From 308af519a54b609784707f299277b4def5ebba7f Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Sat, 12 Aug 2023 17:08:33 -0400 Subject: [PATCH] sounds halfway named (#1110) * first few * more * more sounds * for now * visually separate remaining sounds * checkpoint * star power refactor * standard name * fix --------- Co-authored-by: HailSanta --- include/common_structs.h | 22 +- include/dead.h | 2 +- include/effects.h | 62 +- include/entity.h | 2 +- include/enums.h | 1839 +++++++++-------- include/macros.h | 9 +- include/npc.h | 4 +- include/script_api/common.h | 6 +- include/variables.h | 2 +- src/16F740.c | 24 +- src/16c8e0.c | 36 +- src/17D6A0.c | 38 +- src/17FEB0.c | 3 +- src/182B30.c | 35 +- src/18F340.c | 16 +- src/190B20.c | 14 +- src/19FAF0.c | 2 +- src/1A5830.c | 14 +- src/80850_len_3060.c | 24 +- src/8800.c | 8 +- src/C50A0.c | 8 +- src/actor_api.c | 126 +- src/audio/sfx.c | 116 +- src/background.c | 12 +- src/background_gfx.c | 6 +- src/battle/action_cmd.c | 4 +- src/battle/action_cmd/body_slam.c | 2 +- src/battle/action_cmd/hammer.c | 8 +- src/battle/action_cmd/jump.c | 2 +- src/battle/action_cmd/tidal_wave.c | 4 +- src/battle/action_cmd/water_block.c | 10 +- src/battle/area/dig/actor/tubba_blubba.c | 16 +- src/battle/area/flo2/actor/huff_n_puff.c | 22 +- src/battle/area/flo2/actor/spike.c | 4 +- src/battle/area/hos/actor/goombario_tutor.c | 4 +- src/battle/area/hos/actor/magikoopa.c | 8 +- .../area/isk_part_2/actor/chain_chomp.c | 34 +- src/battle/area/isk_part_2/actor/tutankoopa.c | 12 +- src/battle/area/kgr/actor/fuzzipede.c | 2 +- .../area/kmr_part_2/actor/blue_goomba_1.c | 8 +- .../area/kmr_part_2/actor/blue_goomba_2.c | 8 +- .../area/kmr_part_2/actor/goomba_king.c | 8 +- .../area/kmr_part_2/actor/red_goomba_1.c | 8 +- .../area/kmr_part_2/actor/red_goomba_2.c | 8 +- .../area/kmr_part_3/actor/egg_jr_troopa.c | 4 +- .../area/kmr_part_3/actor/final_jr_troopa.c | 20 +- src/battle/area/kmr_part_3/actor/jr_troopa.c | 4 +- .../area/kmr_part_3/actor/mage_jr_troopa.c | 6 +- .../area/kmr_part_3/actor/para_jr_troopa.c | 18 +- .../kmr_part_3/actor/spiked_para_jr_troopa.c | 18 +- .../kmr_part_3/actor/tutorial_paragoomba.c | 24 +- .../kmr_part_3/actor/tutorial_spiked_goomba.c | 8 +- src/battle/area/kpa2/actor/bowser.c | 8 +- src/battle/area/kpa2/actor/bowser_intro.c | 8 +- src/battle/area/kpa2/actor/bowser_phase_1.c | 18 +- src/battle/area/kpa2/actor/bowser_phase_2.c | 26 +- src/battle/area/kpa2/actor/bowser_phase_3.c | 30 +- .../area/kpa4/actor/bombshell_bill_blaster.c | 2 +- src/battle/area/mac/actor/chan.c | 16 +- src/battle/area/mac/actor/lee.c | 94 +- src/battle/area/mac/actor/master1.c | 8 +- src/battle/area/mac/actor/master2.c | 16 +- src/battle/area/mac/actor/master3.c | 32 +- src/battle/area/nok/actor/kent_c_koopa.c | 8 +- src/battle/area/omo2/actor/general_guy.c | 12 +- src/battle/area/omo2_2/actor/stilt_guy.c | 2 +- src/battle/area/omo2_3/actor/shy_stack.c | 4 +- .../area/omo3/actor/big_lantern_ghost.c | 6 +- src/battle/area/pra2/actor/crystal_king.c | 4 +- src/battle/area/sam2/actor/monstar.c | 2 +- src/battle/area/tik2/actor/electro_blooper.c | 10 +- src/battle/area/tik2/actor/super_blooper.c | 12 +- src/battle/battle.c | 38 +- src/battle/common/actor/amazy_dayzee.inc.c | 4 +- src/battle/common/actor/anti_guy.inc.c | 2 +- src/battle/common/actor/bill_blaster.inc.c | 2 +- src/battle/common/actor/blue_shy_guy.inc.c | 2 +- src/battle/common/actor/bob_omb.inc.c | 4 +- src/battle/common/actor/crazee_dayzee.inc.c | 4 +- src/battle/common/actor/dark_koopa.inc.c | 2 +- src/battle/common/actor/dark_paratroopa.inc.c | 10 +- src/battle/common/actor/duplighost.inc.c | 2 +- .../actor/duplighost/ghost_lakilester.inc.c | 2 +- .../actor/duplighost/ghost_sushie.inc.c | 18 +- src/battle/common/actor/ember.inc.c | 32 +- src/battle/common/actor/green_shy_guy.inc.c | 2 +- src/battle/common/actor/groove_guy.inc.c | 28 +- src/battle/common/actor/hammer_bro.inc.c | 8 +- src/battle/common/actor/hurt_plant.inc.c | 2 +- .../common/actor/hyper_paragoomba.inc.c | 12 +- src/battle/common/actor/koopatrol.inc.c | 6 +- src/battle/common/actor/lakitu.inc.c | 4 +- src/battle/common/actor/lava_bubble.inc.c | 8 +- src/battle/common/actor/magikoopa.inc.c | 4 +- src/battle/common/actor/paragloomba.inc.c | 8 +- src/battle/common/actor/paragoomba.inc.c | 8 +- src/battle/common/actor/paratroopa.inc.c | 8 +- src/battle/common/actor/pink_shy_guy.inc.c | 2 +- src/battle/common/actor/pokey.inc.c | 18 +- src/battle/common/actor/pokey_mummy.inc.c | 8 +- src/battle/common/actor/red_shy_guy.inc.c | 2 +- src/battle/common/actor/ruff_puff.inc.c | 4 +- src/battle/common/actor/sky_guy.inc.c | 10 +- src/battle/common/actor/slot_machine.inc.c | 6 +- src/battle/common/actor/spear_guy.inc.c | 2 +- src/battle/common/actor/spiny.inc.c | 8 +- src/battle/common/actor/spy_guy.inc.c | 4 +- src/battle/common/actor/yellow_shy_guy.inc.c | 2 +- src/battle/common/move/StarBeamSupport.inc.c | 259 +-- src/battle/common/move/StarPowerSupport.inc.c | 326 +++ src/battle/common/move/UseItem.inc.c | 8 +- src/battle/move/hammer/hammer_charge_0.c | 6 +- src/battle/move/hammer/hammer_charge_1.c | 6 +- src/battle/move/hammer/hammer_charge_2.c | 6 +- src/battle/move/item/dizzy_dial.c | 48 +- src/battle/move/item/dried_shroom.c | 10 +- src/battle/move/item/fire_flower.c | 29 +- src/battle/move/item/fright_jar.c | 47 +- src/battle/move/item/hustle_drink.c | 2 +- src/battle/move/item/pow_block.c | 48 +- src/battle/move/item/repel_gel.c | 2 +- src/battle/move/item/shooting_star.c | 30 +- src/battle/move/item/sleepy_sheep.c | 30 +- src/battle/move/item/snowman_doll.c | 71 +- src/battle/move/item/stop_watch.c | 26 +- src/battle/move/item/strange_cake.c | 2 +- src/battle/move/item/super_soda.c | 2 +- src/battle/move/item/thunder_bolt.c | 25 +- src/battle/move/item/thunder_rage.c | 24 +- src/battle/move/jump/auto_multibounce.c | 36 +- src/battle/move/jump/demo_power_bounce.c | 30 +- src/battle/move/jump/earthquake_jump.c | 30 +- src/battle/move/jump/jump_charge_0.c | 2 +- src/battle/move/jump/jump_charge_1.c | 2 +- src/battle/move/jump/jump_charge_2.c | 2 +- src/battle/move/jump/multibounce.c | 36 +- src/battle/move/jump/power_bounce.c | 36 +- src/battle/move/star_power/chill_out.c | 433 +--- src/battle/move/star_power/focus.c | 294 +-- src/battle/move/star_power/lullaby.c | 287 +-- src/battle/move/star_power/peach_beam.c | 17 +- src/battle/move/star_power/peach_focus.c | 267 +-- src/battle/move/star_power/refresh.c | 306 +-- src/battle/move/star_power/smooch.c | 266 +-- src/battle/move/star_power/star_beam.c | 17 +- src/battle/move/star_power/star_storm.c | 307 +-- src/battle/move/star_power/time_out.c | 276 +-- src/battle/move/star_power/twink_dash.c | 252 +-- src/battle/move/star_power/up_and_away.c | 445 +--- src/battle/partner/bombette.c | 12 +- src/battle/partner/bow.c | 8 +- src/battle/partner/goombario.c | 16 +- src/battle/partner/goompa.c | 2 +- src/battle/partner/kooper.c | 6 +- src/battle/partner/lakilester.c | 4 +- src/battle/partner/parakarry.c | 4 +- src/battle/partner/sushie.c | 28 +- src/battle/partner/twink.c | 4 +- src/battle/partner/watt.c | 10 +- src/battle/use_star_powers.c | 92 +- ...Black.inc.c => FadeBackgroundDarken.inc.c} | 10 +- ...lack.inc.c => FadeBackgroundLighten.inc.c} | 9 +- src/common/SetNpcCollision32.inc.c | 9 - src/common/StarPower.inc.c | 53 - src/common/UnkBackgroundFunc.inc.c | 18 - src/common/UnkBackgroundFunc2.inc.c | 21 - src/common/UnkSfxFunc.inc.c | 4 +- src/common/UnkStarFunc.inc.c | 10 - src/common/battle/ChompChainSupport.inc.c | 2 +- src/effects/music_note.c | 82 +- src/effects/recover.c | 126 +- src/effects/star.c | 119 +- src/encounter.c | 10 +- src/entity.c | 12 +- src/entity/BlueWarpPipe.c | 2 +- src/entity/SimpleSpring.c | 4 +- src/entity/default/BoardedFloor.c | 2 +- src/entity/sbk_omo/StarBoxLauncher.c | 2 +- src/entity_model.c | 8 +- src/evt/fa4c0_len_3bf0.c | 2 +- src/evt/fx_api.c | 2 +- src/evt/script_list.c | 4 +- src/imgfx.c | 4 +- src/main_loop.c | 6 +- src/msg.c | 26 +- src/npc.c | 9 +- src/pulse_stone.c | 2 +- src/sprite.c | 14 +- src/sprite.h | 4 +- src/state_battle.c | 2 +- src/state_startup.c | 2 +- src/world/action/hammer.c | 2 +- src/world/action/sneaky_parasol.c | 2 +- src/world/area_arn/arn_07/arn_07_2_main.c | 8 +- src/world/area_arn/arn_07/arn_07_5_npc.c | 16 +- src/world/area_arn/arn_08/arn_08_4_gears.c | 2 +- src/world/area_arn/arn_09/arn_09_5_npc.c | 2 +- src/world/area_dgb/dgb_01/dgb_01_3_bridges.c | 20 +- src/world/area_dgb/dgb_01/dgb_01_5_npc.c | 2 +- src/world/area_dgb/dgb_03/dgb_03_3_clock.c | 4 +- src/world/area_dgb/dgb_11/dgb_11_3_entity.c | 2 +- src/world/area_dgb/dgb_12/dgb_12_3_spikes.c | 2 +- src/world/area_dgb/dgb_18/dgb_18_3_npc.c | 14 +- src/world/area_dro/dro_01/dro_01_2_main.c | 2 +- src/world/area_end/end_00/end_00_4_allies.c | 4 +- src/world/area_flo/flo_00/flo_00_3_npc.c | 2 +- src/world/area_flo/flo_07/flo_07_3_npc.c | 2 +- src/world/area_flo/flo_08/flo_08_4_npc.c | 6 +- src/world/area_flo/flo_11/flo_11_3_npc.c | 2 +- src/world/area_flo/flo_13/flo_13_4_npc.c | 4 +- src/world/area_flo/flo_16/flo_16_6_puzzle.c | 6 +- src/world/area_flo/flo_18/flo_18_1_music.c | 2 +- src/world/area_flo/flo_18/flo_18_3_machine.c | 2 +- src/world/area_flo/flo_21/flo_21_2_main.c | 4 +- src/world/area_flo/flo_23/flo_23_3_npc.c | 6 +- src/world/area_flo/flo_25/flo_25_3_npc.c | 6 +- src/world/area_hos/hos_03/hos_03_2_main.c | 2 +- src/world/area_hos/hos_04/hos_04_1_music.c | 2 +- src/world/area_hos/hos_05/hos_05_1_music.c | 4 +- src/world/area_hos/hos_05/hos_05_7_model_fx.c | 4 +- src/world/area_hos/hos_06/hos_06_6_chest.c | 4 +- src/world/area_hos/hos_10/hos_10_7_ending.c | 2 +- src/world/area_isk/isk_03/isk_03_4_switch.c | 4 +- src/world/area_isk/isk_06/isk_06_4_switch.c | 4 +- src/world/area_isk/isk_07/isk_07_6_switch.c | 4 +- src/world/area_isk/isk_09/isk_09_5_switch.c | 16 +- src/world/area_isk/isk_12/isk_12_4_switch.c | 8 +- src/world/area_isk/isk_16/isk_16_1_main.c | 4 +- src/world/area_isk/isk_16/isk_16_3_boss.c | 2 +- src/world/area_iwa/iwa_10/iwa_10_4_train.c | 2 +- src/world/area_jan/common/PullVine.inc.c | 4 +- src/world/area_jan/jan_03/jan_03_2_main.c | 2 +- src/world/area_jan/jan_04/jan_04_4_npc.c | 6 +- src/world/area_jan/jan_06/jan_06_2_statue.c | 10 +- src/world/area_jan/jan_22/jan_22_3_npc.c | 24 +- src/world/area_jan/jan_22/jan_22_5_zipline.c | 2 +- src/world/area_kkj/kkj_03/kkj_03_4_scenes.c | 4 +- .../area_kkj/kkj_13/kkj_13_3_npcs_finale.c | 6 +- .../area_kkj/kkj_13/kkj_13_5_intro_scenes.c | 14 +- src/world/area_kkj/kkj_15/kkj_15_2_main.c | 4 +- .../area_kkj/kkj_15/kkj_15_3_rotating_wall.c | 6 +- src/world/area_kkj/kkj_17/kkj_17_3_chest.c | 4 +- src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c | 4 +- .../area_kkj/kkj_23/kkj_23_3_npcs_finale.c | 6 +- src/world/area_kkj/kkj_25/kkj_25_5_arena.c | 2 +- .../area_kkj/kkj_25/kkj_25_7_kammy_defeated.c | 4 +- .../area_kkj/kkj_27/kkj_27_3_rotating_wall.c | 2 +- src/world/area_kkj/kkj_29/kkj_29_3_quiz.c | 30 +- src/world/area_kmr/kmr_02/kmr_02_2_main.c | 2 +- src/world/area_kmr/kmr_02/kmr_02_7_kammy.c | 2 +- src/world/area_kmr/kmr_07/kmr_07_3_npc.c | 4 +- src/world/area_kmr/kmr_10/kmr_10_4_entity.c | 4 +- src/world/area_kmr/kmr_11/kmr_11_3_scenes.c | 10 +- src/world/area_kmr/kmr_11/kmr_11_5_entity.c | 2 +- src/world/area_kmr/kmr_11/kmr_11_6_kammy.c | 2 +- src/world/area_kmr/kmr_20/kmr_20_10_npc.c | 2 +- src/world/area_kmr/kmr_20/kmr_20_13_records.c | 2 +- src/world/area_kpa/kpa_04/kpa_04_3_statues.c | 4 +- .../area_kpa/kpa_111/kpa_111_3_statues.c | 4 +- .../area_kpa/kpa_113/kpa_113_4_statues.c | 4 +- .../area_kpa/kpa_115/kpa_115_3_statues.c | 4 +- src/world/area_kpa/kpa_133/kpa_133_3_entity.c | 2 +- src/world/area_kpa/kpa_134/kpa_134_3_chains.c | 36 +- src/world/area_kpa/kpa_134/kpa_134_5_panels.c | 4 +- src/world/area_kpa/kpa_70/kpa_70_2_main.c | 4 +- src/world/area_kpa/kpa_81/kpa_81_3_npc.c | 2 +- src/world/area_kpa/kpa_82/kpa_82_3_npc.c | 2 +- src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c | 2 +- src/world/area_kzn/kzn_09/kzn_09_3_zipline.c | 2 +- src/world/area_kzn/kzn_19/kzn_19_2_main.c | 4 +- .../area_mac/mac_01/npc/flower_gate.inc.c | 16 +- .../area_mac/mac_01/npc/rowf_and_rhuff.inc.c | 8 +- src/world/area_mac/mac_03/mac_03_3_train.c | 2 +- src/world/area_mac/mac_03/mac_03_6_foliage.c | 2 +- src/world/area_mac/mac_03/mac_03_7_oinks.c | 10 +- .../area_mac/mac_04/npc_chet_rippo.inc.c | 2 +- src/world/area_mac/mac_04/npc_muskular.inc.c | 2 +- src/world/area_mac/mac_05/mac_05_5_whale.c | 6 +- src/world/area_mac/mac_05/mac_05_6_rooms.c | 2 +- src/world/area_mac/mac_06/mac_06_2_whale.c | 6 +- src/world/area_mgm/mgm_00/mgm_00_2_npc.c | 4 +- .../area_mgm/mgm_00/mgm_00_3_scoreboard.c | 2 +- src/world/area_mgm/mgm_02/mgm_02_2_npc.c | 2 +- src/world/area_mim/mim_01/mim_01_4_hint.c | 6 +- src/world/area_mim/mim_02/mim_02_5_hint.c | 2 +- src/world/area_mim/mim_03/mim_03_4_hint.c | 8 +- src/world/area_mim/mim_04/mim_04_4_hint.c | 2 +- src/world/area_mim/mim_06/mim_06_4_hint.c | 12 +- src/world/area_mim/mim_07/mim_07_4_hint.c | 2 +- src/world/area_mim/mim_09/mim_09_4_hint.c | 8 +- src/world/area_mim/mim_10/mim_10_4_npc.c | 2 +- src/world/area_mim/mim_11/mim_11_2_main.c | 2 +- src/world/area_nok/nok_01/npcs_crisis.inc.c | 4 +- src/world/area_nok/nok_02/nok_02_2_main.c | 2 +- src/world/area_nok/nok_02/nok_02_4_rooms.c | 2 +- src/world/area_nok/nok_02/nok_02_6_npc.c | 2 +- src/world/area_nok/nok_04/nok_04_4_npc.c | 2 +- src/world/area_nok/nok_11/nok_11_4_npc.c | 2 +- src/world/area_nok/nok_12/nok_12_3_entity.c | 2 +- src/world/area_nok/nok_12/nok_12_4_bridge.c | 6 +- src/world/area_nok/nok_14/nok_14_4_bridge.c | 16 +- .../area_obk/obk_01/obk_01_3_chandelier.c | 14 +- .../area_obk/obk_01/obk_01_5_jump_scare.c | 2 +- src/world/area_obk/obk_03/obk_03_4_entity.c | 2 +- src/world/area_obk/obk_04/obk_04_3_npc.c | 2 +- src/world/area_obk/obk_08/obk_08_5_npc.c | 2 +- src/world/area_obk/obk_09/obk_09_3_meet_bow.c | 10 +- src/world/area_omo/common/ToyTrain.inc.c | 12 +- .../area_omo/omo_02/omo_02_5_barricade.c | 2 +- .../area_omo/omo_03/omo_03_7_train_drop.c | 6 +- src/world/area_omo/omo_04/omo_04_6_scenes.c | 4 +- src/world/area_omo/omo_05/omo_05_4_npc.c | 4 +- src/world/area_omo/omo_07/omo_07_6_scenes.c | 2 +- src/world/area_omo/omo_08/omo_08_3_boxes.c | 8 +- src/world/area_omo/omo_09/omo_09_8_scenes.c | 2 +- src/world/area_omo/omo_11/omo_11_3_gizmos.c | 20 +- src/world/area_omo/omo_15/omo_15_2_main.c | 4 +- src/world/area_omo/omo_15/omo_15_3_npc.c | 2 +- src/world/area_osr/osr_02/osr_02_3_npc.c | 14 +- .../area_osr/osr_03/osr_03_5_interlude.c | 2 +- src/world/area_osr/osr_03/osr_03_6_ending.c | 2 +- src/world/area_osr/osr_04/osr_04_2_assault.c | 2 +- src/world/area_pra/pra_01/pra_01_3_npc.c | 2 +- src/world/area_pra/pra_02/pra_02_4_entity.c | 2 +- src/world/area_pra/pra_09/pra_09_3_npc.c | 2 +- src/world/area_pra/pra_13/pra_13_3_npc.c | 4 +- src/world/area_pra/pra_19/pra_19_3_npc.c | 2 +- src/world/area_pra/pra_22/pra_22_2_main.c | 4 +- src/world/area_pra/pra_29/pra_29_4_bridge.c | 2 +- src/world/area_pra/pra_31/pra_31_4_puzzle.c | 34 +- src/world/area_pra/pra_32/pra_32_2_main.c | 8 +- src/world/area_pra/pra_33/pra_33_3_entity.c | 2 +- src/world/area_sam/sam_08/sam_08_4_npc.c | 8 +- src/world/area_sam/sam_12/sam_12_4_scenes.c | 2 +- src/world/area_sbk/sbk_02/sbk_02_4_npc.c | 2 +- src/world/area_tik/tik_01/tik_01_4_entity.c | 4 +- src/world/area_tik/tik_05/tik_05_4_entity.c | 4 +- src/world/area_tik/tik_08/tik_08_4_entity.c | 4 +- src/world/area_tik/tik_09/tik_09_4_entity.c | 4 +- src/world/area_tik/tik_25/tik_25_3_entity.c | 8 +- src/world/area_trd/trd_00/trd_00_3_npc.c | 2 +- src/world/area_trd/trd_01/trd_01_1_main.c | 8 +- src/world/area_trd/trd_02/trd_02_1_main.c | 6 +- src/world/area_trd/trd_03/trd_03_4_puzzle.c | 4 +- src/world/area_trd/trd_04/trd_04.h | 2 +- src/world/area_trd/trd_04/trd_04_1_main.c | 6 +- src/world/area_trd/trd_04/trd_04_2_entity.c | 10 +- src/world/area_trd/trd_04/trd_04_3_npc.c | 4 +- src/world/area_trd/trd_05/trd_05_3_trap.c | 2 +- src/world/area_trd/trd_05/trd_05_4_npc.c | 12 +- src/world/area_trd/trd_10/trd_10_1_main.c | 4 +- src/world/common/complete/Quizmo.inc.c | 24 +- src/world/common/enemy/HeartPlant.inc.c | 2 +- src/world/common/enemy/HurtPlant.inc.c | 2 +- src/world/common/enemy/ai/ParatroopaAI.inc.c | 2 +- src/world/common/entity/SuperBlock.inc.c | 2 +- .../common/todo/StarSpiritEffectFunc.inc.c | 2 +- src/world/dead/area_flo/flo_00/flo_00_3_npc.c | 2 +- src/world/dead/area_flo/flo_07/flo_07_3_npc.c | 2 +- src/world/dead/area_flo/flo_08/flo_08_4_npc.c | 6 +- src/world/dead/area_flo/flo_11/flo_11_3_npc.c | 2 +- src/world/dead/area_flo/flo_13/flo_13_4_npc.c | 4 +- .../dead/area_flo/flo_16/flo_16_6_puzzle.c | 6 +- .../dead/area_flo/flo_18/flo_18_1_music.c | 2 +- .../dead/area_flo/flo_18/flo_18_3_machine.c | 2 +- .../dead/area_kzn/kzn_19/kzn_19_2_main.c | 4 +- src/world/partner/lakilester.c | 6 +- src/world/partner/sushie.c | 6 +- src/world/script_api/push_blocks.c | 2 +- src/world_use_item.c | 4 +- tools/ignored_funcs.txt | 2 +- ver/us/symbol_addrs.txt | 342 +-- ver/us/undefined_syms.txt | 2 +- 373 files changed, 3623 insertions(+), 6073 deletions(-) create mode 100644 src/battle/common/move/StarPowerSupport.inc.c rename src/common/{FadeBackgroundToBlack.inc.c => FadeBackgroundDarken.inc.c} (69%) rename src/common/{UnfadeBackgroundToBlack.inc.c => FadeBackgroundLighten.inc.c} (69%) delete mode 100644 src/common/SetNpcCollision32.inc.c delete mode 100644 src/common/StarPower.inc.c delete mode 100644 src/common/UnkBackgroundFunc.inc.c delete mode 100644 src/common/UnkBackgroundFunc2.inc.c delete mode 100644 src/common/UnkStarFunc.inc.c diff --git a/include/common_structs.h b/include/common_structs.h index a74aaab0f7..a9c7e93092 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -24,6 +24,7 @@ typedef void NoArgCallback(void*); #define PAL_BIN u16 typedef s32 b32; +typedef s16 b16; typedef s8 b8; typedef s32 HitID; @@ -184,7 +185,7 @@ typedef struct NpcQuizmoBlur { } NpcQuizmoBlur; // size = 0x8; typedef struct NpcHistoryPoint { - /* 0x00 */ s8 isAirborne; + /* 0x00 */ b8 isAirborne; /* 0x01 */ char unk_01[0x3]; /* 0x04 */ Vec3f pos; } NpcHistoryPoint; // size = 0x10 @@ -245,7 +246,7 @@ typedef struct Npc { /* 0x080 */ s32 collisionChannel; /* flags used with collision tracing */ /* 0x084 */ s16 curFloor; /* colliderID */ /* 0x086 */ s16 curWall; /* colliderID */ - /* 0x088 */ s16 isFacingAway; + /* 0x088 */ b16 isFacingAway; /* 0x08A */ s16 yawCamOffset; /* 0x08C */ s16 turnAroundYawAdjustment; /* 0x08E */ s16 duration; // TODO: name less vaguely @@ -760,7 +761,7 @@ typedef struct Camera { /* 0x002 */ s16 moveFlags; /* 0x004 */ s16 updateMode; /* 0x006 */ s16 needsInit; - /* 0x008 */ s16 isChangingMap; + /* 0x008 */ b16 isChangingMap; /* 0x00A */ s16 viewportW; /* 0x00C */ s16 viewportH; /* 0x00E */ s16 viewportStartX; @@ -881,9 +882,9 @@ typedef struct BattleStatus { /* 0x081 */ s8 actionSuccess; /* 0x082 */ char unk_82; /* 0x083 */ s8 actionCommandMode; - /* 0x084 */ s8 actionResult; + /* 0x084 */ s8 actionResult; // actionResultAmount? /* 0x085 */ s8 unk_85; - /* 0x086 */ s8 unk_86; + /* 0x086 */ s8 unk_86; // actionResult? /* 0x087 */ s8 blockResult; /* 0 = fail, 1 = success, -1 = mashed */ /* 0x088 */ s8 itemUsesLeft; /* set to 2 for double dip, 3 for triple dip */ /* 0x089 */ s8 hpDrainCount; @@ -1198,7 +1199,7 @@ typedef struct MessagePrintState { /* 0x45E */ u8 printDelayTime; // delay to print each chunk /* 0x45F */ u8 charsPerChunk; // how many chars to print at once /* 0x460 */ s32 curLinePos; // position along current line - /* 0x464 */ u8 unk_464; + /* 0x464 */ u8 windowScrollRate; /* 0x465 */ char unk_465; /* 0x466 */ u16 nextLinePos; // ? /* 0x468 */ u8 lineCount; @@ -1416,8 +1417,7 @@ typedef struct GameStatus { /* 0x07F */ s8 peachDisguise; /* (1 = koopatrol, 2 = hammer bros, 3 = clubba) */ /* 0x080 */ u8 peachBakingIngredient; ///< @see enum PeachBakingItems /* 0x081 */ s8 multiplayerEnabled; - /* 0x082 */ s8 unk_82; - /* 0x083 */ s8 unk_83; + /* 0x082 */ Vec2b unk_82; /* 0x084 */ s8 playerSpriteSet; /* 0x085 */ char unk_85; /* 0x086 */ s16 areaID; @@ -1432,7 +1432,7 @@ typedef struct GameStatus { /* 0x0A4 */ f32 playerYaw; /* 0x0A8 */ s8 creditsViewportMode; /* 0x0A9 */ s8 unk_A9; // selected language? - /* 0x0AA */ s8 demoFlags; + /* 0x0AA */ s8 demoBattleFlags; /* 0x0AB */ u8 soundOutputMode; /* 0x0AC */ s8 introState; /* 0x0AD */ s8 introCounter; @@ -1716,7 +1716,7 @@ typedef struct DecorationTable { } DecorationTable; // size = 0x8E8 typedef struct PlayerPathElement { - /* 0x00 */ s8 isJumping; + /* 0x00 */ b8 isJumping; /* 0x03 */ char unk_01[3]; /* 0x04 */ Vec3f pos; } PlayerPathElement; // size = 0x10 @@ -1905,7 +1905,7 @@ typedef struct Actor { /* 0x21C */ s8 statusAfflicted; /* 0x21D */ s8 disableDismissTimer; /* 0x21E */ s16 unk_21E; - /* 0x220 */ s8 isGlowing; // also used for goombario charge amount + /* 0x220 */ b8 isGlowing; // also used for goombario charge amount /* 0x221 */ s8 attackBoost; /* 0x222 */ s8 defenseBoost; /* 0x223 */ s8 chillOutAmount; /* attack reduction */ diff --git a/include/dead.h b/include/dead.h index 8eaa6abce5..902964ce9e 100644 --- a/include/dead.h +++ b/include/dead.h @@ -252,7 +252,7 @@ #define AssignPanelFlag dead_AssignPanelFlag #define Entity_HiddenPanel dead_Entity_HiddenPanel #define ShakeCam dead_ShakeCam -#define func_802D62E4 dead_func_802D62E4 +#define StopTrackingSoundPos dead_StopTrackingSoundPos #define IsStartingConversation dead_IsStartingConversation #define ModifyGlobalOverrideFlags dead_ModifyGlobalOverrideFlags #define FindKeyItem dead_FindKeyItem diff --git a/include/effects.h b/include/effects.h index d018b3b54b..128074db72 100644 --- a/include/effects.h +++ b/include/effects.h @@ -181,26 +181,22 @@ typedef struct SnowflakeFXData { typedef struct StarFXData { /* 0x000 */ s32 unk_00; - /* 0x004 */ f32 unk_04; - /* 0x008 */ f32 unk_08; - /* 0x00C */ f32 unk_0C; - /* 0x010 */ f32 unk_10; - /* 0x014 */ f32 unk_14; - /* 0x018 */ f32 unk_18; + /* 0x004 */ Vec3f pos; + /* 0x010 */ Vec3f vel; /* 0x01C */ f32 unk_1C; /* 0x020 */ f32 unk_20; - /* 0x024 */ f32 unk_24; + /* 0x024 */ f32 angle; /* 0x028 */ s32 unk_28; /* 0x02C */ f32 unk_2C; /* 0x030 */ s32 unk_30; /* 0x034 */ f32 unk_34; - /* 0x038 */ s32 unk_38; + /* 0x038 */ s32 type; /* 0x03C */ s32 unk_3C; /* 0x040 */ Mtx unk_40[8]; - /* 0x240 */ f32 unk_240; - /* 0x244 */ s32 unk_244; - /* 0x248 */ s32 unk_248; - /* 0x24C */ s32 unk_24C; + /* 0x240 */ f32 scale; + /* 0x244 */ s32 primR; + /* 0x248 */ s32 primG; + /* 0x24C */ s32 primB; } StarFXData; // size = 0x250 typedef struct EmoteFXData { @@ -572,17 +568,17 @@ typedef struct ShockwaveFXData { } ShockwaveFXData; // size = 0x58 typedef struct MusicNoteFXData { - /* 0x00 */ s32 unk_00; + /* 0x00 */ s32 type; /* 0x04 */ Vec3f pos; - /* 0x10 */ f32 unk_10; - /* 0x14 */ s32 unk_14; + /* 0x10 */ f32 scale; + /* 0x14 */ s32 alpha; /* 0x18 */ s32 timeLeft; - /* 0x1C */ s32 unk_1C; - /* 0x20 */ s32 unk_20; - /* 0x24 */ f32 unk_24; - /* 0x28 */ f32 unk_28; - /* 0x2C */ f32 unk_2C; - /* 0x30 */ f32 unk_30; + /* 0x1C */ s32 lifetime; + /* 0x20 */ s32 noteType; + /* 0x24 */ f32 velX; + /* 0x28 */ f32 velY; + /* 0x2C */ f32 finalVelX; + /* 0x30 */ f32 finalVelY; } MusicNoteFXData; // size = 0x34 typedef struct SmokeBurstFXData { @@ -1077,22 +1073,18 @@ typedef struct FireFlowerFXData { } FireFlowerFXData; // size = 0x4C typedef struct RecoverFXData { - /* 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; + /* 0x00 */ s32 type; + /* 0x04 */ Vec3f pos; + /* 0x10 */ Vec3f vel; + /* 0x1C */ f32 angle; /* 0x20 */ s32 unk_20; - /* 0x24 */ f32 unk_24; - /* 0x28 */ s32 unk_28; - /* 0x2C */ s32 unk_2C; - /* 0x30 */ s32 unk_30; + /* 0x24 */ f32 offsetX; + /* 0x28 */ s32 alpha; + /* 0x2C */ s32 timeLeft; + /* 0x30 */ s32 lifetime; /* 0x34 */ s32 unk_34; - /* 0x38 */ f32 unk_38; - /* 0x3C */ f32 unk_3C; + /* 0x38 */ f32 scaleX; + /* 0x3C */ f32 scaleY; /* 0x40 */ s32 unk_40; /* 0x44 */ s32 unk_44; } RecoverFXData; // size = 0x48 diff --git a/include/entity.h b/include/entity.h index 7d372a0fd5..911ceee5a4 100644 --- a/include/entity.h +++ b/include/entity.h @@ -210,7 +210,7 @@ typedef struct ChestData { typedef struct BlueWarpPipeData { /* 0x00 */ s32 unk_00; // proably flags /* 0x04 */ s32 timer; - /* 0x08 */ s32 isRaised; + /* 0x08 */ b32 isRaised; /* 0x0C */ s32 entryID; /* 0x10 */ EvtScript* onEnterPipeEvt; /* 0x14 */ s32 flagIndex; diff --git a/include/enums.h b/include/enums.h index 9a32cf1ee9..7553ebd0ce 100644 --- a/include/enums.h +++ b/include/enums.h @@ -549,119 +549,119 @@ enum SoundIDs { SOUND_MSG_VOICE_5A = 0x00000019, SOUND_MSG_VOICE_5B = 0x0000001A, SOUND_MSG_VOICE_STAR = 0x0000001B, - SOUND_LRAW_0021 = 0x00000021, - SOUND_LRAW_0022 = 0x00000022, + SOUND_LRAW_TRD_FLOWING_WATER = 0x00000021, + SOUND_LRAW_TRD_RAISE_STAIRS = 0x00000022, SOUND_TRD_WATER_SPLASH = 0x00000023, - SOUND_LRAW_0024 = 0x00000024, - SOUND_0025 = 0x00000025, - SOUND_0026 = 0x00000026, - SOUND_LRAW_0027 = 0x00000027, - SOUND_0028 = 0x00000028, - SOUND_0029 = 0x00000029, - SOUND_002A = 0x0000002A, + SOUND_LRAW_TRD_02_LOWER_STAIRS = 0x00000024, + SOUND_TRD_02_STAIRS_LOWERED = 0x00000025, + SOUND_TRD_PUZZLE_PLATFORM_THUD = 0x00000026, + SOUND_LRAW_TRD_04_LOWER_STAIRS = 0x00000027, + SOUND_TRD_04_STAIRS_LOWERED = 0x00000028, + SOUND_POUNDING_HIGH = 0x00000029, + SOUND_POUNDING_LOW = 0x0000002A, SOUND_TRD_MAGIC_DOOR_JUMP = 0x0000002B, SOUND_TRD_MAGIC_DOOR_LAND = 0x0000002C, - SOUND_002D = 0x0000002D, - SOUND_002E = 0x0000002E, - SOUND_002F = 0x0000002F, - SOUND_0030 = 0x00000030, - SOUND_LRAW_0033 = 0x00000033, - SOUND_LRAW_0034 = 0x00000034, - SOUND_0035 = 0x00000035, - SOUND_0036 = 0x00000036, - SOUND_0037 = 0x00000037, - SOUND_0038 = 0x00000038, - SOUND_LRAW_0039 = 0x00000039, - SOUND_003F = 0x0000003F, - SOUND_0040 = 0x00000040, - SOUND_0041 = 0x00000041, - SOUND_0042 = 0x00000042, - SOUND_LRAW_0043 = 0x00000043, - SOUND_0044 = 0x00000044, + SOUND_PRA_PUSH_STATUE = 0x0000002D, + SOUND_PRA_FLIP_WALL = 0x0000002E, + SOUND_PRA_EXTEND_HIDDEN_BRIDGE = 0x0000002F, + SOUND_PRA_UNFOLD_EXIT = 0x00000030, + SOUND_LRAW_KKJ_RUMBLING = 0x00000033, + SOUND_LRAW_OSR_RUMBLING = 0x00000034, // doesn't loop? + SOUND_0035 = 0x00000035, + SOUND_0036 = 0x00000036, + SOUND_0037 = 0x00000037, + SOUND_0038 = 0x00000038, + SOUND_LRAW_0039 = 0x00000039, + SOUND_003F = 0x0000003F, + SOUND_0040 = 0x00000040, + SOUND_0041 = 0x00000041, + SOUND_0042 = 0x00000042, + SOUND_LRAW_0043 = 0x00000043, + SOUND_0044 = 0x00000044, SOUND_JR_TROOPA_SPLASH = 0x00000045, SOUND_LRAW_JR_TROOPA_SWIM = 0x00000046, SOUND_BOO_SPOOK = 0x00000047, - SOUND_0048 = 0x00000048, - SOUND_LRAW_004A = 0x0000004A, - SOUND_LRAW_004C = 0x0000004C, - SOUND_LRAW_004D = 0x0000004D, - SOUND_LRAW_004E = 0x0000004E, - SOUND_LRAW_004F = 0x0000004F, - SOUND_LRAW_0050 = 0x00000050, - SOUND_0051 = 0x00000051, - SOUND_LRAW_0052 = 0x00000052, - SOUND_0053 = 0x00000053, - SOUND_LRAW_0054 = 0x00000054, - SOUND_0055 = 0x00000055, - SOUND_LRAW_0056 = 0x00000056, - SOUND_0057 = 0x00000057, - SOUND_0058 = 0x00000058, - SOUND_0059 = 0x00000059, - SOUND_005A = 0x0000005A, - SOUND_LRAW_005B = 0x0000005B, - SOUND_005C = 0x0000005C, - SOUND_LRAW_005D = 0x0000005D, - SOUND_005E = 0x0000005E, - SOUND_005F = 0x0000005F, - SOUND_LRAW_0060 = 0x00000060, - SOUND_0061 = 0x00000061, - SOUND_0062 = 0x00000062, - SOUND_0064 = 0x00000064, - SOUND_0067 = 0x00000067, - SOUND_0068 = 0x00000068, - SOUND_0069 = 0x00000069, - SOUND_006A = 0x0000006A, - SOUND_006B = 0x0000006B, - SOUND_006C = 0x0000006C, - SOUND_006D = 0x0000006D, - SOUND_LRAW_0070 = 0x00000070, - SOUND_0071 = 0x00000071, - SOUND_0072 = 0x00000072, - SOUND_0073 = 0x00000073, - SOUND_0074 = 0x00000074, - SOUND_0077 = 0x00000077, - SOUND_007D = 0x0000007D, - SOUND_0082 = 0x00000082, - SOUND_LRAW_0083 = 0x00000083, - SOUND_0084 = 0x00000084, - SOUND_0085 = 0x00000085, - SOUND_0087 = 0x00000087, - SOUND_LRAW_0089 = 0x00000089, - SOUND_008A = 0x0000008A, - SOUND_008B = 0x0000008B, - SOUND_008C = 0x0000008C, - SOUND_008D = 0x0000008D, - SOUND_LRAW_008E = 0x0000008E, - SOUND_008F = 0x0000008F, - SOUND_LRAW_0091 = 0x00000091, - SOUND_0092 = 0x00000092, - SOUND_0093 = 0x00000093, - SOUND_LRAW_0094 = 0x00000094, - SOUND_0095 = 0x00000095, - SOUND_0096 = 0x00000096, - SOUND_0097 = 0x00000097, - SOUND_0098 = 0x00000098, - SOUND_LRAW_0099 = 0x00000099, - SOUND_009B = 0x0000009B, - SOUND_009D = 0x0000009D, - SOUND_LRAW_009E = 0x0000009E, - SOUND_LRAW_009F = 0x0000009F, - SOUND_LRAW_00A0 = 0x000000A0, - SOUND_00A1 = 0x000000A1, - SOUND_LRAW_00A2 = 0x000000A2, - SOUND_00A3 = 0x000000A3, - SOUND_00A4 = 0x000000A4, - SOUND_00A5 = 0x000000A5, - SOUND_00A6 = 0x000000A6, - SOUND_00A7 = 0x000000A7, - SOUND_00A8 = 0x000000A8, - SOUND_00A9 = 0x000000A9, - SOUND_00AA = 0x000000AA, - SOUND_00AB = 0x000000AB, - SOUND_00AC = 0x000000AC, - SOUND_LRAW_00AD = 0x000000AD, - SOUND_LRAW_00AE = 0x000000AE, - SOUND_LRAW_00AF = 0x000000AF, + SOUND_OBJECT_LAND = 0x00000048, + SOUND_LRAW_004A = 0x0000004A, + SOUND_LRAW_004C = 0x0000004C, + SOUND_LRAW_004D = 0x0000004D, + SOUND_LRAW_004E = 0x0000004E, + SOUND_LRAW_004F = 0x0000004F, + SOUND_LRAW_0050 = 0x00000050, + SOUND_0051 = 0x00000051, + SOUND_LRAW_0052 = 0x00000052, + SOUND_0053 = 0x00000053, + SOUND_LRAW_0054 = 0x00000054, + SOUND_0055 = 0x00000055, + SOUND_LRAW_0056 = 0x00000056, + SOUND_0057 = 0x00000057, + SOUND_0058 = 0x00000058, + SOUND_0059 = 0x00000059, + SOUND_005A = 0x0000005A, + SOUND_LRAW_005B = 0x0000005B, + SOUND_005C = 0x0000005C, + SOUND_LRAW_005D = 0x0000005D, + SOUND_005E = 0x0000005E, + SOUND_005F = 0x0000005F, + SOUND_LRAW_0060 = 0x00000060, + SOUND_0061 = 0x00000061, + SOUND_0062 = 0x00000062, + SOUND_0064 = 0x00000064, + SOUND_NOK_BRIDGE_XYLOPHONE_1 = 0x00000067, + SOUND_NOK_BRIDGE_XYLOPHONE_2 = 0x00000068, + SOUND_NOK_BRIDGE_XYLOPHONE_3 = 0x00000069, + SOUND_NOK_BRIDGE_XYLOPHONE_4 = 0x0000006A, + SOUND_NOK_BRIDGE_XYLOPHONE_5 = 0x0000006B, + SOUND_NOK_BRIDGE_XYLOPHONE_6 = 0x0000006C, + SOUND_NOK_BRIDGE_XYLOPHONE_7 = 0x0000006D, + SOUND_LRAW_WINDILL_GEARS = 0x00000070, + SOUND_NOK_BRIDGE_THUD_1 = 0x00000071, + SOUND_NOK_BRIDGE_THUD_2 = 0x00000072, + SOUND_NOK_BRIDGE_THUD_3 = 0x00000073, + SOUND_JR_TROOPA_SCAMPER = 0x00000074, + SOUND_NOK_HOUSE_CONFLICT = 0x00000077, + SOUND_PULSE_STONE = 0x0000007D, + SOUND_TRAIN_DEPARTURE = 0x00000082, + SOUND_LRAW_TOYBOX_TRAIN_GEAR = 0x00000083, + SOUND_TOYBOX_TRAIN_WHISTLE_B = 0x00000084, + SOUND_OMO_PLATFORM_ASCEND = 0x00000085, + SOUND_OMO_PLATFORM_DESCEND = 0x00000087, + SOUND_LRAW_AUDIENCE_MURMUR = 0x00000089, + SOUND_AUDIENCE_CHEER = 0x0000008A, + SOUND_AUDIENCE_BOO = 0x0000008B, + SOUND_QUIZ_NEXT_QUESTION = 0x0000008C, + SOUND_QUIZ_BUZZER = 0x0000008D, + SOUND_LRAW_QUIZ_TICKING = 0x0000008E, + SOUND_QUIZMO_VANISH = 0x0000008F, + SOUND_LRAW_PUFF_PUFF_MACHINE = 0x00000091, + SOUND_USE_SNEAKY_PARASOL = 0x00000092, + SOUND_KKJ_ROTATING_WALL = 0x00000093, // loops + SOUND_LRAW_DGB_COLLAPSE = 0x00000094, + SOUND_DGB_COLLAPSE_1 = 0x00000095, + SOUND_DGB_COLLAPSE_2 = 0x00000096, + SOUND_DGB_COLLAPSE_4 = 0x00000097, + SOUND_DGB_COLLAPSE_3 = 0x00000098, + SOUND_LRAW_OBK_LOWER_CHAIN = 0x00000099, + SOUND_OBK_CAGE_SLAM = 0x0000009B, + SOUND_OBK_CHANDELIER_SWING = 0x0000009D, + SOUND_LRAW_MOVE_STATUE = 0x0000009E, + SOUND_LRAW_MOVE_LARGE_STATUE = 0x0000009F, + SOUND_LRAW_OMO_ROTATING_WHEEL = 0x000000A0, + SOUND_OMO_TOYBOX_TRAIN_DROP = 0x000000A1, + SOUND_LRAW_STAR_CARD_APPEARS = 0x000000A2, + SOUND_STARSHIP_APPEARS = 0x000000A3, + SOUND_KPA_LIGHT_RAYS = 0x000000A4, + SOUND_KMR_TOWER_COLLAPSE_RUMBLE = 0x000000A5, + SOUND_KMR_TOWER_COLLAPSE_THUD = 0x000000A6, + SOUND_KMR_TOWER_COLLAPSE_UNFOLD = 0x000000A7, + SOUND_DGB_SMALL_THUD = 0x000000A8, + SOUND_ROWF_OPEN_SHOP = 0x000000A9, + SOUND_ROWF_PULL_RUG_OUT = 0x000000AA, + SOUND_ROWF_CLOSE_SHOP = 0x000000AB, + SOUND_ROWF_PUSH_RUG_IN = 0x000000AC, + SOUND_LRAW_STAR_SANCTUARY_FAR = 0x000000AD, + SOUND_LRAW_STAR_SANCTUARY_NEAR = 0x000000AE, + SOUND_LRAW_STAR_SANCTUARY_INSIDE = 0x000000AF, SOUND_INTRO_NEXT_PAGE = 0x000000B0, SOUND_MERLAR_APPEARS = 0x000000B1, SOUND_STAR_CARD_APPEARS = 0x000000B2, @@ -701,37 +701,37 @@ enum SoundIDs { SOUND_HIT_NORMAL = 0x000000E9, SOUND_HIT_FIRE = 0x000000EA, SOUND_HIT_ICE = 0x000000EB, - SOUND_00F1 = 0x000000F1, - SOUND_00F2 = 0x000000F2, - SOUND_00F3 = 0x000000F3, - SOUND_00F4 = 0x000000F4, - SOUND_00F5 = 0x000000F5, - SOUND_00F6 = 0x000000F6, - SOUND_00F7 = 0x000000F7, - SOUND_00F8 = 0x000000F8, - SOUND_00F9 = 0x000000F9, - SOUND_00FA = 0x000000FA, - SOUND_00FB = 0x000000FB, - SOUND_00FC = 0x000000FC, - SOUND_00FD = 0x000000FD, - SOUND_00FE = 0x000000FE, - SOUND_00FF = 0x000000FF, - SOUND_0100 = 0x00000100, - SOUND_0108 = 0x00000108, - SOUND_010B = 0x0000010B, + SOUND_00F1 = 0x000000F1, + SOUND_00F2 = 0x000000F2, + SOUND_00F3 = 0x000000F3, + SOUND_00F4 = 0x000000F4, + SOUND_00F5 = 0x000000F5, + SOUND_00F6 = 0x000000F6, + SOUND_00F7 = 0x000000F7, + SOUND_00F8 = 0x000000F8, + SOUND_00F9 = 0x000000F9, + SOUND_00FA = 0x000000FA, + SOUND_00FB = 0x000000FB, + SOUND_00FC = 0x000000FC, + SOUND_00FD = 0x000000FD, + SOUND_00FE = 0x000000FE, + SOUND_00FF = 0x000000FF, + SOUND_0100 = 0x00000100, + SOUND_0108 = 0x00000108, + SOUND_010B = 0x0000010B, SOUND_IMMUNE = 0x0000010C, SOUND_HIT_BONES = 0x0000010D, - SOUND_010E = 0x0000010E, + SOUND_010E = 0x0000010E, SOUND_ACTOR_HURT = 0x0000010F, - SOUND_0110 = 0x00000110, - SOUND_0131 = 0x00000131, - SOUND_0133 = 0x00000133, - SOUND_0134 = 0x00000134, - SOUND_0137 = 0x00000137, - SOUND_0138 = 0x00000138, - SOUND_0139 = 0x00000139, - SOUND_013D = 0x0000013D, - SOUND_013E = 0x0000013E, + SOUND_0110 = 0x00000110, + SOUND_0131 = 0x00000131, + SOUND_0133 = 0x00000133, + SOUND_0134 = 0x00000134, + SOUND_0137 = 0x00000137, + SOUND_0138 = 0x00000138, + SOUND_0139 = 0x00000139, + SOUND_013D = 0x0000013D, + SOUND_013E = 0x0000013E, SOUND_STEP_NORMAL1 = 0x00000141, SOUND_STEP_NORMAL2 = 0x00000142, SOUND_STEP_CRUNCHY1 = 0x00000143, @@ -747,79 +747,79 @@ enum SoundIDs { SOUND_SMASH_HAMER_BLOCK_3 = 0x00000151, SOUND_ACTIVATE_SWITCH = 0x00000152, SOUND_SEARCH_BUSH = 0x00000153, - SOUND_0156 = 0x00000156, - SOUND_0158 = 0x00000158, - SOUND_015A = 0x0000015A, - SOUND_015B = 0x0000015B, - SOUND_015C = 0x0000015C, - SOUND_015D = 0x0000015D, - SOUND_015E = 0x0000015E, - SOUND_0160 = 0x00000160, - SOUND_0161 = 0x00000161, - SOUND_0162 = 0x00000162, + SOUND_0156 = 0x00000156, + SOUND_0158 = 0x00000158, + SOUND_015A = 0x0000015A, + SOUND_015B = 0x0000015B, + SOUND_015C = 0x0000015C, + SOUND_015D = 0x0000015D, + SOUND_015E = 0x0000015E, + SOUND_0160 = 0x00000160, + SOUND_0161 = 0x00000161, + SOUND_0162 = 0x00000162, SOUND_ENTER_PIPE = 0x00000163, - SOUND_LRAW_0164 = 0x00000164, + SOUND_LRAW_0164 = 0x00000164, SOUND_SMASH_GOOMNUT_TREE = 0x00000165, SOUND_SHAKE_TREE = 0x00000166, - SOUND_0167 = 0x00000167, - SOUND_LRAW_0168 = 0x00000168, + SOUND_0167 = 0x00000167, + SOUND_LRAW_0168 = 0x00000168, SOUND_DUST_OFF = 0x00000172, - SOUND_0173 = 0x00000173, - SOUND_0174 = 0x00000174, - SOUND_0175 = 0x00000175, - SOUND_0176 = 0x00000176, - SOUND_SRAW_19_A = 0x00000179, - SOUND_SRAW_19_B = 0x0000017A, - SOUND_017B = 0x0000017B, - SOUND_017C = 0x0000017C, - SOUND_017D = 0x0000017D, - SOUND_017E = 0x0000017E, - SOUND_017F = 0x0000017F, - SOUND_0180 = 0x00000180, - SOUND_0181 = 0x00000181, - SOUND_0182 = 0x00000182, - SOUND_0183 = 0x00000183, - SOUND_LRAW_0185 = 0x00000185, - SOUND_0186 = 0x00000186, - SOUND_0187 = 0x00000187, - SOUND_0188 = 0x00000188, - SOUND_LRAW_0189 = 0x00000189, - SOUND_018A = 0x0000018A, - SOUND_018C = 0x0000018C, - SOUND_018D = 0x0000018D, - SOUND_018E = 0x0000018E, - SOUND_0190 = 0x00000190, - SOUND_0191 = 0x00000191, - SOUND_0193 = 0x00000193, - SOUND_LRAW_0194 = 0x00000194, - SOUND_LRAW_0197 = 0x00000197, - SOUND_LRAW_0198 = 0x00000198, - SOUND_LRAW_0199 = 0x00000199, - SOUND_LRAW_019A = 0x0000019A, - SOUND_019B = 0x0000019B, - SOUND_019C = 0x0000019C, - SOUND_019D = 0x0000019D, - SOUND_019E = 0x0000019E, - SOUND_019F = 0x0000019F, - SOUND_01A0 = 0x000001A0, - SOUND_01A1 = 0x000001A1, - SOUND_01A2 = 0x000001A2, - SOUND_01A3 = 0x000001A3, - SOUND_01A4 = 0x000001A4, - SOUND_01A5 = 0x000001A5, - SOUND_01A6 = 0x000001A6, - SOUND_01A7 = 0x000001A7, - SOUND_01A8 = 0x000001A8, - SOUND_01A9 = 0x000001A9, - SOUND_01AA = 0x000001AA, - SOUND_01AB = 0x000001AB, - SOUND_01AC = 0x000001AC, - SOUND_01AD = 0x000001AD, - SOUND_01AE = 0x000001AE, - SOUND_01AF = 0x000001AF, - SOUND_LRAW_01B1 = 0x000001B1, - SOUND_LRAW_01B2 = 0x000001B2, - SOUND_LRAW_01B3 = 0x000001B3, + SOUND_0173 = 0x00000173, + SOUND_0174 = 0x00000174, + SOUND_0175 = 0x00000175, + SOUND_0176 = 0x00000176, + SOUND_SRAW_19_A = 0x00000179, + SOUND_SRAW_19_B = 0x0000017A, + SOUND_017B = 0x0000017B, + SOUND_017C = 0x0000017C, + SOUND_017D = 0x0000017D, + SOUND_017E = 0x0000017E, + SOUND_017F = 0x0000017F, + SOUND_0180 = 0x00000180, + SOUND_0181 = 0x00000181, + SOUND_0182 = 0x00000182, + SOUND_0183 = 0x00000183, + SOUND_LRAW_0185 = 0x00000185, + SOUND_0186 = 0x00000186, + SOUND_0187 = 0x00000187, + SOUND_0188 = 0x00000188, + SOUND_LRAW_0189 = 0x00000189, + SOUND_018A = 0x0000018A, + SOUND_018C = 0x0000018C, + SOUND_018D = 0x0000018D, + SOUND_018E = 0x0000018E, + SOUND_0190 = 0x00000190, + SOUND_0191 = 0x00000191, + SOUND_0193 = 0x00000193, + SOUND_LRAW_0194 = 0x00000194, + SOUND_LRAW_0197 = 0x00000197, + SOUND_LRAW_0198 = 0x00000198, + SOUND_LRAW_0199 = 0x00000199, + SOUND_LRAW_019A = 0x0000019A, + SOUND_019B = 0x0000019B, + SOUND_019C = 0x0000019C, + SOUND_019D = 0x0000019D, + SOUND_019E = 0x0000019E, + SOUND_019F = 0x0000019F, + SOUND_01A0 = 0x000001A0, + SOUND_01A1 = 0x000001A1, + SOUND_01A2 = 0x000001A2, + SOUND_01A3 = 0x000001A3, + SOUND_01A4 = 0x000001A4, + SOUND_01A5 = 0x000001A5, + SOUND_01A6 = 0x000001A6, + SOUND_01A7 = 0x000001A7, + SOUND_01A8 = 0x000001A8, + SOUND_01A9 = 0x000001A9, + SOUND_01AA = 0x000001AA, + SOUND_01AB = 0x000001AB, + SOUND_01AC = 0x000001AC, + SOUND_01AD = 0x000001AD, + SOUND_01AE = 0x000001AE, + SOUND_01AF = 0x000001AF, + SOUND_LRAW_01B1 = 0x000001B1, + SOUND_LRAW_01B2 = 0x000001B2, + SOUND_LRAW_01B3 = 0x000001B3, SOUND_BASIC_DOOR_OPEN = 0x000001C1, SOUND_BASIC_DOOR_CLOSE = 0x000001C2, SOUND_METAL_DOOR_OPEN = 0x000001C3, @@ -830,68 +830,68 @@ enum SoundIDs { SOUND_CREAKY_DOOR_CLOSE = 0x000001C8, SOUND_METAL_GATE_OPEN = 0x000001C9, SOUND_METAL_GATE_CLOSE = 0x000001CA, - SOUND_SRAW_11_A = 0x000001CB, - SOUND_SRAW_12_A = 0x000001CC, - SOUND_SRAW_11_B = 0x000001CD, - SOUND_SRAW_12_B = 0x000001CE, - SOUND_01CF = 0x000001CF, - SOUND_01D0 = 0x000001D0, - SOUND_01D1 = 0x000001D1, - SOUND_01D2 = 0x000001D2, - SOUND_01D3 = 0x000001D3, - SOUND_01D4 = 0x000001D4, - SOUND_01D5 = 0x000001D5, + SOUND_SRAW_11_A = 0x000001CB, + SOUND_SRAW_12_A = 0x000001CC, + SOUND_SRAW_11_B = 0x000001CD, + SOUND_SRAW_12_B = 0x000001CE, + SOUND_01CF = 0x000001CF, + SOUND_01D0 = 0x000001D0, + SOUND_01D1 = 0x000001D1, + SOUND_01D2 = 0x000001D2, + SOUND_01D3 = 0x000001D3, + SOUND_01D4 = 0x000001D4, + SOUND_01D5 = 0x000001D5, SOUND_CREAKY_ROCKING_CHAIR = 0x000001D6, - SOUND_01D8 = 0x000001D8, - SOUND_01D9 = 0x000001D9, - SOUND_01DA = 0x000001DA, - SOUND_01DB = 0x000001DB, - SOUND_01DC = 0x000001DC, - SOUND_01DD = 0x000001DD, - SOUND_01DE = 0x000001DE, - SOUND_01DF = 0x000001DF, - SOUND_01E0 = 0x000001E0, - SOUND_01E1 = 0x000001E1, - SOUND_01E2 = 0x000001E2, - SOUND_01E3 = 0x000001E3, - SOUND_01E4 = 0x000001E4, - SOUND_01E5 = 0x000001E5, - SOUND_01E6 = 0x000001E6, - SOUND_01E7 = 0x000001E7, - SOUND_01E8 = 0x000001E8, - SOUND_01E9 = 0x000001E9, - SOUND_01EA = 0x000001EA, - SOUND_01EB = 0x000001EB, - SOUND_01EC = 0x000001EC, - SOUND_01ED = 0x000001ED, - SOUND_01EE = 0x000001EE, - SOUND_01EF = 0x000001EF, - SOUND_01F0 = 0x000001F0, - SOUND_01F1 = 0x000001F1, - SOUND_01F2 = 0x000001F2, - SOUND_01F3 = 0x000001F3, - SOUND_01F4 = 0x000001F4, - SOUND_01F5 = 0x000001F5, - SOUND_01F9 = 0x000001F9, - SOUND_01FA = 0x000001FA, - SOUND_SRAW_1A_A = 0x000001FB, - SOUND_SRAW_1A_B = 0x000001FC, - SOUND_01FD = 0x000001FD, - SOUND_01FE = 0x000001FE, - SOUND_01FF = 0x000001FF, - SOUND_0201 = 0x00000201, - SOUND_0202 = 0x00000202, - SOUND_0203 = 0x00000203, - SOUND_0204 = 0x00000204, - SOUND_0205 = 0x00000205, - SOUND_0206 = 0x00000206, - SOUND_LRAW_0207 = 0x00000207, - SOUND_0208 = 0x00000208, - SOUND_0209 = 0x00000209, - SOUND_020A = 0x0000020A, - SOUND_SRAW_14_A = 0x0000020C, - SOUND_SRAW_14_B = 0x0000020D, - SOUND_SRAW_14_C = 0x0000020E, + SOUND_01D8 = 0x000001D8, + SOUND_01D9 = 0x000001D9, + SOUND_01DA = 0x000001DA, + SOUND_01DB = 0x000001DB, + SOUND_01DC = 0x000001DC, + SOUND_01DD = 0x000001DD, + SOUND_01DE = 0x000001DE, + SOUND_01DF = 0x000001DF, + SOUND_01E0 = 0x000001E0, + SOUND_01E1 = 0x000001E1, + SOUND_01E2 = 0x000001E2, + SOUND_01E3 = 0x000001E3, + SOUND_01E4 = 0x000001E4, + SOUND_01E5 = 0x000001E5, + SOUND_01E6 = 0x000001E6, + SOUND_01E7 = 0x000001E7, + SOUND_01E8 = 0x000001E8, + SOUND_01E9 = 0x000001E9, + SOUND_01EA = 0x000001EA, + SOUND_01EB = 0x000001EB, + SOUND_01EC = 0x000001EC, + SOUND_01ED = 0x000001ED, + SOUND_PRA_UNFOLD_STEP = 0x000001EE, + SOUND_KPA_DROP_WALL = 0x000001EF, + SOUND_01F0 = 0x000001F0, + SOUND_01F1 = 0x000001F1, + SOUND_01F2 = 0x000001F2, + SOUND_01F3 = 0x000001F3, + SOUND_01F4 = 0x000001F4, + SOUND_01F5 = 0x000001F5, + SOUND_01F9 = 0x000001F9, + SOUND_01FA = 0x000001FA, + SOUND_SRAW_1A_A = 0x000001FB, + SOUND_SRAW_1A_B = 0x000001FC, + SOUND_01FD = 0x000001FD, + SOUND_01FE = 0x000001FE, + SOUND_TOYBOX_TRAIN_WHISTLE_A = 0x000001FF, + SOUND_0201 = 0x00000201, + SOUND_0202 = 0x00000202, + SOUND_0203 = 0x00000203, + SOUND_0204 = 0x00000204, + SOUND_0205 = 0x00000205, + SOUND_0206 = 0x00000206, + SOUND_LRAW_0207 = 0x00000207, + SOUND_0208 = 0x00000208, + SOUND_0209 = 0x00000209, + SOUND_020A = 0x0000020A, + SOUND_SRAW_14_A = 0x0000020C, + SOUND_SRAW_14_B = 0x0000020D, + SOUND_SRAW_14_C = 0x0000020E, SOUND_COIN_PICKUP = 0x00000211, SOUND_COIN_BOUNCE = 0x00000212, SOUND_HEART_PICKUP = 0x00000213, @@ -900,172 +900,179 @@ enum SoundIDs { SOUND_FLOWER_PICKUP = 0x00000217, SOUND_FLOWER_BOUNCE = 0x00000218, SOUND_STAR_PIECE_BOUNCE = 0x00000219, - SOUND_021A = 0x0000021A, - SOUND_021B = 0x0000021B, - SOUND_021C = 0x0000021C, + SOUND_ITEM_BOUNCE = 0x0000021A, + SOUND_BADGE_BOUNCE = 0x0000021B, + SOUND_APPROVE = 0x0000021C, SOUND_MENU_ERROR = 0x0000021D, - SOUND_LRAW_0221 = 0x00000221, - SOUND_0222 = 0x00000222, - SOUND_0223 = 0x00000223, - SOUND_0225 = 0x00000225, - SOUND_0226 = 0x00000226, - SOUND_0227 = 0x00000227, - SOUND_0228 = 0x00000228, - SOUND_0229 = 0x00000229, - SOUND_LRAW_022A = 0x0000022A, - SOUND_LRAW_022B = 0x0000022B, - SOUND_LRAW_022C = 0x0000022C, - SOUND_LRAW_022D = 0x0000022D, - SOUND_SRAW_1C_A = 0x0000022E, - SOUND_SRAW_1C_B = 0x0000022F, - SOUND_0230 = 0x00000230, - SOUND_0231 = 0x00000231, - SOUND_0233 = 0x00000233, - SOUND_0234 = 0x00000234, - SOUND_0235 = 0x00000235, - SOUND_0236 = 0x00000236, - SOUND_0237 = 0x00000237, - SOUND_0238 = 0x00000238, - SOUND_LRAW_023D = 0x0000023D, - SOUND_0241 = 0x00000241, - SOUND_0242 = 0x00000242, - SOUND_0244 = 0x00000244, - SOUND_0245 = 0x00000245, - SOUND_0246 = 0x00000246, - SOUND_0247 = 0x00000247, - SOUND_LRAW_0248 = 0x00000248, - SOUND_LRAW_0249 = 0x00000249, - SOUND_024A = 0x0000024A, - SOUND_024B = 0x0000024B, - SOUND_SRAW_15_A = 0x00000259, - SOUND_SRAW_15_B = 0x0000025A, - SOUND_SRAW_16_A = 0x0000025C, - SOUND_SRAW_16_B = 0x0000025D, - SOUND_0261 = 0x00000261, - SOUND_0262 = 0x00000262, - SOUND_0263 = 0x00000263, - SOUND_0265 = 0x00000265, - SOUND_0266 = 0x00000266, - SOUND_0267 = 0x00000267, - SOUND_0269 = 0x00000269, - SOUND_026A = 0x0000026A, - SOUND_026B = 0x0000026B, - SOUND_026C = 0x0000026C, - SOUND_LRAW_0271 = 0x00000271, - SOUND_LRAW_0273 = 0x00000273, - SOUND_LRAW_0274 = 0x00000274, - SOUND_LRAW_0275 = 0x00000275, - SOUND_LRAW_0276 = 0x00000276, - SOUND_0281 = 0x00000281, - SOUND_0282 = 0x00000282, - SOUND_0283 = 0x00000283, - SOUND_0284 = 0x00000284, - SOUND_0286 = 0x00000286, - SOUND_LRAW_0287 = 0x00000287, - SOUND_0288 = 0x00000288, - SOUND_0289 = 0x00000289, - SOUND_028A = 0x0000028A, - SOUND_028B = 0x0000028B, - SOUND_028C = 0x0000028C, - SOUND_028E = 0x0000028E, - SOUND_028F = 0x0000028F, - SOUND_0290 = 0x00000290, + SOUND_LRAW_KPA_CHAIN_DRIVE = 0x00000221, + SOUND_KPA_DUMP_LAVA = 0x00000222, + SOUND_0223 = 0x00000223, + SOUND_0225 = 0x00000225, + SOUND_0226 = 0x00000226, + SOUND_0227 = 0x00000227, + SOUND_0228 = 0x00000228, + SOUND_KPA_PULL_CHAIN = 0x00000229, + SOUND_LRAW_KPA_FILL_WATER = 0x0000022A, + SOUND_LRAW_KPA_DRAIN_WATER = 0x0000022B, // sounds like a flush + SOUND_LRAW_022C = 0x0000022C, + SOUND_LRAW_022D = 0x0000022D, + SOUND_SRAW_1C_A = 0x0000022E, + SOUND_SRAW_1C_B = 0x0000022F, + SOUND_0230 = 0x00000230, + SOUND_0231 = 0x00000231, + SOUND_0232 = 0x00000232, //unused? flute + SOUND_TIMING_BAR_TICK = 0x00000233, + SOUND_TIMING_BAR_GO = 0x00000234, + SOUND_JUMP_COMBO_1 = 0x00000235, + SOUND_JUMP_COMBO_2 = 0x00000236, + SOUND_JUMP_COMBO_3 = 0x00000237, + SOUND_JUMP_COMBO_4 = 0x00000238, + SOUND_JUMP_COMBO_5 = 0x00000239, // unused + SOUND_JUMP_COMBO_6 = 0x0000023A, // unused + SOUND_JUMP_COMBO_7 = 0x0000023B, // unused, rings a bit longer than the others + SOUND_JUMP_COMBO_8 = 0x0000023C, // unused + SOUND_LRAW_BOWSER_PROPELLER = 0x0000023D, + SOUND_BEGIN_WISH = 0x00000241, + SOUND_REFRESH = 0x00000242, + SOUND_CHILL_OUT = 0x00000244, + SOUND_SMOOCH = 0x00000245, + SOUND_TIME_OUT = 0x00000246, + SOUND_UP_AND_AWAY_CAST = 0x00000247, + SOUND_LRAW_0248 = 0x00000248, + SOUND_LRAW_0249 = 0x00000249, + SOUND_024A = 0x0000024A, + SOUND_024B = 0x0000024B, + SOUND_SRAW_15_A = 0x00000259, + SOUND_SRAW_15_B = 0x0000025A, + SOUND_SRAW_16_A = 0x0000025C, + SOUND_SRAW_16_B = 0x0000025D, + SOUND_0261 = 0x00000261, + SOUND_0262 = 0x00000262, + SOUND_0263 = 0x00000263, + SOUND_0265 = 0x00000265, + SOUND_0266 = 0x00000266, + SOUND_0267 = 0x00000267, + SOUND_0269 = 0x00000269, + SOUND_026A = 0x0000026A, + SOUND_026B = 0x0000026B, + SOUND_026C = 0x0000026C, + SOUND_LRAW_0271 = 0x00000271, + SOUND_LRAW_0273 = 0x00000273, + SOUND_LRAW_0274 = 0x00000274, + SOUND_LRAW_0275 = 0x00000275, + SOUND_LRAW_0276 = 0x00000276, + SOUND_0281 = 0x00000281, + SOUND_0282 = 0x00000282, + SOUND_0283 = 0x00000283, + SOUND_0284 = 0x00000284, + SOUND_0286 = 0x00000286, + SOUND_LRAW_0287 = 0x00000287, + SOUND_0288 = 0x00000288, + SOUND_0289 = 0x00000289, + SOUND_028A = 0x0000028A, + SOUND_028B = 0x0000028B, + SOUND_028C = 0x0000028C, + SOUND_028E = 0x0000028E, + SOUND_028F = 0x0000028F, + SOUND_0290 = 0x00000290, SOUND_BOW_SPOOK = 0x00000291, - SOUND_0292 = 0x00000292, - SOUND_0293 = 0x00000293, - SOUND_0294 = 0x00000294, - SOUND_LRAW_0295 = 0x00000295, - SOUND_0297 = 0x00000297, - SOUND_0298 = 0x00000298, - SOUND_0299 = 0x00000299, - SOUND_029A = 0x0000029A, - SOUND_029B = 0x0000029B, - SOUND_029C = 0x0000029C, - SOUND_029D = 0x0000029D, - SOUND_02A0 = 0x000002A0, - SOUND_02A1 = 0x000002A1, - SOUND_02A2 = 0x000002A2, - SOUND_02A3 = 0x000002A3, - SOUND_02A4 = 0x000002A4, - SOUND_SRAW_13_A = 0x000002A6, - SOUND_SRAW_13_B = 0x000002A7, - SOUND_LRAW_02A8 = 0x000002A8, - SOUND_02AA = 0x000002AA, - SOUND_UNUSED_2C1 = 0x000002C1, - SOUND_02C4 = 0x000002C4, - SOUND_02C5 = 0x000002C5, - SOUND_02C6 = 0x000002C6, - SOUND_02C7 = 0x000002C7, - SOUND_02C8 = 0x000002C8, + SOUND_BOOTLER_SPOOK = 0x00000292, + SOUND_0293 = 0x00000293, + SOUND_SUSHIE_DIVE = 0x00000294, + SOUND_FLIGHT = 0x00000295, + SOUND_SUSHIE_SQUIRT = 0x00000297, + SOUND_SUSHIE_FOUNTAIN = 0x00000298, + SOUND_DESTROY_WATER_BLOCK = 0x00000299, + SOUND_SUSHIE_STEP = 0x0000029A, + SOUND_TIDAL_WAVE_LEAP_A = 0x0000029B, + SOUND_TIDAL_WAVE_LEAP_B = 0x0000029C, + SOUND_TIDAL_WAVE_WATER = 0x0000029D, + SOUND_SUSHIE_FLOP = 0x000002A0, + SOUND_PLANT_FLOWERS = 0x000002A1, + SOUND_FLOWER_GATE = 0x000002A2, + SOUND_FLOWER_DOOR_SPINNING = 0x000002A3, + SOUND_FLOWER_DOOR_WAVES = 0x000002A4, + SOUND_RAVEN_LEAP_A = 0x000002A6, + SOUND_RAVEN_LEAP_B = 0x000002A7, + SOUND_LRAW_BOBOMB_FUSE = 0x000002A8, + SOUND_TWINK_FLY_B = 0x000002AA, + SOUND_PARAGOOMBA_DIVE = 0x000002C1, + SOUND_HURT_PLANT_BITE = 0x000002C4, + SOUND_LAKILESTER_SUMMON_SPINY = 0x000002C5, + SOUND_LAKILESTER_THROW_SPINY = 0x000002C6, + SOUND_SPINY_SPIN_UP = 0x000002C7, + SOUND_BULLET_BILL_FIRE = 0x000002C8, SOUND_BULLET_BILL_MOTION = 0x000002C9, - SOUND_02CA = 0x000002CA, - SOUND_02CB = 0x000002CB, + SOUND_DUPLIGHOST_STEP = 0x000002CA, + SOUND_DUPLIGHOST_LEAP = 0x000002CB, + SOUND_DUPLIGHOST_POWER_DOWN = 0x000002CC, // unused SOUND_SMOKE_BURST = 0x000002CD, - SOUND_02CE = 0x000002CE, - SOUND_02CF = 0x000002CF, - SOUND_02D1 = 0x000002D1, - SOUND_02D2 = 0x000002D2, - SOUND_02D3 = 0x000002D3, - SOUND_02D4 = 0x000002D4, + SOUND_POKEY_THROW = 0x000002CE, + SOUND_EMBER_JUMP = 0x000002CF, + SOUND_EMBER_DOUSE = 0x000002D0, // unused + SOUND_02D1 = 0x000002D1, + SOUND_02D2 = 0x000002D2, + SOUND_02D3 = 0x000002D3, + SOUND_02D4 = 0x000002D4, SOUND_DAYZEE_JUMP = 0x000002D5, - SOUND_02D6 = 0x000002D6, + SOUND_02D6 = 0x000002D6, SOUND_DAYZEE_SONG = 0x000002D7, SOUND_POWER_UP = 0x000002D8, - SOUND_02D9 = 0x000002D9, - SOUND_02DA = 0x000002DA, - SOUND_02DB = 0x000002DB, - SOUND_02DC = 0x000002DC, - SOUND_02DD = 0x000002DD, - SOUND_02DE = 0x000002DE, - SOUND_02DF = 0x000002DF, - SOUND_02E0 = 0x000002E0, - SOUND_02E1 = 0x000002E1, - SOUND_02E2 = 0x000002E2, - SOUND_02E3 = 0x000002E3, - SOUND_02E4 = 0x000002E4, - SOUND_02E5 = 0x000002E5, - SOUND_02E6 = 0x000002E6, - SOUND_02E7 = 0x000002E7, - SOUND_02E8 = 0x000002E8, - SOUND_02E9 = 0x000002E9, - SOUND_02EA = 0x000002EA, - SOUND_02EB = 0x000002EB, - SOUND_02EC = 0x000002EC, - SOUND_02ED = 0x000002ED, - SOUND_02EE = 0x000002EE, - SOUND_02EF = 0x000002EF, - SOUND_02F0 = 0x000002F0, - SOUND_SRAW_0E_A = 0x000002F1, - SOUND_SRAW_0E_B = 0x000002F2, - SOUND_02F3 = 0x000002F3, - SOUND_SRAW_0B_A = 0x000002F4, - SOUND_SRAW_0B_B = 0x000002F5, + SOUND_02D9 = 0x000002D9, + SOUND_02DA = 0x000002DA, + SOUND_02DB = 0x000002DB, + SOUND_02DC = 0x000002DC, + SOUND_02DD = 0x000002DD, + SOUND_02DE = 0x000002DE, + SOUND_02DF = 0x000002DF, + SOUND_02E0 = 0x000002E0, + SOUND_SKY_GUY_BALLOON_POP = 0x000002E1, + SOUND_GROOVE_GUY_TWIRL = 0x000002E2, + SOUND_GROOVE_GUY_LEAP = 0x000002E3, + SOUND_GROOVE_GUY_SPIN_DOWN = 0x000002E4, + SOUND_CALL_FOR_BACKUP = 0x000002E5, + SOUND_GROOVE_GUY_SUMMON = 0x000002E6, + SOUND_SLINGSHOT_DRAW = 0x000002E7, + SOUND_SLINGSHOT_FIRE = 0x000002E8, + SOUND_HAMMER_BROS_THROW = 0x000002E9, + SOUND_MONSTAR_CAST_SPELL = 0x000002EA, + SOUND_LANTERN_GHOST_LIGHT = 0x000002EB, + SOUND_POKEY_STEP = 0x000002EC, + SOUND_POKEY_SMASH = 0x000002ED, + SOUND_POKEY_REACH_DOWN = 0x000002EE, + SOUND_02EF = 0x000002EF, + SOUND_02F0 = 0x000002F0, + SOUND_SRAW_0E_A = 0x000002F1, + SOUND_SRAW_0E_B = 0x000002F2, + SOUND_02F3 = 0x000002F3, + SOUND_SRAW_0B_A = 0x000002F4, + SOUND_SRAW_0B_B = 0x000002F5, SOUND_TWEESTER_LAUNCH = 0x000002F6, - SOUND_02F7 = 0x000002F7, - SOUND_02F8 = 0x000002F8, - SOUND_02F9 = 0x000002F9, - SOUND_02FA = 0x000002FA, - SOUND_02FB = 0x000002FB, - SOUND_02FC = 0x000002FC, - SOUND_02FD = 0x000002FD, + SOUND_02F7 = 0x000002F7, + SOUND_02F8 = 0x000002F8, + SOUND_02F9 = 0x000002F9, + SOUND_02FA = 0x000002FA, + SOUND_02FB = 0x000002FB, + SOUND_02FC = 0x000002FC, + SOUND_02FD = 0x000002FD, SOUND_CLOSE_SHELL = 0x000002FF, - SOUND_0300 = 0x00000300, - SOUND_0301 = 0x00000301, - SOUND_0302 = 0x00000302, - SOUND_0303 = 0x00000303, - SOUND_0305 = 0x00000305, - SOUND_0306 = 0x00000306, - SOUND_0309 = 0x00000309, - SOUND_030A = 0x0000030A, - SOUND_030B = 0x0000030B, + SOUND_0300 = 0x00000300, + SOUND_0301 = 0x00000301, + SOUND_0302 = 0x00000302, + SOUND_0303 = 0x00000303, + SOUND_0305 = 0x00000305, + SOUND_0306 = 0x00000306, + SOUND_0309 = 0x00000309, + SOUND_030A = 0x0000030A, + SOUND_030B = 0x0000030B, SOUND_SHY_GUY_SCREAMS1 = 0x0000030C, SOUND_SHY_GUY_SCREAMS2 = 0x0000030D, SOUND_SHY_GUY_SCREAMS3 = 0x0000030E, SOUND_TOY_TANK_MOVE1 = 0x0000030F, SOUND_TOY_TANK_MOVE2 = 0x00000310, - SOUND_0311 = 0x00000311, - SOUND_0312 = 0x00000312, - SOUND_0315 = 0x00000315, + SOUND_0311 = 0x00000311, + SOUND_0312 = 0x00000312, + SOUND_0315 = 0x00000315, SOUND_SRAW_FIRE_BAR_0_B = 0x00000316, SOUND_SRAW_FIRE_BAR_1_B = 0x00000317, SOUND_SRAW_FIRE_BAR_2_B = 0x00000318, @@ -1079,18 +1086,18 @@ enum SoundIDs { SOUND_BURROW_SURFACE = 0x00000321, SOUND_BURROW_DIG = 0x00000322, SOUND_MOLE_POP = 0x00000323, - SOUND_0327 = 0x00000327, - SOUND_0328 = 0x00000328, - SOUND_032B = 0x0000032B, - SOUND_032C = 0x0000032C, - SOUND_LRAW_032E = 0x0000032E, - SOUND_SRAW_0C_A = 0x0000032F, - SOUND_SRAW_0C_B = 0x00000330, - SOUND_SRAW_17_A = 0x00000331, - SOUND_SRAW_17_B = 0x00000332, - SOUND_SRAW_17_C = 0x00000333, - SOUND_SRAW_0D_A = 0x00000334, - SOUND_SRAW_0D_B = 0x00000335, + SOUND_0327 = 0x00000327, + SOUND_0328 = 0x00000328, + SOUND_032B = 0x0000032B, + SOUND_032C = 0x0000032C, + SOUND_LRAW_032E = 0x0000032E, + SOUND_SRAW_0C_A = 0x0000032F, + SOUND_SRAW_0C_B = 0x00000330, + SOUND_SRAW_17_A = 0x00000331, + SOUND_SRAW_17_B = 0x00000332, + SOUND_SRAW_17_C = 0x00000333, + SOUND_SRAW_0D_A = 0x00000334, + SOUND_SRAW_0D_B = 0x00000335, SOUND_SRAW_FIRE_BAR_0_A = 0x00000336, SOUND_SRAW_FIRE_BAR_1_A = 0x00000337, SOUND_SRAW_FIRE_BAR_2_A = 0x00000338, @@ -1103,144 +1110,144 @@ enum SoundIDs { SOUND_SRAW_FIRE_BAR_9_A = 0x0000033F, SOUND_SRAW_FIRE_BAR_DEAD = 0x00000340, SOUND_LRAW_CHARGE_BAR = 0x00000341, - SOUND_0342 = 0x00000342, + SOUND_POKEY_SWAY = 0x00000342, // same as SOUND_POKEY_LEAN_BACK? SOUND_POKEY_WALK = 0x00000343, - SOUND_POKEY_LEAN_BACK = 0x00000344, - SOUND_POKEY_LEAN_FORWARD = 0x00000345, + SOUND_POKEY_LEAN_FORWARD = 0x00000344, + SOUND_POKEY_LEAN_BACK = 0x00000345, SOUND_POKEY_EMERGE_FROM_GROUND = 0x00000346, SOUND_LRAW_CHEERING = 0x00000349, - SOUND_034A = 0x0000034A, - SOUND_034E = 0x0000034E, + SOUND_034A = 0x0000034A, + SOUND_034E = 0x0000034E, SOUND_ACTOR_FLIGHT = 0x00000351, - SOUND_0353 = 0x00000353, - SOUND_0354 = 0x00000354, - SOUND_0355 = 0x00000355, - SOUND_0356 = 0x00000356, - SOUND_0357 = 0x00000357, - SOUND_0358 = 0x00000358, - SOUND_0359 = 0x00000359, - SOUND_035B = 0x0000035B, - SOUND_035C = 0x0000035C, - SOUND_035D = 0x0000035D, - SOUND_035E = 0x0000035E, - SOUND_035F = 0x0000035F, - SOUND_0361 = 0x00000361, - SOUND_0362 = 0x00000362, - SOUND_0363 = 0x00000363, - SOUND_0364 = 0x00000364, - SOUND_0365 = 0x00000365, - SOUND_0366 = 0x00000366, - SOUND_0367 = 0x00000367, - SOUND_0368 = 0x00000368, - SOUND_0369 = 0x00000369, - SOUND_036B = 0x0000036B, - SOUND_LRAW_036C = 0x0000036C, - SOUND_LRAW_036D = 0x0000036D, - SOUND_036E = 0x0000036E, - SOUND_036F = 0x0000036F, - SOUND_0370 = 0x00000370, - SOUND_0371 = 0x00000371, - SOUND_0372 = 0x00000372, - SOUND_0373 = 0x00000373, - SOUND_0374 = 0x00000374, - SOUND_0375 = 0x00000375, - SOUND_0376 = 0x00000376, - SOUND_0377 = 0x00000377, - SOUND_0378 = 0x00000378, - SOUND_0379 = 0x00000379, + SOUND_0353 = 0x00000353, + SOUND_0354 = 0x00000354, + SOUND_0355 = 0x00000355, + SOUND_0356 = 0x00000356, + SOUND_0357 = 0x00000357, + SOUND_0358 = 0x00000358, + SOUND_EMBER_FLY = 0x00000359, // loops + SOUND_035B = 0x0000035B, + SOUND_CHARGE_LIGHTNING = 0x0000035C, + SOUND_035D = 0x0000035D, + SOUND_035E = 0x0000035E, + SOUND_035F = 0x0000035F, + SOUND_0361 = 0x00000361, + SOUND_0362 = 0x00000362, + SOUND_0363 = 0x00000363, + SOUND_0364 = 0x00000364, + SOUND_0365 = 0x00000365, + SOUND_0366 = 0x00000366, + SOUND_0367 = 0x00000367, + SOUND_0368 = 0x00000368, + SOUND_0369 = 0x00000369, + SOUND_036B = 0x0000036B, + SOUND_LRAW_036C = 0x0000036C, + SOUND_LRAW_036D = 0x0000036D, + SOUND_036E = 0x0000036E, + SOUND_036F = 0x0000036F, + SOUND_0370 = 0x00000370, + SOUND_0371 = 0x00000371, + SOUND_0372 = 0x00000372, + SOUND_0373 = 0x00000373, + SOUND_0374 = 0x00000374, + SOUND_0375 = 0x00000375, + SOUND_0376 = 0x00000376, + SOUND_0377 = 0x00000377, + SOUND_0378 = 0x00000378, + SOUND_0379 = 0x00000379, SOUND_HIT_PLAYER_SHOCK = 0x0000037A, SOUND_HIT_SHOCK = 0x0000037B, - SOUND_037C = 0x0000037C, - SOUND_037D = 0x0000037D, - SOUND_037E = 0x0000037E, + SOUND_037C = 0x0000037C, + SOUND_037D = 0x0000037D, + SOUND_037E = 0x0000037E, SOUND_SHYGUY_FLY = 0x00000380, - SOUND_0381 = 0x00000381, - SOUND_0382 = 0x00000382, - SOUND_0383 = 0x00000383, - SOUND_0384 = 0x00000384, - SOUND_0385 = 0x00000385, - SOUND_0386 = 0x00000386, - SOUND_0387 = 0x00000387, - SOUND_LRAW_0388 = 0x00000388, - SOUND_0389 = 0x00000389, - SOUND_038A = 0x0000038A, - SOUND_038B = 0x0000038B, - SOUND_038C = 0x0000038C, - SOUND_038D = 0x0000038D, - SOUND_038E = 0x0000038E, - SOUND_0390 = 0x00000390, - SOUND_LRAW_0391 = 0x00000391, - SOUND_0392 = 0x00000392, - SOUND_0393 = 0x00000393, - SOUND_0394 = 0x00000394, + SOUND_0381 = 0x00000381, + SOUND_0382 = 0x00000382, + SOUND_0383 = 0x00000383, + SOUND_0384 = 0x00000384, + SOUND_0385 = 0x00000385, + SOUND_0386 = 0x00000386, + SOUND_0387 = 0x00000387, + SOUND_LRAW_0388 = 0x00000388, + SOUND_0389 = 0x00000389, + SOUND_038A = 0x0000038A, + SOUND_038B = 0x0000038B, + SOUND_038C = 0x0000038C, + SOUND_038D = 0x0000038D, + SOUND_038E = 0x0000038E, + SOUND_0390 = 0x00000390, + SOUND_LRAW_0391 = 0x00000391, + SOUND_0392 = 0x00000392, + SOUND_0393 = 0x00000393, + SOUND_0394 = 0x00000394, SOUND_GENERAL_WHISTLE = 0x00000395, - SOUND_0396 = 0x00000396, - SOUND_0397 = 0x00000397, - SOUND_0398 = 0x00000398, - SOUND_0399 = 0x00000399, - SOUND_039A = 0x0000039A, - SOUND_039B = 0x0000039B, - SOUND_039C = 0x0000039C, - SOUND_039D = 0x0000039D, - SOUND_LRAW_039E = 0x0000039E, - SOUND_039F = 0x0000039F, - SOUND_03A0 = 0x000003A0, - SOUND_03A2 = 0x000003A2, - SOUND_03A3 = 0x000003A3, - SOUND_03A4 = 0x000003A4, - SOUND_03A5 = 0x000003A5, - SOUND_03A6 = 0x000003A6, - SOUND_03A7 = 0x000003A7, - SOUND_03A8 = 0x000003A8, - SOUND_03A9 = 0x000003A9, - SOUND_03AA = 0x000003AA, - SOUND_03AB = 0x000003AB, - SOUND_03AC = 0x000003AC, - SOUND_LRAW_03AD = 0x000003AD, - SOUND_03AE = 0x000003AE, - SOUND_03AF = 0x000003AF, - SOUND_03B0 = 0x000003B0, - SOUND_03B1 = 0x000003B1, - SOUND_03B2 = 0x000003B2, - SOUND_03B3 = 0x000003B3, + SOUND_0396 = 0x00000396, + SOUND_0397 = 0x00000397, + SOUND_0398 = 0x00000398, + SOUND_0399 = 0x00000399, + SOUND_039A = 0x0000039A, + SOUND_039B = 0x0000039B, + SOUND_039C = 0x0000039C, + SOUND_039D = 0x0000039D, + SOUND_LRAW_039E = 0x0000039E, + SOUND_039F = 0x0000039F, + SOUND_03A0 = 0x000003A0, + SOUND_03A2 = 0x000003A2, + SOUND_03A3 = 0x000003A3, + SOUND_03A4 = 0x000003A4, + SOUND_03A5 = 0x000003A5, + SOUND_03A6 = 0x000003A6, + SOUND_03A7 = 0x000003A7, + SOUND_03A8 = 0x000003A8, + SOUND_03A9 = 0x000003A9, + SOUND_03AA = 0x000003AA, + SOUND_03AB = 0x000003AB, + SOUND_03AC = 0x000003AC, + SOUND_LRAW_03AD = 0x000003AD, + SOUND_03AE = 0x000003AE, + SOUND_03AF = 0x000003AF, + SOUND_03B0 = 0x000003B0, + SOUND_03B1 = 0x000003B1, + SOUND_03B2 = 0x000003B2, + SOUND_03B3 = 0x000003B3, SOUND_ACTOR_STEP_B = 0x000003B4, SOUND_FAKE_BOWSER_BLAST = 0x000003B5, // large blasting sound when the fake bowser robot is destroyed - SOUND_SRAW_21_A = 0x000003B6, - SOUND_SRAW_21_B = 0x000003B7, - SOUND_03B9 = 0x000003B9, - SOUND_03BB = 0x000003BB, - SOUND_LRAW_03BC = 0x000003BC, - SOUND_03BD = 0x000003BD, - SOUND_03BE = 0x000003BE, - SOUND_03C0 = 0x000003C0, - SOUND_03C1 = 0x000003C1, - SOUND_03C3 = 0x000003C3, - SOUND_03C4 = 0x000003C4, - SOUND_03C5 = 0x000003C5, - SOUND_03C6 = 0x000003C6, - SOUND_03C7 = 0x000003C7, - SOUND_03C8 = 0x000003C8, - SOUND_03C9 = 0x000003C9, - SOUND_03CA = 0x000003CA, - SOUND_03CB = 0x000003CB, - SOUND_03CC = 0x000003CC, - SOUND_03CD = 0x000003CD, - SOUND_03CE = 0x000003CE, - SOUND_03CF = 0x000003CF, - SOUND_03D0 = 0x000003D0, - SOUND_03D1 = 0x000003D1, - SOUND_03D2 = 0x000003D2, - SOUND_03D3 = 0x000003D3, + SOUND_SRAW_21_A = 0x000003B6, + SOUND_SRAW_21_B = 0x000003B7, + SOUND_03B9 = 0x000003B9, + SOUND_03BB = 0x000003BB, + SOUND_LRAW_03BC = 0x000003BC, + SOUND_03BD = 0x000003BD, + SOUND_03BE = 0x000003BE, + SOUND_03C0 = 0x000003C0, + SOUND_03C1 = 0x000003C1, + SOUND_03C3 = 0x000003C3, + SOUND_03C4 = 0x000003C4, + SOUND_03C5 = 0x000003C5, + SOUND_03C6 = 0x000003C6, + SOUND_03C7 = 0x000003C7, + SOUND_03C8 = 0x000003C8, + SOUND_03C9 = 0x000003C9, + SOUND_03CA = 0x000003CA, + SOUND_03CB = 0x000003CB, + SOUND_03CC = 0x000003CC, + SOUND_03CD = 0x000003CD, + SOUND_03CE = 0x000003CE, + SOUND_03CF = 0x000003CF, + SOUND_03D0 = 0x000003D0, + SOUND_03D1 = 0x000003D1, + SOUND_03D2 = 0x000003D2, + SOUND_03D3 = 0x000003D3, SOUND_OPEN_SHELL = 0x000003D4, - SOUND_03D5 = 0x000003D5, - SOUND_03D6 = 0x000003D6, - SOUND_03D9 = 0x000003D9, - SOUND_03DB = 0x000003DB, - SOUND_03DC = 0x000003DC, - SOUND_03DD = 0x000003DD, - SOUND_03DE = 0x000003DE, - SOUND_03E0 = 0x000003E0, - SOUND_03E1 = 0x000003E1, + SOUND_03D5 = 0x000003D5, + SOUND_03D6 = 0x000003D6, + SOUND_03D9 = 0x000003D9, + SOUND_03DB = 0x000003DB, + SOUND_03DC = 0x000003DC, + SOUND_03DD = 0x000003DD, + SOUND_03DE = 0x000003DE, + SOUND_03E0 = 0x000003E0, + SOUND_03E1 = 0x000003E1, SOUND_ACTOR_JUMP = 0x000003E2, SOUND_ACTOR_TRIP = 0x000003E3, SOUND_ACTOR_TWITCH = 0x000003E4, @@ -1248,31 +1255,31 @@ enum SoundIDs { SOUND_BIG_POWER_UP = 0x000003E6, SOUND_LARGE_ACTOR_JUMP = 0x000003E7, SOUND_MOLE_THROW = 0x000003E8, - SOUND_03E9 = 0x000003E9, - SOUND_03EA = 0x000003EA, - SOUND_03EB = 0x000003EB, - SOUND_03EC = 0x000003EC, - SOUND_03ED = 0x000003ED, - SOUND_03EE = 0x000003EE, - SOUND_03EF = 0x000003EF, + SOUND_03E9 = 0x000003E9, + SOUND_03EA = 0x000003EA, + SOUND_03EB = 0x000003EB, + SOUND_03EC = 0x000003EC, + SOUND_03ED = 0x000003ED, + SOUND_03EE = 0x000003EE, + SOUND_03EF = 0x000003EF, SOUND_DANGER = 0x000003F1, SOUND_PERIL = 0x000003F2, - SOUND_03F3 = 0x000003F3, - SOUND_03F4 = 0x000003F4, - SOUND_03F6 = 0x000003F6, - SOUND_03F9 = 0x000003F9, + SOUND_03F3 = 0x000003F3, + SOUND_03F4 = 0x000003F4, + SOUND_03F6 = 0x000003F6, + SOUND_03F9 = 0x000003F9, SOUND_THROW = 0x000003FA, - SOUND_03FB = 0x000003FB, - SOUND_03FC = 0x000003FC, - SOUND_2003 = 0x00002003, - SOUND_2004 = 0x00002004, - SOUND_2005 = 0x00002005, - SOUND_2006 = 0x00002006, - SOUND_2009 = 0x00002009, - SOUND_200A = 0x0000200A, - SOUND_200B = 0x0000200B, - SOUND_200C = 0x0000200C, - SOUND_200D = 0x0000200D, + SOUND_03FB = 0x000003FB, + SOUND_03FC = 0x000003FC, + SOUND_2003 = 0x00002003, + SOUND_2004 = 0x00002004, + SOUND_2005 = 0x00002005, + SOUND_2006 = 0x00002006, + SOUND_2009 = 0x00002009, + SOUND_200A = 0x0000200A, + SOUND_200B = 0x0000200B, + SOUND_200C = 0x0000200C, + SOUND_200D = 0x0000200D, SOUND_BOW_VANISH = 0x0000200E, SOUND_BOW_APPEAR = 0x0000200F, SOUND_EGG_MISSILE_BLAST = 0x00002010, @@ -1284,205 +1291,206 @@ enum SoundIDs { SOUND_BOMBETTE_BLAST_LV1 = 0x00002016, SOUND_BOMBETTE_BLAST_LV2 = 0x00002017, SOUND_BOMBETTE_BLAST_LV3 = 0x00002018, - SOUND_2019 = 0x00002019, - SOUND_201A = 0x0000201A, - SOUND_201B = 0x0000201B, - SOUND_201C = 0x0000201C, - SOUND_201D = 0x0000201D, - SOUND_201E = 0x0000201E, - SOUND_201F = 0x0000201F, - SOUND_2020 = 0x00002020, - SOUND_2021 = 0x00002021, - SOUND_2022 = 0x00002022, - SOUND_2023 = 0x00002023, - SOUND_2024 = 0x00002024, - SOUND_2026 = 0x00002026, - SOUND_SRAW_1D_A = 0x0000202A, - SOUND_SRAW_1D_B = 0x0000202B, - SOUND_202C = 0x0000202C, - SOUND_202D = 0x0000202D, - SOUND_202E = 0x0000202E, - SOUND_202F = 0x0000202F, - SOUND_2030 = 0x00002030, + SOUND_2019 = 0x00002019, + SOUND_201A = 0x0000201A, + SOUND_201B = 0x0000201B, + SOUND_201C = 0x0000201C, + SOUND_201D = 0x0000201D, + SOUND_201E = 0x0000201E, + SOUND_201F = 0x0000201F, + SOUND_2020 = 0x00002020, + SOUND_2021 = 0x00002021, + SOUND_2022 = 0x00002022, + SOUND_2023 = 0x00002023, + SOUND_2024 = 0x00002024, + SOUND_DIZZY_SHELL = 0x00002026, + SOUND_SRAW_1D_A = 0x0000202A, + SOUND_SRAW_1D_B = 0x0000202B, + SOUND_FIRE_FLOWER_A = 0x0000202C, + SOUND_FIRE_FLOWER_B = 0x0000202D, + SOUND_SNOWMAN_DOLL_JUMP = 0x0000202E, + SOUND_202F = 0x0000202F, // unused + SOUND_POW_BLOCK = 0x00002030, SOUND_INFLICT_SLEEP = 0x00002031, - SOUND_INFLICT_STATUS = 0x00002032, //< Stop poison paralyze, - SOUND_2033 = 0x00002033, - SOUND_2034 = 0x00002034, - SOUND_2035 = 0x00002035, - SOUND_2036 = 0x00002036, - SOUND_2037 = 0x00002037, - SOUND_2038 = 0x00002038, - SOUND_2039 = 0x00002039, - SOUND_SRAW_1B_A = 0x0000203A, - SOUND_SRAW_1B_B = 0x0000203B, - SOUND_203C = 0x0000203C, - SOUND_203D = 0x0000203D, - SOUND_203E = 0x0000203E, - SOUND_203F = 0x0000203F, - SOUND_LRAW_2040 = 0x00002040, - SOUND_SRAW_1E_A = 0x00002041, - SOUND_SRAW_1E_B = 0x00002042, - SOUND_SRAW_1F_A = 0x00002043, - SOUND_SRAW_1F_B = 0x00002044, - SOUND_2045 = 0x00002045, - SOUND_2046 = 0x00002046, - SOUND_2047 = 0x00002047, - SOUND_2049 = 0x00002049, - SOUND_204A = 0x0000204A, - SOUND_204B = 0x0000204B, - SOUND_204D = 0x0000204D, - SOUND_2051 = 0x00002051, - SOUND_2052 = 0x00002052, - SOUND_2053 = 0x00002053, - SOUND_2055 = 0x00002055, + SOUND_INFLICT_STATUS = 0x00002032, + SOUND_DIZZY_DIAL = 0x00002033, + SOUND_SUSHIE_BELLY_FLOP = 0x00002034, + SOUND_CREATE_WATER_BLOCK = 0x00002035, + SOUND_WHALE_OPEN_MOUTH = 0x00002036, + SOUND_WHALE_CLOSE_MOUTH = 0x00002037, + SOUND_SNORE_INHALE = 0x00002038, + SOUND_SNORE_EXHALE = 0x00002039, + SOUND_SRAW_1B_A = 0x0000203A, + SOUND_SRAW_1B_B = 0x0000203B, + SOUND_203C = 0x0000203C, + SOUND_203D = 0x0000203D, + SOUND_203E = 0x0000203E, + SOUND_203F = 0x0000203F, + SOUND_KPA_FLIP_BRIDGE_PANEL = 0x00002040, + SOUND_SRAW_1E_A = 0x00002041, + SOUND_SRAW_1E_B = 0x00002042, + SOUND_SRAW_1F_A = 0x00002043, + SOUND_SRAW_1F_B = 0x00002044, + SOUND_STAR_SPIRIT_DEPART_1 = 0x00002045, + SOUND_STAR_SPIRIT_DEPART_2 = 0x00002046, + SOUND_STAR_SPIRIT_DEPART_3 = 0x00002047, + SOUND_2049 = 0x00002049, + SOUND_OPEN_MAGIC_CHEST = 0x0000204A, + SOUND_CLOSE_MAGIC_CHEST = 0x0000204B, + SOUND_204C = 0x0000204C, // unused + SOUND_FLO_MOVE_PILLAR = 0x0000204D, + SOUND_WISH_ASCENDING = 0x00002051, + SOUND_UP_AND_AWAY_SEND_AWAY = 0x00002052, + SOUND_STAR_POWER_RECOVERY = 0x00002053, + SOUND_START_RECOVERY = 0x00002055, SOUND_RECOVER = 0x00002056, - SOUND_2059 = 0x00002059, - SOUND_205A = 0x0000205A, - SOUND_205B = 0x0000205B, - SOUND_205C = 0x0000205C, - SOUND_205D = 0x0000205D, - SOUND_205E = 0x0000205E, - SOUND_205F = 0x0000205F, - SOUND_2060 = 0x00002060, - SOUND_2061 = 0x00002061, - SOUND_2062 = 0x00002062, - SOUND_2063 = 0x00002063, - SOUND_2064 = 0x00002064, - SOUND_2065 = 0x00002065, - SOUND_2066 = 0x00002066, - SOUND_2067 = 0x00002067, - SOUND_2069 = 0x00002069, - SOUND_206A = 0x0000206A, - SOUND_206B = 0x0000206B, - SOUND_206D = 0x0000206D, - SOUND_206E = 0x0000206E, - SOUND_206F = 0x0000206F, - SOUND_2070 = 0x00002070, - SOUND_2071 = 0x00002071, - SOUND_2072 = 0x00002072, - SOUND_2073 = 0x00002073, - SOUND_2074 = 0x00002074, - SOUND_2075 = 0x00002075, + SOUND_FLOWERS_LIGHT_GIGGLE = 0x00002059, + SOUND_FLOWERS_SAD_GIGGLE = 0x0000205A, + SOUND_FLOWERS_LAUGH = 0x0000205B, + SOUND_FLOWERS_WITHER = 0x0000205C, + SOUND_FLOWERS_GROW = 0x0000205D, + SOUND_ROCK_LAUGHTER = 0x0000205E, + SOUND_TREE_LAUGHTER = 0x0000205F, + SOUND_IMPISH_LAUGH = 0x00002060, + SOUND_CHAIN_CHOMP_BITE = 0x00002061, + SOUND_CHAIN_CHOMP_THUD = 0x00002062, + SOUND_CHAIN_RATTLE = 0x00002063, + SOUND_2064 = 0x00002064, + SOUND_2065 = 0x00002065, + SOUND_2066 = 0x00002066, + SOUND_2067 = 0x00002067, + SOUND_2069 = 0x00002069, + SOUND_206A = 0x0000206A, + SOUND_206B = 0x0000206B, + SOUND_206D = 0x0000206D, + SOUND_206E = 0x0000206E, + SOUND_206F = 0x0000206F, + SOUND_2070 = 0x00002070, + SOUND_UP_AND_AWAY_CAPTURE = 0x00002071, + SOUND_2072 = 0x00002072, + SOUND_2073 = 0x00002073, + SOUND_2074 = 0x00002074, + SOUND_2075 = 0x00002075, SOUND_BOMB_BLAST = 0x00002076, - SOUND_SRAW_20_A = 0x00002078, - SOUND_SRAW_20_B = 0x00002079, - SOUND_207A = 0x0000207A, - SOUND_207B = 0x0000207B, - SOUND_207C = 0x0000207C, - SOUND_207D = 0x0000207D, - SOUND_207E = 0x0000207E, - SOUND_207F = 0x0000207F, + SOUND_SRAW_20_A = 0x00002078, + SOUND_SRAW_20_B = 0x00002079, + SOUND_207A = 0x0000207A, + SOUND_207B = 0x0000207B, + SOUND_207C = 0x0000207C, + SOUND_207D = 0x0000207D, + SOUND_207E = 0x0000207E, + SOUND_207F = 0x0000207F, SOUND_JUMP_2081 = 0x00002081, SOUND_JUMP_8BIT_MARIO = 0x00002082, - SOUND_2085 = 0x00002085, - SOUND_2086 = 0x00002086, - SOUND_2087 = 0x00002087, - SOUND_2088 = 0x00002088, - SOUND_2089 = 0x00002089, - SOUND_208A = 0x0000208A, - SOUND_208B = 0x0000208B, - SOUND_208C = 0x0000208C, - SOUND_208D = 0x0000208D, - SOUND_208E = 0x0000208E, - SOUND_208F = 0x0000208F, - SOUND_2091 = 0x00002091, - SOUND_2092 = 0x00002092, - SOUND_2093 = 0x00002093, - SOUND_2094 = 0x00002094, - SOUND_2095 = 0x00002095, - SOUND_2096 = 0x00002096, - SOUND_2097 = 0x00002097, - SOUND_2098 = 0x00002098, - SOUND_2099 = 0x00002099, - SOUND_209A = 0x0000209A, - SOUND_209B = 0x0000209B, - SOUND_209D = 0x0000209D, - SOUND_209E = 0x0000209E, - SOUND_209F = 0x0000209F, - SOUND_20A0 = 0x000020A0, - SOUND_20A1 = 0x000020A1, - SOUND_20A2 = 0x000020A2, - SOUND_20A3 = 0x000020A3, - SOUND_20A4 = 0x000020A4, - SOUND_20A5 = 0x000020A5, - SOUND_20A6 = 0x000020A6, - SOUND_20A7 = 0x000020A7, - SOUND_20A8 = 0x000020A8, - SOUND_20AB = 0x000020AB, - SOUND_20AC = 0x000020AC, - SOUND_20AD = 0x000020AD, - SOUND_20AE = 0x000020AE, - SOUND_20B1 = 0x000020B1, - SOUND_20B2 = 0x000020B2, - SOUND_20B3 = 0x000020B3, - SOUND_20B4 = 0x000020B4, - SOUND_20B6 = 0x000020B6, - SOUND_20B7 = 0x000020B7, - SOUND_20B8 = 0x000020B8, - SOUND_20B9 = 0x000020B9, + SOUND_STAR_BOX_LAUNCHER = 0x00002085, + SOUND_SPRING = 0x00002086, + SOUND_ZIPLINE_FINISH = 0x00002087, + SOUND_PUSH_BLOCK = 0x00002088, + SOUND_PULL_VINE = 0x00002089, + SOUND_FLOOR_SWITCH_DEPRESS = 0x0000208A, + SOUND_FLOOR_SWITCH_ACTIVATE = 0x0000208B, + SOUND_NO_DAMGE = 0x0000208C, + SOUND_USE_ITEM = 0x0000208D, + SOUND_GROW = 0x0000208E, + SOUND_CHARGE_UP = 0x0000208F, + SOUND_OPEN_TRAPDOOR = 0x00002091, + SOUND_BREAK_FLOOR = 0x00002092, + SOUND_SPIKES_EXTEND = 0x00002093, + SOUND_JUMP_SCARE = 0x00002094, + SOUND_EAT_OR_DRINK = 0x00002095, + SOUND_SPIT_OUT = 0x00002096, + SOUND_GLASS_SHATTER = 0x00002097, + SOUND_VANISH_IN_SMOKE = 0x00002098, + SOUND_HEART_PLANT = 0x00002099, + SOUND_HURT_PLANT_SHRIEK = 0x0000209A, + SOUND_209B = 0x0000209B, + SOUND_209D = 0x0000209D, + SOUND_209E = 0x0000209E, + SOUND_209F = 0x0000209F, + SOUND_20A0 = 0x000020A0, + SOUND_20A1 = 0x000020A1, + SOUND_20A2 = 0x000020A2, + SOUND_20A3 = 0x000020A3, + SOUND_20A4 = 0x000020A4, + SOUND_20A5 = 0x000020A5, + SOUND_20A6 = 0x000020A6, + SOUND_20A7 = 0x000020A7, + SOUND_20A8 = 0x000020A8, + SOUND_20AB = 0x000020AB, + SOUND_20AC = 0x000020AC, + SOUND_20AD = 0x000020AD, + SOUND_20AE = 0x000020AE, + SOUND_20B1 = 0x000020B1, + SOUND_20B2 = 0x000020B2, + SOUND_20B3 = 0x000020B3, + SOUND_20B4 = 0x000020B4, + SOUND_20B6 = 0x000020B6, + SOUND_20B7 = 0x000020B7, + SOUND_20B8 = 0x000020B8, + SOUND_20B9 = 0x000020B9, SOUND_ACTOR_STEP_A = 0x000020BA, - SOUND_20BB = 0x000020BB, - SOUND_20BC = 0x000020BC, - SOUND_20BD = 0x000020BD, - SOUND_20BE = 0x000020BE, - SOUND_20BF = 0x000020BF, - SOUND_20C1 = 0x000020C1, - SOUND_20C2 = 0x000020C2, - SOUND_20C3 = 0x000020C3, - SOUND_20C4 = 0x000020C4, - SOUND_20C5 = 0x000020C5, - SOUND_20C6 = 0x000020C6, + SOUND_20BB = 0x000020BB, + SOUND_20BC = 0x000020BC, + SOUND_20BD = 0x000020BD, + SOUND_20BE = 0x000020BE, + SOUND_20BF = 0x000020BF, + SOUND_20C1 = 0x000020C1, + SOUND_20C2 = 0x000020C2, + SOUND_20C3 = 0x000020C3, + SOUND_20C4 = 0x000020C4, + SOUND_20C5 = 0x000020C5, + SOUND_20C6 = 0x000020C6, SOUND_TUBBA_HEART_JUMP = 0x000020C8, - SOUND_20C9 = 0x000020C9, - SOUND_20CA = 0x000020CA, - SOUND_20CB = 0x000020CB, - SOUND_20CC = 0x000020CC, - SOUND_20CD = 0x000020CD, - SOUND_20CE = 0x000020CE, - SOUND_20CF = 0x000020CF, - SOUND_20D0 = 0x000020D0, - SOUND_20D1 = 0x000020D1, - SOUND_20D2 = 0x000020D2, - SOUND_20D3 = 0x000020D3, + SOUND_20C9 = 0x000020C9, + SOUND_20CA = 0x000020CA, + SOUND_20CB = 0x000020CB, + SOUND_20CC = 0x000020CC, + SOUND_20CD = 0x000020CD, + SOUND_20CE = 0x000020CE, + SOUND_20CF = 0x000020CF, + SOUND_20D0 = 0x000020D0, + SOUND_20D1 = 0x000020D1, + SOUND_20D2 = 0x000020D2, + SOUND_20D3 = 0x000020D3, SOUND_SPELL_CAST1 = 0x000020D4, SOUND_SPELL_CAST2 = 0x000020D5, SOUND_SPELL_CAST3 = 0x000020D6, SOUND_SPELL_CAST4 = 0x000020D7, SOUND_SPELL_CAST5 = 0x000020D8, // unused SOUND_FUZZIPEDE_MOTION = 0x000020D9, - SOUND_20DA = 0x000020DA, - SOUND_20DB = 0x000020DB, - SOUND_20DC = 0x000020DC, + SOUND_20DA = 0x000020DA, + SOUND_20DB = 0x000020DB, + SOUND_20DC = 0x000020DC, SOUND_GOOMBA_STEP = 0x000020DD, - SOUND_20DE = 0x000020DE, + SOUND_20DE = 0x000020DE, SOUND_PARAGOOMBA_FLY = 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, - SOUND_20EF = 0x000020EF, - SOUND_20F0 = 0x000020F0, - SOUND_20F1 = 0x000020F1, - SOUND_20F2 = 0x000020F2, - SOUND_20F3 = 0x000020F3, - SOUND_20F4 = 0x000020F4, - SOUND_20F5 = 0x000020F5, - SOUND_20F6 = 0x000020F6, - SOUND_20F7 = 0x000020F7, - SOUND_20F9 = 0x000020F9, - SOUND_20FB = 0x000020FB, - SOUND_20FC = 0x000020FC, + SOUND_PARAGOOMBA_PREDIVE = 0x000020E0, + SOUND_20E1 = 0x000020E1, + SOUND_20E2 = 0x000020E2, + SOUND_20E3 = 0x000020E3, + SOUND_20E4 = 0x000020E4, + SOUND_20E5 = 0x000020E5, + SOUND_20E6 = 0x000020E6, + SOUND_LEVITATE = 0x000020E7, + SOUND_ILLUSION_DISSOLVE = 0x000020E8, + SOUND_20E9 = 0x000020E9, + SOUND_20EA = 0x000020EA, + SOUND_20EB = 0x000020EB, + SOUND_20EC = 0x000020EC, + SOUND_20ED = 0x000020ED, + SOUND_20EE = 0x000020EE, + SOUND_20EF = 0x000020EF, + SOUND_20F0 = 0x000020F0, + SOUND_20F1 = 0x000020F1, + SOUND_20F2 = 0x000020F2, + SOUND_20F3 = 0x000020F3, + SOUND_20F4 = 0x000020F4, + SOUND_20F5 = 0x000020F5, + SOUND_20F6 = 0x000020F6, + SOUND_20F7 = 0x000020F7, + SOUND_20F9 = 0x000020F9, + SOUND_20FB = 0x000020FB, + SOUND_20FC = 0x000020FC, SOUND_FAKE_BOWSER_SWING = 0x000020FD, SOUND_FAKE_BOWSER_STRIKE = 0x000020FE, SOUND_FILE_MENU_MOVE_CURSOR = 0x00002101, @@ -1512,11 +1520,11 @@ enum SoundIDs { SOUND_SPIN_SMASH_1 = 0x0000211E, SOUND_SPIN_SMASH_2 = 0x0000211F, SOUND_SPIN_SMASH_3 = 0x00002120, - SOUND_2121 = 0x00002121, - SOUND_2122 = 0x00002122, - SOUND_2123 = 0x00002123, - SOUND_2124 = 0x00002124, - SOUND_2125 = 0x00002125, + SOUND_2121 = 0x00002121, + SOUND_2122 = 0x00002122, + SOUND_2123 = 0x00002123, + SOUND_2124 = 0x00002124, + SOUND_2125 = 0x00002125, SOUND_BOWSER_CAST_RECOVER = 0x00002126, SOUND_BOWSER_LIGHTNING = 0x00002127, SOUND_BOWSER_POWER_DOWN = 0x00002128, @@ -1527,117 +1535,117 @@ enum SoundIDs { SOUND_RELEASE_ENERGY = 0x0000212D, SOUND_GATHER_ENERGY = 0x0000212E, // looping sounds - SOUND_LOOP_00 = 0x80000000, - SOUND_LOOP_01 = 0x80000001, - SOUND_LOOP_02 = 0x80000002, - SOUND_LOOP_03 = 0x80000003, - SOUND_LOOP_04 = 0x80000004, - SOUND_LOOP_05 = 0x80000005, - SOUND_LOOP_06 = 0x80000006, - SOUND_LOOP_07 = 0x80000007, - SOUND_LOOP_08 = 0x80000008, - SOUND_LOOP_09 = 0x80000009, - SOUND_LOOP_0A = 0x8000000A, // unused - SOUND_LOOP_0B = 0x8000000B, - SOUND_LOOP_0C = 0x8000000C, - SOUND_LOOP_0D = 0x8000000D, - SOUND_LOOP_0E = 0x8000000E, - SOUND_LOOP_0F = 0x8000000F, - SOUND_LOOP_10 = 0x80000010, - SOUND_LOOP_11 = 0x80000011, - SOUND_LOOP_12 = 0x80000012, // unused - SOUND_LOOP_13 = 0x80000013, // unused - SOUND_LOOP_14 = 0x80000014, // unused - SOUND_LOOP_15 = 0x80000015, - SOUND_LOOP_16 = 0x80000016, - SOUND_LOOP_17 = 0x80000017, - SOUND_LOOP_18 = 0x80000018, - SOUND_LOOP_19 = 0x80000019, - SOUND_LOOP_1A = 0x8000001A, - SOUND_LOOP_1B = 0x8000001B, - SOUND_LOOP_1C = 0x8000001C, - SOUND_LOOP_1D = 0x8000001D, - SOUND_LOOP_1E = 0x8000001E, - SOUND_LOOP_1F = 0x8000001F, // unused, no data - SOUND_LOOP_20 = 0x80000020, // unused, no data - SOUND_LOOP_21 = 0x80000021, - SOUND_LOOP_22 = 0x80000022, - SOUND_LOOP_23 = 0x80000023, - SOUND_LOOP_24 = 0x80000024, - SOUND_LOOP_25 = 0x80000025, - SOUND_LOOP_26 = 0x80000026, // unused - SOUND_LOOP_27 = 0x80000027, - SOUND_LOOP_28 = 0x80000028, - SOUND_LOOP_29 = 0x80000029, - SOUND_LOOP_2A = 0x8000002A, - SOUND_LOOP_2B = 0x8000002B, - SOUND_LOOP_2C = 0x8000002C, - SOUND_LOOP_2D = 0x8000002D, - SOUND_LOOP_2E = 0x8000002E, - SOUND_LOOP_2F = 0x8000002F, - SOUND_LOOP_30 = 0x80000030, - SOUND_LOOP_31 = 0x80000031, - SOUND_LOOP_32 = 0x80000032, - SOUND_LOOP_33 = 0x80000033, - SOUND_LOOP_34 = 0x80000034, - SOUND_LOOP_35 = 0x80000035, - SOUND_LOOP_36 = 0x80000036, - SOUND_LOOP_37 = 0x80000037, - SOUND_LOOP_38 = 0x80000038, - SOUND_LOOP_39 = 0x80000039, - SOUND_LOOP_3A = 0x8000003A, // unused - SOUND_LOOP_3B = 0x8000003B, // unused - SOUND_LOOP_3C = 0x8000003C, // unused - SOUND_LOOP_3D = 0x8000003D, // unused - SOUND_LOOP_3E = 0x8000003E, // unused - SOUND_LOOP_3F = 0x8000003F, // unused - SOUND_LOOP_40 = 0x80000040, + SOUND_LOOP_00 = 0x80000000, + SOUND_LOOP_BOBOMB_FUSE = 0x80000001, + SOUND_LOOP_02 = 0x80000002, + SOUND_LOOP_03 = 0x80000003, + SOUND_LOOP_TRD_02_LOWER_STAIRS = 0x80000004, + SOUND_LOOP_TRD_04_LOWER_STAIRS = 0x80000005, + SOUND_LOOP_TRD_FLOWING_WATER = 0x80000006, + SOUND_LOOP_TRD_RAISE_STAIRS = 0x80000007, + SOUND_LOOP_08 = 0x80000008, + SOUND_LOOP_09 = 0x80000009, + SOUND_LOOP_0A = 0x8000000A, // unused + SOUND_LOOP_0B = 0x8000000B, + SOUND_LOOP_0C = 0x8000000C, + SOUND_LOOP_0D = 0x8000000D, + SOUND_LOOP_0E = 0x8000000E, + SOUND_LOOP_OBK_LOWER_CHAIN = 0x8000000F, + SOUND_LOOP_MOVE_STATUE = 0x80000010, + SOUND_LOOP_11 = 0x80000011, + SOUND_LOOP_QUIZ_TICKING = 0x80000012, // unused + SOUND_LOOP_AUDIENCE_MURMUR = 0x80000013, // unused + SOUND_LOOP_TOYBOX_TRAIN_GEAR = 0x80000014, // unused + SOUND_LOOP_15 = 0x80000015, + SOUND_LOOP_OMO_ROTATING_WHEEL = 0x80000016, + SOUND_LOOP_17 = 0x80000017, + SOUND_LOOP_MOVE_LARGE_STATUE = 0x80000018, + SOUND_LOOP_19 = 0x80000019, + SOUND_LOOP_1A = 0x8000001A, + SOUND_LOOP_1B = 0x8000001B, + SOUND_LOOP_1C = 0x8000001C, + SOUND_LOOP_1D = 0x8000001D, + SOUND_LOOP_1E = 0x8000001E, + SOUND_LOOP_1F = 0x8000001F, // unused, no data + SOUND_LOOP_20 = 0x80000020, // unused, no data + SOUND_LOOP_21 = 0x80000021, + SOUND_LOOP_22 = 0x80000022, + SOUND_LOOP_23 = 0x80000023, + SOUND_LOOP_24 = 0x80000024, + SOUND_LOOP_PUFF_PUFF_MACHINE = 0x80000025, + SOUND_LOOP_26 = 0x80000026, // unused + SOUND_LOOP_27 = 0x80000027, + SOUND_LOOP_28 = 0x80000028, + SOUND_LOOP_29 = 0x80000029, + SOUND_LOOP_2A = 0x8000002A, + SOUND_LOOP_2B = 0x8000002B, + SOUND_LOOP_2C = 0x8000002C, + SOUND_LOOP_2D = 0x8000002D, + SOUND_LOOP_2E = 0x8000002E, + SOUND_LOOP_2F = 0x8000002F, + SOUND_LOOP_30 = 0x80000030, + SOUND_LOOP_31 = 0x80000031, + SOUND_LOOP_32 = 0x80000032, + SOUND_LOOP_33 = 0x80000033, + SOUND_LOOP_34 = 0x80000034, + SOUND_LOOP_35 = 0x80000035, + SOUND_LOOP_36 = 0x80000036, + SOUND_LOOP_37 = 0x80000037, + SOUND_LOOP_38 = 0x80000038, + SOUND_LOOP_39 = 0x80000039, + SOUND_LOOP_3A = 0x8000003A, // unused + SOUND_LOOP_3B = 0x8000003B, // unused + SOUND_LOOP_3C = 0x8000003C, // unused + SOUND_LOOP_3D = 0x8000003D, // unused + SOUND_LOOP_3E = 0x8000003E, // unused + SOUND_LOOP_3F = 0x8000003F, // unused + SOUND_LOOP_40 = 0x80000040, SOUND_LOOP_CHARGE_BAR = 0x80000041, - SOUND_LOOP_42 = 0x80000042, - SOUND_LOOP_43 = 0x80000043, - SOUND_LOOP_44 = 0x80000044, - SOUND_LOOP_45 = 0x80000045, - SOUND_LOOP_46 = 0x80000046, - SOUND_LOOP_47 = 0x80000047, - SOUND_LOOP_48 = 0x80000048, - SOUND_LOOP_49 = 0x80000049, - SOUND_LOOP_4A = 0x8000004A, - SOUND_LOOP_4B = 0x8000004B, - SOUND_LOOP_4C = 0x8000004C, - SOUND_LOOP_4D = 0x8000004D, - SOUND_LOOP_4E = 0x8000004E, // unused - SOUND_LOOP_4F = 0x8000004F, - SOUND_LOOP_50 = 0x80000050, - SOUND_LOOP_51 = 0x80000051, - SOUND_LOOP_52 = 0x80000052, - SOUND_LOOP_53 = 0x80000053, - SOUND_LOOP_54 = 0x80000054, // unused + SOUND_LOOP_42 = 0x80000042, + SOUND_LOOP_43 = 0x80000043, + SOUND_LOOP_44 = 0x80000044, + SOUND_LOOP_45 = 0x80000045, + SOUND_LOOP_46 = 0x80000046, + SOUND_LOOP_47 = 0x80000047, + SOUND_LOOP_48 = 0x80000048, + SOUND_LOOP_49 = 0x80000049, + SOUND_LOOP_4A = 0x8000004A, + SOUND_LOOP_WINDILL_GEARS = 0x8000004B, + SOUND_LOOP_4C = 0x8000004C, + SOUND_LOOP_4D = 0x8000004D, + SOUND_LOOP_4E = 0x8000004E, // unused + SOUND_LOOP_4F = 0x8000004F, + SOUND_LOOP_50 = 0x80000050, + SOUND_LOOP_KPA_CHAIN_DRIVE = 0x80000051, + SOUND_LOOP_KPA_FILL_WATER = 0x80000052, + SOUND_LOOP_KPA_DRAIN_WATER = 0x80000053, + SOUND_LOOP_KPA_FLIP_BRIDGE_PANEL = 0x80000054, // unused SOUND_LOOP_JR_TROOPA_SWIM = 0x80000055, - SOUND_LOOP_56 = 0x80000056, - SOUND_LOOP_57 = 0x80000057, - SOUND_LOOP_58 = 0x80000058, - SOUND_LOOP_59 = 0x80000059, - SOUND_LOOP_5A = 0x8000005A, - SOUND_LOOP_5B = 0x8000005B, - SOUND_LOOP_5C = 0x8000005C, - SOUND_LOOP_5D = 0x8000005D, - SOUND_LOOP_5E = 0x8000005E, - SOUND_LOOP_5F = 0x8000005F, - SOUND_LOOP_60 = 0x80000060, - SOUND_LOOP_61 = 0x80000061, - SOUND_LOOP_62 = 0x80000062, // unused, no data - SOUND_LOOP_63 = 0x80000063, - SOUND_LOOP_64 = 0x80000064, - SOUND_LOOP_65 = 0x80000065, - SOUND_LOOP_66 = 0x80000066, - SOUND_LOOP_67 = 0x80000067, - SOUND_LOOP_68 = 0x80000068, - SOUND_LOOP_69 = 0x80000069, - SOUND_LOOP_6A = 0x8000006A, - SOUND_LOOP_6B = 0x8000006B, - SOUND_LOOP_6C = 0x8000006C, - SOUND_LOOP_6D = 0x8000006D, // unused - SOUND_LOOP_6E = 0x8000006E, // unused + SOUND_LOOP_KKJ_RUMBLING = 0x80000056, + SOUND_LOOP_OSR_RUMBLING = 0x80000057, + SOUND_LOOP_58 = 0x80000058, + SOUND_LOOP_59 = 0x80000059, + SOUND_LOOP_5A = 0x8000005A, + SOUND_LOOP_5B = 0x8000005B, + SOUND_LOOP_5C = 0x8000005C, + SOUND_LOOP_DGB_COLLAPSE = 0x8000005D, + SOUND_LOOP_5E = 0x8000005E, + SOUND_LOOP_5F = 0x8000005F, + SOUND_LOOP_60 = 0x80000060, + SOUND_LOOP_61 = 0x80000061, + SOUND_LOOP_62 = 0x80000062, // unused, no data + SOUND_LOOP_STAR_SANCTUARY_FAR = 0x80000063, + SOUND_LOOP_STAR_SANCTUARY_NEAR = 0x80000064, + SOUND_LOOP_STAR_SANCTUARY_INSIDE = 0x80000065, + SOUND_LOOP_BOWSER_PROPELLER = 0x80000066, + SOUND_LOOP_STAR_CARD_APPEARS = 0x80000067, + SOUND_LOOP_68 = 0x80000068, + SOUND_LOOP_69 = 0x80000069, + SOUND_LOOP_6A = 0x8000006A, + SOUND_LOOP_6B = 0x8000006B, + SOUND_LOOP_6C = 0x8000006C, + SOUND_LOOP_6D = 0x8000006D, // unused + SOUND_LOOP_6E = 0x8000006E, // unused // exit doors SOUND_DOOR_OPEN = 0x90000000, SOUND_DOOR_CLOSE = 0x90000001, @@ -1656,29 +1664,29 @@ enum SoundIDs { SOUND_SEQ_FIRE_BAR_8 = 0xB0000008, SOUND_SEQ_FIRE_BAR_9 = 0xB0000009, SOUND_SEQ_FIRE_BAR_DEAD = 0xB000000A, - SOUND_SEQ_0B = 0xB000000B, // unused - SOUND_SEQ_0C = 0xB000000C, - SOUND_SEQ_0D = 0xB000000D, - SOUND_SEQ_0E = 0xB000000E, - SOUND_SEQ_0F = 0xB000000F, - SOUND_SEQ_10 = 0xB0000010, - SOUND_SEQ_11 = 0xB0000011, - SOUND_SEQ_12 = 0xB0000012, - SOUND_SEQ_13 = 0xB0000013, // unused - SOUND_SEQ_14 = 0xB0000014, // unused - SOUND_SEQ_15 = 0xB0000015, - SOUND_SEQ_16 = 0xB0000016, - SOUND_SEQ_17 = 0xB0000017, - SOUND_SEQ_18 = 0xB0000018, - SOUND_SEQ_19 = 0xB0000019, - SOUND_SEQ_1A = 0xB000001A, - SOUND_SEQ_1B = 0xB000001B, - SOUND_SEQ_1C = 0xB000001C, - SOUND_SEQ_1D = 0xB000001D, - SOUND_SEQ_1E = 0xB000001E, - SOUND_SEQ_1F = 0xB000001F, - SOUND_SEQ_20 = 0xB0000020, // unused - SOUND_SEQ_21 = 0xB0000021, + SOUND_SEQ_0B = 0xB000000B, // unused + SOUND_SEQ_0C = 0xB000000C, + SOUND_SEQ_0D = 0xB000000D, + SOUND_SEQ_0E = 0xB000000E, + SOUND_SEQ_BOO_VANISH = 0xB000000F, + SOUND_SEQ_BOO_APPEAR = 0xB0000010, + SOUND_SEQ_11 = 0xB0000011, + SOUND_SEQ_12 = 0xB0000012, + SOUND_SEQ_RAVEN_LEAP = 0xB0000013, // unused + SOUND_SEQ_14 = 0xB0000014, // unused + SOUND_SEQ_15 = 0xB0000015, + SOUND_SEQ_16 = 0xB0000016, + SOUND_SEQ_17 = 0xB0000017, + SOUND_SEQ_18 = 0xB0000018, + SOUND_SEQ_19 = 0xB0000019, + SOUND_SEQ_1A = 0xB000001A, + SOUND_SEQ_1B = 0xB000001B, + SOUND_SEQ_1C = 0xB000001C, + SOUND_SEQ_1D = 0xB000001D, + SOUND_SEQ_1E = 0xB000001E, + SOUND_SEQ_1F = 0xB000001F, + SOUND_SEQ_20 = 0xB0000020, // unused + SOUND_SEQ_21 = 0xB0000021, }; enum SoundSpatializationFlags { @@ -2106,8 +2114,8 @@ enum Events { EVENT_SCARE_AWAY = 0x00000039, EVENT_BEGIN_AIR_LIFT = 0x0000003A, EVENT_UP_AND_AWAY = 0x0000003D, - EVENT_62 = 0x0000003E, - EVENT_SWAP_PARTNER = 0x0000003F, + EVENT_PUT_PARTNER_AWAY = 0x0000003E, + EVENT_RECEIVE_BUFF = 0x0000003F, EVENT_LIFE_SHROOM_PROC = 0x00000040, EVENT_REVIVE = 0x00000041, EVENT_66 = 0x00000042, @@ -2560,20 +2568,20 @@ enum EntityFlags { enum EntityCollisionFlags { ENTITY_COLLISION_PLAYER_TOUCH_FLOOR = 0x00000001, - ENTITY_COLLISION_FLAG_2 = 0x00000002, + ENTITY_COLLISION_FLAG_02 = 0x00000002, ENTITY_COLLISION_PLAYER_TOUCH_CEILING = 0x00000004, ENTITY_COLLISION_PLAYER_TOUCH_WALL = 0x00000008, ENTITY_COLLISION_PLAYER_PUSHING_AGAINST = 0x00000010, - ENTITY_COLLISION_FLAG_20 = 0x00000020, + ENTITY_COLLISION_FLAG_20 = 0x00000020, ENTITY_COLLISION_PLAYER_HAMMER = 0x00000040, ENTITY_COLLISION_PARTNER = 0x00000080, ENTITY_COLLISION_PLAYER_LAST_FLOOR = 0x00000100 }; enum EntityHideMode { - ENTITY_HIDE_MODE_0 = 0, - ENTITY_HIDE_MODE_1 = 1, - ENTITY_HIDE_MODE_2 = 2, + ENTITY_HIDE_MODE_0 = 0, + ENTITY_HIDE_MODE_1 = 1, + ENTITY_HIDE_MODE_2 = 2, }; typedef enum PushGridOccupant { @@ -3254,7 +3262,7 @@ enum ActorPartFlags { ACTOR_PART_FLAG_20 = 0x00000020, ACTOR_PART_FLAG_40 = 0x00000040, ACTOR_PART_FLAG_80 = 0x00000080, - ACTOR_PART_FLAG_100 = 0x00000100, + ACTOR_PART_FLAG_TRANSPARENT = 0x00000100, ACTOR_PART_FLAG_200 = 0x00000200, ACTOR_PART_FLAG_400 = 0x00000400, ACTOR_PART_FLAG_800 = 0x00000800, @@ -3316,6 +3324,14 @@ enum ActorEventFlags { ACTOR_EVENT_FLAG_80000000 = 0x80000000, }; +enum PartnerWishAnims { + PARTNER_WISH_ANIM_WALK = 0, + PARTNER_WISH_ANIM_PRAY = 1, + PARTNER_WISH_ANIM_UNUSED = 2, + PARTNER_WISH_ANIM_RETURN = 3, + PARTNER_WISH_ANIM_IDLE = 4, +}; + enum PartnerAnimIndices { PARTNER_ANIM_INDEX_STILL = 0x0, PARTNER_ANIM_INDEX_WALK = 0x1, @@ -3472,6 +3488,15 @@ enum DemoState { DEMO_STATE_DONE = 5, }; +enum DemoFlags { + DEMO_BTL_FLAG_ENABLED = 0x01, + DEMO_BTL_FLAG_PARTNER_ACTING = 0x02, + DEMO_BTL_FLAG_ENEMY_ACTING = 0x04, + DEMO_BTL_FLAG_10 = 0x10, + DEMO_BTL_FLAG_20 = 0x20, + DEMO_BTL_FLAG_40 = 0x40, +}; + enum MapLoadType { LOAD_FROM_MAP = 0, LOAD_FROM_FILE_SELECT = 1, diff --git a/include/macros.h b/include/macros.h index 4aeaf16abf..25eff43d0b 100644 --- a/include/macros.h +++ b/include/macros.h @@ -47,7 +47,7 @@ #define PTR_LIST_END ((void*) -1) -#define API_CALLABLE(name) ApiStatus name(Evt* script, s32 isInitialCall) +#define API_CALLABLE(name) ApiStatus name(Evt* script, b32 isInitialCall) // standardized padding macros for map overlays #define MAP_RODATA_PAD(n,name) const s32 N(rodata_pad_##name)[n] = {}; @@ -257,6 +257,13 @@ } \ }; +#define UNPACK_PAL_R(color) (((color) >> 11) & 0x1F) +#define UNPACK_PAL_G(color) (((color) >> 6) & 0x1F) +#define UNPACK_PAL_B(color) (((color) >> 1) & 0x1F) +#define UNPACK_PAL_A(color) ((color) & 1) + +#define PACK_PAL_RGBA(r, g, b, a) (((r) << 11) | ((g) << 6) | ((b) << 1) | (a)); + #define PM_CC_01 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0 #define PM_CC_02 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0 #define PM_CC_03 TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0 diff --git a/include/npc.h b/include/npc.h index 85bd68034c..d881890a13 100644 --- a/include/npc.h +++ b/include/npc.h @@ -223,7 +223,7 @@ typedef struct { /* 0x1C */ Vec3i detectPos; /* 0x28 */ VecXZi detectSize; /* 0x30 */ enum TerritoryShape detectShape; - /* 0x34 */ s32 isFlying; + /* 0x34 */ b32 isFlying; } EnemyTerritoryWander; // size = 0x38 typedef struct { @@ -233,7 +233,7 @@ typedef struct { /* 0x80 */ Vec3i detectPos; /* 0x8C */ VecXZi detectSize; /* 0x94 */ enum TerritoryShape detectShape; - /* 0x98 */ s32 isFlying; + /* 0x98 */ b32 isFlying; } EnemyTerritoryPatrol; // size = 0x9C typedef union { diff --git a/include/script_api/common.h b/include/script_api/common.h index 574473bf7c..a2a5713bab 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -4,8 +4,8 @@ #include "common_structs.h" #include "macros.h" -ApiStatus FadeBackgroundToBlack(Evt* script, s32 isInitialCall); -ApiStatus UnfadeBackgroundFromBlack(Evt* script, s32 isInitialCall); +ApiStatus FadeBackgroundDarken(Evt* script, s32 isInitialCall); +ApiStatus FadeBackgroundLighten(Evt* script, s32 isInitialCall); ApiStatus GetCamLookAtObjVector(Evt* script, s32 isInitialCall); ApiStatus HasMerleeCasts(Evt* script, s32 isInitialCall); ApiStatus OnDefeatEnemy(Evt* script, s32 isInitialCall); @@ -331,7 +331,7 @@ ApiStatus SetPlayerImgFXFlags(Evt* script, s32 isInitialCall); ApiStatus UpdatePlayerImgFX(Evt* script, s32 isInitialCall); ApiStatus PushSong(Evt* script, s32 isInitialCall); ApiStatus PopSong(Evt* script, s32 isInitialCall); -ApiStatus func_802D62E4(Evt* script, s32 isInitialCall); +ApiStatus StopTrackingSoundPos(Evt* script, s32 isInitialCall); ApiStatus func_80044238(Evt* script, s32 isInitialCall); ApiStatus MakeLocalVertexCopy(Evt* script, s32 isInitialCall); ApiStatus SetCustomGfx(Evt* script, s32 isInitialCall); diff --git a/include/variables.h b/include/variables.h index 8ac7477c19..7d2feff753 100644 --- a/include/variables.h +++ b/include/variables.h @@ -116,7 +116,7 @@ extern s32 gCurrentDisplayContextIndex; extern s16 gCurrentCamID; -extern s32 D_8029C890[10][5]; +extern s32 PartnerWishAnims[][5]; extern HeapNode heap_battleHead; diff --git a/src/16F740.c b/src/16F740.c index 32b28da7d9..6811da96d6 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -238,7 +238,7 @@ void btl_state_update_normal_start(void) { read_background_size(&gBackgroundImage); } - if (gGameStatusPtr->demoFlags & 1) { + if (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED) { set_curtain_scale_goal(1.0f); } @@ -446,7 +446,7 @@ void btl_state_update_normal_start(void) { btl_set_state(BATTLE_STATE_ENEMY_FIRST_STRIKE); break; default: - if (!(gGameStatusPtr->demoFlags & 1)) { + if (!(gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED)) { actor = battleStatus->playerActor; if (gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) { script = start_script(&EVS_PeachEnterStage, EVT_PRIORITY_A, 0); @@ -486,7 +486,7 @@ void btl_state_update_normal_start(void) { btl_cam_use_preset(BTL_CAM_DEFAULT); } - if (!(gGameStatusPtr->demoFlags & 1)) { + if (!(gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED)) { BattleScreenFadeAmt -= 10; } else { BattleScreenFadeAmt -= 50; @@ -771,7 +771,7 @@ void btl_state_update_begin_player_turn(void) { fx_water_splash(0, player->curPos.x - 15.0f, player->curPos.y + 32.0f, player->curPos.z + 5.0f, 1.0f, 24); fx_water_splash(1, player->curPos.x + 15.0f, player->curPos.y + 22.0f, player->curPos.z + 5.0f, 1.0f, 24); battleStatus->waterBlockEffect = NULL; - sfx_play_sound(SOUND_0299); + sfx_play_sound(SOUND_DESTROY_WATER_BLOCK); btl_show_battle_message(BTL_MSG_WATER_BLOCK_END, 60); gBattleSubState = BTL_SUBSTATE_BEGIN_PLAYER_TURN_AWAIT_WATER_BLOCK; } else { @@ -918,11 +918,11 @@ back: } if (player->transparentStatus != 0) { player->transparentDuration--; - part->flags |= ACTOR_PART_FLAG_100; + part->flags |= ACTOR_PART_FLAG_TRANSPARENT; do { if (player->transparentDuration <= 0) { player->transparentStatus = 0; - part->flags &= ~ACTOR_PART_FLAG_100; + part->flags &= ~ACTOR_PART_FLAG_TRANSPARENT; remove_status_transparent(player->hudElementDataIndex); } } while (0); // TODO required to match @@ -2763,7 +2763,7 @@ void btl_state_update_player_move(void) { break; } - if (gGameStatusPtr->demoFlags & 1) { + if (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED) { btl_set_state(BATTLE_STATE_END_DEMO_BATTLE); break; } @@ -3258,7 +3258,7 @@ void btl_state_update_partner_move(void) { break; } - if (gGameStatusPtr->demoFlags & 1) { + if (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED) { btl_set_state(BATTLE_STATE_END_DEMO_BATTLE); break; } @@ -3266,7 +3266,7 @@ void btl_state_update_partner_move(void) { if (playerData->curPartner == PARTNER_GOOMBARIO && battleStatus->moveCategory == BTL_MENU_TYPE_CHANGE_PARTNER && battleStatus->selectedMoveID != MOVE_CHARGE) { - partner->isGlowing = 0; + partner->isGlowing = FALSE; gBattleStatus.flags1 &= ~BS_FLAGS1_GOOMBARIO_CHARGED; } if (btl_check_player_defeated()) { @@ -3677,7 +3677,7 @@ void btl_state_update_enemy_move(void) { } if (battleStatus->stateFreezeCount == 0) { - if (gGameStatusPtr->demoFlags & 1) { + if (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED) { btl_set_state(BATTLE_STATE_END_DEMO_BATTLE); } else { btl_update_ko_status(); @@ -3952,7 +3952,7 @@ void btl_state_update_first_strike(void) { if (battleStatus->stateFreezeCount == 0) { decrement_status_bar_disabled(); - if (!(gGameStatusPtr->demoFlags & 1)) { + if (!(gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED)) { Actor* target; if (btl_check_player_defeated() || btl_check_enemies_defeated()) { @@ -4003,7 +4003,7 @@ void btl_state_draw_first_stike(void) { if (BattleScreenFadeAmt == 0) { set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); } else { - if (!(gGameStatusPtr->demoFlags & 1)) { + if (!(gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED)) { BattleScreenFadeAmt -= 20; } else { BattleScreenFadeAmt -= 50; diff --git a/src/16c8e0.c b/src/16c8e0.c index 2ec9f76120..ef967ad72e 100644 --- a/src/16c8e0.c +++ b/src/16c8e0.c @@ -51,22 +51,22 @@ HudScript* bHPDigitHudScripts[] = { s32 BattleScreenFadeAmt = 0xFF; EvtScript BtlPutPartnerAway = { - EVT_CALL(DispatchEvent, 256, 62) + EVT_CALL(DispatchEvent, ACTOR_PARTNER, EVENT_PUT_PARTNER_AWAY) EVT_CHILD_THREAD EVT_SETF(LVar0, EVT_FLOAT(1.0)) EVT_LOOP(10) - EVT_CALL(SetActorScale, 256, LVar0, LVar0, EVT_FLOAT(1.0)) + EVT_CALL(SetActorScale, ACTOR_PARTNER, LVar0, LVar0, EVT_FLOAT(1.0)) EVT_SUBF(LVar0, EVT_FLOAT(0.1)) EVT_WAIT(1) EVT_END_LOOP EVT_END_CHILD_THREAD EVT_CALL(EnablePartnerBlur) - EVT_CALL(PlaySoundAtActor, 0, 14) + EVT_CALL(PlaySoundAtActor, 0, SOUND_PARTNER_GET_OUT) EVT_CALL(GetActorPos, 0, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) - EVT_CALL(SetActorJumpGravity, 256, EVT_FLOAT(1.0)) - EVT_CALL(SetGoalPos, 256, LVar0, LVar1, LVar2) - EVT_CALL(JumpToGoal, 256, 10, 0, 0, 1) + EVT_CALL(SetActorJumpGravity, ACTOR_PARTNER, EVT_FLOAT(1.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(JumpToGoal, ACTOR_PARTNER, 10, 0, 0, 1) EVT_CALL(DisablePartnerBlur) EVT_RETURN EVT_END @@ -76,22 +76,22 @@ EvtScript BtlBringPartnerOut = { EVT_CHILD_THREAD EVT_SETF(LVar0, EVT_FLOAT(0.1)) EVT_LOOP(20) - EVT_CALL(SetActorScale, 256, LVar0, LVar0, EVT_FLOAT(1.0)) + EVT_CALL(SetActorScale, ACTOR_PARTNER, LVar0, LVar0, EVT_FLOAT(1.0)) EVT_ADDF(LVar0, EVT_FLOAT(0.05)) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetActorScale, 256, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, 0, 13) - EVT_CALL(GetGoalPos, 256, LVar0, LVar1, LVar2) - EVT_CALL(SetActorJumpGravity, 256, EVT_FLOAT(1.0)) + EVT_CALL(PlaySoundAtActor, 0, SOUND_PARTNER_PUT_AWAY) + EVT_CALL(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(SetActorJumpGravity, ACTOR_PARTNER, EVT_FLOAT(1.0)) EVT_IF_EQ(LVar1, 0) - EVT_CALL(JumpToGoal, 256, 20, 0, 0, 1) + EVT_CALL(JumpToGoal, ACTOR_PARTNER, 20, 0, 0, 1) EVT_ELSE - EVT_CALL(JumpToGoal, 256, 20, 0, 0, 1) + EVT_CALL(JumpToGoal, ACTOR_PARTNER, 20, 0, 0, 1) EVT_END_IF - EVT_CALL(GetActorPos, 256, LVar0, LVar1, LVar2) - EVT_CALL(ForceHomePos, 256, LVar0, LVar1, LVar2) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(ForceHomePos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_RETURN EVT_END }; @@ -745,9 +745,9 @@ void tattle_cam_pre_render(Camera* camera) { } else { for (i = 0; i < ARRAY_COUNT(gTattleBgPalette); i++) { u16 palColor = gGameStatusPtr->backgroundPalette[i]; - u16 blendedB = blend_background_channel_COPY((palColor >> 1) & 0x1F, fogB >> 3, fogA); - u16 blendedG = blend_background_channel_COPY((palColor >> 6) & 0x1F, fogG >> 3, fogA); - u16 blendedR = blend_background_channel_COPY((palColor >> 11) & 0x1F, fogR >> 3, fogA); + u16 blendedB = blend_background_channel_COPY(UNPACK_PAL_B(palColor), fogB >> 3, fogA); + u16 blendedG = blend_background_channel_COPY(UNPACK_PAL_G(palColor), fogG >> 3, fogA); + u16 blendedR = blend_background_channel_COPY(UNPACK_PAL_R(palColor), fogR >> 3, fogA); gTattleBgPalette[i] = blendedB << 1 | blendedG << 6 | blendedR << 11 | 1; } } diff --git a/src/17D6A0.c b/src/17D6A0.c index 1d7f9112d3..ccaecbd2ee 100644 --- a/src/17D6A0.c +++ b/src/17D6A0.c @@ -618,8 +618,8 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { .delay = { 30, 30 } }, [ACTOR_TYPE_LAKITU] = { - .walk = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, - .fly = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, + .walk = { SOUND_FLIGHT, SOUND_FLIGHT }, + .fly = { SOUND_FLIGHT, SOUND_FLIGHT }, .jump = SOUND_ACTOR_JUMP, .hurt = SOUND_ACTOR_HURT, .delay = { -5, -5 } @@ -660,15 +660,15 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { .delay = { 30, 30 } }, [ACTOR_TYPE_RUFF_PUFF] = { - .walk = { SOUND_LRAW_0295, NULL }, - .fly = { SOUND_LRAW_0295, NULL }, + .walk = { SOUND_FLIGHT, NULL }, + .fly = { SOUND_FLIGHT, NULL }, .jump = SOUND_ACTOR_JUMP, .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SPIKE] = { - .walk = { SOUND_LRAW_0295, NULL }, - .fly = { SOUND_LRAW_0295, NULL }, + .walk = { SOUND_FLIGHT, NULL }, + .fly = { SOUND_FLIGHT, NULL }, .jump = SOUND_ACTOR_JUMP, .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } @@ -709,7 +709,7 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { .delay = { 30, 30 } }, [ACTOR_TYPE_DUPLIGHOST] = { - .walk = { SOUND_02CA, SOUND_02CA }, + .walk = { SOUND_DUPLIGHOST_STEP, SOUND_DUPLIGHOST_STEP }, .fly = { NULL, NULL }, .jump = SOUND_ACTOR_JUMP, .hurt = SOUND_ACTOR_HURT, @@ -758,15 +758,15 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { .delay = { 30, 30 } }, [ACTOR_TYPE_GHOST_SUSHIE] = { - .walk = { SOUND_029A, SOUND_029A }, + .walk = { SOUND_SUSHIE_STEP, SOUND_SUSHIE_STEP }, .fly = { NULL, NULL }, .jump = SOUND_ACTOR_JUMP, .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GHOST_LAKILESTER] = { - .walk = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, - .fly = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, + .walk = { SOUND_FLIGHT, SOUND_FLIGHT }, + .fly = { SOUND_FLIGHT, SOUND_FLIGHT }, .jump = SOUND_ACTOR_JUMP, .hurt = SOUND_ACTOR_HURT, .delay = { -5, -5 } @@ -1010,8 +1010,8 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_66] = { - .walk = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, - .fly = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, + .walk = { SOUND_FLIGHT, SOUND_FLIGHT }, + .fly = { SOUND_FLIGHT, SOUND_FLIGHT }, .jump = SOUND_ACTOR_JUMP, .hurt = SOUND_ACTOR_HURT, .delay = { -5, -5 } @@ -1115,15 +1115,15 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { .delay = { 30, 30 } }, [ACTOR_TYPE_SUSHIE] = { - .walk = { SOUND_029A, SOUND_029A }, + .walk = { SOUND_SUSHIE_STEP, SOUND_SUSHIE_STEP }, .fly = { NULL, NULL }, .jump = SOUND_ACTOR_JUMP, .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_LAKILESTER] = { - .walk = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, - .fly = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, + .walk = { SOUND_FLIGHT, SOUND_FLIGHT }, + .fly = { SOUND_FLIGHT, SOUND_FLIGHT }, .jump = SOUND_ACTOR_JUMP, .hurt = SOUND_ACTOR_HURT, .delay = { -5, -5 } @@ -1178,7 +1178,7 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { .delay = { 30, 30 } }, [ACTOR_TYPE_LEE] = { - .walk = { SOUND_02CA, SOUND_02CA }, + .walk = { SOUND_DUPLIGHOST_STEP, SOUND_DUPLIGHOST_STEP }, .fly = { NULL, NULL }, .jump = SOUND_ACTOR_JUMP, .hurt = SOUND_ACTOR_HURT, @@ -1227,15 +1227,15 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { .delay = { 30, 30 } }, [ACTOR_TYPE_LEE_SUSHIE] = { - .walk = { SOUND_029A, SOUND_029A }, + .walk = { SOUND_SUSHIE_STEP, SOUND_SUSHIE_STEP }, .fly = { NULL, NULL }, .jump = SOUND_ACTOR_JUMP, .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_LEE_LAKILESTER] = { - .walk = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, - .fly = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, + .walk = { SOUND_FLIGHT, SOUND_FLIGHT }, + .fly = { SOUND_FLIGHT, SOUND_FLIGHT }, .jump = SOUND_ACTOR_JUMP, .hurt = SOUND_ACTOR_HURT, .delay = { -5, -5 } diff --git a/src/17FEB0.c b/src/17FEB0.c index 860424b946..750a00499b 100644 --- a/src/17FEB0.c +++ b/src/17FEB0.c @@ -758,7 +758,8 @@ ApiStatus ItemCheckHit(Evt* script, s32 isInitialCall) { flags = *args++; if ((flags & (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) == (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) { - gBattleStatus.flags1 |= BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE; + gBattleStatus.flags1 |= BS_FLAGS1_10; + gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; } else if (flags & BS_FLAGS1_10) { gBattleStatus.flags1 |= BS_FLAGS1_10; gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; diff --git a/src/182B30.c b/src/182B30.c index cc0a87b8e9..f1293771ca 100644 --- a/src/182B30.c +++ b/src/182B30.c @@ -10,13 +10,6 @@ enum StandardPalettes { STANDARD_PAL_STATIC = 3, }; -#define UNPACK_PAL_R(color) (((color) >> 11) & 0x1F) -#define UNPACK_PAL_G(color) (((color) >> 6) & 0x1F) -#define UNPACK_PAL_B(color) (((color) >> 1) & 0x1F) -#define UNPACK_PAL_A(color) ((color) & 1) - -#define PACK_PAL_RGBA(r, g, b, a) (((r) << 11) | ((g) << 6) | ((b) << 1) | (a)); - // lerp from A to B as alpha does from 0 to 255 #define LERP_COMPONENT(a, b, alpha) ((a) * (255 - (alpha)) + (b) * (alpha)) / 255; @@ -770,7 +763,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) { set_standard_shadow_scale(shadow, dist); shadow->scale.x *= actorPart->shadowScale; } - if (actorPart->opacity < 255 || actorPart->flags & ACTOR_PART_FLAG_100) { + if (actorPart->opacity < 255 || actorPart->flags & ACTOR_PART_FLAG_TRANSPARENT) { actor->renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; } } @@ -988,9 +981,9 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) { } if (actor->transparentStatus == STATUS_KEY_TRANSPARENT) { - part->flags |= ACTOR_PART_FLAG_100; + part->flags |= ACTOR_PART_FLAG_TRANSPARENT; } else { - part->flags &= ~ACTOR_PART_FLAG_100; + part->flags &= ~ACTOR_PART_FLAG_TRANSPARENT; } do { @@ -1152,7 +1145,7 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) { if (actor->staticStatus == STATUS_KEY_STATIC) { create_status_static(actor->hudElementDataIndex, STATUS_KEY_STATIC); } - if ((actor->transparentStatus == STATUS_KEY_TRANSPARENT) || (part->flags & ACTOR_PART_FLAG_100)) { + if ((actor->transparentStatus == STATUS_KEY_TRANSPARENT) || (part->flags & ACTOR_PART_FLAG_TRANSPARENT)) { create_status_transparent(actor->hudElementDataIndex, STATUS_KEY_TRANSPARENT); } if (actor->chillOutAmount != 0) { @@ -1434,7 +1427,7 @@ void update_player_actor_shadow(void) { set_standard_shadow_scale(shadow, distance); shadow->scale.x *= player->shadowScale * player->scalingFactor; - if (parts->opacity >= 255 && !(parts->flags & ACTOR_PART_FLAG_100)) { + if (parts->opacity >= 255 && !(parts->flags & ACTOR_PART_FLAG_TRANSPARENT)) { player->renderMode = RENDER_MODE_ALPHATEST; } else { player->renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; @@ -1597,7 +1590,7 @@ void appendGfx_player_actor(void* arg0) { } if (player->transparentStatus == STATUS_KEY_TRANSPARENT) { - playerParts->flags |= ACTOR_PART_FLAG_100; + playerParts->flags |= ACTOR_PART_FLAG_TRANSPARENT; if (FALSE) { // TODO required to match - also whyyyyyy compiler, whyyyyy back: @@ -1606,7 +1599,7 @@ void appendGfx_player_actor(void* arg0) { goto end; } } else { - playerParts->flags &= ~ACTOR_PART_FLAG_100; + playerParts->flags &= ~ACTOR_PART_FLAG_TRANSPARENT; } do { @@ -1785,7 +1778,7 @@ void appendGfx_player_actor(void* arg0) { playerParts->curAnimation = get_player_anim_for_status(STATUS_KEY_STATIC); animChanged = TRUE; } - if ((player->transparentStatus == STATUS_KEY_TRANSPARENT) || (playerParts->flags & ACTOR_PART_FLAG_100)) { + if ((player->transparentStatus == STATUS_KEY_TRANSPARENT) || (playerParts->flags & ACTOR_PART_FLAG_TRANSPARENT)) { if (!animChanged) { playerParts->curAnimation = get_player_anim_for_status(STATUS_KEY_TRANSPARENT); animChanged = TRUE; @@ -1819,7 +1812,7 @@ void appendGfx_player_actor(void* arg0) { create_status_static(player->hudElementDataIndex, STATUS_KEY_STATIC); } } - if ((player->transparentStatus == STATUS_KEY_TRANSPARENT) || (playerParts->flags & ACTOR_PART_FLAG_100)) { + if ((player->transparentStatus == STATUS_KEY_TRANSPARENT) || (playerParts->flags & ACTOR_PART_FLAG_TRANSPARENT)) { create_status_transparent(player->hudElementDataIndex, STATUS_KEY_TRANSPARENT); } } else { @@ -1953,7 +1946,7 @@ s32 render_with_adjusted_palettes(b32 isNpcSprite, ActorPart* part, s32 yaw, Mat sprDrawOpts = DRAW_SPRITE_OVERRIDE_ALPHA; opacity = part->opacity; } - if (part->flags & ACTOR_PART_FLAG_100) { + if (part->flags & ACTOR_PART_FLAG_TRANSPARENT) { sprDrawOpts = DRAW_SPRITE_OVERRIDE_ALPHA; opacity = opacity * 120 / 255; } @@ -2056,7 +2049,7 @@ void func_8025950C(ActorPart* part, s32 yaw, Matrix4f mtx) { idMask = DRAW_SPRITE_OVERRIDE_ALPHA; opacity = part->opacity; } - if (part->flags & ACTOR_PART_FLAG_100) { + if (part->flags & ACTOR_PART_FLAG_TRANSPARENT) { idMask = DRAW_SPRITE_OVERRIDE_ALPHA; opacity = (opacity * 120) / 255; } @@ -2100,7 +2093,7 @@ void func_802596C0(ActorPart* part, s32 yaw, Matrix4f mtx) { opacity = part->opacity; } - if (part->flags & ACTOR_PART_FLAG_100) { + if (part->flags & ACTOR_PART_FLAG_TRANSPARENT) { idMask = DRAW_SPRITE_OVERRIDE_ALPHA; opacity = (opacity * 120) / 255; } @@ -2125,7 +2118,7 @@ void func_802597B0(ActorPart* part, s32 yaw, Matrix4f mtx) { idMask = DRAW_SPRITE_OVERRIDE_ALPHA; opacity = part->opacity; } - if (part->flags & ACTOR_PART_FLAG_100) { + if (part->flags & ACTOR_PART_FLAG_TRANSPARENT) { idMask = DRAW_SPRITE_OVERRIDE_ALPHA; opacity = (opacity * 120) / 255; } @@ -2167,7 +2160,7 @@ void func_8025995C(ActorPart* part, s32 yaw, Matrix4f mtx) { idMask = DRAW_SPRITE_OVERRIDE_ALPHA; opacity = part->opacity; } - if (part->flags & ACTOR_PART_FLAG_100) { + if (part->flags & ACTOR_PART_FLAG_TRANSPARENT) { idMask = DRAW_SPRITE_OVERRIDE_ALPHA; opacity = (opacity * 120) / 255; } diff --git a/src/18F340.c b/src/18F340.c index 3c7c5a9e3b..94c15c9034 100644 --- a/src/18F340.c +++ b/src/18F340.c @@ -338,7 +338,7 @@ API_CALLABLE(BattleMerleeFadeStageToBlack) { script->functionTemp[0] = 25; } - set_background_color_blend(0, 0, 0, ((25 - script->functionTemp[0]) * 10) & 0xFE); + set_background_color_blend(0, 0, 0, ((25 - script->functionTemp[0]) * 10) & 254); script->functionTemp[0]--; if (script->functionTemp[0] == 0) { @@ -1001,13 +1001,13 @@ EvtScript EVS_Player_HandleEvent = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar1, ANIM_Mario1_Idle) EVT_EXEC_WAIT(EVS_Player_NoDamageHit) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_18) EVT_CASE_OR_EQ(EVENT_BLOCK) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Mario1_Crouch) EVT_EXEC_WAIT(EVS_Player_NoDamageHit) @@ -1331,7 +1331,7 @@ EvtScript D_80287404 = { EVT_IF_EQ(LVar1, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208D) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_USE_ITEM) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 18) @@ -1352,7 +1352,7 @@ EvtScript D_80287404 = { EVT_CALL(RemoveItemEntity, LVarA) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208D) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_USE_ITEM) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_WAIT(4) EVT_ADD(LVar1, 45) @@ -1405,7 +1405,7 @@ EvtScript D_80287834 = { EvtScript EVS_PlayEatFX = { EVT_THREAD EVT_LOOP(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2095) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_EAT_OR_DRINK) EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD @@ -1418,7 +1418,7 @@ EvtScript EVS_PlayEatFX = { EvtScript EVS_PlayDrinkFX = { EVT_THREAD EVT_LOOP(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2095) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_EAT_OR_DRINK) EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD @@ -1485,7 +1485,7 @@ EvtScript EVS_UseLifeShroom = { EVT_END_LOOP EVT_CALL(RemoveEffect, LVar0) EVT_CALL(RemoveItemEntity, LVarA) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2055) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_START_RECOVERY) EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 1, LVar3, LVar4, LVar5, 70, 70, 10, 20) EVT_WAIT(20) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0373) diff --git a/src/190B20.c b/src/190B20.c index e246be2a54..9aba028aaa 100644 --- a/src/190B20.c +++ b/src/190B20.c @@ -1219,7 +1219,7 @@ void load_player_actor(void) { player->actorBlueprint = &bPlayerActorBlueprint; player->actorType = bPlayerActorBlueprint.type; - if ((gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) || (gGameStatusPtr->demoFlags & 2)) { + if ((gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) || (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_PARTNER_ACTING)) { player->homePos.x = player->curPos.x = -130.0f; player->homePos.y = player->curPos.y = 0.0f; player->homePos.z = player->curPos.z = -10.0f; @@ -1281,7 +1281,7 @@ void load_player_actor(void) { player->koDuration = 0; player->transparentStatus = 0; player->transparentDuration = 0; - player->isGlowing = 0; + player->isGlowing = FALSE; player->unk_21E = 0; player->disableDismissTimer = 0; player->attackBoost = 0; @@ -1440,7 +1440,7 @@ void load_partner_actor(void) { ASSERT(actorBP != NULL); nuPiReadRom(partnerData->dmaStart, partnerData->dmaDest, partnerData->dmaEnd - partnerData->dmaStart); - if ((gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) || (gGameStatusPtr->demoFlags & 2)) { + if ((gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) || (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_PARTNER_ACTING)) { x = -95.0f; y = partnerData->y; z = 0.0f; @@ -1520,7 +1520,7 @@ void load_partner_actor(void) { partnerActor->koDuration = 0; partnerActor->transparentStatus = 0; partnerActor->transparentDuration = 0; - partnerActor->isGlowing = 0; + partnerActor->isGlowing = FALSE; partnerActor->unk_21E = 0; partnerActor->disableDismissTimer = 0; partnerActor->attackBoost = 0; @@ -1772,7 +1772,7 @@ Actor* create_actor(Formation formation) { actor->koDuration = 0; actor->transparentStatus = 0; actor->transparentDuration = 0; - actor->isGlowing = 0; + actor->isGlowing = FALSE; actor->unk_21E = 0; actor->disableDismissTimer = 0; actor->attackBoost = 0; @@ -2861,7 +2861,7 @@ void remove_player_buffs(s32 buffs) { if (buffs & PLAYER_BUFF_TRANSPARENT && (player->transparentStatus != 0)) { player->transparentDuration = 0; player->transparentStatus = 0; - playerActorParts->flags &= ~ACTOR_PART_FLAG_100; + playerActorParts->flags &= ~ACTOR_PART_FLAG_TRANSPARENT; remove_status_transparent(player->hudElementDataIndex); } if (buffs & PLAYER_BUFF_WATER_BLOCK && (battleStatus->waterBlockTurnsLeft != 0)) { @@ -2875,7 +2875,7 @@ void remove_player_buffs(s32 buffs) { fx_water_splash(1, player->curPos.x + 15.0f, player->curPos.y + 22.0f, player->curPos.z + 5.0f, 1.0f, 0x18); battleStatus->waterBlockEffect = NULL; - sfx_play_sound(SOUND_0299); + sfx_play_sound(SOUND_DESTROY_WATER_BLOCK); } if (buffs & PLAYER_BUFF_TURBO_CHARGE && (battleStatus->turboChargeTurnsLeft != 0)) { battleStatus->turboChargeTurnsLeft = 0; diff --git a/src/19FAF0.c b/src/19FAF0.c index 13e35b234b..43c8d81850 100644 --- a/src/19FAF0.c +++ b/src/19FAF0.c @@ -417,7 +417,7 @@ HitResult calc_player_damage_enemy(void) { sfx_play_sound_at_position(SOUND_2073, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); break; case 6: - sfx_play_sound_at_position(SOUND_205B, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_FLOWERS_LAUGH, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); break; } } diff --git a/src/1A5830.c b/src/1A5830.c index 15d7e01ffc..eca88d087f 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -2999,7 +2999,7 @@ ApiStatus DispatchDamageEvent(Evt* script, s32 isInitialCall) { s32 actorID = evt_get_variable(script, *args++); Actor* actor; s32 damageAmount; - s32 scriptExists; + s32 eventID; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; @@ -3007,13 +3007,17 @@ ApiStatus DispatchDamageEvent(Evt* script, s32 isInitialCall) { actor = get_actor(actorID); damageAmount = evt_get_variable(script, *args++); + eventID = evt_get_variable(script, *args++); - if (dispatch_damage_event_actor_0(actor, damageAmount, evt_get_variable(script, *args++)) < 0) { + if (dispatch_damage_event_actor_0(actor, damageAmount, eventID) < 0) { return ApiStatus_BLOCK; } - scriptExists = does_script_exist_by_ref(script) != 0; - return scriptExists * ApiStatus_DONE2; + if (does_script_exist_by_ref(script)) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } } ApiStatus DispatchEvent(Evt* script, s32 isInitialCall) { @@ -3434,7 +3438,7 @@ ApiStatus ClearStatusEffects(Evt* script, s32 isInitialCall) { actor->disableEffect->data.disableX->koDuration = 0; actor->attackBoost = 0; actor->defenseBoost = 0; - actor->isGlowing = 0; + actor->isGlowing = FALSE; return ApiStatus_DONE2; } diff --git a/src/80850_len_3060.c b/src/80850_len_3060.c index 32be2ff8f0..c675843623 100644 --- a/src/80850_len_3060.c +++ b/src/80850_len_3060.c @@ -568,7 +568,7 @@ void update_status_bar(void) { return; } - if (gGameStatusPtr->isBattle == 0 && playerData->coins != uiStatus->displayCoins) { + if (!gGameStatusPtr->isBattle && playerData->coins != uiStatus->displayCoins) { status_bar_start_blinking_coins(); } @@ -612,7 +612,7 @@ void update_status_bar(void) { } if (uiStatus->displayHP != playerData->curHP) { - if (gGameStatusPtr->isBattle == 0 && playerData->curHP < uiStatus->displayHP) { + if (!gGameStatusPtr->isBattle && playerData->curHP < uiStatus->displayHP) { status_bar_start_blinking_hp(); } if (uiStatus->displayHP < playerData->curHP) { @@ -630,7 +630,7 @@ void update_status_bar(void) { } if (uiStatus->displayFP != playerData->curFP) { - if (gGameStatusPtr->isBattle == 0 && playerData->curFP < uiStatus->displayFP) { + if (!gGameStatusPtr->isBattle && playerData->curFP < uiStatus->displayFP) { status_bar_start_blinking_fp(); } if (uiStatus->displayFP < playerData->curFP) { @@ -672,7 +672,7 @@ void update_status_bar(void) { } switch (uiStatus->hidden) { - case 0: + case FALSE: uiStatus->drawPosY += 10; if (uiStatus->drawPosY >= 18) { uiStatus->drawPosY = 18; @@ -684,8 +684,8 @@ void update_status_bar(void) { } else { if (!uiStatus->ignoreChanges) { if (!uiStatus->unk_3B[0] || playerStatus->actionState != ACTION_STATE_IDLE) { - if (gGameStatusPtr->isBattle == 0) { - uiStatus->hidden = 1; + if (!gGameStatusPtr->isBattle) { + uiStatus->hidden = TRUE; uiStatus->showTimer = 0; uiStatus->unk_3B[1] = 0; } @@ -694,7 +694,7 @@ void update_status_bar(void) { } } break; - case 1: + case TRUE: uiStatus->drawPosY -= 5; if (uiStatus->drawPosY < -100) { uiStatus->drawPosY = -100; @@ -707,9 +707,9 @@ void update_status_bar(void) { uiStatus->showTimer++; } - if (uiStatus->showTimer >= 240 && gGameStatusPtr->isBattle == 0) { + if (uiStatus->showTimer >= 240 && !gGameStatusPtr->isBattle) { uiStatus->showTimer = 210; - uiStatus->hidden = 0; + uiStatus->hidden = FALSE; uiStatus->unk_3B[0] = 1; uiStatus->unk_3B[1] = 1; } @@ -1355,7 +1355,7 @@ s32 is_status_bar_visible(void) { void status_bar_start_blinking_hp(void) { UiStatus* uiStatus = &gUIStatus; - if (gGameStatusPtr->isBattle == 0) { + if (!gGameStatusPtr->isBattle) { uiStatus->hpBlinkTimer = 120; } @@ -1378,7 +1378,7 @@ void status_bar_stop_blinking_hp(void) { void status_bar_start_blinking_fp(void) { UiStatus* uiStatus = &gUIStatus; - if (gGameStatusPtr->isBattle == 0) { + if (!gGameStatusPtr->isBattle) { uiStatus->fpBlinkTimer = 120; } @@ -1400,7 +1400,7 @@ void status_bar_stop_blinking_fp(void) { void status_bar_start_blinking_coins(void) { UiStatus* uiStatus = &gUIStatus; - if (gGameStatusPtr->isBattle == 0) { + if (!gGameStatusPtr->isBattle) { uiStatus->coinsBlinkTimer = 120; } diff --git a/src/8800.c b/src/8800.c index 0da40064f3..04f1282dd5 100644 --- a/src/8800.c +++ b/src/8800.c @@ -192,8 +192,8 @@ void render_frame(s32 isSecondPass) { camera->unkMatrix = &gDisplayContext->matrixStack[gMatrixListPos]; matrixListPos = gMatrixListPos++; guRotate(&gDisplayContext->matrixStack[matrixListPos], -camera->trueRot.x, 0.0f, 1.0f, 0.0f); - camera->vpAlt.vp.vtrans[0] = camera->vp.vp.vtrans[0] + gGameStatusPtr->unk_82; - camera->vpAlt.vp.vtrans[1] = camera->vp.vp.vtrans[1] + gGameStatusPtr->unk_83; + camera->vpAlt.vp.vtrans[0] = camera->vp.vp.vtrans[0] + gGameStatusPtr->unk_82.x; + camera->vpAlt.vp.vtrans[1] = camera->vp.vp.vtrans[1] + gGameStatusPtr->unk_82.y; if (!(camera->flags & CAMERA_FLAG_ORTHO)) { if (gCurrentCamID != CAM_3) { @@ -436,8 +436,8 @@ void set_cam_viewport(s16 id, s16 x, s16 y, s16 width, s16 height) { camera->vpAlt.vp.vscale[2] = 0x1FF; camera->vpAlt.vp.vscale[3] = 0; - camera->vpAlt.vp.vtrans[0] = gGameStatusPtr->unk_82 + 4 * (s16) ((u16) camera->viewportStartX + (camera->viewportW / 2)); - camera->vpAlt.vp.vtrans[1] = gGameStatusPtr->unk_83 + 4 * (s16) ((u16) camera->viewportStartY + (camera->viewportH / 2)); + camera->vpAlt.vp.vtrans[0] = gGameStatusPtr->unk_82.x + 4 * (s16) ((u16) camera->viewportStartX + (camera->viewportW / 2)); + camera->vpAlt.vp.vtrans[1] = gGameStatusPtr->unk_82.y + 4 * (s16) ((u16) camera->viewportStartY + (camera->viewportH / 2)); camera->vpAlt.vp.vtrans[2] = 0x200; camera->vpAlt.vp.vtrans[3] = 0; } diff --git a/src/C50A0.c b/src/C50A0.c index 8dfbe6ebd0..669b2626a1 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -1654,7 +1654,7 @@ void render_item_entities(void) { alpha = alpha * (255 - a1) / 255; } if (item->flags & (ITEM_ENTITY_FLAG_TRANSPARENT | ITEM_ENTITY_FLAG_HIDING)) { - if (gSpriteShadingProfile->flags) { + if (gSpriteShadingProfile->flags != 0) { gDPSetRenderMode(gMainGfxPos++, AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); } else { @@ -1668,7 +1668,7 @@ void render_item_entities(void) { if (!(item->flags & ITEM_ENTITY_FLAG_40000)) { gDPLoadTLUT_pal16(gMainGfxPos++, 0, gHudElementCacheTablePalette[item->lookupPaletteIndex].data); - if (gSpriteShadingProfile->flags) { + if (gSpriteShadingProfile->flags != 0) { gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 12, gHudElementCacheTableRaster[item->lookupRasterIndex].data); gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); gDPLoadSync(gMainGfxPos++); @@ -2371,9 +2371,9 @@ void update_item_entity_collectable(ItemEntity* item) { item->flags |= ITEM_ENTITY_FLAG_DONE_FALLING; } else { if (IS_BADGE(item->itemID)) { - sfx_play_sound_at_position(SOUND_021B, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_BADGE_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); } else if (IS_ITEM(item->itemID)) { - sfx_play_sound_at_position(SOUND_021A, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_ITEM_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); } else { switch (item->itemID) { case ITEM_HEART: diff --git a/src/actor_api.c b/src/actor_api.c index a586577866..05217d7a13 100644 --- a/src/actor_api.c +++ b/src/actor_api.c @@ -2855,7 +2855,7 @@ ApiStatus GetStatusFlags(Evt* script, s32 isInitialCall) { } for (partsTable = actor->partsTable; partsTable != NULL; partsTable = partsTable->nextPart) { - if (partsTable->flags & 0x100) { + if (partsTable->flags & ACTOR_PART_FLAG_TRANSPARENT) { flags |= STATUS_FLAG_TRANSPARENT; } if (partsTable->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) { @@ -2969,7 +2969,6 @@ ApiStatus GetBattleVar(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - ApiStatus ResetAllActorSounds(Evt* script, s32 isInitialCall) { s32 actorID = evt_get_variable(script, *script->ptrReadPos); @@ -2985,39 +2984,39 @@ s32 SetActorSounds(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); Actor* actor; - s32 temp_s0_4; - s32 temp_s1; - s32 temp_s3; + s32 soundType; + s32 sound1; + s32 sound2; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - temp_s3 = evt_get_variable(script, *args++); - temp_s0_4 = evt_get_variable(script, *args++); - temp_s1 = evt_get_variable(script, *args++); + soundType = evt_get_variable(script, *args++); + sound1 = evt_get_variable(script, *args++); + sound2 = evt_get_variable(script, *args++); actor = get_actor(actorID); - switch (temp_s3) { - case 0: - actor->actorTypeData1[0] = temp_s0_4; - actor->actorTypeData1[1] = temp_s1; + switch (soundType) { + case ACTOR_SOUND_WALK: + actor->actorTypeData1[0] = sound1; + actor->actorTypeData1[1] = sound2; break; - case 1: - actor->actorTypeData1[2] = temp_s0_4; - actor->actorTypeData1[3] = temp_s1; + case ACTOR_SOUND_FLY: + actor->actorTypeData1[2] = sound1; + actor->actorTypeData1[3] = sound2; break; - case 2: - actor->actorTypeData1[4] = temp_s0_4; + case ACTOR_SOUND_JUMP: + actor->actorTypeData1[4] = sound1; break; - case 3: - actor->actorTypeData1[5] = temp_s0_4; + case ACTOR_SOUND_HURT: + actor->actorTypeData1[5] = sound1; break; - case 4: - actor->actorTypeData1b[0] = temp_s0_4; + case ACTOR_SOUND_WALK_INCREMENT: + actor->actorTypeData1b[0] = sound1; break; - case 5: - actor->actorTypeData1b[1] = temp_s0_4; + case ACTOR_SOUND_FLY_INCREMENT: + actor->actorTypeData1b[1] = sound1; break; } @@ -3028,36 +3027,38 @@ ApiStatus ResetActorSounds(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); Actor* actor; - s32 temp_s3; + s32 soundType; + s32 sound1; + s32 sound2; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - temp_s3 = evt_get_variable(script, *args++); - evt_get_variable(script, *args++); - evt_get_variable(script, *args++); + soundType = evt_get_variable(script, *args++); + sound1 = evt_get_variable(script, *args++); + sound2 = evt_get_variable(script, *args++); actor = get_actor(actorID); - switch (temp_s3) { - case 0: + switch (soundType) { + case ACTOR_SOUND_WALK: actor->actorTypeData1[0] = bActorSoundTable[actor->actorType].walk[0]; actor->actorTypeData1[1] = bActorSoundTable[actor->actorType].walk[1]; break; - case 1: + case ACTOR_SOUND_FLY: actor->actorTypeData1[2] = bActorSoundTable[actor->actorType].fly[0]; actor->actorTypeData1[3] = bActorSoundTable[actor->actorType].fly[1]; break; - case 2: + case ACTOR_SOUND_JUMP: actor->actorTypeData1[4] = bActorSoundTable[actor->actorType].jump; break; - case 3: + case ACTOR_SOUND_HURT: actor->actorTypeData1[5] = bActorSoundTable[actor->actorType].hurt; break; - case 4: + case ACTOR_SOUND_WALK_INCREMENT: actor->actorTypeData1b[0] = bActorSoundTable[actor->actorType].delay[0]; break; - case 5: + case ACTOR_SOUND_FLY_INCREMENT: actor->actorTypeData1b[1] = bActorSoundTable[actor->actorType].delay[1]; break; } @@ -3070,40 +3071,40 @@ ApiStatus SetPartSounds(Evt* script, s32 isInitialCall) { s32 actorID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 partID; - s32 temp_s1_5; - s32 temp_s2; - s32 temp_s4; + s32 soundType; + s32 sound1; + s32 sound2; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } partID = evt_get_variable(script, *args++); - temp_s4 = evt_get_variable(script, *args++); - temp_s1_5 = evt_get_variable(script, *args++); - temp_s2 = evt_get_variable(script, *args++); + soundType = evt_get_variable(script, *args++); + sound1 = evt_get_variable(script, *args++); + sound2 = evt_get_variable(script, *args++); actorPart = get_actor_part(get_actor(actorID), partID); - switch (temp_s4) { - case 0: - actorPart->partTypeData[0] = temp_s1_5; - actorPart->partTypeData[1] = temp_s2; + switch (soundType) { + case ACTOR_SOUND_WALK: + actorPart->partTypeData[0] = sound1; + actorPart->partTypeData[1] = sound2; break; - case 1: - actorPart->partTypeData[2] = temp_s1_5; - actorPart->partTypeData[3] = temp_s2; + case ACTOR_SOUND_FLY: + actorPart->partTypeData[2] = sound1; + actorPart->partTypeData[3] = sound2; break; - case 2: - actorPart->partTypeData[4] = temp_s1_5; + case ACTOR_SOUND_JUMP: + actorPart->partTypeData[4] = sound1; break; - case 3: - actorPart->partTypeData[5] = temp_s1_5; + case ACTOR_SOUND_HURT: + actorPart->partTypeData[5] = sound1; break; - case 4: - actorPart->actorTypeData2b[0] = temp_s1_5; + case ACTOR_SOUND_WALK_INCREMENT: + actorPart->actorTypeData2b[0] = sound1; break; - case 5: - actorPart->actorTypeData2b[1] = temp_s1_5; + case ACTOR_SOUND_FLY_INCREMENT: + actorPart->actorTypeData2b[1] = sound1; break; } @@ -3131,7 +3132,6 @@ ApiStatus SetActorType(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - ApiStatus ShowShockEffect(Evt* script, s32 isInitialCall) { s32 actorID = evt_get_variable(script, *script->ptrReadPos); @@ -3248,10 +3248,10 @@ ApiStatus BoostAttack(Evt* script, s32 isInitialCall) { break; case 2: if (script->functionTemp[3] == 0) { - dispatch_event_actor(actor, EVENT_SWAP_PARTNER); + dispatch_event_actor(actor, EVENT_RECEIVE_BUFF); btl_cam_use_preset(BTL_CAM_DEFAULT); btl_cam_move(15); - actor->isGlowing = 1; + actor->isGlowing = TRUE; actor->attackBoost += attackBoost; if (actor->attackBoost > 20) { actor->attackBoost = 20; @@ -3372,10 +3372,10 @@ ApiStatus BoostDefense(Evt* script, s32 isInitialCall) { break; case 2: if (script->functionTemp[3] == 0) { - dispatch_event_actor(actor, EVENT_SWAP_PARTNER); + dispatch_event_actor(actor, EVENT_RECEIVE_BUFF); btl_cam_use_preset(BTL_CAM_DEFAULT); btl_cam_move(15); - actor->isGlowing = 1; + actor->isGlowing = TRUE; actor->defenseBoost += defenseBoost; if (actor->defenseBoost > 20) { actor->defenseBoost = 20; @@ -3483,7 +3483,7 @@ ApiStatus VanishActor(Evt* script, s32 isInitialCall) { break; case 2: if (script->functionTemp[3] == 0) { - dispatch_event_actor(actor, EVENT_SWAP_PARTNER); + dispatch_event_actor(actor, EVENT_RECEIVE_BUFF); btl_cam_use_preset(BTL_CAM_DEFAULT); btl_cam_move(15); inflict_status(actor, 0xE, vanished); @@ -3589,7 +3589,7 @@ ApiStatus ElectrifyActor(Evt* script, s32 isInitialCall) { break; case 2: if (script->functionTemp[3] == 0) { - dispatch_event_actor(actor, EVENT_SWAP_PARTNER); + dispatch_event_actor(actor, EVENT_RECEIVE_BUFF); btl_cam_use_preset(BTL_CAM_DEFAULT); btl_cam_move(15); inflict_status(actor, 0xB, electrified); @@ -3695,7 +3695,7 @@ ApiStatus HealActor(Evt* script, s32 isInitialCall) { switch (script->functionTemp[0]) { case 1: if (script->functionTemp[3] == 0) { - dispatch_event_actor(actor, EVENT_SWAP_PARTNER); + dispatch_event_actor(actor, EVENT_RECEIVE_BUFF); fx_recover(0, x2, y2, z2, hpBoost); show_start_recovery_shimmer(x1, y1, z1, hpBoost); script->functionTemp[3] = 30; diff --git a/src/audio/sfx.c b/src/audio/sfx.c index 6c56e75970..ff6b3b1b12 100644 --- a/src/audio/sfx.c +++ b/src/audio/sfx.c @@ -11,13 +11,13 @@ SHIFT_BSS u16 gCurrentRoomDoorSounds; // map logical looping soundIDs to raw ones s32 LoopingSounds[] = { [SOUND_LOOP_IDX(SOUND_LOOP_00)] SOUND_LRAW_0287, - [SOUND_LOOP_IDX(SOUND_LOOP_01)] SOUND_LRAW_02A8, + [SOUND_LOOP_IDX(SOUND_LOOP_BOBOMB_FUSE)] SOUND_LRAW_BOBOMB_FUSE, [SOUND_LOOP_IDX(SOUND_LOOP_02)] SOUND_LRAW_0054, [SOUND_LOOP_IDX(SOUND_LOOP_03)] SOUND_LRAW_0056, - [SOUND_LOOP_IDX(SOUND_LOOP_04)] SOUND_LRAW_0024, - [SOUND_LOOP_IDX(SOUND_LOOP_05)] SOUND_LRAW_0027, - [SOUND_LOOP_IDX(SOUND_LOOP_06)] SOUND_LRAW_0021, - [SOUND_LOOP_IDX(SOUND_LOOP_07)] SOUND_LRAW_0022, + [SOUND_LOOP_IDX(SOUND_LOOP_TRD_02_LOWER_STAIRS)] SOUND_LRAW_TRD_02_LOWER_STAIRS, + [SOUND_LOOP_IDX(SOUND_LOOP_TRD_04_LOWER_STAIRS)] SOUND_LRAW_TRD_04_LOWER_STAIRS, + [SOUND_LOOP_IDX(SOUND_LOOP_TRD_FLOWING_WATER)] SOUND_LRAW_TRD_FLOWING_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_TRD_RAISE_STAIRS)] SOUND_LRAW_TRD_RAISE_STAIRS, [SOUND_LOOP_IDX(SOUND_LOOP_08)] SOUND_LRAW_CHEERING, [SOUND_LOOP_IDX(SOUND_LOOP_09)] SOUND_LRAW_0273, [SOUND_LOOP_IDX(SOUND_LOOP_0A)] SOUND_LRAW_0275, @@ -25,16 +25,16 @@ s32 LoopingSounds[] = { [SOUND_LOOP_IDX(SOUND_LOOP_0C)] SOUND_LRAW_0274, [SOUND_LOOP_IDX(SOUND_LOOP_0D)] SOUND_LRAW_0273, [SOUND_LOOP_IDX(SOUND_LOOP_0E)] SOUND_LRAW_0274, - [SOUND_LOOP_IDX(SOUND_LOOP_0F)] SOUND_LRAW_0099, - [SOUND_LOOP_IDX(SOUND_LOOP_10)] SOUND_LRAW_009E, + [SOUND_LOOP_IDX(SOUND_LOOP_OBK_LOWER_CHAIN)] SOUND_LRAW_OBK_LOWER_CHAIN, + [SOUND_LOOP_IDX(SOUND_LOOP_MOVE_STATUE)] SOUND_LRAW_MOVE_STATUE, [SOUND_LOOP_IDX(SOUND_LOOP_11)] SOUND_LRAW_032E, - [SOUND_LOOP_IDX(SOUND_LOOP_12)] SOUND_LRAW_008E, - [SOUND_LOOP_IDX(SOUND_LOOP_13)] SOUND_LRAW_0089, - [SOUND_LOOP_IDX(SOUND_LOOP_14)] SOUND_LRAW_0083, + [SOUND_LOOP_IDX(SOUND_LOOP_QUIZ_TICKING)] SOUND_LRAW_QUIZ_TICKING, + [SOUND_LOOP_IDX(SOUND_LOOP_AUDIENCE_MURMUR)] SOUND_LRAW_AUDIENCE_MURMUR, + [SOUND_LOOP_IDX(SOUND_LOOP_TOYBOX_TRAIN_GEAR)] SOUND_LRAW_TOYBOX_TRAIN_GEAR, [SOUND_LOOP_IDX(SOUND_LOOP_15)] SOUND_LRAW_0388, - [SOUND_LOOP_IDX(SOUND_LOOP_16)] SOUND_LRAW_00A0, + [SOUND_LOOP_IDX(SOUND_LOOP_OMO_ROTATING_WHEEL)] SOUND_LRAW_OMO_ROTATING_WHEEL, [SOUND_LOOP_IDX(SOUND_LOOP_17)] SOUND_LRAW_004A, - [SOUND_LOOP_IDX(SOUND_LOOP_18)] SOUND_LRAW_009F, + [SOUND_LOOP_IDX(SOUND_LOOP_MOVE_LARGE_STATUE)] SOUND_LRAW_MOVE_LARGE_STATUE, [SOUND_LOOP_IDX(SOUND_LOOP_19)] SOUND_LRAW_0168, [SOUND_LOOP_IDX(SOUND_LOOP_1A)] SOUND_LRAW_0185, [SOUND_LOOP_IDX(SOUND_LOOP_1B)] SOUND_LRAW_0052, @@ -47,7 +47,7 @@ s32 LoopingSounds[] = { [SOUND_LOOP_IDX(SOUND_LOOP_22)] SOUND_LRAW_0199, [SOUND_LOOP_IDX(SOUND_LOOP_23)] SOUND_LRAW_0194, [SOUND_LOOP_IDX(SOUND_LOOP_24)] SOUND_LRAW_019A, - [SOUND_LOOP_IDX(SOUND_LOOP_25)] SOUND_LRAW_0091, + [SOUND_LOOP_IDX(SOUND_LOOP_PUFF_PUFF_MACHINE)] SOUND_LRAW_PUFF_PUFF_MACHINE, [SOUND_LOOP_IDX(SOUND_LOOP_26)] SOUND_LRAW_0164, [SOUND_LOOP_IDX(SOUND_LOOP_27)] SOUND_LRAW_0271, [SOUND_LOOP_IDX(SOUND_LOOP_28)] SOUND_LRAW_0271, @@ -85,35 +85,35 @@ s32 LoopingSounds[] = { [SOUND_LOOP_IDX(SOUND_LOOP_48)] SOUND_LRAW_0271, [SOUND_LOOP_IDX(SOUND_LOOP_49)] SOUND_LRAW_0271, [SOUND_LOOP_IDX(SOUND_LOOP_4A)] SOUND_LRAW_0050, - [SOUND_LOOP_IDX(SOUND_LOOP_4B)] SOUND_LRAW_0070, + [SOUND_LOOP_IDX(SOUND_LOOP_WINDILL_GEARS)] SOUND_LRAW_WINDILL_GEARS, [SOUND_LOOP_IDX(SOUND_LOOP_4C)] SOUND_LRAW_036C, [SOUND_LOOP_IDX(SOUND_LOOP_4D)] SOUND_LRAW_036D, - [SOUND_LOOP_IDX(SOUND_LOOP_4E)] SOUND_LRAW_0295, + [SOUND_LOOP_IDX(SOUND_LOOP_4E)] SOUND_FLIGHT, [SOUND_LOOP_IDX(SOUND_LOOP_4F)] SOUND_LRAW_0043, [SOUND_LOOP_IDX(SOUND_LOOP_50)] SOUND_LRAW_0197, - [SOUND_LOOP_IDX(SOUND_LOOP_51)] SOUND_LRAW_0221, - [SOUND_LOOP_IDX(SOUND_LOOP_52)] SOUND_LRAW_022A, - [SOUND_LOOP_IDX(SOUND_LOOP_53)] SOUND_LRAW_022B, - [SOUND_LOOP_IDX(SOUND_LOOP_54)] SOUND_LRAW_2040, + [SOUND_LOOP_IDX(SOUND_LOOP_KPA_CHAIN_DRIVE)] SOUND_LRAW_KPA_CHAIN_DRIVE, + [SOUND_LOOP_IDX(SOUND_LOOP_KPA_FILL_WATER)] SOUND_LRAW_KPA_FILL_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_KPA_DRAIN_WATER)] SOUND_LRAW_KPA_DRAIN_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_KPA_FLIP_BRIDGE_PANEL)] SOUND_KPA_FLIP_BRIDGE_PANEL, [SOUND_LOOP_IDX(SOUND_LOOP_JR_TROOPA_SWIM)] SOUND_LRAW_JR_TROOPA_SWIM, - [SOUND_LOOP_IDX(SOUND_LOOP_56)] SOUND_LRAW_0033, - [SOUND_LOOP_IDX(SOUND_LOOP_57)] SOUND_LRAW_0034, + [SOUND_LOOP_IDX(SOUND_LOOP_KKJ_RUMBLING)] SOUND_LRAW_KKJ_RUMBLING, + [SOUND_LOOP_IDX(SOUND_LOOP_OSR_RUMBLING)] SOUND_LRAW_OSR_RUMBLING, [SOUND_LOOP_IDX(SOUND_LOOP_58)] SOUND_LRAW_0039, [SOUND_LOOP_IDX(SOUND_LOOP_59)] SOUND_LRAW_004C, [SOUND_LOOP_IDX(SOUND_LOOP_5A)] SOUND_LRAW_004D, [SOUND_LOOP_IDX(SOUND_LOOP_5B)] SOUND_LRAW_01B1, [SOUND_LOOP_IDX(SOUND_LOOP_5C)] SOUND_LRAW_01B2, - [SOUND_LOOP_IDX(SOUND_LOOP_5D)] SOUND_LRAW_0094, + [SOUND_LOOP_IDX(SOUND_LOOP_DGB_COLLAPSE)] SOUND_LRAW_DGB_COLLAPSE, [SOUND_LOOP_IDX(SOUND_LOOP_5E)] SOUND_LRAW_005D, [SOUND_LOOP_IDX(SOUND_LOOP_5F)] SOUND_LRAW_005B, [SOUND_LOOP_IDX(SOUND_LOOP_60)] SOUND_LRAW_0060, [SOUND_LOOP_IDX(SOUND_LOOP_61)] SOUND_LRAW_01B3, [SOUND_LOOP_IDX(SOUND_LOOP_62)] SOUND_NONE, - [SOUND_LOOP_IDX(SOUND_LOOP_63)] SOUND_LRAW_00AD, - [SOUND_LOOP_IDX(SOUND_LOOP_64)] SOUND_LRAW_00AE, - [SOUND_LOOP_IDX(SOUND_LOOP_65)] SOUND_LRAW_00AF, - [SOUND_LOOP_IDX(SOUND_LOOP_66)] SOUND_LRAW_023D, - [SOUND_LOOP_IDX(SOUND_LOOP_67)] SOUND_LRAW_00A2, + [SOUND_LOOP_IDX(SOUND_LOOP_STAR_SANCTUARY_FAR)] SOUND_LRAW_STAR_SANCTUARY_FAR, + [SOUND_LOOP_IDX(SOUND_LOOP_STAR_SANCTUARY_NEAR)] SOUND_LRAW_STAR_SANCTUARY_NEAR, + [SOUND_LOOP_IDX(SOUND_LOOP_STAR_SANCTUARY_INSIDE)] SOUND_LRAW_STAR_SANCTUARY_INSIDE, + [SOUND_LOOP_IDX(SOUND_LOOP_BOWSER_PROPELLER)] SOUND_LRAW_BOWSER_PROPELLER, + [SOUND_LOOP_IDX(SOUND_LOOP_STAR_CARD_APPEARS)] SOUND_LRAW_STAR_CARD_APPEARS, [SOUND_LOOP_IDX(SOUND_LOOP_68)] SOUND_LRAW_0248, [SOUND_LOOP_IDX(SOUND_LOOP_69)] SOUND_LRAW_0249, [SOUND_LOOP_IDX(SOUND_LOOP_6A)] SOUND_LRAW_0391, @@ -124,26 +124,26 @@ s32 LoopingSounds[] = { }; // all sound IDs for alternating sounds -s32 D_8014F48C[] = { SOUND_SRAW_FIRE_BAR_0_A, SOUND_SRAW_FIRE_BAR_0_B }; -s32 D_8014F494[] = { SOUND_SRAW_FIRE_BAR_1_A, SOUND_SRAW_FIRE_BAR_1_B }; -s32 D_8014F49C[] = { SOUND_SRAW_FIRE_BAR_2_A, SOUND_SRAW_FIRE_BAR_2_B }; -s32 D_8014F4A4[] = { SOUND_SRAW_FIRE_BAR_3_A, SOUND_SRAW_FIRE_BAR_3_B }; -s32 D_8014F4AC[] = { SOUND_SRAW_FIRE_BAR_4_A, SOUND_SRAW_FIRE_BAR_4_B }; -s32 D_8014F4B4[] = { SOUND_SRAW_FIRE_BAR_5_A, SOUND_SRAW_FIRE_BAR_5_B }; -s32 D_8014F4BC[] = { SOUND_SRAW_FIRE_BAR_6_A, SOUND_SRAW_FIRE_BAR_6_B }; -s32 D_8014F4C4[] = { SOUND_SRAW_FIRE_BAR_7_A, SOUND_SRAW_FIRE_BAR_7_B }; -s32 D_8014F4CC[] = { SOUND_SRAW_FIRE_BAR_8_A, SOUND_SRAW_FIRE_BAR_8_B }; -s32 D_8014F4D4[] = { SOUND_SRAW_FIRE_BAR_9_A, SOUND_SRAW_FIRE_BAR_9_B }; -s32 D_8014F4DC[] = { SOUND_SRAW_FIRE_BAR_DEAD, SOUND_SRAW_FIRE_BAR_DEAD }; +s32 FireBar0Sounds[] = { SOUND_SRAW_FIRE_BAR_0_A, SOUND_SRAW_FIRE_BAR_0_B }; +s32 FireBar1Sounds[] = { SOUND_SRAW_FIRE_BAR_1_A, SOUND_SRAW_FIRE_BAR_1_B }; +s32 FireBar2Sounds[] = { SOUND_SRAW_FIRE_BAR_2_A, SOUND_SRAW_FIRE_BAR_2_B }; +s32 FireBar3Sounds[] = { SOUND_SRAW_FIRE_BAR_3_A, SOUND_SRAW_FIRE_BAR_3_B }; +s32 FireBar4Sounds[] = { SOUND_SRAW_FIRE_BAR_4_A, SOUND_SRAW_FIRE_BAR_4_B }; +s32 FireBar5Sounds[] = { SOUND_SRAW_FIRE_BAR_5_A, SOUND_SRAW_FIRE_BAR_5_B }; +s32 FireBar6Sounds[] = { SOUND_SRAW_FIRE_BAR_6_A, SOUND_SRAW_FIRE_BAR_6_B }; +s32 FireBar7Sounds[] = { SOUND_SRAW_FIRE_BAR_7_A, SOUND_SRAW_FIRE_BAR_7_B }; +s32 FireBar8Sounds[] = { SOUND_SRAW_FIRE_BAR_8_A, SOUND_SRAW_FIRE_BAR_8_B }; +s32 FireBar9Sounds[] = { SOUND_SRAW_FIRE_BAR_9_A, SOUND_SRAW_FIRE_BAR_9_B }; +s32 FireBarDeadSounds[] = { SOUND_SRAW_FIRE_BAR_DEAD, SOUND_SRAW_FIRE_BAR_DEAD }; s32 D_8014F4E4[] = { SOUND_SRAW_0B_A, SOUND_SRAW_0B_B }; s32 D_8014F4EC[] = { SOUND_SRAW_0C_A, SOUND_SRAW_0C_B }; s32 D_8014F4F4[] = { SOUND_SRAW_0D_A, SOUND_SRAW_0D_B }; s32 D_8014F4FC[] = { SOUND_SRAW_0E_A, SOUND_SRAW_0E_B }; -s32 D_8014F504[] = { SOUND_BOO_VANISH_A, SOUND_BOO_VANISH_B }; -s32 D_8014F50C[] = { SOUND_BOO_APPEAR_A, SOUND_BOO_APPEAR_B }; +s32 BooVanishSounds[] = { SOUND_BOO_VANISH_A, SOUND_BOO_VANISH_B }; +s32 BooAppearSounds[] = { SOUND_BOO_APPEAR_A, SOUND_BOO_APPEAR_B }; s32 D_8014F514[] = { SOUND_SRAW_11_A, SOUND_SRAW_11_B }; s32 D_8014F51C[] = { SOUND_SRAW_12_A, SOUND_SRAW_12_B }; -s32 D_8014F524[] = { SOUND_SRAW_13_A, SOUND_SRAW_13_B }; +s32 RavenLeapSounds[] = { SOUND_RAVEN_LEAP_A, SOUND_RAVEN_LEAP_B }; s32 D_8014F52C[] = { SOUND_SRAW_14_A, SOUND_SRAW_14_B, SOUND_SRAW_14_C }; s32 D_8014F538[] = { SOUND_SRAW_15_A, SOUND_SRAW_15_B }; s32 D_8014F540[] = { SOUND_SRAW_16_A, SOUND_SRAW_16_B }; @@ -163,26 +163,26 @@ s32 D_8014F59C[] = { SOUND_SRAW_21_A, SOUND_SRAW_21_B }; // map logical alternating soundIDs to lists of raw ones AlternatingSoundSet AlternatingSounds[] = { - SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_0, D_8014F48C), - SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_1, D_8014F494), - SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_2, D_8014F49C), - SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_3, D_8014F4A4), - SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_4, D_8014F4AC), - SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_5, D_8014F4B4), - SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_6, D_8014F4BC), - SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_7, D_8014F4C4), - SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_8, D_8014F4CC), - SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_9, D_8014F4D4), - SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_DEAD, D_8014F4DC), + SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_0, FireBar0Sounds), + SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_1, FireBar1Sounds), + SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_2, FireBar2Sounds), + SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_3, FireBar3Sounds), + SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_4, FireBar4Sounds), + SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_5, FireBar5Sounds), + SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_6, FireBar6Sounds), + SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_7, FireBar7Sounds), + SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_8, FireBar8Sounds), + SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_9, FireBar9Sounds), + SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_DEAD, FireBarDeadSounds), SEQ_SOUND_ENTRY(SOUND_SEQ_0B, D_8014F4E4), SEQ_SOUND_ENTRY(SOUND_SEQ_0C, D_8014F4EC), SEQ_SOUND_ENTRY(SOUND_SEQ_0D, D_8014F4F4), SEQ_SOUND_ENTRY(SOUND_SEQ_0E, D_8014F4FC), - SEQ_SOUND_ENTRY(SOUND_SEQ_0F, D_8014F504), - SEQ_SOUND_ENTRY(SOUND_SEQ_10, D_8014F50C), + SEQ_SOUND_ENTRY(SOUND_SEQ_BOO_VANISH, BooVanishSounds), + SEQ_SOUND_ENTRY(SOUND_SEQ_BOO_APPEAR, BooAppearSounds), SEQ_SOUND_ENTRY(SOUND_SEQ_11, D_8014F514), SEQ_SOUND_ENTRY(SOUND_SEQ_12, D_8014F51C), - SEQ_SOUND_ENTRY(SOUND_SEQ_13, D_8014F524), + SEQ_SOUND_ENTRY(SOUND_SEQ_RAVEN_LEAP, RavenLeapSounds), SEQ_SOUND_ENTRY(SOUND_SEQ_14, D_8014F52C), SEQ_SOUND_ENTRY(SOUND_SEQ_15, D_8014F538), SEQ_SOUND_ENTRY(SOUND_SEQ_16, D_8014F540), @@ -389,7 +389,7 @@ SoundInstance* sfx_get_env_sound_instance(s32 soundID) { return NULL; } -void sfx_play_sound_looping(s32 soundId, u8 volume, u8 pan, s16 pitchShift) { +void sfx_play_sound_looping(s32 soundID, u8 volume, u8 pan, s16 pitchShift) { SoundInstance* sound = gCurrentEnvSounds; s32 i; @@ -400,12 +400,12 @@ void sfx_play_sound_looping(s32 soundId, u8 volume, u8 pan, s16 pitchShift) { } sound->pan = pan; - sound->soundID = soundId; + sound->soundID = soundID; sound->volume = volume; sound->pitchShift = pitchShift; sound->flags |= SOUND_INSTANCE_FLAG_ACTIVE; - snd_start_sound_with_shift(soundId, volume, pan, pitchShift); + snd_start_sound_with_shift(soundID, volume, pan, pitchShift); } void sfx_register_looping_sound_at_position(s32 soundID, s32 flags, f32 x, f32 y, f32 z) { diff --git a/src/background.c b/src/background.c index 385df379ab..3fded87588 100644 --- a/src/background.c +++ b/src/background.c @@ -144,9 +144,9 @@ void appendGfx_background_texture(void) { } else { for (i = 0; i < ARRAY_COUNT(gBackgroundPalette); i++) { u16 palColor = gGameStatusPtr->backgroundPalette[i]; - blendedB = blend_background_channel((palColor >> 1) & 0x1F, fogB >> 3, fogA); - blendedG = blend_background_channel((palColor >> 6) & 0x1F, fogG >> 3, fogA); - blendedR = blend_background_channel((palColor >> 11) & 0x1F, fogR >> 3, fogA); + blendedB = blend_background_channel(UNPACK_PAL_B(palColor), fogB >> 3, fogA); + blendedG = blend_background_channel(UNPACK_PAL_G(palColor), fogG >> 3, fogA); + blendedR = blend_background_channel(UNPACK_PAL_R(palColor), fogR >> 3, fogA); gBackgroundPalette[i] = blendedB << 1 | blendedG << 6 | blendedR << 11 | 1; } } @@ -156,9 +156,9 @@ void appendGfx_background_texture(void) { default: for (i = 0; i < ARRAY_COUNT(gBackgroundPalette); i++) { u16 palColor = gGameStatusPtr->backgroundPalette[i]; - blendedB = (b2 >> 3) + ((((palColor >> 1) & 0x1F) * b1) >> 8); - blendedG = (g2 >> 3) + ((((palColor >> 6) & 0x1F) * g1) >> 8); - blendedR = (r2 >> 3) + ((((palColor >> 11) & 0x1F) * r1) >> 8); + blendedB = (b2 >> 3) + ((UNPACK_PAL_B(palColor) * b1) >> 8); + blendedG = (g2 >> 3) + ((UNPACK_PAL_G(palColor) * g1) >> 8); + blendedR = (r2 >> 3) + ((UNPACK_PAL_R(palColor) * r1) >> 8); if (blendedB > 0x1F) { blendedB = 0x1F; diff --git a/src/background_gfx.c b/src/background_gfx.c index 0df2bf408b..71c178a157 100644 --- a/src/background_gfx.c +++ b/src/background_gfx.c @@ -42,9 +42,9 @@ s32 gfx_frame_filter_pass_0(const u16* frameBuffer0, const u16* frameBuffer1, s3 s32 pixel = SCREEN_WIDTH * y + x; out->a = (frameBuffer1[pixel] >> 2) & 0xF; - out->r = (frameBuffer0[pixel] >> 11); - out->g = (frameBuffer0[pixel] >> 6) & 0x1F; - out->b = (frameBuffer0[pixel] >> 1) & 0x1F; + out->r = UNPACK_PAL_R(frameBuffer0[pixel]); + out->g = UNPACK_PAL_G(frameBuffer0[pixel]); + out->b = UNPACK_PAL_B(frameBuffer0[pixel]); } void gfx_frame_filter_pass_1(Color_RGBA8* filterBuf0, Color_RGBA8 filterBuf1, u16* out) { diff --git a/src/battle/action_cmd.c b/src/battle/action_cmd.c index a70573037b..45c2cdd94d 100644 --- a/src/battle/action_cmd.c +++ b/src/battle/action_cmd.c @@ -274,7 +274,7 @@ void action_command_init_status(void) { } } - if (gGameStatusPtr->demoFlags & 1) { + if (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED) { actionCommandStatus->autoSucceed = TRUE; } @@ -553,7 +553,7 @@ s32 check_block_input(s32 buttonMask) { return TRUE; } - if (battleStatus->actionCommandMode == ACTION_COMMAND_MODE_NOT_LEARNED || (gGameStatusPtr->demoFlags & 1)) { + if (battleStatus->actionCommandMode == ACTION_COMMAND_MODE_NOT_LEARNED || (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED)) { return FALSE; } diff --git a/src/battle/action_cmd/body_slam.c b/src/battle/action_cmd/body_slam.c index b0ca639106..036c7da0a2 100644 --- a/src/battle/action_cmd/body_slam.c +++ b/src/battle/action_cmd/body_slam.c @@ -132,7 +132,7 @@ void N(update)(void) { hud_element_set_script(actionCommandStatus->hudElements[2], &HES_TimingReady); hud_element_set_script(actionCommandStatus->hudElements[0], &HES_AButton); if (!actionCommandStatus->isBarFilled) { - sfx_play_sound(SOUND_0234); + sfx_play_sound(SOUND_TIMING_BAR_GO); actionCommandStatus->isBarFilled = TRUE; } } diff --git a/src/battle/action_cmd/hammer.c b/src/battle/action_cmd/hammer.c index 6bcb73de40..0f6820a8ec 100644 --- a/src/battle/action_cmd/hammer.c +++ b/src/battle/action_cmd/hammer.c @@ -215,14 +215,14 @@ void N(update)(void) { hud_element_set_script(actionCommandStatus->hudElements[4], &HES_TimingCharge3); battleStatus->actionResult = 0; if (actionCommandStatus->frameCounter == 0 && actionCommandStatus->playHammerSounds) { - sfx_play_sound(SOUND_0233); + sfx_play_sound(SOUND_TIMING_BAR_TICK); } } else if (actionCommandStatus->frameCounter < temp_f20 * 2) { hud_element_set_script(actionCommandStatus->hudElements[3], &HES_TimingCharge2); battleStatus->actionResult = 1; if (actionCommandStatus->frameCounter == temp_f20) { if (actionCommandStatus->playHammerSounds) { - sfx_play_sound(SOUND_0233); + sfx_play_sound(SOUND_TIMING_BAR_TICK); } } } else if (actionCommandStatus->frameCounter < temp_f20 * 3.0f) { @@ -230,7 +230,7 @@ void N(update)(void) { battleStatus->actionResult = 2; if (actionCommandStatus->frameCounter == temp_f20 * 2) { if (actionCommandStatus->playHammerSounds) { - sfx_play_sound(SOUND_0233); + sfx_play_sound(SOUND_TIMING_BAR_TICK); } } } @@ -240,7 +240,7 @@ void N(update)(void) { hud_element_set_script(actionCommandStatus->hudElements[1], &HES_TimingReady); hud_element_set_script(actionCommandStatus->hudElements[5], &HES_StickTapNeutral); if (actionCommandStatus->playHammerSounds) { - sfx_play_sound(SOUND_0234); + sfx_play_sound(SOUND_TIMING_BAR_GO); } if (actionCommandStatus->autoSucceed != 0 && actionCommandStatus->autoSucceed != 2) { actionCommandStatus->autoSucceed = 2; diff --git a/src/battle/action_cmd/jump.c b/src/battle/action_cmd/jump.c index 74da979759..31b4e6726f 100644 --- a/src/battle/action_cmd/jump.c +++ b/src/battle/action_cmd/jump.c @@ -187,7 +187,7 @@ void N(update)(void) { void N(draw)(void) { hud_element_draw_clipped(gActionCommandStatus.hudElements[0]); - if (!(gGameStatusPtr->demoFlags & 1)) { + if (!(gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED)) { hud_element_draw_clipped(gActionCommandStatus.hudElements[1]); } } diff --git a/src/battle/action_cmd/tidal_wave.c b/src/battle/action_cmd/tidal_wave.c index 62eab12d3f..3041a30703 100644 --- a/src/battle/action_cmd/tidal_wave.c +++ b/src/battle/action_cmd/tidal_wave.c @@ -139,7 +139,7 @@ void N(update)(void) { actionCommandStatus->hudPosX + ((actionCommandStatus->unk_5D - 1) * 20) + 16, actionCommandStatus->hudPosY); hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); - sfx_play_sound(SOUND_0233); + sfx_play_sound(SOUND_TIMING_BAR_TICK); actionCommandStatus->lookBackCounter = 1; actionCommandStatus->state = 12; // fallthrough @@ -263,7 +263,7 @@ void N(update)(void) { } actionCommandStatus->state = 11; battleStatus->actionResult++; - sfx_play_sound(SOUND_021C); + sfx_play_sound(SOUND_APPROVE); return; } diff --git a/src/battle/action_cmd/water_block.c b/src/battle/action_cmd/water_block.c index 7eff8391b2..c5cb526cc2 100644 --- a/src/battle/action_cmd/water_block.c +++ b/src/battle/action_cmd/water_block.c @@ -349,16 +349,16 @@ void N(update)(void) { btl_set_popup_duration(99); if (actionCommandStatus->frameCounter == 42) { hud_element_set_script(actionCommandStatus->hudElements[11], &HES_TimingCharge3); - sfx_play_sound(SOUND_0233); + sfx_play_sound(SOUND_TIMING_BAR_TICK); } if (actionCommandStatus->frameCounter == 22) { hud_element_set_script(actionCommandStatus->hudElements[12], &HES_TimingCharge2); - sfx_play_sound(SOUND_0233); + sfx_play_sound(SOUND_TIMING_BAR_TICK); } if (actionCommandStatus->frameCounter == 2) { hud_element_set_script(actionCommandStatus->hudElements[2], &HES_TimingReady); hud_element_set_script(actionCommandStatus->hudElements[0], &HES_AButtonDown); - sfx_play_sound(SOUND_0234); + sfx_play_sound(SOUND_TIMING_BAR_GO); } actionCommandStatus->frameCounter--; if (actionCommandStatus->frameCounter == 0) { @@ -428,7 +428,7 @@ void N(update)(void) { if (actionCommandStatus->frameCounter == 2) { hud_element_set_script(actionCommandStatus->hudElements[3], &HES_TimingReady); hud_element_set_script(actionCommandStatus->hudElements[0], &HES_AButtonDown); - sfx_play_sound(SOUND_0234); + sfx_play_sound(SOUND_TIMING_BAR_GO); } actionCommandStatus->frameCounter--; if (actionCommandStatus->frameCounter == 0) { @@ -502,7 +502,7 @@ void N(update)(void) { if (actionCommandStatus->frameCounter == 2) { hud_element_set_script(actionCommandStatus->hudElements[4], &HES_TimingReady); hud_element_set_script(actionCommandStatus->hudElements[0], &HES_AButtonDown); - sfx_play_sound(SOUND_0234); + sfx_play_sound(SOUND_TIMING_BAR_GO); } actionCommandStatus->frameCounter--; if (actionCommandStatus->frameCounter == 0) { diff --git a/src/battle/area/dig/actor/tubba_blubba.c b/src/battle/area/dig/actor/tubba_blubba.c index d43c5619d4..541347e1ae 100644 --- a/src/battle/area/dig/actor/tubba_blubba.c +++ b/src/battle/area/dig/actor/tubba_blubba.c @@ -277,8 +277,8 @@ EvtScript N(attackFistDrop) = { EVT_END_IF EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim02) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -305,8 +305,8 @@ EvtScript N(attackFistDrop) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_SWITCH(LVarF) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CASE_OR_EQ(10) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim02) @@ -337,8 +337,8 @@ EvtScript N(attackBodyCrush) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim10) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_THREAD EVT_WAIT(12) @@ -406,8 +406,8 @@ EvtScript N(attackBodyCrush) = { EVT_CALL(MoveBattleCamOver, 20) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CASE_OR_EQ(10) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5) EVT_IF_FLAG(LVar5, STATUS_FLAG_SHRINK) diff --git a/src/battle/area/flo2/actor/huff_n_puff.c b/src/battle/area/flo2/actor/huff_n_puff.c index 1caeafde35..453747aa9c 100644 --- a/src/battle/area/flo2/actor/huff_n_puff.c +++ b/src/battle/area/flo2/actor/huff_n_puff.c @@ -807,7 +807,7 @@ EvtScript N(OnDeath) = { EVT_KILL_THREAD(LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_EFFECT_SNAKING_STATIC), LVar0) EVT_CALL(RemoveEffect, LVar0) - EVT_CALL(StopSound, SOUND_035C) + EVT_CALL(StopSound, SOUND_CHARGE_LIGHTNING) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_HuffNPuff_Anim08) @@ -909,7 +909,7 @@ EvtScript N(OnBurnDeath) = { EVT_KILL_THREAD(LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_EFFECT_SNAKING_STATIC), LVar0) EVT_CALL(RemoveEffect, LVar0) - EVT_CALL(StopSound, SOUND_035C) + EVT_CALL(StopSound, SOUND_CHARGE_LIGHTNING) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_HuffNPuff_Anim27) @@ -2228,7 +2228,7 @@ EvtScript N(electricCharge) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_2, EVT_PTR(N(IdleAnimations_charged2))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_3, EVT_PTR(N(IdleAnimations_charged3))) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_ELECTRIFIED, TRUE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHARGE_LIGHTNING) EVT_CALL(N(StartRumbleWithParams), 70, 120) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 60, EVT_FLOAT(0.3)) @@ -2295,7 +2295,7 @@ EvtScript N(attackGroundLightning) = { EVT_GOTO(1) EVT_END_IF EVT_END_THREAD - EVT_CALL(StopSound, SOUND_035C) + EVT_CALL(StopSound, SOUND_CHARGE_LIGHTNING) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D3) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 10) @@ -2372,7 +2372,7 @@ EvtScript N(electicCharge_copy) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_2, EVT_PTR(N(IdleAnimations_charged2))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_3, EVT_PTR(N(IdleAnimations_charged3))) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_ELECTRIFIED, TRUE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHARGE_LIGHTNING) EVT_CALL(N(StartRumbleWithParams), 70, 120) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 60, EVT_FLOAT(0.3)) @@ -2459,7 +2459,7 @@ EvtScript N(attackDirectLightning) = { EVT_GOTO(1) EVT_END_IF EVT_END_THREAD - EVT_CALL(StopSound, SOUND_035C) + EVT_CALL(StopSound, SOUND_CHARGE_LIGHTNING) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035B) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -2576,8 +2576,8 @@ EvtScript N(attackDirectLightning) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, 0, 10, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim01) @@ -5180,9 +5180,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(func_80269470) EVT_END_IF EVT_SWITCH(LVarA) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_TUFF_PUFF_BIT_ARRAY), LVar0) diff --git a/src/battle/area/flo2/actor/spike.c b/src/battle/area/flo2/actor/spike.c index bef0ae9de1..ebbc8b6d96 100644 --- a/src/battle/area/flo2/actor/spike.c +++ b/src/battle/area/flo2/actor/spike.c @@ -290,7 +290,7 @@ EvtScript N(attack) = { EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_END_IF EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, LVar3, 30, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAKILESTER_SUMMON_SPINY) EVT_THREAD EVT_LOOP(15) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 1, 0, 0) @@ -311,7 +311,7 @@ EvtScript N(attack) = { EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_ThrowSpiny) EVT_WAIT(3) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_02C6) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_LAKILESTER_THROW_SPINY) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_2, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) diff --git a/src/battle/area/hos/actor/goombario_tutor.c b/src/battle/area/hos/actor/goombario_tutor.c index ecc0a1877c..dcdbef1561 100644 --- a/src/battle/area/hos/actor/goombario_tutor.c +++ b/src/battle/area/hos/actor/goombario_tutor.c @@ -236,8 +236,8 @@ EvtScript N(takeTurn_80219444) = { EVT_CALL(CloseActionCommandInfo) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CASE_OR_EQ(10) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) EVT_WAIT(1) diff --git a/src/battle/area/hos/actor/magikoopa.c b/src/battle/area/hos/actor/magikoopa.c index ee7dfbf2e4..fd0a7c43a3 100644 --- a/src/battle/area/hos/actor/magikoopa.c +++ b/src/battle/area/hos/actor/magikoopa.c @@ -985,8 +985,8 @@ EvtScript N(shapeSpell) = { EVT_WAIT(30) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar9, 0, 0, 1, 16) EVT_SWITCH(LVar9) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(PlaySoundAtActor, LVarA, SOUND_SPELL_CAST2) EVT_END_IF @@ -1117,8 +1117,8 @@ EvtScript N(shapeSpell) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT), 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_IF EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_WAIT(20) EVT_CALL(YieldTurn) EVT_END_CASE_GROUP 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 f9aa475af9..e4fb2bdb79 100644 --- a/src/battle/area/isk_part_2/actor/chain_chomp.c +++ b/src/battle/area/isk_part_2/actor/chain_chomp.c @@ -485,21 +485,21 @@ EvtScript N(EVS_HandleEvent) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4)) EVT_CALL(AddGoalPos, ACTOR_SELF, 30, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_CALL(AddGoalPos, ACTOR_SELF, 15, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_CALL(AddGoalPos, ACTOR_SELF, 5, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_ChainChomp_SlowBite) EVT_EXEC_WAIT(N(EVS_Chomp_HopHome)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_THREAD @@ -691,7 +691,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_ADD(LVar0, 45) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) @@ -715,7 +715,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) @@ -727,7 +727,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_SUB(LVar0, 25) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) @@ -737,7 +737,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_SUB(LVar0, 15) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 4, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) @@ -793,7 +793,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) @@ -803,7 +803,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_ADD(LVar0, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) @@ -813,7 +813,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_ADD(LVar0, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) @@ -822,7 +822,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_THREAD EVT_SUB(LVar0, 10) EVT_CALL(JumpToGoal, ACTOR_SELF, 4, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) @@ -891,7 +891,7 @@ EvtScript N(EVS_Chomp_HopToPos) = { EVT_IF_LT(LVar4, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) @@ -903,7 +903,7 @@ EvtScript N(EVS_Chomp_HopToPos) = { EVT_ADD(LVar3, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar3, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) @@ -917,7 +917,7 @@ EvtScript N(EVS_Chomp_HopToPos) = { EVT_IF_LT(LVar4, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) @@ -928,7 +928,7 @@ EvtScript N(EVS_Chomp_HopToPos) = { EVT_SUB(LVar3, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar3, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) diff --git a/src/battle/area/isk_part_2/actor/tutankoopa.c b/src/battle/area/isk_part_2/actor/tutankoopa.c index 351e11c3bb..25334d7f52 100644 --- a/src/battle/area/isk_part_2/actor/tutankoopa.c +++ b/src/battle/area/isk_part_2/actor/tutankoopa.c @@ -721,7 +721,7 @@ EvtScript N(EVS_Attack_DropDebris) = { EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 70) - EVT_CALL(PlaySound, SOUND_20E7) + EVT_CALL(PlaySound, SOUND_LEVITATE) 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) @@ -743,7 +743,7 @@ EvtScript N(EVS_Attack_DropDebris) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 20, 315, 30, 0, 0) - EVT_CALL(PlaySound, SOUND_20E8) + EVT_CALL(PlaySound, SOUND_ILLUSION_DISSOLVE) EVT_ELSE EVT_WAIT(50) EVT_CALL(PlaySound, SOUND_20E9) @@ -751,7 +751,7 @@ EvtScript N(EVS_Attack_DropDebris) = { EVT_CALL(StartRumble, 10) EVT_CALL(PlaySound, SOUND_20EA) EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_20E8) + EVT_CALL(PlaySound, SOUND_ILLUSION_DISSOLVE) EVT_END_IF EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_DebrisDropState, LVar0) EVT_SWITCH(LVar0) @@ -1047,7 +1047,7 @@ EvtScript N(EVS_Move_SummonChomp) = { EVT_CALL(SetBattleCamTarget, LVar0, LVar1, LVar2) EVT_CALL(MoveBattleCamOver, 5) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2061) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_BITE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamZoom, 200) EVT_CALL(SetBattleCamTarget, LVar0, LVar1, LVar2) @@ -1128,7 +1128,7 @@ EvtScript N(EVS_SummonedChompHop) = { EVT_IF_LT(LVar6, LVar4) EVT_CALL(SetGoalPos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, LVarB, LVar3, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_THREAD @@ -1136,7 +1136,7 @@ EvtScript N(EVS_SummonedChompHop) = { EVT_SUB(LVar5, LVar4) EVT_CALL(SetGoalPos, LVarB, LVar5, LVar1, LVar2) EVT_CALL(JumpToGoal, LVarB, LVar3, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_THREAD diff --git a/src/battle/area/kgr/actor/fuzzipede.c b/src/battle/area/kgr/actor/fuzzipede.c index 505b97a4e0..3ab576a13f 100644 --- a/src/battle/area/kgr/actor/fuzzipede.c +++ b/src/battle/area/kgr/actor/fuzzipede.c @@ -386,7 +386,7 @@ EvtScript N(handleEvent_802197FC) = { EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_Fuzzipede_Anim04) EVT_EXEC_WAIT(EVS_Enemy_Recover) - EVT_CASE_EQ(EVENT_SWAP_PARTNER) + EVT_CASE_EQ(EVENT_RECEIVE_BUFF) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim19) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba_1.c b/src/battle/area/kmr_part_2/actor/blue_goomba_1.c index de87d73825..94297271a2 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba_1.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba_1.c @@ -309,8 +309,8 @@ EvtScript N(takeTurn_8021A5A0) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Blue_Midair) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -421,8 +421,8 @@ EvtScript N(takeTurn_8021A5A0) = { EVT_END_SWITCH EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) EVT_WAIT(1) diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba_2.c b/src/battle/area/kmr_part_2/actor/blue_goomba_2.c index 1ae889c606..cf290e3484 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba_2.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba_2.c @@ -305,8 +305,8 @@ EvtScript N(takeTurn_8021E0F0) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Blue_Midair) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -417,8 +417,8 @@ EvtScript N(takeTurn_8021E0F0) = { EVT_END_SWITCH EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) EVT_WAIT(1) 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 7cfaac7824..24c539a138 100644 --- a/src/battle/area/kmr_part_2/actor/goomba_king.c +++ b/src/battle/area/kmr_part_2/actor/goomba_king.c @@ -414,8 +414,8 @@ EvtScript N(80221680) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 2, BS_FLAGS1_10) EVT_SWITCH(LVarA) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0x80000000, 0, 0, 0) EVT_END_IF @@ -493,8 +493,8 @@ EvtScript N(80221CD4) = { EVT_END_THREAD EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 2, BS_FLAGS1_10) EVT_SWITCH(LVarA) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_THREAD EVT_WAIT(12) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_3, SOUND_0301) diff --git a/src/battle/area/kmr_part_2/actor/red_goomba_1.c b/src/battle/area/kmr_part_2/actor/red_goomba_1.c index 8661187dbf..e1e14e6891 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba_1.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba_1.c @@ -309,8 +309,8 @@ EvtScript N(takeTurn_8021C3B0) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Red_Midair) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -421,8 +421,8 @@ EvtScript N(takeTurn_8021C3B0) = { EVT_END_SWITCH EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) EVT_WAIT(1) diff --git a/src/battle/area/kmr_part_2/actor/red_goomba_2.c b/src/battle/area/kmr_part_2/actor/red_goomba_2.c index 60ac8a6f76..d72b69531c 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba_2.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba_2.c @@ -305,8 +305,8 @@ EvtScript N(takeTurn_8021FAF0) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Red_Midair) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -417,8 +417,8 @@ EvtScript N(takeTurn_8021FAF0) = { EVT_END_SWITCH EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) EVT_WAIT(1) 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 2f197861ec..f744d1202d 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 @@ -405,8 +405,8 @@ EvtScript N(takeTurn_80225314) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Jump) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 2, BS_FLAGS1_10) EVT_SWITCH(LVarA) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(2.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Midair) 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 8a26b206f8..b844dfc37f 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 @@ -215,7 +215,7 @@ EvtScript N(8022C6D4) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) - EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) EVT_WAIT(30) EVT_END_IF EVT_END_IF @@ -826,13 +826,13 @@ EvtScript N(8022ED10) = { 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) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_SpikedParaJrTroopa_FlyFast) @@ -840,7 +840,7 @@ EvtScript N(8022ED10) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) EVT_SET(LVar1, 20) @@ -872,7 +872,7 @@ EvtScript N(8022ED10) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_SpikedParaJrTroopa_FlyFast) @@ -880,7 +880,7 @@ EvtScript N(8022ED10) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_SpikedParaJrTroopa_Dive) @@ -924,12 +924,12 @@ EvtScript N(8022F468) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 6, BS_FLAGS1_10) EVT_SWITCH(LVarF) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_THREAD EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) 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 da6b4add76..e5f5a80143 100644 --- a/src/battle/area/kmr_part_3/actor/jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/jr_troopa.c @@ -355,8 +355,8 @@ EvtScript N(takeTurn_802234A4) = { 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) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) 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 684cea9608..3bd1e9fefd 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 @@ -145,7 +145,7 @@ EvtScript N(8022A750) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) - EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) EVT_WAIT(30) EVT_END_IF EVT_END_IF @@ -396,8 +396,8 @@ EvtScript N(takeTurn_8022B4F0) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarA) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST2) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 120) 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 55903843f1..9170cfb446 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 @@ -133,7 +133,7 @@ EvtScript N(80225F7C) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) - EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) EVT_WAIT(30) EVT_END_IF EVT_END_IF @@ -406,13 +406,13 @@ EvtScript N(takeTurn_80226F58) = { 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) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ParaJrTroopa_FlyFast) @@ -420,7 +420,7 @@ EvtScript N(takeTurn_80226F58) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) EVT_SET(LVar1, 20) @@ -451,7 +451,7 @@ EvtScript N(takeTurn_80226F58) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ParaJrTroopa_FlyFast) @@ -459,7 +459,7 @@ EvtScript N(takeTurn_80226F58) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ParaJrTroopa_Dive) @@ -469,8 +469,8 @@ EvtScript N(takeTurn_80226F58) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CASE_OR_EQ(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetGoalToTarget, ACTOR_SELF) 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 4d6e9c0574..4fb50ce1cd 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 @@ -126,7 +126,7 @@ EvtScript N(80228084) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) - EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) EVT_WAIT(30) EVT_END_IF EVT_END_IF @@ -455,13 +455,13 @@ EvtScript N(takeTurn_8022936C) = { 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) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedParaJrTroopa_FlyFast) @@ -469,7 +469,7 @@ EvtScript N(takeTurn_8022936C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) EVT_SET(LVar1, 20) @@ -500,7 +500,7 @@ EvtScript N(takeTurn_8022936C) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedParaJrTroopa_FlyFast) @@ -508,7 +508,7 @@ EvtScript N(takeTurn_8022936C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedParaJrTroopa_Dive) @@ -518,8 +518,8 @@ EvtScript N(takeTurn_8022936C) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CASE_OR_EQ(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c b/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c index 2e8d1dc2f8..5f6b8d1292 100644 --- a/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c +++ b/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c @@ -386,15 +386,15 @@ EvtScript N(takeTurn_8021CDFC) = { 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) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66) EVT_CALL(SetBattleCamZoom, 300) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) @@ -402,7 +402,7 @@ EvtScript N(takeTurn_8021CDFC) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) @@ -444,7 +444,7 @@ EvtScript N(takeTurn_8021CDFC) = { EVT_CALL(SetBattleCamZoom, 300) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) @@ -452,7 +452,7 @@ EvtScript N(takeTurn_8021CDFC) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -462,8 +462,8 @@ EvtScript N(takeTurn_8021CDFC) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, ((0)), 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) @@ -782,8 +782,8 @@ EvtScript N(takeTurn_8021E788) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Midair) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, ((0)), 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -894,8 +894,8 @@ EvtScript N(takeTurn_8021E788) = { EVT_END_SWITCH EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, ((0)), 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) EVT_WAIT(1) diff --git a/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c b/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c index 49b7021338..0a04ff7b73 100644 --- a/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c +++ b/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c @@ -321,8 +321,8 @@ EvtScript N(takeTurn_8021B19C) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedGoomba_Midair) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, ((0)), 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -433,8 +433,8 @@ EvtScript N(takeTurn_8021B19C) = { EVT_END_SWITCH EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, ((0)), 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) EVT_WAIT(1) diff --git a/src/battle/area/kpa2/actor/bowser.c b/src/battle/area/kpa2/actor/bowser.c index 4a3f50c168..499666e6c6 100644 --- a/src/battle/area/kpa2/actor/bowser.c +++ b/src/battle/area/kpa2/actor/bowser.c @@ -483,8 +483,8 @@ EvtScript N(attackFlameBreath) = { EVT_END }; -#include "common/FadeBackgroundToBlack.inc.c" -#include "common/UnfadeBackgroundToBlack.inc.c" +#include "common/FadeBackgroundDarken.inc.c" +#include "common/FadeBackgroundLighten.inc.c" EvtScript N(attackShockwaveDrain) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -495,7 +495,7 @@ EvtScript N(attackShockwaveDrain) = { EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) EVT_WAIT(10) - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 15) EVT_SUB(LVar2, 3) @@ -513,7 +513,7 @@ EvtScript N(attackShockwaveDrain) = { EVT_SET(LVar1, 55) EVT_PLAY_EFFECT(EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0) EVT_THREAD - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_END_THREAD EVT_WAIT(8) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) diff --git a/src/battle/area/kpa2/actor/bowser_intro.c b/src/battle/area/kpa2/actor/bowser_intro.c index dd7db58611..05f72c1177 100644 --- a/src/battle/area/kpa2/actor/bowser_intro.c +++ b/src/battle/area/kpa2/actor/bowser_intro.c @@ -145,8 +145,8 @@ ActorBlueprint NAMESPACE = { #include "common/StartRumbleWithParams.inc.c" #include "common/UnkFireBreathFXFunc.inc.c" #include "common/UnkBowserFunc1.inc.c" -#include "common/FadeBackgroundToBlack.inc.c" -#include "common/UnfadeBackgroundToBlack.inc.c" +#include "common/FadeBackgroundDarken.inc.c" +#include "common/FadeBackgroundLighten.inc.c" #include "common/RemoveChillOut.inc.c" #include "common/StarRodAppearEffect.inc.c" #include "common/StarRodPowerUpEffect.inc.c" @@ -531,7 +531,7 @@ EvtScript N(unkDecorationScript) = { }; EvtScript N(useStarRod) = { - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -598,7 +598,7 @@ EvtScript N(useStarRod) = { EVT_END_THREAD EVT_WAIT(75) EVT_THREAD - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpLaugh) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) diff --git a/src/battle/area/kpa2/actor/bowser_phase_1.c b/src/battle/area/kpa2/actor/bowser_phase_1.c index 0c2b3c0dae..69011c89d5 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_1.c +++ b/src/battle/area/kpa2/actor/bowser_phase_1.c @@ -157,8 +157,8 @@ ActorBlueprint NAMESPACE = { #include "common/StartRumbleWithParams.inc.c" #include "common/UnkBowserFunc1.inc.c" -#include "common/FadeBackgroundToBlack.inc.c" -#include "common/UnfadeBackgroundToBlack.inc.c" +#include "common/FadeBackgroundDarken.inc.c" +#include "common/FadeBackgroundLighten.inc.c" #include "common/RemoveChillOut.inc.c" #include "common/StarRodAppearEffect.inc.c" #include "common/StarRodPowerUpEffect.inc.c" @@ -355,8 +355,8 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_WAIT(1000) - EVT_CASE_EQ(EVENT_SWAP_PARTNER) - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CASE_EQ(EVENT_RECEIVE_BUFF) + EVT_CALL(N(FadeBackgroundLighten)) EVT_CASE_EQ(EVENT_STAR_BEAM) EVT_CALL(FreezeBattleCam, TRUE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 1) @@ -587,7 +587,7 @@ EvtScript N(unkDecorationScript) = { }; EvtScript N(useStarRod) = { - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -654,7 +654,7 @@ EvtScript N(useStarRod) = { EVT_END_THREAD EVT_WAIT(75) EVT_THREAD - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpLaugh) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) @@ -754,7 +754,7 @@ EvtScript N(recover) = { EVT_CALL(MoveBattleCamOver, 40) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_CAST_RECOVER) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -1323,7 +1323,7 @@ EvtScript N(attackShockwaveDrain) = { EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) EVT_WAIT(10) - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) @@ -1364,7 +1364,7 @@ EvtScript N(attackShockwaveDrain) = { 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)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_END_THREAD EVT_WAIT(8) EVT_CALL(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/area/kpa2/actor/bowser_phase_2.c b/src/battle/area/kpa2/actor/bowser_phase_2.c index 68ff7555d6..b02f403ff3 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_2.c +++ b/src/battle/area/kpa2/actor/bowser_phase_2.c @@ -156,8 +156,8 @@ ActorBlueprint NAMESPACE = { #define BOWSER_LARGE #include "common/StartRumbleWithParams.inc.c" #include "common/UnkBowserFunc1.inc.c" -#include "common/FadeBackgroundToBlack.inc.c" -#include "common/UnfadeBackgroundToBlack.inc.c" +#include "common/FadeBackgroundDarken.inc.c" +#include "common/FadeBackgroundLighten.inc.c" #include "common/RemoveChillOut.inc.c" #include "common/StarRodAppearEffect.inc.c" #include "common/StarRodPowerUpEffect.inc.c" @@ -294,8 +294,8 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PostJump) 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_RECEIVE_BUFF) + EVT_CALL(N(FadeBackgroundLighten)) EVT_CASE_EQ(EVENT_30) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt) @@ -438,7 +438,7 @@ EvtScript N(unkDecorationScript) = { }; EvtScript N(useStarRod) = { - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -505,7 +505,7 @@ EvtScript N(useStarRod) = { EVT_END_THREAD EVT_WAIT(75) EVT_THREAD - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpLaugh) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) @@ -605,7 +605,7 @@ EvtScript N(recover) = { EVT_CALL(MoveBattleCamOver, 40) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_CAST_RECOVER) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -1174,7 +1174,7 @@ EvtScript N(attackShockwaveDrain) = { EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) EVT_WAIT(10) - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) @@ -1215,7 +1215,7 @@ EvtScript N(attackShockwaveDrain) = { 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)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_END_THREAD EVT_WAIT(8) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -1516,7 +1516,7 @@ EvtScript N(attackLightningBlast) = { EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EF) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1565,10 +1565,10 @@ EvtScript N(attackLightningBlast) = { EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_WAIT(20) - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_ELSE EVT_WAIT(20) - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_END_IF EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_SET(LVar1, ANIM_BattleBowser_Walk) @@ -1592,7 +1592,7 @@ EvtScript N(attackLightningBlast) = { EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CASE_OR_EQ(HIT_RESULT_10) EVT_WAIT(30) - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_IF_EQ(LVarF, HIT_RESULT_10) EVT_RETURN EVT_END_IF diff --git a/src/battle/area/kpa2/actor/bowser_phase_3.c b/src/battle/area/kpa2/actor/bowser_phase_3.c index b6a90fb6e8..63651f71c7 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_3.c +++ b/src/battle/area/kpa2/actor/bowser_phase_3.c @@ -199,8 +199,8 @@ API_CALLABLE(N(MakeLightnings)) { return ApiStatus_DONE2; } #include "common/UnkBowserFunc1.inc.c" -#include "common/FadeBackgroundToBlack.inc.c" -#include "common/UnfadeBackgroundToBlack.inc.c" +#include "common/FadeBackgroundDarken.inc.c" +#include "common/FadeBackgroundLighten.inc.c" #include "common/RemoveChillOut.inc.c" #include "common/StarRodAppearEffect.inc.c" #include "common/StarRodPowerUpEffect.inc.c" @@ -429,8 +429,8 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PostJump) 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_RECEIVE_BUFF) + EVT_CALL(N(FadeBackgroundLighten)) EVT_CASE_EQ(EVENT_30) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt) @@ -697,7 +697,7 @@ EvtScript N(unkDecorationScript) = { }; EvtScript N(useStarRod) = { - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -764,7 +764,7 @@ EvtScript N(useStarRod) = { EVT_END_THREAD EVT_WAIT(75) EVT_THREAD - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpLaugh) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) @@ -864,7 +864,7 @@ EvtScript N(recover) = { EVT_CALL(MoveBattleCamOver, 40) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_CAST_RECOVER) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -1407,7 +1407,7 @@ EvtScript N(attackShockwaveDrain) = { EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) EVT_WAIT(10) - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) @@ -1448,7 +1448,7 @@ EvtScript N(attackShockwaveDrain) = { 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)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_END_THREAD EVT_WAIT(8) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -1512,8 +1512,8 @@ EvtScript N(attackShockwaveDrain) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) 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) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CASE_OR_EQ(10) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) EVT_WAIT(15) @@ -1749,7 +1749,7 @@ EvtScript N(attackLightningBlast) = { EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EF) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1798,10 +1798,10 @@ EvtScript N(attackLightningBlast) = { EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_WAIT(20) - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_ELSE EVT_WAIT(20) - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_END_IF EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_SET(LVar1, ANIM_BattleBowser_Walk) @@ -1825,7 +1825,7 @@ EvtScript N(attackLightningBlast) = { EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CASE_OR_EQ(HIT_RESULT_10) EVT_WAIT(30) - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_IF_EQ(LVarF, HIT_RESULT_10) EVT_RETURN EVT_END_IF diff --git a/src/battle/area/kpa4/actor/bombshell_bill_blaster.c b/src/battle/area/kpa4/actor/bombshell_bill_blaster.c index 96877baab4..435805a790 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill_blaster.c +++ b/src/battle/area/kpa4/actor/bombshell_bill_blaster.c @@ -205,7 +205,7 @@ EvtScript N(bulletShot) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(StartRumble, 9) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BULLET_BILL_FIRE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 33) EVT_ADD(LVar1, 19) diff --git a/src/battle/area/mac/actor/chan.c b/src/battle/area/mac/actor/chan.c index 9f745ec1bf..225a6a442c 100644 --- a/src/battle/area/mac/actor/chan.c +++ b/src/battle/area/mac/actor/chan.c @@ -598,8 +598,8 @@ EvtScript N(takeTurn_8021B81C) = { EVT_END_IF EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(SetPartYaw, ACTOR_SELF, PRT_MAIN, 180) @@ -658,8 +658,8 @@ EvtScript N(takeTurn_8021B81C) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 30) @@ -744,8 +744,8 @@ EvtScript N(takeTurn_Chan) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_THREAD EVT_LOOP(0) @@ -793,8 +793,8 @@ EvtScript N(takeTurn_Chan) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 40) diff --git a/src/battle/area/mac/actor/lee.c b/src/battle/area/mac/actor/lee.c index 6240c7a010..b0baba1a14 100644 --- a/src/battle/area/mac/actor/lee.c +++ b/src/battle/area/mac/actor/lee.c @@ -268,11 +268,11 @@ EvtScript N(flyingTackle) = { EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Lee_Crouch) EVT_WAIT(20) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02CB, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_DUPLIGHOST_LEAP, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) @@ -315,8 +315,8 @@ EvtScript N(flyingTackle) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Lee_Land) @@ -846,8 +846,8 @@ EvtScript N(EVS_Move_Headbonk) = { EVT_CALL(N(UnkFunc62), LVarA, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetJumpAnimations, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(N(ActorJumpToPos)) @@ -963,8 +963,8 @@ EvtScript N(EVS_Move_Headbonk) = { EVT_END_SWITCH EVT_LABEL(100) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(YieldTurn) EVT_EXEC_WAIT(N(8021F08C)) EVT_END_CASE_GROUP @@ -1481,8 +1481,8 @@ EvtScript N(takeTurn_80221200) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_THREAD EVT_CALL(N(UnkActorPosFunc)) @@ -1543,8 +1543,8 @@ EvtScript N(takeTurn_80221200) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 8) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1829,8 +1829,8 @@ EvtScript N(takeTurn_802229C4) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2020) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -10, 0, 0) @@ -1885,8 +1885,8 @@ EvtScript N(takeTurn_802229C4) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBombette_Idle) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 8) @@ -2215,8 +2215,8 @@ EvtScript N(80223B74) = { 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) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_THREAD EVT_WAIT(5) @@ -2259,8 +2259,8 @@ EvtScript N(80223B74) = { EVT_END_SWITCH EVT_CALL(PlaySound, SOUND_NONE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Dive) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4)) @@ -2599,8 +2599,8 @@ EvtScript N(takeTurn_80224CA0) = { EVT_WAIT(15) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) @@ -2711,8 +2711,8 @@ EvtScript N(takeTurn_80224CA0) = { EVT_END_IF EVT_END_LOOP EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_WAIT(10) EVT_CALL(YieldTurn) EVT_THREAD @@ -3129,8 +3129,8 @@ EvtScript N(takeTurn_80226004) = { 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) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_THREAD EVT_WAIT(5) @@ -3203,8 +3203,8 @@ EvtScript N(takeTurn_80226004) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE), SUPPRESS_EVENT_ALL, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(func_802196A4_465B34, 1) EVT_CALL(func_80219658_465AE8, 1) @@ -3486,8 +3486,8 @@ EvtScript N(takeTurn_802270BC) = { EVT_WAIT(15) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) @@ -3541,7 +3541,7 @@ EvtScript N(takeTurn_802270BC) = { EVT_END_SWITCH EVT_END_THREAD EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2034) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_BELLY_FLOP) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Jump) @@ -3555,15 +3555,15 @@ EvtScript N(takeTurn_802270BC) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(LandJump, ACTOR_SELF) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(AddGoalPos, ACTOR_SELF, -15, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP) EVT_CALL(AddGoalPos, ACTOR_SELF, -10, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -3631,7 +3631,7 @@ EvtScript N(takeTurn_802270BC) = { EVT_END_SWITCH EVT_END_THREAD EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2034) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_BELLY_FLOP) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Jump) @@ -3660,8 +3660,8 @@ EvtScript N(takeTurn_802270BC) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Fall) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 60) @@ -3669,19 +3669,19 @@ EvtScript N(takeTurn_802270BC) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP) EVT_ADD(LVar0, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP) EVT_ADD(LVar0, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP) EVT_ADD(LVar0, 10) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 4, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Idle) EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -3998,7 +3998,7 @@ EvtScript N(takeTurn_80228B78) = { EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_END_IF EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, LVar3, 30, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAKILESTER_SUMMON_SPINY) EVT_THREAD EVT_LOOP(15) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 1, 0, 0) @@ -4023,8 +4023,8 @@ EvtScript N(takeTurn_80228B78) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_201B) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_3, ANIM_BattleLakilester_SpinySpin) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_3, EVT_FLOAT(1.5)) @@ -4076,8 +4076,8 @@ EvtScript N(takeTurn_80228B78) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_WAIT(15) EVT_CALL(YieldTurn) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) diff --git a/src/battle/area/mac/actor/master1.c b/src/battle/area/mac/actor/master1.c index a02c417657..7c824e8c5c 100644 --- a/src/battle/area/mac/actor/master1.c +++ b/src/battle/area/mac/actor/master1.c @@ -248,8 +248,8 @@ EvtScript N(takeTurn_8022AA54) = { EVT_CALL(RunToGoal, ACTOR_SELF, 8, TRUE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10) EVT_SWITCH(LVarA) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -279,8 +279,8 @@ EvtScript N(takeTurn_8022AA54) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/area/mac/actor/master2.c b/src/battle/area/mac/actor/master2.c index 30924e4c65..5127189194 100644 --- a/src/battle/area/mac/actor/master2.c +++ b/src/battle/area/mac/actor/master2.c @@ -252,8 +252,8 @@ EvtScript N(singleStrike2) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10) EVT_SWITCH(LVarA) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -284,8 +284,8 @@ EvtScript N(singleStrike2) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 8, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_THREAD @@ -349,8 +349,8 @@ EvtScript N(doubleStrike2) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10) EVT_SWITCH(LVarA) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -413,8 +413,8 @@ EvtScript N(doubleStrike2) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, BS_FLAGS1_SP_EVT_ACTIVE) EVT_WAIT(15) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) diff --git a/src/battle/area/mac/actor/master3.c b/src/battle/area/mac/actor/master3.c index 17baf03f06..21677c6fb4 100644 --- a/src/battle/area/mac/actor/master3.c +++ b/src/battle/area/mac/actor/master3.c @@ -279,8 +279,8 @@ EvtScript N(singleStrike3) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10) EVT_SWITCH(LVarA) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -311,8 +311,8 @@ EvtScript N(singleStrike3) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 10, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_THREAD @@ -376,8 +376,8 @@ EvtScript N(doubleStrike3) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10) EVT_SWITCH(LVarA) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -440,8 +440,8 @@ EvtScript N(doubleStrike3) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 7, BS_FLAGS1_SP_EVT_ACTIVE) EVT_WAIT(15) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) @@ -507,8 +507,8 @@ EvtScript N(tripleStrike3) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10) EVT_SWITCH(LVarA) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -630,8 +630,8 @@ EvtScript N(tripleStrike3) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 7, BS_FLAGS1_SP_EVT_ACTIVE) EVT_WAIT(15) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) @@ -768,8 +768,8 @@ EvtScript N(8023059C) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 10, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) @@ -801,8 +801,8 @@ EvtScript N(80230914) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 10, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) diff --git a/src/battle/area/nok/actor/kent_c_koopa.c b/src/battle/area/nok/actor/kent_c_koopa.c index 4754c08b45..e5e3a82a5e 100644 --- a/src/battle/area/nok/actor/kent_c_koopa.c +++ b/src/battle/area/nok/actor/kent_c_koopa.c @@ -636,8 +636,8 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_WAIT(10) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVarA) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarB, 0, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVarB) @@ -844,8 +844,8 @@ EvtScript N(EVS_Attack_HeavyStomp) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LARGE_ACTOR_JUMP) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim06) EVT_THREAD diff --git a/src/battle/area/omo2/actor/general_guy.c b/src/battle/area/omo2/actor/general_guy.c index 5f118140a7..40bad5c669 100644 --- a/src/battle/area/omo2/actor/general_guy.c +++ b/src/battle/area/omo2/actor/general_guy.c @@ -26,9 +26,9 @@ enum N(ActorPartIDs) { PRT_2 = 2, }; -#include "common/FadeBackgroundToBlack.inc.c" +#include "common/FadeBackgroundDarken.inc.c" -#include "common/UnfadeBackgroundToBlack.inc.c" +#include "common/FadeBackgroundLighten.inc.c" s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, @@ -440,7 +440,7 @@ EvtScript N(attack_lightning_shot) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_THREAD - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_END_THREAD EVT_CALL(GetModelCenter, 39) EVT_THREAD @@ -483,7 +483,7 @@ EvtScript N(attack_lightning_shot) = { EVT_IF_NE(LVar0, 0) EVT_CALL(SetDarknessMode, BTL_DARKNESS_MODE_3) EVT_END_IF - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_CALL(SetAnimation, ACTOR_ENEMY0, PRT_MAIN, ANIM_GeneralGuy_Anim02) EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) @@ -512,7 +512,7 @@ EvtScript N(attack_lightning_shot) = { EVT_IF_NE(LVar0, 0) EVT_CALL(SetDarknessMode, BTL_DARKNESS_MODE_3) EVT_END_IF - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_CALL(SetAnimation, ACTOR_ENEMY0, PRT_MAIN, ANIM_GeneralGuy_Anim02) EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) @@ -560,7 +560,7 @@ EvtScript N(attack_lightning_shot) = { EVT_IF_NE(LVar0, 0) EVT_CALL(SetDarknessMode, BTL_DARKNESS_MODE_3) EVT_END_IF - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_CALL(SetAnimation, ACTOR_ENEMY0, PRT_MAIN, ANIM_GeneralGuy_Anim02) EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) diff --git a/src/battle/area/omo2_2/actor/stilt_guy.c b/src/battle/area/omo2_2/actor/stilt_guy.c index 90dab44bc0..5aceab9e8a 100644 --- a/src/battle/area/omo2_2/actor/stilt_guy.c +++ b/src/battle/area/omo2_2/actor/stilt_guy.c @@ -1162,7 +1162,7 @@ EvtScript N(shy_guy_attack2) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim09) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim03) diff --git a/src/battle/area/omo2_3/actor/shy_stack.c b/src/battle/area/omo2_3/actor/shy_stack.c index 3b1bcc0285..fe1dce0056 100644 --- a/src/battle/area/omo2_3/actor/shy_stack.c +++ b/src/battle/area/omo2_3/actor/shy_stack.c @@ -1270,9 +1270,9 @@ EvtScript N(takeTurn) = { EVT_WAIT(20) EVT_ADD(LVar0, 4) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SLINGSHOT_DRAW) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SLINGSHOT_FIRE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) diff --git a/src/battle/area/omo3/actor/big_lantern_ghost.c b/src/battle/area/omo3/actor/big_lantern_ghost.c index fb0cb42bc1..a5979b7058 100644 --- a/src/battle/area/omo3/actor/big_lantern_ghost.c +++ b/src/battle/area/omo3/actor/big_lantern_ghost.c @@ -550,8 +550,8 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_LARGE_ACTOR_JUMP, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarA) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim10) EVT_THREAD EVT_WAIT(10) @@ -662,7 +662,7 @@ EvtScript N(attackLightBeam) = { EVT_CALL(SetBattleCamOffsetZ, 35) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LANTERN_GHOST_LIGHT) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim0F) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_LANTERN_BRIGHTNESS), LVar5) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_LANTERN_BRIGHTNESS), 11) diff --git a/src/battle/area/pra2/actor/crystal_king.c b/src/battle/area/pra2/actor/crystal_king.c index 7b1204bc8e..3e879b9a72 100644 --- a/src/battle/area/pra2/actor/crystal_king.c +++ b/src/battle/area/pra2/actor/crystal_king.c @@ -786,7 +786,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_CrystalKing_Anim19) EVT_EXEC_WAIT(EVS_Enemy_AirLift) - EVT_CASE_EQ(EVENT_SWAP_PARTNER) + EVT_CASE_EQ(EVENT_RECEIVE_BUFF) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 20, 0) @@ -1245,7 +1245,7 @@ EvtScript N(MakeIllusions) = { EVT_IF_FLAG(LVar0, N(FLAG_LOW_HP)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim1D) EVT_WAIT(20) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEVITATE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar7, LVar8, LVar9) EVT_CALL(MakeLerp, 0, 41, 30, EASING_SIN_OUT) EVT_LABEL(10) diff --git a/src/battle/area/sam2/actor/monstar.c b/src/battle/area/sam2/actor/monstar.c index 19537e3277..7e1807f831 100644 --- a/src/battle/area/sam2/actor/monstar.c +++ b/src/battle/area/sam2/actor/monstar.c @@ -382,7 +382,7 @@ EvtScript N(attack) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 60) EVT_WAIT(60) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MONSTAR_CAST_SPELL) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_036E) EVT_THREAD EVT_WAIT(10) diff --git a/src/battle/area/tik2/actor/electro_blooper.c b/src/battle/area/tik2/actor/electro_blooper.c index c63bb4af9d..7bc31b8f6d 100644 --- a/src/battle/area/tik2/actor/electro_blooper.c +++ b/src/battle/area/tik2/actor/electro_blooper.c @@ -251,8 +251,8 @@ API_CALLABLE(N(unused_func)) { return ApiStatus_DONE2; } -#include "common/FadeBackgroundToBlack.inc.c" -#include "common/UnfadeBackgroundToBlack.inc.c" +#include "common/FadeBackgroundDarken.inc.c" +#include "common/FadeBackgroundLighten.inc.c" API_CALLABLE(N(UpdateSnakingStatic)) { Bytecode* args = script->ptrReadPos; @@ -525,7 +525,7 @@ EvtScript N(electricCharge) = { EVT_CALL(SetBattleCamZoom, 320) EVT_CALL(MoveBattleCamOver, 50) EVT_WAIT(20) - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(N(StartRumbleWithParams), 70, 80) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 40, EVT_FLOAT(0.3)) @@ -540,7 +540,7 @@ EvtScript N(electricCharge) = { EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -865,7 +865,7 @@ EvtScript N(charge) = { EVT_END_IF 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_035C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHARGE_LIGHTNING) EVT_CALL(SetPartEventFlags, ACTOR_SELF, PRT_2, ACTOR_EVENT_FLAG_ATTACK_CHARGED | ACTOR_EVENT_FLAG_ELECTRIFIED) EVT_CALL(func_8026ED20, ACTOR_SELF, PRT_MAIN, 1) EVT_CALL(SetActorPaletteEffect, ACTOR_SELF, PRT_MAIN, PAL_ADJUST_STATIC) diff --git a/src/battle/area/tik2/actor/super_blooper.c b/src/battle/area/tik2/actor/super_blooper.c index 09addde3ca..8d3167c658 100644 --- a/src/battle/area/tik2/actor/super_blooper.c +++ b/src/battle/area/tik2/actor/super_blooper.c @@ -256,8 +256,8 @@ API_CALLABLE(N(unused_func)) { return ApiStatus_DONE2; } -#include "common/FadeBackgroundToBlack.inc.c" -#include "common/UnfadeBackgroundToBlack.inc.c" +#include "common/FadeBackgroundDarken.inc.c" +#include "common/FadeBackgroundLighten.inc.c" #include "common/SpitInk.inc.c" EvtScript N(init) = { @@ -676,7 +676,7 @@ EvtScript N(makeBabies) = { EVT_CALL(MoveBattleCamOver, 40) EVT_WAIT(20) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP) - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(N(StartRumbleWithParams), 50, 20) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(0.3)) @@ -726,7 +726,7 @@ EvtScript N(makeBabies) = { EVT_END_IF EVT_WAIT(2) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim0C) - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -746,7 +746,7 @@ EvtScript N(getEnraged) = { EVT_CALL(MoveBattleCamOver, 50) EVT_WAIT(20) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP) - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(N(StartRumbleWithParams), 70, 80) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 40, EVT_FLOAT(0.3)) @@ -760,7 +760,7 @@ EvtScript N(getEnraged) = { EVT_EXEC_WAIT(N(enrage)) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(N(UnfadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN diff --git a/src/battle/battle.c b/src/battle/battle.c index a5d12a755e..ef01d43a8a 100644 --- a/src/battle/battle.c +++ b/src/battle/battle.c @@ -101,7 +101,7 @@ BattleArea gBattleAreas[] = { }; void reset_battle_status(void) { - gGameStatusPtr->demoFlags = 0; + gGameStatusPtr->demoBattleFlags = 0; gBattleState = BATTLE_STATE_0; D_800DC4E0 = 1; gBattleSubState = BTL_SUBSTATE_INIT; @@ -216,7 +216,7 @@ void load_demo_battle(u32 index) { u32 mode; s32 battleID; - gGameStatusPtr->demoFlags = 0; + gGameStatusPtr->demoBattleFlags = 0; gGameStatusPtr->areaID = 0; gGameStatusPtr->mapID = 0; gGameStatusPtr->isBattle = FALSE; @@ -248,36 +248,36 @@ void load_demo_battle(u32 index) { set_screen_overlay_params_front(OVERLAY_TYPE_9, 255.0f); switch (index) { - case 0: + case 0: // hammer first strike on Fuzzies setup_demo_player(); mode = 0; playerData->hasActionCommands = FALSE; battleID = BTL_DIG_FORMATION_00; break; - case 1: + case 1: // jump on Monty Mole setup_demo_player(); mode = 0; playerData->curPartner = PARTNER_BOW; battleID = BTL_DIG_FORMATION_01; break; - case 2: + case 2: // Parakarry shell shot against Pokey setup_demo_player(); mode = 0; playerData->curPartner = PARTNER_PARAKARRY; - gGameStatusPtr->demoFlags |= 2; + gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_PARTNER_ACTING; battleID = BTL_DIG_FORMATION_02; break; - case 3: + case 3: // Thunder Rage on Shy Guys at the slot machine setup_demo_player(); mode = 0; playerData->curPartner = PARTNER_WATT; battleID = BTL_DIG_FORMATION_03; break; - case 4: + case 4: // stomped by Tubba Blubba setup_demo_player(); - playerData->curPartner = PARTNER_KOOPER; - gGameStatusPtr->demoFlags |= 4; mode = 0; + playerData->curPartner = PARTNER_KOOPER; + gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_ENEMY_ACTING; battleID = BTL_DIG_FORMATION_04; break; default: @@ -294,32 +294,32 @@ void load_demo_battle(u32 index) { gCurrentEncounter.firstStrikeType = FIRST_STRIKE_NONE; gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_NONE; gCurrentEncounter.hitTier = 0; - gGameStatusPtr->demoFlags |= 0x10; - gGameStatusPtr->demoFlags |= 0x20; - gGameStatusPtr->demoFlags |= 0x40; + gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_10; + gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_20; + gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_40; break; case 1: gCurrentEncounter.firstStrikeType = FIRST_STRIKE_PLAYER; gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_HAMMER; gCurrentEncounter.hitTier = playerData->hammerLevel; - gGameStatusPtr->demoFlags |= 0x10; + gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_10; break; case 2: gCurrentEncounter.firstStrikeType = FIRST_STRIKE_PLAYER; gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_JUMP; gCurrentEncounter.hitTier = playerData->bootsLevel; - gGameStatusPtr->demoFlags |= 0x10; + gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_10; break; case 3: gCurrentEncounter.firstStrikeType = FIRST_STRIKE_PLAYER; gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_PARTNER; - gGameStatusPtr->demoFlags |= 0x20; + gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_20; break; case 4: gCurrentEncounter.firstStrikeType = FIRST_STRIKE_ENEMY; gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_NONE; gCurrentEncounter.hitTier = 0; - gGameStatusPtr->demoFlags |= 0x40; + gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_40; break; } @@ -327,9 +327,7 @@ void load_demo_battle(u32 index) { gCurrentEncounter.unk_07 = 0; gCurrentEncounter.instigatorValue = 0; set_battle_stage(BTL_STAGE_DEFAULT); - gGameStatusPtr->demoFlags |= 1; + gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_ENABLED; gOverrideFlags &= ~GLOBAL_OVERRIDES_8; load_battle(battleID); } - -static const f32 padding[] = { 0.0f, 0.0f }; diff --git a/src/battle/common/actor/amazy_dayzee.inc.c b/src/battle/common/actor/amazy_dayzee.inc.c index 163f47595e..ae02c5de04 100644 --- a/src/battle/common/actor/amazy_dayzee.inc.c +++ b/src/battle/common/actor/amazy_dayzee.inc.c @@ -313,8 +313,8 @@ EvtScript N(attackPainfulSong) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 15), 20, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVarF) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 10) EVT_WAIT(20) diff --git a/src/battle/common/actor/anti_guy.inc.c b/src/battle/common/actor/anti_guy.inc.c index c86ccc8640..d487f1b2d1 100644 --- a/src/battle/common/actor/anti_guy.inc.c +++ b/src/battle/common/actor/anti_guy.inc.c @@ -343,7 +343,7 @@ EvtScript N(80222824) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim09) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim03) diff --git a/src/battle/common/actor/bill_blaster.inc.c b/src/battle/common/actor/bill_blaster.inc.c index 4330891742..21dd79d588 100644 --- a/src/battle/common/actor/bill_blaster.inc.c +++ b/src/battle/common/actor/bill_blaster.inc.c @@ -221,7 +221,7 @@ EvtScript N(EVS_Move_FireBullet) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(StartRumble, 9) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BULLET_BILL_FIRE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 33) EVT_ADD(LVar1, 19) diff --git a/src/battle/common/actor/blue_shy_guy.inc.c b/src/battle/common/actor/blue_shy_guy.inc.c index 6a98e5ecb6..817b633c8b 100644 --- a/src/battle/common/actor/blue_shy_guy.inc.c +++ b/src/battle/common/actor/blue_shy_guy.inc.c @@ -332,7 +332,7 @@ EvtScript N(8021BC2C) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim09) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim03) diff --git a/src/battle/common/actor/bob_omb.inc.c b/src/battle/common/actor/bob_omb.inc.c index 85e9e3b7d2..a7a9e3002a 100644 --- a/src/battle/common/actor/bob_omb.inc.c +++ b/src/battle/common/actor/bob_omb.inc.c @@ -169,7 +169,7 @@ EvtScript N(EVS_Ignite) = { EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(EVS_HandleEvent_Ignited))) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_EXPLODE_ON_CONTACT, TRUE) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_Ignited))) - EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_LOOP_01) + EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_LOOP_BOBOMB_FUSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_WalkLit) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(2.0)) @@ -625,7 +625,7 @@ EvtScript N(EVS_Attack_Blast) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_LOOP_01) + EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_LOOP_BOBOMB_FUSE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) diff --git a/src/battle/common/actor/crazee_dayzee.inc.c b/src/battle/common/actor/crazee_dayzee.inc.c index c05ba79bbd..fa47d7ad67 100644 --- a/src/battle/common/actor/crazee_dayzee.inc.c +++ b/src/battle/common/actor/crazee_dayzee.inc.c @@ -306,8 +306,8 @@ EvtScript N(attackPainfulSong) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 20), 4, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVarF) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 10) EVT_WAIT(20) diff --git a/src/battle/common/actor/dark_koopa.inc.c b/src/battle/common/actor/dark_koopa.inc.c index 4dc570169e..422868b46c 100644 --- a/src/battle/common/actor/dark_koopa.inc.c +++ b/src/battle/common/actor/dark_koopa.inc.c @@ -723,7 +723,7 @@ EvtScript N(attackDizzyTornado) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_WAIT(20) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2026) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DIZZY_SHELL) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 1, ACTOR_DECORATION_WHIRLWIND) EVT_WAIT(40) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 0, BS_FLAGS1_10) diff --git a/src/battle/common/actor/dark_paratroopa.inc.c b/src/battle/common/actor/dark_paratroopa.inc.c index 07df10b380..df1d3f0e91 100644 --- a/src/battle/common/actor/dark_paratroopa.inc.c +++ b/src/battle/common/actor/dark_paratroopa.inc.c @@ -448,7 +448,7 @@ EvtScript N(takeTurn) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_ParaTroopa_Dark_Windup) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -457,7 +457,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 25) @@ -517,7 +517,7 @@ EvtScript N(takeTurn) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_ParaTroopa_Dark_Windup) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -526,7 +526,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) @@ -1275,7 +1275,7 @@ EvtScript N(koopa_attackDizzyTornado) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_WAIT(20) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2026) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DIZZY_SHELL) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 1, ACTOR_DECORATION_WHIRLWIND) EVT_WAIT(40) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 0, BS_FLAGS1_10) diff --git a/src/battle/common/actor/duplighost.inc.c b/src/battle/common/actor/duplighost.inc.c index f216924974..19669b4e6e 100644 --- a/src/battle/common/actor/duplighost.inc.c +++ b/src/battle/common/actor/duplighost.inc.c @@ -250,7 +250,7 @@ EvtScript N(attack) = { EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Duplighost_Anim07) EVT_WAIT(20) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02CB, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_DUPLIGHOST_LEAP, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) diff --git a/src/battle/common/actor/duplighost/ghost_lakilester.inc.c b/src/battle/common/actor/duplighost/ghost_lakilester.inc.c index 94a17deba7..0dd6d5fb7f 100644 --- a/src/battle/common/actor/duplighost/ghost_lakilester.inc.c +++ b/src/battle/common/actor/duplighost/ghost_lakilester.inc.c @@ -287,7 +287,7 @@ EvtScript N(lakilester_takeTurn) = { EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_END_IF EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, LVar3, 30, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAKILESTER_SUMMON_SPINY) EVT_THREAD EVT_LOOP(15) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 1, 0, 0) diff --git a/src/battle/common/actor/duplighost/ghost_sushie.inc.c b/src/battle/common/actor/duplighost/ghost_sushie.inc.c index 9abe8b5c67..507d8c27e6 100644 --- a/src/battle/common/actor/duplighost/ghost_sushie.inc.c +++ b/src/battle/common/actor/duplighost/ghost_sushie.inc.c @@ -296,7 +296,7 @@ EvtScript N(sushie_takeTurn) = { EVT_END_SWITCH EVT_END_THREAD EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2034) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_BELLY_FLOP) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Jump) @@ -310,15 +310,15 @@ EvtScript N(sushie_takeTurn) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(LandJump, ACTOR_SELF) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(AddGoalPos, ACTOR_SELF, -15, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP) EVT_CALL(AddGoalPos, ACTOR_SELF, -10, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -386,7 +386,7 @@ EvtScript N(sushie_takeTurn) = { EVT_END_SWITCH EVT_END_THREAD EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2034) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_BELLY_FLOP) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Jump) @@ -424,19 +424,19 @@ EvtScript N(sushie_takeTurn) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP) EVT_ADD(LVar0, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP) EVT_ADD(LVar0, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP) EVT_ADD(LVar0, 10) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 4, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Idle) EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) diff --git a/src/battle/common/actor/ember.inc.c b/src/battle/common/actor/ember.inc.c index c242806218..16681b8c67 100644 --- a/src/battle/common/actor/ember.inc.c +++ b/src/battle/common/actor/ember.inc.c @@ -383,7 +383,7 @@ EvtScript N(handleEvent_8021B8BC) = { EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN EVT_CASE_EQ(47) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0359 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMBER_FLY | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_LavaBubble_Blue_Anim07) EVT_EXEC_WAIT(EVS_Enemy_ShockHit) @@ -392,7 +392,7 @@ EvtScript N(handleEvent_8021B8BC) = { EVT_EXEC_WAIT(EVS_Enemy_JumpBack) EVT_EXEC_WAIT(N(8021B2FC)) EVT_CASE_EQ(38) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0359 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMBER_FLY | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_LavaBubble_Blue_Anim07) EVT_EXEC_WAIT(EVS_Enemy_ShockHit) @@ -471,8 +471,8 @@ EvtScript N(8021BE64) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Blue_Anim01) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, 16) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Blue_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -517,8 +517,8 @@ EvtScript N(8021BE64) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_SET(LVar0, 1) EVT_SET(LVar1, 4587780) @@ -597,8 +597,8 @@ EvtScript N(8021C654) = { EVT_WAIT(30) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, 16) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(6) - EVT_CASE_OR_EQ(5) + EVT_CASE_OR_EQ(HIT_RESULT_MISS) + EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Blue_Anim06) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -640,8 +640,8 @@ EvtScript N(8021C654) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_FIRE | DAMAGE_TYPE_NO_CONTACT), 0, 0, 3, 32) EVT_WAIT(20) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_EXEC_WAIT(N(8021B2FC)) EVT_END_CASE_GROUP @@ -669,12 +669,12 @@ EvtScript N(8021CBC8) = { 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_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, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMBER_JUMP) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Blue_Anim04) @@ -708,7 +708,7 @@ EvtScript N(8021CBC8) = { EVT_END_SWITCH EVT_WAIT(5) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMBER_JUMP) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Blue_Anim04) @@ -729,8 +729,8 @@ EvtScript N(8021CBC8) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) diff --git a/src/battle/common/actor/green_shy_guy.inc.c b/src/battle/common/actor/green_shy_guy.inc.c index 42872c14ee..1e3eb6cd94 100644 --- a/src/battle/common/actor/green_shy_guy.inc.c +++ b/src/battle/common/actor/green_shy_guy.inc.c @@ -332,7 +332,7 @@ EvtScript N(80220D2C) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Green_Anim09) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Green_Anim03) diff --git a/src/battle/common/actor/groove_guy.inc.c b/src/battle/common/actor/groove_guy.inc.c index 1bfa7e7ed9..b1d9c2812f 100644 --- a/src/battle/common/actor/groove_guy.inc.c +++ b/src/battle/common/actor/groove_guy.inc.c @@ -356,7 +356,7 @@ EvtScript N(sleepySpin) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GROOVE_GUY_TWIRL) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0C) EVT_SET(LVar0, 0) EVT_LOOP(30) @@ -402,7 +402,7 @@ EvtScript N(sleepySpin) = { EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) EVT_END_THREAD EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GROOVE_GUY_LEAP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0B) EVT_SET(LVar0, 0) EVT_LOOP(15) @@ -414,7 +414,7 @@ EvtScript N(sleepySpin) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0C) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GROOVE_GUY_SPIN_DOWN) EVT_THREAD EVT_SET(LVar0, 0) EVT_LOOP(20) @@ -623,55 +623,55 @@ s32 func_8021878C_512D5C(Evt* script, s32 isInitialCall) { EvtScript N(8022671C) = { EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0C) EVT_WAIT(4) EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0B) EVT_WAIT(4) EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0C) EVT_WAIT(4) EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0D) EVT_WAIT(4) EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0C) EVT_WAIT(4) EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0B) EVT_WAIT(4) EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0C) EVT_WAIT(4) EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0D) EVT_WAIT(4) EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0C) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) @@ -682,7 +682,7 @@ EvtScript N(8022671C) = { EVT_END_IF EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(func_8021878C_512D5C, LVar0, LVar1, LVar2, LVar3, 48) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GROOVE_GUY_SUMMON) EVT_SET(LVar0, 0) EVT_LOOP(48) EVT_ADD(LVar0, 30) @@ -757,7 +757,7 @@ EvtScript N(80226DEC) = { EVT_CALL(SetActorSounds, LVarB, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_THREAD EVT_LOOP(2) - EVT_CALL(PlaySoundAtActor, LVarB, SOUND_02E2) + EVT_CALL(PlaySoundAtActor, LVarB, SOUND_GROOVE_GUY_TWIRL) EVT_WAIT(25) EVT_END_LOOP EVT_END_THREAD diff --git a/src/battle/common/actor/hammer_bro.inc.c b/src/battle/common/actor/hammer_bro.inc.c index cb33d78508..014e120f0d 100644 --- a/src/battle/common/actor/hammer_bro.inc.c +++ b/src/battle/common/actor/hammer_bro.inc.c @@ -352,7 +352,7 @@ EvtScript N(attackHammerThrow) = { EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_HAMMER_1, ACTOR_SOUND_JUMP, 0, 0) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_HAMMER_1, SOUND_02E9) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_HAMMER_1, SOUND_HAMMER_BROS_THROW) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) @@ -380,7 +380,7 @@ EvtScript N(attackHammerThrow) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_HAMMER_1, ACTOR_SOUND_JUMP, 0, 0) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_HAMMER_1, SOUND_02E9) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_HAMMER_1, SOUND_HAMMER_BROS_THROW) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_HAMMER_1, EVT_FLOAT(1.3)) @@ -416,7 +416,7 @@ EvtScript N(hammerMiss) = { EVT_WAIT(4) 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_02E9) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar0, SOUND_HAMMER_BROS_THROW) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_SET(LVar2, 10) @@ -445,7 +445,7 @@ EvtScript N(hammerHit) = { EVT_WAIT(4) 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_02E9) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar0, SOUND_HAMMER_BROS_THROW) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar0, EVT_FLOAT(1.3)) diff --git a/src/battle/common/actor/hurt_plant.inc.c b/src/battle/common/actor/hurt_plant.inc.c index 2cea3b0d65..e8fb3380fc 100644 --- a/src/battle/common/actor/hurt_plant.inc.c +++ b/src/battle/common/actor/hurt_plant.inc.c @@ -304,7 +304,7 @@ EvtScript N(takeTurn_8021E33C) = { EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HurtPlant_Anim05) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HURT_PLANT_BITE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HurtPlant_Anim06) EVT_WAIT(6) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) diff --git a/src/battle/common/actor/hyper_paragoomba.inc.c b/src/battle/common/actor/hyper_paragoomba.inc.c index 2339c331b2..56b80976ed 100644 --- a/src/battle/common/actor/hyper_paragoomba.inc.c +++ b/src/battle/common/actor/hyper_paragoomba.inc.c @@ -243,7 +243,7 @@ EvtScript N(8021B678) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) @@ -251,7 +251,7 @@ EvtScript N(8021B678) = { EVT_ADD(LVar1, 20) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -677,7 +677,7 @@ EvtScript N(takeTurn_8021D1DC) = { EVT_CALL(SetBattleCamZoom, 300) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) @@ -685,7 +685,7 @@ EvtScript N(takeTurn_8021D1DC) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) @@ -727,7 +727,7 @@ EvtScript N(takeTurn_8021D1DC) = { EVT_CALL(SetBattleCamZoom, 300) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) @@ -735,7 +735,7 @@ EvtScript N(takeTurn_8021D1DC) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, 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 1cd735214e..476d63906c 100644 --- a/src/battle/common/actor/koopatrol.inc.c +++ b/src/battle/common/actor/koopatrol.inc.c @@ -1057,19 +1057,19 @@ EvtScript N(summonFriend) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim02) EVT_WAIT(20) EVT_LOOP(2) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim02) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim09) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim02) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim09) EVT_WAIT(8) diff --git a/src/battle/common/actor/lakitu.inc.c b/src/battle/common/actor/lakitu.inc.c index a6790f5ffb..1ec5778186 100644 --- a/src/battle/common/actor/lakitu.inc.c +++ b/src/battle/common/actor/lakitu.inc.c @@ -353,8 +353,8 @@ EvtScript N(attackSpinyFlip) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_THREAD EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_2, EVT_FLOAT(1.0)) diff --git a/src/battle/common/actor/lava_bubble.inc.c b/src/battle/common/actor/lava_bubble.inc.c index 07777210d1..5fc5d9c748 100644 --- a/src/battle/common/actor/lava_bubble.inc.c +++ b/src/battle/common/actor/lava_bubble.inc.c @@ -280,7 +280,7 @@ EvtScript N(handleEvent_80219500) = { EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0359 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMBER_FLY | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_LavaBubble_Anim07) EVT_EXEC_WAIT(EVS_Enemy_ShockHit) @@ -289,7 +289,7 @@ EvtScript N(handleEvent_80219500) = { EVT_EXEC_WAIT(EVS_Enemy_JumpBack) EVT_EXEC_WAIT(N(80219464)) EVT_CASE_EQ(EVENT_SHOCK_DEATH) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0359 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMBER_FLY | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_LavaBubble_Anim07) EVT_EXEC_WAIT(EVS_Enemy_ShockHit) @@ -571,7 +571,7 @@ EvtScript N(fireballs_Player) = { EVT_SET(LVarA, LVar0) EVT_WAIT(10) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMBER_JUMP) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Anim04) @@ -605,7 +605,7 @@ EvtScript N(fireballs_Player) = { EVT_END_SWITCH EVT_WAIT(5) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMBER_JUMP) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Anim04) diff --git a/src/battle/common/actor/magikoopa.inc.c b/src/battle/common/actor/magikoopa.inc.c index 7275e44b89..d6211bdd71 100644 --- a/src/battle/common/actor/magikoopa.inc.c +++ b/src/battle/common/actor/magikoopa.inc.c @@ -1168,8 +1168,8 @@ EvtScript N(attackMagicBlast) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, 6, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_IF EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_WAIT(20) EVT_CALL(YieldTurn) EVT_END_CASE_GROUP diff --git a/src/battle/common/actor/paragloomba.inc.c b/src/battle/common/actor/paragloomba.inc.c index eaed54dc8f..d3c7a19072 100644 --- a/src/battle/common/actor/paragloomba.inc.c +++ b/src/battle/common/actor/paragloomba.inc.c @@ -399,7 +399,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetBattleCamZoom, 300) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) @@ -407,7 +407,7 @@ EvtScript N(takeTurn) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) @@ -449,7 +449,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetBattleCamZoom, 300) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) @@ -457,7 +457,7 @@ EvtScript N(takeTurn) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) diff --git a/src/battle/common/actor/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c index 81263121a6..e8459ebbec 100644 --- a/src/battle/common/actor/paragoomba.inc.c +++ b/src/battle/common/actor/paragoomba.inc.c @@ -401,7 +401,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetBattleCamZoom, 300) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) @@ -409,7 +409,7 @@ EvtScript N(EVS_TakeTurn) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) @@ -451,7 +451,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetBattleCamZoom, 300) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) @@ -459,7 +459,7 @@ EvtScript N(EVS_TakeTurn) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, 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 39ae3edd01..c53c2d04c0 100644 --- a/src/battle/common/actor/paratroopa.inc.c +++ b/src/battle/common/actor/paratroopa.inc.c @@ -459,7 +459,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_ParaTroopa_Windup) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -468,7 +468,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 25) @@ -528,7 +528,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_ParaTroopa_Windup) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -537,7 +537,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) diff --git a/src/battle/common/actor/pink_shy_guy.inc.c b/src/battle/common/actor/pink_shy_guy.inc.c index c4c9aba327..da2fa00940 100644 --- a/src/battle/common/actor/pink_shy_guy.inc.c +++ b/src/battle/common/actor/pink_shy_guy.inc.c @@ -332,7 +332,7 @@ EvtScript N(8021F22C) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Pink_Anim09) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Pink_Anim03) diff --git a/src/battle/common/actor/pokey.inc.c b/src/battle/common/actor/pokey.inc.c index 6ae239441c..895f7bcfd6 100644 --- a/src/battle/common/actor/pokey.inc.c +++ b/src/battle/common/actor/pokey.inc.c @@ -534,7 +534,7 @@ EvtScript N(EVS_Attack_GroundSmash) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Pokey_Idle2) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0342) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_SWAY) EVT_CALL(MakeLerp, 0, -40, 20, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -545,7 +545,7 @@ EvtScript N(EVS_Attack_GroundSmash) = { EVT_END_IF EVT_CHILD_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02ED) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_SMASH) EVT_END_CHILD_THREAD EVT_CALL(MakeLerp, -40, 90, 5, EASING_QUADRATIC_IN) EVT_LABEL(3) @@ -781,14 +781,14 @@ EvtScript N(EVS_TakeTurn) = { EVT_CASE_EQ(3) EVT_END_SWITCH EVT_END_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0342) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_SWAY) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Anim_Windup, LVar1) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1) EVT_WAIT(12) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Anim_Throw, LVar1) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1) EVT_WAIT(1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_THROW) EVT_WAIT(3) EVT_EXEC_WAIT(N(EVS_DecrementSize)) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -933,7 +933,7 @@ EvtScript N(EVS_SummonBackup) = { EVT_END_IF EVT_CHILD_THREAD EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_LEAN_BACK) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_LEAN_FORWARD) EVT_END_CHILD_THREAD // lean forward EVT_CALL(MakeLerp, -20, 30, 20, EASING_COS_IN_OUT) @@ -946,7 +946,7 @@ EvtScript N(EVS_SummonBackup) = { EVT_END_IF EVT_CHILD_THREAD EVT_WAIT(6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_LEAN_FORWARD) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_LEAN_BACK) EVT_END_CHILD_THREAD // lean back EVT_CALL(MakeLerp, 30, -40, 20, EASING_COS_IN_OUT) @@ -959,7 +959,7 @@ EvtScript N(EVS_SummonBackup) = { EVT_END_IF EVT_CHILD_THREAD EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_REACH_DOWN) EVT_END_CHILD_THREAD // smash into ground EVT_CALL(MakeLerp, -40, 90, 10, EASING_COS_IN_OUT) @@ -1039,8 +1039,8 @@ EvtScript N(EVS_SummonBackup) = { EvtScript N(EVS_Attack_SinglePartLeap) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_02EC, SOUND_02EC) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EC, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_POKEY_STEP, SOUND_POKEY_STEP) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_POKEY_STEP, SOUND_NONE) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) diff --git a/src/battle/common/actor/pokey_mummy.inc.c b/src/battle/common/actor/pokey_mummy.inc.c index dc61539373..d288bd94aa 100644 --- a/src/battle/common/actor/pokey_mummy.inc.c +++ b/src/battle/common/actor/pokey_mummy.inc.c @@ -521,14 +521,14 @@ EvtScript N(takeTurn_80219D88) = { EVT_CASE_EQ(3) EVT_END_SWITCH EVT_END_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0342) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_SWAY) EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar1) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1) EVT_WAIT(12) EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar1) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1) EVT_WAIT(1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_THROW) EVT_WAIT(3) EVT_EXEC_WAIT(N(8021B1B4)) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -594,8 +594,8 @@ EvtScript N(takeTurn_80219D88) = { EvtScript N(8021A6C8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_02EC, SOUND_02EC) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EC, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_POKEY_STEP, SOUND_POKEY_STEP) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_POKEY_STEP, SOUND_NONE) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) diff --git a/src/battle/common/actor/red_shy_guy.inc.c b/src/battle/common/actor/red_shy_guy.inc.c index 813d4f04ee..14637fc76a 100644 --- a/src/battle/common/actor/red_shy_guy.inc.c +++ b/src/battle/common/actor/red_shy_guy.inc.c @@ -332,7 +332,7 @@ EvtScript N(acrobaticAttack) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim09) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim03) diff --git a/src/battle/common/actor/ruff_puff.inc.c b/src/battle/common/actor/ruff_puff.inc.c index 9d1c408c19..77647ebfef 100644 --- a/src/battle/common/actor/ruff_puff.inc.c +++ b/src/battle/common/actor/ruff_puff.inc.c @@ -316,8 +316,8 @@ EvtScript N(takeTurn) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_THREAD EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 16, 0) diff --git a/src/battle/common/actor/sky_guy.inc.c b/src/battle/common/actor/sky_guy.inc.c index 32caf105ba..1710c0239b 100644 --- a/src/battle/common/actor/sky_guy.inc.c +++ b/src/battle/common/actor/sky_guy.inc.c @@ -340,12 +340,12 @@ EvtScript N(80229CB0) = { EvtScript N(80229F08) = { EVT_CALL(GetLastElement, LVar0) - EVT_SET(LVar0, 65536) + EVT_SET(LVar0, DAMAGE_TYPE_SPINY_SURGE) EVT_IF_FLAG(LVar0, DAMAGE_TYPE_FIRE | DAMAGE_TYPE_BLAST | DAMAGE_TYPE_4000 | DAMAGE_TYPE_SPINY_SURGE) EVT_CALL(HideHealthBar, ACTOR_SELF) EVT_THREAD EVT_WAIT(20) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SKY_GUY_BALLOON_POP) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_3, ANIM_SkyGuy_Anim2E) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_4, ANIM_SkyGuy_Anim2D) @@ -518,7 +518,7 @@ EvtScript N(takeTurn_8022A9D0) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 1) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SLINGSHOT_DRAW) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_SkyGuy_Anim08) EVT_WAIT(12) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -528,7 +528,7 @@ EvtScript N(takeTurn_8022A9D0) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_6, ANIM_SkyGuy_Anim0B) EVT_WAIT(12) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_6, ACTOR_PART_FLAG_INVISIBLE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SLINGSHOT_FIRE) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_6, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) @@ -848,7 +848,7 @@ EvtScript N(8022BF14) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim09) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim03) diff --git a/src/battle/common/actor/slot_machine.inc.c b/src/battle/common/actor/slot_machine.inc.c index 906d802fb2..106cb0e212 100644 --- a/src/battle/common/actor/slot_machine.inc.c +++ b/src/battle/common/actor/slot_machine.inc.c @@ -110,9 +110,9 @@ ActorBlueprint N(slot_machine_start) = { }; API_CALLABLE(N(IsDemoBattle)) { - script->varTable[0] = 0; - if (gGameStatusPtr->demoFlags & 1) { - script->varTable[0] = 1; + script->varTable[0] = FALSE; + if (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED) { + script->varTable[0] = TRUE; } return ApiStatus_DONE2; diff --git a/src/battle/common/actor/spear_guy.inc.c b/src/battle/common/actor/spear_guy.inc.c index b9dc4b9935..7260635c2e 100644 --- a/src/battle/common/actor/spear_guy.inc.c +++ b/src/battle/common/actor/spear_guy.inc.c @@ -1344,7 +1344,7 @@ EvtScript N(8021CD50) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim09) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim03) diff --git a/src/battle/common/actor/spiny.inc.c b/src/battle/common/actor/spiny.inc.c index 30f39ddd6a..aa09b4ebec 100644 --- a/src/battle/common/actor/spiny.inc.c +++ b/src/battle/common/actor/spiny.inc.c @@ -425,9 +425,9 @@ EvtScript N(takeTurn) = { EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_Lakitu_Anim0C) EVT_WAIT(10) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_02C7) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_SPINY_SPIN_UP) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) - EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_2, ACTOR_SOUND_WALK, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_2, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 4, BS_FLAGS1_10) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -471,8 +471,8 @@ EvtScript N(takeTurn) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_Lakitu_Anim0B) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/spy_guy.inc.c b/src/battle/common/actor/spy_guy.inc.c index 1d96dc9e1a..6c4f1789b0 100644 --- a/src/battle/common/actor/spy_guy.inc.c +++ b/src/battle/common/actor/spy_guy.inc.c @@ -338,7 +338,7 @@ EvtScript N(slingshotAttack) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 1) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SLINGSHOT_DRAW) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpyGuy_Anim15) EVT_WAIT(12) EVT_WAIT(12) @@ -352,7 +352,7 @@ EvtScript N(slingshotAttack) = { EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_2, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4)) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SLINGSHOT_FIRE) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_2, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) diff --git a/src/battle/common/actor/yellow_shy_guy.inc.c b/src/battle/common/actor/yellow_shy_guy.inc.c index 9ec774f494..e0c32f2fac 100644 --- a/src/battle/common/actor/yellow_shy_guy.inc.c +++ b/src/battle/common/actor/yellow_shy_guy.inc.c @@ -333,7 +333,7 @@ EvtScript N(8021D72C) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Yellow_Anim09) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Yellow_Anim03) diff --git a/src/battle/common/move/StarBeamSupport.inc.c b/src/battle/common/move/StarBeamSupport.inc.c index cb2c98bce4..f9ce088cb7 100644 --- a/src/battle/common/move/StarBeamSupport.inc.c +++ b/src/battle/common/move/StarBeamSupport.inc.c @@ -2,250 +2,7 @@ #include "script_api/battle.h" #include "sprite/player.h" -#include "common/StarPower.inc.c" - -API_CALLABLE(N(GetStage)); -API_CALLABLE(N(starBeam2)); - -EvtScript N(802A24F0) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(FadeBackgroundToBlack)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(beforeUsePower) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(UnkBackgroundFunc2)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A2C20) = { - EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, FALSE) - EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) - EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_SRAW_1E_A) - EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) - EVT_CALL(N(SetNpcCollision32)) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_SET(LVar0, 0) - EVT_LOOP(8) - EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_WAIT(10) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) - EVT_CALL(SetForegroundModelsVisible, TRUE) - EVT_RETURN - EVT_END -}; - -EvtScript N(802A2E2C) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2047) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2045) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(afterUsePower) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, ACTOR_PLAYER) - 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, ANIM_Mario1_Run) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) - EVT_ELSE - EVT_CALL(N(UnkBackgroundFunc)) - EVT_WAIT(15) - EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) - EVT_CALL(N(UnkStarFunc), 3) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A33A8) = { +EvtScript N(EVS_PlayBeamFX) = { EVT_THREAD EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 100, 0) EVT_WAIT(5) @@ -295,7 +52,7 @@ static EffectInstance* N(effect); static char N(padding)[4]; static s32 N(miscParticlesTimeLeft)[8]; static s32 N(spiritsMoveTime)[8]; -static s32 N(starBeamStage); +static s32 N(StarBeamStage); API_CALLABLE(N(ProcessPeachStarBeam)) { PeachStarBeamFXData* effectData; @@ -312,7 +69,7 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { f32 dist; if (isInitialCall) { - N(starBeamStage) = 0; + N(StarBeamStage) = 0; script->functionTemp[2] = evt_get_variable(script, *args++); script->functionTemp[0] = PEACH_STAR_BEAM_CREATE_EFFECT; } @@ -560,7 +317,7 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { N(effect)->data.peachStarBeam->envG = 240; N(effect)->data.peachStarBeam->envB = 240; } - newScript = start_script(&N(802A33A8), EVT_PRIORITY_A, 0); + newScript = start_script(&N(EVS_PlayBeamFX), EVT_PRIORITY_A, 0); newScript->varTable[0] = playerState->curPos.x; newScript->varTable[1] = playerState->curPos.y * 0.5f; @@ -584,7 +341,7 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { N(effect)->data.peachStarBeam->unk_3C = playerState->moveTime; N(effect)->data.peachStarBeam->beamAlpha = playerState->moveTime; if (script->functionTemp[1] == 0) { - N(starBeamStage) = 1; + N(StarBeamStage) = 1; if (script->functionTemp[2] == 0 && player->targetListLength == 1) { if (get_actor_part(get_actor(player->targetActorID), player->targetPartIndex)->eventFlags & ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED) { script->functionTemp[0] = PEACH_STAR_BEAM_IMMUNE; @@ -668,7 +425,7 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { } if (!cond) { - N(starBeamStage) = 2; + N(StarBeamStage) = 2; N(effect)->flags |= FX_INSTANCE_FLAG_DISMISS; return ApiStatus_DONE2; } @@ -738,7 +495,7 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { } if (!cond) { - N(starBeamStage) = 2; + N(StarBeamStage) = 2; N(effect)->flags |= FX_INSTANCE_FLAG_DISMISS; return ApiStatus_DONE2; } @@ -748,7 +505,7 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { } API_CALLABLE(N(GetStage)) { - script->varTable[0] = N(starBeamStage); + script->varTable[0] = N(StarBeamStage); return ApiStatus_DONE2; } diff --git a/src/battle/common/move/StarPowerSupport.inc.c b/src/battle/common/move/StarPowerSupport.inc.c new file mode 100644 index 0000000000..99248f9401 --- /dev/null +++ b/src/battle/common/move/StarPowerSupport.inc.c @@ -0,0 +1,326 @@ +#include "common.h" +#include "script_api/battle.h" +#include "model.h" +#include "effects.h" +#include "sprite/player.h" + +API_CALLABLE(N(SpawnStarSparkleFX)) { + Bytecode* args = script->ptrReadPos; + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); + + fx_sparkles(FX_SPARKLES_0, x, y, z, 40.0f); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SpawnWishSparkleFX)) { + Bytecode* args = script->ptrReadPos; + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); + + fx_stars_shimmer(5, x, y, z, 50.0f, 50.0f, 40, 30); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SpawnStarSpiritArriveFX)) { + Bytecode* args = script->ptrReadPos; + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); + + fx_sparkles(FX_SPARKLES_0, x, y, z, 30.0f); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SpawnStarSpiritDepartFX)) { + Bytecode* args = script->ptrReadPos; + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); + + fx_misc_particles(4, x, y, z, 20.0f, 20.0f, 1.0f, 10, 15); + return ApiStatus_DONE2; +} + +#include "common/FadeBackgroundDarken.inc.c" + +API_CALLABLE(N(FadeBackgroundDarkenForBeam)) { + if (isInitialCall) { + mdl_set_all_fog_mode(FOG_MODE_1); + *gBackgroundFogModePtr = FOG_MODE_1; + set_background_color_blend(0, 0, 0, 0); + script->functionTemp[0] = 0; + } + + set_background_color_blend(0, 0, 0, script->functionTemp[0]); + script->functionTemp[0] += 10; + + if (script->functionTemp[0] >= 230) { + set_background_color_blend(0, 0, 0, 230); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +#include "common/FadeBackgroundLighten.inc.c" + +API_CALLABLE(N(SetPartnerWishAnim)) { + PlayerData* playerData = &gPlayerData; + Bytecode* args = script->ptrReadPos; + s32 wishAnimIdx = evt_get_variable(script, *args++); + AnimID anim = PartnerWishAnims[playerData->curPartner][wishAnimIdx]; + + set_animation(ACTOR_PARTNER, 0, anim); + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetStarSpiritSize)) { + Npc* npc = get_npc_unsafe(NPC_BTL_SPIRIT); + + npc->collisionHeight = 32; + npc->collisionDiameter = 32; + return ApiStatus_DONE2; +} + +EvtScript N(EVS_StarPower_WishForSpirit) = { + EVT_CALL(GetOwnerID, LVarA) + EVT_IF_EQ(LVarA, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) + EVT_WAIT(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) + 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_WAIT(8) + EVT_CALL(PlaySound, SOUND_BEGIN_WISH) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 15) + EVT_CALL(N(SpawnStarSparkleFX), LVar0, LVar1, LVar2) + EVT_CALL(N(FadeBackgroundDarken)) + EVT_WAIT(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) + EVT_WAIT(10) + EVT_CALL(PlaySound, SOUND_WISH_ASCENDING) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(N(SpawnWishSparkleFX), LVar0, LVar1, LVar2) + EVT_WAIT(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) + EVT_WAIT(10) + EVT_CALL(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_WALK) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_IDLE) + EVT_WAIT(8) + EVT_CALL(PlaySound, SOUND_BEGIN_WISH) + EVT_CALL(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_PRAY) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 15) + EVT_CALL(N(SpawnStarSparkleFX), LVar0, LVar1, LVar2) + EVT_CALL(N(FadeBackgroundDarken)) + EVT_WAIT(20) + EVT_CALL(PlaySound, SOUND_WISH_ASCENDING) + EVT_CALL(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_PRAY) + EVT_WAIT(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(N(SpawnWishSparkleFX), LVar0, LVar1, LVar2) + EVT_WAIT(30) + EVT_CALL(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_IDLE) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_StarPower_WishForBeam) = { + EVT_CALL(GetOwnerID, LVarA) + EVT_IF_EQ(LVarA, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) + EVT_WAIT(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) + 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_WAIT(8) + EVT_CALL(PlaySound, SOUND_BEGIN_WISH) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 15) + EVT_CALL(N(SpawnStarSparkleFX), LVar0, LVar1, LVar2) + EVT_CALL(N(FadeBackgroundDarkenForBeam)) + EVT_WAIT(20) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) + EVT_WAIT(10) + EVT_CALL(PlaySound, SOUND_WISH_ASCENDING) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(N(SpawnWishSparkleFX), LVar0, LVar1, LVar2) + EVT_WAIT(30) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) + EVT_WAIT(10) + EVT_CALL(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_WALK) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 16) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) + EVT_CALL(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_IDLE) + EVT_WAIT(8) + EVT_CALL(PlaySound, SOUND_BEGIN_WISH) + EVT_CALL(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_PRAY) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 15) + EVT_CALL(N(SpawnStarSparkleFX), LVar0, LVar1, LVar2) + EVT_CALL(N(FadeBackgroundDarkenForBeam)) + EVT_WAIT(20) + EVT_CALL(PlaySound, SOUND_WISH_ASCENDING) + EVT_CALL(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_PRAY) + EVT_WAIT(10) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(N(SpawnWishSparkleFX), LVar0, LVar1, LVar2) + EVT_WAIT(30) + EVT_CALL(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_IDLE) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_StarPower_SpiritSummoned) = { + EVT_WAIT(8) + EVT_CALL(SetForegroundModelsVisible, FALSE) + EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) + EVT_CALL(MoveBattleCamOver, 1) + EVT_CALL(PlaySound, SOUND_SRAW_1E_A) + EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) + EVT_CALL(N(SetStarSpiritSize)) + 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(SpawnStarSpiritArriveFX), -75, 167, 0) + EVT_WAIT(10) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) + EVT_SET(LVar0, 0) + EVT_LOOP(8) + EVT_ADD(LVar0, 67) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(10) + 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetForegroundModelsVisible, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_StarPower_SpiritDeparts) = { + EVT_CALL(GetOwnerID, LVarA) + EVT_IF_EQ(LVarA, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) + EVT_CALL(PlaySound, SOUND_STAR_SPIRIT_DEPART_3) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT(6) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) + EVT_CALL(N(SpawnStarSpiritDepartFX), LVar0, LVar1, LVar2) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) + EVT_THREAD + EVT_SET(LVar2, 0) + EVT_SET(LVar3, 720) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 60) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) + EVT_ADD(LVar1, 140) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) + EVT_WAIT(10) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) + EVT_CALL(PlaySound, SOUND_STAR_SPIRIT_DEPART_1) + EVT_THREAD + EVT_LOOP(5) + EVT_WAIT(6) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) + EVT_CALL(N(SpawnStarSpiritDepartFX), LVar0, LVar1, LVar2) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) + EVT_THREAD + EVT_SET(LVar2, 0) + EVT_SET(LVar3, 720) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 60) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) + EVT_ADD(LVar1, 140) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) + EVT_WAIT(10) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_StarPower_EndWish) = { + EVT_CALL(GetOwnerID, LVarA) + EVT_IF_EQ(LVarA, ACTOR_PLAYER) + EVT_CALL(N(FadeBackgroundLighten)) + EVT_WAIT(15) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) + EVT_ELSE + EVT_CALL(N(FadeBackgroundLighten)) + EVT_WAIT(15) + EVT_CALL(SetGoalToHome, ACTOR_PARTNER) + EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) + EVT_CALL(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_RETURN) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) + EVT_CALL(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_IDLE) + EVT_END_IF + EVT_RETURN + EVT_END +}; + diff --git a/src/battle/common/move/UseItem.inc.c b/src/battle/common/move/UseItem.inc.c index 77e10d13e3..27998e26ba 100644 --- a/src/battle/common/move/UseItem.inc.c +++ b/src/battle/common/move/UseItem.inc.c @@ -6,7 +6,7 @@ EvtScript N(UseItemWithEffect) = { EVT_IF_EQ(LVar1, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208D) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_USE_ITEM) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 18) @@ -27,7 +27,7 @@ EvtScript N(UseItemWithEffect) = { EVT_CALL(RemoveItemEntity, LVarA) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208D) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_USE_ITEM) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_WAIT(4) EVT_ADD(LVar1, 45) @@ -80,7 +80,7 @@ EvtScript N(PlayerGoHome) = { EvtScript N(EatItem) = { EVT_THREAD EVT_LOOP(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2095) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_EAT_OR_DRINK) EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD @@ -93,7 +93,7 @@ EvtScript N(EatItem) = { EvtScript N(DrinkItem) = { EVT_THREAD EVT_LOOP(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2095) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_EAT_OR_DRINK) EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD diff --git a/src/battle/move/hammer/hammer_charge_0.c b/src/battle/move/hammer/hammer_charge_0.c index c68e8ccb7d..7dbbff1dbc 100644 --- a/src/battle/move/hammer/hammer_charge_0.c +++ b/src/battle/move/hammer/hammer_charge_0.c @@ -207,7 +207,7 @@ EvtScript N(EVS_802A3948) = { EVT_ADD(LVar0, 15) EVT_ADD(LVar1, 35) EVT_CALL(func_802A10C8_74F1F8, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) @@ -258,7 +258,7 @@ EvtScript N(EVS_802A3C90) = { EVT_ADD(LVar0, 15) EVT_ADD(LVar1, 35) EVT_CALL(func_802A10C8_74F1F8, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) @@ -309,7 +309,7 @@ EvtScript N(EVS_802A3FD8) = { EVT_ADD(LVar0, 15) EVT_ADD(LVar1, 35) EVT_CALL(func_802A10C8_74F1F8, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) diff --git a/src/battle/move/hammer/hammer_charge_1.c b/src/battle/move/hammer/hammer_charge_1.c index 7c2683c95e..5e504e0cda 100644 --- a/src/battle/move/hammer/hammer_charge_1.c +++ b/src/battle/move/hammer/hammer_charge_1.c @@ -216,7 +216,7 @@ EvtScript N(EVS_802A39C8) = { EVT_ADD(LVar0, 15) EVT_ADD(LVar1, 35) EVT_CALL(func_802A10C8_759678, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) @@ -268,7 +268,7 @@ EvtScript N(EVS_802A3D1C) = { EVT_ADD(LVar0, 15) EVT_ADD(LVar1, 35) EVT_CALL(func_802A10C8_759678, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) @@ -320,7 +320,7 @@ EvtScript N(EVS_802A4070) = { EVT_ADD(LVar0, 15) EVT_ADD(LVar1, 35) EVT_CALL(func_802A10C8_759678, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) diff --git a/src/battle/move/hammer/hammer_charge_2.c b/src/battle/move/hammer/hammer_charge_2.c index 185f348493..81ae51c9dc 100644 --- a/src/battle/move/hammer/hammer_charge_2.c +++ b/src/battle/move/hammer/hammer_charge_2.c @@ -216,7 +216,7 @@ EvtScript N(EVS_802A39C8) = { EVT_ADD(LVar0, 15) EVT_ADD(LVar1, 35) EVT_CALL(func_802A10C8_75E698, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) @@ -266,7 +266,7 @@ EvtScript N(EVS_802A3CF4) = { EVT_ADD(LVar0, 15) EVT_ADD(LVar1, 35) EVT_CALL(func_802A10C8_75E698, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) @@ -316,7 +316,7 @@ EvtScript N(EVS_802A4020) = { EVT_ADD(LVar0, 15) EVT_ADD(LVar1, 35) EVT_CALL(func_802A10C8_75E698, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) diff --git a/src/battle/move/item/dizzy_dial.c b/src/battle/move/item/dizzy_dial.c index de9f4c3597..1870ff5aad 100644 --- a/src/battle/move/item/dizzy_dial.c +++ b/src/battle/move/item/dizzy_dial.c @@ -4,17 +4,17 @@ #define NAMESPACE battle_item_dizzy_dial -static s32 D_802A1CD0; +static s32 ScreenBlurWorkerID; #include "battle/common/move/ItemRefund.inc.c" -void func_802A123C_727B4C(void) { +void N(worker_render_screen_blur)(void) { draw_prev_frame_buffer_at_screen_pos(0, 0, 320, 240, 160.0f); } -API_CALLABLE(N(func_802A1270_727B80)) { +API_CALLABLE(N(AnimateDizzyDialCameraFX)) { Camera* camera = &gCameras[CAM_BATTLE]; - f32 a; + f32 angle; if (isInitialCall) { script->functionTemp[0] = 0; @@ -24,14 +24,14 @@ API_CALLABLE(N(func_802A1270_727B80)) { case 0: script->functionTemp[1] = 0; script->functionTemp[2] = 0; - sfx_play_sound(SOUND_2033); + sfx_play_sound(SOUND_DIZZY_DIAL); camera->auxPitch = 0; - D_802A1CD0 = create_worker_frontUI(NULL, func_802A123C_727B4C); + ScreenBlurWorkerID = create_worker_frontUI(NULL, N(worker_render_screen_blur)); script->functionTemp[0] = 1; case 1: camera->flags |= CAMERA_FLAG_SHAKING; - a = script->functionTemp[1]; - guRotateF(camera->viewMtxShaking, a, 0.0f, 0.0f, 1.0f); + angle = script->functionTemp[1]; + guRotateF(camera->viewMtxShaking, angle, 0.0f, 0.0f, 1.0f); script->functionTemp[1] = 2.0 * ((1.0 - sin_rad(DEG_TO_RAD(script->functionTemp[2] + 90))) * 360.0); script->functionTemp[2]++; if (script->functionTemp[2] <= 90) { @@ -39,7 +39,7 @@ API_CALLABLE(N(func_802A1270_727B80)) { } camera->auxPitch = 0; camera->flags &= ~CAMERA_FLAG_SHAKING; - free_worker(D_802A1CD0); + free_worker(ScreenBlurWorkerID); return ApiStatus_DONE2; } @@ -64,7 +64,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(MoveBattleCamOver, 3) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_END_THREAD - EVT_CALL(N(func_802A1270_727B80)) + EVT_CALL(N(AnimateDizzyDialCameraFX)) EVT_THREAD EVT_CALL(StartRumble, 8) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) @@ -80,20 +80,20 @@ EvtScript N(EVS_UseItem) = { EVT_END_THREAD EVT_CALL(InitTargetIterator) EVT_LABEL(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(GetItemPower, ITEM_DIZZY_DIAL, LVar0, LVar1) - 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, ITER_NEXT, LVar0) - EVT_IF_NE(LVar0, -1) - EVT_GOTO(0) - EVT_END_IF + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(GetItemPower, ITEM_DIZZY_DIAL, LVar0, LVar1) + 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, ITER_NEXT, LVar0) + EVT_IF_NE(LVar0, -1) + EVT_GOTO(0) + EVT_END_IF EVT_WAIT(30) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/item/dried_shroom.c b/src/battle/move/item/dried_shroom.c index 8c7e577189..94b5dddbb1 100644 --- a/src/battle/move/item/dried_shroom.c +++ b/src/battle/move/item/dried_shroom.c @@ -9,12 +9,12 @@ API_CALLABLE(N(ShowHeartRecoveryFX)) { Bytecode* args = script->ptrReadPos; - s32 a = evt_get_variable(script, *args++); - s32 b = evt_get_variable(script, *args++); - s32 c = evt_get_variable(script, *args++); - s32 d = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); + s32 duration = evt_get_variable(script, *args++); - fx_recover(0, a, b, c, d); + fx_recover(0, x, y, z, duration); return ApiStatus_DONE2; } diff --git a/src/battle/move/item/fire_flower.c b/src/battle/move/item/fire_flower.c index d758eed5fe..863bb8ba46 100644 --- a/src/battle/move/item/fire_flower.c +++ b/src/battle/move/item/fire_flower.c @@ -19,30 +19,15 @@ API_CALLABLE(N(func_802A123C_716E9C)) { return ApiStatus_DONE2; } -#include "common/FadeBackgroundToBlack.inc.c" - -API_CALLABLE(N(func_802A1378_716FD8)) { - if (isInitialCall) { - script->functionTemp[0] = 20; - } - - set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 254); - - script->functionTemp[0]--; - if (script->functionTemp[0] == 0) { - set_background_color_blend(0, 0, 0, 0); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} +#include "common/FadeBackgroundDarken.inc.c" +#include "common/FadeBackgroundLighten.inc.c" #include "battle/common/move/UseItem.inc.c" EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_FIRE_FLOWER) EVT_EXEC_WAIT(N(UseItemWithEffect)) - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(PlaySound, SOUND_0377) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_PlantFireFlower) EVT_THREAD @@ -71,9 +56,9 @@ EvtScript N(EVS_UseItem) = { EVT_WAIT(25) EVT_LOOP(12) EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_202C) + EVT_CALL(PlaySound, SOUND_FIRE_FLOWER_A) EVT_WAIT(2) - EVT_CALL(PlaySound, SOUND_202D) + EVT_CALL(PlaySound, SOUND_FIRE_FLOWER_B) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -84,7 +69,7 @@ EvtScript N(EVS_UseItem) = { EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) - EVT_IF_EQ(LVar0, 6) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_GOTO(1) EVT_END_IF EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -96,7 +81,7 @@ EvtScript N(EVS_UseItem) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(N(func_802A1378_716FD8)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_WAIT(30) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/item/fright_jar.c b/src/battle/move/item/fright_jar.c index 0a78e088b9..af28e6fac8 100644 --- a/src/battle/move/item/fright_jar.c +++ b/src/battle/move/item/fright_jar.c @@ -8,30 +8,15 @@ #include "battle/common/move/ItemRefund.inc.c" -#include "common/FadeBackgroundToBlack.inc.c" - -API_CALLABLE(N(func_802A12D4_72BBE4)) { - if (isInitialCall) { - script->functionTemp[0] = 20; - } - - set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 254); - - script->functionTemp[0]--; - if (script->functionTemp[0] == 0) { - set_background_color_blend(0, 0, 0, 0); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} +#include "common/FadeBackgroundDarken.inc.c" +#include "common/FadeBackgroundLighten.inc.c" #include "battle/common/move/UseItem.inc.c" EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_FRIGHT_JAR) EVT_EXEC_WAIT(N(UseItemWithEffect)) - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_THREAD EVT_WAIT(5) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -63,21 +48,21 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(InitTargetIterator) EVT_LABEL(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(SetDamageSource, DMG_SRC_FRIGHT_JAR) - EVT_CALL(ItemSpookEnemy, LVar0, 1879052288, 0, 100, 0, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_LABEL(1) - EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) - EVT_IF_NE(LVar0, -1) - EVT_GOTO(0) - EVT_END_IF + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(SetDamageSource, DMG_SRC_FRIGHT_JAR) + EVT_CALL(ItemSpookEnemy, LVar0, DAMAGE_TYPE_FEAR | DAMAGE_TYPE_STATUS_ALWAYS_HITS | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_NO_CONTACT, 0, 100, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_LABEL(1) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_IF_NE(LVar0, -1) + EVT_GOTO(0) + EVT_END_IF EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Walk) - EVT_CALL(N(func_802A12D4_72BBE4)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_WAIT(20) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/item/hustle_drink.c b/src/battle/move/item/hustle_drink.c index 9fdd3c7960..1dee1d80f2 100644 --- a/src/battle/move/item/hustle_drink.c +++ b/src/battle/move/item/hustle_drink.c @@ -94,7 +94,7 @@ EvtScript N(EVS_UseItem) = { EVT_WAIT(1) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.4), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) EVT_WAIT(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_GROW) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.9), EVT_FLOAT(1.3), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.9), EVT_FLOAT(1.2), EVT_FLOAT(1.0)) diff --git a/src/battle/move/item/pow_block.c b/src/battle/move/item/pow_block.c index 8cede60fe7..3008b09b9d 100644 --- a/src/battle/move/item/pow_block.c +++ b/src/battle/move/item/pow_block.c @@ -8,16 +8,16 @@ #include "battle/common/move/ItemRefund.inc.c" -API_CALLABLE(N(func_802A123C_718A8C)) { +API_CALLABLE(N(ForceTriggerPOWBlockEntity)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; CollisionStatus* collisionStatus = &gCollisionStatus; PlayerStatus* playerStatus = &gPlayerStatus; if (player->scalingFactor == 1.0) { - s32 var = script->varTable[10]; - get_entity_by_index(var); - collisionStatus->curCeiling = var | COLLISION_WITH_ENTITY_BIT; + s32 entityID = script->varTable[10]; + get_entity_by_index(entityID); + collisionStatus->curCeiling = entityID | COLLISION_WITH_ENTITY_BIT; playerStatus->flags |= PS_FLAG_JUMPING; update_entities(); collisionStatus->curCeiling = -1; @@ -28,7 +28,7 @@ API_CALLABLE(N(func_802A123C_718A8C)) { return ApiStatus_DONE2; } -API_CALLABLE(N(func_802A12E4_718B34)) { +API_CALLABLE(N(DeletePOWBlockEntity)) { Entity* entity = get_entity_by_index(script->varTable[10]); entity->flags |= ENTITY_FLAG_PENDING_INSTANCE_DELETE; @@ -36,7 +36,7 @@ API_CALLABLE(N(func_802A12E4_718B34)) { return ApiStatus_DONE2; } -API_CALLABLE(N(func_802A1318_718B68)) { +API_CALLABLE(N(AdjustPOWBlockEntityScale)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; Entity* entity = get_entity_by_index(script->varTable[10]); @@ -59,7 +59,7 @@ EvtScript N(EVS_UseItem) = { EVT_WAIT(10) 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(N(AdjustPOWBlockEntityScale)) 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) @@ -71,7 +71,7 @@ EvtScript N(EVS_UseItem) = { EVT_THREAD EVT_WAIT(15) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_BLOCK) - EVT_CALL(N(func_802A123C_718A8C)) + EVT_CALL(N(ForceTriggerPOWBlockEntity)) 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) @@ -82,7 +82,7 @@ EvtScript N(EVS_UseItem) = { 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(PlaySoundAtActor, ACTOR_PLAYER, SOUND_POW_BLOCK) 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)) @@ -105,25 +105,25 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(InitTargetIterator) EVT_LABEL(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(GetItemPower, ITEM_POW_BLOCK, LVar3, LVar4) - EVT_CALL(ApplyShrinkFromOwner, LVar3) - EVT_CALL(SetDamageSource, DMG_SRC_POW_BLOCK) - EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_POW | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar3, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_LABEL(1) - EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) - EVT_IF_NE(LVar0, -1) - EVT_GOTO(0) - EVT_END_IF + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(GetItemPower, ITEM_POW_BLOCK, LVar3, LVar4) + EVT_CALL(ApplyShrinkFromOwner, LVar3) + EVT_CALL(SetDamageSource, DMG_SRC_POW_BLOCK) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_POW | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_LABEL(1) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_IF_NE(LVar0, -1) + EVT_GOTO(0) + EVT_END_IF 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_CALL(N(DeletePOWBlockEntity)) EVT_WAIT(30) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/item/repel_gel.c b/src/battle/move/item/repel_gel.c index 1c60ab245c..d0807f017c 100644 --- a/src/battle/move/item/repel_gel.c +++ b/src/battle/move/item/repel_gel.c @@ -14,7 +14,7 @@ API_CALLABLE(N(func_802A123C_72DDAC)) { inflict_status(player, STATUS_KEY_TRANSPARENT, script->varTable[0]); player->statusAfflicted = 0; - part->flags |= ACTOR_PART_FLAG_100; + part->flags |= ACTOR_PART_FLAG_TRANSPARENT; return ApiStatus_DONE2; } diff --git a/src/battle/move/item/shooting_star.c b/src/battle/move/item/shooting_star.c index b90b387bc6..a3b401891b 100644 --- a/src/battle/move/item/shooting_star.c +++ b/src/battle/move/item/shooting_star.c @@ -114,21 +114,21 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(InitTargetIterator) EVT_LABEL(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(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, DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_LABEL(1) - EVT_WAIT(10) - EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) - EVT_IF_NE(LVar0, -1) - EVT_GOTO(0) - EVT_END_IF + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + 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, DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_LABEL(1) + EVT_WAIT(10) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_IF_NE(LVar0, -1) + EVT_GOTO(0) + EVT_END_IF EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) diff --git a/src/battle/move/item/sleepy_sheep.c b/src/battle/move/item/sleepy_sheep.c index c6c04ffd9e..2e0118b991 100644 --- a/src/battle/move/item/sleepy_sheep.c +++ b/src/battle/move/item/sleepy_sheep.c @@ -319,7 +319,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 32) - EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 20, EMOTER_POS, LVar0, LVar1, LVar2, 10) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 20, EMOTER_POS, LVar0, LVar1, LVar2, 10) EVT_WAIT(30) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT(1) @@ -416,20 +416,20 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(InitTargetIterator) EVT_LABEL(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(GetItemPower, ITEM_SLEEPY_SHEEP, LVar0, LVar1) - 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, ITER_NEXT, LVar0) - EVT_IF_NE(LVar0, -1) - EVT_GOTO(0) - EVT_END_IF + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(GetItemPower, ITEM_SLEEPY_SHEEP, LVar0, LVar1) + 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, ITER_NEXT, LVar0) + EVT_IF_NE(LVar0, -1) + EVT_GOTO(0) + EVT_END_IF EVT_WAIT(30) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/item/snowman_doll.c b/src/battle/move/item/snowman_doll.c index 2d282510e4..48fb1d54eb 100644 --- a/src/battle/move/item/snowman_doll.c +++ b/src/battle/move/item/snowman_doll.c @@ -10,40 +10,25 @@ API_CALLABLE(N(func_802A123C_71C06C)) { Bytecode* args = script->ptrReadPos; - s32 a = evt_get_variable(script, *args++); - s32 b = evt_get_variable(script, *args++); - s32 c = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); - fx_sparkles(FX_SPARKLES_2, a, b, c, 30.0f); - fx_sparkles(FX_SPARKLES_2, a, b, c, 30.0f); + fx_sparkles(FX_SPARKLES_2, x, y, z, 30.0f); + fx_sparkles(FX_SPARKLES_2, x, y, z, 30.0f); return ApiStatus_DONE2; } -#include "common/FadeBackgroundToBlack.inc.c" - -API_CALLABLE(N(func_802A13B8_71C1E8)) { - if (isInitialCall) { - script->functionTemp[0] = 20; - } - - set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 254); - - script->functionTemp[0]--; - if (script->functionTemp[0] == 0) { - set_background_color_blend(0, 0, 0, 0); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} +#include "common/FadeBackgroundDarken.inc.c" +#include "common/FadeBackgroundLighten.inc.c" #include "battle/common/move/UseItem.inc.c" EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_SNOWMAN_DOLL) EVT_EXEC_WAIT(N(UseItemWithEffect)) - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0363) EVT_THREAD EVT_LOOP(45) @@ -63,19 +48,19 @@ EvtScript N(EVS_UseItem) = { 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(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SNOWMAN_DOLL_JUMP) EVT_CALL(StartRumble, 9) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(46) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_202E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SNOWMAN_DOLL_JUMP) EVT_CALL(StartRumble, 9) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(25) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_202E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SNOWMAN_DOLL_JUMP) EVT_CALL(StartRumble, 9) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(25) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_202E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SNOWMAN_DOLL_JUMP) EVT_CALL(StartRumble, 9) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD @@ -87,24 +72,24 @@ EvtScript N(EVS_UseItem) = { EVT_WAIT(110) EVT_CALL(InitTargetIterator) EVT_LABEL(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(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, DAMAGE_TYPE_ICE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_WAIT(5) - EVT_LABEL(1) - EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) - EVT_IF_NE(LVar0, -1) - EVT_GOTO(0) - EVT_END_IF + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + 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, DAMAGE_TYPE_ICE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_WAIT(5) + EVT_LABEL(1) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_IF_NE(LVar0, -1) + EVT_GOTO(0) + EVT_END_IF EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(30) - EVT_CALL(N(func_802A13B8_71C1E8)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN EVT_END diff --git a/src/battle/move/item/stop_watch.c b/src/battle/move/item/stop_watch.c index 045ebbda69..af9d330737 100644 --- a/src/battle/move/item/stop_watch.c +++ b/src/battle/move/item/stop_watch.c @@ -6,23 +6,9 @@ #define NAMESPACE battle_item_stop_watch #include "battle/common/move/ItemRefund.inc.c" -#include "common/FadeBackgroundToBlack.inc.c" -API_CALLABLE(N(func_802A12D4_7270A4)) { - if (isInitialCall) { - script->functionTemp[0] = 20; - } - - set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 254); - - script->functionTemp[0]--; - if (script->functionTemp[0] == 0) { - set_background_color_blend(0, 0, 0, 0); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} +#include "common/FadeBackgroundDarken.inc.c" +#include "common/FadeBackgroundLighten.inc.c" #include "battle/common/move/UseItem.inc.c" @@ -34,9 +20,9 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_END_THREAD - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_PLAY_EFFECT(EFFECT_STOP_WATCH, 0, 0, 0, 0, EVT_FLOAT(1.0), 200, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0246) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_TIME_OUT) EVT_WAIT(200) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 20) @@ -44,7 +30,7 @@ EvtScript N(EVS_UseItem) = { EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) - EVT_IF_EQ(LVar0, 6) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_GOTO(1) EVT_END_IF EVT_CALL(GetItemPower, ITEM_STOP_WATCH, LVar0, LVar1) @@ -56,7 +42,7 @@ EvtScript N(EVS_UseItem) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(N(func_802A12D4_7270A4)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN EVT_END diff --git a/src/battle/move/item/strange_cake.c b/src/battle/move/item/strange_cake.c index f66ee13797..91852b3641 100644 --- a/src/battle/move/item/strange_cake.c +++ b/src/battle/move/item/strange_cake.c @@ -249,7 +249,7 @@ API_CALLABLE(N(func_802A1B14_731E14)) { inflict_status(player, STATUS_KEY_TRANSPARENT, 3); player->statusAfflicted = 0; - part->flags |= ACTOR_PART_FLAG_100; + part->flags |= ACTOR_PART_FLAG_TRANSPARENT; return ApiStatus_DONE2; } diff --git a/src/battle/move/item/super_soda.c b/src/battle/move/item/super_soda.c index 024931bc75..b13e6c8317 100644 --- a/src/battle/move/item/super_soda.c +++ b/src/battle/move/item/super_soda.c @@ -178,7 +178,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(InitTargetIterator) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_IF_EQ(LVar0, ACTOR_PLAYER) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2095) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_EAT_OR_DRINK) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Drink) EVT_WAIT(45) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/item/thunder_bolt.c b/src/battle/move/item/thunder_bolt.c index f2a2466943..c0b35df9bf 100644 --- a/src/battle/move/item/thunder_bolt.c +++ b/src/battle/move/item/thunder_bolt.c @@ -36,23 +36,8 @@ API_CALLABLE(N(func_802A123C_722D7C)) { return ApiStatus_DONE2; } -#include "common/FadeBackgroundToBlack.inc.c" - -API_CALLABLE(N(func_802A1420_722F60)) { - if (isInitialCall) { - script->functionTemp[0] = 20; - } - - set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 254); - - script->functionTemp[0]--; - if (script->functionTemp[0] == 0) { - set_background_color_blend(0, 0, 0, 0); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} +#include "common/FadeBackgroundDarken.inc.c" +#include "common/FadeBackgroundLighten.inc.c" #include "battle/common/move/UseItem.inc.c" @@ -64,13 +49,13 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_END_THREAD - EVT_CALL(battle_item_thunder_bolt_FadeBackgroundToBlack) + EVT_CALL(battle_item_thunder_bolt_FadeBackgroundDarken) EVT_CALL(PlaySound, SOUND_0365) EVT_WAIT(10) EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) - EVT_IF_EQ(LVar0, 6) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_GOTO(1) EVT_END_IF EVT_CALL(battle_item_thunder_bolt_func_802A123C_722D7C) @@ -85,7 +70,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(30) - EVT_CALL(battle_item_thunder_bolt_func_802A1420_722F60) + EVT_CALL(battle_item_thunder_bolt_FadeBackgroundLighten) EVT_EXEC_WAIT(battle_item_thunder_bolt_PlayerGoHome) EVT_RETURN EVT_END diff --git a/src/battle/move/item/thunder_rage.c b/src/battle/move/item/thunder_rage.c index 29412dc615..34b32db45e 100644 --- a/src/battle/move/item/thunder_rage.c +++ b/src/battle/move/item/thunder_rage.c @@ -7,23 +7,9 @@ #define NAMESPACE battle_item_thunder_rage #include "battle/common/move/ItemRefund.inc.c" -#include "common/FadeBackgroundToBlack.inc.c" -API_CALLABLE(N(func_802A12D4_71B474)) { - if (isInitialCall) { - script->functionTemp[0] = 20; - } - - set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 254); - - script->functionTemp[0]--; - if (script->functionTemp[0] == 0) { - set_background_color_blend(0, 0, 0, 0); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} +#include "common/FadeBackgroundDarken.inc.c" +#include "common/FadeBackgroundLighten.inc.c" API_CALLABLE(N(func_802A1354_71B4F4)) { Actor* enemyTarget = get_actor(script->owner1.enemyID); @@ -63,14 +49,14 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_END_CHILD_THREAD - EVT_CALL(N(FadeBackgroundToBlack)) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(PlaySound, SOUND_0365) EVT_WAIT(10) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) - EVT_IF_EQ(LVar0, 6) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_GOTO(1) EVT_END_IF EVT_CALL(N(func_802A1354_71B4F4)) @@ -90,7 +76,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(30) - EVT_CALL(N(func_802A12D4_71B474)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN EVT_END diff --git a/src/battle/move/jump/auto_multibounce.c b/src/battle/move/jump/auto_multibounce.c index 766b22fc33..c24c3666e3 100644 --- a/src/battle/move/jump/auto_multibounce.c +++ b/src/battle/move/jump/auto_multibounce.c @@ -54,7 +54,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -128,15 +128,15 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_3) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_CALL(DidActionSucceed, LVar0) @@ -196,7 +196,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 48) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -275,15 +275,15 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_3) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_CALL(DidActionSucceed, LVar0) @@ -343,7 +343,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 48) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -415,15 +415,15 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_3) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_CALL(DidActionSucceed, LVar0) diff --git a/src/battle/move/jump/demo_power_bounce.c b/src/battle/move/jump/demo_power_bounce.c index 8d226f0c3f..742ceac5a1 100644 --- a/src/battle/move/jump/demo_power_bounce.c +++ b/src/battle/move/jump/demo_power_bounce.c @@ -165,15 +165,15 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_3) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_SWITCH(LVar0) @@ -301,15 +301,15 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_3) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_SWITCH(LVar0) @@ -433,15 +433,15 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_3) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_SWITCH(LVar0) diff --git a/src/battle/move/jump/earthquake_jump.c b/src/battle/move/jump/earthquake_jump.c index f0fc716bf8..7f0cc39228 100644 --- a/src/battle/move/jump/earthquake_jump.c +++ b/src/battle/move/jump/earthquake_jump.c @@ -215,15 +215,15 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_3) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_LABEL(12) @@ -441,15 +441,15 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_3) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_LABEL(12) @@ -663,15 +663,15 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_3) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_LABEL(12) diff --git a/src/battle/move/jump/jump_charge_0.c b/src/battle/move/jump/jump_charge_0.c index 30c024106c..da5e159582 100644 --- a/src/battle/move/jump/jump_charge_0.c +++ b/src/battle/move/jump/jump_charge_0.c @@ -72,7 +72,7 @@ EvtScript N(EVS_UseMove0) = { EVT_ADD(LVar1, 25) EVT_ADD(LVar2, 5) EVT_CALL(N(func_802A1108_74D678), LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) diff --git a/src/battle/move/jump/jump_charge_1.c b/src/battle/move/jump/jump_charge_1.c index d7fb49a3dc..54136fa9ca 100644 --- a/src/battle/move/jump/jump_charge_1.c +++ b/src/battle/move/jump/jump_charge_1.c @@ -81,7 +81,7 @@ EvtScript N(EVS_UseMove0) = { EVT_ADD(LVar1, 25) EVT_ADD(LVar2, 5) EVT_CALL(N(func_802A1108_74D678), LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) diff --git a/src/battle/move/jump/jump_charge_2.c b/src/battle/move/jump/jump_charge_2.c index 4bd9b4d668..2381bdeccd 100644 --- a/src/battle/move/jump/jump_charge_2.c +++ b/src/battle/move/jump/jump_charge_2.c @@ -81,7 +81,7 @@ EvtScript N(EVS_UseMove0) = { EVT_ADD(LVar1, 25) EVT_ADD(LVar2, 5) EVT_CALL(N(func_802A1108_74D678), LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) diff --git a/src/battle/move/jump/multibounce.c b/src/battle/move/jump/multibounce.c index 17003dfaa2..b803f1d388 100644 --- a/src/battle/move/jump/multibounce.c +++ b/src/battle/move/jump/multibounce.c @@ -67,7 +67,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -141,15 +141,15 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_3) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_CALL(DidActionSucceed, LVar0) @@ -218,7 +218,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 48) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -297,15 +297,15 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_3) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_CALL(DidActionSucceed, LVar0) @@ -374,7 +374,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 48) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -446,15 +446,15 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_3) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_CALL(DidActionSucceed, LVar0) diff --git a/src/battle/move/jump/power_bounce.c b/src/battle/move/jump/power_bounce.c index bb2337ff1e..ce87aca11a 100644 --- a/src/battle/move/jump/power_bounce.c +++ b/src/battle/move/jump/power_bounce.c @@ -174,26 +174,26 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) - EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, BS_FLAGS1_40) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) - EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 224) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40 | BS_FLAGS1_80) EVT_END_IF EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) - EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 32) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_3) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_SWITCH(LVar0) @@ -327,15 +327,15 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_3) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_SWITCH(LVar0) @@ -465,15 +465,15 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_3) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_SWITCH(LVar0) diff --git a/src/battle/move/star_power/chill_out.c b/src/battle/move/star_power/chill_out.c index 6c601d3b23..be8882ab12 100644 --- a/src/battle/move/star_power/chill_out.c +++ b/src/battle/move/star_power/chill_out.c @@ -5,58 +5,67 @@ #define NAMESPACE battle_move_chill_out -BSS s32 D_802A2CC0; +BSS b32 D_802A2CC0; -#include "common/StarPower.inc.c" +#include "battle/common/move/StarPowerSupport.inc.c" -API_CALLABLE(func_802A1518_7905E8) { - D_802A2CC0 = 0; +API_CALLABLE(N(func_802A1518_7905E8)) { + D_802A2CC0 = FALSE; return ApiStatus_DONE2; } -API_CALLABLE(func_802A1528_7905F8) { +API_CALLABLE(N(func_802A1528_7905F8)) { script->varTable[0] = D_802A2CC0; return ApiStatus_DONE2; } -API_CALLABLE(func_802A153C_79060C) { - f32 a = rand_int(200) - 25; - f32 b = rand_int(120) + 7; - f32 c = rand_int(50) - 25; +API_CALLABLE(N(func_802A153C_79060C)) { + f32 x = rand_int(200) - 25; + f32 y = rand_int(120) + 7; + f32 z = rand_int(50) - 25; - fx_cold_breath(2, a, b, c, 2.0f, 20); + fx_cold_breath(2, x, y, z, 2.0f, 20); - a = rand_int(200) - 25; - b = rand_int(120) + 7; - c = rand_int(50) - 25; + x = rand_int(200) - 25; + y = rand_int(120) + 7; + z = rand_int(50) - 25; - fx_sparkles(FX_SPARKLES_4, a, b, c, 40.0f); + fx_sparkles(FX_SPARKLES_4, x, y, z, 40.0f); return ApiStatus_DONE2; } -API_CALLABLE(func_802A163C_79070C) { +API_CALLABLE(N(func_802A163C_79070C)) { Actor* actor = get_actor(script->owner1.actorID); Actor* target = get_actor(actor->targetActorID); ActorPart* part = get_actor_part(target, actor->targetPartIndex); - s32 flag1 = ACTOR_FLAG_NO_DMG_APPLY; // these manual flag ones are necessary to match. once we figure out flags, we can add more - s32 flag2 = ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED; - script->varTable[0] = 0; + script->varTable[0] = FALSE; - if ((target->flags & ACTOR_FLAG_TARGET_ONLY) - || (target->flags & flag1) - || (target->flags & ACTOR_FLAG_2000) - || (part->eventFlags & ACTOR_EVENT_FLAG_ENCHANTED) - || (part->eventFlags & flag2) - ) { + if (target->flags & ACTOR_FLAG_TARGET_ONLY) { return ApiStatus_DONE2; } - script->varTable[0] = 1; + if (target->flags & ACTOR_FLAG_NO_DMG_APPLY) { + return ApiStatus_DONE2; + } + + if (target->flags & ACTOR_FLAG_2000) { + return ApiStatus_DONE2; + } + + if (part->eventFlags & ACTOR_EVENT_FLAG_ENCHANTED) { + return ApiStatus_DONE2; + } + + if (part->eventFlags & ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED) { + return ApiStatus_DONE2; + } + + script->varTable[0] = TRUE; return ApiStatus_DONE2; } -API_CALLABLE(func_802A16F4_7907C4) { +API_CALLABLE(N(func_802A16F4_7907C4)) { Actor* enemy = get_actor(script->owner1.enemyID); Actor* target = get_actor(enemy->targetActorID); ActorPart* targetPart = get_actor_part(target, enemy->targetPartIndex); @@ -85,7 +94,7 @@ API_CALLABLE(func_802A16F4_7907C4) { target->chillOutTurns = 4; target->chillOutAmount = 3; - dispatch_damage_event_actor_0(target, 0, 10); + dispatch_damage_event_actor_0(target, 0, EVENT_HIT); x = target->curPos.x + target->headOffset.x + (target->size.x / 2); if (target->flags & ACTOR_FLAG_UPSIDE_DOWN) { @@ -99,331 +108,93 @@ API_CALLABLE(func_802A16F4_7907C4) { fx_stat_change(5, x, y, z, 1.0f, 60); sfx_play_sound(SOUND_INFLICT_CHILL_OUT); - D_802A2CC0 = 1; + D_802A2CC0 = TRUE; return ApiStatus_DONE2; } -EvtScript N(802A18F0) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(FadeBackgroundToBlack)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1C88) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(UnkBackgroundFunc2)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A2020) = { - EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, FALSE) - EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) - EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_SRAW_1E_A) - EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) - EVT_CALL(N(SetNpcCollision32)) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_SET(LVar0, 0) - EVT_LOOP(8) - EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_WAIT(10) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) - EVT_CALL(SetForegroundModelsVisible, TRUE) - EVT_RETURN - EVT_END -}; - -EvtScript N(802A222C) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2047) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2045) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A267C) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - 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, ANIM_Mario1_Run) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) - EVT_ELSE - EVT_CALL(N(UnkBackgroundFunc)) - EVT_WAIT(15) - EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) - EVT_CALL(N(UnkStarFunc), 3) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - EvtScript N(EVS_UsePower) = { - EVT_CALL(func_802A1518_7905E8) - EVT_EXEC_WAIT(N(802A18F0)) + EVT_CALL(N(func_802A1518_7905E8)) + EVT_EXEC_WAIT(N(EVS_StarPower_WishForSpirit)) EVT_SET_CONST(LVar0, ANIM_BattleMuskular_Idle) - EVT_EXEC_WAIT(N(802A2020)) + EVT_EXEC_WAIT(N(EVS_StarPower_SpiritSummoned)) EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleMuskular_Shout) EVT_WAIT(16) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) - EVT_CALL(PlaySound, SOUND_0244) + EVT_CALL(PlaySound, SOUND_CHILL_OUT) EVT_CALL(InitTargetIterator) EVT_LABEL(10) - EVT_CALL(ItemCheckHit, LVar0, 0, 0, 0, 0) - EVT_IF_EQ(LVar0, 6) - EVT_GOTO(11) - EVT_END_IF - EVT_CALL(func_802A163C_79070C) - EVT_IF_EQ(LVar0, 1) - EVT_CALL(GetOwnerTarget, LVarA, LVarB) - EVT_THREAD - EVT_LOOP(5) + EVT_CALL(ItemCheckHit, LVar0, 0, 0, 0, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(11) + EVT_END_IF + EVT_CALL(N(func_802A163C_79070C)) + EVT_IF_EQ(LVar0, TRUE) + EVT_CALL(GetOwnerTarget, LVarA, LVarB) + EVT_THREAD + EVT_LOOP(5) + EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_WAIT(1) + EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.1), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_WAIT(1) + EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.2), EVT_FLOAT(0.95), EVT_FLOAT(1.0)) + EVT_WAIT(1) + EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.3), EVT_FLOAT(0.9), EVT_FLOAT(1.0)) + EVT_WAIT(1) + EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.35), EVT_FLOAT(0.85), EVT_FLOAT(1.0)) + EVT_WAIT(1) + EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.38), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) + EVT_WAIT(1) + EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.4), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) + EVT_WAIT(1) + EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.3), EVT_FLOAT(0.85), EVT_FLOAT(1.0)) + EVT_WAIT(1) + EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.2), EVT_FLOAT(0.9), EVT_FLOAT(1.0)) + EVT_WAIT(1) + EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.1), EVT_FLOAT(0.95), EVT_FLOAT(1.0)) + EVT_WAIT(1) + EVT_END_LOOP EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_WAIT(1) - EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.1), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_WAIT(1) - EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.2), EVT_FLOAT(0.95), EVT_FLOAT(1.0)) - EVT_WAIT(1) - EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.3), EVT_FLOAT(0.9), EVT_FLOAT(1.0)) - EVT_WAIT(1) - EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.35), EVT_FLOAT(0.85), EVT_FLOAT(1.0)) - EVT_WAIT(1) - EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.38), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) - EVT_WAIT(1) - EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.4), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) - EVT_WAIT(1) - EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.3), EVT_FLOAT(0.85), EVT_FLOAT(1.0)) - EVT_WAIT(1) - EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.2), EVT_FLOAT(0.9), EVT_FLOAT(1.0)) - EVT_WAIT(1) - EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.1), EVT_FLOAT(0.95), EVT_FLOAT(1.0)) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(SetActorScaleModifier, LVarA, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_END_THREAD - EVT_END_IF - EVT_LABEL(11) - EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) - EVT_IF_NE(LVar0, -1) - EVT_GOTO(10) - EVT_END_IF + EVT_END_THREAD + EVT_END_IF + EVT_LABEL(11) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_IF_NE(LVar0, -1) + EVT_GOTO(10) + EVT_END_IF EVT_LOOP(30) - EVT_CALL(func_802A153C_79060C) + EVT_CALL(N(func_802A153C_79060C)) EVT_WAIT(2) EVT_END_LOOP EVT_CALL(ChooseNextTarget, ITER_FIRST, 0) EVT_LABEL(0) - EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(ItemCheckHit, LVar0, 0, 0, 0, 0) - EVT_IF_EQ(LVar0, 6) - EVT_GOTO(1) - EVT_END_IF - EVT_CALL(func_802A163C_79070C) - EVT_IF_EQ(LVar0, 1) - EVT_CALL(func_802A16F4_7907C4) - EVT_ELSE - 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_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(ItemCheckHit, LVar0, 0, 0, 0, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(N(func_802A163C_79070C)) + EVT_IF_EQ(LVar0, TRUE) + EVT_CALL(N(func_802A16F4_7907C4)) + EVT_ELSE + 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, ITER_NEXT, LVar0) + EVT_IF_NE(LVar0, -1) + EVT_GOTO(0) + EVT_END_IF EVT_WAIT(5) - 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(N(func_802A1528_7905F8)) + EVT_IF_EQ(LVar0, TRUE) EVT_CALL(ShowMessageBox, BTL_MSG_CHILL_OUT_BEGIN, 60) EVT_END_IF EVT_CALL(PlayerYieldTurn) - EVT_EXEC_WAIT(N(802A222C)) - EVT_EXEC_WAIT(N(802A267C)) - EVT_CALL(func_802A1528_7905F8) - EVT_IF_EQ(LVar0, 1) + EVT_EXEC_WAIT(N(EVS_StarPower_SpiritDeparts)) + EVT_EXEC_WAIT(N(EVS_StarPower_EndWish)) + EVT_CALL(N(func_802A1528_7905F8)) + EVT_IF_EQ(LVar0, TRUE) EVT_CALL(WaitForMessageBoxDone) EVT_END_IF EVT_RETURN diff --git a/src/battle/move/star_power/focus.c b/src/battle/move/star_power/focus.c index 7d5b026f4a..b4037cde0f 100644 --- a/src/battle/move/star_power/focus.c +++ b/src/battle/move/star_power/focus.c @@ -4,17 +4,23 @@ #define NAMESPACE battle_move_focus -#include "common/StarPower.inc.c" +#include "battle/common/move/StarPowerSupport.inc.c" -API_CALLABLE(func_802A1518_78A378) { +enum { + RESTORE_NOT_FULL = 0, + RESTORE_ALREADY_FULL = 1, + RESTORE_NOW_FULL = 2, +}; + +API_CALLABLE(N(RestoreStarPowerFromPlayer)) { PlayerData* playerData = &gPlayerData; s32 deepFocusSP; s32 superFocusSP; - script->varTable[0] = 0; + script->varTable[0] = RESTORE_NOT_FULL; if (playerData->specialBarsFilled >= playerData->maxStarPower * 256) { - script->varTable[0] = 1; + script->varTable[0] = RESTORE_ALREADY_FULL; return ApiStatus_DONE2; } @@ -24,285 +30,47 @@ API_CALLABLE(func_802A1518_78A378) { add_SP(deepFocusSP + superFocusSP + 128); if (playerData->specialBarsFilled == playerData->maxStarPower * 256) { - script->varTable[0] = 2; + script->varTable[0] = RESTORE_NOW_FULL; } return ApiStatus_DONE2; } -API_CALLABLE(func_802A15B0_78A410) { +API_CALLABLE(N(RestoreStarPowerFromPartner)) { PlayerData* playerData = &gPlayerData; - script->varTable[0] = 0; + script->varTable[0] = RESTORE_NOT_FULL; if (playerData->specialBarsFilled >= playerData->maxStarPower * 256) { - script->varTable[0] = 1; + script->varTable[0] = RESTORE_ALREADY_FULL; return ApiStatus_DONE2; } add_SP(128); if (playerData->specialBarsFilled == playerData->maxStarPower * 256) { - script->varTable[0] = 2; + script->varTable[0] = RESTORE_NOW_FULL; } return ApiStatus_DONE2; } -EvtScript N(802A1630) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(FadeBackgroundToBlack)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A19C8) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(UnkBackgroundFunc2)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1D60) = { - EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, FALSE) - EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) - EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_SRAW_1E_A) - EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) - EVT_CALL(N(SetNpcCollision32)) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_SET(LVar0, 0) - EVT_LOOP(8) - EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_WAIT(10) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) - EVT_CALL(SetForegroundModelsVisible, TRUE) - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1F6C) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2047) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2045) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A23BC) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - 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, ANIM_Mario1_Run) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) - EVT_ELSE - EVT_CALL(N(UnkBackgroundFunc)) - EVT_WAIT(15) - EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) - EVT_CALL(N(UnkStarFunc), 3) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - EvtScript N(EVS_UsePower) = { - EVT_EXEC_WAIT(N(802A1630)) + EVT_EXEC_WAIT(N(EVS_StarPower_WishForSpirit)) EVT_CALL(EnableBattleStatusBar, TRUE) EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySound, SOUND_2053) - EVT_CALL(func_802A1518_78A378) + EVT_IF_EQ(LVarA, ACTOR_PLAYER) + EVT_CALL(PlaySound, SOUND_STAR_POWER_RECOVERY) + EVT_CALL(N(RestoreStarPowerFromPlayer)) EVT_WAIT(30) - EVT_CALL(N(UnkBackgroundFunc)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) + EVT_CASE_EQ(RESTORE_NOT_FULL) EVT_CALL(ShowMessageBox, BTL_MSG_STAR_POWER_RECHARGED, 60) - EVT_CASE_EQ(1) + EVT_CASE_EQ(RESTORE_ALREADY_FULL) EVT_CALL(ShowMessageBox, BTL_MSG_STAR_POWER_MAXED, 60) - EVT_CASE_EQ(2) + EVT_CASE_EQ(RESTORE_NOW_FULL) EVT_CALL(ShowMessageBox, BTL_MSG_STAR_POWER_FILLED, 60) EVT_END_SWITCH EVT_CALL(WaitForMessageBoxDone) @@ -313,26 +81,26 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(PlayerRunToGoal, 0) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_ELSE - EVT_CALL(PlaySound, SOUND_2053) - EVT_CALL(func_802A15B0_78A410) + EVT_CALL(PlaySound, SOUND_STAR_POWER_RECOVERY) + EVT_CALL(N(RestoreStarPowerFromPartner)) EVT_WAIT(30) - EVT_CALL(N(UnkBackgroundFunc)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) + EVT_CASE_EQ(RESTORE_NOT_FULL) EVT_CALL(ShowMessageBox, BTL_MSG_STAR_POWER_RECHARGED, 60) - EVT_CASE_EQ(1) + EVT_CASE_EQ(RESTORE_ALREADY_FULL) EVT_CALL(ShowMessageBox, BTL_MSG_STAR_POWER_MAXED, 60) - EVT_CASE_EQ(2) + EVT_CASE_EQ(RESTORE_NOW_FULL) EVT_CALL(ShowMessageBox, BTL_MSG_STAR_POWER_FILLED, 60) EVT_END_SWITCH EVT_CALL(WaitForMessageBoxDone) EVT_CALL(PartnerYieldTurn) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) - EVT_CALL(N(UnkStarFunc), 3) + EVT_CALL(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_RETURN) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) - EVT_CALL(N(UnkStarFunc), 4) + EVT_CALL(N(SetPartnerWishAnim), PARTNER_WISH_ANIM_IDLE) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/battle/move/star_power/lullaby.c b/src/battle/move/star_power/lullaby.c index 2fcc607239..6e0167ff9f 100644 --- a/src/battle/move/star_power/lullaby.c +++ b/src/battle/move/star_power/lullaby.c @@ -5,25 +5,24 @@ #define NAMESPACE battle_move_lullaby -#include "common/StarPower.inc.c" +#include "battle/common/move/StarPowerSupport.inc.c" -API_CALLABLE(func_802A1518_78D668) { +API_CALLABLE(N(SpawnMusicNotesFX)) { + s32 x, y; + if (isInitialCall) { script->functionTemp[0] = 0; } switch (script->functionTemp[0]) { - s32 temp; - s32 temp2; - case 0: script->functionTemp[2] = -80; script->functionTemp[1] = 0; script->functionTemp[0] = 1; case 1: - temp = script->functionTemp[2]; - temp2 = (sin_rad(DEG_TO_RAD(script->functionTemp[1])) * 30.0f) + 30.0f; - fx_music_note(0, temp, temp2, 50.0f); + x = script->functionTemp[2]; + y = 30.0f + 30.0f * sin_rad(DEG_TO_RAD(script->functionTemp[1])); + fx_music_note(0, x, y, 50.0f); script->functionTemp[2] += 14; script->functionTemp[1] += 20; @@ -35,273 +34,35 @@ API_CALLABLE(func_802A1518_78D668) { return ApiStatus_BLOCK; } -EvtScript N(802A1620) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(FadeBackgroundToBlack)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A19B8) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(UnkBackgroundFunc2)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1D50) = { - EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, FALSE) - EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) - EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_SRAW_1E_A) - EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) - EVT_CALL(N(SetNpcCollision32)) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_SET(LVar0, 0) - EVT_LOOP(8) - EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_WAIT(10) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) - EVT_CALL(SetForegroundModelsVisible, TRUE) - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1F5C) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2047) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2045) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A23AC) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - 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, ANIM_Mario1_Run) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) - EVT_ELSE - EVT_CALL(N(UnkBackgroundFunc)) - EVT_WAIT(15) - EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) - EVT_CALL(N(UnkStarFunc), 3) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - EvtScript N(EVS_UsePower) = { - EVT_EXEC_WAIT(N(802A1620)) + EVT_EXEC_WAIT(N(EVS_StarPower_WishForSpirit)) EVT_SET_CONST(LVar0, ANIM_BattleMamar_Idle) - EVT_EXEC_WAIT(N(802A1D50)) + EVT_EXEC_WAIT(N(EVS_StarPower_SpiritSummoned)) EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleMamar_Shout) EVT_WAIT(16) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_WAIT(15) EVT_CALL(PlaySound, SOUND_03F4) - EVT_CALL(func_802A1518_78D668) + EVT_CALL(N(SpawnMusicNotesFX)) EVT_WAIT(30) EVT_CALL(InitTargetIterator) EVT_LABEL(0) - EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(ItemCheckHit, LVar0, 0, 0, 0, 0) - EVT_IF_EQ(LVar0, 6) - EVT_GOTO(1) - EVT_END_IF - EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 0, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_LABEL(1) - EVT_WAIT(5) - EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) - EVT_IF_NE(LVar0, -1) - EVT_GOTO(0) - EVT_END_IF + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(ItemCheckHit, LVar0, 0, 0, 0, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_LABEL(1) + EVT_WAIT(5) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_IF_NE(LVar0, -1) + EVT_GOTO(0) + EVT_END_IF EVT_WAIT(5) EVT_CALL(PlayerYieldTurn) - EVT_EXEC_WAIT(N(802A1F5C)) - EVT_EXEC_WAIT(N(802A23AC)) + EVT_EXEC_WAIT(N(EVS_StarPower_SpiritDeparts)) + EVT_EXEC_WAIT(N(EVS_StarPower_EndWish)) EVT_RETURN EVT_END }; diff --git a/src/battle/move/star_power/peach_beam.c b/src/battle/move/star_power/peach_beam.c index fd970d5aa1..8fc4705001 100644 --- a/src/battle/move/star_power/peach_beam.c +++ b/src/battle/move/star_power/peach_beam.c @@ -4,10 +4,11 @@ #define NAMESPACE battle_move_peach_beam +#include "battle/common/move/StarPowerSupport.inc.c" #include "battle/common/move/StarBeamSupport.inc.c" EvtScript N(EVS_UsePower) = { - EVT_EXEC_WAIT(N(beforeUsePower)) + EVT_EXEC_WAIT(N(EVS_StarPower_WishForBeam)) EVT_CALL(AddBattleCamZoom, 100) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(InitTargetIterator) @@ -25,12 +26,12 @@ EvtScript N(EVS_UsePower) = { EVT_END_LOOP EVT_CALL(InitTargetIterator) EVT_LABEL(0) - EVT_CALL(SetGoalToTarget, ACTOR_SELF) - 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 + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + 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 EVT_LOOP(0) EVT_WAIT(1) EVT_CALL(N(GetStage)) @@ -41,7 +42,7 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(N(unkStarBeamBgFunc)) EVT_CALL(PlayerYieldTurn) - EVT_EXEC_WAIT(N(afterUsePower)) + EVT_EXEC_WAIT(N(EVS_StarPower_EndWish)) EVT_RETURN EVT_END }; diff --git a/src/battle/move/star_power/peach_focus.c b/src/battle/move/star_power/peach_focus.c index dbaedd6e89..752db02250 100644 --- a/src/battle/move/star_power/peach_focus.c +++ b/src/battle/move/star_power/peach_focus.c @@ -5,253 +5,18 @@ #define NAMESPACE battle_move_peach_focus -#include "common/StarPower.inc.c" +#include "battle/common/move/StarPowerSupport.inc.c" -API_CALLABLE(func_802A1518_79C4B8) { - // TODO: replace with actual struct when we know what it is - // varTable[0] is Twink's actorVar[0] - ((s32*)script->varTable[0])[1]++; +API_CALLABLE(N(IncreaseTwinkDefense)) { + // a pointer to Twink's DefenseTable is stored in his actorVar1 in twink.c + // it has now been copied to this script var, where we can retrieve it + s32* twinkDefenseTable = script->varTablePtr[0]; + + // increment the value of the first key in the defense table + twinkDefenseTable[1]++; return ApiStatus_DONE2; } -EvtScript N(802A1530) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(FadeBackgroundToBlack)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A18C8) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(UnkBackgroundFunc2)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1C60) = { - EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, FALSE) - EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) - EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_SRAW_1E_A) - EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) - EVT_CALL(N(SetNpcCollision32)) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_SET(LVar0, 0) - EVT_LOOP(8) - EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_WAIT(10) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) - EVT_CALL(SetForegroundModelsVisible, TRUE) - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1E6C) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2047) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2045) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A22BC) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - 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, ANIM_Mario1_Run) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) - EVT_ELSE - EVT_CALL(N(UnkBackgroundFunc)) - EVT_WAIT(15) - EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) - EVT_CALL(N(UnkStarFunc), 3) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - EvtScript N(EVS_UsePower) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -279,11 +44,11 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(MoveBattleCamOver, 60) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach3_Pray) - EVT_CALL(PlaySound, SOUND_0241) + EVT_CALL(PlaySound, SOUND_BEGIN_WISH) 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(N(SpawnStarSparkleFX), LVar0, LVar1, LVar2) + EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(GetActorVar, ACTOR_PARTNER, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(ActorSpeak, MSG_CH8_0096, ACTOR_PLAYER, 0, ANIM_Peach3_Pray, ANIM_Peach3_Pray) @@ -291,17 +56,17 @@ EvtScript N(EVS_UsePower) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach1_Idle) EVT_WAIT(10) - EVT_CALL(PlaySound, SOUND_2051) + EVT_CALL(PlaySound, SOUND_WISH_ASCENDING) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) + EVT_CALL(N(SpawnWishSparkleFX), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(PlaySound, SOUND_2053) + EVT_CALL(PlaySound, SOUND_STAR_POWER_RECOVERY) EVT_CALL(GetActorVar, ACTOR_PARTNER, 0, LVar0) EVT_ADD(LVar0, 1) EVT_CALL(SetActorVar, ACTOR_PARTNER, 0, LVar0) EVT_CALL(ModifyActorDecoration, ACTOR_PARTNER, 1, 0, LVar0, 0, 0, 0) EVT_CALL(GetActorVar, ACTOR_PARTNER, 1, LVar0) - EVT_CALL(func_802A1518_79C4B8) + EVT_CALL(N(IncreaseTwinkDefense)) EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetActorYaw, ACTOR_SELF, 150) @@ -317,7 +82,7 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_WAIT(1) EVT_CALL(PlayerYieldTurn) - EVT_CALL(N(UnkBackgroundFunc)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_WAIT(15) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) diff --git a/src/battle/move/star_power/refresh.c b/src/battle/move/star_power/refresh.c index d888fcefdc..15fef9088f 100644 --- a/src/battle/move/star_power/refresh.c +++ b/src/battle/move/star_power/refresh.c @@ -6,21 +6,29 @@ #define NAMESPACE battle_move_refresh -#include "common/StarPower.inc.c" +#include "battle/common/move/StarPowerSupport.inc.c" -API_CALLABLE(func_802A1518_78BB18) { +API_CALLABLE(N(FlyAroundPlayer)) { Bytecode* args = script->ptrReadPos; + s32 npcID; Npc* npc; + enum { + STATE_INIT = 0, + STATE_FLYING = 1, + STATE_DONE = 2, + }; + if (isInitialCall) { - script->functionTemp[0] = 0; + script->functionTemp[0] = STATE_INIT; } npc = script->functionTempPtr[1]; switch (script->functionTemp[0]) { - case 0: - script->functionTempPtr[1] = npc = get_npc_unsafe(evt_get_variable(script, *args++)); + case STATE_INIT: + npcID = evt_get_variable(script, *args++); + script->functionTempPtr[1] = npc = get_npc_unsafe(npcID); npc->planarFlyDist = 0; npc->yaw = 0; npc->duration = 0; @@ -30,9 +38,9 @@ API_CALLABLE(func_802A1518_78BB18) { npc->moveToPos.x = npc->pos.x; npc->moveToPos.y = npc->pos.y; npc->moveToPos.z = npc->pos.z; - script->functionTemp[0] = 1; + script->functionTemp[0] = STATE_FLYING; break; - case 1: + case STATE_FLYING: if (npc->jumpVel < 0.0f) { npc->planarFlyDist += 3.0; if (npc->planarFlyDist > 40.0f) { @@ -65,17 +73,17 @@ API_CALLABLE(func_802A1518_78BB18) { npc->jumpScale = 0.5f; } if (npc->pos.y > 200.0f) { - script->functionTemp[0] = 2; + script->functionTemp[0] = STATE_DONE; } break; - case 2: + case STATE_DONE: return ApiStatus_DONE2; } return ApiStatus_BLOCK; } -API_CALLABLE(func_802A17D4_78BDD4) { +API_CALLABLE(N(RemovePlayerDebuffs)) { Actor* actor = gBattleStatus.playerActor; if (actor->debuff != 0) { @@ -98,300 +106,62 @@ API_CALLABLE(func_802A17D4_78BDD4) { #include "common/AddFP.inc.c" -API_CALLABLE(func_802A18E8_78BEE8) { +API_CALLABLE(N(SpawnHeartRecoverFX)) { Bytecode* args = script->ptrReadPos; - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - s32 var3 = evt_get_variable(script, *args++); - s32 var4 = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); + s32 duration = evt_get_variable(script, *args++); - fx_recover(0, var1, var2, var3, var4); + fx_recover(0, x, y, z, duration); return ApiStatus_DONE2; } -API_CALLABLE(func_802A19A8_78BFA8) { +API_CALLABLE(N(SpawnFlowerRecoverFX)) { Bytecode* args = script->ptrReadPos; - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - s32 var3 = evt_get_variable(script, *args++); - s32 var4 = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); + s32 duration = evt_get_variable(script, *args++); - fx_recover(1, var1, var2, var3, var4); + fx_recover(1, x, y, z, duration); return ApiStatus_DONE2; } -EvtScript N(802A1A70) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(FadeBackgroundToBlack)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1E08) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(UnkBackgroundFunc2)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A21A0) = { - EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, FALSE) - EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) - EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_SRAW_1E_A) - EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) - EVT_CALL(N(SetNpcCollision32)) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_SET(LVar0, 0) - EVT_LOOP(8) - EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_WAIT(10) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) - EVT_CALL(SetForegroundModelsVisible, TRUE) - EVT_RETURN - EVT_END -}; - -EvtScript N(802A23AC) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2047) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2045) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A27FC) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - 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, ANIM_Mario1_Run) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) - EVT_ELSE - EVT_CALL(N(UnkBackgroundFunc)) - EVT_WAIT(15) - EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) - EVT_CALL(N(UnkStarFunc), 3) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - EvtScript N(EVS_UsePower) = { - EVT_EXEC_WAIT(N(802A1A70)) + EVT_EXEC_WAIT(N(EVS_StarPower_WishForSpirit)) EVT_SET_CONST(LVar0, ANIM_BattleEldstar_Idle) - EVT_EXEC_WAIT(N(802A21A0)) + EVT_EXEC_WAIT(N(EVS_StarPower_SpiritSummoned)) EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleEldstar_Shout) EVT_WAIT(16) EVT_THREAD EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_END_THREAD - EVT_CALL(PlaySound, SOUND_0242) + EVT_CALL(PlaySound, SOUND_REFRESH) EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) - EVT_CALL(func_802A1518_78BB18, 100) + EVT_CALL(N(FlyAroundPlayer), NPC_BTL_SPIRIT) 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) - EVT_CALL(func_802A18E8_78BEE8, LVar0, LVar1, LVar2, 5) + EVT_CALL(N(SpawnHeartRecoverFX), LVar0, LVar1, LVar2, 5) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 25) - EVT_CALL(func_802A19A8_78BFA8, LVar0, LVar1, LVar2, 5) + EVT_CALL(N(SpawnFlowerRecoverFX), LVar0, LVar1, LVar2, 5) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, 5) EVT_CALL(N(AddHP), 5) EVT_CALL(N(AddFP), 5) - EVT_CALL(func_802A17D4_78BDD4) + EVT_CALL(N(RemovePlayerDebuffs)) EVT_WAIT(30) EVT_CALL(PlayerYieldTurn) - EVT_EXEC_WAIT(N(802A27FC)) + EVT_EXEC_WAIT(N(EVS_StarPower_EndWish)) EVT_RETURN EVT_END }; diff --git a/src/battle/move/star_power/smooch.c b/src/battle/move/star_power/smooch.c index 484f31f7b8..660e7e6358 100644 --- a/src/battle/move/star_power/smooch.c +++ b/src/battle/move/star_power/smooch.c @@ -5,260 +5,22 @@ #define NAMESPACE battle_move_smooch -#include "common/StarPower.inc.c" +#include "battle/common/move/StarPowerSupport.inc.c" #include "common/AddHP.inc.c" -API_CALLABLE(func_802A156C_7922FC) { +API_CALLABLE(N(SpawnRecoverFX)) { Bytecode* args = script->ptrReadPos; - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - s32 var3 = evt_get_variable(script, *args++); - s32 var4 = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); + s32 duration = evt_get_variable(script, *args++); - fx_recover(0, var1, var2, var3, var4); + fx_recover(0, x, y, z, duration); return ApiStatus_DONE2; } -EvtScript N(802A1630) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(FadeBackgroundToBlack)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A19C8) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(UnkBackgroundFunc2)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1D60) = { - EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, FALSE) - EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) - EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_SRAW_1E_A) - EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) - EVT_CALL(N(SetNpcCollision32)) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_SET(LVar0, 0) - EVT_LOOP(8) - EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_WAIT(10) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) - EVT_CALL(SetForegroundModelsVisible, TRUE) - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1F6C) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2047) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2045) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A23BC) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - 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, ANIM_Mario1_Run) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) - EVT_ELSE - EVT_CALL(N(UnkBackgroundFunc)) - EVT_WAIT(15) - EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) - EVT_CALL(N(UnkStarFunc), 3) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - Vec2i N(RecoverEffectPositions)[] = { { 15, 15 }, { -33, 27 }, @@ -268,9 +30,9 @@ Vec2i N(RecoverEffectPositions)[] = { }; EvtScript N(EVS_UsePower) = { - EVT_EXEC_WAIT(N(802A1630)) + EVT_EXEC_WAIT(N(EVS_StarPower_WishForSpirit)) EVT_SET_CONST(LVar0, ANIM_BattleMisstar_Still) - EVT_EXEC_WAIT(N(802A1D60)) + EVT_EXEC_WAIT(N(EVS_StarPower_SpiritSummoned)) EVT_WAIT(16) EVT_THREAD EVT_WAIT(10) @@ -299,7 +61,7 @@ EvtScript N(EVS_UsePower) = { EVT_ADD(LVar1, 15) EVT_ADD(LVar2, -5) EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 10, 0, EASING_COS_IN_OUT) - EVT_CALL(PlaySound, SOUND_0245) + EVT_CALL(PlaySound, SOUND_SMOOCH) EVT_THREAD EVT_PLAY_EFFECT(EFFECT_RECOVER, 2, LVar0, LVar1, LVar2, 1, 0) EVT_WAIT(2) @@ -318,7 +80,7 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_ADD(LVar0, 5) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) + EVT_CALL(N(SpawnStarSparkleFX), LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_ADD(LVar0, 25) @@ -327,7 +89,7 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_FallBack) EVT_WAIT(12) EVT_THREAD - EVT_EXEC_WAIT(N(802A1F6C)) + EVT_EXEC_WAIT(N(EVS_StarPower_SpiritDeparts)) EVT_END_THREAD EVT_THREAD EVT_LOOP(2) @@ -383,13 +145,13 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 35) - EVT_CALL(func_802A156C_7922FC, LVar0, LVar1, LVar2, 20) + EVT_CALL(N(SpawnRecoverFX), LVar0, LVar1, LVar2, 20) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, 20) EVT_CALL(N(AddHP), 20) EVT_THREAD - EVT_CALL(N(UnkBackgroundFunc)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_END_THREAD EVT_CALL(PlayerYieldTurn) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) diff --git a/src/battle/move/star_power/star_beam.c b/src/battle/move/star_power/star_beam.c index c2f7d26273..5385041ea1 100644 --- a/src/battle/move/star_power/star_beam.c +++ b/src/battle/move/star_power/star_beam.c @@ -5,10 +5,11 @@ #define NAMESPACE battle_move_star_beam +#include "battle/common/move/StarPowerSupport.inc.c" #include "battle/common/move/StarBeamSupport.inc.c" EvtScript N(EVS_UsePower) = { - EVT_EXEC_WAIT(N(beforeUsePower)) + EVT_EXEC_WAIT(N(EVS_StarPower_WishForBeam)) EVT_CALL(AddBattleCamZoom, 100) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(InitTargetIterator) @@ -26,12 +27,12 @@ EvtScript N(EVS_UsePower) = { EVT_END_LOOP EVT_CALL(InitTargetIterator) EVT_LABEL(0) - EVT_CALL(SetGoalToTarget, ACTOR_SELF) - 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 + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + 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 EVT_LOOP(0) EVT_WAIT(1) EVT_CALL(N(GetStage)) @@ -42,7 +43,7 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(N(unkStarBeamBgFunc)) EVT_CALL(PlayerYieldTurn) - EVT_EXEC_WAIT(N(afterUsePower)) + EVT_EXEC_WAIT(N(EVS_StarPower_EndWish)) EVT_RETURN EVT_END }; diff --git a/src/battle/move/star_power/star_storm.c b/src/battle/move/star_power/star_storm.c index aabaf4ba84..8ba04ecd51 100644 --- a/src/battle/move/star_power/star_storm.c +++ b/src/battle/move/star_power/star_storm.c @@ -1,282 +1,43 @@ #include "common.h" #include "script_api/battle.h" #include "sprite/npc/BattleSkolar.h" -#include "sprite/player.h" #define NAMESPACE battle_move_star_storm -#include "common/StarPower.inc.c" +#include "battle/common/move/StarPowerSupport.inc.c" -API_CALLABLE(func_802A1518_78ECE8) { - s32 var1 = -50 - rand_int(200); - s32 var2 = 200; - s32 var3 = rand_int(40); +API_CALLABLE(N(func_802A1518_78ECE8)) { + s32 x = -50 - rand_int(200); + s32 y = 200; + s32 z = rand_int(40); f32 var4; if (script->varTable[0] % 4) { - var4 = var1 + (rand_int(50) + var2); - fx_star(2, var1, var2, var3, var4, 0, var3, rand_int(10) + 7); + var4 = x + (rand_int(50) + y); + fx_star(2, x, y, z, var4, 0, z, rand_int(10) + 7); } else { - var4 = var1 + (rand_int(50) + var2); - fx_star(3, var1, var2, var3, var4, 0, var3, rand_int(10) + 7); + var4 = x + (rand_int(50) + y); + fx_star(3, x, y, z, var4, 0, z, rand_int(10) + 7); } return ApiStatus_DONE2; } -API_CALLABLE(func_802A1628_78EDF8) { +API_CALLABLE(N(func_802A1628_78EDF8)) { Bytecode* args = script->ptrReadPos; - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - s32 var3 = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); - fx_damage_stars(2, var1, var2, var3, 0, -1.0f, 0, 5); + fx_damage_stars(2, x, y, z, 0, -1.0f, 0, 5); return ApiStatus_DONE2; } -EvtScript N(802A16F0) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(FadeBackgroundToBlack)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1A88) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(UnkBackgroundFunc2)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1E20) = { - EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, FALSE) - EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) - EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_SRAW_1E_A) - EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) - EVT_CALL(N(SetNpcCollision32)) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_SET(LVar0, 0) - EVT_LOOP(8) - EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_WAIT(10) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) - EVT_CALL(SetForegroundModelsVisible, TRUE) - EVT_RETURN - EVT_END -}; - -EvtScript N(802A202C) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2047) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2045) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A247C) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - 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, ANIM_Mario1_Run) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) - EVT_ELSE - EVT_CALL(N(UnkBackgroundFunc)) - EVT_WAIT(15) - EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) - EVT_CALL(N(UnkStarFunc), 3) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - EvtScript N(EVS_UsePower) = { - EVT_EXEC_WAIT(N(802A16F0)) + EVT_EXEC_WAIT(N(EVS_StarPower_WishForSpirit)) EVT_SET_CONST(LVar0, ANIM_BattleSkolar_Idle) - EVT_EXEC_WAIT(N(802A1E20)) + EVT_EXEC_WAIT(N(EVS_StarPower_SpiritSummoned)) EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleSkolar_Shout) EVT_WAIT(16) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) @@ -284,11 +45,11 @@ EvtScript N(EVS_UsePower) = { EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_CALL(PlaySound, SOUND_SRAW_15_A) - EVT_CALL(func_802A1518_78ECE8) + EVT_CALL(N(func_802A1518_78ECE8)) EVT_WAIT(5) EVT_ADD(LVar0, 1) EVT_CALL(PlaySound, SOUND_SRAW_15_B) - EVT_CALL(func_802A1518_78ECE8) + EVT_CALL(N(func_802A1518_78ECE8)) EVT_WAIT(5) EVT_ADD(LVar0, 1) EVT_END_LOOP @@ -315,24 +76,24 @@ EvtScript N(EVS_UsePower) = { EVT_WAIT(90) EVT_CALL(InitTargetIterator) EVT_LABEL(0) - EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(ItemCheckHit, LVar0, 0, 0, 0, 0) - EVT_IF_EQ(LVar0, 6) - EVT_GOTO(1) - EVT_END_IF - EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(func_802A1628_78EDF8, LVar0, LVar1, LVar2) - EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 7, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_LABEL(1) - EVT_WAIT(10) - EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) - EVT_IF_NE(LVar0, -1) - EVT_GOTO(0) - EVT_END_IF + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(ItemCheckHit, LVar0, 0, 0, 0, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) + EVT_CALL(N(func_802A1628_78EDF8), LVar0, LVar1, LVar2) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 7, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_LABEL(1) + EVT_WAIT(10) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_IF_NE(LVar0, -1) + EVT_GOTO(0) + EVT_END_IF EVT_WAIT(20) - EVT_EXEC_WAIT(N(802A202C)) + EVT_EXEC_WAIT(N(EVS_StarPower_SpiritDeparts)) EVT_CALL(PlayerYieldTurn) - EVT_EXEC_WAIT(N(802A247C)) + EVT_EXEC_WAIT(N(EVS_StarPower_EndWish)) EVT_RETURN EVT_END }; diff --git a/src/battle/move/star_power/time_out.c b/src/battle/move/star_power/time_out.c index c71777cb6a..a290510077 100644 --- a/src/battle/move/star_power/time_out.c +++ b/src/battle/move/star_power/time_out.c @@ -5,275 +5,37 @@ #define NAMESPACE battle_move_time_out -#include "common/StarPower.inc.c" - -EvtScript N(802A1520) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(FadeBackgroundToBlack)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A18B8) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(UnkBackgroundFunc2)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1C50) = { - EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, FALSE) - EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) - EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_SRAW_1E_A) - EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) - EVT_CALL(N(SetNpcCollision32)) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_SET(LVar0, 0) - EVT_LOOP(8) - EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_WAIT(10) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) - EVT_CALL(SetForegroundModelsVisible, TRUE) - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1E5C) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2047) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2045) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A22AC) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - 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, ANIM_Mario1_Run) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) - EVT_ELSE - EVT_CALL(N(UnkBackgroundFunc)) - EVT_WAIT(15) - EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) - EVT_CALL(N(UnkStarFunc), 3) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; +#include "battle/common/move/StarPowerSupport.inc.c" EvtScript N(EVS_UsePower) = { - EVT_EXEC_WAIT(N(802A1520)) + EVT_EXEC_WAIT(N(EVS_StarPower_WishForSpirit)) EVT_SET_CONST(LVar0, ANIM_BattleKlevar_Idle) - EVT_EXEC_WAIT(N(802A1C50)) + EVT_EXEC_WAIT(N(EVS_StarPower_SpiritSummoned)) EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleKlevar_Shout) EVT_WAIT(16) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) - EVT_CALL(PlaySound, SOUND_0246) + EVT_CALL(PlaySound, SOUND_TIME_OUT) EVT_PLAY_EFFECT(EFFECT_STOP_WATCH, 0, 0, 0, 0, EVT_FLOAT(1.0), 200, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0246) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_TIME_OUT) EVT_WAIT(200) EVT_CALL(InitTargetIterator) EVT_LABEL(0) - EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(ItemCheckHit, LVar0, 0, 0, 0, 0) - EVT_IF_EQ(LVar0, 6) - EVT_GOTO(1) - EVT_END_IF - EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, DMG_STATUS_KEY(STATUS_FLAG_STOP, 5, 100), 0, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_WAIT(5) - EVT_LABEL(1) - EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) - EVT_IF_NE(LVar0, -1) - EVT_GOTO(0) - EVT_END_IF + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(ItemCheckHit, LVar0, 0, 0, 0, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, DMG_STATUS_KEY(STATUS_FLAG_STOP, 5, 100), 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_WAIT(5) + EVT_LABEL(1) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_IF_NE(LVar0, -1) + EVT_GOTO(0) + EVT_END_IF EVT_WAIT(5) EVT_CALL(PlayerYieldTurn) - EVT_EXEC_WAIT(N(802A1E5C)) - EVT_EXEC_WAIT(N(802A22AC)) + EVT_EXEC_WAIT(N(EVS_StarPower_SpiritDeparts)) + EVT_EXEC_WAIT(N(EVS_StarPower_EndWish)) EVT_RETURN EVT_END }; diff --git a/src/battle/move/star_power/twink_dash.c b/src/battle/move/star_power/twink_dash.c index e63e6fcf46..3936c949b5 100644 --- a/src/battle/move/star_power/twink_dash.c +++ b/src/battle/move/star_power/twink_dash.c @@ -4,9 +4,9 @@ #define NAMESPACE battle_move_twink_dash -#include "common/StarPower.inc.c" +#include "battle/common/move/StarPowerSupport.inc.c" -API_CALLABLE(func_802A1518_79DDB8) { +API_CALLABLE(N(RestoreStarPower)) { PlayerData* playerData = &gPlayerData; PlayerData* playerData2 = &gPlayerData; @@ -26,244 +26,6 @@ API_CALLABLE(func_802A1518_79DDB8) { return ApiStatus_DONE2; } -EvtScript N(802A15B0) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(FadeBackgroundToBlack)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1948) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(UnkBackgroundFunc2)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1CE0) = { - EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, FALSE) - EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) - EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_SRAW_1E_A) - EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) - EVT_CALL(N(SetNpcCollision32)) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_SET(LVar0, 0) - EVT_LOOP(8) - EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_WAIT(10) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) - EVT_CALL(SetForegroundModelsVisible, TRUE) - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1EEC) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2047) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2045) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A233C) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - 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, ANIM_Mario1_Run) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) - EVT_ELSE - EVT_CALL(N(UnkBackgroundFunc)) - EVT_WAIT(15) - EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) - EVT_CALL(N(UnkStarFunc), 3) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - EvtScript N(EVS_UsePower) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -276,19 +38,19 @@ EvtScript N(EVS_UsePower) = { EVT_WAIT(8) 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(N(SpawnStarSparkleFX), LVar0, LVar1, LVar2) + EVT_CALL(N(FadeBackgroundDarken)) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach3_Pray) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) + EVT_CALL(N(SpawnWishSparkleFX), LVar0, LVar1, LVar2) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach2_Curious) - EVT_CALL(func_802A1518_79DDB8) + EVT_CALL(N(RestoreStarPower)) EVT_WAIT(10) - EVT_CALL(N(UnkBackgroundFunc)) + EVT_CALL(N(FadeBackgroundLighten)) EVT_WAIT(15) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) diff --git a/src/battle/move/star_power/up_and_away.c b/src/battle/move/star_power/up_and_away.c index a99312c553..1e3a1c858c 100644 --- a/src/battle/move/star_power/up_and_away.c +++ b/src/battle/move/star_power/up_and_away.c @@ -9,9 +9,9 @@ extern EntityModelScript EMS_StarIcon; #define NAMESPACE battle_move_up_and_away -#include "common/StarPower.inc.c" +#include "battle/common/move/StarPowerSupport.inc.c" -API_CALLABLE(func_802A1518_7957F8) { +API_CALLABLE(N(DarkenBackground)) { if (isInitialCall) { mdl_set_all_fog_mode(FOG_MODE_1); *gBackgroundFogModePtr = FOG_MODE_1; @@ -30,7 +30,7 @@ API_CALLABLE(func_802A1518_7957F8) { return ApiStatus_BLOCK; } -API_CALLABLE(func_802A15B4_795894) { +API_CALLABLE(N(RestoreBackground)) { if (isInitialCall) { script->functionTemp[0] = 254; } @@ -47,277 +47,42 @@ API_CALLABLE(func_802A15B4_795894) { return ApiStatus_BLOCK; } -API_CALLABLE(func_802A1628_795908) { +API_CALLABLE(N(ShouldTargetBeCaptured)) { Actor* targetActor = get_actor(get_actor(script->owner1.actorID)->targetActorID); - u32 flags; - script->varTable[0] = 0; - flags = targetActor->flags; + script->varTable[0] = FALSE; - if (!(flags & ACTOR_FLAG_TARGET_ONLY)) { - if (!(flags & ACTOR_FLAG_NO_DMG_APPLY)) { - if (!(flags & ACTOR_FLAG_2000) - && targetActor->actorBlueprint->upAndAwayChance != 0 - && rand_int(100) <= targetActor->actorBlueprint->upAndAwayChance - ) { - script->varTable[0] = 1; - } - } else { - return ApiStatus_DONE2; - } + if (targetActor->flags & ACTOR_FLAG_TARGET_ONLY) { + return ApiStatus_DONE2; + } + + if (targetActor->flags & ACTOR_FLAG_NO_DMG_APPLY) { + return ApiStatus_DONE2; + } + + if (targetActor->flags & ACTOR_FLAG_2000) { + return ApiStatus_DONE2; + } + + if (targetActor->actorBlueprint->upAndAwayChance != 0 + && rand_int(100) <= targetActor->actorBlueprint->upAndAwayChance + ) { + script->varTable[0] = TRUE; } return ApiStatus_DONE2; } -EvtScript N(802A16D0) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(FadeBackgroundToBlack)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1A68) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) - 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_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) - EVT_CALL(N(UnkBackgroundFunc2)) - EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) - EVT_WAIT(10) - 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, ANIM_Mario1_LookUp) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) - EVT_WAIT(10) - EVT_CALL(N(UnkStarFunc), 0) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 16) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) - EVT_CALL(N(UnkStarFunc), 4) - EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_0241) - 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, SOUND_2051) - EVT_CALL(N(UnkStarFunc), 1) - EVT_WAIT(10) - EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) - EVT_WAIT(30) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A1E00) = { - EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, FALSE) - EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) - EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_SRAW_1E_A) - EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) - EVT_CALL(N(SetNpcCollision32)) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_SET(LVar0, 0) - EVT_LOOP(8) - EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_WAIT(10) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) - EVT_CALL(SetForegroundModelsVisible, TRUE) - EVT_RETURN - EVT_END -}; - -EvtScript N(802A200C) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2047) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySound, SOUND_2045) - EVT_THREAD - EVT_LOOP(5) - EVT_WAIT(6) - 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, NPC_BTL_SPIRIT, TRUE) - EVT_THREAD - EVT_SET(LVar2, 0) - EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - 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, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) - EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) - EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(802A245C) = { - EVT_CALL(GetOwnerID, LVarA) - EVT_IF_EQ(LVarA, 0) - 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, ANIM_Mario1_Run) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) - EVT_ELSE - EVT_CALL(N(UnkBackgroundFunc)) - EVT_WAIT(15) - EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) - EVT_CALL(N(UnkStarFunc), 3) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) - EVT_CALL(N(UnkStarFunc), 4) - EVT_END_IF - EVT_RETURN - EVT_END -}; - EvtScript N(EVS_UsePower) = { - EVT_EXEC_WAIT(N(802A16D0)) + EVT_EXEC_WAIT(N(EVS_StarPower_WishForSpirit)) EVT_SET_CONST(LVar0, ANIM_BattleKalmar_Idle) - EVT_EXEC_WAIT(N(802A1E00)) + EVT_EXEC_WAIT(N(EVS_StarPower_SpiritSummoned)) EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleKalmar_Shout) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(20) EVT_CALL(SetMotionBlurParams, 0, 0, 0, 320, 240, 128, 10) - EVT_CALL(func_802A1518_7957F8) - EVT_CALL(PlaySound, SOUND_0247) + EVT_CALL(N(DarkenBackground)) + EVT_CALL(PlaySound, SOUND_UP_AND_AWAY_CAST) EVT_PLAY_EFFECT(EFFECT_ENERGY_SHOCKWAVE, 0, 0, 20, 0, EVT_FLOAT(1.0), 90) EVT_WAIT(30) EVT_THREAD @@ -328,89 +93,89 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(SetMotionBlurParams, 0, 0, 0, 320, 240, 0, 10) EVT_CALL(InitTargetIterator) EVT_LABEL(0) - EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(func_802A1628_795908) - EVT_SET(LFlag0, FALSE) - EVT_CALL(ItemCheckHit, LVar1, 0, 0, 0, 0) - EVT_IF_EQ(LVar1, 6) - EVT_SET(LVar0, 0) - EVT_SET(LFlag0, TRUE) - EVT_END_IF - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_CALL(DispatchEvent, LVar0, EVENT_UP_AND_AWAY) - EVT_CALL(SetActorRotationOffset, LVar0, 0, 10, 0) - EVT_THREAD - EVT_CALL(GetOwnerTarget, LVarB, LVar1) - EVT_WAIT(10) - EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(EMS_StarIcon)) - EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) - EVT_SET(LVarD, LVar0) - EVT_SET(LVarE, LVar1) - EVT_SET(LVarF, LVar2) - EVT_CALL(SetVirtualEntityPosition, LVarA, LVar0, LVar1, LVar2) - EVT_SETF(LVar0, EVT_FLOAT(0.2)) - EVT_CALL(SetVirtualEntityScale, LVarA, LVar0, LVar0, LVar0) - EVT_LOOP(4) - EVT_ADDF(LVar0, EVT_FLOAT(0.2)) - EVT_CALL(SetVirtualEntityScale, LVarA, LVar0, LVar0, LVar0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_SET(LVar0, 0) - EVT_LOOP(5) - EVT_ADD(LVar0, 72) - EVT_CALL(SetVirtualEntityRotation, LVarA, 0, LVar0, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(PlaySound, SOUND_2052) - EVT_SET(LVar0, LVarD) - EVT_SET(LVar1, LVarE) - EVT_SET(LVar2, LVarF) - EVT_SET(LVar3, 0) - EVT_LOOP(50) + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(N(ShouldTargetBeCaptured)) + EVT_SET(LFlag0, FALSE) + EVT_CALL(ItemCheckHit, LVar1, 0, 0, 0, 0) + EVT_IF_EQ(LVar1, HIT_RESULT_MISS) + EVT_SET(LVar0, 0) + EVT_SET(LFlag0, TRUE) + EVT_END_IF + EVT_SWITCH(LVar0) + EVT_CASE_GT(0) + EVT_CALL(GetOwnerTarget, LVar0, LVar1) + EVT_CALL(DispatchEvent, LVar0, EVENT_UP_AND_AWAY) + EVT_CALL(SetActorRotationOffset, LVar0, 0, 10, 0) + EVT_THREAD + EVT_CALL(GetOwnerTarget, LVarB, LVar1) + EVT_WAIT(10) + EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(EMS_StarIcon)) + EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) + EVT_SET(LVarD, LVar0) + EVT_SET(LVarE, LVar1) + EVT_SET(LVarF, LVar2) EVT_CALL(SetVirtualEntityPosition, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(SetVirtualEntityRotation, LVarA, 0, LVar3, 0) - EVT_ADD(LVar1, 6) - EVT_ADD(LVar3, 45) - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_THREAD - EVT_CALL(PlaySound, SOUND_2071) - EVT_CALL(GetOwnerTarget, LVarA, LVar1) - EVT_CALL(SetActorFlagBits, LVarA, 4, TRUE) - EVT_SETF(LVar0, EVT_FLOAT(1.0)) - EVT_LOOP(18) - EVT_SUBF(LVar0, EVT_FLOAT(0.05)) - EVT_CALL(SetActorScale, LVarA, LVar0, LVar0, LVar0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(SetActorPos, LVarA, NPC_DISPOSE_LOCATION) - EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) - EVT_LOOP(10) - 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, TRUE) - EVT_CALL(RemoveActor, LVarA) - EVT_END_THREAD - EVT_CASE_DEFAULT - EVT_IF_EQ(LFlag0, FALSE) - 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, ITER_NEXT, LVar0) - EVT_IF_NE(LVar0, -1) - EVT_GOTO(0) - EVT_END_IF + EVT_SETF(LVar0, EVT_FLOAT(0.2)) + EVT_CALL(SetVirtualEntityScale, LVarA, LVar0, LVar0, LVar0) + EVT_LOOP(4) + EVT_ADDF(LVar0, EVT_FLOAT(0.2)) + EVT_CALL(SetVirtualEntityScale, LVarA, LVar0, LVar0, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_SET(LVar0, 0) + EVT_LOOP(5) + EVT_ADD(LVar0, 72) + EVT_CALL(SetVirtualEntityRotation, LVarA, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySound, SOUND_UP_AND_AWAY_SEND_AWAY) + EVT_SET(LVar0, LVarD) + EVT_SET(LVar1, LVarE) + EVT_SET(LVar2, LVarF) + EVT_SET(LVar3, 0) + EVT_LOOP(50) + EVT_CALL(SetVirtualEntityPosition, LVarA, LVar0, LVar1, LVar2) + EVT_CALL(SetVirtualEntityRotation, LVarA, 0, LVar3, 0) + EVT_ADD(LVar1, 6) + EVT_ADD(LVar3, 45) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(PlaySound, SOUND_UP_AND_AWAY_CAPTURE) + EVT_CALL(GetOwnerTarget, LVarA, LVar1) + EVT_CALL(SetActorFlagBits, LVarA, 4, TRUE) + EVT_SETF(LVar0, EVT_FLOAT(1.0)) + EVT_LOOP(18) + EVT_SUBF(LVar0, EVT_FLOAT(0.05)) + EVT_CALL(SetActorScale, LVarA, LVar0, LVar0, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetActorPos, LVarA, NPC_DISPOSE_LOCATION) + EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) + EVT_LOOP(10) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, FX_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, TRUE) + EVT_CALL(RemoveActor, LVarA) + EVT_END_THREAD + EVT_CASE_DEFAULT + EVT_IF_EQ(LFlag0, FALSE) + 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, ITER_NEXT, LVar0) + EVT_IF_NE(LVar0, -1) + EVT_GOTO(0) + EVT_END_IF EVT_WAIT(70) - EVT_CALL(func_802A15B4_795894) - EVT_EXEC_WAIT(N(802A200C)) + EVT_CALL(N(RestoreBackground)) + EVT_EXEC_WAIT(N(EVS_StarPower_SpiritDeparts)) EVT_CALL(PlayerYieldTurn) - EVT_EXEC_WAIT(N(802A245C)) + EVT_EXEC_WAIT(N(EVS_StarPower_EndWish)) EVT_RETURN EVT_END }; diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index 31a70ed1eb..9e5ca22ff6 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -363,7 +363,7 @@ EvtScript N(handleEvent) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleBombette_Hurt) EVT_EXEC_WAIT(EVS_Partner_NoDamageHit) @@ -579,7 +579,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Partner_Recover) EVT_CASE_OR_EQ(EVENT_18) EVT_CASE_OR_EQ(EVENT_BLOCK) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleBombette_Block) EVT_EXEC_WAIT(EVS_Partner_NoDamageHit) @@ -1301,8 +1301,8 @@ EvtScript N(bomb) = { EVT_END_IF EVT_SET(LVar0, 0) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CASE_OR_EQ(1) EVT_CASE_OR_EQ(3) EVT_THREAD @@ -1399,8 +1399,8 @@ EvtScript N(firstStrikeBodySlam) = { EVT_LABEL(10) EVT_SET(LVar0, 0) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CASE_OR_EQ(1) EVT_CASE_OR_EQ(3) EVT_THREAD diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c index b117d10fe1..013e67e17e 100644 --- a/src/battle/partner/bow.c +++ b/src/battle/partner/bow.c @@ -257,7 +257,7 @@ EvtScript N(handleEvent) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleBow_Hurt) EVT_EXEC_WAIT(EVS_Partner_NoDamageHit) @@ -296,7 +296,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Partner_Recover) EVT_CASE_OR_EQ(EVENT_18) EVT_CASE_OR_EQ(EVENT_BLOCK) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleBow_Block) EVT_EXEC_WAIT(EVS_Partner_NoDamageHit) @@ -1209,8 +1209,8 @@ EvtScript N(fanSmack) = { EVT_CALL(SetActorYaw, ACTOR_PARTNER, 0) EVT_END_THREAD EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) EVT_EXEC_WAIT(N(returnHome)) diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 233776ed42..78c9d0dc35 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -10,7 +10,7 @@ extern s32 bActorTattles[ACTOR_TYPE_COUNT]; static EffectInstance* N(tattleEffect); -static s32 N(isCharged); +static b32 N(isCharged); extern s32 N(powerBounceChance); extern EvtScript N(init); @@ -387,9 +387,9 @@ API_CALLABLE(N(ChargeAtPos)) { s32 boostAmount; s32 x, y, z; - N(isCharged) = 0; + N(isCharged) = FALSE; if (partner->isGlowing > 0) { - N(isCharged) = 1; + N(isCharged) = TRUE; } boostAmount = 0; @@ -470,7 +470,7 @@ API_CALLABLE(N(PlayChargeFX)) { } API_CALLABLE(N(GetChargeMessage)) { - if (N(isCharged) == 0) { + if (!N(isCharged)) { script->varTable[0] = BTL_MSG_CHARGE_GOOMBARIO; } else { script->varTable[0] = BTL_MSG_CHARGE_GOOMBARIO_MORE; @@ -586,7 +586,7 @@ EvtScript N(handleEvent) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleGoombario_HurtStill) EVT_EXEC_WAIT(EVS_Partner_NoDamageHit) @@ -626,7 +626,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Partner_Recover) EVT_CASE_OR_EQ(EVENT_18) EVT_CASE_OR_EQ(EVENT_BLOCK) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleGoombario_Block) EVT_EXEC_WAIT(EVS_Partner_NoDamageHit) @@ -1482,7 +1482,7 @@ EvtScript N(charge) = { EVT_CALL(SetActorDispOffset, ACTOR_PARTNER, 0, 19, 0) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208F) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_CHARGE_UP) EVT_CALL(N(PlayChargeFX), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) EVT_WAIT(3) EVT_CALL(N(PlayChargeFX), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) @@ -1505,7 +1505,7 @@ EvtScript N(charge) = { EVT_ADD(LVar0, 10) EVT_ADD(LVar1, 25) EVT_ADD(LVar2, 5) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208E) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_GROW) EVT_CALL(N(ChargeAtPos), LVar0, LVar1, LVar2) EVT_WAIT(4) EVT_CALL(SetActorJumpGravity, ACTOR_PARTNER, EVT_FLOAT(1.4)) diff --git a/src/battle/partner/goompa.c b/src/battle/partner/goompa.c index 6c4ad0ab9a..f6e7e2081c 100644 --- a/src/battle/partner/goompa.c +++ b/src/battle/partner/goompa.c @@ -104,7 +104,7 @@ EvtScript N(handleEvent) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) - EVT_CALL(PlaySound, SOUND_208C) + EVT_CALL(PlaySound, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_Goompa_Injured) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c index b610fe79b8..b338ac3042 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -290,7 +290,7 @@ EvtScript N(handleEvent) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleKooper_Hurt) EVT_EXEC_WAIT(EVS_Partner_NoDamageHit) @@ -330,7 +330,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Partner_Recover) EVT_CASE_OR_EQ(EVENT_18) EVT_CASE_OR_EQ(EVENT_BLOCK) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleKooper_LowerShell) EVT_EXEC_WAIT(EVS_Partner_NoDamageHit) @@ -900,7 +900,7 @@ EvtScript N(dizzyShell) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_200C) EVT_SET(LVar9, 0) EVT_SET(LVarA, EVT_FLOAT(8.0)) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2026) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_DIZZY_SHELL) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_ZERO, 1, ACTOR_DECORATION_WHIRLWIND) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_SET(LVar9, 1) diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c index 3092cbd8fa..4d32369f8d 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -212,7 +212,7 @@ EvtScript N(handleEvent) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Hurt) EVT_EXEC_WAIT(EVS_Partner_NoDamageHit) @@ -251,7 +251,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Partner_Recover) EVT_CASE_OR_EQ(EVENT_18) EVT_CASE_OR_EQ(EVENT_BLOCK) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Block) EVT_EXEC_WAIT(EVS_Partner_NoDamageHit) diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index 563965ac42..3024761c72 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -725,7 +725,7 @@ EvtScript N(handleEvent) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleParakarry_HurtStill) EVT_EXEC_WAIT(EVS_Partner_NoDamageHit) @@ -767,7 +767,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Partner_Recover) EVT_CASE_OR_EQ(EVENT_18) EVT_CASE_OR_EQ(EVENT_BLOCK) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleParakarry_OrientShell) EVT_EXEC_WAIT(EVS_Partner_NoDamageHit) diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c index 8790950c66..9265c1c914 100644 --- a/src/battle/partner/sushie.c +++ b/src/battle/partner/sushie.c @@ -259,9 +259,9 @@ API_CALLABLE(N(ProcessTidalWave)) { } while (0); if (script->functionTemp[2] != 0) { - sfx_play_sound_at_position(SOUND_029B, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_TIDAL_WAVE_LEAP_A, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); } else { - sfx_play_sound_at_position(SOUND_029C, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_TIDAL_WAVE_LEAP_B, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); } script->functionTemp[2] = 1 - script->functionTemp[2]; } @@ -283,9 +283,9 @@ API_CALLABLE(N(ProcessTidalWave)) { } while (0); // TODO macro? if (script->functionTemp[2] != 0) { - sfx_play_sound_at_position(SOUND_029B, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_TIDAL_WAVE_LEAP_A, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); } else { - sfx_play_sound_at_position(SOUND_029C, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_TIDAL_WAVE_LEAP_B, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); } script->functionTemp[2] = 1 - script->functionTemp[2]; } @@ -307,9 +307,9 @@ API_CALLABLE(N(ProcessTidalWave)) { } while (0); // TODO macro? if (script->functionTemp[2] != 0) { - sfx_play_sound_at_position(SOUND_029B, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_TIDAL_WAVE_LEAP_A, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); } else { - sfx_play_sound_at_position(SOUND_029C, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_TIDAL_WAVE_LEAP_B, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); } script->functionTemp[2] = 1 - script->functionTemp[2]; } @@ -331,8 +331,8 @@ API_CALLABLE(N(ProcessTidalWave)) { sEffect->data.waterFountain->unk_38 = state->angle; sEffect->data.waterFountain->unk_3C = partner->scale.x; sEffect->data.waterFountain->unk_40 = partner->scale.x; - if (state->moveTime == 0x46) { - sfx_play_sound_at_position(SOUND_029D, SOUND_SPACE_MODE_0, 0.0f, 0.0f, 0.0f); + if (state->moveTime == 70) { + sfx_play_sound_at_position(SOUND_TIDAL_WAVE_WATER, SOUND_SPACE_MODE_0, 0.0f, 0.0f, 0.0f); fx_underwater(0, -50.0f, 20.0f, 0.0f, 1.0f, 120); } @@ -495,7 +495,7 @@ EvtScript N(handleEvent) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleSushie_Hurt) EVT_EXEC_WAIT(EVS_Partner_NoDamageHit) @@ -534,7 +534,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Partner_Recover) EVT_CASE_OR_EQ(EVENT_18) EVT_CASE_OR_EQ(EVENT_BLOCK) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleSushie_Block) EVT_EXEC_WAIT(EVS_Partner_NoDamageHit) @@ -854,7 +854,7 @@ EvtScript N(bellyFlop) = { EVT_END_SWITCH EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2034) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_SUSHIE_BELLY_FLOP) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(GetActionCommandResult, LVar0) EVT_IF_GT(LVar0, 0) @@ -982,7 +982,7 @@ EvtScript N(squirt) = { EVT_SETF(LVarE, LVar0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0297) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_SUSHIE_SQUIRT) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(PartnerTestEnemy, LVar0, DAMAGE_TYPE_WATER | DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) @@ -1073,7 +1073,7 @@ EvtScript N(waterBlock) = { EVT_CALL(SetBattleCamZoom, 277) EVT_CALL(MoveBattleCamOver, 10) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0298) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_SUSHIE_FOUNTAIN) EVT_CALL(N(PlaySquirtFX)) EVT_WAIT(65) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Celebrate) @@ -1082,7 +1082,7 @@ EvtScript N(waterBlock) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 83) EVT_PLAY_EFFECT(EFFECT_WATERFALL, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 50, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2035) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_CREATE_WATER_BLOCK) EVT_THREAD EVT_WAIT(20) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/partner/twink.c b/src/battle/partner/twink.c index 478cc66677..a709411616 100644 --- a/src/battle/partner/twink.c +++ b/src/battle/partner/twink.c @@ -225,7 +225,7 @@ EvtScript N(nextTurn) = { EvtScript N(executeAction) = { EVT_CALL(EnableIdleScript, ACTOR_PARTNER, 0) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_207F, SOUND_02AA) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_207F, SOUND_TWINK_FLY_B) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(InitTargetIterator) @@ -275,7 +275,7 @@ EvtScript N(executeAction) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_207F, SOUND_02AA) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_207F, SOUND_TWINK_FLY_B) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_Twink_Angry) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index e61fcc9740..edaf95634e 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -559,7 +559,7 @@ EvtScript N(handleEvent) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleWatt_Hurt) EVT_EXEC_WAIT(EVS_Partner_NoDamageHit) @@ -601,11 +601,11 @@ EvtScript N(handleEvent) = { EVT_SET(LVar3, 20) EVT_EXEC_WAIT(EVS_Partner_Recover) EVT_CALL(N(WattFXBounce)) - EVT_CASE_EQ(EVENT_62) + EVT_CASE_EQ(EVENT_PUT_PARTNER_AWAY) EVT_CALL(N(WattFXRemove)) EVT_CASE_OR_EQ(EVENT_18) EVT_CASE_OR_EQ(EVENT_BLOCK) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NO_DAMGE) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleWatt_Block) EVT_EXEC_WAIT(EVS_Partner_NoDamageHit) @@ -1150,7 +1150,7 @@ EvtScript N(8023AE8C) = { EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208E) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_GROW) EVT_CALL(GetActionCommandResult, LVar0) EVT_CALL(N(ApplyTurboCharge)) EVT_SET(LVarE, LVarF) @@ -1221,7 +1221,7 @@ EvtScript N(8023B450) = { EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_208E) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_GROW) EVT_CALL(GetActionCommandResult, LVar0) EVT_CALL(N(ApplyTurboCharge)) EVT_SET(LVarE, LVarF) diff --git a/src/battle/use_star_powers.c b/src/battle/use_star_powers.c index 2e7cc0e2f7..8fcd935ad6 100644 --- a/src/battle/use_star_powers.c +++ b/src/battle/use_star_powers.c @@ -41,72 +41,72 @@ BattleMoveEntry StarPowersTable[] = { BTL_MOVE(twink_dash, EVS_UsePower), }; -s32 D_8029C890[][5] = { +s32 PartnerWishAnims[][5] = { [PARTNER_NONE] { - ANIM_Mario1_UsePower, - ANIM_Mario1_Pray, - ANIM_Mario1_LookUp, - ANIM_Mario1_Run, - 0, + [PARTNER_WISH_ANIM_WALK] ANIM_Mario1_UsePower, + [PARTNER_WISH_ANIM_PRAY] ANIM_Mario1_Pray, + [PARTNER_WISH_ANIM_UNUSED] ANIM_Mario1_LookUp, + [PARTNER_WISH_ANIM_RETURN] ANIM_Mario1_Run, + [PARTNER_WISH_ANIM_IDLE] 0, }, [PARTNER_GOOMBARIO] { - ANIM_BattleGoombario_Run, - ANIM_BattleGoombario_CloseEyes, - ANIM_BattleGoombario_CloseEyes, - ANIM_BattleGoombario_Run, - ANIM_BattleGoombario_Idle, + [PARTNER_WISH_ANIM_WALK] ANIM_BattleGoombario_Run, + [PARTNER_WISH_ANIM_PRAY] ANIM_BattleGoombario_CloseEyes, + [PARTNER_WISH_ANIM_UNUSED] ANIM_BattleGoombario_CloseEyes, + [PARTNER_WISH_ANIM_RETURN] ANIM_BattleGoombario_Run, + [PARTNER_WISH_ANIM_IDLE] ANIM_BattleGoombario_Idle, }, [PARTNER_KOOPER] { - ANIM_BattleKooper_Run, - ANIM_BattleKooper_Pray, - ANIM_BattleKooper_Pray, - ANIM_BattleKooper_Run, - ANIM_BattleKooper_Idle, + [PARTNER_WISH_ANIM_WALK] ANIM_BattleKooper_Run, + [PARTNER_WISH_ANIM_PRAY] ANIM_BattleKooper_Pray, + [PARTNER_WISH_ANIM_UNUSED] ANIM_BattleKooper_Pray, + [PARTNER_WISH_ANIM_RETURN] ANIM_BattleKooper_Run, + [PARTNER_WISH_ANIM_IDLE] ANIM_BattleKooper_Idle, }, [PARTNER_BOMBETTE] { - ANIM_BattleBombette_Run, - ANIM_BattleBombette_Sleep, - ANIM_BattleBombette_Sleep, - ANIM_BattleBombette_Run, - ANIM_BattleBombette_Idle, + [PARTNER_WISH_ANIM_WALK] ANIM_BattleBombette_Run, + [PARTNER_WISH_ANIM_PRAY] ANIM_BattleBombette_Sleep, + [PARTNER_WISH_ANIM_UNUSED] ANIM_BattleBombette_Sleep, + [PARTNER_WISH_ANIM_RETURN] ANIM_BattleBombette_Run, + [PARTNER_WISH_ANIM_IDLE] ANIM_BattleBombette_Idle, }, [PARTNER_PARAKARRY] { - ANIM_BattleParakarry_Run, - ANIM_BattleParakarry_Pray, - ANIM_BattleParakarry_Pray, - ANIM_BattleParakarry_Run, - ANIM_BattleParakarry_Idle, + [PARTNER_WISH_ANIM_WALK] ANIM_BattleParakarry_Run, + [PARTNER_WISH_ANIM_PRAY] ANIM_BattleParakarry_Pray, + [PARTNER_WISH_ANIM_UNUSED] ANIM_BattleParakarry_Pray, + [PARTNER_WISH_ANIM_RETURN] ANIM_BattleParakarry_Run, + [PARTNER_WISH_ANIM_IDLE] ANIM_BattleParakarry_Idle, }, [PARTNER_GOOMPA] { // no data }, [PARTNER_WATT] { - ANIM_BattleWatt_Run, - ANIM_BattleWatt_Sleep, - ANIM_BattleWatt_Sleep, - ANIM_BattleWatt_Run, - ANIM_BattleParakarry_Idle, // @bug uses wrong sprite! + [PARTNER_WISH_ANIM_WALK] ANIM_BattleWatt_Run, + [PARTNER_WISH_ANIM_PRAY] ANIM_BattleWatt_Sleep, + [PARTNER_WISH_ANIM_UNUSED] ANIM_BattleWatt_Sleep, + [PARTNER_WISH_ANIM_RETURN] ANIM_BattleWatt_Run, + [PARTNER_WISH_ANIM_IDLE] ANIM_BattleParakarry_Idle, // @bug uses wrong sprite! }, [PARTNER_SUSHIE] { - ANIM_BattleSushie_Run, - ANIM_BattleSushie_Pray, - ANIM_BattleSushie_Pray, - ANIM_BattleSushie_Run, - ANIM_BattleSushie_Idle, + [PARTNER_WISH_ANIM_WALK] ANIM_BattleSushie_Run, + [PARTNER_WISH_ANIM_PRAY] ANIM_BattleSushie_Pray, + [PARTNER_WISH_ANIM_UNUSED] ANIM_BattleSushie_Pray, + [PARTNER_WISH_ANIM_RETURN] ANIM_BattleSushie_Run, + [PARTNER_WISH_ANIM_IDLE] ANIM_BattleSushie_Idle, }, [PARTNER_LAKILESTER] { - ANIM_BattleLakilester_Run, - ANIM_BattleLakilester_Pray, - ANIM_BattleLakilester_Pray, - ANIM_BattleLakilester_Run, - ANIM_BattleLakilester_Idle, + [PARTNER_WISH_ANIM_WALK] ANIM_BattleLakilester_Run, + [PARTNER_WISH_ANIM_PRAY] ANIM_BattleLakilester_Pray, + [PARTNER_WISH_ANIM_UNUSED] ANIM_BattleLakilester_Pray, + [PARTNER_WISH_ANIM_RETURN] ANIM_BattleLakilester_Run, + [PARTNER_WISH_ANIM_IDLE] ANIM_BattleLakilester_Idle, }, [PARTNER_BOW] { - ANIM_BattleBow_Run, - ANIM_BattleBow_Pray, - ANIM_BattleBow_Pray, - ANIM_BattleBow_Run, - ANIM_BattleBow_Idle, + [PARTNER_WISH_ANIM_WALK] ANIM_BattleBow_Run, + [PARTNER_WISH_ANIM_PRAY] ANIM_BattleBow_Pray, + [PARTNER_WISH_ANIM_UNUSED] ANIM_BattleBow_Pray, + [PARTNER_WISH_ANIM_RETURN] ANIM_BattleBow_Run, + [PARTNER_WISH_ANIM_IDLE] ANIM_BattleBow_Idle, }, }; diff --git a/src/common/FadeBackgroundToBlack.inc.c b/src/common/FadeBackgroundDarken.inc.c similarity index 69% rename from src/common/FadeBackgroundToBlack.inc.c rename to src/common/FadeBackgroundDarken.inc.c index 0c7fa9d771..701986c4cd 100644 --- a/src/common/FadeBackgroundToBlack.inc.c +++ b/src/common/FadeBackgroundDarken.inc.c @@ -2,7 +2,7 @@ #include "model.h" #include "npc.h" -API_CALLABLE(N(FadeBackgroundToBlack)) { +API_CALLABLE(N(FadeBackgroundDarken)) { if (isInitialCall) { mdl_set_all_fog_mode(FOG_MODE_1); *gBackgroundFogModePtr = FOG_MODE_1; @@ -12,6 +12,10 @@ API_CALLABLE(N(FadeBackgroundToBlack)) { set_background_color_blend(0, 0, 0, ((20 - script->functionTemp[0]) * 10) & 254); script->functionTemp[0]--; - do {} while (0); - return (script->functionTemp[0] == 0) * ApiStatus_DONE2; + + if (script->functionTemp[0] == 0) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } } diff --git a/src/common/UnfadeBackgroundToBlack.inc.c b/src/common/FadeBackgroundLighten.inc.c similarity index 69% rename from src/common/UnfadeBackgroundToBlack.inc.c rename to src/common/FadeBackgroundLighten.inc.c index 9f2f98c93b..cf45176d76 100644 --- a/src/common/UnfadeBackgroundToBlack.inc.c +++ b/src/common/FadeBackgroundLighten.inc.c @@ -2,18 +2,17 @@ #include "model.h" #include "map.h" -API_CALLABLE(N(UnfadeBackgroundToBlack)) { +API_CALLABLE(N(FadeBackgroundLighten)) { if (isInitialCall) { script->functionTemp[0] = 20; } - set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 0xFE); - script->functionTemp[0] -= 1; + set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 254); + script->functionTemp[0]--; if (script->functionTemp[0] == 0) { set_background_color_blend(0, 0, 0, 0); return ApiStatus_DONE2; - } else { - return ApiStatus_BLOCK; } + return ApiStatus_BLOCK; } diff --git a/src/common/SetNpcCollision32.inc.c b/src/common/SetNpcCollision32.inc.c deleted file mode 100644 index 0fb9a9c7db..0000000000 --- a/src/common/SetNpcCollision32.inc.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -API_CALLABLE(N(SetNpcCollision32)) { - Npc* npc = get_npc_unsafe(100); - - npc->collisionHeight = 32; - npc->collisionDiameter = 32; - return ApiStatus_DONE2; -} diff --git a/src/common/StarPower.inc.c b/src/common/StarPower.inc.c deleted file mode 100644 index aaf88afa4b..0000000000 --- a/src/common/StarPower.inc.c +++ /dev/null @@ -1,53 +0,0 @@ -#include "common.h" -#include "effects.h" - -API_CALLABLE(N(UnkStarFunc1)) { - Bytecode* args = script->ptrReadPos; - s32 a = evt_get_variable(script, *args++); - s32 b = evt_get_variable(script, *args++); - s32 c = evt_get_variable(script, *args++); - - fx_sparkles(FX_SPARKLES_0, a, b, c, 40.0f); - return ApiStatus_DONE2; -} - -API_CALLABLE(N(UnkStarFunc2)) { - Bytecode* args = script->ptrReadPos; - s32 a = evt_get_variable(script, *args++); - s32 b = evt_get_variable(script, *args++); - s32 c = evt_get_variable(script, *args++); - - fx_stars_shimmer(5, a, b, c, 50.0f, 50.0f, 40, 30); - return ApiStatus_DONE2; -} - -API_CALLABLE(N(UnkStarFunc3)) { - Bytecode* args = script->ptrReadPos; - s32 a = evt_get_variable(script, *args++); - s32 b = evt_get_variable(script, *args++); - s32 c = evt_get_variable(script, *args++); - - fx_sparkles(FX_SPARKLES_0, a, b, c, 30.0f); - return ApiStatus_DONE2; -} - -API_CALLABLE(N(UnkStarFunc4)) { - Bytecode* args = script->ptrReadPos; - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - - fx_misc_particles(4, var1, var2, evt_get_variable(script, *args++), 20.0f, 20.0f, 1.0f, 0xA, 0xF); - return ApiStatus_DONE2; -} - -#include "common/FadeBackgroundToBlack.inc.c" - -#include "common/UnkBackgroundFunc2.inc.c" - -#include "common/UnkBackgroundFunc.inc.c" - -#include "common/UnkStarFunc.inc.c" - -#include "common/SetNpcCollision32.inc.c" - -// possibly 2 scripts here diff --git a/src/common/UnkBackgroundFunc.inc.c b/src/common/UnkBackgroundFunc.inc.c deleted file mode 100644 index 908070fffe..0000000000 --- a/src/common/UnkBackgroundFunc.inc.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "common.h" -#include "model.h" - -API_CALLABLE(N(UnkBackgroundFunc)) { - if (isInitialCall) { - script->functionTemp[0] = 20; - } - - set_background_color_blend(0, 0, 0, script->functionTemp[0] * 10); - script->functionTemp[0] -= 1; - - if (script->functionTemp[0] == 0) { - set_background_color_blend(0, 0, 0, 0); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} diff --git a/src/common/UnkBackgroundFunc2.inc.c b/src/common/UnkBackgroundFunc2.inc.c deleted file mode 100644 index 7617594c07..0000000000 --- a/src/common/UnkBackgroundFunc2.inc.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "common.h" -#include "model.h" - -API_CALLABLE(N(UnkBackgroundFunc2)) { - if (isInitialCall) { - mdl_set_all_fog_mode(FOG_MODE_1); - *gBackgroundFogModePtr = FOG_MODE_1; - set_background_color_blend(0, 0, 0, 0); - script->functionTemp[0] = 0; - } - - set_background_color_blend(0, 0, 0, script->functionTemp[0]); - script->functionTemp[0] += 10; - - if (script->functionTemp[0] >= 230) { - set_background_color_blend(0, 0, 0, 230); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} diff --git a/src/common/UnkSfxFunc.inc.c b/src/common/UnkSfxFunc.inc.c index b87606a0aa..9a042465b8 100644 --- a/src/common/UnkSfxFunc.inc.c +++ b/src/common/UnkSfxFunc.inc.c @@ -11,13 +11,13 @@ API_CALLABLE(N(UnkSfxFunc)) { distY = actor->state.goalPos.y - actor->curPos.y; distZ = actor->state.goalPos.z - actor->curPos.z; script->functionTemp[0] = ((sqrtf(SQ(distX) + SQ(distY) + SQ(distZ)) / actor->state.speed) * 0.5f) + 1.0f; - sfx_play_sound_at_position(SOUND_0359, SOUND_SPACE_MODE_0, actor->curPos.x, actor->curPos.y, actor->curPos.z); + sfx_play_sound_at_position(SOUND_EMBER_FLY, SOUND_SPACE_MODE_0, actor->curPos.x, actor->curPos.y, actor->curPos.z); } if (script->functionTemp[0]-- > 0) { return ApiStatus_BLOCK; } - sfx_play_sound_at_position(SOUND_0359 | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0, actor->curPos.x, actor->curPos.y, actor->curPos.z); + sfx_play_sound_at_position(SOUND_EMBER_FLY | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0, actor->curPos.x, actor->curPos.y, actor->curPos.z); return ApiStatus_DONE2; } diff --git a/src/common/UnkStarFunc.inc.c b/src/common/UnkStarFunc.inc.c deleted file mode 100644 index 421cdc4159..0000000000 --- a/src/common/UnkStarFunc.inc.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "common.h" - -API_CALLABLE(N(UnkStarFunc)) { - PlayerData* playerData = &gPlayerData; - Bytecode* args = script->ptrReadPos; - - set_animation(ACTOR_PARTNER, 0, D_8029C890[playerData->curPartner][evt_get_variable(script, *args++)]); - - return ApiStatus_DONE2; -} diff --git a/src/common/battle/ChompChainSupport.inc.c b/src/common/battle/ChompChainSupport.inc.c index 5ef259c1ba..f683b0ccb4 100644 --- a/src/common/battle/ChompChainSupport.inc.c +++ b/src/common/battle/ChompChainSupport.inc.c @@ -130,7 +130,7 @@ API_CALLABLE(N(ChompChainUpdate)) { if (chain->velY < 2.0f * -chain->gravAccel) { chain->velY = 2.0f * -chain->gravAccel; if (actor->state.varTable[CHOMP_CHAIN_AVAR_SOUNDS] && i == 0) { - sfx_play_sound_at_position(SOUND_2063, SOUND_SPACE_MODE_0, actor->curPos.x, actor->curPos.y, actor->curPos.z); + sfx_play_sound_at_position(SOUND_CHAIN_RATTLE, SOUND_SPACE_MODE_0, actor->curPos.x, actor->curPos.y, actor->curPos.z); } } diff --git a/src/effects/music_note.c b/src/effects/music_note.c index 66775f6561..26f3fe60fe 100644 --- a/src/effects/music_note.c +++ b/src/effects/music_note.c @@ -33,7 +33,7 @@ s8 D_E004C67C[] = { 254, 213, 172, }; -void music_note_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { +void music_note_main(s32 type, f32 posX, f32 posY, f32 posZ) { EffectBlueprint bp; EffectBlueprint* bpPtr = &bp; EffectInstance* effect; @@ -55,35 +55,35 @@ void music_note_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { ASSERT(effect->data.musicNote != NULL); - part->unk_00 = arg0; - part->pos.x = arg1; - part->pos.y = arg2; - part->pos.z = arg3; - part->unk_10 = 0; - part->timeLeft = 0x40; - part->unk_14 = 0; - part->unk_1C = 0; - part->unk_20 = rand_int(6); - switch (arg0) { + part->type = type; + part->pos.x = posX; + part->pos.y = posY; + part->pos.z = posZ; + part->scale = 0; + part->timeLeft = 64; + part->alpha = 0; + part->lifetime = 0; + part->noteType = rand_int(6); + switch (type) { case 0: - part->unk_24 = 0.0f; - part->unk_28 = 1.0f; - part->unk_2C = 0; - part->unk_30 = 1.0f; + part->velX = 0.0f; + part->velY = 1.0f; + part->finalVelX = 0.0f; + part->finalVelY = 1.0f; break; case 1: randInt = rand_int(10); - part->unk_24 = (randInt * 0.1) + -5.0; - part->unk_28 = (rand_int(10) * 0.1) + 0.5; - part->unk_2C = 0; - part->unk_30 = 0.0f; + part->velX = (randInt * 0.1) + -5.0; + part->velY = (rand_int(10) * 0.1) + 0.5; + part->finalVelX = 0.0f; + part->finalVelY = 0.0f; break; default: randInt = rand_int(10); - part->unk_24 = 5.0 - (randInt * 0.1); - part->unk_28 = (rand_int(10) * 0.1) + 1.0; - part->unk_2C = 0; - part->unk_30 = 0.0f; + part->velX = 5.0 - (randInt * 0.1); + part->velY = (rand_int(10) * 0.1) + 1.0; + part->finalVelX = 0.0f; + part->finalVelY = 0.0f; break; } } @@ -96,23 +96,23 @@ void music_note_update(EffectInstance* effect) { s32 timeLeft; part->timeLeft--; - part->unk_1C++; + part->lifetime++; timeLeft = part->timeLeft; if (timeLeft < 0) { remove_effect(effect); return; } if (timeLeft >= 6) { - part->unk_14 += (255 - part->unk_14) * 0.3; - part->unk_10 += (1.0f - part->unk_10) * 0.3; + part->alpha += (255 - part->alpha) * 0.3; + part->scale += (1.0f - part->scale) * 0.3; } if (timeLeft < 10) { - part->unk_14 = timeLeft * 25; + part->alpha = timeLeft * 25; } - part->pos.x += part->unk_24; - part->pos.y += part->unk_28; - part->unk_24 += (part->unk_2C - part->unk_24) * 0.04; - part->unk_28 += (part->unk_30 - part->unk_28) * 0.04; + part->pos.x += part->velX; + part->pos.y += part->velY; + part->velX += (part->finalVelX - part->velX) * 0.04; + part->velY += (part->finalVelY - part->velY) * 0.04; } void music_note_render(EffectInstance* effect) { @@ -131,9 +131,9 @@ void music_note_render(EffectInstance* effect) { void music_note_appendGfx(void* data) { EffectInstance* effect = data; MusicNoteFXData* fxData = effect->data.musicNote; - Matrix4f sp18, sp58; - s32 colorIdx = fxData->unk_1C; - s32 dlistIdx = fxData->unk_20; + Matrix4f mtxTransform, mtxTemp; + s32 colorIdx = fxData->lifetime; + s32 dlistIdx = fxData->noteType; s32 rgbOffset; // TODO required to match - need to initialize define twice for some reason @@ -144,14 +144,14 @@ void music_note_appendGfx(void* data) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, D_09000FC0_35B5A0); gDPSetPrimColor(gMainGfxPos++, 0, 0, - D_E004C67C[rgbOffset], D_E004C67C[rgbOffset + 1], D_E004C67C[rgbOffset + 2], fxData->unk_14 + D_E004C67C[rgbOffset], D_E004C67C[rgbOffset + 1], D_E004C67C[rgbOffset + 2], fxData->alpha ); - guTranslateF(sp18, fxData->pos.x, fxData->pos.y, fxData->pos.z); - guRotateF(sp58, -gCameras[gCurrentCameraID].curYaw, 0.0f, 1.0f, 0.0f); - guMtxCatF(sp58, sp18, sp18); - guScaleF(sp58, fxData->unk_10, fxData->unk_10, 0.0f); - guMtxCatF(sp58, sp18, sp18); - guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(mtxTransform, fxData->pos.x, fxData->pos.y, fxData->pos.z); + guRotateF(mtxTemp, -gCameras[gCurrentCameraID].curYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guScaleF(mtxTemp, fxData->scale, fxData->scale, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E004C660[dlistIdx]); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); diff --git a/src/effects/recover.c b/src/effects/recover.c index 79fc305e8a..89002f9df8 100644 --- a/src/effects/recover.c +++ b/src/effects/recover.c @@ -41,7 +41,7 @@ void recover_render(EffectInstance* effect); void func_E008042C(EffectInstance* effect); void func_E0080448(EffectInstance* effect); -EffectInstance* recover_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { +EffectInstance* recover_main(s32 type, f32 posX, f32 posY, f32 posZ, s32 duration) { EffectBlueprint bp; EffectInstance* effect; RecoverFXData* part; @@ -60,45 +60,45 @@ EffectInstance* recover_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { part = effect->data.recover = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.recover != NULL); - part->unk_00 = arg0; - part->unk_04 = arg1; - part->unk_08 = arg2; - part->unk_0C = arg3; - part->unk_2C = 46; - part->unk_30 = 0; - if (arg4 < 0) { + part->type = type; + part->pos.x = posX; + part->pos.y = posY; + part->pos.z = posZ; + part->timeLeft = 46; + part->lifetime = 0; + if (duration < 0) { part->unk_44 = 1; - arg4 = -arg4; + duration = -duration; } else { part->unk_44 = 0; } - part->unk_40 = arg4; + part->unk_40 = duration; part++; for (i = 1; i < numParts; i++, part++) { - part->unk_04 = 0.0f; - part->unk_08 = 0; - part->unk_0C = 0; - part->unk_24 = 0; - part->unk_10 = 0; - part->unk_18 = 0; + part->pos.x = 0.0f; + part->pos.y = 0.0f; + part->pos.z = 0.0f; + part->offsetX = 0; + part->vel.x = 0; + part->vel.z = 0; part->unk_20 = 0; - part->unk_1C = 0; + part->angle = 0; if (i == 1) { - part->unk_04 = 0.0f; + part->pos.x = 0.0f; part->unk_34 = 0; - part->unk_38 = 0; - part->unk_3C = 0; - part->unk_14 = 1.4f; + part->scaleX = 0.0f;; + part->scaleY = 0.0f;; + part->vel.y = 1.4f; } else { - part->unk_14 = 1.4f; + part->vel.y = 1.4f; part->unk_34 = i + 10; - part->unk_38 = 0; - part->unk_3C = 0; - part->unk_04 = ((i & 1) * 2 - 1) * ((i - 1) >> 1) * 4; + part->scaleX = 0.0f;; + part->scaleY = 0.0f;; + part->pos.x = ((i & 1) * 2 - 1) * ((i - 1) >> 1) * 4; } - part->unk_2C = 0; - part->unk_28 = 255; + part->timeLeft = 0; + part->alpha = 255; } return effect; @@ -109,49 +109,49 @@ void recover_init(EffectInstance* effect) { void recover_update(EffectInstance* effect) { RecoverFXData* part = effect->data.recover; - s32 unk_2C; + s32 time; s32 i; - part->unk_2C--; - part->unk_30++; + part->timeLeft--; + part->lifetime++; - if (part->unk_2C < 0) { + if (part->timeLeft < 0) { remove_effect(effect); return; } - unk_2C = part->unk_2C; + time = part->timeLeft; part++; for (i = 1; i < effect->numParts; i++, part++) { - s32 unk_2C_2 = part->unk_2C; + s32 unk_2C_2 = part->timeLeft; if (part->unk_34 <= 0 || --part->unk_34 <= 0) { if (unk_2C_2 >= 7) { - part->unk_3C = 1.0f; - part->unk_38 = 1.0f; + part->scaleY = 1.0f; + part->scaleX = 1.0f; } else { - part->unk_38 = D_E0080AF0[unk_2C_2]; - part->unk_3C = D_E0080B0C[unk_2C_2]; + part->scaleX = D_E0080AF0[unk_2C_2]; + part->scaleY = D_E0080B0C[unk_2C_2]; } - part->unk_04 += part->unk_10; - part->unk_08 += part->unk_14; - part->unk_0C += part->unk_18; - part->unk_1C = sin_deg(i * 38 + unk_2C * 12) * -30.0f; - part->unk_24 = cos_deg(i * 38 + unk_2C * 12) * 8.0f; + part->pos.x += part->vel.x; + part->pos.y += part->vel.y; + part->pos.z += part->vel.z; + part->angle = sin_deg(i * 38 + time * 12) * -30.0f; + part->offsetX = cos_deg(i * 38 + time * 12) * 8.0f; - if (unk_2C < 20) { - part->unk_24 *= (f32) unk_2C * 0.05; - part->unk_1C *= (f32) unk_2C * 0.05; + if (time < 20) { + part->offsetX *= (f32) time * 0.05; + part->angle *= (f32) time * 0.05; } - if (unk_2C < 10) { - part->unk_28 = unk_2C * 25; - part->unk_14 *= 0.9; + if (time < 10) { + part->alpha = time * 25; + part->vel.y *= 0.9; } - part->unk_2C++; + part->timeLeft++; } } } @@ -166,7 +166,7 @@ void func_E008042C(EffectInstance* effect) { void func_E0080448(EffectInstance* effect) { RecoverFXData* part = ((EffectInstance*)effect)->data.recover; s32 i; - s32 unk_00; + s32 type; s32 unk_40; s32 unk_44 = part->unk_44; Matrix4f sp18; @@ -176,22 +176,22 @@ void func_E0080448(EffectInstance* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); guRotateF(sp58, -gCameras[gCurrentCameraID].curYaw, 0.0f, 1.0f, 0.0f); guMtxCatF(sp58, sp18, sp98); guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - unk_00 = part->unk_00; + type = part->type; unk_40 = part->unk_40; part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { if (part->unk_34 <= 0) { - gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, part->unk_28); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, part->alpha); - if (part->unk_28 == 255) { + if (part->alpha == 255) { gDPSetRenderMode(gMainGfxPos++, AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM), AA_EN | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)); gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); } else { @@ -199,38 +199,38 @@ void func_E0080448(EffectInstance* effect) { gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0); } - gSPDisplayList(gMainGfxPos++, (unk_00 == 0 || unk_00 == 2) ? + gSPDisplayList(gMainGfxPos++, (type == 0 || type == 2) ? (unk_44 == 0 ? D_09003200_385000 : D_09003298_385098) : D_09003330_385130); - guTranslateF(sp18, part->unk_04 + part->unk_24, part->unk_08, part->unk_0C); - guScaleF(sp58, part->unk_38, part->unk_3C, 1.0f); + guTranslateF(sp18, part->pos.x + part->offsetX, part->pos.y, part->pos.z); + guScaleF(sp58, part->scaleX, part->scaleY, 1.0f); guMtxCatF(sp58, sp18, sp18); guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - guRotateF(sp18, part->unk_1C, 0.0f, 0.0f, 1.0f); + guRotateF(sp18, part->angle, 0.0f, 0.0f, 1.0f); guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - if (i == 1 && unk_00 != 2) { + if (i == 1 && type != 2) { gSPDisplayList(gMainGfxPos++, D_090033D0_3851D0); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_090034D0_3852D0); - if (unk_40 < 0xA && unk_44 == 0) { + if (unk_40 < 10 && unk_44 == 0) { gSPDisplayList(gMainGfxPos++, D_E0080AC0[unk_40]); - gSPDisplayList(gMainGfxPos++, unk_00 == 0 ? D_09003410_385210 : D_09003470_385270); + gSPDisplayList(gMainGfxPos++, type == 0 ? D_09003410_385210 : D_09003470_385270); } else { s32 ones = unk_40 % 10; s32 tens = unk_44 == 0 ? (unk_40 / 10) : 10; gSPDisplayList(gMainGfxPos++, D_E0080AC0[ones]); - gSPDisplayList(gMainGfxPos++, unk_00 == 0 ? D_09003450_385250 : D_090034B0_3852B0); + gSPDisplayList(gMainGfxPos++, type == 0 ? D_09003450_385250 : D_090034B0_3852B0); gSPDisplayList(gMainGfxPos++, D_E0080AC0[tens]); - gSPDisplayList(gMainGfxPos++, unk_00 == 0 ? D_09003430_385230 : D_09003490_385290); + gSPDisplayList(gMainGfxPos++, type == 0 ? D_09003430_385230 : D_09003490_385290); } } else { gSPDisplayList(gMainGfxPos++, D_090033F0_3851F0); diff --git a/src/effects/star.c b/src/effects/star.c index 42313c6289..51e10cc160 100644 --- a/src/effects/star.c +++ b/src/effects/star.c @@ -12,7 +12,7 @@ void star_update(EffectInstance* effect); void star_render(EffectInstance* effect); void star_appendGfx(void* effect); -EffectInstance* star_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { +EffectInstance* star_main(s32 type, f32 posX, f32 posY, f32 posZ, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { EffectBlueprint bp; StarFXData* part; EffectInstance* effect; @@ -45,30 +45,30 @@ EffectInstance* star_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 ASSERT(effect->data.star != NULL); part->unk_00 = 1; - part->unk_04 = arg1; - part->unk_08 = arg2; - part->unk_0C = arg3; + part->pos.x = posX; + part->pos.y = posY; + part->pos.z = posZ; part->unk_1C = 0; - part->unk_24 = 0.0f; + part->angle = 0.0f; part->unk_28 = 0; - part->unk_38 = arg0; + part->type = type; - if (arg0 == 3) { - part->unk_240 = 0.2f; - part->unk_244 = rand_int(255); - part->unk_248 = rand_int(255 - part->unk_244); - temp_s0 = 255 - part->unk_248; - part->unk_24C = temp_s0 - part->unk_244; + if (type == 3) { + part->scale = 0.2f; + part->primR = rand_int(255); + part->primG = rand_int(255 - part->primR); + temp_s0 = 255 - part->primG; + part->primB = temp_s0 - part->primR; } else { - part->unk_244 = 210; - part->unk_248 = 186; - part->unk_24C = 90; - part->unk_240 = 0.5f; + part->primR = 210; + part->primG = 186; + part->primB = 90; + part->scale = 0.5f; } - temp_f24 = arg4 - arg1; - temp_f22 = arg5 - arg2; - temp_f20 = arg6 - arg3; + temp_f24 = arg4 - posX; + temp_f22 = arg5 - posY; + temp_f20 = arg6 - posZ; temp_f26 = SQ(temp_f24) + SQ(temp_f22) + SQ(temp_f20); phi_f26 = temp_f26; @@ -77,33 +77,33 @@ EffectInstance* star_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 temp_f26 = arg7 / phi_f26; } - part->unk_10 = temp_f24 * temp_f26; - part->unk_14 = temp_f22 * temp_f26; - part->unk_18 = temp_f20 * temp_f26; + part->vel.x = temp_f24 * temp_f26; + part->vel.y = temp_f22 * temp_f26; + part->vel.z = temp_f20 * temp_f26; currentYaw = gCameras[gCurrentCameraID].curYaw; cosYaw = -cos_deg(currentYaw); sinYaw = -sin_deg(currentYaw); - temp_f4 = cosYaw * part->unk_10; - temp_f2 = sinYaw * part->unk_18; + temp_f4 = cosYaw * part->vel.x; + temp_f2 = sinYaw * part->vel.z; temp_f12 = SQ(temp_f4) + SQ(temp_f2); if (temp_f12 != 0.0f) { temp_f12 = sqrtf(temp_f12); } - if ((cosYaw * part->unk_10) + (sinYaw * part->unk_18) < 0.0f) { + if ((cosYaw * part->vel.x) + (sinYaw * part->vel.z) < 0.0f) { temp_f12 = -temp_f12; part->unk_2C = -20.0f; } else { part->unk_2C = 20.0f; } - part->unk_20 = part->unk_24 = atan2(0.0f, 0.0f, -part->unk_14, -temp_f12); + part->unk_20 = part->angle = atan2(0.0f, 0.0f, -part->vel.y, -temp_f12); part->unk_30 = phi_f26 / arg7; part->unk_34 = -temp_f12; - guTranslate(part->unk_40, part->unk_04, part->unk_08, part->unk_0C); + guTranslate(part->unk_40, part->pos.x, part->pos.y, part->pos.z); for (i = 1; i < ARRAY_COUNT(part->unk_40); i++) { part->unk_40[i] = part->unk_40[0]; @@ -124,35 +124,35 @@ void star_update(EffectInstance* effect) { f32 x, y, z, length; f32 xTemp, yTemp, zTemp; - if (data->unk_38 >= 2) { - length = SQ(data->unk_10) + SQ(data->unk_14) + SQ(data->unk_18); + if (data->type >= 2) { + length = SQ(data->vel.x) + SQ(data->vel.y) + SQ(data->vel.z); if (length > 0.01f) { length = 1.0f / sqrtf(length); } - xTemp = data->unk_10 * length * 32.0f; - yTemp = data->unk_14 * length * 32.0f; - zTemp = data->unk_18 * length * 32.0f; - x = data->unk_04 - xTemp; - y = data->unk_08 - yTemp; - z = data->unk_0C - zTemp; + xTemp = data->vel.x * length * 32.0f; + yTemp = data->vel.y * length * 32.0f; + zTemp = data->vel.z * length * 32.0f; + x = data->pos.x - xTemp; + y = data->pos.y - yTemp; + z = data->pos.z - zTemp; length = 64.0f; if (data->unk_00 != 0 && - data->unk_14 < 0.0f && + data->vel.y < 0.0f && npc_raycast_down_sides(0, &x, &y, &z, &length) != 0 && length < 42.0f) { data->unk_1C = data->unk_1C + 1.0f; - data->unk_14 = -data->unk_14 * 0.6; - data->unk_10 = data->unk_10 * 0.7; + data->vel.y = -data->vel.y * 0.6; + data->vel.x = data->vel.x * 0.7; data->unk_34 = data->unk_34 * 0.7; data->unk_2C = data->unk_2C * 0.7; load_effect(EFFECT_LANDING_DUST); - landing_dust_main(0, data->unk_04, data->unk_08 - 5.0f, data->unk_0C, 0.0f); + landing_dust_main(0, data->pos.x, data->pos.y - 5.0f, data->pos.z, 0.0f); if (!gGameStatusPtr->isBattle) { - sfx_play_sound_at_position(SOUND_SEQ_16, SOUND_SPACE_MODE_0, data->unk_04, data->unk_08, data->unk_0C); + sfx_play_sound_at_position(SOUND_SEQ_16, SOUND_SPACE_MODE_0, data->pos.x, data->pos.y, data->pos.z); } data->unk_00 = 0; @@ -162,19 +162,19 @@ void star_update(EffectInstance* effect) { } if (data->unk_1C != 0.0f) { - data->unk_14 += -0.5; - data->unk_24 += data->unk_2C; - data->unk_20 = atan2(0.0f, 0.0f, -data->unk_14, data->unk_34); + data->vel.y += -0.5; + data->angle += data->unk_2C; + data->unk_20 = atan2(0.0f, 0.0f, -data->vel.y, data->unk_34); } } - if (playerStatus->pos.y - data->unk_08 > 300.0f) { + if (playerStatus->pos.y - data->pos.y > 300.0f) { data->unk_30 = -1; } - data->unk_04 += data->unk_10; - data->unk_08 += data->unk_14; - data->unk_0C += data->unk_18; + data->pos.x += data->vel.x; + data->pos.y += data->vel.y; + data->pos.z += data->vel.z; if (data->unk_30 < 0) { remove_effect(effect); @@ -191,7 +191,7 @@ void star_render(EffectInstance* effect) { renderTask.appendGfxArg = effect; renderTask.appendGfx = star_appendGfx; renderTask.dist = 0; - if (effect15->unk_38 != 0) { + if (effect15->type != 0) { renderModeTemp = RENDER_MODE_2D; } else { renderModeTemp = RENDER_MODE_SURF_SOLID_AA_ZB_LAYER0; @@ -203,11 +203,11 @@ void star_render(EffectInstance* effect) { void star_appendGfx(void* effect) { StarFXData* data = ((EffectInstance*)effect)->data.star; - f32 unk_240 = data->unk_240; - s32 unk_38 = data->unk_38; - s32 unk_244 = data->unk_244; - s32 unk_248 = data->unk_248; - s32 unk_24C = data->unk_24C; + f32 scale = data->scale; + s32 type = data->type; + s32 primR = data->primR; + s32 primG = data->primG; + s32 primB = data->primB; s32 idx; Matrix4f sp20; Matrix4f sp60; @@ -216,20 +216,20 @@ void star_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].curYaw, 0.0f, unk_240, data->unk_04, data->unk_08, data->unk_0C); - guRotateF(sp60, data->unk_24, 0.0f, 0.0f, 1.0f); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].curYaw, 0.0f, scale, data->pos.x, data->pos.y, data->pos.z); + guRotateF(sp60, data->angle, 0.0f, 0.0f, 1.0f); guMtxCatF(sp60, sp20, sp20); guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gDPSetPrimColor(gMainGfxPos++, 0, 80, unk_244, unk_248, unk_24C, 255); + gDPSetPrimColor(gMainGfxPos++, 0, 80, primR, primG, primB, 255); gDPSetEnvColor(gMainGfxPos++, 127, 127, 127, 127); - gSPDisplayList(gMainGfxPos++, (data->unk_38 >= 2) ? D_09001650_333CF0 : D_09001530_333BD0); + gSPDisplayList(gMainGfxPos++, (data->type >= 2) ? D_09001650_333CF0 : D_09001530_333BD0); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); gDPPipeSync(gMainGfxPos++); - if (unk_38 == 3) { + if (type == 3) { gSPDisplayList(gMainGfxPos++, D_090017D0_333E70); } else { gSPDisplayList(gMainGfxPos++, D_09001780_333E20); @@ -242,8 +242,7 @@ void star_appendGfx(void* effect) { if (data->unk_1C <= 1.0f) { s32 baseIdx = (data->unk_3C + 5) % 8; - - guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].curYaw, 0.0f, unk_240, data->unk_04, data->unk_08, data->unk_0C); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].curYaw, 0.0f, scale, data->pos.x, data->pos.y, data->pos.z); guRotateF(sp60, data->unk_20, 0.0f, 0.0f, 1.0f); guMtxCatF(sp60, sp20, sp20); guMtxF2L(sp20, &data->unk_40[data->unk_3C]); diff --git a/src/encounter.c b/src/encounter.c index 0265c9cfb2..899dee6edf 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -22,7 +22,7 @@ s32 D_80077C40 = 0; EvtScript EVS_MerleeDropCoins = { EVT_WAIT(10) - EVT_CALL(FadeBackgroundToBlack) + EVT_CALL(FadeBackgroundDarken) EVT_WAIT(10) EVT_CALL(CreateNpc, NPC_BTL_MERLEE, ANIM_BattleMerlee_Gather) EVT_CALL(SetNpcFlagBits, NPC_BTL_MERLEE, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) @@ -36,7 +36,7 @@ EvtScript EVS_MerleeDropCoins = { EVT_WAIT(30) EVT_CALL(SetNpcAnimation, NPC_BTL_MERLEE, ANIM_BattleMerlee_Release) EVT_CALL(MerleeStopFX) - EVT_CALL(UnfadeBackgroundFromBlack) + EVT_CALL(FadeBackgroundLighten) EVT_WAIT(20) EVT_THREAD EVT_CALL(FadeOutMerlee) @@ -240,7 +240,7 @@ ApiStatus ShowMerleeRanOutMessage(Evt* script, s32 isInitialCall) { } } -ApiStatus FadeBackgroundToBlack(Evt* script, s32 isInitialCall) { +ApiStatus FadeBackgroundDarken(Evt* script, s32 isInitialCall) { if (isInitialCall) { mdl_set_all_fog_mode(FOG_MODE_1); *gBackgroundFogModePtr = FOG_MODE_1; @@ -258,12 +258,12 @@ ApiStatus FadeBackgroundToBlack(Evt* script, s32 isInitialCall) { } } -ApiStatus UnfadeBackgroundFromBlack(Evt* script, s32 isInitialCall) { +ApiStatus FadeBackgroundLighten(Evt* script, s32 isInitialCall) { if (isInitialCall) { script->functionTemp[0] = 25; } - set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 0xFE); + set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 254); script->functionTemp[0] -= 5; if (script->functionTemp[0] == 0) { diff --git a/src/entity.c b/src/entity.c index d049409811..5fc64dbd24 100644 --- a/src/entity.c +++ b/src/entity.c @@ -1516,18 +1516,14 @@ ApiStatus AssignCrateFlag(Evt* script, s32 isInitialCall) { } s32 create_entity_shadow(Entity* entity, f32 x, f32 y, f32 z) { - u16 staticFlags = entity->blueprint->flags; + u16 bpFlags = entity->blueprint->flags; s32 type; s16 shadowIndex; - if (staticFlags & ENTITY_FLAG_FIXED_SHADOW_SIZE) { - if (staticFlags & ENTITY_FLAG_SQUARE_SHADOW) { - type = 2; - } else { - type = 3; - } + if (bpFlags & ENTITY_FLAG_FIXED_SHADOW_SIZE) { + type = (bpFlags & ENTITY_FLAG_SQUARE_SHADOW) ? 2 : 3; } else { - type = ((staticFlags >> 11) ^ 1) & 1; + type = (bpFlags & ENTITY_FLAG_SQUARE_SHADOW) ? 0 : 1; } shadowIndex = create_shadow_type(type, x, y, z); diff --git a/src/entity/BlueWarpPipe.c b/src/entity/BlueWarpPipe.c index 0fffe2f088..c5c8b310a3 100644 --- a/src/entity/BlueWarpPipe.c +++ b/src/entity/BlueWarpPipe.c @@ -24,7 +24,7 @@ void entity_BlueWarpPipe_rise_up(Entity* entity) { BlueWarpPipeData* pipeData = entity->dataBuf.bluePipe; pipeData->timer--; - if ((pipeData->timer != -1) && (pipeData->isRaised == 0)) { + if ((pipeData->timer != -1) && !pipeData->isRaised) { entity->pos.y += 2.3125; } else { pipeData->timer = 0; diff --git a/src/entity/SimpleSpring.c b/src/entity/SimpleSpring.c index 1073adf664..e4d5729cf7 100644 --- a/src/entity/SimpleSpring.c +++ b/src/entity/SimpleSpring.c @@ -22,7 +22,7 @@ void entity_ScriptSpring_idle(Entity* entity) { set_action_state(ACTION_STATE_USE_SPRING); } exec_entity_commandlist(entity); - sfx_play_sound_at_position(SOUND_2086, SOUND_SPACE_MODE_0, entity->pos.x, entity->pos.y, entity->pos.z); + sfx_play_sound_at_position(SOUND_SPRING, SOUND_SPACE_MODE_0, entity->pos.x, entity->pos.y, entity->pos.z); } } @@ -37,7 +37,7 @@ void entity_SimpleSpring_idle(Entity* entity) { play_model_animation(entity->virtualModelIndex, Entity_SimpleSpring_AnimLaunch); entity_start_script(entity); exec_entity_commandlist(entity); - sfx_play_sound_at_position(SOUND_2086, SOUND_SPACE_MODE_0, entity->pos.x, entity->pos.y, entity->pos.z); + sfx_play_sound_at_position(SOUND_SPRING, SOUND_SPACE_MODE_0, entity->pos.x, entity->pos.y, entity->pos.z); disable_player_input(); playerStatus->curSpeed = 0; } diff --git a/src/entity/default/BoardedFloor.c b/src/entity/default/BoardedFloor.c index bfbf9629c6..199f8a1b5d 100644 --- a/src/entity/default/BoardedFloor.c +++ b/src/entity/default/BoardedFloor.c @@ -232,7 +232,7 @@ void Entity_BoardedFloor_shatter(Entity* entity) { EntityModelScript Entity_BoardedFloor_Script = { es_ClearFlags(ENTITY_FLAG_DISABLE_COLLISION) es_SetCallback(Entity_BoardedFloor_idle, 0) - es_PlaySound(SOUND_2092) + es_PlaySound(SOUND_BREAK_FLOOR) es_SetFlags(ENTITY_FLAG_DISABLE_COLLISION) es_Call(Entity_BoardedFloor_shatter) es_SetCallback(Entity_BoardedFloor_update_fragments, 0) diff --git a/src/entity/sbk_omo/StarBoxLauncher.c b/src/entity/sbk_omo/StarBoxLauncher.c index 90393d8b2f..db809a3505 100644 --- a/src/entity/sbk_omo/StarBoxLauncher.c +++ b/src/entity/sbk_omo/StarBoxLauncher.c @@ -138,7 +138,7 @@ void entity_StarBoxLauncher_launch(Entity* entity) { data->riseSpeedPhase = 90.0f; data->faceTexOffset = D_802BCAA0_E313F0[0]; data->faceAnimTimer = D_802BCAA0_E313F0[1]; - sfx_play_sound(SOUND_2085); + sfx_play_sound(SOUND_STAR_BOX_LAUNCHER); // fallthrough case 1: temp = entity->pos.y; diff --git a/src/entity_model.c b/src/entity_model.c index 224c9cc8a2..cf45cc6cb4 100644 --- a/src/entity_model.c +++ b/src/entity_model.c @@ -418,7 +418,7 @@ void draw_entity_model_A(s32 modelIdx, Mtx* transformMtx) { f32 x, y, z, w; f32 inX, inY, inZ; - if ((gGameStatusPtr->isBattle == 0) || (modelIdx & 0x800)) { + if ((!gGameStatusPtr->isBattle) || (modelIdx & 0x800)) { modelIdx &= ~0x800; model = (*gCurrentEntityModelList)[modelIdx]; @@ -456,7 +456,7 @@ void draw_entity_model_B(s32 modelIdx, Mtx* transformMtx, s32 vertexSegment, Vec f32 x, y, z, w; f32 inX, inY, inZ; - if ((gGameStatusPtr->isBattle == 0) || (modelIdx & 0x800)) { + if ((!gGameStatusPtr->isBattle) || (modelIdx & 0x800)) { modelIdx &= ~0x800; model = (*gCurrentEntityModelList)[modelIdx]; @@ -491,7 +491,7 @@ void draw_entity_model_C(s32 modelIdx, Mtx* transformMtx) { RenderTask rt; RenderTask* rtPtr = &rt; - if ((gGameStatusPtr->isBattle == 0) || (modelIdx & 0x800)) { + if ((!gGameStatusPtr->isBattle) || (modelIdx & 0x800)) { modelIdx &= ~0x800; model = (*gCurrentEntityModelList)[modelIdx]; @@ -521,7 +521,7 @@ void draw_entity_model_D(s32 modelIdx, Mtx* transformMtx, s32 arg2, Vec3s* verte RenderTask rt; RenderTask* rtPtr = &rt; - if ((gGameStatusPtr->isBattle == 0) || (modelIdx & 0x800)) { + if ((!gGameStatusPtr->isBattle) || (modelIdx & 0x800)) { modelIdx &= ~0x800; model = (*gCurrentEntityModelList)[modelIdx]; diff --git a/src/evt/fa4c0_len_3bf0.c b/src/evt/fa4c0_len_3bf0.c index 13d05cd0c9..d0bd65bbe8 100644 --- a/src/evt/fa4c0_len_3bf0.c +++ b/src/evt/fa4c0_len_3bf0.c @@ -233,7 +233,7 @@ ApiStatus StopSound(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D62E4(Evt* script, s32 isInitialCall) { +ApiStatus StopTrackingSoundPos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 soundID = evt_get_variable(script, *args++); diff --git a/src/evt/fx_api.c b/src/evt/fx_api.c index 3f4cbe9d5a..c3321066f7 100644 --- a/src/evt/fx_api.c +++ b/src/evt/fx_api.c @@ -16,7 +16,7 @@ ApiStatus ShowStartRecoveryShimmer(Evt* script, s32 isInitialCall) { f32 z = evt_get_float_variable(script, *args++); show_start_recovery_shimmer(x, y, z, evt_get_variable(script, *args++)); - sfx_play_sound_at_position(SOUND_2055, SOUND_SPACE_MODE_0, x, y, z); + sfx_play_sound_at_position(SOUND_START_RECOVERY, SOUND_SPACE_MODE_0, x, y, z); return ApiStatus_DONE2; } diff --git a/src/evt/script_list.c b/src/evt/script_list.c index 4714c1ceae..ab67557ff8 100644 --- a/src/evt/script_list.c +++ b/src/evt/script_list.c @@ -168,7 +168,7 @@ void find_script_labels(Evt* script) { void clear_script_list(void) { s32 i; - if (gGameStatusPtr->isBattle == 0) { + if (!gGameStatusPtr->isBattle) { gCurrentScriptListPtr = &gWorldScriptList; gMapVars = gWorldMapVars; gMapFlags = gWorldMapFlags; @@ -199,7 +199,7 @@ void clear_script_list(void) { } void init_script_list(void) { - if (gGameStatusPtr->isBattle == 0) { + if (!gGameStatusPtr->isBattle) { gCurrentScriptListPtr = &gWorldScriptList; gMapVars = gWorldMapVars; gMapFlags = gWorldMapFlags; diff --git a/src/imgfx.c b/src/imgfx.c index 3df01d7089..53a7fea3a2 100644 --- a/src/imgfx.c +++ b/src/imgfx.c @@ -1619,8 +1619,8 @@ void imgfx_appendGfx_mesh_basic(ImgFXState* state, Matrix4f mtx) { cam = &gCameras[gCurrentCamID]; if (gGameStatusPtr->isBattle == 2) { gSPViewport(gMainGfxPos++, &D_8014EE40); - D_8014EE50.vp.vtrans[0] = D_8014EE40.vp.vtrans[0] + gGameStatusPtr->unk_82; - D_8014EE50.vp.vtrans[1] = D_8014EE40.vp.vtrans[1] + gGameStatusPtr->unk_83; + D_8014EE50.vp.vtrans[0] = D_8014EE40.vp.vtrans[0] + gGameStatusPtr->unk_82.x; + D_8014EE50.vp.vtrans[1] = D_8014EE40.vp.vtrans[1] + gGameStatusPtr->unk_82.y; } else { gSPViewport(gMainGfxPos++, &cam->vp); } diff --git a/src/main_loop.c b/src/main_loop.c index 0c87a80bf5..7ffa07b08c 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -262,10 +262,10 @@ void load_engine_data(void) { gGameStatusPtr->musicEnabled = 1; gGameStatusPtr->unk_7C = 1; gGameStatusPtr->creditsViewportMode = -1; - gGameStatusPtr->demoFlags = 0; + gGameStatusPtr->demoBattleFlags = 0; gGameStatusPtr->multiplayerEnabled = 0; - gGameStatusPtr->unk_82 = -8; - gGameStatusPtr->unk_83 = 4; + gGameStatusPtr->unk_82.x = -8; + gGameStatusPtr->unk_82.y = 4; timeFreezeMode = 0; gGameStatusPtr->debugQuizmo = gGameStatusPtr->unk_13C = 0; gGameStepDelayCount = 5; diff --git a/src/msg.c b/src/msg.c index 3d399c5087..aab551b842 100644 --- a/src/msg.c +++ b/src/msg.c @@ -34,11 +34,9 @@ enum RewindArrowStates { #endif #if VERSION_PAL -#define CONST_A 7 -#define CONST_B 5.0 +#define CHOICE_POINTER_MOVE_RATE 5.0 #else -#define CONST_A 6 -#define CONST_B 6.0 +#define CHOICE_POINTER_MOVE_RATE 6.0 #endif typedef MessageImageData* MessageImageDataList[1]; @@ -520,12 +518,12 @@ s32 _update_message(MessagePrintState* printer) { printer->stateFlags |= MSG_STATE_FLAG_PRINT_QUICKLY; } } - printer->curLinePos += printer->unk_464; + printer->curLinePos += printer->windowScrollRate; if ((printer->stateFlags & MSG_STATE_FLAG_PRINT_QUICKLY) || (!(printer->stateFlags & (MSG_STATE_FLAG_10 | MSG_STATE_FLAG_4)) && (gGameStatusPtr->curButtons[0] & BUTTON_A))) { - printer->curLinePos += CONST_A; + printer->curLinePos += (s32)(6 / DT); } if (printer->curLinePos >= printer->nextLinePos) { @@ -820,7 +818,7 @@ void msg_copy_to_print_buffer(MessagePrintState* printer, s32 arg1, s32 arg2) { printer->stateFlags |= MSG_STATE_FLAG_800; printer->delayFlags |= MSG_DELAY_FLAG_1; if (arg == MSG_STYLE_INSPECT) { - sfx_play_sound_with_params(SOUND_021C, 0, 0, 0); + sfx_play_sound_with_params(SOUND_APPROVE, 0, 0, 0); } } break; @@ -829,7 +827,7 @@ void msg_copy_to_print_buffer(MessagePrintState* printer, s32 arg1, s32 arg2) { printer->windowBasePos.y = *srcBuf++; printer->windowSize.x = *srcBuf++; printer->windowSize.y = *srcBuf++; - sfx_play_sound_with_params(SOUND_021C, 0, 0, 0); + sfx_play_sound_with_params(SOUND_APPROVE, 0, 0, 0); printer->windowState = MSG_WINDOW_STATE_OPENING; printer->delayFlags |= MSG_DELAY_FLAG_1; printer->stateFlags |= MSG_STATE_FLAG_800; @@ -1346,7 +1344,7 @@ void initialize_printer(MessagePrintState* printer, s32 arg1, s32 arg2) { printer->printBuffer[0] = MSG_CHAR_PRINT_END; printer->printDelayTime = 1; printer->charsPerChunk = 1; - printer->unk_464 = CONST_A; + printer->windowScrollRate = (s32)(6 / DT); printer->srcBuffer = NULL; printer->msgID = 0; printer->curPrintDelay = 0; @@ -2186,7 +2184,7 @@ void msg_draw_choice_pointer(MessagePrintState* printer) { posY = printer->windowOffsetPos.y + printer->windowBasePos.y + printer->cursorPosY[printer->selectedOption]; } else { s32 baseX, baseY, targetX, targetY; - f32 moveToTargetAlpha = (f32)(printer->scrollingTime + 1.0) / CONST_B; + f32 moveToTargetAlpha = (f32)(printer->scrollingTime + 1.0) / CHOICE_POINTER_MOVE_RATE; baseX = printer->windowOffsetPos.x + printer->windowBasePos.x + printer->cursorPosX[printer->selectedOption]; targetX = printer->windowOffsetPos.x + printer->windowBasePos.x + printer->cursorPosX[printer->targetOption]; @@ -4035,7 +4033,7 @@ void msg_draw_frame(s32 posX, s32 posY, s32 sizeX, s32 sizeY, s32 style, s32 pal s32 i; s32 frameType; s32 textures[16]; - s32 r, g, b; + u8 r, g, b; Rect quads[16]; if (sizeX < 16 || sizeY < 16) { @@ -4059,9 +4057,9 @@ void msg_draw_frame(s32 posX, s32 posY, s32 sizeX, s32 sizeY, s32 style, s32 pal do {} while (0); switch (style) { case MSG_STYLE_CHOICE: - r = ((((u16*)(ui_msg_palettes[0]))[4] >> 11) & 0x1F) * 8; - g = ((((u16*)(ui_msg_palettes[0]))[4] >> 6) & 0x1F) * 8; - b = ((((u16*)(ui_msg_palettes[0]))[4] >> 1) & 0x1F) * 8; + r = UNPACK_PAL_R(((u16*)ui_msg_palettes)[4]) * 8; + g = UNPACK_PAL_G(((u16*)ui_msg_palettes)[4]) * 8; + b = UNPACK_PAL_B(((u16*)ui_msg_palettes)[4]) * 8; gDPPipeSync(gMainGfxPos++); if (fading != 0 && bgAlpha < 255) { gDPSetRenderMode(gMainGfxPos++, IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); diff --git a/src/npc.c b/src/npc.c index 84937150cc..da38e93a34 100644 --- a/src/npc.c +++ b/src/npc.c @@ -1439,11 +1439,12 @@ s32 npc_draw_palswap_mode_1(Npc* npc, s32 arg1, Matrix4f mtx) { } u16 npc_blend_palette_colors(u16 colorA, u16 colorB, s32 lerpAlpha) { - u32 r = ((((colorA >> 11) & 0x1F) * (255 - lerpAlpha)) + (((colorB >> 11) & 0x1F) * lerpAlpha)) / 255; - u32 g = ((((colorA >> 6) & 0x1F) * (255 - lerpAlpha)) + (((colorB >> 6) & 0x1F) * lerpAlpha)) / 255; - u32 b = ((((colorA >> 1) & 0x1F) * (255 - lerpAlpha)) + (((colorB >> 1) & 0x1F) * lerpAlpha)) / 255; + u8 r = (UNPACK_PAL_R(colorA) * (255 - lerpAlpha) + UNPACK_PAL_R(colorB) * lerpAlpha) / 255; + u8 g = (UNPACK_PAL_G(colorA) * (255 - lerpAlpha) + UNPACK_PAL_G(colorB) * lerpAlpha) / 255; + u8 b = (UNPACK_PAL_B(colorA) * (255 - lerpAlpha) + UNPACK_PAL_B(colorB) * lerpAlpha) / 255; + u8 a = UNPACK_PAL_A(colorB); - return (colorB & 1) | (((r & 0xFF) << 11) | ((g & 0xFF) << 6) | ((b & 0xFF) << 1)); + return PACK_PAL_RGBA(r, g, b, a); } s32 npc_draw_palswap_mode_2(Npc* npc, s32 arg1, s32 arg2, Matrix4f mtx) { diff --git a/src/pulse_stone.c b/src/pulse_stone.c index 638e654688..85080e99ee 100644 --- a/src/pulse_stone.c +++ b/src/pulse_stone.c @@ -129,7 +129,7 @@ void appendGfx_pulse_stone_icon(void) { PulseStonePtr->pingTime++; if (PulseStonePtr->pingTime >= pingDelay + 2) { PulseStonePtr->pingTime = 0; - sfx_play_sound_at_player(SOUND_007D, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_PULSE_STONE, SOUND_SPACE_MODE_0); } if (PulseStonePtr->pingTime < 2) { ifxImg.palette = pulse_stone_icon_2_pal; diff --git a/src/sprite.c b/src/sprite.c index cd425c7f6a..0169887156 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -39,13 +39,13 @@ Quad spr_defaultQuad = { } }; -Vp D_802DF3D0 = {{ +Vp SprPauseVp = {{ { 640, 480, 511, 0 }, { 640, 480, 511, 0 }, } }; -Vp D_802DF3E0 = {{ +Vp SprPauseVpAlt = {{ { 640, 480, 511, 0 }, { 640, 480, 512, 0 }, } @@ -240,7 +240,7 @@ void spr_appendGfx_component_flat( if (gSpriteShadingProfile->flags & 2) { Camera* camera = &gCameras[gCurrentCamID]; if (gGameStatusPtr->isBattle == 2) { - gSPViewport(gMainGfxPos++, &D_802DF3E0); + gSPViewport(gMainGfxPos++, &SprPauseVpAlt); } else { gSPViewport(gMainGfxPos++, &camera->vpAlt); } @@ -267,7 +267,7 @@ void spr_appendGfx_component_flat( if (gSpriteShadingProfile->flags & 2) { Camera* camera = &gCameras[gCurrentCamID]; if (gGameStatusPtr->isBattle == 2) { - gSPViewport(gMainGfxPos++, &D_802DF3E0); + gSPViewport(gMainGfxPos++, &SprPauseVpAlt); } else { gSPViewport(gMainGfxPos++, &camera->vpAlt); } @@ -303,9 +303,9 @@ void spr_appendGfx_component_flat( Camera* camera = &gCameras[gCurrentCamID]; if (gGameStatusPtr->isBattle == 2) { - gSPViewport(gMainGfxPos++, &D_802DF3D0); - D_802DF3E0.vp.vtrans[0] = D_802DF3D0.vp.vtrans[0] + gGameStatusPtr->unk_82; - D_802DF3E0.vp.vtrans[1] = D_802DF3D0.vp.vtrans[1] + gGameStatusPtr->unk_83; + gSPViewport(gMainGfxPos++, &SprPauseVp); + SprPauseVpAlt.vp.vtrans[0] = SprPauseVp.vp.vtrans[0] + gGameStatusPtr->unk_82.x; + SprPauseVpAlt.vp.vtrans[1] = SprPauseVp.vp.vtrans[1] + gGameStatusPtr->unk_82.y; } else { gSPViewport(gMainGfxPos++, &camera->vp); } diff --git a/src/sprite.h b/src/sprite.h index 0f66c7c581..ee65fae1c7 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -117,8 +117,8 @@ typedef struct Quad { } Quad; // size = 0x40 extern Quad spr_defaultQuad; -extern Vp D_802DF3D0; -extern Vp D_802DF3E0; +extern Vp SprPauseVp; +extern Vp SprPauseVpAlt; extern Gfx D_802DF3F0[]; extern Gfx D_802DF428[]; extern Gfx D_802DF460[]; diff --git a/src/state_battle.c b/src/state_battle.c index ceee4d039e..b80ffaad82 100644 --- a/src/state_battle.c +++ b/src/state_battle.c @@ -168,7 +168,7 @@ void state_step_end_battle(void) { init_entity_data(); init_trigger_list(); - if (gGameStatusPtr->demoFlags & 1) { + if (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED) { npc_reload_all(); playerStatus->animFlags = D_800A0904; set_game_mode(GAME_MODE_DEMO); diff --git a/src/state_startup.c b/src/state_startup.c index 0d8fb63ab1..f147dbbdaf 100644 --- a/src/state_startup.c +++ b/src/state_startup.c @@ -27,7 +27,7 @@ void state_step_startup(void) { gGameStatusPtr->disableScripts = 0; gGameStatusPtr->keepUsingPartnerOnMapChange = FALSE; gGameStatusPtr->creditsViewportMode = -1; - gGameStatusPtr->demoFlags = 0; + gGameStatusPtr->demoBattleFlags = 0; gGameStatusPtr->unk_A9 = -1; gGameStatusPtr->demoState = DEMO_STATE_NONE; diff --git a/src/world/action/hammer.c b/src/world/action/hammer.c index b1e3582a40..f25af109c5 100644 --- a/src/world/action/hammer.c +++ b/src/world/action/hammer.c @@ -106,7 +106,7 @@ void action_hammer_play_hit_fx(s32 hitID) { soundID = SOUND_2073; break; case 6: - soundID = SOUND_205B; + soundID = SOUND_FLOWERS_LAUGH; break; } diff --git a/src/world/action/sneaky_parasol.c b/src/world/action/sneaky_parasol.c index 8a44588db0..418df8404a 100644 --- a/src/world/action/sneaky_parasol.c +++ b/src/world/action/sneaky_parasol.c @@ -121,7 +121,7 @@ void action_update_parasol(void) { if (playerStatus->flipYaw[CAM_DEFAULT] == 0) { if (peach_disguise_check_overlaps() < 0) { suggest_player_anim_allow_backward(ANIM_Peach2_UseParasol); - sfx_play_sound_at_player(SOUND_0092, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_USE_SNEAKY_PARASOL, SOUND_SPACE_MODE_0); playerStatus->actionSubstate++; // SUBSTATE_USE_PARASOL } else { suggest_player_anim_allow_backward(ANIM_Peach2_CantFitParasol); diff --git a/src/world/area_arn/arn_07/arn_07_2_main.c b/src/world/area_arn/arn_07/arn_07_2_main.c index 2e46d26854..3dec0fb642 100644 --- a/src/world/area_arn/arn_07/arn_07_2_main.c +++ b/src/world/area_arn/arn_07/arn_07_2_main.c @@ -25,9 +25,9 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_LOOP_67) + EVT_CALL(PlaySound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(StopSound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, 145, 65, 0) EVT_END_THREAD EVT_THREAD @@ -87,9 +87,9 @@ EvtScript N(EVS_RespawnStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_LOOP_67) + EVT_CALL(PlaySound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(StopSound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, 145, 65, 0) EVT_END_THREAD EVT_THREAD diff --git a/src/world/area_arn/arn_07/arn_07_5_npc.c b/src/world/area_arn/arn_07/arn_07_5_npc.c index 7a0d201321..7d607ff3a0 100644 --- a/src/world/area_arn/arn_07/arn_07_5_npc.c +++ b/src/world/area_arn/arn_07/arn_07_5_npc.c @@ -55,22 +55,22 @@ EvtScript N(EVS_Scene_BossDefeated) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim22) EVT_WAIT(15 * DT) EVT_LOOP(4) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_10, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_BOO_APPEAR, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_02, 0, 1) EVT_WAIT(4 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_10, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_BOO_APPEAR, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_05, 0, 1) EVT_WAIT(4 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_10, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_BOO_APPEAR, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_01, 0, 1) EVT_WAIT(6 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_10, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_BOO_APPEAR, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_03, 0, 1) EVT_WAIT(8 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_10, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_BOO_APPEAR, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_04, 0, 1) EVT_WAIT(6 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_10, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_BOO_APPEAR, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_06, 0, 1) EVT_WAIT(6 * DT) EVT_END_LOOP @@ -79,7 +79,7 @@ EvtScript N(EVS_Scene_BossDefeated) = { EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim22) EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_10, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_BOO_APPEAR, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_02, 0, 1) EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim21) @@ -531,7 +531,7 @@ EvtScript N(EVS_Scene_SkolarRescued) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_2045, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_STAR_SPIRIT_DEPART_1, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) diff --git a/src/world/area_arn/arn_08/arn_08_4_gears.c b/src/world/area_arn/arn_08/arn_08_4_gears.c index a56ae2ea11..a1197fa15e 100644 --- a/src/world/area_arn/arn_08/arn_08_4_gears.c +++ b/src/world/area_arn/arn_08/arn_08_4_gears.c @@ -1,7 +1,7 @@ #include "arn_08.h" EvtScript N(EVS_AnimateGears) = { - EVT_CALL(PlaySound, SOUND_LOOP_4B) + EVT_CALL(PlaySound, SOUND_LOOP_WINDILL_GEARS) EVT_THREAD EVT_SET(LVar0, 0) EVT_LABEL(10) diff --git a/src/world/area_arn/arn_09/arn_09_5_npc.c b/src/world/area_arn/arn_09/arn_09_5_npc.c index b62bf2f83f..ca57a3ea4c 100644 --- a/src/world/area_arn/arn_09/arn_09_5_npc.c +++ b/src/world/area_arn/arn_09/arn_09_5_npc.c @@ -23,7 +23,7 @@ EvtScript N(EVS_NpcIdle_TubbasHeart) = { EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5)) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 0, 25, -10, 6 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2086, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SPRING, SOUND_SPACE_MODE_0) EVT_CALL(N(PlaySpringAnimation)) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim13) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5)) 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 e8bea481c4..42504ed2ec 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 @@ -76,25 +76,25 @@ EvtScript N(EVS_Scene_TubbaSmashBridges) = { EVT_CALL(SetAnimatedModelRootPosition, 0, 0, 0, 0) EVT_CALL(SetAnimatedModelRenderMode, 0, RENDER_MODE_SURFACE_OPA) EVT_THREAD - EVT_CALL(PlaySound, SOUND_0095) + EVT_CALL(PlaySound, SOUND_DGB_COLLAPSE_1) EVT_WAIT(60) - EVT_CALL(PlaySound, SOUND_0096) + EVT_CALL(PlaySound, SOUND_DGB_COLLAPSE_2) EVT_WAIT(25) - EVT_CALL(PlaySound, SOUND_0098) + EVT_CALL(PlaySound, SOUND_DGB_COLLAPSE_3) EVT_WAIT(70) - EVT_CALL(PlaySound, SOUND_0097) + EVT_CALL(PlaySound, SOUND_DGB_COLLAPSE_4) EVT_END_THREAD EVT_THREAD EVT_WAIT(100) - EVT_CALL(PlaySound, SOUND_00A8) + EVT_CALL(PlaySound, SOUND_DGB_SMALL_THUD) EVT_WAIT(50) - EVT_CALL(PlaySound, SOUND_00A8) + EVT_CALL(PlaySound, SOUND_DGB_SMALL_THUD) EVT_WAIT(30) - EVT_CALL(PlaySound, SOUND_00A8) + EVT_CALL(PlaySound, SOUND_DGB_SMALL_THUD) EVT_WAIT(70) - EVT_CALL(PlaySound, SOUND_00A8) + EVT_CALL(PlaySound, SOUND_DGB_SMALL_THUD) EVT_WAIT(30) - EVT_CALL(PlaySound, SOUND_00A8) + EVT_CALL(PlaySound, SOUND_DGB_SMALL_THUD) EVT_END_THREAD EVT_THREAD EVT_CALL(DisablePlayerPhysics, TRUE) @@ -127,7 +127,7 @@ EvtScript N(EVS_Scene_TubbaSmashBridges) = { EVT_CALL(EnablePartnerAI) EVT_END_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 300, EVT_FLOAT(1.0)) - EVT_CALL(StopSound, SOUND_LOOP_5D) + EVT_CALL(StopSound, SOUND_LOOP_DGB_COLLAPSE) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim0D) EVT_CALL(SetNpcSpeed, NPC_Tubba, EVT_FLOAT(3.0)) diff --git a/src/world/area_dgb/dgb_01/dgb_01_5_npc.c b/src/world/area_dgb/dgb_01/dgb_01_5_npc.c index 2c744572c6..3b0daf58fa 100644 --- a/src/world/area_dgb/dgb_01/dgb_01_5_npc.c +++ b/src/world/area_dgb/dgb_01/dgb_01_5_npc.c @@ -67,7 +67,7 @@ EvtScript N(EVS_NpcIdle_Tubba_Floor3) = { EVT_CALL(GetNpcPos, NPC_Tubba, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Tubba, LVar0, LVar1, LVar2, 30) EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20A0, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySound, SOUND_LOOP_5D) + EVT_CALL(PlaySound, SOUND_LOOP_DGB_COLLAPSE) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(4.0)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(2.0)) EVT_CALL(SetSelfVar, 0, 3) diff --git a/src/world/area_dgb/dgb_03/dgb_03_3_clock.c b/src/world/area_dgb/dgb_03/dgb_03_3_clock.c index bf586bf723..9dc3506c4c 100644 --- a/src/world/area_dgb/dgb_03/dgb_03_3_clock.c +++ b/src/world/area_dgb/dgb_03/dgb_03_3_clock.c @@ -55,7 +55,7 @@ EvtScript N(EVS_PushClock_Impl) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_END_THREAD EVT_CALL(MakeLerp, LVar6, LVar7, 100, EASING_LINEAR) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o77, SOUND_LOOP_10, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o77, SOUND_LOOP_MOVE_STATUE, SOUND_SPACE_MODE_0) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_o77, LVar0, 0, 0) @@ -67,7 +67,7 @@ EvtScript N(EVS_PushClock_Impl) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(StopSound, SOUND_LOOP_10) + EVT_CALL(StopSound, SOUND_LOOP_MOVE_STATUE) EVT_RETURN EVT_END }; diff --git a/src/world/area_dgb/dgb_11/dgb_11_3_entity.c b/src/world/area_dgb/dgb_11/dgb_11_3_entity.c index a4b2df6d9c..3b1d1597a6 100644 --- a/src/world/area_dgb/dgb_11/dgb_11_3_entity.c +++ b/src/world/area_dgb/dgb_11/dgb_11_3_entity.c @@ -69,7 +69,7 @@ EvtScript N(EVS_UseSpring) = { EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.0)) EVT_CALL(PlayerJump1, 375, 25, -250, 10) EVT_CALL(N(PlaySpringAnimation)) - EVT_CALL(PlaySoundAtPlayer, SOUND_2086, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_SPRING, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.7)) EVT_CALL(PlayerJump, 375, 0, -175, 15) EVT_KILL_THREAD(LVarA) diff --git a/src/world/area_dgb/dgb_12/dgb_12_3_spikes.c b/src/world/area_dgb/dgb_12/dgb_12_3_spikes.c index 9ab4d92c0d..0f901a1a99 100644 --- a/src/world/area_dgb/dgb_12/dgb_12_3_spikes.c +++ b/src/world/area_dgb/dgb_12/dgb_12_3_spikes.c @@ -32,7 +32,7 @@ EvtScript N(EVS_SetupSpikes) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(60) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o215, SOUND_2093, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o215, SOUND_SPIKES_EXTEND, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o215, COLLIDER_FLAGS_UPPER_MASK) EVT_END_THREAD diff --git a/src/world/area_dgb/dgb_18/dgb_18_3_npc.c b/src/world/area_dgb/dgb_18/dgb_18_3_npc.c index f12dfead26..a74cf23d73 100644 --- a/src/world/area_dgb/dgb_18/dgb_18_3_npc.c +++ b/src/world/area_dgb/dgb_18/dgb_18_3_npc.c @@ -228,7 +228,7 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim24) EVT_WAIT(30) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2038, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SNORE_INHALE, SOUND_SPACE_MODE_0) EVT_WAIT(30) EVT_THREAD EVT_CALL(SetSelfVar, 1, 0) @@ -237,12 +237,12 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { EVT_IF_EQ(LVar0, 1) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2039, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SNORE_EXHALE, SOUND_SPACE_MODE_0) EVT_CALL(RandInt, 10, LVar1) EVT_ADD(LVar1, 15) EVT_CALL(ShowSleepBubble, NPC_Tubba, 0, 0, 2, 628, 121, 127, LVar1, LVar0) EVT_WAIT(48) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2038, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SNORE_INHALE, SOUND_SPACE_MODE_0) EVT_CALL(RandInt, 10, LVar1) EVT_ADD(LVar1, 10) EVT_CALL(SetSleepBubbleTimeLeft, LVar0, LVar1) @@ -271,7 +271,7 @@ EvtScript N(EVS_NpcIdle_Tubba_Asleep) = { EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim24) EVT_WAIT(30) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2038, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SNORE_INHALE, SOUND_SPACE_MODE_0) EVT_WAIT(30) EVT_THREAD EVT_CALL(SetSelfVar, 1, 0) @@ -280,12 +280,12 @@ EvtScript N(EVS_NpcIdle_Tubba_Asleep) = { EVT_IF_EQ(LVar0, 1) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2039, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SNORE_EXHALE, SOUND_SPACE_MODE_0) EVT_CALL(RandInt, 10, LVar1) EVT_ADD(LVar1, 15) EVT_CALL(ShowSleepBubble, NPC_Tubba, 0, 0, 2, 628, 121, 127, LVar1, LVar0) EVT_WAIT(48) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2038, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SNORE_INHALE, SOUND_SPACE_MODE_0) EVT_CALL(RandInt, 10, LVar1) EVT_ADD(LVar1, 10) EVT_CALL(SetSleepBubbleTimeLeft, LVar0, LVar1) @@ -298,7 +298,7 @@ EvtScript N(EVS_NpcIdle_Tubba_Asleep) = { EvtScript N(EVS_NpcAI_Tubba_WakeUp) = { EVT_SET_GROUP(EVT_GROUP_0B) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2039, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SNORE_EXHALE, SOUND_SPACE_MODE_0) EVT_CALL(ShowSleepBubble, NPC_Tubba, 0, 50, 2, 552, 111, 128, 30, LVar0) EVT_WAIT(360) EVT_CALL(SetSleepBubbleTimeLeft, LVar0, 20) diff --git a/src/world/area_dro/dro_01/dro_01_2_main.c b/src/world/area_dro/dro_01/dro_01_2_main.c index 7eb56efc8e..ad312ee03d 100644 --- a/src/world/area_dro/dro_01/dro_01_2_main.c +++ b/src/world/area_dro/dro_01/dro_01_2_main.c @@ -68,7 +68,7 @@ EvtScript N(EVS_EnterMap) = { EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerPos, LVar0, NPC_DISPOSE_POS_Y, LVar2) EVT_WAIT(30) - EVT_CALL(PlaySound, SOUND_208E) + EVT_CALL(PlaySound, SOUND_GROW) EVT_SET(GF_DRO01_WarpPipe, TRUE) EVT_WAIT(30) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) diff --git a/src/world/area_end/end_00/end_00_4_allies.c b/src/world/area_end/end_00/end_00_4_allies.c index 99d21771f0..696a094007 100644 --- a/src/world/area_end/end_00/end_00_4_allies.c +++ b/src/world/area_end/end_00/end_00_4_allies.c @@ -2,7 +2,7 @@ #include "effects.h" EvtScript N(EVS_ParadePhase_Luigi) = { - EVT_CALL(PlaySound, SOUND_LRAW_0089) + EVT_CALL(PlaySound, SOUND_LRAW_AUDIENCE_MURMUR) EVT_WAIT(80 * DT) EVT_THREAD EVT_LOOP(9 * DT) @@ -15,7 +15,7 @@ EvtScript N(EVS_ParadePhase_Luigi) = { EVT_WAIT(10 * DT) EVT_CALL(InterpNpcYaw, NPC_Luigi, 90, 0) EVT_WAIT(25 * DT) - EVT_CALL(StopSound, SOUND_LRAW_0089) + EVT_CALL(StopSound, SOUND_LRAW_AUDIENCE_MURMUR) EVT_WAIT(15 * DT) EVT_THREAD EVT_WAIT(10 * DT) diff --git a/src/world/area_flo/flo_00/flo_00_3_npc.c b/src/world/area_flo/flo_00/flo_00_3_npc.c index 57b1cc5c01..fc131c0b17 100644 --- a/src/world/area_flo/flo_00/flo_00_3_npc.c +++ b/src/world/area_flo/flo_00/flo_00_3_npc.c @@ -557,7 +557,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Klevar, SOUND_2045, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Klevar, SOUND_STAR_SPIRIT_DEPART_1, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) diff --git a/src/world/area_flo/flo_07/flo_07_3_npc.c b/src/world/area_flo/flo_07/flo_07_3_npc.c index 85987c82b1..d4a35773d0 100644 --- a/src/world/area_flo/flo_07/flo_07_3_npc.c +++ b/src/world/area_flo/flo_07/flo_07_3_npc.c @@ -66,7 +66,7 @@ EvtScript N(EVS_MakeCrystalBerry) = { EVT_SET(GF_FLO07_CrystalBerryFellOnLeftSide, TRUE) EVT_END_IF EVT_CALL(PlaySound, SOUND_LRAW_03BC | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_LRAW_03BC) + EVT_CALL(StopTrackingSoundPos, SOUND_LRAW_03BC) EVT_SET(AF_FLO_MadeCrystalBerry, TRUE) EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Posie, ANIM_Posie_Talk, ANIM_Posie_Idle, 0, MSG_CH6_006A) diff --git a/src/world/area_flo/flo_08/flo_08_4_npc.c b/src/world/area_flo/flo_08/flo_08_4_npc.c index f32465f9b5..e1e8913623 100644 --- a/src/world/area_flo/flo_08/flo_08_4_npc.c +++ b/src/world/area_flo/flo_08/flo_08_4_npc.c @@ -34,14 +34,14 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CALL(N(FlowerGuard_JudgeItemTastiness), LVar0) EVT_CALL(MakeItemEntity, LVar8, -695, 20, -29, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVar7, LVar0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EAT_OR_DRINK, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Yellow_Eat) EVT_WAIT(20 * DT) EVT_CALL(RemoveItemEntity, LVar7) EVT_SWITCH(LVar8) EVT_CASE_EQ(160) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Yellow_Chew, ANIM_GateFlower_Yellow_Idle, 0, MSG_CH6_0046) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_021C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_APPROVE, SOUND_SPACE_MODE_0) EVT_CALL(EndSpeech, NPC_SELF, ANIM_GateFlower_Yellow_HappyTalk, ANIM_GateFlower_Yellow_HappyIdle, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Yellow_OpenGate) EVT_CALL(PlaySoundAtCollider, COLLIDER_o96, SOUND_METAL_GATE_OPEN, SOUND_SPACE_MODE_0) @@ -75,7 +75,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CASE_DEFAULT EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Yellow_Chew, ANIM_GateFlower_Yellow_Idle, 0, MSG_CH6_0044) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Yellow_Disgust) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SPIT_OUT, SOUND_SPACE_MODE_0) EVT_CALL(MakeItemEntity, LVar8, 125, 20, 0, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVar7, LVar0) EVT_WAIT(5 * DT) diff --git a/src/world/area_flo/flo_11/flo_11_3_npc.c b/src/world/area_flo/flo_11/flo_11_3_npc.c index d61787d4cb..4c7d103b04 100644 --- a/src/world/area_flo/flo_11/flo_11_3_npc.c +++ b/src/world/area_flo/flo_11/flo_11_3_npc.c @@ -66,7 +66,7 @@ Vec3f N(FlightPath_Lakitu_02_Flee)[] = { EvtScript N(EVS_PlayFlightSounds) = { EVT_LOOP(0) - EVT_CALL(PlaySound, SOUND_LRAW_0295) + EVT_CALL(PlaySound, SOUND_FLIGHT) EVT_WAIT(LVar0) EVT_END_LOOP EVT_RETURN diff --git a/src/world/area_flo/flo_13/flo_13_4_npc.c b/src/world/area_flo/flo_13/flo_13_4_npc.c index 4c8f97d2ab..5bbee2fd58 100644 --- a/src/world/area_flo/flo_13/flo_13_4_npc.c +++ b/src/world/area_flo/flo_13/flo_13_4_npc.c @@ -31,7 +31,7 @@ API_CALLABLE(N(PlayLakiluluFlightSounds)) { if (script->functionTemp[0] % 5 == 0) { sfx_get_spatialized_sound_params(npc->pos.x, npc->pos.y, npc->pos.z, &volume, &pan, SOUND_PARAM_MORE_QUIET | SOUND_SPACE_FULL); - sfx_play_sound_with_params(SOUND_LRAW_0295, volume, pan, + sfx_play_sound_with_params(SOUND_FLIGHT, volume, pan, update_lerp(EASING_LINEAR, 500.0f, 0.0f, script->functionTemp[0], script->functionTemp[1])); } @@ -56,7 +56,7 @@ API_CALLABLE(N(PlayLakilesterFlightSounds)) { if (script->functionTemp[0] % 5 == 0) { sfx_get_spatialized_sound_params(npc->pos.x, npc->pos.y, npc->pos.z, &volume, &pan, SOUND_PARAM_MORE_QUIET | SOUND_SPACE_FULL); - sfx_play_sound_with_params(SOUND_LRAW_0295, volume, pan, + sfx_play_sound_with_params(SOUND_FLIGHT, volume, pan, update_lerp(EASING_LINEAR, 500.0f, 0.0f, script->functionTemp[0], 80)); } diff --git a/src/world/area_flo/flo_16/flo_16_6_puzzle.c b/src/world/area_flo/flo_16/flo_16_6_puzzle.c index 078e4cb9f7..c8409edde7 100644 --- a/src/world/area_flo/flo_16/flo_16_6_puzzle.c +++ b/src/world/area_flo/flo_16/flo_16_6_puzzle.c @@ -28,7 +28,7 @@ EvtScript N(EVS_OnTouch_RedPillar) = { EVT_SET(AF_FLO_RaisedRedPillar, FALSE) EVT_END_IF EVT_WAIT(15) - EVT_CALL(PlaySound, SOUND_204D) + EVT_CALL(PlaySound, SOUND_FLO_MOVE_PILLAR) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(0.8)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.2)) @@ -91,7 +91,7 @@ EvtScript N(EVS_OnTouch_GreenPillar) = { EVT_SET(AF_FLO_RaisedGreenPillar, FALSE) EVT_END_IF EVT_WAIT(15) - EVT_CALL(PlaySound, SOUND_204D) + EVT_CALL(PlaySound, SOUND_FLO_MOVE_PILLAR) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(0.8)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.2)) @@ -162,7 +162,7 @@ EvtScript N(EVS_OnTouch_PurplePillar) = { EVT_SET(AF_FLO_LoweredPurplePillar, FALSE) EVT_END_IF EVT_WAIT(15) - EVT_CALL(PlaySound, SOUND_204D) + EVT_CALL(PlaySound, SOUND_FLO_MOVE_PILLAR) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(0.8)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.2)) diff --git a/src/world/area_flo/flo_18/flo_18_1_music.c b/src/world/area_flo/flo_18/flo_18_1_music.c index 95cd57d9f5..0028d440f2 100644 --- a/src/world/area_flo/flo_18/flo_18_1_music.c +++ b/src/world/area_flo/flo_18/flo_18_1_music.c @@ -4,7 +4,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) EVT_CALL(SetMusicTrack, 0, SONG_PUFF_PUFF_MACHINE, 0, 8) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_LOOP_25, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_LOOP_PUFF_PUFF_MACHINE, SOUND_SPACE_MODE_0) EVT_CASE_DEFAULT EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, 8) EVT_END_SWITCH diff --git a/src/world/area_flo/flo_18/flo_18_3_machine.c b/src/world/area_flo/flo_18/flo_18_3_machine.c index 639162a01a..7857587b39 100644 --- a/src/world/area_flo/flo_18/flo_18_3_machine.c +++ b/src/world/area_flo/flo_18/flo_18_3_machine.c @@ -606,7 +606,7 @@ EvtScript N(EVS_DamageMachine) = { EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 0, 30, 30, EVT_FLOAT(4.0), 40) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0)) EVT_EXEC_WAIT(N(EVS_BreakSmokestack)) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_LRAW_0091 | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_LRAW_PUFF_PUFF_MACHINE | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0) EVT_CALL(FadeOutMusic, 0, 1000) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_WAIT(30) diff --git a/src/world/area_flo/flo_21/flo_21_2_main.c b/src/world/area_flo/flo_21/flo_21_2_main.c index eba94bca65..b81b5cb1bd 100644 --- a/src/world/area_flo/flo_21/flo_21_2_main.c +++ b/src/world/area_flo/flo_21/flo_21_2_main.c @@ -37,9 +37,9 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_LOOP_67) + EVT_CALL(PlaySound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(StopSound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, 650, 205, 0) EVT_END_THREAD EVT_THREAD diff --git a/src/world/area_flo/flo_23/flo_23_3_npc.c b/src/world/area_flo/flo_23/flo_23_3_npc.c index b1b07a77ce..908e0d0d91 100644 --- a/src/world/area_flo/flo_23/flo_23_3_npc.c +++ b/src/world/area_flo/flo_23/flo_23_3_npc.c @@ -34,14 +34,14 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CALL(N(FlowerGuard_JudgeItemTastiness), LVar0) EVT_CALL(MakeItemEntity, LVar8, 385, 20, -34, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVar7, LVar0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EAT_OR_DRINK, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Blue_Eat) EVT_WAIT(20 * DT) EVT_CALL(RemoveItemEntity, LVar7) EVT_SWITCH(LVar8) EVT_CASE_EQ(158) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Blue_Chew, ANIM_GateFlower_Blue_Idle, 0, MSG_CH6_004D) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_021C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_APPROVE, SOUND_SPACE_MODE_0) EVT_CALL(EndSpeech, NPC_SELF, ANIM_GateFlower_Blue_HappyTalk, ANIM_GateFlower_Blue_HappyIdle, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Blue_OpenGate) EVT_CALL(PlaySoundAtCollider, COLLIDER_o95, SOUND_METAL_GATE_OPEN, SOUND_SPACE_MODE_0) @@ -75,7 +75,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CASE_DEFAULT EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Blue_Chew, ANIM_GateFlower_Blue_Idle, 0, MSG_CH6_004B) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Blue_Disgust) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SPIT_OUT, SOUND_SPACE_MODE_0) EVT_CALL(MakeItemEntity, LVar8, 375, 20, 0, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVar7, LVar0) EVT_WAIT(5 * DT) diff --git a/src/world/area_flo/flo_25/flo_25_3_npc.c b/src/world/area_flo/flo_25/flo_25_3_npc.c index a44cfa2d07..17a97ed932 100644 --- a/src/world/area_flo/flo_25/flo_25_3_npc.c +++ b/src/world/area_flo/flo_25/flo_25_3_npc.c @@ -34,14 +34,14 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CALL(N(FlowerGuard_JudgeItemTastiness), LVar0) EVT_CALL(MakeItemEntity, LVar8, 505, 20, -24, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVar7, LVar0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EAT_OR_DRINK, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Red_Eat) EVT_WAIT(20 * DT) EVT_CALL(RemoveItemEntity, LVar7) EVT_SWITCH(LVar8) EVT_CASE_EQ(159) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Red_Chew, ANIM_GateFlower_Red_Idle, 0, MSG_CH6_003F) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_021C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_APPROVE, SOUND_SPACE_MODE_0) EVT_CALL(EndSpeech, NPC_SELF, ANIM_GateFlower_Red_HappyTalk, ANIM_GateFlower_Red_HappyIdle, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Red_OpenGate) EVT_CALL(PlaySoundAtCollider, COLLIDER_o94, SOUND_METAL_GATE_OPEN, SOUND_SPACE_MODE_0) @@ -75,7 +75,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CASE_DEFAULT EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Red_Chew, ANIM_GateFlower_Red_Idle, 0, MSG_CH6_003D) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Red_Disgust) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SPIT_OUT, SOUND_SPACE_MODE_0) EVT_CALL(MakeItemEntity, LVar8, -125, 20, 0, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVar7, LVar0) EVT_WAIT(5 * DT) diff --git a/src/world/area_hos/hos_03/hos_03_2_main.c b/src/world/area_hos/hos_03/hos_03_2_main.c index c9ca112733..d6ac5244c1 100644 --- a/src/world/area_hos/hos_03/hos_03_2_main.c +++ b/src/world/area_hos/hos_03/hos_03_2_main.c @@ -73,7 +73,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC(N(EVS_SetupAurora)) EVT_CALL(UseRoomDoorSounds, DOOR_SOUNDS_UNUSED) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_LOOP_63) + EVT_CALL(PlaySound, SOUND_LOOP_STAR_SANCTUARY_FAR) EVT_EXEC(N(EVS_SetupRooms)) EVT_EXEC(N(EVS_SetupShop)) EVT_EXEC(N(EVS_SetupFoliage)) diff --git a/src/world/area_hos/hos_04/hos_04_1_music.c b/src/world/area_hos/hos_04/hos_04_1_music.c index 5a6149813a..570e9fbea6 100644 --- a/src/world/area_hos/hos_04/hos_04_1_music.c +++ b/src/world/area_hos/hos_04/hos_04_1_music.c @@ -21,7 +21,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_ELSE EVT_CALL(SetMusicTrack, 0, SONG_STAR_HAVEN, 0, 8) EVT_END_IF - EVT_CALL(PlaySound, SOUND_LOOP_64) + EVT_CALL(PlaySound, SOUND_LOOP_STAR_SANCTUARY_NEAR) EVT_END_SWITCH EVT_RETURN EVT_END diff --git a/src/world/area_hos/hos_05/hos_05_1_music.c b/src/world/area_hos/hos_05/hos_05_1_music.c index 3d631d3635..1f3f1ef5da 100644 --- a/src/world/area_hos/hos_05/hos_05_1_music.c +++ b/src/world/area_hos/hos_05/hos_05_1_music.c @@ -14,7 +14,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(hos_05_ENTRY_1) EVT_CALL(SetMusicTrack, 0, SONG_STARSHIP_THEME, 1, 8) - EVT_CALL(PlaySound, SOUND_LOOP_65) + EVT_CALL(PlaySound, SOUND_LOOP_STAR_SANCTUARY_INSIDE) EVT_CASE_EQ(hos_05_ENTRY_3) EVT_EXEC(N(EVS_PlayIntroStoryMusic)) EVT_CASE_EQ(hos_05_ENTRY_4) @@ -22,7 +22,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_IF_EQ(AF_HOS_B5, FALSE) EVT_CALL(SetMusicTrack, 0, SONG_STAR_SANCTUARY, 0, 8) EVT_END_IF - EVT_CALL(PlaySound, SOUND_LOOP_65) + EVT_CALL(PlaySound, SOUND_LOOP_STAR_SANCTUARY_INSIDE) EVT_END_SWITCH EVT_RETURN EVT_END diff --git a/src/world/area_hos/hos_05/hos_05_7_model_fx.c b/src/world/area_hos/hos_05/hos_05_7_model_fx.c index 1d7f5ada9d..771b7b3f3f 100644 --- a/src/world/area_hos/hos_05/hos_05_7_model_fx.c +++ b/src/world/area_hos/hos_05/hos_05_7_model_fx.c @@ -201,7 +201,7 @@ EvtScript N(EVS_Starship_Summon) = { EVT_EXEC(N(EVS_UpdateTexturePan_Starship)) EVT_END_THREAD EVT_CALL(SetTexPanner, MODEL_o646, 9) - EVT_CALL(PlaySoundAt, SOUND_00A3, 0, 0, 250, 0) + EVT_CALL(PlaySoundAt, SOUND_STARSHIP_APPEARS, 0, 0, 250, 0) EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, 0, 250, 0, 10, LVar9) EVT_WAIT(20) EVT_CALL(SetModelCustomGfx, MODEL_o646, CUSTOM_GFX_1, FOG_MODE_UNCHANGED) @@ -232,7 +232,7 @@ EvtScript N(EVS_Starship_Summon) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(40) - EVT_CALL(PlaySoundAt, SOUND_00A3 | SOUND_ID_TRIGGER_CHANGE_SOUND, 0, 0, 250, 0) + EVT_CALL(PlaySoundAt, SOUND_STARSHIP_APPEARS | SOUND_ID_TRIGGER_CHANGE_SOUND, 0, 0, 250, 0) EVT_CALL(DismissEffect, LVar9) EVT_CALL(EnableGroup, MODEL_g277, TRUE) EVT_CALL(MakeLerp, 200, 0, 45, EASING_QUADRATIC_OUT) diff --git a/src/world/area_hos/hos_06/hos_06_6_chest.c b/src/world/area_hos/hos_06/hos_06_6_chest.c index 1336662871..0e24269e6e 100644 --- a/src/world/area_hos/hos_06/hos_06_6_chest.c +++ b/src/world/area_hos/hos_06/hos_06_6_chest.c @@ -149,7 +149,7 @@ API_CALLABLE(N(SetItemRetrieved)) { #include "world/common/todo/GetItemEmptyCount.inc.c" EvtScript N(EVS_OpenChest) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o207, SOUND_204A, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o207, SOUND_OPEN_MAGIC_CHEST, 0) EVT_CALL(MakeLerp, 0, 80, 20, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -173,7 +173,7 @@ EvtScript N(EVS_CloseChest) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o207, SOUND_204B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o207, SOUND_CLOSE_MAGIC_CHEST, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_hos/hos_10/hos_10_7_ending.c b/src/world/area_hos/hos_10/hos_10_7_ending.c index 8893f1b09f..7019b10662 100644 --- a/src/world/area_hos/hos_10/hos_10_7_ending.c +++ b/src/world/area_hos/hos_10/hos_10_7_ending.c @@ -184,7 +184,7 @@ EvtScript N(EVS_Scene_CastleDescending) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) - EVT_CALL(PlaySound, SOUND_00A4 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_KPA_LIGHT_RAYS | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetPlayerPos, -130, 200, 1300) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetNpcPos, NPC_PARTNER, -150, 200, 1300) diff --git a/src/world/area_isk/isk_03/isk_03_4_switch.c b/src/world/area_isk/isk_03/isk_03_4_switch.c index 73d7243923..c1c94db1c1 100644 --- a/src/world/area_isk/isk_03/isk_03_4_switch.c +++ b/src/world/area_isk/isk_03/isk_03_4_switch.c @@ -38,7 +38,7 @@ EvtScript N(EVS_OnTouch_DrainSwitch) = { EVT_CALL(EnablePartnerAI) EVT_END_THREAD EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o1990, SOUND_208A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1990, SOUND_FLOOR_SWITCH_DEPRESS, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -49,7 +49,7 @@ EvtScript N(EVS_OnTouch_DrainSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o1990, SOUND_208B, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1990, SOUND_FLOOR_SWITCH_ACTIVATE, SOUND_SPACE_MODE_0) EVT_SET(AF_ISK03_SandSwitchActivated, TRUE) EVT_UNBIND EVT_RETURN diff --git a/src/world/area_isk/isk_06/isk_06_4_switch.c b/src/world/area_isk/isk_06/isk_06_4_switch.c index 913839f6c2..e4e763cd2c 100644 --- a/src/world/area_isk/isk_06/isk_06_4_switch.c +++ b/src/world/area_isk/isk_06/isk_06_4_switch.c @@ -38,7 +38,7 @@ EvtScript N(EVS_OnTouch_DrainSwitch) = { EVT_CALL(EnablePartnerAI) EVT_END_THREAD EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_208A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_FLOOR_SWITCH_DEPRESS, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -49,7 +49,7 @@ EvtScript N(EVS_OnTouch_DrainSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_208B, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_FLOOR_SWITCH_ACTIVATE, SOUND_SPACE_MODE_0) EVT_SET(AF_ISK06_SandSwitchActivated, TRUE) EVT_UNBIND EVT_RETURN diff --git a/src/world/area_isk/isk_07/isk_07_6_switch.c b/src/world/area_isk/isk_07/isk_07_6_switch.c index dc0949ad5c..842821d82d 100644 --- a/src/world/area_isk/isk_07/isk_07_6_switch.c +++ b/src/world/area_isk/isk_07/isk_07_6_switch.c @@ -23,7 +23,7 @@ EvtScript N(EVS_OnTouch_StairSwitch) = { EVT_RETURN EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2022, SOUND_208A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2022, SOUND_FLOOR_SWITCH_DEPRESS, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -33,7 +33,7 @@ EvtScript N(EVS_OnTouch_StairSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2022, SOUND_208B, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2022, SOUND_FLOOR_SWITCH_ACTIVATE, SOUND_SPACE_MODE_0) EVT_SET(AF_ISK07_FlippingRedStairs, TRUE) EVT_LABEL(15) EVT_WAIT(1) diff --git a/src/world/area_isk/isk_09/isk_09_5_switch.c b/src/world/area_isk/isk_09/isk_09_5_switch.c index 39c59432a4..d9ae83f18b 100644 --- a/src/world/area_isk/isk_09/isk_09_5_switch.c +++ b/src/world/area_isk/isk_09/isk_09_5_switch.c @@ -34,7 +34,7 @@ EvtScript N(EVS_OnTouch_BlueSwitchCenter) = { EVT_RETURN EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2096, SOUND_208A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2096, SOUND_FLOOR_SWITCH_DEPRESS, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -44,7 +44,7 @@ EvtScript N(EVS_OnTouch_BlueSwitchCenter) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2096, SOUND_208B, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2096, SOUND_FLOOR_SWITCH_ACTIVATE, SOUND_SPACE_MODE_0) EVT_SET(AF_ISK09_FlippingBlueStairs, TRUE) EVT_LABEL(15) EVT_WAIT(1) @@ -71,7 +71,7 @@ EvtScript N(EVS_OnTouch_BlueSwitchMidLeft) = { EVT_RETURN EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2099, SOUND_208A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2099, SOUND_FLOOR_SWITCH_DEPRESS, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -81,7 +81,7 @@ EvtScript N(EVS_OnTouch_BlueSwitchMidLeft) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2099, SOUND_208B, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2099, SOUND_FLOOR_SWITCH_ACTIVATE, SOUND_SPACE_MODE_0) EVT_SET(AF_ISK09_FlippingBlueStairs, TRUE) EVT_LABEL(15) EVT_WAIT(1) @@ -108,7 +108,7 @@ EvtScript N(EVS_OnTouch_BlueSwitchTopLeft) = { EVT_RETURN EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2102, SOUND_208A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2102, SOUND_FLOOR_SWITCH_DEPRESS, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -118,7 +118,7 @@ EvtScript N(EVS_OnTouch_BlueSwitchTopLeft) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2102, SOUND_208B, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2102, SOUND_FLOOR_SWITCH_ACTIVATE, SOUND_SPACE_MODE_0) EVT_SET(AF_ISK09_FlippingBlueStairs, TRUE) EVT_LABEL(15) EVT_WAIT(1) @@ -145,7 +145,7 @@ EvtScript N(EVS_OnTouch_RedSwitch) = { EVT_RETURN EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2105, SOUND_208A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2105, SOUND_FLOOR_SWITCH_DEPRESS, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -155,7 +155,7 @@ EvtScript N(EVS_OnTouch_RedSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2105, SOUND_208B, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2105, SOUND_FLOOR_SWITCH_ACTIVATE, SOUND_SPACE_MODE_0) EVT_SET(AF_ISK09_FlippingRedStairs, TRUE) EVT_LABEL(15) EVT_WAIT(1) diff --git a/src/world/area_isk/isk_12/isk_12_4_switch.c b/src/world/area_isk/isk_12/isk_12_4_switch.c index 8f08a88d70..eb22f3ec2d 100644 --- a/src/world/area_isk/isk_12/isk_12_4_switch.c +++ b/src/world/area_isk/isk_12/isk_12_4_switch.c @@ -23,7 +23,7 @@ EvtScript N(EVS_OnTouch_DrainSwitch) = { EVT_CALL(EnablePartnerAI) EVT_END_THREAD EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2059, SOUND_208A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2059, SOUND_FLOOR_SWITCH_DEPRESS, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -34,7 +34,7 @@ EvtScript N(EVS_OnTouch_DrainSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2059, SOUND_208B, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2059, SOUND_FLOOR_SWITCH_ACTIVATE, SOUND_SPACE_MODE_0) EVT_SET(AF_ISK12_SandSwitchActivated, TRUE) EVT_UNBIND EVT_RETURN @@ -48,7 +48,7 @@ EvtScript N(EVS_OnTouch_StaircaseSwitch) = { EVT_RETURN EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_208A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_FLOOR_SWITCH_DEPRESS, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -58,7 +58,7 @@ EvtScript N(EVS_OnTouch_StaircaseSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_208B, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_FLOOR_SWITCH_ACTIVATE, SOUND_SPACE_MODE_0) EVT_CALL(InterpPlayerYaw, 260, 0) EVT_SET(AF_ISK12_StairSwitchActivated, TRUE) EVT_THREAD diff --git a/src/world/area_isk/isk_16/isk_16_1_main.c b/src/world/area_isk/isk_16/isk_16_1_main.c index b7d655402d..47fcc3bf84 100644 --- a/src/world/area_isk/isk_16/isk_16_1_main.c +++ b/src/world/area_isk/isk_16/isk_16_1_main.c @@ -27,9 +27,9 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_LOOP_67) + EVT_CALL(PlaySound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(StopSound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, 408, -825, 414) EVT_END_THREAD EVT_THREAD diff --git a/src/world/area_isk/isk_16/isk_16_3_boss.c b/src/world/area_isk/isk_16/isk_16_3_boss.c index 90f4117d12..05bb430b4e 100644 --- a/src/world/area_isk/isk_16/isk_16_3_boss.c +++ b/src/world/area_isk/isk_16/isk_16_3_boss.c @@ -142,7 +142,7 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = { EvtScript N(EVS_PlayChompSounds) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_ChainChomp, SOUND_2061, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_ChainChomp, SOUND_CHAIN_CHOMP_BITE, SOUND_SPACE_MODE_0) EVT_WAIT(5) EVT_END_LOOP EVT_RETURN diff --git a/src/world/area_iwa/iwa_10/iwa_10_4_train.c b/src/world/area_iwa/iwa_10/iwa_10_4_train.c index 028c0d2c13..8b65e4f60a 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_4_train.c +++ b/src/world/area_iwa/iwa_10/iwa_10_4_train.c @@ -510,7 +510,7 @@ EvtScript N(EVS_DepartForToadTown) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_TrainToad_02, ANIM_TrainToad_Talk, ANIM_TrainToad_Still, 5, MSG_CH2_0003) - EVT_CALL(PlaySound, SOUND_0082) + EVT_CALL(PlaySound, SOUND_TRAIN_DEPARTURE) EVT_THREAD EVT_LOOP(1000) EVT_SUBF(MV_TrainMoveSpeed, EVT_FLOAT(0.031)) diff --git a/src/world/area_jan/common/PullVine.inc.c b/src/world/area_jan/common/PullVine.inc.c index 3b2422dd22..7618925d59 100644 --- a/src/world/area_jan/common/PullVine.inc.c +++ b/src/world/area_jan/common/PullVine.inc.c @@ -68,7 +68,7 @@ EvtScript N(EVS_PullVine_Manage) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(GetModelCenter, LVarD) - EVT_CALL(PlaySoundAt, SOUND_2089, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_PULL_VINE, 0, LVar0, LVar1, LVar2) EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_SETF(LVar1, EVT_FLOAT(0.0)) EVT_THREAD @@ -135,7 +135,7 @@ EvtScript N(EVS_PullVine_Manage) = { EVT_CALL(PlayerJump, LVar6, LVar1, LVar4, 10) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_CALL(GetModelCenter, LVarD) - EVT_CALL(PlaySoundAt, SOUND_2089, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_PULL_VINE, 0, LVar0, LVar1, LVar2) EVT_THREAD EVT_WAIT(10) EVT_LOOP(5) diff --git a/src/world/area_jan/jan_03/jan_03_2_main.c b/src/world/area_jan/jan_03/jan_03_2_main.c index 31117fff07..efbc1f947d 100644 --- a/src/world/area_jan/jan_03/jan_03_2_main.c +++ b/src/world/area_jan/jan_03/jan_03_2_main.c @@ -43,7 +43,7 @@ EvtScript N(EVS_EnterMap) = { EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerPos, LVar0, NPC_DISPOSE_POS_Y, LVar2) EVT_WAIT(30) - EVT_CALL(PlaySound, SOUND_208E) + EVT_CALL(PlaySound, SOUND_GROW) EVT_SET(GF_JAN03_WarpPipe, TRUE) EVT_WAIT(30) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) diff --git a/src/world/area_jan/jan_04/jan_04_4_npc.c b/src/world/area_jan/jan_04/jan_04_4_npc.c index 5810bcad2e..2466e44fef 100644 --- a/src/world/area_jan/jan_04/jan_04_4_npc.c +++ b/src/world/area_jan/jan_04/jan_04_4_npc.c @@ -19,7 +19,7 @@ EvtScript N(EVS_ShakeTree_Sushie) = { EVT_IF_EQ(GF_JAN04_SushieTreeHitCounterB, FALSE) EVT_IF_EQ(GF_JAN04_SushieTreeHitCounterA, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Sushie, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_Sushie, SOUND_02A0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Sushie, SOUND_SUSHIE_FLOP, 0) EVT_CALL(NpcJump0, NPC_Sushie, 90, 140, -85, 20 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 90, 140, -85) EVT_CALL(SetPanTarget, CAM_DEFAULT, 90, 140, -85) @@ -39,7 +39,7 @@ EvtScript N(EVS_ShakeTree_Sushie) = { EVT_SET(AF_JAN_08, FALSE) EVT_ELSE EVT_CALL(SetNpcJumpscale, NPC_Sushie, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_Sushie, SOUND_02A0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Sushie, SOUND_SUSHIE_FLOP, 0) EVT_CALL(NpcJump0, NPC_Sushie, -10, 112, -80, 15 * DT) EVT_SET(GF_JAN04_SushieTreeHitCounterA, FALSE) EVT_SET(GF_JAN04_SushieTreeHitCounterB, TRUE) @@ -48,7 +48,7 @@ EvtScript N(EVS_ShakeTree_Sushie) = { EVT_END_IF EVT_ELSE EVT_CALL(SetNpcJumpscale, NPC_Sushie, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_Sushie, SOUND_02A0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Sushie, SOUND_SUSHIE_FLOP, 0) EVT_CALL(NpcJump0, NPC_Sushie, 50, 0, 0, 20 * DT) EVT_SET(GF_JAN04_SushieTreeHitCounterA, TRUE) EVT_CALL(EnableNpcShadow, NPC_Sushie, TRUE) diff --git a/src/world/area_jan/jan_06/jan_06_2_statue.c b/src/world/area_jan/jan_06/jan_06_2_statue.c index 53cb6eebc3..724c216472 100644 --- a/src/world/area_jan/jan_06/jan_06_2_statue.c +++ b/src/world/area_jan/jan_06/jan_06_2_statue.c @@ -56,7 +56,7 @@ API_CALLABLE(N(AdjustEnvSoundPosition)) { script->functionTemp[0] = evt_get_variable(script, *args++); script->functionTemp[1] = evt_get_variable(script, *args++); script->functionTemp[2] = evt_get_variable(script, *args++); - sfx_adjust_env_sound_pos(SOUND_LRAW_009E, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_LRAW_MOVE_STATUE, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); return ApiStatus_DONE2; } @@ -72,10 +72,10 @@ EvtScript N(PlayMovingStatueSound) = { }; EvtScript N(EVS_Scene_MoveStatue) = { - EVT_CALL(PlaySound, SOUND_LOOP_18) + EVT_CALL(PlaySound, SOUND_LOOP_MOVE_LARGE_STATUE) EVT_EXEC_WAIT(N(EVS_MoveStatue)) EVT_CALL(GetModelCenter, MODEL_o162) - EVT_CALL(PlaySoundAt, SOUND_LOOP_10, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_LOOP_MOVE_STATUE, 0, LVar0, LVar1, LVar2) EVT_EXEC_GET_TID(N(PlayMovingStatueSound), LVar9) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 180, EVT_FLOAT(0.4)) @@ -93,8 +93,8 @@ EvtScript N(EVS_Scene_MoveStatue) = { EVT_END_LOOP EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(1.0)) EVT_KILL_THREAD(LVar9) - EVT_CALL(StopSound, SOUND_LOOP_10) - EVT_CALL(StopSound, SOUND_LOOP_18) + EVT_CALL(StopSound, SOUND_LOOP_MOVE_STATUE) + EVT_CALL(StopSound, SOUND_LOOP_MOVE_LARGE_STATUE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o166, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o247, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o180, 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 f951408414..e54cdd587e 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 @@ -176,34 +176,34 @@ EvtScript N(EVS_GatherRavensNearRaphael) = { EvtScript N(EVS_Ravens_LeapIntoTree) = { EVT_CHILD_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_SRAW_13_A, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_RAVEN_LEAP_A, 0) EVT_CALL(SetNpcFlagBits, NPC_Raven_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Flail) EVT_CALL(NpcJump0, NPC_Raven_02, 271, 325, -17, 30 * DT) EVT_END_CHILD_THREAD EVT_CHILD_THREAD EVT_WAIT(3 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_SRAW_13_B, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_RAVEN_LEAP_B, 0) EVT_CALL(SetNpcFlagBits, NPC_Raven_05, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Flail) EVT_CALL(NpcJump0, NPC_Raven_05, 400, 215, -23, 30 * DT) EVT_END_CHILD_THREAD EVT_CHILD_THREAD EVT_WAIT(6 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Raven_01, SOUND_SRAW_13_A, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_01, SOUND_RAVEN_LEAP_A, 0) EVT_CALL(SetNpcFlagBits, NPC_Raven_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Flail) EVT_CALL(NpcJump0, NPC_Raven_01, 208, 335, -17, 30 * DT) EVT_END_CHILD_THREAD EVT_CHILD_THREAD EVT_WAIT(9 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Raven_03, SOUND_SRAW_13_B, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_03, SOUND_RAVEN_LEAP_B, 0) EVT_CALL(SetNpcFlagBits, NPC_Raven_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Flail) EVT_CALL(NpcJump0, NPC_Raven_03, 327, 200, -8, 30 * DT) EVT_END_CHILD_THREAD EVT_WAIT(30 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_SRAW_13_A, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_RAVEN_LEAP_A, 0) EVT_CALL(SetNpcFlagBits, NPC_Raven_04, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Flail) EVT_CALL(NpcJump0, NPC_Raven_04, 222, 284, -13, 15 * DT) @@ -423,7 +423,7 @@ EvtScript N(EVS_ManageRavens) = { EVT_CALL(SetNpcPos, NPC_Raven_02, 200, 185, 0) EVT_CALL(SetNpcPos, NPC_Raven_03, 338, 212, -20) EVT_CALL(SetNpcPos, NPC_Raven_04, 267, 314, -12) - EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_SRAW_13_A, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_RAVEN_LEAP_A, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 60) EVT_CALL(NpcJump0, NPC_Raven_05, LVar0, 0, 40, 20 * DT) @@ -439,7 +439,7 @@ EvtScript N(EVS_ManageRavens) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_SRAW_13_A, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_RAVEN_LEAP_A, 0) EVT_CALL(SetNpcPos, NPC_Raven_05, 350, 0, 100) EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Flail) EVT_CALL(NpcJump0, NPC_Raven_05, 400, 215, -23, 20 * DT) @@ -481,7 +481,7 @@ EvtScript N(EVS_ManageRavens) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_SRAW_13_A, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_RAVEN_LEAP_A, 0) EVT_CALL(NpcJump0, NPC_Raven_05, 150, 0, 20, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Walk) EVT_THREAD @@ -489,7 +489,7 @@ EvtScript N(EVS_ManageRavens) = { EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Idle) EVT_CALL(InterpNpcYaw, NPC_Raven_05, 90, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_SRAW_13_B, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_RAVEN_LEAP_B, 0) EVT_CALL(NpcJump0, NPC_Raven_04, 150, 0, 20, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Walk) EVT_THREAD @@ -497,7 +497,7 @@ EvtScript N(EVS_ManageRavens) = { EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Idle) EVT_CALL(InterpNpcYaw, NPC_Raven_04, 90, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Raven_03, SOUND_SRAW_13_A, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_03, SOUND_RAVEN_LEAP_A, 0) EVT_CALL(NpcJump0, NPC_Raven_03, 150, 0, 20, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Walk) EVT_THREAD @@ -505,7 +505,7 @@ EvtScript N(EVS_ManageRavens) = { EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Idle) EVT_CALL(InterpNpcYaw, NPC_Raven_03, 90, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_SRAW_13_B, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_RAVEN_LEAP_B, 0) EVT_CALL(NpcJump0, NPC_Raven_02, 150, 0, 20, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Walk) EVT_CALL(NpcMoveTo, NPC_Raven_02, 110, -10, 15 * DT) @@ -1369,7 +1369,7 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2045, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_STAR_SPIRIT_DEPART_1, 0) EVT_END_THREAD EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) diff --git a/src/world/area_jan/jan_22/jan_22_5_zipline.c b/src/world/area_jan/jan_22/jan_22_5_zipline.c index 6ebefaea71..63e79fdfba 100644 --- a/src/world/area_jan/jan_22/jan_22_5_zipline.c +++ b/src/world/area_jan/jan_22/jan_22_5_zipline.c @@ -152,7 +152,7 @@ EvtScript N(EVS_RideZipline) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySound, SOUND_2087) + EVT_CALL(PlaySound, SOUND_ZIPLINE_FINISH) EVT_LABEL(10) EVT_CALL(SetPlayerFlagBits, PS_FLAG_SCRIPTED_FALL, TRUE) EVT_SET(MF_RidingZipline1, FALSE) diff --git a/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c b/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c index 16500d078c..b86210d642 100644 --- a/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c +++ b/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c @@ -66,7 +66,7 @@ EvtScript N(EVS_Scene_MeetingPeach) = { EVT_END_THREAD EVT_WAIT(17 * DT) EVT_THREAD - EVT_CALL(PlaySound, SOUND_LOOP_56) + EVT_CALL(PlaySound, SOUND_LOOP_KKJ_RUMBLING) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 200 * DT, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_WAIT(60 * DT) @@ -135,7 +135,7 @@ EvtScript N(EVS_Scene_Ascending) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_CALL(PlaySound, SOUND_LOOP_56) + EVT_CALL(PlaySound, SOUND_LOOP_KKJ_RUMBLING) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 200, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_WAIT(100 * DT) diff --git a/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c b/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c index 1f59ebc216..59af5a49e7 100644 --- a/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c +++ b/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c @@ -12,14 +12,14 @@ API_CALLABLE(N(UpdatePropellerSoundPos)) { f32 y = npc->pos.y; f32 z = npc->pos.z; - sfx_adjust_env_sound_pos(SOUND_LRAW_023D, SOUND_SPACE_MODE_0, x, y, z); + sfx_adjust_env_sound_pos(SOUND_LRAW_BOWSER_PROPELLER, SOUND_SPACE_MODE_0, x, y, z); script->varTable[0] = y; return ApiStatus_DONE2; } EvtScript N(EVS_UpdatePropellerSounds) = { - EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Prop, SOUND_LOOP_66, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Prop, SOUND_LOOP_BOWSER_PROPELLER, 0) EVT_LOOP(0) EVT_CALL(N(UpdatePropellerSoundPos)) EVT_IF_LT(LVar0, 0) @@ -30,7 +30,7 @@ EvtScript N(EVS_UpdatePropellerSounds) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(StopSound, SOUND_LOOP_66) + EVT_CALL(StopSound, SOUND_LOOP_BOWSER_PROPELLER) EVT_RETURN EVT_END }; diff --git a/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c b/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c index 0105f1dc00..1252c5e751 100644 --- a/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c +++ b/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c @@ -9,14 +9,14 @@ API_CALLABLE(N(UpdatePropellerSoundPos_Intro)) { f32 y = npc->pos.y; f32 z = npc->pos.z; - sfx_adjust_env_sound_pos(SOUND_LRAW_023D, SOUND_SPACE_MODE_0, x, y, z); + sfx_adjust_env_sound_pos(SOUND_LRAW_BOWSER_PROPELLER, SOUND_SPACE_MODE_0, x, y, z); script->varTable[0] = y; return ApiStatus_DONE2; } EvtScript N(EVS_UpdatePropellerSounds_Intro) = { - EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Prop, SOUND_LOOP_66, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Prop, SOUND_LOOP_BOWSER_PROPELLER, 0) EVT_LOOP(0) EVT_CALL(N(UpdatePropellerSoundPos_Intro)) EVT_IF_LT(LVar0, 0) @@ -24,7 +24,7 @@ EvtScript N(EVS_UpdatePropellerSounds_Intro) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(StopSound, SOUND_LOOP_66) + EVT_CALL(StopSound, SOUND_LOOP_BOWSER_PROPELLER) EVT_RETURN EVT_END }; @@ -201,15 +201,15 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD - EVT_CALL(PlaySound, SOUND_LOOP_56) + EVT_CALL(PlaySound, SOUND_LOOP_KKJ_RUMBLING) #if VERSION_PAL EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 60 * DT, EVT_FLOAT(0.5)) #else EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(0.5)) #endif - EVT_CALL(PlaySound, SOUND_LRAW_0033 | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_LRAW_0033) + EVT_CALL(PlaySound, SOUND_LRAW_KKJ_RUMBLING | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(StopTrackingSoundPos, SOUND_LRAW_KKJ_RUMBLING) EVT_END_THREAD EVT_THREAD EVT_CALL(SetPlayerJumpscale, 0) @@ -309,7 +309,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_CALL(EnableGroup, MODEL_g147, FALSE) EVT_CALL(EnableGroup, MODEL_g152, TRUE) EVT_CALL(EnableGroup, MODEL_g154, TRUE) - EVT_CALL(PlaySoundAt, SOUND_2097, 0, 600, 60, -150) + EVT_CALL(PlaySoundAt, SOUND_GLASS_SHATTER, 0, 600, 60, -150) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 600, 60, -150, 120) EVT_CALL(N(ShatterWindow)) EVT_WAIT(1) diff --git a/src/world/area_kkj/kkj_15/kkj_15_2_main.c b/src/world/area_kkj/kkj_15/kkj_15_2_main.c index 9c7b4a7978..0d54de4fe0 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_2_main.c +++ b/src/world/area_kkj/kkj_15/kkj_15_2_main.c @@ -143,9 +143,9 @@ EvtScript N(EVS_Main) = { EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, kkj_15_ENTRY_1) EVT_IF_EQ(GB_StoryProgress, STORY_CH3_BEGAN_PEACH_MISSION) - EVT_CALL(StopSound, SOUND_0093) + EVT_CALL(StopSound, SOUND_KKJ_ROTATING_WALL) EVT_ELSE - EVT_CALL(PlaySoundAt, SOUND_0093, 0, 50, 5, -200) + EVT_CALL(PlaySoundAt, SOUND_KKJ_ROTATING_WALL, 0, 50, 5, -200) EVT_END_IF EVT_WAIT(10) EVT_END_IF diff --git a/src/world/area_kkj/kkj_15/kkj_15_3_rotating_wall.c b/src/world/area_kkj/kkj_15/kkj_15_3_rotating_wall.c index e549ba78e3..d4ed821ee0 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_3_rotating_wall.c +++ b/src/world/area_kkj/kkj_15/kkj_15_3_rotating_wall.c @@ -32,7 +32,7 @@ EvtScript N(EVS_AnimateRotatingWall_AlmostCaught) = { EVT_WAIT(180 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround) EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_0093, 0, 50, 5, -200) + EVT_CALL(PlaySoundAt, SOUND_KKJ_ROTATING_WALL, 0, 50, 5, -200) EVT_CALL(MakeLerp, 0, -1800, 360 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -45,7 +45,7 @@ EvtScript N(EVS_AnimateRotatingWall_AlmostCaught) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(StopSound, SOUND_0093) + EVT_CALL(StopSound, SOUND_KKJ_ROTATING_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_g25, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1, COLLIDER_FLAGS_UPPER_MASK) EVT_RETURN @@ -70,7 +70,7 @@ EvtScript N(EVS_AnimateRotatingWall_Default) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(StopSound, SOUND_0093) + EVT_CALL(StopSound, SOUND_KKJ_ROTATING_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_g25, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1, COLLIDER_FLAGS_UPPER_MASK) EVT_RETURN diff --git a/src/world/area_kkj/kkj_17/kkj_17_3_chest.c b/src/world/area_kkj/kkj_17/kkj_17_3_chest.c index 34babc5d2b..1d501c2246 100644 --- a/src/world/area_kkj/kkj_17/kkj_17_3_chest.c +++ b/src/world/area_kkj/kkj_17/kkj_17_3_chest.c @@ -148,7 +148,7 @@ API_CALLABLE(N(SetItemRetrieved)) { #include "world/common/todo/GetItemEmptyCount.inc.c" EvtScript N(EVS_OpenChest) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o89, SOUND_204A, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o89, SOUND_OPEN_MAGIC_CHEST, 0) EVT_CALL(MakeLerp, 0, 80, 20, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -172,7 +172,7 @@ EvtScript N(EVS_CloseChest) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o89, SOUND_204B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o89, SOUND_CLOSE_MAGIC_CHEST, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c b/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c index 81997d6869..a8fcac9838 100644 --- a/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c +++ b/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c @@ -339,7 +339,7 @@ EvtScript N(EVS_GourmetGuy_RunAround) = { }; EvtScript N(EVS_RejectCake) = { - EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_2096, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_SPIT_OUT, 0) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_SpitOut) EVT_CALL(MakeItemEntity, MV_CakeItemIdx, 105, 30, 20, ITEM_SPAWN_MODE_DECORATION, 0) EVT_CALL(MakeLerp, 0, 100, 4, EASING_LINEAR) @@ -519,7 +519,7 @@ EvtScript N(EVS_Scene_JudgeCake) = { EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Eat) EVT_LOOP(6) EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_2095, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_EAT_OR_DRINK, 0) EVT_END_LOOP EVT_IF_NE(AB_KKJ_CompletedBakeStep, CAKE_TYPE_DONE) EVT_EXEC_WAIT(N(EVS_RejectCake)) diff --git a/src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c b/src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c index 59bffceb8c..20df106f9a 100644 --- a/src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c +++ b/src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c @@ -18,14 +18,14 @@ API_CALLABLE(N(UpdatePropellerSoundPos)) { f32 y = npc->pos.y; f32 z = npc->pos.z; - sfx_adjust_env_sound_pos(SOUND_LRAW_023D, SOUND_SPACE_MODE_0, x, y, z); + sfx_adjust_env_sound_pos(SOUND_LRAW_BOWSER_PROPELLER, SOUND_SPACE_MODE_0, x, y, z); script->varTable[0] = y; return ApiStatus_DONE2; } EvtScript N(EVS_UpdatePropellerSounds) = { - EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Prop, SOUND_LOOP_66, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Prop, SOUND_LOOP_BOWSER_PROPELLER, 0) EVT_LOOP(0) EVT_CALL(N(UpdatePropellerSoundPos)) EVT_IF_LT(LVar0, 0) @@ -33,7 +33,7 @@ EvtScript N(EVS_UpdatePropellerSounds) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(StopSound, SOUND_LOOP_66) + EVT_CALL(StopSound, SOUND_LOOP_BOWSER_PROPELLER) EVT_RETURN EVT_END }; diff --git a/src/world/area_kkj/kkj_25/kkj_25_5_arena.c b/src/world/area_kkj/kkj_25/kkj_25_5_arena.c index 70cbd7d745..597ab75f42 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_5_arena.c +++ b/src/world/area_kkj/kkj_25/kkj_25_5_arena.c @@ -72,7 +72,7 @@ EvtScript N(EVS_BowserActivatesSwitch) = { EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_Bowser_01, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_Bowser_01, 300, 0, 0, 20) - EVT_CALL(PlaySoundAtNpc, NPC_Bowser_01, SOUND_208B, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_01, SOUND_FLOOR_SWITCH_ACTIVATE, 0) EVT_CALL(PlaySoundAtNpc, NPC_Bowser_01, SOUND_20A0, 0) EVT_SET(AF_KKJ_1A, TRUE) EVT_RETURN diff --git a/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c b/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c index 647467628f..c8e9d313d5 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c +++ b/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c @@ -125,7 +125,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_Peach_01, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) - EVT_CALL(PlaySoundAt, SOUND_2051, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_WISH_ASCENDING, 0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 5, LVar0, LVar1, LVar2, 40, 120, 45, 150) EVT_WAIT(150) EVT_CALL(SetNpcAnimation, NPC_Bowser_02, ANIM_WorldBowser_RearUpLaugh) @@ -178,7 +178,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { EVT_WAIT(15) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(2.0), 0, 300, EVT_FLOAT(17.0), EVT_FLOAT(-13.0)) EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 5, 100, 45, -66, 40, 50, 45, 80) - EVT_CALL(PlaySound, SOUND_2051) + EVT_CALL(PlaySound, SOUND_WISH_ASCENDING) EVT_WAIT(30) EVT_SET(LVar0, NPC_Eldstar) EVT_EXEC(N(AddStarSpiritHovering)) diff --git a/src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c b/src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c index 4a5a3d626d..e4fbab8a01 100644 --- a/src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c +++ b/src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c @@ -35,7 +35,7 @@ EvtScript N(EVS_Scene_RotatingWall) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_g29, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o124, COLLIDER_FLAGS_UPPER_MASK) EVT_THREAD - EVT_CALL(PlaySoundAt, SOUND_0093, 0, -250, 5, 0) + EVT_CALL(PlaySoundAt, SOUND_KKJ_ROTATING_WALL, 0, -250, 5, 0) EVT_CALL(GetPlayerPos, LVar9, LVar0, LVarA) EVT_CALL(MakeLerp, 0, -450, 120 * DT, EASING_LINEAR) EVT_LOOP(0) diff --git a/src/world/area_kkj/kkj_29/kkj_29_3_quiz.c b/src/world/area_kkj/kkj_29/kkj_29_3_quiz.c index 42257bf721..cc824e7a8a 100644 --- a/src/world/area_kkj/kkj_29/kkj_29_3_quiz.c +++ b/src/world/area_kkj/kkj_29/kkj_29_3_quiz.c @@ -85,7 +85,7 @@ EvtScript N(EVS_UpdateScores) = { }; EvtScript N(EVS_WaitForBuzzIn) = { - EVT_CALL(PlaySound, SOUND_LRAW_008E) + EVT_CALL(PlaySound, SOUND_LRAW_QUIZ_TICKING) EVT_CALL(N(AwaitPlayerBuzzIn)) EVT_IF_EQ(LVar0, 0) // time's up // player took too long, decide who will answer based on score @@ -104,21 +104,21 @@ EvtScript N(EVS_WaitForBuzzIn) = { // player will answer EVT_SET(AB_KKJ29_AnsweringContestant, CONTESTANT_PEACH) EVT_END_IF - EVT_CALL(StopSound, SOUND_LRAW_008E) + EVT_CALL(StopSound, SOUND_LRAW_QUIZ_TICKING) EVT_SET(AB_KKJ29_AnswerScore, ANSWER_PENDING) EVT_SWITCH(AB_KKJ29_AnsweringContestant) EVT_CASE_EQ(CONTESTANT_LEFT) - EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_008D, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_QUIZ_BUZZER, 0) EVT_CALL(EndSpeech, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5) EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_00FA) EVT_CALL(GetNpcPos, NPC_Koopatrol_01, LVar0, LVar1, LVar2) EVT_CASE_EQ(CONTESTANT_PEACH) - EVT_CALL(PlaySoundAtPlayer, SOUND_008D, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_QUIZ_BUZZER, 0) EVT_CALL(EndSpeech, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5) EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_00F9) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CASE_EQ(CONTESTANT_RIGHT) - EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_02, SOUND_008D, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_02, SOUND_QUIZ_BUZZER, 0) EVT_CALL(EndSpeech, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5) EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_00FB) EVT_CALL(GetNpcPos, NPC_Koopatrol_02, LVar0, LVar1, LVar2) @@ -141,7 +141,7 @@ EvtScript N(EVS_WaitForBuzzIn) = { // LVar5 rival choice selection // LVar6 host response to wrong answer EvtScript N(Script_DoRound) = { - EVT_CALL(PlaySound, SOUND_008C) + EVT_CALL(PlaySound, SOUND_QUIZ_NEXT_QUESTION) EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, LVar1) EVT_SET(LVar0, LVar2) // wait for input @@ -159,14 +159,14 @@ EvtScript N(Script_DoRound) = { EVT_END_SWITCH // handle the choice EVT_IF_EQ(LVar0, LVar5) - EVT_CALL(PlaySound, SOUND_021C) - EVT_CALL(PlaySound, SOUND_008A) + EVT_CALL(PlaySound, SOUND_APPROVE) + EVT_CALL(PlaySound, SOUND_AUDIENCE_CHEER) EVT_SET(AB_KKJ29_AnswerScore, ANSWER_RIGHT) EVT_EXEC_WAIT(N(EVS_UpdateScores)) EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_0110) EVT_ELSE EVT_CALL(PlaySound, SOUND_MENU_ERROR) - EVT_CALL(PlaySound, SOUND_008B) + EVT_CALL(PlaySound, SOUND_AUDIENCE_BOO) EVT_SET(AB_KKJ29_AnswerScore, ANSWER_WRONG) EVT_EXEC_WAIT(N(EVS_UpdateScores)) EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, LVar6) @@ -660,7 +660,7 @@ EvtScript N(EVS_DeclareWinner) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(OUTCOME_LEFT_WON) EVT_CALL(SpeakToNpc, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, NPC_Koopatrol_01, MSG_Peach_011B) - EVT_CALL(PlaySound, SOUND_008A) + EVT_CALL(PlaySound, SOUND_AUDIENCE_CHEER) EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim19) EVT_CALL(ContinueSpeech, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_011C) EVT_WAIT(10) @@ -671,7 +671,7 @@ EvtScript N(EVS_DeclareWinner) = { EVT_WAIT(10) EVT_CASE_EQ(OUTCOME_PEACH_WON) EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, MSG_Peach_0121) - EVT_CALL(PlaySound, SOUND_008A) + EVT_CALL(PlaySound, SOUND_AUDIENCE_CHEER) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Delighted) EVT_WAIT(1) EVT_CALL(ContinueSpeech, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, MSG_Peach_0122) @@ -681,7 +681,7 @@ EvtScript N(EVS_DeclareWinner) = { EVT_WAIT(10) EVT_CASE_EQ(OUTCOME_RIGHT_WON) EVT_CALL(SpeakToNpc, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, NPC_Koopatrol_02, MSG_Peach_011E) - EVT_CALL(PlaySound, SOUND_008A) + EVT_CALL(PlaySound, SOUND_AUDIENCE_CHEER) EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim19) EVT_CALL(ContinueSpeech, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_011F) EVT_WAIT(10) @@ -696,7 +696,7 @@ EvtScript N(EVS_DeclareWinner) = { EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_0123) EVT_END_IF - EVT_CALL(PlaySound, SOUND_008B) + EVT_CALL(PlaySound, SOUND_AUDIENCE_BOO) EVT_END_SWITCH EVT_RETURN EVT_END @@ -992,10 +992,10 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_WAIT(30 * DT) EVT_CALL(SetMusicTrack, 0, SONG_PEACH_QUIZ_INTRO, 0, 8) EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_00F5) - EVT_CALL(PlaySound, SOUND_008A) + EVT_CALL(PlaySound, SOUND_AUDIENCE_CHEER) EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_00F6) - EVT_CALL(PlaySound, SOUND_008A) + EVT_CALL(PlaySound, SOUND_AUDIENCE_CHEER) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround) EVT_CALL(PlaySoundAtPlayer, SOUND_0263, 0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 45, 13, EMOTER_PLAYER, 0, 0, 0, 0) diff --git a/src/world/area_kmr/kmr_02/kmr_02_2_main.c b/src/world/area_kmr/kmr_02/kmr_02_2_main.c index 34ca167a59..845330de2e 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_2_main.c +++ b/src/world/area_kmr/kmr_02/kmr_02_2_main.c @@ -65,7 +65,7 @@ EvtScript N(EVS_EnterMap) = { EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerPos, LVar0, NPC_DISPOSE_POS_Y, LVar2) EVT_WAIT(30) - EVT_CALL(PlaySound, SOUND_208E) + EVT_CALL(PlaySound, SOUND_GROW) EVT_SET(GF_KMR02_WarpPipe, TRUE) EVT_WAIT(30) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) diff --git a/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c b/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c index 7ba3851ee7..db3971d8b7 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c +++ b/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c @@ -45,7 +45,7 @@ Vec3f N(FlightPath_KammyDepart)[] = { EvtScript N(EVS_PlayKammyFlightSounds) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_LRAW_0295, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_FLIGHT, SOUND_SPACE_MODE_0) EVT_WAIT(4 * DT) EVT_END_LOOP EVT_RETURN diff --git a/src/world/area_kmr/kmr_07/kmr_07_3_npc.c b/src/world/area_kmr/kmr_07/kmr_07_3_npc.c index 88d8012469..856ccd2baf 100644 --- a/src/world/area_kmr/kmr_07/kmr_07_3_npc.c +++ b/src/world/area_kmr/kmr_07/kmr_07_3_npc.c @@ -126,7 +126,7 @@ EvtScript N(EVS_NpcDefeat_GoombaBros_Red) = { EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Blue, SOUND_ACTOR_HURT, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_GoombaBros_Blue, 307, 25, 49, 20 * DT) EVT_CALL(N(PlaySpringReboundAnimation)) - EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Blue, SOUND_2086, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Blue, SOUND_SPRING, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_GoombaBros_Blue, 401, 80, 25, 30 * DT) EVT_WAIT(5 * DT) EVT_CALL(SetNpcSpeed, NPC_GoombaBros_Blue, EVT_FLOAT(6.0 / DT)) @@ -144,7 +144,7 @@ EvtScript N(EVS_NpcDefeat_GoombaBros_Red) = { EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Red, SOUND_ACTOR_HURT, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_GoombaBros_Red, 307, 25, 49, 20 * DT) EVT_CALL(N(PlaySpringReboundAnimation)) - EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Red, SOUND_2086, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Red, SOUND_SPRING, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_GoombaBros_Red, 401, 80, 25, 30 * DT) EVT_WAIT(5 * DT) EVT_CALL(SetNpcSpeed, NPC_GoombaBros_Red, EVT_FLOAT(6.0 / DT)) diff --git a/src/world/area_kmr/kmr_10/kmr_10_4_entity.c b/src/world/area_kmr/kmr_10/kmr_10_4_entity.c index d065fd5826..af8360dccd 100644 --- a/src/world/area_kmr/kmr_10/kmr_10_4_entity.c +++ b/src/world/area_kmr/kmr_10/kmr_10_4_entity.c @@ -35,8 +35,8 @@ EvtScript N(EVS_OnShakeTree1) = { EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_Dummy, EVT_FLOAT(0.8)) EVT_CALL(NpcJump0, NPC_Dummy, 370, 10, 20, 15) - EVT_CALL(PlaySoundAt, SOUND_0048, SOUND_SPACE_MODE_0, 370, 10, 20) - EVT_CALL(PlaySoundAt, SOUND_2086, SOUND_SPACE_MODE_0, 370, 10, 20) + EVT_CALL(PlaySoundAt, SOUND_OBJECT_LAND, SOUND_SPACE_MODE_0, 370, 10, 20) + EVT_CALL(PlaySoundAt, SOUND_SPRING, SOUND_SPACE_MODE_0, 370, 10, 20) EVT_CALL(N(PlaySpringReboundAnimation), MV_SpringEntityIndex) EVT_IF_EQ(GF_KMR10_UnreadFlagForSpring, FALSE) EVT_ADD(GF_KMR10_UnreadFlagForSpring, 1) diff --git a/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c b/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c index 11adfbfb24..b4bedf4fbb 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c +++ b/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c @@ -80,7 +80,7 @@ EvtScript N(EVS_FocusCam_Battlement) = { }; EvtScript N(EVS_RandomQuaking) = { - EVT_CALL(PlaySound, SOUND_00A5) + EVT_CALL(PlaySound, SOUND_KMR_TOWER_COLLAPSE_RUMBLE) EVT_LABEL(0) EVT_CALL(RandInt, 10, LVar0) EVT_ADD(LVar0, 5) @@ -155,15 +155,15 @@ EvtScript N(EVS_FortressCollapse_PlayFX) = { EVT_CALL(PlaySound, SOUND_01E2) EVT_EXEC(N(EVS_FortressCollapse_MakeDust2)) EVT_WAIT(95) - EVT_CALL(PlaySound, SOUND_00A6) + EVT_CALL(PlaySound, SOUND_KMR_TOWER_COLLAPSE_THUD) EVT_EXEC(N(EVS_FortressCollapse_MakeDust3)) EVT_EXEC(N(EVS_FortressCollapse_MakeDust4)) EVT_WAIT(34) - EVT_CALL(PlaySound, SOUND_00A6) + EVT_CALL(PlaySound, SOUND_KMR_TOWER_COLLAPSE_THUD) EVT_EXEC(N(EVS_FortressCollapse_MakeDust5)) EVT_EXEC(N(EVS_FortressCollapse_MakeDust6)) EVT_WAIT(40) - EVT_CALL(PlaySound, SOUND_00A7) + EVT_CALL(PlaySound, SOUND_KMR_TOWER_COLLAPSE_UNFOLD) EVT_WAIT(160) EVT_CALL(PlaySound, SOUND_01E8) EVT_WAIT(40) @@ -259,7 +259,7 @@ EvtScript N(EVS_Scene_SelfDestruct) = { EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.5)) EVT_WAIT(20) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.2)) - EVT_CALL(PlaySound, SOUND_00A5 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_KMR_TOWER_COLLAPSE_RUMBLE | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_EXEC(N(EVS_PlayFortressAnimation)) EVT_EXEC(N(EVS_FortressCollapse_PlayFX)) diff --git a/src/world/area_kmr/kmr_11/kmr_11_5_entity.c b/src/world/area_kmr/kmr_11/kmr_11_5_entity.c index 5ed20391b7..3fb0cd7eac 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_5_entity.c +++ b/src/world/area_kmr/kmr_11/kmr_11_5_entity.c @@ -51,7 +51,7 @@ EvtScript N(EVS_Interact_SwitchBush) = { EVT_EXEC_GET_TID(N(EVS_TetherSwitchToBlueGoomba), LVarB) EVT_CALL(SetNpcJumpscale, NPC_BlueGoombaBro, EVT_FLOAT(2.0)) EVT_CALL(NpcJump0, NPC_BlueGoombaBro, -445, 0, 92, 15 * DT) - EVT_CALL(PlaySoundAt, SOUND_0048, SOUND_SPACE_MODE_0, -469, 1, 92) + EVT_CALL(PlaySoundAt, SOUND_OBJECT_LAND, SOUND_SPACE_MODE_0, -469, 1, 92) EVT_CALL(SetNpcJumpscale, NPC_BlueGoombaBro, EVT_FLOAT(2.0)) EVT_CALL(NpcJump0, NPC_BlueGoombaBro, -469, 0, 92, 7 * DT) EVT_KILL_THREAD(LVarB) diff --git a/src/world/area_kmr/kmr_11/kmr_11_6_kammy.c b/src/world/area_kmr/kmr_11/kmr_11_6_kammy.c index b0456722d3..75fd0f0135 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_6_kammy.c +++ b/src/world/area_kmr/kmr_11/kmr_11_6_kammy.c @@ -48,7 +48,7 @@ EvtScript N(EVS_Scene_KammyWatching) = { EVT_END_THREAD EVT_THREAD EVT_LOOP(24 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_LRAW_0295, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_FLIGHT, SOUND_SPACE_MODE_0) EVT_WAIT(4) EVT_END_LOOP EVT_END_THREAD diff --git a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c index 1c96a4b13b..4312f9725d 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c +++ b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c @@ -367,7 +367,7 @@ EvtScript N(EVS_Scene_CaughtLuigiInBasement) = { EVT_CALL(SetNpcAnimation, NPC_Luigi_0, ANIM_Luigi_Run) EVT_CALL(NpcMoveTo, NPC_Luigi_0, -130, -17, 15) EVT_CALL(NpcJump0, NPC_Luigi_0, -145, -54, -45, 10) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_0, SOUND_2086, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_0, SOUND_SPRING, SOUND_SPACE_MODE_0) EVT_CALL(N(PlaySpringLaunchAnimation)) EVT_THREAD EVT_WAIT(3) diff --git a/src/world/area_kmr/kmr_20/kmr_20_13_records.c b/src/world/area_kmr/kmr_20/kmr_20_13_records.c index 25b8bcafd8..7033dd3be3 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_13_records.c +++ b/src/world/area_kmr/kmr_20/kmr_20_13_records.c @@ -142,7 +142,7 @@ void N(appendGfx_records)(void* data) { records->unk_0A = 0; records->lerpTime = 0; records->state = RECORDS_STATE_FADING_IN; - snd_start_sound(SOUND_021C, 0, 0); + snd_start_sound(SOUND_APPROVE, 0, 0); // fallthrough case RECORDS_STATE_FADING_IN: records->lerpTime++; diff --git a/src/world/area_kpa/kpa_04/kpa_04_3_statues.c b/src/world/area_kpa/kpa_04/kpa_04_3_statues.c index 3c4b098985..6b711cf1e2 100644 --- a/src/world/area_kpa/kpa_04/kpa_04_3_statues.c +++ b/src/world/area_kpa/kpa_04/kpa_04_3_statues.c @@ -25,7 +25,7 @@ EvtScript N(EVS_PushStatue_Impl) = { EVT_RETURN EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o160, SOUND_LOOP_10, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o160, SOUND_LOOP_MOVE_STATUE, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 100, EVT_FLOAT(0.6)) EVT_END_THREAD @@ -72,7 +72,7 @@ EvtScript N(EVS_PushStatue_Impl) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(StopSound, SOUND_LOOP_10) + EVT_CALL(StopSound, SOUND_LOOP_MOVE_STATUE) EVT_RETURN EVT_END }; diff --git a/src/world/area_kpa/kpa_111/kpa_111_3_statues.c b/src/world/area_kpa/kpa_111/kpa_111_3_statues.c index 26b384239f..a90c9b4b59 100644 --- a/src/world/area_kpa/kpa_111/kpa_111_3_statues.c +++ b/src/world/area_kpa/kpa_111/kpa_111_3_statues.c @@ -55,7 +55,7 @@ EvtScript N(EVS_PushRightStatue_Impl) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_END_THREAD EVT_CALL(MakeLerp, LVar6, LVar7, 100, EASING_LINEAR) - EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_LOOP_10, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_LOOP_MOVE_STATUE, SOUND_SPACE_MODE_0) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_g21, LVar0, 0, 0) @@ -67,7 +67,7 @@ EvtScript N(EVS_PushRightStatue_Impl) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(StopSound, SOUND_LOOP_10) + EVT_CALL(StopSound, SOUND_LOOP_MOVE_STATUE) EVT_RETURN EVT_END }; diff --git a/src/world/area_kpa/kpa_113/kpa_113_4_statues.c b/src/world/area_kpa/kpa_113/kpa_113_4_statues.c index f35fd72d4f..a14e732c56 100644 --- a/src/world/area_kpa/kpa_113/kpa_113_4_statues.c +++ b/src/world/area_kpa/kpa_113/kpa_113_4_statues.c @@ -56,7 +56,7 @@ EvtScript N(EVS_PushLeftStatue_Impl) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_END_THREAD EVT_CALL(MakeLerp, LVar6, LVar7, 100, EASING_LINEAR) - EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_LOOP_10, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_LOOP_MOVE_STATUE, SOUND_SPACE_MODE_0) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_g19, LVar0, 0, 0) @@ -68,7 +68,7 @@ EvtScript N(EVS_PushLeftStatue_Impl) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(StopSound, SOUND_LOOP_10) + EVT_CALL(StopSound, SOUND_LOOP_MOVE_STATUE) EVT_RETURN EVT_END }; diff --git a/src/world/area_kpa/kpa_115/kpa_115_3_statues.c b/src/world/area_kpa/kpa_115/kpa_115_3_statues.c index f1863567a7..34c075f593 100644 --- a/src/world/area_kpa/kpa_115/kpa_115_3_statues.c +++ b/src/world/area_kpa/kpa_115/kpa_115_3_statues.c @@ -55,7 +55,7 @@ EvtScript N(EVS_PushMiddleStatue_Impl) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_END_THREAD EVT_CALL(MakeLerp, LVar6, LVar7, 100, EASING_LINEAR) - EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_LOOP_10, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_LOOP_MOVE_STATUE, SOUND_SPACE_MODE_0) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_g20, LVar0, 0, 0) @@ -67,7 +67,7 @@ EvtScript N(EVS_PushMiddleStatue_Impl) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(StopSound, SOUND_LOOP_10) + EVT_CALL(StopSound, SOUND_LOOP_MOVE_STATUE) EVT_RETURN EVT_END }; diff --git a/src/world/area_kpa/kpa_133/kpa_133_3_entity.c b/src/world/area_kpa/kpa_133/kpa_133_3_entity.c index dbd3a2f633..53670967f4 100644 --- a/src/world/area_kpa/kpa_133/kpa_133_3_entity.c +++ b/src/world/area_kpa/kpa_133/kpa_133_3_entity.c @@ -99,7 +99,7 @@ EvtScript N(EVS_SetupHiddenSpring) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(18) - EVT_CALL(PlaySoundAtNpc, NPC_Dummy, SOUND_01EF, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Dummy, SOUND_KPA_DROP_WALL, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_THREAD EVT_CALL(MakeLerp, -90, 0, 15, EASING_QUADRATIC_IN) 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 b95d2f137f..3fed93b83f 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 @@ -85,7 +85,7 @@ EvtScript N(EVS_SetupLowerChain) = { EVT_CALL(N(DetectLowerChainGrab)) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtPlayer, SOUND_0229, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_KPA_PULL_CHAIN, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_WAIT(1) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_HoldOnto) @@ -149,7 +149,7 @@ EvtScript N(EVS_LowerWaterLevel0) = { EVT_END_THREAD EVT_CALL(SetGroupVisibility, MODEL_sui1, MODEL_GROUP_VISIBLE) EVT_CALL(EnableModel, MODEL_o385, TRUE) - EVT_CALL(PlaySound, SOUND_LOOP_53) + EVT_CALL(PlaySound, SOUND_LOOP_KPA_DRAIN_WATER) EVT_CALL(MakeLerp, 120, 20, 120, EASING_LINEAR) EVT_LABEL(30) EVT_CALL(UpdateLerp) @@ -159,8 +159,8 @@ EvtScript N(EVS_LowerWaterLevel0) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(30) EVT_END_IF - EVT_CALL(PlaySound, SOUND_LRAW_022B | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_LRAW_022B) + EVT_CALL(PlaySound, SOUND_LRAW_KPA_DRAIN_WATER | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(StopTrackingSoundPos, SOUND_LRAW_KPA_DRAIN_WATER) EVT_CALL(SetGroupVisibility, MODEL_sui1, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_s_sui, FALSE) EVT_CALL(EnableModel, MODEL_o385, FALSE) @@ -212,17 +212,17 @@ EvtScript N(EVS_RaiseWaterLevel1) = { EVT_GOTO(15) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_LOOP_52, SOUND_SPACE_MODE_0, 118, 115, -11) + EVT_CALL(PlaySoundAt, SOUND_LOOP_KPA_FILL_WATER, SOUND_SPACE_MODE_0, 118, 115, -11) EVT_WAIT(20) EVT_THREAD - EVT_CALL(SetTexPanner, MODEL_o388, 2) - EVT_CALL(SetTexPanner, MODEL_o389, 3) + EVT_CALL(SetTexPanner, MODEL_o388, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o389, TEX_PANNER_3) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_SET(LVar2, 0) EVT_LOOP(1000) - EVT_CALL(SetTexPanOffset, 2, 0, LVar0, LVar1) - EVT_CALL(SetTexPanOffset, 3, 0, 0, LVar2) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, 0, LVar2) EVT_ADD(LVar0, 1000) EVT_ADD(LVar1, 4000) EVT_ADD(LVar2, -1500) @@ -266,8 +266,8 @@ EvtScript N(EVS_RaiseWaterLevel1) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(40) EVT_END_IF - EVT_CALL(PlaySound, SOUND_LRAW_022A | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_LRAW_022A) + EVT_CALL(PlaySound, SOUND_LRAW_KPA_FILL_WATER | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(StopTrackingSoundPos, SOUND_LRAW_KPA_FILL_WATER) EVT_CALL(EnableModel, MODEL_o389, FALSE) EVT_CALL(EnableModel, MODEL_o388, FALSE) EVT_END_THREAD @@ -332,7 +332,7 @@ EvtScript N(EVS_SetupUpperChain) = { EVT_CALL(N(DetectUpperChainGrab)) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtPlayer, SOUND_0229, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_KPA_PULL_CHAIN, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_WAIT(1) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_HoldOnto) @@ -397,7 +397,7 @@ EvtScript N(EVS_LowerWaterLevel1) = { EVT_END_IF EVT_END_THREAD EVT_CALL(SetGroupVisibility, MODEL_sui1, MODEL_GROUP_VISIBLE) - EVT_CALL(PlaySound, SOUND_LOOP_53) + EVT_CALL(PlaySound, SOUND_LOOP_KPA_DRAIN_WATER) EVT_CALL(MakeLerp, 220, 120, 120, EASING_LINEAR) EVT_LABEL(30) EVT_CALL(UpdateLerp) @@ -407,8 +407,8 @@ EvtScript N(EVS_LowerWaterLevel1) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(30) EVT_END_IF - EVT_CALL(PlaySound, SOUND_LRAW_022B | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_LRAW_022B) + EVT_CALL(PlaySound, SOUND_LRAW_KPA_DRAIN_WATER | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(StopTrackingSoundPos, SOUND_LRAW_KPA_DRAIN_WATER) EVT_WAIT(10) EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) @@ -456,7 +456,7 @@ EvtScript N(EVS_RaiseWaterLevel2) = { EVT_GOTO(15) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_LOOP_52, SOUND_SPACE_MODE_0, 500, 240, -25) + EVT_CALL(PlaySoundAt, SOUND_LOOP_KPA_FILL_WATER, SOUND_SPACE_MODE_0, 500, 240, -25) EVT_WAIT(20) EVT_THREAD EVT_CALL(SetTexPanner, MODEL_o388, 2) @@ -509,8 +509,8 @@ EvtScript N(EVS_RaiseWaterLevel2) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(40) EVT_END_IF - EVT_CALL(PlaySound, SOUND_LRAW_022A | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_LRAW_022A) + EVT_CALL(PlaySound, SOUND_LRAW_KPA_FILL_WATER | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(StopTrackingSoundPos, SOUND_LRAW_KPA_FILL_WATER) EVT_CALL(EnableModel, MODEL_o389, FALSE) EVT_CALL(EnableModel, MODEL_o388, FALSE) EVT_END_THREAD diff --git a/src/world/area_kpa/kpa_134/kpa_134_5_panels.c b/src/world/area_kpa/kpa_134/kpa_134_5_panels.c index 813b48749e..a35786ea47 100644 --- a/src/world/area_kpa/kpa_134/kpa_134_5_panels.c +++ b/src/world/area_kpa/kpa_134/kpa_134_5_panels.c @@ -67,12 +67,12 @@ EvtScript N(EVS_FlipWallPanels) = { EVT_IF_EQ(LVar5, -1) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_LRAW_2040, SOUND_SPACE_MODE_0, LVar6, LVar7, LVar8) + EVT_CALL(PlaySoundAt, SOUND_KPA_FLIP_BRIDGE_PANEL, SOUND_SPACE_MODE_0, LVar6, LVar7, LVar8) EVT_EXEC(N(EVS_FlipWallPanel)) EVT_WAIT(10) EVT_END_LOOP EVT_WAIT(50) - EVT_CALL(StopSound, SOUND_LRAW_2040) + EVT_CALL(StopSound, SOUND_KPA_FLIP_BRIDGE_PANEL) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) diff --git a/src/world/area_kpa/kpa_70/kpa_70_2_main.c b/src/world/area_kpa/kpa_70/kpa_70_2_main.c index e3fa560b1c..0d914c90c8 100644 --- a/src/world/area_kpa/kpa_70/kpa_70_2_main.c +++ b/src/world/area_kpa/kpa_70/kpa_70_2_main.c @@ -79,10 +79,10 @@ EvtScript N(EVS_Main) = { EVT_CALL(InitAnimatedModels) EVT_EXEC(N(EVS_SetupChainDrive)) EVT_THREAD - EVT_CALL(PlaySoundAt, SOUND_LOOP_51, SOUND_SPACE_MODE_0, 800, 100, -200) + EVT_CALL(PlaySoundAt, SOUND_LOOP_KPA_CHAIN_DRIVE, SOUND_SPACE_MODE_0, 800, 100, -200) EVT_WAIT(28) EVT_LOOP(0) - EVT_CALL(PlaySoundAt, SOUND_0222, SOUND_SPACE_MODE_0, 800, 100, -200) + EVT_CALL(PlaySoundAt, SOUND_KPA_DUMP_LAVA, SOUND_SPACE_MODE_0, 800, 100, -200) EVT_WAIT(90) EVT_END_LOOP EVT_END_THREAD diff --git a/src/world/area_kpa/kpa_81/kpa_81_3_npc.c b/src/world/area_kpa/kpa_81/kpa_81_3_npc.c index 96e81ba68f..47fac2a945 100644 --- a/src/world/area_kpa/kpa_81/kpa_81_3_npc.c +++ b/src/world/area_kpa/kpa_81/kpa_81_3_npc.c @@ -164,7 +164,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_WAIT(25) EVT_CALL(EnableModel, MODEL_o165, FALSE) EVT_END_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_2091, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_OPEN_TRAPDOOR, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 90, 30, EASING_COS_SLOW_OVERSHOOT) EVT_LABEL(10) EVT_CALL(UpdateLerp) diff --git a/src/world/area_kpa/kpa_82/kpa_82_3_npc.c b/src/world/area_kpa/kpa_82/kpa_82_3_npc.c index 1dca3161b2..f74cba08a8 100644 --- a/src/world/area_kpa/kpa_82/kpa_82_3_npc.c +++ b/src/world/area_kpa/kpa_82/kpa_82_3_npc.c @@ -986,7 +986,7 @@ EvtScript N(EVS_ShowResultCard) = { EVT_IF_EQ(MV_LastAnswerResult, ANSWER_CORRECT) EVT_SET(LVar0, 2160) EVT_EXEC_WAIT(N(EVS_ShowUnknownCard)) - EVT_CALL(PlaySound, SOUND_021C) + EVT_CALL(PlaySound, SOUND_APPROVE) EVT_WAIT(10 * DT) EVT_CALL(EnableGroup, MODEL_g47, FALSE) EVT_SET(LVarA, MODEL_m_kai) diff --git a/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c b/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c index 5a76dfa5a3..8458b3a693 100644 --- a/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c +++ b/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c @@ -137,7 +137,7 @@ EvtScript N(EVS_RideZipline) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySound, SOUND_2087) + EVT_CALL(PlaySound, SOUND_ZIPLINE_FINISH) EVT_LABEL(10) EVT_CALL(SetPlayerFlagBits, PS_FLAG_SCRIPTED_FALL, TRUE) EVT_SET(MF_RidingZipline1, FALSE) diff --git a/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c b/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c index 9614e99361..01632d468f 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c +++ b/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c @@ -131,7 +131,7 @@ EvtScript N(EVS_RideZipline) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySound, SOUND_2087) + EVT_CALL(PlaySound, SOUND_ZIPLINE_FINISH) EVT_LABEL(10) EVT_CALL(SetPlayerFlagBits, PS_FLAG_SCRIPTED_FALL, TRUE) EVT_SET(MF_Zipline_GoingDown, FALSE) diff --git a/src/world/area_kzn/kzn_19/kzn_19_2_main.c b/src/world/area_kzn/kzn_19/kzn_19_2_main.c index 39693f5561..047545bd58 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_2_main.c +++ b/src/world/area_kzn/kzn_19/kzn_19_2_main.c @@ -38,9 +38,9 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_LOOP_67) + EVT_CALL(PlaySound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(StopSound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, 185, 110, -30) EVT_END_THREAD EVT_THREAD diff --git a/src/world/area_mac/mac_01/npc/flower_gate.inc.c b/src/world/area_mac/mac_01/npc/flower_gate.inc.c index 8bc6152a4c..a47c851020 100644 --- a/src/world/area_mac/mac_01/npc/flower_gate.inc.c +++ b/src/world/area_mac/mac_01/npc/flower_gate.inc.c @@ -273,7 +273,7 @@ EvtScript N(EVS_Scene_FlowerGateAppears) = { #endif EVT_EXEC(N(EVS_PlayFlowerGateSong)) EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 0, 266, 50, 338, 1, LVar9) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_02A2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_FLOWER_GATE, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_FadeInFlowerGateGlowAlpha)) EVT_THREAD EVT_WAIT(10) @@ -287,7 +287,7 @@ EvtScript N(EVS_Scene_FlowerGateAppears) = { EVT_EXEC_GET_TID(N(EVS_ModulateFlowerGateGlowAlpha), LVar2) EVT_WAIT(30 / DT) EVT_CALL(EnableModel, MODEL_r_door, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_02A3, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_FLOWER_DOOR_SPINNING, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 3060, 80, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -300,7 +300,7 @@ EvtScript N(EVS_Scene_FlowerGateAppears) = { EVT_CALL(EnableModel, MODEL_r_door, FALSE) EVT_CALL(EnableGroup, MODEL_to_flo, TRUE) EVT_CALL(DismissEffect, LVar9) - EVT_CALL(PlaySoundAt, SOUND_02A4, SOUND_SPACE_MODE_0, 266, 50, 338) + EVT_CALL(PlaySoundAt, SOUND_FLOWER_DOOR_WAVES, SOUND_SPACE_MODE_0, 266, 50, 338) EVT_LOOP(3) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 5, 266, 50, 338, 1, 20) EVT_WAIT(5) @@ -367,7 +367,7 @@ EvtScript N(EVS_MinhT_PlantSeed) = { EVT_END_SWITCH EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MinhT_Cheer) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_02A1, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_PLANT_FLOWERS, SOUND_SPACE_MODE_0) EVT_SWITCH(LVar5) EVT_CASE_EQ(0) EVT_CALL(EnableModel, MODEL_o375, TRUE) @@ -648,7 +648,7 @@ EvtScript N(EVS_ExitFlowerGate) = { EVT_RETURN EVT_END_IF EVT_CALL(N(SetPartnerTetherClose)) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_02A2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_FLOWER_GATE, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_FadeInFlowerGateGlowAlpha)) EVT_SET(LVar0, 3) EVT_EXEC_GET_TID(N(EVS_ModulateFlowerGateGlowAlpha), LVar2) @@ -692,7 +692,7 @@ EvtScript N(EVS_ExitFlowerGate) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_02A2 | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_FLOWER_GATE | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_FadeOutFlowerGateGlowAlpha)) EVT_CALL(EnableGroup, MODEL_to_flo, FALSE) EVT_CALL(EnableGroup, MODEL_r_door, TRUE) @@ -725,7 +725,7 @@ EvtScript N(EVS_EnterFlowerGate) = { EVT_CALL(SetPlayerPos, 264, 27, 320) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcPos, NPC_PARTNER, 264, 27, 320) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_02A2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_FLOWER_GATE, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_FadeInFlowerGateGlowAlpha)) EVT_SET(LVar0, 2) EVT_EXEC_GET_TID(N(EVS_ModulateFlowerGateGlowAlpha), LVar2) @@ -762,7 +762,7 @@ EvtScript N(EVS_EnterFlowerGate) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_stopper, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(N(ResetPartnerTetherDist)) EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_02A2 | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_FLOWER_GATE | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_FadeOutFlowerGateGlowAlpha)) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_stopper, COLLIDER_FLAGS_UPPER_MASK) EVT_RETURN diff --git a/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c b/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c index 7a24d2692e..50e3d12402 100644 --- a/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c +++ b/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c @@ -413,7 +413,7 @@ EvtScript N(EVS_Rhuff_RevealBadges) = { EVT_SET(MF_BadgeShopOpen, TRUE) EVT_CALL(SetNpcYaw, NPC_Rowf, 270) EVT_THREAD - EVT_CALL(PlaySoundAt, SOUND_00A9, SOUND_SPACE_MODE_0, -220, 37, 271) + EVT_CALL(PlaySoundAt, SOUND_ROWF_OPEN_SHOP, SOUND_SPACE_MODE_0, -220, 37, 271) EVT_CALL(MakeLerp, 0, -220, 30, EASING_COS_BOUNCE) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -448,7 +448,7 @@ EvtScript N(EVS_Rhuff_RevealBadges) = { EVT_END_THREAD EVT_CALL(EnableModel, MODEL_ju_1, TRUE) EVT_CALL(N(RevealRowfBadges)) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o295, SOUND_00AA, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o295, SOUND_ROWF_PULL_RUG_OUT, SOUND_SPACE_MODE_0) EVT_USE_BUF(EVT_PTR(N(D_802555AC_815E2C))) EVT_LOOP(50) EVT_BUF_READ2(LVar0, MV_RowfRugRippleAmount) @@ -488,7 +488,7 @@ EvtScript N(EVS_Rhuff_HideBadges) = { EVT_END_IF EVT_CALL(NpcJump0, NPC_Rowf, -220, -54, 261, 16) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_o295, SOUND_00AC, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o295, SOUND_ROWF_PUSH_RUG_IN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 600, 50, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -516,7 +516,7 @@ EvtScript N(EVS_Rhuff_HideBadges) = { EVT_WAIT(1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_00AB, SOUND_SPACE_MODE_0, -220, 37, 271) + EVT_CALL(PlaySoundAt, SOUND_ROWF_CLOSE_SHOP, SOUND_SPACE_MODE_0, -220, 37, 271) EVT_END_THREAD EVT_WAIT(15) EVT_THREAD diff --git a/src/world/area_mac/mac_03/mac_03_3_train.c b/src/world/area_mac/mac_03/mac_03_3_train.c index bb274a384b..e7f85eb192 100644 --- a/src/world/area_mac/mac_03/mac_03_3_train.c +++ b/src/world/area_mac/mac_03/mac_03_3_train.c @@ -543,7 +543,7 @@ EvtScript N(EVS_DepartForMtRugged) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_TrainToad_02, ANIM_TrainToad_Talk, ANIM_TrainToad_Still, 5, MSG_MAC_Station_0009) - EVT_CALL(PlaySound, SOUND_0082) + EVT_CALL(PlaySound, SOUND_TRAIN_DEPARTURE) EVT_THREAD EVT_LOOP(1000) EVT_ADDF(MV_TrainMoveSpeed, EVT_FLOAT(0.031)) diff --git a/src/world/area_mac/mac_03/mac_03_6_foliage.c b/src/world/area_mac/mac_03/mac_03_6_foliage.c index 4097e440ca..a48d7853be 100644 --- a/src/world/area_mac/mac_03/mac_03_6_foliage.c +++ b/src/world/area_mac/mac_03/mac_03_6_foliage.c @@ -16,7 +16,7 @@ EvtScript N(EVS_OnShakeTree3) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(5) - EVT_CALL(PlaySoundWithVolume, SOUND_208E, 0) + EVT_CALL(PlaySoundWithVolume, SOUND_GROW, 0) EVT_CALL(EnableModel, MODEL_o241, TRUE) EVT_SET(LVar0, -30) EVT_LOOP(30) diff --git a/src/world/area_mac/mac_03/mac_03_7_oinks.c b/src/world/area_mac/mac_03/mac_03_7_oinks.c index 2a091f3188..9cb618d297 100644 --- a/src/world/area_mac/mac_03/mac_03_7_oinks.c +++ b/src/world/area_mac/mac_03/mac_03_7_oinks.c @@ -176,7 +176,7 @@ EvtScript N(EVS_TurnCrank) = { EVT_CALL(PlaySound, SOUND_MENU_ERROR) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySound, SOUND_208B) + EVT_CALL(PlaySound, SOUND_FLOOR_SWITCH_ACTIVATE) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) @@ -237,7 +237,7 @@ EvtScript N(EVS_TurnCrank) = { EVT_CALL(ScaleModel, MODEL_boo, 1, LVar0, 1) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_2095, SOUND_SPACE_MODE_0, 170, 73, -450) + EVT_CALL(PlaySoundAt, SOUND_EAT_OR_DRINK, SOUND_SPACE_MODE_0, 170, 73, -450) EVT_SET(GB_MAC03_LilOinkCapsuleState, 1) EVT_CALL(SetPanTarget, CAM_DEFAULT, 230, 20, -270) EVT_CALL(SetCamPitch, CAM_DEFAULT, 15, -6) @@ -263,12 +263,12 @@ EvtScript N(EVS_TurnCrank) = { EVT_END_LOOP EVT_CALL(SetNpcJumpscale, NPC_Capsule, 1) EVT_CALL(NpcJump0, NPC_Capsule, LVar2, EVT_FLOAT(63.0), -273, 5) - EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_2095, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_EAT_OR_DRINK, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_Capsule, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Capsule, LVar0, LVar1, LVar2, 10) - EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_2095, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_EAT_OR_DRINK, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Capsule, LVar0, LVar1, LVar2, 5) - EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_2095, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_EAT_OR_DRINK, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_capsule, COLLIDER_FLAGS_UPPER_MASK) EVT_WAIT(10) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) diff --git a/src/world/area_mac/mac_04/npc_chet_rippo.inc.c b/src/world/area_mac/mac_04/npc_chet_rippo.inc.c index 535f0eb567..2bb9723d4c 100644 --- a/src/world/area_mac/mac_04/npc_chet_rippo.inc.c +++ b/src/world/area_mac/mac_04/npc_chet_rippo.inc.c @@ -179,7 +179,7 @@ EvtScript N(EVS_NpcInteract_ChetRippo) = { EVT_CALL(SpeakToPlayer, NPC_ChetRippo, ANIM_ChetRippo_Talk, ANIM_ChetRippo_Idle, 0, LVar7) EVT_WAIT(10) EVT_CALL(GetNpcPos, NPC_ChetRippo, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_ChetRippo, SOUND_2098, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_ChetRippo, SOUND_VANISH_IN_SMOKE, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1) EVT_CALL(SetNpcPos, NPC_ChetRippo, NPC_DISPOSE_LOCATION) EVT_SET(AF_MAC_32, TRUE) diff --git a/src/world/area_mac/mac_04/npc_muskular.inc.c b/src/world/area_mac/mac_04/npc_muskular.inc.c index 4789ea9417..8cf6881204 100644 --- a/src/world/area_mac/mac_04/npc_muskular.inc.c +++ b/src/world/area_mac/mac_04/npc_muskular.inc.c @@ -169,7 +169,7 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Muskular, SOUND_2045, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Muskular, SOUND_STAR_SPIRIT_DEPART_1, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) diff --git a/src/world/area_mac/mac_05/mac_05_5_whale.c b/src/world/area_mac/mac_05/mac_05_5_whale.c index 8afc943d14..16dd0b9e19 100644 --- a/src/world/area_mac/mac_05/mac_05_5_whale.c +++ b/src/world/area_mac/mac_05/mac_05_5_whale.c @@ -297,19 +297,19 @@ EvtScript N(EVS_8025194C) = { EVT_CALL(GetNpcVar, NPC_Whale, 0, LVar0) EVT_IF_NE(LVar0, 0) EVT_CALL(PlaySound, SOUND_LRAW_0043 | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_LRAW_0043) + EVT_CALL(StopTrackingSoundPos, SOUND_LRAW_0043) EVT_CALL(N(DisposeWhaleGeyser), LVar0) EVT_CALL(SetNpcVar, NPC_Whale, 0, 0) EVT_END_IF EVT_END_IF EVT_SWITCH(LVarB) EVT_CASE_EQ(ANIM_Kolorado_IdleSad) - EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2037, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_WHALE_CLOSE_MOUTH, SOUND_SPACE_MODE_0) EVT_SET(LVarD, EVT_PTR(N(D_80250D58_862EC8))) EVT_CASE_EQ(ANIM_Kolorado_Still) EVT_SET(LVarD, EVT_PTR(N(D_80250A5C_862BCC))) EVT_CASE_EQ(ANIM_Kolorado_Yell) - EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2036, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_WHALE_OPEN_MOUTH, SOUND_SPACE_MODE_0) EVT_SET(LVarD, EVT_PTR(N(D_80250AD4_862C44))) EVT_CASE_EQ(ANIM_Kolorado_Idle) EVT_SET(LVarD, EVT_PTR(N(D_80251654_8637C4))) diff --git a/src/world/area_mac/mac_05/mac_05_6_rooms.c b/src/world/area_mac/mac_05/mac_05_6_rooms.c index 3b6333f909..66583583ca 100644 --- a/src/world/area_mac/mac_05/mac_05_6_rooms.c +++ b/src/world/area_mac/mac_05/mac_05_6_rooms.c @@ -43,7 +43,7 @@ EvtScript N(D_802525B0_864720) = { EVT_CASE_EQ(0) EVT_CALL(SetMusicTrack, 0, SONG_CLUB64, 0, 8) EVT_CALL(StopSound, SOUND_LOOP_58) - EVT_CALL(func_802D62E4, SOUND_LRAW_0039) + EVT_CALL(StopTrackingSoundPos, SOUND_LRAW_0039) EVT_CALL(EnableGroup, MODEL_bar_inn, TRUE) EVT_CALL(EnableModel, MODEL_o139, FALSE) EVT_CALL(EnableModel, MODEL_o140, FALSE) diff --git a/src/world/area_mac/mac_06/mac_06_2_whale.c b/src/world/area_mac/mac_06/mac_06_2_whale.c index 5a8b24fa88..1ab872406e 100644 --- a/src/world/area_mac/mac_06/mac_06_2_whale.c +++ b/src/world/area_mac/mac_06/mac_06_2_whale.c @@ -293,19 +293,19 @@ EvtScript N(EVS_WhaleMain) = { EVT_CALL(GetNpcVar, NPC_Whale, 0, LVar0) EVT_IF_NE(LVar0, 0) EVT_CALL(PlaySound, SOUND_LRAW_0043 | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_LRAW_0043) + EVT_CALL(StopTrackingSoundPos, SOUND_LRAW_0043) EVT_CALL(N(DisposeWhaleGeyser), LVar0) EVT_CALL(SetNpcVar, NPC_Whale, 0, 0) EVT_END_IF EVT_END_IF EVT_SWITCH(LVarB) EVT_CASE_EQ(ANIM_Kolorado_IdleSad) - EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2037, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_WHALE_CLOSE_MOUTH, SOUND_SPACE_MODE_0) EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_IdleSad))) EVT_CASE_EQ(ANIM_Kolorado_Still) EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_Still))) EVT_CASE_EQ(ANIM_Kolorado_Yell) - EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2036, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_WHALE_OPEN_MOUTH, SOUND_SPACE_MODE_0) EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_2))) EVT_CASE_EQ(ANIM_Kolorado_Idle) EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_Idle))) diff --git a/src/world/area_mgm/mgm_00/mgm_00_2_npc.c b/src/world/area_mgm/mgm_00/mgm_00_2_npc.c index 1eb33019c9..496a6b5126 100644 --- a/src/world/area_mgm/mgm_00/mgm_00_2_npc.c +++ b/src/world/area_mgm/mgm_00/mgm_00_2_npc.c @@ -24,7 +24,7 @@ EvtScript N(EVS_RaisePipe_JumpAttack) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(5) - EVT_CALL(PlaySoundWithVolume, SOUND_208E, 0) + EVT_CALL(PlaySoundWithVolume, SOUND_GROW, 0) EVT_CALL(EnableModel, MODEL_o5, TRUE) EVT_SET(LVar0, -30) EVT_LOOP(30) @@ -49,7 +49,7 @@ EvtScript N(EVS_RaisePipe_SmashAttack) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(5) - EVT_CALL(PlaySoundWithVolume, SOUND_208E, 0) + EVT_CALL(PlaySoundWithVolume, SOUND_GROW, 0) EVT_CALL(EnableModel, MODEL_o9, TRUE) EVT_SET(LVar0, -30) EVT_LOOP(30) diff --git a/src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c b/src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c index 2883098ee5..824da6c590 100644 --- a/src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c +++ b/src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c @@ -109,7 +109,7 @@ void N(animate_and_draw_record)(void* renderData) { case RECORD_START_SHOW: data->stateTimer = 0; data->state = RECORD_STATE_FADE_IN; - snd_start_sound(SOUND_021C, 0, 0); + snd_start_sound(SOUND_APPROVE, 0, 0); // fallthrough case RECORD_STATE_FADE_IN: data->stateTimer++; 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 2536889136..8fc48500df 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 @@ -731,7 +731,7 @@ API_CALLABLE(N(RunMinigame)) { } break; case BOX_STATE_PEACH_HIT: - sfx_play_sound(SOUND_021C); + sfx_play_sound(SOUND_APPROVE); model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); enable_npc_shadow(npc); npc->duration = 0; diff --git a/src/world/area_mim/mim_01/mim_01_4_hint.c b/src/world/area_mim/mim_01/mim_01_4_hint.c index 6507dc0492..06a39af214 100644 --- a/src/world/area_mim/mim_01/mim_01_4_hint.c +++ b/src/world/area_mim/mim_01/mim_01_4_hint.c @@ -52,7 +52,7 @@ EvtScript N(EVS_LaughingFlowers) = { EVT_WAIT(2) EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, -0x10000) EVT_WAIT(2) - EVT_CALL(PlaySoundAt, SOUND_205B, SOUND_SPACE_MODE_0, 301, 0, -27) + EVT_CALL(PlaySoundAt, SOUND_FLOWERS_LAUGH, SOUND_SPACE_MODE_0, 301, 0, -27) EVT_CALL(MakeLerp, 0, 30, 50, EASING_COS_IN_OUT) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -69,7 +69,7 @@ EvtScript N(EVS_LaughingFlowers) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_205B, SOUND_SPACE_MODE_0, 301, 0, -27) + EVT_CALL(PlaySoundAt, SOUND_FLOWERS_LAUGH, SOUND_SPACE_MODE_0, 301, 0, -27) EVT_CALL(MakeLerp, 30, -30, 50, EASING_COS_IN_OUT) EVT_LABEL(20) EVT_CALL(UpdateLerp) @@ -86,7 +86,7 @@ EvtScript N(EVS_LaughingFlowers) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(20) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_205B, SOUND_SPACE_MODE_0, 301, 0, -27) + EVT_CALL(PlaySoundAt, SOUND_FLOWERS_LAUGH, SOUND_SPACE_MODE_0, 301, 0, -27) EVT_CALL(MakeLerp, -30, 0, 50, EASING_COS_IN_OUT) EVT_LABEL(30) EVT_CALL(UpdateLerp) diff --git a/src/world/area_mim/mim_02/mim_02_5_hint.c b/src/world/area_mim/mim_02/mim_02_5_hint.c index 0e2d8e226b..7a1bc2aae0 100644 --- a/src/world/area_mim/mim_02/mim_02_5_hint.c +++ b/src/world/area_mim/mim_02/mim_02_5_hint.c @@ -11,7 +11,7 @@ EvtScript N(EVS_SetupExitHint) = { EVT_ADD(LVar2, 1) EVT_CALL(EnableModel, MODEL_o414, FALSE) EVT_CALL(EnableModel, MODEL_me, TRUE) - EVT_CALL(PlaySoundAt, SOUND_2060, SOUND_SPACE_MODE_0, 10, 110, -200) + EVT_CALL(PlaySoundAt, SOUND_IMPISH_LAUGH, SOUND_SPACE_MODE_0, 10, 110, -200) EVT_LOOP(LVar2) EVT_CALL(EnableModel, MODEL_o414, TRUE) EVT_CALL(EnableModel, MODEL_me, FALSE) diff --git a/src/world/area_mim/mim_03/mim_03_4_hint.c b/src/world/area_mim/mim_03/mim_03_4_hint.c index 72e2dd339f..123499f5d8 100644 --- a/src/world/area_mim/mim_03/mim_03_4_hint.c +++ b/src/world/area_mim/mim_03/mim_03_4_hint.c @@ -124,7 +124,7 @@ EvtScript N(EVS_FlowersReact_Correct) = { }; EvtScript N(EVS_CheckFlowers_North) = { - EVT_CALL(PlaySoundAt, SOUND_2059, SOUND_SPACE_MODE_0, 0, 0, -300) + EVT_CALL(PlaySoundAt, SOUND_FLOWERS_LIGHT_GIGGLE, SOUND_SPACE_MODE_0, 0, 0, -300) EVT_SET(LVar8, EVT_PTR(N(FlowerModels_North))) EVT_SET(LVar9, 0) EVT_EXEC_WAIT(N(EVS_FlowersReact_Wrong)) @@ -133,7 +133,7 @@ EvtScript N(EVS_CheckFlowers_North) = { }; EvtScript N(EVS_CheckFlowers_West) = { - EVT_CALL(PlaySoundAt, SOUND_205A, SOUND_SPACE_MODE_0, -300, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_FLOWERS_SAD_GIGGLE, SOUND_SPACE_MODE_0, -300, 0, 0) EVT_SET(LVar8, EVT_PTR(N(FlowerModels_West))) EVT_SET(LVar9, 1) EVT_EXEC_WAIT(N(EVS_FlowersReact_Correct)) @@ -142,7 +142,7 @@ EvtScript N(EVS_CheckFlowers_West) = { }; EvtScript N(EVS_CheckFlowers_South) = { - EVT_CALL(PlaySoundAt, SOUND_2059, SOUND_SPACE_MODE_0, 0, 0, 300) + EVT_CALL(PlaySoundAt, SOUND_FLOWERS_LIGHT_GIGGLE, SOUND_SPACE_MODE_0, 0, 0, 300) EVT_SET(LVar8, EVT_PTR(N(FlowerModels_South))) EVT_SET(LVar9, 2) EVT_EXEC_WAIT(N(EVS_FlowersReact_Wrong)) @@ -151,7 +151,7 @@ EvtScript N(EVS_CheckFlowers_South) = { }; EvtScript N(EVS_CheckFlowers_East) = { - EVT_CALL(PlaySoundAt, SOUND_2059, SOUND_SPACE_MODE_0, 300, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_FLOWERS_LIGHT_GIGGLE, SOUND_SPACE_MODE_0, 300, 0, 0) EVT_SET(LVar8, EVT_PTR(N(FlowerModels_East))) EVT_SET(LVar9, 3) EVT_EXEC_WAIT(N(EVS_FlowersReact_Wrong)) diff --git a/src/world/area_mim/mim_04/mim_04_4_hint.c b/src/world/area_mim/mim_04/mim_04_4_hint.c index 40483f850a..a6e502b558 100644 --- a/src/world/area_mim/mim_04/mim_04_4_hint.c +++ b/src/world/area_mim/mim_04/mim_04_4_hint.c @@ -60,7 +60,7 @@ EvtScript N(EVS_ManageEvilTree) = { EVT_CALL(AwaitPlayerApproach, 0, -340, 50) EVT_CALL(AwaitPlayerLeave, 0, -340, 50) EVT_CALL(N(TryEvilTreeLaugh)) - EVT_CALL(PlaySoundAt, SOUND_205F, SOUND_SPACE_MODE_0, 55, 96, -254) + EVT_CALL(PlaySoundAt, SOUND_TREE_LAUGHTER, SOUND_SPACE_MODE_0, 55, 96, -254) EVT_GOTO(0) EVT_RETURN EVT_END diff --git a/src/world/area_mim/mim_06/mim_06_4_hint.c b/src/world/area_mim/mim_06/mim_06_4_hint.c index e5d773d50e..8df5a17db8 100644 --- a/src/world/area_mim/mim_06/mim_06_4_hint.c +++ b/src/world/area_mim/mim_06/mim_06_4_hint.c @@ -84,7 +84,7 @@ EvtScript N(EVS_InspectFlowers_South) = { EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, -0x8000) EVT_WAIT(2) EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, -0x10000) - EVT_CALL(PlaySoundAt, SOUND_205B, SOUND_SPACE_MODE_0, -10, 0, -300) + EVT_CALL(PlaySoundAt, SOUND_FLOWERS_LAUGH, SOUND_SPACE_MODE_0, -10, 0, -300) EVT_CALL(MakeLerp, 0, 30, 50, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -99,7 +99,7 @@ EvtScript N(EVS_InspectFlowers_South) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySound, SOUND_205B) + EVT_CALL(PlaySound, SOUND_FLOWERS_LAUGH) EVT_CALL(MakeLerp, 30, -30, 50, EASING_COS_IN_OUT) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -114,7 +114,7 @@ EvtScript N(EVS_InspectFlowers_South) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySound, SOUND_205B) + EVT_CALL(PlaySound, SOUND_FLOWERS_LAUGH) EVT_CALL(MakeLerp, -30, 0, 50, EASING_COS_IN_OUT) EVT_LABEL(20) EVT_CALL(UpdateLerp) @@ -141,7 +141,7 @@ EvtScript N(EVS_InspectFlowers_West) = { EVT_WAIT(2) EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, -0x10000) EVT_WAIT(15) - EVT_CALL(PlaySoundAt, SOUND_205C, SOUND_SPACE_MODE_0, -300, 0, -10) + EVT_CALL(PlaySoundAt, SOUND_FLOWERS_WITHER, SOUND_SPACE_MODE_0, -300, 0, -10) EVT_USE_BUF(EVT_PTR(N(FlowerModels_West))) EVT_BUF_READ2(LVarA, LVarB) EVT_EXEC(N(EVS_FlowersWither)) @@ -159,7 +159,7 @@ EvtScript N(EVS_InspectFlowers_North) = { EVT_WAIT(2) EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, 0, -0x10000) EVT_WAIT(15) - EVT_CALL(PlaySoundAt, SOUND_205C, SOUND_SPACE_MODE_0, 10, 0, 300) + EVT_CALL(PlaySoundAt, SOUND_FLOWERS_WITHER, SOUND_SPACE_MODE_0, 10, 0, 300) EVT_USE_BUF(EVT_PTR(N(FlowerModels_North))) EVT_BUF_READ2(LVarA, LVarB) EVT_EXEC(N(EVS_FlowersWither)) @@ -177,7 +177,7 @@ EvtScript N(EVS_InspectFlowers_East) = { EVT_WAIT(2) EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, 0, -0x10000) EVT_WAIT(15) - EVT_CALL(PlaySoundAt, SOUND_205C, SOUND_SPACE_MODE_0, 300, 0, -10) + EVT_CALL(PlaySoundAt, SOUND_FLOWERS_WITHER, SOUND_SPACE_MODE_0, 300, 0, -10) EVT_USE_BUF(EVT_PTR(N(FlowerModels_East))) EVT_BUF_READ2(LVarA, LVarB) EVT_EXEC(N(EVS_FlowersWither)) diff --git a/src/world/area_mim/mim_07/mim_07_4_hint.c b/src/world/area_mim/mim_07/mim_07_4_hint.c index 3f41d6c9fb..9f09d14574 100644 --- a/src/world/area_mim/mim_07/mim_07_4_hint.c +++ b/src/world/area_mim/mim_07/mim_07_4_hint.c @@ -85,7 +85,7 @@ EvtScript N(EVS_OnInspectEvilRock) = { EVT_IF_EQ(LVar0, 1) EVT_WAIT(10) EVT_EXEC_GET_TID(N(EVS_ManageEvilRock), LVar9) - EVT_CALL(PlaySoundAt, SOUND_205E, SOUND_SPACE_MODE_0, -34, 0, -300) + EVT_CALL(PlaySoundAt, SOUND_ROCK_LAUGHTER, SOUND_SPACE_MODE_0, -34, 0, -300) EVT_LOOP(18) EVT_CALL(TranslateModel, MODEL_o289, EVT_FLOAT(1.0), 0, EVT_FLOAT(1.0)) EVT_CALL(TranslateModel, MODEL_o440, EVT_FLOAT(1.0), 0, EVT_FLOAT(1.0)) 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 4a61e13097..3695603631 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 @@ -5,7 +5,7 @@ EvtScript N(EVS_FlowersGentleRocking) = { EVT_WAIT(2) EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, -0x10000) EVT_WAIT(2) - EVT_CALL(PlaySoundAt, SOUND_205B, SOUND_SPACE_MODE_0, -23, 0, 300) + EVT_CALL(PlaySoundAt, SOUND_FLOWERS_LAUGH, SOUND_SPACE_MODE_0, -23, 0, 300) EVT_CALL(MakeLerp, 0, 30, 50, EASING_COS_IN_OUT) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -19,7 +19,7 @@ EvtScript N(EVS_FlowersGentleRocking) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_205B, SOUND_SPACE_MODE_0, -23, 0, 300) + EVT_CALL(PlaySoundAt, SOUND_FLOWERS_LAUGH, SOUND_SPACE_MODE_0, -23, 0, 300) EVT_CALL(MakeLerp, 30, -30, 50, EASING_COS_IN_OUT) EVT_LABEL(20) EVT_CALL(UpdateLerp) @@ -33,7 +33,7 @@ EvtScript N(EVS_FlowersGentleRocking) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(20) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_205B, SOUND_SPACE_MODE_0, -23, 0, 300) + EVT_CALL(PlaySoundAt, SOUND_FLOWERS_LAUGH, SOUND_SPACE_MODE_0, -23, 0, 300) EVT_CALL(MakeLerp, -30, 0, 50, EASING_COS_IN_OUT) EVT_LABEL(30) EVT_CALL(UpdateLerp) @@ -59,7 +59,7 @@ EvtScript N(EVS_InspectBush) = { EVT_IF_EQ(MV_FoundHint, FALSE) EVT_SET(MV_FoundHint, TRUE) EVT_CALL(SetGroupVisibility, MODEL_hana, MODEL_GROUP_VISIBLE) - EVT_CALL(PlaySound, SOUND_205D) + EVT_CALL(PlaySound, SOUND_FLOWERS_GROW) EVT_CALL(MakeLerp, 10, 100, 30, EASING_LINEAR) EVT_LABEL(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_mim/mim_10/mim_10_4_npc.c b/src/world/area_mim/mim_10/mim_10_4_npc.c index 875a7e8ea9..acb1e873f4 100644 --- a/src/world/area_mim/mim_10/mim_10_4_npc.c +++ b/src/world/area_mim/mim_10/mim_10_4_npc.c @@ -174,7 +174,7 @@ EvtScript N(EVS_Scene_BootlersInvitation) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_0292, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOOTLER_SPOOK, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_Bootler_SpookPlayer)) EVT_CALL(SetCamDistance, CAM_DEFAULT, 450) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) diff --git a/src/world/area_mim/mim_11/mim_11_2_main.c b/src/world/area_mim/mim_11/mim_11_2_main.c index c7197a2a99..35ba5af5e0 100644 --- a/src/world/area_mim/mim_11/mim_11_2_main.c +++ b/src/world/area_mim/mim_11/mim_11_2_main.c @@ -217,7 +217,7 @@ EvtScript N(EVS_EnterMap) = { EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerPos, LVar0, NPC_DISPOSE_POS_Y, LVar2) EVT_WAIT(30) - EVT_CALL(PlaySound, SOUND_208E) + EVT_CALL(PlaySound, SOUND_GROW) EVT_SET(GF_MIM11_WarpPipe, TRUE) EVT_WAIT(30) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) diff --git a/src/world/area_nok/nok_01/npcs_crisis.inc.c b/src/world/area_nok/nok_01/npcs_crisis.inc.c index eebcf0cca3..006ed82e9a 100644 --- a/src/world/area_nok/nok_01/npcs_crisis.inc.c +++ b/src/world/area_nok/nok_01/npcs_crisis.inc.c @@ -11,7 +11,7 @@ EvtScript N(EVS_Scene_RecoverTreeShell) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(5) EVT_CALL(NpcJump0, NPC_KoopaShell_03, 220, 0, 210, 20) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaShell_03, SOUND_021A, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaShell_03, SOUND_ITEM_BOUNCE, 0) EVT_CALL(PlayerFaceNpc, NPC_KoopaShell_03, FALSE) EVT_CALL(NpcFaceNpc, NPC_Koopa_03, NPC_KoopaShell_03, 0) EVT_CALL(SetNpcFlagBits, NPC_Koopa_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) @@ -88,7 +88,7 @@ EvtScript N(EVS_Scene_RecoverBlockShell) = { EVT_CALL(SetNpcAux, NPC_Koopa_02, EVT_PTR(N(EVS_DoNothing))) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(NpcJump0, NPC_KoopaShell_02, 60, 0, 328, 20) - EVT_CALL(PlaySound, SOUND_021A) + EVT_CALL(PlaySound, SOUND_ITEM_BOUNCE) EVT_CALL(PlayerFaceNpc, NPC_KoopaShell_02, FALSE) EVT_CALL(NpcFaceNpc, NPC_Koopa_02, NPC_KoopaShell_02, 0) EVT_CALL(SetNpcFlagBits, NPC_Koopa_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) diff --git a/src/world/area_nok/nok_02/nok_02_2_main.c b/src/world/area_nok/nok_02/nok_02_2_main.c index 519a8d088d..992c4ffaf6 100644 --- a/src/world/area_nok/nok_02/nok_02_2_main.c +++ b/src/world/area_nok/nok_02/nok_02_2_main.c @@ -74,7 +74,7 @@ EvtScript N(EVS_EnterMap) = { EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerPos, LVar0, NPC_DISPOSE_POS_Y, LVar2) EVT_WAIT(30) - EVT_CALL(PlaySound, SOUND_208E) + EVT_CALL(PlaySound, SOUND_GROW) EVT_SET(GF_NOK02_WarpPipe, TRUE) EVT_WAIT(30) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) 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 97ab81ef37..dd23922f1d 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 @@ -25,7 +25,7 @@ EvtScript N(EVS_SpinKooperCeilingFan) = { EvtScript N(EVS_UpdateKooperFightSounds) = { EVT_LOOP(0) EVT_IF_EQ(GF_Quizmo_TakingQuiz, FALSE) - EVT_CALL(PlaySoundAt, SOUND_0077, 0, 0, 0, -180) + EVT_CALL(PlaySoundAt, SOUND_NOK_HOUSE_CONFLICT, 0, 0, 0, -180) EVT_END_IF EVT_CALL(RandInt, 30, LVar5) EVT_ADD(LVar5, 30) 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 0ea4b1c665..027fc4cc41 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 @@ -413,7 +413,7 @@ EvtScript N(EVS_BreakBlock_DropShell) = { EVT_CALL(BindNpcAI, NPC_Koopa_02, EVT_PTR(N(EVS_DoNothing))) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(NpcJump0, NPC_KoopaShell_02, 227, 0, 247, 20) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaShell_02, SOUND_021A, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaShell_02, SOUND_ITEM_BOUNCE, 0) EVT_CALL(PlayerFaceNpc, NPC_KoopaShell_02, FALSE) EVT_CALL(NpcFaceNpc, NPC_Koopa_02, NPC_KoopaShell_02, 0) EVT_CALL(SetNpcFlagBits, NPC_Koopa_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) diff --git a/src/world/area_nok/nok_04/nok_04_4_npc.c b/src/world/area_nok/nok_04/nok_04_4_npc.c index 2f0fdcd132..97d181ffe1 100644 --- a/src/world/area_nok/nok_04/nok_04_4_npc.c +++ b/src/world/area_nok/nok_04/nok_04_4_npc.c @@ -1441,7 +1441,7 @@ EvtScript N(EVS_HitTree) = { EVT_IF_EQ(LVar0, MV_CorrectTreeIndex) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySound, SOUND_021C) + EVT_CALL(PlaySound, SOUND_APPROVE) EVT_END_THREAD EVT_EXEC_WAIT(N(EVS_HitTree_Correct)) EVT_ELSE diff --git a/src/world/area_nok/nok_11/nok_11_4_npc.c b/src/world/area_nok/nok_11/nok_11_4_npc.c index a74b6a363a..3e5e58d4ef 100644 --- a/src/world/area_nok/nok_11/nok_11_4_npc.c +++ b/src/world/area_nok/nok_11/nok_11_4_npc.c @@ -110,7 +110,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.5)) EVT_CALL(NpcJump0, NPC_SELF, -165, -90, 50, 20 * DT) EVT_WAIT(30 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0074, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_JR_TROOPA_SCAMPER, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_ScamperBack) EVT_CALL(SetNpcYaw, NPC_SELF, 270) EVT_THREAD diff --git a/src/world/area_nok/nok_12/nok_12_3_entity.c b/src/world/area_nok/nok_12/nok_12_3_entity.c index d6a80f2f07..82efbab826 100644 --- a/src/world/area_nok/nok_12/nok_12_3_entity.c +++ b/src/world/area_nok/nok_12/nok_12_3_entity.c @@ -43,7 +43,7 @@ EvtScript N(EVS_OnShakeTree_DropSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_0048, 0, -470, LVar0, -150) + EVT_CALL(PlaySoundAt, SOUND_OBJECT_LAND, 0, -470, LVar0, -150) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_THREAD EVT_WAIT(5) 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 cc575a615a..5a192432c9 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 @@ -12,7 +12,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { EVT_CALL(N(SetCamera0Flag1000)) EVT_CALL(InterpCamTargetPos, CAM_DEFAULT, 1, -272, 0, -56, 20) EVT_WAIT(15) - EVT_CALL(PlaySoundAt, SOUND_0071, 0, -275, 0, -39) + EVT_CALL(PlaySoundAt, SOUND_NOK_BRIDGE_THUD_1, 0, -275, 0, -39) EVT_CALL(MakeLerp, -320, 0, 15, EASING_QUADRATIC_IN) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -28,7 +28,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(15) - EVT_CALL(PlaySoundAt, SOUND_0072, 0, -275, 0, -39) + EVT_CALL(PlaySoundAt, SOUND_NOK_BRIDGE_THUD_2, 0, -275, 0, -39) EVT_CALL(MakeLerp, 0, 90, 10, EASING_QUADRATIC_IN) EVT_LABEL(20) EVT_CALL(UpdateLerp) @@ -57,7 +57,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { EVT_GOTO(20) EVT_END_IF EVT_WAIT(10) - EVT_CALL(PlaySoundAt, SOUND_0073, 0, -275, 0, -39) + EVT_CALL(PlaySoundAt, SOUND_NOK_BRIDGE_THUD_3, 0, -275, 0, -39) EVT_CALL(MakeLerp, 0, 90, 10, EASING_QUADRATIC_IN) EVT_LABEL(30) EVT_CALL(UpdateLerp) diff --git a/src/world/area_nok/nok_14/nok_14_4_bridge.c b/src/world/area_nok/nok_14/nok_14_4_bridge.c index aa787f622e..c9ae1c1a8e 100644 --- a/src/world/area_nok/nok_14/nok_14_4_bridge.c +++ b/src/world/area_nok/nok_14/nok_14_4_bridge.c @@ -13,7 +13,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { EVT_CALL(InterpCamTargetPos, CAM_DEFAULT, TRUE, 3, 0, -60, 20) EVT_WAIT(10) EVT_SET(GB_StoryProgress, STORY_CH1_MADE_SECOND_BRIDGE) - EVT_CALL(PlaySoundAt, SOUND_0071, SOUND_SPACE_MODE_0, 0, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_NOK_BRIDGE_THUD_1, SOUND_SPACE_MODE_0, 0, 0, -60) EVT_CALL(MakeLerp, -200, 0, 15, EASING_COS_IN) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -29,7 +29,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(15) - EVT_CALL(PlaySoundAt, SOUND_0067, SOUND_SPACE_MODE_0, -84, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_NOK_BRIDGE_XYLOPHONE_1, SOUND_SPACE_MODE_0, -84, 0, -60) EVT_THREAD EVT_CALL(MakeLerp, 0, 90, 8, EASING_COS_IN_OUT) EVT_LABEL(20) @@ -41,7 +41,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { EVT_END_IF EVT_END_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAt, SOUND_0068, SOUND_SPACE_MODE_0, -56, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_NOK_BRIDGE_XYLOPHONE_2, SOUND_SPACE_MODE_0, -56, 0, -60) EVT_THREAD EVT_CALL(MakeLerp, 0, 90, 8, EASING_LINEAR) EVT_LABEL(24) @@ -53,7 +53,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { EVT_END_IF EVT_END_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAt, SOUND_0069, SOUND_SPACE_MODE_0, -28, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_NOK_BRIDGE_XYLOPHONE_3, SOUND_SPACE_MODE_0, -28, 0, -60) EVT_THREAD EVT_CALL(MakeLerp, 0, 90, 8, EASING_LINEAR) EVT_LABEL(21) @@ -65,7 +65,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { EVT_END_IF EVT_END_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAt, SOUND_006A, SOUND_SPACE_MODE_0, 0, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_NOK_BRIDGE_XYLOPHONE_4, SOUND_SPACE_MODE_0, 0, 0, -60) EVT_THREAD EVT_CALL(MakeLerp, 0, 90, 8, EASING_LINEAR) EVT_LABEL(25) @@ -77,7 +77,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { EVT_END_IF EVT_END_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAt, SOUND_006B, SOUND_SPACE_MODE_0, 28, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_NOK_BRIDGE_XYLOPHONE_5, SOUND_SPACE_MODE_0, 28, 0, -60) EVT_THREAD EVT_CALL(MakeLerp, 0, 90, 8, EASING_LINEAR) EVT_LABEL(22) @@ -89,7 +89,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { EVT_END_IF EVT_END_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAt, SOUND_006C, SOUND_SPACE_MODE_0, 56, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_NOK_BRIDGE_XYLOPHONE_6, SOUND_SPACE_MODE_0, 56, 0, -60) EVT_THREAD EVT_CALL(MakeLerp, 0, 90, 8, EASING_LINEAR) EVT_LABEL(26) @@ -101,7 +101,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { EVT_END_IF EVT_END_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAt, SOUND_006D, SOUND_SPACE_MODE_0, 84, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_NOK_BRIDGE_XYLOPHONE_7, SOUND_SPACE_MODE_0, 84, 0, -60) EVT_THREAD EVT_CALL(MakeLerp, 0, 90, 8, EASING_LINEAR) EVT_LABEL(23) diff --git a/src/world/area_obk/obk_01/obk_01_3_chandelier.c b/src/world/area_obk/obk_01/obk_01_3_chandelier.c index 0fc293f1f0..7b9c6f07ee 100644 --- a/src/world/area_obk/obk_01/obk_01_3_chandelier.c +++ b/src/world/area_obk/obk_01/obk_01_3_chandelier.c @@ -207,7 +207,7 @@ API_CALLABLE(N(UpdateChandelier)) { } // detect direction reversal if (nextSwingAngle * chandelier->swingAngle <= 0.0f) { - sfx_play_sound_at_player(SOUND_009D, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_OBK_CHANDELIER_SWING, SOUND_SPACE_MODE_0); } chandelier->swingAngle = nextSwingAngle; } @@ -216,13 +216,13 @@ API_CALLABLE(N(UpdateChandelier)) { if (!script->functionTemp[2]) { // is chain moving? if (chandelier->dropDistance != lastDropDistance) { - sfx_play_sound_at_position(SOUND_LOOP_0F, SOUND_SPACE_MODE_0, 440.0f, chandelier->dropDistance, 271.0f); + sfx_play_sound_at_position(SOUND_LOOP_OBK_LOWER_CHAIN, SOUND_SPACE_MODE_0, 440.0f, chandelier->dropDistance, 271.0f); script->functionTemp[2] = TRUE; } } else { // is chain done moving? if (chandelier->dropDistance == lastDropDistance) { - sfx_stop_sound(SOUND_LOOP_0F); + sfx_stop_sound(SOUND_LOOP_OBK_LOWER_CHAIN); script->functionTemp[2] = FALSE; } } @@ -235,13 +235,13 @@ API_CALLABLE(N(UpdateChandelier)) { f32 x, y, z; get_collider_center(COLLIDER_o557, &x, &y, &z); - sfx_play_sound_at_position(SOUND_LOOP_10, SOUND_SPACE_MODE_0, x, y, z); + sfx_play_sound_at_position(SOUND_LOOP_MOVE_STATUE, SOUND_SPACE_MODE_0, x, y, z); script->functionTemp[3] = TRUE; } } else { // is cabinet done moving? if (cabinetPos == script->varTable[1]) { - sfx_stop_sound(SOUND_LOOP_10); + sfx_stop_sound(SOUND_LOOP_MOVE_STATUE); script->functionTemp[3] = FALSE; } } @@ -419,7 +419,7 @@ EvtScript N(EVS_LaunchFromCouch_GrabChandelier) = { EVT_SET(CONTROL_DATA_8, FALSE) EVT_SET(LVar8, MODEL_tobu1) EVT_EXEC(N(EVS_Couch_AnimateCushion)) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o567, SOUND_2086, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o567, SOUND_SPRING, SOUND_SPACE_MODE_0) EVT_SET(LVar8, MODEL_bane1) EVT_EXEC(N(EVS_Couch_AnimateSpring)) EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) @@ -554,7 +554,7 @@ EvtScript N(EVS_LaunchFromCouch_Crash) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_SET(LVar8, MODEL_tobu1) EVT_EXEC(N(EVS_Couch_AnimateCushion)) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o567, SOUND_2086, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o567, SOUND_SPRING, SOUND_SPACE_MODE_0) EVT_SET(LVar8, MODEL_bane1) EVT_EXEC(N(EVS_Couch_AnimateSpring)) EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) diff --git a/src/world/area_obk/obk_01/obk_01_5_jump_scare.c b/src/world/area_obk/obk_01/obk_01_5_jump_scare.c index 0099cd4ef7..fc5c832efc 100644 --- a/src/world/area_obk/obk_01/obk_01_5_jump_scare.c +++ b/src/world/area_obk/obk_01/obk_01_5_jump_scare.c @@ -11,7 +11,7 @@ EvtScript N(EVS_Scene_JumpScareBoo) = { EVT_SUB(LVar3, 10) EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 0, LVar3, LVar4, LVar5, EVT_FLOAT(2.8), 50) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_JumpScareBoo, SOUND_2094, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_JumpScareBoo, SOUND_JUMP_SCARE, SOUND_SPACE_MODE_0) EVT_SUB(LVar4, 12) EVT_CALL(MakeLerp, 10, 450, 8 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) diff --git a/src/world/area_obk/obk_03/obk_03_4_entity.c b/src/world/area_obk/obk_03/obk_03_4_entity.c index 0c5f3ba8bd..2716c39a87 100644 --- a/src/world/area_obk/obk_03/obk_03_4_entity.c +++ b/src/world/area_obk/obk_03/obk_03_4_entity.c @@ -25,7 +25,7 @@ EvtScript N(EVS_SecondSwitch_Drop) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(N(GetEntityPosition), LVar7, LVarA, LVarB, LVarC) - EVT_CALL(PlaySoundAt, SOUND_0048, SOUND_SPACE_MODE_0, LVarA, LVarB, LVarC) + EVT_CALL(PlaySoundAt, SOUND_OBJECT_LAND, SOUND_SPACE_MODE_0, LVarA, LVarB, LVarC) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, LVar8, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_obk/obk_04/obk_04_3_npc.c b/src/world/area_obk/obk_04/obk_04_3_npc.c index 619e4dc055..2178f6bdf2 100644 --- a/src/world/area_obk/obk_04/obk_04_3_npc.c +++ b/src/world/area_obk/obk_04/obk_04_3_npc.c @@ -185,7 +185,7 @@ API_CALLABLE(N(UpdateKeepAwayBoo)) { npc->yaw = yaw; npc->duration--; if (npc->duration == 0) { - sfx_play_sound_at_position(SOUND_SEQ_0F, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(SOUND_SEQ_BOO_VANISH, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); script->functionTemp[1] = RING_STATE_2; npc->duration = 0; npc->moveToPos.x = npc->pos.x; diff --git a/src/world/area_obk/obk_08/obk_08_5_npc.c b/src/world/area_obk/obk_08/obk_08_5_npc.c index 0bb0c6741d..fa99d2f474 100644 --- a/src/world/area_obk/obk_08/obk_08_5_npc.c +++ b/src/world/area_obk/obk_08/obk_08_5_npc.c @@ -145,7 +145,7 @@ API_CALLABLE(func_80240D10_BD4580) { npc->yaw = yaw; npc->duration--; if (npc->duration == 0) { - sfx_play_sound_at_position(SOUND_SEQ_0F, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(SOUND_SEQ_BOO_VANISH, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); script->functionTemp[1] = RING_STATE_2; npc->duration = 0; npc->moveToPos.x = npc->pos.x; diff --git a/src/world/area_obk/obk_09/obk_09_3_meet_bow.c b/src/world/area_obk/obk_09/obk_09_3_meet_bow.c index caea57cef3..d5e1605cb3 100644 --- a/src/world/area_obk/obk_09/obk_09_3_meet_bow.c +++ b/src/world/area_obk/obk_09/obk_09_3_meet_bow.c @@ -103,7 +103,7 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_CALL(EnableGroup, MODEL_ori, TRUE) EVT_CALL(SetNpcPos, NPC_Skolar, 1, 650, 80) EVT_CALL(EnableNpcShadow, NPC_Skolar, FALSE) - EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_LOOP_0F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_LOOP_OBK_LOWER_CHAIN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, -280, -480, 100 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -115,8 +115,8 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(StopSound, SOUND_LOOP_0F) - EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_009B, SOUND_SPACE_MODE_0) + EVT_CALL(StopSound, SOUND_LOOP_OBK_LOWER_CHAIN) + EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_OBK_CAGE_SLAM, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(0.2)) EVT_WAIT(40 * DT) EVT_CALL(SetCamType, CAM_DEFAULT, 4, TRUE) @@ -139,7 +139,7 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_WAIT(30 * DT) EVT_CALL(SetNpcPos, NPC_Skolar, 1, 620, 80) EVT_CALL(EnableNpcShadow, NPC_Skolar, FALSE) - EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_LOOP_0F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_LOOP_OBK_LOWER_CHAIN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, -480, -280, 100 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -151,7 +151,7 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(StopSound, SOUND_LOOP_0F) + EVT_CALL(StopSound, SOUND_LOOP_OBK_LOWER_CHAIN) EVT_CALL(EnableGroup, MODEL_ori, FALSE) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_Bow, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, 0, MSG_CH3_004D) diff --git a/src/world/area_omo/common/ToyTrain.inc.c b/src/world/area_omo/common/ToyTrain.inc.c index b335b5eeb3..802e06e4df 100644 --- a/src/world/area_omo/common/ToyTrain.inc.c +++ b/src/world/area_omo/common/ToyTrain.inc.c @@ -182,9 +182,9 @@ EvtScript N(EVS_Scene_RideTrain) = { EVT_SETF(ArrayVar(15), EVT_FLOAT(-10.0)) EVT_SET(LFlag0, TRUE) EVT_IF_EQ(AF_OMO_03, FALSE) - EVT_CALL(PlaySound, SOUND_01FF) + EVT_CALL(PlaySound, SOUND_TOYBOX_TRAIN_WHISTLE_A) EVT_ELSE - EVT_CALL(PlaySound, SOUND_0084) + EVT_CALL(PlaySound, SOUND_TOYBOX_TRAIN_WHISTLE_B) EVT_END_IF EVT_END_IF EVT_ELSE @@ -377,7 +377,7 @@ EvtScript N(EVS_TrainUnk_D) = { EVT_CALL(NpcJump0, NPC_Conductor, LVar4, 50, LVar5, 10) EVT_CALL(InterpNpcYaw, NPC_Conductor, LVarA, 0) EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 5, MSG_CH4_0009) - EVT_CALL(PlaySound, SOUND_LRAW_0083) + EVT_CALL(PlaySound, SOUND_LRAW_TOYBOX_TRAIN_GEAR) EVT_CALL(SetMusicTrack, 0, SONG_TOYBOX_TRAIN, 0, 8) EVT_WAIT(10) EVT_RETURN @@ -441,7 +441,7 @@ EvtScript N(EVS_TrainUnk_AltD) = { EVT_CALL(NpcJump0, NPC_Conductor, LVar4, 50, LVar5, 10) EVT_CALL(InterpNpcYaw, NPC_Conductor, LVarA, 0) EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 5, MSG_CH4_0009) - EVT_CALL(PlaySound, SOUND_LRAW_0083) + EVT_CALL(PlaySound, SOUND_LRAW_TOYBOX_TRAIN_GEAR) EVT_CALL(SetMusicTrack, 0, SONG_TOYBOX_TRAIN, 0, 8) EVT_WAIT(10) EVT_RETURN @@ -450,7 +450,7 @@ EvtScript N(EVS_TrainUnk_AltD) = { #endif EvtScript N(EVS_TrainUnk_E) = { - EVT_CALL(StopSound, SOUND_LRAW_0083) + EVT_CALL(StopSound, SOUND_LRAW_TOYBOX_TRAIN_GEAR) EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) @@ -497,7 +497,7 @@ EvtScript N(EVS_TrainUnk_E) = { #ifdef INCLUDE_ALTERNATES EvtScript N(EVS_TrainUnk_AltE) = { - EVT_CALL(StopSound, SOUND_LRAW_0083) + EVT_CALL(StopSound, SOUND_LRAW_TOYBOX_TRAIN_GEAR) EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) diff --git a/src/world/area_omo/omo_02/omo_02_5_barricade.c b/src/world/area_omo/omo_02/omo_02_5_barricade.c index 3da003a91b..7a2f2ecf96 100644 --- a/src/world/area_omo/omo_02/omo_02_5_barricade.c +++ b/src/world/area_omo/omo_02/omo_02_5_barricade.c @@ -367,7 +367,7 @@ EvtScript N(EVS_Scene_BreakBarricade) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(165) EVT_CALL(PlaySound, SOUND_LRAW_036D | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_LRAW_036D) + EVT_CALL(StopTrackingSoundPos, SOUND_LRAW_036D) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Red_Anim04) EVT_CALL(SetNpcPos, NPC_ShyGuy_01, -285, 0, 35) EVT_CALL(SetNpcSpeed, NPC_ShyGuy_01, EVT_FLOAT(8.0)) diff --git a/src/world/area_omo/omo_03/omo_03_7_train_drop.c b/src/world/area_omo/omo_03/omo_03_7_train_drop.c index 74d80b3ea7..364b4bc3ed 100644 --- a/src/world/area_omo/omo_03/omo_03_7_train_drop.c +++ b/src/world/area_omo/omo_03/omo_03_7_train_drop.c @@ -45,7 +45,7 @@ EvtScript N(EVS_Scene_TrainDropped) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtModel, MODEL_p_8, SOUND_00A1, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_p_8, SOUND_OMO_TOYBOX_TRAIN_DROP, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(3.0)) EVT_END_THREAD @@ -82,7 +82,7 @@ EvtScript N(EVS_Scene_TrainDropped) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtModel, MODEL_p_8, SOUND_00A1, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_p_8, SOUND_OMO_TOYBOX_TRAIN_DROP, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 8, EVT_FLOAT(2.0)) EVT_END_THREAD @@ -115,7 +115,7 @@ EvtScript N(EVS_Scene_TrainDropped) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtModel, MODEL_p_8, SOUND_00A1, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_p_8, SOUND_OMO_TOYBOX_TRAIN_DROP, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD diff --git a/src/world/area_omo/omo_04/omo_04_6_scenes.c b/src/world/area_omo/omo_04/omo_04_6_scenes.c index 677daecd6c..a39521a22d 100644 --- a/src/world/area_omo/omo_04/omo_04_6_scenes.c +++ b/src/world/area_omo/omo_04/omo_04_6_scenes.c @@ -90,7 +90,7 @@ Vec3f N(FlightPath_Kammy3)[] = { EvtScript N(EVS_PlayKammyFlightSounds) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_LRAW_0295, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_FLIGHT, SOUND_SPACE_MODE_0) EVT_WAIT(4) EVT_END_LOOP EVT_RETURN @@ -192,7 +192,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_WAIT(100 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) EVT_ADD(LVar0, 55) - EVT_CALL(PlaySoundAt, SOUND_2098, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_VANISH_IN_SMOKE, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, 0, 0, 1, 15, 3, 8) EVT_WAIT(5 * DT) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) diff --git a/src/world/area_omo/omo_05/omo_05_4_npc.c b/src/world/area_omo/omo_05/omo_05_4_npc.c index c02afe2bc8..2b71ae1628 100644 --- a/src/world/area_omo/omo_05/omo_05_4_npc.c +++ b/src/world/area_omo/omo_05/omo_05_4_npc.c @@ -88,12 +88,12 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_Eat) EVT_LOOP(6) EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EAT_OR_DRINK, SOUND_SPACE_MODE_0) EVT_END_LOOP EVT_IF_NE(LVar9, 2) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(10.0 / DT)) EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SPIT_OUT, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_SpitOut) EVT_CALL(SetItemFlags, LVar7, 64, 0) EVT_CALL(GetAngleToPlayer, NPC_SELF, LVar0) diff --git a/src/world/area_omo/omo_07/omo_07_6_scenes.c b/src/world/area_omo/omo_07/omo_07_6_scenes.c index 5a73b628c1..f85e705268 100644 --- a/src/world/area_omo/omo_07/omo_07_6_scenes.c +++ b/src/world/area_omo/omo_07/omo_07_6_scenes.c @@ -94,7 +94,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_WAIT(75 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) EVT_ADD(LVar0, 55) - EVT_CALL(PlaySoundAt, SOUND_2098, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_VANISH_IN_SMOKE, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, 0, 0, 1, 15, 3, 8) EVT_WAIT(5 * DT) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) 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 93890c7f08..ef2f249c4c 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 @@ -409,7 +409,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_THREAD EVT_CALL(GetModelCenter, MODEL_b1_1) EVT_CALL(SetGroupVisibility, MODEL_b1, MODEL_GROUP_HIDDEN) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_2098, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_VANISH_IN_SMOKE, SOUND_SPACE_MODE_0) EVT_LOOP(4) EVT_SET(LVar3, 20) EVT_CALL(RandInt, 40, LVar6) @@ -431,7 +431,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_THREAD EVT_CALL(GetModelCenter, MODEL_b2_1) EVT_CALL(SetGroupVisibility, MODEL_b2, MODEL_GROUP_HIDDEN) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_2098, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_VANISH_IN_SMOKE, SOUND_SPACE_MODE_0) EVT_LOOP(4) EVT_SET(LVar3, 20) EVT_CALL(RandInt, 40, LVar6) @@ -453,7 +453,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_THREAD EVT_CALL(GetModelCenter, MODEL_b3_1) EVT_CALL(SetGroupVisibility, MODEL_b3, MODEL_GROUP_HIDDEN) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_2098, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_VANISH_IN_SMOKE, SOUND_SPACE_MODE_0) EVT_LOOP(4) EVT_SET(LVar3, 20) EVT_CALL(RandInt, 40, LVar6) @@ -475,7 +475,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_THREAD EVT_CALL(GetModelCenter, MODEL_b4_1) EVT_CALL(SetGroupVisibility, MODEL_b4, MODEL_GROUP_HIDDEN) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_2098, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_VANISH_IN_SMOKE, SOUND_SPACE_MODE_0) EVT_LOOP(4) EVT_SET(LVar3, 20) EVT_CALL(RandInt, 40, LVar6) diff --git a/src/world/area_omo/omo_09/omo_09_8_scenes.c b/src/world/area_omo/omo_09/omo_09_8_scenes.c index 62e9b34385..1cc6caa75c 100644 --- a/src/world/area_omo/omo_09/omo_09_8_scenes.c +++ b/src/world/area_omo/omo_09/omo_09_8_scenes.c @@ -94,7 +94,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_WAIT(75 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) EVT_ADD(LVar0, 55) - EVT_CALL(PlaySoundAt, SOUND_2098, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_VANISH_IN_SMOKE, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, 150, 0, 1, 15, 3, 8) EVT_WAIT(5 * DT) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) diff --git a/src/world/area_omo/omo_11/omo_11_3_gizmos.c b/src/world/area_omo/omo_11/omo_11_3_gizmos.c index 0265aa52b2..bcd1af5c31 100644 --- a/src/world/area_omo/omo_11/omo_11_3_gizmos.c +++ b/src/world/area_omo/omo_11/omo_11_3_gizmos.c @@ -125,7 +125,7 @@ API_CALLABLE(N(UpdateRotatingPlatforms)) { s32 j, k; if (isInitialCall) { - sfx_play_sound_at_position(SOUND_LOOP_16, SOUND_SPACE_MODE_0, 315.0f, 125.0f, -100.0f); + sfx_play_sound_at_position(SOUND_LOOP_OMO_ROTATING_WHEEL, SOUND_SPACE_MODE_0, 315.0f, 125.0f, -100.0f); script->functionTempPtr[0] = it = heap_malloc(sizeof(*it) * ARRAY_COUNT(N(RotatingPlatformModels))); script->functionTemp[1] = 0; @@ -229,7 +229,7 @@ API_CALLABLE(N(UpdateRotatingPlatforms)) { return ApiStatus_BLOCK; } -EvtScript N(EVS_UpdateBasicPlatformA) = { +EvtScript N(EVS_UpdateBasicPlatform_Silent) = { EVT_CALL(RandInt, 20, LVarA) EVT_WAIT(LVarA) EVT_USE_BUF(LVar0) @@ -264,13 +264,13 @@ EvtScript N(EVS_UpdateBasicPlatformA) = { EVT_END }; -EvtScript N(EVS_UpdateBasicPlatformB) = { +EvtScript N(EVS_UpdateBasicPlatform_Audible) = { EVT_CALL(RandInt, 20, LVarA) EVT_WAIT(LVarA) EVT_USE_BUF(LVar0) EVT_BUF_READ4(LVar6, LVar7, LVar8, LVar9) EVT_LABEL(0) - EVT_CALL(PlaySound, SOUND_0085) + EVT_CALL(PlaySound, SOUND_OMO_PLATFORM_ASCEND) EVT_CALL(MakeLerp, 0, 70, 51, EASING_COS_IN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) @@ -283,7 +283,7 @@ EvtScript N(EVS_UpdateBasicPlatformB) = { EVT_GOTO(1) EVT_END_IF EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_0087) + EVT_CALL(PlaySound, SOUND_OMO_PLATFORM_DESCEND) EVT_CALL(MakeLerp, 70, 0, 51, EASING_COS_IN_OUT) EVT_LABEL(2) EVT_CALL(UpdateLerp) @@ -325,15 +325,15 @@ EvtScript N(EVS_SetupGizmos) = { EVT_CALL(ParentColliderToModel, COLLIDER_2_5, MODEL_2_5) EVT_CALL(ParentColliderToModel, COLLIDER_f2_5, MODEL_f2_5) EVT_SET(LVar0, EVT_PTR(N(BasicPlatform1))) - EVT_EXEC(N(EVS_UpdateBasicPlatformA)) + EVT_EXEC(N(EVS_UpdateBasicPlatform_Silent)) EVT_SET(LVar0, EVT_PTR(N(BasicPlatform2))) - EVT_EXEC(N(EVS_UpdateBasicPlatformA)) + EVT_EXEC(N(EVS_UpdateBasicPlatform_Silent)) EVT_SET(LVar0, EVT_PTR(N(BasicPlatform3))) - EVT_EXEC(N(EVS_UpdateBasicPlatformA)) + EVT_EXEC(N(EVS_UpdateBasicPlatform_Silent)) EVT_SET(LVar0, EVT_PTR(N(BasicPlatform4))) - EVT_EXEC(N(EVS_UpdateBasicPlatformB)) + EVT_EXEC(N(EVS_UpdateBasicPlatform_Audible)) EVT_SET(LVar0, EVT_PTR(N(BasicPlatform5))) - EVT_EXEC(N(EVS_UpdateBasicPlatformA)) + EVT_EXEC(N(EVS_UpdateBasicPlatform_Silent)) EVT_THREAD EVT_CALL(N(UpdatePlatformShadows)) EVT_END_THREAD diff --git a/src/world/area_omo/omo_15/omo_15_2_main.c b/src/world/area_omo/omo_15/omo_15_2_main.c index 07b42033a6..a1b62da3c9 100644 --- a/src/world/area_omo/omo_15/omo_15_2_main.c +++ b/src/world/area_omo/omo_15/omo_15_2_main.c @@ -29,9 +29,9 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_LOOP_67) + EVT_CALL(PlaySound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(StopSound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, -100, 85, 0) EVT_END_THREAD EVT_THREAD diff --git a/src/world/area_omo/omo_15/omo_15_3_npc.c b/src/world/area_omo/omo_15/omo_15_3_npc.c index 6a2767a401..0e57af66ae 100644 --- a/src/world/area_omo/omo_15/omo_15_3_npc.c +++ b/src/world/area_omo/omo_15/omo_15_3_npc.c @@ -297,7 +297,7 @@ EvtScript N(EVS_BossDefeated_RunAway) = { EVT_END_IF EVT_END_LOOP EVT_CALL(PlaySound, SOUND_LRAW_036D | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_LRAW_036D) + EVT_CALL(StopTrackingSoundPos, SOUND_LRAW_036D) EVT_ELSE EVT_SET(LVar0, LVar9) EVT_SUB(LVar0, 0) diff --git a/src/world/area_osr/osr_02/osr_02_3_npc.c b/src/world/area_osr/osr_02/osr_02_3_npc.c index a67f6450fd..441952c159 100644 --- a/src/world/area_osr/osr_02/osr_02_3_npc.c +++ b/src/world/area_osr/osr_02/osr_02_3_npc.c @@ -268,42 +268,42 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_THREAD EVT_SET(LVar4, NPC_Eldstar) - EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2045, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_STAR_SPIRIT_DEPART_1, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_StarSpirit_FlyAway)) EVT_END_THREAD EVT_THREAD EVT_WAIT(30) EVT_SET(LVar4, NPC_Misstar) - EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2046, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_STAR_SPIRIT_DEPART_2, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_StarSpirit_FlyAway)) EVT_END_THREAD EVT_THREAD EVT_WAIT(60) EVT_SET(LVar4, NPC_Skolar) - EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2045, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_STAR_SPIRIT_DEPART_1, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_StarSpirit_FlyAway)) EVT_END_THREAD EVT_THREAD EVT_WAIT(90) EVT_SET(LVar4, NPC_Mamar) - EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2046, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_STAR_SPIRIT_DEPART_2, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_StarSpirit_FlyAway)) EVT_END_THREAD EVT_THREAD EVT_WAIT(120) EVT_SET(LVar4, NPC_Kalmar) - EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2045, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_STAR_SPIRIT_DEPART_1, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_StarSpirit_FlyAway)) EVT_END_THREAD EVT_THREAD EVT_WAIT(150) EVT_SET(LVar4, NPC_Muskular) - EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2046, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_STAR_SPIRIT_DEPART_2, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_StarSpirit_FlyAway)) EVT_END_THREAD EVT_WAIT(180) EVT_SET(LVar4, NPC_Klevar) - EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2045, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_STAR_SPIRIT_DEPART_1, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_StarSpirit_FlyAway)) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(20) diff --git a/src/world/area_osr/osr_03/osr_03_5_interlude.c b/src/world/area_osr/osr_03/osr_03_5_interlude.c index b48376b206..e8aa5f7290 100644 --- a/src/world/area_osr/osr_03/osr_03_5_interlude.c +++ b/src/world/area_osr/osr_03/osr_03_5_interlude.c @@ -37,7 +37,7 @@ EvtScript N(EVS_PlayKammyFlightFX) = { EVT_CHILD_THREAD EVT_SET(LVar0, 110) EVT_LOOP(0) - EVT_CALL(PlaySoundWithVolume, SOUND_LRAW_0295, LVar0) + EVT_CALL(PlaySoundWithVolume, SOUND_FLIGHT, LVar0) EVT_ADD(LVar0, -2) EVT_IF_LT(LVar0, 10) EVT_SET(LVar0, 10) diff --git a/src/world/area_osr/osr_03/osr_03_6_ending.c b/src/world/area_osr/osr_03/osr_03_6_ending.c index dfc2ef29e4..402e81ac1f 100644 --- a/src/world/area_osr/osr_03/osr_03_6_ending.c +++ b/src/world/area_osr/osr_03/osr_03_6_ending.c @@ -169,7 +169,7 @@ EvtScript N(EVS_Scene_CastleDestruction) = { EVT_END_LOOP EVT_KILL_THREAD(LVar9) EVT_WAIT(50) - EVT_CALL(PlaySound, SOUND_00A4) + EVT_CALL(PlaySound, SOUND_KPA_LIGHT_RAYS) EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, 0, -430, 1920, 15, LVar9) EVT_WAIT(30) EVT_THREAD diff --git a/src/world/area_osr/osr_04/osr_04_2_assault.c b/src/world/area_osr/osr_04/osr_04_2_assault.c index a187e59b81..378637e4f4 100644 --- a/src/world/area_osr/osr_04/osr_04_2_assault.c +++ b/src/world/area_osr/osr_04/osr_04_2_assault.c @@ -440,7 +440,7 @@ EvtScript N(EVS_Scene_BowsersAssault) = { EVT_CALL(EnableGroup, MODEL_yoru, FALSE) EVT_CALL(SetPlayerPos, 0, 0, 2000) EVT_THREAD - EVT_CALL(PlaySound, SOUND_LOOP_57) + EVT_CALL(PlaySound, SOUND_LOOP_OSR_RUMBLING) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 450 * DT, EVT_FLOAT(2.0)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 100 * DT, EVT_FLOAT(1.0)) EVT_END_THREAD diff --git a/src/world/area_pra/pra_01/pra_01_3_npc.c b/src/world/area_pra/pra_01/pra_01_3_npc.c index e01f2e6de6..287b584c6f 100644 --- a/src/world/area_pra/pra_01/pra_01_3_npc.c +++ b/src/world/area_pra/pra_01/pra_01_3_npc.c @@ -155,7 +155,7 @@ EvtScript N(EVS_Scene_RescuedKalmar) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Kalmar, SOUND_2045, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Kalmar, SOUND_STAR_SPIRIT_DEPART_1, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) 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 4d9846dcc0..70c3ea8228 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 @@ -35,7 +35,7 @@ EvtScript N(EVS_RaisePoundableSwitch) = { }; EvtScript N(EVS_LowerPoundableSwitch) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o1344, SOUND_208B, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1344, SOUND_FLOOR_SWITCH_ACTIVATE, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -10, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_pra/pra_09/pra_09_3_npc.c b/src/world/area_pra/pra_09/pra_09_3_npc.c index 66d4a2d74d..a3ce059135 100644 --- a/src/world/area_pra/pra_09/pra_09_3_npc.c +++ b/src/world/area_pra/pra_09/pra_09_3_npc.c @@ -164,7 +164,7 @@ EvtScript N(EVS_Imposter_Unmask) = { EVT_CALL(SetNpcAnimation, LVar4, ANIM_Duplighost_Anim04) EVT_CALL(InterpNpcYaw, LVar4, 90, 0) EVT_CALL(SetNpcSpeed, LVar4, EVT_FLOAT(6.5)) - EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_02CB, 0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_DUPLIGHOST_LEAP, 0) EVT_CALL(NpcMoveTo, LVar4, 0, LVar2, 0) EVT_CALL(SetNpcPos, LVar4, NPC_DISPOSE_LOCATION) EVT_END_THREAD diff --git a/src/world/area_pra/pra_13/pra_13_3_npc.c b/src/world/area_pra/pra_13/pra_13_3_npc.c index 7597e15481..0b1447a033 100644 --- a/src/world/area_pra/pra_13/pra_13_3_npc.c +++ b/src/world/area_pra/pra_13/pra_13_3_npc.c @@ -147,12 +147,12 @@ EvtScript N(EVS_Scene_DefeatImposters) = { EVT_CALL(InterpNpcYaw, NPC_Duplighost_02, 270, 0) EVT_WAIT(15) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Duplighost_01, SOUND_02CB, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Duplighost_01, SOUND_DUPLIGHOST_LEAP, 0) EVT_CALL(SetNpcAnimation, NPC_Duplighost_01, ANIM_Duplighost_Anim04) EVT_CALL(NpcMoveTo, NPC_Duplighost_01, 0, -70, 45) EVT_CALL(SetNpcPos, NPC_Duplighost_01, NPC_DISPOSE_LOCATION) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Duplighost_02, SOUND_02CB, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Duplighost_02, SOUND_DUPLIGHOST_LEAP, 0) EVT_CALL(SetNpcAnimation, NPC_Duplighost_02, ANIM_Duplighost_Anim04) EVT_CALL(NpcMoveTo, NPC_Duplighost_02, -30, -70, 45) EVT_CALL(SetNpcPos, NPC_Duplighost_02, -30, -1000, 0) diff --git a/src/world/area_pra/pra_19/pra_19_3_npc.c b/src/world/area_pra/pra_19/pra_19_3_npc.c index baf5cebf7c..068f09a4ee 100644 --- a/src/world/area_pra/pra_19/pra_19_3_npc.c +++ b/src/world/area_pra/pra_19/pra_19_3_npc.c @@ -274,7 +274,7 @@ EvtScript N(EVS_Imposter_Unmask) = { EVT_CALL(SetNpcAnimation, LVar4, ANIM_Duplighost_Anim04) EVT_CALL(InterpNpcYaw, LVar4, 90, 0) EVT_CALL(SetNpcSpeed, LVar4, EVT_FLOAT(6.5)) - EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_02CB, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_DUPLIGHOST_LEAP, SOUND_SPACE_MODE_0) EVT_CALL(NpcMoveTo, LVar4, 0, LVar2, 0) EVT_CALL(SetNpcPos, LVar4, NPC_DISPOSE_LOCATION) EVT_END_THREAD diff --git a/src/world/area_pra/pra_22/pra_22_2_main.c b/src/world/area_pra/pra_22/pra_22_2_main.c index 801312fc44..a44494b5aa 100644 --- a/src/world/area_pra/pra_22/pra_22_2_main.c +++ b/src/world/area_pra/pra_22/pra_22_2_main.c @@ -158,7 +158,7 @@ EvtScript N(EVS_PushRightStatue_Impl) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_END_THREAD EVT_CALL(MakeLerp, LVar6, LVar7, 100, EASING_LINEAR) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o1064, SOUND_LOOP_10, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1064, SOUND_LOOP_MOVE_STATUE, SOUND_SPACE_MODE_0) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_o1005, LVar0, 0, 0) @@ -172,7 +172,7 @@ EvtScript N(EVS_PushRightStatue_Impl) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(StopSound, SOUND_LOOP_10) + EVT_CALL(StopSound, SOUND_LOOP_MOVE_STATUE) EVT_RETURN EVT_END }; diff --git a/src/world/area_pra/pra_29/pra_29_4_bridge.c b/src/world/area_pra/pra_29/pra_29_4_bridge.c index 1e730c980a..ea0316cb66 100644 --- a/src/world/area_pra/pra_29/pra_29_4_bridge.c +++ b/src/world/area_pra/pra_29/pra_29_4_bridge.c @@ -56,7 +56,7 @@ EvtScript N(EVS_ExtendBridgeFromMirror) = { EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_002F, 0, 250, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_PRA_EXTEND_HIDDEN_BRIDGE, 0, 250, 0, 0) EVT_CALL(MakeLerp, 0, 511, 80, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) 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 bb32396b40..44dedda277 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 @@ -339,37 +339,37 @@ EvtScript N(EVS_Scene_PuzzleSolved) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(50) - EVT_CALL(PlaySoundAtModel, MODEL_k1, SOUND_0030, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k1, SOUND_PRA_UNFOLD_EXIT, 0) EVT_WAIT(25) - EVT_CALL(PlaySoundAtModel, MODEL_k2, SOUND_01EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k2, SOUND_PRA_UNFOLD_STEP, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_PRA_UNFOLD_STEP, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_PRA_UNFOLD_STEP, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_PRA_UNFOLD_STEP, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_PRA_UNFOLD_STEP, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_PRA_UNFOLD_STEP, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_PRA_UNFOLD_STEP, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_PRA_UNFOLD_STEP, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_PRA_UNFOLD_STEP, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_PRA_UNFOLD_STEP, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_PRA_UNFOLD_STEP, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_PRA_UNFOLD_STEP, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_PRA_UNFOLD_STEP, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_PRA_UNFOLD_STEP, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_PRA_UNFOLD_STEP, 0) EVT_END_THREAD EVT_THREAD EVT_WAIT(50) @@ -471,7 +471,7 @@ EvtScript N(EVS_PushStatue_Impl) = { EVT_CALL(ShakeCam, CAM_DEFAULT, 0, PUSH_TIME, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_SET(MV_PushingStatue, TRUE) - EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_002D, 0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_PRA_PUSH_STATUE, 0) EVT_CALL(N(BeginPushingStatue), LVarA) EVT_WAIT(PUSH_TIME) EVT_SET(MV_PushingStatue, FALSE) diff --git a/src/world/area_pra/pra_32/pra_32_2_main.c b/src/world/area_pra/pra_32/pra_32_2_main.c index 8796970644..0b6a555bc7 100644 --- a/src/world/area_pra/pra_32/pra_32_2_main.c +++ b/src/world/area_pra/pra_32/pra_32_2_main.c @@ -24,9 +24,9 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_LOOP_67) + EVT_CALL(PlaySound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(StopSound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, 595, 185, 116) EVT_END_THREAD EVT_THREAD @@ -86,9 +86,9 @@ EvtScript N(EVS_RespawnStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_LOOP_67) + EVT_CALL(PlaySound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(StopSound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, 595, 185, 116) EVT_END_THREAD EVT_THREAD diff --git a/src/world/area_pra/pra_33/pra_33_3_entity.c b/src/world/area_pra/pra_33/pra_33_3_entity.c index a9b5425d94..3720ab40f2 100644 --- a/src/world/area_pra/pra_33/pra_33_3_entity.c +++ b/src/world/area_pra/pra_33/pra_33_3_entity.c @@ -39,7 +39,7 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_ELSE EVT_SET(MV_WallFlipped, FALSE) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o1063, SOUND_002E, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1063, SOUND_PRA_FLIP_WALL, SOUND_SPACE_MODE_0) EVT_CALL(N(CheckPlayerOnDais)) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1063, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(N(GetDaisRelativePlayerPos)) diff --git a/src/world/area_sam/sam_08/sam_08_4_npc.c b/src/world/area_sam/sam_08/sam_08_4_npc.c index 27b114ebc3..262ede88f1 100644 --- a/src/world/area_sam/sam_08/sam_08_4_npc.c +++ b/src/world/area_sam/sam_08/sam_08_4_npc.c @@ -71,22 +71,22 @@ EvtScript N(EVS_NpcDefeat_Duplighost) = { EVT_CALL(SetNpcAnimation, NPC_Duplighost, ANIM_Duplighost_Anim04) EVT_CALL(GetNpcPos, NPC_Duplighost, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 50) - EVT_CALL(PlaySoundAtNpc, NPC_Duplighost, SOUND_02CA, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Duplighost, SOUND_DUPLIGHOST_STEP, 0) EVT_CALL(NpcJump0, NPC_Duplighost, LVar0, LVar1, LVar2, 13 * DT) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_ADD(LVar0, 50) - EVT_CALL(PlaySoundAtNpc, NPC_Duplighost, SOUND_02CA, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Duplighost, SOUND_DUPLIGHOST_STEP, 0) EVT_CALL(NpcJump0, NPC_Duplighost, LVar0, LVar1, LVar2, 13 * DT) EVT_ADD(LVar0, 50) - EVT_CALL(PlaySoundAtNpc, NPC_Duplighost, SOUND_02CA, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Duplighost, SOUND_DUPLIGHOST_STEP, 0) EVT_CALL(NpcJump0, NPC_Duplighost, LVar0, LVar1, LVar2, 13 * DT) EVT_SET(GB_StoryProgress, STORY_CH7_DEFEATED_FIRST_DUPLIGHOST) EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, FALSE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o47, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(DisablePlayerInput, FALSE) EVT_ADD(LVar0, 50) - EVT_CALL(PlaySoundAtNpc, NPC_Duplighost, SOUND_02CA, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Duplighost, SOUND_DUPLIGHOST_STEP, 0) EVT_CALL(NpcJump0, NPC_Duplighost, LVar0, LVar1, LVar2, 20 * DT) EVT_CASE_EQ(OUTCOME_PLAYER_LOST) EVT_CASE_EQ(OUTCOME_PLAYER_FLED) diff --git a/src/world/area_sam/sam_12/sam_12_4_scenes.c b/src/world/area_sam/sam_12/sam_12_4_scenes.c index 60355d9dcc..4b1442e5f5 100644 --- a/src/world/area_sam/sam_12/sam_12_4_scenes.c +++ b/src/world/area_sam/sam_12/sam_12_4_scenes.c @@ -83,7 +83,7 @@ EvtScript N(EVS_MerlarFlickering) = { }; EvtScript N(EVS_SpawnStarStoneSparkles) = { - EVT_CALL(PlaySoundAt, SOUND_2045, 0, 230, 30, 0) + EVT_CALL(PlaySoundAt, SOUND_STAR_SPIRIT_DEPART_1, 0, 230, 30, 0) EVT_LABEL(0) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 2, 230, 30, 0, 30) EVT_WAIT(20) diff --git a/src/world/area_sbk/sbk_02/sbk_02_4_npc.c b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c index 7a8c4389e9..d9da1e732e 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_4_npc.c +++ b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c @@ -160,7 +160,7 @@ EvtScript N(EVS_Scene_RescuedMamar) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Mamar, SOUND_2045, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Mamar, SOUND_STAR_SPIRIT_DEPART_1, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) diff --git a/src/world/area_tik/tik_01/tik_01_4_entity.c b/src/world/area_tik/tik_01/tik_01_4_entity.c index 52d3104644..418f416888 100644 --- a/src/world/area_tik/tik_01/tik_01_4_entity.c +++ b/src/world/area_tik/tik_01/tik_01_4_entity.c @@ -16,7 +16,7 @@ EvtScript N(EVS_SpawnSwitch) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_0048, SOUND_SPACE_MODE_0, LVar2, LVar0, 25) + EVT_CALL(PlaySoundAt, SOUND_OBJECT_LAND, SOUND_SPACE_MODE_0, LVar2, LVar0, 25) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_RETURN @@ -53,7 +53,7 @@ EvtScript N(EVS_GotoMap_dro_01_2) = { EvtScript N(EVS_OnSwitchActivate) = { EVT_WAIT(10) - EVT_CALL(PlaySound, SOUND_208E) + EVT_CALL(PlaySound, SOUND_GROW) EVT_SET(GF_TIK01_WarpPipes, TRUE) EVT_UNBIND EVT_RETURN diff --git a/src/world/area_tik/tik_05/tik_05_4_entity.c b/src/world/area_tik/tik_05/tik_05_4_entity.c index 0388d67099..8c548c05b8 100644 --- a/src/world/area_tik/tik_05/tik_05_4_entity.c +++ b/src/world/area_tik/tik_05/tik_05_4_entity.c @@ -46,8 +46,8 @@ EvtScript N(EVS_BreakBlock_DropSpring) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_0048, SOUND_SPACE_MODE_0, LVar5, LVar0, 0) - EVT_CALL(PlaySoundAt, SOUND_2086, SOUND_SPACE_MODE_0, LVar5, LVar0, 0) + EVT_CALL(PlaySoundAt, SOUND_OBJECT_LAND, SOUND_SPACE_MODE_0, LVar5, LVar0, 0) + EVT_CALL(PlaySoundAt, SOUND_SPRING, SOUND_SPACE_MODE_0, LVar5, LVar0, 0) EVT_CALL(N(PlaySpringAnimation), MV_Unk_00) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN diff --git a/src/world/area_tik/tik_08/tik_08_4_entity.c b/src/world/area_tik/tik_08/tik_08_4_entity.c index f2619ab077..b85b6b570d 100644 --- a/src/world/area_tik/tik_08/tik_08_4_entity.c +++ b/src/world/area_tik/tik_08/tik_08_4_entity.c @@ -14,7 +14,7 @@ EvtScript N(EVS_SpawnSwitch) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_0048, SOUND_SPACE_MODE_0, 90, LVar0, 100) + EVT_CALL(PlaySoundAt, SOUND_OBJECT_LAND, SOUND_SPACE_MODE_0, 90, LVar0, 100) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_RETURN @@ -30,7 +30,7 @@ EvtScript N(EVS_GotoMap_jan_03_3) = { EvtScript N(EVS_OnSwitchActivate) = { EVT_WAIT(10) - EVT_CALL(PlaySound, SOUND_208E) + EVT_CALL(PlaySound, SOUND_GROW) EVT_SET(GF_TIK08_WarpPipe, TRUE) EVT_UNBIND EVT_RETURN diff --git a/src/world/area_tik/tik_09/tik_09_4_entity.c b/src/world/area_tik/tik_09/tik_09_4_entity.c index 391c82ba79..a6a71259c8 100644 --- a/src/world/area_tik/tik_09/tik_09_4_entity.c +++ b/src/world/area_tik/tik_09/tik_09_4_entity.c @@ -29,7 +29,7 @@ EvtScript N(EVS_SpawnSwitch) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_0048, SOUND_SPACE_MODE_0, -10, LVar0, 10) + EVT_CALL(PlaySoundAt, SOUND_OBJECT_LAND, SOUND_SPACE_MODE_0, -10, LVar0, 10) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -49,7 +49,7 @@ EvtScript N(EVS_GotoMap_mim_11_3) = { EvtScript N(EVS_PlayRisingPipeSound) = { EVT_WAIT(10) - EVT_CALL(PlaySound, SOUND_208E) + EVT_CALL(PlaySound, SOUND_GROW) EVT_SET(GF_TIK09_WarpPipe, TRUE) EVT_UNBIND EVT_RETURN diff --git a/src/world/area_tik/tik_25/tik_25_3_entity.c b/src/world/area_tik/tik_25/tik_25_3_entity.c index 9ae9cf4526..a66e77bc5d 100644 --- a/src/world/area_tik/tik_25/tik_25_3_entity.c +++ b/src/world/area_tik/tik_25/tik_25_3_entity.c @@ -53,8 +53,8 @@ EvtScript N(EVS_OnBreakBlock_SpringR) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_0048, SOUND_SPACE_MODE_0, LVar5, LVar0, 0) - EVT_CALL(PlaySoundAt, SOUND_2086, SOUND_SPACE_MODE_0, LVar5, LVar0, 0) + EVT_CALL(PlaySoundAt, SOUND_OBJECT_LAND, SOUND_SPACE_MODE_0, LVar5, LVar0, 0) + EVT_CALL(PlaySoundAt, SOUND_SPRING, SOUND_SPACE_MODE_0, LVar5, LVar0, 0) EVT_CALL(N(PlaySpringReboundAnimation), MV_EntityID_SpringR) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN @@ -88,8 +88,8 @@ EvtScript N(EVS_OnBreakBlock_SpringL) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_0048, SOUND_SPACE_MODE_0, LVar5, LVar0, 0) - EVT_CALL(PlaySoundAt, SOUND_2086, SOUND_SPACE_MODE_0, LVar5, LVar0, 0) + EVT_CALL(PlaySoundAt, SOUND_OBJECT_LAND, SOUND_SPACE_MODE_0, LVar5, LVar0, 0) + EVT_CALL(PlaySoundAt, SOUND_SPRING, SOUND_SPACE_MODE_0, LVar5, LVar0, 0) EVT_CALL(N(PlaySpringReboundAnimation), MV_EntityID_SpringL) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN diff --git a/src/world/area_trd/trd_00/trd_00_3_npc.c b/src/world/area_trd/trd_00/trd_00_3_npc.c index 110a60c987..ad3b5d65b9 100644 --- a/src/world/area_trd/trd_00/trd_00_3_npc.c +++ b/src/world/area_trd/trd_00/trd_00_3_npc.c @@ -271,7 +271,7 @@ EvtScript N(D_80241DA4_99BA14) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Eldstar, SOUND_2045, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Eldstar, SOUND_STAR_SPIRIT_DEPART_1, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) 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 e537f32d40..2a11f4a97c 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 @@ -60,7 +60,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_WAIT(10 * DT) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o162, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(SetGroupVisibility, MODEL_move_saku, MODEL_GROUP_HIDDEN) - EVT_CALL(PlaySound, SOUND_LOOP_06) + EVT_CALL(PlaySound, SOUND_LOOP_TRD_FLOWING_WATER) EVT_CHILD_THREAD EVT_SET_GROUP(EVT_GROUP_00) EVT_WAIT(4 * DT) @@ -100,13 +100,13 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_END_LOOP EVT_END_CHILD_THREAD EVT_THREAD - EVT_CALL(PlaySound, SOUND_LOOP_07) + EVT_CALL(PlaySound, SOUND_LOOP_TRD_RAISE_STAIRS) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10 * DT, EVT_FLOAT(4.0)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20 * DT, EVT_FLOAT(0.7)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 250 * DT, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30 * DT, EVT_FLOAT(0.5)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10 * DT, EVT_FLOAT(1.2)) - EVT_CALL(StopSound, SOUND_LOOP_07) + EVT_CALL(StopSound, SOUND_LOOP_TRD_RAISE_STAIRS) EVT_END_THREAD EVT_THREAD EVT_WAIT(50 * DT) @@ -269,7 +269,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(1) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.5 / DT)) - EVT_CALL(StopSound, SOUND_LOOP_06) + EVT_CALL(StopSound, SOUND_LOOP_TRD_FLOWING_WATER) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) EVT_UNBIND 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 96ac22bb3b..e890e7a1d2 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 @@ -59,7 +59,7 @@ EvtScript N(EVS_Scene_LowerStairs) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(30) EVT_CALL(SetGroupVisibility, MODEL_move_saku, MODEL_GROUP_HIDDEN) - EVT_CALL(PlaySound, SOUND_LOOP_04) + EVT_CALL(PlaySound, SOUND_LOOP_TRD_02_LOWER_STAIRS) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.7)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 320, EVT_FLOAT(1.0)) @@ -107,8 +107,8 @@ EvtScript N(EVS_Scene_LowerStairs) = { EVT_CALL(UpdateColliderTransform, COLLIDER_o54) EVT_CALL(UpdateColliderTransform, COLLIDER_o55) EVT_CALL(UpdateColliderTransform, COLLIDER_o65) - EVT_CALL(StopSound, SOUND_LOOP_04) - EVT_CALL(PlaySound, SOUND_0025) + EVT_CALL(StopSound, SOUND_LOOP_TRD_02_LOWER_STAIRS) + EVT_CALL(PlaySound, SOUND_TRD_02_STAIRS_LOWERED) EVT_SET(GB_StoryProgress, STORY_CH1_LOWERED_SECOND_STAIRS) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(SetTimeFreezeMode, 0) diff --git a/src/world/area_trd/trd_03/trd_03_4_puzzle.c b/src/world/area_trd/trd_03/trd_03_4_puzzle.c index f589e4b9c4..5ebd702915 100644 --- a/src/world/area_trd/trd_03/trd_03_4_puzzle.c +++ b/src/world/area_trd/trd_03/trd_03_4_puzzle.c @@ -46,7 +46,7 @@ EvtScript N(EVS_RetractPlatform) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVar7, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySound, SOUND_0026) + EVT_CALL(PlaySound, SOUND_TRD_PUZZLE_PLATFORM_THUD) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(0.3)) EVT_RETURN EVT_END @@ -62,7 +62,7 @@ EvtScript N(EVS_ExtendPlatform) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, LVar7, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySound, SOUND_0026) + EVT_CALL(PlaySound, SOUND_TRD_PUZZLE_PLATFORM_THUD) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(0.3)) EVT_RETURN EVT_END diff --git a/src/world/area_trd/trd_04/trd_04.h b/src/world/area_trd/trd_04/trd_04.h index 7eddac059d..cf43027ce1 100644 --- a/src/world/area_trd/trd_04/trd_04.h +++ b/src/world/area_trd/trd_04/trd_04.h @@ -20,7 +20,7 @@ enum { enum { MV_Unk_00 = MapVar(0), MV_Unk_01 = MapVar(1), - MV_Unk_02 = MapVar(2), + MV_EntityID_Switch = MapVar(2), }; #define NAMESPACE trd_04 diff --git a/src/world/area_trd/trd_04/trd_04_1_main.c b/src/world/area_trd/trd_04/trd_04_1_main.c index c0c6cd4ff8..a47ee9e19e 100644 --- a/src/world/area_trd/trd_04/trd_04_1_main.c +++ b/src/world/area_trd/trd_04/trd_04_1_main.c @@ -126,7 +126,7 @@ EvtScript N(EVS_Scene_LowerStairs) = { EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetNpcPos, NPC_PARTNER, -163, 0, -12) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) - EVT_CALL(PlaySound, SOUND_LOOP_05) + EVT_CALL(PlaySound, SOUND_LOOP_TRD_04_LOWER_STAIRS) EVT_WAIT(20 * DT) EVT_THREAD EVT_LOOP(5) @@ -193,8 +193,8 @@ EvtScript N(EVS_Scene_LowerStairs) = { EVT_END_IF EVT_CALL(UpdateColliderTransform, COLLIDER_o86) EVT_CALL(UpdateColliderTransform, COLLIDER_o87) - EVT_CALL(StopSound, SOUND_LOOP_05) - EVT_CALL(PlaySound, SOUND_0028) + EVT_CALL(StopSound, SOUND_LOOP_TRD_04_LOWER_STAIRS) + EVT_CALL(PlaySound, SOUND_TRD_04_STAIRS_LOWERED) EVT_WAIT(50 * DT) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) diff --git a/src/world/area_trd/trd_04/trd_04_2_entity.c b/src/world/area_trd/trd_04/trd_04_2_entity.c index 84235fb917..84524791eb 100644 --- a/src/world/area_trd/trd_04/trd_04_2_entity.c +++ b/src/world/area_trd/trd_04/trd_04_2_entity.c @@ -100,7 +100,7 @@ EvtScript N(EVS_Padlock_UpperDoors) = { EVT_END }; -EvtScript N(EVS_80245198) = { +EvtScript N(EVS_DropSwitch) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(40 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -188, 0, -43) @@ -113,13 +113,13 @@ EvtScript N(EVS_80245198) = { EVT_CALL(MakeLerp, 175, 0, 20 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(N(SetEntityPosition), MV_Unk_02, -180, LVar0, -35) + EVT_CALL(N(SetEntityPosition), MV_EntityID_Switch, -180, LVar0, -35) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_0048, SOUND_SPACE_MODE_0, -180, 0, -35) + EVT_CALL(PlaySoundAt, SOUND_OBJECT_LAND, SOUND_SPACE_MODE_0, -180, 0, -35) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(20 * DT) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -150,9 +150,9 @@ EvtScript N(EVS_MakeEntities) = { EVT_IF_LE(GB_StoryProgress, STORY_CH1_DEFEATED_BASEMENT_GUARD) EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueSwitch), NPC_DISPOSE_LOCATION, 0, MAKE_ENTITY_END) EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_TRD04_LowerStairs)) - EVT_SET(MV_Unk_02, LVar0) + EVT_SET(MV_EntityID_Switch, LVar0) EVT_IF_EQ(GB_StoryProgress, STORY_CH1_DEFEATED_BASEMENT_GUARD) - EVT_CALL(N(SetEntityPosition), MV_Unk_02, -180, 0, -35) + EVT_CALL(N(SetEntityPosition), MV_EntityID_Switch, -180, 0, -35) EVT_END_IF EVT_END_IF EVT_RETURN diff --git a/src/world/area_trd/trd_04/trd_04_3_npc.c b/src/world/area_trd/trd_04/trd_04_3_npc.c index 97eda75991..113f5b773f 100644 --- a/src/world/area_trd/trd_04/trd_04_3_npc.c +++ b/src/world/area_trd/trd_04/trd_04_3_npc.c @@ -1,6 +1,6 @@ #include "trd_04.h" -extern EvtScript N(EVS_80245198); +extern EvtScript N(EVS_DropSwitch); #include "world/common/enemy/KoopaTroopa_Wander.inc.c" #include "world/common/enemy/KoopaTroopa_Patrol.inc.c" @@ -14,7 +14,7 @@ EvtScript N(EVS_NpcDefeat_KoopaTroopa) = { EVT_THREAD EVT_CALL(DoNpcDefeat) EVT_END_THREAD - EVT_EXEC_WAIT(N(EVS_80245198)) + EVT_EXEC_WAIT(N(EVS_DropSwitch)) EVT_END_SWITCH EVT_RETURN EVT_END 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 560290fff6..7bd5b53f2a 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 @@ -293,7 +293,7 @@ EvtScript N(EVS_OnHitTrapTrigger) = { EVT_CALL(EnableModel, MODEL_o95, TRUE) EVT_CALL(EnableModel, MODEL_o96, TRUE) EVT_CALL(SetGroupVisibility, MODEL_kesu, MODEL_GROUP_VISIBLE) - EVT_CALL(PlaySound, SOUND_2091) + EVT_CALL(PlaySound, SOUND_OPEN_TRAPDOOR) EVT_CALL(MakeLerp, 0, 90, 30, EASING_COS_SLOW_OVERSHOOT) EVT_LABEL(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_trd/trd_05/trd_05_4_npc.c b/src/world/area_trd/trd_05/trd_05_4_npc.c index 9df23e2ba7..364ecacab1 100644 --- a/src/world/area_trd/trd_05/trd_05_4_npc.c +++ b/src/world/area_trd/trd_05/trd_05_4_npc.c @@ -53,32 +53,32 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_CALL(PlaySound, SOUND_0029) + EVT_CALL(PlaySound, SOUND_POUNDING_HIGH) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Hammering) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -100, 240, 30) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 90) EVT_WAIT(15 * DT) - EVT_CALL(PlaySound, SOUND_002A) + EVT_CALL(PlaySound, SOUND_POUNDING_LOW) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Hammering) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -35, 240, -75) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 270) EVT_WAIT(15 * DT) - EVT_CALL(PlaySound, SOUND_0029) + EVT_CALL(PlaySound, SOUND_POUNDING_HIGH) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Hammering) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -40, 240, 10) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 270) EVT_WAIT(15 * DT) - EVT_CALL(PlaySound, SOUND_002A) + EVT_CALL(PlaySound, SOUND_POUNDING_LOW) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Hammering) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -110, 240, -20) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 90) EVT_WAIT(15 * DT) - EVT_CALL(PlaySound, SOUND_0029) + EVT_CALL(PlaySound, SOUND_POUNDING_HIGH) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Hammering) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -90, 240, 30) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 90) EVT_WAIT(15 * DT) - EVT_CALL(PlaySound, SOUND_002A) + EVT_CALL(PlaySound, SOUND_POUNDING_LOW) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Hammering) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -30, 240, -50) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 270) diff --git a/src/world/area_trd/trd_10/trd_10_1_main.c b/src/world/area_trd/trd_10/trd_10_1_main.c index 8a036e6452..49e38a5f9f 100644 --- a/src/world/area_trd/trd_10/trd_10_1_main.c +++ b/src/world/area_trd/trd_10/trd_10_1_main.c @@ -43,9 +43,9 @@ EvtScript N(EVS_BossDefeated) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_LOOP_67) + EVT_CALL(PlaySound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(StopSound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, -135, 85, 0) EVT_END_THREAD EVT_THREAD diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c index 7634e519dc..4e1da8e9dc 100644 --- a/src/world/common/complete/Quizmo.inc.c +++ b/src/world/common/complete/Quizmo.inc.c @@ -996,7 +996,7 @@ EvtScript N(EVS_Quizmo_QuizMain) = { EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_EXEC_GET_TID(N(EVS_Quizmo_SetCharacterPositons), LVar1) EVT_CALL(ContinueSpeech, -1, ANIM_ChuckQuizmo_Talk, ANIM_ChuckQuizmo_Idle, 0, MSG_MGM_000B) - EVT_CALL(PlaySound, 137) + EVT_CALL(PlaySound, SOUND_LRAW_AUDIENCE_MURMUR) EVT_LOOP(0) EVT_IS_THREAD_RUNNING(LVar1, LVar0) EVT_IF_EQ(LVar0, 0) @@ -1017,13 +1017,13 @@ EvtScript N(EVS_Quizmo_QuizMain) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Question) EVT_SET(LVar0, MSG_QuizChoice_01) EVT_ADD(LVar0, GB_CompletedQuizzes) - EVT_CALL(PlaySound, 142) + EVT_CALL(PlaySound, SOUND_LRAW_QUIZ_TICKING) EVT_CALL(ShowChoice, LVar0) EVT_KILL_THREAD(LVar1) - EVT_CALL(StopSound, 142) + EVT_CALL(StopSound, SOUND_LRAW_QUIZ_TICKING) EVT_EXEC(N(EVS_Quizmo_PlayerHitBuzzer)) EVT_WAIT(15) - EVT_CALL(PlaySound, 141) + EVT_CALL(PlaySound, SOUND_QUIZ_BUZZER) EVT_CALL(N(Quizmo_UnkStageEffectMode), LVar0) EVT_SET(QUIZ_ARRAY_ANSWER_RESULT, 0) EVT_CALL(N(Quizmo_CreateWorker)) @@ -1045,15 +1045,15 @@ EvtScript N(EVS_Quizmo_QuizMain) = { EVT_CALL(N(Quizmo_SetStageLightsDelay), 2) EVT_END_THREAD EVT_THREAD - EVT_CALL(PlaySound, SOUND_021C) + EVT_CALL(PlaySound, SOUND_APPROVE) EVT_WAIT(6) - EVT_CALL(PlaySound, SOUND_021C) + EVT_CALL(PlaySound, SOUND_APPROVE) EVT_WAIT(6) - EVT_CALL(PlaySound, SOUND_021C) + EVT_CALL(PlaySound, SOUND_APPROVE) EVT_WAIT(6) - EVT_CALL(PlaySound, SOUND_021C) + EVT_CALL(PlaySound, SOUND_APPROVE) EVT_END_THREAD - EVT_CALL(PlaySound, SOUND_008A) + EVT_CALL(PlaySound, SOUND_AUDIENCE_CHEER) EVT_CALL(N(Quizmo_SetVannaAnim_Clap)) EVT_THREAD EVT_WAIT(15) @@ -1135,7 +1135,7 @@ EvtScript N(EVS_Quizmo_QuizMain) = { EVT_CALL(SetNpcAnimation, CHUCK_QUIZMO_NPC_ID, ANIM_ChuckQuizmo_OpenWrong) EVT_SET(QUIZ_ARRAY_ANSWER_RESULT, 2) EVT_CALL(PlaySound, SOUND_MENU_ERROR) - EVT_CALL(PlaySound, SOUND_008B) + EVT_CALL(PlaySound, SOUND_AUDIENCE_BOO) EVT_EXEC_GET_TID(N(EVS_Quizmo_WrongAnswer), LVar1) EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) EVT_PLAY_EFFECT(EFFECT_WINDY_LEAVES, 0, LVar2, LVar3, LVar4) @@ -1154,11 +1154,11 @@ EvtScript N(EVS_Quizmo_QuizMain) = { EVT_CALL(EnablePartnerAI) EVT_THREAD EVT_WAIT(30) - EVT_CALL(PlaySound, SOUND_008F) + EVT_CALL(PlaySound, SOUND_QUIZMO_VANISH) EVT_END_THREAD EVT_THREAD EVT_WAIT(45) - EVT_CALL(StopSound, SOUND_LRAW_0089) + EVT_CALL(StopSound, SOUND_LRAW_AUDIENCE_MURMUR) EVT_END_THREAD EVT_CALL(N(Quizmo_SetVannaAnim_Wave)) EVT_CALL(N(Quizmo_DestroyEffects)) diff --git a/src/world/common/enemy/HeartPlant.inc.c b/src/world/common/enemy/HeartPlant.inc.c index aa5349e4c6..9e18d33c19 100644 --- a/src/world/common/enemy/HeartPlant.inc.c +++ b/src/world/common/enemy/HeartPlant.inc.c @@ -23,7 +23,7 @@ EvtScript N(EVS_NpcInteract_HeartPlant) = { EVT_CALL(GetSelfVar, 1, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(SetSelfVar, 1, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2099, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HEART_PLANT, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HeartPlant_Anim00) EVT_WAIT(1) EVT_CALL(N(HeartPlant_SpawnHeart)) diff --git a/src/world/common/enemy/HurtPlant.inc.c b/src/world/common/enemy/HurtPlant.inc.c index 6212e87c62..9487734443 100644 --- a/src/world/common/enemy/HurtPlant.inc.c +++ b/src/world/common/enemy/HurtPlant.inc.c @@ -17,7 +17,7 @@ EvtScript N(EVS_NpcAI_HurtPlant) = { EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HurtPlant_Anim08) EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_209A, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HURT_PLANT_SHRIEK, 0) EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_WAIT(5) diff --git a/src/world/common/enemy/ai/ParatroopaAI.inc.c b/src/world/common/enemy/ai/ParatroopaAI.inc.c index 5528aa06cc..8a6880106b 100644 --- a/src/world/common/enemy/ai/ParatroopaAI.inc.c +++ b/src/world/common/enemy/ai/ParatroopaAI.inc.c @@ -29,7 +29,7 @@ void N(ParatroopaAI_Windup)(Evt* script, MobileAISettings* aiSettings, EnemyDete enemy->unk_10.z = npc->pos.z; enemy->hitboxIsActive = TRUE; - ai_enemy_play_sound(npc, SOUND_UNUSED_2C1, 0); + ai_enemy_play_sound(npc, SOUND_PARAGOOMBA_DIVE, 0); yawTemp = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->pos.x, gPlayerStatusPtr->pos.z); npc->duration = 12; npc->yaw = yawTemp; diff --git a/src/world/common/entity/SuperBlock.inc.c b/src/world/common/entity/SuperBlock.inc.c index 770918f50f..d566540529 100644 --- a/src/world/common/entity/SuperBlock.inc.c +++ b/src/world/common/entity/SuperBlock.inc.c @@ -444,7 +444,7 @@ EvtScript N(SuperBlock_ShowUpgradeEffects) = { EVT_CALL(PlaySound, SOUND_GATHER_ENERGY) EVT_CALL(N(SuperBlock_WhiteScreenFlash), 70, 70) EVT_WAIT(27 * DT) - EVT_CALL(PlaySound, SOUND_208E) + EVT_CALL(PlaySound, SOUND_GROW) EVT_CALL(N(SuperBlock_WhiteScreenFlash), 50, 50) EVT_END_THREAD EVT_THREAD diff --git a/src/world/common/todo/StarSpiritEffectFunc.inc.c b/src/world/common/todo/StarSpiritEffectFunc.inc.c index 8b42a031cd..0824f5d54d 100644 --- a/src/world/common/todo/StarSpiritEffectFunc.inc.c +++ b/src/world/common/todo/StarSpiritEffectFunc.inc.c @@ -19,7 +19,7 @@ API_CALLABLE(N(StarSpiritEffectFunc1)) { StarSpiritData* ptr = script->varTablePtr[0]; - sfx_adjust_env_sound_pos(SOUND_LRAW_00A2, SOUND_SPACE_MODE_0, ptr->unk_00, ptr->unk_04, ptr->unk_08); + sfx_adjust_env_sound_pos(SOUND_LRAW_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, ptr->unk_00, ptr->unk_04, ptr->unk_08); if (ptr->unk_44 < 2) { return ApiStatus_BLOCK; diff --git a/src/world/dead/area_flo/flo_00/flo_00_3_npc.c b/src/world/dead/area_flo/flo_00/flo_00_3_npc.c index 1427b42007..cba75c589d 100644 --- a/src/world/dead/area_flo/flo_00/flo_00_3_npc.c +++ b/src/world/dead/area_flo/flo_00/flo_00_3_npc.c @@ -557,7 +557,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_Klevar, SOUND_2045, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Klevar, SOUND_STAR_SPIRIT_DEPART_1, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) diff --git a/src/world/dead/area_flo/flo_07/flo_07_3_npc.c b/src/world/dead/area_flo/flo_07/flo_07_3_npc.c index 69349de405..3f1e1ae05d 100644 --- a/src/world/dead/area_flo/flo_07/flo_07_3_npc.c +++ b/src/world/dead/area_flo/flo_07/flo_07_3_npc.c @@ -66,7 +66,7 @@ EvtScript N(EVS_MakeCrystalBerry) = { EVT_SET(GF_FLO07_CrystalBerryFellOnLeftSide, TRUE) EVT_END_IF EVT_CALL(PlaySound, SOUND_LRAW_03BC | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_LRAW_03BC) + EVT_CALL(StopTrackingSoundPos, SOUND_LRAW_03BC) EVT_SET(AF_FLO_MadeCrystalBerry, TRUE) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_Posie, ANIM_Posie_Talk, ANIM_Posie_Idle, 0, MSG_CH6_006A) diff --git a/src/world/dead/area_flo/flo_08/flo_08_4_npc.c b/src/world/dead/area_flo/flo_08/flo_08_4_npc.c index 247a214c1e..da0f0d01e2 100644 --- a/src/world/dead/area_flo/flo_08/flo_08_4_npc.c +++ b/src/world/dead/area_flo/flo_08/flo_08_4_npc.c @@ -34,14 +34,14 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CALL(N(FlowerGuard_JudgeItemTastiness), LVar0) EVT_CALL(MakeItemEntity, LVar8, -695, 20, -29, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVar7, LVar0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EAT_OR_DRINK, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Yellow_Eat) EVT_WAIT(20) EVT_CALL(RemoveItemEntity, LVar7) EVT_SWITCH(LVar8) EVT_CASE_EQ(160) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Yellow_Chew, ANIM_GateFlower_Yellow_Idle, 0, MSG_CH6_0046) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_021C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_APPROVE, SOUND_SPACE_MODE_0) EVT_CALL(EndSpeech, NPC_SELF, ANIM_GateFlower_Yellow_HappyTalk, ANIM_GateFlower_Yellow_HappyIdle, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Yellow_OpenGate) EVT_CALL(PlaySoundAtCollider, COLLIDER_o96, SOUND_METAL_GATE_OPEN, SOUND_SPACE_MODE_0) @@ -75,7 +75,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CASE_DEFAULT EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Yellow_Chew, ANIM_GateFlower_Yellow_Idle, 0, MSG_CH6_0044) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Yellow_Disgust) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SPIT_OUT, SOUND_SPACE_MODE_0) EVT_CALL(MakeItemEntity, LVar8, 125, 20, 0, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVar7, LVar0) EVT_WAIT(5) diff --git a/src/world/dead/area_flo/flo_11/flo_11_3_npc.c b/src/world/dead/area_flo/flo_11/flo_11_3_npc.c index 09e5101a04..356a0fc770 100644 --- a/src/world/dead/area_flo/flo_11/flo_11_3_npc.c +++ b/src/world/dead/area_flo/flo_11/flo_11_3_npc.c @@ -66,7 +66,7 @@ Vec3f N(FlightPath_Lakitu_02_Flee)[] = { EvtScript N(EVS_PlayFlightSounds) = { EVT_LOOP(0) - EVT_CALL(PlaySound, SOUND_LRAW_0295) + EVT_CALL(PlaySound, SOUND_FLIGHT) EVT_WAIT(LVar0) EVT_END_LOOP EVT_RETURN diff --git a/src/world/dead/area_flo/flo_13/flo_13_4_npc.c b/src/world/dead/area_flo/flo_13/flo_13_4_npc.c index 81d70c1e1c..2b291b6d25 100644 --- a/src/world/dead/area_flo/flo_13/flo_13_4_npc.c +++ b/src/world/dead/area_flo/flo_13/flo_13_4_npc.c @@ -32,7 +32,7 @@ API_CALLABLE(N(PlayLakiluluFlightSounds)) { if (script->functionTemp[0] % 5 == 0) { sfx_get_spatialized_sound_params(npc->pos.x, npc->pos.y, npc->pos.z, &volume, &pan, SOUND_PARAM_MORE_QUIET | SOUND_SPACE_FULL); - sfx_play_sound_with_params(SOUND_LRAW_0295, volume, pan, + sfx_play_sound_with_params(SOUND_FLIGHT, volume, pan, update_lerp(EASING_LINEAR, 500.0f, 0.0f, script->functionTemp[0], script->functionTemp[1])); } @@ -57,7 +57,7 @@ API_CALLABLE(N(PlayLakilesterFlightSounds)) { if (script->functionTemp[0] % 5 == 0) { sfx_get_spatialized_sound_params(npc->pos.x, npc->pos.y, npc->pos.z, &volume, &pan, SOUND_PARAM_MORE_QUIET | SOUND_SPACE_FULL); - sfx_play_sound_with_params(SOUND_LRAW_0295, volume, pan, + sfx_play_sound_with_params(SOUND_FLIGHT, volume, pan, update_lerp(EASING_LINEAR, 500.0f, 0.0f, script->functionTemp[0], 80)); } diff --git a/src/world/dead/area_flo/flo_16/flo_16_6_puzzle.c b/src/world/dead/area_flo/flo_16/flo_16_6_puzzle.c index 078e4cb9f7..c8409edde7 100644 --- a/src/world/dead/area_flo/flo_16/flo_16_6_puzzle.c +++ b/src/world/dead/area_flo/flo_16/flo_16_6_puzzle.c @@ -28,7 +28,7 @@ EvtScript N(EVS_OnTouch_RedPillar) = { EVT_SET(AF_FLO_RaisedRedPillar, FALSE) EVT_END_IF EVT_WAIT(15) - EVT_CALL(PlaySound, SOUND_204D) + EVT_CALL(PlaySound, SOUND_FLO_MOVE_PILLAR) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(0.8)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.2)) @@ -91,7 +91,7 @@ EvtScript N(EVS_OnTouch_GreenPillar) = { EVT_SET(AF_FLO_RaisedGreenPillar, FALSE) EVT_END_IF EVT_WAIT(15) - EVT_CALL(PlaySound, SOUND_204D) + EVT_CALL(PlaySound, SOUND_FLO_MOVE_PILLAR) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(0.8)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.2)) @@ -162,7 +162,7 @@ EvtScript N(EVS_OnTouch_PurplePillar) = { EVT_SET(AF_FLO_LoweredPurplePillar, FALSE) EVT_END_IF EVT_WAIT(15) - EVT_CALL(PlaySound, SOUND_204D) + EVT_CALL(PlaySound, SOUND_FLO_MOVE_PILLAR) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(0.8)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.2)) diff --git a/src/world/dead/area_flo/flo_18/flo_18_1_music.c b/src/world/dead/area_flo/flo_18/flo_18_1_music.c index 95cd57d9f5..0028d440f2 100644 --- a/src/world/dead/area_flo/flo_18/flo_18_1_music.c +++ b/src/world/dead/area_flo/flo_18/flo_18_1_music.c @@ -4,7 +4,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) EVT_CALL(SetMusicTrack, 0, SONG_PUFF_PUFF_MACHINE, 0, 8) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_LOOP_25, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_LOOP_PUFF_PUFF_MACHINE, SOUND_SPACE_MODE_0) EVT_CASE_DEFAULT EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, 8) EVT_END_SWITCH diff --git a/src/world/dead/area_flo/flo_18/flo_18_3_machine.c b/src/world/dead/area_flo/flo_18/flo_18_3_machine.c index b17d8c6ad9..6011a592b3 100644 --- a/src/world/dead/area_flo/flo_18/flo_18_3_machine.c +++ b/src/world/dead/area_flo/flo_18/flo_18_3_machine.c @@ -609,7 +609,7 @@ EvtScript N(EVS_DamageMachine) = { EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 0, 30, 30, EVT_FLOAT(4.0), 40) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0)) EVT_EXEC_WAIT(N(EVS_BreakSmokestack)) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_LRAW_0091 | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_LRAW_PUFF_PUFF_MACHINE | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0) EVT_CALL(FadeOutMusic, 0, 1000) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_WAIT(30) diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c b/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c index cff68f689b..68ca4472e2 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c @@ -38,9 +38,9 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_LOOP_67) + EVT_CALL(PlaySound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(StopSound, SOUND_LOOP_STAR_CARD_APPEARS) EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, 185, 110, -30) EVT_END_THREAD EVT_THREAD diff --git a/src/world/partner/lakilester.c b/src/world/partner/lakilester.c index 9ebbdbd213..0c67c5ae38 100644 --- a/src/world/partner/lakilester.c +++ b/src/world/partner/lakilester.c @@ -402,10 +402,10 @@ void N(update_riding_physics)(Npc* lakilester) { if (N(MovePitchAdjustment) < 60) { pitchShift = update_lerp(EASING_LINEAR, 0.0f, 100.0f, N(MovePitchAdjustment), 60); - sfx_play_sound_with_params(SOUND_LRAW_0295, 0, 64, pitchShift); + sfx_play_sound_with_params(SOUND_FLIGHT, 0, 64, pitchShift); } else { pitchShift = update_lerp(EASING_LINEAR, 100.0f, 0.0f, N(MovePitchAdjustment) - 60, 60); - sfx_play_sound_with_params(SOUND_LRAW_0295, 0, 64, pitchShift); + sfx_play_sound_with_params(SOUND_FLIGHT, 0, 64, pitchShift); } } } @@ -1166,7 +1166,7 @@ API_CALLABLE(N(EnterMap)) { } } - sfx_play_sound_at_npc(SOUND_LRAW_0295, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_FLIGHT, SOUND_SPACE_MODE_0, NPC_PARTNER); playerStatus->anim = ANIM_MarioW2_RideLaki; playerStatus->animNotifyValue = 0; playerStatus->flags |= PS_FLAG_FACE_FORWARDS; diff --git a/src/world/partner/sushie.c b/src/world/partner/sushie.c index 533e8596f5..5d91009874 100644 --- a/src/world/partner/sushie.c +++ b/src/world/partner/sushie.c @@ -288,7 +288,7 @@ void N(update_riding_physics)(Npc* sushie) { if (N(DiveTime) >= 10) { if (!(partnerStatus->curButtons & BUTTON_C_DOWN) || N(DiveTime) >= 30) { sushie->curAnim = ANIM_WorldSushie_Rise; - sfx_play_sound_at_npc(SOUND_0294 | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_SUSHIE_DIVE | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0, NPC_PARTNER); N(DiveState) = DIVE_STATE_SURFACING; } } @@ -616,14 +616,14 @@ API_CALLABLE(N(UseAbility)) { if (sushie->curWall < 0 || sushie->curWall & COLLISION_WITH_ENTITY_BIT) { if (N(DiveState) == DIVE_STATE_DIVING && N(DiveTime) == 1) { - sfx_play_sound_at_npc(SOUND_0294, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_SUSHIE_DIVE, SOUND_SPACE_MODE_0, NPC_PARTNER); } break; } collider = get_collider_flags(sushie->curWall) & COLLIDER_FLAGS_SURFACE_TYPE_MASK; if (collider != SURFACE_TYPE_DOCK_WALL) { if (N(DiveState) == DIVE_STATE_DIVING && N(DiveTime) == 1) { - sfx_play_sound_at_npc(SOUND_0294, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_SUSHIE_DIVE, SOUND_SPACE_MODE_0, NPC_PARTNER); } break; } diff --git a/src/world/script_api/push_blocks.c b/src/world/script_api/push_blocks.c index 8e53c59412..486b8a6081 100644 --- a/src/world/script_api/push_blocks.c +++ b/src/world/script_api/push_blocks.c @@ -333,7 +333,7 @@ EvtScript EVS_PushWall_PushBlock = { EVT_END_IF // perform the push EVT_CALL(ClearPushedBlockFromGrid) - EVT_CALL(PlaySound, SOUND_2088) + EVT_CALL(PlaySound, SOUND_PUSH_BLOCK) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(UpdatePushBlockMotion) EVT_CALL(FinishPushBlockMotion) diff --git a/src/world_use_item.c b/src/world_use_item.c index 77f7948767..db38b899e2 100644 --- a/src/world_use_item.c +++ b/src/world_use_item.c @@ -124,7 +124,7 @@ EvtScript EVS_WorldItem_ShowUsedItem = { EvtScript EVS_WorldItem_PlayEatingSounds = { EVT_THREAD EVT_LOOP(4) - EVT_CALL(PlaySound, SOUND_2095) + EVT_CALL(PlaySound, SOUND_EAT_OR_DRINK) EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD @@ -137,7 +137,7 @@ EvtScript EVS_WorldItem_PlayEatingSounds = { EvtScript EVS_WorldItem_PlayDrinkingSounds = { EVT_THREAD EVT_LOOP(4) - EVT_CALL(PlaySound, SOUND_2095) + EVT_CALL(PlaySound, SOUND_EAT_OR_DRINK) EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index 4378c3763f..600e0712df 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -189,7 +189,7 @@ dead_GetValueByRef = 0x802E2F8C; dead_SetValueByRef = 0x802E2F30; dead_AssignPanelFlag = 0x8011A968; dead_ShakeCam = 0x802D8758; -dead_func_802D62E4 = 0x802E3934; +dead_StopTrackingSoundPos = 0x802E3934; dead_IsStartingConversation = 0x80048290; dead_ModifyGlobalOverrideFlags = 0x802E2EAC; dead_FindKeyItem = 0x802E4064; diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 9d0113a504..175a6f8cfa 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -342,8 +342,8 @@ get_defeated = 0x8003EDF0; // type:func rom:0x1A1F0 set_defeated = 0x8003EE40; // type:func rom:0x1A240 ShowMerleeCoinMessage = 0x8003EE98; // type:func rom:0x1A298 ShowMerleeRanOutMessage = 0x8003EECC; // type:func rom:0x1A2CC -FadeBackgroundToBlack = 0x8003EF00; // type:func rom:0x1A300 -UnfadeBackgroundFromBlack = 0x8003EF98; // type:func rom:0x1A398 +FadeBackgroundDarken = 0x8003EF00; // type:func rom:0x1A300 +FadeBackgroundLighten = 0x8003EF98; // type:func rom:0x1A398 FadeInMerlee = 0x8003F018; // type:func rom:0x1A418 FadeOutMerlee = 0x8003F084; // type:func rom:0x1A484 MerleeUpdateFX = 0x8003F0C4; // type:func rom:0x1A4C4 @@ -4621,26 +4621,26 @@ gWindowDisappearScales = 0x8014F2A8; // rom:0xE59A8 gWindowDisappearFlags = 0x8014F2B4; // rom:0xE59B4 gWindowGroups = 0x8014F2C0; // rom:0xE59C0 LoopingSounds = 0x8014F2D0; // rom:0xE59D0 -D_8014F48C = 0x8014F48C; // rom:0xE5B8C -D_8014F494 = 0x8014F494; // rom:0xE5B94 -D_8014F49C = 0x8014F49C; // rom:0xE5B9C -D_8014F4A4 = 0x8014F4A4; // rom:0xE5BA4 -D_8014F4AC = 0x8014F4AC; // rom:0xE5BAC -D_8014F4B4 = 0x8014F4B4; // rom:0xE5BB4 -D_8014F4BC = 0x8014F4BC; // rom:0xE5BBC -D_8014F4C4 = 0x8014F4C4; // rom:0xE5BC4 -D_8014F4CC = 0x8014F4CC; // rom:0xE5BCC -D_8014F4D4 = 0x8014F4D4; // rom:0xE5BD4 -D_8014F4DC = 0x8014F4DC; // rom:0xE5BDC +FireBar0Sounds = 0x8014F48C; // rom:0xE5B8C +FireBar1Sounds = 0x8014F494; // rom:0xE5B94 +FireBar2Sounds = 0x8014F49C; // rom:0xE5B9C +FireBar3Sounds = 0x8014F4A4; // rom:0xE5BA4 +FireBar4Sounds = 0x8014F4AC; // rom:0xE5BAC +FireBar5Sounds = 0x8014F4B4; // rom:0xE5BB4 +FireBar6Sounds = 0x8014F4BC; // rom:0xE5BBC +FireBar7Sounds = 0x8014F4C4; // rom:0xE5BC4 +FireBar8Sounds = 0x8014F4CC; // rom:0xE5BCC +FireBar9Sounds = 0x8014F4D4; // rom:0xE5BD4 +FireBarDeadSounds = 0x8014F4DC; // rom:0xE5BDC D_8014F4E4 = 0x8014F4E4; // rom:0xE5BE4 D_8014F4EC = 0x8014F4EC; // rom:0xE5BEC D_8014F4F4 = 0x8014F4F4; // rom:0xE5BF4 D_8014F4FC = 0x8014F4FC; // rom:0xE5BFC -D_8014F504 = 0x8014F504; // rom:0xE5C04 -D_8014F50C = 0x8014F50C; // rom:0xE5C0C +BooVanishSounds = 0x8014F504; // rom:0xE5C04 +BooAppearSounds = 0x8014F50C; // rom:0xE5C0C D_8014F514 = 0x8014F514; // rom:0xE5C14 D_8014F51C = 0x8014F51C; // rom:0xE5C1C -D_8014F524 = 0x8014F524; // rom:0xE5C24 +RavenLeapSounds = 0x8014F524; // rom:0xE5C24 D_8014F52C = 0x8014F52C; // rom:0xE5C2C D_8014F538 = 0x8014F538; // rom:0xE5C38 D_8014F540 = 0x8014F540; // rom:0xE5C40 @@ -5467,7 +5467,7 @@ PlaySound = 0x802D6150; // type:func rom:0xFAB00 PlaySoundWithVolume = 0x802D617C; // type:func rom:0xFAB2C PlaySoundAt = 0x802D61DC; // type:func rom:0xFAB8C StopSound = 0x802D62B8; // type:func rom:0xFAC68 -func_802D62E4 = 0x802D62E4; // type:func rom:0xFAC94 +StopTrackingSoundPos = 0x802D62E4; // type:func rom:0xFAC94 UseDoorSounds = 0x802D6314; // type:func rom:0xFACC4 UseRoomDoorSounds = 0x802D6340; // type:func rom:0xFACF0 PlaySoundAtF = 0x802D636C; // type:func rom:0xFAD1C @@ -5611,8 +5611,8 @@ spr_update_player_raster_cache = 0x802DEFB4; // type:func rom:0x1020A4 spr_load_npc_extra_anims = 0x802DF00C; // type:func rom:0x1020FC spr_allocate_components = 0x802DF2D8; // type:func rom:0x1023C8 spr_defaultQuad = 0x802DF390; // rom:0x102480 -D_802DF3D0 = 0x802DF3D0; // rom:0x1024C0 -D_802DF3E0 = 0x802DF3E0; // rom:0x1024D0 +SprPauseVp = 0x802DF3D0; // rom:0x1024C0 +SprPauseVpAlt = 0x802DF3E0; // rom:0x1024D0 D_802DF3F0 = 0x802DF3F0; // rom:0x1024E0 D_802DF428 = 0x802DF428; // rom:0x102518 D_802DF460 = 0x802DF460; // rom:0x102550 @@ -7533,7 +7533,7 @@ EVS_Enemy_HopToPos = 0x8029C12C; // rom:0x1CAA0C EVS_Enemy_AirLift = 0x8029C37C; // rom:0x1CAC5C EVS_Enemy_BlowAway = 0x8029C4A8; // rom:0x1CAD88 StarPowersTable = 0x8029C7D0; // rom:0x1CB0B0 -D_8029C890 = 0x8029C890; // rom:0x1CB170 +PartnerWishAnims = 0x8029C890; // rom:0x1CB170 D_8029CAAC = 0x8029CAAC; // rom:0x1CB38C D_8029CC00 = 0x8029CC00; // rom:0x1CB4E0 D_8029CC08 = 0x8029CC08; // rom:0x1CB4E8 @@ -11841,9 +11841,9 @@ b_area_omo_Formation_2B = 0x802306C0; // rom:0x52AC90 b_area_omo_Formation_2C = 0x80230714; // rom:0x52ACE4 b_area_omo_Formations = 0x80230730; // rom:0x52AD00 b_area_omo_Stages = 0x80230AC8; // rom:0x52B098 -b_area_omo2_general_guy_FadeBackgroundToBlack = 0x80218000; // type:func rom:0x52B6A0 +b_area_omo2_general_guy_FadeBackgroundDarken = 0x80218000; // type:func rom:0x52B6A0 D_80231110 = 0x80231110; // rom:0x52B6E0 -b_area_omo2_general_guy_UnfadeBackgroundToBlack = 0x80218098; // type:func rom:0x52B738 +b_area_omo2_general_guy_FadeBackgroundLighten = 0x80218098; // type:func rom:0x52B738 b_area_omo2_toy_tank_UpdateBulbGlow = 0x80218120; // type:func rom:0x52B7C0 func_802181F4_52B894 = 0x802181F4; // type:func rom:0x52B894 func_80218250_52B8F0 = 0x80218250; // type:func rom:0x52B8F0 @@ -12668,14 +12668,14 @@ b_area_tik2_StartRumbleWithParams = 0x80218000; // type:func rom:0x608AB0 b_area_tik2_SpitInk = 0x80218058; // type:func rom:0x608B08 dup_b_area_tik2_StartRumbleWithParams = 0x80218200; // type:func rom:0x608CB0 func_80218258_608D08 = 0x80218258; // type:func rom:0x608D08 -b_area_tik2_FadeBackgroundToBlack = 0x802182EC; // type:func rom:0x608D9C -b_area_tik2_UnfadeBackgroundToBlack = 0x80218384; // type:func rom:0x608E34 +b_area_tik2_FadeBackgroundDarken = 0x802182EC; // type:func rom:0x608D9C +b_area_tik2_FadeBackgroundLighten = 0x80218384; // type:func rom:0x608E34 func_80218404_608EB4 = 0x80218404; // type:func rom:0x608EB4 dup_b_area_tik2_SpitInk = 0x802184E4; // type:func rom:0x608F94 dup2_b_area_tik2_StartRumbleWithParams = 0x80218680; // type:func rom:0x609130 func_802186D8_609188 = 0x802186D8; // type:func rom:0x609188 -dup_b_area_tik2_FadeBackgroundToBlack = 0x8021876C; // type:func rom:0x60921C -dup_b_area_tik2_UnfadeBackgroundToBlack = 0x80218804; // type:func rom:0x6092B4 +dup_b_area_tik2_FadeBackgroundDarken = 0x8021876C; // type:func rom:0x60921C +dup_b_area_tik2_FadeBackgroundLighten = 0x80218804; // type:func rom:0x6092B4 dup2_b_area_tik2_SpitInk = 0x80218884; // type:func rom:0x609334 dup3_b_area_tik2_StartRumbleWithParams = 0x80218A20; // type:func rom:0x6094D0 b_area_tik2_SpawnDrainHealthStartFX = 0x80218A78; // type:func rom:0x609528 @@ -13606,20 +13606,20 @@ dup2_b_area_kpa_SetAbsoluteStatusOffsets = 0x80218514; // type:func rom:0x684F44 dup_b_area_kpa_StartRumbleWithParams = 0x802185E0; // type:func rom:0x685010 b_area_kpa_UnkFunc52 = 0x80218638; // type:func rom:0x685068 b_area_kpa_UnkSfxFunc = 0x80218700; // type:func rom:0x685130 -dup_b_area_kpa2_FadeBackgroundToBlack = 0x80218000; // type:func rom:0x69F200 -dup_b_area_kpa2_UnfadeBackgroundToBlack = 0x80218098; // type:func rom:0x69F298 +dup_b_area_kpa2_FadeBackgroundDarken = 0x80218000; // type:func rom:0x69F200 +dup_b_area_kpa2_FadeBackgroundLighten = 0x80218098; // type:func rom:0x69F298 dup_b_area_kpa2_StartRumbleWithParams = 0x80218120; // type:func rom:0x69F320 dup3_b_area_kpa2_UnkFireBreathFXFunc = 0x80218178; // type:func rom:0x69F378 func_802181E4_69F3E4 = 0x802181E4; // type:func rom:0x69F3E4 -dup2_b_area_kpa2_FadeBackgroundToBlack = 0x80218588; // type:func rom:0x69F788 -dup2_b_area_kpa2_UnfadeBackgroundToBlack = 0x80218620; // type:func rom:0x69F820 +dup2_b_area_kpa2_FadeBackgroundDarken = 0x80218588; // type:func rom:0x69F788 +dup2_b_area_kpa2_FadeBackgroundLighten = 0x80218620; // type:func rom:0x69F820 dup2_b_area_kpa2_RemoveChillOut = 0x802186A0; // type:func rom:0x69F8A0 func_802186D0_69F8D0 = 0x802186D0; // type:func rom:0x69F8D0 func_80218AA4_69FCA4 = 0x80218AA4; // type:func rom:0x69FCA4 dup2_b_area_kpa2_StartRumbleWithParams = 0x80218F00; // type:func rom:0x6A0100 func_80218F58_6A0158 = 0x80218F58; // type:func rom:0x6A0158 -dup3_b_area_kpa2_FadeBackgroundToBlack = 0x802192FC; // type:func rom:0x6A04FC -dup3_b_area_kpa2_UnfadeBackgroundToBlack = 0x80219394; // type:func rom:0x6A0594 +dup3_b_area_kpa2_FadeBackgroundDarken = 0x802192FC; // type:func rom:0x6A04FC +dup3_b_area_kpa2_FadeBackgroundLighten = 0x80219394; // type:func rom:0x6A0594 dup3_b_area_kpa2_RemoveChillOut = 0x80219414; // type:func rom:0x6A0614 func_80219444_6A0644 = 0x80219444; // type:func rom:0x6A0644 func_80219818_6A0A18 = 0x80219818; // type:func rom:0x6A0A18 @@ -13632,8 +13632,8 @@ dup_b_area_kpa2_CanPlayerLoseAction = 0x8021A1B8; // type:func rom:0x6A13B8 dup_b_area_kpa2_UnkFireBreathFXFunc = 0x8021A254; // type:func rom:0x6A1454 dup3_b_area_kpa2_StartRumbleWithParams = 0x8021A2C0; // type:func rom:0x6A14C0 func_8021A318_6A1518 = 0x8021A318; // type:func rom:0x6A1518 -dup4_b_area_kpa2_FadeBackgroundToBlack = 0x8021A6BC; // type:func rom:0x6A18BC -dup4_b_area_kpa2_UnfadeBackgroundToBlack = 0x8021A754; // type:func rom:0x6A1954 +dup4_b_area_kpa2_FadeBackgroundDarken = 0x8021A6BC; // type:func rom:0x6A18BC +dup4_b_area_kpa2_FadeBackgroundLighten = 0x8021A754; // type:func rom:0x6A1954 dup4_b_area_kpa2_RemoveChillOut = 0x8021A7D4; // type:func rom:0x6A19D4 func_8021A804_6A1A04 = 0x8021A804; // type:func rom:0x6A1A04 func_8021ABD8_6A1DD8 = 0x8021ABD8; // type:func rom:0x6A1DD8 @@ -13648,8 +13648,8 @@ func_8021B678_6A2878 = 0x8021B678; // type:func rom:0x6A2878 b_area_kpa2_StartRumbleWithParams = 0x8021B950; // type:func rom:0x6A2B50 func_8021B9A8_6A2BA8 = 0x8021B9A8; // type:func rom:0x6A2BA8 func_8021BC60_6A2E60 = 0x8021BC60; // type:func rom:0x6A2E60 -b_area_kpa2_FadeBackgroundToBlack = 0x8021C004; // type:func rom:0x6A3204 -b_area_kpa2_UnfadeBackgroundToBlack = 0x8021C09C; // type:func rom:0x6A329C +b_area_kpa2_FadeBackgroundDarken = 0x8021C004; // type:func rom:0x6A3204 +b_area_kpa2_FadeBackgroundLighten = 0x8021C09C; // type:func rom:0x6A329C b_area_kpa2_RemoveChillOut = 0x8021C11C; // type:func rom:0x6A331C func_8021C14C_6A334C = 0x8021C14C; // type:func rom:0x6A334C func_8021C520_6A3720 = 0x8021C520; // type:func rom:0x6A3720 @@ -13978,7 +13978,7 @@ battle_item_mushroom_main = 0x802A20CC; // rom:0x71691C battle_item_fire_flower_GiveRefund = 0x802A1000; // type:func rom:0x716C60 battle_item_fire_flower_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x716E34 battle_item_fire_flower_func_802A123C_716E9C = 0x802A123C; // type:func rom:0x716E9C -battle_item_fire_flower_FadeBackgroundToBlack = 0x802A12E0; // type:func rom:0x716F40 +battle_item_fire_flower_FadeBackgroundDarken = 0x802A12E0; // type:func rom:0x716F40 battle_item_fire_flower_func_802A1378_716FD8 = 0x802A1378; // type:func rom:0x716FD8 battle_item_fire_flower_UseItemWithEffect = 0x802A1400; // rom:0x717060 battle_item_fire_flower_UseItem = 0x802A1704; // rom:0x717364 @@ -14001,9 +14001,9 @@ battle_item_dusty_hammer_modelCommandList = 0x802A1B50; // rom:0x718520 battle_item_dusty_hammer_main = 0x802A1B6C; // rom:0x71853C battle_item_pow_block_GiveRefund = 0x802A1000; // type:func rom:0x718850 battle_item_pow_block_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x718A24 -battle_item_pow_block_func_802A123C_718A8C = 0x802A123C; // type:func rom:0x718A8C -battle_item_pow_block_func_802A12E4_718B34 = 0x802A12E4; // type:func rom:0x718B34 -battle_item_pow_block_func_802A1318_718B68 = 0x802A1318; // type:func rom:0x718B68 +battle_item_pow_block_ForceTriggerPOWBlockEntity = 0x802A123C; // type:func rom:0x718A8C +battle_item_pow_block_DeletePOWBlockEntity = 0x802A12E4; // type:func rom:0x718B34 +battle_item_pow_block_AdjustPOWBlockEntityScale = 0x802A1318; // type:func rom:0x718B68 battle_item_pow_block_UseItemWithEffect = 0x802A13A0; // rom:0x718BF0 battle_item_pow_block_UseItem = 0x802A16A4; // rom:0x718EF4 battle_item_pow_block_PlayerGoHome = 0x802A17D0; // rom:0x719020 @@ -14034,7 +14034,7 @@ battle_item_volt_shroom_DrinkItem = 0x802A17C4; // rom:0x71AFB4 battle_item_volt_shroom_main = 0x802A183C; // rom:0x71B02C battle_item_thunder_rage_GiveRefund = 0x802A1000; // type:func rom:0x71B1A0 battle_item_thunder_rage_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x71B374 -battle_item_thunder_rage_FadeBackgroundToBlack = 0x802A123C; // type:func rom:0x71B3DC +battle_item_thunder_rage_FadeBackgroundDarken = 0x802A123C; // type:func rom:0x71B3DC battle_item_thunder_rage_func_802A12D4_71B474 = 0x802A12D4; // type:func rom:0x71B474 battle_item_thunder_rage_func_802A1354_71B4F4 = 0x802A1354; // type:func rom:0x71B4F4 battle_item_thunder_rage_UseItemWithEffect = 0x802A14A0; // rom:0x71B640 @@ -14046,7 +14046,7 @@ battle_item_thunder_rage_main = 0x802A1A5C; // rom:0x71BBFC battle_item_snowman_doll_GiveRefund = 0x802A1000; // type:func rom:0x71BE30 battle_item_snowman_doll_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x71C004 battle_item_snowman_doll_func_802A123C_71C06C = 0x802A123C; // type:func rom:0x71C06C -battle_item_snowman_doll_FadeBackgroundToBlack = 0x802A1320; // type:func rom:0x71C150 +battle_item_snowman_doll_FadeBackgroundDarken = 0x802A1320; // type:func rom:0x71C150 battle_item_snowman_doll_func_802A13B8_71C1E8 = 0x802A13B8; // type:func rom:0x71C1E8 battle_item_snowman_doll_UseItemWithEffect = 0x802A1440; // rom:0x71C270 battle_item_snowman_doll_UseItem = 0x802A1744; // rom:0x71C574 @@ -14123,7 +14123,7 @@ battle_item_tasty_tonic_main = 0x802A189C; // rom:0x72289C battle_item_thunder_bolt_GiveRefund = 0x802A1000; // type:func rom:0x722B40 battle_item_thunder_bolt_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x722D14 battle_item_thunder_bolt_func_802A123C_722D7C = 0x802A123C; // type:func rom:0x722D7C -battle_item_thunder_bolt_FadeBackgroundToBlack = 0x802A1388; // type:func rom:0x722EC8 +battle_item_thunder_bolt_FadeBackgroundDarken = 0x802A1388; // type:func rom:0x722EC8 battle_item_thunder_bolt_func_802A1420_722F60 = 0x802A1420; // type:func rom:0x722F60 battle_item_thunder_bolt_UseItemWithEffect = 0x802A14A0; // rom:0x722FE0 battle_item_thunder_bolt_UseItem = 0x802A17A4; // rom:0x7232E4 @@ -14177,7 +14177,7 @@ battle_item_hustle_drink_DrinkItem = 0x802A1824; // rom:0x726784 battle_item_hustle_drink_main = 0x802A189C; // rom:0x7267FC battle_item_stop_watch_GiveRefund = 0x802A1000; // type:func rom:0x726DD0 battle_item_stop_watch_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x726FA4 -battle_item_stop_watch_FadeBackgroundToBlack = 0x802A123C; // type:func rom:0x72700C +battle_item_stop_watch_FadeBackgroundDarken = 0x802A123C; // type:func rom:0x72700C battle_item_stop_watch_func_802A12D4_7270A4 = 0x802A12D4; // type:func rom:0x7270A4 battle_item_stop_watch_UseItemWithEffect = 0x802A1360; // rom:0x727130 battle_item_stop_watch_UseItem = 0x802A1664; // rom:0x727434 @@ -14187,8 +14187,8 @@ battle_item_stop_watch_DrinkItem = 0x802A18A4; // rom:0x727674 battle_item_stop_watch_main = 0x802A191C; // rom:0x7276EC battle_item_dizzy_dial_GiveRefund = 0x802A1000; // type:func rom:0x727910 battle_item_dizzy_dial_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x727AE4 -func_802A123C_727B4C = 0x802A123C; // type:func rom:0x727B4C -battle_item_dizzy_dial_func_802A1270_727B80 = 0x802A1270; // type:func rom:0x727B80 +battle_item_dizzy_dial_worker_render_screen_blur = 0x802A123C; // type:func rom:0x727B4C +battle_item_dizzy_dial_AnimateDizzyDialCameraFX = 0x802A1270; // type:func rom:0x727B80 battle_item_dizzy_dial_UseItemWithEffect = 0x802A13D0; // rom:0x727CE0 battle_item_dizzy_dial_UseItem = 0x802A16D4; // rom:0x727FE4 battle_item_dizzy_dial_PlayerGoHome = 0x802A1800; // rom:0x728110 @@ -14244,7 +14244,7 @@ battle_item_insecticide_herb_modelCommandList = 0x802A1D30; // rom:0x72B480 battle_item_insecticide_herb_main = 0x802A1D4C; // rom:0x72B49C battle_item_fright_jar_GiveRefund = 0x802A1000; // type:func rom:0x72B910 battle_item_fright_jar_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x72BAE4 -battle_item_fright_jar_FadeBackgroundToBlack = 0x802A123C; // type:func rom:0x72BB4C +battle_item_fright_jar_FadeBackgroundDarken = 0x802A123C; // type:func rom:0x72BB4C battle_item_fright_jar_func_802A12D4_72BBE4 = 0x802A12D4; // type:func rom:0x72BBE4 battle_item_fright_jar_UseItemWithEffect = 0x802A1360; // rom:0x72BC70 battle_item_fright_jar_UseItem = 0x802A1664; // rom:0x72BF74 @@ -14595,108 +14595,108 @@ func_802A10E4_781A04 = 0x802A10E4; // type:func rom:0x781A04 battle_move_shrink_stomp_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x783BA0 battle_move_earthquake_jump_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x785B20 func_802A10E4_785C04 = 0x802A10E4; // type:func rom:0x785C04 -battle_star_focus_UnkStarFunc1 = 0x802A1000; // type:func rom:0x789E60 -battle_star_focus_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x789F0C -battle_star_focus_UnkStarFunc3 = 0x802A116C; // type:func rom:0x789FCC -battle_star_focus_UnkStarFunc4 = 0x802A1218; // type:func rom:0x78A078 -battle_star_focus_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x78A144 -battle_star_focus_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x78A1DC -battle_star_focus_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x78A274 -battle_star_focus_UnkStarFunc = 0x802A1494; // type:func rom:0x78A2F4 +battle_star_focus_SpawnStarSparkleFX = 0x802A1000; // type:func rom:0x789E60 +battle_star_focus_SpawnWishSparkleFX = 0x802A10AC; // type:func rom:0x789F0C +battle_star_focus_SpawnStarSpiritArriveFX = 0x802A116C; // type:func rom:0x789FCC +battle_star_focus_SpawnStarSpiritDepartFX = 0x802A1218; // type:func rom:0x78A078 +battle_star_focus_FadeBackgroundDarken = 0x802A12E4; // type:func rom:0x78A144 +battle_star_focus_FadeBackgroundDarkenForBeam = 0x802A137C; // type:func rom:0x78A1DC +battle_star_focus_FadeBackgroundLighten = 0x802A1414; // type:func rom:0x78A274 +battle_star_focus_SetPartnerWishAnim = 0x802A1494; // type:func rom:0x78A2F4 battle_star_focus_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x78A348 -func_802A1518_78A378 = 0x802A1518; // type:func rom:0x78A378 -func_802A15B0_78A410 = 0x802A15B0; // type:func rom:0x78A410 +battle_star_focus_RestoreStarPowerFromPlayer = 0x802A1518; // type:func rom:0x78A378 +battle_star_focus_RestoreStarPowerFromPartner = 0x802A15B0; // type:func rom:0x78A410 battle_star_focus_802A1630 = 0x802A1630; // rom:0x78A490 battle_star_focus_802A19C8 = 0x802A19C8; // rom:0x78A828 battle_star_focus_802A1D60 = 0x802A1D60; // rom:0x78ABC0 battle_star_focus_802A1F6C = 0x802A1F6C; // rom:0x78ADCC battle_star_focus_802A23BC = 0x802A23BC; // rom:0x78B21C battle_star_focus_EVS_UsePower = 0x802A24E8; // rom:0x78B348 -battle_star_refresh_UnkStarFunc1 = 0x802A1000; // type:func rom:0x78B600 -battle_star_refresh_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x78B6AC -battle_star_refresh_UnkStarFunc3 = 0x802A116C; // type:func rom:0x78B76C -battle_star_refresh_UnkStarFunc4 = 0x802A1218; // type:func rom:0x78B818 -battle_star_refresh_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x78B8E4 -battle_star_refresh_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x78B97C -battle_star_refresh_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x78BA14 -battle_star_refresh_UnkStarFunc = 0x802A1494; // type:func rom:0x78BA94 +battle_star_refresh_SpawnStarSparkleFX = 0x802A1000; // type:func rom:0x78B600 +battle_star_refresh_SpawnWishSparkleFX = 0x802A10AC; // type:func rom:0x78B6AC +battle_star_refresh_SpawnStarSpiritArriveFX = 0x802A116C; // type:func rom:0x78B76C +battle_star_refresh_SpawnStarSpiritDepartFX = 0x802A1218; // type:func rom:0x78B818 +battle_star_refresh_FadeBackgroundDarken = 0x802A12E4; // type:func rom:0x78B8E4 +battle_star_refresh_FadeBackgroundDarkenForBeam = 0x802A137C; // type:func rom:0x78B97C +battle_star_refresh_FadeBackgroundLighten = 0x802A1414; // type:func rom:0x78BA14 +battle_star_refresh_SetPartnerWishAnim = 0x802A1494; // type:func rom:0x78BA94 battle_star_refresh_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x78BAE8 -func_802A1518_78BB18 = 0x802A1518; // type:func rom:0x78BB18 -func_802A17D4_78BDD4 = 0x802A17D4; // type:func rom:0x78BDD4 +battle_move_refresh_FlyAroundPlayer = 0x802A1518; // type:func rom:0x78BB18 +battle_move_refresh_RemovePlayerDebuffs = 0x802A17D4; // type:func rom:0x78BDD4 battle_star_refresh_AddHP = 0x802A1840; // type:func rom:0x78BE40 battle_star_refresh_AddFP = 0x802A1894; // type:func rom:0x78BE94 -func_802A18E8_78BEE8 = 0x802A18E8; // type:func rom:0x78BEE8 -func_802A19A8_78BFA8 = 0x802A19A8; // type:func rom:0x78BFA8 +battle_star_refresh_SpawnHeartRecoverFX = 0x802A18E8; // type:func rom:0x78BEE8 +battle_star_refresh_SpawnFlowerRecoverFX = 0x802A19A8; // type:func rom:0x78BFA8 battle_star_refresh_802A1A70 = 0x802A1A70; // rom:0x78C070 battle_star_refresh_802A1E08 = 0x802A1E08; // rom:0x78C408 battle_star_refresh_802A21A0 = 0x802A21A0; // rom:0x78C7A0 battle_star_refresh_802A23AC = 0x802A23AC; // rom:0x78C9AC battle_star_refresh_802A27FC = 0x802A27FC; // rom:0x78CDFC battle_star_refresh_EVS_UsePower = 0x802A2928; // rom:0x78CF28 -battle_star_lullaby_UnkStarFunc1 = 0x802A1000; // type:func rom:0x78D150 -battle_star_lullaby_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x78D1FC -battle_star_lullaby_UnkStarFunc3 = 0x802A116C; // type:func rom:0x78D2BC -battle_star_lullaby_UnkStarFunc4 = 0x802A1218; // type:func rom:0x78D368 -battle_star_lullaby_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x78D434 -battle_star_lullaby_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x78D4CC -battle_star_lullaby_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x78D564 -battle_star_lullaby_UnkStarFunc = 0x802A1494; // type:func rom:0x78D5E4 +battle_star_lullaby_SpawnStarSparkleFX = 0x802A1000; // type:func rom:0x78D150 +battle_star_lullaby_SpawnWishSparkleFX = 0x802A10AC; // type:func rom:0x78D1FC +battle_star_lullaby_SpawnStarSpiritArriveFX = 0x802A116C; // type:func rom:0x78D2BC +battle_star_lullaby_SpawnStarSpiritDepartFX = 0x802A1218; // type:func rom:0x78D368 +battle_star_lullaby_FadeBackgroundDarken = 0x802A12E4; // type:func rom:0x78D434 +battle_star_lullaby_FadeBackgroundDarkenForBeam = 0x802A137C; // type:func rom:0x78D4CC +battle_star_lullaby_FadeBackgroundLighten = 0x802A1414; // type:func rom:0x78D564 +battle_star_lullaby_SetPartnerWishAnim = 0x802A1494; // type:func rom:0x78D5E4 battle_star_lullaby_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x78D638 -func_802A1518_78D668 = 0x802A1518; // type:func rom:0x78D668 +battle_star_lullaby_SpawnMusicNotesFX = 0x802A1518; // type:func rom:0x78D668 battle_star_lullaby_802A1620 = 0x802A1620; // rom:0x78D770 battle_star_lullaby_802A19B8 = 0x802A19B8; // rom:0x78DB08 battle_star_lullaby_802A1D50 = 0x802A1D50; // rom:0x78DEA0 battle_star_lullaby_802A1F5C = 0x802A1F5C; // rom:0x78E0AC battle_star_lullaby_802A23AC = 0x802A23AC; // rom:0x78E4FC battle_star_lullaby_EVS_UsePower = 0x802A24D8; // rom:0x78E628 -battle_star_star_storm_UnkStarFunc1 = 0x802A1000; // type:func rom:0x78E7D0 -battle_star_star_storm_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x78E87C -battle_star_star_storm_UnkStarFunc3 = 0x802A116C; // type:func rom:0x78E93C -battle_star_star_storm_UnkStarFunc4 = 0x802A1218; // type:func rom:0x78E9E8 -battle_star_star_storm_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x78EAB4 -battle_star_star_storm_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x78EB4C -battle_star_star_storm_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x78EBE4 -battle_star_star_storm_UnkStarFunc = 0x802A1494; // type:func rom:0x78EC64 +battle_star_star_storm_SpawnStarSparkleFX = 0x802A1000; // type:func rom:0x78E7D0 +battle_star_star_storm_SpawnWishSparkleFX = 0x802A10AC; // type:func rom:0x78E87C +battle_star_star_storm_SpawnStarSpiritArriveFX = 0x802A116C; // type:func rom:0x78E93C +battle_star_star_storm_SpawnStarSpiritDepartFX = 0x802A1218; // type:func rom:0x78E9E8 +battle_star_star_storm_FadeBackgroundDarken = 0x802A12E4; // type:func rom:0x78EAB4 +battle_star_star_storm_FadeBackgroundDarkenForBeam = 0x802A137C; // type:func rom:0x78EB4C +battle_star_star_storm_FadeBackgroundLighten = 0x802A1414; // type:func rom:0x78EBE4 +battle_star_star_storm_SetPartnerWishAnim = 0x802A1494; // type:func rom:0x78EC64 battle_star_star_storm_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x78ECB8 -func_802A1518_78ECE8 = 0x802A1518; // type:func rom:0x78ECE8 -func_802A1628_78EDF8 = 0x802A1628; // type:func rom:0x78EDF8 +battle_star_star_storm_func_802A1518_78ECE8 = 0x802A1518; // type:func rom:0x78ECE8 +battle_star_star_storm_func_802A1628_78EDF8 = 0x802A1628; // type:func rom:0x78EDF8 battle_star_star_storm_802A16F0 = 0x802A16F0; // rom:0x78EEC0 battle_star_star_storm_802A1A88 = 0x802A1A88; // rom:0x78F258 battle_star_star_storm_802A1E20 = 0x802A1E20; // rom:0x78F5F0 battle_star_star_storm_802A202C = 0x802A202C; // rom:0x78F7FC battle_star_star_storm_802A247C = 0x802A247C; // rom:0x78FC4C battle_star_star_storm_EVS_UsePower = 0x802A25A8; // rom:0x78FD78 -battle_star_chill_out_UnkStarFunc1 = 0x802A1000; // type:func rom:0x7900D0 -battle_star_chill_out_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79017C -battle_star_chill_out_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79023C -battle_star_chill_out_UnkStarFunc4 = 0x802A1218; // type:func rom:0x7902E8 -battle_star_chill_out_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x7903B4 -battle_star_chill_out_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x79044C -battle_star_chill_out_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x7904E4 -battle_star_chill_out_UnkStarFunc = 0x802A1494; // type:func rom:0x790564 +battle_star_chill_out_SpawnStarSparkleFX = 0x802A1000; // type:func rom:0x7900D0 +battle_star_chill_out_SpawnWishSparkleFX = 0x802A10AC; // type:func rom:0x79017C +battle_star_chill_out_SpawnStarSpiritArriveFX = 0x802A116C; // type:func rom:0x79023C +battle_star_chill_out_SpawnStarSpiritDepartFX = 0x802A1218; // type:func rom:0x7902E8 +battle_star_chill_out_FadeBackgroundDarken = 0x802A12E4; // type:func rom:0x7903B4 +battle_star_chill_out_FadeBackgroundDarkenForBeam = 0x802A137C; // type:func rom:0x79044C +battle_star_chill_out_FadeBackgroundLighten = 0x802A1414; // type:func rom:0x7904E4 +battle_star_chill_out_SetPartnerWishAnim = 0x802A1494; // type:func rom:0x790564 battle_star_chill_out_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x7905B8 -func_802A1518_7905E8 = 0x802A1518; // type:func rom:0x7905E8 -func_802A1528_7905F8 = 0x802A1528; // type:func rom:0x7905F8 -func_802A153C_79060C = 0x802A153C; // type:func rom:0x79060C -func_802A163C_79070C = 0x802A163C; // type:func rom:0x79070C -func_802A16F4_7907C4 = 0x802A16F4; // type:func rom:0x7907C4 +battle_star_chill_out_func_802A1518_7905E8 = 0x802A1518; // type:func rom:0x7905E8 +battle_star_chill_out_func_802A1528_7905F8 = 0x802A1528; // type:func rom:0x7905F8 +battle_star_chill_out_func_802A153C_79060C = 0x802A153C; // type:func rom:0x79060C +battle_star_chill_out_func_802A163C_79070C = 0x802A163C; // type:func rom:0x79070C +battle_star_chill_out_func_802A16F4_7907C4 = 0x802A16F4; // type:func rom:0x7907C4 battle_star_chill_out_802A18F0 = 0x802A18F0; // rom:0x7909C0 battle_star_chill_out_802A1C88 = 0x802A1C88; // rom:0x790D58 battle_star_chill_out_802A2020 = 0x802A2020; // rom:0x7910F0 battle_star_chill_out_802A222C = 0x802A222C; // rom:0x7912FC battle_star_chill_out_802A267C = 0x802A267C; // rom:0x79174C battle_star_chill_out_EVS_UsePower = 0x802A27A8; // rom:0x791878 -battle_star_smooch_UnkStarFunc1 = 0x802A1000; // type:func rom:0x791D90 -battle_star_smooch_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x791E3C -battle_star_smooch_UnkStarFunc3 = 0x802A116C; // type:func rom:0x791EFC -battle_star_smooch_UnkStarFunc4 = 0x802A1218; // type:func rom:0x791FA8 -battle_star_smooch_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x792074 -battle_star_smooch_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x79210C -battle_star_smooch_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x7921A4 -battle_star_smooch_UnkStarFunc = 0x802A1494; // type:func rom:0x792224 +battle_star_smooch_SpawnStarSparkleFX = 0x802A1000; // type:func rom:0x791D90 +battle_star_smooch_SpawnWishSparkleFX = 0x802A10AC; // type:func rom:0x791E3C +battle_star_smooch_SpawnStarSpiritArriveFX = 0x802A116C; // type:func rom:0x791EFC +battle_star_smooch_SpawnStarSpiritDepartFX = 0x802A1218; // type:func rom:0x791FA8 +battle_star_smooch_FadeBackgroundDarken = 0x802A12E4; // type:func rom:0x792074 +battle_star_smooch_FadeBackgroundDarkenForBeam = 0x802A137C; // type:func rom:0x79210C +battle_star_smooch_FadeBackgroundLighten = 0x802A1414; // type:func rom:0x7921A4 +battle_star_smooch_SetPartnerWishAnim = 0x802A1494; // type:func rom:0x792224 battle_star_smooch_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x792278 battle_star_smooch_AddHP = 0x802A1518; // type:func rom:0x7922A8 -func_802A156C_7922FC = 0x802A156C; // type:func rom:0x7922FC +battle_move_smooch_SpawnRecoverFX = 0x802A156C; // type:func rom:0x7922FC battle_star_smooch_802A1630 = 0x802A1630; // rom:0x7923C0 battle_star_smooch_802A19C8 = 0x802A19C8; // rom:0x792758 battle_star_smooch_802A1D60 = 0x802A1D60; // rom:0x792AF0 @@ -14704,14 +14704,14 @@ battle_star_smooch_802A1F6C = 0x802A1F6C; // rom:0x792CFC battle_star_smooch_802A23BC = 0x802A23BC; // rom:0x79314C battle_star_smooch_intTable_802A24E8 = 0x802A24E8; // rom:0x793278 battle_star_smooch_EVS_UsePower = 0x802A2510; // rom:0x7932A0 -battle_star_time_out_UnkStarFunc1 = 0x802A1000; // type:func rom:0x793D20 -battle_star_time_out_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x793DCC -battle_star_time_out_UnkStarFunc3 = 0x802A116C; // type:func rom:0x793E8C -battle_star_time_out_UnkStarFunc4 = 0x802A1218; // type:func rom:0x793F38 -battle_star_time_out_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x794004 -battle_star_time_out_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x79409C -battle_star_time_out_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x794134 -battle_star_time_out_UnkStarFunc = 0x802A1494; // type:func rom:0x7941B4 +battle_star_time_out_SpawnStarSparkleFX = 0x802A1000; // type:func rom:0x793D20 +battle_star_time_out_SpawnWishSparkleFX = 0x802A10AC; // type:func rom:0x793DCC +battle_star_time_out_SpawnStarSpiritArriveFX = 0x802A116C; // type:func rom:0x793E8C +battle_star_time_out_SpawnStarSpiritDepartFX = 0x802A1218; // type:func rom:0x793F38 +battle_star_time_out_FadeBackgroundDarken = 0x802A12E4; // type:func rom:0x794004 +battle_star_time_out_FadeBackgroundDarkenForBeam = 0x802A137C; // type:func rom:0x79409C +battle_star_time_out_FadeBackgroundLighten = 0x802A1414; // type:func rom:0x794134 +battle_star_time_out_SetPartnerWishAnim = 0x802A1494; // type:func rom:0x7941B4 battle_star_time_out_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x794208 battle_star_time_out_802A1520 = 0x802A1520; // rom:0x794240 battle_star_time_out_802A18B8 = 0x802A18B8; // rom:0x7945D8 @@ -14719,94 +14719,94 @@ battle_star_time_out_802A1C50 = 0x802A1C50; // rom:0x794970 battle_star_time_out_802A1E5C = 0x802A1E5C; // rom:0x794B7C battle_star_time_out_802A22AC = 0x802A22AC; // rom:0x794FCC battle_star_time_out_EVS_UsePower = 0x802A23D8; // rom:0x7950F8 -battle_star_up_and_away_UnkStarFunc1 = 0x802A1000; // type:func rom:0x7952E0 -battle_star_up_and_away_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79538C -battle_star_up_and_away_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79544C -battle_star_up_and_away_UnkStarFunc4 = 0x802A1218; // type:func rom:0x7954F8 -battle_star_up_and_away_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x7955C4 -battle_star_up_and_away_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x79565C -battle_star_up_and_away_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x7956F4 -battle_star_up_and_away_UnkStarFunc = 0x802A1494; // type:func rom:0x795774 +battle_star_up_and_away_SpawnStarSparkleFX = 0x802A1000; // type:func rom:0x7952E0 +battle_star_up_and_away_SpawnWishSparkleFX = 0x802A10AC; // type:func rom:0x79538C +battle_star_up_and_away_SpawnStarSpiritArriveFX = 0x802A116C; // type:func rom:0x79544C +battle_star_up_and_away_SpawnStarSpiritDepartFX = 0x802A1218; // type:func rom:0x7954F8 +battle_star_up_and_away_FadeBackgroundDarken = 0x802A12E4; // type:func rom:0x7955C4 +battle_star_up_and_away_FadeBackgroundDarkenForBeam = 0x802A137C; // type:func rom:0x79565C +battle_star_up_and_away_FadeBackgroundLighten = 0x802A1414; // type:func rom:0x7956F4 +battle_star_up_and_away_SetPartnerWishAnim = 0x802A1494; // type:func rom:0x795774 battle_star_up_and_away_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x7957C8 -func_802A1518_7957F8 = 0x802A1518; // type:func rom:0x7957F8 -func_802A15B4_795894 = 0x802A15B4; // type:func rom:0x795894 -func_802A1628_795908 = 0x802A1628; // type:func rom:0x795908 +battle_star_up_and_away_DarkenBackground = 0x802A1518; // type:func rom:0x7957F8 +battle_star_up_and_away_RestoreBackground = 0x802A15B4; // type:func rom:0x795894 +battle_star_up_and_away_ShouldTargetBeCaptured = 0x802A1628; // type:func rom:0x795908 battle_star_up_and_away_802A16D0 = 0x802A16D0; // rom:0x7959B0 battle_star_up_and_away_802A1A68 = 0x802A1A68; // rom:0x795D48 battle_star_up_and_away_802A1E00 = 0x802A1E00; // rom:0x7960E0 battle_star_up_and_away_802A200C = 0x802A200C; // rom:0x7962EC battle_star_up_and_away_802A245C = 0x802A245C; // rom:0x79673C battle_star_up_and_away_EVS_UsePower = 0x802A2588; // rom:0x796868 -battle_star_star_beam_UnkStarFunc1 = 0x802A1000; // type:func rom:0x796FC0 -battle_star_star_beam_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79706C -battle_star_star_beam_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79712C -battle_star_star_beam_UnkStarFunc4 = 0x802A1218; // type:func rom:0x7971D8 -battle_star_star_beam_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x7972A4 -battle_star_star_beam_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x79733C -battle_star_star_beam_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x7973D4 -battle_star_star_beam_UnkStarFunc = 0x802A1494; // type:func rom:0x797454 +battle_star_star_beam_SpawnStarSparkleFX = 0x802A1000; // type:func rom:0x796FC0 +battle_star_star_beam_SpawnWishSparkleFX = 0x802A10AC; // type:func rom:0x79706C +battle_star_star_beam_SpawnStarSpiritArriveFX = 0x802A116C; // type:func rom:0x79712C +battle_star_star_beam_SpawnStarSpiritDepartFX = 0x802A1218; // type:func rom:0x7971D8 +battle_star_star_beam_FadeBackgroundDarken = 0x802A12E4; // type:func rom:0x7972A4 +battle_star_star_beam_FadeBackgroundDarkenForBeam = 0x802A137C; // type:func rom:0x79733C +battle_star_star_beam_FadeBackgroundLighten = 0x802A1414; // type:func rom:0x7973D4 +battle_star_star_beam_SetPartnerWishAnim = 0x802A1494; // type:func rom:0x797454 battle_star_star_beam_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x7974A8 func_802A1518_7974D8 = 0x802A1518; // type:func rom:0x7974D8 func_802A2468_798428 = 0x802A2468; // type:func rom:0x798428 func_802A247C_79843C = 0x802A247C; // type:func rom:0x79843C -battle_star_star_beam_802A24F0 = 0x802A24F0; // rom:0x7984B0 +battle_star_star_beam_EVS_StarPower_WishForSpirit = 0x802A24F0; // rom:0x7984B0 battle_star_star_beam_802A2888 = 0x802A2888; // rom:0x798848 -battle_star_star_beam_802A2C20 = 0x802A2C20; // rom:0x798BE0 -battle_star_star_beam_802A2E2C = 0x802A2E2C; // rom:0x798DEC +battle_star_star_beam_EVS_StarPower_SpiritSummoned = 0x802A2C20; // rom:0x798BE0 +battle_star_star_beam_EVS_StarPower_SpiritDeparts = 0x802A2E2C; // rom:0x798DEC battle_star_star_beam_802A327C = 0x802A327C; // rom:0x79923C -battle_star_star_beam_802A33A8 = 0x802A33A8; // rom:0x799368 +battle_star_star_beam_EVS_PlayBeamFX = 0x802A33A8; // rom:0x799368 D_802A3514_7994D4 = 0x802A3514; // rom:0x7994D4 D_802A3534_7994F4 = 0x802A3534; // rom:0x7994F4 D_802A3554_799514 = 0x802A3554; // rom:0x799514 battle_star_star_beam_EVS_UsePower = 0x802A35B4; // rom:0x799574 -battle_star_peach_beam_UnkStarFunc1 = 0x802A1000; // type:func rom:0x7997B0 -battle_star_peach_beam_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79985C -battle_star_peach_beam_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79991C -battle_star_peach_beam_UnkStarFunc4 = 0x802A1218; // type:func rom:0x7999C8 -battle_star_peach_beam_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x799A94 -battle_star_peach_beam_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x799B2C -battle_star_peach_beam_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x799BC4 -battle_star_peach_beam_UnkStarFunc = 0x802A1494; // type:func rom:0x799C44 +battle_star_peach_beam_SpawnStarSparkleFX = 0x802A1000; // type:func rom:0x7997B0 +battle_star_peach_beam_SpawnWishSparkleFX = 0x802A10AC; // type:func rom:0x79985C +battle_star_peach_beam_SpawnStarSpiritArriveFX = 0x802A116C; // type:func rom:0x79991C +battle_star_peach_beam_SpawnStarSpiritDepartFX = 0x802A1218; // type:func rom:0x7999C8 +battle_star_peach_beam_FadeBackgroundDarken = 0x802A12E4; // type:func rom:0x799A94 +battle_star_peach_beam_FadeBackgroundDarkenForBeam = 0x802A137C; // type:func rom:0x799B2C +battle_star_peach_beam_FadeBackgroundLighten = 0x802A1414; // type:func rom:0x799BC4 +battle_star_peach_beam_SetPartnerWishAnim = 0x802A1494; // type:func rom:0x799C44 battle_star_peach_beam_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x799C98 func_802A1518_799CC8 = 0x802A1518; // type:func rom:0x799CC8 func_802A2468_79AC18 = 0x802A2468; // type:func rom:0x79AC18 func_802A247C_79AC2C = 0x802A247C; // type:func rom:0x79AC2C -battle_star_peach_beam_802A24F0 = 0x802A24F0; // rom:0x79ACA0 +battle_star_peach_beam_EVS_StarPower_WishForSpirit = 0x802A24F0; // rom:0x79ACA0 battle_star_peach_beam_802A2888 = 0x802A2888; // rom:0x79B038 -battle_star_peach_beam_802A2C20 = 0x802A2C20; // rom:0x79B3D0 -battle_star_peach_beam_802A2E2C = 0x802A2E2C; // rom:0x79B5DC +battle_star_peach_beam_EVS_StarPower_SpiritSummoned = 0x802A2C20; // rom:0x79B3D0 +battle_star_peach_beam_EVS_StarPower_SpiritDeparts = 0x802A2E2C; // rom:0x79B5DC battle_star_peach_beam_802A327C = 0x802A327C; // rom:0x79BA2C -battle_star_peach_beam_802A33A8 = 0x802A33A8; // rom:0x79BB58 +battle_star_peach_beam_EVS_PlayBeamFX = 0x802A33A8; // rom:0x79BB58 battle_star_peach_beam_D_802A3514_7FCCC4 = 0x802A3514; // rom:0x79BCC4 battle_star_peach_beam_D_802A3534_7FCCE4 = 0x802A3534; // rom:0x79BCE4 battle_star_peach_beam_D_802A3554_7FCD04 = 0x802A3554; // rom:0x79BD04 battle_star_peach_beam_EVS_UsePower = 0x802A35B4; // rom:0x79BD64 -battle_star_peach_focus_UnkStarFunc1 = 0x802A1000; // type:func rom:0x79BFA0 -battle_star_peach_focus_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79C04C -battle_star_peach_focus_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79C10C -battle_star_peach_focus_UnkStarFunc4 = 0x802A1218; // type:func rom:0x79C1B8 -battle_star_peach_focus_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x79C284 -battle_star_peach_focus_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x79C31C -battle_star_peach_focus_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x79C3B4 -battle_star_peach_focus_UnkStarFunc = 0x802A1494; // type:func rom:0x79C434 +battle_star_peach_focus_SpawnStarSparkleFX = 0x802A1000; // type:func rom:0x79BFA0 +battle_star_peach_focus_SpawnWishSparkleFX = 0x802A10AC; // type:func rom:0x79C04C +battle_star_peach_focus_SpawnStarSpiritArriveFX = 0x802A116C; // type:func rom:0x79C10C +battle_star_peach_focus_SpawnStarSpiritDepartFX = 0x802A1218; // type:func rom:0x79C1B8 +battle_star_peach_focus_FadeBackgroundDarken = 0x802A12E4; // type:func rom:0x79C284 +battle_star_peach_focus_FadeBackgroundDarkenForBeam = 0x802A137C; // type:func rom:0x79C31C +battle_star_peach_focus_FadeBackgroundLighten = 0x802A1414; // type:func rom:0x79C3B4 +battle_star_peach_focus_SetPartnerWishAnim = 0x802A1494; // type:func rom:0x79C434 battle_star_peach_focus_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x79C488 -func_802A1518_79C4B8 = 0x802A1518; // type:func rom:0x79C4B8 +battle_move_peach_focus_IncreaseTwinkDefense = 0x802A1518; // type:func rom:0x79C4B8 battle_star_peach_focus_802A1530 = 0x802A1530; // rom:0x79C4D0 battle_star_peach_focus_802A18C8 = 0x802A18C8; // rom:0x79C868 battle_star_peach_focus_802A1C60 = 0x802A1C60; // rom:0x79CC00 battle_star_peach_focus_802A1E6C = 0x802A1E6C; // rom:0x79CE0C battle_star_peach_focus_802A22BC = 0x802A22BC; // rom:0x79D25C battle_star_peach_focus_EVS_UsePower = 0x802A23E8; // rom:0x79D388 -battle_star_peach_dash_UnkStarFunc1 = 0x802A1000; // type:func rom:0x79D8A0 -battle_star_peach_dash_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79D94C -battle_star_peach_dash_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79DA0C -battle_star_peach_dash_UnkStarFunc4 = 0x802A1218; // type:func rom:0x79DAB8 -battle_star_peach_dash_FadeBackgroundToBlack = 0x802A12E4; // type:func rom:0x79DB84 -battle_star_peach_dash_UnkBackgroundFunc2 = 0x802A137C; // type:func rom:0x79DC1C -battle_star_peach_dash_UnkBackgroundFunc = 0x802A1414; // type:func rom:0x79DCB4 -battle_star_peach_dash_UnkStarFunc = 0x802A1494; // type:func rom:0x79DD34 +battle_star_peach_dash_SpawnStarSparkleFX = 0x802A1000; // type:func rom:0x79D8A0 +battle_star_peach_dash_SpawnWishSparkleFX = 0x802A10AC; // type:func rom:0x79D94C +battle_star_peach_dash_SpawnStarSpiritArriveFX = 0x802A116C; // type:func rom:0x79DA0C +battle_star_peach_dash_SpawnStarSpiritDepartFX = 0x802A1218; // type:func rom:0x79DAB8 +battle_star_peach_dash_FadeBackgroundDarken = 0x802A12E4; // type:func rom:0x79DB84 +battle_star_peach_dash_FadeBackgroundDarkenForBeam = 0x802A137C; // type:func rom:0x79DC1C +battle_star_peach_dash_FadeBackgroundLighten = 0x802A1414; // type:func rom:0x79DCB4 +battle_star_peach_dash_SetPartnerWishAnim = 0x802A1494; // type:func rom:0x79DD34 battle_star_peach_dash_SetNpcCollision32 = 0x802A14E8; // type:func rom:0x79DD88 -func_802A1518_79DDB8 = 0x802A1518; // type:func rom:0x79DDB8 +battle_move_twink_dash_RestoreStarPower = 0x802A1518; // type:func rom:0x79DDB8 battle_star_peach_dash_802A15B0 = 0x802A15B0; // rom:0x79DE50 battle_star_peach_dash_802A1948 = 0x802A1948; // rom:0x79E1E8 battle_star_peach_dash_802A1CE0 = 0x802A1CE0; // rom:0x79E580 diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 5eeeeb38a5..60417db4f1 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -428,7 +428,7 @@ dead_PlayAmbientSounds = PlayAmbientSounds + 0xD650; dead_PlaySound = PlaySound + 0xD650; dead_PlaySoundAt = PlaySoundAt + 0xD650; dead_StopSound = StopSound + 0xD650; -dead_func_802D62E4 = func_802D62E4 + 0xD650; +dead_StopTrackingSoundPos = StopTrackingSoundPos + 0xD650; dead_ShowKeyChoicePopup = ShowKeyChoicePopup + 0xD650; dead_ShowConsumableChoicePopup = ShowConsumableChoicePopup + 0xD650; dead_RemoveKeyItemAt = RemoveKeyItemAt + 0xD650;