From 38c7785bfd372698133a81a604769527dfc59335 Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Sat, 5 Aug 2023 01:24:23 -0400 Subject: [PATCH] CRASH (#1109) * sounds 1 * identify looping sounds * standardize sound names * more sounds * more sounds * ow ow ow * 2 more --------- Co-authored-by: HailSanta --- include/enums.h | 2284 +++++++++-------- src/16F740.c | 8 +- src/17D6A0.c | 980 +++---- src/17FEB0.c | 4 +- src/18C790.c | 8 +- src/18F340.c | 30 +- src/190B20.c | 6 +- src/19FAF0.c | 36 +- src/1A5830.c | 4 +- src/1AC760.c | 22 +- src/23680.c | 6 +- src/7bb60_len_41b0.c | 2 +- src/80850_len_3060.c | 6 +- src/C50A0.c | 44 +- src/audio/sfx.c | 367 +-- src/audio/sfx_player.c | 4 +- src/battle/action_cmd.c | 2 +- src/battle/action_cmd/air_lift.c | 6 +- src/battle/action_cmd/air_raid.c | 6 +- src/battle/action_cmd/body_slam.c | 8 +- src/battle/action_cmd/bomb.c | 6 +- src/battle/action_cmd/dizzy_shell.c | 6 +- src/battle/action_cmd/fire_shell.c | 6 +- src/battle/action_cmd/hammer.c | 8 +- src/battle/action_cmd/mega_shock.c | 6 +- src/battle/action_cmd/power_shock.c | 6 +- src/battle/action_cmd/smack.c | 6 +- src/battle/action_cmd/spiny_surge.c | 6 +- src/battle/action_cmd/spook.c | 6 +- src/battle/action_cmd/squirt.c | 8 +- src/battle/action_cmd/tidal_wave.c | 4 +- src/battle/action_cmd/water_block.c | 10 +- src/battle/area/arn/actor/tubba_blubba.c | 4 +- src/battle/area/arn/actor/tubbas_heart.c | 4 +- src/battle/area/dgb/actor/tubba_blubba.c | 4 +- src/battle/area/dig/actor/tubba_blubba.c | 4 +- src/battle/area/flo2/actor/huff_n_puff.c | 278 +- src/battle/area/flo2/actor/spike.c | 4 +- src/battle/area/hos/actor/goombario_tutor.c | 2 +- src/battle/area/hos/actor/magikoopa.c | 20 +- .../area/isk_part_2/actor/chain_chomp.c | 4 +- src/battle/area/isk_part_2/actor/tutankoopa.c | 22 +- src/battle/area/kgr/actor/fuzzipede.c | 4 +- src/battle/area/kkj/actor/kammy_koopa.c | 2 +- .../area/kmr_part_2/actor/blue_goomba_1.c | 2 +- .../area/kmr_part_2/actor/goomba_king.c | 14 +- .../area/kmr_part_2/actor/goomnut_tree.c | 4 +- .../area/kmr_part_2/actor/red_goomba_1.c | 2 +- .../area/kmr_part_3/actor/egg_jr_troopa.c | 2 +- .../area/kmr_part_3/actor/final_jr_troopa.c | 22 +- src/battle/area/kmr_part_3/actor/jr_troopa.c | 2 +- .../area/kmr_part_3/actor/mage_jr_troopa.c | 6 +- .../area/kmr_part_3/actor/para_jr_troopa.c | 8 +- .../kmr_part_3/actor/spiked_para_jr_troopa.c | 8 +- .../kmr_part_3/actor/tutorial_paragoomba.c | 4 +- src/battle/area/kpa2/actor/bowser_intro.c | 6 +- src/battle/area/kpa2/actor/bowser_phase_1.c | 14 +- src/battle/area/kpa2/actor/bowser_phase_2.c | 16 +- src/battle/area/kpa2/actor/bowser_phase_3.c | 20 +- src/battle/area/kpa4/actor/bombshell_bill.c | 2 +- .../area/kpa4/actor/bombshell_bill_blaster.c | 2 +- src/battle/area/kzn2/actor/lava_bud.c | 10 +- src/battle/area/kzn2/actor/lava_piranha.c | 52 +- src/battle/area/kzn2/actor/petit_piranha.c | 4 +- src/battle/area/mac/actor/chan.c | 4 +- src/battle/area/mac/actor/lee.c | 24 +- src/battle/area/mac/actor/master1.c | 2 +- src/battle/area/mac/actor/master2.c | 18 +- src/battle/area/mac/actor/master3.c | 36 +- src/battle/area/nok/actor/kent_c_koopa.c | 14 +- src/battle/area/omo2/actor/general_guy.c | 8 +- src/battle/area/omo2/actor/light_bulb.c | 2 +- src/battle/area/omo2/actor/toy_tank.c | 4 +- src/battle/area/omo2_1/actor/shy_squad.c | 38 +- src/battle/area/omo2_2/actor/stilt_guy.c | 26 +- src/battle/area/omo2_3/actor/shy_stack.c | 22 +- src/battle/area/omo2_4/actor/signal_guy.c | 2 +- .../area/omo3/actor/big_lantern_ghost.c | 42 +- src/battle/area/pra2/actor/crystal_bit.c | 4 +- src/battle/area/pra2/actor/crystal_king.c | 36 +- src/battle/area/sam2/actor/monstar.c | 6 +- src/battle/area/tik2/actor/blooper.c | 14 +- src/battle/area/tik2/actor/blooper_baby.c | 18 +- src/battle/area/tik2/actor/electro_blooper.c | 16 +- src/battle/area/tik2/actor/super_blooper.c | 20 +- .../trd_part_2/actor/common_koopa_bros.inc.c | 16 +- .../area/trd_part_2/actor/fake_bowser.c | 46 +- src/battle/btl_evt_library.c | 2 +- src/battle/common/actor/albino_dino.inc.c | 6 +- src/battle/common/actor/anti_guy.inc.c | 16 +- src/battle/common/actor/bandit.inc.c | 18 +- src/battle/common/actor/bill_blaster.inc.c | 2 +- src/battle/common/actor/blue_shy_guy.inc.c | 16 +- src/battle/common/actor/bob_omb.inc.c | 4 +- src/battle/common/actor/bony_beetle.inc.c | 2 +- src/battle/common/actor/bullet_bill.inc.c | 2 +- src/battle/common/actor/buzzy_beetle.inc.c | 4 +- src/battle/common/actor/bzzap.inc.c | 6 +- src/battle/common/actor/dark_koopa.inc.c | 4 +- src/battle/common/actor/dark_paratroopa.inc.c | 6 +- src/battle/common/actor/dry_bones.inc.c | 12 +- src/battle/common/actor/duplighost.inc.c | 4 +- .../actor/duplighost/ghost_goombario.inc.c | 8 +- .../actor/duplighost/ghost_lakilester.inc.c | 2 +- .../actor/duplighost/ghost_sushie.inc.c | 14 +- .../common/actor/duplighost/ghost_watt.inc.c | 2 +- src/battle/common/actor/ember.inc.c | 12 +- src/battle/common/actor/forest_fuzzy.inc.c | 8 +- src/battle/common/actor/frost_piranha.inc.c | 2 +- src/battle/common/actor/fuzzy.inc.c | 8 +- src/battle/common/actor/gray_magikoopa.inc.c | 8 +- src/battle/common/actor/green_magikoopa.inc.c | 8 +- src/battle/common/actor/green_shy_guy.inc.c | 16 +- src/battle/common/actor/groove_guy.inc.c | 42 +- src/battle/common/actor/hammer_bro.inc.c | 8 +- src/battle/common/actor/hurt_plant.inc.c | 2 +- src/battle/common/actor/hyper_cleft.inc.c | 4 +- src/battle/common/actor/hyper_goomba.inc.c | 6 +- .../common/actor/hyper_paragoomba.inc.c | 10 +- src/battle/common/actor/jungle_fuzzy.inc.c | 12 +- src/battle/common/actor/koopa_troopa.inc.c | 4 +- src/battle/common/actor/koopatrol.inc.c | 14 +- src/battle/common/actor/lava_bubble.inc.c | 12 +- src/battle/common/actor/magikoopa.inc.c | 20 +- src/battle/common/actor/medi_guy.inc.c | 16 +- src/battle/common/actor/paragloomba.inc.c | 4 +- src/battle/common/actor/paragoomba.inc.c | 4 +- src/battle/common/actor/paratroopa.inc.c | 6 +- src/battle/common/actor/pink_shy_guy.inc.c | 16 +- src/battle/common/actor/pokey.inc.c | 20 +- src/battle/common/actor/pokey_mummy.inc.c | 8 +- src/battle/common/actor/putrid_piranha.inc.c | 2 +- src/battle/common/actor/pyro_guy.inc.c | 8 +- src/battle/common/actor/red_magikoopa.inc.c | 8 +- src/battle/common/actor/red_shy_guy.inc.c | 16 +- src/battle/common/actor/sky_guy.inc.c | 26 +- src/battle/common/actor/spear_guy.inc.c | 42 +- src/battle/common/actor/spike_top.inc.c | 4 +- src/battle/common/actor/spiny.inc.c | 2 +- src/battle/common/actor/spy_guy.inc.c | 8 +- src/battle/common/actor/stone_chomp.inc.c | 36 +- src/battle/common/actor/swoopula.inc.c | 20 +- src/battle/common/actor/white_magikoopa.inc.c | 14 +- .../common/actor/yellow_magikoopa.inc.c | 10 +- src/battle/common/actor/yellow_shy_guy.inc.c | 16 +- src/battle/common/move/HammerSupport.inc.c | 38 +- src/battle/common/move/JumpSupport.inc.c | 2 +- src/battle/common/move/StarBeamSupport.inc.c | 32 +- src/battle/move/hammer/attack.c | 26 +- src/battle/move/hammer/auto_smash.c | 8 +- src/battle/move/hammer/d_down_pound.c | 6 +- src/battle/move/hammer/hammer_charge_0.c | 26 +- src/battle/move/hammer/hammer_charge_1.c | 26 +- src/battle/move/hammer/hammer_charge_2.c | 26 +- src/battle/move/hammer/hammer_throw.c | 22 +- src/battle/move/hammer/mega_quake.c | 12 +- src/battle/move/hammer/mega_smash.c | 8 +- src/battle/move/hammer/power_quake.c | 12 +- src/battle/move/hammer/power_smash.c | 8 +- src/battle/move/hammer/quake_hammer.c | 12 +- src/battle/move/hammer/shell_crack.c | 8 +- src/battle/move/hammer/shrink_smash.c | 8 +- src/battle/move/hammer/spin_smash.c | 12 +- src/battle/move/hammer/super_smash.c | 8 +- src/battle/move/item/egg_missile.c | 2 +- src/battle/move/item/electro_pop.c | 2 +- src/battle/move/item/fire_flower.c | 2 +- src/battle/move/item/fright_jar.c | 2 +- src/battle/move/item/hustle_drink.c | 4 +- src/battle/move/item/insecticide_herb.c | 2 +- src/battle/move/item/mystery.c | 4 +- src/battle/move/item/repel_gel.c | 4 +- src/battle/move/item/shooting_star.c | 8 +- src/battle/move/item/sleepy_sheep.c | 2 +- src/battle/move/item/snowman_doll.c | 2 +- src/battle/move/item/stone_cap.c | 4 +- src/battle/move/item/stop_watch.c | 2 +- src/battle/move/item/strange_cake.c | 4 +- src/battle/move/item/thunder_bolt.c | 4 +- src/battle/move/item/thunder_rage.c | 4 +- src/battle/move/item/volt_shroom.c | 2 +- src/battle/move/jump/attack.c | 48 +- src/battle/move/jump/auto_jump.c | 18 +- src/battle/move/jump/auto_multibounce.c | 78 +- src/battle/move/jump/d_down_jump.c | 32 +- src/battle/move/jump/demo_power_bounce.c | 60 +- src/battle/move/jump/dizzy_stomp.c | 18 +- src/battle/move/jump/earthquake_jump.c | 60 +- src/battle/move/jump/jump_charge_0.c | 6 +- src/battle/move/jump/jump_charge_1.c | 6 +- src/battle/move/jump/jump_charge_2.c | 6 +- src/battle/move/jump/mega_jump.c | 12 +- src/battle/move/jump/multibounce.c | 78 +- src/battle/move/jump/power_bounce.c | 60 +- src/battle/move/jump/power_jump.c | 12 +- src/battle/move/jump/shrink_stomp.c | 18 +- src/battle/move/jump/sleep_stomp.c | 18 +- src/battle/move/jump/super_jump.c | 12 +- src/battle/move/star_power/chill_out.c | 14 +- src/battle/move/star_power/focus.c | 10 +- src/battle/move/star_power/lullaby.c | 12 +- src/battle/move/star_power/peach_focus.c | 12 +- src/battle/move/star_power/refresh.c | 12 +- src/battle/move/star_power/smooch.c | 14 +- src/battle/move/star_power/star_storm.c | 18 +- src/battle/move/star_power/time_out.c | 14 +- src/battle/move/star_power/twink_dash.c | 10 +- src/battle/move/star_power/up_and_away.c | 12 +- src/battle/partner/bombette.c | 26 +- src/battle/partner/goombario.c | 20 +- src/battle/partner/kooper.c | 6 +- src/battle/partner/lakilester.c | 6 +- src/battle/partner/parakarry.c | 8 +- src/battle/partner/sushie.c | 22 +- src/battle/partner/twink.c | 6 +- src/battle/partner/watt.c | 12 +- src/common/ActorJumpToPos.inc.c | 2 +- src/common/UnkSfxFunc.inc.c | 4 +- src/effects/disable_x.c | 2 +- src/effects/star.c | 2 +- src/encounter.c | 18 +- src/entity/Block.c | 6 +- src/entity/Chest.c | 2 +- src/entity/HeartBlock.c | 2 +- src/entity/ShatteringBlock.c | 2 +- src/entity/Switch.c | 8 +- src/entity/default/Padlock.c | 8 +- src/entity/jan_iwa/Plants1.c | 10 +- src/entity/jan_iwa/Plants2.c | 8 +- src/evt/fx_api.c | 2 +- src/filemenu/filemenu_createfile.c | 12 +- src/filemenu/filemenu_main.c | 6 +- src/filemenu/filemenu_selectlanguage.c | 6 +- src/i_spy.c | 2 +- src/msg.c | 18 +- src/pulse_stone.c | 2 +- src/state_title_screen.c | 2 +- src/world/action/hammer.c | 30 +- src/world/action/hit_lava.c | 4 +- src/world/action/land.c | 6 +- src/world/action/slide.c | 6 +- src/world/action/sneaky_parasol.c | 8 +- src/world/action/spin.c | 8 +- src/world/action/spin_jump.c | 2 +- src/world/action/tornado_jump.c | 4 +- src/world/action/use_munchlesia.c | 2 +- src/world/area_arn/arn_05/arn_05_3_npc.c | 16 +- src/world/area_arn/arn_07/arn_07_2_main.c | 34 +- src/world/area_arn/arn_07/arn_07_3_windmill.c | 2 +- src/world/area_arn/arn_07/arn_07_4_entity.c | 2 +- src/world/area_arn/arn_07/arn_07_5_npc.c | 18 +- src/world/area_arn/arn_08/arn_08_2_main.c | 6 +- src/world/area_arn/arn_08/arn_08_4_gears.c | 2 +- src/world/area_arn/arn_09/arn_09_5_npc.c | 4 +- src/world/area_arn/arn_10/arn_10_3_npc.c | 6 +- src/world/area_arn/arn_11/arn_11_2_main.c | 4 +- src/world/area_arn/arn_11/arn_11_3_npc.c | 6 +- src/world/area_arn/arn_12/arn_12_3_npc.c | 6 +- src/world/area_arn/arn_13/arn_13_3_npc.c | 6 +- src/world/area_dgb/dgb_00/dgb_00_3_npc.c | 32 +- src/world/area_dgb/dgb_01/dgb_01_3_bridges.c | 20 +- src/world/area_dgb/dgb_01/dgb_01_4_entity.c | 2 +- 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_03/dgb_03_4_entity.c | 2 +- src/world/area_dgb/dgb_08/dgb_08_3_npc.c | 4 +- src/world/area_dgb/dgb_15/dgb_15_4_entity.c | 2 +- src/world/area_dgb/dgb_18/dgb_18_3_npc.c | 2 +- src/world/area_dro/dro_01/dro_01_2_main.c | 2 +- src/world/area_dro/dro_01/npc_shop_owner.c | 4 +- src/world/area_dro/dro_02/dro_02_3_main.c | 2 +- src/world/area_dro/dro_02/dro_02_5_npc.c | 2 +- src/world/area_dro/dro_02/npc_merlee.c | 52 +- src/world/area_end/end_00/end_00_4_allies.c | 4 +- src/world/area_flo/common/DroppingVine.inc.c | 2 +- src/world/area_flo/common/LogBridge.inc.c | 4 +- src/world/area_flo/flo_00/flo_00_2_main.c | 8 +- src/world/area_flo/flo_00/flo_00_3_npc.c | 4 +- .../area_flo/flo_00/flo_00_5_beanstalk.c | 6 +- src/world/area_flo/flo_03/flo_03_3_npc.c | 12 +- src/world/area_flo/flo_07/flo_07_1_music.c | 2 +- src/world/area_flo/flo_07/flo_07_3_npc.c | 6 +- src/world/area_flo/flo_08/flo_08_4_npc.c | 2 +- src/world/area_flo/flo_10/flo_10_1_music.c | 2 +- src/world/area_flo/flo_10/flo_10_4_fountain.c | 2 +- src/world/area_flo/flo_10/flo_10_5_npc.c | 2 +- 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_14/flo_14_3_bubbles.c | 10 +- src/world/area_flo/flo_15/flo_15_5_stairs.c | 2 +- src/world/area_flo/flo_18/flo_18_1_music.c | 2 +- src/world/area_flo/flo_18/flo_18_3_machine.c | 26 +- src/world/area_flo/flo_18/flo_18_4_npc.c | 6 +- .../area_flo/flo_19/flo_19_5_beanstalk.c | 4 +- src/world/area_flo/flo_21/flo_21_2_main.c | 10 +- src/world/area_flo/flo_21/flo_21_4_npc.c | 6 +- src/world/area_flo/flo_22/flo_22_4_well.c | 2 +- src/world/area_flo/flo_23/flo_23_3_npc.c | 2 +- src/world/area_flo/flo_24/flo_24_1_music.c | 2 +- src/world/area_flo/flo_24/flo_24_4_water.c | 2 +- src/world/area_flo/flo_25/flo_25_3_npc.c | 2 +- src/world/area_hos/common/FallingStars.inc.c | 4 +- src/world/area_hos/hos_01/hos_01_4_npc.c | 2 +- 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_04/hos_04_7_starship.c | 2 +- src/world/area_hos/hos_05/hos_05_1_music.c | 4 +- src/world/area_hos/hos_05/hos_05_4_npc.c | 20 +- src/world/area_hos/hos_05/hos_05_5_intro.c | 4 +- src/world/area_hos/hos_05/hos_05_7_model_fx.c | 4 +- .../area_hos/hos_05/hos_05_8_star_ship.c | 4 +- .../area_hos/hos_06/hos_06_5_merluvlee.c | 10 +- src/world/area_hos/hos_10/hos_10_7_ending.c | 2 +- src/world/area_hos/hos_20/hos_20_2_starship.c | 18 +- src/world/area_isk/isk_02/isk_02_2_lock.c | 4 +- src/world/area_isk/isk_02/isk_02_3_ambush.c | 2 +- src/world/area_isk/isk_03/isk_03_2_sand.c | 6 +- .../area_isk/isk_04/isk_04_3_obstructions.c | 4 +- src/world/area_isk/isk_05/isk_05_3_npc.c | 6 +- src/world/area_isk/isk_06/isk_06_3_sand.c | 6 +- src/world/area_isk/isk_07/isk_07_4_stairs.c | 8 +- src/world/area_isk/isk_07/isk_07_5_lock.c | 8 +- src/world/area_isk/isk_07/isk_07_7_ambush.c | 2 +- src/world/area_isk/isk_09/isk_09_4_stairs.c | 8 +- src/world/area_isk/isk_11/isk_11_4_scene.c | 14 +- src/world/area_isk/isk_11/isk_11_5_puzzle.c | 20 +- src/world/area_isk/isk_11/isk_11_6_lock.c | 4 +- src/world/area_isk/isk_12/isk_12_3_sand.c | 6 +- src/world/area_isk/isk_12/isk_12_4_switch.c | 16 +- src/world/area_isk/isk_16/isk_16_1_main.c | 10 +- src/world/area_isk/isk_16/isk_16_3_boss.c | 8 +- src/world/area_iwa/iwa_00/iwa_00_1_main.c | 4 +- src/world/area_iwa/iwa_00/iwa_00_3_npc.c | 2 +- src/world/area_iwa/iwa_01/iwa_01_1_main.c | 4 +- src/world/area_iwa/iwa_10/iwa_10_1_music.c | 4 +- src/world/area_iwa/iwa_10/iwa_10_2_main.c | 2 +- src/world/area_iwa/iwa_10/iwa_10_4_train.c | 6 +- .../area_iwa/iwa_10/iwa_10_6_parakarry.c | 4 +- src/world/area_iwa/iwa_11/iwa_11_3_train.c | 2 +- src/world/area_jan/jan_00/jan_00_1_main.c | 2 +- src/world/area_jan/jan_00/jan_00_2_npc.c | 14 +- src/world/area_jan/jan_01/jan_01_2_main.c | 2 +- src/world/area_jan/jan_01/jan_01_3_npc.c | 4 +- src/world/area_jan/jan_02/jan_02_2_main.c | 2 +- src/world/area_jan/jan_03/jan_03_2_main.c | 2 +- src/world/area_jan/jan_03/jan_03_4_npc.c | 2 +- src/world/area_jan/jan_04/jan_04_4_npc.c | 6 +- src/world/area_jan/jan_04/jan_04_8_treasure.c | 6 +- src/world/area_jan/jan_05/jan_05_5_npc.c | 10 +- src/world/area_jan/jan_06/jan_06_2_statue.c | 10 +- src/world/area_jan/jan_07/jan_07_3_npc.c | 14 +- src/world/area_jan/jan_08/jan_08_5_npc.c | 2 +- src/world/area_jan/jan_10/jan_10_3_npc.c | 4 +- src/world/area_jan/jan_11/jan_11_3_npc.c | 2 +- src/world/area_jan/jan_13/jan_13_2_puzzle.c | 14 +- src/world/area_jan/jan_15/jan_15_2_npc.c | 4 +- src/world/area_jan/jan_16/jan_16_3_npc.c | 8 +- src/world/area_jan/jan_22/jan_22_3_npc.c | 52 +- src/world/area_jan/jan_22/jan_22_5_zipline.c | 12 +- src/world/area_jan/jan_23/jan_23_3_npc.c | 26 +- src/world/area_kgr/kgr_02/kgr_02_3_npc.c | 12 +- src/world/area_kkj/kkj_03/kkj_03_4_scenes.c | 8 +- src/world/area_kkj/kkj_10/kkj_10_2_entity.c | 2 +- .../area_kkj/kkj_10/kkj_10_3_npcs_early.c | 2 +- .../area_kkj/kkj_10/kkj_10_4_npcs_later.c | 2 +- src/world/area_kkj/kkj_11/kkj_11_2_entity.c | 2 +- .../area_kkj/kkj_11/kkj_11_5_npcs_early.c | 4 +- .../area_kkj/kkj_11/kkj_11_6_npcs_later.c | 2 +- src/world/area_kkj/kkj_12/kkj_12_2_npc.c | 2 +- .../area_kkj/kkj_13/kkj_13_3_npcs_finale.c | 6 +- .../area_kkj/kkj_13/kkj_13_5_intro_scenes.c | 16 +- src/world/area_kkj/kkj_14/kkj_14_2_main.c | 2 +- .../area_kkj/kkj_14/kkj_14_3_interactables.c | 10 +- .../area_kkj/kkj_14/kkj_14_4_npc_guards.c | 2 +- src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c | 16 +- src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c | 2 +- src/world/area_kkj/kkj_15/kkj_15_2_main.c | 10 +- .../area_kkj/kkj_15/kkj_15_3_rotating_wall.c | 6 +- src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c | 30 +- src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c | 6 +- src/world/area_kkj/kkj_16/kkj_16_1_main.c | 2 +- .../area_kkj/kkj_16/kkj_16_2_npcs_early.c | 2 +- .../area_kkj/kkj_16/kkj_16_3_npcs_later.c | 2 +- src/world/area_kkj/kkj_16/kkj_16_4_stealth.c | 2 +- src/world/area_kkj/kkj_18/kkj_18_2_main.c | 2 +- src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c | 18 +- src/world/area_kkj/kkj_19/kkj_19_5_baking.c | 8 +- src/world/area_kkj/kkj_20/kkj_20_4_npc.c | 4 +- src/world/area_kkj/kkj_23/kkj_23_2_main.c | 2 +- .../area_kkj/kkj_23/kkj_23_3_npcs_finale.c | 6 +- .../area_kkj/kkj_23/kkj_23_4_npcs_peach.c | 2 +- src/world/area_kkj/kkj_23/kkj_23_5_scene.c | 4 +- .../area_kkj/kkj_25/kkj_25_2_npc_initial.c | 6 +- src/world/area_kkj/kkj_25/kkj_25_5_arena.c | 16 +- .../area_kkj/kkj_25/kkj_25_7_kammy_defeated.c | 26 +- .../kkj_25/kkj_25_8_bowser_defeated.c | 16 +- src/world/area_kkj/kkj_26/kkj_26_1_main.c | 2 +- .../area_kkj/kkj_27/kkj_27_3_rotating_wall.c | 6 +- src/world/area_kkj/kkj_29/kkj_29_1_main.c | 2 +- src/world/area_kkj/kkj_29/kkj_29_3_quiz.c | 40 +- src/world/area_kmr/kmr_00/kmr_00_3_revival.c | 24 +- src/world/area_kmr/kmr_02/kmr_02_2_main.c | 2 +- src/world/area_kmr/kmr_02/kmr_02_3_npc.c | 18 +- src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c | 2 +- src/world/area_kmr/kmr_02/kmr_02_5_entity.c | 2 +- src/world/area_kmr/kmr_02/kmr_02_7_kammy.c | 4 +- src/world/area_kmr/kmr_03/kmr_03_3_npc.c | 2 +- .../area_kmr/kmr_03/kmr_03_6_fall_down.c | 6 +- src/world/area_kmr/kmr_04/kmr_04_3_npc.c | 2 +- src/world/area_kmr/kmr_07/kmr_07_3_npc.c | 10 +- src/world/area_kmr/kmr_09/kmr_09_3_npc.c | 4 +- src/world/area_kmr/kmr_10/kmr_10_4_entity.c | 2 +- src/world/area_kmr/kmr_11/kmr_11_3_scenes.c | 28 +- src/world/area_kmr/kmr_11/kmr_11_4_npc.c | 6 +- src/world/area_kmr/kmr_11/kmr_11_5_entity.c | 4 +- src/world/area_kmr/kmr_11/kmr_11_6_kammy.c | 2 +- src/world/area_kmr/kmr_12/kmr_12_3_npc.c | 4 +- src/world/area_kmr/kmr_20/kmr_20_10_npc.c | 32 +- .../area_kmr/kmr_20/kmr_20_11_npc_intro.c | 8 +- .../area_kmr/kmr_20/kmr_20_12_npc_epilogue.c | 12 +- src/world/area_kmr/kmr_20/kmr_20_13_records.c | 2 +- .../area_kmr/kmr_20/kmr_20_4_documents.c | 2 +- src/world/area_kpa/kpa_04/kpa_04_3_statues.c | 4 +- src/world/area_kpa/kpa_08/kpa_08_3_entity.c | 8 +- src/world/area_kpa/kpa_09/kpa_09_3_entity.c | 8 +- .../area_kpa/kpa_111/kpa_111_3_statues.c | 4 +- src/world/area_kpa/kpa_113/kpa_113_3_entity.c | 2 +- .../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 | 28 +- src/world/area_kpa/kpa_134/kpa_134_5_panels.c | 4 +- src/world/area_kpa/kpa_134/kpa_134_6_entity.c | 2 +- src/world/area_kpa/kpa_14/kpa_14_3_entity.c | 2 +- src/world/area_kpa/kpa_16/kpa_16_4_npc.c | 6 +- src/world/area_kpa/kpa_17/kpa_17_4_npc.c | 4 +- src/world/area_kpa/kpa_52/kpa_52_2_entity.c | 2 +- src/world/area_kpa/kpa_53/kpa_53_3_npc.c | 2 +- src/world/area_kpa/kpa_60/kpa_60_2_entity.c | 2 +- src/world/area_kpa/kpa_60/kpa_60_3_main.c | 4 +- src/world/area_kpa/kpa_60/kpa_60_4_scenes.c | 4 +- src/world/area_kpa/kpa_62/kpa_62_2_entity.c | 2 +- src/world/area_kpa/kpa_62/kpa_62_3_main.c | 4 +- src/world/area_kpa/kpa_63/kpa_63_3_main.c | 4 +- src/world/area_kpa/kpa_63/kpa_63_4_scenes.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 | 6 +- src/world/area_kpa/kpa_83/kpa_83_3_npc.c | 8 +- src/world/area_kpa/kpa_91/kpa_91_4_entity.c | 2 +- src/world/area_kpa/kpa_95/kpa_95_2_entity.c | 2 +- src/world/area_kzn/kzn_02/kzn_02_3_npc.c | 8 +- src/world/area_kzn/kzn_03/kzn_03_2_npc.c | 4 +- src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c | 12 +- src/world/area_kzn/kzn_04/kzn_04_3_npc.c | 8 +- src/world/area_kzn/kzn_09/kzn_09_3_zipline.c | 12 +- src/world/area_kzn/kzn_09/kzn_09_4_npc.c | 12 +- src/world/area_kzn/kzn_10/kzn_10_2_tromp.c | 8 +- src/world/area_kzn/kzn_11/kzn_11_3_npc.c | 8 +- src/world/area_kzn/kzn_17/kzn_17_4_tromp.c | 6 +- src/world/area_kzn/kzn_18/kzn_18_2_npc.c | 2 +- src/world/area_kzn/kzn_19/kzn_19_1_music.c | 2 +- src/world/area_kzn/kzn_19/kzn_19_2_main.c | 10 +- src/world/area_kzn/kzn_19/kzn_19_4_npc.c | 6 +- src/world/area_kzn/kzn_20/kzn_20_1_music.c | 2 +- src/world/area_kzn/kzn_20/kzn_20_3_npc.c | 22 +- src/world/area_kzn/kzn_22/kzn_22_1_music.c | 2 +- src/world/area_kzn/kzn_22/kzn_22_4_npc.c | 2 +- src/world/area_kzn/kzn_23/kzn_23_3_npc.c | 4 +- src/world/area_mac/mac_00/mac_00_5_npc.c | 2 +- .../area_mac/mac_00/npc/russ_and_thief.inc.c | 4 +- src/world/area_mac/mac_01/mac_01_9_npc.c | 22 +- .../area_mac/mac_01/npc/flower_gate.inc.c | 40 +- .../area_mac/mac_01/npc/post_office.inc.c | 2 +- .../area_mac/mac_01/npc/read_fortune.inc.c | 10 +- .../area_mac/mac_01/npc/rowf_and_rhuff.inc.c | 8 +- src/world/area_mac/mac_02/mac_02_5_entity.c | 2 +- src/world/area_mac/mac_02/npc/bootler.inc.c | 10 +- .../area_mac/mac_02/npc/shyguy_thief.inc.c | 2 +- src/world/area_mac/mac_03/mac_03_3_train.c | 6 +- src/world/area_mac/mac_03/mac_03_4_npc.c | 8 +- src/world/area_mac/mac_03/mac_03_7_oinks.c | 4 +- src/world/area_mac/mac_04/mac_04_1_music.c | 2 +- src/world/area_mac/mac_04/mac_04_6_npc.c | 4 +- src/world/area_mac/mac_04/mac_04_8_entity.c | 10 +- .../area_mac/mac_04/npc_chet_rippo.inc.c | 2 +- src/world/area_mac/mac_04/npc_muskular.inc.c | 4 +- .../area_mac/mac_04/npc_toybox_shyguy.inc.c | 8 +- src/world/area_mac/mac_05/mac_05_1_music.c | 2 +- src/world/area_mac/mac_05/mac_05_4_npc.c | 26 +- src/world/area_mac/mac_05/mac_05_5_whale.c | 6 +- src/world/area_mac/mac_05/mac_05_6_rooms.c | 4 +- src/world/area_mac/mac_06/mac_06_2_whale.c | 6 +- src/world/area_mac/mac_06/mac_06_3_npc.c | 4 +- .../area_mgm/mgm_00/mgm_00_3_scoreboard.c | 2 +- src/world/area_mgm/mgm_01/mgm_01_2_npc.c | 16 +- src/world/area_mgm/mgm_02/mgm_02_2_npc.c | 40 +- src/world/area_mim/common/AnimateGates.inc.c | 4 +- src/world/area_mim/mim_01/mim_01_4_hint.c | 2 +- src/world/area_mim/mim_01/mim_01_5_gate.c | 4 +- src/world/area_mim/mim_02/mim_02_3_npc.c | 12 +- src/world/area_mim/mim_05/mim_05_4_hint.c | 10 +- src/world/area_mim/mim_07/mim_07_5_gate.c | 4 +- src/world/area_mim/mim_10/mim_10_4_npc.c | 2 +- src/world/area_nok/nok_01/nok_01_4_npc.c | 16 +- src/world/area_nok/nok_01/npcs_crisis.inc.c | 26 +- src/world/area_nok/nok_01/npcs_normal.inc.c | 16 +- src/world/area_nok/nok_02/nok_02_4_rooms.c | 2 +- src/world/area_nok/nok_02/nok_02_6_npc.c | 28 +- src/world/area_nok/nok_02/npcs_crisis.inc.c | 14 +- src/world/area_nok/nok_02/npcs_normal.inc.c | 4 +- src/world/area_nok/nok_03/nok_03_1_music.c | 2 +- src/world/area_nok/nok_03/nok_03_4_npc.c | 12 +- src/world/area_nok/nok_04/nok_04_4_npc.c | 74 +- src/world/area_nok/nok_11/nok_11_2_main.c | 2 +- src/world/area_nok/nok_11/nok_11_4_npc.c | 10 +- src/world/area_nok/nok_12/nok_12_1_music.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_12/nok_12_6_npc.c | 2 +- src/world/area_nok/nok_13/nok_13_1_music.c | 2 +- src/world/area_nok/nok_13/nok_13_3_entity.c | 2 +- src/world/area_nok/nok_14/nok_14_1_music.c | 2 +- src/world/area_nok/nok_14/nok_14_4_bridge.c | 16 +- src/world/area_nok/nok_15/nok_15_1_music.c | 2 +- .../area_obk/obk_01/obk_01_3_chandelier.c | 12 +- src/world/area_obk/obk_01/obk_01_4_portrait.c | 8 +- src/world/area_obk/obk_02/obk_02_6_entity.c | 6 +- src/world/area_obk/obk_03/obk_03_4_entity.c | 8 +- src/world/area_obk/obk_04/obk_04_3_npc.c | 2 +- .../area_obk/obk_07/obk_07_4_fireplace.c | 2 +- src/world/area_obk/obk_08/obk_08_3_cabinets.c | 16 +- src/world/area_obk/obk_08/obk_08_4_entity.c | 8 +- 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 | 16 +- .../common/TrainStationSwitches.inc.c | 4 +- .../area_omo/omo_02/omo_02_5_barricade.c | 20 +- src/world/area_omo/omo_02/omo_02_6_npc.c | 6 +- src/world/area_omo/omo_03/omo_03_3_gizmos.c | 6 +- .../area_omo/omo_03/omo_03_7_train_drop.c | 6 +- src/world/area_omo/omo_04/omo_04_6_scenes.c | 6 +- src/world/area_omo/omo_05/omo_05_4_npc.c | 16 +- src/world/area_omo/omo_06/omo_06_3_gizmos.c | 6 +- src/world/area_omo/omo_07/omo_07_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 | 52 +- .../area_omo/omo_09/omo_09_4_slot_machine.c | 14 +- src/world/area_omo/omo_09/omo_09_8_scenes.c | 2 +- src/world/area_omo/omo_11/omo_11_3_gizmos.c | 6 +- src/world/area_omo/omo_12/omo_12_3_npc.c | 4 +- src/world/area_omo/omo_13/omo_13_4_npc.c | 2 +- src/world/area_omo/omo_14/omo_14_2_main.c | 2 +- src/world/area_omo/omo_14/omo_14_3_npc.c | 8 +- src/world/area_omo/omo_15/omo_15_2_main.c | 10 +- src/world/area_omo/omo_15/omo_15_3_npc.c | 18 +- src/world/area_osr/osr_00/osr_00_2_main.c | 2 +- src/world/area_osr/osr_01/osr_01_2_main.c | 2 +- src/world/area_osr/osr_02/osr_02_3_npc.c | 4 +- src/world/area_osr/osr_03/osr_03_4_starship.c | 2 +- .../area_osr/osr_03/osr_03_5_interlude.c | 2 +- src/world/area_osr/osr_03/osr_03_6_ending.c | 4 +- src/world/area_osr/osr_04/osr_04_2_assault.c | 10 +- src/world/area_pra/pra_01/pra_01_3_npc.c | 4 +- src/world/area_pra/pra_02/pra_02_4_entity.c | 12 +- src/world/area_pra/pra_09/pra_09_3_npc.c | 4 +- src/world/area_pra/pra_13/pra_13_3_npc.c | 4 +- src/world/area_pra/pra_18/pra_18_3_npc.c | 4 +- src/world/area_pra/pra_19/pra_19_3_npc.c | 6 +- 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_2_npc.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 | 20 +- src/world/area_pra/pra_32/pra_32_3_npc.c | 2 +- src/world/area_pra/pra_33/pra_33_3_entity.c | 2 +- src/world/area_pra/pra_34/pra_34_2_main.c | 4 +- src/world/area_sam/sam_01/sam_01_4_npc.c | 4 +- src/world/area_sam/sam_01/sam_01_5_scenes.c | 12 +- src/world/area_sam/sam_02/sam_02_2_main.c | 4 +- src/world/area_sam/sam_04/sam_04_3_snowmen.c | 6 +- src/world/area_sam/sam_04/sam_04_4_npc.c | 4 +- src/world/area_sam/sam_05/sam_05_5_scenes.c | 4 +- .../area_sam/sam_07/sam_07_4_frozen_pit.c | 6 +- src/world/area_sam/sam_08/sam_08_4_npc.c | 8 +- src/world/area_sam/sam_08/sam_08_5_scenes.c | 18 +- src/world/area_sam/sam_09/sam_09_4_sockets.c | 6 +- src/world/area_sam/sam_10/sam_10_4_stairs.c | 14 +- src/world/area_sam/sam_11/sam_11_3_rooms.c | 2 +- src/world/area_sam/sam_11/sam_11_4_entity.c | 8 +- src/world/area_sam/sam_11/sam_11_6_pond.c | 22 +- .../area_sam/sam_11/sam_11_7_staircase.c | 20 +- src/world/area_sam/sam_12/sam_12_4_scenes.c | 8 +- src/world/area_sbk/sbk_02/sbk_02_3_ruins.c | 10 +- src/world/area_sbk/sbk_02/sbk_02_4_npc.c | 4 +- src/world/area_sbk/sbk_20/sbk_20_2_entity.c | 6 +- src/world/area_sbk/sbk_30/sbk_30_2_main.c | 2 +- src/world/area_sbk/sbk_56/sbk_56_1_main.c | 2 +- src/world/area_tik/common/DripVolumes.inc.c | 2 +- src/world/area_tik/tik_01/tik_01_2_main.c | 2 +- src/world/area_tik/tik_01/tik_01_4_entity.c | 4 +- src/world/area_tik/tik_01/tik_01_5_npc.c | 8 +- src/world/area_tik/tik_02/tik_02_2_main.c | 6 +- src/world/area_tik/tik_02/tik_02_5_npc.c | 8 +- src/world/area_tik/tik_03/tik_03_2_main.c | 4 +- src/world/area_tik/tik_05/tik_05_2_main.c | 4 +- src/world/area_tik/tik_05/tik_05_4_entity.c | 2 +- src/world/area_tik/tik_06/tik_06_2_main.c | 8 +- src/world/area_tik/tik_08/tik_08_2_main.c | 4 +- src/world/area_tik/tik_08/tik_08_4_entity.c | 4 +- src/world/area_tik/tik_08/tik_08_5_npc.c | 8 +- src/world/area_tik/tik_09/tik_09_2_main.c | 12 +- src/world/area_tik/tik_09/tik_09_4_entity.c | 4 +- src/world/area_tik/tik_10/tik_10_2_main.c | 2 +- src/world/area_tik/tik_18/tik_18_2_main.c | 2 +- src/world/area_tik/tik_18/tik_18_4_npc.c | 2 +- src/world/area_tik/tik_19/tik_19_2_main.c | 6 +- src/world/area_tik/tik_20/tik_20_2_main.c | 2 +- src/world/area_tik/tik_23/tik_23_2_main.c | 2 +- src/world/area_tik/tik_24/tik_24_2_main.c | 2 +- src/world/area_tik/tik_25/tik_25_3_entity.c | 4 +- src/world/area_trd/trd_00/trd_00_0_header.c | 4 +- src/world/area_trd/trd_00/trd_00_3_npc.c | 8 +- src/world/area_trd/trd_01/trd_01_1_main.c | 30 +- src/world/area_trd/trd_01/trd_01_2_entity.c | 2 +- src/world/area_trd/trd_02/trd_02_1_main.c | 6 +- src/world/area_trd/trd_02/trd_02_2_entity.c | 2 +- src/world/area_trd/trd_03/trd_03_3_npc.c | 8 +- src/world/area_trd/trd_03/trd_03_4_puzzle.c | 4 +- src/world/area_trd/trd_04/trd_04_1_main.c | 6 +- src/world/area_trd/trd_04/trd_04_2_entity.c | 8 +- src/world/area_trd/trd_05/trd_05_3_trap.c | 8 +- src/world/area_trd/trd_05/trd_05_4_npc.c | 18 +- src/world/area_trd/trd_06/trd_06_2_falling.c | 8 +- .../area_trd/trd_06/trd_06_3_npc_prisoners.c | 2 +- .../area_trd/trd_07/trd_07_3_magic_doors.c | 8 +- src/world/area_trd/trd_08/trd_08_3_npc.c | 8 +- src/world/area_trd/trd_09/trd_09_3_npc.c | 4 +- src/world/area_trd/trd_10/trd_10_1_main.c | 10 +- src/world/area_trd/trd_10/trd_10_2_npc.c | 4 +- .../area_trd/trd_10/trd_10_3_fake_bowser.c | 2 +- .../common/atomic/PushBlockGravity.inc.c | 2 +- src/world/common/complete/Quizmo.inc.c | 16 +- src/world/common/enemy/Sentinel.inc.c | 4 +- src/world/common/enemy/ai/BulletBillAI.inc.c | 4 +- src/world/common/enemy/ai/CleftAI.inc.c | 2 +- .../common/enemy/ai/ClubbaNappingAI.inc.c | 8 +- src/world/common/enemy/ai/FireBarAI.inc.c | 2 +- src/world/common/enemy/ai/FlyingAI.inc.c | 4 +- .../common/enemy/ai/FlyingMagikoopaAI.inc.c | 2 +- src/world/common/enemy/ai/GuardAI.inc.c | 4 +- src/world/common/enemy/ai/HoppingAI.inc.c | 8 +- src/world/common/enemy/ai/LakituAI.inc.c | 4 +- .../common/enemy/ai/PiranhaPlantAI.inc.c | 2 +- src/world/common/enemy/ai/SentinelAI.inc.c | 8 +- .../common/enemy/ai/States_PatrolAI.inc.c | 4 +- src/world/common/enemy/ai/SwooperAI.inc.c | 2 +- src/world/common/entity/SuperBlock.inc.c | 4 +- .../common/todo/StarSpiritEffectFunc.inc.c | 2 +- src/world/common/todo/UnkFunc51.inc.c | 2 +- .../dead/area_flo/flo_00/flo_00_2_main.c | 8 +- src/world/dead/area_flo/flo_00/flo_00_3_npc.c | 4 +- .../dead/area_flo/flo_00/flo_00_5_beanstalk.c | 6 +- src/world/dead/area_flo/flo_03/flo_03_3_npc.c | 12 +- .../dead/area_flo/flo_07/flo_07_1_music.c | 2 +- src/world/dead/area_flo/flo_07/flo_07_3_npc.c | 6 +- src/world/dead/area_flo/flo_08/flo_08_4_npc.c | 2 +- .../dead/area_flo/flo_10/flo_10_1_music.c | 2 +- .../dead/area_flo/flo_10/flo_10_4_fountain.c | 2 +- src/world/dead/area_flo/flo_10/flo_10_5_npc.c | 2 +- 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_14/flo_14_3_bubbles.c | 10 +- .../dead/area_flo/flo_15/flo_15_5_stairs.c | 2 +- .../dead/area_flo/flo_18/flo_18_1_music.c | 2 +- .../dead/area_flo/flo_18/flo_18_3_machine.c | 26 +- src/world/dead/area_flo/flo_18/flo_18_4_npc.c | 6 +- .../dead/area_flo/flo_19/flo_19_5_beanstalk.c | 4 +- src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c | 8 +- .../dead/area_kzn/kzn_17/kzn_17_4_tromp.c | 6 +- src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c | 2 +- .../dead/area_kzn/kzn_19/kzn_19_1_music.c | 2 +- .../dead/area_kzn/kzn_19/kzn_19_2_main.c | 10 +- src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c | 6 +- .../dead/area_kzn/kzn_20/kzn_20_1_music.c | 2 +- src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c | 22 +- .../dead/area_kzn/kzn_22/kzn_22_1_music.c | 2 +- src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c | 2 +- src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c | 4 +- src/world/partner/bombette.c | 16 +- src/world/partner/kooper.c | 10 +- src/world/partner/lakilester.c | 6 +- src/world/partner/sushie.c | 12 +- 693 files changed, 5039 insertions(+), 5016 deletions(-) diff --git a/include/enums.h b/include/enums.h index c1c7e1a29b..9a32cf1ee9 100644 --- a/include/enums.h +++ b/include/enums.h @@ -523,1140 +523,1162 @@ enum EasingType { }; enum SoundIDs { - SOUND_NONE = 0x00000000, - SOUND_OPEN_POPUP_1 = 0x00000001, - SOUND_OPEN_POPUP_2 = 0x00000002, - SOUND_LOWER_STATUS_BAR = 0x00000003, - SOUND_RAISE_STATUS_BAR = 0x00000004, - SOUND_MENU_BADGE_EQUIP = 0x00000005, - SOUND_MENU_BADGE_UNEQUIP = 0x00000006, - SOUND_MENU_SHOW_CHOICE = 0x00000009, - SOUND_CHIME_BEGIN_AMBUSH = 0x0000000A, - SOUND_CHIME_SOLVED_PUZZLE = 0x0000000B, - SOUND_ACTIVATE_COMPUTER = 0x0000000C, // unused - SOUND_PARTNER_PUT_AWAY = 0x0000000D, - SOUND_PARTNER_GET_OUT = 0x0000000E, - SOUND_PARTNER_SWAP_BATTLE_POS = 0x0000000F, - SOUND_SAVE_CONFIRM = 0x00000010, - SOUND_MSG_VOICE_1A = 0x00000011, - SOUND_MSG_VOICE_1B = 0x00000012, - SOUND_MSG_VOICE_2A = 0x00000013, - SOUND_MSG_VOICE_2B = 0x00000014, - SOUND_MSG_VOICE_3A = 0x00000015, - SOUND_MSG_VOICE_3B = 0x00000016, - SOUND_MSG_VOICE_4A = 0x00000017, - SOUND_MSG_VOICE_4B = 0x00000018, - SOUND_MSG_VOICE_5A = 0x00000019, - SOUND_MSG_VOICE_5B = 0x0000001A, - SOUND_MSG_VOICE_STAR = 0x0000001B, - SOUND_21 = 0x00000021, - SOUND_22 = 0x00000022, - SOUND_23 = 0x00000023, - SOUND_24 = 0x00000024, - SOUND_25 = 0x00000025, - SOUND_26 = 0x00000026, - SOUND_27 = 0x00000027, - SOUND_28 = 0x00000028, - SOUND_29 = 0x00000029, - SOUND_2A = 0x0000002A, - SOUND_2B = 0x0000002B, - SOUND_2C = 0x0000002C, - SOUND_2D = 0x0000002D, - SOUND_2E = 0x0000002E, - SOUND_2F = 0x0000002F, - SOUND_30 = 0x00000030, - SOUND_33 = 0x00000033, - SOUND_34 = 0x00000034, - SOUND_35 = 0x00000035, - SOUND_36 = 0x00000036, - SOUND_37 = 0x00000037, - SOUND_38 = 0x00000038, - SOUND_39 = 0x00000039, - SOUND_3F = 0x0000003F, - SOUND_40 = 0x00000040, - SOUND_41 = 0x00000041, - SOUND_42 = 0x00000042, - SOUND_43 = 0x00000043, - SOUND_44 = 0x00000044, - SOUND_JR_TROOPA_SPLASH = 0x00000045, - SOUND_JR_TROOPA_SWIM = 0x00000046, - SOUND_BOO_SPOOK = 0x00000047, - SOUND_48 = 0x00000048, - SOUND_4A = 0x0000004A, - SOUND_4C = 0x0000004C, - SOUND_4D = 0x0000004D, - SOUND_4E = 0x0000004E, - SOUND_4F = 0x0000004F, - SOUND_50 = 0x00000050, - SOUND_51 = 0x00000051, - SOUND_52 = 0x00000052, - SOUND_53 = 0x00000053, - SOUND_54 = 0x00000054, - SOUND_55 = 0x00000055, - SOUND_56 = 0x00000056, - SOUND_57 = 0x00000057, - SOUND_58 = 0x00000058, - SOUND_59 = 0x00000059, - SOUND_5A = 0x0000005A, - SOUND_5B = 0x0000005B, - SOUND_5C = 0x0000005C, - SOUND_5D = 0x0000005D, - SOUND_5E = 0x0000005E, - SOUND_5F = 0x0000005F, - SOUND_60 = 0x00000060, - SOUND_61 = 0x00000061, - SOUND_62 = 0x00000062, - SOUND_64 = 0x00000064, - SOUND_67 = 0x00000067, - SOUND_68 = 0x00000068, - SOUND_69 = 0x00000069, - SOUND_6A = 0x0000006A, - SOUND_6B = 0x0000006B, - SOUND_6C = 0x0000006C, - SOUND_6D = 0x0000006D, - SOUND_70 = 0x00000070, - SOUND_71 = 0x00000071, - SOUND_72 = 0x00000072, - SOUND_73 = 0x00000073, - SOUND_74 = 0x00000074, - SOUND_77 = 0x00000077, - SOUND_7D = 0x0000007D, - SOUND_82 = 0x00000082, - SOUND_83 = 0x00000083, - SOUND_84 = 0x00000084, - SOUND_85 = 0x00000085, - SOUND_87 = 0x00000087, - SOUND_89 = 0x00000089, - SOUND_8A = 0x0000008A, - SOUND_8B = 0x0000008B, - SOUND_8C = 0x0000008C, - SOUND_8D = 0x0000008D, - SOUND_8E = 0x0000008E, - SOUND_8F = 0x0000008F, - SOUND_91 = 0x00000091, - SOUND_92 = 0x00000092, - SOUND_93 = 0x00000093, - SOUND_94 = 0x00000094, - SOUND_95 = 0x00000095, - SOUND_96 = 0x00000096, - SOUND_97 = 0x00000097, - SOUND_98 = 0x00000098, - SOUND_99 = 0x00000099, - SOUND_9B = 0x0000009B, - SOUND_9D = 0x0000009D, - SOUND_9E = 0x0000009E, - SOUND_9F = 0x0000009F, - SOUND_A0 = 0x000000A0, - SOUND_A1 = 0x000000A1, - SOUND_A2 = 0x000000A2, - SOUND_A3 = 0x000000A3, - SOUND_A4 = 0x000000A4, - SOUND_A5 = 0x000000A5, - SOUND_A6 = 0x000000A6, - SOUND_A7 = 0x000000A7, - SOUND_A8 = 0x000000A8, - SOUND_A9 = 0x000000A9, - SOUND_AA = 0x000000AA, - SOUND_AB = 0x000000AB, - SOUND_AC = 0x000000AC, - SOUND_AD = 0x000000AD, - SOUND_AE = 0x000000AE, - SOUND_AF = 0x000000AF, - SOUND_B0 = 0x000000B0, - SOUND_B1 = 0x000000B1, - SOUND_B2 = 0x000000B2, - SOUND_B4 = 0x000000B4, - SOUND_BOO_VANISH_A = 0x000000C1, - SOUND_BOO_VANISH_B = 0x000000C2, - SOUND_BOO_APPEAR_A = 0x000000C3, - SOUND_BOO_APPEAR_B = 0x000000C4, - SOUND_MENU_OPEN = 0x000000C5, - SOUND_MENU_CLOSE = 0x000000C6, - SOUND_MENU_CHANGE_SELECTION = 0x000000C7, - SOUND_MENU_CHANGE_TAB = 0x000000C8, - SOUND_MENU_NEXT = 0x000000C9, - SOUND_MENU_BACK = 0x000000CA, - SOUND_CB = 0x000000CB, - SOUND_CC = 0x000000CC, - SOUND_CD = 0x000000CD, - SOUND_CE = 0x000000CE, - SOUND_D1 = 0x000000D1, - SOUND_D2 = 0x000000D2, - SOUND_D3 = 0x000000D3, - SOUND_D4 = 0x000000D4, - SOUND_D5 = 0x000000D5, - SOUND_D6 = 0x000000D6, - SOUND_D9 = 0x000000D9, - SOUND_DA = 0x000000DA, - SOUND_DC = 0x000000DC, - SOUND_DD = 0x000000DD, - SOUND_DF = 0x000000DF, - SOUND_E0 = 0x000000E0, - SOUND_HIT_PLAYER_NORMAL = 0x000000E1, - SOUND_HIT_PLAYER_FIRE = 0x000000E2, - SOUND_HIT_PLAYER_ICE = 0x000000E3, - SOUND_FROZEN_SHATTER = 0x000000E7, - SOUND_E8 = 0x000000E8, - SOUND_HIT_NORMAL = 0x000000E9, - SOUND_HIT_FIRE = 0x000000EA, - SOUND_HIT_ICE = 0x000000EB, - SOUND_F1 = 0x000000F1, - SOUND_F2 = 0x000000F2, - SOUND_F3 = 0x000000F3, - SOUND_F4 = 0x000000F4, - SOUND_F5 = 0x000000F5, - SOUND_F6 = 0x000000F6, - SOUND_F7 = 0x000000F7, - SOUND_F8 = 0x000000F8, - SOUND_F9 = 0x000000F9, - SOUND_FA = 0x000000FA, - SOUND_FB = 0x000000FB, - SOUND_FC = 0x000000FC, - SOUND_FD = 0x000000FD, - SOUND_FE = 0x000000FE, - SOUND_FF = 0x000000FF, - SOUND_100 = 0x00000100, - SOUND_108 = 0x00000108, - SOUND_10B = 0x0000010B, - SOUND_IMMUNE = 0x0000010C, - SOUND_HIT_BONES = 0x0000010D, - SOUND_10E = 0x0000010E, - SOUND_10F = 0x0000010F, - SOUND_110 = 0x00000110, - SOUND_131 = 0x00000131, - SOUND_133 = 0x00000133, - SOUND_134 = 0x00000134, - SOUND_137 = 0x00000137, - SOUND_138 = 0x00000138, - SOUND_139 = 0x00000139, - SOUND_13D = 0x0000013D, - SOUND_13E = 0x0000013E, - SOUND_STEP_NORMAL1 = 0x00000141, - SOUND_STEP_NORMAL2 = 0x00000142, - SOUND_STEP_CRUNCHY1 = 0x00000143, - SOUND_STEP_CRUNCHY2 = 0x00000144, - SOUND_SPIN_JUMP = 0x00000146, - SOUND_TORNADO_JUMP = 0x00000147, - SOUND_SOFT_LAND = 0x00000148, - SOUND_149 = 0x00000149, - SOUND_14A = 0x0000014A, - SOUND_LAND = 0x0000014B, - SOUND_HIT_BLOCK = 0x0000014E, - SOUND_14F = 0x0000014F, - SOUND_150 = 0x00000150, - SOUND_151 = 0x00000151, - SOUND_152 = 0x00000152, - SOUND_SEARCH_BUSH = 0x00000153, - SOUND_156 = 0x00000156, - SOUND_158 = 0x00000158, - SOUND_15A = 0x0000015A, - SOUND_15B = 0x0000015B, - SOUND_15C = 0x0000015C, - SOUND_15D = 0x0000015D, - SOUND_15E = 0x0000015E, - SOUND_160 = 0x00000160, - SOUND_161 = 0x00000161, - SOUND_162 = 0x00000162, - SOUND_ENTER_PIPE = 0x00000163, - SOUND_164 = 0x00000164, - SOUND_SMASH_GOOMNUT_TREE = 0x00000165, - SOUND_SHAKE_TREE = 0x00000166, - SOUND_167 = 0x00000167, - SOUND_168 = 0x00000168, - SOUND_DUST_OFF = 0x00000172, - SOUND_173 = 0x00000173, - SOUND_174 = 0x00000174, - SOUND_175 = 0x00000175, - SOUND_176 = 0x00000176, - SOUND_179 = 0x00000179, - SOUND_17A = 0x0000017A, - SOUND_17B = 0x0000017B, - SOUND_17C = 0x0000017C, - SOUND_17D = 0x0000017D, - SOUND_17E = 0x0000017E, - SOUND_17F = 0x0000017F, - SOUND_180 = 0x00000180, - SOUND_181 = 0x00000181, - SOUND_182 = 0x00000182, - SOUND_183 = 0x00000183, - SOUND_185 = 0x00000185, - SOUND_186 = 0x00000186, - SOUND_187 = 0x00000187, - SOUND_188 = 0x00000188, - SOUND_189 = 0x00000189, - SOUND_18A = 0x0000018A, - SOUND_18C = 0x0000018C, - SOUND_18D = 0x0000018D, - SOUND_18E = 0x0000018E, - SOUND_190 = 0x00000190, - SOUND_191 = 0x00000191, - SOUND_193 = 0x00000193, - SOUND_194 = 0x00000194, - SOUND_197 = 0x00000197, - SOUND_198 = 0x00000198, - SOUND_199 = 0x00000199, - SOUND_19A = 0x0000019A, - SOUND_19B = 0x0000019B, - SOUND_19C = 0x0000019C, - SOUND_19D = 0x0000019D, - SOUND_19E = 0x0000019E, - SOUND_19F = 0x0000019F, - SOUND_1A0 = 0x000001A0, - SOUND_1A1 = 0x000001A1, - SOUND_1A2 = 0x000001A2, - SOUND_1A3 = 0x000001A3, - SOUND_1A4 = 0x000001A4, - SOUND_1A5 = 0x000001A5, - SOUND_1A6 = 0x000001A6, - SOUND_1A7 = 0x000001A7, - SOUND_1A8 = 0x000001A8, - SOUND_1A9 = 0x000001A9, - SOUND_1AA = 0x000001AA, - SOUND_1AB = 0x000001AB, - SOUND_1AC = 0x000001AC, - SOUND_1AD = 0x000001AD, - SOUND_1AE = 0x000001AE, - SOUND_1AF = 0x000001AF, - SOUND_1B1 = 0x000001B1, - SOUND_1B2 = 0x000001B2, - SOUND_1B3 = 0x000001B3, - SOUND_BASIC_DOOR_OPEN = 0x000001C1, - SOUND_BASIC_DOOR_CLOSE = 0x000001C2, - SOUND_METAL_DOOR_OPEN = 0x000001C3, - SOUND_METAL_DOOR_CLOSE = 0x000001C4, - SOUND_LARGE_DOOR_OPEN = 0x000001C5, - SOUND_LARGE_DOOR_CLOSE = 0x000001C6, - SOUND_CREAKY_DOOR_OPEN = 0x000001C7, - SOUND_CREAKY_DOOR_CLOSE = 0x000001C8, - SOUND_METAL_GATE_OPEN = 0x000001C9, - SOUND_METAL_GATE_CLOSE = 0x000001CA, - SOUND_1CB = 0x000001CB, - SOUND_1CC = 0x000001CC, - SOUND_1CD = 0x000001CD, - SOUND_1CE = 0x000001CE, - SOUND_1CF = 0x000001CF, - SOUND_1D0 = 0x000001D0, - SOUND_1D1 = 0x000001D1, - SOUND_1D2 = 0x000001D2, - SOUND_1D3 = 0x000001D3, - SOUND_1D4 = 0x000001D4, - SOUND_1D5 = 0x000001D5, - SOUND_CREAKY_ROCKING_CHAIR = 0x000001D6, - SOUND_1D8 = 0x000001D8, - SOUND_1D9 = 0x000001D9, - SOUND_1DA = 0x000001DA, - SOUND_1DB = 0x000001DB, - SOUND_1DC = 0x000001DC, - SOUND_1DD = 0x000001DD, - SOUND_1DE = 0x000001DE, - SOUND_1DF = 0x000001DF, - SOUND_1E0 = 0x000001E0, - SOUND_1E1 = 0x000001E1, - SOUND_1E2 = 0x000001E2, - SOUND_1E3 = 0x000001E3, - SOUND_1E4 = 0x000001E4, - SOUND_1E5 = 0x000001E5, - SOUND_1E6 = 0x000001E6, - SOUND_1E7 = 0x000001E7, - SOUND_1E8 = 0x000001E8, - SOUND_1E9 = 0x000001E9, - SOUND_1EA = 0x000001EA, - SOUND_1EB = 0x000001EB, - SOUND_1EC = 0x000001EC, - SOUND_1ED = 0x000001ED, - SOUND_1EE = 0x000001EE, - SOUND_1EF = 0x000001EF, - SOUND_1F0 = 0x000001F0, - SOUND_1F1 = 0x000001F1, - SOUND_1F2 = 0x000001F2, - SOUND_1F3 = 0x000001F3, - SOUND_1F4 = 0x000001F4, - SOUND_1F5 = 0x000001F5, - SOUND_1F9 = 0x000001F9, - SOUND_1FA = 0x000001FA, - SOUND_1FB = 0x000001FB, - SOUND_1FC = 0x000001FC, - SOUND_1FD = 0x000001FD, - SOUND_1FE = 0x000001FE, - SOUND_1FF = 0x000001FF, - SOUND_201 = 0x00000201, - SOUND_202 = 0x00000202, - SOUND_203 = 0x00000203, - SOUND_204 = 0x00000204, - SOUND_205 = 0x00000205, - SOUND_206 = 0x00000206, - SOUND_207 = 0x00000207, - SOUND_208 = 0x00000208, - SOUND_209 = 0x00000209, - SOUND_20A = 0x0000020A, - SOUND_20C = 0x0000020C, - SOUND_20D = 0x0000020D, - SOUND_20E = 0x0000020E, - SOUND_211 = 0x00000211, - SOUND_212 = 0x00000212, - SOUND_213 = 0x00000213, - SOUND_214 = 0x00000214, - SOUND_215 = 0x00000215, - SOUND_217 = 0x00000217, - SOUND_218 = 0x00000218, - SOUND_219 = 0x00000219, - SOUND_21A = 0x0000021A, - SOUND_21B = 0x0000021B, - SOUND_21C = 0x0000021C, - SOUND_MENU_ERROR = 0x0000021D, - SOUND_221 = 0x00000221, - SOUND_222 = 0x00000222, - SOUND_223 = 0x00000223, - SOUND_225 = 0x00000225, - SOUND_226 = 0x00000226, - SOUND_227 = 0x00000227, - SOUND_228 = 0x00000228, - SOUND_229 = 0x00000229, - SOUND_22A = 0x0000022A, - SOUND_22B = 0x0000022B, - SOUND_22C = 0x0000022C, - SOUND_22D = 0x0000022D, - SOUND_22E = 0x0000022E, - SOUND_22F = 0x0000022F, - SOUND_230 = 0x00000230, - SOUND_231 = 0x00000231, - SOUND_233 = 0x00000233, - SOUND_234 = 0x00000234, - SOUND_235 = 0x00000235, - SOUND_236 = 0x00000236, - SOUND_237 = 0x00000237, - SOUND_238 = 0x00000238, - SOUND_23D = 0x0000023D, - SOUND_241 = 0x00000241, - SOUND_242 = 0x00000242, - SOUND_244 = 0x00000244, - SOUND_245 = 0x00000245, - SOUND_246 = 0x00000246, - SOUND_247 = 0x00000247, - SOUND_248 = 0x00000248, - SOUND_249 = 0x00000249, - SOUND_24A = 0x0000024A, - SOUND_24B = 0x0000024B, - SOUND_259 = 0x00000259, - SOUND_25A = 0x0000025A, - SOUND_25C = 0x0000025C, - SOUND_25D = 0x0000025D, - SOUND_261 = 0x00000261, - SOUND_262 = 0x00000262, - SOUND_263 = 0x00000263, - SOUND_265 = 0x00000265, - SOUND_266 = 0x00000266, - SOUND_267 = 0x00000267, - SOUND_269 = 0x00000269, - SOUND_26A = 0x0000026A, - SOUND_26B = 0x0000026B, - SOUND_26C = 0x0000026C, - SOUND_271 = 0x00000271, - SOUND_273 = 0x00000273, - SOUND_274 = 0x00000274, - SOUND_275 = 0x00000275, - SOUND_276 = 0x00000276, - SOUND_281 = 0x00000281, - SOUND_282 = 0x00000282, - SOUND_283 = 0x00000283, - SOUND_284 = 0x00000284, - SOUND_286 = 0x00000286, - SOUND_287 = 0x00000287, - SOUND_288 = 0x00000288, - SOUND_289 = 0x00000289, - SOUND_28A = 0x0000028A, - SOUND_28B = 0x0000028B, - SOUND_28C = 0x0000028C, - SOUND_28E = 0x0000028E, - SOUND_28F = 0x0000028F, - SOUND_290 = 0x00000290, - SOUND_BOW_SPOOK = 0x00000291, - SOUND_292 = 0x00000292, - SOUND_293 = 0x00000293, - SOUND_294 = 0x00000294, - SOUND_295 = 0x00000295, - SOUND_297 = 0x00000297, - SOUND_298 = 0x00000298, - SOUND_299 = 0x00000299, - SOUND_29A = 0x0000029A, - SOUND_29B = 0x0000029B, - SOUND_29C = 0x0000029C, - SOUND_29D = 0x0000029D, - SOUND_2A0 = 0x000002A0, - SOUND_2A1 = 0x000002A1, - SOUND_2A2 = 0x000002A2, - SOUND_2A3 = 0x000002A3, - SOUND_2A4 = 0x000002A4, - SOUND_2A6 = 0x000002A6, - SOUND_2A7 = 0x000002A7, - SOUND_2A8 = 0x000002A8, - SOUND_2AA = 0x000002AA, - SOUND_UNUSED_2C1 = 0x000002C1, - SOUND_2C4 = 0x000002C4, - SOUND_2C5 = 0x000002C5, - SOUND_2C6 = 0x000002C6, - SOUND_2C7 = 0x000002C7, - SOUND_2C8 = 0x000002C8, - SOUND_2C9 = 0x000002C9, - SOUND_2CA = 0x000002CA, - SOUND_2CB = 0x000002CB, - SOUND_SMOKE_BURST = 0x000002CD, - SOUND_2CE = 0x000002CE, - SOUND_2CF = 0x000002CF, - SOUND_2D1 = 0x000002D1, - SOUND_2D2 = 0x000002D2, - SOUND_2D3 = 0x000002D3, - SOUND_2D4 = 0x000002D4, - SOUND_2D5 = 0x000002D5, - SOUND_2D6 = 0x000002D6, - SOUND_DAYZEE_SONG = 0x000002D7, - SOUND_POWER_UP = 0x000002D8, - SOUND_2D9 = 0x000002D9, - SOUND_2DA = 0x000002DA, - SOUND_2DB = 0x000002DB, - SOUND_2DC = 0x000002DC, - SOUND_2DD = 0x000002DD, - SOUND_2DE = 0x000002DE, - SOUND_2DF = 0x000002DF, - SOUND_2E0 = 0x000002E0, - SOUND_2E1 = 0x000002E1, - SOUND_2E2 = 0x000002E2, - SOUND_2E3 = 0x000002E3, - SOUND_2E4 = 0x000002E4, - SOUND_2E5 = 0x000002E5, - SOUND_2E6 = 0x000002E6, - SOUND_2E7 = 0x000002E7, - SOUND_2E8 = 0x000002E8, - SOUND_2E9 = 0x000002E9, - SOUND_2EA = 0x000002EA, - SOUND_2EB = 0x000002EB, - SOUND_2EC = 0x000002EC, - SOUND_2ED = 0x000002ED, - SOUND_2EE = 0x000002EE, - SOUND_2EF = 0x000002EF, - SOUND_2F0 = 0x000002F0, - SOUND_2F1 = 0x000002F1, - SOUND_2F2 = 0x000002F2, - SOUND_2F3 = 0x000002F3, - SOUND_2F4 = 0x000002F4, - SOUND_2F5 = 0x000002F5, - SOUND_TWEESTER_LAUNCH = 0x000002F6, - SOUND_2F7 = 0x000002F7, - SOUND_2F8 = 0x000002F8, - SOUND_2F9 = 0x000002F9, - SOUND_2FA = 0x000002FA, - SOUND_2FB = 0x000002FB, - SOUND_2FC = 0x000002FC, - SOUND_2FD = 0x000002FD, - SOUND_CLOSE_SHELL = 0x000002FF, - SOUND_300 = 0x00000300, - SOUND_301 = 0x00000301, - SOUND_302 = 0x00000302, - SOUND_303 = 0x00000303, - SOUND_305 = 0x00000305, - SOUND_306 = 0x00000306, - SOUND_309 = 0x00000309, - SOUND_30A = 0x0000030A, - SOUND_30B = 0x0000030B, - SOUND_SHY_GUY_SCREAMS1 = 0x0000030C, - SOUND_SHY_GUY_SCREAMS2 = 0x0000030D, - SOUND_SHY_GUY_SCREAMS3 = 0x0000030E, - SOUND_TOY_TANK_MOVE1 = 0x0000030F, - SOUND_TOY_TANK_MOVE2 = 0x00000310, - SOUND_311 = 0x00000311, - SOUND_312 = 0x00000312, - SOUND_315 = 0x00000315, - SOUND_316 = 0x00000316, - SOUND_317 = 0x00000317, - SOUND_318 = 0x00000318, - SOUND_319 = 0x00000319, - SOUND_31A = 0x0000031A, - SOUND_31B = 0x0000031B, - SOUND_31C = 0x0000031C, - SOUND_31D = 0x0000031D, - SOUND_31E = 0x0000031E, - SOUND_31F = 0x0000031F, - SOUND_BURROW_SURFACE = 0x00000321, - SOUND_BURROW_DIG = 0x00000322, - SOUND_MOLE_POP = 0x00000323, - SOUND_327 = 0x00000327, - SOUND_328 = 0x00000328, - SOUND_32B = 0x0000032B, - SOUND_32C = 0x0000032C, - SOUND_32E = 0x0000032E, - SOUND_32F = 0x0000032F, - SOUND_330 = 0x00000330, - SOUND_331 = 0x00000331, - SOUND_332 = 0x00000332, - SOUND_333 = 0x00000333, - SOUND_334 = 0x00000334, - SOUND_335 = 0x00000335, - SOUND_336 = 0x00000336, - SOUND_337 = 0x00000337, - SOUND_338 = 0x00000338, - SOUND_339 = 0x00000339, - SOUND_33A = 0x0000033A, - SOUND_33B = 0x0000033B, - SOUND_33C = 0x0000033C, - SOUND_33D = 0x0000033D, - SOUND_33E = 0x0000033E, - SOUND_33F = 0x0000033F, - SOUND_340 = 0x00000340, - SOUND_341 = 0x00000341, - SOUND_342 = 0x00000342, - SOUND_343 = 0x00000343, - SOUND_344 = 0x00000344, - SOUND_345 = 0x00000345, - SOUND_346 = 0x00000346, - SOUND_349 = 0x00000349, - SOUND_34A = 0x0000034A, - SOUND_34E = 0x0000034E, - SOUND_351 = 0x00000351, - SOUND_353 = 0x00000353, - SOUND_354 = 0x00000354, - SOUND_355 = 0x00000355, - SOUND_356 = 0x00000356, - SOUND_357 = 0x00000357, - SOUND_358 = 0x00000358, - SOUND_359 = 0x00000359, - SOUND_35B = 0x0000035B, - SOUND_35C = 0x0000035C, - SOUND_35D = 0x0000035D, - SOUND_35E = 0x0000035E, - SOUND_35F = 0x0000035F, - SOUND_361 = 0x00000361, - SOUND_362 = 0x00000362, - SOUND_363 = 0x00000363, - SOUND_364 = 0x00000364, - SOUND_365 = 0x00000365, - SOUND_366 = 0x00000366, - SOUND_367 = 0x00000367, - SOUND_368 = 0x00000368, - SOUND_369 = 0x00000369, - SOUND_36B = 0x0000036B, - SOUND_36C = 0x0000036C, - SOUND_36D = 0x0000036D, - SOUND_36E = 0x0000036E, - SOUND_36F = 0x0000036F, - SOUND_370 = 0x00000370, - SOUND_371 = 0x00000371, - SOUND_372 = 0x00000372, - SOUND_373 = 0x00000373, - SOUND_374 = 0x00000374, - SOUND_375 = 0x00000375, - SOUND_376 = 0x00000376, - SOUND_377 = 0x00000377, - SOUND_378 = 0x00000378, - SOUND_379 = 0x00000379, - SOUND_HIT_PLAYER_SHOCK = 0x0000037A, - SOUND_HIT_SHOCK = 0x0000037B, - SOUND_37C = 0x0000037C, - SOUND_37D = 0x0000037D, - SOUND_37E = 0x0000037E, - SOUND_380 = 0x00000380, - SOUND_381 = 0x00000381, - SOUND_382 = 0x00000382, - SOUND_383 = 0x00000383, - SOUND_384 = 0x00000384, - SOUND_385 = 0x00000385, - SOUND_386 = 0x00000386, - SOUND_387 = 0x00000387, - SOUND_388 = 0x00000388, - SOUND_389 = 0x00000389, - SOUND_38A = 0x0000038A, - SOUND_38B = 0x0000038B, - SOUND_38C = 0x0000038C, - SOUND_38D = 0x0000038D, - SOUND_38E = 0x0000038E, - SOUND_390 = 0x00000390, - SOUND_391 = 0x00000391, - SOUND_392 = 0x00000392, - SOUND_393 = 0x00000393, - SOUND_394 = 0x00000394, - SOUND_GENERAL_WHISTLE = 0x00000395, - SOUND_396 = 0x00000396, - SOUND_397 = 0x00000397, - SOUND_398 = 0x00000398, - SOUND_399 = 0x00000399, - SOUND_39A = 0x0000039A, - SOUND_39B = 0x0000039B, - SOUND_39C = 0x0000039C, - SOUND_39D = 0x0000039D, - SOUND_39E = 0x0000039E, - SOUND_39F = 0x0000039F, - SOUND_3A0 = 0x000003A0, - SOUND_3A2 = 0x000003A2, - SOUND_3A3 = 0x000003A3, - SOUND_3A4 = 0x000003A4, - SOUND_3A5 = 0x000003A5, - SOUND_3A6 = 0x000003A6, - SOUND_3A7 = 0x000003A7, - SOUND_3A8 = 0x000003A8, - SOUND_3A9 = 0x000003A9, - SOUND_3AA = 0x000003AA, - SOUND_3AB = 0x000003AB, - SOUND_3AC = 0x000003AC, - SOUND_3AD = 0x000003AD, - SOUND_3AE = 0x000003AE, - SOUND_3AF = 0x000003AF, - SOUND_3B0 = 0x000003B0, - SOUND_3B1 = 0x000003B1, - SOUND_3B2 = 0x000003B2, - SOUND_3B3 = 0x000003B3, - SOUND_3B4 = 0x000003B4, - SOUND_FAKE_BOWSER_BLAST = 0x000003B5, // large blasting sound when the fake bowser robot is destroyed - SOUND_3B6 = 0x000003B6, - SOUND_3B7 = 0x000003B7, - SOUND_3B9 = 0x000003B9, - SOUND_3BB = 0x000003BB, - SOUND_3BC = 0x000003BC, - SOUND_3BD = 0x000003BD, - SOUND_3BE = 0x000003BE, - SOUND_3C0 = 0x000003C0, - SOUND_3C1 = 0x000003C1, - SOUND_3C3 = 0x000003C3, - SOUND_3C4 = 0x000003C4, - SOUND_3C5 = 0x000003C5, - SOUND_3C6 = 0x000003C6, - SOUND_3C7 = 0x000003C7, - SOUND_3C8 = 0x000003C8, - SOUND_3C9 = 0x000003C9, - SOUND_3CA = 0x000003CA, - SOUND_3CB = 0x000003CB, - SOUND_3CC = 0x000003CC, - SOUND_3CD = 0x000003CD, - SOUND_3CE = 0x000003CE, - SOUND_3CF = 0x000003CF, - SOUND_3D0 = 0x000003D0, - SOUND_3D1 = 0x000003D1, - SOUND_3D2 = 0x000003D2, - SOUND_3D3 = 0x000003D3, - SOUND_OPEN_SHELL = 0x000003D4, - SOUND_3D5 = 0x000003D5, - SOUND_3D6 = 0x000003D6, - SOUND_3D9 = 0x000003D9, - SOUND_3DB = 0x000003DB, - SOUND_3DC = 0x000003DC, - SOUND_3DD = 0x000003DD, - SOUND_3DE = 0x000003DE, - SOUND_3E0 = 0x000003E0, - SOUND_3E1 = 0x000003E1, - SOUND_JUMP_3E2 = 0x000003E2, - SOUND_MISS_JUMP = 0x000003E3, - SOUND_3E4 = 0x000003E4, - SOUND_DEATH = 0x000003E5, - SOUND_BIG_POWER_UP = 0x000003E6, - SOUND_3E7 = 0x000003E7, - SOUND_MOLE_THROW = 0x000003E8, - SOUND_3E9 = 0x000003E9, - SOUND_3EA = 0x000003EA, - SOUND_3EB = 0x000003EB, - SOUND_3EC = 0x000003EC, - SOUND_3ED = 0x000003ED, - SOUND_3EE = 0x000003EE, - SOUND_3EF = 0x000003EF, - SOUND_DANGER = 0x000003F1, - SOUND_PERIL = 0x000003F2, - SOUND_3F3 = 0x000003F3, - SOUND_3F4 = 0x000003F4, - SOUND_3F6 = 0x000003F6, - SOUND_3F9 = 0x000003F9, - SOUND_THROW = 0x000003FA, - SOUND_3FB = 0x000003FB, - SOUND_3FC = 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_2010 = 0x00002010, - SOUND_WATT_REPEL_DARKNESS = 0x00002011, - SOUND_WATT_RESUME_DARKNESS = 0x00002012, - SOUND_2013 = 0x00002013, - SOUND_2014 = 0x00002014, - SOUND_2015 = 0x00002015, - SOUND_CANNON1 = 0x00002016, - SOUND_CANNON2 = 0x00002017, - SOUND_CANNON3 = 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_202A = 0x0000202A, - SOUND_202B = 0x0000202B, - SOUND_202C = 0x0000202C, - SOUND_202D = 0x0000202D, - SOUND_202E = 0x0000202E, - SOUND_202F = 0x0000202F, - SOUND_2030 = 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_203A = 0x0000203A, - SOUND_203B = 0x0000203B, - SOUND_203C = 0x0000203C, - SOUND_203D = 0x0000203D, - SOUND_203E = 0x0000203E, - SOUND_203F = 0x0000203F, - SOUND_2040 = 0x00002040, - SOUND_2041 = 0x00002041, - SOUND_2042 = 0x00002042, - SOUND_2043 = 0x00002043, - SOUND_2044 = 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_2056 = 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_BOMB_BLAST = 0x00002076, - SOUND_2078 = 0x00002078, - SOUND_2079 = 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_20BA = 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_20C8 = 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_SPELL_CAST1 = 0x000020D4, - SOUND_SPELL_CAST2 = 0x000020D5, - SOUND_SPELL_CAST3 = 0x000020D6, - SOUND_SPELL_CAST4 = 0x000020D7, - SOUND_SPELL_CAST5 = 0x000020D8, - SOUND_20D9 = 0x000020D9, - SOUND_20DA = 0x000020DA, - SOUND_20DB = 0x000020DB, - SOUND_20DC = 0x000020DC, - SOUND_20DD = 0x000020DD, - SOUND_20DE = 0x000020DE, - SOUND_20DF = 0x000020DF, - SOUND_20E0 = 0x000020E0, - SOUND_20E1 = 0x000020E1, - SOUND_20E2 = 0x000020E2, - SOUND_20E3 = 0x000020E3, - SOUND_20E4 = 0x000020E4, - SOUND_20E5 = 0x000020E5, - SOUND_20E6 = 0x000020E6, - SOUND_20E7 = 0x000020E7, - SOUND_20E8 = 0x000020E8, - SOUND_20E9 = 0x000020E9, - SOUND_20EA = 0x000020EA, - SOUND_20EB = 0x000020EB, - SOUND_20EC = 0x000020EC, - SOUND_20ED = 0x000020ED, - SOUND_20EE = 0x000020EE, - 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_20FD = 0x000020FD, - SOUND_20FE = 0x000020FE, - SOUND_2101 = 0x00002101, - SOUND_2102 = 0x00002102, - SOUND_2103 = 0x00002103, - SOUND_2104 = 0x00002104, - SOUND_2105 = 0x00002105, - SOUND_2106 = 0x00002106, - SOUND_2107 = 0x00002107, - SOUND_2108 = 0x00002108, - SOUND_210A = 0x0000210A, - SOUND_210B = 0x0000210B, - SOUND_210C = 0x0000210C, - SOUND_2111 = 0x00002111, - SOUND_2112 = 0x00002112, - SOUND_2113 = 0x00002113, - SOUND_2114 = 0x00002114, - SOUND_2115 = 0x00002115, - SOUND_2116 = 0x00002116, - SOUND_2117 = 0x00002117, - SOUND_2118 = 0x00002118, - SOUND_2119 = 0x00002119, - SOUND_211A = 0x0000211A, - SOUND_211B = 0x0000211B, - SOUND_211C = 0x0000211C, - SOUND_211D = 0x0000211D, - SOUND_211E = 0x0000211E, - SOUND_211F = 0x0000211F, - SOUND_2120 = 0x00002120, - SOUND_2121 = 0x00002121, - SOUND_2122 = 0x00002122, - SOUND_2123 = 0x00002123, - SOUND_2124 = 0x00002124, - SOUND_2125 = 0x00002125, - SOUND_2126 = 0x00002126, - SOUND_2127 = 0x00002127, - SOUND_2128 = 0x00002128, - SOUND_2129 = 0x00002129, - SOUND_212A = 0x0000212A, - SOUND_212B = 0x0000212B, - SOUND_212C = 0x0000212C, - SOUND_212D = 0x0000212D, - SOUND_212E = 0x0000212E, + SOUND_NONE = 0x00000000, + SOUND_OPEN_POPUP_1 = 0x00000001, + SOUND_OPEN_POPUP_2 = 0x00000002, + SOUND_LOWER_STATUS_BAR = 0x00000003, + SOUND_RAISE_STATUS_BAR = 0x00000004, + SOUND_MENU_BADGE_EQUIP = 0x00000005, + SOUND_MENU_BADGE_UNEQUIP = 0x00000006, + SOUND_MENU_SHOW_CHOICE = 0x00000009, + SOUND_CHIME_BEGIN_AMBUSH = 0x0000000A, + SOUND_CHIME_SOLVED_PUZZLE = 0x0000000B, + SOUND_ACTIVATE_COMPUTER = 0x0000000C, // unused + SOUND_PARTNER_PUT_AWAY = 0x0000000D, + SOUND_PARTNER_GET_OUT = 0x0000000E, + SOUND_PARTNER_SWAP_BATTLE_POS = 0x0000000F, + SOUND_SAVE_CONFIRM = 0x00000010, + SOUND_MSG_VOICE_1A = 0x00000011, + SOUND_MSG_VOICE_1B = 0x00000012, + SOUND_MSG_VOICE_2A = 0x00000013, + SOUND_MSG_VOICE_2B = 0x00000014, + SOUND_MSG_VOICE_3A = 0x00000015, + SOUND_MSG_VOICE_3B = 0x00000016, + SOUND_MSG_VOICE_4A = 0x00000017, + SOUND_MSG_VOICE_4B = 0x00000018, + SOUND_MSG_VOICE_5A = 0x00000019, + SOUND_MSG_VOICE_5B = 0x0000001A, + SOUND_MSG_VOICE_STAR = 0x0000001B, + SOUND_LRAW_0021 = 0x00000021, + SOUND_LRAW_0022 = 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_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_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_INTRO_NEXT_PAGE = 0x000000B0, + SOUND_MERLAR_APPEARS = 0x000000B1, + SOUND_STAR_CARD_APPEARS = 0x000000B2, + SOUND_TUBBA_POUNDING = 0x000000B4, + SOUND_BOO_VANISH_A = 0x000000C1, + SOUND_BOO_VANISH_B = 0x000000C2, + SOUND_BOO_APPEAR_A = 0x000000C3, + SOUND_BOO_APPEAR_B = 0x000000C4, + SOUND_MENU_OPEN = 0x000000C5, + SOUND_MENU_CLOSE = 0x000000C6, + SOUND_MENU_CHANGE_SELECTION = 0x000000C7, + SOUND_MENU_CHANGE_TAB = 0x000000C8, + SOUND_MENU_NEXT = 0x000000C9, + SOUND_MENU_BACK = 0x000000CA, + SOUND_MSG_WAIT = 0x000000CB, + SOUND_MSG_SKIP = 0x000000CC, + SOUND_MSG_REWIND = 0x000000CD, + SOUND_MSG_UNREWIND = 0x000000CE, + SOUND_JINGLE_GOT_ITEM = 0x000000D1, + SOUND_JINGLE_GOT_KEY = 0x000000D2, + SOUND_JINGLE_GOT_BADGE = 0x000000D3, + SOUND_JINGLE_WON_BATTLE = 0x000000D4, + SOUND_FILE_MENU_IN = 0x000000D5, + SOUND_FILE_MENU_OUT = 0x000000D6, + SOUND_TRANSPORTER_IN = 0x000000D9, + SOUND_TRANSPORTER_OUT = 0x000000DA, + SOUND_SLIDE_WHISTLE_IN = 0x000000DB, // unused + SOUND_SLIDE_WHISTLE_OUT = 0x000000DC, + SOUND_HEAVY_OBJECT_DROP = 0x000000DD, + SOUND_CHECK_LAUGHING_FLOWERS = 0x000000DF, + SOUNC_CHECK_MAILBOX = 0x000000E0, + SOUND_HIT_PLAYER_NORMAL = 0x000000E1, + SOUND_HIT_PLAYER_FIRE = 0x000000E2, + SOUND_HIT_PLAYER_ICE = 0x000000E3, + SOUND_FROZEN_SHATTER = 0x000000E7, + SOUND_TOUCH_LAVA = 0x000000E8, + 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_IMMUNE = 0x0000010C, + SOUND_HIT_BONES = 0x0000010D, + 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_STEP_NORMAL1 = 0x00000141, + SOUND_STEP_NORMAL2 = 0x00000142, + SOUND_STEP_CRUNCHY1 = 0x00000143, + SOUND_STEP_CRUNCHY2 = 0x00000144, + SOUND_SPIN_JUMP = 0x00000146, + SOUND_TORNADO_JUMP = 0x00000147, + SOUND_LAND_SOFTLY = 0x00000148, + SOUND_LAND_SPIN_JUMP = 0x00000149, + SOUND_LAND_TORANDO_JUMP = 0x0000014A, + SOUND_HIT_BLOCK = 0x0000014E, + SOUND_SMASH_HAMER_BLOCK_1 = 0x0000014F, + SOUND_SMASH_HAMER_BLOCK_2 = 0x00000150, + 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_ENTER_PIPE = 0x00000163, + SOUND_LRAW_0164 = 0x00000164, + SOUND_SMASH_GOOMNUT_TREE = 0x00000165, + SOUND_SHAKE_TREE = 0x00000166, + 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_BASIC_DOOR_OPEN = 0x000001C1, + SOUND_BASIC_DOOR_CLOSE = 0x000001C2, + SOUND_METAL_DOOR_OPEN = 0x000001C3, + SOUND_METAL_DOOR_CLOSE = 0x000001C4, + SOUND_LARGE_DOOR_OPEN = 0x000001C5, + SOUND_LARGE_DOOR_CLOSE = 0x000001C6, + SOUND_CREAKY_DOOR_OPEN = 0x000001C7, + 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_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_COIN_PICKUP = 0x00000211, + SOUND_COIN_BOUNCE = 0x00000212, + SOUND_HEART_PICKUP = 0x00000213, + SOUND_HEART_BOUNCE = 0x00000214, + SOUND_STAR_POINT_PICKUP = 0x00000215, + SOUND_FLOWER_PICKUP = 0x00000217, + SOUND_FLOWER_BOUNCE = 0x00000218, + SOUND_STAR_PIECE_BOUNCE = 0x00000219, + SOUND_021A = 0x0000021A, + SOUND_021B = 0x0000021B, + SOUND_021C = 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_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_BULLET_BILL_MOTION = 0x000002C9, + SOUND_02CA = 0x000002CA, + SOUND_02CB = 0x000002CB, + SOUND_SMOKE_BURST = 0x000002CD, + SOUND_02CE = 0x000002CE, + SOUND_02CF = 0x000002CF, + SOUND_02D1 = 0x000002D1, + SOUND_02D2 = 0x000002D2, + SOUND_02D3 = 0x000002D3, + SOUND_02D4 = 0x000002D4, + SOUND_DAYZEE_JUMP = 0x000002D5, + 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_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_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_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_SRAW_FIRE_BAR_0_B = 0x00000316, + SOUND_SRAW_FIRE_BAR_1_B = 0x00000317, + SOUND_SRAW_FIRE_BAR_2_B = 0x00000318, + SOUND_SRAW_FIRE_BAR_3_B = 0x00000319, + SOUND_SRAW_FIRE_BAR_4_B = 0x0000031A, + SOUND_SRAW_FIRE_BAR_5_B = 0x0000031B, + SOUND_SRAW_FIRE_BAR_6_B = 0x0000031C, + SOUND_SRAW_FIRE_BAR_7_B = 0x0000031D, + SOUND_SRAW_FIRE_BAR_8_B = 0x0000031E, + SOUND_SRAW_FIRE_BAR_9_B = 0x0000031F, + 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_SRAW_FIRE_BAR_0_A = 0x00000336, + SOUND_SRAW_FIRE_BAR_1_A = 0x00000337, + SOUND_SRAW_FIRE_BAR_2_A = 0x00000338, + SOUND_SRAW_FIRE_BAR_3_A = 0x00000339, + SOUND_SRAW_FIRE_BAR_4_A = 0x0000033A, + SOUND_SRAW_FIRE_BAR_5_A = 0x0000033B, + SOUND_SRAW_FIRE_BAR_6_A = 0x0000033C, + SOUND_SRAW_FIRE_BAR_7_A = 0x0000033D, + SOUND_SRAW_FIRE_BAR_8_A = 0x0000033E, + SOUND_SRAW_FIRE_BAR_9_A = 0x0000033F, + SOUND_SRAW_FIRE_BAR_DEAD = 0x00000340, + SOUND_LRAW_CHARGE_BAR = 0x00000341, + SOUND_0342 = 0x00000342, + SOUND_POKEY_WALK = 0x00000343, + SOUND_POKEY_LEAN_BACK = 0x00000344, + SOUND_POKEY_LEAN_FORWARD = 0x00000345, + SOUND_POKEY_EMERGE_FROM_GROUND = 0x00000346, + SOUND_LRAW_CHEERING = 0x00000349, + 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_HIT_PLAYER_SHOCK = 0x0000037A, + SOUND_HIT_SHOCK = 0x0000037B, + 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_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_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_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_ACTOR_JUMP = 0x000003E2, + SOUND_ACTOR_TRIP = 0x000003E3, + SOUND_ACTOR_TWITCH = 0x000003E4, + SOUND_ACTOR_DEATH = 0x000003E5, + 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_DANGER = 0x000003F1, + SOUND_PERIL = 0x000003F2, + 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_BOW_VANISH = 0x0000200E, + SOUND_BOW_APPEAR = 0x0000200F, + SOUND_EGG_MISSILE_BLAST = 0x00002010, + SOUND_WATT_REPEL_DARKNESS = 0x00002011, + SOUND_WATT_RESUME_DARKNESS = 0x00002012, + SOUND_SUSHIE_EMBARK = 0x00002013, + SOUND_SUSHIE_RIDE_IDLE = 0x00002014, + SOUND_SUSHIE_RIDE_MOVING = 0x00002015, + 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_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_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_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_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_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_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_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_GOOMBA_STEP = 0x000020DD, + 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_FAKE_BOWSER_SWING = 0x000020FD, + SOUND_FAKE_BOWSER_STRIKE = 0x000020FE, + SOUND_FILE_MENU_MOVE_CURSOR = 0x00002101, + SOUND_CREATE_FILE_MOVE_CURSOR = 0x00002102, + SOUND_CREATE_FILE_SET_CHARACTER = 0x00002103, + SOUND_CREATE_FILE_BACKSPACE = 0x00002104, + SOUND_CREATE_FILE_CHANGE_CHARSET = 0x00002105, + SOUND_INFLICT_CHILL_OUT = 0x00002106, + SOUND_INFLICT_KO = 0x00002107, + SOUND_SPAWN_BLOCK = 0x00002108, + SOUND_D_DOWN_HIT_1 = 0x0000210A, + SOUND_D_DOWN_HIT_2 = 0x0000210B, + SOUND_D_DOWN_HIT_3 = 0x0000210C, + SOUND_SPIN = 0x00002111, + SOUND_SPEEDY_SPIN = 0x00002112, + SOUND_SPIN_ATTACK = 0x00002113, + SOUND_SPEEDY_SPIN_ATTACK = 0x00002114, + SOUND_HAMMER_SWING_1 = 0x00002115, + SOUND_HAMMER_SWING_2 = 0x00002116, + SOUND_HAMMER_SWING_3 = 0x00002117, + SOUND_HAMMER_STRIKE_1 = 0x00002118, + SOUND_HAMMER_STRIKE_2 = 0x00002119, + SOUND_HAMMER_STRIKE_3 = 0x0000211A, + SOUND_HAMMER_QUAKE_1 = 0x0000211B, + SOUND_HAMMER_QUAKE_2 = 0x0000211C, + SOUND_HAMMER_QUAKE_3 = 0x0000211D, + 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_BOWSER_CAST_RECOVER = 0x00002126, + SOUND_BOWSER_LIGHTNING = 0x00002127, + SOUND_BOWSER_POWER_DOWN = 0x00002128, + SOUND_BOWSER_COLLAPSE = 0x00002129, + SOUND_OBK_CHANDELIER_RELEASE = 0x0000212A, + SOUND_OBK_CHANDELIER_STOP = 0x0000212B, + SOUND_OBK_CHANDELIER_RETRACT = 0x0000212C, + SOUND_RELEASE_ENERGY = 0x0000212D, + SOUND_GATHER_ENERGY = 0x0000212E, // looping sounds - SOUND_80000000 = 0x80000000, - SOUND_80000001 = 0x80000001, - SOUND_80000002 = 0x80000002, - SOUND_80000003 = 0x80000003, - SOUND_80000004 = 0x80000004, - SOUND_80000005 = 0x80000005, - SOUND_80000006 = 0x80000006, - SOUND_80000007 = 0x80000007, - SOUND_80000008 = 0x80000008, - SOUND_80000009 = 0x80000009, - SOUND_8000000B = 0x8000000B, - SOUND_8000000C = 0x8000000C, - SOUND_8000000D = 0x8000000D, - SOUND_8000000E = 0x8000000E, - SOUND_8000000F = 0x8000000F, - SOUND_80000010 = 0x80000010, - SOUND_80000011 = 0x80000011, - SOUND_80000015 = 0x80000015, - SOUND_80000016 = 0x80000016, - SOUND_80000017 = 0x80000017, - SOUND_80000018 = 0x80000018, - SOUND_80000019 = 0x80000019, - SOUND_8000001A = 0x8000001A, - SOUND_8000001B = 0x8000001B, - SOUND_8000001C = 0x8000001C, - SOUND_8000001D = 0x8000001D, - SOUND_8000001E = 0x8000001E, - SOUND_80000021 = 0x80000021, - SOUND_80000022 = 0x80000022, - SOUND_80000023 = 0x80000023, - SOUND_80000024 = 0x80000024, - SOUND_80000025 = 0x80000025, - SOUND_80000027 = 0x80000027, - SOUND_80000028 = 0x80000028, - SOUND_80000029 = 0x80000029, - SOUND_8000002A = 0x8000002A, - SOUND_8000002B = 0x8000002B, - SOUND_8000002C = 0x8000002C, - SOUND_8000002D = 0x8000002D, - SOUND_8000002E = 0x8000002E, - SOUND_8000002F = 0x8000002F, - SOUND_80000030 = 0x80000030, - SOUND_80000031 = 0x80000031, - SOUND_80000032 = 0x80000032, - SOUND_80000033 = 0x80000033, - SOUND_80000034 = 0x80000034, - SOUND_80000035 = 0x80000035, - SOUND_80000036 = 0x80000036, - SOUND_80000037 = 0x80000037, - SOUND_80000038 = 0x80000038, - SOUND_80000039 = 0x80000039, - SOUND_80000040 = 0x80000040, - SOUND_80000041 = 0x80000041, - SOUND_80000042 = 0x80000042, - SOUND_80000043 = 0x80000043, - SOUND_80000044 = 0x80000044, - SOUND_80000045 = 0x80000045, - SOUND_80000046 = 0x80000046, - SOUND_80000047 = 0x80000047, - SOUND_80000048 = 0x80000048, - SOUND_80000049 = 0x80000049, - SOUND_8000004A = 0x8000004A, - SOUND_8000004B = 0x8000004B, - SOUND_8000004C = 0x8000004C, - SOUND_8000004D = 0x8000004D, - SOUND_8000004F = 0x8000004F, - SOUND_80000050 = 0x80000050, - SOUND_80000051 = 0x80000051, - SOUND_80000052 = 0x80000052, - SOUND_80000053 = 0x80000053, - SOUND_80000055 = 0x80000055, - SOUND_80000056 = 0x80000056, - SOUND_80000057 = 0x80000057, - SOUND_80000058 = 0x80000058, - SOUND_80000059 = 0x80000059, - SOUND_8000005A = 0x8000005A, - SOUND_8000005B = 0x8000005B, - SOUND_8000005C = 0x8000005C, - SOUND_8000005D = 0x8000005D, - SOUND_8000005E = 0x8000005E, - SOUND_8000005F = 0x8000005F, - SOUND_80000060 = 0x80000060, - SOUND_80000061 = 0x80000061, - SOUND_80000063 = 0x80000063, - SOUND_80000064 = 0x80000064, - SOUND_80000065 = 0x80000065, - SOUND_80000066 = 0x80000066, - SOUND_80000067 = 0x80000067, - SOUND_80000068 = 0x80000068, - SOUND_80000069 = 0x80000069, - SOUND_8000006A = 0x8000006A, - SOUND_8000006B = 0x8000006B, - SOUND_8000006C = 0x8000006C, + 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_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_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 // exit doors - SOUND_DOOR_OPEN = 0x90000000, - SOUND_DOOR_CLOSE = 0x90000001, + SOUND_DOOR_OPEN = 0x90000000, + SOUND_DOOR_CLOSE = 0x90000001, // room doors - SOUND_ROOM_DOOR_OPEN = 0xA0000000, - SOUND_ROOM_DOOR_CLOSE = 0xA0000001, + SOUND_ROOM_DOOR_OPEN = 0xA0000000, + SOUND_ROOM_DOOR_CLOSE = 0xA0000001, // alternating sounds - SOUND_FIRE_BAR_0 = 0xB0000000, - SOUND_FIRE_BAR_1 = 0xB0000001, - SOUND_FIRE_BAR_2 = 0xB0000002, - SOUND_FIRE_BAR_3 = 0xB0000003, - SOUND_FIRE_BAR_4 = 0xB0000004, - SOUND_FIRE_BAR_5 = 0xB0000005, - SOUND_FIRE_BAR_6 = 0xB0000006, - SOUND_FIRE_BAR_7 = 0xB0000007, - SOUND_FIRE_BAR_8 = 0xB0000008, - SOUND_FIRE_BAR_9 = 0xB0000009, - SOUND_B000000A = 0xB000000A, - SOUND_B000000C = 0xB000000C, - SOUND_B000000D = 0xB000000D, - SOUND_B000000E = 0xB000000E, - SOUND_B000000F = 0xB000000F, - SOUND_B0000010 = 0xB0000010, - SOUND_B0000011 = 0xB0000011, - SOUND_B0000012 = 0xB0000012, - SOUND_B0000015 = 0xB0000015, - SOUND_B0000016 = 0xB0000016, - SOUND_B0000017 = 0xB0000017, - SOUND_B0000018 = 0xB0000018, - SOUND_B0000019 = 0xB0000019, - SOUND_B000001A = 0xB000001A, - SOUND_B000001B = 0xB000001B, - SOUND_B000001C = 0xB000001C, - SOUND_B000001D = 0xB000001D, - SOUND_B000001E = 0xB000001E, - SOUND_B000001F = 0xB000001F, - SOUND_B0000021 = 0xB0000021, + SOUND_SEQ_FIRE_BAR_0 = 0xB0000000, + SOUND_SEQ_FIRE_BAR_1 = 0xB0000001, + SOUND_SEQ_FIRE_BAR_2 = 0xB0000002, + SOUND_SEQ_FIRE_BAR_3 = 0xB0000003, + SOUND_SEQ_FIRE_BAR_4 = 0xB0000004, + SOUND_SEQ_FIRE_BAR_5 = 0xB0000005, + SOUND_SEQ_FIRE_BAR_6 = 0xB0000006, + SOUND_SEQ_FIRE_BAR_7 = 0xB0000007, + 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, }; enum SoundSpatializationFlags { @@ -1676,7 +1698,7 @@ enum SoundSpatializationFlags { enum SoundType { SOUND_TYPE_SPECIAL = 0x80000000, - SOUND_TYPE_LOOPING = 0, + SOUND_TYPE_LOOPING = 0, // 0x80000000 (with SOUND_TYPE_SPECIAL) SOUND_TYPE_EXIT_DOOR = 1, // 0x90000000 (with SOUND_TYPE_SPECIAL) SOUND_TYPE_ROOM_DOOR = 2, // 0xA0000000 (with SOUND_TYPE_SPECIAL) SOUND_TYPE_ALTERNATING = 3, // 0xB0000000 (with SOUND_TYPE_SPECIAL) diff --git a/src/16F740.c b/src/16F740.c index ae73087f7b..32b28da7d9 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -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_299); + sfx_play_sound(SOUND_0299); btl_show_battle_message(BTL_MSG_WATER_BLOCK_END, 60); gBattleSubState = BTL_SUBSTATE_BEGIN_PLAYER_TURN_AWAIT_WATER_BLOCK; } else { @@ -2294,7 +2294,7 @@ void btl_state_update_run_away(void) { enemyCount = prevSP - battleStatus->totalStarPoints; if (enemyCount > 0) { - sfx_play_sound(SOUND_211); + sfx_play_sound(SOUND_COIN_PICKUP); } playerData->starPoints += enemyCount; BattleScreenFadeAmt++; @@ -2852,7 +2852,7 @@ void btl_state_update_player_move(void) { gBattleSubState = BTL_SUBSTATE_PLAYER_MOVE_CHECK_PLAYER_STATUS; break; } - sfx_play_sound(SOUND_2107); + sfx_play_sound(SOUND_INFLICT_KO); btl_show_battle_message(messageIndex, 60); for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { actor = battleStatus->enemyActors[i]; @@ -3362,7 +3362,7 @@ void btl_state_update_partner_move(void) { break; } - sfx_play_sound(SOUND_2107); + sfx_play_sound(SOUND_INFLICT_KO); btl_show_battle_message(messageIndex, 60); for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { diff --git a/src/17D6A0.c b/src/17D6A0.c index c0eda44596..1d7f9112d3 100644 --- a/src/17D6A0.c +++ b/src/17D6A0.c @@ -296,773 +296,773 @@ s32 D_80281454[] = { ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { [ACTOR_TYPE_RED_GOOMBA] = { - .walk = { SOUND_20DD, SOUND_20DD }, - .fly = { SOUND_20DD, SOUND_20DD }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .fly = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_RED_PARAGOOMBA] = { - .walk = { SOUND_20DF, SOUND_20DF }, - .fly = { SOUND_20DF, SOUND_20DF }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_PARAGOOMBA_FLY, SOUND_PARAGOOMBA_FLY }, + .fly = { SOUND_PARAGOOMBA_FLY, SOUND_PARAGOOMBA_FLY }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GLOOMBA] = { - .walk = { SOUND_20DD, SOUND_20DD }, - .fly = { SOUND_20DD, SOUND_20DD }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .fly = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_PARAGLOOMBA] = { - .walk = { SOUND_20DF, SOUND_20DF }, - .fly = { SOUND_20DF, SOUND_20DF }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_PARAGOOMBA_FLY, SOUND_PARAGOOMBA_FLY }, + .fly = { SOUND_PARAGOOMBA_FLY, SOUND_PARAGOOMBA_FLY }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SPIKED_GLOOMBA] = { - .walk = { SOUND_20DD, SOUND_20DD }, - .fly = { SOUND_20DD, SOUND_20DD }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .fly = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_DARK_KOOPA] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_DARK_PARATROOPA] = { - .walk = { SOUND_20DF, SOUND_20DF }, - .fly = { SOUND_20DF, SOUND_20DF }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_PARAGOOMBA_FLY, SOUND_PARAGOOMBA_FLY }, + .fly = { SOUND_PARAGOOMBA_FLY, SOUND_PARAGOOMBA_FLY }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GOOMBA] = { - .walk = { SOUND_20DD, SOUND_20DD }, - .fly = { SOUND_20DD, SOUND_20DD }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .fly = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_PARAGOOMBA] = { - .walk = { SOUND_20DF, SOUND_20DF }, - .fly = { SOUND_20DF, SOUND_20DF }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_PARAGOOMBA_FLY, SOUND_PARAGOOMBA_FLY }, + .fly = { SOUND_PARAGOOMBA_FLY, SOUND_PARAGOOMBA_FLY }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SPIKED_GOOMBA] = { - .walk = { SOUND_20DD, SOUND_20DD }, - .fly = { SOUND_20DD, SOUND_20DD }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .fly = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_FUZZY] = { - .walk = { SOUND_331, SOUND_331 }, - .fly = { SOUND_331, SOUND_331 }, - .jump = SOUND_331, - .hurt = SOUND_10F, + .walk = { SOUND_SRAW_17_A, SOUND_SRAW_17_A }, + .fly = { SOUND_SRAW_17_A, SOUND_SRAW_17_A }, + .jump = SOUND_SRAW_17_A, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_KOOPA_TROOPA] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_PARATROOPA] = { - .walk = { SOUND_20DF, SOUND_20DF }, - .fly = { SOUND_20DF, SOUND_20DF }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_PARAGOOMBA_FLY, SOUND_PARAGOOMBA_FLY }, + .fly = { SOUND_PARAGOOMBA_FLY, SOUND_PARAGOOMBA_FLY }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_BOB_OMB] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_BOB_OMB_DUP] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_BULLET_BILL] = { - .walk = { SOUND_2C9, SOUND_2C9 }, - .fly = { SOUND_2C9, SOUND_2C9 }, - .jump = SOUND_2C9, - .hurt = SOUND_10F, + .walk = { SOUND_BULLET_BILL_MOTION, SOUND_BULLET_BILL_MOTION }, + .fly = { SOUND_BULLET_BILL_MOTION, SOUND_BULLET_BILL_MOTION }, + .jump = SOUND_BULLET_BILL_MOTION, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_BILL_BLASTER] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_CLEFT] = { .walk = { SOUND_20D0, SOUND_20D0 }, .fly = { SOUND_20D0, SOUND_20D0 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_MONTY_MOLE] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_BANDIT] = { .walk = { SOUND_20C1, SOUND_20C1 }, .fly = { SOUND_20C1, SOUND_20C1 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_POKEY] = { - .walk = { SOUND_343, NULL }, + .walk = { SOUND_POKEY_WALK, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_POKEY_MUMMY] = { - .walk = { SOUND_343, NULL }, + .walk = { SOUND_POKEY_WALK, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SWOOPER] = { - .walk = { SOUND_351, SOUND_351 }, - .fly = { SOUND_351, SOUND_351 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT }, + .fly = { SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_BUZZY_BEETLE] = { - .walk = { SOUND_20DD, SOUND_20DD }, - .fly = { SOUND_20DD, SOUND_20DD }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .fly = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_STONE_CHOMP] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, .jump = NULL, - .hurt = SOUND_10F, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_PIRANHA_PLANT] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_FOREST_FUZZY] = { - .walk = { SOUND_331, SOUND_331 }, - .fly = { SOUND_331, SOUND_331 }, - .jump = SOUND_331, - .hurt = SOUND_10F, + .walk = { SOUND_SRAW_17_A, SOUND_SRAW_17_A }, + .fly = { SOUND_SRAW_17_A, SOUND_SRAW_17_A }, + .jump = SOUND_SRAW_17_A, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_HYPER_GOOMBA] = { - .walk = { SOUND_20DD, SOUND_20DD }, - .fly = { SOUND_20DD, SOUND_20DD }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .fly = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_HYPER_PARAGOOMBA] = { - .walk = { SOUND_20DF, SOUND_20DF }, - .fly = { SOUND_20DF, SOUND_20DF }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_PARAGOOMBA_FLY, SOUND_PARAGOOMBA_FLY }, + .fly = { SOUND_PARAGOOMBA_FLY, SOUND_PARAGOOMBA_FLY }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_HYPER_CLEFT] = { .walk = { SOUND_20D0, SOUND_20D0 }, .fly = { SOUND_20D0, SOUND_20D0 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_CLUBBA] = { .walk = { SOUND_20C4, SOUND_20C4 }, .fly = { SOUND_20C4, SOUND_20C4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SHY_GUY] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GROOVE_GUY] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SKY_GUY] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_MEDI_GUY] = { .walk = { NULL, NULL }, - .fly = { SOUND_380, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .fly = { SOUND_SHYGUY_FLY, NULL }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_PYRO_GUY] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SPY_GUY] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_FUZZIPEDE] = { - .walk = { SOUND_20D9, SOUND_20D9 }, - .fly = { SOUND_20D9, SOUND_20D9 }, - .jump = SOUND_20D9, - .hurt = SOUND_10F, + .walk = { SOUND_FUZZIPEDE_MOTION, SOUND_FUZZIPEDE_MOTION }, + .fly = { SOUND_FUZZIPEDE_MOTION, SOUND_FUZZIPEDE_MOTION }, + .jump = SOUND_FUZZIPEDE_MOTION, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_HURT_PLANT] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_M_BUSH] = { .walk = { SOUND_20C6, SOUND_20C6 }, .fly = { SOUND_20C6, SOUND_20C6 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_AQUA_FUZZY] = { - .walk = { SOUND_331, SOUND_331 }, - .fly = { SOUND_331, SOUND_331 }, - .jump = SOUND_331, - .hurt = SOUND_10F, + .walk = { SOUND_SRAW_17_A, SOUND_SRAW_17_A }, + .fly = { SOUND_SRAW_17_A, SOUND_SRAW_17_A }, + .jump = SOUND_SRAW_17_A, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_JUNGLE_FUZZY] = { - .walk = { SOUND_331, SOUND_331 }, - .fly = { SOUND_331, SOUND_331 }, - .jump = SOUND_331, - .hurt = SOUND_10F, + .walk = { SOUND_SRAW_17_A, SOUND_SRAW_17_A }, + .fly = { SOUND_SRAW_17_A, SOUND_SRAW_17_A }, + .jump = SOUND_SRAW_17_A, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SPEAR_GUY] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_LAVA_BUBBLE] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SPIKE_TOP] = { - .walk = { SOUND_20DD, SOUND_20DD }, - .fly = { SOUND_20DD, SOUND_20DD }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .fly = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_PUTRID_PIRANHA] = { - .walk = { SOUND_3CE, SOUND_3CE }, + .walk = { SOUND_03CE, SOUND_03CE }, .fly = { NULL, NULL }, .jump = NULL, .hurt = NULL, .delay = { 30, 30 } }, [ACTOR_TYPE_LAKITU] = { - .walk = { SOUND_295, SOUND_295 }, - .fly = { SOUND_295, SOUND_295 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, + .fly = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { -5, -5 } }, [ACTOR_TYPE_SPINY] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_MONTY_MOLE_BOSS] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_BZZAP] = { - .walk = { SOUND_357, NULL }, - .fly = { SOUND_357, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_0357, NULL }, + .fly = { SOUND_0357, NULL }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_CRAZEE_DAYZEE] = { - .walk = { SOUND_2D6, SOUND_2D6 }, - .fly = { SOUND_2D6, SOUND_2D6 }, - .jump = SOUND_2D5, - .hurt = SOUND_10F, + .walk = { SOUND_02D6, SOUND_02D6 }, + .fly = { SOUND_02D6, SOUND_02D6 }, + .jump = SOUND_DAYZEE_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_AMAZY_DAYZEE] = { - .walk = { SOUND_2D6, SOUND_2D6 }, - .fly = { SOUND_2D6, SOUND_2D6 }, - .jump = SOUND_2D5, - .hurt = SOUND_10F, + .walk = { SOUND_02D6, SOUND_02D6 }, + .fly = { SOUND_02D6, SOUND_02D6 }, + .jump = SOUND_DAYZEE_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_RUFF_PUFF] = { - .walk = { SOUND_295, NULL }, - .fly = { SOUND_295, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_LRAW_0295, NULL }, + .fly = { SOUND_LRAW_0295, NULL }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SPIKE] = { - .walk = { SOUND_295, NULL }, - .fly = { SOUND_295, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_LRAW_0295, NULL }, + .fly = { SOUND_LRAW_0295, NULL }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GULPIT] = { .walk = { SOUND_20C4, SOUND_20C4 }, .fly = { SOUND_20C4, SOUND_20C4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GULPIT_ROCKS] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_WHITE_CLUBBA] = { .walk = { SOUND_20C4, SOUND_20C4 }, .fly = { SOUND_20C4, SOUND_20C4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_FROST_PIRANHA] = { - .walk = { SOUND_3CE, SOUND_3CE }, + .walk = { SOUND_03CE, SOUND_03CE }, .fly = { NULL, NULL }, .jump = NULL, - .hurt = SOUND_10F, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SWOOPULA] = { - .walk = { SOUND_351, SOUND_351 }, - .fly = { SOUND_351, SOUND_351 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT }, + .fly = { SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_DUPLIGHOST] = { - .walk = { SOUND_2CA, SOUND_2CA }, + .walk = { SOUND_02CA, SOUND_02CA }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GHOST_GOOMBARIO] = { - .walk = { SOUND_20DD, SOUND_20DD }, + .walk = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GHOST_KOOPER] = { - .walk = { SOUND_100, SOUND_100 }, + .walk = { SOUND_0100, SOUND_0100 }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GHOST_BOMBETTE] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GHOST_PARAKARRY] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GHOST_BOW] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GHOST_WATT] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GHOST_SUSHIE] = { - .walk = { SOUND_29A, SOUND_29A }, + .walk = { SOUND_029A, SOUND_029A }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GHOST_LAKILESTER] = { - .walk = { SOUND_295, SOUND_295 }, - .fly = { SOUND_295, SOUND_295 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, + .fly = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { -5, -5 } }, [ACTOR_TYPE_ALBINO_DINO] = { - .walk = { SOUND_30B, SOUND_2FD }, + .walk = { SOUND_030B, SOUND_02FD }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_EMBER] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_BONY_BEETLE] = { .walk = { SOUND_20CD, SOUND_20CD }, .fly = { SOUND_20CD, SOUND_20CD }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_DRY_BONES] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_DRY_BONES2] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_BOMBSHELL_BLASTER] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_BOMBSHELL_BILL] = { - .walk = { SOUND_2C9, SOUND_2C9 }, - .fly = { SOUND_2C9, SOUND_2C9 }, - .jump = SOUND_2C9, - .hurt = SOUND_10F, + .walk = { SOUND_BULLET_BILL_MOTION, SOUND_BULLET_BILL_MOTION }, + .fly = { SOUND_BULLET_BILL_MOTION, SOUND_BULLET_BILL_MOTION }, + .jump = SOUND_BULLET_BILL_MOTION, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_HAMMER_BROS] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_KOOPATROL] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_MAGIKOOPA] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_FLYING_MAGIKOOPA] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_MAGICLONE] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_FLYING_MAGICLONE] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_RED_MAGIKOOPA] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_FLYING_RED_MAGIKOOPA] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GREEN_MAGIKOOPA] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_FLYING_GREEN_MAGIKOOPA] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_YELLOW_MAGIKOOPA] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_FLYING_YELLOW_MAGIKOOPA] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GRAY_MAGIKOOPA] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_FLYING_GRAY_MAGIKOOPA] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_WHITE_MAGIKOOPA] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_FLYING_WHITE_MAGIKOOPA] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_5B] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_5C] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_5D] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_5E] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_5F] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_60] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_61] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_62] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_63] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_64] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_65] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_66] = { - .walk = { SOUND_295, SOUND_295 }, - .fly = { SOUND_295, SOUND_295 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, + .fly = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { -5, -5 } }, [ACTOR_TYPE_UNUSED_67] = { - .walk = { SOUND_20DD, SOUND_20DD }, - .fly = { SOUND_20DD, SOUND_20DD }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .fly = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_68] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_69] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_6A] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_MONTY_HOLE] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_6C] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_UNUSED_6D] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_PLAYER] = { @@ -1073,59 +1073,59 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { .delay = { 30, 30 } }, [ACTOR_TYPE_GOOMBARIO] = { - .walk = { SOUND_20DD, SOUND_20DD }, + .walk = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_KOOPER] = { - .walk = { SOUND_100, SOUND_100 }, + .walk = { SOUND_0100, SOUND_0100 }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_BOMBETTE] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_PARAKARRY] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_BOW] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_WATT] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SUSHIE] = { - .walk = { SOUND_29A, SOUND_29A }, + .walk = { SOUND_029A, SOUND_029A }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_LAKILESTER] = { - .walk = { SOUND_295, SOUND_295 }, - .fly = { SOUND_295, SOUND_295 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, + .fly = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { -5, -5 } }, [ACTOR_TYPE_TWINK] = { @@ -1150,94 +1150,94 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { .delay = { 30, 30 } }, [ACTOR_TYPE_THE_MASTER_1] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .jump = NULL, - .hurt = SOUND_10F, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_THE_MASTER_2] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .jump = NULL, - .hurt = SOUND_10F, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_THE_MASTER_3] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .jump = NULL, - .hurt = SOUND_10F, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_CHAN] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_LEE] = { - .walk = { SOUND_2CA, SOUND_2CA }, + .walk = { SOUND_02CA, SOUND_02CA }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_LEE_GOOMBARIO] = { - .walk = { SOUND_20DD, SOUND_20DD }, + .walk = { SOUND_GOOMBA_STEP, SOUND_GOOMBA_STEP }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_LEE_KOOPER] = { - .walk = { SOUND_100, SOUND_100 }, + .walk = { SOUND_0100, SOUND_0100 }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_LEE_BOMBETTE] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_LEE_PARAKARRY] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_LEE_BOW] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_LEE_WATT] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_LEE_SUSHIE] = { - .walk = { SOUND_29A, SOUND_29A }, + .walk = { SOUND_029A, SOUND_029A }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_LEE_LAKILESTER] = { - .walk = { SOUND_295, SOUND_295 }, - .fly = { SOUND_295, SOUND_295 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, + .fly = { SOUND_LRAW_0295, SOUND_LRAW_0295 }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { -5, -5 } }, [ACTOR_TYPE_KAMMY_KOOPA] = { @@ -1249,79 +1249,79 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { }, [ACTOR_TYPE_JR_TROOPA1] = { .walk = { SOUND_20C1, SOUND_20C1 }, - .fly = { SOUND_351, SOUND_351 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .fly = { SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_JR_TROOPA2] = { .walk = { SOUND_20C1, SOUND_20C1 }, - .fly = { SOUND_351, SOUND_351 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .fly = { SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_JR_TROOPA3] = { .walk = { SOUND_20C1, SOUND_20C1 }, - .fly = { SOUND_351, SOUND_351 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .fly = { SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_JR_TROOPA4] = { .walk = { SOUND_20C1, SOUND_20C1 }, - .fly = { SOUND_351, SOUND_351 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .fly = { SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_JR_TROOPA5] = { .walk = { SOUND_20C1, SOUND_20C1 }, - .fly = { SOUND_351, SOUND_351 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .fly = { SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_JR_TROOPA6] = { .walk = { SOUND_20C1, SOUND_20C1 }, - .fly = { SOUND_351, SOUND_351 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .fly = { SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_JR_TROOPA_DUP1] = { .walk = { SOUND_20C1, SOUND_20C1 }, - .fly = { SOUND_351, SOUND_351 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .fly = { SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_JR_TROOPA_DUP2] = { .walk = { SOUND_20C1, SOUND_20C1 }, - .fly = { SOUND_351, SOUND_351 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .fly = { SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_BLUE_GOOMBA_BOSS] = { - .walk = { SOUND_3AC, SOUND_3AC }, + .walk = { SOUND_03AC, SOUND_03AC }, .fly = { NULL, NULL }, - .jump = SOUND_10F, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_HURT, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_RED_GOOMBA_BOSS] = { - .walk = { SOUND_3AC, SOUND_3AC }, + .walk = { SOUND_03AC, SOUND_03AC }, .fly = { NULL, NULL }, - .jump = SOUND_10F, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_HURT, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GOOMBA_KING] = { .walk = { SOUND_20EC, SOUND_20EC }, .fly = { NULL, NULL }, .jump = NULL, - .hurt = SOUND_10F, + .hurt = SOUND_ACTOR_HURT, .delay = { 22, 30 } }, [ACTOR_TYPE_GOOMNUT_TREE] = { @@ -1341,33 +1341,33 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { [ACTOR_TYPE_MAGIKOOPA_BOSS] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_FLYING_MAGIKOOPA_BOSS] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_MAGIKOOPA_DUP1] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_MAGIKOOPA_DUP2] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_FAKE_BOWSER] = { - .walk = { SOUND_3EA, SOUND_3EA }, + .walk = { SOUND_03EA, SOUND_03EA }, .fly = { NULL, NULL }, .jump = NULL, .hurt = NULL, @@ -1381,30 +1381,30 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { .delay = { 30, 30 } }, [ACTOR_TYPE_GREEN_NINJAKOOPA] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, + .jump = SOUND_ACTOR_JUMP, .hurt = NULL, .delay = { 30, 30 } }, [ACTOR_TYPE_RED_NINJAKOOPA] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, + .jump = SOUND_ACTOR_JUMP, .hurt = NULL, .delay = { 30, 30 } }, [ACTOR_TYPE_BLACK_NINJAKOOPA] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, + .jump = SOUND_ACTOR_JUMP, .hurt = NULL, .delay = { 30, 30 } }, [ACTOR_TYPE_YELLOW_NINJAKOOPA] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, + .jump = SOUND_ACTOR_JUMP, .hurt = NULL, .delay = { 30, 30 } }, @@ -1423,7 +1423,7 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { .delay = { -14, -14 } }, [ACTOR_TYPE_TUTANKOOPA] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, .jump = NULL, .hurt = NULL, @@ -1433,7 +1433,7 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, .jump = NULL, - .hurt = SOUND_10F, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_TUBBA_BLUBBA_INVINCIBLE] = { @@ -1453,7 +1453,7 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { [ACTOR_TYPE_TUBBA_HEART] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_20C8, + .jump = SOUND_TUBBA_HEART_JUMP, .hurt = NULL, .delay = { 30, 30 } }, @@ -1461,81 +1461,81 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { .walk = { SOUND_2066, SOUND_2066 }, .fly = { NULL, NULL }, .jump = NULL, - .hurt = SOUND_10F, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SHY_STACK] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 10, 10 } }, [ACTOR_TYPE_SHY_SQUAD] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, .jump = NULL, - .hurt = SOUND_10F, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_GENERAL_GUY] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, .jump = NULL, - .hurt = SOUND_10F, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_TOY_TANK] = { - .walk = { SOUND_37E, SOUND_37E }, + .walk = { SOUND_037E, SOUND_037E }, .fly = { NULL, NULL }, .jump = NULL, - .hurt = SOUND_10F, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_LIGHT_BULB] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, .jump = NULL, - .hurt = SOUND_10F, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SIGNAL_GUY] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, .jump = NULL, - .hurt = SOUND_10F, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SHY_SQUAD_DUP] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, .jump = NULL, - .hurt = SOUND_10F, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SHY_GUY_DUP] = { - .walk = { SOUND_20BA, SOUND_20BA }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_A }, .fly = { NULL, NULL }, .jump = NULL, - .hurt = SOUND_10F, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_ANTI_GUY_OMO] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_ANTI_GUY_KPA] = { - .walk = { SOUND_20BA, SOUND_3B4 }, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, .fly = { NULL, NULL }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_BIG_LANTERN_GHOST] = { - .walk = { SOUND_37D, SOUND_37D }, + .walk = { SOUND_037D, SOUND_037D }, .fly = { NULL, NULL }, .jump = NULL, .hurt = NULL, @@ -1599,7 +1599,7 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { }, [ACTOR_TYPE_HUFF_N_PUFF] = { .walk = { NULL, NULL }, - .fly = { SOUND_3D1, NULL }, + .fly = { SOUND_03D1, NULL }, .jump = NULL, .hurt = NULL, .delay = { 30, 30 } @@ -1642,14 +1642,14 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { [ACTOR_TYPE_INTRO_BOWSER] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_3E7, + .jump = SOUND_LARGE_ACTOR_JUMP, .hurt = NULL, .delay = { 30, 30 } }, [ACTOR_TYPE_BOWSER_PHASE_1] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_3E7, + .jump = SOUND_LARGE_ACTOR_JUMP, .hurt = NULL, .delay = { 30, 30 } }, @@ -1663,7 +1663,7 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { [ACTOR_TYPE_BOWSER_PHASE_2] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_3E7, + .jump = SOUND_LARGE_ACTOR_JUMP, .hurt = NULL, .delay = { 30, 30 } }, @@ -1677,7 +1677,7 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { [ACTOR_TYPE_BOWSER_PHASE_3] = { .walk = { NULL, NULL }, .fly = { NULL, NULL }, - .jump = SOUND_3E7, + .jump = SOUND_LARGE_ACTOR_JUMP, .hurt = NULL, .delay = { 30, 30 } }, @@ -1731,24 +1731,24 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { .delay = { 30, 30 } }, [ACTOR_TYPE_LAKILESTER_DUP] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SLOT_MACHINE_START] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_SLOT_MACHINE_STOP] = { - .walk = { SOUND_20BA, SOUND_3B4 }, - .fly = { SOUND_20BA, SOUND_3B4 }, - .jump = SOUND_JUMP_3E2, - .hurt = SOUND_10F, + .walk = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .fly = { SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B }, + .jump = SOUND_ACTOR_JUMP, + .hurt = SOUND_ACTOR_HURT, .delay = { 30, 30 } }, [ACTOR_TYPE_WHACKA] = { diff --git a/src/17FEB0.c b/src/17FEB0.c index 308083976b..860424b946 100644 --- a/src/17FEB0.c +++ b/src/17FEB0.c @@ -391,7 +391,7 @@ HitResult calc_item_damage_enemy(void) { hitResult = HIT_RESULT_HIT; sp1C = TRUE; gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10 | BS_FLAGS1_SHOW_PLAYER_DECORATIONS | BS_FLAGS1_ACTORS_VISIBLE; - sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); wasStatusInflicted = TRUE; gBattleStatus.flags1 |= BS_FLAGS1_40; } else { @@ -407,7 +407,7 @@ HitResult calc_item_damage_enemy(void) { || ((gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) && !(gBattleStatus.flags1 & BS_FLAGS1_80)) ) { if (battleStatus->lastAttackDamage > 0) { - sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->lastAttackDamage > 0 || (battleStatus->curAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS) && sp1C) { diff --git a/src/18C790.c b/src/18C790.c index 877b0e7895..dd123eea11 100644 --- a/src/18C790.c +++ b/src/18C790.c @@ -508,7 +508,7 @@ void btl_state_update_celebration(void) { bFadeToBlackAmt = 0; LevelUpSelectTextOffsetX = 0; LevelUpSelectTextVelX = 0; - sfx_play_sound(SOUND_D4); + sfx_play_sound(SOUND_JINGLE_WON_BATTLE); prevSP = playerData->starPoints + battleStatus->totalStarPoints; if (prevSP > 99) { @@ -551,7 +551,7 @@ void btl_state_update_celebration(void) { battleStatus->totalStarPoints = EndBattleRewardTotal / 100; deltaSP = prevSP - battleStatus->totalStarPoints; if (deltaSP > 0) { - sfx_play_sound(SOUND_215); + sfx_play_sound(SOUND_STAR_POINT_PICKUP); } playerData->starPoints += deltaSP; @@ -615,7 +615,7 @@ void btl_state_update_celebration(void) { btl_cam_use_preset(BTL_CAM_DEFAULT); btl_cam_move(5); DMA_COPY_SEGMENT(level_up); - sfx_play_sound(SOUND_80000008); + sfx_play_sound(SOUND_LOOP_08); CelebrateStateTime = 0; gBattleSubState = BTL_SUBSTATE_CELEBRATE_LEVEL_UP_BEGIN; } @@ -981,7 +981,7 @@ void btl_state_update_celebration(void) { if (battleStatus->curButtonsPressed & BUTTON_A) { if (!CantLevelUpStat[battleStatus->curSubmenu]) { sfx_play_sound(SOUND_MENU_NEXT); - sfx_play_sound(SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND); + sfx_play_sound(SOUND_LRAW_CHEERING | SOUND_ID_TRIGGER_CHANGE_SOUND); gBattleSubState = BTL_SUBSTATE_CELEBRATE_LEVEL_UP_UPGRADE; } else { sfx_play_sound(SOUND_MENU_ERROR); diff --git a/src/18F340.c b/src/18F340.c index 5391c41320..3c7c5a9e3b 100644 --- a/src/18F340.c +++ b/src/18F340.c @@ -75,7 +75,7 @@ API_CALLABLE(DoesMarioStatusPreventHappyAnimation) { Actor* player = gBattleStatus.playerActor; show_action_rating(ACTION_RATING_LUCKY, player, player->curPos.x, player->curPos.y + 20.0f, player->curPos.z); - sfx_play_sound(SOUND_3FC); + sfx_play_sound(SOUND_03FC); script->varTable[0] = FALSE; if (player->debuff == STATUS_KEY_FEAR || player->debuff == STATUS_KEY_DIZZY || player->debuff == STATUS_KEY_PARALYZE || player->debuff == STATUS_KEY_SLEEP ||player->debuff == STATUS_KEY_FROZEN || player->debuff == STATUS_KEY_STOP) { @@ -368,7 +368,7 @@ API_CALLABLE(BattleFadeInMerlee) { Npc* merlee = get_npc_unsafe(NPC_BTL_MERLEE); if (isInitialCall) { - sfx_play_sound(SOUND_24B); + sfx_play_sound(SOUND_024B); merlee->alpha = 0; } @@ -695,7 +695,7 @@ EvtScript EVS_MarioEnterStage = { EVT_CHILD_THREAD EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) EVT_END_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_162) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0162) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_GetUp) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_DustOff) @@ -1059,7 +1059,7 @@ EvtScript EVS_Player_Celebrate = { EvtScript EVS_RunAwayNoCommand = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hustled) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15D) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_015D) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) @@ -1096,7 +1096,7 @@ EvtScript EVS_RunAwayNoCommand = { EVT_CALL(DetermineAutoRunAwaySuccess) EVT_IF_EQ(LVar0, 1) EVT_CALL(SetFledBattleFlag) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_015E) EVT_CALL(SetGoalPos, ACTOR_PLAYER, -240, 0, 10) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(16.0)) EVT_CALL(PlayerRunToGoal, 0) @@ -1106,7 +1106,7 @@ EvtScript EVS_RunAwayNoCommand = { EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) EVT_END_CHILD_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Trip) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_162) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0162) EVT_CALL(SetGoalPos, ACTOR_PLAYER, -100, 0, 10) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(10.0)) EVT_CALL(PlayerRunToGoal, 0) @@ -1168,7 +1168,7 @@ EvtScript EVS_RunAwayStart = { EVT_CALL(SetupMashMeter, 1, 100, 0, 0, 0, 0) EVT_CALL(func_80260E38) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hustled) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15D) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_015D) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) @@ -1210,7 +1210,7 @@ EvtScript EVS_RunAwayStart = { EVT_CALL(DetermineAutoRunAwaySuccess) EVT_IF_EQ(LVar0, 1) EVT_CALL(SetFledBattleFlag) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_015E) EVT_CALL(SetGoalPos, ACTOR_PLAYER, -240, 0, 10) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(16.0)) EVT_CALL(PlayerRunToGoal, 0) @@ -1220,7 +1220,7 @@ EvtScript EVS_RunAwayStart = { EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) EVT_END_CHILD_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Trip) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_162) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0162) EVT_CALL(SetGoalPos, ACTOR_PLAYER, -100, 0, 10) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(10.0)) EVT_CALL(PlayerRunToGoal, 0) @@ -1286,7 +1286,7 @@ EvtScript EVS_PlayerDies = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_24) EVT_WAIT(15) EVT_CALL(EnablePlayerBlur, BLUR_DISABLE) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_371) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0371) EVT_SET(LVar0, 0) EVT_LOOP(30) EVT_ADD(LVar0, 60) @@ -1301,7 +1301,7 @@ EvtScript EVS_PlayerDies = { EVT_END_LOOP EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3FB) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_03FB) EVT_SET(LVar0, 0) EVT_SET(LVar1, 1) EVT_LOOP(0) @@ -1473,7 +1473,7 @@ EvtScript EVS_UseLifeShroom = { EVT_WAIT(15) EVT_CALL(GiveRefundCleanup) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_372) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0372) EVT_ADD(LVar4, 15) EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 3, LVar3, LVar4, LVar5, EVT_FLOAT(1.0)) EVT_SET(LVar0, LVarF) @@ -1488,7 +1488,7 @@ EvtScript EVS_UseLifeShroom = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2055) EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 1, LVar3, LVar4, LVar5, 70, 70, 10, 20) EVT_WAIT(20) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_373) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0373) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 2, LVar0, LVar1, LVar2, 50, 20, 32, 30) EVT_WAIT(40) @@ -1517,7 +1517,7 @@ EvtScript EVS_UseLifeShroom = { EVT_CHILD_THREAD EVT_CALL(LifeShroomRevealWorld) EVT_END_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_374) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0374) EVT_CALL(SetActorRotation, ACTOR_PLAYER, 0, 0, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(ConsumeLifeShroom) @@ -1551,7 +1551,7 @@ EvtScript EVS_UseLifeShroom = { EVT_PLAY_EFFECT(EFFECT_MISC_PARTICLES, 2, LVar0, LVar1, LVar2, 20, 20, EVT_FLOAT(1.0), 10, 50) EVT_END_LOOP EVT_END_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/190B20.c b/src/190B20.c index bdd9861fb8..e246be2a54 100644 --- a/src/190B20.c +++ b/src/190B20.c @@ -2199,7 +2199,7 @@ s32 inflict_partner_ko(Actor* target, s32 statusTypeKey, s32 duration) { if (statusTypeKey == STATUS_KEY_DAZE) { if (statusTypeKey != target->koStatus) { inflict_status(target, STATUS_KEY_DAZE, duration); - sfx_play_sound(SOUND_2107); + sfx_play_sound(SOUND_INFLICT_KO); } else { target->koDuration += duration; if (target->koDuration > 9) { @@ -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_299); + sfx_play_sound(SOUND_0299); } if (buffs & PLAYER_BUFF_TURBO_CHARGE && (battleStatus->turboChargeTurnsLeft != 0)) { battleStatus->turboChargeTurnsLeft = 0; @@ -2907,7 +2907,7 @@ void btl_update_ko_status(void) { player->disableEffect->data.disableX->koDuration = player->koDuration; if (koDuration == 0) { - sfx_play_sound(SOUND_2107); + sfx_play_sound(SOUND_INFLICT_KO); } } diff --git a/src/19FAF0.c b/src/19FAF0.c index 9e089054e2..13e35b234b 100644 --- a/src/19FAF0.c +++ b/src/19FAF0.c @@ -216,7 +216,7 @@ HitResult calc_player_test_enemy(void) { && (targetPart->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP) && !player_team_is_ability_active(player, ABILITY_SPIKE_SHIELD)) { - sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); return HIT_RESULT_LANDED_ON_SPIKE; } @@ -225,7 +225,7 @@ HitResult calc_player_test_enemy(void) { && (!(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_SPIKY_FRONT) && !player_team_is_ability_active(player, ABILITY_SPIKE_SHIELD))) { - sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_player_1(1, EVENT_SPIKE_CONTACT); dispatch_event_actor(target, EVENT_SPIKE_TAUNT); return HIT_RESULT_BACKFIRE; @@ -326,7 +326,7 @@ HitResult calc_player_damage_enemy(void) { && (targetPart->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP) && !player_team_is_ability_active(player, ABILITY_SPIKE_SHIELD)) { - sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_player_1(1, EVENT_SPIKE_CONTACT); dispatch_event_actor(target, EVENT_SPIKE_TAUNT); return HIT_RESULT_BACKFIRE; @@ -369,7 +369,7 @@ HitResult calc_player_damage_enemy(void) { && !(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_FLAG_80) && !player_team_is_ability_active(player, ABILITY_SPIKE_SHIELD) ) { - sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_player_1(1, EVENT_SPIKE_CONTACT); dispatch_event_actor(target, EVENT_SPIKE_TAUNT); return HIT_RESULT_BACKFIRE; @@ -402,13 +402,13 @@ HitResult calc_player_damage_enemy(void) { switch (attackFxType) { case 1: - sfx_play_sound_at_position(SOUND_372, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0372, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); break; case 2: - sfx_play_sound_at_position(SOUND_F1, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_00F1, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); break; case 3: - sfx_play_sound_at_position(SOUND_DC, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_SLIDE_WHISTLE_OUT, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); break; case 4: sfx_play_sound_at_position(SOUND_2072, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); @@ -898,7 +898,7 @@ HitResult calc_player_damage_enemy(void) { } if (battleStatus->lastAttackDamage > 0) { - sfx_play_sound(SOUND_231); + sfx_play_sound(SOUND_0231); } if (battleStatus->lastAttackDamage > 0 || battleStatus->curAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS && tempBinary) { @@ -1173,7 +1173,7 @@ ApiStatus func_80273444(Evt* script, s32 isInitialCall) { playerState->unk_28 = 180 / playerState->moveTime; playerState->unk_2C = playerState->goalPos.y; if (script->functionTemp[1] != 2) { - sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); + sfx_play_sound_at_position(SOUND_0160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); } script->functionTemp[0] = TRUE; } @@ -1218,7 +1218,7 @@ ApiStatus func_80273444(Evt* script, s32 isInitialCall) { play_movement_dust_effects(2, player->curPos.x, player->curPos.y, player->curPos.z, player->yaw); } if (script->functionTemp[1] != 2) { - sfx_play_sound_at_position(SOUND_SOFT_LAND, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); + sfx_play_sound_at_position(SOUND_LAND_SOFTLY, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); } return ApiStatus_DONE1; @@ -1286,7 +1286,7 @@ ApiStatus PlayerFallToGoal(Evt* script, s32 isInitialCall) { player->curPos.y = state->goalPos.y; player->curPos.z = state->goalPos.z; play_movement_dust_effects(2, player->curPos.x, player->curPos.y, player->curPos.z, player->yaw); - sfx_play_sound_at_position(SOUND_SOFT_LAND, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); + sfx_play_sound_at_position(SOUND_LAND_SOFTLY, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); return ApiStatus_DONE1; } return ApiStatus_BLOCK; @@ -1332,7 +1332,7 @@ ApiStatus PlayerLandJump(Evt* script, s32 isInitialCall) { player->curPos.y = 0.0f; play_movement_dust_effects(2, player->curPos.x, player->curPos.y, player->curPos.z, player->yaw); - sfx_play_sound_at_position(SOUND_SOFT_LAND, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); + sfx_play_sound_at_position(SOUND_LAND_SOFTLY, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); return ApiStatus_DONE1; } @@ -1843,7 +1843,7 @@ ApiStatus func_80274A18(Evt* script, s32 isInitialCall) { playerState->vel = vel2 + ((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.8 * acc2) + acc2); } set_animation(0, 0, playerState->animJumpRise); - sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); + sfx_play_sound_at_position(SOUND_0160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); script->functionTemp[0] = 1; } @@ -1984,7 +1984,7 @@ ApiStatus func_802752AC(Evt* script, s32 isInitialCall) { playerState->vel = 0.0f; playerState->speed += temp / playerState->moveTime; set_animation(ACTOR_PLAYER, 0, playerState->animJumpRise); - sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); + sfx_play_sound_at_position(SOUND_0160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); playerState->unk_24 = 90.0f; playerState->bounceDivisor = 45.0f; playerState->unk_28 = 360 / playerState->moveTime; @@ -2088,7 +2088,7 @@ ApiStatus func_802752AC(Evt* script, s32 isInitialCall) { playerState->unk_24 = clamp_angle(playerState->unk_24); playerState->moveTime--; if (playerState->moveTime == 0) { - sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); + sfx_play_sound_at_position(SOUND_0160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); set_animation(ACTOR_PLAYER, 0, playerState->animJumpFall); player->rotPivotOffset.y = 14; player->rot.z -= 66.0f; @@ -2228,7 +2228,7 @@ ApiStatus func_80275F00(Evt* script, s32 isInitialCall) { playerState->unk_30.z = (playerState->goalPos.z - playerState->curPos.z) / playerState->moveTime; playerState->speed += temp / playerState->moveTime; set_animation(ACTOR_PLAYER, 0, playerState->animJumpFall); - sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); + sfx_play_sound_at_position(SOUND_0160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); sfx_play_sound_at_position(SOUND_TORNADO_JUMP, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); playerState->unk_18.x = 0.0f; playerState->unk_18.y = 0.0f; @@ -2272,7 +2272,7 @@ ApiStatus func_80275F00(Evt* script, s32 isInitialCall) { playerState->unk_30.z = (playerState->goalPos.z - playerState->curPos.z) / playerState->moveTime; playerState->speed += temp / playerState->moveTime; set_animation(ACTOR_PLAYER, 0, playerState->animJumpRise); - sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); + sfx_play_sound_at_position(SOUND_0160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); sfx_play_sound_at_position(SOUND_TORNADO_JUMP, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); playerState->unk_18.x = 0.0f; playerState->unk_18.y = 0.0f; @@ -2327,7 +2327,7 @@ ApiStatus func_80275F00(Evt* script, s32 isInitialCall) { playerState->unk_30.z = (playerState->goalPos.z - playerState->curPos.z) / playerState->moveTime; playerState->speed += temp / playerState->moveTime; set_animation(ACTOR_PLAYER, 0, playerState->animJumpRise); - sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); + sfx_play_sound_at_position(SOUND_0160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z); playerState->unk_24 = 90.0f; playerState->bounceDivisor = 45.0f; playerState->unk_28 = 360 / playerState->moveTime; diff --git a/src/1A5830.c b/src/1A5830.c index 35f2e011f1..15d7e01ffc 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -438,7 +438,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) { if (blocked) { damage--; damage -= player_team_is_ability_active(target, ABILITY_DAMAGE_DODGE); - sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); show_action_rating(ACTION_RATING_NICE, target, state->goalPos.x, state->goalPos.y, state->goalPos.z); gBattleStatus.flags1 |= BS_FLAGS1_ATK_BLOCKED; break; @@ -451,7 +451,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) { if (target->koStatus == 0 && !(battleStatus->curAttackElement & DAMAGE_TYPE_UNBLOCKABLE)) { if (check_block_input(BUTTON_A)) { damage = 0; - sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); show_action_rating(ACTION_RATING_NICE, target, state->goalPos.x, state->goalPos.y, state->goalPos.z); gBattleStatus.flags1 |= BS_FLAGS1_ATK_BLOCKED; break; diff --git a/src/1AC760.c b/src/1AC760.c index 3728cdc043..63a7bd9f0f 100644 --- a/src/1AC760.c +++ b/src/1AC760.c @@ -79,7 +79,7 @@ HitResult calc_partner_test_enemy(void) { && (part->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP) && !(target->flags2 & ACTOR_FLAG_UPSIDE_DOWN) ) { - sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); return HIT_RESULT_LANDED_ON_SPIKE; } @@ -89,7 +89,7 @@ HitResult calc_partner_test_enemy(void) { && !(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_SPIKY_FRONT) && !player_team_is_ability_active(partner, ABILITY_SPIKE_SHIELD) ) { - sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_partner_1(1, EVENT_SPIKE_CONTACT); dispatch_event_actor(target, EVENT_SPIKE_TAUNT); return HIT_RESULT_BACKFIRE; @@ -114,7 +114,7 @@ HitResult calc_partner_test_enemy(void) { && !(target->flags & ACTOR_FLAG_UPSIDE_DOWN) && !(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_SPIKY_TOP) ) { - sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_partner_1(1, EVENT_SPIKE_CONTACT); dispatch_event_actor(target, EVENT_SPIKE_TAUNT); return HIT_RESULT_BACKFIRE; @@ -125,7 +125,7 @@ HitResult calc_partner_test_enemy(void) { && !(target->flags & ACTOR_FLAG_UPSIDE_DOWN) && !(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_FLAG_80) ) { - sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_partner_1(1, EVENT_SPIKE_CONTACT); dispatch_event_actor(target, EVENT_SPIKE_TAUNT); return HIT_RESULT_BACKFIRE; @@ -228,7 +228,7 @@ HitResult calc_partner_damage_enemy(void) { if (battleStatus->curAttackElement & DAMAGE_TYPE_JUMP && targetPart->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP ) { - sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_partner_1(1, EVENT_SPIKE_CONTACT); dispatch_event_actor(target, EVENT_SPIKE_TAUNT); return HIT_RESULT_BACKFIRE; @@ -269,7 +269,7 @@ HitResult calc_partner_damage_enemy(void) { && targetPart->eventFlags & ACTOR_EVENT_FLAG_SPIKY_FRONT && !(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_SPIKY_FRONT) ) { - sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_partner_1(1, EVENT_SPIKE_CONTACT); dispatch_event_actor(target, EVENT_SPIKE_TAUNT); return HIT_RESULT_BACKFIRE; @@ -294,7 +294,7 @@ HitResult calc_partner_damage_enemy(void) { && !(target->flags & ACTOR_FLAG_UPSIDE_DOWN) && !(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_FLAG_80) ) { - sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_partner_1(1, EVENT_SPIKE_CONTACT); dispatch_event_actor(target, EVENT_SPIKE_TAUNT); return HIT_RESULT_BACKFIRE; @@ -306,7 +306,7 @@ HitResult calc_partner_damage_enemy(void) { && !(target->flags & ACTOR_FLAG_UPSIDE_DOWN) && !(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_SPIKY_TOP) ) { - sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_partner_1(1, EVENT_SPIKE_CONTACT); dispatch_event_actor(target, EVENT_SPIKE_TAUNT); return HIT_RESULT_BACKFIRE; @@ -684,7 +684,7 @@ HitResult calc_partner_damage_enemy(void) { retVal = 0; tempBinary = TRUE; gBattleStatus.flags1 |= (BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10 | BS_FLAGS1_SHOW_PLAYER_DECORATIONS | BS_FLAGS1_ACTORS_VISIBLE); - sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else { dispatchEvent = EVENT_IMMUNE; retVal = 2; @@ -725,7 +725,7 @@ HitResult calc_partner_damage_enemy(void) { retVal = 0; tempBinary = TRUE; gBattleStatus.flags1 |= (BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10 | BS_FLAGS1_SHOW_PLAYER_DECORATIONS | BS_FLAGS1_ACTORS_VISIBLE); - sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else { dispatchEvent = EVENT_IMMUNE; retVal = 2; @@ -764,7 +764,7 @@ HitResult calc_partner_damage_enemy(void) { && !(gBattleStatus.flags1 & BS_FLAGS1_80) ) { if (battleStatus->lastAttackDamage > 0) { - sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->lastAttackDamage > 0 || (battleStatus->curAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS && tempBinary)) { diff --git a/src/23680.c b/src/23680.c index 604dc11b7f..3ff6faabc7 100644 --- a/src/23680.c +++ b/src/23680.c @@ -586,7 +586,7 @@ void basic_ai_wander(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolum yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->pos.x, gPlayerStatusPtr->pos.z); if (!npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, aiSettings->chaseSpeed, yaw, npc->collisionHeight, npc->collisionDiameter)) { npc->yaw = yaw; - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &sp34); enemy->aiFlags &= ~ENEMY_AI_FLAG_40; enemy->aiFlags &= ~ENEMY_AI_FLAG_20; @@ -683,7 +683,7 @@ void basic_ai_loiter(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolum yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->pos.x, gPlayerStatusPtr->pos.z); if (!npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, aiSettings->chaseSpeed, yaw, npc->collisionHeight, npc->collisionDiameter)) { npc->yaw = yaw; - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); if (enemy->npcSettings->actionFlags & AI_ACTION_JUMP_WHEN_SEE_PLAYER) { script->AI_TEMP_STATE = AI_STATE_ALERT_INIT; @@ -716,7 +716,7 @@ void basic_ai_found_player_jump_init(Evt* script, MobileAISettings* npcAISetting Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - ai_enemy_play_sound(npc, SOUND_3E1, 0); + ai_enemy_play_sound(npc, SOUND_03E1, 0); npc->curAnim = enemy->animList[ENEMY_ANIM_INDEX_JUMP]; npc->jumpVel = 10.0f; npc->jumpScale = 2.5f; diff --git a/src/7bb60_len_41b0.c b/src/7bb60_len_41b0.c index 1186ddb095..eacaece294 100644 --- a/src/7bb60_len_41b0.c +++ b/src/7bb60_len_41b0.c @@ -390,7 +390,7 @@ void phys_player_land(void) { playerStatus->landPos.x = playerStatus->pos.x; playerStatus->landPos.z = playerStatus->pos.z; playerStatus->flags &= ~PS_FLAG_AIRBORNE; - sfx_play_sound_at_player(SOUND_SOFT_LAND, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_LAND_SOFTLY, SOUND_SPACE_MODE_0); if (!(collisionStatus->curFloor & COLLISION_WITH_ENTITY_BIT)) { phys_adjust_cam_on_landing(); } diff --git a/src/80850_len_3060.c b/src/80850_len_3060.c index 389febfacb..32be2ff8f0 100644 --- a/src/80850_len_3060.c +++ b/src/80850_len_3060.c @@ -619,7 +619,7 @@ void update_status_bar(void) { if (uiStatus->drawPosY >= 18) { if (gGameStatusPtr->frameCounter % 4 == 0) { uiStatus->displayHP++; - sfx_play_sound(SOUND_213); + sfx_play_sound(SOUND_HEART_PICKUP); } } else if (gGameStatusPtr->frameCounter % 4 == 0) { uiStatus->displayHP++; @@ -637,7 +637,7 @@ void update_status_bar(void) { if (uiStatus->drawPosY >= 18) { if (gGameStatusPtr->frameCounter % 4 == 0) { uiStatus->displayFP++; - sfx_play_sound(SOUND_217); + sfx_play_sound(SOUND_FLOWER_PICKUP); } } else if (gGameStatusPtr->frameCounter % 4 == 0) { uiStatus->displayFP++; @@ -1121,7 +1121,7 @@ void coin_counter_draw_content(UNK_TYPE arg0, s32 posX, s32 posY) { s32 iconIndex; if ((gPlayerData.coins != uiStatus->displayCoins) && ((gGameStatusPtr->frameCounter % 3) == 0)) { - sfx_play_sound(SOUND_211); + sfx_play_sound(SOUND_COIN_PICKUP); } iconIndex = uiStatus->iconIndex10; diff --git a/src/C50A0.c b/src/C50A0.c index 537e71e09a..8dfbe6ebd0 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -2371,34 +2371,34 @@ 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_21B, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_021B, 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_21A, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_021A, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); } else { switch (item->itemID) { case ITEM_HEART: - sfx_play_sound_at_position(SOUND_214, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_HEART_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); break; case ITEM_COIN: - sfx_play_sound_at_position(SOUND_212, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_COIN_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); break; case ITEM_KOOPA_FORTRESS_KEY: - sfx_play_sound_at_position(SOUND_212, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_COIN_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); break; case ITEM_HEART_PIECE: - sfx_play_sound_at_position(SOUND_214, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_HEART_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); break; case ITEM_STAR_POINT: - sfx_play_sound_at_position(SOUND_212, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_COIN_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); break; case ITEM_HEART_POINT: - sfx_play_sound_at_position(SOUND_214, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_HEART_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); break; case ITEM_STAR_PIECE: - sfx_play_sound_at_position(SOUND_219, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_STAR_PIECE_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); break; case ITEM_FLOWER_POINT: - sfx_play_sound_at_position(SOUND_218, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_FLOWER_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); break; } } @@ -2439,25 +2439,25 @@ void update_item_entity_collectable(ItemEntity* item) { case ITEM_HEART: if (playerData->curHP < playerData->curMaxHP) { fx_recover(0, playerStatus->pos.x, playerStatus->pos.y + playerStatus->colliderHeight, playerStatus->pos.z, 1); - sfx_play_sound_at_position(SOUND_2056, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_RECOVER, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); } playerData->curHP++; if (playerData->curHP > playerData->curMaxHP) { playerData->curHP = playerData->curMaxHP; } - sfx_play_sound_at_position(SOUND_213, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_HEART_PICKUP, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); fx_sparkles(4, playerStatus->pos.x, playerStatus->pos.y + playerStatus->colliderHeight, playerStatus->pos.z, 30.0f); break; case ITEM_FLOWER_POINT: if (playerData->curFP < playerData->curMaxFP) { fx_recover(1, playerStatus->pos.x, playerStatus->pos.y + playerStatus->colliderHeight, playerStatus->pos.z, 1); - sfx_play_sound_at_position(SOUND_2056, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_RECOVER, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); } playerData->curFP++; if (playerData->curFP > playerData->curMaxFP) { playerData->curFP = playerData->curMaxFP; } - sfx_play_sound_at_position(SOUND_217, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_FLOWER_PICKUP, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); fx_sparkles(4, playerStatus->pos.x, playerStatus->pos.y + playerStatus->colliderHeight, playerStatus->pos.z, 30.0f); break; case ITEM_COIN: @@ -2465,7 +2465,7 @@ void update_item_entity_collectable(ItemEntity* item) { if (playerData->coins > 999) { playerData->coins = 999; } - sfx_play_sound_at_position(SOUND_211, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_COIN_PICKUP, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); playerData->totalCoinsEarned++; if (playerData->totalCoinsEarned > 99999) { playerData->totalCoinsEarned = 99999; @@ -2473,19 +2473,19 @@ void update_item_entity_collectable(ItemEntity* item) { break; case ITEM_KOOPA_FORTRESS_KEY: playerData->fortressKeyCount = playerData->fortressKeyCount + 1; - sfx_play_sound_at_position(SOUND_211, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_COIN_PICKUP, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); break; case ITEM_STAR_POINT: playerData->starPoints++; if (playerData->starPoints > 100) { playerData->starPoints = 100; } - sfx_play_sound_at_position(SOUND_211, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_COIN_PICKUP, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); break; case ITEM_HEART_POINT: playerData->curHP = playerData->curMaxHP; playerData->curFP = playerData->curMaxFP; - sfx_play_sound_at_position(SOUND_213, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_HEART_PICKUP, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z); break; } D_801565A8 = FALSE; @@ -2602,13 +2602,13 @@ void update_item_entity_pickup(ItemEntity* item) { if (!(item->pickupMsgFlags & ITEM_PICKUP_FLAG_NO_SOUND)) { if (gItemTable[item->itemID].typeFlags & ITEM_TYPE_FLAG_BADGE) { - sfx_play_sound(SOUND_D3); + sfx_play_sound(SOUND_JINGLE_GOT_BADGE); } else if (gItemTable[item->itemID].typeFlags & ITEM_TYPE_FLAG_KEY) { - sfx_play_sound(SOUND_D2); + sfx_play_sound(SOUND_JINGLE_GOT_KEY); } else if (item->itemID == ITEM_COIN) { - sfx_play_sound_at_position(SOUND_211, 0, item->pos.x, item->pos.y, item->pos.z); + sfx_play_sound_at_position(SOUND_COIN_PICKUP, 0, item->pos.x, item->pos.y, item->pos.z); } else { - sfx_play_sound(SOUND_D1); + sfx_play_sound(SOUND_JINGLE_GOT_ITEM); } } diff --git a/src/audio/sfx.c b/src/audio/sfx.c index ad7596904d..6c56e75970 100644 --- a/src/audio/sfx.c +++ b/src/audio/sfx.c @@ -6,196 +6,197 @@ SHIFT_BSS u16 gCurrentDoorSounds; SHIFT_BSS u16 gCurrentRoomDoorSounds; -// sound IDs +#define SOUND_LOOP_IDX(soundID) (soundID & 0xFFFF) + +// map logical looping soundIDs to raw ones s32 LoopingSounds[] = { - SOUND_287, SOUND_2A8, SOUND_54, SOUND_56, SOUND_24, SOUND_27, SOUND_21, SOUND_22, SOUND_349, - SOUND_273, SOUND_275, SOUND_275, SOUND_274, SOUND_273, SOUND_274, SOUND_99, SOUND_9E, SOUND_32E, - SOUND_8E, SOUND_89, SOUND_83, SOUND_388, SOUND_A0, SOUND_4A, SOUND_9F, SOUND_168, SOUND_185, - SOUND_52, SOUND_4E, SOUND_4F, SOUND_189, 0, 0, SOUND_198, SOUND_199, SOUND_194, - SOUND_19A, SOUND_91, SOUND_164, SOUND_271, SOUND_271, SOUND_274, SOUND_275, SOUND_271, SOUND_273, - SOUND_271, SOUND_273, SOUND_271, SOUND_274, SOUND_275, SOUND_276, SOUND_271, SOUND_273, SOUND_271, - SOUND_274, SOUND_276, SOUND_275, SOUND_271, SOUND_271, SOUND_271, SOUND_271, SOUND_276, SOUND_275, - SOUND_274, SOUND_39E, SOUND_341, SOUND_207, SOUND_271, SOUND_271, SOUND_275, SOUND_276, SOUND_271, - SOUND_271, SOUND_271, SOUND_50, SOUND_70, SOUND_36C, SOUND_36D, SOUND_295, SOUND_43, SOUND_197, - SOUND_221, SOUND_22A, SOUND_22B, SOUND_2040, SOUND_JR_TROOPA_SWIM, SOUND_33, SOUND_34, SOUND_39, SOUND_4C, - SOUND_4D, SOUND_1B1, SOUND_1B2, SOUND_94, SOUND_5D, SOUND_5B, SOUND_60, SOUND_1B3, 0, - SOUND_AD, SOUND_AE, SOUND_AF, SOUND_23D, SOUND_A2, SOUND_248, SOUND_249, SOUND_391, SOUND_3BC, - SOUND_3AD, SOUND_22C, SOUND_22D, + [SOUND_LOOP_IDX(SOUND_LOOP_00)] SOUND_LRAW_0287, + [SOUND_LOOP_IDX(SOUND_LOOP_01)] SOUND_LRAW_02A8, + [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_08)] SOUND_LRAW_CHEERING, + [SOUND_LOOP_IDX(SOUND_LOOP_09)] SOUND_LRAW_0273, + [SOUND_LOOP_IDX(SOUND_LOOP_0A)] SOUND_LRAW_0275, + [SOUND_LOOP_IDX(SOUND_LOOP_0B)] SOUND_LRAW_0275, + [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_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_15)] SOUND_LRAW_0388, + [SOUND_LOOP_IDX(SOUND_LOOP_16)] SOUND_LRAW_00A0, + [SOUND_LOOP_IDX(SOUND_LOOP_17)] SOUND_LRAW_004A, + [SOUND_LOOP_IDX(SOUND_LOOP_18)] SOUND_LRAW_009F, + [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, + [SOUND_LOOP_IDX(SOUND_LOOP_1C)] SOUND_LRAW_004E, + [SOUND_LOOP_IDX(SOUND_LOOP_1D)] SOUND_LRAW_004F, + [SOUND_LOOP_IDX(SOUND_LOOP_1E)] SOUND_LRAW_0189, + [SOUND_LOOP_IDX(SOUND_LOOP_1F)] SOUND_NONE, + [SOUND_LOOP_IDX(SOUND_LOOP_20)] SOUND_NONE, + [SOUND_LOOP_IDX(SOUND_LOOP_21)] SOUND_LRAW_0198, + [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_26)] SOUND_LRAW_0164, + [SOUND_LOOP_IDX(SOUND_LOOP_27)] SOUND_LRAW_0271, + [SOUND_LOOP_IDX(SOUND_LOOP_28)] SOUND_LRAW_0271, + [SOUND_LOOP_IDX(SOUND_LOOP_29)] SOUND_LRAW_0274, + [SOUND_LOOP_IDX(SOUND_LOOP_2A)] SOUND_LRAW_0275, + [SOUND_LOOP_IDX(SOUND_LOOP_2B)] SOUND_LRAW_0271, + [SOUND_LOOP_IDX(SOUND_LOOP_2C)] SOUND_LRAW_0273, + [SOUND_LOOP_IDX(SOUND_LOOP_2D)] SOUND_LRAW_0271, + [SOUND_LOOP_IDX(SOUND_LOOP_2E)] SOUND_LRAW_0273, + [SOUND_LOOP_IDX(SOUND_LOOP_2F)] SOUND_LRAW_0271, + [SOUND_LOOP_IDX(SOUND_LOOP_30)] SOUND_LRAW_0274, + [SOUND_LOOP_IDX(SOUND_LOOP_31)] SOUND_LRAW_0275, + [SOUND_LOOP_IDX(SOUND_LOOP_32)] SOUND_LRAW_0276, + [SOUND_LOOP_IDX(SOUND_LOOP_33)] SOUND_LRAW_0271, + [SOUND_LOOP_IDX(SOUND_LOOP_34)] SOUND_LRAW_0273, + [SOUND_LOOP_IDX(SOUND_LOOP_35)] SOUND_LRAW_0271, + [SOUND_LOOP_IDX(SOUND_LOOP_36)] SOUND_LRAW_0274, + [SOUND_LOOP_IDX(SOUND_LOOP_37)] SOUND_LRAW_0276, + [SOUND_LOOP_IDX(SOUND_LOOP_38)] SOUND_LRAW_0275, + [SOUND_LOOP_IDX(SOUND_LOOP_39)] SOUND_LRAW_0271, + [SOUND_LOOP_IDX(SOUND_LOOP_3A)] SOUND_LRAW_0271, + [SOUND_LOOP_IDX(SOUND_LOOP_3B)] SOUND_LRAW_0271, + [SOUND_LOOP_IDX(SOUND_LOOP_3C)] SOUND_LRAW_0271, + [SOUND_LOOP_IDX(SOUND_LOOP_3D)] SOUND_LRAW_0276, + [SOUND_LOOP_IDX(SOUND_LOOP_3E)] SOUND_LRAW_0275, + [SOUND_LOOP_IDX(SOUND_LOOP_3F)] SOUND_LRAW_0274, + [SOUND_LOOP_IDX(SOUND_LOOP_40)] SOUND_LRAW_039E, + [SOUND_LOOP_IDX(SOUND_LOOP_CHARGE_BAR)] SOUND_LRAW_CHARGE_BAR, + [SOUND_LOOP_IDX(SOUND_LOOP_42)] SOUND_LRAW_0207, + [SOUND_LOOP_IDX(SOUND_LOOP_43)] SOUND_LRAW_0271, + [SOUND_LOOP_IDX(SOUND_LOOP_44)] SOUND_LRAW_0271, + [SOUND_LOOP_IDX(SOUND_LOOP_45)] SOUND_LRAW_0275, + [SOUND_LOOP_IDX(SOUND_LOOP_46)] SOUND_LRAW_0276, + [SOUND_LOOP_IDX(SOUND_LOOP_47)] SOUND_LRAW_0271, + [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_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_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_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_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_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_68)] SOUND_LRAW_0248, + [SOUND_LOOP_IDX(SOUND_LOOP_69)] SOUND_LRAW_0249, + [SOUND_LOOP_IDX(SOUND_LOOP_6A)] SOUND_LRAW_0391, + [SOUND_LOOP_IDX(SOUND_LOOP_6B)] SOUND_LRAW_03BC, + [SOUND_LOOP_IDX(SOUND_LOOP_6C)] SOUND_LRAW_03AD, + [SOUND_LOOP_IDX(SOUND_LOOP_6D)] SOUND_LRAW_022C, + [SOUND_LOOP_IDX(SOUND_LOOP_6E)] SOUND_LRAW_022D, }; // all sound IDs for alternating sounds -s32 D_8014F48C[] = { SOUND_336, SOUND_316 }; -s32 D_8014F494[] = { SOUND_337, SOUND_317 }; -s32 D_8014F49C[] = { SOUND_338, SOUND_318 }; -s32 D_8014F4A4[] = { SOUND_339, SOUND_319 }; -s32 D_8014F4AC[] = { SOUND_33A, SOUND_31A }; -s32 D_8014F4B4[] = { SOUND_33B, SOUND_31B }; -s32 D_8014F4BC[] = { SOUND_33C, SOUND_31C }; -s32 D_8014F4C4[] = { SOUND_33D, SOUND_31D }; -s32 D_8014F4CC[] = { SOUND_33E, SOUND_31E }; -s32 D_8014F4D4[] = { SOUND_33F, SOUND_31F }; -s32 D_8014F4DC[] = { SOUND_340, SOUND_340 }; -s32 D_8014F4E4[] = { SOUND_2F4, SOUND_2F5 }; -s32 D_8014F4EC[] = { SOUND_32F, SOUND_330 }; -s32 D_8014F4F4[] = { SOUND_334, SOUND_335 }; -s32 D_8014F4FC[] = { SOUND_2F1, SOUND_2F2 }; +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 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 D_8014F514[] = { SOUND_1CB, SOUND_1CD }; -s32 D_8014F51C[] = { SOUND_1CC, SOUND_1CE }; -s32 D_8014F524[] = { SOUND_2A6, SOUND_2A7 }; -s32 D_8014F52C[] = { SOUND_20C, SOUND_20D, SOUND_20E }; -s32 D_8014F538[] = { SOUND_259, SOUND_25A }; -s32 D_8014F540[] = { SOUND_25C, SOUND_25D }; -s32 D_8014F548[] = { SOUND_331, SOUND_332, SOUND_333 }; -s32 D_8014F554[] = { SOUND_2078, SOUND_2079 }; -s32 D_8014F55C[] = { SOUND_179, SOUND_17A }; -s32 D_8014F564[] = { SOUND_1FB, SOUND_1FC }; -s32 D_8014F56C[] = { SOUND_203A, SOUND_203B }; -s32 D_8014F574[] = { SOUND_22E, SOUND_22F }; -s32 D_8014F57C[] = { SOUND_202A, SOUND_202B }; -s32 D_8014F584[] = { SOUND_2041, SOUND_2042 }; -s32 D_8014F58C[] = { SOUND_2043, SOUND_2044 }; -s32 D_8014F594[] = { SOUND_2078, SOUND_2079 }; -s32 D_8014F59C[] = { SOUND_3B6, SOUND_3B7 }; +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 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 }; +s32 D_8014F548[] = { SOUND_SRAW_17_A, SOUND_SRAW_17_B, SOUND_SRAW_17_C }; +s32 D_8014F554[] = { SOUND_SRAW_20_A, SOUND_SRAW_20_B }; +s32 D_8014F55C[] = { SOUND_SRAW_19_A, SOUND_SRAW_19_B }; +s32 D_8014F564[] = { SOUND_SRAW_1A_A, SOUND_SRAW_1A_B }; +s32 D_8014F56C[] = { SOUND_SRAW_1B_A, SOUND_SRAW_1B_B }; +s32 D_8014F574[] = { SOUND_SRAW_1C_A, SOUND_SRAW_1C_B }; +s32 D_8014F57C[] = { SOUND_SRAW_1D_A, SOUND_SRAW_1D_B }; +s32 D_8014F584[] = { SOUND_SRAW_1E_A, SOUND_SRAW_1E_B }; +s32 D_8014F58C[] = { SOUND_SRAW_1F_A, SOUND_SRAW_1F_B }; +s32 D_8014F594[] = { SOUND_SRAW_20_A, SOUND_SRAW_20_B }; +s32 D_8014F59C[] = { SOUND_SRAW_21_A, SOUND_SRAW_21_B }; +#define SEQ_SOUND_ENTRY(soundID, sym) [soundID & 0xFFFF] { .sounds = sym, .soundCount = ARRAY_COUNT(sym) } + +// map logical alternating soundIDs to lists of raw ones AlternatingSoundSet AlternatingSounds[] = { - { - .sounds = D_8014F48C, - .soundCount = ARRAY_COUNT(D_8014F48C), - }, - { - .sounds = D_8014F494, - .soundCount = ARRAY_COUNT(D_8014F494), - }, - { - .sounds = D_8014F49C, - .soundCount = ARRAY_COUNT(D_8014F494), - }, - { - .sounds = D_8014F4A4, - .soundCount = ARRAY_COUNT(D_8014F4A4), - }, - { - .sounds = D_8014F4AC, - .soundCount = ARRAY_COUNT(D_8014F4AC), - }, - { - .sounds = D_8014F4B4, - .soundCount = ARRAY_COUNT(D_8014F4B4), - }, - { - .sounds = D_8014F4BC, - .soundCount = ARRAY_COUNT(D_8014F4BC), - }, - { - .sounds = D_8014F4C4, - .soundCount = ARRAY_COUNT(D_8014F4C4), - }, - { - .sounds = D_8014F4CC, - .soundCount = ARRAY_COUNT(D_8014F4CC), - }, - { - .sounds = D_8014F4D4, - .soundCount = ARRAY_COUNT(D_8014F4D4), - }, - { - .sounds = D_8014F4DC, - .soundCount = ARRAY_COUNT(D_8014F4DC), - }, - { - .sounds = D_8014F4E4, - .soundCount = ARRAY_COUNT(D_8014F4E4), - }, - { - .sounds = D_8014F4EC, - .soundCount = ARRAY_COUNT(D_8014F4EC), - }, - { - .sounds = D_8014F4F4, - .soundCount = ARRAY_COUNT(D_8014F4F4), - }, - { - .sounds = D_8014F4FC, - .soundCount = ARRAY_COUNT(D_8014F4FC), - }, - { - .sounds = D_8014F504, - .soundCount = ARRAY_COUNT(D_8014F504), - }, - { - .sounds = D_8014F50C, - .soundCount = ARRAY_COUNT(D_8014F50C), - }, - { - .sounds = D_8014F514, - .soundCount = ARRAY_COUNT(D_8014F514), - }, - { - .sounds = D_8014F51C, - .soundCount = ARRAY_COUNT(D_8014F51C), - }, - { - .sounds = D_8014F524, - .soundCount = ARRAY_COUNT(D_8014F524), - }, - { - .sounds = D_8014F52C, - .soundCount = ARRAY_COUNT(D_8014F52C), - }, - { - .sounds = D_8014F538, - .soundCount = ARRAY_COUNT(D_8014F538), - }, - { - .sounds = D_8014F540, - .soundCount = ARRAY_COUNT(D_8014F540), - }, - { - .sounds = D_8014F548, - .soundCount = ARRAY_COUNT(D_8014F548), - }, - { - .sounds = D_8014F554, - .soundCount = ARRAY_COUNT(D_8014F554), - }, - { - .sounds = D_8014F55C, - .soundCount = ARRAY_COUNT(D_8014F55C), - }, - { - .sounds = D_8014F564, - .soundCount = ARRAY_COUNT(D_8014F564), - }, - { - .sounds = D_8014F56C, - .soundCount = ARRAY_COUNT(D_8014F56C), - }, - { - .sounds = D_8014F574, - .soundCount = ARRAY_COUNT(D_8014F574), - }, - { - .sounds = D_8014F57C, - .soundCount = ARRAY_COUNT(D_8014F57C), - }, - { - .sounds = D_8014F584, - .soundCount = ARRAY_COUNT(D_8014F584), - }, - { - .sounds = D_8014F58C, - .soundCount = ARRAY_COUNT(D_8014F58C), - }, - { - .sounds = D_8014F594, - .soundCount = ARRAY_COUNT(D_8014F594), - }, - { - .sounds = D_8014F59C, - .soundCount = ARRAY_COUNT(D_8014F59C), - } + 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_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_11, D_8014F514), + SEQ_SOUND_ENTRY(SOUND_SEQ_12, D_8014F51C), + SEQ_SOUND_ENTRY(SOUND_SEQ_13, D_8014F524), + SEQ_SOUND_ENTRY(SOUND_SEQ_14, D_8014F52C), + SEQ_SOUND_ENTRY(SOUND_SEQ_15, D_8014F538), + SEQ_SOUND_ENTRY(SOUND_SEQ_16, D_8014F540), + SEQ_SOUND_ENTRY(SOUND_SEQ_17, D_8014F548), + SEQ_SOUND_ENTRY(SOUND_SEQ_18, D_8014F554), + SEQ_SOUND_ENTRY(SOUND_SEQ_19, D_8014F55C), + SEQ_SOUND_ENTRY(SOUND_SEQ_1A, D_8014F564), + SEQ_SOUND_ENTRY(SOUND_SEQ_1B, D_8014F56C), + SEQ_SOUND_ENTRY(SOUND_SEQ_1C, D_8014F574), + SEQ_SOUND_ENTRY(SOUND_SEQ_1D, D_8014F57C), + SEQ_SOUND_ENTRY(SOUND_SEQ_1E, D_8014F584), + SEQ_SOUND_ENTRY(SOUND_SEQ_1F, D_8014F58C), + SEQ_SOUND_ENTRY(SOUND_SEQ_20, D_8014F594), + SEQ_SOUND_ENTRY(SOUND_SEQ_21, D_8014F59C), }; s32 OpenCloseSounds[][2] = { @@ -204,7 +205,7 @@ s32 OpenCloseSounds[][2] = { { SOUND_LARGE_DOOR_OPEN, SOUND_LARGE_DOOR_CLOSE }, { SOUND_CREAKY_DOOR_OPEN, SOUND_CREAKY_DOOR_CLOSE }, { SOUND_METAL_GATE_OPEN, SOUND_METAL_GATE_CLOSE }, - { SOUND_1CB, SOUND_1CC }, + { SOUND_SRAW_11_A, SOUND_SRAW_12_A }, { SOUND_20A3, SOUND_20A4 }, }; diff --git a/src/audio/sfx_player.c b/src/audio/sfx_player.c index 9a6fb2855e..83566a8336 100644 --- a/src/audio/sfx_player.c +++ b/src/audio/sfx_player.c @@ -120,8 +120,8 @@ s32 CUSTOM_ECHO_PARAMS_3[] = { AlUnkGemini D_80078370[] = { { - .sound1 = SOUND_34A, - .sound2 = SOUND_349, + .sound1 = SOUND_034A, + .sound2 = SOUND_LRAW_CHEERING, .flags = 1 } }; diff --git a/src/battle/action_cmd.c b/src/battle/action_cmd.c index c39e72cc89..a70573037b 100644 --- a/src/battle/action_cmd.c +++ b/src/battle/action_cmd.c @@ -737,7 +737,7 @@ API_CALLABLE(CloseActionCommandInfo) { } } - sfx_stop_sound(SOUND_80000041); + sfx_stop_sound(SOUND_LOOP_CHARGE_BAR); close_action_command_instruction_popup(); return ApiStatus_DONE2; diff --git a/src/battle/action_cmd/air_lift.c b/src/battle/action_cmd/air_lift.c index 914e6edefa..5acc294989 100644 --- a/src/battle/action_cmd/air_lift.c +++ b/src/battle/action_cmd/air_lift.c @@ -136,7 +136,7 @@ void N(update)(void) { hud_element_set_script(actionCommandStatus->hudElements[0], &HES_MashAButton); air_lift_bss_0 = 1; actionCommandStatus->frameCounter = actionCommandStatus->duration; - sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0); + sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0); actionCommandStatus->state = 11; // fallthrough case 11: @@ -184,7 +184,7 @@ void N(update)(void) { if (battleStatus->actionResult < battleStatus->actionSuccess) { battleStatus->actionResult = battleStatus->actionSuccess; } - sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionSuccess * 12); + sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionSuccess * 12); if (actionCommandStatus->frameCounter != 0) { actionCommandStatus->frameCounter--; @@ -208,7 +208,7 @@ void N(update)(void) { func_80269160(); } btl_set_popup_duration(0); - sfx_stop_sound(SOUND_80000041); + sfx_stop_sound(SOUND_LOOP_CHARGE_BAR); actionCommandStatus->frameCounter = 20; actionCommandStatus->state = 12; break; diff --git a/src/battle/action_cmd/air_raid.c b/src/battle/action_cmd/air_raid.c index 1dc158781c..799cac9865 100644 --- a/src/battle/action_cmd/air_raid.c +++ b/src/battle/action_cmd/air_raid.c @@ -115,7 +115,7 @@ void N(update)(void) { battleStatus->unk_85 = 0; actionCommandStatus->unk_5C = 0; actionCommandStatus->frameCounter = actionCommandStatus->duration; - sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0); + sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0); actionCommandStatus->state = 11; // fallthrough case 11: @@ -159,7 +159,7 @@ void N(update)(void) { } battleStatus->actionResult = actionCommandStatus->barFillLevel / 100; - sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12); + sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12); switch (partner->actorBlueprint->level) { case 0: @@ -212,7 +212,7 @@ void N(update)(void) { } btl_set_popup_duration(0); - sfx_stop_sound(SOUND_80000041); + sfx_stop_sound(SOUND_LOOP_CHARGE_BAR); actionCommandStatus->frameCounter = 5; actionCommandStatus->state = 12; break; diff --git a/src/battle/action_cmd/body_slam.c b/src/battle/action_cmd/body_slam.c index 9aeb3e2e4c..b0ca639106 100644 --- a/src/battle/action_cmd/body_slam.c +++ b/src/battle/action_cmd/body_slam.c @@ -115,7 +115,7 @@ void N(update)(void) { actionCommandStatus->barFillLevel = 0; actionCommandStatus->thresholdLevel = 0; actionCommandStatus->frameCounter = actionCommandStatus->duration; - sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0); + sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0); actionCommandStatus->state = 11; case 11: btl_set_popup_duration(99); @@ -132,13 +132,13 @@ 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_234); + sfx_play_sound(SOUND_0234); actionCommandStatus->isBarFilled = TRUE; } } battleStatus->actionResult = actionCommandStatus->barFillLevel / 100; - sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12); + sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12); if (actionCommandStatus->frameCounter != 0) { actionCommandStatus->frameCounter--; return; @@ -159,7 +159,7 @@ void N(update)(void) { func_80269160(); } btl_set_popup_duration(0); - sfx_stop_sound(SOUND_80000041); + sfx_stop_sound(SOUND_LOOP_CHARGE_BAR); actionCommandStatus->frameCounter = 5; actionCommandStatus->state = 12; break; diff --git a/src/battle/action_cmd/bomb.c b/src/battle/action_cmd/bomb.c index d9b9454eaf..a7ea097fc9 100644 --- a/src/battle/action_cmd/bomb.c +++ b/src/battle/action_cmd/bomb.c @@ -104,7 +104,7 @@ void N(update)(void) { hud_element_set_script(actionCommandStatus->hudElements[0], &HES_MashAButton); actionCommandStatus->barFillLevel = 0; actionCommandStatus->frameCounter = actionCommandStatus->duration; - sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0); + sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0); actionCommandStatus->state = 11; // fallthrough @@ -148,7 +148,7 @@ void N(update)(void) { } battleStatus->actionResult = actionCommandStatus->barFillLevel / 100; - sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12); + sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12); if (actionCommandStatus->frameCounter == 0) { if (actionCommandStatus->barFillLevel == 0) { @@ -168,7 +168,7 @@ void N(update)(void) { func_80269160(); } - sfx_stop_sound(SOUND_80000041); + sfx_stop_sound(SOUND_LOOP_CHARGE_BAR); btl_set_popup_duration(0); actionCommandStatus->frameCounter = 5; actionCommandStatus->state = 12; diff --git a/src/battle/action_cmd/dizzy_shell.c b/src/battle/action_cmd/dizzy_shell.c index ba69d789b8..92c422051e 100644 --- a/src/battle/action_cmd/dizzy_shell.c +++ b/src/battle/action_cmd/dizzy_shell.c @@ -100,7 +100,7 @@ void N(update)(void) { hud_element_set_script(actionCommandStatus->hudElements[0], &HES_MashAButton); actionCommandStatus->barFillLevel = 0; actionCommandStatus->frameCounter = actionCommandStatus->duration; - sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0); + sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0); actionCommandStatus->state = 11; case 11: btl_set_popup_duration(99); @@ -144,7 +144,7 @@ void N(update)(void) { } battleStatus->actionResult = actionCommandStatus->barFillLevel / 100; - sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12); + sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12); if (actionCommandStatus->frameCounter != 0) { actionCommandStatus->frameCounter--; @@ -173,7 +173,7 @@ void N(update)(void) { if (battleStatus->actionSuccess == 100) { func_80269160(); } - sfx_stop_sound(SOUND_80000041); + sfx_stop_sound(SOUND_LOOP_CHARGE_BAR); btl_set_popup_duration(0); actionCommandStatus->frameCounter = 5; actionCommandStatus->state = 12; diff --git a/src/battle/action_cmd/fire_shell.c b/src/battle/action_cmd/fire_shell.c index a2bc4054de..54dd164bbb 100644 --- a/src/battle/action_cmd/fire_shell.c +++ b/src/battle/action_cmd/fire_shell.c @@ -106,7 +106,7 @@ void N(update)(void) { battleStatus->unk_85 = 0; actionCommandStatus->unk_5C = 0; actionCommandStatus->frameCounter = actionCommandStatus->duration; - sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0); + sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0); actionCommandStatus->state = 11; case 11: btl_set_popup_duration(99); @@ -146,7 +146,7 @@ void N(update)(void) { } battleStatus->actionResult = actionCommandStatus->barFillLevel / 100; - sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12); + sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12); switch (partner->actorBlueprint->level) { case 0: if (battleStatus->actionResult >= D_802A9964_427334[battleStatus->unk_85]) { @@ -195,7 +195,7 @@ void N(update)(void) { if (battleStatus->actionSuccess == 100) { func_80269160(); } - sfx_stop_sound(SOUND_80000041); + sfx_stop_sound(SOUND_LOOP_CHARGE_BAR); btl_set_popup_duration(0); actionCommandStatus->frameCounter = 5; actionCommandStatus->state = 12; diff --git a/src/battle/action_cmd/hammer.c b/src/battle/action_cmd/hammer.c index a486b5c8ff..6bcb73de40 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_233); + sfx_play_sound(SOUND_0233); } } 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_233); + sfx_play_sound(SOUND_0233); } } } 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_233); + sfx_play_sound(SOUND_0233); } } } @@ -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_234); + sfx_play_sound(SOUND_0234); } if (actionCommandStatus->autoSucceed != 0 && actionCommandStatus->autoSucceed != 2) { actionCommandStatus->autoSucceed = 2; diff --git a/src/battle/action_cmd/mega_shock.c b/src/battle/action_cmd/mega_shock.c index c85343f5ac..ece294ed5e 100644 --- a/src/battle/action_cmd/mega_shock.c +++ b/src/battle/action_cmd/mega_shock.c @@ -162,7 +162,7 @@ void N(update)(void) { actionCommandStatus->barFillLevel = 0; actionCommandStatus->unk_5C = 0; actionCommandStatus->frameCounter = actionCommandStatus->duration; - sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0); + sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0); actionCommandStatus->state = 11; case 11: btl_set_popup_duration(99); @@ -257,7 +257,7 @@ void N(update)(void) { adjustedFillLevel = actionCommandStatus->barFillLevel / 100; battleStatus->actionResult = adjustedFillLevel; - sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, adjustedFillLevel * 12); + sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, adjustedFillLevel * 12); if (actionCommandStatus->frameCounter == 0) { s16 threshold; @@ -290,7 +290,7 @@ void N(update)(void) { func_80269160(); } - sfx_stop_sound(SOUND_80000041); + sfx_stop_sound(SOUND_LOOP_CHARGE_BAR); btl_set_popup_duration(0); actionCommandStatus->frameCounter = 5; actionCommandStatus->state = 12; diff --git a/src/battle/action_cmd/power_shock.c b/src/battle/action_cmd/power_shock.c index 799da1d7f8..2f2ed3f0cb 100644 --- a/src/battle/action_cmd/power_shock.c +++ b/src/battle/action_cmd/power_shock.c @@ -160,7 +160,7 @@ void N(update)(void) { actionCommandStatus->unk_5C = 0; D_802A9B00 = TRUE; actionCommandStatus->frameCounter = actionCommandStatus->duration; - sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0); + sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0); actionCommandStatus->state = 11; // fallthrough case 11: @@ -208,7 +208,7 @@ void N(update)(void) { } battleStatus->actionResult = actionCommandStatus->barFillLevel / 100; - sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12); + sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12); if (actionCommandStatus->frameCounter == 0) { phi_a1 = actionCommandStatus->barFillLevel; @@ -236,7 +236,7 @@ void N(update)(void) { func_80269160(); } - sfx_stop_sound(SOUND_80000041); + sfx_stop_sound(SOUND_LOOP_CHARGE_BAR); btl_set_popup_duration(0); actionCommandStatus->frameCounter = 5; actionCommandStatus->state = 12; diff --git a/src/battle/action_cmd/smack.c b/src/battle/action_cmd/smack.c index 0e42b48057..a457771186 100644 --- a/src/battle/action_cmd/smack.c +++ b/src/battle/action_cmd/smack.c @@ -134,7 +134,7 @@ void N(update)(void) { battleStatus->unk_85 = 0; actionCommandStatus->unk_5C = 0; actionCommandStatus->frameCounter = actionCommandStatus->duration; - sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0); + sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0); actionCommandStatus->state = 11; // fallthrough @@ -185,7 +185,7 @@ void N(update)(void) { } battleStatus->actionResult = actionCommandStatus->barFillLevel / 100; - sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12); + sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12); switch (partnerActor->actorBlueprint->level) { case 0: @@ -261,7 +261,7 @@ void N(update)(void) { } btl_set_popup_duration(0); - sfx_stop_sound(SOUND_80000041); + sfx_stop_sound(SOUND_LOOP_CHARGE_BAR); actionCommandStatus->frameCounter = 5; actionCommandStatus->state = 12; break; diff --git a/src/battle/action_cmd/spiny_surge.c b/src/battle/action_cmd/spiny_surge.c index 722871c3f1..555833a0ff 100644 --- a/src/battle/action_cmd/spiny_surge.c +++ b/src/battle/action_cmd/spiny_surge.c @@ -140,7 +140,7 @@ void N(update)(void) { actionCommandStatus->unk_5C = 0; D_802A98C0 = 0; actionCommandStatus->frameCounter = actionCommandStatus->duration; - sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0); + sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0); actionCommandStatus->state = 11; // fallthrough @@ -194,7 +194,7 @@ void N(update)(void) { D_802A98C0 = battleStatus->curButtonsDown; battleStatus->actionResult = actionCommandStatus->unk_5C; - sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionSuccess * 12); + sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionSuccess * 12); if (actionCommandStatus->frameCounter != 0) { actionCommandStatus->frameCounter--; @@ -219,7 +219,7 @@ void N(update)(void) { } btl_set_popup_duration(0); - sfx_stop_sound(SOUND_80000041); + sfx_stop_sound(SOUND_LOOP_CHARGE_BAR); actionCommandStatus->frameCounter = 5; actionCommandStatus->state = 12; break; diff --git a/src/battle/action_cmd/spook.c b/src/battle/action_cmd/spook.c index a05a75b81a..d3cbb3c426 100644 --- a/src/battle/action_cmd/spook.c +++ b/src/battle/action_cmd/spook.c @@ -102,7 +102,7 @@ void N(update)(void) { battleStatus->actionResult = 0; actionCommandStatus->unk_5C = 0; actionCommandStatus->frameCounter = actionCommandStatus->duration; - sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0); + sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0); actionCommandStatus->state = 11; case 11: btl_set_popup_duration(99); @@ -174,7 +174,7 @@ void N(update)(void) { } battleStatus->actionResult = actionCommandStatus->barFillLevel / 100; - sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12); + sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12); if (actionCommandStatus->frameCounter != 0) { actionCommandStatus->frameCounter--; @@ -204,7 +204,7 @@ void N(update)(void) { func_80269160(); } btl_set_popup_duration(0); - sfx_stop_sound(SOUND_80000041); + sfx_stop_sound(SOUND_LOOP_CHARGE_BAR); actionCommandStatus->frameCounter = 5; actionCommandStatus->state = 12; break; diff --git a/src/battle/action_cmd/squirt.c b/src/battle/action_cmd/squirt.c index f831f2d832..04589461fb 100644 --- a/src/battle/action_cmd/squirt.c +++ b/src/battle/action_cmd/squirt.c @@ -123,7 +123,7 @@ void N(update)(void) { actionCommandStatus->barFillLevel = 0; actionCommandStatus->unk_5C = 0; actionCommandStatus->frameCounter = actionCommandStatus->duration; - sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0); + sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0); actionCommandStatus->state = 11; // fallthrough case 11: @@ -152,7 +152,7 @@ void N(update)(void) { } battleStatus->actionResult = actionCommandStatus->barFillLevel / 100; - sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12); + sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12); id = actionCommandStatus->hudElements[0]; if (temp < 80) { if (hud_element_get_script(id) != &HES_AButtonDown) { @@ -186,7 +186,7 @@ void N(update)(void) { func_80269160(); } btl_set_popup_duration(0); - sfx_stop_sound(SOUND_80000041); + sfx_stop_sound(SOUND_LOOP_CHARGE_BAR); actionCommandStatus->frameCounter = 5; actionCommandStatus->state = 12; break; @@ -217,7 +217,7 @@ void N(draw)(void) { } void N(free)(void) { - sfx_stop_sound(SOUND_80000041); + sfx_stop_sound(SOUND_LOOP_CHARGE_BAR); hud_element_free(gActionCommandStatus.hudElements[0]); hud_element_free(gActionCommandStatus.hudElements[1]); } diff --git a/src/battle/action_cmd/tidal_wave.c b/src/battle/action_cmd/tidal_wave.c index 87f0a05d93..62eab12d3f 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_233); + sfx_play_sound(SOUND_0233); actionCommandStatus->lookBackCounter = 1; actionCommandStatus->state = 12; // fallthrough @@ -263,7 +263,7 @@ void N(update)(void) { } actionCommandStatus->state = 11; battleStatus->actionResult++; - sfx_play_sound(SOUND_21C); + sfx_play_sound(SOUND_021C); return; } diff --git a/src/battle/action_cmd/water_block.c b/src/battle/action_cmd/water_block.c index 59cf6a57f3..7eff8391b2 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_233); + sfx_play_sound(SOUND_0233); } if (actionCommandStatus->frameCounter == 22) { hud_element_set_script(actionCommandStatus->hudElements[12], &HES_TimingCharge2); - sfx_play_sound(SOUND_233); + sfx_play_sound(SOUND_0233); } 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_234); + sfx_play_sound(SOUND_0234); } 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_234); + sfx_play_sound(SOUND_0234); } 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_234); + sfx_play_sound(SOUND_0234); } actionCommandStatus->frameCounter--; if (actionCommandStatus->frameCounter == 0) { diff --git a/src/battle/area/arn/actor/tubba_blubba.c b/src/battle/area/arn/actor/tubba_blubba.c index 42da54eceb..2fda4a1316 100644 --- a/src/battle/area/arn/actor/tubba_blubba.c +++ b/src/battle/area/arn/actor/tubba_blubba.c @@ -282,7 +282,7 @@ EvtScript N(80226558) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim15) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35E) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim16) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim17) @@ -368,7 +368,7 @@ EvtScript N(80226B88) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim0A) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim0B) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_3E7, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_LARGE_ACTOR_JUMP, 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/area/arn/actor/tubbas_heart.c b/src/battle/area/arn/actor/tubbas_heart.c index 8a58ae89df..75a15110ad 100644 --- a/src/battle/area/arn/actor/tubbas_heart.c +++ b/src/battle/area/arn/actor/tubbas_heart.c @@ -603,10 +603,10 @@ EvtScript N(802255D8) = { EVT_CALL(SetBattleCamOffsetZ, 35) EVT_CALL(MoveBattleCamOver, 50) EVT_WAIT(56) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3DB) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_03DB) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) EVT_WAIT(37) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3DB) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_03DB) EVT_WAIT(22) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 10) diff --git a/src/battle/area/dgb/actor/tubba_blubba.c b/src/battle/area/dgb/actor/tubba_blubba.c index c6a8530022..60e8eee97a 100644 --- a/src/battle/area/dgb/actor/tubba_blubba.c +++ b/src/battle/area/dgb/actor/tubba_blubba.c @@ -402,7 +402,7 @@ EvtScript N(80219D88) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim15) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35E) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim16) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim17) @@ -486,7 +486,7 @@ EvtScript N(8021A36C) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim0F) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim10) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_3E7, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_LARGE_ACTOR_JUMP, 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/area/dig/actor/tubba_blubba.c b/src/battle/area/dig/actor/tubba_blubba.c index db519c9c43..d43c5619d4 100644 --- a/src/battle/area/dig/actor/tubba_blubba.c +++ b/src/battle/area/dig/actor/tubba_blubba.c @@ -350,7 +350,7 @@ EvtScript N(attackBodyCrush) = { EVT_SET(LVar1, 0) EVT_ADD(LVar2, 5) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(PlaySound, SOUND_JUMP_3E2) + EVT_CALL(PlaySound, SOUND_ACTOR_JUMP) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 23, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) @@ -390,7 +390,7 @@ EvtScript N(attackBodyCrush) = { EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(PlaySound, SOUND_JUMP_3E2) + EVT_CALL(PlaySound, SOUND_ACTOR_JUMP) EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE) EVT_END_SWITCH EVT_WAIT(2) diff --git a/src/battle/area/flo2/actor/huff_n_puff.c b/src/battle/area/flo2/actor/huff_n_puff.c index f82d548e13..1caeafde35 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_35C) + EVT_CALL(StopSound, SOUND_035C) 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_35C) + EVT_CALL(StopSound, SOUND_035C) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_HuffNPuff_Anim27) @@ -1522,7 +1522,7 @@ EvtScript N(attackBodySlam) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 20, 0) EVT_CALL(FlyToGoal, ACTOR_SELF, 40, -20, EASING_SIN_OUT) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E7) + 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(HIT_RESULT_MISS) @@ -1780,7 +1780,7 @@ EvtScript N(normalAction) = { EVT_END_IF EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim1A) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_HuffNPuff_Anim1B) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_3, ANIM_HuffNPuff_Anim1C) @@ -1863,7 +1863,7 @@ EvtScript N(normalAction) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(RemoveEffect, LVar8) - EVT_CALL(StopSound, SOUND_3B0) + EVT_CALL(StopSound, SOUND_03B0) EVT_CALL(StopSound, SOUND_BIG_POWER_UP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim17) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_HuffNPuff_Anim18) @@ -1871,7 +1871,7 @@ EvtScript N(normalAction) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar3) @@ -1938,7 +1938,7 @@ EvtScript N(attackWindBreath) = { EVT_GOTO(1) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B0) EVT_THREAD EVT_WAIT(15) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP) @@ -1951,7 +1951,7 @@ EvtScript N(attackWindBreath) = { EVT_CALL(SetBattleCamOffsetZ, 20) EVT_CALL(MoveBattleCamOver, 180) EVT_WAIT(90) - EVT_CALL(StopSound, SOUND_3B0) + EVT_CALL(StopSound, SOUND_03B0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim1D) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_HuffNPuff_Anim1D) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_3, ANIM_HuffNPuff_Anim1E) @@ -1959,7 +1959,7 @@ EvtScript N(attackWindBreath) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_HuffNPuff_Anim21) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_3, ANIM_HuffNPuff_Anim22) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035D) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) @@ -2025,7 +2025,7 @@ EvtScript N(attackWindBreath) = { EVT_WAIT(LVar0) EVT_END_LOOP EVT_WAIT(20) - EVT_CALL(StopSound, SOUND_35D) + EVT_CALL(StopSound, SOUND_035D) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -2178,7 +2178,7 @@ EvtScript N(attackWindBreath) = { EVT_WAIT(110) EVT_SET(LVar1, 0) EVT_END_IF - EVT_CALL(StopSound, SOUND_35D) + EVT_CALL(StopSound, SOUND_035D) EVT_WAIT(2) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -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_35C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035C) EVT_CALL(N(StartRumbleWithParams), 70, 120) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 60, EVT_FLOAT(0.3)) @@ -2295,8 +2295,8 @@ EvtScript N(attackGroundLightning) = { EVT_GOTO(1) EVT_END_IF EVT_END_THREAD - EVT_CALL(StopSound, SOUND_35C) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3D3) + EVT_CALL(StopSound, SOUND_035C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D3) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 10) EVT_SET(LVar3, LVar0) @@ -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_35C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035C) EVT_CALL(N(StartRumbleWithParams), 70, 120) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 60, EVT_FLOAT(0.3)) @@ -2459,8 +2459,8 @@ EvtScript N(attackDirectLightning) = { EVT_GOTO(1) EVT_END_IF EVT_END_THREAD - EVT_CALL(StopSound, SOUND_35C) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35B) + EVT_CALL(StopSound, SOUND_035C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035B) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_EQ(HIT_RESULT_LUCKY) @@ -2603,7 +2603,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(SetBattleCamOffsetZ, 5) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B3) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim1A) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_HuffNPuff_Anim1B) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_3, ANIM_HuffNPuff_Anim1C) @@ -2653,9 +2653,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVar9, 2) EVT_IF_EQ(LVar9, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D6) EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(4), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(4), LVarA, LVarB, LVarF) @@ -2682,9 +2682,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVar9, 2) EVT_IF_EQ(LVar9, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D6) EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(9), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(9), LVarA, LVarB, LVarF) @@ -2711,9 +2711,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVar9, 2) EVT_IF_EQ(LVar9, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D6) EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(3), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(3), LVarA, LVarB, LVarF) @@ -2740,9 +2740,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVar9, 2) EVT_IF_EQ(LVar9, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D6) EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(5), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(5), LVarA, LVarB, LVarF) @@ -2769,9 +2769,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVar9, 2) EVT_IF_EQ(LVar9, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D6) EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(1), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(1), LVarA, LVarB, LVarF) @@ -2798,9 +2798,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVar9, 2) EVT_IF_EQ(LVar9, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D6) EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(0), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(0), LVarA, LVarB, LVarF) @@ -2827,9 +2827,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVar9, 2) EVT_IF_EQ(LVar9, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D6) EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(8), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(8), LVarA, LVarB, LVarF) @@ -2856,9 +2856,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVar9, 2) EVT_IF_EQ(LVar9, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D6) EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(2), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(2), LVarA, LVarB, LVarF) @@ -2885,9 +2885,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVar9, 2) EVT_IF_EQ(LVar9, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D6) EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(7), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(7), LVarA, LVarB, LVarF) @@ -2914,9 +2914,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVar9, 2) EVT_IF_EQ(LVar9, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D6) EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(6), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(6), LVarA, LVarB, LVarF) @@ -3613,9 +3613,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(4)) EVT_CALL(FlyToGoal, ArrayVar(4), 20, -10, EASING_SIN_OUT) @@ -3627,9 +3627,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(9)) EVT_CALL(FlyToGoal, ArrayVar(9), 20, -10, EASING_SIN_OUT) @@ -3641,9 +3641,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(3)) EVT_CALL(FlyToGoal, ArrayVar(3), 20, -10, EASING_SIN_OUT) @@ -3655,9 +3655,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(5)) EVT_CALL(FlyToGoal, ArrayVar(5), 20, -10, EASING_SIN_OUT) @@ -3669,9 +3669,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(1)) EVT_CALL(FlyToGoal, ArrayVar(1), 20, -10, EASING_SIN_OUT) @@ -3683,9 +3683,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(0)) EVT_CALL(FlyToGoal, ArrayVar(0), 20, -10, EASING_SIN_OUT) @@ -3697,9 +3697,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(8)) EVT_CALL(FlyToGoal, ArrayVar(8), 20, -10, EASING_SIN_OUT) @@ -3711,9 +3711,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(2)) EVT_CALL(FlyToGoal, ArrayVar(2), 20, -10, EASING_SIN_OUT) @@ -3725,9 +3725,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(7)) EVT_CALL(FlyToGoal, ArrayVar(7), 20, -10, EASING_SIN_OUT) @@ -3739,9 +3739,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(6)) EVT_CALL(FlyToGoal, ArrayVar(6), 20, -10, EASING_SIN_OUT) @@ -3804,9 +3804,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(4)) EVT_CALL(FlyToGoal, ArrayVar(4), 20, -10, EASING_SIN_OUT) @@ -3818,9 +3818,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(9)) EVT_CALL(FlyToGoal, ArrayVar(9), 20, -10, EASING_SIN_OUT) @@ -3832,9 +3832,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(3)) EVT_CALL(FlyToGoal, ArrayVar(3), 20, -10, EASING_SIN_OUT) @@ -3846,9 +3846,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(5)) EVT_CALL(FlyToGoal, ArrayVar(5), 20, -10, EASING_SIN_OUT) @@ -3860,9 +3860,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(1)) EVT_CALL(FlyToGoal, ArrayVar(1), 20, -10, EASING_SIN_OUT) @@ -3874,9 +3874,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(0)) EVT_CALL(FlyToGoal, ArrayVar(0), 20, -10, EASING_SIN_OUT) @@ -3888,9 +3888,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(8)) EVT_CALL(FlyToGoal, ArrayVar(8), 20, -10, EASING_SIN_OUT) @@ -3902,9 +3902,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(2)) EVT_CALL(FlyToGoal, ArrayVar(2), 20, -10, EASING_SIN_OUT) @@ -3916,9 +3916,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(7)) EVT_CALL(FlyToGoal, ArrayVar(7), 20, -10, EASING_SIN_OUT) @@ -3930,9 +3930,9 @@ EvtScript N(attackGroundSlam) = { EVT_THREAD EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(6)) EVT_CALL(FlyToGoal, ArrayVar(6), 20, -10, EASING_SIN_OUT) @@ -3969,7 +3969,7 @@ EvtScript N(tuffPuffMoveToPlayer) = { EVT_CALL(N(Atan2), LVarE, LVar0, LVar2, LVar3, LVar5) EVT_SET(LVarF, 0) EVT_LOOP(0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DB) EVT_SET(LVarF, 0) EVT_SET(LVarC, LVarB) EVT_ADD(LVarC, LVarB) @@ -4172,9 +4172,9 @@ EvtScript N(attackTuffPuffs) = { EVT_ADD(LVar2, LVar4) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(4), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(4), 30, -10, EASING_SIN_OUT) @@ -4206,9 +4206,9 @@ EvtScript N(attackTuffPuffs) = { EVT_ADD(LVar2, LVar4) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(9), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(9), 30, -10, EASING_SIN_OUT) @@ -4240,9 +4240,9 @@ EvtScript N(attackTuffPuffs) = { EVT_ADD(LVar2, LVar4) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(3), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(3), 30, -10, EASING_SIN_OUT) @@ -4274,9 +4274,9 @@ EvtScript N(attackTuffPuffs) = { EVT_ADD(LVar2, LVar4) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(5), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(5), 30, -10, EASING_SIN_OUT) @@ -4308,9 +4308,9 @@ EvtScript N(attackTuffPuffs) = { EVT_ADD(LVar2, LVar4) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(1), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(1), 30, -10, EASING_SIN_OUT) @@ -4342,9 +4342,9 @@ EvtScript N(attackTuffPuffs) = { EVT_ADD(LVar2, LVar4) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(0), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(0), 30, -10, EASING_SIN_OUT) @@ -4376,9 +4376,9 @@ EvtScript N(attackTuffPuffs) = { EVT_ADD(LVar2, LVar4) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(8), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(8), 30, -10, EASING_SIN_OUT) @@ -4410,9 +4410,9 @@ EvtScript N(attackTuffPuffs) = { EVT_ADD(LVar2, LVar4) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(2), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(2), 30, -10, EASING_SIN_OUT) @@ -4444,9 +4444,9 @@ EvtScript N(attackTuffPuffs) = { EVT_ADD(LVar2, LVar4) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(7), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(7), 30, -10, EASING_SIN_OUT) @@ -4478,9 +4478,9 @@ EvtScript N(attackTuffPuffs) = { EVT_ADD(LVar2, LVar4) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(6), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(6), 30, -10, EASING_SIN_OUT) @@ -4825,9 +4825,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(4), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(4)) EVT_CALL(FlyToGoal, ArrayVar(4), 30, 10, EASING_SIN_OUT) @@ -4854,9 +4854,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(9), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(9)) EVT_CALL(FlyToGoal, ArrayVar(9), 30, 10, EASING_SIN_OUT) @@ -4883,9 +4883,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(3), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(3)) EVT_CALL(FlyToGoal, ArrayVar(3), 30, 10, EASING_SIN_OUT) @@ -4912,9 +4912,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(5), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(5)) EVT_CALL(FlyToGoal, ArrayVar(5), 30, 10, EASING_SIN_OUT) @@ -4941,9 +4941,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(1), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(1)) EVT_CALL(FlyToGoal, ArrayVar(1), 30, 10, EASING_SIN_OUT) @@ -4970,9 +4970,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(0), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(0)) EVT_CALL(FlyToGoal, ArrayVar(0), 30, 10, EASING_SIN_OUT) @@ -4999,9 +4999,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(8), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(8)) EVT_CALL(FlyToGoal, ArrayVar(8), 30, 10, EASING_SIN_OUT) @@ -5028,9 +5028,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(2), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(2)) EVT_CALL(FlyToGoal, ArrayVar(2), 30, 10, EASING_SIN_OUT) @@ -5057,9 +5057,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(7), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(7)) EVT_CALL(FlyToGoal, ArrayVar(7), 30, 10, EASING_SIN_OUT) @@ -5086,9 +5086,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(6), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(6)) EVT_CALL(FlyToGoal, ArrayVar(6), 30, 10, EASING_SIN_OUT) @@ -5428,9 +5428,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(4), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(4)) EVT_CALL(FlyToGoal, ArrayVar(4), 30, 10, EASING_SIN_OUT) @@ -5457,9 +5457,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(9), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(9)) EVT_CALL(FlyToGoal, ArrayVar(9), 30, 10, EASING_SIN_OUT) @@ -5486,9 +5486,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(3), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(3)) EVT_CALL(FlyToGoal, ArrayVar(3), 30, 10, EASING_SIN_OUT) @@ -5515,9 +5515,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(5), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(5)) EVT_CALL(FlyToGoal, ArrayVar(5), 30, 10, EASING_SIN_OUT) @@ -5544,9 +5544,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(1), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(1)) EVT_CALL(FlyToGoal, ArrayVar(1), 30, 10, EASING_SIN_OUT) @@ -5573,9 +5573,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(0), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(0)) EVT_CALL(FlyToGoal, ArrayVar(0), 30, 10, EASING_SIN_OUT) @@ -5602,9 +5602,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(8), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(8)) EVT_CALL(FlyToGoal, ArrayVar(8), 30, 10, EASING_SIN_OUT) @@ -5631,9 +5631,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(2), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(2)) EVT_CALL(FlyToGoal, ArrayVar(2), 30, 10, EASING_SIN_OUT) @@ -5660,9 +5660,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(7), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(7)) EVT_CALL(FlyToGoal, ArrayVar(7), 30, 10, EASING_SIN_OUT) @@ -5689,9 +5689,9 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(SetActorVar, ArrayVar(6), 2, 0) EVT_MOD(LVarA, 2) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D5) + EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D5) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D6) + EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(6)) EVT_CALL(FlyToGoal, ArrayVar(6), 30, 10, EASING_SIN_OUT) diff --git a/src/battle/area/flo2/actor/spike.c b/src/battle/area/flo2/actor/spike.c index 116e491533..bef0ae9de1 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_2C5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C5) 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_2C6) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_02C6) 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 bacc04f2eb..ecc0a1877c 100644 --- a/src/battle/area/hos/actor/goombario_tutor.c +++ b/src/battle/area/hos/actor/goombario_tutor.c @@ -209,7 +209,7 @@ EvtScript N(takeTurn_80219444) = { EVT_WAIT(10) EVT_CALL(action_command_jump_start, 12, 3) EVT_END_THREAD - EVT_CALL(PlaySound, SOUND_JUMP_3E2) + EVT_CALL(PlaySound, SOUND_ACTOR_JUMP) EVT_CALL(JumpToGoal, ACTOR_SELF, 22, FALSE, TRUE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) diff --git a/src/battle/area/hos/actor/magikoopa.c b/src/battle/area/hos/actor/magikoopa.c index 92816ad0ce..ee7dfbf2e4 100644 --- a/src/battle/area/hos/actor/magikoopa.c +++ b/src/battle/area/hos/actor/magikoopa.c @@ -276,7 +276,7 @@ EvtScript N(8021D890) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 1) EVT_CALL(SetPartPos, ACTOR_SELF, PRT_3, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) @@ -797,9 +797,9 @@ EvtScript N(healOne) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, LVarB, SOUND_206D) - EVT_CALL(PlaySoundAtActor, LVarB, SOUND_214) + EVT_CALL(PlaySoundAtActor, LVarB, SOUND_HEART_BOUNCE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, LVarB, SOUND_25C) + EVT_CALL(PlaySoundAtActor, LVarB, SOUND_SRAW_16_A) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) @@ -890,9 +890,9 @@ EvtScript N(healAll) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, LVar0, SOUND_206D) - EVT_CALL(PlaySoundAtActor, LVar0, SOUND_214) + EVT_CALL(PlaySoundAtActor, LVar0, SOUND_HEART_BOUNCE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, LVar0, SOUND_25C) + EVT_CALL(PlaySoundAtActor, LVar0, SOUND_SRAW_16_A) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) @@ -1546,7 +1546,7 @@ EvtScript N(boostAttack) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_2DD) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DD) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) @@ -1658,7 +1658,7 @@ EvtScript N(boostDefense) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_2DD) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DD) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) @@ -1729,7 +1729,7 @@ EvtScript N(electrify) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_FlyingMagikoopa_Anim02) EVT_END_IF EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F0) EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, ACTOR_FLAG_FLYING) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1771,7 +1771,7 @@ EvtScript N(electrify) = { EVT_THREAD EVT_WAIT(10) EVT_LOOP(4) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_3D2) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_03D2) EVT_CALL(RandInt, 3, LVar0) EVT_ADD(LVar0, 3) EVT_WAIT(LVar0) @@ -1887,7 +1887,7 @@ EvtScript N(vanish) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_2DB) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DB) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) 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 b5b71210b6..f9aa475af9 100644 --- a/src/battle/area/isk_part_2/actor/chain_chomp.c +++ b/src/battle/area/isk_part_2/actor/chain_chomp.c @@ -700,13 +700,13 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ChainChomp_SlowBite) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_10F) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_HURT) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(PlaySound, SOUND_10F) + EVT_CALL(PlaySound, SOUND_ACTOR_HURT) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ChainChomp_Idle) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/area/isk_part_2/actor/tutankoopa.c b/src/battle/area/isk_part_2/actor/tutankoopa.c index 64c4fb9ead..351e11c3bb 100644 --- a/src/battle/area/isk_part_2/actor/tutankoopa.c +++ b/src/battle/area/isk_part_2/actor/tutankoopa.c @@ -629,7 +629,7 @@ EvtScript N(EVS_Attack_ThrowShell) = { EVT_CALL(JumpPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 5, TRUE) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_SELF, LVar9, ANIM_BuzzyBeetle_Anim05) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F9) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarA) @@ -1002,7 +1002,7 @@ EvtScript N(EVS_Move_SummonChomp) = { EVT_GOTO(0) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySound, SOUND_26B) + EVT_CALL(PlaySound, SOUND_026B) EVT_LABEL(10) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_GateOpenAmount, LVarD) EVT_CALL(TranslateModel, 31, 0, LVarD, 0) @@ -1012,7 +1012,7 @@ EvtScript N(EVS_Move_SummonChomp) = { EVT_IF_LT(LVarD, 60) EVT_GOTO(10) EVT_END_IF - EVT_CALL(StopSound, SOUND_26B) + EVT_CALL(StopSound, SOUND_026B) EVT_WAIT(10) // create the chomp and have him exit the gate EVT_CALL(SummonEnemy, EVT_PTR(N(SummonedChomp)), FALSE) @@ -1099,7 +1099,7 @@ EvtScript N(EVS_Move_SummonChomp) = { EVT_GOTO(40) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySound, SOUND_26B) + EVT_CALL(PlaySound, SOUND_026B) EVT_LABEL(50) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_GateOpenAmount, LVarD) EVT_CALL(TranslateModel, 31, 0, LVarD, 0) @@ -1109,8 +1109,8 @@ EvtScript N(EVS_Move_SummonChomp) = { EVT_IF_GT(LVarD, 0) EVT_GOTO(50) EVT_END_IF - EVT_CALL(StopSound, SOUND_26B) - EVT_CALL(PlaySound, SOUND_26C) + EVT_CALL(StopSound, SOUND_026B) + EVT_CALL(PlaySound, SOUND_026C) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.5)) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_HasSummoned, TRUE) EVT_RETURN @@ -1163,10 +1163,10 @@ EvtScript N(EVS_LevitateToHomePos) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.1)) EVT_CALL(SetGoalPos, ACTOR_SELF, 97, 70, 15) EVT_CALL(JumpToGoal, ACTOR_SELF, 45, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A) EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_B) EVT_END_THREAD EVT_WAIT(5) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Stunned, FALSE) @@ -1183,10 +1183,10 @@ EvtScript N(EVS_GetBackUp) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A) EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_B) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Idle) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(TutankoopaAnims))) @@ -1240,7 +1240,7 @@ EvtScript N(EVS_Tutankoopa_Death) = { EVT_CALL(GetActorPos, ACTOR_ENEMY1, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_DEATH) + EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_ACTOR_DEATH) EVT_SET(LVar3, 0) EVT_LOOP(12) EVT_CALL(SetActorRotation, ACTOR_ENEMY1, LVar3, 0, 0) diff --git a/src/battle/area/kgr/actor/fuzzipede.c b/src/battle/area/kgr/actor/fuzzipede.c index cd040ad3f8..505b97a4e0 100644 --- a/src/battle/area/kgr/actor/fuzzipede.c +++ b/src/battle/area/kgr/actor/fuzzipede.c @@ -925,9 +925,9 @@ EvtScript N(8021C004) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) diff --git a/src/battle/area/kkj/actor/kammy_koopa.c b/src/battle/area/kkj/actor/kammy_koopa.c index 7301622fc5..d043920dab 100644 --- a/src/battle/area/kkj/actor/kammy_koopa.c +++ b/src/battle/area/kkj/actor/kammy_koopa.c @@ -501,7 +501,7 @@ EvtScript N(onDeath) = { EVT_SUB(LVar2, 1) EVT_CALL(SetPartPos, ACTOR_SELF, PRT_2, LVar0, LVar1, LVar2) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_2, ACTOR_PART_FLAG_INVISIBLE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) 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 57a6f901b3..de87d73825 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 @@ -498,7 +498,7 @@ EvtScript N(doDeath_8021B388) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar2, LVar3, LVar4) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar2, LVar3, LVar4, 0, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_SET(LVar3, 0) EVT_LOOP(12) 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 a0d786bc15..7cfaac7824 100644 --- a/src/battle/area/kmr_part_2/actor/goomba_king.c +++ b/src/battle/area/kmr_part_2/actor/goomba_king.c @@ -497,7 +497,7 @@ EvtScript N(80221CD4) = { EVT_CASE_OR_EQ(5) EVT_THREAD EVT_WAIT(12) - EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_3, SOUND_301) + EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_3, SOUND_0301) EVT_END_THREAD EVT_THREAD EVT_WAIT(10) @@ -517,7 +517,7 @@ EvtScript N(80221CD4) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_4, SOUND_301) + EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_4, SOUND_0301) EVT_END_THREAD EVT_THREAD EVT_WAIT(3) @@ -537,7 +537,7 @@ EvtScript N(80221CD4) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(17) - EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_5, SOUND_301) + EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_5, SOUND_0301) EVT_END_THREAD EVT_THREAD EVT_WAIT(15) @@ -566,7 +566,7 @@ EvtScript N(80221CD4) = { EVT_END_SWITCH EVT_THREAD EVT_WAIT(12) - EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_3, SOUND_301) + EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_3, SOUND_0301) EVT_END_THREAD EVT_THREAD EVT_WAIT(10) @@ -586,7 +586,7 @@ EvtScript N(80221CD4) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_4, SOUND_301) + EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_4, SOUND_0301) EVT_END_THREAD EVT_THREAD EVT_WAIT(3) @@ -606,7 +606,7 @@ EvtScript N(80221CD4) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(17) - EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_5, SOUND_301) + EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_5, SOUND_0301) EVT_END_THREAD EVT_THREAD EVT_WAIT(15) @@ -742,7 +742,7 @@ EvtScript N(doDeath_80222F50) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar2, LVar3, LVar4) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar2, LVar3, LVar4, 0, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_SET(LVar3, 0) EVT_LOOP(12) diff --git a/src/battle/area/kmr_part_2/actor/goomnut_tree.c b/src/battle/area/kmr_part_2/actor/goomnut_tree.c index d83a8683b0..7192721722 100644 --- a/src/battle/area/kmr_part_2/actor/goomnut_tree.c +++ b/src/battle/area/kmr_part_2/actor/goomnut_tree.c @@ -350,7 +350,7 @@ EvtScript N(80223DBC) = { EVT_IF_EQ(LVar0, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, 10, 0, 10) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_2, 1, FALSE) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_301) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_0301) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_2, EVT_FLOAT(0.8)) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PRT_2, EVT_FLOAT(4.0)) EVT_CALL(FallPartTo, ACTOR_SELF, PRT_2, 10, 20, 10, 20) @@ -364,7 +364,7 @@ EvtScript N(80223DBC) = { EVT_END_LOOP EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_301) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_0301) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_2, EVT_FLOAT(0.8)) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PRT_2, EVT_FLOAT(4.0)) EVT_CALL(GetStatusFlags, ACTOR_ENEMY0, LVar0) 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 7eb6d4742b..8661187dbf 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 @@ -482,7 +482,7 @@ EvtScript N(doDeath_8021D0C4) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar2, LVar3, LVar4) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar2, LVar3, LVar4, 0, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_SET(LVar3, 0) EVT_LOOP(12) 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 c5b48dd580..2f197861ec 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 @@ -172,7 +172,7 @@ EvtScript N(80224658) = { EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 10) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) - EVT_CALL(PlaySound, SOUND_DEATH) + EVT_CALL(PlaySound, SOUND_ACTOR_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) 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 713c0c629e..8a26b206f8 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 @@ -212,7 +212,7 @@ EvtScript N(8022C6D4) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_IF_EQ(LVar2, MOVE_SPOOK) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263) + 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) @@ -243,7 +243,7 @@ EvtScript N(8022C804) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(32) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_300) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0300) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 40, 0) @@ -322,7 +322,7 @@ EvtScript N(8022CC74) = { EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 10) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) - EVT_CALL(PlaySound, SOUND_DEATH) + EVT_CALL(PlaySound, SOUND_ACTOR_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) @@ -1197,7 +1197,7 @@ EvtScript N(80230794) = { EVT_ADD(LVar0, LVar1) EVT_ADD(LVar0, 50) EVT_SET(LVar1, 200) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_366) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0366) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarA) EVT_CASE_EQ(6) @@ -1304,8 +1304,8 @@ EvtScript N(8023106C) = { EVT_ADD(LVar1, LVar4) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, LVar5, 30, 0) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_ADD(LVar2, 50) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar1, LVar2, LVar3, 10, 0) @@ -1319,9 +1319,9 @@ EvtScript N(8023106C) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) @@ -1435,7 +1435,7 @@ EvtScript N(802318F8) = { EVT_IF_EQ(LVar1, 0) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301) EVT_CALL(HideHealthBar, ACTOR_SELF) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.2)) @@ -1461,7 +1461,7 @@ EvtScript N(802318F8) = { EVT_SUB(LVar0, 5) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_WAIT(15) - EVT_CALL(PlaySound, SOUND_DEATH) + EVT_CALL(PlaySound, SOUND_ACTOR_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) @@ -1514,7 +1514,7 @@ EvtScript N(802318F8) = { EVT_SUB(LVar0, 5) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_WAIT(15) - EVT_CALL(PlaySound, SOUND_DEATH) + EVT_CALL(PlaySound, SOUND_ACTOR_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) 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 0a582d8c14..da6b4add76 100644 --- a/src/battle/area/kmr_part_3/actor/jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/jr_troopa.c @@ -158,7 +158,7 @@ EvtScript N(80222C78) = { EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 10) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) - EVT_CALL(PlaySound, SOUND_DEATH) + EVT_CALL(PlaySound, SOUND_ACTOR_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) 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 8b908e5f30..684cea9608 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 @@ -142,7 +142,7 @@ EvtScript N(8022A750) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_IF_EQ(LVar2, MOVE_SPOOK) EVT_CALL(SetActorVar, ACTOR_SELF, 3, 1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263) + 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) @@ -173,7 +173,7 @@ EvtScript N(8022A880) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(32) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_300) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0300) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 40, 0) @@ -564,7 +564,7 @@ EvtScript N(8022BF1C) = { EVT_SUB(LVar0, 5) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_WAIT(15) - EVT_CALL(PlaySound, SOUND_DEATH) + EVT_CALL(PlaySound, SOUND_ACTOR_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) 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 5ea762f84f..55903843f1 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 @@ -130,7 +130,7 @@ EvtScript N(80225F7C) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_IF_EQ(LVar2, MOVE_SPOOK) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263) + 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) @@ -161,7 +161,7 @@ EvtScript N(802260AC) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(32) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_300) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0300) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 40, 0) @@ -540,7 +540,7 @@ EvtScript N(802279B0) = { EVT_IF_EQ(LVar1, 0) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(HideHealthBar, ACTOR_SELF) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) @@ -567,7 +567,7 @@ EvtScript N(802279B0) = { EVT_SUB(LVar0, 5) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) 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 5c1436cce3..4d6e9c0574 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 @@ -123,7 +123,7 @@ EvtScript N(80228084) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_IF_EQ(LVar2, MOVE_SPOOK) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263) + 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) @@ -154,7 +154,7 @@ EvtScript N(802281B4) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(32) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_300) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0300) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 40, 0) @@ -638,7 +638,7 @@ EvtScript N(8022A018) = { EVT_IF_EQ(LVar1, 0) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(HideHealthBar, ACTOR_SELF) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) @@ -665,7 +665,7 @@ EvtScript N(8022A018) = { EVT_SUB(LVar0, 5) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_WAIT(15) - EVT_CALL(PlaySound, SOUND_DEATH) + EVT_CALL(PlaySound, SOUND_ACTOR_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) 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 1e0fbd61aa..2e8d1dc2f8 100644 --- a/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c +++ b/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c @@ -413,7 +413,7 @@ EvtScript N(takeTurn_8021CDFC) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_THREAD EVT_LOOP(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_FLY) EVT_WAIT(4) EVT_END_LOOP EVT_END_THREAD @@ -504,7 +504,7 @@ EvtScript N(8021D614) = { EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Hurt) EVT_END_IF - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) diff --git a/src/battle/area/kpa2/actor/bowser_intro.c b/src/battle/area/kpa2/actor/bowser_intro.c index 52578e5c86..dd7db58611 100644 --- a/src/battle/area/kpa2/actor/bowser_intro.c +++ b/src/battle/area/kpa2/actor/bowser_intro.c @@ -346,7 +346,7 @@ EvtScript N(attackClawSwipe) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock) EVT_WAIT(25) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Swipe) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35E) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E) EVT_WAIT(3) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -417,9 +417,9 @@ EvtScript N(attackFireBreath) = { EVT_CALL(N(UnkFireBreathFXFunc), LVarF) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 50, 148) - EVT_CALL(PlaySound, SOUND_3BD) + EVT_CALL(PlaySound, SOUND_03BD) EVT_WAIT(70) - EVT_CALL(PlaySound, SOUND_3BD | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_03BD | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_ParadePeach_Weep) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) diff --git a/src/battle/area/kpa2/actor/bowser_phase_1.c b/src/battle/area/kpa2/actor/bowser_phase_1.c index a80cb07dc0..0c2b3c0dae 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_1.c +++ b/src/battle/area/kpa2/actor/bowser_phase_1.c @@ -503,7 +503,7 @@ EvtScript N(onDeath) = { EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 10) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_SET(LVar3, 0) @@ -755,7 +755,7 @@ EvtScript N(recover) = { EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) EVT_CALL(N(FadeBackgroundToBlack)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2126) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_CAST_RECOVER) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -785,9 +785,9 @@ EvtScript N(recover) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) @@ -1241,7 +1241,7 @@ EvtScript N(attackClawSwipe) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock) EVT_WAIT(25) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Swipe) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35E) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E) EVT_WAIT(3) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarA) @@ -1503,9 +1503,9 @@ EvtScript N(attackFlameBreath) = { EVT_END_IF EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 50, 148) - EVT_CALL(PlaySound, SOUND_3BD) + EVT_CALL(PlaySound, SOUND_03BD) EVT_WAIT(70) - EVT_CALL(PlaySound, SOUND_3BD | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_03BD | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_WAIT(10) 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 bacb30dab0..68ff7555d6 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_2.c +++ b/src/battle/area/kpa2/actor/bowser_phase_2.c @@ -606,7 +606,7 @@ EvtScript N(recover) = { EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) EVT_CALL(N(FadeBackgroundToBlack)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2126) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_CAST_RECOVER) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -636,9 +636,9 @@ EvtScript N(recover) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) @@ -1094,7 +1094,7 @@ EvtScript N(attackClawSwipe) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock) EVT_WAIT(25) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Swipe) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35E) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E) EVT_WAIT(3) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarA) @@ -1361,9 +1361,9 @@ EvtScript N(attackFlameBreath) = { EVT_END_IF EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 50, 148) - EVT_CALL(PlaySound, SOUND_3BD) + EVT_CALL(PlaySound, SOUND_03BD) EVT_WAIT(70) - EVT_CALL(PlaySound, SOUND_3BD | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_03BD | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -1514,7 +1514,7 @@ EvtScript N(attackLightningBlast) = { EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EF) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) EVT_CALL(N(FadeBackgroundToBlack)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) @@ -1551,7 +1551,7 @@ EvtScript N(attackLightningBlast) = { EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveEffect, LVarE) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2127) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_LIGHTNING) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_THREAD EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, 0, LVar1) diff --git a/src/battle/area/kpa2/actor/bowser_phase_3.c b/src/battle/area/kpa2/actor/bowser_phase_3.c index 1ea2f792df..b6a90fb6e8 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_3.c +++ b/src/battle/area/kpa2/actor/bowser_phase_3.c @@ -538,7 +538,7 @@ EvtScript N(onDeath) = { EVT_CALL(MoveBattleCamOver, 15) EVT_END_IF EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2128) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_POWER_DOWN) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Hurt) EVT_THREAD EVT_CALL(MakeLerp, 0, 80, 8, EASING_QUADRATIC_OUT) @@ -594,7 +594,7 @@ EvtScript N(onDeath) = { EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_HurtStill) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2129) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_COLLAPSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_DefeatedIdle) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 180, 16) @@ -865,7 +865,7 @@ EvtScript N(recover) = { EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) EVT_CALL(N(FadeBackgroundToBlack)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2126) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_CAST_RECOVER) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -895,9 +895,9 @@ EvtScript N(recover) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) @@ -1327,7 +1327,7 @@ EvtScript N(attackClawSwipe) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock) EVT_WAIT(25) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Swipe) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35E) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E) EVT_WAIT(3) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarA) @@ -1594,9 +1594,9 @@ EvtScript N(attackFlameBreath) = { EVT_END_IF EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 50, 148) - EVT_CALL(PlaySound, SOUND_3BD) + EVT_CALL(PlaySound, SOUND_03BD) EVT_WAIT(70) - EVT_CALL(PlaySound, SOUND_3BD | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_03BD | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -1747,7 +1747,7 @@ EvtScript N(attackLightningBlast) = { EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EF) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) EVT_CALL(N(FadeBackgroundToBlack)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) @@ -1784,7 +1784,7 @@ EvtScript N(attackLightningBlast) = { EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveEffect, LVarE) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2127) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_LIGHTNING) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_THREAD EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, 0, LVar1) diff --git a/src/battle/area/kpa4/actor/bombshell_bill.c b/src/battle/area/kpa4/actor/bombshell_bill.c index d31378744e..83d817ca90 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill.c +++ b/src/battle/area/kpa4/actor/bombshell_bill.c @@ -298,7 +298,7 @@ EvtScript N(playExplosionEffects) = { EVT_ADD(LVar1, 16) EVT_ADD(LVar2, 2) EVT_PLAY_EFFECT(EFFECT_BLAST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(3.0), 30, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2078) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_20_A) EVT_CALL(StartRumble, 11) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) diff --git a/src/battle/area/kpa4/actor/bombshell_bill_blaster.c b/src/battle/area/kpa4/actor/bombshell_bill_blaster.c index 764ce2b73a..96877baab4 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_2C8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C8) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 33) EVT_ADD(LVar1, 19) diff --git a/src/battle/area/kzn2/actor/lava_bud.c b/src/battle/area/kzn2/actor/lava_bud.c index a0c38ca6e8..2c617df007 100644 --- a/src/battle/area/kzn2/actor/lava_bud.c +++ b/src/battle/area/kzn2/actor/lava_bud.c @@ -564,7 +564,7 @@ EvtScript N(summonPetitPiranha) = { EVT_CALL(SetActorPos, LVar5, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) EVT_SUB(LVar1, 15) - EVT_CALL(PlaySoundAtActor, LVar5, SOUND_3C9) + EVT_CALL(PlaySoundAtActor, LVar5, SOUND_03C9) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar9) EVT_IF_EQ(LVar9, 1) EVT_CALL(GetActorPos, LVar5, LVar0, LVar1, LVar2) @@ -647,7 +647,7 @@ EvtScript N(onDeath) = { EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_FIREY, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_2, ACTOR_EVENT_FLAG_FIREY, FALSE) EVT_WAIT(29) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C7) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_CALL(OverrideBattleDmaDest, VINE_1_BASE) @@ -678,7 +678,7 @@ EvtScript N(onDeath) = { EVT_CALL(SetActorVar, ACTOR_SELF, 7, ANIM_LavaBud_Anim0F) EVT_CALL(SetActorVar, ACTOR_SELF, 8, ANIM_LavaBud_Anim09) EVT_WAIT(29) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C7) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_CALL(OverrideBattleDmaDest, VINE_1_BASE) @@ -889,7 +889,7 @@ EvtScript N(onHit) = { EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_FIREY, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_2, ACTOR_EVENT_FLAG_FIREY, FALSE) EVT_WAIT(29) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C7) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_CALL(OverrideBattleDmaDest, VINE_1_BASE) @@ -1021,7 +1021,7 @@ EvtScript N(attackPetitSpit) = { EVT_CALL(SetGoalPos, LVar5, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, LVar5, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, LVar5, EVT_FLOAT(1.8)) - EVT_CALL(PlaySoundAtActor, LVar5, SOUND_3CB) + EVT_CALL(PlaySoundAtActor, LVar5, SOUND_03CB) EVT_CALL(SetTargetActor, LVar5, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, LVar5) EVT_CALL(EnemyTestTarget, LVar5, LVar9, 0, 0, 1, BS_FLAGS1_10) diff --git a/src/battle/area/kzn2/actor/lava_piranha.c b/src/battle/area/kzn2/actor/lava_piranha.c index b34cf3efb7..37abde0208 100644 --- a/src/battle/area/kzn2/actor/lava_piranha.c +++ b/src/battle/area/kzn2/actor/lava_piranha.c @@ -664,9 +664,9 @@ EvtScript N(spawnColorado) = { EVT_CALL(SpeakToPlayer, NPC_BTL_COMPANION, -1, -1, 0, MSG_CH5_0104) EVT_THREAD EVT_LOOP(9) - EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_20BA, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_ACTOR_STEP_A, SOUND_SPACE_MODE_0) EVT_WAIT(2) - EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_3B4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_ACTOR_STEP_B, SOUND_SPACE_MODE_0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD @@ -674,7 +674,7 @@ EvtScript N(spawnColorado) = { EVT_CALL(SetNpcAnimationSpeed, NPC_BTL_COMPANION, EVT_FLOAT(2.0)) EVT_CALL(SetNpcSpeed, NPC_BTL_COMPANION, EVT_FLOAT(10.0)) EVT_CALL(NpcMoveTo, NPC_BTL_COMPANION, 70, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_E8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_TOUCH_LAVA, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimationSpeed, NPC_BTL_COMPANION, EVT_FLOAT(1.0)) EVT_CALL(SetNpcJumpscale, NPC_BTL_COMPANION, EVT_FLOAT(1.0)) EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_BattleKolorado_Injured) @@ -705,9 +705,9 @@ EvtScript N(spawnColorado) = { EVT_CALL(NpcJump0, NPC_BTL_COMPANION, 50, 0, 0, 12) EVT_THREAD EVT_LOOP(4) - EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_20BA, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_ACTOR_STEP_A, SOUND_SPACE_MODE_0) EVT_WAIT(2) - EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_3B4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_ACTOR_STEP_B, SOUND_SPACE_MODE_0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD @@ -715,7 +715,7 @@ EvtScript N(spawnColorado) = { EVT_CALL(SetNpcSpeed, NPC_BTL_COMPANION, EVT_FLOAT(8.0)) EVT_CALL(NpcMoveTo, NPC_BTL_COMPANION, -60, 0, 0) EVT_CALL(SpeakToPlayer, NPC_BTL_COMPANION, ANIM_BattleKolorado_Shout, ANIM_BattleKolorado_ShoutStill, 5, MSG_CH5_0106) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_174) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0174) EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_BattleKolorado_Run) EVT_CALL(SetNpcSpeed, NPC_BTL_COMPANION, EVT_FLOAT(6.0)) EVT_CALL(NpcMoveTo, NPC_BTL_COMPANION, -300, 0, 0) @@ -1101,7 +1101,7 @@ EvtScript N(takeTurn) = { EVT_END_LOOP EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03BB) EVT_SET(LVar0, ACTOR_ENEMY0) EVT_EXEC_WAIT(N(ignite)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim04) @@ -1150,7 +1150,7 @@ EvtScript N(attackFlameSpew) = { EVT_WAIT(14) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim05) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C1) EVT_WAIT(45) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim06) EVT_CALL(GetPartOffset, ACTOR_SELF, PRT_MAIN, LVar0, LVar1, LVar2) @@ -1161,7 +1161,7 @@ EvtScript N(attackFlameSpew) = { EVT_SUB(LVar3, 40) EVT_SET(LVar4, -10) EVT_PLAY_EFFECT(EFFECT_63, 1, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 20, 20, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C3) EVT_WAIT(19) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, LVar3, 0, LVar5, 50, 50, EVT_FLOAT(1.0), 40, 55, EVT_FLOAT(1.0), EVT_FLOAT(1.0), 0) @@ -1232,7 +1232,7 @@ EvtScript N(attackFireStream) = { EVT_WAIT(14) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim0E) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C1) EVT_WAIT(45) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim08) EVT_CALL(GetPartOffset, ACTOR_SELF, PRT_MAIN, LVar0, LVar1, LVar2) @@ -1241,7 +1241,7 @@ EvtScript N(attackFireStream) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_PLAY_EFFECT(EFFECT_63, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 16, 40, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C4) EVT_WAIT(15) EVT_THREAD EVT_WAIT(24) @@ -1301,7 +1301,7 @@ API_CALLABLE(N(UpdateSong)) { // play 'end battle' song if (isInitialCall) { - sfx_play_sound(SOUND_D4); + sfx_play_sound(SOUND_JINGLE_WON_BATTLE); bgm_set_song(0, SONG_BATTLE_END, 0, 500, 8); return ApiStatus_BLOCK; } @@ -1383,9 +1383,9 @@ EvtScript N(onDeath) = { EVT_CALL(PlayModelAnimation, VINE_2, VINE_2_BASE) EVT_WAIT(4) EVT_THREAD - EVT_CALL(PlaySound, SOUND_3BC) + EVT_CALL(PlaySound, SOUND_LRAW_03BC) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 119, EVT_FLOAT(0.3)) - EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_LRAW_03BC | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 234) EVT_CALL(HideHealthBar, ACTOR_SELF) @@ -1396,7 +1396,7 @@ EvtScript N(onDeath) = { EVT_CALL(LoadBattleDmaData, 10) EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C6) EVT_WAIT(35) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) @@ -1466,7 +1466,7 @@ EvtScript N(onDeath) = { EVT_CALL(SetAnimatedModelRootPosition, VINE_2, 0, -250, 0) EVT_CALL(SetActorPos, ACTOR_SELF, 100, 0, 0) EVT_CALL(DropStarPoints, ACTOR_SELF) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH) EVT_CALL(ForceHomePos, ACTOR_SELF, 61, 61, 0) EVT_WAIT(65) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) @@ -1481,15 +1481,15 @@ EvtScript N(onDeath) = { EVT_END_THREAD EVT_WAIT(80) EVT_THREAD - EVT_CALL(PlaySound, SOUND_3BC) + EVT_CALL(PlaySound, SOUND_LRAW_03BC) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 165, EVT_FLOAT(1.2)) - EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_LRAW_03BC | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 300) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_WAIT(20) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_263) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0263) 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) @@ -1589,7 +1589,7 @@ EvtScript N(onDeath) = { EVT_CALL(EnableModel, 85, TRUE) EVT_CALL(EnableModel, 87, TRUE) EVT_CALL(EnableModel, 88, TRUE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C5) EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, 100, 0, 0, 70, 80, EVT_FLOAT(2.5), 80, 55, EVT_FLOAT(2.0), EVT_FLOAT(2.0), 0) EVT_CALL(LoadAnimatedModel, VINE_4, EVT_PTR(N(anim1))) EVT_CALL(PlayModelAnimation, VINE_4, EVT_PTR(N(anim1_8021A364))) @@ -1653,14 +1653,14 @@ EvtScript N(onDeath) = { EVT_CALL(LoadBattleDmaData, 35) EVT_CALL(PlayModelAnimation, VINE_3, VINE_3_BASE) EVT_THREAD - EVT_CALL(PlaySound, SOUND_3BC) + EVT_CALL(PlaySound, SOUND_LRAW_03BC) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 100, EVT_FLOAT(0.5)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 8, EVT_FLOAT(0.2)) - EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_LRAW_03BC | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 216) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3CC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03CC) EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE) @@ -1681,7 +1681,7 @@ EvtScript N(onDeath) = { EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, 105, 60, 2, 80, 60, EVT_FLOAT(1.8), 90, 100, EVT_FLOAT(1.5), EVT_FLOAT(1.5), 0) EVT_END_IF EVT_WAIT(121) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3CD) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03CD) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim0A) EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE) EVT_CALL(LoadBattleDmaData, 11) @@ -1792,7 +1792,7 @@ EvtScript N(onDeath) = { EVT_WAIT(3) EVT_CALL(SetActorPos, ACTOR_SELF, -60, 0, 0) EVT_CALL(DropStarPoints, ACTOR_SELF) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH) EVT_WAIT(15) EVT_CALL(GetActorVar, ACTOR_SELF, 6, LVar0) EVT_IF_NE(LVar0, 0) @@ -2039,7 +2039,7 @@ EvtScript N(doOnHit) = { EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_FIREY, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_2, ACTOR_EVENT_FLAG_FIREY, FALSE) EVT_WAIT(29) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C8) EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE) EVT_CALL(LoadBattleDmaData, 13) EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE) diff --git a/src/battle/area/kzn2/actor/petit_piranha.c b/src/battle/area/kzn2/actor/petit_piranha.c index 9300b47a1a..1fca5f513d 100644 --- a/src/battle/area/kzn2/actor/petit_piranha.c +++ b/src/battle/area/kzn2/actor/petit_piranha.c @@ -278,7 +278,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_PetitPiranha_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3CA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03CA) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -287,7 +287,7 @@ EvtScript N(takeTurn) = { EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3CB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03CB) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/area/mac/actor/chan.c b/src/battle/area/mac/actor/chan.c index 773c626eb1..9f745ec1bf 100644 --- a/src/battle/area/mac/actor/chan.c +++ b/src/battle/area/mac/actor/chan.c @@ -183,7 +183,7 @@ EvtScript N(8021A12C) = { EVT_SUB(LVar1, 24) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) @@ -587,7 +587,7 @@ EvtScript N(takeTurn_8021B81C) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_Still) EVT_WAIT(8) EVT_END_IF - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05) diff --git a/src/battle/area/mac/actor/lee.c b/src/battle/area/mac/actor/lee.c index ad9984eb8d..6240c7a010 100644 --- a/src/battle/area/mac/actor/lee.c +++ b/src/battle/area/mac/actor/lee.c @@ -268,7 +268,7 @@ 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_2CB, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02CB, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(6) @@ -385,7 +385,7 @@ EvtScript N(8021E118) = { EVT_IF_GT(LVarC, 0) EVT_SET(LVarC, 0) EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(0.5)) - EVT_CALL(SetActorSounds, LVarA, ACTOR_SOUND_JUMP, SOUND_301, 0) + EVT_CALL(SetActorSounds, LVarA, ACTOR_SOUND_JUMP, SOUND_0301, 0) EVT_CALL(SetGoalPos, LVarA, LVarB, LVarC, LVarD) EVT_CALL(JumpToGoal, LVarA, 15, FALSE, TRUE, FALSE) EVT_CALL(ResetActorSounds, LVarA, ACTOR_SOUND_JUMP) @@ -1026,7 +1026,7 @@ EvtScript N(EVS_Move_Tattle) = { EVT_CALL(func_802CAE50, 2, LVar0, LVar1, LVar2) EVT_CALL(func_802CABE8, 2, 0, LVar3, 100, 4) EVT_WAIT(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_282) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0282) EVT_CALL(SetCamFlag80, CAM_TATTLE, TRUE) EVT_WAIT(10) EVT_CALL(ActorSpeak, MSG_EnemyTattle_Mario, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Talk, ANIM_BattleGoombario_Idle) @@ -3160,7 +3160,7 @@ EvtScript N(takeTurn_80226004) = { EVT_CALL(AddBattleCamZoom, -75) EVT_CALL(MoveBattleCamOver, LVarA) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_289) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0289) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -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_29A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) 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_29A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) EVT_CALL(AddGoalPos, ACTOR_SELF, -10, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_29A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -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_29A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) 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_29A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) 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_29A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) 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_29A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) 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_2C5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C5) EVT_THREAD EVT_LOOP(15) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 1, 0, 0) diff --git a/src/battle/area/mac/actor/master1.c b/src/battle/area/mac/actor/master1.c index e93d5bb3a3..a02c417657 100644 --- a/src/battle/area/mac/actor/master1.c +++ b/src/battle/area/mac/actor/master1.c @@ -275,7 +275,7 @@ EvtScript N(takeTurn_8022AA54) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) diff --git a/src/battle/area/mac/actor/master2.c b/src/battle/area/mac/actor/master2.c index 6edccc2624..30924e4c65 100644 --- a/src/battle/area/mac/actor/master2.c +++ b/src/battle/area/mac/actor/master2.c @@ -279,7 +279,7 @@ EvtScript N(singleStrike2) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 8, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) @@ -305,7 +305,7 @@ EvtScript N(singleStrike2) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_WAIT(3) @@ -314,7 +314,7 @@ EvtScript N(singleStrike2) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_B) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand) EVT_WAIT(20) EVT_END_CASE_GROUP @@ -345,7 +345,7 @@ EvtScript N(doubleStrike2) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 1) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B9) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10) EVT_SWITCH(LVarA) @@ -386,14 +386,14 @@ EvtScript N(doubleStrike2) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_10) EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_JUMP) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedUppercut) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.9)) @@ -407,7 +407,7 @@ EvtScript N(doubleStrike2) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) EVT_END_THREAD EVT_WAIT(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, BS_FLAGS1_SP_EVT_ACTIVE) @@ -435,7 +435,7 @@ EvtScript N(doubleStrike2) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 30, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_WAIT(3) @@ -444,7 +444,7 @@ EvtScript N(doubleStrike2) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_B) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand) EVT_WAIT(20) EVT_END_CASE_GROUP diff --git a/src/battle/area/mac/actor/master3.c b/src/battle/area/mac/actor/master3.c index b6c2036502..17baf03f06 100644 --- a/src/battle/area/mac/actor/master3.c +++ b/src/battle/area/mac/actor/master3.c @@ -306,7 +306,7 @@ EvtScript N(singleStrike3) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 10, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) @@ -332,7 +332,7 @@ EvtScript N(singleStrike3) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_WAIT(3) @@ -341,7 +341,7 @@ EvtScript N(singleStrike3) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_B) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand) EVT_WAIT(20) EVT_END_CASE_GROUP @@ -372,7 +372,7 @@ EvtScript N(doubleStrike3) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 1) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B9) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10) EVT_SWITCH(LVarA) @@ -413,14 +413,14 @@ EvtScript N(doubleStrike3) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, BS_FLAGS1_10) EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_JUMP) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedUppercut) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.9)) @@ -434,7 +434,7 @@ EvtScript N(doubleStrike3) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) EVT_END_THREAD EVT_WAIT(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 7, BS_FLAGS1_SP_EVT_ACTIVE) @@ -462,7 +462,7 @@ EvtScript N(doubleStrike3) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 30, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_WAIT(3) @@ -471,7 +471,7 @@ EvtScript N(doubleStrike3) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_B) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand) EVT_WAIT(20) EVT_END_CASE_GROUP @@ -503,7 +503,7 @@ EvtScript N(tripleStrike3) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 1) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B9) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10) EVT_SWITCH(LVarA) @@ -544,7 +544,7 @@ EvtScript N(tripleStrike3) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_10) @@ -553,7 +553,7 @@ EvtScript N(tripleStrike3) = { EVT_THREAD EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_JUMP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedUppercut) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.5)) EVT_CALL(JumpToGoal, ACTOR_SELF, 25, FALSE, TRUE, FALSE) @@ -566,7 +566,7 @@ EvtScript N(tripleStrike3) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) EVT_END_THREAD EVT_WAIT(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, 0) @@ -589,7 +589,7 @@ EvtScript N(tripleStrike3) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 30, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_WAIT(3) @@ -604,7 +604,7 @@ EvtScript N(tripleStrike3) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPunch) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_B) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedKick) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) @@ -624,7 +624,7 @@ EvtScript N(tripleStrike3) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 7, BS_FLAGS1_SP_EVT_ACTIVE) @@ -652,7 +652,7 @@ EvtScript N(tripleStrike3) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 30, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_WAIT(3) @@ -661,7 +661,7 @@ EvtScript N(tripleStrike3) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_B) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand) EVT_WAIT(20) EVT_END_CASE_GROUP diff --git a/src/battle/area/nok/actor/kent_c_koopa.c b/src/battle/area/nok/actor/kent_c_koopa.c index 84045680c1..4754c08b45 100644 --- a/src/battle/area/nok/actor/kent_c_koopa.c +++ b/src/battle/area/nok/actor/kent_c_koopa.c @@ -631,7 +631,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_370) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0370) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim0A) EVT_WAIT(10) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 3, BS_FLAGS1_10) @@ -655,7 +655,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(StopSound, SOUND_370) + EVT_CALL(StopSound, SOUND_0370) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim0C) EVT_WAIT(8) EVT_CALL(YieldTurn) @@ -756,7 +756,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(StopSound, SOUND_370) + EVT_CALL(StopSound, SOUND_0370) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim0C) EVT_WAIT(8) EVT_CALL(YieldTurn) @@ -806,7 +806,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_END_IF EVT_END_THREAD EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(StopSound, SOUND_370) + EVT_CALL(StopSound, SOUND_0370) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim0C) EVT_WAIT(8) EVT_CALL(YieldTurn) @@ -841,7 +841,7 @@ EvtScript N(EVS_Attack_HeavyStomp) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim01) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E7) + 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) @@ -1171,7 +1171,7 @@ API_CALLABLE(N(UnusedFunc)) { } EvtScript N(EVS_DropDummyCoin) = { - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar5, SOUND_212) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar5, SOUND_COIN_BOUNCE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar6, LVar7, LVar8) EVT_CALL(SetPartPos, ACTOR_SELF, LVar5, LVar6, 35, LVar8) EVT_CALL(N(GetCoinTrajectory), LVar6, LVar8, LVar0, LVar1, LVar2, LVar3) @@ -1188,7 +1188,7 @@ EvtScript N(EVS_DropDummyCoin) = { EVT_WAIT(1) EVT_END_LOOP // give coin to player - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar5, SOUND_211) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar5, SOUND_COIN_PICKUP) EVT_CALL(AddCoin, 1) EVT_RETURN EVT_END diff --git a/src/battle/area/omo2/actor/general_guy.c b/src/battle/area/omo2/actor/general_guy.c index 9d9612002c..5f118140a7 100644 --- a/src/battle/area/omo2/actor/general_guy.c +++ b/src/battle/area/omo2/actor/general_guy.c @@ -333,7 +333,7 @@ EvtScript N(attack_throw_bomb) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) EVT_CASE_EQ(HIT_RESULT_MISS) - EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_2, SOUND_2F9) + EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_2, SOUND_02F9) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -350,7 +350,7 @@ EvtScript N(attack_throw_bomb) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_CASE_EQ(HIT_RESULT_LUCKY) - EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_2, SOUND_2F9) + EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_2, SOUND_02F9) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -376,7 +376,7 @@ EvtScript N(attack_throw_bomb) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_SWITCH - EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_2, SOUND_2F9) + EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_2, SOUND_02F9) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PRT_2, EVT_FLOAT(14.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_2, EVT_FLOAT(0.1)) @@ -445,7 +445,7 @@ EvtScript N(attack_lightning_shot) = { EVT_CALL(GetModelCenter, 39) EVT_THREAD EVT_LOOP(4) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_3D2) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_03D2) EVT_CALL(RandInt, 3, LVar0) EVT_ADD(LVar0, 3) EVT_WAIT(LVar0) diff --git a/src/battle/area/omo2/actor/light_bulb.c b/src/battle/area/omo2/actor/light_bulb.c index b746a907fc..6580dc145f 100644 --- a/src/battle/area/omo2/actor/light_bulb.c +++ b/src/battle/area/omo2/actor/light_bulb.c @@ -382,7 +382,7 @@ API_CALLABLE(func_80218250_52B8F0) { } EvtScript N(onDeath) = { - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY2, SOUND_3AE) + EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY2, SOUND_03AE) EVT_CALL(func_80218250_52B8F0) EVT_CALL(EnableModel, 39, FALSE) EVT_CALL(EnableModel, 41, FALSE) diff --git a/src/battle/area/omo2/actor/toy_tank.c b/src/battle/area/omo2/actor/toy_tank.c index e783160e8e..2fd1eb59e6 100644 --- a/src/battle/area/omo2/actor/toy_tank.c +++ b/src/battle/area/omo2/actor/toy_tank.c @@ -738,7 +738,7 @@ EvtScript N(start_battle_with_tank) = { EvtScript N(onDeath) = { EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_36F) + EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_036F) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_fall_apart)) EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar0) EVT_IF_NE(LVar0, 0) @@ -756,7 +756,7 @@ EvtScript N(onDeath) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_ENEMY0) EVT_CALL(MoveBattleCamOver, 60) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_34E) + EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_034E) EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY0, EVT_FLOAT(0.6)) EVT_CALL(SetActorDispOffset, ACTOR_ENEMY0, 0, 0, 0) EVT_CALL(GetActorPos, ACTOR_ENEMY0, LVar0, LVar1, LVar2) diff --git a/src/battle/area/omo2_1/actor/shy_squad.c b/src/battle/area/omo2_1/actor/shy_squad.c index d7b4b76b0c..4f736f492c 100644 --- a/src/battle/area/omo2_1/actor/shy_squad.c +++ b/src/battle/area/omo2_1/actor/shy_squad.c @@ -996,7 +996,7 @@ EvtScript N(onHit) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0) EVT_SET(LVar8, 0) EVT_LOOP(12) @@ -1095,7 +1095,7 @@ EvtScript N(onDeath) = { EVT_END_LOOP EVT_CALL(GetPartOffset, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_SET(LVar3, 0) EVT_LOOP(12) @@ -1127,11 +1127,11 @@ EvtScript N(attack) = { EVT_SUB(LVar0, LVar1) EVT_SWITCH(LVar0) EVT_CASE_EQ(1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CASE_LT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EB) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EC) EVT_END_SWITCH EVT_SET(LVar0, 2) EVT_SET(LVar1, ANIM_ShySquadGuy_Anim03) @@ -1202,12 +1202,12 @@ EvtScript N(attack) = { EVT_SUB(LVar0, LVar1) EVT_SWITCH(LVar0) EVT_CASE_EQ(1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CASE_LT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EB) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EC) EVT_END_SWITCH EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) @@ -1226,7 +1226,7 @@ EvtScript N(attack) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(ACTOR_VARS_GUYS_KILLED), LVar0) EVT_SUB(LVarE, LVar0) EVT_SET(LVarD, LVarE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3AD) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_03AD) EVT_LOOP(LVarD) EVT_IF_GT(LVarE, 1) EVT_SET(LVar0, BS_FLAGS1_40) @@ -1252,7 +1252,7 @@ EvtScript N(attack) = { EVT_END_IF EVT_WAIT(10) EVT_END_LOOP - EVT_CALL(StopSound, SOUND_3AD) + EVT_CALL(StopSound, SOUND_LRAW_03AD) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(20) @@ -1261,12 +1261,12 @@ EvtScript N(attack) = { EVT_SUB(LVar0, LVar1) EVT_SWITCH(LVar0) EVT_CASE_EQ(1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CASE_LT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EB) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EC) EVT_END_SWITCH EVT_SET(LVar1, ANIM_ShySquadGuy_Anim04) EVT_EXEC_WAIT(N(move_squad_to_home)) @@ -1327,7 +1327,7 @@ EvtScript N(flee) = { EVT_SUB(LVar0, LVar1) EVT_SWITCH(LVar0) EVT_CASE_EQ(1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CASE_LT(4) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHY_GUY_SCREAMS3) @@ -1339,7 +1339,7 @@ EvtScript N(flee) = { EVT_CALL(SetGoalPos, ACTOR_SELF, 240, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 0, TRUE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_1E2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_01E2) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(2.5)) EVT_CALL(GetActorVar, ACTOR_SELF, N(ACTOR_VARS_GUYS_KILLED), LVar0) EVT_IF_LT(LVar0, 14) @@ -1348,19 +1348,19 @@ EvtScript N(flee) = { EVT_CALL(ActorSpeak, MSG_CH4_0068, ACTOR_ENEMY0, PRT_MAIN, -1, -1) EVT_END_IF EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_1E2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_01E2) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(2.0)) EVT_WAIT(12) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_1E2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_01E2) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(2.0)) EVT_END_THREAD EVT_CALL(EndActorSpeech, ACTOR_ENEMY0, PRT_MAIN, -1, -1) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_WAIT(40) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_173) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0173) EVT_WAIT(20) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_174) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0174) EVT_END_THREAD EVT_SET(LVar0, 2) EVT_SET(LVar1, ANIM_ShySquadGuy_Anim08) diff --git a/src/battle/area/omo2_2/actor/stilt_guy.c b/src/battle/area/omo2_2/actor/stilt_guy.c index d6277ec1d6..90dab44bc0 100644 --- a/src/battle/area/omo2_2/actor/stilt_guy.c +++ b/src/battle/area/omo2_2/actor/stilt_guy.c @@ -283,10 +283,10 @@ EvtScript N(init) = { EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar1) EVT_IF_EQ(LVar1, 0) EVT_SET(LVar0, 10) - EVT_CALL(PlaySound, SOUND_305) + EVT_CALL(PlaySound, SOUND_0305) EVT_ELSE EVT_SET(LVar0, 50) - EVT_CALL(PlaySound, SOUND_306) + EVT_CALL(PlaySound, SOUND_0306) EVT_END_IF EVT_SUB(LVar2, 13) EVT_CALL(SetPartPos, ACTOR_SELF, PRT_8, LVar0, 200, LVar2) @@ -683,7 +683,7 @@ EvtScript N(attack) = { EVT_SET(LVar1, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.5)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2066) @@ -717,7 +717,7 @@ EvtScript N(attack) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.5)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_WAIT(2) @@ -775,7 +775,7 @@ EvtScript N(fallOff) = { EVT_END_LOOP EVT_CALL(SetPartFlags, ACTOR_SELF, PRT_2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_NO_TARGET) EVT_END_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_301) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_0301) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) @@ -1080,8 +1080,8 @@ EvtScript N(shy_guy_attack1) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim04) @@ -1119,9 +1119,9 @@ EvtScript N(shy_guy_attack1) = { EVT_END_SWITCH EVT_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim04) @@ -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_234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) 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) @@ -1173,7 +1173,7 @@ EvtScript N(shy_guy_attack2) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) @@ -1272,8 +1272,8 @@ EvtScript N(shy_guy_attack2) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim07) diff --git a/src/battle/area/omo2_3/actor/shy_stack.c b/src/battle/area/omo2_3/actor/shy_stack.c index e6339908e4..3b1bcc0285 100644 --- a/src/battle/area/omo2_3/actor/shy_stack.c +++ b/src/battle/area/omo2_3/actor/shy_stack.c @@ -371,7 +371,7 @@ EvtScript N(init) = { EVT_CALL(SetPartPos, ACTOR_SELF, PRT_11, LVar0, 200, 0) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_14, SOUND_301) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_14, SOUND_0301) EVT_END_THREAD EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_14, ANIM_ShyGuy_Red_Anim0A) @@ -384,7 +384,7 @@ EvtScript N(init) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(36) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_13, SOUND_301) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_13, SOUND_0301) EVT_END_THREAD EVT_THREAD EVT_WAIT(31) @@ -409,7 +409,7 @@ EvtScript N(init) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(67) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_12, SOUND_301) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_12, SOUND_0301) EVT_END_THREAD EVT_THREAD EVT_WAIT(62) @@ -442,7 +442,7 @@ EvtScript N(init) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(98) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_11, SOUND_301) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_11, SOUND_0301) EVT_END_THREAD EVT_THREAD EVT_WAIT(93) @@ -1031,7 +1031,7 @@ EvtScript N(fall_apart) = { }; EvtScript N(lower_actor_pos) = { - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 18) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1157,7 +1157,7 @@ EvtScript N(doSpinSmashHit) = { EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_10, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(GetPartOffset, ACTOR_SELF, PRT_10, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_10, SOUND_DEATH) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_10, SOUND_ACTOR_DEATH) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_SET(LVar0, 0) EVT_LOOP(12) @@ -1226,7 +1226,7 @@ EvtScript N(80235168) = { EVT_WAIT(20) EVT_CALL(GetPartOffset, ACTOR_SELF, PRT_10, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_10, SOUND_DEATH) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_10, SOUND_ACTOR_DEATH) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_SET(LVar0, 0) EVT_LOOP(12) @@ -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_2E7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E7) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E8) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -1475,9 +1475,9 @@ EvtScript N(onSpinSmashLaunchDeath) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) - EVT_CALL(PlaySound, SOUND_DEATH) + EVT_CALL(PlaySound, SOUND_ACTOR_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_SET(LVar3, 0) diff --git a/src/battle/area/omo2_4/actor/signal_guy.c b/src/battle/area/omo2_4/actor/signal_guy.c index 0094cc3d2b..3d5773db54 100644 --- a/src/battle/area/omo2_4/actor/signal_guy.c +++ b/src/battle/area/omo2_4/actor/signal_guy.c @@ -154,7 +154,7 @@ EvtScript N(handleEvent) = { EVT_PLAY_EFFECT(EFFECT_SWEAT, 0, LVar0, LVar1, LVar2, 10, 45, 4, 0) EVT_WAIT(6) EVT_END_LOOP - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_MarshalGuy_Anim0C) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) diff --git a/src/battle/area/omo3/actor/big_lantern_ghost.c b/src/battle/area/omo3/actor/big_lantern_ghost.c index c61ad24376..fb0cb42bc1 100644 --- a/src/battle/area/omo3/actor/big_lantern_ghost.c +++ b/src/battle/area/omo3/actor/big_lantern_ghost.c @@ -431,16 +431,16 @@ EvtScript N(handleEvent) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_HIT_SOUND_COUNTER), LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A3) EVT_CALL(AddActorVar, ACTOR_SELF, N(VAR_HIT_SOUND_COUNTER), 1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A4) EVT_CALL(AddActorVar, ACTOR_SELF, N(VAR_HIT_SOUND_COUNTER), 1) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A5) EVT_CALL(AddActorVar, ACTOR_SELF, N(VAR_HIT_SOUND_COUNTER), 1) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A6) EVT_CALL(AddActorVar, ACTOR_SELF, N(VAR_HIT_SOUND_COUNTER), 1) EVT_CASE_DEFAULT EVT_END_SWITCH @@ -547,7 +547,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim01) EVT_WAIT(8) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_3E7, 0) + 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) @@ -564,7 +564,7 @@ EvtScript N(attackHeavyJump) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037D) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_SUB(LVar0, 15) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) @@ -574,7 +574,7 @@ EvtScript N(attackHeavyJump) = { EVT_SUB(LVar0, 10) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037D) EVT_WAIT(8) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -601,7 +601,7 @@ EvtScript N(attackHeavyJump) = { EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037D) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 320) @@ -618,12 +618,12 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 12, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037D) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim01) EVT_ADD(LVar0, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037D) EVT_WAIT(8) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) @@ -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_2EB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EB) 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) @@ -721,13 +721,13 @@ EvtScript N(attackLightBeam) = { EVT_WAIT(10) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3AA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03AA) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A9) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A8) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A7) EVT_END_SWITCH EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim14) @@ -770,12 +770,12 @@ EvtScript N(extinguish) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(20) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3CF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03CF) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim0F) EVT_WAIT(8) EVT_THREAD EVT_WAIT(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3D0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D0) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim0E) EVT_WAIT(5) @@ -786,13 +786,13 @@ EvtScript N(extinguish) = { EVT_WAIT(10) EVT_SWITCH(LVar0) EVT_CASE_EQ(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3AA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03AA) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A9) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A8) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A7) EVT_END_SWITCH EVT_END_THREAD EVT_WAIT(14) diff --git a/src/battle/area/pra2/actor/crystal_bit.c b/src/battle/area/pra2/actor/crystal_bit.c index 025551ed99..0ed4931987 100644 --- a/src/battle/area/pra2/actor/crystal_bit.c +++ b/src/battle/area/pra2/actor/crystal_bit.c @@ -297,7 +297,7 @@ EvtScript N(handleEvent) = { EVT_CALL(GetAnimation, ACTOR_SELF, PRT_MAIN, LVar1) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_CALL(HideHealthBar, ACTOR_SELF) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar1, 0, LVar3) @@ -359,7 +359,7 @@ EvtScript N(handleEvent) = { EVT_END_IF EVT_EXEC_WAIT(EVS_Enemy_BurnHit) EVT_CALL(HideHealthBar, ACTOR_SELF) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar1, 0, LVar3) diff --git a/src/battle/area/pra2/actor/crystal_king.c b/src/battle/area/pra2/actor/crystal_king.c index e8a408b904..7b1204bc8e 100644 --- a/src/battle/area/pra2/actor/crystal_king.c +++ b/src/battle/area/pra2/actor/crystal_king.c @@ -955,7 +955,7 @@ EvtScript N(AttackIcyBreath) = { EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim1C) EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035D) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -980,7 +980,7 @@ EvtScript N(AttackIcyBreath) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 30, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_WAIT(30) - EVT_CALL(StopSound, SOUND_35D) + EVT_CALL(StopSound, SOUND_035D) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -1009,7 +1009,7 @@ EvtScript N(AttackIcyBreath) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 50, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_WAIT(60) - EVT_CALL(StopSound, SOUND_35D) + EVT_CALL(StopSound, SOUND_035D) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim15) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -1052,7 +1052,7 @@ EvtScript N(AttackIceBolt) = { EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim1C) EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -1284,7 +1284,7 @@ EvtScript N(MakeIllusions) = { EVT_CALL(SetAnimation, LVar0, 1, ANIM_CrystalKing_Anim00) EVT_CALL(SetAnimation, LVar0, 1, ANIM_CrystalKing_Anim09) EVT_CALL(UseIdleAnimation, LVar0, TRUE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DF) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE1_ID), LVar0) EVT_CALL(EnableActorBlur, LVar0, IDLE_SCRIPT_DISABLE) @@ -1505,7 +1505,7 @@ EvtScript N(SummonCrystalBits) = { EVT_CALL(SetPartScale, LVar0, 1, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4)) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim1F) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DE) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_BIT3_ID), LVar0) EVT_SETF(LVar1, EVT_FLOAT(42.0)) EVT_SETF(LVar2, EVT_FLOAT(85.0)) @@ -1605,7 +1605,7 @@ EvtScript N(AttackIcyBreathWithClones) = { EVT_CALL(SetAnimation, LVarA, 1, ANIM_CrystalKing_Anim1C) EVT_CALL(SetAnimation, LVarB, 1, ANIM_CrystalKing_Anim1C) EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035D) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -1656,7 +1656,7 @@ EvtScript N(AttackIcyBreathWithClones) = { EVT_CALL(func_80218280_6609D0, LVarF) EVT_END_IF EVT_WAIT(30) - EVT_CALL(StopSound, SOUND_35D) + EVT_CALL(StopSound, SOUND_035D) EVT_IF_EQ(LVar5, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -1715,7 +1715,7 @@ EvtScript N(AttackIcyBreathWithClones) = { EVT_CALL(func_80218280_6609D0, LVarF) EVT_END_IF EVT_WAIT(60) - EVT_CALL(StopSound, SOUND_35D) + EVT_CALL(StopSound, SOUND_035D) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim15) EVT_CALL(SetAnimation, LVarA, 1, ANIM_CrystalKing_Anim15) EVT_CALL(SetAnimation, LVarB, 1, ANIM_CrystalKing_Anim15) @@ -1769,7 +1769,7 @@ EvtScript N(MoveBitToTarget) = { }; EvtScript N(RemoveCrystalBit) = { - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3D9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D9) EVT_SET(LVarA, LVar0) EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW, FALSE) @@ -1803,7 +1803,7 @@ EvtScript N(RemoveCrystalBit) = { }; EvtScript N(AttackWithCrystalBit) = { - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3D9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D9) EVT_SET(LVarA, LVar0) EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW, FALSE) @@ -1856,7 +1856,7 @@ EvtScript N(NormalAttack) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 30, EVT_FLOAT(0.2)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3AF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03AF) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_BIT1_ID), LVar0) EVT_CALL(ActorExists, LVar0, LVar1) EVT_IF_EQ(LVar1, TRUE) @@ -2012,24 +2012,24 @@ EvtScript N(Heal) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A) EVT_END_THREAD EVT_IF_EQ(LFlag0, TRUE) EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, LVarA, SOUND_206D) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_214) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_HEART_BOUNCE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_25C) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_SRAW_16_A) EVT_END_THREAD EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, LVarB, SOUND_206D) - EVT_CALL(PlaySoundAtActor, LVarB, SOUND_214) + EVT_CALL(PlaySoundAtActor, LVarB, SOUND_HEART_BOUNCE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, LVarB, SOUND_25C) + EVT_CALL(PlaySoundAtActor, LVarB, SOUND_SRAW_16_A) EVT_END_THREAD EVT_END_IF EVT_IF_EQ(LFlag0, FALSE) diff --git a/src/battle/area/sam2/actor/monstar.c b/src/battle/area/sam2/actor/monstar.c index 0cc6fd0cb1..19537e3277 100644 --- a/src/battle/area/sam2/actor/monstar.c +++ b/src/battle/area/sam2/actor/monstar.c @@ -382,8 +382,8 @@ EvtScript N(attack) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 60) EVT_WAIT(60) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EA) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_36E) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_036E) EVT_THREAD EVT_WAIT(10) EVT_LOOP(18) @@ -545,7 +545,7 @@ EvtScript N(OnDeath) = { EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 10) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_SET(LVar3, 0) diff --git a/src/battle/area/tik2/actor/blooper.c b/src/battle/area/tik2/actor/blooper.c index 7f29765f21..b3a6ec999b 100644 --- a/src/battle/area/tik2/actor/blooper.c +++ b/src/battle/area/tik2/actor/blooper.c @@ -29,7 +29,7 @@ EvtScript N(FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(FallToGoal, ACTOR_SELF, 8) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) EVT_SET(LVar7, LVar4) EVT_ADD(LVar7, LVar4) EVT_ADD(LVar7, LVar0) @@ -52,7 +52,7 @@ EvtScript N(FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) EVT_SET(LVar7, LVar0) EVT_ADD(LVar7, LVar0) EVT_ADD(LVar7, LVar4) @@ -75,7 +75,7 @@ EvtScript N(FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) @@ -410,7 +410,7 @@ EvtScript N(attackSpinDrop) = { EVT_SET(LVar1, 100) EVT_SET(LVar3, 15) EVT_EXEC_WAIT(N(FloatToPos)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DD) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DD) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -514,7 +514,7 @@ EvtScript N(attackInkBlast) = { EVT_CALL(MoveBattleCamOver, 50) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) EVT_SET(LVar7, LVar4) EVT_ADD(LVar7, LVar0) EVT_MULF(LVar7, EVT_FLOAT(0.5)) @@ -534,7 +534,7 @@ EvtScript N(attackInkBlast) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, EASING_CUBIC_OUT) @@ -549,7 +549,7 @@ EvtScript N(attackInkBlast) = { EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 40, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -40) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_ADD(LVar3, 1) EVT_SUB(LVar4, 27) diff --git a/src/battle/area/tik2/actor/blooper_baby.c b/src/battle/area/tik2/actor/blooper_baby.c index a3005ef507..017d72a3c2 100644 --- a/src/battle/area/tik2/actor/blooper_baby.c +++ b/src/battle/area/tik2/actor/blooper_baby.c @@ -29,7 +29,7 @@ EvtScript N(FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(FallToGoal, ACTOR_SELF, 8) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35F) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035F) EVT_SET(LVar7, LVar4) EVT_ADD(LVar7, LVar4) EVT_ADD(LVar7, LVar0) @@ -52,7 +52,7 @@ EvtScript N(FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35F) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035F) EVT_SET(LVar7, LVar0) EVT_ADD(LVar7, LVar0) EVT_ADD(LVar7, LVar4) @@ -75,7 +75,7 @@ EvtScript N(FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35F) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035F) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) @@ -211,7 +211,7 @@ ActorBlueprint NAMESPACE = { EvtScript N(init) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35F) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035F) EVT_CALL(N(StartRumbleWithParams), 80, 20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BabyBlooper_Anim00) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BabyBlooper_Anim01) @@ -224,7 +224,7 @@ EvtScript N(init) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_SELF, 8, 0, EASING_LINEAR) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35F) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035F) EVT_CALL(N(StartRumbleWithParams), 80, 20) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) @@ -407,7 +407,7 @@ EvtScript N(takeTurn) = { EVT_EXEC_WAIT(N(FloatToPos)) EVT_THREAD EVT_WAIT(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301) EVT_END_THREAD EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarF) @@ -495,7 +495,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_SET(LFlag0, FALSE) EVT_LOOP(2) @@ -563,13 +563,13 @@ EvtScript N(takeTurn) = { EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar3) EVT_IF_NE(LVar3, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) EVT_CALL(N(SpawnDrainHealthStartFX), LVar0, LVar1, LVar2, LVar3) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A) EVT_CALL(N(SpawnDrainHealthContinueFX), LVar0, LVar1, LVar2, LVar3) EVT_END_THREAD EVT_ADD(LVar0, 20) diff --git a/src/battle/area/tik2/actor/electro_blooper.c b/src/battle/area/tik2/actor/electro_blooper.c index ef453a8bad..c63bb4af9d 100644 --- a/src/battle/area/tik2/actor/electro_blooper.c +++ b/src/battle/area/tik2/actor/electro_blooper.c @@ -34,7 +34,7 @@ EvtScript N(FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(FallToGoal, ACTOR_SELF, 8) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) EVT_SET(LVar7, LVar4) EVT_ADD(LVar7, LVar4) EVT_ADD(LVar7, LVar0) @@ -57,7 +57,7 @@ EvtScript N(FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) EVT_SET(LVar7, LVar0) EVT_ADD(LVar7, LVar0) EVT_ADD(LVar7, LVar4) @@ -80,7 +80,7 @@ EvtScript N(FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) @@ -572,7 +572,7 @@ EvtScript N(attackSpinDrop) = { EVT_SET(LVar1, 100) EVT_SET(LVar3, 15) EVT_EXEC_WAIT(N(FloatToPos)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DD) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DD) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -773,7 +773,7 @@ EvtScript N(attackInkBlast) = { EVT_CALL(MoveBattleCamOver, 80) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) EVT_SET(LVar7, LVar4) EVT_ADD(LVar7, LVar0) EVT_MULF(LVar7, EVT_FLOAT(0.5)) @@ -793,7 +793,7 @@ EvtScript N(attackInkBlast) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, EASING_CUBIC_OUT) @@ -808,7 +808,7 @@ EvtScript N(attackInkBlast) = { EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 40, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -40) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_ADD(LVar3, 1) EVT_SUB(LVar4, 28) @@ -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_35C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035C) 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 f9a0ba708c..09addde3ca 100644 --- a/src/battle/area/tik2/actor/super_blooper.c +++ b/src/battle/area/tik2/actor/super_blooper.c @@ -39,7 +39,7 @@ EvtScript N(FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(FallToGoal, ACTOR_SELF, 8) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) EVT_SET(LVar7, LVar4) EVT_ADD(LVar7, LVar4) EVT_ADD(LVar7, LVar0) @@ -62,7 +62,7 @@ EvtScript N(FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) EVT_SET(LVar7, LVar0) EVT_ADD(LVar7, LVar0) EVT_ADD(LVar7, LVar4) @@ -85,7 +85,7 @@ EvtScript N(FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) @@ -502,7 +502,7 @@ EvtScript N(attackSpinDrop) = { EVT_SET(LVar1, 100) EVT_SET(LVar3, 15) EVT_EXEC_WAIT(N(FloatToPos)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DD) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DD) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -592,7 +592,7 @@ EvtScript N(attackInkBlast) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(FallToGoal, ACTOR_SELF, 8) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) EVT_SET(LVar7, LVar4) EVT_ADD(LVar7, LVar0) EVT_MULF(LVar7, EVT_FLOAT(0.5)) @@ -612,7 +612,7 @@ EvtScript N(attackInkBlast) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, EASING_CUBIC_OUT) @@ -625,7 +625,7 @@ EvtScript N(attackInkBlast) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 16, 0, EASING_LINEAR) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 40, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -40) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_ADD(LVar3, 1) EVT_SUB(LVar4, 30) @@ -716,12 +716,12 @@ EvtScript N(makeBabies) = { EVT_WAIT(10) EVT_CALL(ActorExists, ACTOR_ENEMY1, LVar1) EVT_IF_EQ(LVar1, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3D9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D9) EVT_CALL(SummonEnemy, EVT_PTR(N(formation_baby_1)), FALSE) EVT_END_IF EVT_CALL(ActorExists, ACTOR_ENEMY2, LVar1) EVT_IF_EQ(LVar1, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3D9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D9) EVT_CALL(SummonEnemy, EVT_PTR(N(formation_baby_2)), FALSE) EVT_END_IF EVT_WAIT(2) @@ -776,7 +776,7 @@ EvtScript N(attackEnragedDrops) = { EVT_SET(LVar1, 100) EVT_SET(LVar3, 15) EVT_EXEC_WAIT(N(FloatToPos)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DD) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DD) 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/trd_part_2/actor/common_koopa_bros.inc.c b/src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c index 8892511da5..05acd1d087 100644 --- a/src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c +++ b/src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c @@ -528,7 +528,7 @@ EvtScript N(HandleCommand) = { EVT_WAIT(12) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_JUMP) EVT_THREAD EVT_SET(LVar0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 18, 0) @@ -542,7 +542,7 @@ EvtScript N(HandleCommand) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, -5, 36) @@ -571,11 +571,11 @@ EvtScript N(HandleCommand) = { EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TowerHeight, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_356) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0356) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_355) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0355) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_354) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0354) EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_SHELL_SPIN) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -605,7 +605,7 @@ EvtScript N(HandleCommand) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037C) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TowerHeight, LVar0) @@ -770,7 +770,7 @@ EvtScript N(HandleCommand) = { EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_ENTER_SHELL) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_353) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0353) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_SHELL_SPIN) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(N(SpawnSpinEffect), LVar0, LVar1, LVar2, 30) @@ -797,7 +797,7 @@ EvtScript N(HandleCommand) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037C) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) diff --git a/src/battle/area/trd_part_2/actor/fake_bowser.c b/src/battle/area/trd_part_2/actor/fake_bowser.c index 60a7c08acf..f3eafcbc28 100644 --- a/src/battle/area/trd_part_2/actor/fake_bowser.c +++ b/src/battle/area/trd_part_2/actor/fake_bowser.c @@ -474,42 +474,42 @@ EvtScript N(EVS_AnimBowser_DeathMain) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_HEAD, EVT_FLOAT(0.5)) EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_HEAD, LVar0, LVar1, LVar2, 60, TRUE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtModel, MODEL_k1, SOUND_1E2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_k1, SOUND_01E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) EVT_WAIT(20) - EVT_CALL(PlaySoundAtModel, MODEL_u1, SOUND_1E2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_u1, SOUND_01E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.5)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 150, 20) EVT_WAIT(30) - EVT_CALL(PlaySoundAtModel, MODEL_p1, SOUND_1E2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_p1, SOUND_01E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) EVT_WAIT(30) - EVT_CALL(PlaySoundAtModel, MODEL_d1, SOUND_1E2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_d1, SOUND_01E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.7)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 70, 20) EVT_WAIT(20) - EVT_CALL(PlaySoundAtModel, MODEL_s1, SOUND_1E2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_s1, SOUND_01E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) EVT_WAIT(20) - EVT_CALL(PlaySoundAtModel, MODEL_km1, SOUND_1E2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_km1, SOUND_01E2, SOUND_SPACE_MODE_0) EVT_CALL(N(StartRumbleWithParams), 60, 20) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) @@ -1483,9 +1483,9 @@ EvtScript N(EVS_FakeBowser_TakeTurn) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_SET(ArrayVar(0), ANIM_BEGIN_IDLE) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20FD) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FAKE_BOWSER_SWING) EVT_WAIT(22) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20FE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FAKE_BOWSER_STRIKE) EVT_END_THREAD EVT_SET(ArrayVar(0), ANIM_BEGIN_STRIKE) EVT_WAIT(24) @@ -1603,9 +1603,9 @@ EvtScript N(EVS_FakeBowser_HandlePhase) = { EVT_WAIT(30) EVT_CALL(ActorSpeak, MSG_CH1_00FD, ACTOR_SELF, PRT_TARGET, -1, -1) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20FD) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FAKE_BOWSER_SWING) EVT_WAIT(22) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20FE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FAKE_BOWSER_STRIKE) EVT_END_THREAD EVT_SET(ArrayVar(0), ANIM_BEGIN_STRIKE) EVT_WAIT(30) @@ -1686,13 +1686,13 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_CALL(EnableGroup, MODEL_ashi, FALSE) EVT_THREAD EVT_WAIT(23) - EVT_CALL(PlaySoundAtActor, GREEN_ACTOR, SOUND_301) + EVT_CALL(PlaySoundAtActor, GREEN_ACTOR, SOUND_0301) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, YELLOW_ACTOR, SOUND_301) + EVT_CALL(PlaySoundAtActor, YELLOW_ACTOR, SOUND_0301) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, BLACK_ACTOR, SOUND_301) + EVT_CALL(PlaySoundAtActor, BLACK_ACTOR, SOUND_0301) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, RED_ACTOR, SOUND_301) + EVT_CALL(PlaySoundAtActor, RED_ACTOR, SOUND_0301) EVT_END_THREAD EVT_THREAD EVT_CALL(SetAnimation, GREEN_ACTOR, 1, ANIM_KoopaBros_Green_Land) @@ -1701,7 +1701,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_CALL(SetActorJumpGravity, GREEN_ACTOR, EVT_FLOAT(1.5)) EVT_CALL(SetActorSounds, GREEN_ACTOR, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(FallToGoal, GREEN_ACTOR, 30) - EVT_CALL(PlaySoundAtActor, GREEN_ACTOR, SOUND_3E9) + EVT_CALL(PlaySoundAtActor, GREEN_ACTOR, SOUND_03E9) EVT_CALL(ResetActorSounds, GREEN_ACTOR, ACTOR_SOUND_JUMP) EVT_CALL(ForceHomePos, GREEN_ACTOR, 20, 0, 0) EVT_CALL(SetAnimation, GREEN_ACTOR, 1, ANIM_KoopaBros_Green_IdleCrouch) @@ -1714,7 +1714,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_CALL(SetActorJumpGravity, YELLOW_ACTOR, EVT_FLOAT(1.5)) EVT_CALL(SetActorSounds, YELLOW_ACTOR, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(FallToGoal, YELLOW_ACTOR, 30) - EVT_CALL(PlaySoundAtActor, YELLOW_ACTOR, SOUND_3E9) + EVT_CALL(PlaySoundAtActor, YELLOW_ACTOR, SOUND_03E9) EVT_CALL(ResetActorSounds, YELLOW_ACTOR, ACTOR_SOUND_JUMP) EVT_CALL(ForceHomePos, YELLOW_ACTOR, 60, 0, -5) EVT_CALL(SetAnimation, YELLOW_ACTOR, 1, ANIM_KoopaBros_Yellow_IdleCrouch) @@ -1727,7 +1727,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_CALL(SetActorJumpGravity, BLACK_ACTOR, EVT_FLOAT(1.5)) EVT_CALL(SetActorSounds, BLACK_ACTOR, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(FallToGoal, BLACK_ACTOR, 30) - EVT_CALL(PlaySoundAtActor, BLACK_ACTOR, SOUND_3E9) + EVT_CALL(PlaySoundAtActor, BLACK_ACTOR, SOUND_03E9) EVT_CALL(ResetActorSounds, BLACK_ACTOR, ACTOR_SOUND_JUMP) EVT_CALL(ForceHomePos, BLACK_ACTOR, 100, 0, -10) EVT_CALL(SetAnimation, BLACK_ACTOR, 1, ANIM_KoopaBros_Black_IdleCrouch) @@ -1740,7 +1740,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_CALL(SetActorJumpGravity, RED_ACTOR, EVT_FLOAT(1.5)) EVT_CALL(SetActorSounds, RED_ACTOR, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(FallToGoal, RED_ACTOR, 30) - EVT_CALL(PlaySoundAtActor, RED_ACTOR, SOUND_3E9) + EVT_CALL(PlaySoundAtActor, RED_ACTOR, SOUND_03E9) EVT_CALL(ResetActorSounds, RED_ACTOR, ACTOR_SOUND_JUMP) EVT_CALL(ForceHomePos, RED_ACTOR, 140, 0, -15) EVT_CALL(SetAnimation, RED_ACTOR, 1, ANIM_KoopaBros_Red_IdleCrouch) @@ -1946,7 +1946,7 @@ EvtScript N(EVS_BuildTowerWithKoopa) = { EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) EVT_CALL(N(PlayLandOnTowerFX), LVarA) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_03E9) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) @@ -2098,7 +2098,7 @@ EvtScript N(EVS_BuildTowerWithKoopa) = { EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) EVT_CALL(N(PlayLandOnTowerFX), LVarA) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_03E9) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) @@ -2165,7 +2165,7 @@ EvtScript N(EVS_BuildTowerWithKoopa) = { EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) EVT_CALL(N(PlayLandOnTowerFX), LVarA) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_03E9) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) @@ -2298,7 +2298,7 @@ EvtScript N(EVS_UpdateTowerWithKoopa) = { EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) EVT_CALL(N(PlayLandOnTowerFX), LVarA) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_03E9) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) @@ -2380,7 +2380,7 @@ EvtScript N(EVS_UpdateTowerWithKoopa) = { EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) EVT_CALL(N(PlayLandOnTowerFX), LVarA) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_03E9) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) diff --git a/src/battle/btl_evt_library.c b/src/battle/btl_evt_library.c index 99c5387345..27774a0ba6 100644 --- a/src/battle/btl_evt_library.c +++ b/src/battle/btl_evt_library.c @@ -1748,7 +1748,7 @@ EvtScript EVS_Enemy_DeathWithoutRemove = { EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 10) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_SET(LVar3, 0) diff --git a/src/battle/common/actor/albino_dino.inc.c b/src/battle/common/actor/albino_dino.inc.c index 3a45505ba1..a82c1d974d 100644 --- a/src/battle/common/actor/albino_dino.inc.c +++ b/src/battle/common/actor/albino_dino.inc.c @@ -260,9 +260,9 @@ EvtScript N(takeTurn) = { EVT_EXEC_GET_TID(N(stamp), LVar9) EVT_THREAD EVT_LOOP(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_30B) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_030B) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2FD) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FD) EVT_WAIT(4) EVT_END_LOOP EVT_END_THREAD @@ -323,7 +323,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2FD) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FD) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_AlbinoDino_Idle) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(1.0)) EVT_WAIT(10) diff --git a/src/battle/common/actor/anti_guy.inc.c b/src/battle/common/actor/anti_guy.inc.c index d5d9cc185a..c86ccc8640 100644 --- a/src/battle/common/actor/anti_guy.inc.c +++ b/src/battle/common/actor/anti_guy.inc.c @@ -261,8 +261,8 @@ EvtScript N(802220FC) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim04) @@ -300,9 +300,9 @@ EvtScript N(802220FC) = { EVT_END_SWITCH EVT_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim04) @@ -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_234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) 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) @@ -354,7 +354,7 @@ EvtScript N(80222824) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) @@ -453,8 +453,8 @@ EvtScript N(80222824) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim07) diff --git a/src/battle/common/actor/bandit.inc.c b/src/battle/common/actor/bandit.inc.c index 14d605a354..8a453df7cb 100644 --- a/src/battle/common/actor/bandit.inc.c +++ b/src/battle/common/actor/bandit.inc.c @@ -236,15 +236,15 @@ EvtScript N(EVS_DropCoin) = { EVT_CALL(AddVectorPolar, LVar1, LVar3, EVT_FLOAT(40.0), LVar0) EVT_CALL(SetGoalPos, LVarA, LVar1, 0, LVar3) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_212) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_COIN_BOUNCE) EVT_CALL(AddVectorPolar, LVar1, LVar3, EVT_FLOAT(20.0), LVar0) EVT_CALL(SetGoalPos, LVarA, LVar1, 0, LVar3) EVT_CALL(JumpToGoal, LVarA, 10, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_212) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_COIN_BOUNCE) EVT_CALL(AddVectorPolar, LVar1, LVar3, EVT_FLOAT(10.0), LVar0) EVT_CALL(SetGoalPos, LVarA, LVar1, 0, LVar3) EVT_CALL(JumpToGoal, LVarA, 5, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_212) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_COIN_BOUNCE) EVT_LOOP(0) EVT_CALL(GetBattleFlags, LVar1) EVT_IF_FLAG(LVar1, BS_FLAGS1_PARTNER_ACTING) @@ -272,13 +272,13 @@ EvtScript N(EVS_DropCoin) = { EVT_IF_LT(LVar4, 30) EVT_CALL(SetGoalPos, LVarA, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, LVarA, 5, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_212) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_COIN_BOUNCE) EVT_ELSE EVT_SET(LVar4, LVar3) EVT_ADD(LVar3, 30) EVT_CALL(SetGoalPos, LVarA, LVar3, LVar1, LVar2) EVT_CALL(JumpToGoal, LVarA, 0, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_212) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_COIN_BOUNCE) EVT_END_IF EVT_ELSE EVT_SET(LVar4, LVar3) @@ -286,12 +286,12 @@ EvtScript N(EVS_DropCoin) = { EVT_IF_LT(LVar4, 30) EVT_CALL(SetGoalPos, LVarA, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, LVarA, 5, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_212) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_COIN_BOUNCE) EVT_ELSE EVT_SUB(LVar3, 30) EVT_CALL(SetGoalPos, LVarA, LVar3, LVar1, LVar2) EVT_CALL(JumpToGoal, LVarA, 0, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_212) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_COIN_BOUNCE) EVT_END_IF EVT_END_IF EVT_GOTO(5) @@ -302,7 +302,7 @@ EvtScript N(EVS_DropCoin) = { EVT_CALL(JumpToGoal, LVarA, 15, FALSE, FALSE, FALSE) EVT_CALL(GetGoalPos, LVarA, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SMALL_GOLD_SPARKLE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 0, 0) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_211) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_COIN_PICKUP) EVT_CALL(GetActorVar, LVarA, AVAR_Coin_NumCoins, LVar0) EVT_CALL(AddCoin, LVar0) EVT_CALL(RemoveActor, LVarA) @@ -677,7 +677,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_THREAD EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_NumCoins, LVar0) EVT_LOOP(LVar0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_212) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_COIN_BOUNCE) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD diff --git a/src/battle/common/actor/bill_blaster.inc.c b/src/battle/common/actor/bill_blaster.inc.c index 1a2b0a385c..4330891742 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_2C8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C8) 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 b83078e613..6a98e5ecb6 100644 --- a/src/battle/common/actor/blue_shy_guy.inc.c +++ b/src/battle/common/actor/blue_shy_guy.inc.c @@ -250,8 +250,8 @@ EvtScript N(8021B504) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim04) @@ -289,9 +289,9 @@ EvtScript N(8021B504) = { EVT_END_SWITCH EVT_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim04) @@ -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_234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) 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) @@ -343,7 +343,7 @@ EvtScript N(8021BC2C) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) @@ -442,8 +442,8 @@ EvtScript N(8021BC2C) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim07) diff --git a/src/battle/common/actor/bob_omb.inc.c b/src/battle/common/actor/bob_omb.inc.c index 1bc300350f..85e9e3b7d2 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_80000001) + EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_LOOP_01) 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_80000001) + EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_LOOP_01) 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/bony_beetle.inc.c b/src/battle/common/actor/bony_beetle.inc.c index 94d585bd06..f6086ba018 100644 --- a/src/battle/common/actor/bony_beetle.inc.c +++ b/src/battle/common/actor/bony_beetle.inc.c @@ -878,7 +878,7 @@ EvtScript N(8021B7C8) = { EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/bullet_bill.inc.c b/src/battle/common/actor/bullet_bill.inc.c index 0c530e83b8..532d3fff00 100644 --- a/src/battle/common/actor/bullet_bill.inc.c +++ b/src/battle/common/actor/bullet_bill.inc.c @@ -306,7 +306,7 @@ EvtScript N(EVS_MakeExplosionFX) = { EVT_ADD(LVar1, 16) EVT_ADD(LVar2, 2) EVT_PLAY_EFFECT(EFFECT_BLAST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(3.0), 30, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2078) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_20_A) EVT_CALL(StartRumble, 11) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) diff --git a/src/battle/common/actor/buzzy_beetle.inc.c b/src/battle/common/actor/buzzy_beetle.inc.c index 3c1a326f27..50da24066c 100644 --- a/src/battle/common/actor/buzzy_beetle.inc.c +++ b/src/battle/common/actor/buzzy_beetle.inc.c @@ -185,7 +185,7 @@ EvtScript N(fallOff) = { EVT_SUB(LVar1, 24) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) @@ -585,7 +585,7 @@ EvtScript N(takeTurn_ceiling) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim0E) EVT_WAIT(8) EVT_END_IF - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05) diff --git a/src/battle/common/actor/bzzap.inc.c b/src/battle/common/actor/bzzap.inc.c index f8f05c4b86..126c22b03a 100644 --- a/src/battle/common/actor/bzzap.inc.c +++ b/src/battle/common/actor/bzzap.inc.c @@ -485,7 +485,7 @@ EvtScript N(attackSwarmSting) = { EVT_WAIT(40) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bzzap_Anim01) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(PlaySound, SOUND_358) + EVT_CALL(PlaySound, SOUND_0358) EVT_SET(LVar0, 2) EVT_EXEC_GET_TID(N(8021B77C), LVarA) EVT_WAIT(11) @@ -612,7 +612,7 @@ EvtScript N(attackSwarmSting) = { EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(30) - EVT_CALL(StopSound, SOUND_358) + EVT_CALL(StopSound, SOUND_0358) EVT_CALL(YieldTurn) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -721,7 +721,7 @@ EvtScript N(attackSwarmSting) = { EVT_ADD(LVar2, 100) EVT_CALL(FlyPartTo, ACTOR_SELF, PRT_6, LVar0, LVar1, LVar2, 0, 10, EASING_LINEAR) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_6, ACTOR_PART_FLAG_INVISIBLE, TRUE) - EVT_CALL(StopSound, SOUND_358) + EVT_CALL(StopSound, SOUND_0358) EVT_CALL(YieldTurn) EVT_END_CASE_GROUP EVT_END_SWITCH diff --git a/src/battle/common/actor/dark_koopa.inc.c b/src/battle/common/actor/dark_koopa.inc.c index 0104bfe498..4dc570169e 100644 --- a/src/battle/common/actor/dark_koopa.inc.c +++ b/src/battle/common/actor/dark_koopa.inc.c @@ -811,7 +811,7 @@ EvtScript N(standUp) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(0.5)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_JUMP) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ToppleStruggle) EVT_SET(LVar0, 0) @@ -827,7 +827,7 @@ EvtScript N(standUp) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) diff --git a/src/battle/common/actor/dark_paratroopa.inc.c b/src/battle/common/actor/dark_paratroopa.inc.c index a7ab4b52ad..07df10b380 100644 --- a/src/battle/common/actor/dark_paratroopa.inc.c +++ b/src/battle/common/actor/dark_paratroopa.inc.c @@ -581,7 +581,7 @@ EvtScript N(fall) = { EVT_SUB(LVar2, 2) EVT_CALL(SetPartPos, ACTOR_SELF, PRT_3, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_Hurt) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVarA) EVT_IF_EQ(LVarA, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1363,7 +1363,7 @@ EvtScript N(koopa_standUp) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(0.5)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_JUMP) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ToppleStruggle) EVT_SET(LVar0, 0) @@ -1379,7 +1379,7 @@ EvtScript N(koopa_standUp) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) diff --git a/src/battle/common/actor/dry_bones.inc.c b/src/battle/common/actor/dry_bones.inc.c index 471ac5cf21..bdcb52dcc3 100644 --- a/src/battle/common/actor/dry_bones.inc.c +++ b/src/battle/common/actor/dry_bones.inc.c @@ -235,7 +235,7 @@ EvtScript N(idle) = { }; EvtScript N(reassemble) = { - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2D2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02D2) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_DryBones_Anim08) EVT_WAIT(20) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) @@ -440,10 +440,10 @@ EvtScript N(takeTurn) = { EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_SUB(LVar0, 1) EVT_IF_EQ(LVar0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2D4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02D4) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_DryBones_Anim09) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2D3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02D3) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_DryBones_Anim0A) EVT_WAIT(20) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) @@ -457,7 +457,7 @@ EvtScript N(takeTurn) = { EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar0) EVT_CALL(SetEnemyHP, ACTOR_SELF, LVar0) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2D4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02D4) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_DryBones_Anim09) EVT_WAIT(10) EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVar0) @@ -490,7 +490,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetPartPos, ACTOR_SELF, PRT_2, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_2, ACTOR_PART_FLAG_INVISIBLE, FALSE) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_2D1) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_02D1) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_2, ACTOR_SOUND_WALK, 0, 0) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_2, ACTOR_SOUND_JUMP, 0, 0) EVT_EXEC_GET_TID(N(rotateBone), LVarA) @@ -519,7 +519,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetPartPos, ACTOR_SELF, PRT_2, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_2, ACTOR_PART_FLAG_INVISIBLE, FALSE) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_2D1) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_02D1) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_2, ACTOR_SOUND_WALK, 0, 0) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_2, ACTOR_SOUND_JUMP, 0, 0) EVT_EXEC_GET_TID(N(rotateBone), LVarA) diff --git a/src/battle/common/actor/duplighost.inc.c b/src/battle/common/actor/duplighost.inc.c index 413c4969ef..f216924974 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_2CB, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02CB, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -366,7 +366,7 @@ EvtScript N(OnHitElectric) = { EVT_IF_GT(LVarC, 0) EVT_SET(LVarC, 0) EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(0.5)) - EVT_CALL(SetActorSounds, LVarA, ACTOR_SOUND_JUMP, SOUND_301, 0) + EVT_CALL(SetActorSounds, LVarA, ACTOR_SOUND_JUMP, SOUND_0301, 0) EVT_CALL(SetGoalPos, LVarA, LVarB, LVarC, LVarD) EVT_CALL(JumpToGoal, LVarA, 15, FALSE, TRUE, FALSE) EVT_CALL(ResetActorSounds, LVarA, ACTOR_SOUND_JUMP) diff --git a/src/battle/common/actor/duplighost/ghost_goombario.inc.c b/src/battle/common/actor/duplighost/ghost_goombario.inc.c index 4899ef0bc7..e09e7fc3f2 100644 --- a/src/battle/common/actor/duplighost/ghost_goombario.inc.c +++ b/src/battle/common/actor/duplighost/ghost_goombario.inc.c @@ -415,7 +415,7 @@ EvtScript N(EVS_Move_Headbonk) = { EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetJumpAnimations, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_281) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0281) EVT_CALL(N(UnkFunc62), LVarA, 3) EVT_CASE_EQ(1) EVT_THREAD @@ -430,7 +430,7 @@ EvtScript N(EVS_Move_Headbonk) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetJumpAnimations, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_281) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0281) EVT_CALL(N(UnkFunc62), LVarA, 3) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CASE_EQ(2) @@ -455,7 +455,7 @@ EvtScript N(EVS_Move_Headbonk) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetJumpAnimations, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_281) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0281) EVT_CALL(N(UnkFunc62), LVarA, 3) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_END_SWITCH @@ -518,7 +518,7 @@ EvtScript N(EVS_Move_Tattle) = { EVT_CALL(func_802CAE50, 2, LVar0, LVar1, LVar2) EVT_CALL(func_802CABE8, 2, 0, LVar3, 100, 4) EVT_WAIT(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_282) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0282) EVT_CALL(SetCamFlag80, CAM_TATTLE, TRUE) EVT_WAIT(10) EVT_CALL(ActorSpeak, MSG_EnemyTattle_Mario, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Talk, ANIM_BattleGoombario_Idle) diff --git a/src/battle/common/actor/duplighost/ghost_lakilester.inc.c b/src/battle/common/actor/duplighost/ghost_lakilester.inc.c index 79512c4e9f..94a17deba7 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_2C5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C5) 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 9b46c69116..9abe8b5c67 100644 --- a/src/battle/common/actor/duplighost/ghost_sushie.inc.c +++ b/src/battle/common/actor/duplighost/ghost_sushie.inc.c @@ -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_29A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) 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_29A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) EVT_CALL(AddGoalPos, ACTOR_SELF, -10, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_29A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -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_29A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) 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_29A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) 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_29A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) 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_29A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A) 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/duplighost/ghost_watt.inc.c b/src/battle/common/actor/duplighost/ghost_watt.inc.c index 19785c7e32..14e3dd199b 100644 --- a/src/battle/common/actor/duplighost/ghost_watt.inc.c +++ b/src/battle/common/actor/duplighost/ghost_watt.inc.c @@ -397,7 +397,7 @@ EvtScript N(watt_takeTurn) = { EVT_CALL(AddBattleCamZoom, -75) EVT_CALL(MoveBattleCamOver, LVarA) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_289) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0289) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/ember.inc.c b/src/battle/common/actor/ember.inc.c index dba29c6b49..c242806218 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_359 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0359 | 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_359 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0359 | 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) @@ -674,7 +674,7 @@ EvtScript N(8021CBC8) = { EVT_SET(LVarA, LVar0) EVT_WAIT(10) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2CF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CF) 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) @@ -682,7 +682,7 @@ EvtScript N(8021CBC8) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) @@ -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_2CF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CF) 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) @@ -719,7 +719,7 @@ EvtScript N(8021CBC8) = { EVT_SET(LVarA, LVar0) EVT_SET(LVarB, LVar1) EVT_SET(LVarC, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 2) diff --git a/src/battle/common/actor/forest_fuzzy.inc.c b/src/battle/common/actor/forest_fuzzy.inc.c index 6151e5474b..8517aea7aa 100644 --- a/src/battle/common/actor/forest_fuzzy.inc.c +++ b/src/battle/common/actor/forest_fuzzy.inc.c @@ -398,12 +398,12 @@ EvtScript N(80219054) = { EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Forest_Bite) EVT_WAIT(21) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Forest_Still) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 330) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, -3, -2, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) @@ -426,13 +426,13 @@ EvtScript N(80219054) = { EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar3) EVT_IF_NE(LVar3, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) EVT_CALL(N(SpawnDrainHealthStartFX), LVar0, LVar1, LVar2, LVar3) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A) EVT_CALL(N(SpawnDrainHealthContinueFX), LVar0, LVar1, LVar2, LVar3) EVT_END_THREAD EVT_ADD(LVar0, 20) diff --git a/src/battle/common/actor/frost_piranha.inc.c b/src/battle/common/actor/frost_piranha.inc.c index 14a3587f2d..e3e0929ab9 100644 --- a/src/battle/common/actor/frost_piranha.inc.c +++ b/src/battle/common/actor/frost_piranha.inc.c @@ -421,7 +421,7 @@ EvtScript N(attack_icy_breath) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Frost_Anim01) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Frost_Anim0B) EVT_WAIT(11) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3AB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03AB) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) diff --git a/src/battle/common/actor/fuzzy.inc.c b/src/battle/common/actor/fuzzy.inc.c index eb595672aa..41afa20a30 100644 --- a/src/battle/common/actor/fuzzy.inc.c +++ b/src/battle/common/actor/fuzzy.inc.c @@ -336,12 +336,12 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Bite) EVT_WAIT(21) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Still) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 330) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, -3, -2, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) @@ -366,13 +366,13 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar3) EVT_IF_NE(LVar3, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) EVT_CALL(N(SpawnDrainHealthStartFX), LVar0, LVar1, LVar2, LVar3) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A) EVT_CALL(N(SpawnDrainHealthContinueFX), LVar0, LVar1, LVar2, LVar3) EVT_END_THREAD EVT_ADD(LVar0, 20) diff --git a/src/battle/common/actor/gray_magikoopa.inc.c b/src/battle/common/actor/gray_magikoopa.inc.c index 97b7923afd..66b60398bc 100644 --- a/src/battle/common/actor/gray_magikoopa.inc.c +++ b/src/battle/common/actor/gray_magikoopa.inc.c @@ -367,7 +367,7 @@ EvtScript N(knockOff) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 1) EVT_CALL(SetPartPos, ACTOR_SELF, PRT_3, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) @@ -629,7 +629,7 @@ EvtScript N(attackWandStrike) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_2DB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DB) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Gray_Anim02) EVT_SET(LVar0, 200) @@ -660,7 +660,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Gray_Anim03) EVT_WAIT(11) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DC) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -883,7 +883,7 @@ EvtScript N(takeTurn) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_2DB) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DB) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) diff --git a/src/battle/common/actor/green_magikoopa.inc.c b/src/battle/common/actor/green_magikoopa.inc.c index 45fdc7bd5c..f012c94650 100644 --- a/src/battle/common/actor/green_magikoopa.inc.c +++ b/src/battle/common/actor/green_magikoopa.inc.c @@ -369,7 +369,7 @@ EvtScript N(knockOff) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 1) EVT_CALL(SetPartPos, ACTOR_SELF, PRT_3, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) @@ -631,7 +631,7 @@ EvtScript N(attackWandStrike) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_2DB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DB) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Green_Anim02) EVT_SET(LVar0, 200) @@ -662,7 +662,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Green_Anim03) EVT_WAIT(11) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DC) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -885,7 +885,7 @@ EvtScript N(takeTurn) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_2DD) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DD) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) diff --git a/src/battle/common/actor/green_shy_guy.inc.c b/src/battle/common/actor/green_shy_guy.inc.c index b7c7320ee0..42872c14ee 100644 --- a/src/battle/common/actor/green_shy_guy.inc.c +++ b/src/battle/common/actor/green_shy_guy.inc.c @@ -250,8 +250,8 @@ EvtScript N(80220604) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Green_Anim04) @@ -289,9 +289,9 @@ EvtScript N(80220604) = { EVT_END_SWITCH EVT_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Green_Anim04) @@ -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_234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) 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) @@ -343,7 +343,7 @@ EvtScript N(80220D2C) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Green_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) @@ -442,8 +442,8 @@ EvtScript N(80220D2C) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Green_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Green_Anim07) diff --git a/src/battle/common/actor/groove_guy.inc.c b/src/battle/common/actor/groove_guy.inc.c index d4383b378e..1bfa7e7ed9 100644 --- a/src/battle/common/actor/groove_guy.inc.c +++ b/src/battle/common/actor/groove_guy.inc.c @@ -267,8 +267,8 @@ EvtScript N(basicAttack) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim10) @@ -302,9 +302,9 @@ EvtScript N(basicAttack) = { EVT_END_SWITCH EVT_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim10) @@ -346,7 +346,7 @@ EvtScript N(sleepySpin) = { 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(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim10) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) @@ -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_2E2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E2) 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_2E3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E3) 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_2E4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E4) 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_2E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) 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_2E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) 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_2E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) 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_2E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) 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_2E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) 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_2E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) 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_2E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) 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_2E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) 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_2E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) 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_2E6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E6) EVT_SET(LVar0, 0) EVT_LOOP(48) EVT_ADD(LVar0, 30) @@ -717,7 +717,7 @@ EvtScript N(80226C00) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetGoalToIndex, LVarB, LVarA) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, LVarB, EVT_FLOAT(4.0)) EVT_CALL(RunToGoal, LVarB, 0, FALSE) @@ -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_2E2) + EVT_CALL(PlaySoundAtActor, LVarB, SOUND_02E2) EVT_WAIT(25) EVT_END_LOOP EVT_END_THREAD @@ -800,7 +800,7 @@ EvtScript N(802271A0) = { EVT_SET(LVar1, LVar4) EVT_SET(LVar2, LVar5) EVT_CALL(SetActorPos, LVarB, LVar0, LVar1, LVar2) - EVT_CALL(SetActorSounds, LVarB, ACTOR_SOUND_WALK, SOUND_380, SOUND_NONE) + EVT_CALL(SetActorSounds, LVarB, ACTOR_SOUND_WALK, SOUND_SHYGUY_FLY, SOUND_NONE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetActorSpeed, LVarB, EVT_FLOAT(4.0)) diff --git a/src/battle/common/actor/hammer_bro.inc.c b/src/battle/common/actor/hammer_bro.inc.c index 6a58f8994c..cb33d78508 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_2E9) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_HAMMER_1, SOUND_02E9) 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_2E9) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_HAMMER_1, SOUND_02E9) 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_2E9) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar0, SOUND_02E9) 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_2E9) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar0, SOUND_02E9) 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 2f7edf86ea..2cea3b0d65 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_2C4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C4) 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_cleft.inc.c b/src/battle/common/actor/hyper_cleft.inc.c index 9bdcd11439..a6770713a3 100644 --- a/src/battle/common/actor/hyper_cleft.inc.c +++ b/src/battle/common/actor/hyper_cleft.inc.c @@ -158,7 +158,7 @@ EvtScript N(80220DC0) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.5)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2D9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02D9) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0, 0) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) @@ -182,7 +182,7 @@ EvtScript N(80220DC0) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DA) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVar0) diff --git a/src/battle/common/actor/hyper_goomba.inc.c b/src/battle/common/actor/hyper_goomba.inc.c index 764342f303..65eee16247 100644 --- a/src/battle/common/actor/hyper_goomba.inc.c +++ b/src/battle/common/actor/hyper_goomba.inc.c @@ -146,7 +146,7 @@ EvtScript N(802189D4) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DD) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GOOMBA_STEP) EVT_CALL(N(StartRumbleWithParams), 128, 10) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.5)) @@ -195,7 +195,7 @@ EvtScript N(802189D4) = { EVT_END_THREAD EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 80) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_10F, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_ACTOR_HURT, 0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -200, 0, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.01)) @@ -225,7 +225,7 @@ EvtScript N(802189D4) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_10F, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_ACTOR_HURT, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 80) EVT_CALL(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/common/actor/hyper_paragoomba.inc.c b/src/battle/common/actor/hyper_paragoomba.inc.c index a5bdc6f62f..2339c331b2 100644 --- a/src/battle/common/actor/hyper_paragoomba.inc.c +++ b/src/battle/common/actor/hyper_paragoomba.inc.c @@ -696,7 +696,7 @@ EvtScript N(takeTurn_8021D1DC) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_THREAD EVT_LOOP(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_FLY) EVT_WAIT(4) EVT_END_LOOP EVT_END_THREAD @@ -785,7 +785,7 @@ EvtScript N(8021D9F4) = { EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Hyper_Hurt) EVT_END_IF - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) @@ -915,7 +915,7 @@ EvtScript N(8021E218) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DD) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GOOMBA_STEP) EVT_CALL(N(StartRumbleWithParams), 128, 10) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.5)) @@ -964,7 +964,7 @@ EvtScript N(8021E218) = { EVT_END_THREAD EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 80) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_10F, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_ACTOR_HURT, 0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -200, 0, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.01)) @@ -994,7 +994,7 @@ EvtScript N(8021E218) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_10F, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_ACTOR_HURT, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 80) EVT_CALL(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/common/actor/jungle_fuzzy.inc.c b/src/battle/common/actor/jungle_fuzzy.inc.c index 6904d0b584..fb3fda937f 100644 --- a/src/battle/common/actor/jungle_fuzzy.inc.c +++ b/src/battle/common/actor/jungle_fuzzy.inc.c @@ -403,12 +403,12 @@ EvtScript N(leechAttack) = { EVT_IF_FLAG(LVar1, STATUS_FLAG_STONE) EVT_WAIT(10) EVT_LOOP(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Bite) EVT_WAIT(21) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Still) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 330) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, -3, -2, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) @@ -443,7 +443,7 @@ EvtScript N(leechAttack) = { EVT_LOOP(5) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Bite) EVT_SET(LFlag0, FALSE) EVT_LOOP(21) @@ -460,7 +460,7 @@ EvtScript N(leechAttack) = { EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Still) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 330) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, -3, -2, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_SET(LFlag0, FALSE) @@ -564,13 +564,13 @@ EvtScript N(leechAttack) = { EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar3) EVT_IF_NE(LVar3, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) EVT_CALL(N(SpawnDrainHealthStartFX), LVar0, LVar1, LVar2, LVar3) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A) EVT_CALL(N(SpawnDrainHealthContinueFX), LVar0, LVar1, LVar2, LVar3) EVT_END_THREAD EVT_ADD(LVar0, 20) diff --git a/src/battle/common/actor/koopa_troopa.inc.c b/src/battle/common/actor/koopa_troopa.inc.c index d448934801..3e8fd1392d 100644 --- a/src/battle/common/actor/koopa_troopa.inc.c +++ b/src/battle/common/actor/koopa_troopa.inc.c @@ -474,7 +474,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_JUMP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_ToppleStruggle) EVT_SET(LVar0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) @@ -489,7 +489,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) diff --git a/src/battle/common/actor/koopatrol.inc.c b/src/battle/common/actor/koopatrol.inc.c index 4dc0cc2d66..1cd735214e 100644 --- a/src/battle/common/actor/koopatrol.inc.c +++ b/src/battle/common/actor/koopatrol.inc.c @@ -658,7 +658,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_JUMP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim0F) EVT_SET(LVar0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) @@ -673,7 +673,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) @@ -830,7 +830,7 @@ EvtScript N(attackShellMissile) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A) EVT_CALL(N(StartRumbleWithParams), 128, 10) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.5)) @@ -858,7 +858,7 @@ EvtScript N(attackShellMissile) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037C) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 4, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -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_2E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) 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_2E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) 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_2E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5) 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/lava_bubble.inc.c b/src/battle/common/actor/lava_bubble.inc.c index 6b3563f672..07777210d1 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_359 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0359 | 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_359 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0359 | 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_2CF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CF) 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) @@ -579,7 +579,7 @@ EvtScript N(fireballs_Player) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) @@ -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_2CF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CF) 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) @@ -616,7 +616,7 @@ EvtScript N(fireballs_Player) = { EVT_SET(LVarA, LVar0) EVT_SET(LVarB, LVar1) EVT_SET(LVarC, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 2) diff --git a/src/battle/common/actor/magikoopa.inc.c b/src/battle/common/actor/magikoopa.inc.c index f40b7d72b7..7275e44b89 100644 --- a/src/battle/common/actor/magikoopa.inc.c +++ b/src/battle/common/actor/magikoopa.inc.c @@ -331,7 +331,7 @@ EvtScript N(knockOff) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 1) EVT_CALL(SetPartPos, ACTOR_SELF, PRT_3, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) @@ -848,9 +848,9 @@ EvtScript N(healOne) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, LVarB, SOUND_206D) - EVT_CALL(PlaySoundAtActor, LVarB, SOUND_214) + EVT_CALL(PlaySoundAtActor, LVarB, SOUND_HEART_BOUNCE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, LVarB, SOUND_25C) + EVT_CALL(PlaySoundAtActor, LVarB, SOUND_SRAW_16_A) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) @@ -941,9 +941,9 @@ EvtScript N(healAll) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, LVar0, SOUND_206D) - EVT_CALL(PlaySoundAtActor, LVar0, SOUND_214) + EVT_CALL(PlaySoundAtActor, LVar0, SOUND_HEART_BOUNCE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, LVar0, SOUND_25C) + EVT_CALL(PlaySoundAtActor, LVar0, SOUND_SRAW_16_A) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) @@ -1597,7 +1597,7 @@ EvtScript N(boostAttack) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_2DD) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DD) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) @@ -1709,7 +1709,7 @@ EvtScript N(boostDefense) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_2DD) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DD) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) @@ -1780,7 +1780,7 @@ EvtScript N(electrify) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_FlyingMagikoopa_Anim02) EVT_END_IF EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F0) EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, ACTOR_FLAG_FLYING) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1822,7 +1822,7 @@ EvtScript N(electrify) = { EVT_THREAD EVT_WAIT(10) EVT_LOOP(4) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_3D2) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_03D2) EVT_CALL(RandInt, 3, LVar0) EVT_ADD(LVar0, 3) EVT_WAIT(LVar0) @@ -1938,7 +1938,7 @@ EvtScript N(makeTransparent) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_2DB) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DB) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) diff --git a/src/battle/common/actor/medi_guy.inc.c b/src/battle/common/actor/medi_guy.inc.c index 62cf2cbab4..e3d807705a 100644 --- a/src/battle/common/actor/medi_guy.inc.c +++ b/src/battle/common/actor/medi_guy.inc.c @@ -275,7 +275,7 @@ EvtScript N(flyingAttack) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F8) 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_MediGuy_Anim05) @@ -283,7 +283,7 @@ EvtScript N(flyingAttack) = { 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_2F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F9) EVT_THREAD EVT_WAIT(5) EVT_SET(LVar0, 0) @@ -318,7 +318,7 @@ EvtScript N(flyingAttack) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F8) 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_MediGuy_Anim05) @@ -329,7 +329,7 @@ EvtScript N(flyingAttack) = { EVT_SET(LVarB, LVar1) EVT_SET(LVarC, LVar2) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F9) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 1) @@ -368,8 +368,8 @@ EvtScript N(healOneAlly) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(GetOwnerID, LVar0) EVT_CALL(GetActorPos, LVar0, LVar1, LVar2, LVar3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_NONE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_MediGuy_Anim05) EVT_ADD(LVar2, 50) @@ -386,9 +386,9 @@ EvtScript N(healOneAlly) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, LVarA, SOUND_206D) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_214) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_HEART_BOUNCE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_25C) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_SRAW_16_A) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) diff --git a/src/battle/common/actor/paragloomba.inc.c b/src/battle/common/actor/paragloomba.inc.c index f83e1c23c3..eaed54dc8f 100644 --- a/src/battle/common/actor/paragloomba.inc.c +++ b/src/battle/common/actor/paragloomba.inc.c @@ -418,7 +418,7 @@ EvtScript N(takeTurn) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_THREAD EVT_LOOP(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_FLY) EVT_WAIT(4) EVT_END_LOOP EVT_END_THREAD @@ -507,7 +507,7 @@ EvtScript N(fall) = { EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Dark_Hurt) EVT_END_IF - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) diff --git a/src/battle/common/actor/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c index 9f55ee8d3a..81263121a6 100644 --- a/src/battle/common/actor/paragoomba.inc.c +++ b/src/battle/common/actor/paragoomba.inc.c @@ -420,7 +420,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_THREAD EVT_LOOP(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_FLY) EVT_WAIT(4) EVT_END_LOOP EVT_END_THREAD @@ -509,7 +509,7 @@ EvtScript N(EVS_KnockDown) = { EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Hurt) EVT_END_IF - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) diff --git a/src/battle/common/actor/paratroopa.inc.c b/src/battle/common/actor/paratroopa.inc.c index 56a3ab27d8..39ae3edd01 100644 --- a/src/battle/common/actor/paratroopa.inc.c +++ b/src/battle/common/actor/paratroopa.inc.c @@ -592,7 +592,7 @@ EvtScript N(EVS_KnockDown) = { EVT_SUB(LVar2, 2) EVT_CALL(SetPartPos, ACTOR_SELF, PRT_DUMMY_WINGS, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_DOWNED, ANIM_KoopaTroopa_Hurt) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_AerialFlip, LVarA) EVT_IF_FALSE(LVarA) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1031,7 +1031,7 @@ EvtScript N(EVS_Downed_TakeTurn) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_DOWNED, EVT_FLOAT(1.0)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_DOWNED, 0) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_JUMP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_DOWNED, ANIM_KoopaTroopa_ToppleStruggle) EVT_SET(LVar0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) @@ -1046,7 +1046,7 @@ EvtScript N(EVS_Downed_TakeTurn) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) diff --git a/src/battle/common/actor/pink_shy_guy.inc.c b/src/battle/common/actor/pink_shy_guy.inc.c index 62f56f8ea3..c4c9aba327 100644 --- a/src/battle/common/actor/pink_shy_guy.inc.c +++ b/src/battle/common/actor/pink_shy_guy.inc.c @@ -250,8 +250,8 @@ EvtScript N(8021EB04) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Pink_Anim04) @@ -289,9 +289,9 @@ EvtScript N(8021EB04) = { EVT_END_SWITCH EVT_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Pink_Anim04) @@ -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_234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) 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) @@ -343,7 +343,7 @@ EvtScript N(8021F22C) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Pink_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) @@ -442,8 +442,8 @@ EvtScript N(8021F22C) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Pink_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Pink_Anim07) diff --git a/src/battle/common/actor/pokey.inc.c b/src/battle/common/actor/pokey.inc.c index 16c4a26b5e..6ae239441c 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_342) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0342) 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_2ED) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02ED) 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_342) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0342) 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_2CE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CE) 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_344) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_LEAN_BACK) 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_345) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_LEAN_FORWARD) 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_2EE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EE) EVT_END_CHILD_THREAD // smash into ground EVT_CALL(MakeLerp, -40, 90, 10, EASING_COS_IN_OUT) @@ -972,7 +972,7 @@ EvtScript N(EVS_SummonBackup) = { EVT_END_IF EVT_WAIT(20) // create new Pokey actor - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_346) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_EMERGE_FROM_GROUND) EVT_CALL(StartRumble, 9) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0)) @@ -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_2EC, SOUND_2EC) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EC, 0) + 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(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 162a3c1550..dc61539373 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_342) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0342) 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_2CE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CE) 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_2EC, SOUND_2EC) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EC, 0) + 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(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/putrid_piranha.inc.c b/src/battle/common/actor/putrid_piranha.inc.c index 7ff2097b67..4b436b2940 100644 --- a/src/battle/common/actor/putrid_piranha.inc.c +++ b/src/battle/common/actor/putrid_piranha.inc.c @@ -414,7 +414,7 @@ EvtScript N(breath) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Putrid_Anim01) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Putrid_Anim08) EVT_WAIT(11) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3AB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03AB) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) diff --git a/src/battle/common/actor/pyro_guy.inc.c b/src/battle/common/actor/pyro_guy.inc.c index efa25eeef3..ac6dad9da5 100644 --- a/src/battle/common/actor/pyro_guy.inc.c +++ b/src/battle/common/actor/pyro_guy.inc.c @@ -131,7 +131,7 @@ EvtScript N(idle_8022CCCC) = { }; EvtScript N(8022CDDC) = { - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_PyroGuy_Anim04) @@ -251,7 +251,7 @@ EvtScript N(takeTurn_8022D344) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_PyroGuy_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -266,7 +266,7 @@ EvtScript N(takeTurn_8022D344) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_PyroGuy_Anim05) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) @@ -296,7 +296,7 @@ EvtScript N(takeTurn_8022D344) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_PyroGuy_Anim05) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/red_magikoopa.inc.c b/src/battle/common/actor/red_magikoopa.inc.c index 6043dafe88..6e9c40f9c1 100644 --- a/src/battle/common/actor/red_magikoopa.inc.c +++ b/src/battle/common/actor/red_magikoopa.inc.c @@ -367,7 +367,7 @@ EvtScript N(knockOff) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 1) EVT_CALL(SetPartPos, ACTOR_SELF, PRT_3, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) @@ -629,7 +629,7 @@ EvtScript N(attackWandStrike) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_2DB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DB) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Red_Anim02) EVT_SET(LVar0, 200) @@ -660,7 +660,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Red_Anim03) EVT_WAIT(11) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DC) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -883,7 +883,7 @@ EvtScript N(takeTurn) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_2DD) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DD) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) diff --git a/src/battle/common/actor/red_shy_guy.inc.c b/src/battle/common/actor/red_shy_guy.inc.c index 51cc09ec46..813d4f04ee 100644 --- a/src/battle/common/actor/red_shy_guy.inc.c +++ b/src/battle/common/actor/red_shy_guy.inc.c @@ -250,8 +250,8 @@ EvtScript N(bumpAttack) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim04) @@ -289,9 +289,9 @@ EvtScript N(bumpAttack) = { EVT_END_SWITCH EVT_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim04) @@ -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_234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) 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) @@ -343,7 +343,7 @@ EvtScript N(acrobaticAttack) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) @@ -442,8 +442,8 @@ EvtScript N(acrobaticAttack) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim07) diff --git a/src/battle/common/actor/sky_guy.inc.c b/src/battle/common/actor/sky_guy.inc.c index b6f7692582..32caf105ba 100644 --- a/src/battle/common/actor/sky_guy.inc.c +++ b/src/battle/common/actor/sky_guy.inc.c @@ -345,7 +345,7 @@ EvtScript N(80229F08) = { EVT_CALL(HideHealthBar, ACTOR_SELF) EVT_THREAD EVT_WAIT(20) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E1) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_3, ANIM_SkyGuy_Anim2E) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_4, ANIM_SkyGuy_Anim2D) @@ -358,7 +358,7 @@ EvtScript N(80229F08) = { EVT_WAIT(15) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_SkyGuy_Anim00) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263) EVT_PLAY_EFFECT(EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 24, 0, 25, 0, 0) EVT_WAIT(25) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_SkyGuy_Anim06) @@ -368,7 +368,7 @@ EvtScript N(80229F08) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 120, 10) @@ -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_2E7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E7) 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_2E8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E8) 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) @@ -766,8 +766,8 @@ EvtScript N(8022B7EC) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim04) @@ -805,9 +805,9 @@ EvtScript N(8022B7EC) = { EVT_END_SWITCH EVT_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim04) @@ -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_234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) 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) @@ -859,7 +859,7 @@ EvtScript N(8022BF14) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) @@ -958,8 +958,8 @@ EvtScript N(8022BF14) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim07) diff --git a/src/battle/common/actor/spear_guy.inc.c b/src/battle/common/actor/spear_guy.inc.c index 5f4047bc8a..b9dc4b9935 100644 --- a/src/battle/common/actor/spear_guy.inc.c +++ b/src/battle/common/actor/spear_guy.inc.c @@ -544,7 +544,7 @@ EvtScript N(spearStab) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_309) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0309) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_SpearGuy_Anim1B) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -570,7 +570,7 @@ EvtScript N(spearStab) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_309) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0309) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_SpearGuy_Anim1B) EVT_WAIT(5) EVT_WAIT(2) @@ -602,9 +602,9 @@ EvtScript N(summonBackup) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2FA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FA) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2FB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FB) EVT_END_THREAD EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -616,9 +616,9 @@ EvtScript N(summonBackup) = { EVT_WAIT(25) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2FA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FA) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2FB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FB) EVT_END_THREAD EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -690,13 +690,13 @@ EvtScript N(summonBackup) = { EVT_CALL(SetActorPos, LVarB, LVar0, 0, 0) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2FA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FA) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2FA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FA) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2FB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FB) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2FB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FB) EVT_WAIT(15) EVT_END_THREAD EVT_CALL(SetActorSpeed, LVarB, EVT_FLOAT(4.0)) @@ -773,7 +773,7 @@ EvtScript N(becomeShyGuy) = { EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_4, SOUND_2FC) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_4, SOUND_02FC) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_4, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_4, LVar0, 0, LVar2, 30, TRUE) EVT_WAIT(5) @@ -853,7 +853,7 @@ EvtScript N(spearThrow) = { EVT_GOTO(0) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_3, SOUND_30A) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_3, SOUND_030A) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_3, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -906,7 +906,7 @@ EvtScript N(spearThrow) = { EVT_GOTO(0) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_3, SOUND_30A) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_3, SOUND_030A) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_3, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1262,8 +1262,8 @@ EvtScript N(8021C628) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim04) @@ -1301,9 +1301,9 @@ EvtScript N(8021C628) = { EVT_END_SWITCH EVT_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim04) @@ -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_234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) 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) @@ -1355,7 +1355,7 @@ EvtScript N(8021CD50) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) @@ -1454,8 +1454,8 @@ EvtScript N(8021CD50) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim07) diff --git a/src/battle/common/actor/spike_top.inc.c b/src/battle/common/actor/spike_top.inc.c index 0a58619a28..1d155644c4 100644 --- a/src/battle/common/actor/spike_top.inc.c +++ b/src/battle/common/actor/spike_top.inc.c @@ -185,7 +185,7 @@ EvtScript N(spikeTop_FallDown) = { EVT_SUB(LVar1, 24) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) @@ -591,7 +591,7 @@ EvtScript N(spikeTop_TakeTurn_Ceiling) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikeTop_Anim01) EVT_WAIT(8) EVT_END_IF - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05) diff --git a/src/battle/common/actor/spiny.inc.c b/src/battle/common/actor/spiny.inc.c index f6695e41f2..30f39ddd6a 100644 --- a/src/battle/common/actor/spiny.inc.c +++ b/src/battle/common/actor/spiny.inc.c @@ -425,7 +425,7 @@ 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_2C7) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_02C7) 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(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 4, BS_FLAGS1_10) diff --git a/src/battle/common/actor/spy_guy.inc.c b/src/battle/common/actor/spy_guy.inc.c index e11de046e8..1d96dc9e1a 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_2E7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E7) 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_2E8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E8) 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) @@ -468,7 +468,7 @@ EvtScript N(hammerAttack) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 70, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpyGuy_Anim07) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -483,7 +483,7 @@ EvtScript N(hammerAttack) = { EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_THREAD EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_327) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0327) EVT_END_THREAD EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) diff --git a/src/battle/common/actor/stone_chomp.inc.c b/src/battle/common/actor/stone_chomp.inc.c index 3454980698..3d0d09fb65 100644 --- a/src/battle/common/actor/stone_chomp.inc.c +++ b/src/battle/common/actor/stone_chomp.inc.c @@ -293,13 +293,13 @@ EvtScript N(EVS_Chomp_HopToPos) = { EVT_IF_LT(LVar4, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03F9) EVT_ELSE EVT_SET(LVar4, LVar3) EVT_ADD(LVar3, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar3, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 0, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03F9) EVT_END_IF EVT_ELSE EVT_SET(LVar4, LVar3) @@ -307,12 +307,12 @@ EvtScript N(EVS_Chomp_HopToPos) = { EVT_IF_LT(LVar4, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03F9) EVT_ELSE EVT_SUB(LVar3, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar3, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 0, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03F9) EVT_END_IF EVT_END_IF EVT_GOTO(0) @@ -528,21 +528,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_3F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03F9) EVT_CALL(AddGoalPos, ACTOR_SELF, 15, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03F9) EVT_CALL(AddGoalPos, ACTOR_SELF, 5, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03F9) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03F9) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_StoneChomp_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_3F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03F9) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_THREAD @@ -655,10 +655,10 @@ 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_3F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03F9) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_StoneChomp_SlowBite) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_10F) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_HURT) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -672,7 +672,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_3F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03F9) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -681,11 +681,11 @@ 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_3F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03F9) 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_3F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03F9) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_StoneChomp_Bite) EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -734,18 +734,18 @@ 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_3F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03F9) 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_3F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03F9) 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_3F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03F9) EVT_SUB(LVar0, 10) EVT_CALL(JumpToGoal, ACTOR_SELF, 4, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03F9) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_StoneChomp_Idle) EVT_WAIT(8) EVT_CALL(YieldTurn) diff --git a/src/battle/common/actor/swoopula.inc.c b/src/battle/common/actor/swoopula.inc.c index 640facfb15..2b0d90485e 100644 --- a/src/battle/common/actor/swoopula.inc.c +++ b/src/battle/common/actor/swoopula.inc.c @@ -516,7 +516,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Gray_Anim02) EVT_WAIT(21) EVT_LOOP(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.9), EVT_FLOAT(1.2), EVT_FLOAT(1.0)) @@ -582,7 +582,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) EVT_LOOP(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_SET(LFlag0, FALSE) EVT_LOOP(1) @@ -726,7 +726,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_SET(LFlag0, FALSE) EVT_LOOP(1) @@ -830,13 +830,13 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar3) EVT_IF_NE(LVar3, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(SpawnDrainHealthStartFX), LVar0, LVar1, LVar2, LVar3) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A) EVT_CALL(N(SpawnDrainHealthContinueFX), LVar0, LVar1, LVar2, LVar3) EVT_END_THREAD EVT_ADD(LVar0, 20) @@ -965,7 +965,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Gray_Anim02) EVT_WAIT(21) EVT_LOOP(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.9), EVT_FLOAT(1.2), EVT_FLOAT(1.0)) @@ -986,7 +986,7 @@ EvtScript N(takeTurn) = { EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.9), EVT_FLOAT(1.2), EVT_FLOAT(1.0)) @@ -1031,7 +1031,7 @@ EvtScript N(takeTurn) = { EVT_END_IF EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_SET(LFlag0, FALSE) EVT_LOOP(1) @@ -1135,13 +1135,13 @@ EvtScript N(takeTurn) = { EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar3) EVT_IF_NE(LVar3, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(SpawnDrainHealthStartFX), LVar0, LVar1, LVar2, LVar3) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A) EVT_CALL(N(SpawnDrainHealthContinueFX), LVar0, LVar1, LVar2, LVar3) EVT_END_THREAD EVT_ADD(LVar0, 20) diff --git a/src/battle/common/actor/white_magikoopa.inc.c b/src/battle/common/actor/white_magikoopa.inc.c index ca8b5c46c1..14024c2e8c 100644 --- a/src/battle/common/actor/white_magikoopa.inc.c +++ b/src/battle/common/actor/white_magikoopa.inc.c @@ -372,7 +372,7 @@ EvtScript N(knockOff) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 1) EVT_CALL(SetPartPos, ACTOR_SELF, PRT_3, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) @@ -634,7 +634,7 @@ EvtScript N(wMagikoopa_WandStrike) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_2DB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DB) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_White_Anim02) EVT_SET(LVar0, 200) @@ -665,7 +665,7 @@ EvtScript N(wMagikoopa_WandStrike) = { EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_White_Anim03) EVT_WAIT(11) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DC) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -996,9 +996,9 @@ EvtScript N(healOne) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, LVar8, SOUND_206D) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_214) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_HEART_BOUNCE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_25C) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_SRAW_16_A) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) @@ -1095,9 +1095,9 @@ EvtScript N(healAll) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, LVar0, SOUND_206D) - EVT_CALL(PlaySoundAtActor, LVar0, SOUND_214) + EVT_CALL(PlaySoundAtActor, LVar0, SOUND_HEART_BOUNCE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, LVar0, SOUND_25C) + EVT_CALL(PlaySoundAtActor, LVar0, SOUND_SRAW_16_A) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) diff --git a/src/battle/common/actor/yellow_magikoopa.inc.c b/src/battle/common/actor/yellow_magikoopa.inc.c index 9318793ce4..88f7e495c9 100644 --- a/src/battle/common/actor/yellow_magikoopa.inc.c +++ b/src/battle/common/actor/yellow_magikoopa.inc.c @@ -366,7 +366,7 @@ EvtScript N(knockOff) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 1) EVT_CALL(SetPartPos, ACTOR_SELF, PRT_3, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) @@ -628,7 +628,7 @@ EvtScript N(attackWandStrike) = { 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(PlaySoundAtActor, ACTOR_SELF, SOUND_2DB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DB) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Yellow_Anim02) EVT_SET(LVar0, 200) @@ -659,7 +659,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Yellow_Anim03) EVT_WAIT(11) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DC) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -841,7 +841,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_FlyingMagikoopa_Yellow_Anim02) EVT_END_IF EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F0) EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, ACTOR_FLAG_FLYING) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -883,7 +883,7 @@ EvtScript N(takeTurn) = { EVT_THREAD EVT_WAIT(10) EVT_LOOP(4) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_3D2) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_03D2) EVT_CALL(RandInt, 3, LVar0) EVT_ADD(LVar0, 3) EVT_WAIT(LVar0) diff --git a/src/battle/common/actor/yellow_shy_guy.inc.c b/src/battle/common/actor/yellow_shy_guy.inc.c index 874907531e..9ec774f494 100644 --- a/src/battle/common/actor/yellow_shy_guy.inc.c +++ b/src/battle/common/actor/yellow_shy_guy.inc.c @@ -251,8 +251,8 @@ EvtScript N(8021D004) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Yellow_Anim04) @@ -290,9 +290,9 @@ EvtScript N(8021D004) = { EVT_END_SWITCH EVT_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Yellow_Anim04) @@ -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_234) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234) 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) @@ -344,7 +344,7 @@ EvtScript N(8021D72C) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Yellow_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) @@ -443,8 +443,8 @@ EvtScript N(8021D72C) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Yellow_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Yellow_Anim07) diff --git a/src/battle/common/move/HammerSupport.inc.c b/src/battle/common/move/HammerSupport.inc.c index 3d6aad4f98..ed9b512c1c 100644 --- a/src/battle/common/move/HammerSupport.inc.c +++ b/src/battle/common/move/HammerSupport.inc.c @@ -128,7 +128,7 @@ EvtScript N(EVS_HammerSupport_F) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010B) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_PullBack) EVT_WAIT(4) EVT_CALL(action_command_hammer_start, 0, 36, 3) @@ -225,7 +225,7 @@ EvtScript N(EVS_UseBasicHammer) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010B) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_PullBack) EVT_WAIT(4) EVT_CALL(N(IsBerserkerEquipped)) @@ -292,10 +292,10 @@ EvtScript N(EVS_UseBasicHammer) = { EVT_END_LOOP EVT_END_IF EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_PreSwing) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2115) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_SWING_1) EVT_WAIT(3) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Swing) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2118) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_STRIKE_1) EVT_RETURN EVT_END }; @@ -311,7 +311,7 @@ EvtScript N(EVS_UseSuperHammer) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010B) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_PullBack) EVT_WAIT(4) EVT_CALL(N(IsBerserkerEquipped)) @@ -361,10 +361,10 @@ EvtScript N(EVS_UseSuperHammer) = { EVT_WAIT(5) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_PreSwing) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2116) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_SWING_2) EVT_WAIT(3) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_Swing) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2119) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_STRIKE_2) EVT_RETURN EVT_END }; @@ -380,7 +380,7 @@ EvtScript N(EVS_UseUltraHammer) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010B) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_PullBack) EVT_WAIT(4) EVT_CALL(N(IsBerserkerEquipped)) @@ -430,10 +430,10 @@ EvtScript N(EVS_UseUltraHammer) = { EVT_WAIT(5) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_PreSwing) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2117) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_SWING_3) EVT_WAIT(3) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_Swing) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211A) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_STRIKE_3) EVT_RETURN EVT_END }; @@ -449,7 +449,7 @@ EvtScript N(EVS_Hammer_UseBasicQuake) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(AddBattleCamZoom, 80) EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010B) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_PullBack) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Hold1) @@ -487,11 +487,11 @@ EvtScript N(EVS_Hammer_UseBasicQuake) = { EVT_IF_EQ(LVar0, 0) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2115) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_SWING_1) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_PreSwing) EVT_WAIT(3) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Swing) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2118) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_STRIKE_1) EVT_RETURN EVT_END }; @@ -507,7 +507,7 @@ EvtScript N(EVS_Hammer_UseSuperQuake) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(AddBattleCamZoom, 80) EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010B) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_PullBack) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_Hold1) @@ -536,11 +536,11 @@ EvtScript N(EVS_Hammer_UseSuperQuake) = { EVT_IF_EQ(LVar0, 0) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2116) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_SWING_2) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_PreSwing) EVT_WAIT(3) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_Swing) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2119) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_STRIKE_2) EVT_RETURN EVT_END }; @@ -556,7 +556,7 @@ EvtScript N(EVS_Hammer_UseUltraQuake) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(AddBattleCamZoom, 80) EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010B) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_PullBack) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_Hold1) @@ -585,11 +585,11 @@ EvtScript N(EVS_Hammer_UseUltraQuake) = { EVT_IF_EQ(LVar0, 0) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2117) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_SWING_3) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_PreSwing) EVT_WAIT(3) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_Swing) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211A) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_STRIKE_3) EVT_RETURN EVT_END }; diff --git a/src/battle/common/move/JumpSupport.inc.c b/src/battle/common/move/JumpSupport.inc.c index ca4b5360d4..fc4fa21cc4 100644 --- a/src/battle/common/move/JumpSupport.inc.c +++ b/src/battle/common/move/JumpSupport.inc.c @@ -261,7 +261,7 @@ EvtScript N(EVS_JumpSupport_Miss) = { EVT_CHILD_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_162) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0162) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_GetUp) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_DustOff) diff --git a/src/battle/common/move/StarBeamSupport.inc.c b/src/battle/common/move/StarBeamSupport.inc.c index 0a3baa6a4c..cb2c98bce4 100644 --- a/src/battle/common/move/StarBeamSupport.inc.c +++ b/src/battle/common/move/StarBeamSupport.inc.c @@ -19,7 +19,7 @@ EvtScript N(802A24F0) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -43,7 +43,7 @@ EvtScript N(802A24F0) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -74,7 +74,7 @@ EvtScript N(beforeUsePower) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -98,7 +98,7 @@ EvtScript N(beforeUsePower) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -122,7 +122,7 @@ EvtScript N(802A2C20) = { EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_2041) + 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) @@ -416,9 +416,9 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { script->functionTemp[1] = 40; if (script->functionTemp[2] == 0) { - sfx_play_sound(SOUND_80000068); + sfx_play_sound(SOUND_LOOP_68); } else { - sfx_play_sound(SOUND_80000069); + sfx_play_sound(SOUND_LOOP_69); } script->functionTemp[0] = PEACH_STAR_BEAM_SPIRITS_APPEAR; break; @@ -459,9 +459,9 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { } if (script->functionTemp[2] == 0) { - sfx_play_sound(SOUND_248 | SOUND_ID_TRIGGER_CHANGE_SOUND); + sfx_play_sound(SOUND_LRAW_0248 | SOUND_ID_TRIGGER_CHANGE_SOUND); } else { - sfx_play_sound(SOUND_249 | SOUND_ID_TRIGGER_CHANGE_SOUND); + sfx_play_sound(SOUND_LRAW_0249 | SOUND_ID_TRIGGER_CHANGE_SOUND); } script->functionTemp[0] = PEACH_STAR_BEAM_FLY_TO_TARGET; } else { @@ -569,7 +569,7 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { do {} while (0); // required to match - sfx_play_sound(SOUND_24A); + sfx_play_sound(SOUND_024A); script->functionTemp[1] = 45; script->functionTemp[0] = PEACH_STAR_BEAM_MAKE_BEAM; } else { @@ -638,11 +638,11 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { script->functionTemp[1]--; if (script->functionTemp[1] == 0) { if (script->functionTemp[2] == 0) { - snd_stop_tracking_env_sound_pos(SOUND_248, TRUE); - sfx_play_sound(SOUND_248 | SOUND_ID_TRIGGER_CHANGE_SOUND); + snd_stop_tracking_env_sound_pos(SOUND_LRAW_0248, TRUE); + sfx_play_sound(SOUND_LRAW_0248 | SOUND_ID_TRIGGER_CHANGE_SOUND); } else { - snd_stop_tracking_env_sound_pos(SOUND_249, TRUE); - sfx_play_sound(SOUND_249 | SOUND_ID_TRIGGER_CHANGE_SOUND); + snd_stop_tracking_env_sound_pos(SOUND_LRAW_0249, TRUE); + sfx_play_sound(SOUND_LRAW_0249 | SOUND_ID_TRIGGER_CHANGE_SOUND); } } } @@ -681,9 +681,9 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { } if (script->functionTemp[2] == 0) { - snd_stop_tracking_env_sound_pos(SOUND_248, FALSE); + snd_stop_tracking_env_sound_pos(SOUND_LRAW_0248, FALSE); } else { - snd_stop_tracking_env_sound_pos(SOUND_249, FALSE); + snd_stop_tracking_env_sound_pos(SOUND_LRAW_0249, FALSE); } script->functionTemp[0] = PEACH_STAR_BEAM_SPIRITS_SCATTER; break; diff --git a/src/battle/move/hammer/attack.c b/src/battle/move/hammer/attack.c index a8d0904892..f654e16703 100644 --- a/src/battle/move/hammer/attack.c +++ b/src/battle/move/hammer/attack.c @@ -100,9 +100,9 @@ EvtScript N(EVS_UseMove0_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) EVT_CASE_DEFAULT @@ -111,9 +111,9 @@ EvtScript N(EVS_UseMove0_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) EVT_END_SWITCH @@ -166,19 +166,19 @@ EvtScript N(EVS_UseMove1) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2115) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_SWING_1) EVT_CALL(StartRumble, 7) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.3)) EVT_END_THREAD EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2116) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_SWING_2) EVT_CALL(StartRumble, 8) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.6)) EVT_END_THREAD EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2117) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_SWING_3) EVT_CALL(StartRumble, 9) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.9)) @@ -196,9 +196,9 @@ EvtScript N(EVS_UseMove1) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVar9, 48) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) @@ -322,9 +322,9 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) EVT_CASE_DEFAULT @@ -333,9 +333,9 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) EVT_END_SWITCH diff --git a/src/battle/move/hammer/auto_smash.c b/src/battle/move/hammer/auto_smash.c index 59ff8c10d2..c9bece146c 100644 --- a/src/battle/move/hammer/auto_smash.c +++ b/src/battle/move/hammer/auto_smash.c @@ -99,9 +99,9 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) EVT_CASE_DEFAULT @@ -110,9 +110,9 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) EVT_END_SWITCH diff --git a/src/battle/move/hammer/d_down_pound.c b/src/battle/move/hammer/d_down_pound.c index 56176685b6..c58d4af037 100644 --- a/src/battle/move/hammer/d_down_pound.c +++ b/src/battle/move/hammer/d_down_pound.c @@ -111,11 +111,11 @@ EvtScript N(UseMove_Impl) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210A) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_D_DOWN_HIT_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_D_DOWN_HIT_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210C) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_D_DOWN_HIT_3) EVT_END_SWITCH EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) diff --git a/src/battle/move/hammer/hammer_charge_0.c b/src/battle/move/hammer/hammer_charge_0.c index c012b69935..c68e8ccb7d 100644 --- a/src/battle/move/hammer/hammer_charge_0.c +++ b/src/battle/move/hammer/hammer_charge_0.c @@ -133,9 +133,9 @@ EvtScript N(EVS_802A3348) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 48) EVT_SET(LFlag0, TRUE) @@ -145,9 +145,9 @@ EvtScript N(EVS_802A3348) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 32) EVT_SET(LFlag0, FALSE) @@ -188,9 +188,9 @@ EvtScript N(EVS_802A3948) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer1_Charging) @@ -209,7 +209,7 @@ EvtScript N(EVS_802A3948) = { EVT_CALL(func_802A10C8_74F1F8, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -239,9 +239,9 @@ EvtScript N(EVS_802A3C90) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer2_Charging) @@ -260,7 +260,7 @@ EvtScript N(EVS_802A3C90) = { EVT_CALL(func_802A10C8_74F1F8, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -290,9 +290,9 @@ EvtScript N(EVS_802A3FD8) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer3_Charging) @@ -311,7 +311,7 @@ EvtScript N(EVS_802A3FD8) = { EVT_CALL(func_802A10C8_74F1F8, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/hammer/hammer_charge_1.c b/src/battle/move/hammer/hammer_charge_1.c index 5a87c5ded2..7c2683c95e 100644 --- a/src/battle/move/hammer/hammer_charge_1.c +++ b/src/battle/move/hammer/hammer_charge_1.c @@ -142,9 +142,9 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 48) EVT_SET(LFlag0, TRUE) @@ -154,9 +154,9 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 32) EVT_SET(LFlag0, FALSE) @@ -197,9 +197,9 @@ EvtScript N(EVS_802A39C8) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer1_Charging) @@ -218,7 +218,7 @@ EvtScript N(EVS_802A39C8) = { EVT_CALL(func_802A10C8_759678, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -249,9 +249,9 @@ EvtScript N(EVS_802A3D1C) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer2_Charging) @@ -270,7 +270,7 @@ EvtScript N(EVS_802A3D1C) = { EVT_CALL(func_802A10C8_759678, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -301,9 +301,9 @@ EvtScript N(EVS_802A4070) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer3_Charging) @@ -322,7 +322,7 @@ EvtScript N(EVS_802A4070) = { EVT_CALL(func_802A10C8_759678, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/hammer/hammer_charge_2.c b/src/battle/move/hammer/hammer_charge_2.c index 030e1da270..185f348493 100644 --- a/src/battle/move/hammer/hammer_charge_2.c +++ b/src/battle/move/hammer/hammer_charge_2.c @@ -142,9 +142,9 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 48) EVT_SET(LFlag0, TRUE) @@ -154,9 +154,9 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 32) EVT_SET(LFlag0, FALSE) @@ -197,9 +197,9 @@ EvtScript N(EVS_802A39C8) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer1_Charging) @@ -218,7 +218,7 @@ EvtScript N(EVS_802A39C8) = { EVT_CALL(func_802A10C8_75E698, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -247,9 +247,9 @@ EvtScript N(EVS_802A3CF4) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer2_Charging) @@ -268,7 +268,7 @@ EvtScript N(EVS_802A3CF4) = { EVT_CALL(func_802A10C8_75E698, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -297,9 +297,9 @@ EvtScript N(EVS_802A4020) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer3_Charging) @@ -318,7 +318,7 @@ EvtScript N(EVS_802A4020) = { EVT_CALL(func_802A10C8_75E698, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/hammer/hammer_throw.c b/src/battle/move/hammer/hammer_throw.c index d3406f16b0..12833b1d2b 100644 --- a/src/battle/move/hammer/hammer_throw.c +++ b/src/battle/move/hammer/hammer_throw.c @@ -176,7 +176,7 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_ATTACK_APPROACH) EVT_CALL(AddBattleCamZoom, 50) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010B) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) @@ -257,13 +257,13 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_SWITCH(LVar1) EVT_CASE_EQ(0) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow1_Throw) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2115) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_SWING_1) EVT_CASE_EQ(1) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow2_Throw) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2116) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_SWING_2) EVT_CASE_EQ(2) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow3_Throw) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2117) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_SWING_3) EVT_END_SWITCH EVT_WAIT(3) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) @@ -382,11 +382,11 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210A) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_D_DOWN_HIT_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_D_DOWN_HIT_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210C) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_D_DOWN_HIT_3) EVT_END_SWITCH EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) @@ -396,9 +396,9 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_THROW | DAMAGE_TYPE_NO_CONTACT, 25, 0, LVarF, 112) EVT_CASE_DEFAULT @@ -407,9 +407,9 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_THROW | DAMAGE_TYPE_NO_CONTACT, 25, 0, LVarE, 48) EVT_END_SWITCH diff --git a/src/battle/move/hammer/mega_quake.c b/src/battle/move/hammer/mega_quake.c index 10c8571d0e..78812fc621 100644 --- a/src/battle/move/hammer/mega_quake.c +++ b/src/battle/move/hammer/mega_quake.c @@ -164,21 +164,21 @@ EvtScript N(EVS_802A3238) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_QUAKE_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211C) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_QUAKE_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211D) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_QUAKE_3) EVT_END_SWITCH EVT_WAIT(10) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2118) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_STRIKE_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2119) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_STRIKE_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211A) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_STRIKE_3) EVT_END_SWITCH EVT_SET(LVar9, 0) EVT_CALL(InitTargetIterator) diff --git a/src/battle/move/hammer/mega_smash.c b/src/battle/move/hammer/mega_smash.c index 2bbfdd17e5..bef49f4a5d 100644 --- a/src/battle/move/hammer/mega_smash.c +++ b/src/battle/move/hammer/mega_smash.c @@ -78,9 +78,9 @@ EvtScript N(UseMove_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) EVT_CASE_DEFAULT @@ -89,9 +89,9 @@ EvtScript N(UseMove_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) EVT_END_SWITCH diff --git a/src/battle/move/hammer/power_quake.c b/src/battle/move/hammer/power_quake.c index bd1e4bcb61..5b192eccca 100644 --- a/src/battle/move/hammer/power_quake.c +++ b/src/battle/move/hammer/power_quake.c @@ -113,21 +113,21 @@ EvtScript N(EVS_802A3168) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_QUAKE_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211C) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_QUAKE_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211D) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_QUAKE_3) EVT_END_SWITCH EVT_WAIT(10) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2118) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_STRIKE_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2119) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_STRIKE_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211A) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_STRIKE_3) EVT_END_SWITCH EVT_SET(LVar9, 0) EVT_CALL(InitTargetIterator) diff --git a/src/battle/move/hammer/power_smash.c b/src/battle/move/hammer/power_smash.c index b1b655ae11..98cbf5d9af 100644 --- a/src/battle/move/hammer/power_smash.c +++ b/src/battle/move/hammer/power_smash.c @@ -73,9 +73,9 @@ EvtScript N(UseMove_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) EVT_CASE_DEFAULT @@ -84,9 +84,9 @@ EvtScript N(UseMove_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) EVT_END_SWITCH diff --git a/src/battle/move/hammer/quake_hammer.c b/src/battle/move/hammer/quake_hammer.c index 659e301baf..68364020fe 100644 --- a/src/battle/move/hammer/quake_hammer.c +++ b/src/battle/move/hammer/quake_hammer.c @@ -98,21 +98,21 @@ EvtScript N(EVS_802A3168) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_QUAKE_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211C) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_QUAKE_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211D) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_QUAKE_3) EVT_END_SWITCH EVT_WAIT(10) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2118) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_STRIKE_1) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2119) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_STRIKE_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211A) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_STRIKE_3) EVT_END_SWITCH EVT_SET(LVar9, 0) EVT_CALL(InitTargetIterator) diff --git a/src/battle/move/hammer/shell_crack.c b/src/battle/move/hammer/shell_crack.c index b64b07cc89..26ef8e11a6 100644 --- a/src/battle/move/hammer/shell_crack.c +++ b/src/battle/move/hammer/shell_crack.c @@ -94,9 +94,9 @@ EvtScript N(UseMove_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SHELL_CRACK, 25, 0, LVarF, 112) EVT_CASE_DEFAULT @@ -105,9 +105,9 @@ EvtScript N(UseMove_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SHELL_CRACK, 25, 0, LVarE, 48) EVT_END_SWITCH diff --git a/src/battle/move/hammer/shrink_smash.c b/src/battle/move/hammer/shrink_smash.c index 5b4014503c..6d49423c2a 100644 --- a/src/battle/move/hammer/shrink_smash.c +++ b/src/battle/move/hammer/shrink_smash.c @@ -97,9 +97,9 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 100), LVarF, 112) EVT_CASE_DEFAULT @@ -108,9 +108,9 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), LVarE, 48) EVT_END_SWITCH diff --git a/src/battle/move/hammer/spin_smash.c b/src/battle/move/hammer/spin_smash.c index bed85034d5..3acc8834a3 100644 --- a/src/battle/move/hammer/spin_smash.c +++ b/src/battle/move/hammer/spin_smash.c @@ -93,7 +93,7 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010B) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash1_Raise) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash1_Hold1) @@ -136,7 +136,7 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_WAIT(3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) EVT_CALL(StartRumble, 7) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SPIN_SMASH_1) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_WAIT(10) @@ -215,7 +215,7 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010B) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash2_Raise) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash2_Hold1) @@ -258,7 +258,7 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_WAIT(3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) EVT_CALL(StartRumble, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211F) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SPIN_SMASH_2) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_WAIT(10) @@ -335,7 +335,7 @@ EvtScript N(EVS_UseMove3_Impl) = { EVT_END_SWITCH EVT_CALL(InitTargetIterator) EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010B) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash3_Raise) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash3_Hold1) @@ -378,7 +378,7 @@ EvtScript N(EVS_UseMove3_Impl) = { EVT_WAIT(3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) EVT_CALL(StartRumble, 9) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2120) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SPIN_SMASH_3) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_WAIT(10) diff --git a/src/battle/move/hammer/super_smash.c b/src/battle/move/hammer/super_smash.c index 1e0ff3c840..44088efe9e 100644 --- a/src/battle/move/hammer/super_smash.c +++ b/src/battle/move/hammer/super_smash.c @@ -74,9 +74,9 @@ EvtScript N(UseMove_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) EVT_CASE_DEFAULT @@ -85,9 +85,9 @@ EvtScript N(UseMove_Impl) = { EVT_CASE_EQ(0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_010E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) EVT_END_SWITCH diff --git a/src/battle/move/item/egg_missile.c b/src/battle/move/item/egg_missile.c index 5d02ab0312..1fbe098f23 100644 --- a/src/battle/move/item/egg_missile.c +++ b/src/battle/move/item/egg_missile.c @@ -177,7 +177,7 @@ EvtScript N(EVS_UseItem) = { EVT_ADD(LVar2, 5) EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 18) EVT_CALL(DeleteVirtualEntity, LVarA) - EVT_CALL(PlaySound, SOUND_2010) + EVT_CALL(PlaySound, SOUND_EGG_MISSILE_BLAST) EVT_CALL(N(func_802A123C_71CF1C), LVar0, LVar1, LVar2) EVT_THREAD EVT_CALL(StartRumble, 5) diff --git a/src/battle/move/item/electro_pop.c b/src/battle/move/item/electro_pop.c index e358ebcb35..a08aced0b1 100644 --- a/src/battle/move/item/electro_pop.c +++ b/src/battle/move/item/electro_pop.c @@ -102,7 +102,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) - EVT_CALL(PlaySound, SOUND_379) + EVT_CALL(PlaySound, SOUND_0379) EVT_CALL(GetItemPower, ITEM_VOLT_SHROOM, LVar0, LVar1) EVT_CALL(N(func_802A123C_7307DC)) EVT_WAIT(40) diff --git a/src/battle/move/item/fire_flower.c b/src/battle/move/item/fire_flower.c index 0884c9d39b..d758eed5fe 100644 --- a/src/battle/move/item/fire_flower.c +++ b/src/battle/move/item/fire_flower.c @@ -43,7 +43,7 @@ EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_FIRE_FLOWER) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(N(FadeBackgroundToBlack)) - EVT_CALL(PlaySound, SOUND_377) + EVT_CALL(PlaySound, SOUND_0377) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_PlantFireFlower) EVT_THREAD EVT_WAIT(50) diff --git a/src/battle/move/item/fright_jar.c b/src/battle/move/item/fright_jar.c index 7439c211e1..0a78e088b9 100644 --- a/src/battle/move/item/fright_jar.c +++ b/src/battle/move/item/fright_jar.c @@ -38,7 +38,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(MoveBattleCamOver, 50) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Crouch) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_367) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0367) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -40) EVT_ADD(LVar1, 5) diff --git a/src/battle/move/item/hustle_drink.c b/src/battle/move/item/hustle_drink.c index 5f935d062e..9fdd3c7960 100644 --- a/src/battle/move/item/hustle_drink.c +++ b/src/battle/move/item/hustle_drink.c @@ -56,7 +56,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_369) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0369) EVT_THREAD EVT_LOOP(2) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -106,7 +106,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD EVT_LOOP(10) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_369) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0369) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 0, LVar0, LVar1, LVar2, 0, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar0, LVar1, LVar2, 0, 0) EVT_WAIT(4) diff --git a/src/battle/move/item/insecticide_herb.c b/src/battle/move/item/insecticide_herb.c index 9860c79f51..cbeb03dbb7 100644 --- a/src/battle/move/item/insecticide_herb.c +++ b/src/battle/move/item/insecticide_herb.c @@ -23,7 +23,7 @@ API_CALLABLE(N(func_802A1280_72A9D0)) { Actor* enemy = get_actor(script->owner1.enemyID); Actor* target; - sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, enemy->state.goalPos.x, enemy->state.goalPos.y, enemy->state.goalPos.z); + sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_MODE_0, enemy->state.goalPos.x, enemy->state.goalPos.y, enemy->state.goalPos.z); target = get_actor(enemy->targetActorID); dispatch_event_actor(target, EVENT_SCARE_AWAY); diff --git a/src/battle/move/item/mystery.c b/src/battle/move/item/mystery.c index 29f7b76dc7..4f1ddbdbda 100644 --- a/src/battle/move/item/mystery.c +++ b/src/battle/move/item/mystery.c @@ -239,9 +239,9 @@ EvtScript N(EVS_UseItem) = { EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_THREAD EVT_WAIT(220) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3F3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_03F3) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_368) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0368) EVT_CALL(N(func_802A13E4_72C994)) EVT_WAIT(2) EVT_IF_NE(LVar0, 133) diff --git a/src/battle/move/item/repel_gel.c b/src/battle/move/item/repel_gel.c index c6c2b63cfb..1c60ab245c 100644 --- a/src/battle/move/item/repel_gel.c +++ b/src/battle/move/item/repel_gel.c @@ -24,14 +24,14 @@ API_CALLABLE(N(func_802A123C_72DDAC)) { EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_REPEL_GEL) EVT_EXEC_WAIT(N(UseItemWithEffect)) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_375) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0375) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_ApplyCream) EVT_WAIT(45) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 3, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_376) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0376) EVT_CALL(GetItemPower, ITEM_REPEL_GEL, LVar0, LVar1) EVT_CALL(N(func_802A123C_72DDAC)) EVT_WAIT(20) diff --git a/src/battle/move/item/shooting_star.c b/src/battle/move/item/shooting_star.c index 2d536d4d3e..b90b387bc6 100644 --- a/src/battle/move/item/shooting_star.c +++ b/src/battle/move/item/shooting_star.c @@ -80,11 +80,11 @@ EvtScript N(EVS_UseItem) = { EVT_THREAD EVT_SET(LVar0, 0) EVT_LOOP(10) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_259) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SRAW_15_A) EVT_CALL(N(func_802A123C_71D9AC)) EVT_ADD(LVar0, 1) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_25A) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SRAW_15_B) EVT_CALL(N(func_802A123C_71D9AC)) EVT_ADD(LVar0, 1) EVT_WAIT(5) @@ -94,10 +94,10 @@ EvtScript N(EVS_UseItem) = { EVT_SET(LVar0, 0) EVT_WAIT(50) EVT_LOOP(10) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_25C) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SRAW_16_A) EVT_ADD(LVar0, 1) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_25D) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SRAW_16_B) EVT_ADD(LVar0, 1) EVT_WAIT(5) EVT_END_LOOP diff --git a/src/battle/move/item/sleepy_sheep.c b/src/battle/move/item/sleepy_sheep.c index 302a574f2f..c6c04ffd9e 100644 --- a/src/battle/move/item/sleepy_sheep.c +++ b/src/battle/move/item/sleepy_sheep.c @@ -295,7 +295,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(SetBattleCamZoom, 169) EVT_CALL(MoveBattleCamOver, 50) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_364) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0364) EVT_LOOP(7) EVT_CALL(StartRumble, 2) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) diff --git a/src/battle/move/item/snowman_doll.c b/src/battle/move/item/snowman_doll.c index 51b8d2f11f..2d282510e4 100644 --- a/src/battle/move/item/snowman_doll.c +++ b/src/battle/move/item/snowman_doll.c @@ -44,7 +44,7 @@ EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_SNOWMAN_DOLL) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(N(FadeBackgroundToBlack)) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_363) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0363) EVT_THREAD EVT_LOOP(45) EVT_CALL(RandInt, 300, LVar0) diff --git a/src/battle/move/item/stone_cap.c b/src/battle/move/item/stone_cap.c index b65b5f6b2f..0cb6ab4515 100644 --- a/src/battle/move/item/stone_cap.c +++ b/src/battle/move/item/stone_cap.c @@ -54,12 +54,12 @@ API_CALLABLE(N(func_802A123C_7217DC)) { EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_STONE_CAP) EVT_EXEC_WAIT(N(UseItemWithEffect)) - EVT_CALL(PlaySound, SOUND_361) + EVT_CALL(PlaySound, SOUND_0361) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_AdjustCap) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Crouch) EVT_CALL(GetItemPower, ITEM_STONE_CAP, LVar0, LVar1) - EVT_CALL(PlaySound, SOUND_362) + EVT_CALL(PlaySound, SOUND_0362) EVT_CALL(N(func_802A123C_7217DC)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_WAIT(20) diff --git a/src/battle/move/item/stop_watch.c b/src/battle/move/item/stop_watch.c index d2e0bb7b6a..045ebbda69 100644 --- a/src/battle/move/item/stop_watch.c +++ b/src/battle/move/item/stop_watch.c @@ -36,7 +36,7 @@ EvtScript N(EVS_UseItem) = { EVT_END_THREAD EVT_CALL(N(FadeBackgroundToBlack)) EVT_PLAY_EFFECT(EFFECT_STOP_WATCH, 0, 0, 0, 0, EVT_FLOAT(1.0), 200, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_246) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0246) EVT_WAIT(200) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 20) diff --git a/src/battle/move/item/strange_cake.c b/src/battle/move/item/strange_cake.c index ab3d0a4edb..f66ee13797 100644 --- a/src/battle/move/item/strange_cake.c +++ b/src/battle/move/item/strange_cake.c @@ -304,9 +304,9 @@ EvtScript N(EVS_UseItem) = { EVT_WAIT(10) EVT_THREAD EVT_WAIT(220) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3F3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_03F3) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_368) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0368) EVT_CALL(N(func_802A13E4_7316E4)) EVT_WAIT(2) EVT_SWITCH(LVar0) diff --git a/src/battle/move/item/thunder_bolt.c b/src/battle/move/item/thunder_bolt.c index d4d605d8eb..f2a2466943 100644 --- a/src/battle/move/item/thunder_bolt.c +++ b/src/battle/move/item/thunder_bolt.c @@ -15,7 +15,7 @@ API_CALLABLE(N(func_802A123C_722D7C)) { s32 scaleX, scaleY; if (actor != NULL) { - sfx_play_sound(SOUND_366); + sfx_play_sound(SOUND_0366); posX = actor->curPos.x; posY = actor->curPos.y + (actor->size.y / 10); @@ -65,7 +65,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(MoveBattleCamOver, 20) EVT_END_THREAD EVT_CALL(battle_item_thunder_bolt_FadeBackgroundToBlack) - EVT_CALL(PlaySound, SOUND_365) + EVT_CALL(PlaySound, SOUND_0365) EVT_WAIT(10) EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/move/item/thunder_rage.c b/src/battle/move/item/thunder_rage.c index 1ab24f9433..29412dc615 100644 --- a/src/battle/move/item/thunder_rage.c +++ b/src/battle/move/item/thunder_rage.c @@ -32,7 +32,7 @@ API_CALLABLE(N(func_802A1354_71B4F4)) { s32 scaleX, scaleY; if (actor != NULL) { - sfx_play_sound(SOUND_366); + sfx_play_sound(SOUND_0366); posX = actor->curPos.x; posY = actor->curPos.y + (actor->size.y / 10); @@ -64,7 +64,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(MoveBattleCamOver, 20) EVT_END_CHILD_THREAD EVT_CALL(N(FadeBackgroundToBlack)) - EVT_CALL(PlaySound, SOUND_365) + EVT_CALL(PlaySound, SOUND_0365) EVT_WAIT(10) EVT_CALL(InitTargetIterator) EVT_LABEL(0) diff --git a/src/battle/move/item/volt_shroom.c b/src/battle/move/item/volt_shroom.c index c5a0852a9c..ccc7b54e40 100644 --- a/src/battle/move/item/volt_shroom.c +++ b/src/battle/move/item/volt_shroom.c @@ -30,7 +30,7 @@ EvtScript N(EVS_UseItem) = { EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_CALL(MultiplyByActorScale, LVar3) EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, LVar3, 30, 0) - EVT_CALL(PlaySound, SOUND_379) + EVT_CALL(PlaySound, SOUND_0379) EVT_CALL(GetItemPower, ITEM_VOLT_SHROOM, LVar0, LVar1) EVT_CALL(N(func_802A123C_71AA2C)) EVT_WAIT(20) diff --git a/src/battle/move/jump/attack.c b/src/battle/move/jump/attack.c index c325443dbc..0d9bfbb0b0 100644 --- a/src/battle/move/jump/attack.c +++ b/src/battle/move/jump/attack.c @@ -75,10 +75,10 @@ EvtScript N(EVS_UseMove0_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -107,7 +107,7 @@ EvtScript N(EVS_UseMove0_ImplA) = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -126,10 +126,10 @@ EvtScript N(EVS_UseMove0_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -162,7 +162,7 @@ EvtScript N(EVS_UseMove0_ImplB) = { EVT_CALL(func_802752AC, 3, 5) EVT_CALL(EnablePlayerBlur, BLUR_RESET) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -181,10 +181,10 @@ EvtScript N(EVS_UseMove0_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -215,7 +215,7 @@ EvtScript N(EVS_UseMove0_ImplC) = { EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, BLUR_RESET) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -264,7 +264,7 @@ EvtScript N(EVS_UseMove1_ImplA) = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(N(GetJumpDamage)) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVarF, 48) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -287,7 +287,7 @@ EvtScript N(EVS_UseMove1_ImplB) = { EVT_CALL(func_802752AC, 3, 1) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_34) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, 48) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -308,7 +308,7 @@ EvtScript N(EVS_UseMove1_ImplC) = { EVT_CALL(func_80275F00, LVarA, 0) EVT_SET(LVarA, 4) EVT_CALL(func_80275F00, LVarA, 1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 48) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -345,10 +345,10 @@ EvtScript N(EVS_UseMove2_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -377,7 +377,7 @@ EvtScript N(EVS_UseMove2_ImplA) = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -396,10 +396,10 @@ EvtScript N(EVS_UseMove2_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -432,7 +432,7 @@ EvtScript N(EVS_UseMove2_ImplB) = { EVT_CALL(func_802752AC, 3, 5) EVT_CALL(EnablePlayerBlur, BLUR_RESET) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -453,10 +453,10 @@ EvtScript N(EVS_UseMove2_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -487,7 +487,7 @@ EvtScript N(EVS_UseMove2_ImplC) = { EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, BLUR_RESET) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -529,10 +529,10 @@ EvtScript N(EVS_802A4018) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -561,7 +561,7 @@ EvtScript N(EVS_802A4018) = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) diff --git a/src/battle/move/jump/auto_jump.c b/src/battle/move/jump/auto_jump.c index 9a651d06a5..0aa84ee20c 100644 --- a/src/battle/move/jump/auto_jump.c +++ b/src/battle/move/jump/auto_jump.c @@ -50,10 +50,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -82,7 +82,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -101,10 +101,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -137,7 +137,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(func_802752AC, 3, 5) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -156,10 +156,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -190,7 +190,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) diff --git a/src/battle/move/jump/auto_multibounce.c b/src/battle/move/jump/auto_multibounce.c index 5e55a3e143..766b22fc33 100644 --- a/src/battle/move/jump/auto_multibounce.c +++ b/src/battle/move/jump/auto_multibounce.c @@ -44,17 +44,17 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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, 112) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -111,32 +111,32 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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, 240) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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, 240) EVT_END_IF EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_CALL(DidActionSucceed, LVar0) @@ -186,17 +186,17 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + 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, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + 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, 112) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + 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_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -258,32 +258,32 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + 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, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + 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, 240) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + 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_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + 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, 240) EVT_END_IF EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_CALL(DidActionSucceed, LVar0) @@ -333,17 +333,17 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + 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, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + 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, 112) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + 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_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -398,32 +398,32 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + 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, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + 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, 240) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + 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_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + 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, 240) EVT_END_IF EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_CALL(DidActionSucceed, LVar0) diff --git a/src/battle/move/jump/d_down_jump.c b/src/battle/move/jump/d_down_jump.c index 2aa0288f74..b967153338 100644 --- a/src/battle/move/jump/d_down_jump.c +++ b/src/battle/move/jump/d_down_jump.c @@ -53,16 +53,16 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVarA) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210A) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_D_DOWN_HIT_1) EVT_WAIT(1) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15A) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_015A) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -92,9 +92,9 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(func_80274A18, 24, 3) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210A) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_D_DOWN_HIT_1) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -111,15 +111,15 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_IF EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_D_DOWN_HIT_2) EVT_WAIT(1) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -153,9 +153,9 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_D_DOWN_HIT_2) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -172,15 +172,15 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_IF EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210C) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_D_DOWN_HIT_3) EVT_WAIT(1) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 3, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 3, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -212,9 +212,9 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210C) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_D_DOWN_HIT_3) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 3, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) diff --git a/src/battle/move/jump/demo_power_bounce.c b/src/battle/move/jump/demo_power_bounce.c index d8c525aec9..8d226f0c3f 100644 --- a/src/battle/move/jump/demo_power_bounce.c +++ b/src/battle/move/jump/demo_power_bounce.c @@ -80,10 +80,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -153,27 +153,27 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_SWITCH(LVar0) @@ -216,10 +216,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -289,27 +289,27 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 224) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 32) EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_SWITCH(LVar0) @@ -352,10 +352,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -421,27 +421,27 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 224) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 32) EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_SWITCH(LVar0) diff --git a/src/battle/move/jump/dizzy_stomp.c b/src/battle/move/jump/dizzy_stomp.c index 1f9e6c7324..460921b9c7 100644 --- a/src/battle/move/jump/dizzy_stomp.c +++ b/src/battle/move/jump/dizzy_stomp.c @@ -37,10 +37,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 1, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -69,7 +69,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 1, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -88,10 +88,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 2, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 2, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -124,7 +124,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(func_802752AC, 3, 5) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 2, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -143,10 +143,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 3, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 3, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -177,7 +177,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 3, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) diff --git a/src/battle/move/jump/earthquake_jump.c b/src/battle/move/jump/earthquake_jump.c index 1867bb2e2d..f0fc716bf8 100644 --- a/src/battle/move/jump/earthquake_jump.c +++ b/src/battle/move/jump/earthquake_jump.c @@ -99,10 +99,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_IF EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) EVT_END_SWITCH EVT_LABEL(2) @@ -203,27 +203,27 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 64) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 224) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 32) EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_LABEL(12) @@ -319,10 +319,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_IF EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) EVT_END_SWITCH EVT_LABEL(2) @@ -429,27 +429,27 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 64) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 224) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 32) EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_LABEL(12) @@ -545,10 +545,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_IF EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) EVT_END_SWITCH EVT_LABEL(2) @@ -651,27 +651,27 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 64) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 224) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 32) EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) 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 7afc185551..30c024106c 100644 --- a/src/battle/move/jump/jump_charge_0.c +++ b/src/battle/move/jump/jump_charge_0.c @@ -52,9 +52,9 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) EVT_END_CHILD_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_FightingStance) @@ -74,7 +74,7 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(N(func_802A1108_74D678), LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/jump/jump_charge_1.c b/src/battle/move/jump/jump_charge_1.c index 6b34702782..d7fb49a3dc 100644 --- a/src/battle/move/jump/jump_charge_1.c +++ b/src/battle/move/jump/jump_charge_1.c @@ -61,9 +61,9 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) EVT_END_CHILD_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_FightingStance) @@ -83,7 +83,7 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(N(func_802A1108_74D678), LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/jump/jump_charge_2.c b/src/battle/move/jump/jump_charge_2.c index a88cd3c3c0..4bd9b4d668 100644 --- a/src/battle/move/jump/jump_charge_2.c +++ b/src/battle/move/jump/jump_charge_2.c @@ -61,9 +61,9 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_CHARGE_UP) EVT_WAIT(10) EVT_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0156) EVT_WAIT(8) EVT_END_CHILD_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_FightingStance) @@ -83,7 +83,7 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(N(func_802A1108_74D678), LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/jump/mega_jump.c b/src/battle/move/jump/mega_jump.c index b6da44599e..1a05714ec9 100644 --- a/src/battle/move/jump/mega_jump.c +++ b/src/battle/move/jump/mega_jump.c @@ -57,10 +57,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -85,10 +85,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 8, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -113,10 +113,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 10, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 7, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) diff --git a/src/battle/move/jump/multibounce.c b/src/battle/move/jump/multibounce.c index 421c0744bf..17003dfaa2 100644 --- a/src/battle/move/jump/multibounce.c +++ b/src/battle/move/jump/multibounce.c @@ -57,17 +57,17 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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, 112) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -124,32 +124,32 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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, 240) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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, 240) EVT_END_IF EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_CALL(DidActionSucceed, LVar0) @@ -208,17 +208,17 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + 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, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + 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, 112) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + 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_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -280,32 +280,32 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + 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, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + 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, 240) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + 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_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + 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, 240) EVT_END_IF EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_CALL(DidActionSucceed, LVar0) @@ -364,17 +364,17 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + 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, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + 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, 112) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + 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_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -429,32 +429,32 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + 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, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + 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, 240) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + 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_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + 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, 240) EVT_END_IF EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) 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 cbbe201431..bb2337ff1e 100644 --- a/src/battle/move/jump/power_bounce.c +++ b/src/battle/move/jump/power_bounce.c @@ -99,10 +99,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -173,27 +173,27 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + 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_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_SWITCH(LVar0) @@ -241,10 +241,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -315,27 +315,27 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 224) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 32) EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_SWITCH(LVar0) @@ -383,10 +383,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -453,27 +453,27 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 224) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 32) EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0235) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0236) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0237) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0238) EVT_END_SWITCH EVT_CALL(func_80269550, LVarE) EVT_SWITCH(LVar0) diff --git a/src/battle/move/jump/power_jump.c b/src/battle/move/jump/power_jump.c index 4533139722..8512841f24 100644 --- a/src/battle/move/jump/power_jump.c +++ b/src/battle/move/jump/power_jump.c @@ -51,10 +51,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -79,10 +79,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -107,10 +107,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 8, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) diff --git a/src/battle/move/jump/shrink_stomp.c b/src/battle/move/jump/shrink_stomp.c index e721e5de61..8970753473 100644 --- a/src/battle/move/jump/shrink_stomp.c +++ b/src/battle/move/jump/shrink_stomp.c @@ -37,10 +37,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 1, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -69,7 +69,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15A) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_015A) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 100), 1, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -88,10 +88,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_015B) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 2, 80) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_015B) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 2, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -124,7 +124,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(func_802752AC, 3, 5) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_WAIT(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_015B) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 100), 2, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -143,10 +143,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15C) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_015C) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 3, 80) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15C) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_015C) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 3, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -177,7 +177,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_WAIT(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15C) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_015C) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 100), 3, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) diff --git a/src/battle/move/jump/sleep_stomp.c b/src/battle/move/jump/sleep_stomp.c index 46f42e17ec..757aaaf195 100644 --- a/src/battle/move/jump/sleep_stomp.c +++ b/src/battle/move/jump/sleep_stomp.c @@ -37,10 +37,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 1, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -69,7 +69,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 1, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -88,10 +88,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 2, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 2, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -124,7 +124,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(func_802752AC, 3, 5) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 2, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -143,10 +143,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 3, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 3, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -177,7 +177,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 3, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) diff --git a/src/battle/move/jump/super_jump.c b/src/battle/move/jump/super_jump.c index 7d5712e1d5..e96a263252 100644 --- a/src/battle/move/jump/super_jump.c +++ b/src/battle/move/jump/super_jump.c @@ -53,10 +53,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -81,10 +81,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 7, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -108,10 +108,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 9, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_015C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) diff --git a/src/battle/move/star_power/chill_out.c b/src/battle/move/star_power/chill_out.c index 36ef18c654..6c601d3b23 100644 --- a/src/battle/move/star_power/chill_out.c +++ b/src/battle/move/star_power/chill_out.c @@ -98,7 +98,7 @@ API_CALLABLE(func_802A16F4_7907C4) { z = target->curPos.z + target->headOffset.z + 5.0f; fx_stat_change(5, x, y, z, 1.0f, 60); - sfx_play_sound(SOUND_2106); + sfx_play_sound(SOUND_INFLICT_CHILL_OUT); D_802A2CC0 = 1; return ApiStatus_DONE2; @@ -116,7 +116,7 @@ EvtScript N(802A18F0) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -140,7 +140,7 @@ EvtScript N(802A18F0) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -171,7 +171,7 @@ EvtScript N(802A1C88) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -195,7 +195,7 @@ EvtScript N(802A1C88) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -219,7 +219,7 @@ EvtScript N(802A2020) = { EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_2041) + 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) @@ -350,7 +350,7 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleMuskular_Shout) EVT_WAIT(16) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) - EVT_CALL(PlaySound, SOUND_244) + EVT_CALL(PlaySound, SOUND_0244) EVT_CALL(InitTargetIterator) EVT_LABEL(10) EVT_CALL(ItemCheckHit, LVar0, 0, 0, 0, 0) diff --git a/src/battle/move/star_power/focus.c b/src/battle/move/star_power/focus.c index 5a7a6a3b25..7d5b026f4a 100644 --- a/src/battle/move/star_power/focus.c +++ b/src/battle/move/star_power/focus.c @@ -61,7 +61,7 @@ EvtScript N(802A1630) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -85,7 +85,7 @@ EvtScript N(802A1630) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -116,7 +116,7 @@ EvtScript N(802A19C8) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -140,7 +140,7 @@ EvtScript N(802A19C8) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -164,7 +164,7 @@ EvtScript N(802A1D60) = { EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_2041) + 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) diff --git a/src/battle/move/star_power/lullaby.c b/src/battle/move/star_power/lullaby.c index 6fc94b95b3..2fcc607239 100644 --- a/src/battle/move/star_power/lullaby.c +++ b/src/battle/move/star_power/lullaby.c @@ -47,7 +47,7 @@ EvtScript N(802A1620) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -71,7 +71,7 @@ EvtScript N(802A1620) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -102,7 +102,7 @@ EvtScript N(802A19B8) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -126,7 +126,7 @@ EvtScript N(802A19B8) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -150,7 +150,7 @@ EvtScript N(802A1D50) = { EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_2041) + 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) @@ -281,7 +281,7 @@ EvtScript N(EVS_UsePower) = { EVT_WAIT(16) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_WAIT(15) - EVT_CALL(PlaySound, SOUND_3F4) + EVT_CALL(PlaySound, SOUND_03F4) EVT_CALL(func_802A1518_78D668) EVT_WAIT(30) EVT_CALL(InitTargetIterator) diff --git a/src/battle/move/star_power/peach_focus.c b/src/battle/move/star_power/peach_focus.c index 59b6e43b9c..dbaedd6e89 100644 --- a/src/battle/move/star_power/peach_focus.c +++ b/src/battle/move/star_power/peach_focus.c @@ -26,7 +26,7 @@ EvtScript N(802A1530) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -50,7 +50,7 @@ EvtScript N(802A1530) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -81,7 +81,7 @@ EvtScript N(802A18C8) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -105,7 +105,7 @@ EvtScript N(802A18C8) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -129,7 +129,7 @@ EvtScript N(802A1C60) = { EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_2041) + 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) @@ -279,7 +279,7 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(MoveBattleCamOver, 60) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach3_Pray) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) diff --git a/src/battle/move/star_power/refresh.c b/src/battle/move/star_power/refresh.c index 401e493229..d888fcefdc 100644 --- a/src/battle/move/star_power/refresh.c +++ b/src/battle/move/star_power/refresh.c @@ -134,7 +134,7 @@ EvtScript N(802A1A70) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -158,7 +158,7 @@ EvtScript N(802A1A70) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -189,7 +189,7 @@ EvtScript N(802A1E08) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -213,7 +213,7 @@ EvtScript N(802A1E08) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -237,7 +237,7 @@ EvtScript N(802A21A0) = { EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_2041) + 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) @@ -370,7 +370,7 @@ EvtScript N(EVS_UsePower) = { EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_END_THREAD - EVT_CALL(PlaySound, SOUND_242) + EVT_CALL(PlaySound, SOUND_0242) EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_CALL(func_802A1518_78BB18, 100) EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) diff --git a/src/battle/move/star_power/smooch.c b/src/battle/move/star_power/smooch.c index e096b9f325..484f31f7b8 100644 --- a/src/battle/move/star_power/smooch.c +++ b/src/battle/move/star_power/smooch.c @@ -33,7 +33,7 @@ EvtScript N(802A1630) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -57,7 +57,7 @@ EvtScript N(802A1630) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -88,7 +88,7 @@ EvtScript N(802A19C8) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -112,7 +112,7 @@ EvtScript N(802A19C8) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -136,7 +136,7 @@ EvtScript N(802A1D60) = { EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_2041) + 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) @@ -299,7 +299,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_245) + EVT_CALL(PlaySound, SOUND_0245) EVT_THREAD EVT_PLAY_EFFECT(EFFECT_RECOVER, 2, LVar0, LVar1, LVar2, 1, 0) EVT_WAIT(2) @@ -392,7 +392,7 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(N(UnkBackgroundFunc)) EVT_END_THREAD EVT_CALL(PlayerYieldTurn) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/star_power/star_storm.c b/src/battle/move/star_power/star_storm.c index be2223a072..aabaf4ba84 100644 --- a/src/battle/move/star_power/star_storm.c +++ b/src/battle/move/star_power/star_storm.c @@ -47,7 +47,7 @@ EvtScript N(802A16F0) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -71,7 +71,7 @@ EvtScript N(802A16F0) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -102,7 +102,7 @@ EvtScript N(802A1A88) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -126,7 +126,7 @@ EvtScript N(802A1A88) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -150,7 +150,7 @@ EvtScript N(802A1E20) = { EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_2041) + 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) @@ -283,11 +283,11 @@ EvtScript N(EVS_UsePower) = { EVT_THREAD EVT_SET(LVar0, 0) EVT_LOOP(10) - EVT_CALL(PlaySound, SOUND_259) + EVT_CALL(PlaySound, SOUND_SRAW_15_A) EVT_CALL(func_802A1518_78ECE8) EVT_WAIT(5) EVT_ADD(LVar0, 1) - EVT_CALL(PlaySound, SOUND_25A) + EVT_CALL(PlaySound, SOUND_SRAW_15_B) EVT_CALL(func_802A1518_78ECE8) EVT_WAIT(5) EVT_ADD(LVar0, 1) @@ -297,10 +297,10 @@ EvtScript N(EVS_UsePower) = { EVT_SET(LVar0, 0) EVT_WAIT(50) EVT_LOOP(10) - EVT_CALL(PlaySound, SOUND_25C) + EVT_CALL(PlaySound, SOUND_SRAW_16_A) EVT_ADD(LVar0, 1) EVT_WAIT(5) - EVT_CALL(PlaySound, SOUND_25D) + EVT_CALL(PlaySound, SOUND_SRAW_16_B) EVT_ADD(LVar0, 1) EVT_WAIT(5) EVT_END_LOOP diff --git a/src/battle/move/star_power/time_out.c b/src/battle/move/star_power/time_out.c index ea691d1b4c..c71777cb6a 100644 --- a/src/battle/move/star_power/time_out.c +++ b/src/battle/move/star_power/time_out.c @@ -19,7 +19,7 @@ EvtScript N(802A1520) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -43,7 +43,7 @@ EvtScript N(802A1520) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -74,7 +74,7 @@ EvtScript N(802A18B8) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -98,7 +98,7 @@ EvtScript N(802A18B8) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -122,7 +122,7 @@ EvtScript N(802A1C50) = { EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_2041) + 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) @@ -252,9 +252,9 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleKlevar_Shout) EVT_WAIT(16) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) - EVT_CALL(PlaySound, SOUND_246) + EVT_CALL(PlaySound, SOUND_0246) EVT_PLAY_EFFECT(EFFECT_STOP_WATCH, 0, 0, 0, 0, EVT_FLOAT(1.0), 200, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_246) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0246) EVT_WAIT(200) EVT_CALL(InitTargetIterator) EVT_LABEL(0) diff --git a/src/battle/move/star_power/twink_dash.c b/src/battle/move/star_power/twink_dash.c index b921fdea80..e63e6fcf46 100644 --- a/src/battle/move/star_power/twink_dash.c +++ b/src/battle/move/star_power/twink_dash.c @@ -38,7 +38,7 @@ EvtScript N(802A15B0) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -62,7 +62,7 @@ EvtScript N(802A15B0) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -93,7 +93,7 @@ EvtScript N(802A1948) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -117,7 +117,7 @@ EvtScript N(802A1948) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -141,7 +141,7 @@ EvtScript N(802A1CE0) = { EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_2041) + 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) diff --git a/src/battle/move/star_power/up_and_away.c b/src/battle/move/star_power/up_and_away.c index 595e85f82e..a99312c553 100644 --- a/src/battle/move/star_power/up_and_away.c +++ b/src/battle/move/star_power/up_and_away.c @@ -82,7 +82,7 @@ EvtScript N(802A16D0) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -106,7 +106,7 @@ EvtScript N(802A16D0) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -137,7 +137,7 @@ EvtScript N(802A1A68) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -161,7 +161,7 @@ EvtScript N(802A1A68) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, SOUND_241) + EVT_CALL(PlaySound, SOUND_0241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -185,7 +185,7 @@ EvtScript N(802A1E00) = { EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, SOUND_2041) + 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) @@ -317,7 +317,7 @@ EvtScript N(EVS_UsePower) = { EVT_WAIT(20) EVT_CALL(SetMotionBlurParams, 0, 0, 0, 320, 240, 128, 10) EVT_CALL(func_802A1518_7957F8) - EVT_CALL(PlaySound, SOUND_247) + EVT_CALL(PlaySound, SOUND_0247) EVT_PLAY_EFFECT(EFFECT_ENERGY_SHOCKWAVE, 0, 0, 20, 0, EVT_FLOAT(1.0), 90) EVT_WAIT(30) EVT_THREAD diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index 48fbbadca2..31a70ed1eb 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -50,7 +50,7 @@ API_CALLABLE(N(PlayExplosionFX)) { } else { fx_explosion(0, x, y + 20, z); } - sfx_play_sound(SOUND_CANNON1); + sfx_play_sound(SOUND_BOMBETTE_BLAST_LV1); break; case MOVE_POWER_BOMB: if (script->varTable[10] > 0) { @@ -58,7 +58,7 @@ API_CALLABLE(N(PlayExplosionFX)) { } else { fx_explosion(0, x, y + 20, z); } - sfx_play_sound(SOUND_CANNON2); + sfx_play_sound(SOUND_BOMBETTE_BLAST_LV2); break; case MOVE_MEGA_BOMB: if (script->varTable[10] > 0) { @@ -66,11 +66,11 @@ API_CALLABLE(N(PlayExplosionFX)) { } else { fx_explosion(1, x, y + 20, z); } - sfx_play_sound(SOUND_CANNON2); + sfx_play_sound(SOUND_BOMBETTE_BLAST_LV2); break; default: fx_explosion(0, x, y + 20, z); - sfx_play_sound(SOUND_CANNON1); + sfx_play_sound(SOUND_BOMBETTE_BLAST_LV1); break; } @@ -350,7 +350,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(CloseActionCommandInfo) - EVT_CALL(StopSound, SOUND_287) + EVT_CALL(StopSound, SOUND_LRAW_0287) EVT_CALL(GetLastEvent, ACTOR_PARTNER, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -1068,7 +1068,7 @@ EvtScript N(bomb) = { EVT_CASE_EQ(MOVE_MEGA_BOMB) EVT_CALL(action_command_bomb_start, 0, 87 * DT, 3, 2) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_287) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_LRAW_0287) EVT_CHILD_THREAD EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_RunLit) @@ -1099,7 +1099,7 @@ EvtScript N(bomb) = { EVT_CASE_EQ(MOVE_BOMB) EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) EVT_END_SWITCH - EVT_CALL(StopSound, SOUND_287) + EVT_CALL(StopSound, SOUND_LRAW_0287) EVT_SWITCH(LVar2) EVT_CASE_EQ(MOVE_BOMB) EVT_SET(LVar0, 6 * DT + 1) @@ -1233,7 +1233,7 @@ EvtScript N(bomb) = { EVT_SWITCH(LVar2) EVT_CASE_EQ(MOVE_BOMB) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_CANNON1) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOMBETTE_BLAST_LV1) EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) EVT_IF_EQ(LVar0, 6) EVT_BREAK_SWITCH @@ -1248,7 +1248,7 @@ EvtScript N(bomb) = { EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVarF, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) EVT_END_SWITCH EVT_CASE_EQ(MOVE_POWER_BOMB) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_CANNON1) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOMBETTE_BLAST_LV1) EVT_LABEL(5) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) @@ -1270,7 +1270,7 @@ EvtScript N(bomb) = { EVT_GOTO(5) EVT_END_IF EVT_CASE_EQ(MOVE_MEGA_BOMB) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_CANNON3) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOMBETTE_BLAST_LV3) EVT_LABEL(10) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) @@ -1346,7 +1346,7 @@ EvtScript N(firstStrikeBodySlam) = { EVT_CALL(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_287) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_LRAW_0287) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_11) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 1) @@ -1354,7 +1354,7 @@ EvtScript N(firstStrikeBodySlam) = { EVT_WAIT(5) EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) EVT_WAIT(10) - EVT_CALL(StopSound, SOUND_287) + EVT_CALL(StopSound, SOUND_LRAW_0287) EVT_LOOP(7) EVT_CALL(SetActorDispOffset, ACTOR_PARTNER, EVT_FLOAT(0.5), 0, 0) EVT_WAIT(1) @@ -1380,7 +1380,7 @@ EvtScript N(firstStrikeBodySlam) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.45)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 8, EVT_FLOAT(0.15)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_CANNON1) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOMBETTE_BLAST_LV1) EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_GOTO(10) diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index b8994467fb..233776ed42 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -284,7 +284,7 @@ API_CALLABLE(N(OnMissHeadbonk)) { play_movement_dust_effects(2, partner->curPos.x, partner->curPos.y, partner->curPos.z, partner->yaw); - sfx_play_sound(SOUND_SOFT_LAND); + sfx_play_sound(SOUND_LAND_SOFTLY); return ApiStatus_DONE1; } @@ -950,7 +950,7 @@ EvtScript N(headbonk1) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_162) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0162) EVT_WAIT(20) EVT_EXEC_WAIT(N(returnHome)) EVT_RETURN @@ -1009,7 +1009,7 @@ EvtScript N(headbonk1) = { EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_281) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0281) EVT_CALL(N(JumpOnTarget), LVarA, 3) EVT_CHILD_THREAD EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) @@ -1055,7 +1055,7 @@ EvtScript N(headbonk2) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_162) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0162) EVT_WAIT(20) EVT_EXEC_WAIT(N(returnHome)) EVT_RETURN @@ -1115,7 +1115,7 @@ EvtScript N(headbonk2) = { EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_281) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0281) EVT_CALL(N(JumpOnTarget), LVarA, 3) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_RESTART) EVT_CHILD_THREAD @@ -1162,7 +1162,7 @@ EvtScript N(headbonk3) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_162) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0162) EVT_WAIT(20) EVT_EXEC_WAIT(N(returnHome)) EVT_RETURN @@ -1231,7 +1231,7 @@ EvtScript N(headbonk3) = { EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_281) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0281) EVT_CALL(N(JumpOnTarget), LVarA, 3) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_RESTART) EVT_CHILD_THREAD @@ -1282,7 +1282,7 @@ EvtScript N(multibonk) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_162) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0162) EVT_WAIT(20) EVT_EXEC_WAIT(N(returnHome)) EVT_RETURN @@ -1372,7 +1372,7 @@ EvtScript N(multibonk) = { EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_281) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0281) EVT_CALL(N(JumpOnTarget), LVarA, 3) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_RESTART) EVT_SUB(LVarD, 1) @@ -1453,7 +1453,7 @@ EvtScript N(tattle) = { EVT_CALL(func_802CAE50, CAM_TATTLE, LVar0, LVar1, LVar2) EVT_CALL(func_802CABE8, CAM_TATTLE, 0, LVar3, 100, 4) EVT_WAIT(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_282) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0282) EVT_CALL(SetCamFlag80, CAM_TATTLE, TRUE) EVT_WAIT(10) EVT_CALL(N(GetTattleMessage)) diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c index 1c61bca3cf..b610fe79b8 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -936,7 +936,7 @@ EvtScript N(dizzyShell) = { EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_END_SWITCH EVT_END_LOOP - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_290) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0290) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 15) EVT_SET(LVarB, 300) @@ -1070,7 +1070,7 @@ EvtScript N(fireShell) = { EVT_SET(LVarA, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_200C) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_28E) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_028E) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_ZERO, 0, ACTOR_DECORATION_RED_FLAMES) EVT_WAIT(1) EVT_CALL(ModifyActorDecoration, ACTOR_PARTNER, -1, 0, 10, 10, 255, 0) @@ -1154,7 +1154,7 @@ EvtScript N(fireShell) = { EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar3, LVar4, LVar5, 32, 4, 0, 10, 0) EVT_END_SWITCH EVT_END_LOOP - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_28F) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_028F) EVT_CALL(N(GetFireShellSpeedAndDamage)) EVT_SWITCH(LVarE) EVT_CASE_OR_EQ(0) diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c index 41aba0d1ae..3092cbd8fa 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -467,7 +467,7 @@ API_CALLABLE(N(SpinyFlipActionCommand)) { } else { sAimingTimer = (s32)(80 * DT); hud_element_set_script(hudStick, &HES_StickTapRight); - sfx_play_sound_at_position(SOUND_312, SOUND_SPACE_MODE_0, 0.0f, 0.0f, 0.0f); + sfx_play_sound_at_position(SOUND_0312, SOUND_SPACE_MODE_0, 0.0f, 0.0f, 0.0f); script->functionTemp[0] = 2; } break; @@ -559,7 +559,7 @@ API_CALLABLE(N(SpinyFlipActionCommand)) { hud_element_free(id); } btl_set_popup_duration(0); - sfx_stop_sound(SOUND_312); + sfx_stop_sound(SOUND_0312); return ApiStatus_DONE2; } @@ -1723,7 +1723,7 @@ EvtScript N(hurricane) = { EVT_CALL(SetBattleCamZoom, 430) EVT_CALL(MoveBattleCamOver, 150 * DT) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_288) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0288) EVT_THREAD EVT_CALL(N(ProcessHurricane)) EVT_END_THREAD diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index ae4692eaaa..563965ac42 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -219,7 +219,7 @@ API_CALLABLE(N(ShellShotActionCommand)) { } } - sfx_play_sound(SOUND_311); + sfx_play_sound(SOUND_0311); shellShotTimer = 60; script->functionTemp[0] = 2; break; @@ -1020,7 +1020,7 @@ EvtScript N(shellShot) = { EVT_CALL(InitTargetIterator) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_ShellFly) EVT_CALL(N(ShellShotActionCommand)) - EVT_CALL(StopSound, SOUND_311) + EVT_CALL(StopSound, SOUND_0311) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2006) EVT_CALL(GetActionResult, LVar0) EVT_CALL(PartnerTestEnemy, LVarA, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) @@ -1068,7 +1068,7 @@ EvtScript N(shellShot) = { EVT_SWITCH(LVar0) EVT_CASE_GT(0) EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_EXPLODE_CONTACT | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_SHOCK_CONTACT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_FLAG_80, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_110) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0110) EVT_CASE_DEFAULT EVT_SET(LVar0, HIT_RESULT_NO_DAMAGE) EVT_END_SWITCH @@ -1267,7 +1267,7 @@ EvtScript N(airRaid) = { EVT_SWITCH(LVar0) EVT_CASE_GT(99) EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_FLAG_80, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_110) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0110) EVT_CASE_DEFAULT EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_FLAG_80, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_SWITCH diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c index bbf0876c33..8790950c66 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_29B, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_029B, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); } else { - sfx_play_sound_at_position(SOUND_29C, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_029C, 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_29B, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_029B, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); } else { - sfx_play_sound_at_position(SOUND_29C, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_029C, 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_29B, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_029B, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); } else { - sfx_play_sound_at_position(SOUND_29C, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_029C, SOUND_SPACE_MODE_0, state->curPos.x, state->curPos.y, state->curPos.z); } script->functionTemp[2] = 1 - script->functionTemp[2]; } @@ -332,7 +332,7 @@ API_CALLABLE(N(ProcessTidalWave)) { 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_29D, SOUND_SPACE_MODE_0, 0.0f, 0.0f, 0.0f); + sfx_play_sound_at_position(SOUND_029D, SOUND_SPACE_MODE_0, 0.0f, 0.0f, 0.0f); fx_underwater(0, -50.0f, 20.0f, 0.0f, 1.0f, 120); } @@ -982,7 +982,7 @@ EvtScript N(squirt) = { EVT_SETF(LVarE, LVar0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_297) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0297) 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) @@ -1014,10 +1014,10 @@ EvtScript N(squirt) = { EVT_SWITCH(LVar0) EVT_CASE_GT(0) EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_WATER | DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_EXPLODE_CONTACT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_FLAG_200, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_110) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0110) EVT_CASE_DEFAULT EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_WATER | DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_EXPLODE_CONTACT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_FLAG_200, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_110) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0110) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -1073,7 +1073,7 @@ EvtScript N(waterBlock) = { EVT_CALL(SetBattleCamZoom, 277) EVT_CALL(MoveBattleCamOver, 10) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_298) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0298) EVT_CALL(N(PlaySquirtFX)) EVT_WAIT(65) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Celebrate) diff --git a/src/battle/partner/twink.c b/src/battle/partner/twink.c index 827b892351..478cc66677 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_2AA) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_207F, SOUND_02AA) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(InitTargetIterator) @@ -242,7 +242,7 @@ EvtScript N(executeAction) = { EVT_CALL(FlyToGoal, ACTOR_PARTNER, 5, 0, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_JUMP_3E2) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_ACTOR_JUMP) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -40, 15, 0) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, -20, EASING_QUARTIC_OUT) @@ -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_2AA) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_207F, SOUND_02AA) 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 979ee8afe9..e61fcc9740 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -742,7 +742,7 @@ EvtScript N(dashToTarget) = { EvtScript N(charge) = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) EVT_CALL(N(WattFXDisable)) - EVT_CALL(PlayLoopingSoundAtActor, ACTOR_PARTNER, 0, SOUND_289) + EVT_CALL(PlayLoopingSoundAtActor, ACTOR_PARTNER, 0, SOUND_0289) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 12) EVT_CALL(N(ElectroDashFX), LVar0, LVar1, LVar2) @@ -1007,7 +1007,7 @@ EvtScript N(powerShock) = { EVT_END_THREAD EVT_WAIT(75 * DT) EVT_CALL(SetActorPaletteEffect, ACTOR_SELF, PRT_MAIN, PAL_ADJUST_WATT_IDLE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_28A) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_028A) EVT_THREAD EVT_SETF(LVar0, EVT_FLOAT(1.0)) EVT_LOOP(3) @@ -1128,7 +1128,7 @@ EvtScript N(8023AE8C) = { EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_ENABLE) EVT_END_THREAD EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_28B) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_028B) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 42) EVT_CALL(N(TurboChargeFX), LVar0, LVar1, LVar2) @@ -1136,7 +1136,7 @@ EvtScript N(8023AE8C) = { EVT_CALL(AddBattleCamZoom, 100) EVT_CALL(MoveBattleCamOver, 5) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -1211,7 +1211,7 @@ EvtScript N(8023B450) = { EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_ENABLE) EVT_END_THREAD EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_28B) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_028B) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 42) EVT_CALL(N(TurboChargeFX), LVar0, LVar1, LVar2) @@ -1313,7 +1313,7 @@ EvtScript N(megaShock) = { EVT_THREAD EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 12) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_28C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_028C) EVT_PLAY_EFFECT(EFFECT_FLASHING_BOX_SHOCKWAVE, 2, LVar0, LVar1, LVar2, 0, 0, 0) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2024) diff --git a/src/common/ActorJumpToPos.inc.c b/src/common/ActorJumpToPos.inc.c index c9e985b24d..6dcd8bf11a 100644 --- a/src/common/ActorJumpToPos.inc.c +++ b/src/common/ActorJumpToPos.inc.c @@ -31,7 +31,7 @@ API_CALLABLE(N(ActorJumpToPos)) { if (actor->curPos.y < 0.0f) { actor->curPos.y = 0.0f; play_movement_dust_effects(2, actor->curPos.x, actor->curPos.y, actor->curPos.z, actor->yaw); - sfx_play_sound(SOUND_SOFT_LAND); + sfx_play_sound(SOUND_LAND_SOFTLY); return ApiStatus_DONE1; } diff --git a/src/common/UnkSfxFunc.inc.c b/src/common/UnkSfxFunc.inc.c index 290b252452..b87606a0aa 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_359, SOUND_SPACE_MODE_0, actor->curPos.x, actor->curPos.y, actor->curPos.z); + sfx_play_sound_at_position(SOUND_0359, 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_359 | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0, actor->curPos.x, actor->curPos.y, actor->curPos.z); + 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); return ApiStatus_DONE2; } diff --git a/src/effects/disable_x.c b/src/effects/disable_x.c index fd1d751a03..5588a73111 100644 --- a/src/effects/disable_x.c +++ b/src/effects/disable_x.c @@ -151,7 +151,7 @@ void disable_x_update(EffectInstance* effect) { data[1].unk_28 = 0; data->unk_38++; if (data->pos.y > -500.0f) { - sfx_play_sound_at_position(SOUND_2107, SOUND_SPACE_MODE_0, data->pos.x, data->pos.y, data->pos.z); + sfx_play_sound_at_position(SOUND_INFLICT_KO, SOUND_SPACE_MODE_0, data->pos.x, data->pos.y, data->pos.z); } } else if (unk_3C < unk_38) { load_effect(EFFECT_DISABLE_X); diff --git a/src/effects/star.c b/src/effects/star.c index b3ea9feb8f..42313c6289 100644 --- a/src/effects/star.c +++ b/src/effects/star.c @@ -152,7 +152,7 @@ void star_update(EffectInstance* effect) { landing_dust_main(0, data->unk_04, data->unk_08 - 5.0f, data->unk_0C, 0.0f); if (!gGameStatusPtr->isBattle) { - sfx_play_sound_at_position(SOUND_B0000016, 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->unk_04, data->unk_08, data->unk_0C); } data->unk_00 = 0; diff --git a/src/encounter.c b/src/encounter.c index a773d4ce1b..0265c9cfb2 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -278,7 +278,7 @@ ApiStatus FadeInMerlee(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(NPC_BTL_MERLEE); if (isInitialCall) { - sfx_play_sound(SOUND_24B); + sfx_play_sound(SOUND_024B); npc->alpha = 0; } @@ -421,7 +421,7 @@ ApiStatus OnDefeatEnemy(Evt* script, s32 isInitialCall) { } if (script->functionTemp[1] == 15) { - sfx_play_sound(SOUND_DEATH); + sfx_play_sound(SOUND_ACTOR_DEATH); fx_damage_stars(1, npc->pos.x, npc->pos.y + (npc->collisionHeight / 2), npc->pos.z, 0, -1.0f, 0, 10); } @@ -1100,7 +1100,7 @@ START_BATTLE: currentEncounter->fadeOutAmount = 0; currentEncounter->unk_94 = 0; currentEncounter->scriptedBattle = FALSE; - sfx_play_sound(0); + sfx_play_sound(SOUND_NONE); gEncounterState = ENCOUNTER_STATE_PRE_BATTLE; D_8009A678 = 1; gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_INIT; @@ -1155,7 +1155,7 @@ START_BATTLE: currentEncounter->unk_94 = 0; currentEncounter->scriptedBattle = FALSE; playerStatus->flags |= PS_FLAG_ENTERING_BATTLE; - sfx_play_sound(0); + sfx_play_sound(SOUND_NONE); gEncounterState = ENCOUNTER_STATE_PRE_BATTLE; D_8009A678 = 1; gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_INIT; @@ -1237,7 +1237,7 @@ START_BATTLE: currentEncounter->unk_94 = 0; currentEncounter->scriptedBattle = FALSE; playerStatus->flags |= PS_FLAG_ENTERING_BATTLE; - sfx_play_sound(0); + sfx_play_sound(SOUND_NONE); gEncounterState = ENCOUNTER_STATE_PRE_BATTLE; D_8009A678 = 1; gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_INIT; @@ -1389,10 +1389,10 @@ void update_encounters_pre_battle(void) { currentEncounter->dizzyAttackDuration = 3; } - sfx_stop_sound(SOUND_2111); - sfx_stop_sound(SOUND_2112); - sfx_stop_sound(SOUND_2113); - sfx_stop_sound(SOUND_2114); + sfx_stop_sound(SOUND_SPIN); + sfx_stop_sound(SOUND_SPEEDY_SPIN); + sfx_stop_sound(SOUND_SPIN_ATTACK); + sfx_stop_sound(SOUND_SPEEDY_SPIN_ATTACK); set_battle_formation(NULL); set_battle_stage(encounter->stage); load_battle(encounter->battle); diff --git a/src/entity/Block.c b/src/entity/Block.c index f1b58ac18b..d13a91dacf 100644 --- a/src/entity/Block.c +++ b/src/entity/Block.c @@ -388,7 +388,7 @@ s32 entity_block_handle_collision(Entity* entity) { return TRUE; } set_entity_commandlist(entity, Entity_BreakingBlock_Script); - sfx_play_sound_at_position(SOUND_14F, SOUND_SPACE_MODE_0, entity->pos.x, entity->pos.y, entity->pos.z); + sfx_play_sound_at_position(SOUND_SMASH_HAMER_BLOCK_1, SOUND_SPACE_MODE_0, entity->pos.x, entity->pos.y, entity->pos.z); break; case ENTITY_TYPE_HAMMER2_BLOCK: case ENTITY_TYPE_HAMMER2_BLOCK_TINY: @@ -403,7 +403,7 @@ s32 entity_block_handle_collision(Entity* entity) { return TRUE; } set_entity_commandlist(entity, Entity_BreakingBlock_Script); - sfx_play_sound_at_position(SOUND_150, SOUND_SPACE_MODE_0, entity->pos.x, entity->pos.y, entity->pos.z); + sfx_play_sound_at_position(SOUND_SMASH_HAMER_BLOCK_2, SOUND_SPACE_MODE_0, entity->pos.x, entity->pos.y, entity->pos.z); break; case ENTITY_TYPE_HAMMER3_BLOCK: case ENTITY_TYPE_HAMMER3_BLOCK_TINY: @@ -411,7 +411,7 @@ s32 entity_block_handle_collision(Entity* entity) { return TRUE; } set_entity_commandlist(entity, Entity_BreakingBlock_Script); - sfx_play_sound_at_position(SOUND_151, SOUND_SPACE_MODE_0, entity->pos.x, entity->pos.y, entity->pos.z); + sfx_play_sound_at_position(SOUND_SMASH_HAMER_BLOCK_3, SOUND_SPACE_MODE_0, entity->pos.x, entity->pos.y, entity->pos.z); break; case ENTITY_TYPE_MULTI_TRIGGER_BLOCK: case ENTITY_TYPE_HEALING_BLOCK: diff --git a/src/entity/Chest.c b/src/entity/Chest.c index a9efbfdf44..66a3f005b3 100644 --- a/src/entity/Chest.c +++ b/src/entity/Chest.c @@ -151,7 +151,7 @@ void entity_Chest_begin_opening(Entity* entity) { data->lidAngle = 0.0f; data->openState = 0; data->giveItemTimer = 40; - sfx_play_sound(SOUND_1D3); + sfx_play_sound(SOUND_01D3); } void entity_Chest_open(Entity* entity) { diff --git a/src/entity/HeartBlock.c b/src/entity/HeartBlock.c index 0ef979791d..c777273cbc 100644 --- a/src/entity/HeartBlock.c +++ b/src/entity/HeartBlock.c @@ -213,7 +213,7 @@ void entity_HeartBlockContent__anim_heal(Entity* entity, s32 arg1) { data->sparkleTrailTimer = 0; recover_hp(-1); recover_fp(-1); - sfx_play_sound(SOUND_131); + sfx_play_sound(SOUND_0131); } data->yawBuffer[data->yawBufferPos] = entity->rot.y; data->yawBufferPos++; diff --git a/src/entity/ShatteringBlock.c b/src/entity/ShatteringBlock.c index 8cb5c902f4..eeefc20c6f 100644 --- a/src/entity/ShatteringBlock.c +++ b/src/entity/ShatteringBlock.c @@ -144,7 +144,7 @@ void entity_shattering_block_init(Entity* entity) { fragmentMatrices = Entity_ShatteringHammer3Block_FragmentsMatrices; break; case ENTITY_TYPE_BRICK_BLOCK: - sfx_play_sound_at_position(SOUND_158, SOUND_SPACE_MODE_0, entity->pos.x, entity->pos.y, entity->pos.z); + sfx_play_sound_at_position(SOUND_0158, SOUND_SPACE_MODE_0, entity->pos.x, entity->pos.y, entity->pos.z); fragmentDisplayLists = Entity_ShatteringBrickBlock_FragmentsRender; fragmentMatrices = Entity_ShatteringBrickBlock_FragmentsMatrices; break; diff --git a/src/entity/Switch.c b/src/entity/Switch.c index 3404ce40a4..03a9fbb282 100644 --- a/src/entity/Switch.c +++ b/src/entity/Switch.c @@ -479,7 +479,7 @@ void entity_HugeBlueSwitch_init(Entity* entity) { EntityScript Entity_RedSwitch_Script = { es_SetCallback(entity_small_switch_idle, 0) - es_PlaySound(SOUND_152) + es_PlaySound(SOUND_ACTIVATE_SWITCH) es_Call(entity_base_switch_start_bound_script) es_Call(entity_base_switch_anim_init) es_SetCallback(entity_RedSwitch_animate_scale, 0) @@ -490,7 +490,7 @@ EntityScript Entity_RedSwitch_Script = { EntityScript Entity_HugeBlueSwitch_Script = { es_SetCallback(entity_HugeBlueSwitch_idle, 0) - es_PlaySound(SOUND_152) + es_PlaySound(SOUND_ACTIVATE_SWITCH) es_Call(entity_base_switch_start_bound_script) es_Call(entity_base_switch_anim_init) es_SetCallback(entity_base_switch_animate_scale, 0) @@ -500,7 +500,7 @@ EntityScript Entity_HugeBlueSwitch_Script = { EntityScript Entity_BlueSwitch_Script = { es_SetCallback(entity_small_switch_idle, 0) - es_PlaySound(SOUND_152) + es_PlaySound(SOUND_ACTIVATE_SWITCH) es_Call(entity_base_switch_start_bound_script) es_Call(entity_base_switch_anim_init) es_SetCallback(entity_base_switch_animate_scale, 0) @@ -511,7 +511,7 @@ EntityScript Entity_BlueSwitch_Script = { EntityScript Entity_GreenStompSwitch_Script = { es_SetCallback(entity_GreenStompSwitch_idle, 0) es_SetCallback(entity_GreenStompSwitch_retract, 0) - es_PlaySound(SOUND_152) + es_PlaySound(SOUND_ACTIVATE_SWITCH) es_SetCallback(NULL, 128) es_SetCallback(entity_GreenStompSwitch_extend, 0) es_Restart diff --git a/src/entity/default/Padlock.c b/src/entity/default/Padlock.c index 57c25d6549..acab837e5e 100644 --- a/src/entity/default/Padlock.c +++ b/src/entity/default/Padlock.c @@ -88,7 +88,7 @@ void entity_Padlock_idle(Entity* entity) { entity_Padlock_push_player(entity); if (entity->flags & ENTITY_FLAG_100000) { data->state++; - sfx_play_sound(SOUND_269); + sfx_play_sound(SOUND_0269); } break; case 1: @@ -130,7 +130,7 @@ void entity_Padlock_idle(Entity* entity) { data->fallSpeed = 10.0f; data->rotSpeed = 0.2f; data->state++; - sfx_play_sound(SOUND_26A); + sfx_play_sound(SOUND_026A); } break; case 4: @@ -148,7 +148,7 @@ void entity_Padlock_idle(Entity* entity) { entity->rot.x = 90.0f; data->rotSpeed = -20.0f; data->state++; - sfx_play_sound(SOUND_26A); + sfx_play_sound(SOUND_026A); } break; case 6: @@ -161,7 +161,7 @@ void entity_Padlock_idle(Entity* entity) { entity->rot.x = 90.0f; data->timer = 5; data->state++; - sfx_play_sound(SOUND_26A); + sfx_play_sound(SOUND_026A); } break; case 7: diff --git a/src/entity/jan_iwa/Plants1.c b/src/entity/jan_iwa/Plants1.c index d1914095a4..aa8268dc4f 100644 --- a/src/entity/jan_iwa/Plants1.c +++ b/src/entity/jan_iwa/Plants1.c @@ -139,12 +139,12 @@ void entity_SpinningFlower_init(Entity* entity) { } void func_802BB314_E2DC44(Entity* entity) { - sfx_play_sound_at_position(SOUND_8000006A, SOUND_SPACE_MODE_0, entity->pos.x, entity->pos.y, entity->pos.z); + sfx_play_sound_at_position(SOUND_LOOP_6A, SOUND_SPACE_MODE_0, entity->pos.x, entity->pos.y, entity->pos.z); } void func_802BB34C_E2DC7C(void) { - sfx_play_sound(SOUND_391 | SOUND_ID_TRIGGER_CHANGE_SOUND); - snd_stop_tracking_env_sound_pos(SOUND_391, TRUE); + sfx_play_sound(SOUND_LRAW_0391 | SOUND_ID_TRIGGER_CHANGE_SOUND); + snd_stop_tracking_env_sound_pos(SOUND_LRAW_0391, TRUE); } void entity_PinkFlowerLight_setupGfx(s32 entityIndex) { @@ -287,7 +287,7 @@ void entity_CymbalPlant_idle(Entity* entity) { disable_player_input(); set_action_state(ACTION_STATE_IDLE); play_model_animation(entity->virtualModelIndex, Entity_CymbalPlant_AnimationGrab); - sfx_play_sound(SOUND_F2); + sfx_play_sound(SOUND_00F2); func_802BB8D4_E2E204(entity); } else { data->unk_01 = 0; @@ -355,7 +355,7 @@ EntityScript Entity_SpinningFlower_Script = { EntityScript Entity_PinkFlower_Script = { es_SetCallback(entity_PinkFlower_idle, 0) - es_PlaySound(SOUND_F4) + es_PlaySound(SOUND_00F4) es_SetCallback(NULL, 50) es_SetFlags(ENTITY_FLAG_SHOWS_INSPECT_PROMPT) es_Restart diff --git a/src/entity/jan_iwa/Plants2.c b/src/entity/jan_iwa/Plants2.c index 0863b30d4c..e922169b88 100644 --- a/src/entity/jan_iwa/Plants2.c +++ b/src/entity/jan_iwa/Plants2.c @@ -191,14 +191,14 @@ void func_802BC3E4_E2ED14(Entity* entity) { data->unk_10 -= 360.0f; } if (data->unk_10 == 96.0f) { - sfx_play_sound(SOUND_392); + sfx_play_sound(SOUND_0392); } } EntityScript Entity_BellbellPlant_Script = { es_SetCallback(entity_BellbellPlant_idle, 0) es_ClearFlags(ENTITY_FLAG_SHOWS_INSPECT_PROMPT) - es_PlaySound(SOUND_F1) + es_PlaySound(SOUND_00F1) es_SetCallback(NULL, 60) es_SetFlags(ENTITY_FLAG_SHOWS_INSPECT_PROMPT) es_Restart @@ -208,7 +208,7 @@ EntityScript Entity_BellbellPlant_Script = { EntityScript Entity_TrumpetPlant_Script = { es_SetCallback(entity_TrumpetPlant_idle, 0) es_ClearFlags(ENTITY_FLAG_SHOWS_INSPECT_PROMPT) - es_PlaySound(SOUND_F3) + es_PlaySound(SOUND_00F3) es_SetCallback(NULL, 15) es_Call(entity_TrumpetPlant_create_effect) es_SetCallback(NULL, 3) @@ -291,7 +291,7 @@ EntityScript Entity_MunchlesiaChewing_Script = { EntityScript Entity_MunchlesiaSpitOut_Script = { es_SetCallback(NULL, 4) es_Call(func_802BC3A0_E2ECD0) - es_PlaySound(SOUND_393) + es_PlaySound(SOUND_0393) es_SetCallback(NULL, 4) es_Call(entity_Munchlesia_create_child_reset1) es_SetFlags(ENTITY_FLAG_HIDDEN) diff --git a/src/evt/fx_api.c b/src/evt/fx_api.c index ca6a15a4ff..3f4cbe9d5a 100644 --- a/src/evt/fx_api.c +++ b/src/evt/fx_api.c @@ -27,7 +27,7 @@ ApiStatus ShowRecoveryShimmer(Evt* script, s32 isInitialCall) { f32 z = evt_get_float_variable(script, *args++); show_recovery_shimmer(x, y, z, evt_get_variable(script, *args++)); - sfx_play_sound_at_position(SOUND_378, SOUND_SPACE_MODE_0, x, y, z); + sfx_play_sound_at_position(SOUND_0378, SOUND_SPACE_MODE_0, x, y, z); return ApiStatus_DONE2; } diff --git a/src/filemenu/filemenu_createfile.c b/src/filemenu/filemenu_createfile.c index 385032b10d..68c4a395cc 100644 --- a/src/filemenu/filemenu_createfile.c +++ b/src/filemenu/filemenu_createfile.c @@ -437,13 +437,13 @@ void filemenu_choose_name_handle_input(MenuPanel* menu) { menu->selected = MENU_PANEL_SELECTED_GRID_DATA(menu); if (oldSelected != menu->selected) { - sfx_play_sound(SOUND_2102); + sfx_play_sound(SOUND_CREATE_FILE_MOVE_CURSOR); } if (filemenu_pressedButtons & BUTTON_A) { switch (menu->selected) { case 0xC6: - sfx_play_sound(SOUND_2103); + sfx_play_sound(SOUND_CREATE_FILE_SET_CHARACTER); if (filemenu_filename_pos == ARRAY_COUNT(filemenu_filename)) { filemenu_filename_pos = ARRAY_COUNT(filemenu_filename) - 1; } @@ -457,7 +457,7 @@ void filemenu_choose_name_handle_input(MenuPanel* menu) { break; case 0xC7: if (menu->page != 1) { - sfx_play_sound(SOUND_2105); + sfx_play_sound(SOUND_CREATE_FILE_CHANGE_CHARSET); menu->page = 1; filemenu_set_selected(menu, menu->col, menu->row); set_window_update(WINDOW_ID_FILEMENU_KEYBOARD, (s32)filemenu_update_change_layout); @@ -465,7 +465,7 @@ void filemenu_choose_name_handle_input(MenuPanel* menu) { break; case 0xC8: if (menu->page != 0) { - sfx_play_sound(SOUND_2105); + sfx_play_sound(SOUND_CREATE_FILE_CHANGE_CHARSET); menu->page = 0; filemenu_set_selected(menu, menu->col, menu->row); set_window_update(WINDOW_ID_FILEMENU_KEYBOARD, (s32)filemenu_update_change_layout); @@ -513,7 +513,7 @@ void filemenu_choose_name_handle_input(MenuPanel* menu) { filemenu_set_selected(newMenu, 0, 0); return; default: - sfx_play_sound(SOUND_2103); + sfx_play_sound(SOUND_CREATE_FILE_SET_CHARACTER); if (filemenu_filename_pos == ARRAY_COUNT(filemenu_filename)) { filemenu_filename[7] = menu->selected; } else { @@ -534,7 +534,7 @@ void filemenu_choose_name_handle_input(MenuPanel* menu) { if ((filemenu_pressedButtons & BUTTON_B) || ((filemenu_pressedButtons & BUTTON_A) && menu->selected == 0xC9)) { - sfx_play_sound(SOUND_2104); + sfx_play_sound(SOUND_CREATE_FILE_BACKSPACE); filemenu_filename_pos--; if (filemenu_filename_pos < 0) { filemenu_filename_pos = 0; diff --git a/src/filemenu/filemenu_main.c b/src/filemenu/filemenu_main.c index d5ab7ccd84..b6ed0b6411 100644 --- a/src/filemenu/filemenu_main.c +++ b/src/filemenu/filemenu_main.c @@ -933,7 +933,7 @@ void filemenu_main_handle_input(MenuPanel* menu) { menu->selected = MENU_PANEL_SELECTED_GRID_DATA(menu); if (originalSelected != menu->selected) { - sfx_play_sound(SOUND_2101); + sfx_play_sound(SOUND_FILE_MENU_MOVE_CURSOR); } if (menu->page == 0) { @@ -1007,7 +1007,7 @@ void filemenu_main_handle_input(MenuPanel* menu) { set_window_update(WINDOW_ID_FILEMENU_FILE2_INFO, (s32)filemenu_update_hidden_options_left); set_window_update(WINDOW_ID_FILEMENU_FILE3_INFO, (s32)filemenu_update_hidden_options_right); set_window_update(WINDOW_ID_FILEMENU_TITLE, (s32)filemenu_update_hidden_title); - sfx_play_sound(SOUND_D6); + sfx_play_sound(SOUND_FILE_MENU_OUT); set_game_mode(GAME_MODE_END_FILE_SELECT); } else if (menu->selected == 4) { sfx_play_sound(SOUND_MENU_NEXT); @@ -1252,7 +1252,7 @@ void filemenu_main_handle_input(MenuPanel* menu) { set_window_update(WINDOW_ID_FILEMENU_FILE2_INFO, (s32)filemenu_update_hidden_options_left); set_window_update(WINDOW_ID_FILEMENU_FILE3_INFO, (s32)filemenu_update_hidden_options_right); set_window_update(WINDOW_ID_FILEMENU_TITLE, (s32)filemenu_update_hidden_title); - sfx_play_sound(SOUND_D6); + sfx_play_sound(SOUND_FILE_MENU_OUT); set_game_mode(GAME_MODE_END_FILE_SELECT); break; case 1: diff --git a/src/filemenu/filemenu_selectlanguage.c b/src/filemenu/filemenu_selectlanguage.c index 29b225ba17..7d74a73937 100644 --- a/src/filemenu/filemenu_selectlanguage.c +++ b/src/filemenu/filemenu_selectlanguage.c @@ -299,7 +299,7 @@ void filemenu_selectlanguage_handle_input(MenuPanel* menu) { menu->selected = MENU_PANEL_SELECTED_GRID_DATA(menu); if (originalSelected != menu->selected) { if (var_a1 == 0) { - sfx_play_sound(SOUND_2101); + sfx_play_sound(SOUND_FILE_MENU_MOVE_CURSOR); } switch (menu->selected) { /* irregular */ case 0: @@ -324,9 +324,9 @@ void filemenu_selectlanguage_handle_input(MenuPanel* menu) { set_window_update(WINDOW_ID_FILEMENU_FILE3_INFO, (s32) &filemenu_selectlanguage_80248018); set_window_update(WINDOW_ID_FILEMENU_TITLE, (s32) filemenu_update_hidden_title); if (var_s1 == 0) { - sfx_play_sound(SOUND_F1); + sfx_play_sound(SOUND_00F1); } else { - sfx_play_sound(SOUND_D6); + sfx_play_sound(SOUND_FILE_MENU_OUT); } set_game_mode(GAME_MODE_END_LANGUAGE_SELECT); } diff --git a/src/i_spy.c b/src/i_spy.c index 1bb4393d06..78c18476da 100644 --- a/src/i_spy.c +++ b/src/i_spy.c @@ -138,7 +138,7 @@ void ispy_notification_update(void) { case I_SPY_OVERSHOOT: ISpyPtr->scale = 0.57f; ISpyPtr->state++; - sfx_play_sound_at_player(SOUND_17B, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_017B, SOUND_SPACE_MODE_0); break; case I_SPY_ANIMATE: ISpyPtr->scale = 0.53f; diff --git a/src/msg.c b/src/msg.c index 6013725bb3..ca793ceb7f 100644 --- a/src/msg.c +++ b/src/msg.c @@ -352,7 +352,7 @@ s32 _update_message(MessagePrintState* printer) { if (printer->fontVariant != 0 || printer->srcBuffer[printer->srcBufferPos] != MSG_CHAR_UNK_C3) { printer->stateFlags |= MSG_STATE_FLAG_PRINT_QUICKLY | MSG_STATE_FLAG_80 | MSG_STATE_FLAG_4; } - sfx_play_sound_with_params(SOUND_CC, 0, 0, 0); + sfx_play_sound_with_params(SOUND_MSG_SKIP, 0, 0, 0); } else if (printer->style == MSG_STYLE_RIGHT || printer->style == MSG_STYLE_LEFT || printer->style == MSG_STYLE_CENTER || @@ -368,7 +368,7 @@ s32 _update_message(MessagePrintState* printer) { printer->unk_4CC = 0; printer->unkArraySize = printer->curLine - 1; printer->unk_4C8 = abs(printer->curLinePos - printer->lineEndPos[printer->unkArraySize]); - sfx_play_sound_with_params(SOUND_CD, 0, 0, 0); + sfx_play_sound_with_params(SOUND_MSG_REWIND, 0, 0, 0); } break; case MSG_WINDOW_STATE_C: @@ -377,14 +377,14 @@ s32 _update_message(MessagePrintState* printer) { printer->unk_4CC = 0; printer->unkArraySize = printer->curLine; printer->unk_4C8 = abs(printer->curLinePos - printer->lineEndPos[printer->unkArraySize]); - sfx_play_sound_with_params(SOUND_CC, 0, 0, 0); + sfx_play_sound_with_params(SOUND_MSG_SKIP, 0, 0, 0); } else if (gGameStatusPtr->pressedButtons[0] & BUTTON_Z) { if (printer->unkArraySize > 0) { printer->windowState = MSG_WINDOW_STATE_B; printer->unk_4CC = 0; printer->unkArraySize--; printer->unk_4C8 = abs(printer->curLinePos - printer->lineEndPos[printer->unkArraySize]); - sfx_play_sound_with_params(SOUND_CD, 0, 0, 0); + sfx_play_sound_with_params(SOUND_MSG_REWIND, 0, 0, 0); } } else { if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) { @@ -392,7 +392,7 @@ s32 _update_message(MessagePrintState* printer) { printer->unk_4CC = 0; printer->unkArraySize++; printer->unk_4C8 = abs(printer->curLinePos - printer->lineEndPos[printer->unkArraySize]); - sfx_play_sound_with_params(SOUND_CE, 0, 0, 0); + sfx_play_sound_with_params(SOUND_MSG_UNREWIND, 0, 0, 0); } } break; @@ -707,13 +707,13 @@ void msg_copy_to_print_buffer(MessagePrintState* printer, s32 arg1, s32 arg2) { case MSG_CHAR_READ_WAIT: printer->windowState = MSG_WINDOW_STATE_WAITING; printer->delayFlags |= MSG_DELAY_FLAG_1; - printer->delayFlags &= ~2; + printer->delayFlags &= ~MSG_DELAY_FLAG_2; printer->rewindArrowAnimState = REWIND_ARROW_STATE_INIT; printer->rewindArrowCounter = 0; printer->stateFlags &= ~MSG_STATE_FLAG_80; printer->stateFlags &= ~MSG_STATE_FLAG_PRINT_QUICKLY; if (printer->style != MSG_STYLE_F) { - sfx_play_sound_with_params(SOUND_CB, 0, 0, 0); + sfx_play_sound_with_params(SOUND_MSG_WAIT, 0, 0, 0); } break; case MSG_CHAR_READ_PAUSE: @@ -797,7 +797,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_21C, 0, 0, 0); + sfx_play_sound_with_params(SOUND_021C, 0, 0, 0); } } break; @@ -806,7 +806,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_21C, 0, 0, 0); + sfx_play_sound_with_params(SOUND_021C, 0, 0, 0); printer->windowState = MSG_WINDOW_STATE_OPENING; printer->delayFlags |= MSG_DELAY_FLAG_1; printer->stateFlags |= MSG_STATE_FLAG_800; diff --git a/src/pulse_stone.c b/src/pulse_stone.c index f7d6733c7f..638e654688 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_7D, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_007D, SOUND_SPACE_MODE_0); } if (PulseStonePtr->pingTime < 2) { ifxImg.palette = pulse_stone_icon_2_pal; diff --git a/src/state_title_screen.c b/src/state_title_screen.c index 808d30456b..b3637659bc 100644 --- a/src/state_title_screen.c +++ b/src/state_title_screen.c @@ -219,7 +219,7 @@ void state_step_title_screen(void) { if (pressedButtons & (BUTTON_A | BUTTON_START)) { gGameStatusPtr->introState = INTRO_STATE_4; *D_800779C0 = 5; - sfx_play_sound(SOUND_D5); + sfx_play_sound(SOUND_FILE_MENU_IN); bgm_set_song(0, SONG_FILE_SELECT, 0, 500, 8); return; } diff --git a/src/world/action/hammer.c b/src/world/action/hammer.c index d79fee68bb..b1e3582a40 100644 --- a/src/world/action/hammer.c +++ b/src/world/action/hammer.c @@ -56,17 +56,17 @@ void action_hammer_play_hit_fx(s32 hitID) { shakeAmt = 1.2f; time = 1; radius = 28; - soundID = SOUND_211A; + soundID = SOUND_HAMMER_STRIKE_3; } else if (gPlayerData.hammerLevel == 1) { shakeAmt = 0.8f; time = 1; radius = 16; - soundID = SOUND_2119; + soundID = SOUND_HAMMER_STRIKE_2; } else { shakeAmt = 0.4f; time = 1; radius = 4; - soundID = SOUND_2118; + soundID = SOUND_HAMMER_STRIKE_1; } theta = DEG_TO_RAD(func_800E5348()); @@ -91,13 +91,13 @@ void action_hammer_play_hit_fx(s32 hitID) { switch (is_ability_active(ABILITY_ATTACK_FX)) { case 1: - soundID = SOUND_372; + soundID = SOUND_0372; break; case 2: - soundID = SOUND_F1; + soundID = SOUND_00F1; break; case 3: - soundID = SOUND_DC; + soundID = SOUND_SLIDE_WHISTLE_OUT; break; case 4: soundID = SOUND_2072; @@ -243,24 +243,24 @@ void action_update_hammer(void) { HammerHit->hitID = func_802B62A4_E25174(); if (gPlayerData.hammerLevel == 2) { - soundID = SOUND_2117; + soundID = SOUND_HAMMER_SWING_3; anim = ANIM_MarioW1_Smash3_Hit; if (HammerHit->hitID < 0) { - soundID = SOUND_2117; + soundID = SOUND_HAMMER_SWING_3; anim = ANIM_MarioW1_Smash3_Miss; } } else if (gPlayerData.hammerLevel == 1) { - soundID = SOUND_2116; + soundID = SOUND_HAMMER_SWING_2; anim = ANIM_MarioW1_Smash2_Hit; if (HammerHit->hitID < 0) { - soundID = SOUND_2116; + soundID = SOUND_HAMMER_SWING_2; anim = ANIM_MarioW1_Smash2_Miss; } } else { - soundID = SOUND_2115; + soundID = SOUND_HAMMER_SWING_1; anim = ANIM_MarioW1_Smash1_Hit; if (HammerHit->hitID < 0) { - soundID = SOUND_2115; + soundID = SOUND_HAMMER_SWING_1; anim = ANIM_MarioW1_Smash1_Miss; } } @@ -373,11 +373,11 @@ void func_802B6820_E256F0(void) { if (HammerHit->timer == 2) { hammerLevel = gPlayerData.hammerLevel; if (hammerLevel == 2) { - soundID = SOUND_2117; + soundID = SOUND_HAMMER_SWING_3; } else if (hammerLevel == 1) { - soundID = SOUND_2116; + soundID = SOUND_HAMMER_SWING_2; } else { - soundID = SOUND_2115; + soundID = SOUND_HAMMER_SWING_1; } sfx_play_sound_at_player(soundID, SOUND_SPACE_MODE_0); diff --git a/src/world/action/hit_lava.c b/src/world/action/hit_lava.c index edd3c4cc9c..a7d3d75995 100644 --- a/src/world/action/hit_lava.c +++ b/src/world/action/hit_lava.c @@ -49,7 +49,7 @@ void action_update_hit_lava(void) { subtract_hp(1); open_status_bar_long(); gOverrideFlags |= GLOBAL_OVERRIDES_40; - sfx_play_sound_at_player(SOUND_E8, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_TOUCH_LAVA, SOUND_SPACE_MODE_0); } switch (playerStatus->actionSubstate) { @@ -174,7 +174,7 @@ void action_update_hit_lava(void) { start_rumble(256, 50); phys_adjust_cam_on_landing(); gCameras[CAM_DEFAULT].moveFlags &= ~CAMERA_MOVE_FLAG_2; - sfx_play_sound_at_player(SOUND_3FB, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_03FB, SOUND_SPACE_MODE_0); suggest_player_anim_always_forward(ANIM_MarioW2_Thrown); playerStatus->flags &= ~PS_FLAG_HIT_FIRE; playerStatus->flags &= ~PS_FLAG_FLYING; diff --git a/src/world/action/land.c b/src/world/action/land.c index d8871bfa34..fef215564a 100644 --- a/src/world/action/land.c +++ b/src/world/action/land.c @@ -45,8 +45,8 @@ void action_update_land(void) { } suggest_player_anim_allow_backward(anim); - sfx_play_sound_at_player(SOUND_161 | SOUND_ID_STOP, SOUND_SPACE_MODE_0); - sfx_play_sound_at_player(SOUND_SOFT_LAND, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_0161 | SOUND_ID_STOP, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_LAND_SOFTLY, SOUND_SPACE_MODE_0); if (!(collisionStatus->curFloor & COLLISION_WITH_ENTITY_BIT)) { phys_adjust_cam_on_landing(); @@ -133,7 +133,7 @@ void action_update_peach_land(void) { playerStatus->landPos.x = playerStatus->pos.x; playerStatus->landPos.z = playerStatus->pos.z; - sfx_play_sound_at_player(SOUND_SOFT_LAND, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_LAND_SOFTLY, SOUND_SPACE_MODE_0); if (!(collisionStatus->curFloor & COLLISION_WITH_ENTITY_BIT)) { phys_adjust_cam_on_landing(); diff --git a/src/world/action/slide.c b/src/world/action/slide.c index 72c9174062..26d20e73f2 100644 --- a/src/world/action/slide.c +++ b/src/world/action/slide.c @@ -57,7 +57,7 @@ void action_update_sliding(void) { D_802B6798 = 0.0f; D_802B679C = 0; suggest_player_anim_allow_backward(ANIM_Mario1_Sit); - sfx_play_sound_at_player(SOUND_167, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_0167, SOUND_SPACE_MODE_0); gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; } speed = playerStatus->curSpeed; @@ -105,7 +105,7 @@ void action_update_sliding(void) { } sin_cos_rad(DEG_TO_RAD(D_802B6790), &sinA, &cosA); playerStatus->pos.y += fabsf((sinA / cosA) * playerStatus->curSpeed); - snd_stop_sound(SOUND_167); + snd_stop_sound(SOUND_0167); break; case SUBSTATE_STOP: posX = playerStatus->pos.x; @@ -150,7 +150,7 @@ void action_update_sliding(void) { if (hitID >= 0) { SlideLaunchSpeed = -1; suggest_player_anim_always_forward(ANIM_MarioW2_Collapse); - sfx_play_sound_at_player(SOUND_162, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_0162, SOUND_SPACE_MODE_0); playerStatus->actionSubstate++; // SUBSTATE_CRASH } break; diff --git a/src/world/action/sneaky_parasol.c b/src/world/action/sneaky_parasol.c index 39ecc3e791..8a44588db0 100644 --- a/src/world/action/sneaky_parasol.c +++ b/src/world/action/sneaky_parasol.c @@ -112,7 +112,7 @@ void action_update_parasol(void) { disguiseNpc = get_npc_by_index(PeachDisguiseNpcIndex); disguiseNpc->flags |= NPC_FLAG_IGNORE_CAMERA_FOR_YAW; playerStatus->flags |= PS_FLAG_ROTATION_LOCKED; - sfx_play_sound_at_player(SOUND_FD, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_00FD, SOUND_SPACE_MODE_0); } } @@ -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_92, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_0092, SOUND_SPACE_MODE_0); playerStatus->actionSubstate++; // SUBSTATE_USE_PARASOL } else { suggest_player_anim_allow_backward(ANIM_Peach2_CantFitParasol); @@ -146,7 +146,7 @@ void action_update_parasol(void) { playerStatus->curStateTime = 12; playerStatus->flags |= PS_FLAG_ROTATION_LOCKED; playerStatus->actionSubstate++; // SUBSTATE_DISGUISE_BEGIN - sfx_play_sound_at_player(SOUND_FD, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_00FD, SOUND_SPACE_MODE_0); } break; case SUBSTATE_DISGUISE_BEGIN: @@ -385,7 +385,7 @@ void action_update_parasol(void) { if (transformation->revertTime != 0) { if (transformation->revertTime <= 10) { if (transformation->revertTime == 10) { - sfx_play_sound_at_player(SOUND_FE, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_00FE, SOUND_SPACE_MODE_0); } if ((transformation->revertTime & 3) == 0) { fx_stars_shimmer(4, diff --git a/src/world/action/spin.c b/src/world/action/spin.c index 943e8c724b..8d90a451fa 100644 --- a/src/world/action/spin.c +++ b/src/world/action/spin.c @@ -95,17 +95,17 @@ void action_update_spin(void) { } } - playerSpinState->spinSoundID = SOUND_2111; + playerSpinState->spinSoundID = SOUND_SPIN; nonDizzyFlags = spinFlags & ~SPIN_TYPE_DIZZY; if (nonDizzyFlags == SPIN_TYPE_ATTACK) { - playerSpinState->spinSoundID = SOUND_2113; + playerSpinState->spinSoundID = SOUND_SPIN_ATTACK; } if (nonDizzyFlags == SPIN_TYPE_SPEEDY) { - playerSpinState->spinSoundID = SOUND_2112; + playerSpinState->spinSoundID = SOUND_SPEEDY_SPIN; } if (nonDizzyFlags == (SPIN_TYPE_ATTACK | SPIN_TYPE_SPEEDY)) { - playerSpinState->spinSoundID = SOUND_2114; + playerSpinState->spinSoundID = SOUND_SPEEDY_SPIN_ATTACK; } sfx_play_sound_at_player(playerSpinState->spinSoundID, SOUND_SPACE_MODE_0); diff --git a/src/world/action/spin_jump.c b/src/world/action/spin_jump.c index 815f060ef5..2e9922606d 100644 --- a/src/world/action/spin_jump.c +++ b/src/world/action/spin_jump.c @@ -136,7 +136,7 @@ void action_update_spin_jump(void) { playerStatus->pitch = 0.0f; playerStatus->actionSubstate++; exec_ShakeCam1(0, 0, 4); - sfx_play_sound_at_player(SOUND_149, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_LAND_SPIN_JUMP, SOUND_SPACE_MODE_0); start_rumble(128, 25); panels = &gCurrentHiddenPanels; panels->tryFlipTrigger = TRUE; diff --git a/src/world/action/tornado_jump.c b/src/world/action/tornado_jump.c index 9b952df0d5..e25d140b02 100644 --- a/src/world/action/tornado_jump.c +++ b/src/world/action/tornado_jump.c @@ -124,7 +124,7 @@ void action_update_tornado_jump(void) { playerStatus->flags &= ~(PS_FLAG_SPINNING | PS_FLAG_FLYING); phys_player_land(); exec_ShakeCam1(0, 0, 4); - sfx_play_sound_at_player(SOUND_14A, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_LAND_TORANDO_JUMP, SOUND_SPACE_MODE_0); start_rumble(256, 50); gCurrentHiddenPanels.tryFlipTrigger = TRUE; @@ -151,7 +151,7 @@ void action_update_tornado_jump(void) { playerStatus->actionState = ACTION_STATE_TORNADO_POUND; playerStatus->actionSubstate++; exec_ShakeCam1(0, 0, 4); - sfx_play_sound_at_player(SOUND_14A, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_LAND_TORANDO_JUMP, SOUND_SPACE_MODE_0); start_rumble(256, 50); gCurrentHiddenPanels.tryFlipTrigger = TRUE; diff --git a/src/world/action/use_munchlesia.c b/src/world/action/use_munchlesia.c index f0cbd527b6..93f18c4c37 100644 --- a/src/world/action/use_munchlesia.c +++ b/src/world/action/use_munchlesia.c @@ -59,7 +59,7 @@ void action_update_use_munchlesia(void) { gCameras[CAM_DEFAULT].targetPos.z = playerStatus->pos.z; hitPosY = player_check_collision_below(Munchlesia_LaunchVelocity, &colliderID); if (colliderID >= 0) { - sfx_play_sound_at_player(SOUND_162, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_0162, SOUND_SPACE_MODE_0); suggest_player_anim_always_forward(ANIM_MarioW2_Collapse); playerStatus->pos.y = hitPosY; D_802B62E0 = 10; diff --git a/src/world/area_arn/arn_05/arn_05_3_npc.c b/src/world/area_arn/arn_05/arn_05_3_npc.c index 61924a802f..49f2dea274 100644 --- a/src/world/area_arn/arn_05/arn_05_3_npc.c +++ b/src/world/area_arn/arn_05/arn_05_3_npc.c @@ -327,7 +327,7 @@ EvtScript N(EVS_TubbaWalking) = { EvtScript N(EVS_Scene_TubbaRaid) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(NpcFacePlayer, NPC_Boo_03, 1) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Boo_03, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20 * DT) EVT_CALL(GetNpcPos, NPC_Boo_03, LVar0, LVar1, LVar2) @@ -352,10 +352,10 @@ EvtScript N(EVS_Scene_TubbaRaid) = { EVT_CALL(SpeakToPlayer, NPC_Boo_03, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_00A0) EVT_CALL(PlaySoundAt, SOUND_20F6, SOUND_SPACE_MODE_0, 450, 200, 160) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(0.8)) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_01, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_05, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_01, SOUND_0262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_0262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_0262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_05, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Boo_01, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Boo_02, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Boo_03, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) @@ -435,8 +435,8 @@ EvtScript N(EVS_Scene_TubbaRaid) = { EVT_CALL(NpcFaceNpc, NPC_Boo_01, NPC_Tubba, 1) EVT_CALL(NpcFaceNpc, NPC_Boo_02, NPC_Tubba, 1) EVT_CALL(SetNpcPos, NPC_Boo_03, 272, 190, 214) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_01, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_01, SOUND_0262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Boo_01, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Boo_02, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_THREAD @@ -518,7 +518,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD EVT_WAIT(50 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_315, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_0315, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(40 * DT) EVT_CALL(SetNpcPos, NPC_Boo_03, NPC_DISPOSE_LOCATION) 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 6cbb7c328b..2e46d26854 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,10 +25,10 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_80000067) + EVT_CALL(PlaySound, SOUND_LOOP_67) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, SOUND_SPACE_MODE_0, 145, 65, 0) + EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, 145, 65, 0) EVT_END_THREAD EVT_THREAD EVT_WAIT(12) @@ -37,7 +37,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_THREAD EVT_WAIT(50) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, SOUND_SPACE_MODE_0, 145, 65, 0) + EVT_CALL(PlaySoundAt, SOUND_0137, SOUND_SPACE_MODE_0, 145, 65, 0) EVT_END_THREAD EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD @@ -63,7 +63,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_WAIT(1) EVT_END_IF EVT_CALL(N(StarSpiritEffectFunc4), 3) - EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GB_StoryProgress, STORY_CH3_STAR_SPIRIT_RESCUED) EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_2, TRANSITION_GET_STAR_CARD) @@ -87,10 +87,10 @@ EvtScript N(EVS_RespawnStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_80000067) + EVT_CALL(PlaySound, SOUND_LOOP_67) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, SOUND_SPACE_MODE_0, 145, 65, 0) + EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, 145, 65, 0) EVT_END_THREAD EVT_THREAD EVT_WAIT(12) @@ -99,7 +99,7 @@ EvtScript N(EVS_RespawnStarCard) = { EVT_THREAD EVT_WAIT(50) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, SOUND_SPACE_MODE_0, 145, 65, 0) + EVT_CALL(PlaySoundAt, SOUND_0137, SOUND_SPACE_MODE_0, 145, 65, 0) EVT_END_THREAD EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD @@ -125,7 +125,7 @@ EvtScript N(EVS_RespawnStarCard) = { EVT_WAIT(1) EVT_END_IF EVT_CALL(N(StarSpiritEffectFunc4), 3) - EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GB_StoryProgress, STORY_CH3_STAR_SPIRIT_RESCUED) EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_2, TRANSITION_GET_STAR_CARD) @@ -154,20 +154,20 @@ EvtScript N(EVS_Scene_TubbaReunion) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, 5, 0, -147) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(RotateModel, MODEL_o39, 80, 0, -1, 0) - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_TubbasHeart, EVT_FLOAT(2.5)) EVT_CALL(NpcJump0, NPC_TubbasHeart, 0, 20, -120, 8 * DT) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, 0, 10, -60, 12 * DT) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, 0, 0, 0, 12 * DT) EVT_WAIT(1) EVT_CALL(SetNpcVar, NPC_TubbasHeart, 0, 0) EVT_THREAD EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, 0, 0, 0, 10 * DT) EVT_WAIT(1) EVT_CALL(GetNpcVar, NPC_TubbasHeart, 0, LVar0) @@ -199,10 +199,10 @@ EvtScript N(EVS_Scene_TubbaReunion) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, 75, 0, 10, 12) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, 150, 0, 20, 12) EVT_WAIT(1) EVT_THREAD @@ -217,7 +217,7 @@ EvtScript N(EVS_Scene_TubbaReunion) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim22) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, 298, 56, 31, 18) EVT_CALL(SetNpcPos, NPC_TubbasHeart, NPC_DISPOSE_LOCATION) EVT_CALL(EnableNpcShadow, NPC_TubbasHeart, FALSE) diff --git a/src/world/area_arn/arn_07/arn_07_3_windmill.c b/src/world/area_arn/arn_07/arn_07_3_windmill.c index 30a96d75da..46bce71c58 100644 --- a/src/world/area_arn/arn_07/arn_07_3_windmill.c +++ b/src/world/area_arn/arn_07/arn_07_3_windmill.c @@ -23,7 +23,7 @@ EvtScript N(EVS_SetupWindmill) = { EvtScript N(EVS_UpdateWindmill) = { EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_SET(LVar1, 30) - EVT_CALL(PlaySoundAtModel, MODEL_o36, SOUND_8000004A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_o36, SOUND_LOOP_4A, SOUND_SPACE_MODE_0) EVT_LABEL(0) EVT_ADDF(LVar0, EVT_FLOAT(1.0)) EVT_CALL(N(WrapWindmillAngle)) diff --git a/src/world/area_arn/arn_07/arn_07_4_entity.c b/src/world/area_arn/arn_07/arn_07_4_entity.c index a9839520fd..093f8338c0 100644 --- a/src/world/area_arn/arn_07/arn_07_4_entity.c +++ b/src/world/area_arn/arn_07/arn_07_4_entity.c @@ -26,7 +26,7 @@ EvtScript N(EVS_UnlockDoor) = { EVT_CALL(CloseChoicePopup) EVT_SET(GB_StoryProgress, STORY_CH3_UNLOCKED_WINDY_MILL) EVT_CALL(N(GetEntityPosition), MV_Unk_00, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_Unk_00) EVT_CALL(N(RemovePadlock)) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) 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 61aecf247a..7a0d201321 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_B0000010, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_10, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_02, 0, 1) EVT_WAIT(4 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_10, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_05, 0, 1) EVT_WAIT(4 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_10, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_01, 0, 1) EVT_WAIT(6 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_10, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_03, 0, 1) EVT_WAIT(8 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_10, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_04, 0, 1) EVT_WAIT(6 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_10, 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_B0000010, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_10, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_02, 0, 1) EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim21) @@ -452,7 +452,7 @@ EvtScript N(EVS_Scene_SkolarRescued) = { EVT_CALL(SetNpcAnimation, NPC_Skolar, ANIM_WorldSkolar_Leap) EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) - EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) EVT_ADD(LVar1, 50) @@ -465,7 +465,7 @@ EvtScript N(EVS_Scene_SkolarRescued) = { EVT_WAIT(6 * DT) EVT_END_LOOP EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0188, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) diff --git a/src/world/area_arn/arn_08/arn_08_2_main.c b/src/world/area_arn/arn_08/arn_08_2_main.c index eb585140bd..4fc463004b 100644 --- a/src/world/area_arn/arn_08/arn_08_2_main.c +++ b/src/world/area_arn/arn_08/arn_08_2_main.c @@ -49,17 +49,17 @@ EvtScript N(EVS_EnterMap) = { EVT_CALL(RotateModel, MODEL_o37, 80, 0, -1, 0) EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim06) EVT_CALL(SetNpcJumpscale, NPC_TubbasHeart, EVT_FLOAT(2.5)) - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, -50, 0, 50, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim07) EVT_WAIT(1) EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim06) - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, -110, 0, 110, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim07) EVT_WAIT(1) EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim06) - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, -180, 0, 180, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim07) EVT_WAIT(1) 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 14847a41b5..a56ae2ea11 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_8000004B) + EVT_CALL(PlaySound, SOUND_LOOP_4B) 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 87920a00a3..b62bf2f83f 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 @@ -21,13 +21,13 @@ EvtScript N(EVS_NpcIdle_TubbasHeart) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim13) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) + 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(N(PlaySpringAnimation)) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim13) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 0, 200, 0, 15 * DT) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_SET(GB_StoryProgress, STORY_CH3_HEART_ESCAPED_WELL) diff --git a/src/world/area_arn/arn_10/arn_10_3_npc.c b/src/world/area_arn/arn_10/arn_10_3_npc.c index 074c3956ee..d94330d668 100644 --- a/src/world/area_arn/arn_10/arn_10_3_npc.c +++ b/src/world/area_arn/arn_10/arn_10_3_npc.c @@ -8,21 +8,21 @@ EvtScript N(EVS_NpcIdle_TubbasHeart) = { EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 8) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim14) EVT_WAIT(1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim13) EVT_SUB(LVar0, 80) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 12) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim14) EVT_WAIT(1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim13) EVT_SUB(LVar0, 80) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 12) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) diff --git a/src/world/area_arn/arn_11/arn_11_2_main.c b/src/world/area_arn/arn_11/arn_11_2_main.c index e94aeb698b..4a89b6125a 100644 --- a/src/world/area_arn/arn_11/arn_11_2_main.c +++ b/src/world/area_arn/arn_11/arn_11_2_main.c @@ -35,10 +35,10 @@ EvtScript N(EVS_Scene_MeetHeart) = { EVT_THREAD EVT_CALL(SetNpcJumpscale, NPC_TubbasHeart, EVT_FLOAT(2.5)) EVT_CALL(GetNpcPos, NPC_TubbasHeart, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 10 * DT) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 10 * DT) EVT_END_THREAD EVT_WAIT(40 * DT) diff --git a/src/world/area_arn/arn_11/arn_11_3_npc.c b/src/world/area_arn/arn_11/arn_11_3_npc.c index 4c57217677..201d6ff849 100644 --- a/src/world/area_arn/arn_11/arn_11_3_npc.c +++ b/src/world/area_arn/arn_11/arn_11_3_npc.c @@ -85,7 +85,7 @@ EvtScript N(EVS_Scene_HeartEscape) = { EVT_LOOP(2) EVT_CALL(GetNpcPos, NPC_TubbasHeart, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_TubbasHeart, EVT_FLOAT(2.5)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 12 * DT) EVT_WAIT(1) EVT_END_LOOP @@ -107,7 +107,7 @@ EvtScript N(EVS_Scene_HeartEscape) = { EVT_IF_EQ(LVar0, SUBLIST_DONE) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 12 * DT) EVT_WAIT(1) EVT_END_LOOP @@ -117,7 +117,7 @@ EvtScript N(EVS_Scene_HeartEscape) = { EVT_IF_EQ(LVar0, SUBLIST_DONE) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 12 * DT) EVT_WAIT(1) EVT_END_LOOP diff --git a/src/world/area_arn/arn_12/arn_12_3_npc.c b/src/world/area_arn/arn_12/arn_12_3_npc.c index 837a1ef7f8..bede9e98e1 100644 --- a/src/world/area_arn/arn_12/arn_12_3_npc.c +++ b/src/world/area_arn/arn_12/arn_12_3_npc.c @@ -8,21 +8,21 @@ EvtScript N(EVS_NpcIdle_TubbasHeart) = { EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 8) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim14) EVT_WAIT(1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim13) EVT_SUB(LVar0, 80) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 12) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim14) EVT_WAIT(1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim13) EVT_SUB(LVar0, 80) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 12) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) diff --git a/src/world/area_arn/arn_13/arn_13_3_npc.c b/src/world/area_arn/arn_13/arn_13_3_npc.c index 09a6b81faa..9764b08322 100644 --- a/src/world/area_arn/arn_13/arn_13_3_npc.c +++ b/src/world/area_arn/arn_13/arn_13_3_npc.c @@ -8,21 +8,21 @@ EvtScript N(EVS_NpcIdle_TubbasHeart) = { EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 8 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim14) EVT_WAIT(1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim13) EVT_SUB(LVar0, 80) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 12 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim14) EVT_WAIT(1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim13) EVT_SUB(LVar0, 80) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_TUBBA_HEART_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 12 * DT) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) diff --git a/src/world/area_dgb/dgb_00/dgb_00_3_npc.c b/src/world/area_dgb/dgb_00/dgb_00_3_npc.c index 7611ea2408..1fd5f70894 100644 --- a/src/world/area_dgb/dgb_00/dgb_00_3_npc.c +++ b/src/world/area_dgb/dgb_00/dgb_00_3_npc.c @@ -5,7 +5,7 @@ API_CALLABLE(N(PlaySentinelSounds)) { Npc* npc = get_npc_unsafe(get_enemy(NPC_Sentinel)->npcID); - sfx_adjust_env_sound_pos(SOUND_32E, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_adjust_env_sound_pos(SOUND_LRAW_032E, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); return ApiStatus_DONE2; } @@ -207,7 +207,7 @@ EvtScript N(EVS_TubbaTaunting) = { EVT_WAIT(LVar0) EVT_IF_EQ(MV_PreventTaunting, FALSE) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAt, SOUND_B4, SOUND_SPACE_MODE_0, 240, 10, -125) + EVT_CALL(PlaySoundAt, SOUND_TUBBA_POUNDING, SOUND_SPACE_MODE_0, 240, 10, -125) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0)) EVT_CALL(ShowMessageAtScreenPos, MSG_CH3_00EF, 160, 40) EVT_CALL(DisablePlayerInput, FALSE) @@ -247,10 +247,10 @@ EvtScript N(EVS_Scene_BoosApproachManor) = { EVT_CALL(SpeakToPlayer, NPC_Boo_01, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 5, MSG_CH3_00DB) EVT_CALL(SpeakToPlayer, NPC_Boo_05, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 5, MSG_CH3_00DC) EVT_CALL(SpeakToPlayer, NPC_Boo_01, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 5, MSG_CH3_00DD) - EVT_CALL(PlaySoundAt, SOUND_B4, SOUND_SPACE_MODE_0, 240, 10, -125) + EVT_CALL(PlaySoundAt, SOUND_TUBBA_POUNDING, SOUND_SPACE_MODE_0, 240, 10, -125) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0)) EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAt, SOUND_B4, SOUND_SPACE_MODE_0, 240, 10, -125) + EVT_CALL(PlaySoundAt, SOUND_TUBBA_POUNDING, SOUND_SPACE_MODE_0, 240, 10, -125) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0)) EVT_CALL(InterpNpcYaw, NPC_Boo_01, 90, 1) EVT_CALL(ShowMessageAtScreenPos, MSG_CH3_00DE, 160, 40) @@ -266,12 +266,12 @@ EvtScript N(EVS_Scene_BoosApproachManor) = { EvtScript N(EVS_Scene_EscapeFromTubba) = { EVT_CALL(SetPlayerSpeed, EVT_FLOAT(8.0 / DT)) EVT_CALL(PlayerMoveTo, 184, -44, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_01, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_04, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_05, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_06, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_01, SOUND_0262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_0262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_0262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_04, SOUND_0262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_05, SOUND_0262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_06, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Boo_01, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Boo_02, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Boo_03, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) @@ -325,10 +325,10 @@ EvtScript N(EVS_Scene_EscapeFromTubba) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(PlaySoundAt, SOUND_B4, SOUND_SPACE_MODE_0, 240, 10, -125) + EVT_CALL(PlaySoundAt, SOUND_TUBBA_POUNDING, SOUND_SPACE_MODE_0, 240, 10, -125) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0)) EVT_WAIT(5 * DT) - EVT_CALL(PlaySoundAt, SOUND_B4, SOUND_SPACE_MODE_0, 240, 10, -125) + EVT_CALL(PlaySoundAt, SOUND_TUBBA_POUNDING, SOUND_SPACE_MODE_0, 240, 10, -125) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0)) EVT_CALL(ShowMessageAtScreenPos, MSG_CH3_00E7, 160, 40) EVT_EXEC_WAIT(N(EVS_BraceDoor1)) @@ -508,7 +508,7 @@ EvtScript N(EVS_Scene_ThrownOutBySentinel) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcPos, NPC_PARTNER, 320, 10, -160) - EVT_CALL(PlaySound, SOUND_32E) + EVT_CALL(PlaySound, SOUND_LRAW_032E) EVT_THREAD EVT_LOOP(180) EVT_CALL(GetNpcPos, NPC_Sentinel, LVar0, LVar1, LVar2) @@ -552,14 +552,14 @@ EvtScript N(EVS_Scene_ThrownOutBySentinel) = { EVT_CALL(SetNpcPos, NPC_Sentinel, 175, 85, -33) EVT_CALL(SetNpcAnimation, NPC_Sentinel, ANIM_Sentinel_Anim09) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_Sentinel, SOUND_2F7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Sentinel, SOUND_02F7, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_Sentinel, ANIM_Sentinel_Anim02) EVT_CALL(SetNpcPos, NPC_Sentinel, 175, 70, -33) EVT_THREAD EVT_WAIT(40) EVT_CALL(SetNpcAnimation, NPC_Sentinel, ANIM_Sentinel_Anim03) EVT_CALL(NpcMoveTo, NPC_Sentinel, 270, -120, 30) - EVT_CALL(StopSound, SOUND_32E) + EVT_CALL(StopSound, SOUND_LRAW_032E) EVT_CALL(SetNpcPos, NPC_Sentinel, NPC_DISPOSE_LOCATION) EVT_END_THREAD EVT_THREAD @@ -569,7 +569,7 @@ EvtScript N(EVS_Scene_ThrownOutBySentinel) = { EVT_END_THREAD EVT_CALL(SetPlayerJumpscale, 0) EVT_CALL(PlayerJump1, 175, 0, -35, 10) - EVT_CALL(PlaySoundAtNpc, NPC_Sentinel, SOUND_162, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Sentinel, SOUND_0162, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Collapse) EVT_THREAD EVT_WAIT(2) 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 42270abbb4..e8bea481c4 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_95) + EVT_CALL(PlaySound, SOUND_0095) EVT_WAIT(60) - EVT_CALL(PlaySound, SOUND_96) + EVT_CALL(PlaySound, SOUND_0096) EVT_WAIT(25) - EVT_CALL(PlaySound, SOUND_98) + EVT_CALL(PlaySound, SOUND_0098) EVT_WAIT(70) - EVT_CALL(PlaySound, SOUND_97) + EVT_CALL(PlaySound, SOUND_0097) EVT_END_THREAD EVT_THREAD EVT_WAIT(100) - EVT_CALL(PlaySound, SOUND_A8) + EVT_CALL(PlaySound, SOUND_00A8) EVT_WAIT(50) - EVT_CALL(PlaySound, SOUND_A8) + EVT_CALL(PlaySound, SOUND_00A8) EVT_WAIT(30) - EVT_CALL(PlaySound, SOUND_A8) + EVT_CALL(PlaySound, SOUND_00A8) EVT_WAIT(70) - EVT_CALL(PlaySound, SOUND_A8) + EVT_CALL(PlaySound, SOUND_00A8) EVT_WAIT(30) - EVT_CALL(PlaySound, SOUND_A8) + EVT_CALL(PlaySound, SOUND_00A8) 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_8000005D) + EVT_CALL(StopSound, SOUND_LOOP_5D) 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_4_entity.c b/src/world/area_dgb/dgb_01/dgb_01_4_entity.c index 402de2d9b9..f26ea723fc 100644 --- a/src/world/area_dgb/dgb_01/dgb_01_4_entity.c +++ b/src/world/area_dgb/dgb_01/dgb_01_4_entity.c @@ -24,7 +24,7 @@ EvtScript N(EVS_UnlockPrompt_Door) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_DGB01_UnlockedEastWing, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_RESUME_GROUP(EVT_GROUP_01) 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 cf52ee5dea..2c744572c6 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_8000005D) + EVT_CALL(PlaySound, SOUND_LOOP_5D) 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 7d40ba959f..bf586bf723 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_80000010, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o77, SOUND_LOOP_10, 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_80000010) + EVT_CALL(StopSound, SOUND_LOOP_10) EVT_RETURN EVT_END }; diff --git a/src/world/area_dgb/dgb_03/dgb_03_4_entity.c b/src/world/area_dgb/dgb_03/dgb_03_4_entity.c index d3430f95e8..28714652d2 100644 --- a/src/world/area_dgb/dgb_03/dgb_03_4_entity.c +++ b/src/world/area_dgb/dgb_03/dgb_03_4_entity.c @@ -24,7 +24,7 @@ EvtScript N(EVS_UnlockPrompt_UpperDoor) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_DGB03_UnlockedThirdFloor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_RESUME_GROUP(EVT_GROUP_01) diff --git a/src/world/area_dgb/dgb_08/dgb_08_3_npc.c b/src/world/area_dgb/dgb_08/dgb_08_3_npc.c index 379958000b..74d0dc946f 100644 --- a/src/world/area_dgb/dgb_08/dgb_08_3_npc.c +++ b/src/world/area_dgb/dgb_08/dgb_08_3_npc.c @@ -330,7 +330,7 @@ NpcData N(NpcData_Sentinel_02) = { }; API_CALLABLE(N(PlayAlertSound)) { - ai_enemy_play_sound(get_npc_unsafe(script->owner1.enemy->npcID), SOUND_32F, 0); + ai_enemy_play_sound(get_npc_unsafe(script->owner1.enemy->npcID), SOUND_SRAW_0C_A, 0); return ApiStatus_DONE2; } @@ -359,7 +359,7 @@ EvtScript N(EVS_NpcIdle_LastClubba) = { EvtScript N(EVS_NpcInteract_LastClubba) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldClubba_Anim08) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2F1, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_0E_A, SOUND_SPACE_MODE_0) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldClubba_Anim02) EVT_WAIT(20) diff --git a/src/world/area_dgb/dgb_15/dgb_15_4_entity.c b/src/world/area_dgb/dgb_15/dgb_15_4_entity.c index 8c56a462ac..2c332296ab 100644 --- a/src/world/area_dgb/dgb_15/dgb_15_4_entity.c +++ b/src/world/area_dgb/dgb_15/dgb_15_4_entity.c @@ -24,7 +24,7 @@ EvtScript N(EVS_UnlockPrompt_Door) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_DGB15_UnlockedUpperFoyer, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_RESUME_GROUP(EVT_GROUP_01) 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 4bb0acbb3e..f12dfead26 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 @@ -304,7 +304,7 @@ EvtScript N(EVS_NpcAI_Tubba_WakeUp) = { EVT_CALL(SetSleepBubbleTimeLeft, LVar0, 20) EVT_CALL(SetNpcVar, NPC_SELF, 1, 2) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2F1, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_0E_A, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim19) EVT_WAIT(30) EVT_THREAD 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 b20bca8176..7eb56efc8e 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 @@ -25,7 +25,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_Scene_RuinsRising) = { - EVT_CALL(PlaySound, SOUND_80000060) + EVT_CALL(PlaySound, SOUND_LOOP_60) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 175, 0, -201) EVT_CALL(SetPanTarget, CAM_DEFAULT, 175, 0, -201) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) diff --git a/src/world/area_dro/dro_01/npc_shop_owner.c b/src/world/area_dro/dro_01/npc_shop_owner.c index d162c6e973..fa9e41d1bc 100644 --- a/src/world/area_dro/dro_01/npc_shop_owner.c +++ b/src/world/area_dro/dro_01/npc_shop_owner.c @@ -58,7 +58,7 @@ EvtScript N(EVS_NpcIdle_ShopOwner) = { EVT_CALL(NpcMoveTo, NPC_SELF, 103, 11, 20 * DT) EVT_CALL(NpcMoveTo, NPC_SELF, 150, 18, 20 * DT) EVT_CALL(EnableNpcBlur, NPC_SELF, TRUE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0174, SOUND_SPACE_MODE_0) EVT_CALL(NpcMoveTo, NPC_SELF, 554, -12, 20 * DT) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_WAIT(30 * DT) @@ -75,7 +75,7 @@ EvtScript N(EVS_NpcIdle_ShopOwner) = { EVT_CASE_LT(STORY_CH2_SHADY_MOUSE_ENTERED_SHOP) EVT_CALL(EnableNpcBlur, NPC_SELF, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0174, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcPos, NPC_SELF, 470, 0, 18) EVT_CALL(NpcMoveTo, NPC_SELF, 287, 9, 20 * DT) EVT_CALL(NpcMoveTo, NPC_SELF, 102, -14, 20 * DT) diff --git a/src/world/area_dro/dro_02/dro_02_3_main.c b/src/world/area_dro/dro_02/dro_02_3_main.c index f651fa4baa..566f09c40a 100644 --- a/src/world/area_dro/dro_02/dro_02_3_main.c +++ b/src/world/area_dro/dro_02/dro_02_3_main.c @@ -19,7 +19,7 @@ EvtScript N(EVS_OnReadPoster) = { }; EvtScript N(EVS_EnterMap) = { - EVT_CALL(PlaySound, SOUND_80000060) + EVT_CALL(PlaySound, SOUND_LOOP_60) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 190, 0, -37) EVT_CALL(SetPanTarget, CAM_DEFAULT, 190, 0, -37) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(200.0)) diff --git a/src/world/area_dro/dro_02/dro_02_5_npc.c b/src/world/area_dro/dro_02/dro_02_5_npc.c index 60f9a0b4df..17f58b1e15 100644 --- a/src/world/area_dro/dro_02/dro_02_5_npc.c +++ b/src/world/area_dro/dro_02/dro_02_5_npc.c @@ -269,7 +269,7 @@ EvtScript N(EVS_NpcIdle_Mouser_03) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) EVT_CALL(NpcMoveTo, NPC_SELF, 150, 18, 20) EVT_CALL(EnableNpcBlur, NPC_SELF, TRUE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0174, SOUND_SPACE_MODE_0) EVT_CALL(NpcMoveTo, NPC_SELF, -83, 11, 20 * DT) EVT_CALL(NpcMoveTo, NPC_SELF, -239, 5, 20 * DT) EVT_CALL(NpcMoveTo, NPC_SELF, -371, 5, 20 * DT) diff --git a/src/world/area_dro/dro_02/npc_merlee.c b/src/world/area_dro/dro_02/npc_merlee.c index 3a627a0e0f..47b03a2cc3 100644 --- a/src/world/area_dro/dro_02/npc_merlee.c +++ b/src/world/area_dro/dro_02/npc_merlee.c @@ -402,7 +402,7 @@ void N(card_worker_update)(void) { if (N(RitualStateTime) == 20) { N(RitualStateTime) = 0; evt_set_variable(N(CreatorScript), RITUAL_VAR_STATE, RITUAL_STATE_FLIP_LEFT); - sfx_play_sound_with_params(SOUND_203, 0, 24, 0); + sfx_play_sound_with_params(SOUND_0203, 0, 24, 0); } break; case RITUAL_STATE_FLIP_LEFT: @@ -417,7 +417,7 @@ void N(card_worker_update)(void) { if (N(RitualStateTime) == 10) { N(RitualStateTime) = 0; evt_set_variable(N(CreatorScript), RITUAL_VAR_STATE, RITUAL_STATE_FLIP_MIDDLE); - sfx_play_sound_with_params(SOUND_203, 0, 64, 0); + sfx_play_sound_with_params(SOUND_0203, 0, 64, 0); } break; case RITUAL_STATE_FLIP_MIDDLE: @@ -432,7 +432,7 @@ void N(card_worker_update)(void) { if (N(RitualStateTime) == 10) { N(RitualStateTime) = 0; evt_set_variable(N(CreatorScript), RITUAL_VAR_STATE, RITUAL_STATE_FLIP_RIGHT); - sfx_play_sound_with_params(SOUND_203, 0, 104, 0); + sfx_play_sound_with_params(SOUND_0203, 0, 104, 0); } break; case RITUAL_STATE_FLIP_RIGHT: @@ -551,7 +551,7 @@ void N(card_worker_update)(void) { N(RitualCards)[1].unk_00 = 0; N(GetCardOrientation)(1, &sp68, &sp6C, &sp70, &sp74); fx_sparkles(0, sp68, sp6C + 20.0f, sp70, 30.0f); - sfx_play_sound(SOUND_206); + sfx_play_sound(SOUND_0206); for (j = 0; j < ARRAY_COUNT(N(D_8024EF90)); j++) { N(D_8024EF90)[j]->flags |= FX_INSTANCE_FLAG_DISMISS; @@ -584,12 +584,12 @@ void N(card_worker_render)(void) { } API_CALLABLE(N(func_8024303C_96C1FC)) { - sfx_play_sound_with_params(SOUND_202A, 0, 24, 0); + sfx_play_sound_with_params(SOUND_SRAW_1D_A, 0, 24, 0); return ApiStatus_DONE2; } API_CALLABLE(N(func_80243068_96C228)) { - sfx_play_sound_with_params(SOUND_202B, 0, 104, 0); + sfx_play_sound_with_params(SOUND_SRAW_1D_B, 0, 104, 0); return ApiStatus_DONE2; } @@ -609,7 +609,7 @@ EvtScript N(EVS_PerformRitual) = { EVT_CALL(GetNpcPos, NPC_Merlee, RITUAL_VAR_POS_X, RITUAL_VAR_POS_Y, RITUAL_VAR_POS_Z) EVT_ADD(RITUAL_VAR_POS_X, 60) EVT_ADD(RITUAL_VAR_POS_Z, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Merlee, SOUND_201, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Merlee, SOUND_0201, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(MakeLerp, 720, 0, 60, EASING_LINEAR) EVT_LOOP(0) @@ -640,7 +640,7 @@ EvtScript N(EVS_PerformRitual) = { EVT_CALL(SetNpcAnimation, NPC_Merlee, ANIM_WorldMerlee_Release) EVT_END_THREAD EVT_WAIT(60) - EVT_CALL(PlaySoundAtNpc, NPC_Merlee, SOUND_202, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Merlee, SOUND_0202, SOUND_SPACE_MODE_0) EVT_SET(LVar0, RITUAL_VAR_POS_Y) EVT_ADD(LVar0, 25) EVT_PLAY_EFFECT(EFFECT_RADIATING_ENERGY_ORB, 0, RITUAL_VAR_POS_X, LVar0, RITUAL_VAR_POS_Z, 1, -1) @@ -660,37 +660,37 @@ EvtScript N(EVS_PerformRitual) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySound, SOUND_B000001D) + EVT_CALL(PlaySound, SOUND_SEQ_1D) EVT_WAIT(10) - EVT_CALL(PlaySound, SOUND_B000001D) + EVT_CALL(PlaySound, SOUND_SEQ_1D) EVT_WAIT(9) - EVT_CALL(PlaySound, SOUND_B000001D) + EVT_CALL(PlaySound, SOUND_SEQ_1D) EVT_WAIT(4) - EVT_CALL(PlaySound, SOUND_B000001D) + EVT_CALL(PlaySound, SOUND_SEQ_1D) EVT_WAIT(4) - EVT_CALL(PlaySound, SOUND_B000001D) + EVT_CALL(PlaySound, SOUND_SEQ_1D) EVT_WAIT(3) - EVT_CALL(PlaySound, SOUND_B000001D) + EVT_CALL(PlaySound, SOUND_SEQ_1D) EVT_WAIT(2) - EVT_CALL(PlaySound, SOUND_B000001D) + EVT_CALL(PlaySound, SOUND_SEQ_1D) EVT_WAIT(2) - EVT_CALL(PlaySound, SOUND_B000001D) + EVT_CALL(PlaySound, SOUND_SEQ_1D) EVT_WAIT(2) - EVT_CALL(PlaySound, SOUND_B000001D) + EVT_CALL(PlaySound, SOUND_SEQ_1D) EVT_WAIT(3) - EVT_CALL(PlaySound, SOUND_B000001D) + EVT_CALL(PlaySound, SOUND_SEQ_1D) EVT_WAIT(2) - EVT_CALL(PlaySound, SOUND_B000001D) + EVT_CALL(PlaySound, SOUND_SEQ_1D) EVT_WAIT(6) - EVT_CALL(PlaySound, SOUND_B000001D) + EVT_CALL(PlaySound, SOUND_SEQ_1D) EVT_WAIT(3) - EVT_CALL(PlaySound, SOUND_B000001D) + EVT_CALL(PlaySound, SOUND_SEQ_1D) EVT_WAIT(3) - EVT_CALL(PlaySound, SOUND_B000001D) + EVT_CALL(PlaySound, SOUND_SEQ_1D) EVT_WAIT(3) - EVT_CALL(PlaySound, SOUND_B000001D) + EVT_CALL(PlaySound, SOUND_SEQ_1D) EVT_WAIT(3) - EVT_CALL(PlaySound, SOUND_B000001D) + EVT_CALL(PlaySound, SOUND_SEQ_1D) EVT_END_THREAD EVT_THREAD EVT_LOOP(0) @@ -710,7 +710,7 @@ EvtScript N(EVS_PerformRitual) = { EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(3) - EVT_CALL(PlaySound, SOUND_204) + EVT_CALL(PlaySound, SOUND_0204) EVT_LOOP(0) EVT_IF_GE(RITUAL_VAR_STATE, RITUAL_STATE_B) EVT_BREAK_LOOP @@ -718,7 +718,7 @@ EvtScript N(EVS_PerformRitual) = { EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(15) - EVT_CALL(PlaySound, SOUND_205) + EVT_CALL(PlaySound, SOUND_0205) EVT_END_THREAD EVT_LOOP(0) EVT_IF_EQ(RITUAL_VAR_STATE, RITUAL_STATE_D) 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 02396e1452..99d21771f0 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_89) + EVT_CALL(PlaySound, SOUND_LRAW_0089) 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_89) + EVT_CALL(StopSound, SOUND_LRAW_0089) EVT_WAIT(15 * DT) EVT_THREAD EVT_WAIT(10 * DT) diff --git a/src/world/area_flo/common/DroppingVine.inc.c b/src/world/area_flo/common/DroppingVine.inc.c index 59578d098d..0293b1a010 100644 --- a/src/world/area_flo/common/DroppingVine.inc.c +++ b/src/world/area_flo/common/DroppingVine.inc.c @@ -47,7 +47,7 @@ EvtScript N(EVS_DroppingVine) = { EVT_END_IF EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAt, SOUND_F8, SOUND_SPACE_MODE_0, LVar3, LVar4, LVar5) + EVT_CALL(PlaySoundAt, SOUND_00F8, SOUND_SPACE_MODE_0, LVar3, LVar4, LVar5) EVT_END_THREAD EVT_CALL(MakeLerp, 0, 180, 20, EASING_CUBIC_IN) EVT_LABEL(1) diff --git a/src/world/area_flo/common/LogBridge.inc.c b/src/world/area_flo/common/LogBridge.inc.c index 9459d1dbad..2c778a9e4e 100644 --- a/src/world/area_flo/common/LogBridge.inc.c +++ b/src/world/area_flo/common/LogBridge.inc.c @@ -14,7 +14,7 @@ EvtScript N(EVS_LogBridge) = { EVT_IF_EQ(LVar8, 0) EVT_THREAD EVT_CALL(GetModelCenter, LVar5) - EVT_CALL(PlaySoundAt, SOUND_1DB, SOUND_PARAM_QUIET | SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_01DB, SOUND_PARAM_QUIET | SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_END_THREAD EVT_END_IF EVT_IF_LT(LVar7, 90) @@ -37,7 +37,7 @@ EvtScript N(EVS_LogBridge) = { EVT_SET(LVar7, 0) EVT_THREAD EVT_CALL(GetModelCenter, LVar5) - EVT_CALL(PlaySoundAt, SOUND_1DC, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_01DC, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_END_THREAD EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, LVar9, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF diff --git a/src/world/area_flo/flo_00/flo_00_2_main.c b/src/world/area_flo/flo_00/flo_00_2_main.c index a650e1fce4..83f7e2aa2d 100644 --- a/src/world/area_flo/flo_00/flo_00_2_main.c +++ b/src/world/area_flo/flo_00/flo_00_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_Wisterwood_Exit) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittn, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(PlayerMoveTo, 30, -170, 10) EVT_CALL(InterpPlayerYaw, 0, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_1CF, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_01CF, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -100, 20, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -38,7 +38,7 @@ EvtScript N(EVS_Wisterwood_Exit) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_1D0, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_01D0, SOUND_SPACE_MODE_0) EVT_CALL(GotoMap, EVT_PTR("mac_01"), mac_01_ENTRY_5) EVT_WAIT(100) EVT_RETURN @@ -49,7 +49,7 @@ EvtScript N(EVS_Wisterwood_Enter) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittn, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(InterpPlayerYaw, 180, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_1CF, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_01CF, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -100, 30, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -71,7 +71,7 @@ EvtScript N(EVS_Wisterwood_Enter) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_1D0, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_01D0, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilittn, COLLIDER_FLAGS_UPPER_MASK) EVT_RETURN 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 457ff34ec2..57b1cc5c01 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 @@ -478,7 +478,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Leap) EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) - EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) EVT_ADD(LVar1, 50) @@ -491,7 +491,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_WAIT(6 * DT) EVT_END_LOOP EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0188, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) diff --git a/src/world/area_flo/flo_00/flo_00_5_beanstalk.c b/src/world/area_flo/flo_00/flo_00_5_beanstalk.c index ddb04fa53f..c24728a8d6 100644 --- a/src/world/area_flo/flo_00/flo_00_5_beanstalk.c +++ b/src/world/area_flo/flo_00/flo_00_5_beanstalk.c @@ -252,7 +252,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(PlayerMoveTo, LVar9, LVarB, 8) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.0)) EVT_CALL(NpcJump0, NPC_PARTNER, LVarC, LVarD, LVarE, 5) - EVT_CALL(PlaySound, SOUND_19C) + EVT_CALL(PlaySound, SOUND_019C) EVT_CALL(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, 1, 8) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) @@ -352,7 +352,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o261, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o351, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(AF_FLO_RidingBeanstalk, FALSE) - EVT_CALL(StopSound, SOUND_19D) + EVT_CALL(StopSound, SOUND_019D) EVT_EXEC_WAIT(N(EVS_SetupMusic)) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(DisablePlayerInput, FALSE) @@ -361,7 +361,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { }; EvtScript N(EVS_Scene_BeanstalkGrowing) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o261, SOUND_19B, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o261, SOUND_019B, SOUND_SPACE_MODE_0) EVT_SET(LVarF, 0) EVT_LOOP(100) EVT_ADD(LVarF, 1) diff --git a/src/world/area_flo/flo_03/flo_03_3_npc.c b/src/world/area_flo/flo_03/flo_03_3_npc.c index f8660ceb38..badbdc2199 100644 --- a/src/world/area_flo/flo_03/flo_03_3_npc.c +++ b/src/world/area_flo/flo_03/flo_03_3_npc.c @@ -171,7 +171,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim16) EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_QUESTION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(GetNpcPos, NPC_MontyMole_02, LVar0, LVar1, LVar2) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0052) @@ -226,7 +226,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetNpcAnimation, NPC_Dayzee, ANIM_Dayzee_Anim0D) - EVT_CALL(PlaySoundAtNpc, NPC_Dayzee, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Dayzee, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Dayzee, EMOTE_EXCLAMATION, 45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0056) @@ -401,7 +401,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) @@ -480,7 +480,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_02, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) @@ -559,7 +559,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_03, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) @@ -638,7 +638,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_04, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) diff --git a/src/world/area_flo/flo_07/flo_07_1_music.c b/src/world/area_flo/flo_07/flo_07_1_music.c index 124581dc10..edf315c69c 100644 --- a/src/world/area_flo/flo_07/flo_07_1_music.c +++ b/src/world/area_flo/flo_07/flo_07_1_music.c @@ -12,7 +12,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, 8) EVT_END_SWITCH EVT_END_IF - EVT_CALL(PlaySound, SOUND_80000021) + EVT_CALL(PlaySound, SOUND_LOOP_21) EVT_RETURN EVT_END }; 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 916eeb1a96..85987c82b1 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 @@ -47,7 +47,7 @@ EvtScript N(EVS_MakeCrystalBerry) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_END_THREAD - EVT_CALL(PlaySound, SOUND_8000006B) + EVT_CALL(PlaySound, SOUND_LOOP_6B) EVT_EXEC_GET_TID(N(EVS_ShakeGround), MV_GroundShakingScript) EVT_CALL(SpeakToPlayer, NPC_Posie, ANIM_Posie_Strain, ANIM_Posie_Strain, 0, MSG_CH6_0069) EVT_KILL_THREAD(MV_GroundShakingScript) @@ -65,8 +65,8 @@ EvtScript N(EVS_MakeCrystalBerry) = { EVT_CALL(MakeItemEntity, ITEM_CRYSTAL_BERRY, -265, 100, 54, ITEM_SPAWN_MODE_FALL_NEVER_VANISH, GF_FLO07_Item_CrystalBerry) EVT_SET(GF_FLO07_CrystalBerryFellOnLeftSide, TRUE) EVT_END_IF - EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_3BC) + EVT_CALL(PlaySound, SOUND_LRAW_03BC | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(func_802D62E4, 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 a442fc83a5..f32465f9b5 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 @@ -41,7 +41,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { 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_21C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_021C, 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) diff --git a/src/world/area_flo/flo_10/flo_10_1_music.c b/src/world/area_flo/flo_10/flo_10_1_music.c index 816998c4de..56146a6b0f 100644 --- a/src/world/area_flo/flo_10/flo_10_1_music.c +++ b/src/world/area_flo/flo_10/flo_10_1_music.c @@ -13,7 +13,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_END_SWITCH EVT_END_IF EVT_IF_GE(GB_StoryProgress, STORY_CH6_FILLED_SPRING_WITH_WATER) - EVT_CALL(PlaySound, SOUND_80000022) + EVT_CALL(PlaySound, SOUND_LOOP_22) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/area_flo/flo_10/flo_10_4_fountain.c b/src/world/area_flo/flo_10/flo_10_4_fountain.c index ab4a554b9d..2ab6e58b83 100644 --- a/src/world/area_flo/flo_10/flo_10_4_fountain.c +++ b/src/world/area_flo/flo_10/flo_10_4_fountain.c @@ -189,7 +189,7 @@ EvtScript N(EVS_Scene_ReleaseFountain) = { EVT_CALL(EnableGroup, MODEL_g31, TRUE) EVT_EXEC_WAIT(N(EVS_UnleashFountain)) EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_80000024) + EVT_CALL(PlaySound, SOUND_LOOP_24) EVT_WAIT(360) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) diff --git a/src/world/area_flo/flo_10/flo_10_5_npc.c b/src/world/area_flo/flo_10/flo_10_5_npc.c index e104708877..89dc1700d6 100644 --- a/src/world/area_flo/flo_10/flo_10_5_npc.c +++ b/src/world/area_flo/flo_10/flo_10_5_npc.c @@ -137,7 +137,7 @@ EvtScript N(EVS_NpcInteract_Lily) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 5, MSG_CH6_0079) EVT_CALL(NpcFacePlayer, NPC_SELF, 1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Lily_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_Idle, ANIM_Lily_Idle, 0, MSG_CH6_007A) 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 d4311db619..d61787d4cb 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_295) + EVT_CALL(PlaySound, SOUND_LRAW_0295) 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 26098d4346..4c8f97d2ab 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_295, volume, pan, + sfx_play_sound_with_params(SOUND_LRAW_0295, 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_295, volume, pan, + sfx_play_sound_with_params(SOUND_LRAW_0295, volume, pan, update_lerp(EASING_LINEAR, 500.0f, 0.0f, script->functionTemp[0], 80)); } diff --git a/src/world/area_flo/flo_14/flo_14_3_bubbles.c b/src/world/area_flo/flo_14/flo_14_3_bubbles.c index 0da973723b..59c93bc9d2 100644 --- a/src/world/area_flo/flo_14/flo_14_3_bubbles.c +++ b/src/world/area_flo/flo_14/flo_14_3_bubbles.c @@ -63,7 +63,7 @@ API_CALLABLE(N(UpdateBubbleSoundPos)) { 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_194, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_LRAW_0194, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); return ApiStatus_DONE2; } @@ -85,7 +85,7 @@ Vec3f N(BubbleFlightPath)[] = { EvtScript N(EVS_BubbleFollowPath) = { EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_80000023) + EVT_CALL(PlaySound, SOUND_LOOP_23) EVT_CALL(LoadPath, 165, EVT_PTR(N(BubbleFlightPath)), ARRAY_COUNT(N(BubbleFlightPath)), EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(GetNextPathPos) @@ -98,7 +98,7 @@ EvtScript N(EVS_BubbleFollowPath) = { EVT_IF_EQ(LVar0, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(StopSound, SOUND_80000023) + EVT_CALL(StopSound, SOUND_LOOP_23) EVT_RETURN EVT_END }; @@ -144,7 +144,7 @@ EvtScript N(EVS_RideBigBubble) = { EVT_END_IF EVT_CALL(GetModelCenter, MODEL_o167) EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar0, LVar1, LVar2, 2, 0) - EVT_CALL(PlaySoundAt, SOUND_2F3, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_02F3, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER) EVT_CALL(EnableModel, MODEL_o167, FALSE) EVT_SET(AF_FLO_BigBubbleReady, FALSE) @@ -159,7 +159,7 @@ EvtScript N(EVS_RideBigBubble) = { }; EvtScript N(EVS_BlowBigBubble) = { - EVT_CALL(PlaySoundAt, SOUND_193, SOUND_SPACE_MODE_0, 591, 55, 121) + EVT_CALL(PlaySoundAt, SOUND_0193, SOUND_SPACE_MODE_0, 591, 55, 121) EVT_CALL(EnableModel, MODEL_o167, TRUE) EVT_SETF(LVar2, EVT_FLOAT(1.0)) EVT_SETF(LVar4, EVT_FLOAT(0.0)) diff --git a/src/world/area_flo/flo_15/flo_15_5_stairs.c b/src/world/area_flo/flo_15/flo_15_5_stairs.c index 1dcc1b242b..61ba54106b 100644 --- a/src/world/area_flo/flo_15/flo_15_5_stairs.c +++ b/src/world/area_flo/flo_15/flo_15_5_stairs.c @@ -44,7 +44,7 @@ EvtScript N(EVS_MonitorFallingStairs) = { EVT_END_THREAD EVT_THREAD EVT_LOOP(6) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_187, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_0187, SOUND_SPACE_MODE_0) EVT_WAIT(20) EVT_END_LOOP EVT_END_THREAD 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 b2e5ca66aa..95cd57d9f5 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_80000025, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_LOOP_25, 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 ce68da5192..639162a01a 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 @@ -253,7 +253,7 @@ EvtScript N(EVS_DamagedLeftOnce) = { EVT_SETF(LVar5, EVT_FLOAT(3.0)) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o130, SOUND_1E6, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o130, SOUND_01E6, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar4, EVT_FLOAT(-0.5)) @@ -296,7 +296,7 @@ EvtScript N(EVS_DamagedRightOnce) = { EVT_SETF(LVar5, EVT_FLOAT(-5.0)) EVT_THREAD EVT_WAIT(12) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_1E7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_01E7, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar4, EVT_FLOAT(-0.5)) @@ -342,7 +342,7 @@ EvtScript N(EVS_DamagedLeftTwice) = { EVT_SETF(LVar5, EVT_FLOAT(0.0)) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o174, SOUND_1E7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o174, SOUND_01E7, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar5, EVT_FLOAT(0.5)) @@ -373,7 +373,7 @@ EvtScript N(EVS_DamagedRightTwice) = { EVT_SETF(LVar5, EVT_FLOAT(0.0)) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o127, SOUND_1E7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o127, SOUND_01E7, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar5, EVT_FLOAT(0.5)) @@ -417,7 +417,7 @@ EvtScript N(EVS_BreakSmokestack) = { EVT_SETF(LVar5, EVT_FLOAT(3.0)) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o131, SOUND_1E6, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o131, SOUND_01E6, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar4, EVT_FLOAT(-0.5)) @@ -455,7 +455,7 @@ EvtScript N(EVS_BreakAntenna) = { EVT_SETF(LVar5, EVT_FLOAT(5.0)) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_1E6, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_01E6, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar4, EVT_FLOAT(-0.5)) @@ -507,7 +507,7 @@ EvtScript N(EVS_DamageMachine) = { EVT_IF_LT(LVar0, -210) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySound, SOUND_1E5) + EVT_CALL(PlaySound, SOUND_01E5) EVT_EXEC_WAIT(N(EVS_ShakeMachine)) EVT_SET(LVar0, LVarA) EVT_IF_LT(GB_StoryProgress, STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) @@ -577,11 +577,11 @@ EvtScript N(EVS_DamageMachine) = { EVT_USE_BUF(EVT_PTR(N(SmokeBurstPositions))) EVT_LOOP(ARRAY_COUNT(N(SmokeBurstPositions))) EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_190, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0190, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 1, 6) EVT_WAIT(2) EVT_ADD(LVar1, 5) - EVT_CALL(PlaySoundAt, SOUND_190, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0190, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 2, 15) EVT_WAIT(LVar3) EVT_ADD(LVar3, 1) @@ -591,7 +591,7 @@ EvtScript N(EVS_DamageMachine) = { EVT_USE_BUF(EVT_PTR(N(SmokeBurstPositions))) EVT_LOOP(ARRAY_COUNT(N(SmokeBurstPositions))) EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_190, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0190, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 1, 25) EVT_WAIT(LVar3) EVT_ADD(LVar3, LVar4) @@ -599,14 +599,14 @@ EvtScript N(EVS_DamageMachine) = { EVT_END_LOOP EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_1A0, SOUND_SPACE_MODE_0, 70, 40, 10) + EVT_CALL(PlaySoundAt, SOUND_01A0, SOUND_SPACE_MODE_0, 70, 40, 10) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 70, 40, 10, EVT_FLOAT(3.0), 30) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAt, SOUND_1A0, SOUND_SPACE_MODE_0, 0, 30, 30) + EVT_CALL(PlaySoundAt, SOUND_01A0, SOUND_SPACE_MODE_0, 0, 30, 30) 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_91 | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_LRAW_0091 | 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_18/flo_18_4_npc.c b/src/world/area_flo/flo_18/flo_18_4_npc.c index 4d103901f1..d5d87f7b39 100644 --- a/src/world/area_flo/flo_18/flo_18_4_npc.c +++ b/src/world/area_flo/flo_18/flo_18_4_npc.c @@ -89,7 +89,7 @@ EvtScript N(EVS_Scene_LakilesterLikesBeingGood) = { EvtScript N(EVS_GangRetreat) = { EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_FlyingMagikoopa, SOUND_19E, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_FlyingMagikoopa, SOUND_019E, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcFlagBits, NPC_FlyingMagikoopa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_FlyingMagikoopa, 270, 0) EVT_CALL(LoadPath, 60 * DT, EVT_PTR(N(RetreatPath_Magikoopa)), ARRAY_COUNT(N(RetreatPath_Magikoopa)), EASING_LINEAR) @@ -104,7 +104,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_END_THREAD EVT_WAIT(15 * DT) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_01, SOUND_19F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_01, SOUND_019F, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcFlagBits, NPC_Lakitu_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_Lakitu_01, 270, 0) EVT_CALL(LoadPath, 60 * DT, EVT_PTR(N(RetreatPath_Lakitu_01)), ARRAY_COUNT(N(RetreatPath_Lakitu_01)), EASING_LINEAR) @@ -130,7 +130,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_03, SOUND_19F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_03, SOUND_019F, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcFlagBits, NPC_Lakitu_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_Lakitu_03, 270, 0) EVT_CALL(LoadPath, 80 * DT, EVT_PTR(N(RetreatPath_Lakitu_03)), ARRAY_COUNT(N(RetreatPath_Lakitu_03)), EASING_LINEAR) diff --git a/src/world/area_flo/flo_19/flo_19_5_beanstalk.c b/src/world/area_flo/flo_19/flo_19_5_beanstalk.c index 836041ae20..841a2ee335 100644 --- a/src/world/area_flo/flo_19/flo_19_5_beanstalk.c +++ b/src/world/area_flo/flo_19/flo_19_5_beanstalk.c @@ -202,7 +202,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(5) EVT_SET(AF_FLO_RidingBeanstalk, FALSE) - EVT_CALL(StopSound, SOUND_19C) + EVT_CALL(StopSound, SOUND_019C) EVT_EXEC_WAIT(N(EVS_SetupMusic)) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(DisablePlayerInput, FALSE) @@ -228,7 +228,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(PlayerMoveTo, LVar9, LVarB, 8) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.0)) EVT_CALL(NpcJump0, NPC_PARTNER, LVarC, LVarD, LVarE, 5) - EVT_CALL(PlaySound, SOUND_19D) + EVT_CALL(PlaySound, SOUND_019D) EVT_CALL(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, 1, 8) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) 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 676f76491a..eba94bca65 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,10 +37,10 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_80000067) + EVT_CALL(PlaySound, SOUND_LOOP_67) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, SOUND_SPACE_MODE_0, 650, 205, 0) + EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, 650, 205, 0) EVT_END_THREAD EVT_THREAD EVT_WAIT(45) @@ -49,7 +49,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_THREAD EVT_WAIT(180) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, SOUND_SPACE_MODE_0, 650, 205, 0) + EVT_CALL(PlaySoundAt, SOUND_0137, SOUND_SPACE_MODE_0, 650, 205, 0) EVT_END_THREAD EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD @@ -75,7 +75,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_WAIT(1) EVT_END_IF EVT_CALL(N(StarSpiritEffectFunc4), 3) - EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GB_StoryProgress, STORY_CH6_STAR_SPIRIT_RESCUED) EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_5, TRANSITION_GET_STAR_CARD) diff --git a/src/world/area_flo/flo_21/flo_21_4_npc.c b/src/world/area_flo/flo_21/flo_21_4_npc.c index 2009de741a..2efea9cc4e 100644 --- a/src/world/area_flo/flo_21/flo_21_4_npc.c +++ b/src/world/area_flo/flo_21/flo_21_4_npc.c @@ -40,7 +40,7 @@ EvtScript N(EVS_PlayRumbleSounds) = { }; EvtScript N(EVS_HuffNPuff_JumpOut) = { - EVT_CALL(PlaySoundAtNpc, NPC_HuffNPuff_01, SOUND_3C0, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_HuffNPuff_01, SOUND_03C0, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 3, 650, 104, 0) EVT_WAIT(15) EVT_CALL(SetNpcJumpscale, NPC_HuffNPuff_02, EVT_FLOAT(0.0)) @@ -418,7 +418,7 @@ EvtScript N(EVS_HuffNPuff_Defeat_BlowUp) = { EVT_CALL(SetNpcPos, LVar8, LVar1, LVar2, -30) EVT_CALL(RandInt, 2, LVar5) EVT_ADD(LVar5, 8) - EVT_CALL(PlaySoundAtNpc, LVar8, SOUND_3D5, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar8, SOUND_03D5, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, LVar8, LVar3, LVar4, -15, LVar5) EVT_CALL(SetNpcPos, LVar8, NPC_DISPOSE_LOCATION) EVT_END_THREAD @@ -431,7 +431,7 @@ EvtScript N(EVS_HuffNPuff_Defeat_BlowUp) = { EVT_BUF_READ4(LVar1, LVar2, LVar3, LVar4) EVT_WAIT(5) EVT_CALL(SetNpcPos, LVar8, LVar1, LVar2, -30) - EVT_CALL(PlaySoundAtNpc, LVar8, SOUND_3D6, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar8, SOUND_03D6, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, LVar8, LVar3, LVar4, -15, 10) EVT_CALL(SetNpcPos, LVar8, NPC_DISPOSE_LOCATION) EVT_RETURN diff --git a/src/world/area_flo/flo_22/flo_22_4_well.c b/src/world/area_flo/flo_22/flo_22_4_well.c index 0d13c70c16..bdd9ff7df0 100644 --- a/src/world/area_flo/flo_22/flo_22_4_well.c +++ b/src/world/area_flo/flo_22/flo_22_4_well.c @@ -45,7 +45,7 @@ EvtScript N(EVS_TossItemIntoWell) = { EVT_CALL(RemoveItemEntity, LVar7) EVT_END_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAt, SOUND_302, SOUND_SPACE_MODE_0, 35, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_0302, SOUND_SPACE_MODE_0, 35, 0, 0) EVT_WAIT(5) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) 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 cb1cc2aee4..b1b07a77ce 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 @@ -41,7 +41,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { 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_21C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_021C, 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) diff --git a/src/world/area_flo/flo_24/flo_24_1_music.c b/src/world/area_flo/flo_24/flo_24_1_music.c index 50d9486846..fdd8655ec6 100644 --- a/src/world/area_flo/flo_24/flo_24_1_music.c +++ b/src/world/area_flo/flo_24/flo_24_1_music.c @@ -7,7 +7,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, 8) EVT_END_IF EVT_IF_GE(GB_StoryProgress, STORY_CH6_FILLED_SPRING_WITH_WATER) - EVT_CALL(PlaySound, SOUND_80000022) + EVT_CALL(PlaySound, SOUND_LOOP_22) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/area_flo/flo_24/flo_24_4_water.c b/src/world/area_flo/flo_24/flo_24_4_water.c index e4b67d6a6a..3a2acdabf4 100644 --- a/src/world/area_flo/flo_24/flo_24_4_water.c +++ b/src/world/area_flo/flo_24/flo_24_4_water.c @@ -13,7 +13,7 @@ EvtScript N(EVS_Scene_FillWithWater) = { EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(300.0), EVT_FLOAT(-150.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_CALL(PlaySound, SOUND_80000050) + EVT_CALL(PlaySound, SOUND_LOOP_50) //@bug thread is never terminated EVT_THREAD EVT_CALL(MakeLerp, 80, 90, 10, EASING_LINEAR) 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 a42fe00864..a44cfa2d07 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 @@ -41,7 +41,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { 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_21C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_021C, 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) diff --git a/src/world/area_hos/common/FallingStars.inc.c b/src/world/area_hos/common/FallingStars.inc.c index e3da7d51fb..661d1ab803 100644 --- a/src/world/area_hos/common/FallingStars.inc.c +++ b/src/world/area_hos/common/FallingStars.inc.c @@ -159,7 +159,7 @@ EvtScript N(EVS_Starfall_Directed) = { EVT_SET(LVar0, 1) EVT_END_SWITCH EVT_IF_LT(LVarE, 2) - EVT_CALL(PlaySoundAt, SOUND_B0000015, 0, LVar1, LVar2, LVar3) + EVT_CALL(PlaySoundAt, SOUND_SEQ_15, 0, LVar1, LVar2, LVar3) EVT_ADD(LVarE, 1) EVT_END_IF EVT_ADD(LVarD, LVar8) @@ -197,7 +197,7 @@ EvtScript N(EVS_Starfall_Random) = { EVT_CALL(RandInt, 50, LVar0) EVT_ADD(LVar0, 20) EVT_CALL(N(UnkEffect0FFunc4)) - EVT_CALL(PlaySoundAt, SOUND_B0000015, 0, LVar1, LVar2, LVar3) + EVT_CALL(PlaySoundAt, SOUND_SEQ_15, 0, LVar1, LVar2, LVar3) EVT_WAIT(LVar0) EVT_GOTO(2) EVT_END_THREAD diff --git a/src/world/area_hos/hos_01/hos_01_4_npc.c b/src/world/area_hos/hos_01/hos_01_4_npc.c index 1bc8ac81ca..0a184c1289 100644 --- a/src/world/area_hos/hos_01/hos_01_4_npc.c +++ b/src/world/area_hos/hos_01/hos_01_4_npc.c @@ -78,7 +78,7 @@ EvtScript N(EVS_Scene_StarSpiritsPlea) = { EVT_CALL(SetNpcJumpscale, NPC_Eldstar, 0) EVT_CALL(NpcJump0, NPC_Eldstar, 21, 260, -277, 30 * DT) EVT_CALL(EnableModel, MODEL_1, TRUE) - EVT_CALL(PlaySound, SOUND_64) + EVT_CALL(PlaySound, SOUND_0064) EVT_CALL(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(DrawAppearSparkles), 0, LVar0, LVar1, LVar2, 10) 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 1bf2be6969..c9ca112733 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_80000063) + EVT_CALL(PlaySound, SOUND_LOOP_63) 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 c145071d39..5a6149813a 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_80000064) + EVT_CALL(PlaySound, SOUND_LOOP_64) EVT_END_SWITCH EVT_RETURN EVT_END diff --git a/src/world/area_hos/hos_04/hos_04_7_starship.c b/src/world/area_hos/hos_04/hos_04_7_starship.c index f5a5e8feaa..f7ccbb7a46 100644 --- a/src/world/area_hos/hos_04/hos_04_7_starship.c +++ b/src/world/area_hos/hos_04/hos_04_7_starship.c @@ -39,7 +39,7 @@ EvtScript N(EVS_Starship_FlyingAway) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySound, SOUND_181) + EVT_CALL(PlaySound, SOUND_0181) EVT_CALL(MakeLerp, 0, 900, 45, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) 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 03c04d428e..3d631d3635 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_80000065) + EVT_CALL(PlaySound, SOUND_LOOP_65) 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_80000065) + EVT_CALL(PlaySound, SOUND_LOOP_65) EVT_END_SWITCH EVT_RETURN EVT_END diff --git a/src/world/area_hos/hos_05/hos_05_4_npc.c b/src/world/area_hos/hos_05/hos_05_4_npc.c index c9ccf397f7..67341d2a50 100644 --- a/src/world/area_hos/hos_05/hos_05_4_npc.c +++ b/src/world/area_hos/hos_05/hos_05_4_npc.c @@ -157,7 +157,7 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { EVT_CALL(NpcJump0, NPC_Eldstar, LVar0, LVar1, LVar2, 5) EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Idle) EVT_ADD(LVar7, 20) - EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, LVar6, LVar7, LVar8) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1F, 0, LVar6, LVar7, LVar8) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar6, LVar7, LVar8, 10) EVT_END_THREAD EVT_THREAD @@ -208,34 +208,34 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Idle) EVT_THREAD EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 2, 0, 154, 85, EVT_FLOAT(2.8), 100) - EVT_CALL(PlaySound, SOUND_212D) + EVT_CALL(PlaySound, SOUND_RELEASE_ENERGY) EVT_WAIT(115) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0188, 0) EVT_ADD(LVar7, 20) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar6, LVar7, LVar8, EVT_FLOAT(0.3), 30) EVT_END_THREAD EVT_WAIT(40) - EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 10, 154, 88) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1F, 0, 10, 154, 88) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 10, 154, 88, 10) EVT_WAIT(6) - EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 10, 154, 88) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1F, 0, 10, 154, 88) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 10, 154, 88, 15) EVT_WAIT(6) - EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, -10, 154, 88) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1F, 0, -10, 154, 88) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, -10, 154, 88, 20) EVT_WAIT(6) - EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 10, 154, 88) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1F, 0, 10, 154, 88) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 10, 154, 88, 25) EVT_WAIT(6) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_LOOP(3) - EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 0, 154, 88) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1F, 0, 0, 154, 88) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 0, 154, 88, 30) EVT_WAIT(6) - EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, -10, 154, 88) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1F, 0, -10, 154, 88) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, -10, 154, 88, 30) EVT_WAIT(6) - EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 10, 154, 88) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1F, 0, 10, 154, 88) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 10, 154, 88, 30) EVT_WAIT(6) EVT_END_LOOP diff --git a/src/world/area_hos/hos_05/hos_05_5_intro.c b/src/world/area_hos/hos_05/hos_05_5_intro.c index edbe311217..24acf8be1d 100644 --- a/src/world/area_hos/hos_05/hos_05_5_intro.c +++ b/src/world/area_hos/hos_05/hos_05_5_intro.c @@ -1708,7 +1708,7 @@ API_CALLABLE(N(AnimateStorybookPages)) { } else { N(CurrentStoryPageTime) = ARRAY_COUNT(N(NextPageAnimOffsetsX)); N(StoryPageState)++; - sfx_play_sound(SOUND_B0); + sfx_play_sound(SOUND_INTRO_NEXT_PAGE); } break; case STORY_PAGE_STATE_NEXT: @@ -1774,7 +1774,7 @@ API_CALLABLE(N(AnimateStorybookPages)) { N(CurrentStoryPageTime) = ARRAY_COUNT(N(NextPageAnimOffsetsX)); N(StoryPageState)++; N(StoryGraphicsPtr)->tapeAlpha = 255; - sfx_play_sound(SOUND_B0); + sfx_play_sound(SOUND_INTRO_NEXT_PAGE); } break; case STORY_PAGE_STATE_BOWSER_NEXT: 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 57490c28f4..1d7f5ada9d 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_A3, 0, 0, 250, 0) + EVT_CALL(PlaySoundAt, SOUND_00A3, 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_A3 | SOUND_ID_TRIGGER_CHANGE_SOUND, 0, 0, 250, 0) + EVT_CALL(PlaySoundAt, SOUND_00A3 | 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_05/hos_05_8_star_ship.c b/src/world/area_hos/hos_05/hos_05_8_star_ship.c index 584a15f270..0e07aa9426 100644 --- a/src/world/area_hos/hos_05/hos_05_8_star_ship.c +++ b/src/world/area_hos/hos_05/hos_05_8_star_ship.c @@ -103,7 +103,7 @@ EvtScript N(EVS_Starship_Depart) = { EVT_WAIT(25) EVT_CALL(N(SwingCameraPitchUpward)) EVT_END_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_17D, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_017D, 0) EVT_SET(LVar2, MV_Starship_PosY) EVT_CALL(MakeLerp, 0, 1000, 100, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -159,7 +159,7 @@ EvtScript N(EVS_EnterStarship) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_17F, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_017F, 0) EVT_CALL(MakeLerp, 750, -85, 90, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_hos/hos_06/hos_06_5_merluvlee.c b/src/world/area_hos/hos_06/hos_06_5_merluvlee.c index a5eb63bfd6..1fd443b08f 100644 --- a/src/world/area_hos/hos_06/hos_06_5_merluvlee.c +++ b/src/world/area_hos/hos_06/hos_06_5_merluvlee.c @@ -570,7 +570,7 @@ EvtScript N(EVS_PerformHintRitual) = { EVT_CALL(SetNpcAnimation, NPC_Merluvlee, ANIM_Merluvlee_Release) EVT_CALL(GetModelCenter, MODEL_o100) EVT_ADD(LVar1, 20) - EVT_CALL(PlaySoundAt, SOUND_207, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_LRAW_0207, 0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), -1) EVT_SET(ArrayVar(1), LVarF) EVT_CALL(EnableModel, MODEL_o185, FALSE) @@ -612,12 +612,12 @@ EvtScript N(EVS_PerformHintRitual) = { EVT_WAIT(50) EVT_CALL(GetModelCenter, MODEL_o100) EVT_ADD(LVar1, 20) - EVT_CALL(PlaySoundAt, SOUND_208, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0208, 0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 20) EVT_WAIT(30) EVT_CALL(GetModelCenter, MODEL_o100) EVT_ADD(LVar1, 20) - EVT_CALL(PlaySoundAt, SOUND_208, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0208, 0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 20) EVT_WAIT(30) EVT_THREAD @@ -625,12 +625,12 @@ EvtScript N(EVS_PerformHintRitual) = { EVT_END_THREAD EVT_CALL(GetModelCenter, MODEL_o100) EVT_ADD(LVar1, 20) - EVT_CALL(PlaySoundAt, SOUND_208, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0208, 0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 20) EVT_WAIT(70) EVT_CALL(DismissEffect, ArrayVar(2)) EVT_WAIT(40) - EVT_CALL(PlaySoundAt, SOUND_207 | SOUND_ID_TRIGGER_CHANGE_SOUND, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_LRAW_0207 | SOUND_ID_TRIGGER_CHANGE_SOUND, 0, LVar0, LVar1, LVar2) EVT_CALL(N(func_80241F98_A3B478), ArrayVar(1)) EVT_WAIT(15) EVT_CALL(EnableModel, MODEL_o185, TRUE) 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 cd54e79477..8893f1b09f 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_A4 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_00A4 | 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_hos/hos_20/hos_20_2_starship.c b/src/world/area_hos/hos_20/hos_20_2_starship.c index 7c79c4634d..d156cdd035 100644 --- a/src/world/area_hos/hos_20/hos_20_2_starship.c +++ b/src/world/area_hos/hos_20/hos_20_2_starship.c @@ -81,7 +81,7 @@ EvtScript N(EVS_Starship_Flight1) = { EVT_SET(MV_Starship_Yaw, 0) EVT_EXEC(N(EVS_AnimateStarship)) EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_17C) + EVT_CALL(PlaySound, SOUND_017C) EVT_IF_LT(GB_StoryProgress, STORY_UNUSED_0000005D) EVT_CALL(MakeLerp, -300, 0, 120, EASING_QUADRATIC_OUT) EVT_LOOP(0) @@ -93,7 +93,7 @@ EvtScript N(EVS_Starship_Flight1) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(100) - EVT_CALL(PlaySound, SOUND_17C | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_017C | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(GotoMap, EVT_PTR("hos_00"), hos_00_ENTRY_3) EVT_ELSE EVT_THREAD @@ -107,7 +107,7 @@ EvtScript N(EVS_Starship_Flight1) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(75) - EVT_CALL(PlaySound, SOUND_17C | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_017C | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(PlaySound, SOUND_20A1) EVT_CALL(MakeLerp, 0, 300, 60, EASING_CUBIC_IN) EVT_LOOP(0) @@ -128,7 +128,7 @@ EvtScript N(EVS_Starship_Flight1) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySound, SOUND_17C | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_017C | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(GotoMap, EVT_PTR("kpa_60"), kpa_60_ENTRY_4) EVT_END_IF EVT_WAIT(100) @@ -149,12 +149,12 @@ EvtScript N(EVS_Starship_Flight2) = { EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.5), EVT_FLOAT(-3.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_CALL(PlaySound, SOUND_17C) + EVT_CALL(PlaySound, SOUND_017C) EVT_SET(MV_Starship_PosX, 0) EVT_SET(MV_Starship_Yaw, 0) EVT_EXEC(N(EVS_AnimateStarship)) EVT_WAIT(100) - EVT_CALL(PlaySound, SOUND_17C | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_017C | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(PlaySound, SOUND_20A1) EVT_CALL(MakeLerp, 0, 300, 60, EASING_CUBIC_IN) EVT_LOOP(0) @@ -189,7 +189,7 @@ EvtScript N(EVS_Starship_Return) = { EVT_SET(MV_Starship_Yaw, 180) EVT_EXEC(N(EVS_AnimateStarship)) EVT_WAIT(2) - EVT_CALL(PlaySound, SOUND_17C) + EVT_CALL(PlaySound, SOUND_017C) EVT_THREAD EVT_CALL(MakeLerp, 300, 0, 120, EASING_QUADRATIC_OUT) EVT_LOOP(0) @@ -201,7 +201,7 @@ EvtScript N(EVS_Starship_Return) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(75) - EVT_CALL(PlaySound, SOUND_17C | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_017C | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(PlaySound, SOUND_20A1) EVT_CALL(MakeLerp, 0, -300, 60, EASING_CUBIC_IN) EVT_LOOP(0) @@ -222,7 +222,7 @@ EvtScript N(EVS_Starship_Return) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySound, SOUND_17C | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_017C | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(GotoMap, EVT_PTR("hos_05"), hos_05_ENTRY_1) EVT_WAIT(100) EVT_RETURN diff --git a/src/world/area_isk/isk_02/isk_02_2_lock.c b/src/world/area_isk/isk_02/isk_02_2_lock.c index ac6cc304c6..df39264cf5 100644 --- a/src/world/area_isk/isk_02/isk_02_2_lock.c +++ b/src/world/area_isk/isk_02/isk_02_2_lock.c @@ -18,14 +18,14 @@ EvtScript N(EVS_UnlockDoor) = { EVT_CALL(CloseChoicePopup) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, 272, 60, 486) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, 272, 60, 486) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_ISK02_UnlockedDoor, TRUE) EVT_SET(LVar0, MV_EntityID_Padlock) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_265, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_0265, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 65, 65, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) diff --git a/src/world/area_isk/isk_02/isk_02_3_ambush.c b/src/world/area_isk/isk_02/isk_02_3_ambush.c index 0db6580b69..e7c9a6ecf5 100644 --- a/src/world/area_isk/isk_02/isk_02_3_ambush.c +++ b/src/world/area_isk/isk_02/isk_02_3_ambush.c @@ -33,7 +33,7 @@ EvtScript N(EVS_SetupSarcophagi) = { EvtScript N(EVS_OpenSarcophagus) = { EVT_IF_EQ(LVar0, 0) - EVT_CALL(PlaySoundAtModel, LVar3, SOUND_1D1, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, LVar3, SOUND_01D1, SOUND_SPACE_MODE_0) EVT_CALL(TranslateModel, LVar3, 0, 0, 13) EVT_WAIT(3) EVT_CALL(MakeLerp, 0, 35, 9, EASING_COS_IN_OUT) diff --git a/src/world/area_isk/isk_03/isk_03_2_sand.c b/src/world/area_isk/isk_03/isk_03_2_sand.c index 224d41eeaa..65458b89b2 100644 --- a/src/world/area_isk/isk_03/isk_03_2_sand.c +++ b/src/world/area_isk/isk_03/isk_03_2_sand.c @@ -220,18 +220,18 @@ EvtScript N(EVS_Scene_DrainSand) = { EVT_EXEC(N(EVS_TexPan_UpperSand)) EVT_EXEC(N(EVS_RescaleDrainingSand)) EVT_EXEC(N(EVS_DrainUpperSand)) - EVT_CALL(PlaySound, SOUND_53) + EVT_CALL(PlaySound, SOUND_0053) EVT_WAIT(75) EVT_EXEC(N(EVS_Camera_LookBelow)) EVT_WAIT(30) EVT_EXEC(N(EVS_TexPan_LowerSand)) EVT_EXEC(N(EVS_FillLowerSand)) - EVT_CALL(PlaySound, SOUND_53 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_0053 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_WAIT(120) EVT_EXEC(N(EVS_LowerSandColumn)) EVT_WAIT(5) EVT_EXEC(N(EVS_CollapseSandPile)) - EVT_CALL(PlaySound, SOUND_53 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_0053 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_WAIT(10) EVT_CALL(EnableModel, MODEL_o1347, FALSE) EVT_CALL(EnableModel, MODEL_o1348, FALSE) diff --git a/src/world/area_isk/isk_04/isk_04_3_obstructions.c b/src/world/area_isk/isk_04/isk_04_3_obstructions.c index 89c6d5d0c0..dba39eba7c 100644 --- a/src/world/area_isk/isk_04/isk_04_3_obstructions.c +++ b/src/world/area_isk/isk_04/isk_04_3_obstructions.c @@ -39,14 +39,14 @@ EvtScript N(EVS_UnlockDoorPrompt) = { EVT_CALL(CloseChoicePopup) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, 600, -330, 100) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, 600, -330, 100) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_ISK04_UnlockedDoor, TRUE) EVT_SET(LVar0, MV_RuinsLockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittsw, SOUND_265, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittsw, SOUND_0265, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 65, 65, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) diff --git a/src/world/area_isk/isk_05/isk_05_3_npc.c b/src/world/area_isk/isk_05/isk_05_3_npc.c index 84d9acb712..a7b61dbaae 100644 --- a/src/world/area_isk/isk_05/isk_05_3_npc.c +++ b/src/world/area_isk/isk_05/isk_05_3_npc.c @@ -165,7 +165,7 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 0) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_266, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_0266, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 65, 0, 15, EASING_QUADRATIC_IN) EVT_LABEL(101) EVT_CALL(UpdateLerp) @@ -174,7 +174,7 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(101) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_267, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_0267, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilittw, COLLIDER_FLAGS_UPPER_MASK) EVT_END_THREAD EVT_CALL(DisablePlayerInput, TRUE) @@ -232,7 +232,7 @@ EvtScript N(EVS_NpcDefeat_StoneChomp_Override) = { EVT_CASE_EQ(OUTCOME_PLAYER_WON) EVT_SET(GF_ISK05_Defeated_StoneChomp, TRUE) EVT_SET(AF_ISK05_StoneChompDefeated, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_265, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_0265, SOUND_SPACE_MODE_0) EVT_THREAD EVT_WAIT(5) EVT_CALL(MakeLerp, 0, 65, 65, EASING_LINEAR) diff --git a/src/world/area_isk/isk_06/isk_06_3_sand.c b/src/world/area_isk/isk_06/isk_06_3_sand.c index 3bc94ae3d5..4614049a66 100644 --- a/src/world/area_isk/isk_06/isk_06_3_sand.c +++ b/src/world/area_isk/isk_06/isk_06_3_sand.c @@ -224,18 +224,18 @@ EvtScript N(EVS_Scene_DrainSand) = { EVT_EXEC(N(EVS_TexPan_UpperSand)) EVT_EXEC(N(EVS_RescaleDrainingSand)) EVT_EXEC(N(EVS_DrainUpperSand)) - EVT_CALL(PlaySound, SOUND_53) + EVT_CALL(PlaySound, SOUND_0053) EVT_WAIT(75) EVT_EXEC(N(EVS_Camera_LookBelow)) EVT_WAIT(30) EVT_EXEC(N(EVS_TexPan_LowerSand)) EVT_EXEC(N(EVS_FillLowerSand)) - EVT_CALL(PlaySound, SOUND_53 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_0053 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_WAIT(120) EVT_EXEC(N(EVS_LowerSandColumn)) EVT_WAIT(5) EVT_EXEC(N(EVS_CollapseSandPile)) - EVT_CALL(PlaySound, SOUND_53 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_0053 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_WAIT(10) EVT_CALL(EnableModel, MODEL_o1686, FALSE) EVT_CALL(EnableModel, MODEL_o1687, FALSE) diff --git a/src/world/area_isk/isk_07/isk_07_4_stairs.c b/src/world/area_isk/isk_07/isk_07_4_stairs.c index a9067c8e2b..f0859e60e8 100644 --- a/src/world/area_isk/isk_07/isk_07_4_stairs.c +++ b/src/world/area_isk/isk_07/isk_07_4_stairs.c @@ -3,7 +3,7 @@ EvtScript N(EVS_RedStairs_FlipCCW) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1994, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o2000, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2000, SOUND_80000002, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2000, SOUND_LOOP_02, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 90, 30, EASING_QUADRATIC_OUT) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -12,7 +12,7 @@ EvtScript N(EVS_RedStairs_FlipCCW) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(StopSound, SOUND_80000002) + EVT_CALL(StopSound, SOUND_LOOP_02) EVT_RETURN EVT_END }; @@ -20,7 +20,7 @@ EvtScript N(EVS_RedStairs_FlipCCW) = { EvtScript N(EVS_RedStairs_FlipCW) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1994, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2000, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o1994, SOUND_80000002, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1994, SOUND_LOOP_02, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 90, 0, 30, EASING_QUADRATIC_OUT) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -29,7 +29,7 @@ EvtScript N(EVS_RedStairs_FlipCW) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(StopSound, SOUND_80000002) + EVT_CALL(StopSound, SOUND_LOOP_02) EVT_RETURN EVT_END }; diff --git a/src/world/area_isk/isk_07/isk_07_5_lock.c b/src/world/area_isk/isk_07/isk_07_5_lock.c index 0b05a7e792..31197ba60b 100644 --- a/src/world/area_isk/isk_07/isk_07_5_lock.c +++ b/src/world/area_isk/isk_07/isk_07_5_lock.c @@ -22,14 +22,14 @@ EvtScript N(EVS_UnlockPrompt_RuinsDoor) = { EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) EVT_RETURN EVT_END_SWITCH - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, -300, -380, 530) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, -300, -380, 530) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_ISK07_UnlockedDoor, TRUE) EVT_SET(LVar0, MV_LockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_265, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_0265, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 65, 65, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -63,7 +63,7 @@ EvtScript N(EVS_SetupLock) = { EvtScript N(EVS_ShutEntryDoor) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilitte, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitte, SOUND_266, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitte, SOUND_0266, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 65, 0, 15, EASING_QUADRATIC_IN) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -73,7 +73,7 @@ EvtScript N(EVS_ShutEntryDoor) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitte, SOUND_267, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitte, SOUND_0267, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.3)) EVT_RETURN EVT_END diff --git a/src/world/area_isk/isk_07/isk_07_7_ambush.c b/src/world/area_isk/isk_07/isk_07_7_ambush.c index 7d393cd7f2..f04229cad1 100644 --- a/src/world/area_isk/isk_07/isk_07_7_ambush.c +++ b/src/world/area_isk/isk_07/isk_07_7_ambush.c @@ -87,7 +87,7 @@ EvtScript N(EVS_SetupSarcophagi) = { }; EvtScript N(EVS_OpenSarcophagusAnim) = { - EVT_CALL(PlaySoundAtModel, LVar3, SOUND_1D1, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, LVar3, SOUND_01D1, SOUND_SPACE_MODE_0) EVT_CALL(TranslateModel, LVar3, 0, 0, 13) EVT_WAIT(3) EVT_CALL(MakeLerp, 0, 35, 9, EASING_COS_IN_OUT) diff --git a/src/world/area_isk/isk_09/isk_09_4_stairs.c b/src/world/area_isk/isk_09/isk_09_4_stairs.c index 0112b76727..64aa8d71fe 100644 --- a/src/world/area_isk/isk_09/isk_09_4_stairs.c +++ b/src/world/area_isk/isk_09/isk_09_4_stairs.c @@ -4,7 +4,7 @@ EvtScript N(EVS_FlipStairsCCW) = { EVT_WAIT(20) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVar3, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, LVar4, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, LVar4, SOUND_80000002, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, LVar4, SOUND_LOOP_02, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 90, LVar5, EASING_COS_IN) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -13,7 +13,7 @@ EvtScript N(EVS_FlipStairsCCW) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(StopSound, SOUND_80000002) + EVT_CALL(StopSound, SOUND_LOOP_02) EVT_RETURN EVT_END }; @@ -21,7 +21,7 @@ EvtScript N(EVS_FlipStairsCCW) = { EvtScript N(EVS_FlipStairsCW) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, LVar3, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVar4, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, LVar3, SOUND_80000002, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, LVar3, SOUND_LOOP_02, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 90, 0, LVar5, EASING_COS_IN) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -30,7 +30,7 @@ EvtScript N(EVS_FlipStairsCW) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(StopSound, SOUND_80000002) + EVT_CALL(StopSound, SOUND_LOOP_02) EVT_RETURN EVT_END }; diff --git a/src/world/area_isk/isk_11/isk_11_4_scene.c b/src/world/area_isk/isk_11/isk_11_4_scene.c index 3edcf1c817..d520c61e78 100644 --- a/src/world/area_isk/isk_11/isk_11_4_scene.c +++ b/src/world/area_isk/isk_11/isk_11_4_scene.c @@ -31,7 +31,7 @@ EvtScript N(EVS_DropHiddenStairs) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_57, SOUND_SPACE_MODE_0, 16, -562, 621) + EVT_CALL(PlaySoundAt, SOUND_0057, SOUND_SPACE_MODE_0, 16, -562, 621) EVT_CALL(MakeLerp, LVar0, -550, 25 * DT, EASING_LINEAR) EVT_CALL(UpdateLerp) EVT_LABEL(20) @@ -48,7 +48,7 @@ EvtScript N(EVS_DropHiddenStairs) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(20) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_57, SOUND_SPACE_MODE_0, 41, -587, 618) + EVT_CALL(PlaySoundAt, SOUND_0057, SOUND_SPACE_MODE_0, 41, -587, 618) EVT_CALL(MakeLerp, LVar0, -800, 25 * DT, EASING_LINEAR) EVT_CALL(UpdateLerp) EVT_LABEL(30) @@ -63,7 +63,7 @@ EvtScript N(EVS_DropHiddenStairs) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(30) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_57, SOUND_SPACE_MODE_0, 66, -612, 616) + EVT_CALL(PlaySoundAt, SOUND_0057, SOUND_SPACE_MODE_0, 66, -612, 616) EVT_CALL(MakeLerp, LVar0, 0xFFFFFBE6, 25 * DT, EASING_LINEAR) EVT_CALL(UpdateLerp) EVT_LABEL(40) @@ -76,7 +76,7 @@ EvtScript N(EVS_DropHiddenStairs) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(40) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_57, SOUND_SPACE_MODE_0, 95, -637, 614) + EVT_CALL(PlaySoundAt, SOUND_0057, SOUND_SPACE_MODE_0, 95, -637, 614) EVT_RETURN EVT_END }; @@ -111,7 +111,7 @@ EvtScript N(EVS_ManageSecretPassage) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_WAIT(10 * DT) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2092, SOUND_55, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2092, SOUND_0055, SOUND_SPACE_MODE_0) EVT_CALL(N(SpawnLensFlare), -16, -438, 510, 240) EVT_CALL(N(SpawnLensFlare), 16, -438, 510, 240) EVT_WAIT(5 * DT) @@ -127,9 +127,9 @@ EvtScript N(EVS_ManageSecretPassage) = { EVT_END_THREAD EVT_WAIT(30 * DT) EVT_THREAD - EVT_CALL(PlaySound, SOUND_80000003) + EVT_CALL(PlaySound, SOUND_LOOP_03) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 330, EVT_FLOAT(0.5)) - EVT_CALL(StopSound, SOUND_80000003) + EVT_CALL(StopSound, SOUND_LOOP_03) EVT_END_THREAD EVT_THREAD EVT_LOOP(12) diff --git a/src/world/area_isk/isk_11/isk_11_5_puzzle.c b/src/world/area_isk/isk_11/isk_11_5_puzzle.c index b3366e1de2..31c074cb6b 100644 --- a/src/world/area_isk/isk_11/isk_11_5_puzzle.c +++ b/src/world/area_isk/isk_11/isk_11_5_puzzle.c @@ -73,7 +73,7 @@ EvtScript N(EVS_ItemPrompt_Socket1) = { EVT_CALL(ShowChoice, MSG_Choice_000D) EVT_CALL(CloseMessage) EVT_IF_EQ(LVar0, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2087, SOUND_261, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2087, SOUND_0261, SOUND_SPACE_MODE_0) EVT_CALL(AddKeyItem, GB_ISK11_ItemSocket1) EVT_SET(LVar0, GB_ISK11_ItemSocket1) EVT_SET(GB_ISK11_ItemSocket1, 0) @@ -103,7 +103,7 @@ EvtScript N(EVS_ItemPrompt_Socket1) = { EVT_CALL(MakeItemEntity, GB_ISK11_ItemSocket1, -88, -508, 502, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(MV_Socket1_ItemEntity, LVar0) EVT_CALL(CloseChoicePopup) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2087, SOUND_261, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2087, SOUND_0261, SOUND_SPACE_MODE_0) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) EVT_RETURN EVT_END @@ -124,7 +124,7 @@ EvtScript N(EVS_ItemPrompt_Socket2) = { EVT_CALL(ShowChoice, MSG_Choice_000D) EVT_CALL(CloseMessage) EVT_IF_EQ(LVar0, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_261, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_0261, SOUND_SPACE_MODE_0) EVT_CALL(AddKeyItem, GB_ISK11_ItemSocket2) EVT_SET(LVar0, GB_ISK11_ItemSocket2) EVT_SET(GB_ISK11_ItemSocket2, 0) @@ -155,7 +155,7 @@ EvtScript N(EVS_ItemPrompt_Socket2) = { EVT_SET(MV_Socket2_ItemEntity, LVar0) EVT_CALL(CloseChoicePopup) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_261, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_0261, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; @@ -175,7 +175,7 @@ EvtScript N(EVS_ItemPrompt_Socket3) = { EVT_CALL(ShowChoice, MSG_Choice_000D) EVT_CALL(CloseMessage) EVT_IF_EQ(LVar0, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_261, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_0261, SOUND_SPACE_MODE_0) EVT_CALL(AddKeyItem, GB_ISK11_ItemSocket3) EVT_SET(LVar0, GB_ISK11_ItemSocket3) EVT_SET(GB_ISK11_ItemSocket3, 0) @@ -206,7 +206,7 @@ EvtScript N(EVS_ItemPrompt_Socket3) = { EVT_SET(MV_Socket3_ItemEntity, LVar0) EVT_CALL(CloseChoicePopup) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_261, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_0261, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; @@ -226,7 +226,7 @@ EvtScript N(EVS_ItemPrompt_Socket4) = { EVT_CALL(ShowChoice, MSG_Choice_000D) EVT_CALL(CloseMessage) EVT_IF_EQ(LVar0, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2089, SOUND_261, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2089, SOUND_0261, SOUND_SPACE_MODE_0) EVT_CALL(AddKeyItem, GB_ISK11_ItemSocket4) EVT_SET(LVar0, GB_ISK11_ItemSocket4) EVT_SET(GB_ISK11_ItemSocket4, 0) @@ -257,7 +257,7 @@ EvtScript N(EVS_ItemPrompt_Socket4) = { EVT_SET(MV_Socket4_ItemEntity, LVar0) EVT_CALL(CloseChoicePopup) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2089, SOUND_261, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2089, SOUND_0261, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; @@ -277,7 +277,7 @@ EvtScript N(EVS_ItemPrompt_Socket5) = { EVT_CALL(ShowChoice, MSG_Choice_000D) EVT_CALL(CloseMessage) EVT_IF_EQ(LVar0, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2088, SOUND_261, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2088, SOUND_0261, SOUND_SPACE_MODE_0) EVT_CALL(AddKeyItem, GB_ISK11_ItemSocket5) EVT_SET(LVar0, GB_ISK11_ItemSocket5) EVT_SET(GB_ISK11_ItemSocket5, 0) @@ -308,7 +308,7 @@ EvtScript N(EVS_ItemPrompt_Socket5) = { EVT_SET(MV_Socket5_ItemEntity, LVar0) EVT_CALL(CloseChoicePopup) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2088, SOUND_261, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2088, SOUND_0261, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; diff --git a/src/world/area_isk/isk_11/isk_11_6_lock.c b/src/world/area_isk/isk_11/isk_11_6_lock.c index 0afb2dd099..803a6e9ea0 100644 --- a/src/world/area_isk/isk_11/isk_11_6_lock.c +++ b/src/world/area_isk/isk_11/isk_11_6_lock.c @@ -18,14 +18,14 @@ EvtScript N(EVS_UnlockPrompt_RuinsKey) = { EVT_CALL(CloseChoicePopup) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, 355, -460, 430) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, 355, -460, 430) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_ISK11_UnlockedDoor, TRUE) EVT_SET(LVar0, MV_LockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_265, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_0265, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 65, 65, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) diff --git a/src/world/area_isk/isk_12/isk_12_3_sand.c b/src/world/area_isk/isk_12/isk_12_3_sand.c index 72e7cea3c2..cd93745cb2 100644 --- a/src/world/area_isk/isk_12/isk_12_3_sand.c +++ b/src/world/area_isk/isk_12/isk_12_3_sand.c @@ -217,18 +217,18 @@ EvtScript N(EVS_Scene_DrainSand) = { EVT_EXEC(N(EVS_TexPan_UpperSand)) EVT_EXEC(N(EVS_RescaleDrainingSand)) EVT_EXEC(N(EVS_DrainUpperSand)) - EVT_CALL(PlaySound, SOUND_53) + EVT_CALL(PlaySound, SOUND_0053) EVT_WAIT(75) EVT_EXEC(N(EVS_Camera_LookBelow)) EVT_WAIT(30) EVT_EXEC(N(EVS_TexPan_LowerSand)) EVT_EXEC(N(EVS_FillLowerSand)) - EVT_CALL(PlaySound, SOUND_53 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_0053 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_WAIT(120) EVT_EXEC(N(EVS_LowerSandColumn)) EVT_WAIT(5) EVT_EXEC(N(EVS_CollapseSandPile)) - EVT_CALL(PlaySound, SOUND_53 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_0053 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_WAIT(10) EVT_CALL(EnableModel, MODEL_o1703, FALSE) EVT_CALL(EnableModel, MODEL_o1704, FALSE) 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 7940110f95..8f08a88d70 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 @@ -62,7 +62,7 @@ EvtScript N(EVS_OnTouch_StaircaseSwitch) = { EVT_CALL(InterpPlayerYaw, 260, 0) EVT_SET(AF_ISK12_StairSwitchActivated, TRUE) EVT_THREAD - EVT_CALL(PlaySoundAt, SOUND_58, SOUND_SPACE_MODE_0, 449, -822, 148) + EVT_CALL(PlaySoundAt, SOUND_0058, SOUND_SPACE_MODE_0, 449, -822, 148) EVT_CALL(MakeLerp, -50, 0, 60, EASING_QUADRATIC_IN) EVT_LABEL(20) EVT_CALL(UpdateLerp) @@ -71,12 +71,12 @@ EvtScript N(EVS_OnTouch_StaircaseSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(20) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_59, SOUND_SPACE_MODE_0, 449, -822, 148) + EVT_CALL(PlaySoundAt, SOUND_0059, SOUND_SPACE_MODE_0, 449, -822, 148) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.1)) EVT_END_THREAD EVT_WAIT(50) EVT_THREAD - EVT_CALL(PlaySoundAt, SOUND_58, SOUND_SPACE_MODE_0, 460, -806, 108) + EVT_CALL(PlaySoundAt, SOUND_0058, SOUND_SPACE_MODE_0, 460, -806, 108) EVT_CALL(MakeLerp, -50, 0, 60, EASING_QUADRATIC_IN) EVT_LABEL(22) EVT_CALL(UpdateLerp) @@ -85,12 +85,12 @@ EvtScript N(EVS_OnTouch_StaircaseSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(22) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_59, SOUND_SPACE_MODE_0, 460, -806, 108) + EVT_CALL(PlaySoundAt, SOUND_0059, SOUND_SPACE_MODE_0, 460, -806, 108) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.1)) EVT_END_THREAD EVT_WAIT(30) EVT_THREAD - EVT_CALL(PlaySoundAt, SOUND_58, SOUND_SPACE_MODE_0, 432, -825, 189) + EVT_CALL(PlaySoundAt, SOUND_0058, SOUND_SPACE_MODE_0, 432, -825, 189) EVT_CALL(MakeLerp, -50, 0, 60, EASING_QUADRATIC_IN) EVT_LABEL(24) EVT_CALL(UpdateLerp) @@ -99,12 +99,12 @@ EvtScript N(EVS_OnTouch_StaircaseSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(24) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_59, SOUND_SPACE_MODE_0, 432, -825, 189) + EVT_CALL(PlaySoundAt, SOUND_0059, SOUND_SPACE_MODE_0, 432, -825, 189) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.1)) EVT_END_THREAD EVT_WAIT(30) EVT_THREAD - EVT_CALL(PlaySoundAt, SOUND_58, SOUND_SPACE_MODE_0, 451, -812, 137) + EVT_CALL(PlaySoundAt, SOUND_0058, SOUND_SPACE_MODE_0, 451, -812, 137) EVT_CALL(MakeLerp, -50, 0, 50, EASING_QUADRATIC_IN) EVT_LABEL(26) EVT_CALL(UpdateLerp) @@ -113,7 +113,7 @@ EvtScript N(EVS_OnTouch_StaircaseSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(26) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_59, SOUND_SPACE_MODE_0, 451, -812, 137) + EVT_CALL(PlaySoundAt, SOUND_0059, SOUND_SPACE_MODE_0, 451, -812, 137) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_WAIT(50) 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 4f2a8a4235..b7d655402d 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,10 +27,10 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_80000067) + EVT_CALL(PlaySound, SOUND_LOOP_67) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, SOUND_SPACE_MODE_0, 408, -825, 414) + EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, 408, -825, 414) EVT_END_THREAD EVT_THREAD EVT_WAIT(45) @@ -39,7 +39,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_THREAD EVT_WAIT(180) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, SOUND_SPACE_MODE_0, 408, -825, 414) + EVT_CALL(PlaySoundAt, SOUND_0137, SOUND_SPACE_MODE_0, 408, -825, 414) EVT_END_THREAD EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD @@ -65,7 +65,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_WAIT(1) EVT_END_IF EVT_CALL(N(StarSpiritEffectFunc4), 3) - EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GB_StoryProgress, STORY_CH2_STAR_SPIRIT_RESCUED) EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_1, TRANSITION_GET_STAR_CARD) 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 482eafb2f3..90f4117d12 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 @@ -109,7 +109,7 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = { EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Idle) EVT_THREAD EVT_WAIT(59) - EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_3EF, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_03EF, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(SetNpcImgFXParams, NPC_Tutankoopa_01, IMGFX_SET_ALPHA, 255, 0, 0, 0) EVT_CALL(SetNpcImgFXFlags, NPC_Tutankoopa_01, IMGFX_FLAG_800) @@ -160,9 +160,9 @@ EvtScript N(EVS_Scene_TutankoopaDefeated) = { EVT_CALL(SetNpcJumpscale, NPC_Tutankoopa_01, EVT_FLOAT(1.0)) EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_20E3, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Tutankoopa_01, 442, -910, 393, 30 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_JUMP_3E2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_ACTOR_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Tutankoopa_01, 416, -910, 420, 20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_JUMP_3E2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_ACTOR_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Tutankoopa_01, 395, -910, 440, 10 * DT) EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Idle) @@ -188,7 +188,7 @@ EvtScript N(EVS_Scene_TutankoopaDefeated) = { EVT_CALL(NpcFaceNpc, NPC_Tutankoopa_01, NPC_ChainChomp, 0) EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Hurt) EVT_CALL(GetNpcPos, NPC_Tutankoopa_01, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_JUMP_3E2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_ACTOR_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Tutankoopa_01, LVar0, LVar1, LVar2, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Idle) EVT_CALL(SpeakToPlayer, NPC_Tutankoopa_01, ANIM_Tutankoopa_Talk, ANIM_Tutankoopa_Idle, 5, MSG_CH2_00E9) diff --git a/src/world/area_iwa/iwa_00/iwa_00_1_main.c b/src/world/area_iwa/iwa_00/iwa_00_1_main.c index ae9f1f44df..900cc680e1 100644 --- a/src/world/area_iwa/iwa_00/iwa_00_1_main.c +++ b/src/world/area_iwa/iwa_00/iwa_00_1_main.c @@ -32,8 +32,8 @@ EvtScript N(EVS_Main) = { EVT_EXEC(N(EVS_TexPan_Water)) EVT_EXEC(N(EVS_BindSlideTriggers)) EVT_CALL(SetMusicTrack, 0, SONG_MT_RUGGED, 0, 8) - EVT_CALL(PlaySoundAtF, SOUND_8000000B, SOUND_SPACE_MODE_1, 35, -80, -120) - EVT_CALL(PlaySoundAtF, SOUND_8000000C, SOUND_SPACE_MODE_1, 500, 85, -120) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_0B, SOUND_SPACE_MODE_1, 35, -80, -120) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_0C, SOUND_SPACE_MODE_1, 500, 85, -120) EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_WAIT(1) diff --git a/src/world/area_iwa/iwa_00/iwa_00_3_npc.c b/src/world/area_iwa/iwa_00/iwa_00_3_npc.c index 0663fb6eec..9969cac6c2 100644 --- a/src/world/area_iwa/iwa_00/iwa_00_3_npc.c +++ b/src/world/area_iwa/iwa_00/iwa_00_3_npc.c @@ -22,7 +22,7 @@ API_CALLABLE(N(func_80240118_90CD58)) { npc->flags |= NPC_FLAG_INVISIBLE; } if (script->functionTemp[1] == 15) { - sfx_play_sound_at_position(SOUND_DEATH, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y + (npc->collisionHeight / 2), npc->pos.z); + sfx_play_sound_at_position(SOUND_ACTOR_DEATH, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y + (npc->collisionHeight / 2), npc->pos.z); fx_damage_stars(1, npc->pos.x, npc->pos.y + (npc->collisionHeight / 2), npc->pos.z, 0.0f, -1.0f, 0.0f, 10); } diff --git a/src/world/area_iwa/iwa_01/iwa_01_1_main.c b/src/world/area_iwa/iwa_01/iwa_01_1_main.c index ab4f7f448e..803e10d9cd 100644 --- a/src/world/area_iwa/iwa_01/iwa_01_1_main.c +++ b/src/world/area_iwa/iwa_01/iwa_01_1_main.c @@ -59,8 +59,8 @@ EvtScript N(EVS_Main) = { EVT_EXEC(N(EVS_BindSlideTriggers2)) EVT_EXEC(N(EVS_BindSlideTriggers1)) EVT_CALL(SetMusicTrack, 0, SONG_MT_RUGGED, 0, 8) - EVT_CALL(PlaySoundAtF, SOUND_8000000D, SOUND_SPACE_MODE_1, -570, -180, 425) - EVT_CALL(PlaySoundAtF, SOUND_8000000E, SOUND_SPACE_MODE_1, 740, -170, 330) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_0D, SOUND_SPACE_MODE_1, -570, -180, 425) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_0E, SOUND_SPACE_MODE_1, 740, -170, 330) EVT_CALL(GetLoadType, LVar1) EVT_IF_EQ(LVar1, 1) EVT_EXEC(EnterSavePoint) diff --git a/src/world/area_iwa/iwa_10/iwa_10_1_music.c b/src/world/area_iwa/iwa_10/iwa_10_1_music.c index 6176621ae0..fa065867de 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_1_music.c +++ b/src/world/area_iwa/iwa_10/iwa_10_1_music.c @@ -7,7 +7,7 @@ EvtScript N(EVS_SetupMusic) = { }; EvtScript N(EVS_PushSong) = { - EVT_CALL(StopSound, SOUND_80000009) + EVT_CALL(StopSound, SOUND_LOOP_09) EVT_CALL(PushSong, SONG_NEW_PARTNER, 0) EVT_RETURN EVT_END @@ -17,7 +17,7 @@ EvtScript N(EVS_PopSong) = { EVT_CALL(FadeOutMusic, 0, 500) EVT_WAIT(15) EVT_CALL(PopSong) - EVT_CALL(PlaySoundAtF, SOUND_80000009, SOUND_SPACE_MODE_1, -560, 0, -233) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_09, SOUND_SPACE_MODE_1, -560, 0, -233) EVT_RETURN EVT_END }; diff --git a/src/world/area_iwa/iwa_10/iwa_10_2_main.c b/src/world/area_iwa/iwa_10/iwa_10_2_main.c index 084e963b82..44becb614e 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_2_main.c +++ b/src/world/area_iwa/iwa_10/iwa_10_2_main.c @@ -53,7 +53,7 @@ EvtScript N(EVS_Main) = { EVT_WAIT(1) EVT_EXEC(N(EVS_SetupMusic)) EVT_EXEC(N(EVS_SetupFoliage)) - EVT_CALL(PlaySoundAtF, SOUND_80000009, SOUND_SPACE_MODE_1, -560, 0, -233) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_09, SOUND_SPACE_MODE_1, -560, 0, -233) EVT_THREAD EVT_SET(LVarF, 0) EVT_LABEL(10) 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 9c1476c91c..028c0d2c13 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 @@ -3,7 +3,7 @@ #include "common/CosInterpMinMax.inc.c" EvtScript N(EVS_SpawnSmoke) = { - EVT_CALL(PlaySoundAtModel, MODEL_07, SOUND_B000001A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_07, SOUND_SEQ_1A, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, MV_TrainMoveDist) EVT_IF_EQ(MF_TrainReverseDir, FALSE) EVT_ADDF(LVar0, -310) @@ -382,7 +382,7 @@ EvtScript N(EVS_ArriveFromToadTown) = { EVT_LABEL(1) EVT_SET(MV_TrainMoveDist, 0) EVT_SET(MV_TrainMoveSpeed, 0) - EVT_CALL(PlaySound, SOUND_1FD) + EVT_CALL(PlaySound, SOUND_01FD) EVT_KILL_THREAD(LVarE) EVT_SET(MF_TrainMoving, FALSE) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) @@ -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_82) + EVT_CALL(PlaySound, SOUND_0082) EVT_THREAD EVT_LOOP(1000) EVT_SUBF(MV_TrainMoveSpeed, EVT_FLOAT(0.031)) diff --git a/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c b/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c index 617af4042a..926a4a53cf 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c +++ b/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c @@ -22,7 +22,7 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_CALL(ShowMessageAtScreenPos, MSG_CH2_000E, 320, 150) EVT_THREAD EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_END_THREAD EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT), 30, 300, EVT_FLOAT(15.0), EVT_FLOAT(-9.5)) @@ -105,7 +105,7 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_SUB(LVar0, 30) EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 15 * DT) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_162, SOUND_SPACE_MODE_0, LVarA, LVarB, LVarC) + EVT_CALL(PlaySoundAt, SOUND_0162, SOUND_SPACE_MODE_0, LVarA, LVarB, LVarC) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD diff --git a/src/world/area_iwa/iwa_11/iwa_11_3_train.c b/src/world/area_iwa/iwa_11/iwa_11_3_train.c index a004b9ea8f..5a191181d1 100644 --- a/src/world/area_iwa/iwa_11/iwa_11_3_train.c +++ b/src/world/area_iwa/iwa_11/iwa_11_3_train.c @@ -17,7 +17,7 @@ API_CALLABLE(N(GetLargeWheelAngle)) { } EvtScript N(EVS_SpawnSmoke) = { - EVT_CALL(PlaySoundAtModel, MODEL_07, SOUND_B000001A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_07, SOUND_SEQ_1A, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, MV_TrainMoveDist) EVT_IF_EQ(MF_TrainReverseDir, FALSE) EVT_ADDF(LVar0, -310) diff --git a/src/world/area_jan/jan_00/jan_00_1_main.c b/src/world/area_jan/jan_00/jan_00_1_main.c index 24a10e810e..b2f95fbcfd 100644 --- a/src/world/area_jan/jan_00/jan_00_1_main.c +++ b/src/world/area_jan/jan_00/jan_00_1_main.c @@ -67,7 +67,7 @@ EvtScript N(EVS_Main) = { EVT_END_IF EVT_CALL(func_8024030C_B2084C) EVT_EXEC_WAIT(N(EVS_80241C10)) - EVT_CALL(PlaySound, SOUND_80000017) + EVT_CALL(PlaySound, SOUND_LOOP_17) EVT_RETURN EVT_END }; diff --git a/src/world/area_jan/jan_00/jan_00_2_npc.c b/src/world/area_jan/jan_00/jan_00_2_npc.c index 4d32755c86..ad49d22b4e 100644 --- a/src/world/area_jan/jan_00/jan_00_2_npc.c +++ b/src/world/area_jan/jan_00/jan_00_2_npc.c @@ -301,7 +301,7 @@ EvtScript N(D_80242FA8_B234E8) = { EVT_CALL(NpcMoveTo, NPC_Kolorado_02, LVar0, LVar2, 10) EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Thrown) EVT_CALL(SetNpcJumpscale, NPC_Kolorado_02, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Kolorado_02, 224, 0, 20, 20) EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Walk) EVT_CALL(NpcMoveTo, NPC_Kolorado_02, 290, 20, 20) @@ -346,7 +346,7 @@ EvtScript N(D_80242FA8_B234E8) = { EVT_CALL(InterpNpcYaw, NPC_Kolorado_02, 90, 4) EVT_WAIT(15) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_Kolorado_02, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Kolorado_02, LVar0, LVar1, LVar2, 15) EVT_WAIT(25) @@ -461,7 +461,7 @@ EvtScript N(EVS_NpcInteract_Kolorado_01) = { EVT_CALL(func_80240B4C_B2108C, 2, LVar0, LVar1, LVar2) EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Thrown) EVT_CALL(SetNpcJumpscale, NPC_Kolorado_02, EVT_FLOAT(0.5)) - EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Kolorado_02, LVar0, LVar1, LVar2, 20) EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Idle) EVT_CALL(InterpNpcYaw, NPC_Kolorado_02, 90, 0) @@ -561,7 +561,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { EVT_CALL(SpeakToPlayer, NPC_SELF, 0xFFFFFFFF, 0xFFFFFFFF, 5, MSG_CH5_0008) EVT_EXEC_GET_TID(N(D_802441C8_B24708), LVar9) EVT_CALL(SetMusicTrack, 0, SONG_JR_TROOPA_THEME, 0, 8) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_80000055, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_LOOP_JR_TROOPA_SWIM, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(func_80241134_B21674) EVT_END_THREAD @@ -582,7 +582,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Charge) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) - EVT_CALL(StopSound, SOUND_80000055) + EVT_CALL(StopSound, SOUND_LOOP_JR_TROOPA_SWIM) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_JR_TROOPA_SPLASH, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 250, 0, 90, 20) EVT_KILL_THREAD(LVar9) @@ -596,7 +596,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_TiredTalk, ANIM_JrTroopa_OutOfBreath, 0, MSG_CH5_000A) EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Panic) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(NpcJump0, NPC_SELF, 250, 0, 90, 10) @@ -618,7 +618,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { EVT_CALL(NpcJump0, NPC_SELF, 80, -50, 90, 20) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_JR_TROOPA_SPLASH, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcRotation, NPC_SELF, 0, -20, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_80000055, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_LOOP_JR_TROOPA_SWIM, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) EVT_CALL(NpcMoveTo, NPC_SELF, -555, -32, 0) diff --git a/src/world/area_jan/jan_01/jan_01_2_main.c b/src/world/area_jan/jan_01/jan_01_2_main.c index 5d73cdf321..400f27c12b 100644 --- a/src/world/area_jan/jan_01/jan_01_2_main.c +++ b/src/world/area_jan/jan_01/jan_01_2_main.c @@ -31,7 +31,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC(EnterWalk) EVT_WAIT(1) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_80000017) + EVT_CALL(PlaySound, SOUND_LOOP_17) EVT_CALL(EnableTexPanning, MODEL_o75, TRUE) EVT_CALL(EnableTexPanning, MODEL_o7, TRUE) EVT_CALL(EnableTexPanning, MODEL_o6, TRUE) diff --git a/src/world/area_jan/jan_01/jan_01_3_npc.c b/src/world/area_jan/jan_01/jan_01_3_npc.c index 745b36530d..93d6506808 100644 --- a/src/world/area_jan/jan_01/jan_01_3_npc.c +++ b/src/world/area_jan/jan_01/jan_01_3_npc.c @@ -46,9 +46,9 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_END_LOOP EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_000D, 320, 60) - EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 25, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 25, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25 * DT) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_jan/jan_02/jan_02_2_main.c b/src/world/area_jan/jan_02/jan_02_2_main.c index bbbe16216a..19ba9ac564 100644 --- a/src/world/area_jan/jan_02/jan_02_2_main.c +++ b/src/world/area_jan/jan_02/jan_02_2_main.c @@ -73,7 +73,7 @@ EvtScript N(EVS_Main) = { EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_80000017) + EVT_CALL(PlaySound, SOUND_LOOP_17) EVT_CALL(EnableTexPanning, MODEL_o202, TRUE) EVT_CALL(EnableTexPanning, MODEL_o203, TRUE) EVT_CALL(EnableTexPanning, MODEL_o103, TRUE) 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 5813dd0065..31117fff07 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 @@ -83,7 +83,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC(N(EVS_EnterMap)) EVT_WAIT(1) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_80000017) + EVT_CALL(PlaySound, SOUND_LOOP_17) EVT_EXEC(N(EVS_SetupRooms)) EVT_EXEC(N(EVS_SetupFoliage)) EVT_CALL(EnableTexPanning, MODEL_o121, TRUE) diff --git a/src/world/area_jan/jan_03/jan_03_4_npc.c b/src/world/area_jan/jan_03/jan_03_4_npc.c index 896b75a504..c7d755999e 100644 --- a/src/world/area_jan/jan_03/jan_03_4_npc.c +++ b/src/world/area_jan/jan_03/jan_03_4_npc.c @@ -668,7 +668,7 @@ EvtScript N(EVS_NpcInteract_Kolorado) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_IdleSad) EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_001A) 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 63bf065213..5810bcad2e 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_2A0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Sushie, SOUND_02A0, 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_2A0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Sushie, SOUND_02A0, 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_2A0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Sushie, SOUND_02A0, 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_04/jan_04_8_treasure.c b/src/world/area_jan/jan_04/jan_04_8_treasure.c index a4528b456a..3fe4be0201 100644 --- a/src/world/area_jan/jan_04/jan_04_8_treasure.c +++ b/src/world/area_jan/jan_04/jan_04_8_treasure.c @@ -69,7 +69,7 @@ EvtScript N(EVS_Scene_TreasureChest) = { EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, jan_04_ENTRY_1) - EVT_CALL(PlaySound, SOUND_302) + EVT_CALL(PlaySound, SOUND_0302) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -350, 300, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, -350, 300, 0) EVT_CALL(SetCamPitch, CAM_DEFAULT, 10, EVT_FLOAT(-7.0)) @@ -124,7 +124,7 @@ EvtScript N(EVS_Scene_TreasureChest) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_1AF, 0, LVar1, LVar2, LVar3) + EVT_CALL(PlaySoundAt, SOUND_01AF, 0, LVar1, LVar2, LVar3) EVT_THREAD EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -15, 0, 0, 10, 10) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, 0, 0, 0, 0, 0) @@ -140,7 +140,7 @@ EvtScript N(EVS_Scene_TreasureChest) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_1AF, 0, LVar1, LVar2, LVar3) + EVT_CALL(PlaySoundAt, SOUND_01AF, 0, LVar1, LVar2, LVar3) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -10, 0, 15, 0, 0) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -10, 0, 15, 0, 0) EVT_WAIT(60) diff --git a/src/world/area_jan/jan_05/jan_05_5_npc.c b/src/world/area_jan/jan_05/jan_05_5_npc.c index f873e408aa..aa9c7be3b5 100644 --- a/src/world/area_jan/jan_05/jan_05_5_npc.c +++ b/src/world/area_jan/jan_05/jan_05_5_npc.c @@ -20,7 +20,7 @@ EvtScript N(EVS_NpcIdle_JungleFuzzy) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, 125, 100, -392) - EVT_CALL(PlaySoundWithVolume, SOUND_331, 110) + EVT_CALL(PlaySoundWithVolume, SOUND_SRAW_17_A, 110) EVT_WAIT(20) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8, TRUE) @@ -63,7 +63,7 @@ EvtScript N(EVS_OnShakeTree_Yoshi) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SetNpcVar, NPC_YoshiKid, 0, 9) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_301, 0) + EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_0301, 0) EVT_CALL(SetNpcJumpscale, NPC_YoshiKid, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_YoshiKid, -308, 0, -248, 30) EVT_END_THREAD @@ -78,9 +78,9 @@ EvtScript N(EVS_OnShakeTree_Yoshi) = { EvtScript N(EVS_YoshiKid_Sleeping) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_32F, 0) + EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_SRAW_0C_A, 0) EVT_WAIT(24) - EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_334, 0) + EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_SRAW_0D_A, 0) EVT_WAIT(21) EVT_CALL(GetNpcVar, NPC_YoshiKid, 0, LVar0) EVT_IF_GE(LVar0, 9) @@ -103,7 +103,7 @@ EvtScript N(EVS_YoshiKid_PlaySounds) = { EVT_KILL_THREAD(LVar9) EVT_CALL(SetNpcAnimation, NPC_YoshiKid, ANIM_YoshiKid_Purple_Cry) EVT_LOOP(3) - EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_1F0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_01F0, 0) EVT_WAIT(13) EVT_END_LOOP EVT_RETURN 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 5124bff928..53cb6eebc3 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_9E, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_LRAW_009E, 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_80000018) + EVT_CALL(PlaySound, SOUND_LOOP_18) EVT_EXEC_WAIT(N(EVS_MoveStatue)) EVT_CALL(GetModelCenter, MODEL_o162) - EVT_CALL(PlaySoundAt, SOUND_80000010, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_LOOP_10, 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_80000010) - EVT_CALL(StopSound, SOUND_80000018) + EVT_CALL(StopSound, SOUND_LOOP_10) + EVT_CALL(StopSound, SOUND_LOOP_18) 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_07/jan_07_3_npc.c b/src/world/area_jan/jan_07/jan_07_3_npc.c index 58f6f971fe..34a915fece 100644 --- a/src/world/area_jan/jan_07/jan_07_3_npc.c +++ b/src/world/area_jan/jan_07/jan_07_3_npc.c @@ -16,7 +16,7 @@ NpcSettings N(NpcSettings_PutridPiranha) = { EvtScript N(EVS_YoshiKid_CryForHelp) = { EVT_SET(AF_JAN_02, FALSE) EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_1F0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_01F0, 0) EVT_WAIT(20) EVT_IF_EQ(AF_JAN_02, TRUE) EVT_BREAK_LOOP @@ -30,9 +30,9 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { EVT_IF_EQ(GF_JAN07_YoshiCriedForHelp, FALSE) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00B4, 320, 60) - EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -183, 50, -11) @@ -75,7 +75,7 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { EVT_WAIT(15) EVT_SET(AF_JAN_02, TRUE) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_END_THREAD EVT_WAIT(30) @@ -181,11 +181,11 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_CALL(InterpNpcYaw, NPC_PutridPiranha_01, 270, 0) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim04) - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_02, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_02, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_PutridPiranha_02, EMOTE_EXCLAMATION, 0, 38, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(3) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim04) - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_PutridPiranha_01, EMOTE_EXCLAMATION, 0, 35, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(35) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim01) @@ -246,7 +246,7 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim06) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim06) - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_3B2, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_03B2, 0) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) EVT_RETURN diff --git a/src/world/area_jan/jan_08/jan_08_5_npc.c b/src/world/area_jan/jan_08/jan_08_5_npc.c index dd8ca7a7c5..462a35ad7e 100644 --- a/src/world/area_jan/jan_08/jan_08_5_npc.c +++ b/src/world/area_jan/jan_08/jan_08_5_npc.c @@ -11,7 +11,7 @@ EvtScript N(EVS_YoshiKid_CryForHelp) = { EVT_SET(AF_JAN_02, FALSE) EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_1F0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_01F0, 0) EVT_WAIT(20) EVT_IF_EQ(AF_JAN_02, TRUE) EVT_BREAK_LOOP diff --git a/src/world/area_jan/jan_10/jan_10_3_npc.c b/src/world/area_jan/jan_10/jan_10_3_npc.c index 689b1891b5..1bddb05af5 100644 --- a/src/world/area_jan/jan_10/jan_10_3_npc.c +++ b/src/world/area_jan/jan_10/jan_10_3_npc.c @@ -16,7 +16,7 @@ EvtScript N(EVS_NpcIdle_JungleFuzzy) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, -566, 100, 65) - EVT_CALL(PlaySoundWithVolume, SOUND_331, 110) + EVT_CALL(PlaySoundWithVolume, SOUND_SRAW_17_A, 110) EVT_WAIT(20) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8, TRUE) @@ -38,7 +38,7 @@ EvtScript N(EVS_NpcInit_JungleFuzzy) = { EvtScript N(EVS_YoshiKid_CryForHelp) = { EVT_SET(AF_JAN_02, FALSE) EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_1F0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_01F0, 0) EVT_WAIT(20) EVT_IF_EQ(AF_JAN_02, TRUE) EVT_BREAK_LOOP diff --git a/src/world/area_jan/jan_11/jan_11_3_npc.c b/src/world/area_jan/jan_11/jan_11_3_npc.c index 903a9ce572..6148734934 100644 --- a/src/world/area_jan/jan_11/jan_11_3_npc.c +++ b/src/world/area_jan/jan_11/jan_11_3_npc.c @@ -6,7 +6,7 @@ EvtScript N(EVS_YoshiKid_CryForHelp) = { EVT_SET(AF_JAN_02, FALSE) EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_1F0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_01F0, 0) EVT_WAIT(20) EVT_IF_EQ(AF_JAN_02, TRUE) EVT_BREAK_LOOP diff --git a/src/world/area_jan/jan_13/jan_13_2_puzzle.c b/src/world/area_jan/jan_13/jan_13_2_puzzle.c index 18e53da9e0..4465eb0e77 100644 --- a/src/world/area_jan/jan_13/jan_13_2_puzzle.c +++ b/src/world/area_jan/jan_13/jan_13_2_puzzle.c @@ -40,7 +40,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_4E, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_LRAW_004E, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); } return ApiStatus_DONE2; } @@ -228,8 +228,8 @@ EvtScript N(EVS_ManageGeyserSounds) = { EVT_IF_NE(AB_JAN13_LastPuzzleProgress, MV_PuzzleProgress) EVT_SET(AB_JAN13_LastPuzzleProgress, MV_PuzzleProgress) EVT_SET(MF_GeyserSoundPlaying, FALSE) - EVT_CALL(StopSound, SOUND_8000001C) - EVT_CALL(StopSound, SOUND_8000001D) + EVT_CALL(StopSound, SOUND_LOOP_1C) + EVT_CALL(StopSound, SOUND_LOOP_1D) EVT_IF_EQ(MV_PuzzleProgress, 5) EVT_IF_EQ(GF_JAN13_SolvedBlockPuzzle, FALSE) EVT_RETURN @@ -239,7 +239,7 @@ EvtScript N(EVS_ManageGeyserSounds) = { EVT_RETURN EVT_END_IF EVT_END_IF - EVT_CALL(PlaySound, SOUND_8000001C) + EVT_CALL(PlaySound, SOUND_LOOP_1C) EVT_SET(MF_GeyserSoundPlaying, TRUE) EVT_SET(LVar0, MV_PuzzleProgress) EVT_ADD(LVar0, 1) @@ -254,7 +254,7 @@ EvtScript N(EVS_ManageGeyserSounds) = { }; EvtScript N(EVS_BoulderTremble) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o33, SOUND_191, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o33, SOUND_0191, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.5)) EVT_RETURN EVT_END @@ -340,7 +340,7 @@ EvtScript N(EVS_ManagePuzzle) = { EVT_WAIT(8) EVT_END_LOOP EVT_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_CALL(GetModelCenter, MODEL_o33) EVT_CALL(FacePlayerTowardPoint, LVar0, LVar2, 4) @@ -393,7 +393,7 @@ EvtScript N(EVS_ManagePuzzle) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(0.4)) EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_8000001D, 0, 37, 0, -138) + EVT_CALL(PlaySoundAt, SOUND_LOOP_1D, 0, 37, 0, -138) EVT_SET(AB_JAN_2, 1) EVT_THREAD EVT_LOOP(200) diff --git a/src/world/area_jan/jan_15/jan_15_2_npc.c b/src/world/area_jan/jan_15/jan_15_2_npc.c index 021ef777ac..186c47fd9e 100644 --- a/src/world/area_jan/jan_15/jan_15_2_npc.c +++ b/src/world/area_jan/jan_15/jan_15_2_npc.c @@ -78,7 +78,7 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_CALL(SetNpcRotation, NPC_PutridPiranha_03, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_03, SOUND_3B1, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_03, SOUND_03B1, 0) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_03, ANIM_LargePiranha_Putrid_Anim01) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim04) @@ -142,7 +142,7 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim06) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim06) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_03, ANIM_LargePiranha_Putrid_Anim06) - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_3B2, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_03B2, 0) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) EVT_RETURN diff --git a/src/world/area_jan/jan_16/jan_16_3_npc.c b/src/world/area_jan/jan_16/jan_16_3_npc.c index d98d8050a4..1bc4d278df 100644 --- a/src/world/area_jan/jan_16/jan_16_3_npc.c +++ b/src/world/area_jan/jan_16/jan_16_3_npc.c @@ -114,7 +114,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven) = { EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_SELF, 2) EVT_CALL(NpcJump1, NPC_SELF, LVar0, LVar1, LVar2, 30) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_18A, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_018A, 0) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 50, EVT_FLOAT(1.0)) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) @@ -156,11 +156,11 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven) = { EVT_LOOP(6) EVT_SWITCH(LVar0) EVT_CASE_RANGE(1, 4) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o97, SOUND_18C, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o97, SOUND_018C, 0) EVT_CASE_EQ(5) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o97, SOUND_18D, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o97, SOUND_018D, 0) EVT_CASE_EQ(6) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o97, SOUND_18E, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o97, SOUND_018E, 0) EVT_END_SWITCH EVT_ADD(LVar0, 1) EVT_WAIT(20) 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 dedc19c442..f951408414 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 @@ -78,7 +78,7 @@ EvtScript N(EVS_UseBasketElevator) = { EVT_END_IF EVT_EXEC_GET_TID(N(EVS_TetherCamToBasketPlayer), LVar7) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) - EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_186, 0) + EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_0186, 0) EVT_CALL(MakeLerp, 0, 170, 60, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -109,7 +109,7 @@ EvtScript N(EVS_UseBasketElevator) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_186, 0) + EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_0186, 0) EVT_CALL(MakeLerp, 170, 0, 60, EASING_CUBIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -176,34 +176,34 @@ EvtScript N(EVS_GatherRavensNearRaphael) = { EvtScript N(EVS_Ravens_LeapIntoTree) = { EVT_CHILD_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_2A6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_SRAW_13_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_2A7, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_SRAW_13_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_2A6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_01, SOUND_SRAW_13_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_2A7, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_03, SOUND_SRAW_13_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_2A6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_SRAW_13_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) @@ -281,7 +281,7 @@ EvtScript N(EVS_Raven_HopAndWalkAway) = { }; EvtScript N(EVS_BuildingEffects) = { - EVT_CALL(PlaySoundAt, SOUND_8000001E, 0, 270, 130, 0) + EVT_CALL(PlaySoundAt, SOUND_LOOP_1E, 0, 270, 130, 0) EVT_LOOP(0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(1.0)) EVT_WAIT(30 * DT) @@ -365,7 +365,7 @@ EvtScript N(EVS_ManageRavens) = { EVT_CALL(InterpNpcYaw, NPC_Raven_02, 270, 0) EVT_END_THREAD EVT_WAIT(3 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_20C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_SRAW_14_A, 0) EVT_CALL(SetNpcRotation, NPC_Raven_04, 0, 0, 180) EVT_CALL(SetNpcFlagBits, NPC_Raven_04, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(InterpNpcYaw, NPC_Raven_03, 270, 0) @@ -407,7 +407,7 @@ EvtScript N(EVS_ManageRavens) = { EVT_GOTO(11) EVT_END_IF EVT_WAIT(40 * DT) - EVT_CALL(StopSound, SOUND_8000001E) + EVT_CALL(StopSound, SOUND_LOOP_1E) EVT_KILL_THREAD(LVarA) EVT_CALL(SetSelfVar, 0, RAVEN_SCENE_FINISH_WORK) EVT_CASE_EQ(RAVEN_SCENE_FINISH_WORK) @@ -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_2A6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_SRAW_13_A, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 60) EVT_CALL(NpcJump0, NPC_Raven_05, LVar0, 0, 40, 20 * DT) @@ -439,13 +439,13 @@ 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_2A6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_SRAW_13_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) EVT_CALL(SpeakToPlayer, NPC_Raven_05, ANIM_Raven_Talk, ANIM_Raven_Idle, 0, MSG_CH5_00CD) EVT_THREAD - EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_186, 0) + EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_0186, 0) EVT_CALL(MakeLerp, 170, 0, 60, EASING_CUBIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -481,7 +481,7 @@ EvtScript N(EVS_ManageRavens) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_2A6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_SRAW_13_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_2A7, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_SRAW_13_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_2A6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_03, SOUND_SRAW_13_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_2A7, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_SRAW_13_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) @@ -703,9 +703,9 @@ EvtScript N(EVS_NpcIdle_Kolorado_HeldCaptive) = { EVT_END_LOOP EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00BC, 320, 60) - EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 25, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 25, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25 * DT) EVT_CALL(DisablePlayerInput, FALSE) @@ -809,9 +809,9 @@ EvtScript N(EVS_NpcIdle_Kolorado_Before) = { EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00C5, 0, 60) - EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 20, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20 * DT) EVT_CALL(DisablePlayerInput, FALSE) @@ -865,11 +865,11 @@ EvtScript N(EVS_NpcIdle_Kolorado_After) = { EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, 190, 60, 0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.5)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, 0) EVT_CALL(NpcJump0, NPC_SELF, 200, 0, 0, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) EVT_CALL(SetSelfVar, 0, 21) - EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_186, 0) + EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_0186, 0) EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5) EVT_CALL(MakeLerp, 0, 170, 60, EASING_LINEAR) EVT_LOOP(0) @@ -890,7 +890,7 @@ EvtScript N(EVS_NpcIdle_Kolorado_After) = { EVT_END_LOOP EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_WAIT(40 * DT) - EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_186, 0) + EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_0186, 0) EVT_CALL(MakeLerp, 170, 0, 60, EASING_CUBIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -1305,7 +1305,7 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMisstar_Leap) EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) - EVT_CALL(PlaySoundAtPlayer, SOUND_139, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0139, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) EVT_ADD(LVar1, 50) @@ -1318,7 +1318,7 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_WAIT(6 * DT) EVT_END_LOOP EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0188, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) 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 97283af32e..6ebefaea71 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 @@ -8,7 +8,7 @@ API_CALLABLE(N(Zipline_AdjustMoveDownSound)) { 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_168, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_LRAW_0168, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); } return ApiStatus_DONE2; } @@ -20,7 +20,7 @@ API_CALLABLE(N(Zipline_AdjustMoveUpSound)) { 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_185, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_LRAW_0185, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); } return ApiStatus_DONE2; } @@ -124,7 +124,7 @@ EvtScript N(EVS_RideZipline) = { EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_HoldOnto) EVT_WAIT(10) EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) - EVT_CALL(PlaySound, SOUND_80000019) + EVT_CALL(PlaySound, SOUND_LOOP_19) EVT_CHILD_THREAD EVT_SET(MF_RidingZipline1, TRUE) EVT_SET(LVar0, ArrayVar(6)) @@ -156,7 +156,7 @@ EvtScript N(EVS_RideZipline) = { EVT_LABEL(10) EVT_CALL(SetPlayerFlagBits, PS_FLAG_SCRIPTED_FALL, TRUE) EVT_SET(MF_RidingZipline1, FALSE) - EVT_CALL(StopSound, SOUND_80000019) + EVT_CALL(StopSound, SOUND_LOOP_19) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o339, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o339, COLLIDER_FLAG_IGNORE_SHELL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o276, COLLIDER_FLAGS_UPPER_MASK) @@ -166,7 +166,7 @@ EvtScript N(EVS_RideZipline) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_KILL_THREAD(LVar9) EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_8000001A) + EVT_CALL(PlaySound, SOUND_LOOP_1A) EVT_CHILD_THREAD EVT_SET(MF_RidingZipline2, TRUE) EVT_SET(LVar0, ArrayVar(6)) @@ -193,7 +193,7 @@ EvtScript N(EVS_RideZipline) = { EVT_GOTO(1) EVT_END_IF EVT_SET(MF_RidingZipline2, FALSE) - EVT_CALL(StopSound, SOUND_8000001A) + EVT_CALL(StopSound, SOUND_LOOP_1A) EVT_RETURN EVT_END }; diff --git a/src/world/area_jan/jan_23/jan_23_3_npc.c b/src/world/area_jan/jan_23/jan_23_3_npc.c index 1f8c834ca3..99bb690339 100644 --- a/src/world/area_jan/jan_23/jan_23_3_npc.c +++ b/src/world/area_jan/jan_23/jan_23_3_npc.c @@ -257,11 +257,11 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(12.0)) EVT_LOOP(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_386, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0386, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, 310) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_387, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0387, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, 460) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) @@ -306,7 +306,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_ADD(LVar0, -120) EVT_ADD(LVar1, -250) EVT_ADD(LVar2, 63) - EVT_CALL(PlaySoundAtNpc, NPC_Raven_01, SOUND_20C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_01, SOUND_SRAW_14_A, 0) EVT_CALL(NpcJump0, NPC_Raven_01, LVar0, LVar1, LVar2, 100) EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Idle) EVT_CALL(EnableNpcShadow, NPC_Raven_01, TRUE) @@ -320,7 +320,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_ADD(LVar0, -120) EVT_ADD(LVar1, -250) EVT_ADD(LVar2, 63) - EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_20D, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_SRAW_14_B, 0) EVT_CALL(NpcJump0, NPC_Raven_02, LVar0, LVar1, LVar2, 100) EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Idle) EVT_CALL(EnableNpcShadow, NPC_Raven_02, TRUE) @@ -342,7 +342,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_ADD(LVar0, -100) EVT_ADD(LVar1, -250) EVT_ADD(LVar2, 50) - EVT_CALL(PlaySoundAtNpc, NPC_Raven_03, SOUND_20E, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_03, SOUND_SRAW_14_C, 0) EVT_CALL(NpcJump0, NPC_Raven_03, LVar0, LVar1, LVar2, 90) EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Idle) EVT_CALL(EnableNpcShadow, NPC_Raven_03, TRUE) @@ -356,7 +356,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_ADD(LVar0, -100) EVT_ADD(LVar1, -250) EVT_ADD(LVar2, 60) - EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_20C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_SRAW_14_A, 0) EVT_CALL(NpcJump0, NPC_Raven_04, LVar0, LVar1, LVar2, 100) EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Idle) EVT_CALL(EnableNpcShadow, NPC_Raven_04, TRUE) @@ -365,7 +365,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_WAIT(20) EVT_EXEC(N(EVS_Raven5_Descend)) EVT_CALL(SetNpcJumpscale, NPC_Raven_05, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_20D, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_SRAW_14_B, 0) EVT_CALL(NpcJump0, NPC_Raven_05, 737, 200, 65, 100) EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Idle) EVT_CALL(EnableNpcShadow, NPC_Raven_05, TRUE) @@ -387,7 +387,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_WAIT(20 * DT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_14_A, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) @@ -413,7 +413,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_WAIT(40 * DT) EVT_THREAD EVT_WAIT(35 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Raven_01, SOUND_20D, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_01, SOUND_SRAW_14_B, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcFlagBits, NPC_Raven_01, NPC_FLAG_GRAVITY, TRUE) @@ -437,7 +437,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_WAIT(20 * DT) EVT_THREAD EVT_WAIT(35 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_20E, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_SRAW_14_C, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcFlagBits, NPC_Raven_02, NPC_FLAG_GRAVITY, TRUE) @@ -461,7 +461,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_WAIT(20 * DT) EVT_THREAD EVT_WAIT(35 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Raven_03, SOUND_20C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_03, SOUND_SRAW_14_A, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcFlagBits, NPC_Raven_03, NPC_FLAG_GRAVITY, TRUE) @@ -485,7 +485,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_WAIT(20 * DT) EVT_THREAD EVT_WAIT(35 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_20D, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_SRAW_14_B, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcFlagBits, NPC_Raven_04, NPC_FLAG_GRAVITY, TRUE) @@ -509,7 +509,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_WAIT(10 * DT) EVT_THREAD EVT_WAIT(45 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_20E, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_SRAW_14_C, 0) EVT_END_THREAD EVT_CALL(SetNpcFlagBits, NPC_Raven_05, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Walk) diff --git a/src/world/area_kgr/kgr_02/kgr_02_3_npc.c b/src/world/area_kgr/kgr_02/kgr_02_3_npc.c index 1303494d79..e293a1abcf 100644 --- a/src/world/area_kgr/kgr_02/kgr_02_3_npc.c +++ b/src/world/area_kgr/kgr_02/kgr_02_3_npc.c @@ -129,19 +129,19 @@ EvtScript N(EVS_Fuzzipede_ReactToLight) = { EvtScript N(EVS_Fuzzipede_JumpAround) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20D9, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_FUZZIPEDE_MOTION, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -100, 80, -80, 20) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20D9, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_FUZZIPEDE_MOTION, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 100, 80, -80, 20) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20D9, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_FUZZIPEDE_MOTION, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 30, 40, -80, 20) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20D9, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_FUZZIPEDE_MOTION, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 135, 15, -100, 20) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20D9, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_FUZZIPEDE_MOTION, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 30, 0, 0, 20) EVT_WAIT(10) EVT_END_LOOP @@ -203,7 +203,7 @@ EvtScript N(EVS_NpcDefeat_Fuzzipede) = { EVT_CALL(FadeOutMusic, 0, 1000) EVT_CALL(SetSelfVar, 2, 1) EVT_THREAD - EVT_CALL(PlaySound, SOUND_42) + EVT_CALL(PlaySound, SOUND_0042) EVT_SET(LVar0, 0) EVT_LOOP(150) EVT_ADD(LVar0, 1) 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 009c9b8203..16500d078c 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 @@ -49,7 +49,7 @@ EvtScript N(EVS_Scene_MeetingPeach) = { EVT_WAIT(10 * DT) EVT_CALL(PlayerMoveTo, 590, 0, 10 * DT) EVT_WAIT(5 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, -45, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_END_THREAD EVT_THREAD @@ -57,7 +57,7 @@ EvtScript N(EVS_Scene_MeetingPeach) = { EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Walk) EVT_CALL(NpcMoveTo, NPC_Peach, 640, 0, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_Peach, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Peach, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_Peach, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_LookAround) @@ -66,7 +66,7 @@ EvtScript N(EVS_Scene_MeetingPeach) = { EVT_END_THREAD EVT_WAIT(17 * DT) EVT_THREAD - EVT_CALL(PlaySound, SOUND_80000056) + EVT_CALL(PlaySound, SOUND_LOOP_56) 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_80000056) + EVT_CALL(PlaySound, SOUND_LOOP_56) 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_10/kkj_10_2_entity.c b/src/world/area_kkj/kkj_10/kkj_10_2_entity.c index a0428e1475..d8752efdc1 100644 --- a/src/world/area_kkj/kkj_10/kkj_10_2_entity.c +++ b/src/world/area_kkj/kkj_10/kkj_10_2_entity.c @@ -19,7 +19,7 @@ EvtScript N(EVS_UnlockPrompt_FrontDoor) = { EVT_CALL(CloseChoicePopup) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_269, 0, 0, 10, 490) + EVT_CALL(PlaySoundAt, SOUND_0269, 0, 0, 10, 490) EVT_SET(LVar0, MV_PadlockEntityIdx) EVT_CALL(N(RemovePadlock)) EVT_WAIT(5) diff --git a/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c b/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c index 7c02379c80..0253d6dca6 100644 --- a/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c +++ b/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c @@ -11,7 +11,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) diff --git a/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c b/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c index 3fc278e0a8..62fa31dc9d 100644 --- a/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c +++ b/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c @@ -30,7 +30,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(N(SetPeachFlag8)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) diff --git a/src/world/area_kkj/kkj_11/kkj_11_2_entity.c b/src/world/area_kkj/kkj_11/kkj_11_2_entity.c index b79d31f0aa..87669921ab 100644 --- a/src/world/area_kkj/kkj_11/kkj_11_2_entity.c +++ b/src/world/area_kkj/kkj_11/kkj_11_2_entity.c @@ -19,7 +19,7 @@ EvtScript N(EVS_ItemPrompt_Lock) = { EVT_CALL(CloseChoicePopup) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_269, 0, 0, 10, 490) + EVT_CALL(PlaySoundAt, SOUND_0269, 0, 0, 10, 490) EVT_SET(LVar0, MV_PadlockEntityIdx) EVT_CALL(N(RemovePadlock)) EVT_WAIT(5) diff --git a/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c b/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c index 9cdeb36e3d..bb14568138 100644 --- a/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c +++ b/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c @@ -12,7 +12,7 @@ EvtScript N(EVS_NpcAI_Koopatrol_01) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) @@ -162,7 +162,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_04) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) diff --git a/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c b/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c index 0a5fa9d32b..6126fd5828 100644 --- a/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c +++ b/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c @@ -29,7 +29,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(N(SetPeachFlag8)) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) diff --git a/src/world/area_kkj/kkj_12/kkj_12_2_npc.c b/src/world/area_kkj/kkj_12/kkj_12_2_npc.c index c86951104c..60ea7e1362 100644 --- a/src/world/area_kkj/kkj_12/kkj_12_2_npc.c +++ b/src/world/area_kkj/kkj_12/kkj_12_2_npc.c @@ -117,7 +117,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(N(SetPeachFlag8)) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) 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 39c07d85cb..1f59ebc216 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_23D, SOUND_SPACE_MODE_0, x, y, z); + sfx_adjust_env_sound_pos(SOUND_LRAW_023D, 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_80000066, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Prop, SOUND_LOOP_66, 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_80000066) + EVT_CALL(StopSound, SOUND_LOOP_66) 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 2e595127c9..0105f1dc00 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_23D, SOUND_SPACE_MODE_0, x, y, z); + sfx_adjust_env_sound_pos(SOUND_LRAW_023D, 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_80000066, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Prop, SOUND_LOOP_66, 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_80000066) + EVT_CALL(StopSound, SOUND_LOOP_66) 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_80000056) + EVT_CALL(PlaySound, SOUND_LOOP_56) #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_33 | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_33) + EVT_CALL(PlaySound, SOUND_LRAW_0033 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(func_802D62E4, SOUND_LRAW_0033) EVT_END_THREAD EVT_THREAD EVT_CALL(SetPlayerJumpscale, 0) @@ -439,12 +439,12 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10 * DT, EVT_FLOAT(4.0)) EVT_END_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_2127, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_BOWSER_LIGHTNING, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 5) EVT_PLAY_EFFECT(EFFECT_LIGHTNING, 4, LVar0, LVar1, LVar2, 0, 0) EVT_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_390, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0390, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Hurt) EVT_CALL(LoadPath, 30 * DT, EVT_PTR(N(PlayerThrownPath)), ARRAY_COUNT(N(PlayerThrownPath)), EASING_LINEAR) EVT_SET(LVar4, 0) diff --git a/src/world/area_kkj/kkj_14/kkj_14_2_main.c b/src/world/area_kkj/kkj_14/kkj_14_2_main.c index 8263724f63..a919deb691 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_2_main.c +++ b/src/world/area_kkj/kkj_14/kkj_14_2_main.c @@ -30,7 +30,7 @@ Gfx N(setup_gfx_candle_lights)[] = { EvtScript N(EVS_EndPeachChapter7) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) - EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(PlaySound, SOUND_SLIDE_WHISTLE_OUT) EVT_CALL(GotoMapSpecial, EVT_PTR("pra_01"), pra_01_ENTRY_4, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; diff --git a/src/world/area_kkj/kkj_14/kkj_14_3_interactables.c b/src/world/area_kkj/kkj_14/kkj_14_3_interactables.c index 7e7edf1fb0..fe1351f7ed 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_3_interactables.c +++ b/src/world/area_kkj/kkj_14/kkj_14_3_interactables.c @@ -237,7 +237,7 @@ EvtScript N(EVS_TexPan_Fireplace) = { }; EvtScript N(EVS_RevealButton) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o128, SOUND_F9, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o128, SOUND_00F9, 0) EVT_CALL(MakeLerp, 0, 180, 15, EASING_LINEAR) EVT_CALL(UpdateLerp) EVT_CALL(RotateGroup, MODEL_g39, LVar0, 1, 0, 0) @@ -267,7 +267,7 @@ EvtScript N(EVS_OpenHiddenPassage) = { EVT_ELSE EVT_SET(LVar0, 60 * DT) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o129, SOUND_FC, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o129, SOUND_00FC, 0) EVT_CALL(MakeLerp, 255, 0, LVar0, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -282,7 +282,7 @@ EvtScript N(EVS_OpenHiddenPassage) = { EVT_WAIT(10 * DT) EVT_THREAD EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAt, SOUND_FB, 0, -125, 10, -120) + EVT_CALL(PlaySoundAt, SOUND_00FB, 0, -125, 10, -120) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, -125, 10, -120, EVT_FLOAT(2.0), 30) EVT_END_THREAD EVT_CALL(MakeLerp, 0, -180, 30 * DT, EASING_QUADRATIC_IN) @@ -316,7 +316,7 @@ EvtScript N(EVS_Inspect_HiddenButton) = { EVT_CALL(SetPlayerAnimation, ANIM_Peach3_PressButtonHigh) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o128, SOUND_FA, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o128, SOUND_00FA, 0) EVT_END_THREAD EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) @@ -355,7 +355,7 @@ EvtScript N(EVS_Inspect_HiddenButton_FirstTime) = { EVT_CALL(SetPlayerAnimation, ANIM_Peach3_PressButtonHigh) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o128, SOUND_FA, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o128, SOUND_00FA, 0) EVT_END_THREAD EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) diff --git a/src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c b/src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c index a79cdb4771..3652794e7f 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c +++ b/src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c @@ -104,7 +104,7 @@ EvtScript N(EVS_Scene_TossedBackInRoom) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtPlayer, SOUND_162, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0162, 0) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Land) EVT_THREAD EVT_ADD(LVar1, 10) diff --git a/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c b/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c index 7db6ac5cc5..9c29c0a4ab 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c +++ b/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c @@ -61,9 +61,9 @@ EvtScript N(EVS_TwinkTappingOnGlassDoor) = { EVT_LOOP(0) EVT_CALL(NpcFlyTo, NPC_PARTNER, 520, 70, -60, 30 * DT, -10, EASING_LINEAR) EVT_CALL(NpcFlyTo, NPC_PARTNER, 520, 70, -61, 10 * DT, -5, EASING_LINEAR) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_1D8, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_01D8, 0) EVT_CALL(NpcFlyTo, NPC_PARTNER, 520, 70, -62, 10 * DT, -5, EASING_LINEAR) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_1D8, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_01D8, 0) EVT_END_LOOP EVT_RETURN EVT_END @@ -98,7 +98,7 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_WAIT(30 * DT) EVT_CALL(N(ClearPeachDepressed)) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) - EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, -45, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(10 * DT) EVT_CALL(InterpPlayerYaw, 270, 3) @@ -194,11 +194,11 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_WAIT(20 * DT) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 150) - EVT_CALL(PlaySoundAt, SOUND_1D8, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_01D8, 0, LVar0, LVar1, LVar2) EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAt, SOUND_1D8, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_01D8, 0, LVar0, LVar1, LVar2) EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0263, 0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(20 * DT) EVT_CALL(InterpPlayerYaw, 135, 5) @@ -227,7 +227,7 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_WAIT(15 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_OpenDoors) - EVT_CALL(PlaySoundAtCollider, COLLIDER_tte, SOUND_1CB, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tte, SOUND_SRAW_11_A, 0) EVT_CALL(MakeLerp, 0, 80, 14, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -349,7 +349,7 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Startle) - EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, -45, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) diff --git a/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c b/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c index 80aad032b0..6bf0575382 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c +++ b/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c @@ -28,7 +28,7 @@ EvtScript N(EVS_Scene_Chapter1) = { EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0035) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0036) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Startle) - EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) 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 3217de31de..9c7b4a7978 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 @@ -25,7 +25,7 @@ Gfx N(setup_gfx_candle_lights)[] = { EvtScript N(EVS_EndPeachChapter0) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) - EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(PlaySound, SOUND_SLIDE_WHISTLE_OUT) EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_10"), kmr_10_ENTRY_0, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; //@bug script not properly terminated @@ -33,7 +33,7 @@ EvtScript N(EVS_EndPeachChapter0) = { EvtScript N(EVS_EndPeachChapter1) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) - EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(PlaySound, SOUND_SLIDE_WHISTLE_OUT) EVT_CALL(GotoMapSpecial, EVT_PTR("trd_00"), trd_00_ENTRY_5, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; //@bug script not properly terminated @@ -41,7 +41,7 @@ EvtScript N(EVS_EndPeachChapter1) = { EvtScript N(EVS_EndPeachChapter3) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) - EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(PlaySound, SOUND_SLIDE_WHISTLE_OUT) EVT_CALL(GotoMapSpecial, EVT_PTR("arn_07"), arn_07_ENTRY_3, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; //@bug script not properly terminated @@ -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_93) + EVT_CALL(StopSound, SOUND_0093) EVT_ELSE - EVT_CALL(PlaySoundAt, SOUND_93, 0, 50, 5, -200) + EVT_CALL(PlaySoundAt, SOUND_0093, 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 0938ddb3eb..e549ba78e3 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_93, 0, 50, 5, -200) + EVT_CALL(PlaySoundAt, SOUND_0093, 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_93) + EVT_CALL(StopSound, SOUND_0093) 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_93) + EVT_CALL(StopSound, SOUND_0093) 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_15/kkj_15_4_chapter0.c b/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c index 32bebc8449..435818e866 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c +++ b/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c @@ -16,11 +16,11 @@ API_CALLABLE(N(SetLightSourcePos)) { EvtScript N(EVS_PlaySounds_KoopaBrosShowOff) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAt, SOUND_55, 0, 100, 0, -40) + EVT_CALL(PlaySoundAt, SOUND_0055, 0, 100, 0, -40) EVT_WAIT(30) - EVT_CALL(PlaySoundAt, SOUND_356, 0, 100, 0, -40) + EVT_CALL(PlaySoundAt, SOUND_0356, 0, 100, 0, -40) EVT_WAIT(60) - EVT_CALL(PlaySoundAt, SOUND_37C, 0, 100, 0, -40) + EVT_CALL(PlaySoundAt, SOUND_037C, 0, 100, 0, -40) EVT_WAIT(30) EVT_END_LOOP EVT_RETURN @@ -147,9 +147,9 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(FadeOutMusic, 0, 2000) EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_CH1_KoopaBros_0007, 300, 20) EVT_WAIT(5 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Bowser, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20 * DT) EVT_THREAD @@ -184,7 +184,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_02, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_02, NPC_FLAG_8, FALSE) EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, 100, -40, 18) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_3E9, SOUND_PARAM_MUTE) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_03E9, SOUND_PARAM_MUTE) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 100, 0, -40, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_02, FALSE) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_IdleCrouch) @@ -198,7 +198,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_8, FALSE) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, 128, -15, 18) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_3E9, SOUND_PARAM_MUTE) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_03E9, SOUND_PARAM_MUTE) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 128, 0, -15, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_01, FALSE) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_IdleCrouch) @@ -212,7 +212,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_03, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_03, NPC_FLAG_8, FALSE) EVT_CALL(NpcMoveTo, NPC_KoopaBros_03, 140, -90, 18) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_3E9, SOUND_PARAM_MUTE) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_03E9, SOUND_PARAM_MUTE) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 140, 0, -90, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_03, FALSE) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_IdleCrouch) @@ -226,7 +226,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_04, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_04, NPC_FLAG_8, FALSE) EVT_CALL(NpcMoveTo, NPC_KoopaBros_04, 168, -45, 18) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_04, SOUND_3E9, SOUND_PARAM_MUTE) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_04, SOUND_03E9, SOUND_PARAM_MUTE) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 168, 0, -45, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_04, FALSE) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_IdleCrouch) @@ -332,13 +332,13 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_EXEC_WAIT(N(EVS_FocusCam_KoopaBros)) EVT_WAIT(10 * DT) EVT_CALL(FadeOutMusic, 0, 500) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_KoopaBros_03, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_KoopaBros_02, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_04, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_04, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_KoopaBros_04, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_KoopaBros_01, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Talk, ANIM_KoopaBros_Red_Idle, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0014) @@ -371,12 +371,12 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_END_THREAD EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_KoopaBros_02, MSG_Peach_CH1_KoopaBros_0015) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_173, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_0173, 0) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_02, 90, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_02, TRUE) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Run) EVT_WAIT(30 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_174, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_0174, 0) EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, 200, -60, 10 * DT) EVT_END_THREAD EVT_THREAD diff --git a/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c b/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c index 49dce240e9..13d51b0e66 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c +++ b/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c @@ -174,7 +174,7 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_THREAD EVT_EXEC_WAIT(N(EVS_AnimateRotatingWall_AlmostCaught)) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp) - EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround) @@ -214,9 +214,9 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Bowser, MSG_Peach_0088) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Delighted) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_Bowser, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SetNpcVar, NPC_Bowser, 0, 1) diff --git a/src/world/area_kkj/kkj_16/kkj_16_1_main.c b/src/world/area_kkj/kkj_16/kkj_16_1_main.c index eabf3e3e9f..32e489924d 100644 --- a/src/world/area_kkj/kkj_16/kkj_16_1_main.c +++ b/src/world/area_kkj/kkj_16/kkj_16_1_main.c @@ -6,7 +6,7 @@ EvtScript N(EVS_EndPeachChapter2) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) - EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(PlaySound, SOUND_SLIDE_WHISTLE_OUT) EVT_CALL(GotoMapSpecial, EVT_PTR("sbk_02"), sbk_02_ENTRY_5, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; //@bug script not properly terminated diff --git a/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c b/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c index 0fe38386af..99996eae91 100644 --- a/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c +++ b/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c @@ -13,7 +13,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_WAIT(20) diff --git a/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c b/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c index 06db2aac01..7d755d7234 100644 --- a/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c +++ b/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c @@ -71,7 +71,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(N(SetPeachFlag8)) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_WAIT(20) diff --git a/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c b/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c index d5a573c413..33ed52e979 100644 --- a/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c +++ b/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c @@ -162,7 +162,7 @@ EvtScript N(EVS_ManageSneakingScenes) = { EVT_CALL(SetMusicTrack, 0, SONG_PEACH_SNEAKING, 0, 4) EVT_END_THREAD EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Startle) - EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) diff --git a/src/world/area_kkj/kkj_18/kkj_18_2_main.c b/src/world/area_kkj/kkj_18/kkj_18_2_main.c index 4955df5f62..7f56d3b8ca 100644 --- a/src/world/area_kkj/kkj_18/kkj_18_2_main.c +++ b/src/world/area_kkj/kkj_18/kkj_18_2_main.c @@ -25,7 +25,7 @@ Gfx N(setup_gfx_candle_lights)[] = { EvtScript N(EVS_EndPeachChapter4) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) - EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(PlaySound, SOUND_SLIDE_WHISTLE_OUT) EVT_CALL(GotoMapSpecial, EVT_PTR("mac_04"), mac_04_ENTRY_5, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; 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 a973f41559..81997d6869 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 @@ -167,7 +167,7 @@ EvtScript N(EVS_CarryPeachAway) = { }; EvtScript N(EVS_OpenAndCloseWindow) = { - EVT_CALL(PlaySoundAt, SOUND_1CB, 0, 190, 78, -20) + EVT_CALL(PlaySoundAt, SOUND_SRAW_11_A, 0, 190, 78, -20) EVT_CALL(MakeLerp, 0, 80, 14, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -189,7 +189,7 @@ EvtScript N(EVS_OpenAndCloseWindow) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_1CC, 0, 190, 78, -20) + EVT_CALL(PlaySoundAt, SOUND_SRAW_12_A, 0, 190, 78, -20) EVT_RETURN EVT_END }; @@ -253,19 +253,19 @@ EvtScript N(EVS_GourmetGuy_LovesCake) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(20.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_381, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_0381, 0) EVT_WAIT(33 * DT) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(65.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(7.5), EVT_FLOAT(-1.3)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_382, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_0382, 0) EVT_WAIT(33 * DT) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(3.5), 0) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_383, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_0383, 0) EVT_WAIT(18 * DT) EVT_CALL(SetMusicTrack, 0, SONG_GOURMET_GUY_FREAKOUT, 0, 8) EVT_WAIT(30 * DT) @@ -292,7 +292,7 @@ EvtScript N(EVS_GourmetGuy_LovesCake) = { }; EvtScript N(EVS_GourmetGuy_RunAround) = { - EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_384, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_0384, 0) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Leap) EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy, EVT_FLOAT(0.001953125)) EVT_CALL(GetNpcPos, NPC_GourmetGuy, LVar0, LVar1, LVar2) @@ -300,7 +300,7 @@ EvtScript N(EVS_GourmetGuy_RunAround) = { EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Panic) EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcSpeed, NPC_GourmetGuy, EVT_FLOAT(20.0 / DT)) - EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_384, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_0384, 0) EVT_CALL(SetNpcRotation, NPC_GourmetGuy, 0, 0, -45) EVT_CALL(SetNpcYaw, NPC_GourmetGuy, 90) EVT_CALL(MakeLerp, 0, 100, 30, EASING_LINEAR) @@ -321,14 +321,14 @@ EvtScript N(EVS_GourmetGuy_RunAround) = { EVT_END_LOOP EVT_WAIT(20 * DT) EVT_CALL(SetNpcRotation, NPC_GourmetGuy, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_384, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_0384, 0) EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy, NPC_FLAG_UPSIDE_DOWN, TRUE) EVT_CALL(SetNpcYaw, NPC_GourmetGuy, 270) EVT_CALL(SetNpcPos, NPC_GourmetGuy, 250, 160, 50) EVT_CALL(NpcMoveTo, NPC_GourmetGuy, -100, 50, 0) EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy, NPC_FLAG_UPSIDE_DOWN, FALSE) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_384, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_0384, 0) EVT_CALL(SetNpcYaw, NPC_GourmetGuy, 90) EVT_CALL(SetNpcPos, NPC_GourmetGuy, -100, 0, 70) EVT_CALL(NpcMoveTo, NPC_GourmetGuy, 140, 70, 0) diff --git a/src/world/area_kkj/kkj_19/kkj_19_5_baking.c b/src/world/area_kkj/kkj_19/kkj_19_5_baking.c index fb2b0064f7..8634356ee5 100644 --- a/src/world/area_kkj/kkj_19/kkj_19_5_baking.c +++ b/src/world/area_kkj/kkj_19/kkj_19_5_baking.c @@ -1302,13 +1302,13 @@ EvtScript N(EVS_ManageBaking) = { EVT_END_LOOP EVT_EXEC_WAIT(N(EVS_CloseOverDoor)) EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAt, SOUND_FF, 0, 100, 22, -178) + EVT_CALL(PlaySoundAt, SOUND_00FF, 0, 100, 22, -178) EVT_WAIT(20 * DT) EVT_CALL(FadeOutMusic, 0, 500) - EVT_CALL(PlaySoundAt, SOUND_394, 0, 100, 22, -178) + EVT_CALL(PlaySoundAt, SOUND_0394, 0, 100, 22, -178) EVT_CALL(N(AwaitPlayerPressATimer)) - EVT_CALL(StopSound, SOUND_394) - EVT_CALL(PlaySoundAt, SOUND_3F3, 0, 100, 22, -178) + EVT_CALL(StopSound, SOUND_0394) + EVT_CALL(PlaySoundAt, SOUND_03F3, 0, 100, 22, -178) EVT_WAIT(10 * DT) // check baking time EVT_IF_LT(LVar0, BAKING_TIME_MIN_FRAMES) diff --git a/src/world/area_kkj/kkj_20/kkj_20_4_npc.c b/src/world/area_kkj/kkj_20/kkj_20_4_npc.c index 5ef68dcb15..69b557f0f0 100644 --- a/src/world/area_kkj/kkj_20/kkj_20_4_npc.c +++ b/src/world/area_kkj/kkj_20/kkj_20_4_npc.c @@ -10,7 +10,7 @@ #include "world/common/todo/GetPeachDisguise.inc.c" EvtScript N(EVS_OpenDresserDoors) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o80, SOUND_1CF, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o80, SOUND_01CF, 0) EVT_CALL(MakeLerp, 0, 80, 14, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -36,7 +36,7 @@ EvtScript N(EVS_CloseDresserDoors) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o80, SOUND_1D0, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o80, SOUND_01D0, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kkj/kkj_23/kkj_23_2_main.c b/src/world/area_kkj/kkj_23/kkj_23_2_main.c index 69a79e8330..40e187341f 100644 --- a/src/world/area_kkj/kkj_23/kkj_23_2_main.c +++ b/src/world/area_kkj/kkj_23/kkj_23_2_main.c @@ -6,7 +6,7 @@ EvtScript N(EVS_EndPeachChapter6) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) - EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(PlaySound, SOUND_SLIDE_WHISTLE_OUT) EVT_CALL(GotoMapSpecial, EVT_PTR("flo_00"), flo_00_ENTRY_A, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; //@bug script not properly terminated 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 eb714d982c..59bffceb8c 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_23D, SOUND_SPACE_MODE_0, x, y, z); + sfx_adjust_env_sound_pos(SOUND_LRAW_023D, 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_80000066, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Prop, SOUND_LOOP_66, 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_80000066) + EVT_CALL(StopSound, SOUND_LOOP_66) EVT_RETURN EVT_END }; diff --git a/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c b/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c index 1de77a5576..ce4d82ec27 100644 --- a/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c +++ b/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c @@ -47,7 +47,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(N(SetPeachFlag8)) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_WAIT(20) diff --git a/src/world/area_kkj/kkj_23/kkj_23_5_scene.c b/src/world/area_kkj/kkj_23/kkj_23_5_scene.c index 999ea7a628..35c7c77202 100644 --- a/src/world/area_kkj/kkj_23/kkj_23_5_scene.c +++ b/src/world/area_kkj/kkj_23/kkj_23_5_scene.c @@ -280,7 +280,7 @@ EvtScript N(EVS_Scene_KammyUnmasksPeach) = { EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 5) EVT_WAIT(10 * DT) EVT_CALL(NpcMoveTo, NPC_Kammy, 280, -50, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20 * DT) EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 5) @@ -300,7 +300,7 @@ EvtScript N(EVS_Scene_KammyUnmasksPeach) = { EVT_ADD(LVar2, 5) EVT_CALL(GetNpcPos, NPC_Kammy, LVar3, LVar4, LVar5) EVT_ADD(LVar4, 180) - EVT_CALL(PlaySoundAtPlayer, SOUND_2127, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_BOWSER_LIGHTNING, 0) EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 5, 20) EVT_CALL(N(SetLightningBoltColor), LVarF, 255, 0, 255) EVT_ADD(LVar1, 15) diff --git a/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c b/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c index 46e09fb559..f43b1c162a 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c +++ b/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c @@ -30,7 +30,7 @@ EvtScript N(EVS_NpcIdle_Bowser) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_END_THREAD EVT_CALL(ModifyGlobalOverrideFlags, 1, GLOBAL_OVERRIDES_20000) - EVT_CALL(StopSound, SOUND_22C) + EVT_CALL(StopSound, SOUND_LRAW_022C) EVT_CALL(StartBossBattle, SONG_BOWSER_BATTLE) EVT_RETURN EVT_END @@ -38,7 +38,7 @@ EvtScript N(EVS_NpcIdle_Bowser) = { EvtScript N(EVS_NpcDefeat_Bowser) = { #define NAME_SUFFIX - EVT_CALL(PlaySound, SOUND_22D) + EVT_CALL(PlaySound, SOUND_LRAW_022D) EVT_EXEC(N(EVS_Scene_PeachBreaksFree)) EVT_RETURN EVT_END @@ -70,7 +70,7 @@ EvtScript N(EVS_NpcIdle_Kammy_Broom) = { EVT_CALL(GetNpcPos, NPC_Peach_01, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(ModifyGlobalOverrideFlags, 1, GLOBAL_OVERRIDES_20000) - EVT_CALL(StopSound, SOUND_22D) + EVT_CALL(StopSound, SOUND_LRAW_022D) EVT_CALL(StartBossBattle, SONG_BOWSER_BATTLE) EVT_CALL(EnablePartnerAI) EVT_RETURN 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 c866fe39fa..70cbd7d745 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 @@ -31,7 +31,7 @@ API_CALLABLE(N(SpawnLensFlare)) { #define NAME_SUFFIX EvtScript N(EVS_ArenaEyesFlash) = { - EVT_CALL(PlaySoundAt, SOUND_5A, 0, 300, -70, 280) + EVT_CALL(PlaySoundAt, SOUND_005A, 0, 300, -70, 280) EVT_CALL(N(SpawnLensFlare), 225, -70, 280, 240) EVT_CALL(N(SpawnLensFlare), 380, -70, 280, 240) EVT_RETURN @@ -60,7 +60,7 @@ EvtScript N(EVS_BowserActivatesSwitch) = { EVT_CALL(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_Land) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_RearUpLaugh) - EVT_CALL(PlaySound, SOUND_3BC) + EVT_CALL(PlaySound, SOUND_LRAW_03BC) EVT_LOOP(0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 1, EVT_FLOAT(2.0)) EVT_WAIT(1) @@ -68,7 +68,7 @@ EvtScript N(EVS_BowserActivatesSwitch) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_LRAW_03BC | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_Bowser_01, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_Bowser_01, 300, 0, 0, 20) @@ -241,7 +241,7 @@ EvtScript N(EVS_AnimateBridgeCollapsing) = { EVT_SET(LVar2, 35) EVT_SET(LVar5, -15) EVT_LOOP(ARRAY_COUNT(N(BridgeModels))) - EVT_CALL(PlaySoundAt, SOUND_B000001B, 0, LVar5, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1B, 0, LVar5, 0, 0) EVT_ADD(LVar5, -30) EVT_BUF_READ1(LVar3) EVT_THREAD @@ -411,7 +411,7 @@ EvtScript N(EVS_Scene_ActivateMachine) = { EVT_CALL(SetNpcDecoration, NPC_Bowser_01, 0, NPC_DECORATION_BOWSER_AURA) EVT_END_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_Bowser_01, SOUND_223, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_01, SOUND_0223, 0) EVT_SETF(LVar0, EVT_FLOAT(1.0)) EVT_LOOP(50) EVT_ADDF(LVar0, EVT_FLOAT(0.01)) @@ -481,7 +481,7 @@ EvtScript N(EVS_ManageArenaEffects) = { EVT_IF_EQ(GF_KKJ25_Defeated_Kammy, FALSE) EVT_THREAD EVT_WAIT(50) - EVT_CALL(PlaySound, SOUND_22C) + EVT_CALL(PlaySound, SOUND_LRAW_022C) EVT_END_THREAD EVT_CALL(MakeLerp, 0, 50, 120, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -498,7 +498,7 @@ EvtScript N(EVS_ManageArenaEffects) = { EVT_END_LOOP EVT_ELSE EVT_IF_EQ(GF_KKJ25_Defeated_Bowser, FALSE) - EVT_CALL(PlaySound, SOUND_22D) + EVT_CALL(PlaySound, SOUND_LRAW_022D) EVT_END_IF EVT_SET(LVar0, 5) EVT_END_IF @@ -611,7 +611,7 @@ EvtScript N(EVS_ManageArenaEffects) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(StopSound, SOUND_22D) + EVT_CALL(StopSound, SOUND_LRAW_022D) EVT_RETURN EVT_END }; 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 26cfff7058..647467628f 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 @@ -93,7 +93,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { EVT_CALL(InterpNpcYaw, NPC_Peach_01, 90, 0) EVT_CALL(SpeakToPlayer, NPC_Twink_01, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_CH8_009D) EVT_WAIT(10) - EVT_CALL(StopSound, SOUND_22D) + EVT_CALL(StopSound, SOUND_LRAW_022D) EVT_CALL(SetMusicTrack, 0, SONG_PEACH_WISHES, 0, 8) EVT_CALL(InterpNpcYaw, NPC_Peach_01, 270, 0) EVT_WAIT(10) @@ -196,7 +196,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { EVT_EXEC(N(AddStarSpiritHovering)) EVT_CALL(GetNpcPos, NPC_Eldstar, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) - EVT_CALL(PlaySoundAt, SOUND_B000001E, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1E, 0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) EVT_SETF(LVar0, 0) EVT_LOOP(20) @@ -215,7 +215,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH8_00A1) EVT_WAIT(10) - EVT_CALL(PlaySoundAt, SOUND_64, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0064, 0, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) @@ -287,7 +287,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { EVT_CALL(NpcJump0, NPC_Eldstar, LVar6, LVar7, LVar8, 5) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1F, 0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) EVT_END_THREAD EVT_THREAD @@ -341,34 +341,34 @@ EvtScript N(EVS_Scene_KammyDefeated) = { EVT_END_THREAD EVT_THREAD EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 2, 100, 28, 10, EVT_FLOAT(2.8), 100) - EVT_CALL(PlaySound, SOUND_212D) + EVT_CALL(PlaySound, SOUND_RELEASE_ENERGY) EVT_WAIT(115) EVT_ADD(LVar1, 20) - EVT_CALL(PlaySoundAt, SOUND_188, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0188, 0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30) EVT_END_THREAD EVT_WAIT(40) - EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 110, 20, 3) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1F, 0, 110, 20, 3) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 110, 20, 3, 10) EVT_WAIT(6) - EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 100, 20, 3) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1F, 0, 100, 20, 3) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 100, 20, 3, 15) EVT_WAIT(6) - EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 90, 20, 3) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1F, 0, 90, 20, 3) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 90, 20, 3, 20) EVT_WAIT(6) - EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 110, 20, 3) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1F, 0, 110, 20, 3) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 110, 20, 3, 25) EVT_WAIT(6) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_LOOP(3) - EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 100, 20, 3) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1F, 0, 100, 20, 3) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 100, 20, 3, 30) EVT_WAIT(6) - EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 90, 20, 3) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1F, 0, 90, 20, 3) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 90, 20, 3, 30) EVT_WAIT(6) - EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 110, 20, 3) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1F, 0, 110, 20, 3) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 110, 20, 3, 30) EVT_WAIT(6) EVT_END_LOOP diff --git a/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c b/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c index 5f32e32d79..372debb69d 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c +++ b/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c @@ -143,7 +143,7 @@ EvtScript N(EVS_ManageShaking) = { EVT_LOOP(1 + ARRAY_COUNT(N(ArenaExplosions))) //@bug extra iteration reads garbage EVT_BUF_READ4(LVar0, LVar1, LVar2, LVar3) EVT_FBUF_READ2(LVar4, LVar5) - EVT_CALL(PlaySoundAt, SOUND_B000001C, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1C, 0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, LVar0, LVar1, LVar2, LVar4, LVar3) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, LVar5) EVT_END_LOOP @@ -247,7 +247,7 @@ EvtScript N(EVS_BowserAndKammyBlownAway) = { EVT_USE_BUF(EVT_PTR(N(ChainExplosionLocations))) EVT_LOOP(ARRAY_COUNT(N(ChainExplosionLocations))) EVT_BUF_READ4(LVar0, LVar1, LVar2, LVar3) - EVT_CALL(PlaySoundAt, SOUND_B000001C, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_SEQ_1C, 0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(2.0), 30) EVT_WAIT(LVar3) EVT_END_LOOP @@ -312,7 +312,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = { EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 14, 150, 60, 0, 1, 330) EVT_WAIT(310 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_CH8_00AA, 160, 40) - EVT_CALL(PlaySound, SOUND_22D) + EVT_CALL(PlaySound, SOUND_LRAW_022D) EVT_CALL(RemoveNpc, NPC_StarRod) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_ThumbsUp) EVT_CALL(GetCurrentPartnerID, LVar0) @@ -370,11 +370,11 @@ EvtScript N(EVS_Scene_BowserDefeated) = { EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Peach_02, ANIM_Peach2_RaiseArms, ANIM_Peach1_Idle, 0, MSG_CH8_00AC) EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_8000006B) + EVT_CALL(PlaySound, SOUND_LOOP_6B) EVT_SET(MV_DestructState, DESTRUCT_STATE_1) - EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0262, 0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 20, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Peach_02, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Peach_02, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_Peach_02, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(InterpPlayerYaw, 270, 0) @@ -471,8 +471,8 @@ EvtScript N(EVS_Scene_BowserDefeated) = { EVT_CALL(SpeakToNpc, NPC_Bowser_03, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 512, NPC_Kammy_05, MSG_CH8_00B0) EVT_SET(MV_ArenaState, ARENA_STATE_BROKEN) EVT_WAIT(20) - EVT_CALL(StopSound, SOUND_3BC) - EVT_CALL(PlaySoundAt, SOUND_230, 0, 500, 0, 100) + EVT_CALL(StopSound, SOUND_LRAW_03BC) + EVT_CALL(PlaySoundAt, SOUND_0230, 0, 500, 0, 100) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 500, 0, 100, EVT_FLOAT(8.0), 90) EVT_SET(MV_DestructState, DESTRUCT_STATE_7) EVT_CALL(SetNpcAnimation, NPC_Bowser_03, ANIM_WorldBowser_Shock) diff --git a/src/world/area_kkj/kkj_26/kkj_26_1_main.c b/src/world/area_kkj/kkj_26/kkj_26_1_main.c index 9311f930dc..5e2e3e0fde 100644 --- a/src/world/area_kkj/kkj_26/kkj_26_1_main.c +++ b/src/world/area_kkj/kkj_26/kkj_26_1_main.c @@ -5,7 +5,7 @@ EvtScript N(EVS_GotoMap_hos_00_1) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) - EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(PlaySound, SOUND_SLIDE_WHISTLE_OUT) EVT_CALL(GotoMapSpecial, EVT_PTR("hos_00"), hos_00_ENTRY_1, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; 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 77445f26f7..4a5a3d626d 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_93, 0, -250, 5, 0) + EVT_CALL(PlaySoundAt, SOUND_0093, 0, -250, 5, 0) EVT_CALL(GetPlayerPos, LVar9, LVar0, LVarA) EVT_CALL(MakeLerp, 0, -450, 120 * DT, EASING_LINEAR) EVT_LOOP(0) @@ -80,7 +80,7 @@ EvtScript N(EVS_UseRotatingWall) = { EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach3_ReachForButton) EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o193, SOUND_FA, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o193, SOUND_00FA, 0) EVT_CALL(SetPlayerAnimation, ANIM_Peach3_PressButton) EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach3_AfterPressButton) @@ -99,7 +99,7 @@ EvtScript N(EVS_UseRotatingWall_FirstTime) = { EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach3_ReachForButton) EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o193, SOUND_FA, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o193, SOUND_00FA, 0) EVT_CALL(SetPlayerAnimation, ANIM_Peach3_PressButton) EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach3_AfterPressButton) diff --git a/src/world/area_kkj/kkj_29/kkj_29_1_main.c b/src/world/area_kkj/kkj_29/kkj_29_1_main.c index 7bdd590cb9..6cda09212e 100644 --- a/src/world/area_kkj/kkj_29/kkj_29_1_main.c +++ b/src/world/area_kkj/kkj_29/kkj_29_1_main.c @@ -5,7 +5,7 @@ EvtScript N(EVS_EndPeachChapter5) = { EVT_SET(LVar0, GB_KKJ_LastPartner) EVT_CALL(N(RestoreFromPeachState)) - EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(PlaySound, SOUND_SLIDE_WHISTLE_OUT) EVT_CALL(GotoMapSpecial, EVT_PTR("jan_22"), jan_22_ENTRY_3, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; //@bug script not properly terminated 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 366a253cc0..42257bf721 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 @@ -35,7 +35,7 @@ EvtScript N(EVS_GiveItemToKoopatrol) = { EVT_ADD(LVar6, 40) EVT_CALL(MakeItemEntity, LVarA, LVar5, LVar6, LVar7, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVarB, LVar0) - EVT_CALL(PlaySound, SOUND_D2) + EVT_CALL(PlaySound, SOUND_JINGLE_GOT_KEY) EVT_CALL(ShowMessageAtScreenPos, LVar2, 160, 40) EVT_CALL(RemoveItemEntity, LVarB) EVT_CALL(SetNpcAnimation, LVar1, ANIM_WorldKoopatrol_Anim03) @@ -85,7 +85,7 @@ EvtScript N(EVS_UpdateScores) = { }; EvtScript N(EVS_WaitForBuzzIn) = { - EVT_CALL(PlaySound, SOUND_8E) + EVT_CALL(PlaySound, SOUND_LRAW_008E) 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_8E) + EVT_CALL(StopSound, SOUND_LRAW_008E) EVT_SET(AB_KKJ29_AnswerScore, ANSWER_PENDING) EVT_SWITCH(AB_KKJ29_AnsweringContestant) EVT_CASE_EQ(CONTESTANT_LEFT) - EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_8D, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_008D, 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_8D, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_008D, 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_8D, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_02, SOUND_008D, 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_8C) + EVT_CALL(PlaySound, SOUND_008C) 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_21C) - EVT_CALL(PlaySound, SOUND_8A) + EVT_CALL(PlaySound, SOUND_021C) + EVT_CALL(PlaySound, SOUND_008A) 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_8B) + EVT_CALL(PlaySound, SOUND_008B) 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_8A) + EVT_CALL(PlaySound, SOUND_008A) 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_8A) + EVT_CALL(PlaySound, SOUND_008A) 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_8A) + EVT_CALL(PlaySound, SOUND_008A) 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_8B) + EVT_CALL(PlaySound, SOUND_008B) EVT_END_SWITCH EVT_RETURN EVT_END @@ -918,7 +918,7 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_END_THREAD EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_263, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_0263, 0) EVT_CALL(ShowEmote, NPC_Koopatrol_01, EMOTE_QUESTION, -45, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20 * DT) EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 90, 5) @@ -992,18 +992,18 @@ 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_8A) + EVT_CALL(PlaySound, SOUND_008A) EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_00F6) - EVT_CALL(PlaySound, SOUND_8A) + EVT_CALL(PlaySound, SOUND_008A) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0263, 0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 45, 13, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(13 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0263, 0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 13, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(13 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0263, 0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 45, 13, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardIdle) diff --git a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c index 75d0eaf2d1..6b913ea5cc 100644 --- a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c +++ b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c @@ -142,7 +142,7 @@ API_CALLABLE(N(func_802405F0_8AC580)) { npc->pos.y = 100.0f; add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f / DT, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); npc->pos.y += (-npc->pos.z + -50.0f + 70.0f / DT) * 0.15f; - sfx_play_sound_at_position(SOUND_B000001E, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(SOUND_SEQ_1E, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); fx_sparkles(FX_SPARKLES_0, npc->pos.x, npc->pos.y + 20.0f, npc->pos.z, 20.0f); script->functionTemp[0] = FUNC_STATE_1; } @@ -218,7 +218,7 @@ API_CALLABLE(N(func_80240BD8_8ACB68)) { if (isInitialCall) { script->functionTemp[1] = evt_get_variable(script, *args); npc = get_npc_unsafe(script->functionTemp[1]); - sfx_play_sound_at_position(SOUND_B000001E, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(SOUND_SEQ_1E, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); fx_sparkles(FX_SPARKLES_0, npc->pos.x, npc->pos.y + 20.0f, npc->pos.z, 10.0f); script->functionTemp[0] = 3; } @@ -464,7 +464,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_CALL(GetNpcPos, NPC_Eldstar, LVar6, LVar7, LVar8) EVT_CALL(NpcJump0, NPC_Eldstar, LVar6, LVar7, LVar8, 5 * DT) EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Idle) - EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_SEQ_1F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 0, 0, 3, 10) EVT_END_THREAD EVT_THREAD @@ -524,29 +524,29 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_WAIT(30 * DT) EVT_THREAD EVT_WAIT(45 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0188, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802404A0_8AC430)) EVT_END_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_SEQ_1F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 10, 10, 3, 10) EVT_WAIT(6 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_SEQ_1F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 0, 10, 3, 15) EVT_WAIT(6 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_SEQ_1F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, -10, 10, 3, 20) EVT_WAIT(6 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_SEQ_1F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 10, 10, 3, 25) EVT_WAIT(6 * DT) EVT_LOOP(3) - EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_SEQ_1F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 0, 10, 3, 30) EVT_WAIT(6 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_SEQ_1F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, -10, 10, 3, 30) EVT_WAIT(6 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_SEQ_1F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 10, 10, 3, 30) EVT_WAIT(6 * DT) EVT_END_LOOP @@ -600,7 +600,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) EVT_WAIT(25 * DT) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_LeanOver) - EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Goombaria, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25 * DT) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Stand) 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 5c9958b2a7..34ca167a59 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 @@ -101,7 +101,7 @@ EvtScript N(EVS_ShowMessage_ItsLocked) = { EvtScript N(EVS_OpenGoombaRoadGate) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_tt2, SOUND_1D2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tt2, SOUND_01D2, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 120, 20, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c index a7ed502bff..d8a56f587d 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c +++ b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c @@ -201,7 +201,7 @@ EvtScript N(EVS_Goombaria_Kiss) = { EVT_ADD(LVar0, 20) EVT_END_IF EVT_PLAY_EFFECT(EFFECT_RECOVER, 2, LVar0, LVar1, LVar2, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_214, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_HEART_BOUNCE, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; @@ -402,9 +402,9 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_PARTNER, -295, -30, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyWalk) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_269, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0269, SOUND_SPACE_MODE_0) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtCollider, COLLIDER_mm1, SOUND_1D2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_mm1, SOUND_01D2, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 120, 20, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -1448,7 +1448,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_LayingDown) EVT_CALL(GetPlayerPos, -220, 33, -342) EVT_WAIT(90 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Eldstar_02, SOUND_2041, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Eldstar_02, SOUND_SRAW_1E_A, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, -198, 115, -272, 10) EVT_CALL(SetNpcPos, NPC_Eldstar_02, -198, 140, -272) EVT_SET(MV_Unk_01, 120) @@ -1528,7 +1528,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_CALL(GetNpcPos, NPC_Eldstar_02, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Eldstar_02, SOUND_2041, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Eldstar_02, SOUND_SRAW_1E_A, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) EVT_CALL(SetNpcPos, NPC_Eldstar_02, NPC_DISPOSE_LOCATION) EVT_WAIT(60 * DT) @@ -1608,7 +1608,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_WAIT(20 * DT) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 0, EVT_FLOAT(-300.0), EVT_FLOAT(20.0), EVT_FLOAT(-10.0)) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Surprise) EVT_WAIT(20 * DT) @@ -1621,7 +1621,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Question) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 60, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(55 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) @@ -2087,10 +2087,10 @@ EvtScript N(EVS_NpcIdle_Eldstar_Epilogue) = { EVT_CALL(SpeakToPlayer, NPC_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 5, MSG_Outro_000F) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Goombaria, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Goombario, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Goombario, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Goombario, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(10) EVT_CALL(InterpNpcYaw, NPC_Goombario, 90, 0) diff --git a/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c b/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c index 1596bd7e7d..3a25d3c466 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c +++ b/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c @@ -165,7 +165,7 @@ EvtScript N(EVS_RoomListener_Verdana) = { EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_SUB(LVar1, 150) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtPlayer, SOUND_161, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0161, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Panic) diff --git a/src/world/area_kmr/kmr_02/kmr_02_5_entity.c b/src/world/area_kmr/kmr_02/kmr_02_5_entity.c index 5f23df81dd..80a46acfa0 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_5_entity.c +++ b/src/world/area_kmr/kmr_02/kmr_02_5_entity.c @@ -112,7 +112,7 @@ EvtScript N(EVS_SummonGateBlock) = { EVT_END_IF EVT_CALL(EnableGroup, MODEL_2, TRUE) EVT_CALL(EnableGroup, MODEL_1, FALSE) - EVT_CALL(PlaySoundAt, SOUND_DD, SOUND_SPACE_MODE_0, LVar2, LVar0, LVar4) + EVT_CALL(PlaySoundAt, SOUND_HEAVY_OBJECT_DROP, SOUND_SPACE_MODE_0, LVar2, LVar0, LVar4) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15 * DT, EVT_FLOAT(1.0)) EVT_END_THREAD 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 b4a9c3876e..7ba3851ee7 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_295, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_LRAW_0295, SOUND_SPACE_MODE_0) EVT_WAIT(4 * DT) EVT_END_LOOP EVT_RETURN @@ -149,7 +149,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_END_IF EVT_KILL_THREAD(MV_Unk_04) EVT_KILL_THREAD(MV_Unk_05) - EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_32B, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_032B, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim10) EVT_WAIT(1) diff --git a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c index d2511b8c9c..31c2072cc1 100644 --- a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c +++ b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c @@ -64,7 +64,7 @@ EvtScript N(EVS_NpcAI_Goompa) = { EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SetNpcAux, NPC_Goompa, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Goompa, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Goompa, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Goompa, EMOTE_EXCLAMATION, 45, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15 * DT) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) diff --git a/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c b/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c index 3f330d4dc6..20ee39e375 100644 --- a/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c +++ b/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c @@ -34,11 +34,11 @@ EvtScript N(EVS_Scene_FallingDown) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_THREAD EVT_WAIT(18 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_175, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0175, SOUND_SPACE_MODE_0) EVT_WAIT(30 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_176, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0176, SOUND_SPACE_MODE_0) EVT_WAIT(28 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_175, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0175, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(HidePlayerShadow, TRUE) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) diff --git a/src/world/area_kmr/kmr_04/kmr_04_3_npc.c b/src/world/area_kmr/kmr_04/kmr_04_3_npc.c index 1cb0b9f9e3..92f9e2df88 100644 --- a/src/world/area_kmr/kmr_04/kmr_04_3_npc.c +++ b/src/world/area_kmr/kmr_04/kmr_04_3_npc.c @@ -96,7 +96,7 @@ EvtScript N(EVS_NpcAI_Goompa) = { EVT_CALL(NpcMoveTo, NPC_PARTNER, 582, 6, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8, FALSE) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_61, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0061, SOUND_SPACE_MODE_0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00AD) EVT_WAIT(10 * DT) EVT_THREAD 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 22b1dabcf4..88d8012469 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 @@ -19,7 +19,7 @@ API_CALLABLE(N(PlaySpringReboundAnimation)) { EvtScript N(EVS_PlayWalkingSounds) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_3AC, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_03AC, SOUND_SPACE_MODE_0) EVT_WAIT(4) EVT_END_LOOP EVT_RETURN @@ -86,14 +86,14 @@ EvtScript N(EVS_NpcIdle_GoombaBros_Red) = { EVT_WAIT(5) EVT_CALL(SetNpcJumpscale, NPC_GoombaBros_Blue, EVT_FLOAT(0.8)) EVT_CALL(SetNpcAnimation, NPC_GoombaBros_Blue, ANIM_GoombaBros_Blue_Walk) - EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Blue, SOUND_10F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Blue, SOUND_ACTOR_HURT, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_GoombaBros_Blue, 267, 0, 28, 30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcJumpscale, NPC_GoombaBros_Red, EVT_FLOAT(0.8)) EVT_CALL(SetNpcAnimation, NPC_GoombaBros_Red, ANIM_GoombaBros_Red_Walk) - EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Red, SOUND_10F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Red, SOUND_ACTOR_HURT, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_GoombaBros_Red, 276, 0, 55, 30 * DT) EVT_END_THREAD EVT_WAIT(15 * DT) @@ -123,7 +123,7 @@ EvtScript N(EVS_NpcDefeat_GoombaBros_Red) = { EVT_THREAD EVT_CALL(SetNpcJumpscale, NPC_GoombaBros_Blue, EVT_FLOAT(1.8)) EVT_CALL(SetNpcAnimation, NPC_GoombaBros_Blue, ANIM_GoombaBros_Blue_CryWalk) - EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Blue, SOUND_10F, SOUND_SPACE_MODE_0) + 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) @@ -141,7 +141,7 @@ EvtScript N(EVS_NpcDefeat_GoombaBros_Red) = { EVT_WAIT(30 * DT) EVT_CALL(SetNpcJumpscale, NPC_GoombaBros_Red, EVT_FLOAT(1.8)) EVT_CALL(SetNpcAnimation, NPC_GoombaBros_Red, ANIM_GoombaBros_Red_CryWalk) - EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Red, SOUND_10F, SOUND_SPACE_MODE_0) + 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) diff --git a/src/world/area_kmr/kmr_09/kmr_09_3_npc.c b/src/world/area_kmr/kmr_09/kmr_09_3_npc.c index b335086939..60ddd92d16 100644 --- a/src/world/area_kmr/kmr_09/kmr_09_3_npc.c +++ b/src/world/area_kmr/kmr_09/kmr_09_3_npc.c @@ -87,7 +87,7 @@ EvtScript N(EVS_NpcIdle_Goomba_Ambush) = { EVT_WAIT(1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_F8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_00F8, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcImgFXFlags, NPC_SELF, IMGFX_FLAG_2000) EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_ANIM, IMGFX_ANIM_UNFURL, 1, 1, 0) EVT_WAIT(15) @@ -103,7 +103,7 @@ EvtScript N(EVS_NpcIdle_Goomba_Ambush) = { EVT_END_LOOP EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.6)) EVT_CALL(NpcJump0, NPC_SELF, -35, 0, 25, 23) 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 9d02ef9d36..d065fd5826 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,7 +35,7 @@ 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_48, SOUND_SPACE_MODE_0, 370, 10, 20) + 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(N(PlaySpringReboundAnimation), MV_SpringEntityIndex) EVT_IF_EQ(GF_KMR10_UnreadFlagForSpring, FALSE) 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 d873f3026c..11adfbfb24 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 @@ -35,7 +35,7 @@ EvtScript N(EVS_GoombaKingBlastoff) = { EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_GoombaKing, EVT_FLOAT(0.3)) EVT_CALL(NpcJump0, NPC_GoombaKing, -1600, 1000, -1600, 150) - EVT_CALL(PlaySoundAt, SOUND_55, SOUND_SPACE_MODE_0, -1600, 1000, -1600) + EVT_CALL(PlaySoundAt, SOUND_0055, SOUND_SPACE_MODE_0, -1600, 1000, -1600) EVT_CALL(N(MakeLensFlare), -1600, 1000, -1600, 40) EVT_CALL(SetNpcPos, NPC_GoombaKing, NPC_DISPOSE_LOCATION) EVT_CALL(RemoveNpc, NPC_GoombaKing) @@ -80,7 +80,7 @@ EvtScript N(EVS_FocusCam_Battlement) = { }; EvtScript N(EVS_RandomQuaking) = { - EVT_CALL(PlaySound, SOUND_A5) + EVT_CALL(PlaySound, SOUND_00A5) EVT_LABEL(0) EVT_CALL(RandInt, 10, LVar0) EVT_ADD(LVar0, 5) @@ -149,25 +149,25 @@ EvtScript N(EVS_FortressCollapse_MakeDust8) = { }; EvtScript N(EVS_FortressCollapse_PlayFX) = { - EVT_CALL(PlaySound, SOUND_1E1) + EVT_CALL(PlaySound, SOUND_01E1) EVT_EXEC(N(EVS_FortressCollapse_MakeDust1)) EVT_WAIT(97) - EVT_CALL(PlaySound, SOUND_1E2) + EVT_CALL(PlaySound, SOUND_01E2) EVT_EXEC(N(EVS_FortressCollapse_MakeDust2)) EVT_WAIT(95) - EVT_CALL(PlaySound, SOUND_A6) + EVT_CALL(PlaySound, SOUND_00A6) EVT_EXEC(N(EVS_FortressCollapse_MakeDust3)) EVT_EXEC(N(EVS_FortressCollapse_MakeDust4)) EVT_WAIT(34) - EVT_CALL(PlaySound, SOUND_A6) + EVT_CALL(PlaySound, SOUND_00A6) EVT_EXEC(N(EVS_FortressCollapse_MakeDust5)) EVT_EXEC(N(EVS_FortressCollapse_MakeDust6)) EVT_WAIT(40) - EVT_CALL(PlaySound, SOUND_A7) + EVT_CALL(PlaySound, SOUND_00A7) EVT_WAIT(160) - EVT_CALL(PlaySound, SOUND_1E8) + EVT_CALL(PlaySound, SOUND_01E8) EVT_WAIT(40) - EVT_CALL(PlaySound, SOUND_1E2) + EVT_CALL(PlaySound, SOUND_01E2) EVT_EXEC(N(EVS_FortressCollapse_MakeDust7)) EVT_EXEC(N(EVS_FortressCollapse_MakeDust8)) EVT_RETURN @@ -215,7 +215,7 @@ EvtScript N(EVS_Scene_SelfDestruct) = { EVT_WAIT(20 * DT) EVT_CALL(SetNpcJumpscale, NPC_GoombaKing, EVT_FLOAT(0.8)) EVT_CALL(NpcFacePlayer, NPC_GoombaKing, 0) - EVT_CALL(PlaySoundAtNpc, NPC_GoombaKing, SOUND_3E7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_GoombaKing, SOUND_LARGE_ACTOR_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump1, NPC_GoombaKing, -380, 120, -42, 25 * DT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(10 * DT) @@ -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_A5 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_00A5 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_EXEC(N(EVS_PlayFortressAnimation)) EVT_EXEC(N(EVS_FortressCollapse_PlayFX)) @@ -411,17 +411,17 @@ EvtScript N(EVS_Scene_MeetGoombaKing_Impl) = { EVT_CALL(SetNpcJumpscale, NPC_RedGoombaBro, EVT_FLOAT(0.8)) EVT_THREAD EVT_CALL(SetNpcPos, NPC_BlueGoombaBro, -400, 0, -162) - EVT_CALL(PlaySoundAtNpc, NPC_BlueGoombaBro, SOUND_10F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_BlueGoombaBro, SOUND_ACTOR_HURT, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_BlueGoombaBro, -432, 130, -146, 30 * DT) EVT_END_THREAD EVT_CALL(SetNpcPos, NPC_RedGoombaBro, -400, 0, -41) - EVT_CALL(PlaySoundAtNpc, NPC_RedGoombaBro, SOUND_10F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_RedGoombaBro, SOUND_ACTOR_HURT, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_RedGoombaBro, -412, 130, -35, 30 * DT) EVT_WAIT(10 * DT) EVT_THREAD EVT_CALL(SetNpcJumpscale, NPC_GoombaKing, EVT_FLOAT(0.8)) EVT_CALL(SetNpcPos, NPC_GoombaKing, -405, 0, -91) - EVT_CALL(PlaySoundAtNpc, NPC_GoombaKing, SOUND_3E7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_GoombaKing, SOUND_LARGE_ACTOR_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_GoombaKing, -419, 119, -91, 30 * DT) EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_MODE_0, -330, 0, -130) EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_MODE_0, -330, 0, -130) diff --git a/src/world/area_kmr/kmr_11/kmr_11_4_npc.c b/src/world/area_kmr/kmr_11/kmr_11_4_npc.c index 1b679e40cf..0f9245cf42 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_4_npc.c +++ b/src/world/area_kmr/kmr_11/kmr_11_4_npc.c @@ -39,21 +39,21 @@ EvtScript N(EVS_NpcIdle_GoombaKing) = { EVT_CALL(GetNpcPos, NPC_RedGoombaBro, LVar0, LVar1, LVar2) EVT_CALL(GetAngleToPlayer, NPC_RedGoombaBro, LVar3) EVT_CALL(AddVectorPolar, LVar0, LVar2, EVT_FLOAT(100.0), LVar3) - EVT_CALL(PlaySoundAtNpc, NPC_RedGoombaBro, SOUND_10F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_RedGoombaBro, SOUND_ACTOR_HURT, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_RedGoombaBro, LVar0, 0, LVar2, 30 * DT) EVT_END_THREAD EVT_THREAD EVT_CALL(GetNpcPos, NPC_BlueGoombaBro, LVar0, LVar1, LVar2) EVT_CALL(GetAngleToPlayer, NPC_BlueGoombaBro, LVar3) EVT_CALL(AddVectorPolar, LVar0, LVar2, EVT_FLOAT(100.0), LVar3) - EVT_CALL(PlaySoundAtNpc, NPC_BlueGoombaBro, SOUND_10F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_BlueGoombaBro, SOUND_ACTOR_HURT, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_BlueGoombaBro, LVar0, 0, LVar2, 30 * DT) EVT_END_THREAD EVT_THREAD EVT_CALL(GetNpcPos, NPC_GoombaKing, LVar0, LVar1, LVar2) EVT_CALL(GetAngleToPlayer, NPC_GoombaKing, LVar3) EVT_CALL(AddVectorPolar, LVar0, LVar2, EVT_FLOAT(100.0), LVar3) - EVT_CALL(PlaySoundAtNpc, NPC_GoombaKing, SOUND_3E7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_GoombaKing, SOUND_LARGE_ACTOR_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_GoombaKing, LVar0, 0, LVar2, 30 * DT) EVT_END_THREAD EVT_WAIT(15 * DT) 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 50f49a88dc..5ed20391b7 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_48, SOUND_SPACE_MODE_0, -469, 1, 92) + EVT_CALL(PlaySoundAt, SOUND_0048, 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) @@ -64,7 +64,7 @@ EvtScript N(EVS_Interact_SwitchBush) = { EvtScript N(EVS_OnBreak_SpecialBrick) = { EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) - EVT_CALL(PlaySoundAt, SOUND_2108, SOUND_SPACE_MODE_0, 665, 35, 70) + EVT_CALL(PlaySoundAt, SOUND_SPAWN_BLOCK, SOUND_SPACE_MODE_0, 665, 35, 70) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 665, 48, 70, 10) EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 665, 35, 70, 45, ITEM_SUPER_SHROOM, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, GF_KMR11_ItemBlock_SuperShroom) 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 551f0d4c36..b0456722d3 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_295, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_LRAW_0295, SOUND_SPACE_MODE_0) EVT_WAIT(4) EVT_END_LOOP EVT_END_THREAD diff --git a/src/world/area_kmr/kmr_12/kmr_12_3_npc.c b/src/world/area_kmr/kmr_12/kmr_12_3_npc.c index 394ee9fc2a..39d99abafa 100644 --- a/src/world/area_kmr/kmr_12/kmr_12_3_npc.c +++ b/src/world/area_kmr/kmr_12/kmr_12_3_npc.c @@ -61,12 +61,12 @@ EvtScript N(EVS_NpcIdle_Goomba) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Goomba_Dizzy) EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Goomba_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_F8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_00F8, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcImgFXFlags, NPC_SELF, IMGFX_FLAG_2000) EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_ANIM, IMGFX_ANIM_UNFURL, 1, 1, 0) EVT_WAIT(12) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.6)) EVT_CALL(NpcJump0, NPC_SELF, -35, 0, 30, 23) 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 e956577f65..1c96a4b13b 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 @@ -110,7 +110,7 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { EVT_WAIT(80) EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_TalkSit, ANIM_Luigi_IdleSit, 5, MSG_CH0_00DB) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, -30, 40, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25) EVT_THREAD @@ -125,7 +125,7 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { EVT_WAIT(15) EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_8, FALSE) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_EXCLAMATION, -30, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) EVT_CALL(GetNpcPos, NPC_Luigi_1, LVar0, LVar1, LVar2) @@ -175,7 +175,7 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_StillBack) EVT_WAIT(30) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, -30, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) @@ -191,7 +191,7 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { EVT_END_THREAD EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_ELLIPSIS, 20, 85, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_QUESTION, -20, 70, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(110) EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 5, MSG_CH0_00DE) @@ -410,7 +410,7 @@ EvtScript N(EVS_NpcIdle_Luigi_ReadingMail) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GF_KMR20_CaughtLuigiReadingLetter, TRUE) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, -30, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Idle) @@ -631,31 +631,31 @@ EvtScript N(EVS_NpcIdle_ShyGuy) = { EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 482, 0, -286, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 726, 0, -153, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 603, 0, 0, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 557, 0, 130, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 357, 0, 87, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 344, 30, -8, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 276, 138, 22, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 360, 61, -117, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 427, 55, -182, 15) EVT_WAIT(5) EVT_END_LOOP @@ -669,11 +669,11 @@ EvtScript N(EVS_NpcAI_ShyGuy) = { EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203F, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 495, 0, -108, 15) EVT_WAIT(3) EVT_CALL(NpcMoveTo, NPC_SELF, 550, -170, 15) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 594, 30, -220, 15) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_ENTER_PIPE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcImgFXFlags, NPC_SELF, IMGFX_FLAG_800) diff --git a/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c b/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c index bd3b133402..f6704e898c 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c +++ b/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c @@ -46,7 +46,7 @@ EvtScript N(EVS_Luigi_PlayWalkSounds_Intro) = { EVT_END_SWITCH EVT_CHILD_THREAD EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_B0000019, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_SEQ_19, SOUND_SPACE_MODE_0) EVT_WAIT(LVar1) EVT_END_LOOP EVT_END_CHILD_THREAD @@ -268,7 +268,7 @@ EvtScript N(EVS_Scene_BeginGame) = { EVT_CALL(NpcFlyTo, NPC_Scene_Parakarry, 430, 20, -165, 60 * DT, -10, EASING_LINEAR) EVT_CALL(InterpNpcYaw, NPC_Scene_Parakarry, 45, 10) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Scene_Parakarry, SOUND_E0, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Scene_Parakarry, SOUNC_CHECK_MAILBOX, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(TranslateModel, MODEL_o222, 2, 0, 0) EVT_CALL(TranslateModel, MODEL_o223, 2, 0, 0) @@ -307,7 +307,7 @@ EvtScript N(EVS_Scene_BeginGame) = { EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Idle) EVT_KILL_THREAD(LVarA) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_E0, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUNC_CHECK_MAILBOX, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(TranslateModel, MODEL_o222, 1, 0, 0) EVT_CALL(TranslateModel, MODEL_o223, 1, 0, 0) @@ -431,7 +431,7 @@ EvtScript N(EVS_Scene_SettingOff) = { EVT_WAIT(7 * DT) EVT_WAIT(7 * DT) EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_SOFT_LAND, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_LAND_SOFTLY, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_Scene_Luigi, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_Scene_Luigi, 594, 30, -216, 15 * DT) diff --git a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c index c1515c0a6d..b246ac2568 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c +++ b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c @@ -78,7 +78,7 @@ EvtScript N(EVS_Luigi_PlayWalkSounds_Epilogue) = { EVT_END_SWITCH EVT_CHILD_THREAD EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_B0000019, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_SEQ_19, SOUND_SPACE_MODE_0) EVT_WAIT(LVar1) EVT_END_LOOP EVT_END_CHILD_THREAD @@ -220,11 +220,11 @@ EvtScript N(EVS_Scene_EpilogueGetLetter) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(35) - EVT_CALL(PlaySoundAt, SOUND_E0, SOUND_SPACE_MODE_0, 430, 0, -185) + EVT_CALL(PlaySoundAt, SOUNC_CHECK_MAILBOX, SOUND_SPACE_MODE_0, 430, 0, -185) EVT_WAIT(25) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 20, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_TalkSit, ANIM_Luigi_IdleSit, 0, MSG_Outro_0021) @@ -239,7 +239,7 @@ EvtScript N(EVS_Scene_EpilogueGetLetter) = { EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Fall) EVT_WAIT(5) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Land) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_SOFT_LAND, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_LAND_SOFTLY, SOUND_SPACE_MODE_0) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Walk) EVT_EXEC_GET_TID(N(EVS_Luigi_PlayWalkSounds_Epilogue), LVarA) @@ -316,7 +316,7 @@ EvtScript N(EVS_Scene_EpilogueGetLetter) = { EVT_WAIT(7) EVT_WAIT(7) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_SOFT_LAND, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_LAND_SOFTLY, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_Luigi_1, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_Luigi_1, 594, 30, -216, 15) 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 d7a2a63a9f..25b8bcafd8 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_21C, 0, 0); + snd_start_sound(SOUND_021C, 0, 0); // fallthrough case RECORDS_STATE_FADING_IN: records->lerpTime++; diff --git a/src/world/area_kmr/kmr_20/kmr_20_4_documents.c b/src/world/area_kmr/kmr_20/kmr_20_4_documents.c index 75477e9696..57447c1591 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_4_documents.c +++ b/src/world/area_kmr/kmr_20/kmr_20_4_documents.c @@ -444,7 +444,7 @@ EvtScript N(EVS_Inspect_LuigisDiary) = { }; EvtScript N(EVS_Shake_Mailbox) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o305, SOUND_E0, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o305, SOUNC_CHECK_MAILBOX, SOUND_SPACE_MODE_0) EVT_CALL(TranslateModel, MODEL_o222, 2, 0, 0) EVT_CALL(TranslateModel, MODEL_o223, 3, 0, 0) EVT_CALL(TranslateModel, MODEL_o224, 1, 0, 0) 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 7a8c0c4831..3c4b098985 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_80000010, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o160, SOUND_LOOP_10, 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_80000010) + EVT_CALL(StopSound, SOUND_LOOP_10) EVT_RETURN EVT_END }; diff --git a/src/world/area_kpa/kpa_08/kpa_08_3_entity.c b/src/world/area_kpa/kpa_08/kpa_08_3_entity.c index dc5e5569f8..b12b99d564 100644 --- a/src/world/area_kpa/kpa_08/kpa_08_3_entity.c +++ b/src/world/area_kpa/kpa_08/kpa_08_3_entity.c @@ -23,7 +23,7 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_CALL(N(UnsetCamera0MoveFlag1)) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_EF) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_227, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_0227, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, -50, 0, 15, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -36,7 +36,7 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(80) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_228, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_0228, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -50, 20, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -52,7 +52,7 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_THREAD EVT_SET_GROUP(EVT_GROUP_EF) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o90, SOUND_227, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o90, SOUND_0227, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, -99, 0, 15, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -66,7 +66,7 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_END_LOOP EVT_CALL(DisablePlayerInput, FALSE) EVT_WAIT(80) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o90, SOUND_228, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o90, SOUND_0228, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -99, 15, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_kpa/kpa_09/kpa_09_3_entity.c b/src/world/area_kpa/kpa_09/kpa_09_3_entity.c index fb3483b979..a5c972d4b9 100644 --- a/src/world/area_kpa/kpa_09/kpa_09_3_entity.c +++ b/src/world/area_kpa/kpa_09/kpa_09_3_entity.c @@ -23,7 +23,7 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_CALL(N(UnsetCamera0MoveFlag1)) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_EF) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_227, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_0227, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, -50, 0, 15, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -36,7 +36,7 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(80) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_228, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_0228, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -50, 15, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -52,7 +52,7 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_THREAD EVT_SET_GROUP(EVT_GROUP_EF) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o106, SOUND_227, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o106, SOUND_0227, SOUND_SPACE_MODE_0) EVT_CALL(EnableGroup, MODEL_move2, TRUE) EVT_CALL(MakeLerp, -50, 0, 15, EASING_COS_IN_OUT) EVT_LOOP(0) @@ -67,7 +67,7 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_END_LOOP EVT_CALL(DisablePlayerInput, FALSE) EVT_WAIT(80) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o106, SOUND_228, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o106, SOUND_0228, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -50, 15, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) 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 b16ba76199..26b384239f 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_80000010, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_LOOP_10, 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_80000010) + EVT_CALL(StopSound, SOUND_LOOP_10) EVT_RETURN EVT_END }; diff --git a/src/world/area_kpa/kpa_113/kpa_113_3_entity.c b/src/world/area_kpa/kpa_113/kpa_113_3_entity.c index 2edd775a33..7773cb3259 100644 --- a/src/world/area_kpa/kpa_113/kpa_113_3_entity.c +++ b/src/world/area_kpa/kpa_113/kpa_113_3_entity.c @@ -23,7 +23,7 @@ EvtScript N(EVS_UnlockPrompt_LockedDoor) = { EVT_CALL(CloseChoicePopup) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySound, SOUND_269) + EVT_CALL(PlaySound, SOUND_0269) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_KPA113_UnlockedDoor, TRUE) EVT_SET(LVar0, MV_PadlockEntityID) 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 a86fddaf1f..f35fd72d4f 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_80000010, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_LOOP_10, 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_80000010) + EVT_CALL(StopSound, SOUND_LOOP_10) 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 a6b7c69f77..f1863567a7 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_80000010, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_LOOP_10, 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_80000010) + EVT_CALL(StopSound, SOUND_LOOP_10) 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 ebaf166721..dbd3a2f633 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_1EF, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Dummy, SOUND_01EF, 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 5f41f7a324..b95d2f137f 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_229, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0229, 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_80000053) + EVT_CALL(PlaySound, SOUND_LOOP_53) 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_22B | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_22B) + EVT_CALL(PlaySound, SOUND_LRAW_022B | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(func_802D62E4, SOUND_LRAW_022B) EVT_CALL(SetGroupVisibility, MODEL_sui1, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_s_sui, FALSE) EVT_CALL(EnableModel, MODEL_o385, FALSE) @@ -212,7 +212,7 @@ EvtScript N(EVS_RaiseWaterLevel1) = { EVT_GOTO(15) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_80000052, SOUND_SPACE_MODE_0, 118, 115, -11) + EVT_CALL(PlaySoundAt, SOUND_LOOP_52, SOUND_SPACE_MODE_0, 118, 115, -11) EVT_WAIT(20) EVT_THREAD EVT_CALL(SetTexPanner, MODEL_o388, 2) @@ -266,8 +266,8 @@ EvtScript N(EVS_RaiseWaterLevel1) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(40) EVT_END_IF - EVT_CALL(PlaySound, SOUND_22A | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_22A) + EVT_CALL(PlaySound, SOUND_LRAW_022A | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(func_802D62E4, SOUND_LRAW_022A) 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_229, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0229, 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_80000053) + EVT_CALL(PlaySound, SOUND_LOOP_53) 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_22B | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_22B) + EVT_CALL(PlaySound, SOUND_LRAW_022B | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(func_802D62E4, SOUND_LRAW_022B) 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_80000052, SOUND_SPACE_MODE_0, 500, 240, -25) + EVT_CALL(PlaySoundAt, SOUND_LOOP_52, 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_22A | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_22A) + EVT_CALL(PlaySound, SOUND_LRAW_022A | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(func_802D62E4, SOUND_LRAW_022A) 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 8bcd9d36f5..813b48749e 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_2040, SOUND_SPACE_MODE_0, LVar6, LVar7, LVar8) + EVT_CALL(PlaySoundAt, SOUND_LRAW_2040, 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_2040) + EVT_CALL(StopSound, SOUND_LRAW_2040) 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_134/kpa_134_6_entity.c b/src/world/area_kpa/kpa_134/kpa_134_6_entity.c index 1bc6a7c841..61901c8f51 100644 --- a/src/world/area_kpa/kpa_134/kpa_134_6_entity.c +++ b/src/world/area_kpa/kpa_134/kpa_134_6_entity.c @@ -64,7 +64,7 @@ EvtScript N(EVS_UnlockPrompt_Door) = { EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_KPA134_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) diff --git a/src/world/area_kpa/kpa_14/kpa_14_3_entity.c b/src/world/area_kpa/kpa_14/kpa_14_3_entity.c index 51bffe9505..c5f8804e8b 100644 --- a/src/world/area_kpa/kpa_14/kpa_14_3_entity.c +++ b/src/world/area_kpa/kpa_14/kpa_14_3_entity.c @@ -43,7 +43,7 @@ EvtScript N(EVS_UnlockPrompt_Door) = { EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_KPA14_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) diff --git a/src/world/area_kpa/kpa_16/kpa_16_4_npc.c b/src/world/area_kpa/kpa_16/kpa_16_4_npc.c index d01a3d97c3..576ec9e4dd 100644 --- a/src/world/area_kpa/kpa_16/kpa_16_4_npc.c +++ b/src/world/area_kpa/kpa_16/kpa_16_4_npc.c @@ -158,9 +158,9 @@ EvtScript N(EVS_NpcIdle_Guards) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_02, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_03, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_0262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_02, SOUND_0262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_03, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Koopatrol_01, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Koopatrol_02, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Koopatrol_03, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) diff --git a/src/world/area_kpa/kpa_17/kpa_17_4_npc.c b/src/world/area_kpa/kpa_17/kpa_17_4_npc.c index 5e32b14c4d..d928cbfec7 100644 --- a/src/world/area_kpa/kpa_17/kpa_17_4_npc.c +++ b/src/world/area_kpa/kpa_17/kpa_17_4_npc.c @@ -21,7 +21,7 @@ EvtScript N(EVS_Scene_FallIntoCell) = { EVT_ELSE EVT_CALL(func_802CF56C, 1) EVT_END_IF - EVT_CALL(PlaySoundAtPlayer, SOUND_161, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0161, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicStill) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_LOOP(0) @@ -30,7 +30,7 @@ EvtScript N(EVS_Scene_FallIntoCell) = { EVT_WAIT(1) EVT_IF_LE(LVar1, 30) EVT_CALL(SetPlayerPos, LVar0, 30, LVar2) - EVT_CALL(PlaySoundAtPlayer, SOUND_3FB, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_03FB, SOUND_SPACE_MODE_0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP diff --git a/src/world/area_kpa/kpa_52/kpa_52_2_entity.c b/src/world/area_kpa/kpa_52/kpa_52_2_entity.c index 3f1b04cede..f4268abc94 100644 --- a/src/world/area_kpa/kpa_52/kpa_52_2_entity.c +++ b/src/world/area_kpa/kpa_52/kpa_52_2_entity.c @@ -24,7 +24,7 @@ EvtScript N(EVS_UnlockPrompt_Door) = { EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_KPA52_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) diff --git a/src/world/area_kpa/kpa_53/kpa_53_3_npc.c b/src/world/area_kpa/kpa_53/kpa_53_3_npc.c index bd3b68b2a0..0726bee74f 100644 --- a/src/world/area_kpa/kpa_53/kpa_53_3_npc.c +++ b/src/world/area_kpa/kpa_53/kpa_53_3_npc.c @@ -46,7 +46,7 @@ EvtScript N(EVS_NpcAI_Duplighost_Flee) = { EVT_END_IF EVT_END_LOOP EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 5) diff --git a/src/world/area_kpa/kpa_60/kpa_60_2_entity.c b/src/world/area_kpa/kpa_60/kpa_60_2_entity.c index 37e558be0a..e559797ea1 100644 --- a/src/world/area_kpa/kpa_60/kpa_60_2_entity.c +++ b/src/world/area_kpa/kpa_60/kpa_60_2_entity.c @@ -23,7 +23,7 @@ EvtScript N(EVS_UnlockPrompt_FrontDoor) = { EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_KPA62_UnlockedFrontDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadLockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadLockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) diff --git a/src/world/area_kpa/kpa_60/kpa_60_3_main.c b/src/world/area_kpa/kpa_60/kpa_60_3_main.c index 326a8344bb..49f98f18fe 100644 --- a/src/world/area_kpa/kpa_60/kpa_60_3_main.c +++ b/src/world/area_kpa/kpa_60/kpa_60_3_main.c @@ -3,7 +3,7 @@ #include "world/common/atomic/TexturePan.inc.c" EvtScript N(EVS_OpenAirshipDockDoor) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1DF, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_01DF, SOUND_SPACE_MODE_0) EVT_CALL(EnableModel, MODEL_o1616, FALSE) EVT_CALL(MakeLerp, 0, -10, 20, EASING_CUBIC_IN) EVT_LOOP(0) @@ -47,7 +47,7 @@ EvtScript N(EVS_CloseAirshipDockDoor) = { EVT_END_IF EVT_END_LOOP EVT_CALL(EnableModel, MODEL_o1616, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1E0, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_01E0, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c b/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c index e481605188..f78b7265a0 100644 --- a/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c +++ b/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c @@ -37,7 +37,7 @@ EvtScript N(EVS_Scene_Arrival) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, -70, 0) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_CALL(PlaySound, SOUND_182) + EVT_CALL(PlaySound, SOUND_0182) EVT_CALL(LoadPath, 45, EVT_PTR(N(FlightPath_Arrival)), ARRAY_COUNT(N(FlightPath_Arrival)), EASING_LINEAR) EVT_LABEL(90) EVT_CALL(GetNextPathPos) @@ -88,7 +88,7 @@ EvtScript N(EVS_Scene_Departure) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD - EVT_CALL(PlaySound, SOUND_183) + EVT_CALL(PlaySound, SOUND_0183) EVT_CALL(LoadPath, 45, EVT_PTR(N(FlightPath_Departure)), ARRAY_COUNT(N(FlightPath_Departure)), EASING_LINEAR) EVT_LABEL(90) EVT_CALL(GetNextPathPos) diff --git a/src/world/area_kpa/kpa_62/kpa_62_2_entity.c b/src/world/area_kpa/kpa_62/kpa_62_2_entity.c index 70708e3c7f..3068876f39 100644 --- a/src/world/area_kpa/kpa_62/kpa_62_2_entity.c +++ b/src/world/area_kpa/kpa_62/kpa_62_2_entity.c @@ -23,7 +23,7 @@ EvtScript N(EVS_UnlockPrompt_FrontDoor) = { EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_KPA62_UnlockedFrontDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadLockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadLockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) diff --git a/src/world/area_kpa/kpa_62/kpa_62_3_main.c b/src/world/area_kpa/kpa_62/kpa_62_3_main.c index c4cc96c9bb..f4e26f46f2 100644 --- a/src/world/area_kpa/kpa_62/kpa_62_3_main.c +++ b/src/world/area_kpa/kpa_62/kpa_62_3_main.c @@ -3,7 +3,7 @@ #include "world/common/atomic/TexturePan.inc.c" EvtScript N(EVS_OpenAirshipDockDoor) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1DF, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_01DF, SOUND_SPACE_MODE_0) EVT_CALL(EnableModel, MODEL_o1616, FALSE) EVT_CALL(MakeLerp, 0, -10, 20, EASING_CUBIC_IN) EVT_LOOP(0) @@ -28,7 +28,7 @@ EvtScript N(EVS_OpenAirshipDockDoor) = { }; EvtScript N(EVS_CloseAirshipDockDoor) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1E0, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_01E0, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 45, 0, 25, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_kpa/kpa_63/kpa_63_3_main.c b/src/world/area_kpa/kpa_63/kpa_63_3_main.c index 4d6c636629..7d2af32851 100644 --- a/src/world/area_kpa/kpa_63/kpa_63_3_main.c +++ b/src/world/area_kpa/kpa_63/kpa_63_3_main.c @@ -1,7 +1,7 @@ #include "kpa_63.h" EvtScript N(EVS_OpenHangerDoor) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_tts, SOUND_1DF, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tts, SOUND_01DF, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 100, 0, 20, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -29,7 +29,7 @@ EvtScript N(EVS_CloseHangerDoor) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_tts, SOUND_1E0, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tts, SOUND_01E0, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c b/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c index 9eb35bc341..92ff31325a 100644 --- a/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c +++ b/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c @@ -146,7 +146,7 @@ EvtScript N(EVS_Starship_Depart) = { EVT_END_IF EVT_CALL(SetMusicTrack, 0, SONG_STARSHIP_THEME, 1, 8) EVT_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_17E, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_017E, SOUND_SPACE_MODE_0) EVT_SET(LVar2, MV_Starship_PosY) EVT_CALL(MakeLerp, 0, -110, 60, EASING_QUADRATIC_OUT) EVT_LOOP(0) @@ -184,7 +184,7 @@ EvtScript N(EVS_Starship_Arrive) = { EVT_CALL(HidePlayerShadow, FALSE) EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) EVT_EXEC_GET_TID(N(EVS_UpdatePassengers), LVar9) - EVT_CALL(PlaySoundAtPlayer, SOUND_17F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_017F, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(MakeLerp, -100, 0, 60, EASING_QUADRATIC_OUT) EVT_LOOP(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 718a8d6bd0..e3fa560b1c 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_80000051, SOUND_SPACE_MODE_0, 800, 100, -200) + EVT_CALL(PlaySoundAt, SOUND_LOOP_51, SOUND_SPACE_MODE_0, 800, 100, -200) EVT_WAIT(28) EVT_LOOP(0) - EVT_CALL(PlaySoundAt, SOUND_222, SOUND_SPACE_MODE_0, 800, 100, -200) + EVT_CALL(PlaySoundAt, SOUND_0222, 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 c83de1fc1b..96e81ba68f 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 @@ -180,7 +180,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicStill) EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_161, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0161, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_LOOP(65) 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 85144d0d05..1dca3161b2 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 @@ -177,7 +177,7 @@ EvtScript N(EVS_SetCam_BeforeBattle) = { EvtScript N(EVS_SetDoorRots) = { EVT_CALL(MakeLerp, 0, 60, 30 * DT, EASING_LINEAR) - EVT_CALL(PlaySound, SOUND_225) + EVT_CALL(PlaySound, SOUND_0225) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_o100, 0, LVar0, 0) @@ -197,7 +197,7 @@ EvtScript N(EVS_SetDoorRots) = { EvtScript N(EVS_CloseDoors) = { EVT_CALL(MakeLerp, 60, 0, 30 * DT, EASING_LINEAR) - EVT_CALL(PlaySound, SOUND_226) + EVT_CALL(PlaySound, SOUND_0226) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_o100, 0, LVar0, 0) @@ -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_21C) + EVT_CALL(PlaySound, SOUND_021C) EVT_WAIT(10 * DT) EVT_CALL(EnableGroup, MODEL_g47, FALSE) EVT_SET(LVarA, MODEL_m_kai) diff --git a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c index 39dfdb6e10..d94724fc7d 100644 --- a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c +++ b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c @@ -201,7 +201,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosRed, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosRed, NPC_FLAG_8, FALSE) EVT_CALL(NpcMoveTo, NPC_KoopaBrosRed, 20, 160, 20) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosRed, SOUND_3E9, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosRed, SOUND_03E9, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 20, 0, 160, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBrosRed, FALSE) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_IdleCrouch) @@ -216,7 +216,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosBlk, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosBlk, NPC_FLAG_8, FALSE) EVT_CALL(NpcMoveTo, NPC_KoopaBrosBlk, 48, 185, 20) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosBlk, SOUND_3E9, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosBlk, SOUND_03E9, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 48, 0, 185, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBrosBlk, FALSE) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_IdleCrouch) @@ -231,7 +231,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosYlw, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosYlw, NPC_FLAG_8, FALSE) EVT_CALL(NpcMoveTo, NPC_KoopaBrosYlw, 60, 110, 20) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosYlw, SOUND_3E9, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosYlw, SOUND_03E9, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 60, 0, 110, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBrosYlw, FALSE) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_IdleCrouch) @@ -246,7 +246,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosGrn, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosGrn, NPC_FLAG_8, FALSE) EVT_CALL(NpcMoveTo, NPC_KoopaBrosGrn, 88, 155, 20) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosGrn, SOUND_3E9, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosGrn, SOUND_03E9, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 88, 0, 155, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBrosGrn, FALSE) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_IdleCrouch) diff --git a/src/world/area_kpa/kpa_91/kpa_91_4_entity.c b/src/world/area_kpa/kpa_91/kpa_91_4_entity.c index f194d901ea..d18495f865 100644 --- a/src/world/area_kpa/kpa_91/kpa_91_4_entity.c +++ b/src/world/area_kpa/kpa_91/kpa_91_4_entity.c @@ -23,7 +23,7 @@ EvtScript N(EVS_UnlockPrompt_PrisonCell) = { EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_KPA91_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) diff --git a/src/world/area_kpa/kpa_95/kpa_95_2_entity.c b/src/world/area_kpa/kpa_95/kpa_95_2_entity.c index 29ddb1f239..f650cc5ec9 100644 --- a/src/world/area_kpa/kpa_95/kpa_95_2_entity.c +++ b/src/world/area_kpa/kpa_95/kpa_95_2_entity.c @@ -23,7 +23,7 @@ EvtScript N(EVS_UnlockPrompt_PrisonCell) = { EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_KPA95_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) diff --git a/src/world/area_kzn/kzn_02/kzn_02_3_npc.c b/src/world/area_kzn/kzn_02/kzn_02_3_npc.c index 349948156d..26c45ec7b9 100644 --- a/src/world/area_kzn/kzn_02/kzn_02_3_npc.c +++ b/src/world/area_kzn/kzn_02/kzn_02_3_npc.c @@ -48,7 +48,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Thrown) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -655, 20, 0, 20) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Yell) EVT_CALL(NpcJump0, NPC_SELF, -645, 20, 0, 5) @@ -88,7 +88,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_GOTO(15) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_E8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_TOUCH_LAVA, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -700, 150, 0, 35) EVT_THREAD EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) @@ -99,7 +99,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Fallen) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 2) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -760, 50, -40, 10) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_WAIT(4) @@ -108,7 +108,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Fallen) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 2) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -760, 40, -40, 10) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_WAIT(4) diff --git a/src/world/area_kzn/kzn_03/kzn_03_2_npc.c b/src/world/area_kzn/kzn_03/kzn_03_2_npc.c index 41b83fbece..e621570abd 100644 --- a/src/world/area_kzn/kzn_03/kzn_03_2_npc.c +++ b/src/world/area_kzn/kzn_03/kzn_03_2_npc.c @@ -61,7 +61,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5)) EVT_LABEL(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 9) EVT_CALL(GetSelfVar, 0, LVar0) EVT_IF_EQ(LVar0, 1) @@ -95,7 +95,7 @@ EvtScript N(EVS_NpcInteract_Kolorado) = { EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5)) EVT_LABEL(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 9) EVT_CALL(GetSelfVar, 0, LVar0) EVT_IF_EQ(LVar0, 1) 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 54f34a570e..5a76dfa5a3 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 @@ -9,7 +9,7 @@ API_CALLABLE(N(Zipline_AdjustMoveDownSound)) { 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_168, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_LRAW_0168, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); } return ApiStatus_DONE2; } @@ -21,7 +21,7 @@ API_CALLABLE(N(Zipline_AdjustMoveUpSound)) { 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_185, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_LRAW_0185, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); } return ApiStatus_DONE2; } @@ -109,7 +109,7 @@ EvtScript N(EVS_RideZipline) = { EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_HoldOnto) EVT_WAIT(10) EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) - EVT_CALL(PlaySound, SOUND_80000019) + EVT_CALL(PlaySound, SOUND_LOOP_19) EVT_CHILD_THREAD EVT_SET(MF_RidingZipline1, TRUE) EVT_SET(LVar0, ArrayVar(6)) @@ -141,14 +141,14 @@ EvtScript N(EVS_RideZipline) = { EVT_LABEL(10) EVT_CALL(SetPlayerFlagBits, PS_FLAG_SCRIPTED_FALL, TRUE) EVT_SET(MF_RidingZipline1, FALSE) - EVT_CALL(StopSound, SOUND_80000019) + EVT_CALL(StopSound, SOUND_LOOP_19) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) EVT_CALL(EnablePartnerAI) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_KILL_THREAD(LVar9) EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_8000001A) + EVT_CALL(PlaySound, SOUND_LOOP_1A) EVT_CHILD_THREAD EVT_SET(MF_RidingZipline2, TRUE) EVT_SET(LVar0, ArrayVar(6)) @@ -175,7 +175,7 @@ EvtScript N(EVS_RideZipline) = { EVT_GOTO(1) EVT_END_IF EVT_SET(MF_RidingZipline2, FALSE) - EVT_CALL(StopSound, SOUND_8000001A) + EVT_CALL(StopSound, SOUND_LOOP_1A) EVT_RETURN EVT_END }; diff --git a/src/world/area_kzn/kzn_04/kzn_04_3_npc.c b/src/world/area_kzn/kzn_04/kzn_04_3_npc.c index 403c06ea99..e605622c2e 100644 --- a/src/world/area_kzn/kzn_04/kzn_04_3_npc.c +++ b/src/world/area_kzn/kzn_04/kzn_04_3_npc.c @@ -5,9 +5,9 @@ #include "world/common/enemy/ai/FireBarAI.inc.c" s32 N(FireBar_Sounds)[] = { - SOUND_FIRE_BAR_0, SOUND_FIRE_BAR_1, SOUND_FIRE_BAR_2, SOUND_FIRE_BAR_3, - SOUND_FIRE_BAR_4, SOUND_FIRE_BAR_5, SOUND_FIRE_BAR_6, SOUND_FIRE_BAR_7, - SOUND_FIRE_BAR_8, SOUND_FIRE_BAR_9, SOUND_FIRE_BAR_9, + SOUND_SEQ_FIRE_BAR_0, SOUND_SEQ_FIRE_BAR_1, SOUND_SEQ_FIRE_BAR_2, SOUND_SEQ_FIRE_BAR_3, + SOUND_SEQ_FIRE_BAR_4, SOUND_SEQ_FIRE_BAR_5, SOUND_SEQ_FIRE_BAR_6, SOUND_SEQ_FIRE_BAR_7, + SOUND_SEQ_FIRE_BAR_8, SOUND_SEQ_FIRE_BAR_9, SOUND_SEQ_FIRE_BAR_9, }; EvtScript N(EVS_FireBar_Defeated) = { @@ -30,7 +30,7 @@ EvtScript N(EVS_FireBar_Defeated) = { EVT_SET(LVar1, LVarB) EVT_END_LOOP EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) - EVT_CALL(PlaySoundAt, SOUND_B000000A, SOUND_SPACE_MODE_0, LVar1, LVar2, LVar3) + EVT_CALL(PlaySoundAt, SOUND_SEQ_FIRE_BAR_DEAD, SOUND_SPACE_MODE_0, LVar1, LVar2, LVar3) EVT_LOOP(10) EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) EVT_CALL(RandInt, 50, LVar4) 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 9920cfce24..9614e99361 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 @@ -8,7 +8,7 @@ API_CALLABLE(N(Zipline_AdjustMoveDownSound)) { 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_168, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_LRAW_0168, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); } return ApiStatus_DONE2; } @@ -20,7 +20,7 @@ API_CALLABLE(N(Zipline_AdjustMoveUpSound)) { 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_185, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_LRAW_0185, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); } return ApiStatus_DONE2; } @@ -103,7 +103,7 @@ EvtScript N(EVS_RideZipline) = { EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_HoldOnto) EVT_WAIT(10) EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) - EVT_CALL(PlaySound, SOUND_80000019) + EVT_CALL(PlaySound, SOUND_LOOP_19) EVT_CHILD_THREAD EVT_SET(MF_Zipline_GoingDown, TRUE) EVT_SET(LVar0, ArrayVar(6)) @@ -135,14 +135,14 @@ EvtScript N(EVS_RideZipline) = { EVT_LABEL(10) EVT_CALL(SetPlayerFlagBits, PS_FLAG_SCRIPTED_FALL, TRUE) EVT_SET(MF_Zipline_GoingDown, FALSE) - EVT_CALL(StopSound, SOUND_80000019) + EVT_CALL(StopSound, SOUND_LOOP_19) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) EVT_CALL(EnablePartnerAI) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_KILL_THREAD(LVar9) EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_8000001A) + EVT_CALL(PlaySound, SOUND_LOOP_1A) EVT_CHILD_THREAD EVT_SET(MF_Zipline_GoingUp, TRUE) EVT_SET(LVar0, ArrayVar(6)) @@ -169,7 +169,7 @@ EvtScript N(EVS_RideZipline) = { EVT_GOTO(1) EVT_END_IF EVT_SET(MF_Zipline_GoingUp, FALSE) - EVT_CALL(StopSound, SOUND_8000001A) + EVT_CALL(StopSound, SOUND_LOOP_1A) EVT_RETURN EVT_END }; diff --git a/src/world/area_kzn/kzn_09/kzn_09_4_npc.c b/src/world/area_kzn/kzn_09/kzn_09_4_npc.c index 29769201ed..d3480b42b1 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_4_npc.c +++ b/src/world/area_kzn/kzn_09/kzn_09_4_npc.c @@ -73,14 +73,14 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = { EVT_WAIT(5) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 3) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25 * DT) EVT_CALL(SetSelfVar, 0, 2) EVT_THREAD EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5)) EVT_LABEL(1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -410, 870, -15, 10 * DT) EVT_CALL(GetSelfVar, 0, LVar0) EVT_IF_NE(LVar0, 1) @@ -108,11 +108,11 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = { EVT_SET(LVar3, -350) EVT_SET(LVar4, 870) EVT_SET(LVar5, -15) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10 * DT) EVT_ADD(LVar3, 90) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Thrown) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10 * DT) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) EVT_CALL(SetSelfVar, 0, 1) @@ -151,7 +151,7 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Fallen) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(NpcJump0, NPC_SELF, LVar3, 700, LVar5, 5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_161, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0161, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetSelfVar, 0, 0) @@ -174,7 +174,7 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00F5, 160, 40) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_162, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0162, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(7.0)) EVT_WAIT(10 * DT) EVT_CALL(SetSelfVar, 0, 0) diff --git a/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c b/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c index 7489a0a7f2..c6c1e4a190 100644 --- a/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c +++ b/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c @@ -145,14 +145,14 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_END_IF EVT_END_SWITCH EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_1E3, SOUND_SPACE_MODE_0, -465, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_01E3, SOUND_SPACE_MODE_0, -465, 0, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(2.5)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.2)) EVT_WAIT(15) EVT_CALL(DisablePlayerInput, FALSE) EVT_EXEC_GET_TID(N(EVS_SpinyTromp_ManageCamera), LVarA) EVT_EXEC_GET_TID(N(EVS_SpinyTromp_ShakeCam), MV_ScreenShakeTID) - EVT_CALL(PlaySoundAt, SOUND_8000001B, SOUND_SPACE_MODE_0, -465, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_LOOP_1B, SOUND_SPACE_MODE_0, -465, 0, 0) EVT_SET(LVar2, 0) EVT_SET(LVar3, 0) EVT_CALL(MakeLerp, UNK_FUNC_50_LVar1, 418, 180, EASING_QUADRATIC_IN) @@ -200,8 +200,8 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.5)) EVT_END_THREAD - EVT_CALL(StopSound, SOUND_8000001B) - EVT_CALL(PlaySoundAt, SOUND_1E4, SOUND_SPACE_MODE_0, 415, -240, 0) + EVT_CALL(StopSound, SOUND_LOOP_1B) + EVT_CALL(PlaySoundAt, SOUND_01E4, SOUND_SPACE_MODE_0, 415, -240, 0) EVT_CALL(EnableModel, MODEL_me, FALSE) EVT_THREAD EVT_SET(LVar0, 418) diff --git a/src/world/area_kzn/kzn_11/kzn_11_3_npc.c b/src/world/area_kzn/kzn_11/kzn_11_3_npc.c index 89bc69b3cd..a68bd82763 100644 --- a/src/world/area_kzn/kzn_11/kzn_11_3_npc.c +++ b/src/world/area_kzn/kzn_11/kzn_11_3_npc.c @@ -6,9 +6,9 @@ #include "world/common/enemy/ai/FireBarAI.inc.c" s32 N(FireBar_Sounds)[] = { - SOUND_FIRE_BAR_0, SOUND_FIRE_BAR_1, SOUND_FIRE_BAR_2, SOUND_FIRE_BAR_3, - SOUND_FIRE_BAR_4, SOUND_FIRE_BAR_5, SOUND_FIRE_BAR_6, SOUND_FIRE_BAR_7, - SOUND_FIRE_BAR_8, SOUND_FIRE_BAR_9, SOUND_FIRE_BAR_9, + SOUND_SEQ_FIRE_BAR_0, SOUND_SEQ_FIRE_BAR_1, SOUND_SEQ_FIRE_BAR_2, SOUND_SEQ_FIRE_BAR_3, + SOUND_SEQ_FIRE_BAR_4, SOUND_SEQ_FIRE_BAR_5, SOUND_SEQ_FIRE_BAR_6, SOUND_SEQ_FIRE_BAR_7, + SOUND_SEQ_FIRE_BAR_8, SOUND_SEQ_FIRE_BAR_9, SOUND_SEQ_FIRE_BAR_9, }; EvtScript N(EVS_FireBar_Defeated) = { @@ -31,7 +31,7 @@ EvtScript N(EVS_FireBar_Defeated) = { EVT_SET(LVar1, LVarB) EVT_END_LOOP EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) - EVT_CALL(PlaySoundAt, SOUND_B000000A, SOUND_SPACE_MODE_0, LVar1, LVar2, LVar3) + EVT_CALL(PlaySoundAt, SOUND_SEQ_FIRE_BAR_DEAD, SOUND_SPACE_MODE_0, LVar1, LVar2, LVar3) EVT_LOOP(10) EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) EVT_CALL(RandInt, 50, LVar4) diff --git a/src/world/area_kzn/kzn_17/kzn_17_4_tromp.c b/src/world/area_kzn/kzn_17/kzn_17_4_tromp.c index 40f6dc530d..52f879a17c 100644 --- a/src/world/area_kzn/kzn_17/kzn_17_4_tromp.c +++ b/src/world/area_kzn/kzn_17/kzn_17_4_tromp.c @@ -72,7 +72,7 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_EXEC_GET_TID(N(EVS_SpinyTromp_ManageCamera), LVarA) EVT_EXEC(N(EVS_Kolorado_TrompPanic)) EVT_EXEC_GET_TID(N(EVS_SpinyTromp_ShakeCam), MV_ScreenShakeTID) - EVT_CALL(PlaySound, SOUND_8000001B) + EVT_CALL(PlaySound, SOUND_LOOP_1B) EVT_SET(LVar3, 0) EVT_CALL(MakeLerp, -583, 750, 270, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -114,7 +114,7 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_IF_GT(LVar0, 630) EVT_KILL_THREAD(MV_ScreenShakeTID) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_gogo, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_gogo, SOUND_1E4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_gogo, SOUND_01E4, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 2, 32, 32, 1, 10, 45) EVT_CALL(EnableModel, MODEL_mae, FALSE) EVT_CALL(EnableModel, MODEL_ato, TRUE) @@ -143,7 +143,7 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_END_LOOP EVT_SET(GB_StoryProgress, STORY_CH5_HIDDEN_PASSAGE_OPEN) EVT_WAIT(50) - EVT_CALL(StopSound, SOUND_8000001B) + EVT_CALL(StopSound, SOUND_LOOP_1B) EVT_CALL(SetGroupVisibility, MODEL_goron, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_me, FALSE) EVT_KILL_THREAD(LVarA) diff --git a/src/world/area_kzn/kzn_18/kzn_18_2_npc.c b/src/world/area_kzn/kzn_18/kzn_18_2_npc.c index a1de8d0f78..8751452967 100644 --- a/src/world/area_kzn/kzn_18/kzn_18_2_npc.c +++ b/src/world/area_kzn/kzn_18/kzn_18_2_npc.c @@ -57,7 +57,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_THREAD EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10 * DT) EVT_CALL(SetNpcYaw, NPC_SELF, 90) EVT_SET(MV_KoloradoJumpDone, TRUE) diff --git a/src/world/area_kzn/kzn_19/kzn_19_1_music.c b/src/world/area_kzn/kzn_19/kzn_19_1_music.c index 1e093561ec..3874a44476 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_1_music.c +++ b/src/world/area_kzn/kzn_19/kzn_19_1_music.c @@ -11,7 +11,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_END_IF EVT_END_IF //@bug extra endif EVT_CASE_GE(STORY_CH5_MT_LAVA_LAVA_ERUPTING) - EVT_CALL(PlaySound, SOUND_8000006B) + EVT_CALL(PlaySound, SOUND_LOOP_6B) EVT_END_SWITCH EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) 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 13b27383ec..39693f5561 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,10 +38,10 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_80000067) + EVT_CALL(PlaySound, SOUND_LOOP_67) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, SOUND_SPACE_MODE_0, 185, 110, -30) + EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, 185, 110, -30) EVT_END_THREAD EVT_THREAD EVT_WAIT(45) @@ -50,7 +50,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_THREAD EVT_WAIT(180) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, SOUND_SPACE_MODE_0, 185, 110, -30) + EVT_CALL(PlaySoundAt, SOUND_0137, SOUND_SPACE_MODE_0, 185, 110, -30) EVT_END_THREAD EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD @@ -78,7 +78,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_IF // wait for pickup EVT_CALL(N(StarSpiritEffectFunc4), 3) - EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_4, TRANSITION_GET_STAR_CARD) EVT_WAIT(100) diff --git a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/area_kzn/kzn_19/kzn_19_4_npc.c index b5d7f24cba..4a9c50dc42 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c +++ b/src/world/area_kzn/kzn_19/kzn_19_4_npc.c @@ -137,7 +137,7 @@ EvtScript N(EVS_Misstar_Escape) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(30) EVT_SET(AF_KZN_BossRoomFloorBroken, TRUE) - EVT_CALL(PlaySound, SOUND_8000006B) + EVT_CALL(PlaySound, SOUND_LOOP_6B) EVT_LOOP(0) EVT_WAIT(1) EVT_IF_NE(AF_KZN_BossRoomFloorBroken, TRUE) @@ -303,7 +303,7 @@ EvtScript N(EVS_NpcIdle_LavaPiranha) = { EVT_CALL(PlayerMoveTo, 200, -30, 0) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_3C5, SOUND_SPACE_MODE_0, 330, 25, -50) + EVT_CALL(PlaySoundAt, SOUND_03C5, SOUND_SPACE_MODE_0, 330, 25, -50) EVT_EXEC(N(EVS_PlayVinesAnim_Emerge)) EVT_WAIT(59) EVT_THREAD @@ -558,7 +558,7 @@ EvtScript N(EVS_NpcDefeat_LavaPiranha) = { EVT_CALL(EnableGroup, MODEL_mae, FALSE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ato, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_mae, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAt, SOUND_3C6, SOUND_SPACE_MODE_0, 330, 25, -50) + EVT_CALL(PlaySoundAt, SOUND_03C6, SOUND_SPACE_MODE_0, 330, 25, -50) EVT_EXEC(N(EVS_PlayVinesAnim_Defeat)) EVT_WAIT(1) EVT_CALL(SetNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_LavaPiranha))) diff --git a/src/world/area_kzn/kzn_20/kzn_20_1_music.c b/src/world/area_kzn/kzn_20/kzn_20_1_music.c index b492956812..155ae5216e 100644 --- a/src/world/area_kzn/kzn_20/kzn_20_1_music.c +++ b/src/world/area_kzn/kzn_20/kzn_20_1_music.c @@ -2,7 +2,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_IF_GE(GB_StoryProgress, STORY_CH5_MT_LAVA_LAVA_ERUPTING) - EVT_CALL(PlaySound, SOUND_8000006B) + EVT_CALL(PlaySound, SOUND_LOOP_6B) EVT_END_IF EVT_IF_LT(GB_StoryProgress, STORY_CH5_OPENED_ESCAPE_ROUTE) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) diff --git a/src/world/area_kzn/kzn_20/kzn_20_3_npc.c b/src/world/area_kzn/kzn_20/kzn_20_3_npc.c index 1d56585b05..ab1e50c7aa 100644 --- a/src/world/area_kzn/kzn_20/kzn_20_3_npc.c +++ b/src/world/area_kzn/kzn_20/kzn_20_3_npc.c @@ -187,9 +187,9 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) EVT_CALL(SetNpcPos, NPC_SELF, -30, 100, 40) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -25, 125, -20, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 20, 150, 5, 10) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 40, 35, 0) @@ -214,7 +214,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 20, 0, 0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -35, 125, -20, 12) EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(1.0)) @@ -227,7 +227,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 5, MSG_CH5_010B) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) @@ -254,11 +254,11 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) EVT_SET(MV_SceneState, SCENE_STATE_KOLORADO_WENT_BACK) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -30, 100, 40, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -15, 75, 80, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 35, 50, 120, 10) EVT_CASE_EQ(SCENE_STATE_KOLORADO_WARNED) EVT_CALL(N(func_80240A68_C96998)) @@ -281,7 +281,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Hurt) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_E8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_TOUCH_LAVA, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump1, NPC_SELF, LVar0, LVar1, LVar2, 60) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_SET(MV_SceneState, SCENE_STATE_KOLORADO_BURNED) @@ -299,9 +299,9 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Walk) EVT_CALL(SetNpcPos, NPC_SELF, -30, 100, 40) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -25, 125, -20, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 20, 150, 5, 8) EVT_SET(MV_SceneState, SCENE_STATE_SEARCH_FOR_EXIT) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) @@ -447,7 +447,7 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_WAIT(15) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 145, -10, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(SetNpcRotation, NPC_SELF, 0, -30, 0) diff --git a/src/world/area_kzn/kzn_22/kzn_22_1_music.c b/src/world/area_kzn/kzn_22/kzn_22_1_music.c index 01dbe5e059..d8b1799aee 100644 --- a/src/world/area_kzn/kzn_22/kzn_22_1_music.c +++ b/src/world/area_kzn/kzn_22/kzn_22_1_music.c @@ -2,7 +2,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_IF_GE(GB_StoryProgress, STORY_CH5_MT_LAVA_LAVA_ERUPTING) - EVT_CALL(PlaySound, SOUND_8000006B) + EVT_CALL(PlaySound, SOUND_LOOP_6B) EVT_END_IF EVT_CALL(SetMusicTrack, 0, SONG_VOLCANO_ESCAPE, 0, 8) EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_4) diff --git a/src/world/area_kzn/kzn_22/kzn_22_4_npc.c b/src/world/area_kzn/kzn_22/kzn_22_4_npc.c index bc84fa73bc..d43ecb28c7 100644 --- a/src/world/area_kzn/kzn_22/kzn_22_4_npc.c +++ b/src/world/area_kzn/kzn_22/kzn_22_4_npc.c @@ -50,7 +50,7 @@ EVT_END_IF //@bug unmatched endif // repeatedly jump for the treasure chest EVT_LABEL(1) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 15) EVT_IF_EQ(AF_KZN23_GrabbedKolorado, FALSE) EVT_WAIT(1) diff --git a/src/world/area_kzn/kzn_23/kzn_23_3_npc.c b/src/world/area_kzn/kzn_23/kzn_23_3_npc.c index 837a4178cb..306149ec46 100644 --- a/src/world/area_kzn/kzn_23/kzn_23_3_npc.c +++ b/src/world/area_kzn/kzn_23/kzn_23_3_npc.c @@ -145,10 +145,10 @@ EvtScript N(EVS_PlayPyroclastSounds) = { EVT_BUF_READ1(LVar1) EVT_END_LOOP EVT_IF_EQ(AF_KZN23_UseAlternateSound, FALSE) - EVT_CALL(PlaySoundAt, SOUND_1AD, SOUND_SPACE_MODE_0, LVar1, 2800, 0) + EVT_CALL(PlaySoundAt, SOUND_01AD, SOUND_SPACE_MODE_0, LVar1, 2800, 0) EVT_SET(AF_KZN23_UseAlternateSound, TRUE) EVT_ELSE - EVT_CALL(PlaySoundAt, SOUND_1AE, SOUND_SPACE_MODE_0, LVar1, 2800, 0) + EVT_CALL(PlaySoundAt, SOUND_01AE, SOUND_SPACE_MODE_0, LVar1, 2800, 0) EVT_SET(AF_KZN23_UseAlternateSound, FALSE) EVT_END_IF EVT_RETURN diff --git a/src/world/area_mac/mac_00/mac_00_5_npc.c b/src/world/area_mac/mac_00/mac_00_5_npc.c index 17dc0cf4e3..c1852f1ad4 100644 --- a/src/world/area_mac/mac_00/mac_00_5_npc.c +++ b/src/world/area_mac/mac_00/mac_00_5_npc.c @@ -23,7 +23,7 @@ EvtScript N(EVS_NpcAI_ShyGuy_03) = { EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_02, ANIM_ShyGuy_Red_Anim03) EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_02, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_02, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_02, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_ShyGuy_02, 400, 20, -300, 20) EVT_CALL(NpcFacePlayer, NPC_ShyGuy_02, 0) EVT_WAIT(10) diff --git a/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c b/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c index a5f39b72d1..f75081b043 100644 --- a/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c +++ b/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c @@ -24,7 +24,7 @@ EvtScript N(EVS_LetterReward_RussT) = { EvtScript N(EVS_ShyGuy_PlayRunningSounds) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_B0000021, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_SEQ_21, SOUND_SPACE_MODE_0) EVT_WAIT(2) EVT_END_LOOP EVT_RETURN @@ -215,7 +215,7 @@ EvtScript N(EVS_ShyGuy_StealDictionary) = { EVT_EXEC_GET_TID(N(EVS_ShyGuy_PlayRunningSounds), LVarA) EVT_CALL(NpcMoveTo, NPC_ShyGuyThief, -10, -410, 0) EVT_KILL_THREAD(LVarA) - EVT_CALL(PlaySoundAtNpc, NPC_ShyGuyThief, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuyThief, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_ShyGuyThief, -10, 0, -340, 0) EVT_SET(LVar0, 21) EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, SOUND_SPACE_MODE_0) diff --git a/src/world/area_mac/mac_01/mac_01_9_npc.c b/src/world/area_mac/mac_01/mac_01_9_npc.c index ac72e7d0a3..78944b16a0 100644 --- a/src/world/area_mac/mac_01/mac_01_9_npc.c +++ b/src/world/area_mac/mac_01/mac_01_9_npc.c @@ -176,7 +176,7 @@ EvtScript N(EVS_ArtifactPrompt_Kolorado) = { EvtScript N(D_8024E6F8_80EF78) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_B0000021, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_SEQ_21, SOUND_SPACE_MODE_0) EVT_WAIT(2) EVT_END_LOOP EVT_RETURN @@ -431,7 +431,7 @@ EvtScript N(EVS_MerlonBargeOut) = { EVT_END_IF EVT_END_LOOP EVT_CALL(N(KnockdownSetPos), -215, 21, -158) - EVT_CALL(PlaySoundAtPlayer, SOUND_162, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0162, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(50 * DT) EVT_CALL(SetNpcPos, NPC_Merlon, -241, 20, -270) @@ -586,7 +586,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0 / DT)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_Merlon, SOUND_209, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Merlon, SOUND_0209, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Gather1) EVT_CALL(GetNpcPos, NPC_Merlon, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) @@ -606,7 +606,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_SET(MF_KoopaBrosSceneLock, TRUE) EVT_END_THREAD EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_20A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_020A, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_DarkToad_01, LVar3, LVar4, LVar5) EVT_ADD(LVar5, 5) EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 2, 20) @@ -623,7 +623,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_20A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_020A, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_DarkToad_02, LVar3, LVar4, LVar5) EVT_ADD(LVar5, 5) EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 2, 20) @@ -640,7 +640,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_20A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_020A, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_DarkToad_03, LVar3, LVar4, LVar5) EVT_ADD(LVar5, 5) EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 2, 20) @@ -656,7 +656,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_CALL(NpcJump0, NPC_KoopaBros_03, LVar3, LVar4, LVar5, 10 * DT) EVT_END_THREAD EVT_WAIT(30 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_20A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_020A, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_DarkToad_04, LVar3, LVar4, LVar5) EVT_ADD(LVar5, 5) EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 2, 20) @@ -696,7 +696,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Run) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Run) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_174, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_0174, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(8.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, 700, 0, 0) @@ -1853,14 +1853,14 @@ EvtScript N(EVS_NpcIdle_ShyGuy_02) = { EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) EVT_WAIT(3) EVT_IF_EQ(MF_InsideToadHouse, TRUE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_END_IF EVT_CALL(NpcJump0, NPC_SELF, 539, 36, -242, 8) EVT_WAIT(2) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) EVT_WAIT(3) EVT_IF_EQ(MF_InsideToadHouse, TRUE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_END_IF EVT_CALL(NpcJump0, NPC_SELF, 572, 36, -226, 8) EVT_WAIT(2) @@ -1878,7 +1878,7 @@ EvtScript N(EVS_NpcAI_ShyGuy_02) = { EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 550, 20, -161, 0) EVT_THREAD EVT_WAIT(10) 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 1ccabb56fc..8bc6152a4c 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 @@ -14,14 +14,14 @@ EvtScript N(EVS_NpcIdle_GardenShyGuy1) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) EVT_LOOP(0) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 180, 27, 280, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 220, 250, 15) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 310, 27, 250, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 350, 280, 15) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 360, 27, 380, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 300, 450, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 230, 450, 15) @@ -36,16 +36,16 @@ EvtScript N(EVS_NpcIdle_GardenShyGuy2) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) EVT_LOOP(0) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 360, 27, 380, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 300, 450, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 230, 450, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 170, 380, 15) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 180, 27, 280, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 220, 250, 15) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 310, 27, 250, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 350, 280, 15) EVT_END_LOOP @@ -74,10 +74,10 @@ EvtScript N(EVS_GardenShyGuy_RunAway) = { EVT_EXEC(N(EVS_MinhThankYou)) EVT_END_IF EVT_CALL(ShowSweat, NPC_SELF, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 110, 20, 420, 0) EVT_CALL(ShowSweat, NPC_SELF, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 40, 0, 450, 0) EVT_CALL(ShowSweat, NPC_SELF, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(NpcMoveTo, NPC_SELF, -30, 550, 0) @@ -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_2A2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_02A2, 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_2A3, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_02A3, 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_2A4, SOUND_SPACE_MODE_0, 266, 50, 338) + EVT_CALL(PlaySoundAt, SOUND_02A4, 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_2A1, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_02A1, SOUND_SPACE_MODE_0) EVT_SWITCH(LVar5) EVT_CASE_EQ(0) EVT_CALL(EnableModel, MODEL_o375, TRUE) @@ -648,14 +648,14 @@ EvtScript N(EVS_ExitFlowerGate) = { EVT_RETURN EVT_END_IF EVT_CALL(N(SetPartnerTetherClose)) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_2A2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_02A2, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_FadeInFlowerGateGlowAlpha)) EVT_SET(LVar0, 3) EVT_EXEC_GET_TID(N(EVS_ModulateFlowerGateGlowAlpha), LVar2) EVT_CALL(PlayerMoveTo, 300, 370, 15) EVT_CALL(InterpPlayerYaw, -22, 0) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_1CF, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_01CF, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -120, 15, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -675,7 +675,7 @@ EvtScript N(EVS_ExitFlowerGate) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_1D0, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_01D0, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(15) EVT_CALL(PlayerMoveTo, 257, 300, 30) @@ -692,7 +692,7 @@ EvtScript N(EVS_ExitFlowerGate) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_2A2 | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_02A2 | 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,11 +725,11 @@ 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_2A2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_02A2, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_FadeInFlowerGateGlowAlpha)) EVT_SET(LVar0, 2) EVT_EXEC_GET_TID(N(EVS_ModulateFlowerGateGlowAlpha), LVar2) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_1CF, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_01CF, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -120, 15, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -751,7 +751,7 @@ EvtScript N(EVS_EnterFlowerGate) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_1D0, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_01D0, SOUND_SPACE_MODE_0) EVT_LOOP(0) EVT_WAIT(1) EVT_IS_THREAD_RUNNING(LVar2, LVar0) @@ -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_2A2 | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_02A2 | 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/post_office.inc.c b/src/world/area_mac/mac_01/npc/post_office.inc.c index 059803f6df..6e4c92e959 100644 --- a/src/world/area_mac/mac_01/npc/post_office.inc.c +++ b/src/world/area_mac/mac_01/npc/post_office.inc.c @@ -443,7 +443,7 @@ EvtScript N(EVS_PostOfficeShyGuy_Escape) = { EVT_EXEC(N(EVS_CarryItem_PostOfficeShyGuy)) EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(60) - EVT_CALL(PlaySoundAtNpc, NPC_PostOfficeShyGuy, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_PostOfficeShyGuy, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_PostOfficeShyGuy, 247, 20, -440, 20) EVT_SET(LVar0, 6) EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, SOUND_SPACE_MODE_0) diff --git a/src/world/area_mac/mac_01/npc/read_fortune.inc.c b/src/world/area_mac/mac_01/npc/read_fortune.inc.c index 945a45f77d..0b1acdd500 100644 --- a/src/world/area_mac/mac_01/npc/read_fortune.inc.c +++ b/src/world/area_mac/mac_01/npc/read_fortune.inc.c @@ -206,7 +206,7 @@ EvtScript N(EVS_Merlon_AnimateDiscoBall) = { EvtScript N(EVS_Merlon_ReadFortuneFX) = { EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_RaiseArms) EVT_CALL(GetModelCenter, MODEL_tama) - EVT_CALL(PlaySoundAt, SOUND_207, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_LRAW_0207, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), -1) EVT_SET(ArrayVar(1), LVarF) EVT_WAIT(30) @@ -246,23 +246,23 @@ EvtScript N(EVS_Merlon_ReadFortuneFX) = { EVT_END_THREAD EVT_WAIT(50) EVT_CALL(GetModelCenter, MODEL_tama) - EVT_CALL(PlaySoundAt, SOUND_208, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0208, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 3, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 20) EVT_WAIT(30) EVT_CALL(GetModelCenter, MODEL_tama) - EVT_CALL(PlaySoundAt, SOUND_208, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0208, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 3, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 20) EVT_WAIT(30) EVT_THREAD EVT_CALL(N(func_802441EC_804A6C)) EVT_END_THREAD EVT_CALL(GetModelCenter, MODEL_tama) - EVT_CALL(PlaySoundAt, SOUND_208, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0208, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 20) EVT_WAIT(70) EVT_CALL(DismissEffect, ArrayVar(2)) EVT_WAIT(40) - EVT_CALL(PlaySoundAt, SOUND_207 | SOUND_ID_TRIGGER_CHANGE_SOUND, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_LRAW_0207 | SOUND_ID_TRIGGER_CHANGE_SOUND, 0, LVar0, LVar1, LVar2) EVT_CALL(N(func_802446AC_804F2C), ArrayVar(1)) EVT_WAIT(15) EVT_CALL(DismissEffect, ArrayVar(1)) 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 62d02920e5..7a24d2692e 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_A9, SOUND_SPACE_MODE_0, -220, 37, 271) + EVT_CALL(PlaySoundAt, SOUND_00A9, 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_AA, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o295, SOUND_00AA, 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_AC, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o295, SOUND_00AC, 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_AB, SOUND_SPACE_MODE_0, -220, 37, 271) + EVT_CALL(PlaySoundAt, SOUND_00AB, SOUND_SPACE_MODE_0, -220, 37, 271) EVT_END_THREAD EVT_WAIT(15) EVT_THREAD diff --git a/src/world/area_mac/mac_02/mac_02_5_entity.c b/src/world/area_mac/mac_02/mac_02_5_entity.c index 35bd46c9f9..094cb5794d 100644 --- a/src/world/area_mac/mac_02/mac_02_5_entity.c +++ b/src/world/area_mac/mac_02/mac_02_5_entity.c @@ -19,7 +19,7 @@ EvtScript N(EVS_ChooseItem_OddKey) = { EVT_CALL(CloseChoicePopup) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, -470, 30, -155) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, -470, 30, -155) EVT_SET(LVar0, MV_BlueHouseLockEntityID) EVT_CALL(N(RemovePadlock)) EVT_WAIT(5) diff --git a/src/world/area_mac/mac_02/npc/bootler.inc.c b/src/world/area_mac/mac_02/npc/bootler.inc.c index b720abf4dc..0c787c0163 100644 --- a/src/world/area_mac/mac_02/npc/bootler.inc.c +++ b/src/world/area_mac/mac_02/npc/bootler.inc.c @@ -38,7 +38,7 @@ EvtScript N(EVS_NpcIdle_Bootler) = { EVT_CALL(SetNpcPos, NPC_SELF, 430, 60, -40) EVT_CALL(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Walk) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0 / DT)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_293, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0293, SOUND_SPACE_MODE_0) EVT_CALL(NpcMoveTo, NPC_SELF, 580, -40, 0) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_END_THREAD @@ -77,7 +77,7 @@ EvtScript N(EVS_NpcIdle_Bootler) = { EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_WAIT(25 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SetNpcScale, NPC_Bootler, EVT_FLOAT(2.0), EVT_FLOAT(2.0), EVT_FLOAT(2.0)) @@ -89,14 +89,14 @@ EvtScript N(EVS_NpcIdle_Bootler) = { EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_WAIT(25 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Walk) EVT_CALL(SetNpcScale, NPC_Bootler, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(SetNpcPos, NPC_SELF, 480, 70, 10) EVT_EXEC_WAIT(N(D_8024ACA4_82DF64)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_293, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0293, SOUND_SPACE_MODE_0) EVT_CALL(NpcFlyTo, NPC_SELF, 550, 40, 10, 40 * DT, 10, EASING_LINEAR) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(SpeakToPlayer, NPC_FiceT, ANIM_FiceT_Afraid, ANIM_FiceT_Afraid, 5, MSG_MAC_Bridge_0028) @@ -104,7 +104,7 @@ EvtScript N(EVS_NpcIdle_Bootler) = { EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_WAIT(25 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(40 * DT) EVT_CALL(InterpPlayerYaw, 270, 0) diff --git a/src/world/area_mac/mac_02/npc/shyguy_thief.inc.c b/src/world/area_mac/mac_02/npc/shyguy_thief.inc.c index 32c40a1389..03a8998fe2 100644 --- a/src/world/area_mac/mac_02/npc/shyguy_thief.inc.c +++ b/src/world/area_mac/mac_02/npc/shyguy_thief.inc.c @@ -17,7 +17,7 @@ EvtScript N(D_8024B5AC_82E86C) = { EvtScript N(D_8024B6A0_82E960) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy, SOUND_B0000021, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy, SOUND_SEQ_21, SOUND_SPACE_MODE_0) EVT_WAIT(2) EVT_END_LOOP EVT_RETURN 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 f475e5e219..bb274a384b 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 @@ -43,7 +43,7 @@ EvtScript N(EVS_CloseCrossingGates) = { }; EvtScript N(EVS_SpawnSmoke) = { - EVT_CALL(PlaySoundAtModel, MODEL_07, SOUND_B000001A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_07, SOUND_SEQ_1A, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, MV_TrainMoveDist) EVT_IF_EQ(MF_TrainReverseDir, FALSE) EVT_ADDF(LVar0, -310) @@ -409,7 +409,7 @@ EvtScript N(EVS_ArriveFromMtRugged) = { EVT_LABEL(1) EVT_SET(MV_TrainMoveDist, -90) EVT_SET(MV_TrainMoveSpeed, 0) - EVT_CALL(PlaySound, SOUND_1FD) + EVT_CALL(PlaySound, SOUND_01FD) EVT_KILL_THREAD(LVarE) EVT_SET(MF_TrainMoving, FALSE) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) @@ -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_82) + EVT_CALL(PlaySound, SOUND_0082) EVT_THREAD EVT_LOOP(1000) EVT_ADDF(MV_TrainMoveSpeed, EVT_FLOAT(0.031)) diff --git a/src/world/area_mac/mac_03/mac_03_4_npc.c b/src/world/area_mac/mac_03/mac_03_4_npc.c index ae97489a47..ef6bf918d7 100644 --- a/src/world/area_mac/mac_03/mac_03_4_npc.c +++ b/src/world/area_mac/mac_03/mac_03_4_npc.c @@ -469,7 +469,7 @@ EvtScript N(EVS_NpcInit_Toad_03) = { EvtScript N(D_8024A7F4_83BFF4) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000021, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_21, SOUND_SPACE_MODE_0) EVT_WAIT(2) EVT_END_LOOP EVT_RETURN @@ -484,11 +484,11 @@ EvtScript N(EVS_NpcIdle_ShyGuy) = { EVT_LOOP(0) EVT_CALL(NpcMoveTo, NPC_SELF, -250, -25, 30) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -250, 0, 30, 15) EVT_CALL(NpcMoveTo, NPC_SELF, -100, 30, 30) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -100, 0, -25, 15) EVT_END_LOOP EVT_RETURN @@ -508,7 +508,7 @@ EvtScript N(EVS_NpcAI_ShyGuy) = { EVT_KILL_THREAD(LVarA) EVT_CALL(ShowSweat, NPC_SELF, 1, 45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -30, 0, 0, 20) EVT_CALL(ShowSweat, NPC_SELF, 1, 45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203F, SOUND_SPACE_MODE_0) 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 a34d871810..2a091f3188 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 @@ -451,7 +451,7 @@ EvtScript N(EVS_OpenCapsule) = { EVT_WAIT(10) EVT_CALL(NpcJump0, NPC_LilOink_01, LVar0, LVar1, LVar2, 15) EVT_EXEC(N(EVS_SpawnLilOinkPrize)) - EVT_CALL(PlaySoundAtNpc, NPC_LilOink_01, SOUND_15E, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_LilOink_01, SOUND_015E, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcSpeed, NPC_LilOink_01, 4) EVT_CALL(NpcMoveTo, NPC_LilOink_01, 580, -170, 0) EVT_CALL(NpcJump0, NPC_LilOink_01, 620, 20, -170, 15) @@ -512,7 +512,7 @@ EvtScript N(EVS_LilOinkFlee) = { EVT_WAIT(10) EVT_CALL(GetNpcPos, LVar1, LVar2, LVar3, LVar4) EVT_CALL(NpcJump0, LVar1, LVar2, LVar3, LVar4, 10) - EVT_CALL(PlaySoundAtNpc, LVar1, SOUND_15E, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar1, SOUND_015E, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcSpeed, LVar1, 8) EVT_CALL(NpcMoveTo, LVar1, 580, LVar4, 0) EVT_CALL(NpcJump0, LVar1, 620, 20, LVar4, 15) diff --git a/src/world/area_mac/mac_04/mac_04_1_music.c b/src/world/area_mac/mac_04/mac_04_1_music.c index 3e8c1d218f..83f3483cef 100644 --- a/src/world/area_mac/mac_04/mac_04_1_music.c +++ b/src/world/area_mac/mac_04/mac_04_1_music.c @@ -11,7 +11,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_END_SWITCH EVT_THREAD EVT_WAIT(60) - EVT_CALL(StopSound, SOUND_80000017) + EVT_CALL(StopSound, SOUND_LOOP_17) EVT_END_THREAD EVT_END_IF EVT_RETURN diff --git a/src/world/area_mac/mac_04/mac_04_6_npc.c b/src/world/area_mac/mac_04/mac_04_6_npc.c index e4b173fe1b..547e0d3671 100644 --- a/src/world/area_mac/mac_04/mac_04_6_npc.c +++ b/src/world/area_mac/mac_04/mac_04_6_npc.c @@ -68,7 +68,7 @@ EvtScript N(EVS_ItemPrompt_ToyTrain) = { EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(RemoveKeyItemAt, LVar1) - EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_1AA, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_01AA, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -90, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -94,7 +94,7 @@ EvtScript N(EVS_ItemPrompt_ToyTrain) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_1AA, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_01AA, SOUND_SPACE_MODE_0) EVT_CALL(CloseChoicePopup) EVT_SET(GB_StoryProgress, STORY_CH4_RETURNED_TOY_TRAIN) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) diff --git a/src/world/area_mac/mac_04/mac_04_8_entity.c b/src/world/area_mac/mac_04/mac_04_8_entity.c index 9908e272dd..b7d71c619e 100644 --- a/src/world/area_mac/mac_04/mac_04_8_entity.c +++ b/src/world/area_mac/mac_04/mac_04_8_entity.c @@ -119,7 +119,7 @@ EvtScript N(EVS_EnterToybox) = { EVT_WAIT(1) EVT_EXEC_GET_TID(N(EVS_FocusCameraOnPlayer), LVarA) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_1AA, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_01AA, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -90, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -135,7 +135,7 @@ EvtScript N(EVS_EnterToybox) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_D9, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_TRANSPORTER_IN, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.35)) EVT_CALL(PlayerJump, -450, 20, -160, 32) EVT_END_THREAD @@ -174,10 +174,10 @@ EvtScript N(EVS_ExitToybox) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_1AA, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_01AA, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_EXEC_GET_TID(N(EVS_FocusCameraOnPlayer), LVarA) - EVT_CALL(PlaySoundAtPlayer, SOUND_DA, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_TRANSPORTER_OUT, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.7)) EVT_CALL(PlayerJump, -480, 45, -90, 25) EVT_EXEC_WAIT(N(EVS_FinishUnshrinking)) @@ -240,7 +240,7 @@ EvtScript N(EVS_ItemPrompt_StoreroomKey) = { EVT_CALL(CloseChoicePopup) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, 155, 48, -480) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, 155, 48, -480) EVT_SET(LVar0, MV_StoreroomLockEntityID) EVT_CALL(N(RemovePadlock)) EVT_WAIT(5) 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 aa28c9a0d4..535f0eb567 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 @@ -162,7 +162,7 @@ EvtScript N(EVS_NpcInteract_ChetRippo) = { EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_ChetRippo, ANIM_ChetRippo_Spread) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_ChetRippo, SOUND_24B, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_ChetRippo, SOUND_024B, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_ChetRippo, LVar6, LVar7, LVar8) EVT_ADD(LVar7, 26) EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 0, LVar6, LVar7, LVar8, 1, 60) 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 762d3c3ecb..4789ea9417 100644 --- a/src/world/area_mac/mac_04/npc_muskular.inc.c +++ b/src/world/area_mac/mac_04/npc_muskular.inc.c @@ -71,7 +71,7 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Leap) EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) - EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) EVT_ADD(LVar0, 10) @@ -85,7 +85,7 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_WAIT(6 * DT) EVT_END_LOOP EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0188, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) diff --git a/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c b/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c index 7debc9022f..de4035d627 100644 --- a/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c +++ b/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c @@ -11,7 +11,7 @@ API_CALLABLE(N(IsPartnerBow)) { EvtScript N(D_802480E0_84ACB0) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_B0000021, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_SEQ_21, SOUND_SPACE_MODE_0) EVT_WAIT(2) EVT_END_LOOP EVT_RETURN @@ -47,7 +47,7 @@ EvtScript N(D_802481E0_84ADB0) = { }; EvtScript N(D_80248298_84AE68) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hk, SOUND_1AB, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hk, SOUND_01AB, SOUND_SPACE_MODE_0) EVT_SET(LVar0, 0) EVT_LOOP(36) EVT_ADD(LVar0, 10) @@ -58,7 +58,7 @@ EvtScript N(D_80248298_84AE68) = { EVT_SET(LVar0, 0) EVT_CALL(RotateModel, MODEL_hkai1, LVar0, 0, 1, 0) EVT_CALL(RotateModel, MODEL_hkai2, LVar0, 0, 1, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hk, SOUND_1AC, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hk, SOUND_01AC, SOUND_SPACE_MODE_0) EVT_CALL(PlaySound, SOUND_CHIME_BEGIN_AMBUSH) EVT_RETURN EVT_END @@ -103,7 +103,7 @@ EvtScript N(D_802483B8_84AF88) = { EvtScript N(D_80248624_84B1F4) = { EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_203E, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_ShyGuy_01, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim11, ANIM_ShyGuy_Pink_Anim01, 0, MSG_MAC_Housing_00B2) diff --git a/src/world/area_mac/mac_05/mac_05_1_music.c b/src/world/area_mac/mac_05/mac_05_1_music.c index 86bde9fc30..d480dabf92 100644 --- a/src/world/area_mac/mac_05/mac_05_1_music.c +++ b/src/world/area_mac/mac_05/mac_05_1_music.c @@ -9,7 +9,7 @@ EvtScript N(EVS_802441E0) = { EVT_CASE_DEFAULT EVT_CALL(FadeOutMusic, 0, 3000) EVT_END_SWITCH - EVT_CALL(PlaySound, SOUND_80000058) + EVT_CALL(PlaySound, SOUND_LOOP_58) EVT_CALL(ClearAmbientSounds, 250) EVT_RETURN EVT_END diff --git a/src/world/area_mac/mac_05/mac_05_4_npc.c b/src/world/area_mac/mac_05/mac_05_4_npc.c index d3969119da..30e0f8c55a 100644 --- a/src/world/area_mac/mac_05/mac_05_4_npc.c +++ b/src/world/area_mac/mac_05/mac_05_4_npc.c @@ -395,7 +395,7 @@ EvtScript N(EVS_80248878) = { EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.5)) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_CALL(SetPlayerPos, -120, 24, 375) - EVT_CALL(PlaySoundAtPlayer, SOUND_44, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0044, SOUND_SPACE_MODE_0) EVT_CALL(PlayerJump1, -310, -10, 372, 80) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) EVT_CALL(PlayerFaceNpc, NPC_Whale, FALSE) @@ -404,7 +404,7 @@ EvtScript N(EVS_80248878) = { EVT_WAIT(5) EVT_CALL(SetNpcPos, NPC_PARTNER, -120, 24, 375) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.5)) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_44, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0044, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_PARTNER, -345, 0, 372, 80) EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER) EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Whale, 0) @@ -414,7 +414,7 @@ EvtScript N(EVS_80248878) = { EVT_WAIT(10) EVT_CALL(SetNpcPos, NPC_Fuzzipede, -120, 24, 375) EVT_CALL(SetNpcJumpscale, NPC_Fuzzipede, EVT_FLOAT(0.5)) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzipede, SOUND_44, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzipede, SOUND_0044, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Fuzzipede, -280, -10, 372, 90) EVT_CALL(NpcFaceNpc, NPC_Fuzzipede, NPC_Whale, 0) EVT_END_THREAD @@ -468,7 +468,7 @@ EvtScript N(EVS_80248878) = { EVT_CALL(FadeOutMusic, 0, 3000) EVT_LOOP(10) EVT_ADD(LVar2, -60) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzipede, SOUND_20D9, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzipede, SOUND_FUZZIPEDE_MOTION, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Fuzzipede, LVar0, LVar1, LVar2, 10) EVT_CALL(NpcFaceNpc, NPC_Kolorado, NPC_Fuzzipede, 0) EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Fuzzipede, 0) @@ -599,7 +599,7 @@ EvtScript N(EVS_802496FC) = { EVT_IF_EQ(GB_StoryProgress, STORY_CH5_TRADED_VASE_FOR_SEED) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Run) EVT_CALL(N(func_80242A90_854C00), 5, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_Kolorado, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_Kolorado, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_Kolorado, LVar0, LVar1, LVar2, 20) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Idle) @@ -751,7 +751,7 @@ EvtScript N(D_80249E84_85BFF4) = { EVT_CALL(PlayerJump1, LVar2, LVar3, LVar4, 10) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_41, SOUND_SPACE_MODE_0, 0, 0, 480) + EVT_CALL(PlaySoundAt, SOUND_0041, SOUND_SPACE_MODE_0, 0, 0, 480) EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Panic) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_WalkSad) @@ -781,7 +781,7 @@ EvtScript N(D_8024A1F8_85C368) = { EVT_EXEC_WAIT(N(D_80249E84_85BFF4)) EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(10) - EVT_CALL(PlaySoundAt, SOUND_41, SOUND_SPACE_MODE_0, 0, 0, 480) + EVT_CALL(PlaySoundAt, SOUND_0041, SOUND_SPACE_MODE_0, 0, 0, 480) EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Panic) EVT_WAIT(10) EVT_CALL(DisablePlayerPhysics, TRUE) @@ -1019,7 +1019,7 @@ EvtScript N(EVS_NpcInteract_Toad_01) = { EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Run) EVT_CALL(NpcMoveTo, NPC_Kolorado, LVar3, LVar5, 20) EVT_CALL(N(func_80242A90_854C00), 2, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_Kolorado, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_Kolorado, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_Kolorado, LVar0, LVar1, LVar2, 20) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Idle) @@ -1190,7 +1190,7 @@ API_CALLABLE(N(func_802431B0_855320)) { if (y < 0.0f) { fx_rising_bubble(0, x, y, z, 0.0f); - sfx_adjust_env_sound_pos(SOUND_JR_TROOPA_SWIM, SOUND_SPACE_MODE_0, x, y, z); + sfx_adjust_env_sound_pos(SOUND_LRAW_JR_TROOPA_SWIM, SOUND_SPACE_MODE_0, x, y, z); } return ApiStatus_DONE2; } @@ -1238,7 +1238,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(45) EVT_EXEC(N(EVS_80244298)) - EVT_CALL(PlaySound, SOUND_80000055) + EVT_CALL(PlaySound, SOUND_LOOP_JR_TROOPA_SWIM) EVT_EXEC_GET_TID(N(D_8024BCBC_85DE2C), LVar9) EVT_CALL(SetNpcPos, NPC_SELF, 150, -30, 490) EVT_WAIT(5) @@ -1246,9 +1246,9 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_WAIT(20) - EVT_CALL(PlaySoundAtPlayer, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_END_THREAD EVT_CALL(ShowMessageAtScreenPos, MSG_MAC_Port_00B4, 160, 40) @@ -1263,7 +1263,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) EVT_CALL(NpcMoveTo, NPC_SELF, -40, 490, 0) EVT_KILL_THREAD(LVar9) - EVT_CALL(StopSound, SOUND_80000055) + EVT_CALL(StopSound, SOUND_LOOP_JR_TROOPA_SWIM) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_JR_TROOPA_SPLASH, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kujira, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o236, COLLIDER_FLAGS_UPPER_MASK) 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 326f7d9dfd..8afc943d14 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 @@ -93,7 +93,7 @@ EvtScript N(D_80250FB4_863124) = { EVT_CALL(GetNpcVar, NPC_Whale, 0, LVar3) EVT_IF_EQ(LVar3, 0) EVT_CALL(N(UnkPlayerPosFunc)) - EVT_CALL(PlaySoundAt, SOUND_8000004F, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_LOOP_4F, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_CALL(N(CreateWhaleGeyser), 0, LVar0, LVar1, LVar2, 0, -1, 0, 30) EVT_CALL(SetNpcVar, NPC_Whale, 0, LVar0) EVT_END_IF @@ -296,8 +296,8 @@ EvtScript N(EVS_8025194C) = { EVT_IF_NE(LVarB, ANIM_Kolorado_Shout) EVT_CALL(GetNpcVar, NPC_Whale, 0, LVar0) EVT_IF_NE(LVar0, 0) - EVT_CALL(PlaySound, SOUND_43 | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_43) + EVT_CALL(PlaySound, SOUND_LRAW_0043 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(func_802D62E4, SOUND_LRAW_0043) EVT_CALL(N(DisposeWhaleGeyser), LVar0) EVT_CALL(SetNpcVar, NPC_Whale, 0, 0) EVT_END_IF 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 57dff7727e..3b6333f909 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 @@ -42,8 +42,8 @@ EvtScript N(D_802525B0_864720) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_CALL(SetMusicTrack, 0, SONG_CLUB64, 0, 8) - EVT_CALL(StopSound, SOUND_80000058) - EVT_CALL(func_802D62E4, SOUND_39) + EVT_CALL(StopSound, SOUND_LOOP_58) + EVT_CALL(func_802D62E4, 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 4e369625cb..5a8b24fa88 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 @@ -89,7 +89,7 @@ EvtScript N(EVS_WhaleState_Shout) = { EVT_CALL(GetNpcVar, NPC_Whale, 0, LVar3) EVT_IF_EQ(LVar3, 0) EVT_CALL(N(UnkPlayerPosFunc)) - EVT_CALL(PlaySoundAt, SOUND_8000004F, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_LOOP_4F, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_CALL(N(CreateWhaleGeyser), 0, LVar0, LVar1, LVar2, 0, -1, 0, 30) EVT_CALL(SetNpcVar, NPC_Whale, 0, LVar0) EVT_END_IF @@ -292,8 +292,8 @@ EvtScript N(EVS_WhaleMain) = { EVT_IF_NE(LVarB, ANIM_Kolorado_Shout) EVT_CALL(GetNpcVar, NPC_Whale, 0, LVar0) EVT_IF_NE(LVar0, 0) - EVT_CALL(PlaySound, SOUND_43 | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_43) + EVT_CALL(PlaySound, SOUND_LRAW_0043 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(func_802D62E4, SOUND_LRAW_0043) EVT_CALL(N(DisposeWhaleGeyser), LVar0) EVT_CALL(SetNpcVar, NPC_Whale, 0, 0) EVT_END_IF diff --git a/src/world/area_mac/mac_06/mac_06_3_npc.c b/src/world/area_mac/mac_06/mac_06_3_npc.c index 262b1fad48..139358e0b6 100644 --- a/src/world/area_mac/mac_06/mac_06_3_npc.c +++ b/src/world/area_mac/mac_06/mac_06_3_npc.c @@ -272,7 +272,7 @@ API_CALLABLE(N(MakeJrTroopaBubbles)) { if (y < 0.0f) { fx_rising_bubble(0, x, y, z, 0.0f); - sfx_adjust_env_sound_pos(SOUND_JR_TROOPA_SWIM, SOUND_SPACE_MODE_0, x, y, z); + sfx_adjust_env_sound_pos(SOUND_LRAW_JR_TROOPA_SWIM, SOUND_SPACE_MODE_0, x, y, z); } return ApiStatus_DONE2; } @@ -479,7 +479,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { EVT_END_LOOP EVT_WAIT(60) EVT_CALL(SetMusicTrack, 0, SONG_JR_TROOPA_THEME, 0, 8) - EVT_CALL(PlaySound, SOUND_80000055) + EVT_CALL(PlaySound, SOUND_LOOP_JR_TROOPA_SWIM) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_ChargeTripped) EVT_CALL(SetNpcPos, NPC_SELF, 250, -30, 500) EVT_WAIT(5) 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 399c7a91b7..2883098ee5 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_21C, 0, 0); + snd_start_sound(SOUND_021C, 0, 0); // fallthrough case RECORD_STATE_FADE_IN: data->stateTimer++; diff --git a/src/world/area_mgm/mgm_01/mgm_01_2_npc.c b/src/world/area_mgm/mgm_01/mgm_01_2_npc.c index 972c092cc9..c5d8f276e7 100644 --- a/src/world/area_mgm/mgm_01/mgm_01_2_npc.c +++ b/src/world/area_mgm/mgm_01/mgm_01_2_npc.c @@ -143,7 +143,7 @@ void N(appendGfx_score_display) (void* renderData) { } else { data->curScore++; } - sfx_play_sound_with_params(SOUND_211, 0, 0x40, 0x32); + sfx_play_sound_with_params(SOUND_COIN_PICKUP, 0, 0x40, 0x32); } draw_number(data->curScore, data->scoreWindowPosX + 63, 32, DRAW_NUMBER_CHARSET_THIN, MSG_PAL_WHITE, 255, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); @@ -413,7 +413,7 @@ API_CALLABLE(N(GiveCoinReward)) { data->curScore -= increment; add_coins(increment); data->targetScore = data->curScore; - sfx_play_sound(SOUND_211); + sfx_play_sound(SOUND_COIN_PICKUP); if (data->curScore > 0) { return ApiStatus_BLOCK; @@ -477,7 +477,7 @@ API_CALLABLE(N(DestroyBlockEntities)) { } } - sfx_play_sound_with_params(SOUND_283, 0x50, 0, 0); + sfx_play_sound_with_params(SOUND_0283, 0x50, 0, 0); return ApiStatus_DONE2; } @@ -573,7 +573,7 @@ API_CALLABLE(N(CreateBlockEntities)) { N(BlockPosY)[curBlockIdx] + 13, N(BlockPosZ)[curBlockIdx] + 5, 23.0f); - sfx_play_sound(SOUND_213); + sfx_play_sound(SOUND_HEART_PICKUP); script->functionTemp[0] = 3; script->functionTemp[1]++; } @@ -593,7 +593,7 @@ API_CALLABLE(N(TakeCoinCost)) { script->functionTemp[0] = 0; } add_coins(-1); - sfx_play_sound(SOUND_211); + sfx_play_sound(SOUND_COIN_PICKUP); script->functionTemp[0]++; @@ -795,9 +795,9 @@ EvtScript N(EVS_ManageMinigame) = { EVT_END_THREAD EVT_SWITCH(LVarB) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundWithVolume, SOUND_CANNON2, 0) + EVT_CALL(PlaySoundWithVolume, SOUND_BOMBETTE_BLAST_LV2, 0) EVT_WAIT(10) - EVT_CALL(PlaySoundWithVolume, SOUND_CANNON2, 0) + EVT_CALL(PlaySoundWithVolume, SOUND_BOMBETTE_BLAST_LV2, 0) EVT_WAIT(10) EVT_CALL(N(EndBowserPanelAnimation)) EVT_CALL(TranslateModel, LVar1, LVar5, LVar6, LVar7) @@ -814,7 +814,7 @@ EvtScript N(EVS_ManageMinigame) = { EVT_CASE_EQ(8) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0037) EVT_CALL(N(DoubleScore)) - EVT_CALL(PlaySoundWithVolume, SOUND_3FC, 0) + EVT_CALL(PlaySoundWithVolume, SOUND_03FC, 0) EVT_WAIT(30) EVT_CALL(N(UpdateRecords)) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0038) 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 69065222c1..2536889136 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 @@ -688,7 +688,7 @@ API_CALLABLE(N(RunMinigame)) { if (data->box[i].stateTimer <= 0) { get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); data->box[i].state = BOX_STATE_PEACH_POPUP; - sfx_play_sound_at_position(SOUND_214, SOUND_PARAM_MORE_QUIET | SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(SOUND_HEART_BOUNCE, SOUND_PARAM_MORE_QUIET | SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); npc->jumpVel = 10.0f; npc->pos.y = npc->moveToPos.y; @@ -731,7 +731,7 @@ API_CALLABLE(N(RunMinigame)) { } break; case BOX_STATE_PEACH_HIT: - sfx_play_sound(SOUND_21C); + sfx_play_sound(SOUND_021C); model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); enable_npc_shadow(npc); npc->duration = 0; @@ -771,31 +771,31 @@ API_CALLABLE(N(RunMinigame)) { if (data->found < NUM_PANELS) { data->timeLeft--; if (data->timeLeft == 750) { - sfx_play_sound(SOUND_1A5); + sfx_play_sound(SOUND_01A5); } else if (data->timeLeft == 600) { - sfx_play_sound(SOUND_1A5); + sfx_play_sound(SOUND_01A5); } else if (data->timeLeft == 450) { - sfx_play_sound(SOUND_1A5); + sfx_play_sound(SOUND_01A5); } else if (data->timeLeft == 300) { - sfx_play_sound(SOUND_1A6); + sfx_play_sound(SOUND_01A6); } else if (data->timeLeft == 270) { - sfx_play_sound(SOUND_1A6); + sfx_play_sound(SOUND_01A6); } else if (data->timeLeft == 240) { - sfx_play_sound(SOUND_1A6); + sfx_play_sound(SOUND_01A6); } else if (data->timeLeft == 210) { - sfx_play_sound(SOUND_1A6); + sfx_play_sound(SOUND_01A6); } else if (data->timeLeft == 180) { - sfx_play_sound(SOUND_1A6); + sfx_play_sound(SOUND_01A6); } else if (data->timeLeft == 150) { - sfx_play_sound(SOUND_1A7); + sfx_play_sound(SOUND_01A7); } else if (data->timeLeft == 120) { - sfx_play_sound(SOUND_1A7); + sfx_play_sound(SOUND_01A7); } else if (data->timeLeft == 90) { - sfx_play_sound(SOUND_1A7); + sfx_play_sound(SOUND_01A7); } else if (data->timeLeft == 60) { - sfx_play_sound(SOUND_1A7); + sfx_play_sound(SOUND_01A7); } else if (data->timeLeft == 30) { - sfx_play_sound(SOUND_1A7); + sfx_play_sound(SOUND_01A7); } } if ((data->timeLeft > 0) && (data->found == NUM_PANELS)) { @@ -835,7 +835,7 @@ API_CALLABLE(N(RunMinigame)) { sfx_play_sound(SOUND_MENU_ERROR); gPlayerStatusPtr->anim = ANIM_Mario1_Idle; } else { - sfx_play_sound(SOUND_D4); + sfx_play_sound(SOUND_JINGLE_WON_BATTLE); gPlayerStatusPtr->anim = ANIM_Mario1_Idle; } @@ -901,7 +901,7 @@ API_CALLABLE(N(GiveCoinReward)) { data->curScore -= increment; add_coins(increment); - sfx_play_sound(SOUND_211); + sfx_play_sound(SOUND_COIN_PICKUP); return (data->curScore > 0) ? ApiStatus_BLOCK : ApiStatus_DONE2; } @@ -928,7 +928,7 @@ API_CALLABLE(N(CleanupGame)) { get_screen_coords(0, npc->pos.x, npc->pos.y, npc->pos.z, &screenX, &screenY, &screenZ); if (screenX - 1 < SCREEN_WIDTH - 1) { fx_walking_dust(1, npc->pos.x, npc->pos.y, npc->pos.z, 0, 0); - sfx_play_sound(SOUND_283); + sfx_play_sound(SOUND_0283); } npc->flags |= NPC_FLAG_INVISIBLE; disable_npc_shadow(npc); @@ -1008,7 +1008,7 @@ API_CALLABLE(N(TakeCoinCost)) { script->functionTemp[0] = 0; } add_coins(-1); - sfx_play_sound(SOUND_211); + sfx_play_sound(SOUND_COIN_PICKUP); script->functionTemp[0]++; return (script->functionTemp[0] == PLAY_COST) ? ApiStatus_DONE2 : ApiStatus_BLOCK; @@ -1768,7 +1768,7 @@ EvtScript N(EVS_NpcInteract_Toad) = { EVT_END_THREAD EVT_CALL(EndSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 5) EVT_CALL(SetSelfVar, 3, 1) - EVT_CALL(PlaySoundWithVolume, SOUND_2108, 80) + EVT_CALL(PlaySoundWithVolume, SOUND_SPAWN_BLOCK, 80) EVT_EXEC(N(EVS_MakeAllBoxesAppear)) EVT_EXEC(N(EVS_SetBoxContents)) EVT_WAIT(25) diff --git a/src/world/area_mim/common/AnimateGates.inc.c b/src/world/area_mim/common/AnimateGates.inc.c index d77a30b82f..27ea9560f9 100644 --- a/src/world/area_mim/common/AnimateGates.inc.c +++ b/src/world/area_mim/common/AnimateGates.inc.c @@ -2,9 +2,9 @@ EvtScript N(EVS_UseGate) = { EVT_THREAD - EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_01D4, SOUND_SPACE_MODE_0) EVT_WAIT(19) - EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D5, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_01D5, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_SWITCH(AB_MIM_1) EVT_CASE_EQ(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 0161355833..6507dc0492 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 @@ -19,7 +19,7 @@ API_CALLABLE(N(GetFlowerNormal)) { } EvtScript N(EVS_LaughingFlowers) = { - EVT_CALL(PlaySoundAt, SOUND_DF, SOUND_SPACE_MODE_0, 301, 0, -27) + EVT_CALL(PlaySoundAt, SOUND_CHECK_LAUGHING_FLOWERS, SOUND_SPACE_MODE_0, 301, 0, -27) EVT_LOOP(6) EVT_SET(LVar0, 2) EVT_CALL(TranslateModel, MODEL_ea_1, 0, 0, LVar0) diff --git a/src/world/area_mim/mim_01/mim_01_5_gate.c b/src/world/area_mim/mim_01/mim_01_5_gate.c index 38d608b495..f785e02778 100644 --- a/src/world/area_mim/mim_01/mim_01_5_gate.c +++ b/src/world/area_mim/mim_01/mim_01_5_gate.c @@ -71,9 +71,9 @@ EvtScript N(EVS_ResetGates) = { }; EvtScript N(EVS_PlayGateSounds) = { - EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_01D4, SOUND_SPACE_MODE_0) EVT_WAIT(19) - EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D5, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_01D5, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; diff --git a/src/world/area_mim/mim_02/mim_02_3_npc.c b/src/world/area_mim/mim_02/mim_02_3_npc.c index 565b711e54..e94e8d8005 100644 --- a/src/world/area_mim/mim_02/mim_02_3_npc.c +++ b/src/world/area_mim/mim_02/mim_02_3_npc.c @@ -39,7 +39,7 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_Oaklie, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_Oaklie, -426, 58, -70, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) @@ -60,7 +60,7 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Oaklie, -333, 0, -81, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) EVT_WAIT(5 * DT) @@ -69,7 +69,7 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Oaklie, -300, 0, -170, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) EVT_WAIT(5 * DT) @@ -78,7 +78,7 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Oaklie, -226, 0, -245, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) EVT_WAIT(5 * DT) @@ -87,7 +87,7 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Oaklie, -160, 0, -296, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) EVT_WAIT(5 * DT) @@ -127,7 +127,7 @@ EvtScript N(EVS_NpcIdle_Oaklie) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_SELF, -455, 0, 0, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) diff --git a/src/world/area_mim/mim_05/mim_05_4_hint.c b/src/world/area_mim/mim_05/mim_05_4_hint.c index f461161c3a..ff27bb70d4 100644 --- a/src/world/area_mim/mim_05/mim_05_4_hint.c +++ b/src/world/area_mim/mim_05/mim_05_4_hint.c @@ -15,7 +15,7 @@ EvtScript N(EVS_FlickerTexPanner) = { EVT_SET(LVarA, ArrayVar(5)) EVT_END_SWITCH EVT_IF_EQ(LVarA, 1) - EVT_CALL(PlaySoundAt, SOUND_3A0, SOUND_SPACE_MODE_0, -300, 0, -10) + EVT_CALL(PlaySoundAt, SOUND_03A0, SOUND_SPACE_MODE_0, -300, 0, -10) EVT_CALL(SetTexPanOffset, LVar1, 0, 0, 0) EVT_ELSE EVT_CALL(SetTexPanOffset, LVar1, 0, 0, -0x8000) @@ -39,7 +39,7 @@ EvtScript N(EVS_FlickerTexPanner) = { }; EvtScript N(EVS_AnimateMushroomSet) = { - EVT_CALL(PlaySoundAt, SOUND_3A0, SOUND_SPACE_MODE_0, -300, 0, -10) + EVT_CALL(PlaySoundAt, SOUND_03A0, SOUND_SPACE_MODE_0, -300, 0, -10) EVT_EXEC(N(EVS_FlickerTexPanner)) EVT_WAIT(30) EVT_LOOP(4) @@ -68,7 +68,7 @@ EvtScript N(EVS_InspectMushrooms_West) = { }; EvtScript N(EVS_InspectMushrooms_South) = { - EVT_CALL(PlaySoundAt, SOUND_3A0, SOUND_SPACE_MODE_0, -20, 0, 300) + EVT_CALL(PlaySoundAt, SOUND_03A0, SOUND_SPACE_MODE_0, -20, 0, 300) EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, -0x8000) EVT_WAIT(20) EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, 0) @@ -77,7 +77,7 @@ EvtScript N(EVS_InspectMushrooms_South) = { }; EvtScript N(EVS_InspectMushrooms_North) = { - EVT_CALL(PlaySoundAt, SOUND_3A0, SOUND_SPACE_MODE_0, 20, 0, -300) + EVT_CALL(PlaySoundAt, SOUND_03A0, SOUND_SPACE_MODE_0, 20, 0, -300) EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, -0x8000) EVT_WAIT(20) EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, 0) @@ -86,7 +86,7 @@ EvtScript N(EVS_InspectMushrooms_North) = { }; EvtScript N(EVS_InspectMushrooms_East) = { - EVT_CALL(PlaySoundAt, SOUND_3A0, SOUND_SPACE_MODE_0, 300, 0, 10) + EVT_CALL(PlaySoundAt, SOUND_03A0, SOUND_SPACE_MODE_0, 300, 0, 10) EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, 0, -0x8000) EVT_WAIT(50) EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, 0, 0) diff --git a/src/world/area_mim/mim_07/mim_07_5_gate.c b/src/world/area_mim/mim_07/mim_07_5_gate.c index a0c5e1c23a..6040ec65bb 100644 --- a/src/world/area_mim/mim_07/mim_07_5_gate.c +++ b/src/world/area_mim/mim_07/mim_07_5_gate.c @@ -72,9 +72,9 @@ EvtScript N(EVS_ResetGates) = { EvtScript N(EVS_UseGate) = { EVT_THREAD - EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_01D4, SOUND_SPACE_MODE_0) EVT_WAIT(19) - EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D5, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_01D5, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_SWITCH(AB_MIM_1) EVT_CASE_EQ(0) 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 f2ca9e741c..875a7e8ea9 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_292, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_0292, 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_nok/nok_01/nok_01_4_npc.c b/src/world/area_nok/nok_01/nok_01_4_npc.c index 34914ce4ff..8b65800029 100644 --- a/src/world/area_nok/nok_01/nok_01_4_npc.c +++ b/src/world/area_nok/nok_01/nok_01_4_npc.c @@ -196,7 +196,7 @@ EvtScript N(EVS_NpcIdle_MiscFuzzy1) = { EVT_BUF_READ2(LVar0, LVar2) EVT_CALL(RandInt, 10, LVar3) EVT_ADD(LVar3, 15) - EVT_CALL(PlaySoundAtNpc, NPC_MiscFuzzy1, SOUND_332, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MiscFuzzy1, SOUND_SRAW_17_B, 0) EVT_CALL(NpcJump0, NPC_MiscFuzzy1, LVar0, LVar1, LVar2, LVar3) EVT_END_LOOP EVT_GOTO(0) @@ -210,30 +210,30 @@ EvtScript N(EVS_MiscFuzzyFlee) = { EVT_CALL(MakeItemEntity, ITEM_COIN, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS, 0) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Fuzzy_Hurt) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_332, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_B, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 25) EVT_ADD(LVar0, 40) EVT_ADD(LVar2, -40) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Fuzzy_Hurt) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_332, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_B, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 15) EVT_ADD(LVar0, 30) EVT_ADD(LVar2, -30) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Fuzzy_Anim09) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_332, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_B, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 13) EVT_ADD(LVar0, 20) EVT_ADD(LVar2, -20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_332, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_B, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 11) EVT_ADD(LVar0, 10) EVT_ADD(LVar2, -10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_332, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_B, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 9) EVT_ADD(LVar0, 80) EVT_ADD(LVar2, -80) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Fuzzy_Run) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_332, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_B, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 15) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) @@ -269,7 +269,7 @@ EvtScript N(EVS_NpcIdle_MiscFuzzy2) = { EVT_ADD(LVar3, 13) EVT_MULF(LVar0, EVT_FLOAT(0.9)) EVT_MULF(LVar2, EVT_FLOAT(0.9)) - EVT_CALL(PlaySoundAtNpc, NPC_MiscFuzzy2, SOUND_333, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MiscFuzzy2, SOUND_SRAW_17_C, 0) EVT_CALL(NpcJump0, NPC_MiscFuzzy2, LVar0, LVar1, LVar2, LVar3) EVT_END_LOOP EVT_GOTO(0) 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 5d34b6505e..eebcf0cca3 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_21A, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaShell_03, SOUND_021A, 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_21A) + EVT_CALL(PlaySound, SOUND_021A) 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) @@ -181,7 +181,7 @@ EvtScript N(EVS_Scene_KooverGetsMugged) = { EVT_WAIT(30) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_SRAW_17_A, 0) EVT_CALL(SetNpcSprite, NPC_Koover, ANIM_KoopaWithoutShell_Idle) EVT_CALL(SetNpcAnimation, NPC_Koover, ANIM_KoopaWithoutShell_Toppled) EVT_CALL(GetNpcPos, NPC_Koover, LVar0, LVar1, LVar2) @@ -204,7 +204,7 @@ EvtScript N(EVS_Scene_KooverGetsMugged) = { EVT_END_THREAD EVT_WAIT(1) EVT_CALL(SetNpcAnimation, NPC_FuzzyWithShell, ANIM_Fuzzy_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyWithShell, LVar0, 0, LVar2, 20) EVT_CALL(SetNpcAnimation, NPC_Koover, ANIM_KoopaWithoutShell_Idle) EVT_CALL(SetNpcAnimation, NPC_FuzzyWithShell, ANIM_Fuzzy_Anim0C) @@ -214,7 +214,7 @@ EvtScript N(EVS_Scene_KooverGetsMugged) = { EVT_CALL(NpcJump0, NPC_KooversShell, LVar0, 0, LVar2, 20) EVT_END_THREAD EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyWithShell, LVar0, 0, LVar2, 20) EVT_CALL(NpcFaceNpc, NPC_Koover, NPC_FuzzyWithShell, 0) EVT_CALL(SetNpcAnimation, NPC_Koover, ANIM_KoopaWithoutShell_CryIdle) @@ -224,7 +224,7 @@ EvtScript N(EVS_Scene_KooverGetsMugged) = { EVT_CALL(NpcJump0, NPC_KooversShell, LVar0, 0, LVar2, 20) EVT_END_THREAD EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyWithShell, LVar0, 0, LVar2, 20) EVT_CALL(SetNpcAnimation, NPC_FuzzyWithShell, ANIM_Fuzzy_Idle) EVT_RETURN @@ -270,7 +270,7 @@ EvtScript N(EVS_NpcIdle_Koover_Crisis) = { EVT_CALL(GetNpcPos, NPC_Koover, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_ADD(LVar1, 35) - EVT_CALL(PlaySoundAtNpc, NPC_Koover, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Koover, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_Koover, EMOTE_EXCLAMATION, 0, 20, EMOTER_POS, LVar0, LVar1, LVar2, 0) EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_Koover, ANIM_Koopa_Run) @@ -375,30 +375,30 @@ EvtScript N(EVS_NpcHit_FuzzyWithShell) = { EVT_THREAD EVT_CALL(GetNpcPos, NPC_KooversShell, LVar0, LVar1, LVar2) EVT_CALL(SetNpcAnimation, NPC_FuzzyWithShell, ANIM_Fuzzy_Hurt) - EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyWithShell, LVar0, 0, LVar2, 25) EVT_ADD(LVar0, 40) EVT_ADD(LVar2, -40) EVT_CALL(SetNpcAnimation, NPC_FuzzyWithShell, ANIM_Fuzzy_Hurt) - EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyWithShell, LVar0, 0, LVar2, 15) EVT_ADD(LVar0, 30) EVT_ADD(LVar2, -30) EVT_CALL(SetNpcAnimation, NPC_FuzzyWithShell, ANIM_Fuzzy_Anim09) - EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyWithShell, LVar0, 0, LVar2, 13) EVT_ADD(LVar0, 20) EVT_ADD(LVar2, -20) - EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyWithShell, LVar0, 0, LVar2, 11) EVT_ADD(LVar0, 10) EVT_ADD(LVar2, -10) - EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyWithShell, LVar0, 0, LVar2, 9) EVT_ADD(LVar0, 80) EVT_ADD(LVar2, -80) EVT_CALL(SetNpcAnimation, NPC_FuzzyWithShell, ANIM_Fuzzy_Run) - EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyWithShell, LVar0, 0, LVar2, 15) EVT_CALL(SetNpcPos, NPC_FuzzyWithShell, NPC_DISPOSE_LOCATION) EVT_END_THREAD diff --git a/src/world/area_nok/nok_01/npcs_normal.inc.c b/src/world/area_nok/nok_01/npcs_normal.inc.c index 222f76f8c7..e05d07f22f 100644 --- a/src/world/area_nok/nok_01/npcs_normal.inc.c +++ b/src/world/area_nok/nok_01/npcs_normal.inc.c @@ -99,7 +99,7 @@ EvtScript N(EVS_NpcInteract_Bobomb_01_Normal) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldBobomb_Red_Idle) EVT_WAIT(3) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_CANNON1, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BOMBETTE_BLAST_LV1, 0) EVT_CALL(N(SpawnExplosionEffect), LVar0, LVar1, LVar2) EVT_END_SWITCH EVT_RETURN @@ -133,7 +133,7 @@ EvtScript N(EVS_NpcInteract_Bobomb_02_Normal) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldBobomb_Red_Idle) EVT_WAIT(3) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_CANNON1, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BOMBETTE_BLAST_LV1, 0) EVT_CALL(N(SpawnExplosionEffect), LVar0, LVar1, LVar2) EVT_WAIT(30) EVT_CALL(PutPartnerAway) @@ -145,7 +145,7 @@ EvtScript N(EVS_NpcInteract_Bobomb_02_Normal) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldBobomb_Red_Idle) EVT_WAIT(3) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_CANNON1, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BOMBETTE_BLAST_LV1, 0) EVT_CALL(N(SpawnExplosionEffect), LVar0, LVar1, LVar2) EVT_END_IF EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) @@ -156,7 +156,7 @@ EvtScript N(EVS_NpcInteract_Bobomb_02_Normal) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldBobomb_Red_Idle) EVT_WAIT(3) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_CANNON1, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BOMBETTE_BLAST_LV1, 0) EVT_CALL(N(SpawnExplosionEffect), LVar0, LVar1, LVar2) EVT_CASE_GE(STORY_CH7_STAR_SPRIT_DEPARTED) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) @@ -166,7 +166,7 @@ EvtScript N(EVS_NpcInteract_Bobomb_02_Normal) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldBobomb_Red_Idle) EVT_WAIT(3) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_CANNON1, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BOMBETTE_BLAST_LV1, 0) EVT_CALL(N(SpawnExplosionEffect), LVar0, LVar1, LVar2) EVT_END_SWITCH EVT_RETURN @@ -192,7 +192,7 @@ EvtScript N(EVS_NpcInteract_Bobomb_03_Normal) = { EVT_CALL(SetNpcAnimation, NPC_Bobomb_02, ANIM_WorldBobomb_Red_Idle) EVT_WAIT(3) EVT_CALL(GetNpcPos, NPC_Bobomb_02, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_Bobomb_02, SOUND_CANNON1, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bobomb_02, SOUND_BOMBETTE_BLAST_LV1, 0) EVT_CALL(N(SpawnExplosionEffect), LVar0, LVar1, LVar2) EVT_END_THREAD EVT_WAIT(20) @@ -203,7 +203,7 @@ EvtScript N(EVS_NpcInteract_Bobomb_03_Normal) = { EVT_CALL(SetNpcAnimation, NPC_Bobomb_01, ANIM_WorldBobomb_Red_Idle) EVT_WAIT(3) EVT_CALL(GetNpcPos, NPC_Bobomb_01, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_Bobomb_01, SOUND_CANNON1, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bobomb_01, SOUND_BOMBETTE_BLAST_LV1, 0) EVT_CALL(N(SpawnExplosionEffect), LVar0, LVar1, LVar2) EVT_END_THREAD EVT_WAIT(20) @@ -214,7 +214,7 @@ EvtScript N(EVS_NpcInteract_Bobomb_03_Normal) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldBobomb_Red_Idle) EVT_WAIT(3) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_CANNON1, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BOMBETTE_BLAST_LV1, 0) EVT_CALL(N(SpawnExplosionEffect), LVar0, LVar1, LVar2) EVT_END_THREAD EVT_ELSE 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 eb3b2706c3..97ab81ef37 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_77, 0, 0, 0, -180) + EVT_CALL(PlaySoundAt, SOUND_0077, 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 38c5daad81..0ea4b1c665 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 @@ -206,7 +206,7 @@ EvtScript N(EVS_FuzzyBoss_PlayerEntersKoopersHouse) = { EVT_END_THREAD EVT_WAIT(1) EVT_CALL(SetNpcJumpscale, NPC_FuzzyBoss, 2) - EVT_CALL(PlaySoundAtNpc, NPC_FuzzyBoss, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_FuzzyBoss, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyBoss, LVarA, 0, LVarC, 12 * DT) EVT_CALL(IsPlayerWithin, 0, -400, 130, LVar0) EVT_IF_EQ(LVar0, 0) @@ -223,7 +223,7 @@ EvtScript N(EVS_FuzzyBoss_PlayerEntersKoopersHouse) = { EVT_END_THREAD EVT_WAIT(1) EVT_CALL(SetNpcJumpscale, NPC_FuzzyBoss, 2) - EVT_CALL(PlaySoundAtNpc, NPC_FuzzyBoss, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_FuzzyBoss, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyBoss, LVarB, LVarC, LVarD, LVarE) EVT_CALL(SetNpcFlagBits, NPC_FuzzyBoss, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcFlagBits, NPC_KoopersShell, NPC_FLAG_GRAVITY, FALSE) @@ -292,7 +292,7 @@ EvtScript N(EVS_NpcIdle_MiscFuzzy1) = { EVT_BUF_READ2(LVar0, LVar2) EVT_CALL(RandInt, 10, LVar3) EVT_ADD(LVar3, 15) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_332, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_B, 0) EVT_CALL(NpcJump0, NPC_MiscFuzzy1, LVar0, LVar1, LVar2, LVar3) EVT_END_LOOP EVT_GOTO(0) @@ -306,30 +306,30 @@ EvtScript N(EVS_MiscFuzzyFlee) = { EVT_CALL(MakeItemEntity, ITEM_COIN, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS, 0) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Fuzzy_Hurt) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_332, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_B, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 25) EVT_ADD(LVar0, 40) EVT_ADD(LVar2, -40) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Fuzzy_Hurt) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_332, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_B, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 15) EVT_ADD(LVar0, 30) EVT_ADD(LVar2, -30) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Fuzzy_Anim09) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_332, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_B, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 13) EVT_ADD(LVar0, 20) EVT_ADD(LVar2, -20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_332, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_B, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 11) EVT_ADD(LVar0, 10) EVT_ADD(LVar2, -10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_332, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_B, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 9) EVT_ADD(LVar0, 80) EVT_ADD(LVar2, -80) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Fuzzy_Run) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_332, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_B, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 15) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) @@ -354,11 +354,11 @@ EvtScript N(EVS_NpcIdle_MiscFuzzy2) = { EVT_GOTO(100) EVT_END_IF EVT_CALL(SetNpcPos, NPC_SELF, 438, 150, 155) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_333, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_C, 0) EVT_CALL(NpcJump0, NPC_SELF, 438, 0, 150, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_333, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_C, 0) EVT_CALL(NpcJump0, NPC_SELF, 402, 0, 160, 15) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_333, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_C, 0) EVT_CALL(NpcJump0, NPC_SELF, 384, 0, 160, 7) EVT_LABEL(0) EVT_USE_BUF(EVT_PTR(N(FuzzyJumpPath2))) @@ -369,7 +369,7 @@ EvtScript N(EVS_NpcIdle_MiscFuzzy2) = { EVT_ADD(LVar3, 13) EVT_MULF(LVar0, EVT_FLOAT(0.9)) EVT_MULF(LVar2, EVT_FLOAT(0.9)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_333, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_C, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, LVar3) EVT_END_LOOP EVT_GOTO(0) @@ -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_21A, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaShell_02, SOUND_021A, 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_02/npcs_crisis.inc.c b/src/world/area_nok/nok_02/npcs_crisis.inc.c index 15617a2f8e..f31396b464 100644 --- a/src/world/area_nok/nok_02/npcs_crisis.inc.c +++ b/src/world/area_nok/nok_02/npcs_crisis.inc.c @@ -228,7 +228,7 @@ EvtScript N(EVS_FuzzyThief_AvoidCapture) = { EVT_LABEL(1) EVT_CALL(N(ChooseSafeJumpLocation), LVarF, LVarE) EVT_CALL(SetNpcFlagBits, NPC_FuzzyThief, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyThief, LVarA, 0, LVarB, LVarC) EVT_CALL(SetNpcFlagBits, NPC_FuzzyThief, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(N(IsPlayerOrKoopaNearby), LVarF, LVarE) @@ -341,27 +341,27 @@ EvtScript N(EVS_NpcIdle_Koopa_01_Crisis) = { EVT_CALL(SetNpcFlagBits, NPC_FuzzyThief, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetNpcPos, NPC_KoopaShell_01, LVar0, LVar1, LVar2) EVT_CALL(SetNpcAnimation, NPC_FuzzyThief, ANIM_Fuzzy_Hurt) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyThief, LVar0, 0, LVar2, 25) EVT_ADD(LVar0, 40) EVT_ADD(LVar2, -40) EVT_CALL(SetNpcAnimation, NPC_FuzzyThief, ANIM_Fuzzy_Hurt) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyThief, LVar0, 0, LVar2, 15) EVT_ADD(LVar0, 30) EVT_CALL(SetNpcAnimation, NPC_FuzzyThief, ANIM_Fuzzy_Anim09) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyThief, LVar0, 0, LVar2, 13) EVT_ADD(LVar0, 20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyThief, LVar0, 0, LVar2, 11) EVT_ADD(LVar0, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyThief, LVar0, 0, LVar2, 9) EVT_ADD(LVar0, 160) EVT_CALL(SetNpcAnimation, NPC_FuzzyThief, ANIM_Fuzzy_Run) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_331, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SRAW_17_A, 0) EVT_CALL(NpcJump0, NPC_FuzzyThief, LVar0, 0, LVar2, 15) EVT_CALL(SetNpcFlagBits, NPC_FuzzyThief, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcPos, NPC_FuzzyThief, NPC_DISPOSE_LOCATION) diff --git a/src/world/area_nok/nok_02/npcs_normal.inc.c b/src/world/area_nok/nok_02/npcs_normal.inc.c index 2eb70bac86..08f101a153 100644 --- a/src/world/area_nok/nok_02/npcs_normal.inc.c +++ b/src/world/area_nok/nok_02/npcs_normal.inc.c @@ -154,7 +154,7 @@ EvtScript N(EVS_Dueling_Bobombs) = { EVT_CALL(SetNpcAnimation, NPC_Bobomb_02, ANIM_WorldBobomb_Green_Idle) EVT_WAIT(3) EVT_CALL(GetNpcPos, NPC_Bobomb_02, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_Bobomb_02, SOUND_CANNON1, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bobomb_02, SOUND_BOMBETTE_BLAST_LV1, 0) EVT_CALL(N(SpawnExplosionEffect), LVar0, LVar1, LVar2) EVT_WAIT(30) EVT_LABEL(20) @@ -171,7 +171,7 @@ EvtScript N(EVS_Dueling_Bobombs) = { EVT_CALL(SetNpcAnimation, NPC_Bobomb_01, ANIM_WorldBobomb_Blue_Idle) EVT_WAIT(3) EVT_CALL(GetNpcPos, NPC_Bobomb_01, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_Bobomb_01, SOUND_CANNON1, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bobomb_01, SOUND_BOMBETTE_BLAST_LV1, 0) EVT_CALL(N(SpawnExplosionEffect), LVar0, LVar1, LVar2) EVT_WAIT(30) EVT_GOTO(10) diff --git a/src/world/area_nok/nok_03/nok_03_1_music.c b/src/world/area_nok/nok_03/nok_03_1_music.c index d03b41b7d1..3ff3c6f221 100644 --- a/src/world/area_nok/nok_03/nok_03_1_music.c +++ b/src/world/area_nok/nok_03/nok_03_1_music.c @@ -6,7 +6,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_ELSE EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_VILLAGE, 0, 8) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_8000005B, 0, 887, 0, -41) + EVT_CALL(PlaySoundAt, SOUND_LOOP_5B, 0, 887, 0, -41) EVT_RETURN EVT_END }; diff --git a/src/world/area_nok/nok_03/nok_03_4_npc.c b/src/world/area_nok/nok_03/nok_03_4_npc.c index 4a37afe818..1bd4ee74bb 100644 --- a/src/world/area_nok/nok_03/nok_03_4_npc.c +++ b/src/world/area_nok/nok_03/nok_03_4_npc.c @@ -20,7 +20,7 @@ EvtScript N(EVS_NpcIdle_FuzzyBoss) = { EVT_SUB(LVar6, LVar0) EVT_IF_LT(LVar6, 100) EVT_ADD(LVar3, 100) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_03, LVar3, LVar4, LVar5, 10 * DT) EVT_SET(GB_StoryProgress, STORY_CH1_FUZZY_THIEF_RAN_AWAY) EVT_END_IF @@ -45,24 +45,24 @@ EvtScript N(EVS_NpcIdle_Fuzzy_01) = { EVT_WAIT(1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_17, 0) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 6) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.2)) EVT_ADD(LVar0, 20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 8) EVT_SUB(LVar0, 15) EVT_ADD(LVar2, 20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10) EVT_ADD(LVar0, 20) EVT_ADD(LVar2, 20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 8) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_17, 0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.8)) EVT_CALL(NpcJump0, NPC_SELF, -341, 0, 23, 15) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) 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 8ecbcd7421..2f0fdcd132 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 @@ -337,7 +337,7 @@ void N(build_gfx_thread)(void) { } EvtScript N(EVS_BossJumpTo) = { - EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, LVarD) EVT_RETURN EVT_END @@ -455,7 +455,7 @@ EvtScript N(EVS_Scene_ShuffleFuzzyPositions) = { EVT_CALL(SetNpcAnimation, NPC_Fuzzy_01, LVar0) EVT_CALL(SetNpcAnimation, NPC_Fuzzy_02, LVar0) EVT_CALL(SetNpcAnimation, NPC_Fuzzy_03, LVar0) - EVT_CALL(PlaySound, SOUND_B0000017) + EVT_CALL(PlaySound, SOUND_SEQ_17) EVT_THREAD EVT_CALL(N(GetTreeHidingSpotPos), MV_CorrectTreeIndex, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_BossFuzzy, LVar0, LVar1, LVar2, LVarD) @@ -714,7 +714,7 @@ EvtScript N(EVS_Unused_RandomlyReveal) = { EVT_CALL(N(GetTreeHidingSpotPos), LVar4, LVar0, LVar1, LVar2) EVT_CALL(RandInt, 10, LVar3) EVT_ADD(LVar3, 20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, LVar3) EVT_GOTO(0) EVT_RETURN @@ -954,7 +954,7 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Kooper, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH1_00C9) EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0263, 0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 50, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) @@ -1016,7 +1016,7 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(SetNpcPos, NPC_BossFuzzy, 63, 0, 212) EVT_CALL(EnableNpcShadow, NPC_BossFuzzy, TRUE) EVT_CALL(SetNpcJumpscale, NPC_BossFuzzy, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_BossFuzzy, -100, 0, 225, 20) EVT_SET(AF_NOK04_TauntMsgDone, FALSE) EVT_SET(AF_NOK04_FleeMsgDone, FALSE) @@ -1028,7 +1028,7 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(GetNpcPos, NPC_BossFuzzy, LVarA, LVarB, LVarC) EVT_LABEL(30) EVT_CALL(SetNpcJumpscale, NPC_BossFuzzy, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 12 * DT) EVT_IF_EQ(AF_NOK04_TauntMsgDone, FALSE) EVT_GOTO(30) @@ -1039,15 +1039,15 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(BindNpcAI, NPC_BossFuzzy, EVT_PTR(N(EVS_NpcAI_StartBossBattle))) EVT_END_THREAD EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_BossFuzzy, -212, 0, 237, 15 * DT) EVT_CALL(GetPlayerPos, LVarA, LVarB, LVarC) EVT_ADD(LVarB, 37) - EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 20 * DT) EVT_WAIT(2) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicHoverStill) - EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 15 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_LABEL(21) @@ -1059,18 +1059,18 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(GetNpcPos, NPC_BossFuzzy, LVarA, LVarB, LVarC) EVT_LABEL(31) EVT_CALL(SetNpcJumpscale, NPC_BossFuzzy, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 15 * DT) EVT_IF_EQ(AF_NOK04_FleeMsgDone, FALSE) EVT_GOTO(31) EVT_END_IF EVT_ADD(LVarA, 70) EVT_ADD(LVarC, -30) - EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 15 * DT) EVT_ADD(LVarA, 70) EVT_ADD(LVarC, -30) - EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 20 * DT) EVT_CALL(EnableNpcShadow, NPC_BossFuzzy, FALSE) EVT_CALL(SetNpcPos, NPC_BossFuzzy, NPC_DISPOSE_LOCATION) @@ -1088,11 +1088,11 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(SetNpcPos, NPC_Fuzzy_01, 63, 0, 212) EVT_CALL(EnableNpcShadow, NPC_Fuzzy_01, TRUE) EVT_CALL(SetNpcJumpscale, NPC_Fuzzy_01, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_01, -100, 0, 225, 10 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_01, -197, 0, 227, 20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_01, -233, 0, 285, 10 * DT) EVT_LABEL(22) EVT_IF_EQ(AF_NOK04_BattleDone, FALSE) @@ -1103,18 +1103,18 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(GetNpcPos, NPC_Fuzzy_01, LVarA, LVarB, LVarC) EVT_LABEL(32) EVT_CALL(SetNpcJumpscale, NPC_Fuzzy_01, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_01, LVarA, LVarB, LVarC, 12 * DT) EVT_IF_EQ(AF_NOK04_FleeMsgDone, FALSE) EVT_GOTO(32) EVT_END_IF EVT_ADD(LVarA, 70) EVT_ADD(LVarC, -30) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_01, LVarA, LVarB, LVarC, 10 * DT) EVT_ADD(LVarA, 70) EVT_ADD(LVarC, -30) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_01, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_01, LVarA, LVarB, LVarC, 20 * DT) EVT_CALL(EnableNpcShadow, NPC_Fuzzy_01, FALSE) EVT_CALL(SetNpcPos, NPC_Fuzzy_01, NPC_DISPOSE_LOCATION) @@ -1124,11 +1124,11 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(SetNpcPos, NPC_Fuzzy_02, 63, 0, 212) EVT_CALL(EnableNpcShadow, NPC_Fuzzy_02, TRUE) EVT_CALL(SetNpcJumpscale, NPC_Fuzzy_02, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_02, -122, 0, 219, 20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_02, -177, 0, 242, 10 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_02, -213, 0, 300, 15 * DT) EVT_LABEL(23) EVT_IF_EQ(AF_NOK04_BattleDone, FALSE) @@ -1140,18 +1140,18 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_WAIT(2) EVT_LABEL(33) EVT_CALL(SetNpcJumpscale, NPC_Fuzzy_02, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_02, LVarA, LVarB, LVarC, 12 * DT) EVT_IF_EQ(AF_NOK04_FleeMsgDone, FALSE) EVT_GOTO(33) EVT_END_IF EVT_ADD(LVarA, 70) EVT_ADD(LVarC, -30) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_02, LVarA, LVarB, LVarC, 20 * DT) EVT_ADD(LVarA, 70) EVT_ADD(LVarC, -30) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_02, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_02, LVarA, LVarB, LVarC, 15 * DT) EVT_CALL(EnableNpcShadow, NPC_Fuzzy_02, FALSE) EVT_CALL(SetNpcPos, NPC_Fuzzy_02, NPC_DISPOSE_LOCATION) @@ -1161,11 +1161,11 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(SetNpcPos, NPC_Fuzzy_03, 63, 0, 212) EVT_CALL(EnableNpcShadow, NPC_Fuzzy_03, TRUE) EVT_CALL(SetNpcJumpscale, NPC_Fuzzy_03, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_03, -100, 0, 269, 20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_03, -217, 0, 212, 10 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_03, -253, 0, 270, 10 * DT) EVT_LABEL(24) EVT_IF_EQ(AF_NOK04_BattleDone, FALSE) @@ -1177,18 +1177,18 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_WAIT(5 * DT) EVT_LABEL(34) EVT_CALL(SetNpcJumpscale, NPC_Fuzzy_03, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_03, LVarA, LVarB, LVarC, 12 * DT) EVT_IF_EQ(AF_NOK04_FleeMsgDone, FALSE) EVT_GOTO(34) EVT_END_IF EVT_ADD(LVarA, 70) EVT_ADD(LVarC, -30) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_03, LVarA, LVarB, LVarC, 15 * DT) EVT_ADD(LVarA, 70) EVT_ADD(LVarC, -30) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzy_03, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_Fuzzy_03, LVarA, LVarB, LVarC, 20 * DT) EVT_CALL(EnableNpcShadow, NPC_Fuzzy_03, FALSE) EVT_CALL(SetNpcPos, NPC_Fuzzy_03, NPC_DISPOSE_LOCATION) @@ -1260,7 +1260,7 @@ EvtScript N(EVS_HitTree_Correct) = { EVT_CALL(SetNpcAnimation, NPC_BossFuzzy, ANIM_Fuzzy_Hurt) EVT_CALL(PlayerFaceNpc, NPC_BossFuzzy, FALSE) EVT_CALL(SetNpcJumpscale, NPC_BossFuzzy, 0) - EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarD, LVarC, 30) EVT_CALL(SetNpcAnimation, NPC_BossFuzzy, ANIM_Fuzzy_Anim09) EVT_SET(LVar9, LVarC) @@ -1268,7 +1268,7 @@ EvtScript N(EVS_HitTree_Correct) = { EVT_CALL(N(SetThreadTargetLengthAngle), 0, 0, 30) EVT_CALL(SetNpcAnimation, NPC_BossFuzzy, ANIM_Fuzzy_Anim0B) EVT_SET(LVarC, LVar9) - EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 30) EVT_CALL(N(AttachThreadFrontNpc), NULL) EVT_CALL(SetModelFlags, MODEL_o177, MODEL_FLAG_USES_CUSTOM_GFX, FALSE) @@ -1298,7 +1298,7 @@ EvtScript N(EVS_HitTree_Correct) = { EVT_CALL(SetNpcAnimation, NPC_BossFuzzy, ANIM_Fuzzy_Hurt) EVT_CALL(PlayerFaceNpc, NPC_BossFuzzy, FALSE) EVT_CALL(SetNpcJumpscale, NPC_BossFuzzy, 0) - EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarD, LVarC, 30) EVT_CALL(SetNpcAnimation, NPC_BossFuzzy, ANIM_Fuzzy_Anim09) EVT_SET(LVar9, LVarC) @@ -1306,7 +1306,7 @@ EvtScript N(EVS_HitTree_Correct) = { EVT_CALL(N(SetThreadTargetLengthAngle), 0, 0, 30) EVT_CALL(SetNpcAnimation, NPC_BossFuzzy, ANIM_Fuzzy_Anim0B) EVT_SET(LVarC, LVar9) - EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 30) EVT_CALL(N(AttachThreadFrontNpc), NULL) EVT_CALL(SetModelFlags, MODEL_o177, MODEL_FLAG_USES_CUSTOM_GFX, FALSE) @@ -1344,7 +1344,7 @@ EvtScript N(EVS_HitTree_Correct) = { EVT_ADD(LVar3, -16) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar3, LVar4, LVar5, 20) EVT_END_THREAD - EVT_CALL(PlaySound, SOUND_D2) + EVT_CALL(PlaySound, SOUND_JINGLE_GOT_KEY) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_GotKooperShell, 160, 40) EVT_CALL(SetNpcPos, NPC_KoopersShell, NPC_DISPOSE_LOCATION) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) @@ -1412,7 +1412,7 @@ EvtScript N(EVS_HitTree_Wrong) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 10) EVT_ADD(LVar1, 10) - EVT_CALL(PlaySoundAtNpc, NPC_AmbushFuzzy, SOUND_B0000017, 0) + EVT_CALL(PlaySoundAtNpc, NPC_AmbushFuzzy, SOUND_SEQ_17, 0) EVT_CALL(NpcJump0, NPC_AmbushFuzzy, LVar0, LVar1, LVar2, 20) EVT_SET(MV_WrongAnswerBattle, 1) EVT_END_SWITCH @@ -1441,7 +1441,7 @@ EvtScript N(EVS_HitTree) = { EVT_IF_EQ(LVar0, MV_CorrectTreeIndex) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySound, SOUND_21C) + EVT_CALL(PlaySound, SOUND_021C) EVT_END_THREAD EVT_EXEC_WAIT(N(EVS_HitTree_Correct)) EVT_ELSE diff --git a/src/world/area_nok/nok_11/nok_11_2_main.c b/src/world/area_nok/nok_11/nok_11_2_main.c index 9c89435fb7..6ebc228c67 100644 --- a/src/world/area_nok/nok_11/nok_11_2_main.c +++ b/src/world/area_nok/nok_11/nok_11_2_main.c @@ -99,7 +99,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC(N(EVS_TexPan_Flowers)) EVT_EXEC(N(EVS_TexPan_Water)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_8000005B) + EVT_CALL(PlaySound, SOUND_LOOP_5B) EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_WAIT(1) 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 7e6be7ade4..a74b6a363a 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 @@ -50,7 +50,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { EVT_SET(LVar0, EVT_PTR(N(SearchBush_Scene))) EVT_EXEC(N(EVS_SearchBush)) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_SELF, -230, 0, -157, 15 * DT) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) @@ -78,10 +78,10 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) EVT_CALL(NpcJump1, NPC_SELF, -191, 0, -32, 5 * DT) EVT_EXEC_GET_TID(N(EVS_JrTroopa_RunFX), LVarA) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_167, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0167, SOUND_SPACE_MODE_0) EVT_CALL(NpcMoveTo, NPC_SELF, -165, 50, 15 * DT) EVT_KILL_THREAD(LVarA) - EVT_CALL(StopSound, SOUND_167) + EVT_CALL(StopSound, SOUND_0167) EVT_WAIT(5 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_FallHeadfirstBack) EVT_WAIT(15 * DT) @@ -106,11 +106,11 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { EVT_ADD(LVar0, 10) EVT_PLAY_EFFECT(EFFECT_WATER_SPLASH, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.7), 30) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_301, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0301, SOUND_SPACE_MODE_0) 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_74, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0074, 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_1_music.c b/src/world/area_nok/nok_12/nok_12_1_music.c index a8cbc0cebb..cee9dec488 100644 --- a/src/world/area_nok/nok_12/nok_12_1_music.c +++ b/src/world/area_nok/nok_12/nok_12_1_music.c @@ -2,7 +2,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_PLEASANT_PATH, 0, 8) - EVT_CALL(PlaySound, SOUND_8000005B) + EVT_CALL(PlaySound, SOUND_LOOP_5B) EVT_RETURN EVT_END }; 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 325dbe87c0..d6a80f2f07 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_48, 0, -470, LVar0, -150) + EVT_CALL(PlaySoundAt, SOUND_0048, 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 23313d9ff2..cc575a615a 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_71, 0, -275, 0, -39) + EVT_CALL(PlaySoundAt, SOUND_0071, 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_72, 0, -275, 0, -39) + EVT_CALL(PlaySoundAt, SOUND_0072, 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_73, 0, -275, 0, -39) + EVT_CALL(PlaySoundAt, SOUND_0073, 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_12/nok_12_6_npc.c b/src/world/area_nok/nok_12/nok_12_6_npc.c index 4404d33174..9059d8b7bf 100644 --- a/src/world/area_nok/nok_12/nok_12_6_npc.c +++ b/src/world/area_nok/nok_12/nok_12_6_npc.c @@ -16,7 +16,7 @@ EvtScript N(EVS_NpcIdle_SpikedGoomba) = { EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_SpikedGoomba_Sleep) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E1, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_03E1, 0) EVT_CALL(MakeLerp, -90, 0, 10, EASING_LINEAR) EVT_LABEL(1) EVT_CALL(UpdateLerp) diff --git a/src/world/area_nok/nok_13/nok_13_1_music.c b/src/world/area_nok/nok_13/nok_13_1_music.c index 5258a296ad..56517e2f47 100644 --- a/src/world/area_nok/nok_13/nok_13_1_music.c +++ b/src/world/area_nok/nok_13/nok_13_1_music.c @@ -2,7 +2,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_PLEASANT_PATH, 0, 8) - EVT_CALL(PlaySound, SOUND_8000005B) + EVT_CALL(PlaySound, SOUND_LOOP_5B) EVT_RETURN EVT_END }; diff --git a/src/world/area_nok/nok_13/nok_13_3_entity.c b/src/world/area_nok/nok_13/nok_13_3_entity.c index bc8298dac3..65bd680a6e 100644 --- a/src/world/area_nok/nok_13/nok_13_3_entity.c +++ b/src/world/area_nok/nok_13/nok_13_3_entity.c @@ -21,7 +21,7 @@ EvtScript N(EVS_BreakBlock_Second) = { EvtScript N(EVS_BreakBlock_Third) = { EVT_IF_EQ(AB_NOK_1, 2) EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) - EVT_CALL(PlaySoundAt, SOUND_2108, 0, 40, 60, -285) + EVT_CALL(PlaySoundAt, SOUND_SPAWN_BLOCK, 0, 40, 60, -285) EVT_SET(AB_NOK_1, 3) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 40, 73, -285, 10) EVT_CALL(MakeEntity, EVT_PTR(Entity_RedBlock), 40, 60, -285, 90, ITEM_ATTACK_FX_B, MAKE_ENTITY_END) diff --git a/src/world/area_nok/nok_14/nok_14_1_music.c b/src/world/area_nok/nok_14/nok_14_1_music.c index 3d281802be..b37e929f01 100644 --- a/src/world/area_nok/nok_14/nok_14_1_music.c +++ b/src/world/area_nok/nok_14/nok_14_1_music.c @@ -2,7 +2,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_PLEASANT_PATH, 0, 8) - EVT_CALL(PlaySound, SOUND_8000005B) + EVT_CALL(PlaySound, SOUND_LOOP_5B) EVT_RETURN EVT_END }; 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 bcdf7f6f0d..aa787f622e 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_71, SOUND_SPACE_MODE_0, 0, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_0071, 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_67, SOUND_SPACE_MODE_0, -84, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_0067, 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_68, SOUND_SPACE_MODE_0, -56, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_0068, 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_69, SOUND_SPACE_MODE_0, -28, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_0069, 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_6A, SOUND_SPACE_MODE_0, 0, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_006A, 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_6B, SOUND_SPACE_MODE_0, 28, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_006B, 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_6C, SOUND_SPACE_MODE_0, 56, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_006C, 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_6D, SOUND_SPACE_MODE_0, 84, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_006D, 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_nok/nok_15/nok_15_1_music.c b/src/world/area_nok/nok_15/nok_15_1_music.c index 6c63d650d1..cb24a9e64b 100644 --- a/src/world/area_nok/nok_15/nok_15_1_music.c +++ b/src/world/area_nok/nok_15/nok_15_1_music.c @@ -2,7 +2,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_PLEASANT_PATH, 0, 8) - EVT_CALL(PlaySound, SOUND_8000005B) + EVT_CALL(PlaySound, SOUND_LOOP_5B) EVT_RETURN EVT_END }; 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 ebd25150d9..0fc293f1f0 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_9D, SOUND_SPACE_MODE_0); + sfx_play_sound_at_player(SOUND_009D, 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_8000000F, SOUND_SPACE_MODE_0, 440.0f, chandelier->dropDistance, 271.0f); + sfx_play_sound_at_position(SOUND_LOOP_0F, 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_8000000F); + sfx_stop_sound(SOUND_LOOP_0F); 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_80000010, SOUND_SPACE_MODE_0, x, y, z); + sfx_play_sound_at_position(SOUND_LOOP_10, 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_80000010); + sfx_stop_sound(SOUND_LOOP_10); script->functionTemp[3] = FALSE; } } @@ -570,7 +570,7 @@ EvtScript N(EVS_LaunchFromCouch_Crash) = { EVT_CALL(PlayerJump, 51, -210, 87, 60) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtPlayer, SOUND_162, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0162, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Collapse) EVT_WAIT(30) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_GetUp) diff --git a/src/world/area_obk/obk_01/obk_01_4_portrait.c b/src/world/area_obk/obk_01/obk_01_4_portrait.c index ed9dff9946..67a234c7ac 100644 --- a/src/world/area_obk/obk_01/obk_01_4_portrait.c +++ b/src/world/area_obk/obk_01/obk_01_4_portrait.c @@ -105,7 +105,7 @@ EvtScript N(EVS_Interact_LowerPortrait) = { EVT_WAIT(1) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(PlayerJump, 812, -170, -2, 20 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_D9, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_TRANSPORTER_IN, SOUND_SPACE_MODE_0) EVT_WAIT(10 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 812, 0, 28) EVT_CALL(SetPanTarget, CAM_DEFAULT, 812, 0, 28) @@ -115,7 +115,7 @@ EvtScript N(EVS_Interact_LowerPortrait) = { EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Jump) EVT_WAIT(1) - EVT_CALL(PlaySoundAtPlayer, SOUND_DA, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_TRANSPORTER_OUT, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerPos, 812, 61, -2) EVT_CALL(PlayerJump, 812, 0, 28, 8 * DT) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) @@ -148,7 +148,7 @@ EvtScript N(EVS_Interact_UpperPortrait) = { EVT_WAIT(1) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(PlayerJump, 812, 40, -2, 20) - EVT_CALL(PlaySoundAtPlayer, SOUND_D9, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_TRANSPORTER_IN, SOUND_SPACE_MODE_0) EVT_WAIT(10 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 812, -210, 28) EVT_CALL(SetPanTarget, CAM_DEFAULT, 812, -210, 28) @@ -158,7 +158,7 @@ EvtScript N(EVS_Interact_UpperPortrait) = { EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Jump) EVT_WAIT(1) - EVT_CALL(PlaySoundAtPlayer, SOUND_DA, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_TRANSPORTER_OUT, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerPos, 812, -146, -2) EVT_CALL(PlayerJump, 812, -210, 28, 8 * DT) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) diff --git a/src/world/area_obk/obk_02/obk_02_6_entity.c b/src/world/area_obk/obk_02/obk_02_6_entity.c index 8c831a04fc..1ab37bd055 100644 --- a/src/world/area_obk/obk_02/obk_02_6_entity.c +++ b/src/world/area_obk/obk_02/obk_02_6_entity.c @@ -5,7 +5,7 @@ EvtScript N(EVS_ChestTrap) = { EVT_WAIT(15) EVT_THREAD - EVT_CALL(PlaySoundAt, SOUND_212A, SOUND_SPACE_MODE_0, 4, 26, -12) + EVT_CALL(PlaySoundAt, SOUND_OBK_CHANDELIER_RELEASE, SOUND_SPACE_MODE_0, 4, 26, -12) EVT_CALL(MakeLerp, 0, -80, 10 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -15,10 +15,10 @@ EvtScript N(EVS_ChestTrap) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_212B, SOUND_SPACE_MODE_0, 4, 26, -12) + EVT_CALL(PlaySoundAt, SOUND_OBK_CHANDELIER_STOP, SOUND_SPACE_MODE_0, 4, 26, -12) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.5)) EVT_WAIT(40 * DT) - EVT_CALL(PlaySoundAt, SOUND_212C, SOUND_SPACE_MODE_0, 4, 26, -12) + EVT_CALL(PlaySoundAt, SOUND_OBK_CHANDELIER_RETRACT, SOUND_SPACE_MODE_0, 4, 26, -12) EVT_CALL(MakeLerp, -80, 0, 20 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) 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 dd7952845a..0c5f3ba8bd 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 @@ -13,7 +13,7 @@ EvtScript N(EVS_SecondSwitch_Drop) = { EVT_THREAD EVT_WAIT(10) EVT_CALL(N(GetEntityPosition), LVar7, LVarA, LVarB, LVarC) - EVT_CALL(PlaySoundAt, SOUND_301, SOUND_SPACE_MODE_0, LVarA, LVarB, LVarC) + EVT_CALL(PlaySoundAt, SOUND_0301, SOUND_SPACE_MODE_0, LVarA, LVarB, LVarC) EVT_END_THREAD EVT_CALL(MakeLerp, LVar3, LVar5, LVar6, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -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_48, SOUND_SPACE_MODE_0, LVarA, LVarB, LVarC) + EVT_CALL(PlaySoundAt, SOUND_0048, 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) @@ -38,7 +38,7 @@ EvtScript N(EVS_ThirdSwitch_Drop) = { EVT_THREAD EVT_WAIT(10) EVT_CALL(N(GetEntityPosition), LVar7, LVarA, LVarB, LVarC) - EVT_CALL(PlaySoundAt, SOUND_303, SOUND_SPACE_MODE_0, LVarA, LVarB, LVarC) + EVT_CALL(PlaySoundAt, SOUND_0303, SOUND_SPACE_MODE_0, LVarA, LVarB, LVarC) EVT_END_THREAD EVT_CALL(MakeLerp, LVar3, LVar5, LVar6, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -50,7 +50,7 @@ EvtScript N(EVS_ThirdSwitch_Drop) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(N(GetEntityPosition), LVar7, LVarA, LVarB, LVarC) - EVT_CALL(PlaySoundAt, SOUND_DD, SOUND_SPACE_MODE_0, LVarA, LVarB, LVarC) + EVT_CALL(PlaySoundAt, SOUND_HEAVY_OBJECT_DROP, 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 5c1dbb5bec..619e4dc055 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_B000000F, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(SOUND_SEQ_0F, 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_07/obk_07_4_fireplace.c b/src/world/area_obk/obk_07/obk_07_4_fireplace.c index 94cddaf480..a3f538e713 100644 --- a/src/world/area_obk/obk_07/obk_07_4_fireplace.c +++ b/src/world/area_obk/obk_07/obk_07_4_fireplace.c @@ -96,7 +96,7 @@ EvtScript N(EVS_Inspect_Fireplace) = { EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_F5, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_00F5, SOUND_SPACE_MODE_0) EVT_SET(LVar0, EVT_PTR(N(ExplosionPositions1))) EVT_EXEC(N(EVS_PlayExplosionFX)) EVT_SET(LVar0, EVT_PTR(N(ExplosionPositions2))) diff --git a/src/world/area_obk/obk_08/obk_08_3_cabinets.c b/src/world/area_obk/obk_08/obk_08_3_cabinets.c index e86197b7a7..78900cfc79 100644 --- a/src/world/area_obk/obk_08/obk_08_3_cabinets.c +++ b/src/world/area_obk/obk_08/obk_08_3_cabinets.c @@ -157,7 +157,7 @@ Vec2i N(DustEmitters_NearCabinet)[] = { }; EvtScript N(EVS_MiddleCabinet_OpenDoors) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu2, SOUND_F6, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu2, SOUND_00F6, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 120, 15, EASING_QUARTIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -183,7 +183,7 @@ EvtScript N(EVS_MiddleCabinet_CloseDoors) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu2, SOUND_F6, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu2, SOUND_00F6, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; @@ -215,12 +215,12 @@ EvtScript N(EVS_Interact_NearCabinet) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(InterruptUsePartner) EVT_LOOP(3) - EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu1, SOUND_F6, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu1, SOUND_00F6, SOUND_SPACE_MODE_0) EVT_CALL(RotateModel, MODEL_tansu1, -1, 1, 0, 0) EVT_WAIT(2) EVT_CALL(RotateModel, MODEL_tansu1, 0, 1, 0, 0) EVT_WAIT(1) - EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu1, SOUND_F6, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu1, SOUND_00F6, SOUND_SPACE_MODE_0) EVT_CALL(TranslateModel, MODEL_tansu1, 0, 0, 100) EVT_CALL(RotateModel, MODEL_tansu1, 1, 1, 0, 0) EVT_CALL(TranslateModel, MODEL_tansu1, 0, 0, -100) @@ -239,7 +239,7 @@ EvtScript N(EVS_Interact_NearCabinet) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu1, SOUND_F7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu1, SOUND_00F7, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(1.5)) EVT_END_THREAD @@ -270,12 +270,12 @@ EvtScript N(EVS_Interact_FarCabinet) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(InterruptUsePartner) EVT_LOOP(5) - EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu3, SOUND_F6, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu3, SOUND_00F6, SOUND_SPACE_MODE_0) EVT_CALL(RotateModel, MODEL_tansu3, -1, 1, 0, 0) EVT_WAIT(2) EVT_CALL(RotateModel, MODEL_tansu3, 0, 1, 0, 0) EVT_WAIT(1) - EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu3, SOUND_F6, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu3, SOUND_00F6, SOUND_SPACE_MODE_0) EVT_CALL(TranslateModel, MODEL_tansu3, 0, 0, 100) EVT_CALL(RotateModel, MODEL_tansu3, 1, 1, 0, 0) EVT_CALL(TranslateModel, MODEL_tansu3, 0, 0, -100) @@ -294,7 +294,7 @@ EvtScript N(EVS_Interact_FarCabinet) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(20) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu3, SOUND_F7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu3, SOUND_00F7, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(1.5)) EVT_END_THREAD diff --git a/src/world/area_obk/obk_08/obk_08_4_entity.c b/src/world/area_obk/obk_08/obk_08_4_entity.c index 0b536e612b..d215d80498 100644 --- a/src/world/area_obk/obk_08/obk_08_4_entity.c +++ b/src/world/area_obk/obk_08/obk_08_4_entity.c @@ -14,8 +14,8 @@ API_CALLABLE(N(EnableItemTransparency)) { } EvtScript N(EVS_AnimateShutterLeft) = { - EVT_CALL(PlaySoundWithVolume, SOUND_B0000011, 0) - EVT_CALL(PlaySoundAtModel, LVar2, SOUND_B0000011, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundWithVolume, SOUND_SEQ_11, 0) + EVT_CALL(PlaySoundAtModel, LVar2, SOUND_SEQ_11, SOUND_SPACE_MODE_0) EVT_CALL(N(ShutterCrashRumble), 5) EVT_SET(LVar3, 90) EVT_CALL(MakeLerp, 0, LVar3, 15, EASING_COS_FAST_OVERSHOOT) @@ -63,8 +63,8 @@ EvtScript N(EVS_AnimateShutterLeft) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(40) EVT_END_IF - EVT_CALL(PlaySoundWithVolume, SOUND_B0000012, 0) - EVT_CALL(PlaySoundAtModel, LVar2, SOUND_B0000012, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundWithVolume, SOUND_SEQ_12, 0) + EVT_CALL(PlaySoundAtModel, LVar2, SOUND_SEQ_12, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; 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 da97c17116..0bb0c6741d 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_B000000F, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(SOUND_SEQ_0F, 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 dd0c48a25b..caea57cef3 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_8000000F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_LOOP_0F, 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_8000000F) - EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_9B, SOUND_SPACE_MODE_0) + EVT_CALL(StopSound, SOUND_LOOP_0F) + EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_009B, 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_8000000F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_LOOP_0F, 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_8000000F) + EVT_CALL(StopSound, SOUND_LOOP_0F) 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 d0e6bf25f3..b335b5eeb3 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_1FF) + EVT_CALL(PlaySound, SOUND_01FF) EVT_ELSE - EVT_CALL(PlaySound, SOUND_84) + EVT_CALL(PlaySound, SOUND_0084) EVT_END_IF EVT_END_IF EVT_ELSE @@ -198,10 +198,10 @@ EvtScript N(EVS_Scene_RideTrain) = { EVT_SETF(ArrayVar(15), EVT_FLOAT(10.0)) EVT_SET(LFlag0, FALSE) EVT_IF_EQ(AF_OMO_03, FALSE) - EVT_CALL(PlaySound, SOUND_1FE) + EVT_CALL(PlaySound, SOUND_01FE) EVT_SET(AF_OMO_03, TRUE) EVT_ELSE - EVT_CALL(PlaySound, SOUND_1FE) + EVT_CALL(PlaySound, SOUND_01FE) EVT_SET(AF_OMO_03, FALSE) EVT_END_IF EVT_END_IF @@ -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_83) + EVT_CALL(PlaySound, SOUND_LRAW_0083) 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_83) + EVT_CALL(PlaySound, SOUND_LRAW_0083) 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_83) + EVT_CALL(StopSound, SOUND_LRAW_0083) 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_83) + EVT_CALL(StopSound, SOUND_LRAW_0083) 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/common/TrainStationSwitches.inc.c b/src/world/area_omo/common/TrainStationSwitches.inc.c index 6cd24004de..0b6faca242 100644 --- a/src/world/area_omo/common/TrainStationSwitches.inc.c +++ b/src/world/area_omo/common/TrainStationSwitches.inc.c @@ -51,7 +51,7 @@ EvtScript N(EVS_UpdateDirectionArrow) = { EVT_END_IF EVT_IF_NE(LVar4, -1) EVT_IF_NE(LVar3, LVar4) - EVT_CALL(PlaySound, SOUND_1F9) + EVT_CALL(PlaySound, SOUND_01F9) EVT_END_IF EVT_END_IF EVT_SET(LVar4, LVar3) @@ -63,7 +63,7 @@ EvtScript N(EVS_UpdateDirectionArrow) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(11) EVT_END_IF - EVT_CALL(PlaySound, SOUND_1FA) + EVT_CALL(PlaySound, SOUND_01FA) EVT_IF_EQ(AF_OMO_UsingRightSwitch, FALSE) EVT_SET(MV_ArrowTexUOffset, 0x4000) EVT_ELSE 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 7e6a22a718..3da003a91b 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 @@ -250,7 +250,7 @@ EvtScript N(EVS_Scene_BreakBarricade) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtModel, MODEL_t1, SOUND_1F4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_t1, SOUND_01F4, SOUND_SPACE_MODE_0) EVT_CALL(GetModelCenter, MODEL_t1) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) @@ -287,7 +287,7 @@ EvtScript N(EVS_Scene_BreakBarricade) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtModel, MODEL_t2_1, SOUND_1F4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_t2_1, SOUND_01F4, SOUND_SPACE_MODE_0) EVT_CALL(GetModelCenter, MODEL_t2_1) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) @@ -334,13 +334,13 @@ EvtScript N(EVS_Scene_BreakBarricade) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtModel, MODEL_t3_2, SOUND_1F4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_t3_2, SOUND_01F4, SOUND_SPACE_MODE_0) EVT_CALL(GetModelCenter, MODEL_t3_2) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_THREAD EVT_WAIT(35) - EVT_CALL(PlaySound, SOUND_8000004D) + EVT_CALL(PlaySound, SOUND_LOOP_4D) EVT_END_THREAD EVT_SET(LVar0, 1) EVT_SET(LVar5, 1) @@ -366,8 +366,8 @@ EvtScript N(EVS_Scene_BreakBarricade) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(165) - EVT_CALL(PlaySound, SOUND_36D | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_36D) + EVT_CALL(PlaySound, SOUND_LRAW_036D | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(func_802D62E4, 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)) @@ -389,11 +389,11 @@ EvtScript N(EVS_Scene_BreakBarricade) = { EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Red_Anim10) EVT_END_THREAD EVT_CALL(NpcJump0, NPC_ShyGuy_01, -45, 0, -8, 10) - EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_MISS_JUMP, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_ACTOR_TRIP, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(50) EVT_LOOP(2) - EVT_CALL(PlaySoundAtNpc, LVar9, SOUND_3E4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar9, SOUND_ACTOR_TWITCH, SOUND_SPACE_MODE_0) EVT_WAIT(7) EVT_END_LOOP EVT_CALL(SetNpcRotationPivot, NPC_ShyGuy_01, 0) @@ -401,13 +401,13 @@ EvtScript N(EVS_Scene_BreakBarricade) = { EVT_CALL(NpcJump0, NPC_ShyGuy_01, -50, 0, -8, 10) EVT_CALL(InterpNpcYaw, NPC_ShyGuy_01, 270, 0) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_3A2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_03A2, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Red_Anim04) EVT_CALL(SetNpcSpeed, NPC_ShyGuy_01, EVT_FLOAT(6.0)) EVT_CALL(NpcMoveTo, NPC_ShyGuy_01, 100, 50, 0) EVT_CALL(RemoveNpc, NPC_ShyGuy_01) EVT_WAIT(30) - EVT_CALL(StopSound, SOUND_3A2) + EVT_CALL(StopSound, SOUND_03A2) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) diff --git a/src/world/area_omo/omo_02/omo_02_6_npc.c b/src/world/area_omo/omo_02/omo_02_6_npc.c index cb1ba10c26..f8c5014feb 100644 --- a/src/world/area_omo/omo_02/omo_02_6_npc.c +++ b/src/world/area_omo/omo_02/omo_02_6_npc.c @@ -22,7 +22,7 @@ EvtScript N(EVS_RestrictCamFromBarricade) = { EvtScript N(EVS_PlayShyGuyRunSounds) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_B0000021, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_SEQ_21, SOUND_SPACE_MODE_0) EVT_WAIT(8) EVT_END_LOOP EVT_RETURN @@ -45,7 +45,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = { EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(6.0 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, -575, 0, 0) EVT_KILL_THREAD(LVarA) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -460, 0, -20, 40 / DT) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) @@ -62,7 +62,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = { EVT_GOTO(10) EVT_END_IF EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -460, 0, -20, 40 / DT) EVT_END_IF EVT_RETURN diff --git a/src/world/area_omo/omo_03/omo_03_3_gizmos.c b/src/world/area_omo/omo_03/omo_03_3_gizmos.c index 4c791c2be4..d23b35310f 100644 --- a/src/world/area_omo/omo_03/omo_03_3_gizmos.c +++ b/src/world/area_omo/omo_03/omo_03_3_gizmos.c @@ -71,7 +71,7 @@ EvtScript N(EVS_Scene_PullBlueSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_1F1, SOUND_SPACE_MODE_0, -440, 10, 40) + EVT_CALL(PlaySoundAt, SOUND_01F1, SOUND_SPACE_MODE_0, -440, 10, 40) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o978, COLLIDER_FLAGS_UPPER_MASK) EVT_WAIT(20) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -184, 10, -229) @@ -82,7 +82,7 @@ EvtScript N(EVS_Scene_PullBlueSwitch) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(20) - EVT_CALL(PlaySoundAt, SOUND_1F2, SOUND_SPACE_MODE_0, -130, 0, -215) + EVT_CALL(PlaySoundAt, SOUND_01F2, SOUND_SPACE_MODE_0, -130, 0, -215) EVT_CALL(MakeLerp, 0, 180, 30, EASING_COS_IN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) @@ -93,7 +93,7 @@ EvtScript N(EVS_Scene_PullBlueSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(1) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_51, SOUND_SPACE_MODE_0, -130, 0, -215) + EVT_CALL(PlaySoundAt, SOUND_0051, SOUND_SPACE_MODE_0, -130, 0, -215) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.0)) EVT_CALL(GetModelCenter, MODEL_o932) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 3, LVar0, LVar1, LVar2, 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 d0d5ecae25..74d80b3ea7 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_A1, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_p_8, SOUND_00A1, 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_A1, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_p_8, SOUND_00A1, 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_A1, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_p_8, SOUND_00A1, 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 612c8719c5..677daecd6c 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_295, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_LRAW_0295, SOUND_SPACE_MODE_0) EVT_WAIT(4) EVT_END_LOOP EVT_RETURN @@ -146,7 +146,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_END_LOOP EVT_SET(MF_KammyFlying, FALSE) EVT_KILL_THREAD(MV_FlightSoundsScriptID) - EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_32B, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_032B, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim10) EVT_WAIT(1) @@ -236,7 +236,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_END_THREAD EVT_WAIT(90 * DT) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) - EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(5 * DT) EVT_END_IF 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 41760a6a21..c02afe2bc8 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 @@ -231,21 +231,21 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(25.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_381, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0381, SOUND_SPACE_MODE_0) EVT_WAIT(33 * DT) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(320.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(13.0), EVT_FLOAT(-0.8)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(25.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_382, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0382, SOUND_SPACE_MODE_0) EVT_WAIT(33 * DT) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(14.0), EVT_FLOAT(0.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(25.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_383, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0383, SOUND_SPACE_MODE_0) EVT_WAIT(18 * DT) EVT_CALL(SetMusicTrack, 0, SONG_GOURMET_GUY_FREAKOUT, 0, 8) EVT_WAIT(30 * DT) @@ -287,19 +287,19 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_GOTO(19) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_384, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0384, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_Panic) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(20.0 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, 0, 110, 0) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_384, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0384, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_UPSIDE_DOWN, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, 0, 145, 110) EVT_CALL(NpcMoveTo, NPC_SELF, -500, 110, 0) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_UPSIDE_DOWN, FALSE) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_384, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0384, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, -45) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) EVT_CALL(MakeLerp, 0, 100, 30 * DT, EASING_LINEAR) @@ -320,7 +320,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_GOTO(10) EVT_END_IF EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_384, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0384, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0) EVT_CALL(SetNpcPos, NPC_SELF, -500, 0, 110) EVT_CALL(NpcMoveTo, NPC_SELF, -250, 110, 0) @@ -334,7 +334,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_385, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0385, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_Leap) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.002)) EVT_CALL(NpcJump0, NPC_SELF, -250, 500, 110, 40 * DT) diff --git a/src/world/area_omo/omo_06/omo_06_3_gizmos.c b/src/world/area_omo/omo_06/omo_06_3_gizmos.c index 0407c28c53..2b0e980c4d 100644 --- a/src/world/area_omo/omo_06/omo_06_3_gizmos.c +++ b/src/world/area_omo/omo_06/omo_06_3_gizmos.c @@ -60,7 +60,7 @@ EvtScript N(EVS_Scene_PullPinkSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_1F1, SOUND_SPACE_MODE_0, -395, 0, -185) + EVT_CALL(PlaySoundAt, SOUND_01F1, SOUND_SPACE_MODE_0, -395, 0, -185) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o930, COLLIDER_FLAGS_UPPER_MASK) EVT_WAIT(20 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 223, 10, -165) @@ -70,7 +70,7 @@ EvtScript N(EVS_Scene_PullPinkSwitch) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAt, SOUND_1F2, SOUND_SPACE_MODE_0, 265, 0, -235) + EVT_CALL(PlaySoundAt, SOUND_01F2, SOUND_SPACE_MODE_0, 265, 0, -235) EVT_CALL(MakeLerp, 0, 180, 30 * DT, EASING_COS_IN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) @@ -81,7 +81,7 @@ EvtScript N(EVS_Scene_PullPinkSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(1) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_51, SOUND_SPACE_MODE_0, 265, 0, -235) + EVT_CALL(PlaySoundAt, SOUND_0051, SOUND_SPACE_MODE_0, 265, 0, -235) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.0)) EVT_CALL(GetModelCenter, MODEL_o897) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 3, LVar0, LVar1, LVar2, 0) diff --git a/src/world/area_omo/omo_07/omo_07_4_npc.c b/src/world/area_omo/omo_07/omo_07_4_npc.c index 6a2eec763c..8e9b536dc2 100644 --- a/src/world/area_omo/omo_07/omo_07_4_npc.c +++ b/src/world/area_omo/omo_07/omo_07_4_npc.c @@ -72,7 +72,7 @@ EvtScript N(EVS_Push_SecretDoor) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(AF_OMO07_DoorOpening, TRUE) - EVT_CALL(PlaySoundAt, SOUND_1D9, SOUND_SPACE_MODE_0, 25, 0, -55) + EVT_CALL(PlaySoundAt, SOUND_01D9, SOUND_SPACE_MODE_0, 25, 0, -55) EVT_THREAD EVT_IF_LT(LVar0, 25) EVT_CALL(MakeLerp, 0, 180, 30, EASING_COS_IN_OUT) @@ -200,7 +200,7 @@ EvtScript N(EVS_NpcAI_ShyGuy) = { EVT_CALL(SetSelfVar, SHYGUY_VAR_WAIT_TIME, 0) EVT_END_IF EVT_CASE_EQ(SHYGUY_STATE_OPEN_DOOR) - EVT_CALL(PlaySoundAt, SOUND_1D9, SOUND_SPACE_MODE_0, 25, 0, -55) + EVT_CALL(PlaySoundAt, SOUND_01D9, SOUND_SPACE_MODE_0, 25, 0, -55) EVT_THREAD EVT_SET(AF_OMO07_DoorOpening, TRUE) EVT_SET(LVar2, MV_SecretDoorAngle) 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 159d424407..5a73b628c1 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 @@ -107,7 +107,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(SetNpcVar, NPC_Kammy, 0, 0) EVT_WAIT(5 * DT) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) - EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(5 * DT) EVT_END_IF 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 ba1fce9806..93890c7f08 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 @@ -208,16 +208,16 @@ EvtScript N(EVS_BoxResult_GiveCoins) = { EVT_WAIT(LVar0) EVT_EXEC(N(EVS_BlueLightOff)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_1A6, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_01A6, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_GreenLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_1A5, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_01A5, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_YellowLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_1A7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_01A7, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_RedLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_1A8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_01A8, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_BlueLightOn)) EVT_WAIT(LVar0) EVT_SUB(LVar0, 1) @@ -230,7 +230,7 @@ EvtScript N(EVS_BoxResult_GiveCoins) = { EVT_EXEC(N(EVS_RedLightOff)) EVT_EXEC(N(EVS_BlueLightOff)) EVT_WAIT(LVar0) - EVT_CALL(PlaySound, SOUND_1A9) + EVT_CALL(PlaySound, SOUND_01A9) EVT_EXEC(N(EVS_GreenLightOn)) EVT_EXEC(N(EVS_YellowLightOn)) EVT_EXEC(N(EVS_RedLightOn)) @@ -315,16 +315,16 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_WAIT(3) EVT_EXEC(N(EVS_BlueLightOff)) EVT_WAIT(3) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_1A6, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_01A6, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_GreenLightOn)) EVT_WAIT(3) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_1A5, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_01A5, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_YellowLightOn)) EVT_WAIT(3) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_1A7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_01A7, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_RedLightOn)) EVT_WAIT(3) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_1A8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_01A8, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_BlueLightOn)) EVT_WAIT(3) EVT_END_LOOP @@ -346,7 +346,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_END_IF EVT_END_LOOP EVT_CALL(GetModelCenter, MODEL_o875) - EVT_CALL(PlaySoundAt, SOUND_1F3, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_01F3, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.8)) EVT_END_THREAD @@ -362,7 +362,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_END_IF EVT_END_LOOP EVT_CALL(GetModelCenter, MODEL_o877) - EVT_CALL(PlaySoundAt, SOUND_1F3, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_01F3, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.8)) EVT_END_THREAD @@ -378,7 +378,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_END_IF EVT_END_LOOP EVT_CALL(GetModelCenter, MODEL_o879) - EVT_CALL(PlaySoundAt, SOUND_1F3, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_01F3, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.8)) EVT_END_THREAD @@ -394,7 +394,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_END_IF EVT_END_LOOP EVT_CALL(GetModelCenter, MODEL_o881) - EVT_CALL(PlaySoundAt, SOUND_1F3, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_01F3, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.8)) EVT_END_THREAD @@ -516,16 +516,16 @@ EvtScript N(EVS_BoxResult_ReleaseShyGuys) = { EVT_WAIT(LVar0) EVT_EXEC(N(EVS_BlueLightOff)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_1A6, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_01A6, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_BlueLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_1A5, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_01A5, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_RedLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_1A7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_01A7, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_YellowLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_1A8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_01A8, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_GreenLightOn)) EVT_WAIT(LVar0) EVT_SUB(LVar0, 1) @@ -538,7 +538,7 @@ EvtScript N(EVS_BoxResult_ReleaseShyGuys) = { EVT_EXEC(N(EVS_RedLightOff)) EVT_EXEC(N(EVS_BlueLightOff)) EVT_WAIT(LVar0) - EVT_CALL(PlaySound, SOUND_1A9) + EVT_CALL(PlaySound, SOUND_01A9) EVT_EXEC(N(EVS_GreenLightOn)) EVT_EXEC(N(EVS_YellowLightOn)) EVT_EXEC(N(EVS_RedLightOn)) @@ -558,7 +558,7 @@ EvtScript N(EVS_BoxResult_ReleaseShyGuys) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(GetModelCenter, MODEL_b1_1) EVT_CALL(SetNpcPos, NPC_ShyGuy_01, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_01, EVT_FLOAT(1.0)) @@ -578,7 +578,7 @@ EvtScript N(EVS_BoxResult_ReleaseShyGuys) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(GetModelCenter, MODEL_b2_1) EVT_CALL(SetNpcPos, NPC_ShyGuy_02, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_02, EVT_FLOAT(1.0)) @@ -598,7 +598,7 @@ EvtScript N(EVS_BoxResult_ReleaseShyGuys) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(GetModelCenter, MODEL_b3_1) EVT_CALL(SetNpcPos, NPC_ShyGuy_03, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_03, EVT_FLOAT(1.0)) @@ -618,7 +618,7 @@ EvtScript N(EVS_BoxResult_ReleaseShyGuys) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(GetModelCenter, MODEL_b4_1) EVT_CALL(SetNpcPos, NPC_ShyGuy_04, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_04, EVT_FLOAT(1.0)) @@ -635,13 +635,13 @@ EvtScript N(EVS_BoxResult_ReleaseShyGuys) = { EvtScript N(EVS_HitBox) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(EVT_PTR(N(GreenBoxInfo))) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_1A2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_01A2, SOUND_SPACE_MODE_0) EVT_CASE_EQ(EVT_PTR(N(YellowBoxInfo))) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_1A1, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_01A1, SOUND_SPACE_MODE_0) EVT_CASE_EQ(EVT_PTR(N(RedBoxInfo))) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_1A3, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_01A3, SOUND_SPACE_MODE_0) EVT_CASE_EQ(EVT_PTR(N(BlueBoxInfo))) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_1A4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_01A4, SOUND_SPACE_MODE_0) EVT_END_SWITCH EVT_USE_BUF(LVar0) EVT_BUF_READ1(LVar1) diff --git a/src/world/area_omo/omo_09/omo_09_4_slot_machine.c b/src/world/area_omo/omo_09/omo_09_4_slot_machine.c index 14e5d933dc..60391d213e 100644 --- a/src/world/area_omo/omo_09/omo_09_4_slot_machine.c +++ b/src/world/area_omo/omo_09/omo_09_4_slot_machine.c @@ -64,7 +64,7 @@ EvtScript N(EVS_HitBlock_SlotStart) = { EVT_IF_EQ(MF_HitStartBlock, FALSE) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtCollider, COLLIDER_s1, SOUND_80000015, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_s1, SOUND_LOOP_15, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_SET(MF_HitStartBlock, TRUE) EVT_SET(AF_OMO09_StartBlock_DontBlink, TRUE) @@ -217,7 +217,7 @@ EvtScript N(EVS_UpdateActiveBlock1) = { EVT_SET(MF_Block1_Active, FALSE) EVT_SET(MV_SlotWheel1_Angle, LVar4) EVT_IF_EQ(AB_OMO09_IsPlayerNearSlotMachine, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_h1, SOUND_3F3, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_h1, SOUND_03F3, SOUND_SPACE_MODE_0) EVT_END_IF EVT_RETURN EVT_END @@ -298,7 +298,7 @@ EvtScript N(EVS_UpdateActiveBlock2) = { EVT_SET(MF_Block2_Active, FALSE) EVT_SET(MV_SlotWheel2_Angle, LVar4) EVT_IF_EQ(AB_OMO09_IsPlayerNearSlotMachine, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_h2, SOUND_3F3, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_h2, SOUND_03F3, SOUND_SPACE_MODE_0) EVT_END_IF EVT_RETURN EVT_END @@ -379,7 +379,7 @@ EvtScript N(EVS_UpdateActiveBlock3) = { EVT_SET(MF_Block3_Active, FALSE) EVT_SET(MV_SlotWheel3_Angle, LVar4) EVT_IF_EQ(AB_OMO09_IsPlayerNearSlotMachine, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_h3, SOUND_3F3, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_h3, SOUND_03F3, SOUND_SPACE_MODE_0) EVT_END_IF EVT_RETURN EVT_END @@ -575,7 +575,7 @@ EvtScript N(EVS_SlotMachine_MainUpdate) = { EVT_LABEL(2) EVT_CALL(IsPlayerWithin, 525, 0, 500, AB_OMO09_IsPlayerNearSlotMachine) EVT_IF_EQ(AB_OMO09_IsPlayerNearSlotMachine, FALSE) - EVT_CALL(StopSound, SOUND_80000015) + EVT_CALL(StopSound, SOUND_LOOP_15) EVT_WAIT(100) EVT_GOTO(99) EVT_END_IF @@ -604,7 +604,7 @@ EvtScript N(EVS_SlotMachine_MainUpdate) = { EVT_IF_NE(LVarA, SLOT_MATCH_NONE) // partial match after two blocks hit EVT_SET(MF_AnimateSlotLights, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o881, SOUND_388 | SOUND_ID_TRIGGER_CHANGE_VOLUME, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o881, SOUND_LRAW_0388 | SOUND_ID_TRIGGER_CHANGE_VOLUME, SOUND_SPACE_MODE_0) EVT_END_IF EVT_END_IF EVT_WAIT(1) @@ -613,7 +613,7 @@ EvtScript N(EVS_SlotMachine_MainUpdate) = { EVT_GOTO(2) EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(StopSound, SOUND_80000015) + EVT_CALL(StopSound, SOUND_LOOP_15) EVT_WAIT(20) EVT_CALL(N(CheckSlotsResult), MV_SlotWheel1_Angle, MV_SlotWheel2_Angle, MV_SlotWheel3_Angle) EVT_IF_NE(LVarA, 0) 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 4c24a9d5e2..62e9b34385 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 @@ -107,7 +107,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(SetNpcVar, NPC_Kammy, 0, 0) EVT_WAIT(5 * DT) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) - EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(5 * DT) EVT_END_IF 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 9f40d8de9e..0265aa52b2 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_80000016, SOUND_SPACE_MODE_0, 315.0f, 125.0f, -100.0f); + sfx_play_sound_at_position(SOUND_LOOP_16, 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; @@ -270,7 +270,7 @@ EvtScript N(EVS_UpdateBasicPlatformB) = { EVT_USE_BUF(LVar0) EVT_BUF_READ4(LVar6, LVar7, LVar8, LVar9) EVT_LABEL(0) - EVT_CALL(PlaySound, SOUND_85) + EVT_CALL(PlaySound, SOUND_0085) 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_87) + EVT_CALL(PlaySound, SOUND_0087) EVT_CALL(MakeLerp, 70, 0, 51, EASING_COS_IN_OUT) EVT_LABEL(2) EVT_CALL(UpdateLerp) diff --git a/src/world/area_omo/omo_12/omo_12_3_npc.c b/src/world/area_omo/omo_12/omo_12_3_npc.c index 9c8ca87816..19ee89dda6 100644 --- a/src/world/area_omo/omo_12/omo_12_3_npc.c +++ b/src/world/area_omo/omo_12/omo_12_3_npc.c @@ -220,7 +220,7 @@ EvtScript N(EVS_Scene_ReleaseWatt) = { EVT_END_IF EVT_END_SWITCH EVT_END_IF - EVT_CALL(PlaySound, SOUND_1F5) + EVT_CALL(PlaySound, SOUND_01F5) EVT_SET(AF_OMO_10, FALSE) EVT_LOOP(8) EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_INVISIBLE, TRUE) @@ -306,7 +306,7 @@ EvtScript N(EVS_Scene_ReleaseWatt) = { EVT_CALL(func_802D2C14, 0) EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_Watt, ANIM_WorldWatt_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_Watt, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Watt, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Watt, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(40 * DT) EVT_CALL(SpeakToPlayer, NPC_Watt, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0, MSG_CH4_0059) diff --git a/src/world/area_omo/omo_13/omo_13_4_npc.c b/src/world/area_omo/omo_13/omo_13_4_npc.c index 43d61a979a..f001834a41 100644 --- a/src/world/area_omo/omo_13/omo_13_4_npc.c +++ b/src/world/area_omo/omo_13/omo_13_4_npc.c @@ -52,7 +52,7 @@ EvtScript N(EVS_NpcInteract_AntiGuy) = { EVT_END_IF EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH4_004A) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(EndSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0) diff --git a/src/world/area_omo/omo_14/omo_14_2_main.c b/src/world/area_omo/omo_14/omo_14_2_main.c index 2661ff337f..9d93c817cc 100644 --- a/src/world/area_omo/omo_14/omo_14_2_main.c +++ b/src/world/area_omo/omo_14/omo_14_2_main.c @@ -19,7 +19,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC(N(EVS_SetupMusic)) EVT_IF_LT(GB_StoryProgress, STORY_CH4_OPENED_GENERAL_GUY_ROOM) - EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_8000004C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_LOOP_4C, SOUND_SPACE_MODE_0) EVT_END_IF EVT_EXEC(N(EVS_CreateDarkness)) EVT_IF_GE(GB_StoryProgress, STORY_CH4_OPENED_GENERAL_GUY_ROOM) diff --git a/src/world/area_omo/omo_14/omo_14_3_npc.c b/src/world/area_omo/omo_14/omo_14_3_npc.c index 6f7716152c..ca2a82d341 100644 --- a/src/world/area_omo/omo_14/omo_14_3_npc.c +++ b/src/world/area_omo/omo_14/omo_14_3_npc.c @@ -114,7 +114,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = { EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_IF_EQ(LVar1, 0) - EVT_CALL(PlaySound, SOUND_3ED) + EVT_CALL(PlaySound, SOUND_03ED) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10 * DT) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 1, 4, EVT_FLOAT(1.0)) @@ -122,7 +122,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = { EVT_WAIT(3 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_PanicRun) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) - EVT_CALL(PlaySound, SOUND_3EE) + EVT_CALL(PlaySound, SOUND_03EE) EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 15 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_ELSE @@ -199,12 +199,12 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = { EVT_ADD(LVar0, 1) EVT_END_LOOP EVT_WAIT(45 * DT) - EVT_CALL(StopSound, SOUND_8000004C) + EVT_CALL(StopSound, SOUND_LOOP_4C) EVT_CALL(SpeakToPlayer, NPC_SELF, -1, -1, 5, MSG_CH4_005E) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_tt1, SOUND_1E4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tt1, SOUND_01E4, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 37, 37, 1, 10, 30) EVT_CALL(EnableModel, MODEL_o821, TRUE) EVT_LOOP(10) 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 592b17f33f..07b42033a6 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,10 +29,10 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_80000067) + EVT_CALL(PlaySound, SOUND_LOOP_67) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, SOUND_SPACE_MODE_0, -100, 85, 0) + EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, -100, 85, 0) EVT_END_THREAD EVT_THREAD EVT_WAIT(45) @@ -41,7 +41,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_THREAD EVT_WAIT(180) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, SOUND_SPACE_MODE_0, -100, 85, 0) + EVT_CALL(PlaySoundAt, SOUND_0137, SOUND_SPACE_MODE_0, -100, 85, 0) EVT_END_THREAD EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD @@ -69,7 +69,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_IF // wait for pickup EVT_CALL(N(StarSpiritEffectFunc4), 3) - EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GB_StoryProgress, STORY_CH4_STAR_SPIRIT_RESCUED) EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_3, TRANSITION_GET_STAR_CARD) 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 ca6b1858d2..6a2767a401 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 @@ -67,7 +67,7 @@ EvtScript N(EVS_Scene_MeetingGeneralGuy) = { EVT_CALL(SpeakToPlayer, NPC_GeneralGuy, ANIM_GeneralGuy_Anim02, ANIM_GeneralGuy_Anim0A, 0, MSG_CH4_0064) EVT_THREAD EVT_WAIT(10 * DT) - EVT_CALL(PlaySound, SOUND_8000004D) + EVT_CALL(PlaySound, SOUND_LOOP_4D) EVT_SET(LVar0, NPC_ShyGuy_01) EVT_LOOP(9) EVT_CALL(SetNpcVar, LVar0, 0, MANAGER_ARMY_CHARGE) @@ -261,7 +261,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy) = { EVT_IF_EQ(LVar0, NPC_ShyGuy_09) EVT_THREAD EVT_WAIT(20) - EVT_CALL(StopSound, SOUND_8000004D) + EVT_CALL(StopSound, SOUND_LOOP_4D) EVT_END_THREAD EVT_CALL(StartBossBattle, SONG_GENERAL_GUY_BATTLE) EVT_END_IF @@ -275,7 +275,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy) = { EvtScript N(EVS_BossDefeated_RunAway) = { EVT_CALL(GetSelfNpcID, LVar9) EVT_IF_EQ(LVar9, NPC_GeneralGuy) - EVT_CALL(PlaySound, SOUND_8000004D) + EVT_CALL(PlaySound, SOUND_LOOP_4D) EVT_USE_BUF(EVT_PTR(N(GeneralGuyFleeScripts))) EVT_BUF_READ1(LVar1) EVT_USE_BUF(LVar1) @@ -296,8 +296,8 @@ EvtScript N(EVS_BossDefeated_RunAway) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySound, SOUND_36D | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_36D) + EVT_CALL(PlaySound, SOUND_LRAW_036D | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(func_802D62E4, SOUND_LRAW_036D) EVT_ELSE EVT_SET(LVar0, LVar9) EVT_SUB(LVar0, 0) @@ -337,11 +337,11 @@ EvtScript N(EVS_BossDefeated_RunAway) = { EVT_CALL(NpcFaceNpc, NPC_PARTNER, LVar9, 3) EVT_END_THREAD EVT_CALL(NpcJump0, LVar9, -220, 0, 63, 10) - EVT_CALL(PlaySoundAtNpc, LVar9, SOUND_MISS_JUMP, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar9, SOUND_ACTOR_TRIP, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(50) EVT_LOOP(2) - EVT_CALL(PlaySoundAtNpc, LVar9, SOUND_3E4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar9, SOUND_ACTOR_TWITCH, SOUND_SPACE_MODE_0) EVT_WAIT(7) EVT_END_LOOP EVT_WAIT(6) @@ -351,9 +351,9 @@ EvtScript N(EVS_BossDefeated_RunAway) = { EVT_CALL(InterpNpcYaw, LVar9, 90, 0) EVT_WAIT(20) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, LVar9, SOUND_3A2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar9, SOUND_03A2, SOUND_SPACE_MODE_0) EVT_WAIT(45) - EVT_CALL(StopSound, SOUND_3A2) + EVT_CALL(StopSound, SOUND_03A2) EVT_CALL(SetNpcVar, NPC_ShyGuy_09, 0, MANAGER_ARMY_FLEE) EVT_END_THREAD EVT_END_SWITCH diff --git a/src/world/area_osr/osr_00/osr_00_2_main.c b/src/world/area_osr/osr_00/osr_00_2_main.c index 1f54daf6dc..5d5dbb1cf8 100644 --- a/src/world/area_osr/osr_00/osr_00_2_main.c +++ b/src/world/area_osr/osr_00/osr_00_2_main.c @@ -81,7 +81,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(GetEntryID, LVar0) EVT_IF_NE(LVar0, osr_00_ENTRY_3) EVT_EXEC(N(EVS_TexPan_Fountain)) - EVT_CALL(PlaySoundAtF, SOUND_80000059, SOUND_SPACE_MODE_1, 300, 0, 400) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_59, SOUND_SPACE_MODE_1, 300, 0, 400) EVT_END_IF EVT_EXEC(N(EVS_EnterMap)) EVT_WAIT(1) diff --git a/src/world/area_osr/osr_01/osr_01_2_main.c b/src/world/area_osr/osr_01/osr_01_2_main.c index 3c19e7b98a..1701f39cc3 100644 --- a/src/world/area_osr/osr_01/osr_01_2_main.c +++ b/src/world/area_osr/osr_01/osr_01_2_main.c @@ -44,7 +44,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_PlaySong_Starship)) EVT_EXEC(N(EVS_TexPan_Fountain)) - EVT_CALL(PlaySoundAtF, SOUND_8000005A, SOUND_SPACE_MODE_1, 300, 2, 399) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_5A, SOUND_SPACE_MODE_1, 300, 2, 399) EVT_CALL(GetEntryID, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(osr_01_ENTRY_3) 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 be8378cfb2..a67f6450fd 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 @@ -100,7 +100,7 @@ EvtScript N(EVS_Twink_FlyAway) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Twink, SOUND_62, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Twink, SOUND_0062, SOUND_SPACE_MODE_0) EVT_CALL(LoadPath, 120, EVT_PTR(N(FlightPath_TwinkDepart)), ARRAY_COUNT(N(FlightPath_TwinkDepart)), EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(GetNextPathPos) @@ -152,7 +152,7 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { EVT_CALL(SetNpcJumpscale, NPC_StarRod, EVT_FLOAT(0.5)) EVT_CALL(NpcJump1, NPC_StarRod, LVar0, LVar1, LVar2, 20) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - EVT_CALL(PlaySound, SOUND_139) + EVT_CALL(PlaySound, SOUND_0139) EVT_LOOP(6) EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 9, LVar0, LVar1, LVar2, 1, 20) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar0, LVar1, LVar2, 30) diff --git a/src/world/area_osr/osr_03/osr_03_4_starship.c b/src/world/area_osr/osr_03/osr_03_4_starship.c index 65196f14f6..acb192a824 100644 --- a/src/world/area_osr/osr_03/osr_03_4_starship.c +++ b/src/world/area_osr/osr_03/osr_03_4_starship.c @@ -52,7 +52,7 @@ EvtScript N(EVS_Scene_Starship) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD - EVT_CALL(PlaySound, SOUND_180) + EVT_CALL(PlaySound, SOUND_0180) EVT_CALL(MakeLerp, 50, 10, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) 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 32bcf0d35b..b48376b206 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_295, LVar0) + EVT_CALL(PlaySoundWithVolume, SOUND_LRAW_0295, 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 c6823bcff1..dfc2ef29e4 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 @@ -93,7 +93,7 @@ EvtScript N(EVS_PlayExplosionFX) = { EVT_LOOP(0) EVT_USE_BUF(EVT_PTR(N(ExplosionPositions))) EVT_LOOP(8) - EVT_CALL(PlaySoundWithVolume, SOUND_B000001C, LVar5) + EVT_CALL(PlaySoundWithVolume, SOUND_SEQ_1C, LVar5) EVT_BUF_READ3(LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(6.0), 30) EVT_WAIT(LVar4) @@ -169,7 +169,7 @@ EvtScript N(EVS_Scene_CastleDestruction) = { EVT_END_LOOP EVT_KILL_THREAD(LVar9) EVT_WAIT(50) - EVT_CALL(PlaySound, SOUND_A4) + EVT_CALL(PlaySound, SOUND_00A4) 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 1b0eed6d11..a187e59b81 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 @@ -326,7 +326,7 @@ EvtScript N(EVS_LiftCastleUp) = { EvtScript N(EVS_RaiseSmokeClouds) = { EVT_SET(MV_SmokeVelY, 0) EVT_THREAD - EVT_CALL(PlaySound, SOUND_36) + EVT_CALL(PlaySound, SOUND_0036) EVT_CALL(MakeLerp, 0, 650, 40 * DT, EASING_CUBIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -362,7 +362,7 @@ EvtScript N(EVS_RaiseSmokeClouds) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(20 * DT) - EVT_CALL(PlaySound, SOUND_37) + EVT_CALL(PlaySound, SOUND_0037) EVT_CALL(MakeLerp, 0, 400, 30 * DT, EASING_CUBIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -397,7 +397,7 @@ EvtScript N(EVS_RaiseSmokeClouds) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(40) - EVT_CALL(PlaySound, SOUND_38) + EVT_CALL(PlaySound, SOUND_0038) EVT_CALL(MakeLerp, 0, 200, 20 * DT, EASING_CUBIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -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_80000057) + EVT_CALL(PlaySound, SOUND_LOOP_57) 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 @@ -504,7 +504,7 @@ EvtScript N(EVS_Scene_BowsersAssault) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_CALL(PlaySound, SOUND_35) + EVT_CALL(PlaySound, SOUND_0035) EVT_CALL(MakeLerp, 0, 30, 50 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) 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 fe89baa678..e01f2e6de6 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 @@ -76,7 +76,7 @@ EvtScript N(EVS_Scene_RescuedKalmar) = { EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Leap) EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) - EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) EVT_ADD(LVar1, 50) @@ -89,7 +89,7 @@ EvtScript N(EVS_Scene_RescuedKalmar) = { EVT_WAIT(6 * DT) EVT_END_LOOP EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0188, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) 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 d3db0f2e59..4d9846dcc0 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 @@ -107,10 +107,10 @@ EvtScript N(EVS_ManagePoundableSwitch) = { EVT_PLAY_EFFECT(EFFECT_DUST, 0, 1000, 250, -180, 50) EVT_END_THREAD EVT_THREAD - EVT_CALL(PlaySound, SOUND_3F) + EVT_CALL(PlaySound, SOUND_003F) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 250 * DT, EVT_FLOAT(0.5)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10 * DT, EVT_FLOAT(1.5)) - EVT_CALL(PlaySound, SOUND_40) + EVT_CALL(PlaySound, SOUND_0040) EVT_END_THREAD EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -183,9 +183,9 @@ EvtScript N(EVS_ItemPrompt_RedPadlock) = { EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_16_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse, 1, 0) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_16_3)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittne, 1, 0) EVT_CALL(N(GetEntityPosition), MV_NearRedPadlock, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_CALL(N(GetEntityPosition), MV_FarRedPadlock, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_NearRedPadlock) EVT_SET(MV_NearRedPadlock, -1) EVT_CALL(N(RemovePadlock)) @@ -220,9 +220,9 @@ EvtScript N(EVS_ItemPrompt_BluePadlock) = { EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_13_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse2, 1, 0) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_13_3)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittne2, 1, 0) EVT_CALL(N(GetEntityPosition), MV_NearBluePadlock, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_CALL(N(GetEntityPosition), MV_FarBluePadlock, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_NearBluePadlock) EVT_SET(MV_NearBluePadlock, -1) EVT_CALL(N(RemovePadlock)) 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 99a472893b..66d4a2d74d 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_2CB, 0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_02CB, 0) EVT_CALL(NpcMoveTo, LVar4, 0, LVar2, 0) EVT_CALL(SetNpcPos, LVar4, NPC_DISPOSE_LOCATION) EVT_END_THREAD @@ -551,7 +551,7 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_ADD(LVar0, 20) EVT_END_IF EVT_PLAY_EFFECT(EFFECT_RECOVER, 2, LVar0, LVar1, LVar2, 0) - EVT_CALL(PlaySoundAtPlayer, SOUND_214, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_HEART_BOUNCE, 0) EVT_END_THREAD EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 10) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldBombette_Idle) 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 e319227f9b..7597e15481 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_2CB, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Duplighost_01, SOUND_02CB, 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_2CB, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Duplighost_02, SOUND_02CB, 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_18/pra_18_3_npc.c b/src/world/area_pra/pra_18/pra_18_3_npc.c index eaefd61613..df2a82f965 100644 --- a/src/world/area_pra/pra_18/pra_18_3_npc.c +++ b/src/world/area_pra/pra_18/pra_18_3_npc.c @@ -144,7 +144,7 @@ EvtScript N(EVS_PlayClubbaDefeatFX) = { EVT_ADD(LVar0, LVar3) EVT_ADD(LVar1, LVar4) EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.8), 0) - EVT_CALL(PlaySoundAt, SOUND_B0000018, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_SEQ_18, 0, LVar0, LVar1, LVar2) EVT_WAIT(2) EVT_SET(LVar0, LVarA) EVT_SET(LVar1, LVarB) @@ -155,7 +155,7 @@ EvtScript N(EVS_PlayClubbaDefeatFX) = { EVT_ADD(LVar0, LVar3) EVT_ADD(LVar1, LVar4) EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.8), 0) - EVT_CALL(PlaySoundAt, SOUND_B0000018, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_SEQ_18, 0, LVar0, LVar1, LVar2) EVT_WAIT(8) EVT_END_LOOP EVT_RETURN 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 cf5403dfd7..baf5cebf7c 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_2CB, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_02CB, SOUND_SPACE_MODE_0) EVT_CALL(NpcMoveTo, LVar4, 0, LVar2, 0) EVT_CALL(SetNpcPos, LVar4, NPC_DISPOSE_LOCATION) EVT_END_THREAD @@ -628,11 +628,11 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, TRUE) EVT_WAIT(60) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Question) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(35) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o1054, SOUND_1E4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1054, SOUND_01E4, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 34, 22, 1, 10, 30) EVT_CALL(EnableModel, MODEL_o1024, FALSE) EVT_CALL(EnableModel, MODEL_o1026, TRUE) 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 5fae9d306b..801312fc44 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_80000010, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1064, SOUND_LOOP_10, 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_80000010) + EVT_CALL(StopSound, SOUND_LOOP_10) 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 1ad2391c95..1e730c980a 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_2F, 0, 250, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_002F, 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_2_npc.c b/src/world/area_pra/pra_31/pra_31_2_npc.c index 5e9f3da355..400b70469f 100644 --- a/src/world/area_pra/pra_31/pra_31_2_npc.c +++ b/src/world/area_pra/pra_31/pra_31_2_npc.c @@ -78,7 +78,7 @@ EvtScript N(EVS_ChangeDinoDirection) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_1ED, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_01ED, 0) EVT_SWITCH(LVar5) EVT_CASE_OR_EQ(90) EVT_CASE_OR_EQ(270) 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 03212f288c..bb32396b40 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_30, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k1, SOUND_0030, 0) EVT_WAIT(25) - EVT_CALL(PlaySoundAtModel, MODEL_k2, SOUND_1EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k2, SOUND_01EE, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_1EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_1EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_1EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_1EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_1EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_1EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_1EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_1EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_1EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_1EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_1EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_1EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_1EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_1EE, 0) + EVT_CALL(PlaySoundAtModel, MODEL_k3, SOUND_01EE, 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_2D, 0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_002D, 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 b8aca812af..8796970644 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,10 +24,10 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_80000067) + EVT_CALL(PlaySound, SOUND_LOOP_67) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, 0, 595, 185, 116) + EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, 595, 185, 116) EVT_END_THREAD EVT_THREAD EVT_WAIT(45) @@ -36,7 +36,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_THREAD EVT_WAIT(180) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, 0, 595, 185, 116) + EVT_CALL(PlaySoundAt, SOUND_0137, 0, 595, 185, 116) EVT_END_THREAD EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD @@ -62,7 +62,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_WAIT(1) EVT_END_IF EVT_CALL(N(StarSpiritEffectFunc4), 3) - EVT_CALL(PlaySoundAtPlayer, SOUND_138, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0138, 0) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GB_StoryProgress, STORY_CH7_STAR_SPIRIT_RESCUED) EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_6, TRANSITION_GET_STAR_CARD) @@ -86,10 +86,10 @@ EvtScript N(EVS_RespawnStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_80000067) + EVT_CALL(PlaySound, SOUND_LOOP_67) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, 0, 595, 185, 116) + EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, 595, 185, 116) EVT_END_THREAD EVT_THREAD EVT_WAIT(45) @@ -98,7 +98,7 @@ EvtScript N(EVS_RespawnStarCard) = { EVT_THREAD EVT_WAIT(180) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, 0, 595, 185, 116) + EVT_CALL(PlaySoundAt, SOUND_0137, 0, 595, 185, 116) EVT_END_THREAD EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD @@ -124,7 +124,7 @@ EvtScript N(EVS_RespawnStarCard) = { EVT_WAIT(1) EVT_END_IF EVT_CALL(N(StarSpiritEffectFunc4), 3) - EVT_CALL(PlaySoundAtPlayer, SOUND_138, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0138, 0) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GB_StoryProgress, STORY_CH7_STAR_SPIRIT_RESCUED) EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_6, TRANSITION_GET_STAR_CARD) diff --git a/src/world/area_pra/pra_32/pra_32_3_npc.c b/src/world/area_pra/pra_32/pra_32_3_npc.c index 12efd68c69..e4a19ac777 100644 --- a/src/world/area_pra/pra_32/pra_32_3_npc.c +++ b/src/world/area_pra/pra_32/pra_32_3_npc.c @@ -179,7 +179,7 @@ EvtScript N(EVS_Scene_BossDefeated) = { EVT_WAIT(1) EVT_END_LOOP EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_CrystalKing_01, SOUND_36B, 0) + EVT_CALL(PlaySoundAtNpc, NPC_CrystalKing_01, SOUND_036B, 0) EVT_CALL(GetNpcPos, NPC_CrystalKing_01, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 0, LVar0, LVar1, LVar2, 1, 130) EVT_END_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 f253a3b3d3..a9b5425d94 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_2E, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1063, SOUND_002E, 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_pra/pra_34/pra_34_2_main.c b/src/world/area_pra/pra_34/pra_34_2_main.c index 8eb5ce7346..e51b64cbaf 100644 --- a/src/world/area_pra/pra_34/pra_34_2_main.c +++ b/src/world/area_pra/pra_34/pra_34_2_main.c @@ -126,9 +126,9 @@ EvtScript N(EVS_UnlockPrompt_Doors) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_PRA34_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_FarPadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, 0, LVar0, LVar1, LVar2) EVT_CALL(N(GetEntityPosition), MV_NearPadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, 0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_FarPadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar0, MV_NearPadlockEntityID) diff --git a/src/world/area_sam/sam_01/sam_01_4_npc.c b/src/world/area_sam/sam_01/sam_01_4_npc.c index 8fbdd715ef..207cfa1193 100644 --- a/src/world/area_sam/sam_01/sam_01_4_npc.c +++ b/src/world/area_sam/sam_01/sam_01_4_npc.c @@ -111,7 +111,7 @@ EvtScript N(EVS_NpcInteract_MayorPenguin) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MayorPenguin_Walk) EVT_CALL(NpcMoveTo, NPC_SELF, -338, -247, 20) - EVT_CALL(PlaySoundAtCollider, COLLIDER_yana, SOUND_1CF, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_yana, SOUND_01CF, 0) EVT_CALL(MakeLerp, 0, 70, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -131,7 +131,7 @@ EvtScript N(EVS_NpcInteract_MayorPenguin) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(20) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_yana, SOUND_1D0, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_yana, SOUND_01D0, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MayorPenguin_Carry) EVT_CALL(InterpNpcYaw, NPC_SELF, 180, 0) EVT_EXEC_GET_TID(N(EVS_Mayor_CarryBucket), LVarA) diff --git a/src/world/area_sam/sam_01/sam_01_5_scenes.c b/src/world/area_sam/sam_01/sam_01_5_scenes.c index 3e1b591461..dd828f86dc 100644 --- a/src/world/area_sam/sam_01/sam_01_5_scenes.c +++ b/src/world/area_sam/sam_01/sam_01_5_scenes.c @@ -117,7 +117,7 @@ EvtScript N(EVS_Scene_MysteryBegins) = { EVT_CALL(InterpNpcYaw, NPC_PARTNER, 0, 0) EVT_CALL(NpcMoveTo, NPC_MayorPenguinWife, -255, -185, 0) EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguinWife, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguinWife, SOUND_0262, 0) EVT_CALL(ShowEmote, NPC_MayorPenguinWife, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Walk) @@ -477,12 +477,12 @@ EvtScript N(EVS_Scene_MysterySolved) = { EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_TalkThink, ANIM_PenguinPatrol_StillThink, 0, MSG_CH7_0025) EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Twitch) EVT_WAIT(30 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguin, SOUND_3E4, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguin, SOUND_ACTOR_TWITCH, 0) EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Dead) EVT_WAIT(2 * DT) EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Twitch) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguin, SOUND_3E4, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguin, SOUND_ACTOR_TWITCH, 0) EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Dead) EVT_WAIT(2 * DT) EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Twitch) @@ -504,12 +504,12 @@ EvtScript N(EVS_Scene_MysterySolved) = { EVT_CALL(InterpNpcYaw, NPC_Herringway, LVar0, 0) EVT_CALL(PlayerFaceNpc, NPC_MayorPenguin, FALSE) EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_MayorPenguin, 0) - EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguin, SOUND_3E4, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguin, SOUND_ACTOR_TWITCH, 0) EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Dead) EVT_WAIT(2 * DT) EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Twitch) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguin, SOUND_3E4, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguin, SOUND_ACTOR_TWITCH, 0) EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Dead) EVT_WAIT(2 * DT) EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Twitch) @@ -528,7 +528,7 @@ EvtScript N(EVS_Scene_MysterySolved) = { EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_WakeUp) EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguin, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguin, SOUND_032C, 0) EVT_CALL(SetNpcJumpscale, NPC_MayorPenguin, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_MayorPenguin, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_MayorPenguin, LVar0, 0, LVar2, 10 * DT) diff --git a/src/world/area_sam/sam_02/sam_02_2_main.c b/src/world/area_sam/sam_02/sam_02_2_main.c index ece824188a..82254c5ac1 100644 --- a/src/world/area_sam/sam_02/sam_02_2_main.c +++ b/src/world/area_sam/sam_02/sam_02_2_main.c @@ -81,10 +81,10 @@ EvtScript N(EVS_EnterMap) = { EVT_CALL(SetPlayerPos, 650, 0, 50) EVT_WAIT(1) EVT_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_302, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0302, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Thrown) EVT_CALL(PlayerJump1, 450, 0, 50, 30) - EVT_CALL(PlaySoundAtPlayer, SOUND_162, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0162, 0) EVT_CALL(PlayerJump1, 440, 0, 50, 5) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(1.0)) EVT_WAIT(30) diff --git a/src/world/area_sam/sam_04/sam_04_3_snowmen.c b/src/world/area_sam/sam_04/sam_04_3_snowmen.c index db27b0b89d..977c2114f2 100644 --- a/src/world/area_sam/sam_04/sam_04_3_snowmen.c +++ b/src/world/area_sam/sam_04/sam_04_3_snowmen.c @@ -105,7 +105,7 @@ EvtScript N(EVS_SnowmanMove) = { EVT_SETF(LVar3, LVar7) EVT_SET(LVar4, 20) EVT_EXEC_WAIT(N(EVS_SnowmanJump)) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_38C, 0) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_038C, 0) EVT_END_LOOP EVT_RETURN EVT_END @@ -263,7 +263,7 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_38D, 0, 0, 0, -300) + EVT_CALL(PlaySoundAt, SOUND_038D, 0, 0, 0, -300) EVT_CALL(MakeLerp, 0, 100, 200 * DT, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -284,7 +284,7 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = { EVT_CALL(GetModelCenter, MODEL_o64) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, 0, LVar2, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_38E, 0, 0, 0, -300) + EVT_CALL(PlaySoundAt, SOUND_038E, 0, 0, 0, -300) EVT_CALL(MakeLerp, 0, 80, 100 * DT, EASING_COS_IN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) diff --git a/src/world/area_sam/sam_04/sam_04_4_npc.c b/src/world/area_sam/sam_04/sam_04_4_npc.c index 2a1025b1b9..bcb89eb86d 100644 --- a/src/world/area_sam/sam_04/sam_04_4_npc.c +++ b/src/world/area_sam/sam_04/sam_04_4_npc.c @@ -64,7 +64,7 @@ EvtScript N(EVS_ItemPrompt_Scarf) = { EVT_CALL(GetNpcPos, NPC_Snowman_03, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) EVT_ADD(LVar2, 20) - EVT_CALL(PlaySoundAt, SOUND_2043, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_SRAW_1F_A, 0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) EVT_WAIT(20) EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) @@ -104,7 +104,7 @@ EvtScript N(EVS_ItemPrompt_Bucket) = { EVT_CALL(GetNpcPos, NPC_Snowman_06, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) EVT_ADD(LVar2, 20) - EVT_CALL(PlaySoundAt, SOUND_2043, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_SRAW_1F_A, 0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) EVT_WAIT(20) EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) diff --git a/src/world/area_sam/sam_05/sam_05_5_scenes.c b/src/world/area_sam/sam_05/sam_05_5_scenes.c index c5cc869c8f..28237446d2 100644 --- a/src/world/area_sam/sam_05/sam_05_5_scenes.c +++ b/src/world/area_sam/sam_05/sam_05_5_scenes.c @@ -151,7 +151,7 @@ EvtScript N(EVS_StarKid_RunAway) = { EVT_ADD(LVarB, 20 * DT) EVT_WAIT(LVarB) EVT_KILL_THREAD(LVar9) - EVT_CALL(PlaySoundAtNpc, LVarA, SOUND_13E, 0) + EVT_CALL(PlaySoundAtNpc, LVarA, SOUND_013E, 0) EVT_CALL(GetNpcPos, LVarA, LVar7, LVar8, LVar9) EVT_CALL(LoadPath, 60 * DT, EVT_PTR(N(RelativeFleePath)), ARRAY_COUNT(N(RelativeFleePath)), EASING_LINEAR) EVT_LABEL(0) @@ -200,7 +200,7 @@ EvtScript N(EVS_StarKidsFlee) = { EVT_END_IF EVT_CALL(SetNpcPos, LVar0, LVar1, LVar2, LVar3) EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_Monstar, SOUND_13D, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Monstar, SOUND_013D, 0) EVT_THREAD EVT_CALL(NpcMoveTo, NPC_Monstar, 615, -5, 10 * DT) EVT_END_THREAD diff --git a/src/world/area_sam/sam_07/sam_07_4_frozen_pit.c b/src/world/area_sam/sam_07/sam_07_4_frozen_pit.c index 5bf8d55b8a..f5736ca4cd 100644 --- a/src/world/area_sam/sam_07/sam_07_4_frozen_pit.c +++ b/src/world/area_sam/sam_07/sam_07_4_frozen_pit.c @@ -138,7 +138,7 @@ API_CALLABLE(N(AwaitPlayerNotPoundingFloor)) { #include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" EvtScript N(EVS_BreakIce) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o116, SOUND_396, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o116, SOUND_0396, 0) EVT_CALL(N(AnimateIceShattering)) EVT_LOOP(10) EVT_CALL(SetGroupVisibility, MODEL_move1, MODEL_GROUP_VISIBLE) @@ -188,7 +188,7 @@ EvtScript N(EVS_UseGreenSwitch) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(N(GetEntityPosition), MV_SwitchEntityID, LVar7, LVar8, LVar9) EVT_IF_EQ(GF_SAM07_FloorRaised, FALSE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_m1_yuka, SOUND_399, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_m1_yuka, SOUND_0399, 0) EVT_SUB(LVar8, -180) EVT_CALL(MakeLerp, -180, 0, 120, EASING_COS_IN_OUT) EVT_LABEL(0) @@ -210,7 +210,7 @@ EvtScript N(EVS_UseGreenSwitch) = { EVT_ELSE EVT_CALL(EnableModel, MODEL_o137, TRUE) EVT_CALL(EnableModel, MODEL_o135, FALSE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_m1_yuka, SOUND_39A, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_m1_yuka, SOUND_039A, 0) EVT_CALL(MakeLerp, 0, -180, 120, EASING_COS_IN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) 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 f6165242d4..27b114ebc3 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_2CA, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Duplighost, SOUND_02CA, 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_2CA, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Duplighost, SOUND_02CA, 0) EVT_CALL(NpcJump0, NPC_Duplighost, LVar0, LVar1, LVar2, 13 * DT) EVT_ADD(LVar0, 50) - EVT_CALL(PlaySoundAtNpc, NPC_Duplighost, SOUND_2CA, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Duplighost, SOUND_02CA, 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_2CA, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Duplighost, SOUND_02CA, 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_08/sam_08_5_scenes.c b/src/world/area_sam/sam_08/sam_08_5_scenes.c index 236b7d559d..066d34bb24 100644 --- a/src/world/area_sam/sam_08/sam_08_5_scenes.c +++ b/src/world/area_sam/sam_08/sam_08_5_scenes.c @@ -9,7 +9,7 @@ API_CALLABLE(N(AdjustFightingSoundsPos)) { s32 z = evt_get_variable(script, *args++); // @bug need to use real sound id, not environmental sound id - sfx_adjust_env_sound_pos(SOUND_8000006C, SOUND_SPACE_MODE_0, x, y, z); + sfx_adjust_env_sound_pos(SOUND_LOOP_6C, SOUND_SPACE_MODE_0, x, y, z); return ApiStatus_DONE2; } @@ -25,7 +25,7 @@ API_CALLABLE(N(StartFightingRumble)) { } EvtScript N(EVS_TwoKoopesFightingFX) = { - EVT_CALL(PlaySoundAtNpc, NPC_Kooper_01A, SOUND_8000006C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kooper_01A, SOUND_LOOP_6C, 0) EVT_LOOP(0) EVT_CALL(N(StartFightingRumble), 80, 10) EVT_CALL(GetNpcPos, NPC_Kooper_01A, LVar0, LVar1, LVar2) @@ -44,7 +44,7 @@ EvtScript N(EVS_Scene_ImposterAppears) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o47, COLLIDER_FLAG_IGNORE_SHELL) EVT_THREAD EVT_CALL(EnableModel, MODEL_m1_kabe, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_m1_kabe, SOUND_39B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_m1_kabe, SOUND_039B, 0) EVT_CALL(MakeLerp, -120, 0, 60 * DT, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -93,19 +93,19 @@ EvtScript N(EVS_Scene_ImposterAppears) = { EVT_CALL(InterpNpcYaw, NPC_Kooper_01A, 270, 0) EVT_CALL(InterpNpcYaw, NPC_Kooper_02A, 90, 0) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_263, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_0263, 0) EVT_CALL(ShowEmote, NPC_Kooper_02A, EMOTE_QUESTION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Kooper_01A, SOUND_263, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kooper_01A, SOUND_0263, 0) EVT_CALL(ShowEmote, NPC_Kooper_01A, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0263, 0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_263, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_0263, 0) EVT_CALL(ShowEmote, NPC_Kooper_02A, EMOTE_QUESTION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Kooper_01A, SOUND_263, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kooper_01A, SOUND_0263, 0) EVT_CALL(ShowEmote, NPC_Kooper_01A, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(SpeakToPlayer, NPC_Kooper_01A, ANIM_WorldKooper_Idle, ANIM_WorldKooper_Idle, 5, MSG_CH7_011F) EVT_THREAD @@ -377,7 +377,7 @@ EvtScript N(EVS_Scene_HitTrueKooper) = { EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2) EVT_WAIT(6 * DT) EVT_END_LOOP - EVT_CALL(StopSound, SOUND_8000006C) + EVT_CALL(StopSound, SOUND_LOOP_6C) EVT_KILL_THREAD(MV_KoopersFightingScript) EVT_CALL(RandInt, 100, LVar0) EVT_IF_GT(LVar0, 50) diff --git a/src/world/area_sam/sam_09/sam_09_4_sockets.c b/src/world/area_sam/sam_09/sam_09_4_sockets.c index cab8061781..1b96d14e4b 100644 --- a/src/world/area_sam/sam_09/sam_09_4_sockets.c +++ b/src/world/area_sam/sam_09/sam_09_4_sockets.c @@ -81,7 +81,7 @@ API_CALLABLE(N(CreateConsumableItemList)) { } EvtScript N(EVS_PlaceItemInSocket) = { - EVT_CALL(PlaySoundAtCollider, LVar4, SOUND_1DD, 0) + EVT_CALL(PlaySoundAtCollider, LVar4, SOUND_01DD, 0) EVT_CALL(MakeLerp, 0, 130, 30 * DT, EASING_LINEAR) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -96,7 +96,7 @@ EvtScript N(EVS_PlaceItemInSocket) = { }; EvtScript N(EVS_TakeItemFromSocket) = { - EVT_CALL(PlaySoundAtCollider, LVar4, SOUND_1DE, 0) + EVT_CALL(PlaySoundAtCollider, LVar4, SOUND_01DE, 0) EVT_CALL(MakeLerp, 130, 0, 30 * DT, EASING_CUBIC_IN) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -106,7 +106,7 @@ EvtScript N(EVS_TakeItemFromSocket) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, LVar4, SOUND_1EA, 0) + EVT_CALL(PlaySoundAtCollider, LVar4, SOUND_01EA, 0) EVT_CALL(GetModelCenter, LVar2) EVT_SET(LVar3, LVar2) EVT_SET(LVar4, LVar2) diff --git a/src/world/area_sam/sam_10/sam_10_4_stairs.c b/src/world/area_sam/sam_10/sam_10_4_stairs.c index e708f7fe3f..bb72c10a6d 100644 --- a/src/world/area_sam/sam_10/sam_10_4_stairs.c +++ b/src/world/area_sam/sam_10/sam_10_4_stairs.c @@ -64,7 +64,7 @@ EvtScript N(EVS_ItemPrompt_StarStoneSocket) = { EVT_RETURN EVT_END_IF EVT_CALL(SetItemPos, MV_StarStoneItemID, -117, 179, -32) - EVT_CALL(PlaySoundAt, SOUND_1EB, 0, -117, 179, -32) + EVT_CALL(PlaySoundAt, SOUND_01EB, 0, -117, 179, -32) EVT_WAIT(30) EVT_THREAD EVT_CALL(MakeLerp, -32, -55, 100 * DT, EASING_COS_IN_OUT) @@ -76,7 +76,7 @@ EvtScript N(EVS_ItemPrompt_StarStoneSocket) = { EVT_GOTO(1) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_o61, SOUND_39C, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o61, SOUND_039C, 0) EVT_CALL(MakeLerp, 0, -23, 100 * DT, EASING_COS_IN_OUT) EVT_LABEL(2) EVT_CALL(UpdateLerp) @@ -98,7 +98,7 @@ EvtScript N(EVS_ItemPrompt_StarStoneSocket) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(30) - EVT_CALL(PlaySound, SOUND_39D) + EVT_CALL(PlaySound, SOUND_039D) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(3.0)) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 3, -20, -20, -66, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 3, 20, -20, -66, 0) @@ -122,7 +122,7 @@ EvtScript N(EVS_ItemPrompt_StarStoneSocket) = { EVT_CALL(SetGroupVisibility, MODEL_move1, MODEL_GROUP_HIDDEN) EVT_CALL(SetGroupVisibility, MODEL_move2, MODEL_GROUP_VISIBLE) EVT_CALL(SetGroupVisibility, MODEL_move3, MODEL_GROUP_HIDDEN) - EVT_CALL(PlaySound, SOUND_80000040) + EVT_CALL(PlaySound, SOUND_LOOP_40) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 600, EVT_FLOAT(0.15)) EVT_END_THREAD @@ -143,8 +143,8 @@ EvtScript N(EVS_ItemPrompt_StarStoneSocket) = { EVT_GOTO(3) EVT_END_IF EVT_IF_EQ(LVar2, 30) - EVT_CALL(PlaySound, SOUND_39F) - EVT_CALL(StopSound, SOUND_80000040) + EVT_CALL(PlaySound, SOUND_039F) + EVT_CALL(StopSound, SOUND_LOOP_40) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(3.0)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(2.0)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) @@ -153,7 +153,7 @@ EvtScript N(EVS_ItemPrompt_StarStoneSocket) = { EVT_SET(LVarA, -20) EVT_SUB(LVarA, LVarB) EVT_ELSE - EVT_CALL(PlaySoundAt, SOUND_1EC, 0, LVar0, LVarA, LVar2) + EVT_CALL(PlaySoundAt, SOUND_01EC, 0, LVar0, LVarA, LVar2) EVT_MOD(LVar2, 3) EVT_IF_EQ(LVar2, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) diff --git a/src/world/area_sam/sam_11/sam_11_3_rooms.c b/src/world/area_sam/sam_11/sam_11_3_rooms.c index 651468d81c..8d1ed31f0c 100644 --- a/src/world/area_sam/sam_11/sam_11_3_rooms.c +++ b/src/world/area_sam/sam_11/sam_11_3_rooms.c @@ -134,7 +134,7 @@ EvtScript N(EVS_UnlockPrompt_LeftHouse) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_SAM11_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, 0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_RESUME_GROUP(EVT_GROUP_01) diff --git a/src/world/area_sam/sam_11/sam_11_4_entity.c b/src/world/area_sam/sam_11/sam_11_4_entity.c index 008db34743..ec4709b3a6 100644 --- a/src/world/area_sam/sam_11/sam_11_4_entity.c +++ b/src/world/area_sam/sam_11/sam_11_4_entity.c @@ -197,9 +197,9 @@ EvtScript N(EVS_TouchFloor_RightRoof) = { EVT_CALL(N(UnsetCamera0MoveFlag1)) EVT_SET(LVar3, 500) EVT_EXEC_GET_TID(N(EVS_TetherCamToPlayerCappedY), LVarA) - EVT_CALL(PlaySoundAtPlayer, SOUND_167, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0167, 0) EVT_CALL(N(MovePlayerAlongRoofSlide)) - EVT_CALL(StopSound, SOUND_167) + EVT_CALL(StopSound, SOUND_0167) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.5)) EVT_CALL(PlayerJump, -150, 325, -300, 40) EVT_CALL(ShakeCam, CAM_DEFAULT, 1, 5, EVT_FLOAT(1.0)) @@ -216,7 +216,7 @@ EvtScript N(EVS_TouchFloor_RightRoof) = { }; EvtScript N(EVS_SpawnChimneySmokeAtPlayer) = { - EVT_CALL(PlaySoundAtPlayer, SOUND_F5, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_00F5, 0) EVT_THREAD EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar1, LVar2, LVar3, 0) @@ -282,7 +282,7 @@ EvtScript N(EVS_TouchFloor_LeftRoof) = { EVT_CALL(SetPlayerPos, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION) EVT_WAIT(20) - EVT_CALL(PlaySoundAtPlayer, SOUND_162, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0162, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 1, 10, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_CALL(SetNpcPos, NPC_PARTNER, -214, 150, -375) diff --git a/src/world/area_sam/sam_11/sam_11_6_pond.c b/src/world/area_sam/sam_11/sam_11_6_pond.c index cb9506f166..289c55ae38 100644 --- a/src/world/area_sam/sam_11/sam_11_6_pond.c +++ b/src/world/area_sam/sam_11/sam_11_6_pond.c @@ -137,7 +137,7 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_SWITCH(GB_SAM11_FrozenPondDamage) EVT_CASE_EQ(1) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_suimen, SOUND_389, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_suimen, SOUND_0389, 0) EVT_CALL(EnableModel, MODEL_ice01, FALSE) EVT_CALL(EnableModel, MODEL_ice02, TRUE) EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_GRAVITY, TRUE) @@ -159,12 +159,12 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_CASE_EQ(2) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(InterruptUsePartner) - EVT_CALL(PlaySoundAtCollider, COLLIDER_suimen, SOUND_38A, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_suimen, SOUND_038A, 0) EVT_CALL(EnableModel, MODEL_ice02, FALSE) EVT_CALL(EnableModel, MODEL_ice03, TRUE) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_PenguinPatrol, SOUND_397, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PenguinPatrol, SOUND_0397, 0) EVT_END_THREAD EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Run) @@ -185,7 +185,7 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, LVar0, LVar2, 0) EVT_THREAD EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(PlaySoundAtPlayer, SOUND_398, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0398, 0) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Thrown) EVT_SET(MF_Unk_01, FALSE) @@ -207,7 +207,7 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, -207, 110, 0) EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, -450, 0, 0) EVT_SET(MF_Unk_01, TRUE) - EVT_CALL(StopSound, SOUND_398) + EVT_CALL(StopSound, SOUND_0398) EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Idle) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Surprise) EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_00B8) @@ -220,7 +220,7 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_ADD(LVar0, -20) EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, LVar0, LVar2, 0) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_PenguinPatrol, SOUND_390, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PenguinPatrol, SOUND_0390, 0) EVT_THREAD EVT_SET(MV_ThrownOut, 1) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) @@ -290,11 +290,11 @@ EvtScript N(EVS_DamageFrozenPond_After) = { EVT_IF_NE(GB_SAM11_FrozenPondDamage, 3) EVT_SWITCH(GB_SAM11_FrozenPondDamage) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtCollider, COLLIDER_suimen, SOUND_389, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_suimen, SOUND_0389, 0) EVT_CALL(EnableModel, MODEL_ice01, FALSE) EVT_CALL(EnableModel, MODEL_ice02, TRUE) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtCollider, COLLIDER_suimen, SOUND_38A, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_suimen, SOUND_038A, 0) EVT_CALL(EnableModel, MODEL_ice02, FALSE) EVT_CALL(EnableModel, MODEL_ice03, TRUE) EVT_END_SWITCH @@ -314,10 +314,10 @@ EvtScript N(EVS_DamageFrozenPond_After) = { EVT_THREAD EVT_CALL(DisablePartnerAI, 0) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_302, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0302, 0) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(1.5)) EVT_CALL(NpcJump1, NPC_PARTNER, 265, 0, 225, 30) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_162, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0162, 0) EVT_CALL(NpcJump1, NPC_PARTNER, 275, 0, 225, 8) EVT_CALL(EnablePartnerAI) EVT_END_THREAD @@ -338,7 +338,7 @@ EvtScript N(EVS_DamageFrozenPond_After) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_END_THREAD EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_38B, 0, 0, 60, 220) + EVT_CALL(PlaySoundAt, SOUND_038B, 0, 0, 60, 220) EVT_CALL(N(SpawnIceShards)) EVT_CALL(EnableModel, MODEL_ice03, FALSE) EVT_CALL(SetGroupVisibility, MODEL_ice04, MODEL_GROUP_VISIBLE) diff --git a/src/world/area_sam/sam_11/sam_11_7_staircase.c b/src/world/area_sam/sam_11/sam_11_7_staircase.c index 32cab883d2..b37e05c9b3 100644 --- a/src/world/area_sam/sam_11/sam_11_7_staircase.c +++ b/src/world/area_sam/sam_11/sam_11_7_staircase.c @@ -6,25 +6,25 @@ EvtScript N(EVS_LowerStaircase) = { EVT_CALL(TranslateModel, MODEL_o733, 0, 0, 0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o525, COLLIDER_FLAGS_UPPER_MASK) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_1E9, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_01E9, 0) EVT_WAIT(11) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_1E9, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_01E9, 0) EVT_WAIT(1) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_1E9, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_01E9, 0) EVT_WAIT(11) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_1E9, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_01E9, 0) EVT_WAIT(1) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_1E9, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_01E9, 0) EVT_WAIT(11) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_1E9, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_01E9, 0) EVT_WAIT(1) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_1E9, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_01E9, 0) EVT_WAIT(11) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_1E9, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_01E9, 0) EVT_WAIT(1) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_1E9, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_01E9, 0) EVT_WAIT(11) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_1E9, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o525, SOUND_01E9, 0) EVT_WAIT(1) EVT_END_THREAD EVT_THREAD 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 17bb0f13fb..60355d9dcc 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 @@ -93,7 +93,7 @@ EvtScript N(EVS_SpawnStarStoneSparkles) = { }; EvtScript N(EVS_SpawnMerlarSparkles) = { - EVT_CALL(PlaySoundAtNpc, NPC_Merlar, SOUND_B1, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Merlar, SOUND_MERLAR_APPEARS, 0) EVT_CALL(GetNpcPos, NPC_Merlar, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) EVT_LOOP(8) @@ -107,7 +107,7 @@ EvtScript N(EVS_SpawnMerlarSparkles) = { EvtScript N(EVS_MarioSleeping) = { EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) EVT_LOOP(0) - EVT_CALL(PlaySoundAtPlayer, SOUND_32F, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_SRAW_0C_A, 0) EVT_WAIT(60) EVT_END_LOOP EVT_RETURN @@ -141,7 +141,7 @@ EvtScript N(EVS_Scene_MeetMerlar) = { EVT_WAIT(100 * DT) EVT_CALL(SetNpcPos, NPC_Merlar, 200, 50, 0) EVT_EXEC(N(EVS_SpawnMerlarSparkles)) - EVT_CALL(PlaySoundAtNpc, NPC_Merlar, SOUND_139, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Merlar, SOUND_0139, 0) EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_LOOP(LOOPCOUNT_2) EVT_ADDF(LVar0, EVT_FLOAT(1.0)) @@ -194,7 +194,7 @@ EvtScript N(EVS_Scene_MeetMerlar) = { EVT_WAIT(30 * DT) EVT_CALL(RemoveEffect, LVar7) EVT_KILL_THREAD(LVarA) - EVT_CALL(PlaySoundAtPlayer, SOUND_2F1, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_SRAW_0E_A, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_JoltAwake) EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) diff --git a/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c b/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c index 9eb5dc49be..2fbc9d359c 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c +++ b/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c @@ -63,7 +63,7 @@ s32 N(PedestalKeyList)[] = { EvtScript N(EVS_Pedestal_Sink) = { EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, 0, 0, 0, 20, 10, 0, 60) EVT_PLAY_EFFECT(EFFECT_DUST, 2, 0, 0, 0, 60) - EVT_CALL(PlaySoundAtCollider, COLLIDER_iwa, SOUND_5F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_iwa, SOUND_005F, SOUND_SPACE_MODE_0) EVT_SET(LVar2, 0) EVT_CALL(MakeLerp, 0, -50, 50, EASING_LINEAR) EVT_LOOP(0) @@ -79,7 +79,7 @@ EvtScript N(EVS_Pedestal_Sink) = { EVT_END_LOOP EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_iwa, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(EnableModel, MODEL_point_iwa, FALSE) - EVT_CALL(PlaySound, SOUND_8000005F) + EVT_CALL(PlaySound, SOUND_LOOP_5F) EVT_RETURN EVT_END }; @@ -330,7 +330,7 @@ EvtScript N(EVS_Ruins_Arise) = { EVT_WAIT(50) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySound, SOUND_8000005E) + EVT_CALL(PlaySound, SOUND_LOOP_5E) EVT_CALL(MakeLerp, -310, 0, 310, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -553,7 +553,7 @@ EvtScript N(EVS_Steps_FinishRising) = { }; EvtScript N(EVS_Steps_Unfold) = { - EVT_CALL(PlaySoundAt, SOUND_5E, SOUND_SPACE_MODE_0, 0, 39, -80) + EVT_CALL(PlaySoundAt, SOUND_005E, SOUND_SPACE_MODE_0, 0, 39, -80) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.2)) EVT_END_THREAD @@ -677,7 +677,7 @@ EvtScript N(EVS_SetupRuins) = { }; EvtScript N(EVS_Ruins_Arise_Continued) = { - EVT_CALL(PlaySound, SOUND_5C) + EVT_CALL(PlaySound, SOUND_005C) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(func_802CF56C, 1) EVT_CALL(FacePlayerTowardPoint, 0, 0, 0) 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 4e5843640c..7a8c4389e9 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 @@ -79,7 +79,7 @@ EvtScript N(EVS_Scene_RescuedMamar) = { EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Leap) EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) - EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) EVT_ADD(LVar1, 50) @@ -92,7 +92,7 @@ EvtScript N(EVS_Scene_RescuedMamar) = { EVT_WAIT(6 * DT) EVT_END_LOOP EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0188, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) diff --git a/src/world/area_sbk/sbk_20/sbk_20_2_entity.c b/src/world/area_sbk/sbk_20/sbk_20_2_entity.c index 323326564b..a3bb395717 100644 --- a/src/world/area_sbk/sbk_20/sbk_20_2_entity.c +++ b/src/world/area_sbk/sbk_20/sbk_20_2_entity.c @@ -8,7 +8,7 @@ EvtScript N(EVS_OnHitInertBlock) = { EVT_CASE_EQ(1) EVT_IF_EQ(GF_SBK20_ItemBlock_Mushroom, FALSE) EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) - EVT_CALL(PlaySoundAt, SOUND_2108, SOUND_SPACE_MODE_0, -80, 60, -200) + EVT_CALL(PlaySoundAt, SOUND_SPAWN_BLOCK, SOUND_SPACE_MODE_0, -80, 60, -200) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, -80, 73, -200, 10) EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -80, 60, -200, 0, ITEM_MUSHROOM, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_Mushroom) @@ -16,7 +16,7 @@ EvtScript N(EVS_OnHitInertBlock) = { EVT_CASE_EQ(10) EVT_IF_EQ(GF_SBK20_ItemBlock_SuperShroom, FALSE) EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) - EVT_CALL(PlaySoundAt, SOUND_2108, SOUND_SPACE_MODE_0, -180, 60, -200) + EVT_CALL(PlaySoundAt, SOUND_SPAWN_BLOCK, SOUND_SPACE_MODE_0, -180, 60, -200) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, -180, 73, -200, 10) EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -180, 60, -200, 0, ITEM_SUPER_SHROOM, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_SuperShroom) @@ -24,7 +24,7 @@ EvtScript N(EVS_OnHitInertBlock) = { EVT_CASE_EQ(100) EVT_IF_EQ(GF_SBK20_ItemBlock_UltraShroom, FALSE) EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) - EVT_CALL(PlaySoundAt, SOUND_2108, SOUND_SPACE_MODE_0, -130, 60, -150) + EVT_CALL(PlaySoundAt, SOUND_SPAWN_BLOCK, SOUND_SPACE_MODE_0, -130, 60, -150) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, -130, 73, -150, 10) EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -130, 60, -150, 0, ITEM_ULTRA_SHROOM, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_UltraShroom) diff --git a/src/world/area_sbk/sbk_30/sbk_30_2_main.c b/src/world/area_sbk/sbk_30/sbk_30_2_main.c index a45d458f8f..f8696283bf 100644 --- a/src/world/area_sbk/sbk_30/sbk_30_2_main.c +++ b/src/world/area_sbk/sbk_30/sbk_30_2_main.c @@ -39,7 +39,7 @@ EvtScript N(EVS_EnterMap) = { }; EvtScript N(EVS_Scene_RuinsRising) = { - EVT_CALL(PlaySound, SOUND_80000060) + EVT_CALL(PlaySound, SOUND_LOOP_60) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 193, 0, -237) EVT_CALL(SetPanTarget, CAM_DEFAULT, 193, 0, -237) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) diff --git a/src/world/area_sbk/sbk_56/sbk_56_1_main.c b/src/world/area_sbk/sbk_56/sbk_56_1_main.c index 081e44869d..fd7fd4da04 100644 --- a/src/world/area_sbk/sbk_56/sbk_56_1_main.c +++ b/src/world/area_sbk/sbk_56/sbk_56_1_main.c @@ -101,7 +101,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeTransformGroup, MODEL_sui) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) EVT_CALL(N(StartOasisSongVariation)) - EVT_CALL(PlaySound, SOUND_80000061) + EVT_CALL(PlaySound, SOUND_LOOP_61) EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_EXEC(N(EVS_SetupFoliage)) diff --git a/src/world/area_tik/common/DripVolumes.inc.c b/src/world/area_tik/common/DripVolumes.inc.c index b8af0a53ff..4eb99d5d9a 100644 --- a/src/world/area_tik/common/DripVolumes.inc.c +++ b/src/world/area_tik/common/DripVolumes.inc.c @@ -151,7 +151,7 @@ EvtScript N(EVS_UpdateDripVolume) = { EVT_END_IF EVT_LABEL(10) EVT_CALL(EnableModel, ArrayVar(5), FALSE) - EVT_CALL(PlaySound, SOUND_3F6) + EVT_CALL(PlaySound, SOUND_03F6) EVT_EXEC_WAIT(N(EVS_UpdateDripSplash)) EVT_GOTO(0) EVT_RETURN diff --git a/src/world/area_tik/tik_01/tik_01_2_main.c b/src/world/area_tik/tik_01/tik_01_2_main.c index d2db764d2b..f85355598d 100644 --- a/src/world/area_tik/tik_01/tik_01_2_main.c +++ b/src/world/area_tik/tik_01/tik_01_2_main.c @@ -22,7 +22,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_80000027) + EVT_CALL(PlaySound, SOUND_LOOP_27) EVT_CALL(EnableTexPanning, MODEL_nagare1, TRUE) EVT_THREAD TEX_PAN_PARAMS_ID(TEX_PANNER_1) 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 fa0a43ccad..52d3104644 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 @@ -6,7 +6,7 @@ EvtScript N(EVS_SpawnSwitch) = { EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) EVT_ADD(LVar2, -75) - EVT_CALL(PlaySoundAt, SOUND_301, SOUND_SPACE_MODE_0, LVar2, 200, 25) + EVT_CALL(PlaySoundAt, SOUND_0301, SOUND_SPACE_MODE_0, LVar2, 200, 25) EVT_CALL(MakeLerp, 200, -10, 25, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -16,7 +16,7 @@ EvtScript N(EVS_SpawnSwitch) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_48, SOUND_SPACE_MODE_0, LVar2, LVar0, 25) + EVT_CALL(PlaySoundAt, SOUND_0048, SOUND_SPACE_MODE_0, LVar2, LVar0, 25) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_RETURN diff --git a/src/world/area_tik/tik_01/tik_01_5_npc.c b/src/world/area_tik/tik_01/tik_01_5_npc.c index 9c0ba8d8cc..badc4ebc27 100644 --- a/src/world/area_tik/tik_01/tik_01_5_npc.c +++ b/src/world/area_tik/tik_01/tik_01_5_npc.c @@ -18,8 +18,8 @@ EvtScript N(EVS_NpcIdle_Blooper) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -75) EVT_CALL(SetNpcPos, NPC_SELF, LVar0, 150, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3DC, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_03DC, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_LARGE_ACTOR_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcFlyTo, NPC_SELF, LVar0, 0, 0, 10, 0, EASING_QUADRATIC_IN) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Blooper_Anim0C) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) @@ -43,8 +43,8 @@ EvtScript N(EVS_NpcDefeat_Blooper) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3DD, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_03DD, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_LARGE_ACTOR_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(NpcFlyTo, NPC_SELF, LVar0, 150, 0, 15, 0, EASING_QUADRATIC_IN) EVT_WAIT(5) diff --git a/src/world/area_tik/tik_02/tik_02_2_main.c b/src/world/area_tik/tik_02/tik_02_2_main.c index 45e740d739..d4dee44af3 100644 --- a/src/world/area_tik/tik_02/tik_02_2_main.c +++ b/src/world/area_tik/tik_02/tik_02_2_main.c @@ -17,9 +17,9 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_80000028) - EVT_CALL(PlaySoundAtF, SOUND_80000029, SOUND_SPACE_MODE_1, -230, -180, 120) - EVT_CALL(PlaySoundAtF, SOUND_8000002A, SOUND_SPACE_MODE_1, 20, -180, 120) + EVT_CALL(PlaySound, SOUND_LOOP_28) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_29, SOUND_SPACE_MODE_1, -230, -180, 120) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_2A, SOUND_SPACE_MODE_1, 20, -180, 120) EVT_EXEC(N(EVS_SetupDrips)) EVT_CALL(EnableTexPanning, MODEL_nagare1, TRUE) EVT_THREAD diff --git a/src/world/area_tik/tik_02/tik_02_5_npc.c b/src/world/area_tik/tik_02/tik_02_5_npc.c index 65f46a7f37..424cf35663 100644 --- a/src/world/area_tik/tik_02/tik_02_5_npc.c +++ b/src/world/area_tik/tik_02/tik_02_5_npc.c @@ -29,8 +29,8 @@ EvtScript N(EVS_NpcIdle_Blooper) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, 140, LVar1, LVar2) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3DC, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_03DC, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_LARGE_ACTOR_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcPos, NPC_SELF, -100, -300, -120) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Blooper_Anim01) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) @@ -63,8 +63,8 @@ EvtScript N(EVS_NpcDefeat_Blooper) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3DD, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_03DD, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_LARGE_ACTOR_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_SELF, -100, -300, -120, 40) EVT_WAIT(1) diff --git a/src/world/area_tik/tik_03/tik_03_2_main.c b/src/world/area_tik/tik_03/tik_03_2_main.c index a18d34b206..81cc679118 100644 --- a/src/world/area_tik/tik_03/tik_03_2_main.c +++ b/src/world/area_tik/tik_03/tik_03_2_main.c @@ -81,8 +81,8 @@ EvtScript N(EVS_Main) = { EVT_RETURN EVT_END_IF EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_8000002B) - EVT_CALL(PlaySoundAtF, SOUND_8000002C, SOUND_SPACE_MODE_1, -10, -20, 120) + EVT_CALL(PlaySound, SOUND_LOOP_2B) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_2C, SOUND_SPACE_MODE_1, -10, -20, 120) EVT_EXEC(N(EVS_EnterMap)) EVT_WAIT(1) EVT_RETURN diff --git a/src/world/area_tik/tik_05/tik_05_2_main.c b/src/world/area_tik/tik_05/tik_05_2_main.c index a59d129b90..9c25edb653 100644 --- a/src/world/area_tik/tik_05/tik_05_2_main.c +++ b/src/world/area_tik/tik_05/tik_05_2_main.c @@ -17,8 +17,8 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_8000002D) - EVT_CALL(PlaySoundAtF, SOUND_8000002E, SOUND_SPACE_MODE_1, -85, -20, 120) + EVT_CALL(PlaySound, SOUND_LOOP_2D) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_2E, SOUND_SPACE_MODE_1, -85, -20, 120) EVT_EXEC(N(EVS_SetupDrips)) EVT_CALL(EnableTexPanning, MODEL_nagare, TRUE) EVT_THREAD 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 9ba632caf2..0388d67099 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,7 +46,7 @@ EvtScript N(EVS_BreakBlock_DropSpring) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_48, SOUND_SPACE_MODE_0, LVar5, LVar0, 0) + 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(N(PlaySpringAnimation), MV_Unk_00) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_tik/tik_06/tik_06_2_main.c b/src/world/area_tik/tik_06/tik_06_2_main.c index eb473545c8..8158edfca3 100644 --- a/src/world/area_tik/tik_06/tik_06_2_main.c +++ b/src/world/area_tik/tik_06/tik_06_2_main.c @@ -67,10 +67,10 @@ EvtScript N(EVS_Main) = { EVT_SET(GF_MAP_ToadTownTunnels, TRUE) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_8000002F) - EVT_CALL(PlaySoundAtF, SOUND_80000030, SOUND_SPACE_MODE_1, -85, -180, 120) - EVT_CALL(PlaySoundAtF, SOUND_80000031, SOUND_SPACE_MODE_1, -25, -140, -130) - EVT_CALL(PlaySoundAtF, SOUND_80000032, SOUND_SPACE_MODE_1, -35, -180, 130) + EVT_CALL(PlaySound, SOUND_LOOP_2F) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_30, SOUND_SPACE_MODE_1, -85, -180, 120) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_31, SOUND_SPACE_MODE_1, -25, -140, -130) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_32, SOUND_SPACE_MODE_1, -35, -180, 130) EVT_EXEC(N(EVS_SetupDrips)) EVT_CALL(EnableTexPanning, MODEL_nagare1, TRUE) EVT_THREAD diff --git a/src/world/area_tik/tik_08/tik_08_2_main.c b/src/world/area_tik/tik_08/tik_08_2_main.c index c9b63d4f85..12b42a7cfa 100644 --- a/src/world/area_tik/tik_08/tik_08_2_main.c +++ b/src/world/area_tik/tik_08/tik_08_2_main.c @@ -32,8 +32,8 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_80000033) - EVT_CALL(PlaySoundAtF, SOUND_80000034, SOUND_SPACE_MODE_1, -30, -30, -85) + EVT_CALL(PlaySound, SOUND_LOOP_33) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_34, SOUND_SPACE_MODE_1, -30, -30, -85) EVT_EXEC(N(EVS_SetupDrips)) EVT_CALL(EnableTexPanning, MODEL_nagare1, TRUE) EVT_CALL(EnableTexPanning, MODEL_o92, TRUE) 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 0857b7de43..f2619ab077 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 @@ -4,7 +4,7 @@ #include "world/common/todo/SetEntityPosition.inc.c" EvtScript N(EVS_SpawnSwitch) = { - EVT_CALL(PlaySoundAt, SOUND_301, SOUND_SPACE_MODE_0, 90, 200, 100) + EVT_CALL(PlaySoundAt, SOUND_0301, SOUND_SPACE_MODE_0, 90, 200, 100) EVT_CALL(MakeLerp, 200, -10, 25, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -14,7 +14,7 @@ EvtScript N(EVS_SpawnSwitch) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_48, SOUND_SPACE_MODE_0, 90, LVar0, 100) + EVT_CALL(PlaySoundAt, SOUND_0048, SOUND_SPACE_MODE_0, 90, LVar0, 100) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_RETURN diff --git a/src/world/area_tik/tik_08/tik_08_5_npc.c b/src/world/area_tik/tik_08/tik_08_5_npc.c index d69badb1f8..4ccd14988f 100644 --- a/src/world/area_tik/tik_08/tik_08_5_npc.c +++ b/src/world/area_tik/tik_08/tik_08_5_npc.c @@ -26,8 +26,8 @@ EvtScript N(EVS_NpcIdle_Blooper) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3DC, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_03DC, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_LARGE_ACTOR_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, -250, -60, 15, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -63,8 +63,8 @@ EvtScript N(EVS_NpcDefeat_Blooper) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3DD, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_03DD, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_LARGE_ACTOR_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(NpcFlyTo, NPC_SELF, -40, -250, 0, 40, 0, EASING_LINEAR) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_EXEC_WAIT(N(EVS_SpawnSwitch)) diff --git a/src/world/area_tik/tik_09/tik_09_2_main.c b/src/world/area_tik/tik_09/tik_09_2_main.c index 0e71f15ed0..3b6e5304ff 100644 --- a/src/world/area_tik/tik_09/tik_09_2_main.c +++ b/src/world/area_tik/tik_09/tik_09_2_main.c @@ -9,7 +9,7 @@ EvtScript N(EVS_CloseGates) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(PlaySound, SOUND_CHIME_BEGIN_AMBUSH) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o59, SOUND_26B, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o59, SOUND_026B, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 60, 0, 25, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -20,7 +20,7 @@ EvtScript N(EVS_CloseGates) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o59, SOUND_26C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o59, SOUND_026C, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o58, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o59, COLLIDER_FLAGS_UPPER_MASK) @@ -67,10 +67,10 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_80000035) - EVT_CALL(PlaySoundAtF, SOUND_80000036, SOUND_SPACE_MODE_1, -190, -20, -120) - EVT_CALL(PlaySoundAtF, SOUND_80000037, SOUND_SPACE_MODE_1, 50, -20, -120) - EVT_CALL(PlaySoundAtF, SOUND_80000038, SOUND_SPACE_MODE_1, 290, -20, -120) + EVT_CALL(PlaySound, SOUND_LOOP_35) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_36, SOUND_SPACE_MODE_1, -190, -20, -120) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_37, SOUND_SPACE_MODE_1, 50, -20, -120) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_38, SOUND_SPACE_MODE_1, 290, -20, -120) EVT_EXEC(N(EVS_SetupDrips)) EVT_CALL(EnableTexPanning, MODEL_nagare, TRUE) EVT_CALL(EnableTexPanning, MODEL_o84, TRUE) 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 9a6fd25600..391c82ba79 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 @@ -19,7 +19,7 @@ EvtScript N(EVS_SpawnSwitch) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(InterpCamTargetPos, 0, 1, -10, -10, 10, 20) EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) - EVT_CALL(PlaySoundAt, SOUND_301, SOUND_SPACE_MODE_0, -10, 200, 10) + EVT_CALL(PlaySoundAt, SOUND_0301, SOUND_SPACE_MODE_0, -10, 200, 10) EVT_CALL(MakeLerp, 200, -10, 25, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -29,7 +29,7 @@ EvtScript N(EVS_SpawnSwitch) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_48, SOUND_SPACE_MODE_0, -10, LVar0, 10) + EVT_CALL(PlaySoundAt, SOUND_0048, 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) diff --git a/src/world/area_tik/tik_10/tik_10_2_main.c b/src/world/area_tik/tik_10/tik_10_2_main.c index dd0fbc5a69..bd599fb928 100644 --- a/src/world/area_tik/tik_10/tik_10_2_main.c +++ b/src/world/area_tik/tik_10/tik_10_2_main.c @@ -16,7 +16,7 @@ EvtScript N(EVS_Main) = { EVT_SETUP_CAMERA_NO_LEAD() EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_80000039) + EVT_CALL(PlaySound, SOUND_LOOP_39) EVT_EXEC(N(EVS_SetupDrips)) EVT_CALL(EnableTexPanning, MODEL_nagare, TRUE) EVT_THREAD diff --git a/src/world/area_tik/tik_18/tik_18_2_main.c b/src/world/area_tik/tik_18/tik_18_2_main.c index ef99e6968c..5020ed4bef 100644 --- a/src/world/area_tik/tik_18/tik_18_2_main.c +++ b/src/world/area_tik/tik_18/tik_18_2_main.c @@ -22,7 +22,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o45, COLLIDER_FLAGS_UPPER_MASK) EVT_EXEC(N(EVS_SetupDrips)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_80000043) + EVT_CALL(PlaySound, SOUND_LOOP_43) EVT_CALL(EnableTexPanning, MODEL_nagare, TRUE) EVT_THREAD TEX_PAN_PARAMS_ID(TEX_PANNER_1) diff --git a/src/world/area_tik/tik_18/tik_18_4_npc.c b/src/world/area_tik/tik_18/tik_18_4_npc.c index 0700ef33a8..4b95cbccea 100644 --- a/src/world/area_tik/tik_18/tik_18_4_npc.c +++ b/src/world/area_tik/tik_18/tik_18_4_npc.c @@ -13,7 +13,7 @@ EvtScript N(EVS_NpcIdle_SpikedGloomba) = { EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_SpikedGoomba_Dark_Sleep) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E1, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_03E1, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, -90, 0, 10, EASING_LINEAR) EVT_LABEL(1) EVT_CALL(UpdateLerp) diff --git a/src/world/area_tik/tik_19/tik_19_2_main.c b/src/world/area_tik/tik_19/tik_19_2_main.c index 78ee979ca7..e55b7b6437 100644 --- a/src/world/area_tik/tik_19/tik_19_2_main.c +++ b/src/world/area_tik/tik_19/tik_19_2_main.c @@ -26,9 +26,9 @@ EvtScript N(EVS_Main) = { EVT_SETUP_CAMERA_NO_LEAD() EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_80000044) - EVT_CALL(PlaySoundAtF, SOUND_80000045, SOUND_SPACE_MODE_1, 0, -20, 30) - EVT_CALL(PlaySoundAtF, SOUND_80000046, SOUND_SPACE_MODE_1, 270, -20, 30) + EVT_CALL(PlaySound, SOUND_LOOP_44) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_45, SOUND_SPACE_MODE_1, 0, -20, 30) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_46, SOUND_SPACE_MODE_1, 270, -20, 30) EVT_CALL(EnableTexPanning, MODEL_nagare, TRUE) EVT_THREAD TEX_PAN_PARAMS_ID(TEX_PANNER_1) diff --git a/src/world/area_tik/tik_20/tik_20_2_main.c b/src/world/area_tik/tik_20/tik_20_2_main.c index 8cf4552cb1..42cdbda41d 100644 --- a/src/world/area_tik/tik_20/tik_20_2_main.c +++ b/src/world/area_tik/tik_20/tik_20_2_main.c @@ -77,7 +77,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(ResetFromLava, EVT_PTR(N(SafeFloorColliders))) EVT_END_THREAD EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_80000047) + EVT_CALL(PlaySound, SOUND_LOOP_47) EVT_EXEC(N(EVS_SetupDrips)) EVT_THREAD TEX_PAN_PARAMS_ID(TEX_PANNER_0) diff --git a/src/world/area_tik/tik_23/tik_23_2_main.c b/src/world/area_tik/tik_23/tik_23_2_main.c index cd7afbd55d..1afca16032 100644 --- a/src/world/area_tik/tik_23/tik_23_2_main.c +++ b/src/world/area_tik/tik_23/tik_23_2_main.c @@ -71,7 +71,7 @@ EvtScript N(EVS_Main) = { EVT_END_IF EVT_WAIT(1) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_80000048) + EVT_CALL(PlaySound, SOUND_LOOP_48) EVT_EXEC_WAIT(N(EVS_SetupDrips)) EVT_CALL(SetTexPanner, MODEL_nagare1, 0) EVT_CALL(SetTexPanner, MODEL_o97, 0) diff --git a/src/world/area_tik/tik_24/tik_24_2_main.c b/src/world/area_tik/tik_24/tik_24_2_main.c index 479ef3af68..4b387d4983 100644 --- a/src/world/area_tik/tik_24/tik_24_2_main.c +++ b/src/world/area_tik/tik_24/tik_24_2_main.c @@ -47,7 +47,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC(N(EVS_UpdateTexturePan)) EVT_END_THREAD EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_80000049) + EVT_CALL(PlaySound, SOUND_LOOP_49) EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_WAIT(1) 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 190c1a3591..9ae9cf4526 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,7 +53,7 @@ EvtScript N(EVS_OnBreakBlock_SpringR) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_48, SOUND_SPACE_MODE_0, LVar5, LVar0, 0) + 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(N(PlaySpringReboundAnimation), MV_EntityID_SpringR) EVT_CALL(DisablePlayerInput, FALSE) @@ -88,7 +88,7 @@ EvtScript N(EVS_OnBreakBlock_SpringL) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_48, SOUND_SPACE_MODE_0, LVar5, LVar0, 0) + 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(N(PlaySpringReboundAnimation), MV_EntityID_SpringL) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_trd/trd_00/trd_00_0_header.c b/src/world/area_trd/trd_00/trd_00_0_header.c index 31fdfcd51c..6ea8457196 100644 --- a/src/world/area_trd/trd_00/trd_00_0_header.c +++ b/src/world/area_trd/trd_00/trd_00_0_header.c @@ -23,12 +23,12 @@ EvtScript N(EVS_SetupMusic) = { EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH1_ARRIVED_AT_KOOPA_FORTRESS) EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_FORTRESS, 1, 8) - EVT_CALL(PlaySound, SOUND_8000005C) + EVT_CALL(PlaySound, SOUND_LOOP_5C) EVT_CASE_EQ(STORY_CH1_BEGAN_PEACH_MISSION) EVT_CALL(SetMusicTrack, 0, SONG_STAR_SPIRIT_THEME, 1, 8) EVT_CASE_DEFAULT EVT_CALL(SetMusicTrack, 0, SONG_PLEASANT_PATH, 0, 8) - EVT_CALL(PlaySound, SOUND_8000005C) + EVT_CALL(PlaySound, SOUND_LOOP_5C) EVT_END_SWITCH EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) 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 a06a190c09..110a60c987 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 @@ -63,7 +63,7 @@ EvtScript N(EVS_NpcIdle_KoopaBros) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_KoopaBros_Black_Talk, ANIM_KoopaBros_Black_Idle, 0, MSG_CH1_00D2) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Walk) EVT_CALL(InterpNpcYaw, NPC_SELF, 45, 2) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_173, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0173, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Run) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) @@ -71,7 +71,7 @@ EvtScript N(EVS_NpcIdle_KoopaBros) = { EVT_WAIT(8 * DT) EVT_WAIT(12 * DT) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0174, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(8.0 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, -496, 101, 0) EVT_END_THREAD @@ -168,7 +168,7 @@ EvtScript N(D_80241DA4_99BA14) = { EVT_CALL(EnableNpcAI, NPC_Eldstar, FALSE) EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Leap) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0139, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) @@ -185,7 +185,7 @@ EvtScript N(D_80241DA4_99BA14) = { EVT_WAIT(20 * DT) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0188, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) EVT_WAIT(40 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) 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 dfeb275074..e537f32d40 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_80000006) + EVT_CALL(PlaySound, SOUND_LOOP_06) 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_80000007) + EVT_CALL(PlaySound, SOUND_LOOP_07) 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_80000007) + EVT_CALL(StopSound, SOUND_LOOP_07) EVT_END_THREAD EVT_THREAD EVT_WAIT(50 * DT) @@ -125,13 +125,13 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_KoopaTroopa_02, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(120 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_02, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_02, ANIM_KoopaTroopa_Panic) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_KoopaTroopa_02, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_LOOP(4) EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_02, 270, 0) @@ -162,7 +162,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_03, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_03, ANIM_KoopaTroopa_Panic) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_03, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_03, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_KoopaTroopa_03, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_LOOP(4) EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_03, 270, 0) @@ -187,7 +187,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_IF_GE(LVar2, -20) EVT_IF_EQ(LFlag0, FALSE) EVT_SET(LFlag0, TRUE) - EVT_CALL(PlaySound, SOUND_23) + EVT_CALL(PlaySound, SOUND_TRD_WATER_SPLASH) EVT_CALL(EnableModel, MODEL_o145, TRUE) EVT_END_IF EVT_END_IF @@ -196,7 +196,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_IF_GE(LVar2, -20) EVT_IF_EQ(LFlag1, FALSE) EVT_SET(LFlag1, TRUE) - EVT_CALL(PlaySound, SOUND_23) + EVT_CALL(PlaySound, SOUND_TRD_WATER_SPLASH) EVT_CALL(TranslateModel, MODEL_o145, 50, 0, 0) EVT_END_IF EVT_END_IF @@ -205,7 +205,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_IF_GE(LVar2, -20) EVT_IF_EQ(LFlag2, FALSE) EVT_SET(LFlag2, TRUE) - EVT_CALL(PlaySound, SOUND_23) + EVT_CALL(PlaySound, SOUND_TRD_WATER_SPLASH) EVT_CALL(TranslateModel, MODEL_o145, 100, 0, 0) EVT_END_IF EVT_END_IF @@ -214,7 +214,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_IF_GE(LVar2, -20) EVT_IF_EQ(LFlag3, FALSE) EVT_SET(LFlag3, TRUE) - EVT_CALL(PlaySound, SOUND_23) + EVT_CALL(PlaySound, SOUND_TRD_WATER_SPLASH) EVT_CALL(TranslateModel, MODEL_o145, 150, 0, 0) EVT_END_IF EVT_END_IF @@ -223,7 +223,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_IF_GE(LVar2, -20) EVT_IF_EQ(LFlag4, FALSE) EVT_SET(LFlag4, TRUE) - EVT_CALL(PlaySound, SOUND_23) + EVT_CALL(PlaySound, SOUND_TRD_WATER_SPLASH) EVT_CALL(TranslateModel, MODEL_o145, 200, 0, 0) EVT_END_IF EVT_END_IF @@ -232,7 +232,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_IF_GE(LVar2, -20) EVT_IF_EQ(LFlag5, FALSE) EVT_SET(LFlag5, TRUE) - EVT_CALL(PlaySound, SOUND_23) + EVT_CALL(PlaySound, SOUND_TRD_WATER_SPLASH) EVT_CALL(TranslateModel, MODEL_o145, 250, 0, 0) EVT_END_IF EVT_END_IF @@ -241,7 +241,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_IF_GE(LVar2, -20) EVT_IF_EQ(LFlag6, FALSE) EVT_SET(LFlag6, TRUE) - EVT_CALL(PlaySound, SOUND_23) + EVT_CALL(PlaySound, SOUND_TRD_WATER_SPLASH) EVT_CALL(TranslateModel, MODEL_o145, 300, 0, 0) EVT_END_IF EVT_END_IF @@ -250,7 +250,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_IF_GE(LVar2, -20) EVT_IF_EQ(LFlag7, FALSE) EVT_SET(LFlag7, TRUE) - EVT_CALL(PlaySound, SOUND_23) + EVT_CALL(PlaySound, SOUND_TRD_WATER_SPLASH) EVT_CALL(EnableModel, MODEL_o145, FALSE) EVT_END_IF EVT_END_IF @@ -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_80000006) + EVT_CALL(StopSound, SOUND_LOOP_06) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) EVT_UNBIND diff --git a/src/world/area_trd/trd_01/trd_01_2_entity.c b/src/world/area_trd/trd_01/trd_01_2_entity.c index bbf9c0296e..f7b4f06099 100644 --- a/src/world/area_trd/trd_01/trd_01_2_entity.c +++ b/src/world/area_trd/trd_01/trd_01_2_entity.c @@ -46,7 +46,7 @@ EvtScript N(EVS_UnlockDoors) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_TRD01_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_Padlock_EntityIndex, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_Padlock_EntityIndex) EVT_CALL(N(RemovePadlock)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) 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 4aff850fc6..96ac22bb3b 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_80000004) + EVT_CALL(PlaySound, SOUND_LOOP_04) 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_80000004) - EVT_CALL(PlaySound, SOUND_25) + EVT_CALL(StopSound, SOUND_LOOP_04) + EVT_CALL(PlaySound, SOUND_0025) 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_02/trd_02_2_entity.c b/src/world/area_trd/trd_02/trd_02_2_entity.c index f5c7e0fc98..500e2acede 100644 --- a/src/world/area_trd/trd_02/trd_02_2_entity.c +++ b/src/world/area_trd/trd_02/trd_02_2_entity.c @@ -25,7 +25,7 @@ EvtScript N(D_80242890_9A3870) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_TRD02_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_Padlock_EntityIndex, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_Padlock_EntityIndex) EVT_CALL(N(RemovePadlock)) EVT_RESUME_GROUP(EVT_GROUP_01) diff --git a/src/world/area_trd/trd_03/trd_03_3_npc.c b/src/world/area_trd/trd_03/trd_03_3_npc.c index 0a7a4bd35e..768217d312 100644 --- a/src/world/area_trd/trd_03/trd_03_3_npc.c +++ b/src/world/area_trd/trd_03/trd_03_3_npc.c @@ -51,7 +51,7 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_WAIT(25 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_01, ANIM_KoopaTroopa_Idle) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_ori1, SOUND_26B, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ori1, SOUND_026B, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 100, 0, 40 * DT, EASING_QUADRATIC_IN) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -60,7 +60,7 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_ori1, SOUND_26C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ori1, SOUND_026C, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(10 * DT) EVT_END_THREAD @@ -98,13 +98,13 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_CALL(SpeakToPlayer, NPC_KoopaBros, ANIM_KoopaBros_Green_Talk, ANIM_KoopaBros_Green_Idle, 0, MSG_CH1_00D4) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Walk) EVT_CALL(InterpNpcYaw, NPC_KoopaBros, 45, 2) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros, SOUND_173, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros, SOUND_0173, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Run) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros, EVT_FLOAT(0.8)) EVT_CALL(GetNpcPos, NPC_KoopaBros, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_KoopaBros, LVar0, LVar1, LVar2, 8 * DT) EVT_WAIT(8 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros, SOUND_174, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros, SOUND_0174, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcSpeed, NPC_KoopaBros, EVT_FLOAT(8.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros, -300, 70, 0) EVT_SET(GB_StoryProgress, STORY_CH1_KOOPA_BROS_HID_KEY) 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 ed18e51bdc..f589e4b9c4 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_26) + EVT_CALL(PlaySound, SOUND_0026) 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_26) + EVT_CALL(PlaySound, SOUND_0026) 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_1_main.c b/src/world/area_trd/trd_04/trd_04_1_main.c index d7a732dde3..c0c6cd4ff8 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_80000005) + EVT_CALL(PlaySound, SOUND_LOOP_05) 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_80000005) - EVT_CALL(PlaySound, SOUND_28) + EVT_CALL(StopSound, SOUND_LOOP_05) + EVT_CALL(PlaySound, SOUND_0028) 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 5797b42d6d..84235fb917 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 @@ -51,7 +51,7 @@ EvtScript N(EVS_UnlockUpperLeftDoors) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_TRD04_UnlockedUpperDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_Unk_00, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_Unk_00) EVT_CALL(N(RemovePadlock)) EVT_RESUME_GROUP(EVT_GROUP_01) @@ -79,7 +79,7 @@ EvtScript N(EVS_UnlockLowerRightDoors) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_TRD04_UnlockedLowerDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_Unk_01, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_Unk_01) EVT_CALL(N(RemovePadlock)) EVT_RESUME_GROUP(EVT_GROUP_01) @@ -109,7 +109,7 @@ EvtScript N(EVS_80245198) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(3 * DT) - EVT_CALL(PlaySoundAt, SOUND_301, SOUND_SPACE_MODE_0, -180, 175, -35) + EVT_CALL(PlaySoundAt, SOUND_0301, SOUND_SPACE_MODE_0, -180, 175, -35) EVT_CALL(MakeLerp, 175, 0, 20 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -119,7 +119,7 @@ EvtScript N(EVS_80245198) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_48, SOUND_SPACE_MODE_0, -180, 0, -35) + EVT_CALL(PlaySoundAt, SOUND_0048, 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) 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 a4ab841948..560290fff6 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 @@ -148,7 +148,7 @@ Vec3f N(UnusedPath)[] = { EvtScript N(EVS_PlayerFalling) = { EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySound, SOUND_175) + EVT_CALL(PlaySound, SOUND_0175) EVT_END_THREAD EVT_THREAD EVT_CALL(MakeLerp, 0, 150, 45, EASING_COS_IN_OUT) @@ -179,7 +179,7 @@ EvtScript N(EVS_PlayerFalling) = { EVT_SETF(LVar6, LVar3) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySound, SOUND_175) + EVT_CALL(PlaySound, SOUND_0175) EVT_END_THREAD EVT_CALL(MakeLerp, 0, 100, 30, EASING_QUADRATIC_IN) EVT_LABEL(1) @@ -207,7 +207,7 @@ EvtScript N(EVS_PartnerFalling) = { EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySound, SOUND_176) + EVT_CALL(PlaySound, SOUND_0176) EVT_END_THREAD EVT_THREAD EVT_CALL(MakeLerp, 0, -135, 45, EASING_COS_IN_OUT) @@ -236,7 +236,7 @@ EvtScript N(EVS_PartnerFalling) = { EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySound, SOUND_176) + EVT_CALL(PlaySound, SOUND_0176) EVT_END_THREAD EVT_CALL(GetNpcPos, NPC_PARTNER, LVar4, LVar5, LVar6) EVT_CALL(MakeLerp, 0, 100, 30, EASING_QUADRATIC_IN) 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 f6dbd3a27d..9df23e2ba7 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_29) + EVT_CALL(PlaySound, SOUND_0029) 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_2A) + EVT_CALL(PlaySound, SOUND_002A) 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_29) + EVT_CALL(PlaySound, SOUND_0029) 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_2A) + EVT_CALL(PlaySound, SOUND_002A) 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_29) + EVT_CALL(PlaySound, SOUND_0029) 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_2A) + EVT_CALL(PlaySound, SOUND_002A) 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) @@ -144,7 +144,7 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Talk, ANIM_KoopaBros_Yellow_Idle, 5, MSG_CH1_00D5) EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_KoopaBros_01, EMOTE_EXCLAMATION, 0, 25, EMOTER_POS, LVar0, LVar1, LVar2, 40) EVT_WAIT(25 * DT) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 270, 2) @@ -156,13 +156,13 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(3.0)) EVT_CALL(NpcJump0, NPC_KoopaBros_01, LVar0, LVar1, LVar2, 5 * DT) EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Talk, ANIM_KoopaBros_Yellow_Idle, 0, MSG_CH1_00D6) - EVT_CALL(PlaySound, SOUND_173) + EVT_CALL(PlaySound, SOUND_0173) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Run) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(0.8)) EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_KoopaBros_01, LVar0, LVar1, LVar2, 8 * DT) EVT_WAIT(8 * DT) - EVT_CALL(PlaySound, SOUND_174) + EVT_CALL(PlaySound, SOUND_0174) EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(8.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -400, -10, 0) EVT_EXEC(N(EVS_EndKoopaBrosTheme)) diff --git a/src/world/area_trd/trd_06/trd_06_2_falling.c b/src/world/area_trd/trd_06/trd_06_2_falling.c index 17ce24fd8d..c3024f88ee 100644 --- a/src/world/area_trd/trd_06/trd_06_2_falling.c +++ b/src/world/area_trd/trd_06/trd_06_2_falling.c @@ -170,7 +170,7 @@ EvtScript N(EVS_PlayerFalling) = { EVT_CALL(SetPlayerPos, 0, 130, 0) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySound, SOUND_175) + EVT_CALL(PlaySound, SOUND_0175) EVT_END_THREAD EVT_THREAD EVT_CALL(MakeLerp, 180, 210, 25, EASING_QUADRATIC_IN) @@ -195,7 +195,7 @@ EvtScript N(EVS_PlayerFalling) = { EVT_IF_EQ(LVar0, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySound, SOUND_108) + EVT_CALL(PlaySound, SOUND_0108) EVT_ADD(LVar2, -1000) EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) EVT_RETURN @@ -207,7 +207,7 @@ EvtScript N(EVS_PartnerFalling) = { EVT_CALL(SetNpcPos, NPC_PARTNER, 0, LVar0, 0) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySound, SOUND_176) + EVT_CALL(PlaySound, SOUND_0176) EVT_END_THREAD EVT_THREAD EVT_CALL(MakeLerp, 180, 150, 25, EASING_QUADRATIC_IN) @@ -233,7 +233,7 @@ EvtScript N(EVS_PartnerFalling) = { EVT_IF_EQ(LVar0, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySound, SOUND_108) + EVT_CALL(PlaySound, SOUND_0108) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) EVT_RETURN EVT_END diff --git a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c index 13365966b5..dc58dac665 100644 --- a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c +++ b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c @@ -111,7 +111,7 @@ EvtScript N(EVS_NpcInteract_Bombette) = { EVT_WAIT(15 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(25 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(40 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00E0) diff --git a/src/world/area_trd/trd_07/trd_07_3_magic_doors.c b/src/world/area_trd/trd_07/trd_07_3_magic_doors.c index 645cac21ed..9810f35159 100644 --- a/src/world/area_trd/trd_07/trd_07_3_magic_doors.c +++ b/src/world/area_trd/trd_07/trd_07_3_magic_doors.c @@ -29,7 +29,7 @@ API_CALLABLE(N(SpawnMovingDoorDust)) { EvtScript N(EVS_AnimateDoorRaising) = { EVT_THREAD EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_2B) + EVT_CALL(PlaySound, SOUND_TRD_MAGIC_DOOR_JUMP) EVT_END_THREAD EVT_THREAD // input LVar0 ignored in this thread @@ -135,7 +135,7 @@ EvtScript N(EVS_AnimateDoorLowering) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySound, SOUND_2C) + EVT_CALL(PlaySound, SOUND_TRD_MAGIC_DOOR_LAND) EVT_IF_EQ(LVar9, MODEL_migi) EVT_CALL(N(SpawnMovingDoorDust), 270, 0, 40, 270) EVT_CALL(N(SpawnMovingDoorDust), 270, 0, -40, 270) @@ -159,7 +159,7 @@ EvtScript N(EVS_AnimateDoorLowering) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(2) EVT_END_IF - EVT_CALL(PlaySound, SOUND_2C) + EVT_CALL(PlaySound, SOUND_TRD_MAGIC_DOOR_LAND) EVT_IF_EQ(LVar9, MODEL_migi) EVT_CALL(N(SpawnMovingDoorDust), 270, 0, 40, 270) EVT_CALL(N(SpawnMovingDoorDust), 270, 0, -40, 270) @@ -183,7 +183,7 @@ EvtScript N(EVS_AnimateDoorLowering) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(4) EVT_END_IF - EVT_CALL(PlaySound, SOUND_2C) + EVT_CALL(PlaySound, SOUND_TRD_MAGIC_DOOR_LAND) EVT_IF_EQ(LVar9, MODEL_migi) EVT_CALL(N(SpawnMovingDoorDust), 270, 0, 40, 270) EVT_CALL(N(SpawnMovingDoorDust), 270, 0, -40, 270) diff --git a/src/world/area_trd/trd_08/trd_08_3_npc.c b/src/world/area_trd/trd_08/trd_08_3_npc.c index 045dd6b17a..87934658b9 100644 --- a/src/world/area_trd/trd_08/trd_08_3_npc.c +++ b/src/world/area_trd/trd_08/trd_08_3_npc.c @@ -4,9 +4,9 @@ #include "world/common/enemy/ai/FireBarAI.inc.c" s32 N(FireBar_Sounds)[] = { - SOUND_FIRE_BAR_0, SOUND_FIRE_BAR_1, SOUND_FIRE_BAR_2, SOUND_FIRE_BAR_3, - SOUND_FIRE_BAR_4, SOUND_FIRE_BAR_5, SOUND_FIRE_BAR_6, SOUND_FIRE_BAR_7, - SOUND_FIRE_BAR_8, SOUND_FIRE_BAR_9, SOUND_FIRE_BAR_9, + SOUND_SEQ_FIRE_BAR_0, SOUND_SEQ_FIRE_BAR_1, SOUND_SEQ_FIRE_BAR_2, SOUND_SEQ_FIRE_BAR_3, + SOUND_SEQ_FIRE_BAR_4, SOUND_SEQ_FIRE_BAR_5, SOUND_SEQ_FIRE_BAR_6, SOUND_SEQ_FIRE_BAR_7, + SOUND_SEQ_FIRE_BAR_8, SOUND_SEQ_FIRE_BAR_9, SOUND_SEQ_FIRE_BAR_9, }; EvtScript N(EVS_FireBar_Defeated) = { @@ -29,7 +29,7 @@ EvtScript N(EVS_FireBar_Defeated) = { EVT_SET(LVar1, LVarB) EVT_END_LOOP EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) - EVT_CALL(PlaySoundAt, SOUND_B000000A, SOUND_SPACE_MODE_0, LVar1, LVar2, LVar3) + EVT_CALL(PlaySoundAt, SOUND_SEQ_FIRE_BAR_DEAD, SOUND_SPACE_MODE_0, LVar1, LVar2, LVar3) EVT_LOOP(10) EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) EVT_CALL(RandInt, 50, LVar4) diff --git a/src/world/area_trd/trd_09/trd_09_3_npc.c b/src/world/area_trd/trd_09/trd_09_3_npc.c index e30263d59c..1a518aa70c 100644 --- a/src/world/area_trd/trd_09/trd_09_3_npc.c +++ b/src/world/area_trd/trd_09/trd_09_3_npc.c @@ -413,7 +413,7 @@ EvtScript N(EVS_NpcAI_BulletBill) = { EVT_ADD(LVar2, 11) EVT_CALL(SetNpcPos, NPC_SELF, LVar1, LVar2, LVar3) EVT_CALL(InterpNpcYaw, NPC_SELF, LVar4, 0) - EVT_CALL(func_80045838, -1, SOUND_328, SOUND_PARAM_MORE_QUIET) + EVT_CALL(func_80045838, -1, SOUND_0328, SOUND_PARAM_MORE_QUIET) EVT_SET(LVarA, LVar1) EVT_SUB(LVarA, 10) EVT_SET(LVarB, LVar2) @@ -430,7 +430,7 @@ EvtScript N(EVS_NpcAI_BulletBill) = { EVT_CASE_EQ(12) EVT_CALL(NpcMoveTo, NPC_SELF, -450, LVar3, 0) EVT_END_SWITCH - EVT_CALL(func_80045838, -1, SOUND_B0000018, 0) + EVT_CALL(func_80045838, -1, SOUND_SEQ_18, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BulletBill_Hurt) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 5) 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 84f0935752..8a036e6452 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,10 +43,10 @@ EvtScript N(EVS_BossDefeated) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_80000067) + EVT_CALL(PlaySound, SOUND_LOOP_67) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, SOUND_SPACE_MODE_0, -135, 85, 0) + EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, -135, 85, 0) EVT_END_THREAD EVT_THREAD EVT_WAIT(45) @@ -55,7 +55,7 @@ EvtScript N(EVS_BossDefeated) = { EVT_THREAD EVT_WAIT(180) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, SOUND_SPACE_MODE_0, -135, 85, 0) + EVT_CALL(PlaySoundAt, SOUND_0137, SOUND_SPACE_MODE_0, -135, 85, 0) EVT_END_THREAD EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD @@ -81,7 +81,7 @@ EvtScript N(EVS_BossDefeated) = { EVT_WAIT(1) EVT_END_IF EVT_CALL(N(StarSpiritEffectFunc4), 3) - EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GB_StoryProgress, STORY_CH1_STAR_SPIRIT_RESCUED) EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_0, TRANSITION_GET_STAR_CARD) diff --git a/src/world/area_trd/trd_10/trd_10_2_npc.c b/src/world/area_trd/trd_10/trd_10_2_npc.c index f00317a5cb..dec0bb575e 100644 --- a/src/world/area_trd/trd_10/trd_10_2_npc.c +++ b/src/world/area_trd/trd_10/trd_10_2_npc.c @@ -89,7 +89,7 @@ EvtScript N(EVS_NpcAI_KoopaBros_01) = { EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_00F6, 300, 100) EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_00F7, 300, 100) EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_00F8, 300, 100) - EVT_CALL(PlaySoundAt, SOUND_1E2, SOUND_SPACE_MODE_0, 0, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_01E2, SOUND_SPACE_MODE_0, 0, 0, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(1.0)) EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_00F9, 300, 100) EVT_WAIT(30 * DT) @@ -170,7 +170,7 @@ EvtScript N(EVS_NpcDefeat_KoopaBros_01) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_END_THREAD EVT_WAIT(120) - EVT_CALL(PlaySoundAt, SOUND_1E2, SOUND_SPACE_MODE_0, 0, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_01E2, SOUND_SPACE_MODE_0, 0, 0, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(0.5)) EVT_WAIT(15) EVT_SET(GF_TRD10_Defeated_KoopaBros, TRUE) diff --git a/src/world/area_trd/trd_10/trd_10_3_fake_bowser.c b/src/world/area_trd/trd_10/trd_10_3_fake_bowser.c index 52b8fb0b18..ec6eff1cc5 100644 --- a/src/world/area_trd/trd_10/trd_10_3_fake_bowser.c +++ b/src/world/area_trd/trd_10/trd_10_3_fake_bowser.c @@ -51,7 +51,7 @@ EvtScript N(EVS_RevealFakeBowser) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(MakeLerp, 100, -100, 60 * DT, EASING_QUADRATIC_OUT) - EVT_CALL(PlaySoundAt, SOUND_3BE, SOUND_SPACE_MODE_0, 50, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_03BE, SOUND_SPACE_MODE_0, 50, 0, 0) EVT_LABEL(10) EVT_CALL(UpdateLerp) EVT_EXEC_WAIT(N(EVS_SetModelsPos)) diff --git a/src/world/common/atomic/PushBlockGravity.inc.c b/src/world/common/atomic/PushBlockGravity.inc.c index b2f0288a94..e7fac0ae49 100644 --- a/src/world/common/atomic/PushBlockGravity.inc.c +++ b/src/world/common/atomic/PushBlockGravity.inc.c @@ -12,7 +12,7 @@ s32 N(push_block_handle_fall)(Entity* block, Evt* source) { block->pos.y = source->varTable[0] - (N(PushBlockFallCurve)[source->functionTemp[0]] * BLOCK_GRID_SIZE); if (source->functionTemp[0] == 0) { - sfx_play_sound_at_position(SOUND_1DA, SOUND_SPACE_MODE_0, block->pos.x, block->pos.y, block->pos.z); + sfx_play_sound_at_position(SOUND_01DA, SOUND_SPACE_MODE_0, block->pos.x, block->pos.y, block->pos.z); } if ((source->functionTemp[0] > 4) && (source->functionTemp[0] & 1)) { diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c index 4f3613a2f3..7634e519dc 100644 --- a/src/world/common/complete/Quizmo.inc.c +++ b/src/world/common/complete/Quizmo.inc.c @@ -1045,15 +1045,15 @@ EvtScript N(EVS_Quizmo_QuizMain) = { EVT_CALL(N(Quizmo_SetStageLightsDelay), 2) EVT_END_THREAD EVT_THREAD - EVT_CALL(PlaySound, SOUND_21C) + EVT_CALL(PlaySound, SOUND_021C) EVT_WAIT(6) - EVT_CALL(PlaySound, SOUND_21C) + EVT_CALL(PlaySound, SOUND_021C) EVT_WAIT(6) - EVT_CALL(PlaySound, SOUND_21C) + EVT_CALL(PlaySound, SOUND_021C) EVT_WAIT(6) - EVT_CALL(PlaySound, SOUND_21C) + EVT_CALL(PlaySound, SOUND_021C) EVT_END_THREAD - EVT_CALL(PlaySound, SOUND_8A) + EVT_CALL(PlaySound, SOUND_008A) 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_8B) + EVT_CALL(PlaySound, SOUND_008B) 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_8F) + EVT_CALL(PlaySound, SOUND_008F) EVT_END_THREAD EVT_THREAD EVT_WAIT(45) - EVT_CALL(StopSound, SOUND_89) + EVT_CALL(StopSound, SOUND_LRAW_0089) EVT_END_THREAD EVT_CALL(N(Quizmo_SetVannaAnim_Wave)) EVT_CALL(N(Quizmo_DestroyEffects)) diff --git a/src/world/common/enemy/Sentinel.inc.c b/src/world/common/enemy/Sentinel.inc.c index 182967c39a..57f7ffa41e 100644 --- a/src/world/common/enemy/Sentinel.inc.c +++ b/src/world/common/enemy/Sentinel.inc.c @@ -50,12 +50,12 @@ EvtScript N(EVS_NpcAI_Sentinel) = { EVT_ADD(LVar1, 20) EVT_ADD(LVar2, 2) EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(func_80045838, -1, SOUND_2F7, 0) + EVT_CALL(func_80045838, -1, SOUND_02F7, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Sentinel_Anim08) EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) EVT_WAIT(10) - EVT_CALL(func_80045838, -1, SOUND_32E | SOUND_ID_TRIGGER_CHANGE_SOUND, 0) + EVT_CALL(func_80045838, -1, SOUND_LRAW_032E | SOUND_ID_TRIGGER_CHANGE_SOUND, 0) EVT_THREAD EVT_LOOP(100) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) diff --git a/src/world/common/enemy/ai/BulletBillAI.inc.c b/src/world/common/enemy/ai/BulletBillAI.inc.c index a15c96aa39..5190712ab6 100644 --- a/src/world/common/enemy/ai/BulletBillAI.inc.c +++ b/src/world/common/enemy/ai/BulletBillAI.inc.c @@ -123,7 +123,7 @@ API_CALLABLE(N(BulletBillAI_Main)) { if (hitDetected) { npc->curAnim = enemy->animList[ENEMY_ANIM_INDEX_HIT]; - ai_enemy_play_sound(npc, SOUND_B0000018, 0); + ai_enemy_play_sound(npc, SOUND_SEQ_18, 0); fx_ring_blast(0, npc->pos.x, npc->pos.y + 5.0f, npc->pos.z + 1.0f, 0.05f, 20); fx_smoke_burst(0, npc->pos.x, npc->pos.y + 5.0f, npc->pos.z + 0.0f, 1.2f, 25); npc->duration = 1; @@ -211,7 +211,7 @@ API_CALLABLE(N(BillBlasterAI_Main)) { npc->curAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; bulletEnemy = get_enemy(enemy->AI_VAR_BLASTER_BULLET); bulletEnemy->VAR_PROJECTILE_HITBOX_STATE = PROJECTILE_HITBOX_STATE_PRE; - ai_enemy_play_sound(npc, SOUND_328, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_0328, SOUND_PARAM_MORE_QUIET); npc->duration = 5; script->AI_TEMP_STATE = AI_STATE_BLASTER_COOLDOWN; // fallthrough diff --git a/src/world/common/enemy/ai/CleftAI.inc.c b/src/world/common/enemy/ai/CleftAI.inc.c index e48d053e9c..1cee281b53 100644 --- a/src/world/common/enemy/ai/CleftAI.inc.c +++ b/src/world/common/enemy/ai/CleftAI.inc.c @@ -76,7 +76,7 @@ void N(CleftAI_Hiding)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol if (basic_ai_check_player_dist(volume, enemy, aiSettings->alertRadius * 0.85, aiSettings->alertOffsetDist, FALSE)) { npc->curAnim = enemy->animList[9]; fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); npc->duration = 12; script->AI_TEMP_STATE = AI_STATE_CLEFT_PRE_AMBUSH; } diff --git a/src/world/common/enemy/ai/ClubbaNappingAI.inc.c b/src/world/common/enemy/ai/ClubbaNappingAI.inc.c index 88ec360ddb..273faef8a4 100644 --- a/src/world/common/enemy/ai/ClubbaNappingAI.inc.c +++ b/src/world/common/enemy/ai/ClubbaNappingAI.inc.c @@ -70,19 +70,19 @@ void N(ClubbaNappingAI_Sleep)(Evt* script, MobileAISettings* aiSettings, EnemyDe } if (shouldWakeUp) { - ai_enemy_play_sound(npc, SOUND_B000000E, 0); + ai_enemy_play_sound(npc, SOUND_SEQ_0E, 0); npc->curAnim = enemy->animList[11]; npc->duration = 10; fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); script->AI_TEMP_STATE = AI_STATE_NAPPING_CLUBBA_WAKE_UP; } npc->duration++; if (npc->duration == 27) { - ai_enemy_play_sound(npc, SOUND_B000000C, 0); + ai_enemy_play_sound(npc, SOUND_SEQ_0C, 0); } else if (npc->duration == 57) { - ai_enemy_play_sound(npc, SOUND_B000000D, 0); + ai_enemy_play_sound(npc, SOUND_SEQ_0D, 0); } else if (npc->duration == 59) { npc->curAnim = enemy->animList[12]; } else if (npc->duration == 60) { diff --git a/src/world/common/enemy/ai/FireBarAI.inc.c b/src/world/common/enemy/ai/FireBarAI.inc.c index e4f9fea6bd..d59b57f88f 100644 --- a/src/world/common/enemy/ai/FireBarAI.inc.c +++ b/src/world/common/enemy/ai/FireBarAI.inc.c @@ -103,7 +103,7 @@ API_CALLABLE(N(FireBarAI_Main)) { if ((hitDetected > 0) && (playerStatus->actionState != ACTION_STATE_HIT_FIRE)) { playerStatus->hazardType = HAZARD_TYPE_FIRE_BAR; set_action_state(ACTION_STATE_HIT_FIRE); - sfx_play_sound_at_position(SOUND_E8, SOUND_SPACE_MODE_0, playerStatus->pos.x, playerStatus->pos.y, playerStatus->pos.z); + sfx_play_sound_at_position(SOUND_TOUCH_LAVA, SOUND_SPACE_MODE_0, playerStatus->pos.x, playerStatus->pos.y, playerStatus->pos.z); gCurrentEncounter.battleTriggerCooldown = 45; playerStatus->blinkTimer = 45; playerStatus->lastGoodPos.x = playerStatus->pos.x; diff --git a/src/world/common/enemy/ai/FlyingAI.inc.c b/src/world/common/enemy/ai/FlyingAI.inc.c index cb1c00b79d..3472e5841d 100644 --- a/src/world/common/enemy/ai/FlyingAI.inc.c +++ b/src/world/common/enemy/ai/FlyingAI.inc.c @@ -135,7 +135,7 @@ void N(FlyingAI_Wander)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVo EffectInstance* emoteTemp; fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xC, &emoteTemp); npc->moveToPos.y = npc->pos.y; - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); if (enemy->npcSettings->actionFlags & AI_ACTION_JUMP_WHEN_SEE_PLAYER) { script->AI_TEMP_STATE = AI_STATE_ALERT_INIT; @@ -233,7 +233,7 @@ void N(FlyingAI_Loiter)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVo && basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 1)) { fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); npc->moveToPos.y = npc->pos.y; - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); if (enemy->npcSettings->actionFlags & AI_ACTION_JUMP_WHEN_SEE_PLAYER) { script->AI_TEMP_STATE = AI_STATE_ALERT_INIT; } else { diff --git a/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c b/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c index 19140073e2..0a5d97acb5 100644 --- a/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c +++ b/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c @@ -22,7 +22,7 @@ void N(FlyingMagikoopaAI_11)(Evt* script, MobileAISettings* aiSettings, EnemyDet if (N(MagikoopaAI_CanShootSpell)(script, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, volume) == 1) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); npc->duration = 50; script->AI_TEMP_STATE = 20; } else { diff --git a/src/world/common/enemy/ai/GuardAI.inc.c b/src/world/common/enemy/ai/GuardAI.inc.c index a7ebddd6ff..f671e7f9db 100644 --- a/src/world/common/enemy/ai/GuardAI.inc.c +++ b/src/world/common/enemy/ai/GuardAI.inc.c @@ -47,7 +47,7 @@ void N(GuardAI_Idle)(Evt* script, GuardAISettings* aiSettings, EnemyDetectVolume if (aiSettings->playerSearchInterval >= 0 && basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 0)) { fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->pos.x, gPlayerStatusPtr->pos.z); if (!(enemy->npcSettings->actionFlags & AI_ACTION_JUMP_WHEN_SEE_PLAYER)) { @@ -162,7 +162,7 @@ void N(GuardAI_ReturnHome)(Evt* script, GuardAISettings* aiSettings, EnemyDetect script->functionTemp[1] = aiSettings->playerSearchInterval; if (basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 0)) { fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, (f32) npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->pos.x, gPlayerStatusPtr->pos.z); if (enemy->npcSettings->actionFlags & AI_ACTION_JUMP_WHEN_SEE_PLAYER) { script->AI_TEMP_STATE = AI_STATE_ALERT_INIT; diff --git a/src/world/common/enemy/ai/HoppingAI.inc.c b/src/world/common/enemy/ai/HoppingAI.inc.c index a8fa208810..473b7de251 100644 --- a/src/world/common/enemy/ai/HoppingAI.inc.c +++ b/src/world/common/enemy/ai/HoppingAI.inc.c @@ -12,7 +12,7 @@ void N(HoppingAI_HopInit)(Evt* script, MobileAISettings* aiSettings, EnemyDetect npc->flags |= NPC_FLAG_JUMPING; npc->jumpVel = (rand_int(45) / 10.0) + 8.0; npc->jumpScale = 1.5f; - ai_enemy_play_sound(npc, SOUND_B0000017, 0); + ai_enemy_play_sound(npc, SOUND_SEQ_17, 0); if (is_point_within_region(enemy->territory->wander.wanderShape, enemy->territory->wander.centerPos.x, @@ -51,7 +51,7 @@ void N(HoppingAI_Hop)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolu if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0) != 0) { EffectInstance* emoteTemp; fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->pos.x, gPlayerStatusPtr->pos.z); script->AI_TEMP_STATE = 12; return; @@ -129,7 +129,7 @@ void N(HoppingAI_Loiter)(Evt* script, MobileAISettings* aiSettings, EnemyDetectV if (aiSettings->playerSearchInterval >= 0 && basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 0) != 0) { EffectInstance* emoteTemp; fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->pos.x, gPlayerStatusPtr->pos.z); script->AI_TEMP_STATE = 12; } else if (npc->turnAroundYawAdjustment == 0) { @@ -156,7 +156,7 @@ void N(HoppingAI_ChaseInit)(Evt* script, MobileAISettings* aiSettings, EnemyDete enemy->yaw = atan2(enemy->pos.x, enemy->pos.z, gPlayerStatusPtr->pos.x, gPlayerStatusPtr->pos.z); enemy->moveSpeed = aiSettings->chaseSpeed; script->AI_TEMP_STATE = 13; - ai_enemy_play_sound(enemy, SOUND_B0000017, 0); + ai_enemy_play_sound(enemy, SOUND_SEQ_17, 0); } void N(HoppingAI_Chase)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { diff --git a/src/world/common/enemy/ai/LakituAI.inc.c b/src/world/common/enemy/ai/LakituAI.inc.c index 85d6ffa811..f857d036da 100644 --- a/src/world/common/enemy/ai/LakituAI.inc.c +++ b/src/world/common/enemy/ai/LakituAI.inc.c @@ -61,7 +61,7 @@ void N(LakituAI_Wander)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVo script->functionTemp[1] = aiSettings->playerSearchInterval; if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0) != 0) { fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); x = npc->pos.x; y = npc->pos.y; z = npc->pos.z; @@ -140,7 +140,7 @@ void N(LakituAI_Loiter)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVo enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 12); if (basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 1) != 0) { fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; return; } diff --git a/src/world/common/enemy/ai/PiranhaPlantAI.inc.c b/src/world/common/enemy/ai/PiranhaPlantAI.inc.c index a611403079..2f6ce0693e 100644 --- a/src/world/common/enemy/ai/PiranhaPlantAI.inc.c +++ b/src/world/common/enemy/ai/PiranhaPlantAI.inc.c @@ -28,7 +28,7 @@ void N(PiranhaPlantAI_01)(Evt* script, MobileAISettings* aiSettings, EnemyDetect if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0)) { ai_enemy_play_sound(npc, SOUND_BURROW_DIG, 0); fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &temp); - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); npc->curAnim = enemy->animList[ENEMY_ANIM_INDEX_MELEE_PRE]; npc->duration = enemy->varTable[8]; script->functionTemp[0] = 10; diff --git a/src/world/common/enemy/ai/SentinelAI.inc.c b/src/world/common/enemy/ai/SentinelAI.inc.c index c37251ac82..4fc1337fe1 100644 --- a/src/world/common/enemy/ai/SentinelAI.inc.c +++ b/src/world/common/enemy/ai/SentinelAI.inc.c @@ -105,7 +105,7 @@ void N(SentinelAI_DescendInit)(Evt* script, MobileAISettings* aiSettings, EnemyD if (!(enemy->varTable[0] & SENTINEL_AI_FLAG_PLAYING_SOUND)) { enemy->varTable[0] |= SENTINEL_AI_FLAG_PLAYING_SOUND; } - sfx_play_sound_at_position(SOUND_80000011, SOUND_SPACE_FULL, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(SOUND_LOOP_11, SOUND_SPACE_FULL, npc->pos.x, npc->pos.y, npc->pos.z); npc->duration = 0; script->AI_TEMP_STATE = AI_STATE_SENTINEL_DESCEND; } @@ -117,7 +117,7 @@ void N(SentinelAI_Descend)(Evt* script, MobileAISettings* aiSettings, EnemyDetec s32 color; // @bug need to use real sound id, not environmental sound id - sfx_adjust_env_sound_pos(SOUND_80000011, SOUND_SPACE_FULL, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_adjust_env_sound_pos(SOUND_LOOP_11, SOUND_SPACE_FULL, npc->pos.x, npc->pos.y, npc->pos.z); if (!basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 1)) { enemy->varTable[0] &= ~SENTINEL_AI_FLAG_CHASING; npc->rot.y = 0.0f; @@ -162,7 +162,7 @@ void N(SentinelAI_LosePlayerInit)(Evt* script, MobileAISettings* aiSettings, Ene enemy->varTable[0] &= ~SENTINEL_AI_FLAG_CHASING; set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_CLEAR, 0, 0, 0, 0, 0); if (enemy->varTable[0] & SENTINEL_AI_FLAG_PLAYING_SOUND) { - sfx_stop_sound(SOUND_80000011); + sfx_stop_sound(SOUND_LOOP_11); enemy->varTable[0] &= ~SENTINEL_AI_FLAG_PLAYING_SOUND; } npc->curAnim = enemy->animList[ENEMY_ANIM_INDEX_MELEE_HIT]; @@ -255,7 +255,7 @@ void N(SentinelAI_ReturnHome)(Evt* script, MobileAISettings* aiSettings, EnemyDe script->functionTemp[1] = aiSettings->playerSearchInterval; if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->alertOffsetDist * 0.5, 0)) { fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &emoteTemp); - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); npc->moveToPos.y = npc->pos.y; script->AI_TEMP_STATE = AI_STATE_SENTINEL_CHASE_INIT; return; diff --git a/src/world/common/enemy/ai/States_PatrolAI.inc.c b/src/world/common/enemy/ai/States_PatrolAI.inc.c index 74dda9d43e..ae9891654e 100644 --- a/src/world/common/enemy/ai/States_PatrolAI.inc.c +++ b/src/world/common/enemy/ai/States_PatrolAI.inc.c @@ -55,7 +55,7 @@ void N(PatrolAI_Move)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolu script->functionTemp[1] = aiSettings->playerSearchInterval; if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0)) { fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); if (enemy->npcSettings->actionFlags & AI_ACTION_JUMP_WHEN_SEE_PLAYER) { script->AI_TEMP_STATE = AI_STATE_ALERT_INIT; } else { @@ -112,7 +112,7 @@ void N(PatrolAI_Loiter)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVo if ((aiSettings->playerSearchInterval >= 0) && basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 0)) { fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->pos.x, gPlayerStatusPtr->pos.z); - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); if (!(enemy->npcSettings->actionFlags & AI_ACTION_JUMP_WHEN_SEE_PLAYER)) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; } else { diff --git a/src/world/common/enemy/ai/SwooperAI.inc.c b/src/world/common/enemy/ai/SwooperAI.inc.c index b89ff5b2a1..6f7f36ab08 100644 --- a/src/world/common/enemy/ai/SwooperAI.inc.c +++ b/src/world/common/enemy/ai/SwooperAI.inc.c @@ -53,7 +53,7 @@ API_CALLABLE(N(SwooperAI_Main)) { if (script->functionTemp[1] <= 0) { script->functionTemp[1] = aiSettings->playerSearchInterval; if (basic_ai_check_player_dist(detectVolumePtr, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0) != 0) { - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET); script->functionTemp[0] = 10; } } diff --git a/src/world/common/entity/SuperBlock.inc.c b/src/world/common/entity/SuperBlock.inc.c index 9a981bd487..770918f50f 100644 --- a/src/world/common/entity/SuperBlock.inc.c +++ b/src/world/common/entity/SuperBlock.inc.c @@ -437,11 +437,11 @@ API_CALLABLE(N(SuperBlock_WaitForPlayerToLand)) { EvtScript N(SuperBlock_ShowUpgradeEffects) = { EVT_WAIT(10 * DT) - EVT_CALL(PlaySound, SOUND_212D) + EVT_CALL(PlaySound, SOUND_RELEASE_ENERGY) EVT_CALL(N(SuperBlock_GatherEnergyFX), SUPER_BLOCK_MAPVAR) EVT_WAIT(85 * DT) EVT_THREAD - EVT_CALL(PlaySound, SOUND_212E) + EVT_CALL(PlaySound, SOUND_GATHER_ENERGY) EVT_CALL(N(SuperBlock_WhiteScreenFlash), 70, 70) EVT_WAIT(27 * DT) EVT_CALL(PlaySound, SOUND_208E) diff --git a/src/world/common/todo/StarSpiritEffectFunc.inc.c b/src/world/common/todo/StarSpiritEffectFunc.inc.c index 706870afd9..8b42a031cd 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_A2, SOUND_SPACE_MODE_0, ptr->unk_00, ptr->unk_04, ptr->unk_08); + sfx_adjust_env_sound_pos(SOUND_LRAW_00A2, 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/common/todo/UnkFunc51.inc.c b/src/world/common/todo/UnkFunc51.inc.c index 0d87718ead..e89ed2186d 100644 --- a/src/world/common/todo/UnkFunc51.inc.c +++ b/src/world/common/todo/UnkFunc51.inc.c @@ -7,7 +7,7 @@ API_CALLABLE(N(UnkFunc51)) { 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_52, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_LRAW_0052, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); return ApiStatus_DONE2; } diff --git a/src/world/dead/area_flo/flo_00/flo_00_2_main.c b/src/world/dead/area_flo/flo_00/flo_00_2_main.c index e8dcc605f5..2ef8fa2bbf 100644 --- a/src/world/dead/area_flo/flo_00/flo_00_2_main.c +++ b/src/world/dead/area_flo/flo_00/flo_00_2_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_Wisterwood_Exit) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittn, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(PlayerMoveTo, 30, -170, 10) EVT_CALL(InterpPlayerYaw, 0, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_1CF, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_01CF, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -100, 20, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -38,7 +38,7 @@ EvtScript N(EVS_Wisterwood_Exit) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_1D0, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_01D0, SOUND_SPACE_MODE_0) EVT_CALL(GotoMap, EVT_PTR("mac_01"), mac_01_ENTRY_5) EVT_WAIT(100) EVT_RETURN @@ -49,7 +49,7 @@ EvtScript N(EVS_Wisterwood_Enter) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittn, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(InterpPlayerYaw, 180, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_1CF, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_01CF, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -100, 30, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -71,7 +71,7 @@ EvtScript N(EVS_Wisterwood_Enter) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_1D0, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_01D0, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilittn, COLLIDER_FLAGS_UPPER_MASK) EVT_RETURN 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 e79fe2f9ab..1427b42007 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 @@ -478,7 +478,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Leap) EVT_WAIT(20) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) - EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) EVT_ADD(LVar1, 50) @@ -491,7 +491,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_WAIT(6) EVT_END_LOOP EVT_WAIT(20) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0188, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) diff --git a/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c b/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c index ddb04fa53f..c24728a8d6 100644 --- a/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c +++ b/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c @@ -252,7 +252,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(PlayerMoveTo, LVar9, LVarB, 8) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.0)) EVT_CALL(NpcJump0, NPC_PARTNER, LVarC, LVarD, LVarE, 5) - EVT_CALL(PlaySound, SOUND_19C) + EVT_CALL(PlaySound, SOUND_019C) EVT_CALL(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, 1, 8) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) @@ -352,7 +352,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o261, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o351, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(AF_FLO_RidingBeanstalk, FALSE) - EVT_CALL(StopSound, SOUND_19D) + EVT_CALL(StopSound, SOUND_019D) EVT_EXEC_WAIT(N(EVS_SetupMusic)) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(DisablePlayerInput, FALSE) @@ -361,7 +361,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { }; EvtScript N(EVS_Scene_BeanstalkGrowing) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o261, SOUND_19B, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o261, SOUND_019B, SOUND_SPACE_MODE_0) EVT_SET(LVarF, 0) EVT_LOOP(100) EVT_ADD(LVarF, 1) diff --git a/src/world/dead/area_flo/flo_03/flo_03_3_npc.c b/src/world/dead/area_flo/flo_03/flo_03_3_npc.c index 4ca8311cec..52e822d0c0 100644 --- a/src/world/dead/area_flo/flo_03/flo_03_3_npc.c +++ b/src/world/dead/area_flo/flo_03/flo_03_3_npc.c @@ -173,7 +173,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim16) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_263, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_0263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_QUESTION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(GetNpcPos, NPC_MontyMole_02, LVar0, LVar1, LVar2) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0052) @@ -228,7 +228,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetNpcAnimation, NPC_Dayzee, ANIM_Dayzee_Anim0D) - EVT_CALL(PlaySoundAtNpc, NPC_Dayzee, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Dayzee, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Dayzee, EMOTE_EXCLAMATION, 45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0056) @@ -405,7 +405,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) @@ -484,7 +484,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_02, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) @@ -563,7 +563,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_03, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) @@ -642,7 +642,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_04, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) diff --git a/src/world/dead/area_flo/flo_07/flo_07_1_music.c b/src/world/dead/area_flo/flo_07/flo_07_1_music.c index 124581dc10..edf315c69c 100644 --- a/src/world/dead/area_flo/flo_07/flo_07_1_music.c +++ b/src/world/dead/area_flo/flo_07/flo_07_1_music.c @@ -12,7 +12,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, 8) EVT_END_SWITCH EVT_END_IF - EVT_CALL(PlaySound, SOUND_80000021) + EVT_CALL(PlaySound, SOUND_LOOP_21) EVT_RETURN EVT_END }; 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 8e2ae843f4..69349de405 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 @@ -47,7 +47,7 @@ EvtScript N(EVS_MakeCrystalBerry) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_END_THREAD - EVT_CALL(PlaySound, SOUND_8000006B) + EVT_CALL(PlaySound, SOUND_LOOP_6B) EVT_EXEC_GET_TID(N(EVS_ShakeGround), MV_GroundShakingScript) EVT_CALL(SpeakToPlayer, NPC_Posie, ANIM_Posie_Strain, ANIM_Posie_Strain, 0, MSG_CH6_0069) EVT_KILL_THREAD(MV_GroundShakingScript) @@ -65,8 +65,8 @@ EvtScript N(EVS_MakeCrystalBerry) = { EVT_CALL(MakeItemEntity, ITEM_CRYSTAL_BERRY, -265, 100, 54, ITEM_SPAWN_MODE_FALL_NEVER_VANISH, GF_FLO07_Item_CrystalBerry) EVT_SET(GF_FLO07_CrystalBerryFellOnLeftSide, TRUE) EVT_END_IF - EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, SOUND_3BC) + EVT_CALL(PlaySound, SOUND_LRAW_03BC | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(func_802D62E4, 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 d312604de6..247a214c1e 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 @@ -41,7 +41,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { 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_21C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_021C, 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) diff --git a/src/world/dead/area_flo/flo_10/flo_10_1_music.c b/src/world/dead/area_flo/flo_10/flo_10_1_music.c index 816998c4de..56146a6b0f 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_1_music.c +++ b/src/world/dead/area_flo/flo_10/flo_10_1_music.c @@ -13,7 +13,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_END_SWITCH EVT_END_IF EVT_IF_GE(GB_StoryProgress, STORY_CH6_FILLED_SPRING_WITH_WATER) - EVT_CALL(PlaySound, SOUND_80000022) + EVT_CALL(PlaySound, SOUND_LOOP_22) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/dead/area_flo/flo_10/flo_10_4_fountain.c b/src/world/dead/area_flo/flo_10/flo_10_4_fountain.c index 829be41f2e..efcf472308 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_4_fountain.c +++ b/src/world/dead/area_flo/flo_10/flo_10_4_fountain.c @@ -189,7 +189,7 @@ EvtScript N(EVS_Scene_ReleaseFountain) = { EVT_CALL(EnableGroup, MODEL_g31, TRUE) EVT_EXEC_WAIT(N(EVS_UnleashFountain)) EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_80000024) + EVT_CALL(PlaySound, SOUND_LOOP_24) EVT_WAIT(360) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) diff --git a/src/world/dead/area_flo/flo_10/flo_10_5_npc.c b/src/world/dead/area_flo/flo_10/flo_10_5_npc.c index a4c5a051a0..5f504b183d 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_5_npc.c +++ b/src/world/dead/area_flo/flo_10/flo_10_5_npc.c @@ -137,7 +137,7 @@ EvtScript N(EVS_NpcInteract_Lily) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 5, MSG_CH6_0079) EVT_CALL(NpcFacePlayer, NPC_SELF, 1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Lily_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_Idle, ANIM_Lily_Idle, 0, MSG_CH6_007A) 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 e8d9507d90..09e5101a04 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_295) + EVT_CALL(PlaySound, SOUND_LRAW_0295) 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 3e8687fa7c..81d70c1e1c 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_295, volume, pan, + sfx_play_sound_with_params(SOUND_LRAW_0295, 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_295, volume, pan, + sfx_play_sound_with_params(SOUND_LRAW_0295, volume, pan, update_lerp(EASING_LINEAR, 500.0f, 0.0f, script->functionTemp[0], 80)); } diff --git a/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c b/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c index 9627b4c91b..d1acb2550d 100644 --- a/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c +++ b/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c @@ -63,7 +63,7 @@ API_CALLABLE(N(UpdateBubbleSoundPos)) { 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_194, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_LRAW_0194, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); return ApiStatus_DONE2; } @@ -85,7 +85,7 @@ Vec3f N(BubbleFlightPath)[] = { EvtScript N(EVS_BubbleFollowPath) = { EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_80000023) + EVT_CALL(PlaySound, SOUND_LOOP_23) EVT_CALL(LoadPath, 165, EVT_PTR(N(BubbleFlightPath)), ARRAY_COUNT(N(BubbleFlightPath)), EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(GetNextPathPos) @@ -98,7 +98,7 @@ EvtScript N(EVS_BubbleFollowPath) = { EVT_IF_EQ(LVar0, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(StopSound, SOUND_80000023) + EVT_CALL(StopSound, SOUND_LOOP_23) EVT_RETURN EVT_END }; @@ -144,7 +144,7 @@ EvtScript N(EVS_RideBigBubble) = { EVT_END_IF EVT_CALL(GetModelCenter, MODEL_o167) EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar0, LVar1, LVar2, 2, 0) - EVT_CALL(PlaySoundAt, SOUND_2F3, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_02F3, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER) EVT_CALL(EnableModel, MODEL_o167, FALSE) EVT_SET(AF_FLO_BigBubbleReady, FALSE) @@ -159,7 +159,7 @@ EvtScript N(EVS_RideBigBubble) = { }; EvtScript N(EVS_BlowBigBubble) = { - EVT_CALL(PlaySoundAt, SOUND_193, SOUND_SPACE_MODE_0, 591, 55, 121) + EVT_CALL(PlaySoundAt, SOUND_0193, SOUND_SPACE_MODE_0, 591, 55, 121) EVT_CALL(EnableModel, MODEL_o167, TRUE) EVT_SETF(LVar2, EVT_FLOAT(1.0)) EVT_SETF(LVar4, EVT_FLOAT(0.0)) diff --git a/src/world/dead/area_flo/flo_15/flo_15_5_stairs.c b/src/world/dead/area_flo/flo_15/flo_15_5_stairs.c index 1dcc1b242b..61ba54106b 100644 --- a/src/world/dead/area_flo/flo_15/flo_15_5_stairs.c +++ b/src/world/dead/area_flo/flo_15/flo_15_5_stairs.c @@ -44,7 +44,7 @@ EvtScript N(EVS_MonitorFallingStairs) = { EVT_END_THREAD EVT_THREAD EVT_LOOP(6) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_187, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_0187, SOUND_SPACE_MODE_0) EVT_WAIT(20) EVT_END_LOOP EVT_END_THREAD 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 b2e5ca66aa..95cd57d9f5 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_80000025, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_LOOP_25, 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 2ffeefc32c..b17d8c6ad9 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 @@ -253,7 +253,7 @@ EvtScript N(EVS_DamagedLeftOnce) = { EVT_SETF(LVar5, EVT_FLOAT(3.0)) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o130, SOUND_1E6, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o130, SOUND_01E6, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar4, EVT_FLOAT(-0.5)) @@ -296,7 +296,7 @@ EvtScript N(EVS_DamagedRightOnce) = { EVT_SETF(LVar5, EVT_FLOAT(-5.0)) EVT_THREAD EVT_WAIT(12) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_1E7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_01E7, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar4, EVT_FLOAT(-0.5)) @@ -342,7 +342,7 @@ EvtScript N(EVS_DamagedLeftTwice) = { EVT_SETF(LVar5, EVT_FLOAT(0.0)) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o174, SOUND_1E7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o174, SOUND_01E7, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar5, EVT_FLOAT(0.5)) @@ -373,7 +373,7 @@ EvtScript N(EVS_DamagedRightTwice) = { EVT_SETF(LVar5, EVT_FLOAT(0.0)) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o127, SOUND_1E7, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o127, SOUND_01E7, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar5, EVT_FLOAT(0.5)) @@ -417,7 +417,7 @@ EvtScript N(EVS_BreakSmokestack) = { EVT_SETF(LVar5, EVT_FLOAT(3.0)) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o131, SOUND_1E6, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o131, SOUND_01E6, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar4, EVT_FLOAT(-0.5)) @@ -455,7 +455,7 @@ EvtScript N(EVS_BreakAntenna) = { EVT_SETF(LVar5, EVT_FLOAT(5.0)) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_1E6, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_01E6, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar4, EVT_FLOAT(-0.5)) @@ -508,7 +508,7 @@ EvtScript N(EVS_DamageMachine) = { EVT_IF_LT(LVar0, -210) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySound, SOUND_1E5) + EVT_CALL(PlaySound, SOUND_01E5) EVT_EXEC_WAIT(N(EVS_ShakeMachine)) EVT_DEBUG_PRINT_VAR(LVarA) EVT_SET(LVar0, LVarA) @@ -580,11 +580,11 @@ EvtScript N(EVS_DamageMachine) = { EVT_USE_BUF(EVT_PTR(N(SmokeBurstPositions))) EVT_LOOP(ARRAY_COUNT(N(SmokeBurstPositions))) EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_190, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0190, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 1, 6) EVT_WAIT(2) EVT_ADD(LVar1, 5) - EVT_CALL(PlaySoundAt, SOUND_190, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0190, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 2, 15) EVT_WAIT(LVar3) EVT_ADD(LVar3, 1) @@ -594,7 +594,7 @@ EvtScript N(EVS_DamageMachine) = { EVT_USE_BUF(EVT_PTR(N(SmokeBurstPositions))) EVT_LOOP(ARRAY_COUNT(N(SmokeBurstPositions))) EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_190, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_0190, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 1, 25) EVT_WAIT(LVar3) EVT_ADD(LVar3, LVar4) @@ -602,14 +602,14 @@ EvtScript N(EVS_DamageMachine) = { EVT_END_LOOP EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_1A0, SOUND_SPACE_MODE_0, 70, 40, 10) + EVT_CALL(PlaySoundAt, SOUND_01A0, SOUND_SPACE_MODE_0, 70, 40, 10) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 70, 40, 10, EVT_FLOAT(3.0), 30) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAt, SOUND_1A0, SOUND_SPACE_MODE_0, 0, 30, 30) + EVT_CALL(PlaySoundAt, SOUND_01A0, SOUND_SPACE_MODE_0, 0, 30, 30) 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_91 | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_LRAW_0091 | 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_flo/flo_18/flo_18_4_npc.c b/src/world/dead/area_flo/flo_18/flo_18_4_npc.c index d6cc145ec8..b3f61bc1b6 100644 --- a/src/world/dead/area_flo/flo_18/flo_18_4_npc.c +++ b/src/world/dead/area_flo/flo_18/flo_18_4_npc.c @@ -89,7 +89,7 @@ EvtScript N(EVS_Scene_LakilesterLikesBeingGood) = { EvtScript N(EVS_GangRetreat) = { EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_FlyingMagikoopa, SOUND_19E, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_FlyingMagikoopa, SOUND_019E, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcFlagBits, NPC_FlyingMagikoopa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_FlyingMagikoopa, 270, 0) EVT_CALL(LoadPath, 60, EVT_PTR(N(RetreatPath_Magikoopa)), ARRAY_COUNT(N(RetreatPath_Magikoopa)), EASING_LINEAR) @@ -104,7 +104,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_END_THREAD EVT_WAIT(15) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_01, SOUND_19F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_01, SOUND_019F, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcFlagBits, NPC_Lakitu_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_Lakitu_01, 270, 0) EVT_CALL(LoadPath, 60, EVT_PTR(N(RetreatPath_Lakitu_01)), ARRAY_COUNT(N(RetreatPath_Lakitu_01)), EASING_LINEAR) @@ -130,7 +130,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_03, SOUND_19F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_03, SOUND_019F, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcFlagBits, NPC_Lakitu_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_Lakitu_03, 270, 0) EVT_CALL(LoadPath, 80, EVT_PTR(N(RetreatPath_Lakitu_03)), ARRAY_COUNT(N(RetreatPath_Lakitu_03)), EASING_LINEAR) diff --git a/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c b/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c index 90743d0c63..9a7b35d262 100644 --- a/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c +++ b/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c @@ -204,7 +204,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(5) EVT_SET(AF_FLO_RidingBeanstalk, FALSE) - EVT_CALL(StopSound, SOUND_19C) + EVT_CALL(StopSound, SOUND_019C) EVT_EXEC_WAIT(N(EVS_SetupMusic)) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(DisablePlayerInput, FALSE) @@ -230,7 +230,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(PlayerMoveTo, LVar9, LVarB, 8) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.0)) EVT_CALL(NpcJump0, NPC_PARTNER, LVarC, LVarD, LVarE, 5) - EVT_CALL(PlaySound, SOUND_19D) + EVT_CALL(PlaySound, SOUND_019D) EVT_CALL(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, 1, 8) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) diff --git a/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c b/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c index d884c077ba..94cb8090e3 100644 --- a/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c +++ b/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c @@ -6,9 +6,9 @@ #include "world/common/enemy/ai/FireBarAI.inc.c" s32 N(FireBar_Sounds)[] = { - SOUND_FIRE_BAR_0, SOUND_FIRE_BAR_1, SOUND_FIRE_BAR_2, SOUND_FIRE_BAR_3, - SOUND_FIRE_BAR_4, SOUND_FIRE_BAR_5, SOUND_FIRE_BAR_6, SOUND_FIRE_BAR_7, - SOUND_FIRE_BAR_8, SOUND_FIRE_BAR_9, SOUND_FIRE_BAR_9, + SOUND_SEQ_FIRE_BAR_0, SOUND_SEQ_FIRE_BAR_1, SOUND_SEQ_FIRE_BAR_2, SOUND_SEQ_FIRE_BAR_3, + SOUND_SEQ_FIRE_BAR_4, SOUND_SEQ_FIRE_BAR_5, SOUND_SEQ_FIRE_BAR_6, SOUND_SEQ_FIRE_BAR_7, + SOUND_SEQ_FIRE_BAR_8, SOUND_SEQ_FIRE_BAR_9, SOUND_SEQ_FIRE_BAR_9, }; EvtScript N(EVS_FireBar_Defeated) = { @@ -31,7 +31,7 @@ EvtScript N(EVS_FireBar_Defeated) = { EVT_SET(LVar1, LVarB) EVT_END_LOOP EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) - EVT_CALL(PlaySoundAt, SOUND_B000000A, SOUND_SPACE_MODE_0, LVar1, LVar2, LVar3) + EVT_CALL(PlaySoundAt, SOUND_SEQ_FIRE_BAR_DEAD, SOUND_SPACE_MODE_0, LVar1, LVar2, LVar3) EVT_LOOP(10) EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) EVT_CALL(RandInt, 50, LVar4) diff --git a/src/world/dead/area_kzn/kzn_17/kzn_17_4_tromp.c b/src/world/dead/area_kzn/kzn_17/kzn_17_4_tromp.c index 4bdc75c3d4..51c28feb35 100644 --- a/src/world/dead/area_kzn/kzn_17/kzn_17_4_tromp.c +++ b/src/world/dead/area_kzn/kzn_17/kzn_17_4_tromp.c @@ -72,7 +72,7 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_EXEC_GET_TID(N(EVS_SpinyTromp_ManageCamera), LVarA) EVT_EXEC(N(EVS_Kolorado_TrompPanic)) EVT_EXEC_GET_TID(N(EVS_SpinyTromp_ShakeCam), MV_ScreenShakeTID) - EVT_CALL(PlaySound, SOUND_8000001B) + EVT_CALL(PlaySound, SOUND_LOOP_1B) EVT_SET(LVar3, 0) EVT_CALL(MakeLerp, -583, 750, 270, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -114,7 +114,7 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_IF_GT(LVar0, 630) EVT_KILL_THREAD(MV_ScreenShakeTID) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_gogo, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_gogo, SOUND_1E4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_gogo, SOUND_01E4, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 2, 32, 32, 1, 10, 45) EVT_CALL(EnableModel, MODEL_mae, FALSE) EVT_CALL(EnableModel, MODEL_ato, TRUE) @@ -143,7 +143,7 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_END_LOOP EVT_SET(GB_StoryProgress, STORY_CH5_HIDDEN_PASSAGE_OPEN) EVT_WAIT(50) - EVT_CALL(StopSound, SOUND_8000001B) + EVT_CALL(StopSound, SOUND_LOOP_1B) EVT_CALL(SetGroupVisibility, MODEL_goron, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_me, FALSE) EVT_KILL_THREAD(LVarA) diff --git a/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c b/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c index 7e4a4fbdbb..28b49b5d58 100644 --- a/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c +++ b/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c @@ -57,7 +57,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_THREAD EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10) EVT_CALL(SetNpcYaw, NPC_SELF, 90) EVT_SET(MV_KoloradoJumpDone, TRUE) diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_1_music.c b/src/world/dead/area_kzn/kzn_19/kzn_19_1_music.c index 1e093561ec..3874a44476 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_1_music.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_1_music.c @@ -11,7 +11,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_END_IF EVT_END_IF //@bug extra endif EVT_CASE_GE(STORY_CH5_MT_LAVA_LAVA_ERUPTING) - EVT_CALL(PlaySound, SOUND_8000006B) + EVT_CALL(PlaySound, SOUND_LOOP_6B) EVT_END_SWITCH EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) 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 7c1f06722b..cff68f689b 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,10 +38,10 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_80000067) + EVT_CALL(PlaySound, SOUND_LOOP_67) EVT_CALL(N(StarSpiritEffectFunc1)) - EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, SOUND_SPACE_MODE_0, 185, 110, -30) + EVT_CALL(StopSound, SOUND_LOOP_67) + EVT_CALL(PlaySoundAt, SOUND_STAR_CARD_APPEARS, SOUND_SPACE_MODE_0, 185, 110, -30) EVT_END_THREAD EVT_THREAD EVT_WAIT(45) @@ -50,7 +50,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_THREAD EVT_WAIT(180) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, SOUND_SPACE_MODE_0, 185, 110, -30) + EVT_CALL(PlaySoundAt, SOUND_0137, SOUND_SPACE_MODE_0, 185, 110, -30) EVT_END_THREAD EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD @@ -78,7 +78,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_IF // wait for pickup EVT_CALL(N(StarSpiritEffectFunc4), 3) - EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_0138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_4, TRANSITION_GET_STAR_CARD) EVT_WAIT(100) diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c index 682e9ca099..b044f38709 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c @@ -479,7 +479,7 @@ EvtScript N(EVS_Misstar_Escape) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(30) EVT_SET(AF_KZN_BossRoomFloorBroken, TRUE) - EVT_CALL(PlaySound, SOUND_8000006B) + EVT_CALL(PlaySound, SOUND_LOOP_6B) EVT_LOOP(0) EVT_WAIT(1) EVT_IF_NE(AF_KZN_BossRoomFloorBroken, TRUE) @@ -677,7 +677,7 @@ EvtScript N(EVS_NpcIdle_LavaPiranha) = { EVT_CALL(PlayerMoveTo, 200, -30, 0) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_3C5, SOUND_SPACE_MODE_0, 330, 25, -50) + EVT_CALL(PlaySoundAt, SOUND_03C5, SOUND_SPACE_MODE_0, 330, 25, -50) EVT_EXEC(N(EVS_PlayVinesAnim_Emerge)) EVT_WAIT(59) EVT_THREAD @@ -932,7 +932,7 @@ EvtScript N(EVS_NpcDefeat_LavaPiranha) = { EVT_CALL(EnableGroup, MODEL_mae, FALSE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ato, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_mae, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAt, SOUND_3C6, SOUND_SPACE_MODE_0, 330, 25, -50) + EVT_CALL(PlaySoundAt, SOUND_03C6, SOUND_SPACE_MODE_0, 330, 25, -50) EVT_EXEC(N(EVS_PlayVinesAnim_Defeat)) EVT_WAIT(1) EVT_CALL(SetNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_LavaPiranha))) diff --git a/src/world/dead/area_kzn/kzn_20/kzn_20_1_music.c b/src/world/dead/area_kzn/kzn_20/kzn_20_1_music.c index b492956812..155ae5216e 100644 --- a/src/world/dead/area_kzn/kzn_20/kzn_20_1_music.c +++ b/src/world/dead/area_kzn/kzn_20/kzn_20_1_music.c @@ -2,7 +2,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_IF_GE(GB_StoryProgress, STORY_CH5_MT_LAVA_LAVA_ERUPTING) - EVT_CALL(PlaySound, SOUND_8000006B) + EVT_CALL(PlaySound, SOUND_LOOP_6B) EVT_END_IF EVT_IF_LT(GB_StoryProgress, STORY_CH5_OPENED_ESCAPE_ROUTE) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) diff --git a/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c b/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c index 1d56585b05..ab1e50c7aa 100644 --- a/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c +++ b/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c @@ -187,9 +187,9 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) EVT_CALL(SetNpcPos, NPC_SELF, -30, 100, 40) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -25, 125, -20, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 20, 150, 5, 10) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 40, 35, 0) @@ -214,7 +214,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 20, 0, 0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -35, 125, -20, 12) EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(1.0)) @@ -227,7 +227,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 5, MSG_CH5_010B) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) @@ -254,11 +254,11 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) EVT_SET(MV_SceneState, SCENE_STATE_KOLORADO_WENT_BACK) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -30, 100, 40, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -15, 75, 80, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 35, 50, 120, 10) EVT_CASE_EQ(SCENE_STATE_KOLORADO_WARNED) EVT_CALL(N(func_80240A68_C96998)) @@ -281,7 +281,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Hurt) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_E8, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_TOUCH_LAVA, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump1, NPC_SELF, LVar0, LVar1, LVar2, 60) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_SET(MV_SceneState, SCENE_STATE_KOLORADO_BURNED) @@ -299,9 +299,9 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Walk) EVT_CALL(SetNpcPos, NPC_SELF, -30, 100, 40) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -25, 125, -20, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 20, 150, 5, 8) EVT_SET(MV_SceneState, SCENE_STATE_SEARCH_FOR_EXIT) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) @@ -447,7 +447,7 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_WAIT(15) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 145, -10, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(SetNpcRotation, NPC_SELF, 0, -30, 0) diff --git a/src/world/dead/area_kzn/kzn_22/kzn_22_1_music.c b/src/world/dead/area_kzn/kzn_22/kzn_22_1_music.c index 01dbe5e059..d8b1799aee 100644 --- a/src/world/dead/area_kzn/kzn_22/kzn_22_1_music.c +++ b/src/world/dead/area_kzn/kzn_22/kzn_22_1_music.c @@ -2,7 +2,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_IF_GE(GB_StoryProgress, STORY_CH5_MT_LAVA_LAVA_ERUPTING) - EVT_CALL(PlaySound, SOUND_8000006B) + EVT_CALL(PlaySound, SOUND_LOOP_6B) EVT_END_IF EVT_CALL(SetMusicTrack, 0, SONG_VOLCANO_ESCAPE, 0, 8) EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_4) diff --git a/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c b/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c index bc84fa73bc..d43ecb28c7 100644 --- a/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c +++ b/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c @@ -50,7 +50,7 @@ EVT_END_IF //@bug unmatched endif // repeatedly jump for the treasure chest EVT_LABEL(1) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 15) EVT_IF_EQ(AF_KZN23_GrabbedKolorado, FALSE) EVT_WAIT(1) diff --git a/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c b/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c index 837a4178cb..306149ec46 100644 --- a/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c +++ b/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c @@ -145,10 +145,10 @@ EvtScript N(EVS_PlayPyroclastSounds) = { EVT_BUF_READ1(LVar1) EVT_END_LOOP EVT_IF_EQ(AF_KZN23_UseAlternateSound, FALSE) - EVT_CALL(PlaySoundAt, SOUND_1AD, SOUND_SPACE_MODE_0, LVar1, 2800, 0) + EVT_CALL(PlaySoundAt, SOUND_01AD, SOUND_SPACE_MODE_0, LVar1, 2800, 0) EVT_SET(AF_KZN23_UseAlternateSound, TRUE) EVT_ELSE - EVT_CALL(PlaySoundAt, SOUND_1AE, SOUND_SPACE_MODE_0, LVar1, 2800, 0) + EVT_CALL(PlaySoundAt, SOUND_01AE, SOUND_SPACE_MODE_0, LVar1, 2800, 0) EVT_SET(AF_KZN23_UseAlternateSound, FALSE) EVT_END_IF EVT_RETURN diff --git a/src/world/partner/bombette.c b/src/world/partner/bombette.c index 4ba18709c2..7f82a43f1e 100644 --- a/src/world/partner/bombette.c +++ b/src/world/partner/bombette.c @@ -314,7 +314,7 @@ API_CALLABLE(N(UseAbility)) { script->functionTemp[1]--; break; } - sfx_play_sound_at_npc(SOUND_80000000, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_LOOP_00, SOUND_SPACE_MODE_0, NPC_PARTNER); N(PlayingFuseSound) = TRUE; add_vec2D_polar(&npc->pos.x, &npc->pos.z, 0.0f, npc->yaw); npc->curAnim = ANIM_WorldBombette_WalkLit; @@ -409,18 +409,18 @@ API_CALLABLE(N(UseAbility)) { } if (N(PlayingFuseSound)) { N(PlayingFuseSound) = FALSE; - sfx_stop_sound(SOUND_80000000); + sfx_stop_sound(SOUND_LOOP_00); } fx_explosion(gPlayerData.partners[gPlayerData.curPartner].level, npc->pos.x, npc->pos.y + (npc->collisionHeight * 0.5f), npc->pos.z); switch (gPlayerData.partners[gPlayerData.curPartner].level) { case 0: - sfx_play_sound_at_npc(SOUND_CANNON1, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_BOMBETTE_BLAST_LV1, SOUND_SPACE_MODE_0, NPC_PARTNER); break; case 1: - sfx_play_sound_at_npc(SOUND_CANNON2, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_BOMBETTE_BLAST_LV2, SOUND_SPACE_MODE_0, NPC_PARTNER); break; case 2: - sfx_play_sound_at_npc(SOUND_CANNON3, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_BOMBETTE_BLAST_LV3, SOUND_SPACE_MODE_0, NPC_PARTNER); break; } exec_ShakeCam1(0, 0, 20); @@ -526,7 +526,7 @@ API_CALLABLE(N(UseAbility)) { partner_clear_player_tracking(npc); if (N(PlayingFuseSound)) { N(PlayingFuseSound) = FALSE; - sfx_stop_sound(SOUND_80000000); + sfx_stop_sound(SOUND_LOOP_00); } temp_ret = ApiStatus_DONE2; return temp_ret; @@ -557,7 +557,7 @@ API_CALLABLE(N(UseAbility)) { temp_ret = ApiStatus_DONE2; if (N(PlayingFuseSound)) { N(PlayingFuseSound) = FALSE; - sfx_stop_sound(SOUND_80000000); + sfx_stop_sound(SOUND_LOOP_00); } temp_ret = ApiStatus_DONE2; break; @@ -684,7 +684,7 @@ void N(pre_battle)(Npc* bombette) { if (N(PlayingFuseSound)) { N(PlayingFuseSound) = FALSE; - sfx_stop_sound(SOUND_80000000); + sfx_stop_sound(SOUND_LOOP_00); } } } diff --git a/src/world/partner/kooper.c b/src/world/partner/kooper.c index de4e4c123b..91ff2ace7d 100644 --- a/src/world/partner/kooper.c +++ b/src/world/partner/kooper.c @@ -395,8 +395,8 @@ API_CALLABLE(N(UseAbility)) { script->USE_STATE = SHELL_TOSS_STATE_KICK; N(ShellTossKickFalling) = FALSE; gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; - sfx_play_sound_at_npc(SOUND_283, SOUND_SPACE_MODE_0, NPC_PARTNER); - sfx_play_sound_at_npc(SOUND_284, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_0283, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_0284, SOUND_SPACE_MODE_0, NPC_PARTNER); } break; @@ -480,7 +480,7 @@ API_CALLABLE(N(UseAbility)) { } if (N(check_for_item_collision)(kooper)) { - sfx_play_sound_at_npc(SOUND_286, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_0286, SOUND_SPACE_MODE_0, NPC_PARTNER); fx_damage_stars(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z, sin_deg(kooper->yaw), -1.0f, -cos_deg(kooper->yaw), 1); sfx_play_sound_at_npc(SOUND_NONE, SOUND_SPACE_MODE_0, NPC_PARTNER); @@ -628,7 +628,7 @@ API_CALLABLE(N(UseAbility)) { kooper->jumpVel = 0.0f; kooper->collisionHeight = 24; kooper->curAnim = ANIM_WorldKooper_Walk; - sfx_stop_sound(SOUND_284); + sfx_stop_sound(SOUND_0284); disable_npc_blur(kooper); if (N(HasItem)) { @@ -749,7 +749,7 @@ void N(pre_battle)(Npc* kooper) { kooper->flags &= ~NPC_FLAG_JUMPING; kooper->flags &= ~NPC_FLAG_IGNORE_WORLD_COLLISION; - sfx_stop_sound(SOUND_284); + sfx_stop_sound(SOUND_0284); set_action_state(ACTION_STATE_IDLE); partner_clear_player_tracking(kooper); disable_npc_blur(kooper); diff --git a/src/world/partner/lakilester.c b/src/world/partner/lakilester.c index 42abe6b537..9ebbdbd213 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_295, 0, 64, pitchShift); + sfx_play_sound_with_params(SOUND_LRAW_0295, 0, 64, pitchShift); } else { pitchShift = update_lerp(EASING_LINEAR, 100.0f, 0.0f, N(MovePitchAdjustment) - 60, 60); - sfx_play_sound_with_params(SOUND_295, 0, 64, pitchShift); + sfx_play_sound_with_params(SOUND_LRAW_0295, 0, 64, pitchShift); } } } @@ -1166,7 +1166,7 @@ API_CALLABLE(N(EnterMap)) { } } - sfx_play_sound_at_npc(SOUND_295, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_LRAW_0295, 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 ee3c38c7bc..533e8596f5 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_294 | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_0294 | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0, NPC_PARTNER); N(DiveState) = DIVE_STATE_SURFACING; } } @@ -529,7 +529,7 @@ API_CALLABLE(N(UseAbility)) { disable_player_shadow(); playerStatus->flags &= ~PS_FLAG_MOVEMENT_LOCKED; suggest_player_anim_always_forward(ANIM_MarioW2_RideSushie); - sfx_play_sound_at_npc(SOUND_2013, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_SUSHIE_EMBARK, SOUND_SPACE_MODE_0, NPC_PARTNER); playerStatus->pos.x = sushie->pos.x; playerStatus->pos.y = sushie->pos.y; playerStatus->pos.z = sushie->pos.z; @@ -557,9 +557,9 @@ API_CALLABLE(N(UseAbility)) { N(get_movement_from_input)(&angle, &speed); if (N(DiveState) == DIVE_STATE_NONE) { if (speed != 0.0f) { - sfx_play_sound_at_npc(SOUND_2015, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_SUSHIE_RIDE_MOVING, SOUND_SPACE_MODE_0, NPC_PARTNER); } else { - sfx_play_sound_at_npc(SOUND_2014, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_SUSHIE_RIDE_IDLE, SOUND_SPACE_MODE_0, NPC_PARTNER); } } } @@ -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_294, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_0294, 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_294, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_0294, SOUND_SPACE_MODE_0, NPC_PARTNER); } break; }