From 354ebdfe209b7bd0643d4ccd76e3c0ffa4e2093c Mon Sep 17 00:00:00 2001 From: Unnunu Date: Mon, 6 Feb 2023 14:21:55 +0300 Subject: [PATCH] last audio function and more documentation (#934) * documented voice * sfx_player * sfx * ambient sounds * fix * fix name * au -> snd --- include/dead.h | 2 +- include/enums.h | 144 ++- include/script_api/common.h | 1 + src/17FEB0.c | 40 +- src/181810.c | 6 +- src/18C790.c | 2 +- src/19FAF0.c | 100 +- src/1A5830.c | 106 +- src/1AC760.c | 80 +- src/23680.c | 10 +- src/7bb60_len_41b0.c | 4 +- src/C50A0.c | 36 +- src/audio.h | 451 +++++---- src/audio/25f00_len_940.c | 43 +- src/audio/28910_len_5090.c | 120 +-- src/audio/2BF90.c | 805 +++++++++++---- src/audio/2d9a0_len_890.c | 303 +++--- src/audio/2e230_len_2190.c | 182 ++-- src/audio/30450.c | 104 +- src/audio/31650.c | 16 +- src/audio/ambience.c | 12 +- src/audio/e0b30_len_b80.c | 8 +- src/audio/private.h | 104 +- src/audio/public.h | 30 +- src/audio/sfx.c | 171 ++-- src/audio/sfx_player.c | 820 ++++++++------- .../area_isk_part_1/actor/stone_chomp.c | 2 +- .../area_isk_part_2/actor/chain_chomp.c | 2 +- src/battle/area_jan/actor/spear_guy.c | 2 +- .../area_kmr_part_2/actor/goomnut_tree.c | 6 +- src/battle/area_kpa2/actor/bowser_intro.c | 2 +- src/battle/area_kpa2/actor/bowser_phase_1.c | 2 +- src/battle/area_kpa2/actor/bowser_phase_2.c | 2 +- src/battle/area_kpa2/actor/bowser_phase_3.c | 2 +- src/battle/area_kpa3/actor/anti_guy.c | 2 +- src/battle/area_kzn/actor/lava_bubble.c | 4 +- src/battle/area_kzn2/actor/lava_piranha.c | 16 +- src/battle/area_omo/actor/anti_guy.c | 2 +- src/battle/area_omo/actor/blue_shy_guy.c | 2 +- src/battle/area_omo/actor/green_shy_guy.c | 2 +- src/battle/area_omo/actor/pink_shy_guy.c | 2 +- src/battle/area_omo/actor/sky_guy.c | 2 +- src/battle/area_omo/actor/yellow_shy_guy.c | 2 +- src/battle/area_omo2_2/actor/stilt_guy.c | 2 +- .../area_trd_part_2/actor/fake_bowser.c | 12 +- src/battle/common/actor/ember.inc.c | 4 +- src/battle/common/actor/red_shy_guy.inc.c | 2 +- src/battle/item/insecticide_herb.c | 2 +- src/battle/partner/lakilester.c | 6 +- src/battle/partner/parakarry.c | 18 +- src/battle/partner/sushie.c | 14 +- src/battle/star/common/peach_star_beam.inc.c | 16 +- src/common/UnkSfxFunc.inc.c | 4 +- src/common/foliage.inc.c | 6 +- src/effects/disable_x.c | 2 +- src/effects/star.c | 2 +- src/encounter.c | 8 +- src/entity/Block.c | 6 +- src/entity/ShatteringBlock.c | 2 +- src/entity/SimpleSpring.c | 4 +- src/entity/jan_iwa/Plants1.c | 6 +- src/evt/fa4c0_len_3bf0.c | 2 +- src/evt/fx_api.c | 4 +- src/evt/player_api.c | 2 +- src/i_spy.c | 2 +- src/main_loop.c | 2 +- src/pulse_stone.c | 2 +- src/state_demo.c | 4 +- src/world/action/hammer.c | 6 +- src/world/action/hit_lava.c | 4 +- src/world/action/jump.c | 4 +- src/world/action/land.c | 6 +- src/world/action/slide.c | 8 +- src/world/action/sneaky_parasol.c | 8 +- src/world/action/spin.c | 2 +- src/world/action/spin_jump.c | 4 +- src/world/action/tornado_jump.c | 6 +- src/world/action/use_munchlesia.c | 2 +- src/world/action/use_tweester.c | 2 +- src/world/area_arn/arn_05/arn_05_3_npc.c | 20 +- src/world/area_arn/arn_07/arn_07_2_main.c | 32 +- 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 | 22 +- src/world/area_arn/arn_08/arn_08_2_main.c | 8 +- src/world/area_arn/arn_09/arn_09_5_npc.c | 6 +- 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 | 10 +- 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 | 36 +- src/world/area_dgb/dgb_01/dgb_01_3_bridges.c | 14 +- src/world/area_dgb/dgb_01/dgb_01_4_entity.c | 2 +- src/world/area_dgb/dgb_01/dgb_01_5_npc.c | 10 +- src/world/area_dgb/dgb_03/dgb_03_3_clock.c | 2 +- src/world/area_dgb/dgb_03/dgb_03_4_entity.c | 2 +- src/world/area_dgb/dgb_08/dgb_08_3_npc.c | 6 +- src/world/area_dgb/dgb_11/dgb_11_3_entity.c | 2 +- src/world/area_dgb/dgb_12/dgb_12_3_spikes.c | 2 +- src/world/area_dgb/dgb_15/dgb_15_4_entity.c | 2 +- src/world/area_dgb/dgb_18/dgb_18_3_npc.c | 28 +- src/world/area_dro/dro_01/dro_01_5_rooms.c | 4 +- src/world/area_dro/dro_01/npc_shop_owner.c | 4 +- src/world/area_dro/dro_02/dro_02_4_rooms.c | 8 +- src/world/area_dro/dro_02/dro_02_5_npc.c | 2 +- src/world/area_dro/dro_02/npc_merlee.c | 4 +- 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 | 6 +- .../area_flo/flo_00/flo_00_5_beanstalk.c | 2 +- src/world/area_flo/flo_03/flo_03_3_npc.c | 32 +- src/world/area_flo/flo_07/flo_07_3_npc.c | 2 +- src/world/area_flo/flo_08/flo_08_4_npc.c | 8 +- src/world/area_flo/flo_10/flo_10_5_npc.c | 2 +- src/world/area_flo/flo_13/flo_13_4_npc.c | 2 +- src/world/area_flo/flo_14/flo_14_3_bubbles.c | 6 +- src/world/area_flo/flo_15/flo_15_5_stairs.c | 8 +- src/world/area_flo/flo_18/flo_18_1_music.c | 2 +- src/world/area_flo/flo_18/flo_18_3_machine.c | 24 +- src/world/area_flo/flo_18/flo_18_4_npc.c | 6 +- src/world/area_flo/flo_21/flo_21_2_main.c | 6 +- src/world/area_flo/flo_21/flo_21_4_npc.c | 10 +- src/world/area_flo/flo_22/flo_22_4_well.c | 2 +- src/world/area_flo/flo_23/flo_23_3_npc.c | 8 +- src/world/area_flo/flo_25/flo_25_3_npc.c | 8 +- src/world/area_hos/hos_03/hos_03_5_foliage.c | 4 +- src/world/area_hos/hos_05/hos_05_7_model_fx.c | 4 +- .../area_hos/hos_06/hos_06_5_merluvlee.c | 2 +- src/world/area_hos/hos_10/hos_10_7_ending.c | 2 +- src/world/area_hos/hos_20/hos_20_2_starship.c | 12 +- 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 | 4 +- src/world/area_isk/isk_03/isk_03_4_switch.c | 4 +- .../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 | 4 +- src/world/area_isk/isk_06/isk_06_4_switch.c | 4 +- src/world/area_isk/isk_07/isk_07_4_stairs.c | 4 +- src/world/area_isk/isk_07/isk_07_5_lock.c | 8 +- src/world/area_isk/isk_07/isk_07_6_switch.c | 4 +- src/world/area_isk/isk_07/isk_07_7_ambush.c | 2 +- src/world/area_isk/isk_09/isk_09_4_stairs.c | 4 +- src/world/area_isk/isk_09/isk_09_5_switch.c | 16 +- src/world/area_isk/isk_11/isk_11_4_scene.c | 10 +- src/world/area_isk/isk_11/isk_11_5_puzzle.c | 22 +- src/world/area_isk/isk_11/isk_11_6_lock.c | 4 +- src/world/area_isk/isk_12/isk_12_3_sand.c | 4 +- src/world/area_isk/isk_12/isk_12_4_switch.c | 24 +- src/world/area_isk/isk_16/isk_16_1_main.c | 6 +- src/world/area_isk/isk_16/isk_16_3_boss.c | 12 +- src/world/area_iwa/iwa_00/iwa_00_1_main.c | 4 +- src/world/area_iwa/iwa_00/iwa_00_3_npc.c | 6 +- src/world/area_iwa/iwa_00/iwa_00_4_slide.c | 4 +- src/world/area_iwa/iwa_01/iwa_01_1_main.c | 4 +- src/world/area_iwa/iwa_01/iwa_01_5_slide.c | 8 +- src/world/area_iwa/iwa_02/iwa_02_3_npc.c | 4 +- src/world/area_iwa/iwa_03/iwa_03_4_slide.c | 4 +- src/world/area_iwa/iwa_04/iwa_04_4_npc.c | 2 +- src/world/area_iwa/iwa_10/iwa_10_1_music.c | 2 +- src/world/area_iwa/iwa_10/iwa_10_2_main.c | 2 +- src/world/area_iwa/iwa_10/iwa_10_4_train.c | 10 +- .../area_iwa/iwa_10/iwa_10_6_parakarry.c | 6 +- src/world/area_iwa/iwa_11/iwa_11_3_train.c | 6 +- src/world/area_jan/jan_00/jan_00_2_npc.c | 18 +- src/world/area_jan/jan_06/B52B40.c | 6 +- src/world/area_jan/jan_13/B767B0.c | 2 +- src/world/area_jan/jan_22/B851A0.c | 4 +- src/world/area_kgr/kgr_02/kgr_02_3_npc.c | 10 +- src/world/area_kkj/kkj_13/AD6200.c | 4 +- src/world/area_kkj/kkj_23/B028A0.c | 2 +- src/world/area_kmr/kmr_00/kmr_00_3_revival.c | 30 +- src/world/area_kmr/kmr_02/kmr_02_2_main.c | 2 +- src/world/area_kmr/kmr_02/kmr_02_3_npc.c | 34 +- src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c | 2 +- src/world/area_kmr/kmr_02/kmr_02_5_entity.c | 10 +- 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 | 14 +- src/world/area_kmr/kmr_09/kmr_09_3_npc.c | 4 +- src/world/area_kmr/kmr_10/kmr_10_4_entity.c | 4 +- src/world/area_kmr/kmr_11/kmr_11_3_scenes.c | 40 +- src/world/area_kmr/kmr_11/kmr_11_4_npc.c | 12 +- 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 | 40 +- .../area_kmr/kmr_20/kmr_20_11_npc_intro.c | 18 +- .../area_kmr/kmr_20/kmr_20_12_npc_epilogue.c | 24 +- src/world/area_kmr/kmr_20/kmr_20_1_music.c | 2 +- .../area_kmr/kmr_20/kmr_20_4_documents.c | 26 +- src/world/area_kmr/kmr_20/kmr_20_5_entity.c | 4 +- src/world/area_kpa/kpa_04/kpa_04_3_statues.c | 2 +- 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 | 2 +- .../area_kpa/kpa_113/kpa_113_4_statues.c | 2 +- .../area_kpa/kpa_115/kpa_115_3_statues.c | 2 +- src/world/area_kpa/kpa_133/kpa_133_3_entity.c | 2 +- src/world/area_kpa/kpa_134/kpa_134_3_chains.c | 18 +- src/world/area_kpa/kpa_134/kpa_134_5_panels.c | 18 +- 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 | 10 +- 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 | 6 +- 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_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 | 4 +- src/world/area_kpa/kpa_83/kpa_83_3_npc.c | 18 +- src/world/area_kpa/kpa_91/kpa_91_2_main.c | 2 +- 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_kpa/kpa_95/kpa_95_3_main.c | 2 +- src/world/area_kzn/kzn_01/kzn_01_2_npc.c | 4 +- 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 | 4 +- src/world/area_kzn/kzn_04/kzn_04_3_npc.c | 2 +- src/world/area_kzn/kzn_06/kzn_06_3_extra.c | 2 +- src/world/area_kzn/kzn_09/kzn_09_3_zipline.c | 4 +- src/world/area_kzn/kzn_09/kzn_09_4_npc.c | 12 +- src/world/area_kzn/kzn_10/kzn_10_2_tromp.c | 6 +- src/world/area_kzn/kzn_11/kzn_11_3_npc.c | 2 +- src/world/area_kzn/kzn_17/kzn_17_3_npc.c | 2 +- src/world/area_kzn/kzn_17/kzn_17_4_tromp.c | 2 +- src/world/area_kzn/kzn_18/kzn_18_2_npc.c | 6 +- src/world/area_kzn/kzn_19/kzn_19_2_main.c | 6 +- src/world/area_kzn/kzn_19/kzn_19_4_npc.c | 4 +- src/world/area_kzn/kzn_20/kzn_20_3_npc.c | 24 +- src/world/area_kzn/kzn_22/kzn_22_4_npc.c | 4 +- src/world/area_kzn/kzn_23/kzn_23_3_npc.c | 4 +- src/world/area_mac/mac_00/mac_00_12_intro.c | 4 +- .../area_mac/mac_00/mac_00_14_epilogue.c | 4 +- src/world/area_mac/mac_00/mac_00_5_npc.c | 8 +- .../area_mac/mac_00/npc/russ_and_thief.inc.c | 86 +- .../area_mac/mac_00/npc/trading_toad.inc.c | 4 +- src/world/area_mac/mac_01/mac_01_2_main.c | 6 +- src/world/area_mac/mac_01/mac_01_9_npc.c | 56 +- .../area_mac/mac_01/npc/flower_gate.inc.c | 50 +- .../area_mac/mac_01/npc/post_office.inc.c | 4 +- .../area_mac/mac_01/npc/read_fortune.inc.c | 10 +- .../area_mac/mac_01/npc/rowf_and_rhuff.inc.c | 52 +- src/world/area_mac/mac_02/mac_02_5_entity.c | 2 +- src/world/area_mac/mac_02/npc/bootler.inc.c | 14 +- src/world/area_mac/mac_02/npc/bubulb.inc.c | 4 +- .../area_mac/mac_02/npc/shyguy_thief.inc.c | 8 +- src/world/area_mac/mac_03/mac_03_3_train.c | 10 +- src/world/area_mac/mac_03/mac_03_4_npc.c | 20 +- src/world/area_mac/mac_03/mac_03_7_oinks.c | 30 +- 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 | 4 +- src/world/area_mac/mac_04/npc_muskular.inc.c | 6 +- .../area_mac/mac_04/npc_toybox_shyguy.inc.c | 18 +- src/world/area_mac/mac_05/mac_05_4_npc.c | 32 +- src/world/area_mac/mac_05/mac_05_5_whale.c | 8 +- src/world/area_mac/mac_06/mac_06_2_whale.c | 8 +- src/world/area_mac/mac_06/mac_06_3_npc.c | 2 +- src/world/area_mgm/mgm_02/mgm_02_2_npc.c | 6 +- src/world/area_mim/common/AnimateGates.inc.c | 4 +- src/world/area_mim/mim_01/mim_01_4_hint.c | 12 +- 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_02/mim_02_5_hint.c | 2 +- src/world/area_mim/mim_03/mim_03_4_hint.c | 12 +- src/world/area_mim/mim_04/mim_04_4_hint.c | 2 +- src/world/area_mim/mim_04/mim_04_6_npc.c | 4 +- src/world/area_mim/mim_05/mim_05_4_hint.c | 10 +- src/world/area_mim/mim_06/mim_06_4_hint.c | 14 +- src/world/area_mim/mim_07/mim_07_4_hint.c | 2 +- src/world/area_mim/mim_07/mim_07_5_gate.c | 4 +- src/world/area_mim/mim_09/mim_09_4_hint.c | 6 +- src/world/area_mim/mim_10/mim_10_4_npc.c | 6 +- src/world/area_mim/mim_11/mim_11_3_gate.c | 16 +- src/world/area_mim/mim_12/mim_12_5_gate.c | 26 +- src/world/area_nok/nok_01/nok_01_7_radio.c | 10 +- src/world/area_nok/nok_11/nok_11_4_npc.c | 10 +- src/world/area_nok/nok_14/nok_14_4_bridge.c | 16 +- src/world/area_nok/nok_14/nok_14_5_npc.c | 2 +- src/world/area_obk/common/RockingChair.inc.c | 2 +- .../area_obk/obk_01/obk_01_3_chandelier.c | 22 +- src/world/area_obk/obk_01/obk_01_4_portrait.c | 24 +- .../area_obk/obk_01/obk_01_5_jump_scare.c | 2 +- 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_03/obk_03_5_stairs.c | 2 +- src/world/area_obk/obk_04/obk_04_3_npc.c | 2 +- src/world/area_obk/obk_04/obk_04_6_game.c | 8 +- src/world/area_obk/obk_05/obk_05_2_main.c | 4 +- .../area_obk/obk_07/obk_07_4_fireplace.c | 2 +- .../area_obk/obk_07/obk_07_6_phonograph.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 | 6 +- src/world/area_obk/obk_08/obk_08_5_npc.c | 2 +- src/world/area_obk/obk_08/obk_08_6_game.c | 4 +- src/world/area_obk/obk_09/obk_09_3_meet_bow.c | 8 +- src/world/area_omo/common/RockingHorse.inc.c | 2 +- .../area_omo/omo_02/omo_02_5_barricade.c | 22 +- src/world/area_omo/omo_02/omo_02_6_npc.c | 8 +- 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 | 12 +- src/world/area_omo/omo_05/omo_05_4_npc.c | 20 +- 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 | 8 +- src/world/area_omo/omo_08/omo_08_3_boxes.c | 56 +- .../area_omo/omo_09/omo_09_4_slot_machine.c | 18 +- src/world/area_omo/omo_09/omo_09_8_scenes.c | 8 +- src/world/area_omo/omo_11/omo_11_3_gizmos.c | 6 +- src/world/area_omo/omo_12/omo_12_3_npc.c | 2 +- src/world/area_omo/omo_13/omo_13_4_npc.c | 4 +- src/world/area_omo/omo_14/omo_14_2_main.c | 2 +- src/world/area_omo/omo_14/omo_14_3_npc.c | 2 +- src/world/area_omo/omo_15/omo_15_2_main.c | 6 +- src/world/area_omo/omo_15/omo_15_3_npc.c | 20 +- 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 | 16 +- src/world/area_pra/pra_01/pra_01_3_npc.c | 6 +- src/world/area_pra/pra_02/pra_02_4_entity.c | 10 +- src/world/area_pra/pra_19/pra_19_3_npc.c | 18 +- src/world/area_pra/pra_22/pra_22_2_main.c | 2 +- src/world/area_pra/pra_33/pra_33_3_entity.c | 2 +- src/world/area_sam/sam_06/sam_06_4_npc.c | 12 +- src/world/area_sam/sam_08/sam_08_5_scenes.c | 3 +- src/world/area_sbk/sbk_02/sbk_02_3_ruins.c | 4 +- src/world/area_sbk/sbk_02/sbk_02_4_npc.c | 10 +- src/world/area_sbk/sbk_20/sbk_20_2_entity.c | 6 +- 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 | 4 +- src/world/area_tik/tik_02/tik_02_5_npc.c | 8 +- src/world/area_tik/tik_03/tik_03_2_main.c | 2 +- src/world/area_tik/tik_05/tik_05_2_main.c | 2 +- src/world/area_tik/tik_05/tik_05_4_entity.c | 4 +- src/world/area_tik/tik_06/tik_06_2_main.c | 6 +- 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 | 10 +- src/world/area_tik/tik_09/tik_09_4_entity.c | 4 +- src/world/area_tik/tik_18/tik_18_4_npc.c | 2 +- src/world/area_tik/tik_19/tik_19_2_main.c | 4 +- src/world/area_tik/tik_25/tik_25_3_entity.c | 8 +- src/world/area_trd/trd_00/trd_00_3_npc.c | 14 +- src/world/area_trd/trd_01/trd_01_1_main.c | 6 +- src/world/area_trd/trd_01/trd_01_2_entity.c | 2 +- src/world/area_trd/trd_02/trd_02_2_entity.c | 2 +- src/world/area_trd/trd_03/trd_03_3_npc.c | 10 +- src/world/area_trd/trd_04/trd_04_2_entity.c | 8 +- src/world/area_trd/trd_05/trd_05_4_npc.c | 2 +- .../area_trd/trd_06/trd_06_3_npc_prisoners.c | 6 +- src/world/area_trd/trd_08/trd_08_3_npc.c | 2 +- src/world/area_trd/trd_09/trd_09_3_npc.c | 4 +- src/world/area_trd/trd_10/trd_10_1_main.c | 6 +- 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/enemy/ai/CleftAI.inc.c | 2 +- .../common/enemy/ai/ClubbaNappingAI.inc.c | 2 +- src/world/common/enemy/ai/FireBarAI.inc.c | 4 +- src/world/common/enemy/ai/FlyingAI.inc.c | 22 +- .../common/enemy/ai/FlyingMagikoopaAI.inc.c | 2 +- src/world/common/enemy/ai/GuardAI.inc.c | 4 +- src/world/common/enemy/ai/HoppingAI.inc.c | 28 +- src/world/common/enemy/ai/LakituAI.inc.c | 4 +- src/world/common/enemy/ai/SentinelAI.inc.c | 7 +- .../common/enemy/ai/States_PatrolAI.inc.c | 4 +- .../complete/MontyMole_GroundAmbush.inc.c | 2 +- .../enemy/complete/MontyMole_WallAmbush.inc.c | 2 +- .../common/enemy/complete/Sentinel.inc.c | 4 +- .../common/enemy/wip/PiranhaPlantAI_01.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 | 6 +- .../dead/area_flo/flo_00/flo_00_5_beanstalk.c | 2 +- src/world/dead/area_flo/flo_03/flo_03_3_npc.c | 32 +- src/world/dead/area_flo/flo_07/flo_07_3_npc.c | 4 +- src/world/dead/area_flo/flo_08/flo_08_4_npc.c | 8 +- src/world/dead/area_flo/flo_10/flo_10_5_npc.c | 2 +- src/world/dead/area_flo/flo_13/flo_13_4_npc.c | 2 +- .../dead/area_flo/flo_14/flo_14_3_bubbles.c | 6 +- .../dead/area_flo/flo_15/flo_15_5_stairs.c | 8 +- .../dead/area_flo/flo_18/flo_18_1_music.c | 2 +- .../dead/area_flo/flo_18/flo_18_3_machine.c | 24 +- src/world/dead/area_flo/flo_18/flo_18_4_npc.c | 6 +- src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c | 2 +- src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c | 2 +- .../dead/area_kzn/kzn_17/kzn_17_4_tromp.c | 2 +- src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c | 6 +- .../dead/area_kzn/kzn_19/kzn_19_2_main.c | 6 +- src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c | 4 +- src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c | 24 +- src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c | 4 +- src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c | 4 +- src/world/partner/bombette.c | 12 +- src/world/partner/bow.c | 6 +- src/world/partner/kooper.c | 24 +- src/world/partner/lakilester.c | 6 +- src/world/partner/parakarry.c | 6 +- src/world/partner/sushie.c | 18 +- src/world/script_api/enter_exit.c | 2 - tools/ignored_funcs.txt | 2 +- ver/us/asm/bss.s | 15 +- ver/us/asm/bss3.s | 8 +- .../nonmatchings/audio/2BF90/func_80051434.s | 941 ------------------ .../audio/2e230_len_2190/au_engine_init.s | 6 +- ver/us/splat.yaml | 4 +- ver/us/symbol_addrs.txt | 144 ++- ver/us/undefined_syms.txt | 2 +- 424 files changed, 3752 insertions(+), 4090 deletions(-) delete mode 100644 ver/us/asm/nonmatchings/audio/2BF90/func_80051434.s diff --git a/include/dead.h b/include/dead.h index 46870c7971..4f31382e82 100644 --- a/include/dead.h +++ b/include/dead.h @@ -309,7 +309,7 @@ #define SetTexPanner dead_SetTexPanner #define func_802D7B10 dead_func_802D7B10 #define Entity_Chest dead_Entity_Chest -#define snd_ambient_80055618 dead_snd_ambient_80055618 +#define snd_ambient_mute dead_snd_ambient_mute #define GetPlayerAnimation dead_GetPlayerAnimation #define SetPlayerSpeed dead_SetPlayerSpeed #define SetItemPos dead_SetItemPos diff --git a/include/enums.h b/include/enums.h index a7a48f02e4..abedef7d04 100644 --- a/include/enums.h +++ b/include/enums.h @@ -539,9 +539,13 @@ enum SoundIDs { SOUND_11 = 0x00000011, SOUND_12 = 0x00000012, SOUND_14 = 0x00000014, + 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, @@ -551,6 +555,8 @@ enum SoundIDs { SOUND_2E = 0x0000002E, SOUND_2F = 0x0000002F, SOUND_30 = 0x00000030, + SOUND_33 = 0x00000033, + SOUND_34 = 0x00000034, SOUND_35 = 0x00000035, SOUND_36 = 0x00000036, SOUND_37 = 0x00000037, @@ -566,18 +572,28 @@ enum SoundIDs { 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, @@ -588,6 +604,7 @@ enum SoundIDs { SOUND_6B = 0x0000006B, SOUND_6C = 0x0000006C, SOUND_6D = 0x0000006D, + SOUND_70 = 0x00000070, SOUND_71 = 0x00000071, SOUND_72 = 0x00000072, SOUND_73 = 0x00000073, @@ -606,15 +623,20 @@ enum SoundIDs { 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, @@ -627,12 +649,17 @@ enum SoundIDs { 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 = 0x000000C1, + SOUND_C2 = 0x000000C2, SOUND_BOO_APPEAR = 0x000000C3, + SOUND_C4 = 0x000000C4, SOUND_MENU_OPEN = 0x000000C5, SOUND_MENU_CLOSE = 0x000000C6, SOUND_MENU_CHANGE_SELECTION = 0x000000C7, @@ -716,6 +743,7 @@ enum SoundIDs { 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, @@ -725,6 +753,8 @@ enum SoundIDs { SOUND_174 = 0x00000174, SOUND_175 = 0x00000175, SOUND_176 = 0x00000176, + SOUND_179 = 0x00000179, + SOUND_17A = 0x0000017A, SOUND_17B = 0x0000017B, SOUND_17C = 0x0000017C, SOUND_17D = 0x0000017D, @@ -738,6 +768,7 @@ enum SoundIDs { SOUND_186 = 0x00000186, SOUND_187 = 0x00000187, SOUND_188 = 0x00000188, + SOUND_189 = 0x00000189, SOUND_18A = 0x0000018A, SOUND_18C = 0x0000018C, SOUND_18D = 0x0000018D, @@ -746,6 +777,10 @@ enum SoundIDs { 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, @@ -767,6 +802,9 @@ enum SoundIDs { 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, @@ -779,6 +817,8 @@ enum SoundIDs { 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, @@ -819,6 +859,8 @@ enum SoundIDs { SOUND_1F5 = 0x000001F5, SOUND_1F9 = 0x000001F9, SOUND_1FA = 0x000001FA, + SOUND_1FB = 0x000001FB, + SOUND_1FC = 0x000001FC, SOUND_1FD = 0x000001FD, SOUND_1FE = 0x000001FE, SOUND_1FF = 0x000001FF, @@ -847,6 +889,7 @@ enum SoundIDs { SOUND_21B = 0x0000021B, SOUND_21C = 0x0000021C, SOUND_MENU_ERROR = 0x0000021D, + SOUND_221 = 0x00000221, SOUND_222 = 0x00000222, SOUND_223 = 0x00000223, SOUND_225 = 0x00000225, @@ -858,6 +901,8 @@ enum SoundIDs { SOUND_22B = 0x0000022B, SOUND_22C = 0x0000022C, SOUND_22D = 0x0000022D, + SOUND_22E = 0x0000022E, + SOUND_22F = 0x0000022F, SOUND_230 = 0x00000230, SOUND_231 = 0x00000231, SOUND_233 = 0x00000233, @@ -885,6 +930,11 @@ enum SoundIDs { 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, @@ -918,6 +968,7 @@ enum SoundIDs { SOUND_2A4 = 0x000002A4, SOUND_2A6 = 0x000002A6, SOUND_2A7 = 0x000002A7, + SOUND_2A8 = 0x000002A8, SOUND_2AA = 0x000002AA, SOUND_UNUSED_2C1 = 0x000002C1, SOUND_2C4 = 0x000002C4, @@ -963,8 +1014,10 @@ enum SoundIDs { 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, @@ -989,6 +1042,16 @@ enum SoundIDs { 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, @@ -998,10 +1061,24 @@ enum SoundIDs { 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, @@ -1033,6 +1110,7 @@ enum SoundIDs { SOUND_368 = 0x00000368, SOUND_369 = 0x00000369, SOUND_36B = 0x0000036B, + SOUND_36C = 0x0000036C, SOUND_36D = 0x0000036D, SOUND_36E = 0x0000036E, SOUND_36F = 0x0000036F, @@ -1059,6 +1137,7 @@ enum SoundIDs { SOUND_385 = 0x00000385, SOUND_386 = 0x00000386, SOUND_387 = 0x00000387, + SOUND_388 = 0x00000388, SOUND_389 = 0x00000389, SOUND_38A = 0x0000038A, SOUND_38B = 0x0000038B, @@ -1066,6 +1145,7 @@ enum SoundIDs { SOUND_38D = 0x0000038D, SOUND_38E = 0x0000038E, SOUND_390 = 0x00000390, + SOUND_391 = 0x00000391, SOUND_392 = 0x00000392, SOUND_393 = 0x00000393, SOUND_394 = 0x00000394, @@ -1078,6 +1158,7 @@ enum SoundIDs { SOUND_39B = 0x0000039B, SOUND_39C = 0x0000039C, SOUND_39D = 0x0000039D, + SOUND_39E = 0x0000039E, SOUND_39F = 0x0000039F, SOUND_3A0 = 0x000003A0, SOUND_3A2 = 0x000003A2, @@ -1100,6 +1181,8 @@ enum SoundIDs { SOUND_3B3 = 0x000003B3, SOUND_3B4 = 0x000003B4, SOUND_3B5 = 0x000003B5, + SOUND_3B6 = 0x000003B6, + SOUND_3B7 = 0x000003B7, SOUND_3B9 = 0x000003B9, SOUND_3BB = 0x000003BB, SOUND_3BC = 0x000003BC, @@ -1155,28 +1238,6 @@ enum SoundIDs { SOUND_THROW = 0x000003FA, SOUND_3FB = 0x000003FB, SOUND_3FC = 0x000003FC, - SOUND_433 = 0x00000433, - SOUND_443 = 0x00000443, - SOUND_453 = 0x00000453, - SOUND_491 = 0x00000491, - SOUND_4A3 = 0x000004A3, - SOUND_4A4 = 0x000004A4, - SOUND_4A5 = 0x000004A5, - SOUND_57C = 0x0000057C, - SOUND_607 = 0x00000607, - SOUND_62A = 0x0000062A, - SOUND_62B = 0x0000062B, - SOUND_648 = 0x00000648, - SOUND_649 = 0x00000649, - SOUND_694 = 0x00000694, - SOUND_6A2 = 0x000006A2, - SOUND_749 = 0x00000749, - SOUND_759 = 0x00000759, - SOUND_76D = 0x0000076D, - SOUND_791 = 0x00000791, - SOUND_7BC = 0x000007BC, - SOUND_7BD = 0x000007BD, - SOUND_B88 = 0x00000B88, SOUND_2003 = 0x00002003, SOUND_2004 = 0x00002004, SOUND_2005 = 0x00002005, @@ -1225,13 +1286,17 @@ enum SoundIDs { 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, @@ -1270,6 +1335,7 @@ enum SoundIDs { SOUND_2075 = 0x00002075, SOUND_BOMB_BLAST = 0x00002076, SOUND_2078 = 0x00002078, + SOUND_2079 = 0x00002079, SOUND_207A = 0x0000207A, SOUND_207B = 0x0000207B, SOUND_207C = 0x0000207C, @@ -1414,8 +1480,7 @@ enum SoundIDs { SOUND_212C = 0x0000212C, SOUND_212D = 0x0000212D, SOUND_212E = 0x0000212E, - SOUND_8161 = 0x00008161, - + // looping sounds SOUND_80000000 = 0x80000000, SOUND_80000001 = 0x80000001, SOUND_80000002 = 0x80000002, @@ -1509,10 +1574,13 @@ enum SoundIDs { SOUND_8000006A = 0x8000006A, SOUND_8000006B = 0x8000006B, SOUND_8000006C = 0x8000006C, - + // exit doors + SOUND_DOOR_OPEN = 0x90000000, + SOUND_DOOR_CLOSE = 0x90000001, + // room doors 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, @@ -1545,12 +1613,6 @@ enum SoundIDs { SOUND_B0000021 = 0xB0000021, }; -enum SoundInstanceFlags { - SOUND_INSTANCE_FLAG_1 = 0x00000001, - SOUND_INSTANCE_FLAG_2 = 0x00000002, - SOUND_INSTANCE_FLAG_4 = 0x00000004, -}; - enum SoundSpatializationFlags { SOUND_SPACE_MODE_MASK = 0x0000FFFF, SOUND_SPACE_MODE_0 = 0x00000000, @@ -1575,9 +1637,17 @@ enum SoundType { }; enum SoundIDBits { - SOUND_ID_10000 = 0x00010000, + SOUND_ID_STOP = 0x00008000, SOUND_ID_LOWER = 0x000023FF, - SOUND_ID_MID = 0x00000C00, + SOUND_ID_ADJUST = 0x00001000, + SOUND_ID_TRIGGER_MASK = 0x00000C00, + SOUND_ID_TRIGGER_CHANGE_SOUND = 0x00000400, + SOUND_ID_TRIGGER_CHANGE_VOLUME = 0x00000800, +}; + +enum SoundTriggers { + SOUND_TRIGGER_CHANGE_SOUND = 1, + SOUND_TRIGGER_CHANGE_VOLUME = 2, }; typedef enum AuResult { @@ -3377,7 +3447,7 @@ enum NpcFlags { NPC_FLAG_MOTION_BLUR = 0x00100000, ///< Gives motion blur effect as NPC moves. Set by enable_npc_blur NPC_FLAG_200000 = 0x00200000, NPC_FLAG_400000 = 0x00400000, - NPC_FLAG_HIDING = 0x00800000, + NPC_FLAG_HIDING = 0x00800000, NPC_FLAG_1000000 = 0x01000000, // TODO. fails assert in set_npc_sprite NPC_FLAG_SIMPLIFIED_PHYSICS = 0x02000000, /// Use simpler, faster physics calculations: @@ -4898,8 +4968,8 @@ enum MapRoomNotifications { ROOM_UPDATE_ENTER_BEGIN = 0, ROOM_UPDATE_ENTER_DONE = 1, ROOM_UPDATE_EXIT_BEGIN = 2, - ROOM_UPDATE_EXIT_END = 3, - // when handling ROOM_UPDATE_ENTER_BEGIN, listener may return this to cancel the door opening. useful for locked doors. + ROOM_UPDATE_EXIT_END = 3, + // when handling ROOM_UPDATE_ENTER_BEGIN, listener may return this to cancel the door opening. useful for locked doors. ROOM_UPDATE_REQUEST_CANCEL = -1, // anim move door updates ROOM_MOVE_DOOR_ENTER_OPEN = 0, diff --git a/include/script_api/common.h b/include/script_api/common.h index c22de5137f..1a87f0ea42 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -202,6 +202,7 @@ ApiStatus FullyRestoreSP(Evt* script, s32 isInitialCall); ApiStatus EnablePartner(Evt* script, s32 isInitialCall); ApiStatus DisablePartner(Evt* script, s32 isInitialCall); ApiStatus UseEntryHeading(Evt* script, s32 isInitialCall); +ApiStatus func_802D2148(Evt* script, s32 isInitialCall); ApiStatus UseExitHeading(Evt* script, s32 isInitialCall); ApiStatus InitVirtualEntityList(Evt* script, s32 isInitialCall); ApiStatus DisablePulseStone(Evt* script, s32 isInitialCall); diff --git a/src/17FEB0.c b/src/17FEB0.c index e89893e27b..bf686e360a 100644 --- a/src/17FEB0.c +++ b/src/17FEB0.c @@ -26,11 +26,11 @@ s32 calc_item_check_hit(void) { return HIT_RESULT_MISS; } if (actor->stoneStatus == STATUS_STONE) { - sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); return HIT_RESULT_IMMUNE; } if ((battleStatus->currentAttackElement & DAMAGE_TYPE_JUMP) && (actorPart->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP)) { - sfx_play_sound_at_position(SOUND_HIT_NORMAL, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_NORMAL, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); return HIT_RESULT_LANDED_ON_SPIKE; } } else { @@ -114,7 +114,7 @@ s32 calc_item_damage_enemy(void) { } if (target->stoneStatus == STATUS_STONE) { - sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 1); show_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 0); @@ -156,7 +156,7 @@ s32 calc_item_damage_enemy(void) { ret = 2; if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS)) { dispatchEvent = EVENT_SCRIPTED_IMMUNE; - sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); battleStatus->lastAttackDamage = 0; } else { dispatchEvent = EVENT_SCRIPTED_IMMUNE; @@ -183,7 +183,7 @@ s32 calc_item_damage_enemy(void) { if (targetPart->flags & ACTOR_PART_FLAG_2000) { dispatch_event_actor(target, dispatchEvent); func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3); - sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); return 2; } if (battleStatus->currentAttackElement & DAMAGE_TYPE_2000) { @@ -381,7 +381,7 @@ s32 calc_item_damage_enemy(void) { ret = 0; sp1C = TRUE; gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10 | BS_FLAGS1_8 | BS_FLAGS1_ACTORS_VISIBLE; - sfx_play_sound_at_position(SOUND_231, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); wasStatusInflicted = TRUE; gBattleStatus.flags1 |= BS_FLAGS1_40; } else { @@ -397,7 +397,7 @@ s32 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, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->lastAttackDamage > 0 || (battleStatus->currentAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS) && sp1C) { @@ -441,18 +441,18 @@ s32 calc_item_damage_enemy(void) { if (battleStatus->lastAttackDamage > 0 && !sp18) { func_80267018(target, 1); if (isFireDamage) { - sfx_play_sound_at_position(SOUND_HIT_FIRE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_FIRE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else if (isElectricDamage) { - sfx_play_sound_at_position(SOUND_HIT_SHOCK, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_SHOCK, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else if (isIceDamage) { - sfx_play_sound_at_position(SOUND_HIT_ICE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_ICE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else { - sfx_play_sound_at_position(SOUND_HIT_NORMAL, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_NORMAL, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } } if ((battleStatus->lastAttackDamage <= 0 && !wasStatusInflicted) || (targetPart->flags & ACTOR_FLAG_2000)) { - sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_SLEEP) && wasStatusInflicted) { @@ -460,35 +460,35 @@ s32 calc_item_damage_enemy(void) { script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_SLEEP, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_SLEEP, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_DIZZY) && wasStatusInflicted) { script = start_script(&DoDizzyHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_PARALYZE) && wasStatusInflicted) { script = start_script(&DoParalyzeHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_POISON) && wasStatusInflicted) { script = start_script(&DoPoisonHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_STOP) && wasStatusInflicted) { script = start_script(&DoStopHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_FROZEN) && wasStatusInflicted) { script = start_script(&DoFreezeHit, EVT_PRIORITY_A, 0); @@ -496,7 +496,7 @@ s32 calc_item_damage_enemy(void) { script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; script->varTablePtr[3] = target; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_SHRINK) && wasStatusInflicted) { script = start_script(&DoShrinkHit, EVT_PRIORITY_A, 0); @@ -504,10 +504,10 @@ s32 calc_item_damage_enemy(void) { script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; script->varTablePtr[3] = target; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackElement & DAMAGE_TYPE_SMASH) && (target->actorType == ACTOR_TYPE_GOOMNUT_TREE)) { - sfx_play_sound_at_position(SOUND_SMASH_GOOMNUT_TREE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_SMASH_GOOMNUT_TREE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } func_80266ADC(target); diff --git a/src/181810.c b/src/181810.c index 4f6add8bf3..6e5123c9b5 100644 --- a/src/181810.c +++ b/src/181810.c @@ -397,7 +397,7 @@ ApiStatus PlaySoundAtActor(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - sfx_play_sound_at_position(soundID, 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(soundID, SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); return ApiStatus_DONE2; } @@ -414,7 +414,7 @@ ApiStatus PlaySoundAtPart(Evt* script, s32 isInitialCall) { } part = get_actor_part(get_actor(actorID), partIndex); - sfx_play_sound_at_position(soundID, 0, part->currentPos.x, part->currentPos.y, part->currentPos.z); + sfx_play_sound_at_position(soundID, SOUND_SPACE_MODE_0, part->currentPos.x, part->currentPos.y, part->currentPos.z); return ApiStatus_DONE2; } @@ -432,7 +432,7 @@ ApiStatus PlayLoopingSoundAtActor(Evt* script, s32 isInitialCall) { actor = get_actor(actorID); actor->loopingSoundID[idx] = soundID; - sfx_play_sound_at_position(soundID, 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(soundID, SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); return ApiStatus_DONE2; } diff --git a/src/18C790.c b/src/18C790.c index f0b3122712..67923a2352 100644 --- a/src/18C790.c +++ b/src/18C790.c @@ -980,7 +980,7 @@ void btl_state_update_celebration(void) { if (battleStatus->currentButtonsPressed & BUTTON_A) { if (!CantLevelUpStat[battleStatus->currentSubmenu]) { sfx_play_sound(SOUND_MENU_NEXT); - sfx_play_sound(SOUND_749); + sfx_play_sound(SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND); gBattleSubState = BTL_SUBSTATE_CELEBRATE_LEVEL_UP_UPGRADE; } else { sfx_play_sound(SOUND_MENU_ERROR); diff --git a/src/19FAF0.c b/src/19FAF0.c index b9a66df6aa..71e36b1b26 100644 --- a/src/19FAF0.c +++ b/src/19FAF0.c @@ -202,19 +202,19 @@ s32 calc_player_test_enemy(void) { { return HIT_RESULT_MISS; } else if (target->stoneStatus == STATUS_STONE) { - sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); return HIT_RESULT_IMMUNE; } else if ((battleStatus->currentAttackElement & DAMAGE_TYPE_JUMP) && (part->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP) && !player_team_is_ability_active(player, ABILITY_SPIKE_SHIELD)) { - sfx_play_sound_at_position(SOUND_108, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); return HIT_RESULT_LANDED_ON_SPIKE; } else if (!(battleStatus->currentAttackElement & (DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_JUMP)) && (part->eventFlags & ACTOR_EVENT_FLAG_SPIKY_FRONT) && (!(battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_4) && !player_team_is_ability_active(player, ABILITY_SPIKE_SHIELD))) { - sfx_play_sound_at_position(SOUND_108, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_108, 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_TRIGGERED_EXPLODE; @@ -292,7 +292,7 @@ s32 calc_player_damage_enemy(void) { } if (target->stoneStatus == STATUS_STONE) { - sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 1); show_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 0); return (gBattleStatus.flags1 & (BS_FLAGS1_200 | BS_FLAGS1_40)) ? 1 : 0; @@ -306,7 +306,7 @@ s32 calc_player_damage_enemy(void) { player_team_is_ability_active(player, ABILITY_SPIKE_SHIELD)) { if (!(battleStatus->currentAttackElement & (DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_SMASH))) { if (targetPart->eventFlags & ACTOR_EVENT_FLAG_8000) { - sfx_play_sound_at_position(SOUND_HIT_PLAYER_FIRE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_PLAYER_FIRE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_player_1(1, EVENT_BURN_CONTACT); dispatch_event_actor(target, EVENT_EXPLODE_TRIGGER); return -1; @@ -314,7 +314,7 @@ s32 calc_player_damage_enemy(void) { if (targetPart->eventFlags & ACTOR_EVENT_FLAG_FIREY && !(battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_10) && !(player_team_is_ability_active(player, ABILITY_FIRE_SHIELD)) && !(player_team_is_ability_active(player, ABILITY_ICE_POWER))) { - sfx_play_sound_at_position(SOUND_HIT_PLAYER_FIRE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_PLAYER_FIRE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_player_1(1, EVENT_BURN_CONTACT); dispatch_event_actor(target, EVENT_BURN_TAUNT); return -1; @@ -323,7 +323,7 @@ s32 calc_player_damage_enemy(void) { if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE && battleStatus->currentAttackElement & DAMAGE_TYPE_FIRE && targetPart->eventFlags & (ACTOR_EVENT_FLAG_400 | ACTOR_EVENT_FLAG_EXPLOSIVE)) { - sfx_play_sound_at_position(SOUND_HIT_PLAYER_FIRE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_PLAYER_FIRE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_event_actor(target, EVENT_EXPLODE_TRIGGER); return (gBattleStatus.flags1 & (BS_FLAGS1_200 | BS_FLAGS1_40)) ? 1 : 0; } @@ -331,13 +331,13 @@ s32 calc_player_damage_enemy(void) { if (!(battleStatus->currentAttackElement & (DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_SMASH)) && targetPart->eventFlags & ACTOR_EVENT_FLAG_200000 && !(battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_80) && !(player_team_is_ability_active(player, ABILITY_SPIKE_SHIELD))) { - sfx_play_sound_at_position(SOUND_108, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_108, 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 -1; } } else { - sfx_play_sound_at_position(SOUND_108, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_108, 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 -1; @@ -370,22 +370,22 @@ s32 calc_player_damage_enemy(void) { switch (attackFxType) { case 1: - sfx_play_sound_at_position(SOUND_372, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_372, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); break; case 2: - sfx_play_sound_at_position(SOUND_F1, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_F1, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); break; case 3: - sfx_play_sound_at_position(SOUND_DC, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_DC, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); break; case 4: - sfx_play_sound_at_position(SOUND_2072, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_2072, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); break; case 5: - sfx_play_sound_at_position(SOUND_2073, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_2073, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); break; case 6: - sfx_play_sound_at_position(SOUND_205B, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_205B, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); break; } } @@ -561,7 +561,7 @@ s32 calc_player_damage_enemy(void) { if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS)) { dispatchEvent = EVENT_SCRIPTED_IMMUNE; - sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else { dispatchEvent = (target->currentHP <= 0) ? EVENT_DEATH : EVENT_SCRIPTED_IMMUNE; } @@ -593,12 +593,12 @@ s32 calc_player_damage_enemy(void) { !(targetPart->eventFlags & ACTOR_EVENT_FLAG_ELECTRIFIED)) || battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT || battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_8 || battleStatus->currentAttackElement & DAMAGE_TYPE_ELECTRIC) { dispatchEvent = (!(gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE)) ? EVENT_SCRIPTED_IMMUNE : EVENT_IMMUNE; - sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_event_actor(target, dispatchEvent); func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3); return (gBattleStatus.flags1 & (BS_FLAGS1_200 | BS_FLAGS1_40)) ? 1 : 0; } else { - sfx_play_sound_at_position(SOUND_HIT_PLAYER_SHOCK, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_PLAYER_SHOCK, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); func_80251474(player); dispatch_damage_event_player_1(1, EVENT_SHOCK_HIT); return -1; @@ -829,7 +829,7 @@ s32 calc_player_damage_enemy(void) { if (tempBinary && gBattleStatus.flags1 & BS_FLAGS1_40 || gBattleStatus.flags1 & BS_FLAGS1_40) { if (!(gBattleStatus.flags1 & BS_FLAGS1_80)) { if (player->actorTypeData1[5]) { - sfx_play_sound_at_position(player->actorTypeData1[5], 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(player->actorTypeData1[5], SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->lastAttackDamage > 0 && (sfx_play_sound(SOUND_231), battleStatus->lastAttackDamage > 0) || // TODO remove sfx_play_sound from conditional @@ -857,19 +857,19 @@ s32 calc_player_damage_enemy(void) { func_80267018(target, 1); if (isFireDamage) { - sfx_play_sound_at_position(SOUND_HIT_FIRE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_FIRE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else if (isElectricDamage) { - sfx_play_sound_at_position(SOUND_HIT_SHOCK, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_SHOCK, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else if (isIceDamage) { - sfx_play_sound_at_position(SOUND_HIT_ICE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_ICE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else { - sfx_play_sound_at_position(SOUND_HIT_NORMAL, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_NORMAL, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } } } if (battleStatus->lastAttackDamage <= 0 && !tempBinary && !sp20 || targetPart->flags & ACTOR_PART_FLAG_2000) { - sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->currentAttackStatus & STATUS_FLAG_SLEEP && wasStatusInflicted) { @@ -877,7 +877,7 @@ s32 calc_player_damage_enemy(void) { evt->varTable[0] = state->goalPos.x; evt->varTable[1] = state->goalPos.y; evt->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_SLEEP, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_SLEEP, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->currentAttackStatus & STATUS_FLAG_DIZZY && wasStatusInflicted) { @@ -885,7 +885,7 @@ s32 calc_player_damage_enemy(void) { evt->varTable[0] = state->goalPos.x; evt->varTable[1] = state->goalPos.y; evt->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->currentAttackStatus & STATUS_FLAG_PARALYZE && wasStatusInflicted) { @@ -893,7 +893,7 @@ s32 calc_player_damage_enemy(void) { evt->varTable[0] = state->goalPos.x; evt->varTable[1] = state->goalPos.y; evt->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->currentAttackStatus & STATUS_FLAG_POISON && wasStatusInflicted) { @@ -901,7 +901,7 @@ s32 calc_player_damage_enemy(void) { evt->varTable[0] = state->goalPos.x; evt->varTable[1] = state->goalPos.y; evt->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->currentAttackStatus & STATUS_FLAG_STOP && wasStatusInflicted) { @@ -909,7 +909,7 @@ s32 calc_player_damage_enemy(void) { evt->varTable[0] = state->goalPos.x; evt->varTable[1] = state->goalPos.y; evt->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->currentAttackStatus & STATUS_FLAG_FROZEN && wasStatusInflicted) { @@ -918,7 +918,7 @@ s32 calc_player_damage_enemy(void) { evt->varTable[1] = state->goalPos.y; evt->varTable[2] = state->goalPos.z; evt->varTablePtr[3] = target; - sfx_play_sound_at_position(SOUND_HIT_PLAYER_ICE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_PLAYER_ICE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->currentAttackStatus & STATUS_FLAG_SHRINK && wasStatusInflicted) { @@ -927,11 +927,11 @@ s32 calc_player_damage_enemy(void) { evt->varTable[1] = state->goalPos.y; evt->varTable[2] = state->goalPos.z; evt->varTablePtr[3] = target; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->currentAttackElement & DAMAGE_TYPE_SMASH && target->actorType == ACTOR_TYPE_GOOMNUT_TREE) { - sfx_play_sound_at_position(SOUND_SMASH_GOOMNUT_TREE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_SMASH_GOOMNUT_TREE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } func_80266ADC(target); @@ -950,7 +950,7 @@ s32 calc_player_damage_enemy(void) { targetPart->eventFlags & ACTOR_EVENT_FLAG_ELECTRIFIED) && !(battleStatus->currentAttackElement & (DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_ELECTRIC)) && !(battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_8)) { - sfx_play_sound_at_position(SOUND_HIT_PLAYER_SHOCK, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_PLAYER_SHOCK, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); func_80251474(player); dispatch_damage_event_player_1(1, EVENT_SHOCK_HIT); return -1; @@ -1016,7 +1016,7 @@ s32 dispatch_damage_event_player(s32 damageAmount, s32 event, s32 arg2) { if (!arg2) { set_goal_pos_to_part(state, ACTOR_PLAYER, 0); - sfx_play_sound_at_position(SOUND_HIT_NORMAL, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_NORMAL, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } show_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage, 1); @@ -1108,7 +1108,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, 0, player->currentPos.x, player->currentPos.y, player->currentPos.z); + sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->currentPos.x, player->currentPos.y, player->currentPos.z); } script->functionTemp[0] = TRUE; } @@ -1153,7 +1153,7 @@ ApiStatus func_80273444(Evt* script, s32 isInitialCall) { play_movement_dust_effects(2, player->currentPos.x, player->currentPos.y, player->currentPos.z, player->yaw); } if (script->functionTemp[1] != 2) { - sfx_play_sound_at_position(SOUND_SOFT_LAND, 0, player->currentPos.x, player->currentPos.y, player->currentPos.z); + sfx_play_sound_at_position(SOUND_SOFT_LAND, SOUND_SPACE_MODE_0, player->currentPos.x, player->currentPos.y, player->currentPos.z); } return ApiStatus_DONE1; @@ -1221,7 +1221,7 @@ ApiStatus PlayerFallToGoal(Evt* script, s32 isInitialCall) { player->currentPos.y = state->goalPos.y; player->currentPos.z = state->goalPos.z; play_movement_dust_effects(2, player->currentPos.x, player->currentPos.y, player->currentPos.z, player->yaw); - sfx_play_sound_at_position(SOUND_SOFT_LAND, 0, player->currentPos.x, player->currentPos.y, player->currentPos.z); + sfx_play_sound_at_position(SOUND_SOFT_LAND, SOUND_SPACE_MODE_0, player->currentPos.x, player->currentPos.y, player->currentPos.z); return ApiStatus_DONE1; } return ApiStatus_BLOCK; @@ -1267,7 +1267,7 @@ ApiStatus PlayerLandJump(Evt *script, s32 isInitialCall) { player->currentPos.y = 0.0f; play_movement_dust_effects(2, player->currentPos.x, player->currentPos.y, player->currentPos.z, player->yaw); - sfx_play_sound_at_position(SOUND_SOFT_LAND, 0, player->currentPos.x, player->currentPos.y, player->currentPos.z); + sfx_play_sound_at_position(SOUND_SOFT_LAND, SOUND_SPACE_MODE_0, player->currentPos.x, player->currentPos.y, player->currentPos.z); return ApiStatus_DONE1; } @@ -1329,9 +1329,9 @@ ApiStatus PlayerRunToGoal(Evt* script, s32 isInitialCall) { player->footStepCounter++; playerState->distance = 0.0f; if ((player->footStepCounter % 2) != 0) { - sfx_play_sound_at_position(SOUND_STEP_NORMAL1, 0, player->currentPos.x, player->currentPos.y, player->currentPos.z); + sfx_play_sound_at_position(SOUND_STEP_NORMAL1, SOUND_SPACE_MODE_0, player->currentPos.x, player->currentPos.y, player->currentPos.z); } else { - sfx_play_sound_at_position(SOUND_STEP_NORMAL2, 0, player->currentPos.x, player->currentPos.y, player->currentPos.z); + sfx_play_sound_at_position(SOUND_STEP_NORMAL2, SOUND_SPACE_MODE_0, player->currentPos.x, player->currentPos.y, player->currentPos.z); } } @@ -1404,9 +1404,9 @@ ApiStatus CancelablePlayerRunToGoal(Evt* script, s32 isInitialCall) { player->footStepCounter++; playerState->distance = 0.0f; if ((player->footStepCounter % 2) != 0) { - sfx_play_sound_at_position(SOUND_STEP_NORMAL1, 0, player->currentPos.x, player->currentPos.y, player->currentPos.z); + sfx_play_sound_at_position(SOUND_STEP_NORMAL1, SOUND_SPACE_MODE_0, player->currentPos.x, player->currentPos.y, player->currentPos.z); } else { - sfx_play_sound_at_position(SOUND_STEP_NORMAL2, 0, player->currentPos.x, player->currentPos.y, player->currentPos.z); + sfx_play_sound_at_position(SOUND_STEP_NORMAL2, SOUND_SPACE_MODE_0, player->currentPos.x, player->currentPos.y, player->currentPos.z); } } @@ -1776,7 +1776,7 @@ ApiStatus func_80274A18(Evt* script, s32 isInitialCall) { playerState->velocity = 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, 0, player->currentPos.x, player->currentPos.y, player->currentPos.z); + sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->currentPos.x, player->currentPos.y, player->currentPos.z); script->functionTemp[0] = 1; } @@ -1917,7 +1917,7 @@ ApiStatus func_802752AC(Evt* script, s32 isInitialCall) { playerState->velocity = 0.0f; playerState->speed += temp / playerState->moveTime; set_animation(ACTOR_PLAYER, 0, playerState->animJumpRise); - sfx_play_sound_at_position(SOUND_160, 0, player->currentPos.x, player->currentPos.y, player->currentPos.z); + sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->currentPos.x, player->currentPos.y, player->currentPos.z); playerState->unk_24 = 90.0f; playerState->bounceDivisor = 45.0f; playerState->unk_28 = 360 / playerState->moveTime; @@ -2021,7 +2021,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, 0, player->currentPos.x, player->currentPos.y, player->currentPos.z); + sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->currentPos.x, player->currentPos.y, player->currentPos.z); set_animation(ACTOR_PLAYER, 0, playerState->animJumpFall); player->rotationPivotOffset.y = 14; player->rotation.z -= 66.0f; @@ -2161,8 +2161,8 @@ ApiStatus func_80275F00(Evt* script, s32 isInitialCall) { playerState->unk_30.z = (playerState->goalPos.z - playerState->currentPos.z) / playerState->moveTime; playerState->speed += temp / playerState->moveTime; set_animation(ACTOR_PLAYER, 0, playerState->animJumpFall); - sfx_play_sound_at_position(SOUND_160, 0, player->currentPos.x, player->currentPos.y, player->currentPos.z); - sfx_play_sound_at_position(SOUND_TORNADO_JUMP, 0, player->currentPos.x, player->currentPos.y, player->currentPos.z); + sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->currentPos.x, player->currentPos.y, player->currentPos.z); + sfx_play_sound_at_position(SOUND_TORNADO_JUMP, SOUND_SPACE_MODE_0, player->currentPos.x, player->currentPos.y, player->currentPos.z); playerState->unk_18.x = 0.0f; playerState->unk_18.y = 0.0f; playerState->unk_24 = 90.0f; @@ -2205,8 +2205,8 @@ ApiStatus func_80275F00(Evt* script, s32 isInitialCall) { playerState->unk_30.z = (playerState->goalPos.z - playerState->currentPos.z) / playerState->moveTime; playerState->speed += temp / playerState->moveTime; set_animation(ACTOR_PLAYER, 0, playerState->animJumpRise); - sfx_play_sound_at_position(SOUND_160, 0, player->currentPos.x, player->currentPos.y, player->currentPos.z); - sfx_play_sound_at_position(SOUND_TORNADO_JUMP, 0, player->currentPos.x, player->currentPos.y, player->currentPos.z); + sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->currentPos.x, player->currentPos.y, player->currentPos.z); + sfx_play_sound_at_position(SOUND_TORNADO_JUMP, SOUND_SPACE_MODE_0, player->currentPos.x, player->currentPos.y, player->currentPos.z); playerState->unk_18.x = 0.0f; playerState->unk_18.y = 0.0f; playerState->unk_24 = 90.0f; @@ -2260,7 +2260,7 @@ ApiStatus func_80275F00(Evt* script, s32 isInitialCall) { playerState->unk_30.z = (playerState->goalPos.z - playerState->currentPos.z) / playerState->moveTime; playerState->speed += temp / playerState->moveTime; set_animation(ACTOR_PLAYER, 0, playerState->animJumpRise); - sfx_play_sound_at_position(SOUND_160, 0, player->currentPos.x, player->currentPos.y, player->currentPos.z); + sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->currentPos.x, player->currentPos.y, player->currentPos.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 e6c3e49e5e..7cf92f5f85 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -42,60 +42,60 @@ void play_hit_sound(Actor* actor, f32 x, f32 y, f32 z, u32 hitSound) { switch (hitSound) { case HIT_SOUND_MISS: - sfx_play_sound_at_position(SOUND_IMMUNE, 0, x, y, z); + sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, x, y, z); break; case HIT_SOUND_BONES: - sfx_play_sound_at_position(SOUND_HIT_BONES, 0, x, y, z); + sfx_play_sound_at_position(SOUND_HIT_BONES, SOUND_SPACE_MODE_0, x, y, z); break; case HIT_SOUND_NORMAL: switch (actorClass) { case ACTOR_CLASS_PLAYER: - sfx_play_sound_at_position(SOUND_HIT_PLAYER_NORMAL, 0, x, y, z); + sfx_play_sound_at_position(SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0, x, y, z); break; case ACTOR_CLASS_PARTNER: - sfx_play_sound_at_position(SOUND_HIT_NORMAL, 0, x, y, z); + sfx_play_sound_at_position(SOUND_HIT_NORMAL, SOUND_SPACE_MODE_0, x, y, z); break; case ACTOR_CLASS_ENEMY: - sfx_play_sound_at_position(SOUND_HIT_NORMAL, 0, x, y, z); + sfx_play_sound_at_position(SOUND_HIT_NORMAL, SOUND_SPACE_MODE_0, x, y, z); break; } break; case HIT_SOUND_FIRE: switch (actorClass) { case ACTOR_CLASS_PLAYER: - sfx_play_sound_at_position(SOUND_HIT_PLAYER_FIRE, 0, x, y, z); + sfx_play_sound_at_position(SOUND_HIT_PLAYER_FIRE, SOUND_SPACE_MODE_0, x, y, z); break; case ACTOR_CLASS_PARTNER: - sfx_play_sound_at_position(SOUND_HIT_FIRE, 0, x, y, z); + sfx_play_sound_at_position(SOUND_HIT_FIRE, SOUND_SPACE_MODE_0, x, y, z); break; case ACTOR_CLASS_ENEMY: - sfx_play_sound_at_position(SOUND_HIT_FIRE, 0, x, y, z); + sfx_play_sound_at_position(SOUND_HIT_FIRE, SOUND_SPACE_MODE_0, x, y, z); break; } break; case HIT_SOUND_ICE: switch (actorClass) { case ACTOR_CLASS_PLAYER: - sfx_play_sound_at_position(SOUND_HIT_PLAYER_ICE, 0, x, y, z); + sfx_play_sound_at_position(SOUND_HIT_PLAYER_ICE, SOUND_SPACE_MODE_0, x, y, z); break; case ACTOR_CLASS_PARTNER: - sfx_play_sound_at_position(SOUND_HIT_ICE, 0, x, y, z); + sfx_play_sound_at_position(SOUND_HIT_ICE, SOUND_SPACE_MODE_0, x, y, z); break; case ACTOR_CLASS_ENEMY: - sfx_play_sound_at_position(SOUND_HIT_ICE, 0, x, y, z); + sfx_play_sound_at_position(SOUND_HIT_ICE, SOUND_SPACE_MODE_0, x, y, z); break; } break; case HIT_SOUND_SHOCK: switch (actorClass) { case ACTOR_CLASS_PLAYER: - sfx_play_sound_at_position(SOUND_HIT_PLAYER_SHOCK, 0, x, y, z); + sfx_play_sound_at_position(SOUND_HIT_PLAYER_SHOCK, SOUND_SPACE_MODE_0, x, y, z); break; case ACTOR_CLASS_PARTNER: - sfx_play_sound_at_position(SOUND_HIT_SHOCK, 0, x, y, z); + sfx_play_sound_at_position(SOUND_HIT_SHOCK, SOUND_SPACE_MODE_0, x, y, z); break; case ACTOR_CLASS_ENEMY: - sfx_play_sound_at_position(SOUND_HIT_SHOCK, 0, x, y, z); + sfx_play_sound_at_position(SOUND_HIT_SHOCK, SOUND_SPACE_MODE_0, x, y, z); break; } break; @@ -425,7 +425,7 @@ s32 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, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); func_802667F0(0, target, state->goalPos.x, state->goalPos.y, state->goalPos.z); gBattleStatus.flags1 |= BS_FLAGS1_ATK_BLOCKED; break; @@ -438,7 +438,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { if (target->koStatus == STATUS_END && !(battleStatus->currentAttackElement & DAMAGE_TYPE_UNBLOCKABLE)) { if (check_block_input(BUTTON_A)) { damage = 0; - sfx_play_sound_at_position(SOUND_231, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); func_802667F0(0, target, state->goalPos.x, state->goalPos.y, state->goalPos.z); gBattleStatus.flags1 |= BS_FLAGS1_ATK_BLOCKED; break; @@ -700,7 +700,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { func_80267018(target, 1); if (attacker->actorTypeData1[5] != SOUND_0) { - sfx_play_sound_at_position(attacker->actorTypeData1[5], 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(attacker->actorTypeData1[5], SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (isFire) { @@ -715,7 +715,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { } if ((battleStatus->lastAttackDamage <= 0 && !statusInflicted2 && !isEnchanted) || targetPart->flags & ACTOR_PART_FLAG_2000) { - sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_SLEEP) && statusInflicted) { @@ -723,35 +723,35 @@ s32 calc_enemy_damage_target(Actor* attacker) { script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_SLEEP, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_SLEEP, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_DIZZY) && statusInflicted) { script = start_script(&DoDizzyHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_PARALYZE) && statusInflicted) { script = start_script(&DoParalyzeHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_POISON) && statusInflicted) { script = start_script(&DoPoisonHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_STOP) && statusInflicted) { script = start_script(&DoStopHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_FROZEN) && statusInflicted) { script = start_script(&DoFreezeHit, EVT_PRIORITY_A, 0); @@ -759,7 +759,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; script->varTablePtr[3] = target; - sfx_play_sound_at_position(SOUND_HIT_ICE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_ICE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_SHRINK) && statusInflicted) { script = start_script(&DoShrinkHit, EVT_PRIORITY_A, 0); @@ -767,11 +767,11 @@ s32 calc_enemy_damage_target(Actor* attacker) { script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; script->varTablePtr[3] = target; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackElement & DAMAGE_TYPE_SMASH) && target->actorType == ACTOR_TYPE_GOOMNUT_TREE) { - sfx_play_sound_at_position(SOUND_SMASH_GOOMNUT_TREE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_SMASH_GOOMNUT_TREE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } func_80266ADC(target); @@ -785,7 +785,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { && !has_enchanted_part(attacker) ) { // enum mismatch? shock vs explode :raised_eyebrow: - sfx_play_sound_at_position(SOUND_HIT_SHOCK, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_SHOCK, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); func_80251474(attacker); dispatch_damage_event_actor_1(attacker, 1, EVENT_SHOCK_HIT); return HIT_RESULT_TRIGGERED_EXPLODE; @@ -1068,7 +1068,7 @@ ApiStatus JumpToGoal(Evt* script, s32 isInitialCall) { set_animation(actor->actorID, (s8) actor->state.jumpPartIndex, actor->state.animJumpRise); } if (!(script->functionTemp[3] & 2) && (actor->actorTypeData1[4] != 0)) { - sfx_play_sound_at_position(actor->actorTypeData1[4], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(actor->actorTypeData1[4], SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } script->functionTemp[0] = 1; } @@ -1254,7 +1254,7 @@ ApiStatus JumpToGoalSimple2(Evt* script, s32 isInitialCall) { state->velocity = ((state->acceleration * state->moveTime) * 0.5f) + (posY / state->moveTime); state->speed += moveDist / state->moveTime; if (actor->actorTypeData1[4] != 0) { - sfx_play_sound_at_position(actor->actorTypeData1[4], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(actor->actorTypeData1[4], SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } script->functionTemp[0] = TRUE; } @@ -1342,7 +1342,7 @@ ApiStatus JumpWithBounce(Evt* script, s32 isInitialCall) { actorState->speed += moveDist / actorState->moveTime; if (actor->actorTypeData1[4] != 0) { - sfx_play_sound_at_position(actor->actorTypeData1[4], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(actor->actorTypeData1[4], SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } script->functionTemp[0] = TRUE; } @@ -1479,7 +1479,7 @@ ApiStatus FallToGoal(Evt* script, s32 isInitialCall) { state->acceleration = (posY / state->moveTime - state->velocity) / (-state->moveTime * 0.5); if (actor->actorTypeData1[4] != 0) { - sfx_play_sound_at_position(actor->actorTypeData1[4], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(actor->actorTypeData1[4], SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } script->functionTemp[0] = 1; } @@ -1561,7 +1561,7 @@ ApiStatus RunToGoal(Evt* script, s32 isInitialCall) { actorState->distance = ~actor->actorTypeData1b[0]; //TODO optimization? } if ((actor->actorTypeData1[0] != 0) && (actor->actorTypeData1[1] == 0)) { - sfx_play_sound_at_position(actor->actorTypeData1[0], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(actor->actorTypeData1[0], SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } script->functionTemp[0] = TRUE; } @@ -1588,11 +1588,11 @@ ApiStatus RunToGoal(Evt* script, s32 isInitialCall) { actorState->distance = 0.0f; if (actor->footStepCounter & 1) { if (actor->actorTypeData1[0] != 0) { - sfx_play_sound_at_position(actor->actorTypeData1[0], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(actor->actorTypeData1[0], SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } } else { if (actor->actorTypeData1[1] != 0) { - sfx_play_sound_at_position(actor->actorTypeData1[1], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(actor->actorTypeData1[1], SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } } } @@ -1603,11 +1603,11 @@ ApiStatus RunToGoal(Evt* script, s32 isInitialCall) { actorState->distance = 0.0f; if (actor->footStepCounter & 1) { if (actor->actorTypeData1[0] != 0) { - sfx_play_sound_at_position(actor->actorTypeData1[0], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(actor->actorTypeData1[0], SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } } else { if (actor->actorTypeData1[1] != 0) { - sfx_play_sound_at_position(actor->actorTypeData1[1], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(actor->actorTypeData1[1], SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } } } @@ -1780,7 +1780,7 @@ ApiStatus JumpPartTo(Evt* script, s32 isInitialCall) { movement->moveSpeed += deltaDist / movement->moveTime; movement->unk_2C = movement->jumpScale * movement->moveTime * 0.5f + posY / movement->moveTime; if (part->partTypeData[4] != 0) { - sfx_play_sound_at_position(part->partTypeData[4], 0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); + sfx_play_sound_at_position(part->partTypeData[4], SOUND_SPACE_MODE_0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); } script->functionTemp[0] = 1; } @@ -1871,7 +1871,7 @@ ApiStatus FallPartTo(Evt* script, s32 isInitialCall) { movement->unk_2C = 0.0f; movement->jumpScale = (posY / movement->moveTime - movement->unk_2C) / (-movement->moveTime * 0.5); if (part->partTypeData[4] != 0) { - sfx_play_sound_at_position(part->partTypeData[4], 0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); + sfx_play_sound_at_position(part->partTypeData[4], SOUND_SPACE_MODE_0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); } script->functionTemp[0] = 1; } @@ -2005,7 +2005,7 @@ ApiStatus RunPartTo(Evt* script, s32 isInitialCall) { movement->distance = ~part->actorTypeData2b[0]; } if (part->partTypeData[0] != 0 && part->partTypeData[1] == 0) { - sfx_play_sound_at_position(part->partTypeData[0], 0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); + sfx_play_sound_at_position(part->partTypeData[0], SOUND_SPACE_MODE_0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); } script->functionTemp[0] = 1; } @@ -2032,11 +2032,11 @@ ApiStatus RunPartTo(Evt* script, s32 isInitialCall) { movement->distance = 0; if (actor->footStepCounter % 2 != 0) { if (part->partTypeData[0] != 0) { - sfx_play_sound_at_position(part->partTypeData[0], 0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); + sfx_play_sound_at_position(part->partTypeData[0], SOUND_SPACE_MODE_0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); } } else { if (part->partTypeData[1] != 0) { - sfx_play_sound_at_position(part->partTypeData[1], 0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); + sfx_play_sound_at_position(part->partTypeData[1], SOUND_SPACE_MODE_0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); } } } @@ -2047,11 +2047,11 @@ ApiStatus RunPartTo(Evt* script, s32 isInitialCall) { movement->distance = 0; if (actor->footStepCounter % 2 != 0) { if (part->partTypeData[0] != 0) { - sfx_play_sound_at_position(part->partTypeData[0], 0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); + sfx_play_sound_at_position(part->partTypeData[0], SOUND_SPACE_MODE_0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); } } else { if (part->partTypeData[1] != 0) { - sfx_play_sound_at_position(part->partTypeData[1], 0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); + sfx_play_sound_at_position(part->partTypeData[1], SOUND_SPACE_MODE_0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); } } } @@ -2141,7 +2141,7 @@ ApiStatus FlyToGoal(Evt* script, s32 isInitialCall) { actorState->velocity = ~actor->actorTypeData1b[1]; } if ((actor->actorTypeData1[2] != 0) && (actor->actorTypeData1[3] == 0)) { - sfx_play_sound_at_position(actor->actorTypeData1[2], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(actor->actorTypeData1[2], SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } } @@ -2177,11 +2177,11 @@ ApiStatus FlyToGoal(Evt* script, s32 isInitialCall) { actorState->velocity = 0.0f; if (actor->footStepCounter & 1) { if (actor->actorTypeData1[2] != 0) { - sfx_play_sound_at_position(actor->actorTypeData1[2], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(actor->actorTypeData1[2], SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } } else { if (actor->actorTypeData1[3] != 0) { - sfx_play_sound_at_position(actor->actorTypeData1[3], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(actor->actorTypeData1[3], SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } } } @@ -2192,11 +2192,11 @@ ApiStatus FlyToGoal(Evt* script, s32 isInitialCall) { actorState->velocity = 0.0f; if (actor->footStepCounter & 1) { if (actor->actorTypeData1[2] != 0) { - sfx_play_sound_at_position(actor->actorTypeData1[2], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(actor->actorTypeData1[2], SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } } else { if (actor->actorTypeData1[3] != 0) { - sfx_play_sound_at_position(actor->actorTypeData1[3], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(actor->actorTypeData1[3], SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } } } @@ -2395,7 +2395,7 @@ ApiStatus FlyPartTo(Evt* script, s32 isInitialCall) { } if (part->partTypeData[2] != 0 && part->partTypeData[3] == 0) { - sfx_play_sound_at_position(part->partTypeData[2], 0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); + sfx_play_sound_at_position(part->partTypeData[2], SOUND_SPACE_MODE_0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); } partMovement->unk_3C = 0; partMovement->angle = 0.0f; @@ -2433,11 +2433,11 @@ ApiStatus FlyPartTo(Evt* script, s32 isInitialCall) { partMovement->unk_2C = 0; if (actor->footStepCounter % 2 != 0) { if (part->partTypeData[2] != 0) { - sfx_play_sound_at_position(part->partTypeData[2], 0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); + sfx_play_sound_at_position(part->partTypeData[2], SOUND_SPACE_MODE_0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); } } else { if (part->partTypeData[3] != 0) { - sfx_play_sound_at_position(part->partTypeData[3], 0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); + sfx_play_sound_at_position(part->partTypeData[3], SOUND_SPACE_MODE_0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); } } } @@ -2448,11 +2448,11 @@ ApiStatus FlyPartTo(Evt* script, s32 isInitialCall) { partMovement->unk_2C = 0; if (actor->footStepCounter % 2 != 0) { if (part->partTypeData[2] != 0) { - sfx_play_sound_at_position(part->partTypeData[2], 0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); + sfx_play_sound_at_position(part->partTypeData[2], SOUND_SPACE_MODE_0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); } } else { if (part->partTypeData[3] != 0) { - sfx_play_sound_at_position(part->partTypeData[3], 0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); + sfx_play_sound_at_position(part->partTypeData[3], SOUND_SPACE_MODE_0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); } } } diff --git a/src/1AC760.c b/src/1AC760.c index 460d131bfa..a88bffd0ca 100644 --- a/src/1AC760.c +++ b/src/1AC760.c @@ -77,7 +77,7 @@ s32 calc_partner_test_enemy(void) { (part->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP) && !(target->flags2 & ACTOR_FLAG_HP_OFFSET_BELOW)) { - sfx_play_sound_at_position(SOUND_108, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); return 4; } @@ -86,7 +86,7 @@ s32 calc_partner_test_enemy(void) { !(battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_4) && !player_team_is_ability_active(partner, ABILITY_SPIKE_SHIELD)) { - sfx_play_sound_at_position(SOUND_108, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_108, 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 -1; @@ -96,7 +96,7 @@ s32 calc_partner_test_enemy(void) { (part->eventFlags & ACTOR_EVENT_FLAG_FIREY) && !(battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_10)) { - sfx_play_sound_at_position(SOUND_HIT_FIRE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_FIRE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_partner_1(1, EVENT_BURN_CONTACT); dispatch_event_actor(target, EVENT_BURN_TAUNT); return -1; @@ -108,7 +108,7 @@ s32 calc_partner_test_enemy(void) { !(target->flags & ACTOR_FLAG_HP_OFFSET_BELOW) && !(battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_1)) { - sfx_play_sound_at_position(SOUND_108, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_108, 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 -1; @@ -119,7 +119,7 @@ s32 calc_partner_test_enemy(void) { !(target->flags & ACTOR_FLAG_HP_OFFSET_BELOW) && !(battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_80)) { - sfx_play_sound_at_position(SOUND_108, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_108, 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 -1; @@ -131,7 +131,7 @@ s32 calc_partner_test_enemy(void) { !(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT) && !(battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_8)) { - sfx_play_sound_at_position(SOUND_HIT_SHOCK, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_SHOCK, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); func_80251474(partner); dispatch_damage_event_partner_1(1, EVENT_SHOCK_HIT); return -1; @@ -141,7 +141,7 @@ s32 calc_partner_test_enemy(void) { (part->eventFlags & ACTOR_EVENT_FLAG_FIREY) && !(battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_10)) { - sfx_play_sound_at_position(SOUND_HIT_FIRE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_FIRE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_partner_1(1, EVENT_BURN_CONTACT); dispatch_event_actor(target, EVENT_BURN_TAUNT); return -1; @@ -193,7 +193,7 @@ s32 calc_partner_damage_enemy(void) { if (gBattleStatus.flags1 & BS_FLAGS1_FORCE_HIT_IMMUNE) { retVal = 2; dispatchEvent = EVENT_SCRIPTED_IMMUNE; - sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else { if (targetPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY || target->transparentStatus == STATUS_TRANSPARENT || targetPart->eventFlags & ACTOR_EVENT_FLAG_800 && !(battleStatus->currentAttackElement & DAMAGE_TYPE_QUAKE)) { @@ -201,7 +201,7 @@ s32 calc_partner_damage_enemy(void) { } if (target->stoneStatus == STATUS_STONE) { - sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 1); show_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 0); return (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) ? 1 : 0; @@ -212,7 +212,7 @@ s32 calc_partner_damage_enemy(void) { } if (battleStatus->currentAttackElement & DAMAGE_TYPE_JUMP && targetPart->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP) { - sfx_play_sound_at_position(SOUND_108, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_108, 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 -1; @@ -220,45 +220,45 @@ s32 calc_partner_damage_enemy(void) { dispatch_event_actor(target, EVENT_EXPLODE_TRIGGER); if (!(battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_2)) { - sfx_play_sound_at_position(SOUND_HIT_FIRE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_FIRE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_partner_1(1, EVENT_BURN_CONTACT); return -1; } - sfx_play_sound_at_position(SOUND_HIT_FIRE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_FIRE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); return (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) ? 1 : 0; } else if (!(battleStatus->currentAttackElement & (DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_SMASH)) && targetPart->eventFlags & ACTOR_EVENT_FLAG_FIREY && !(battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_10)) { - sfx_play_sound_at_position(SOUND_HIT_FIRE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_FIRE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_partner_1(1, EVENT_BURN_CONTACT); dispatch_event_actor(target, EVENT_BURN_TAUNT); return -1; } else if (!(battleStatus->currentAttackElement & (DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_JUMP)) && targetPart->eventFlags & ACTOR_EVENT_FLAG_SPIKY_FRONT && !(battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_4)) { - sfx_play_sound_at_position(SOUND_108, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_108, 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 -1; } else if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE && battleStatus->currentAttackElement & DAMAGE_TYPE_FIRE && targetPart->eventFlags & (ACTOR_EVENT_FLAG_400 | ACTOR_EVENT_FLAG_EXPLOSIVE)) { - sfx_play_sound_at_position(SOUND_HIT_FIRE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_FIRE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_event_actor(target, EVENT_EXPLODE_TRIGGER); return (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) ? 1 : 0; } else if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT) && targetPart->eventFlags & ACTOR_EVENT_FLAG_200000 && !(target->flags & ACTOR_FLAG_HP_OFFSET_BELOW) && !(battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_80)) { - sfx_play_sound_at_position(SOUND_108, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_108, 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 -1; } else if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT) && targetPart->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP && !(target->flags & ACTOR_FLAG_HP_OFFSET_BELOW) && !(battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_1)) { - sfx_play_sound_at_position(SOUND_108, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_108, 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 -1; } else if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE && battleStatus->currentAttackElement & DAMAGE_TYPE_FIRE && targetPart->eventFlags & (ACTOR_EVENT_FLAG_400 | ACTOR_EVENT_FLAG_EXPLOSIVE)) { - sfx_play_sound_at_position(SOUND_HIT_FIRE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_FIRE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_event_actor(target, EVENT_EXPLODE_TRIGGER); return (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) ? 1 : 0; } @@ -267,7 +267,7 @@ s32 calc_partner_damage_enemy(void) { if (partner->staticStatus != STATUS_STATIC && (target->staticStatus == STATUS_STATIC || targetPart->eventFlags & ACTOR_EVENT_FLAG_ELECTRIFIED) && !(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT) && !(battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_8)) { - sfx_play_sound_at_position(SOUND_HIT_SHOCK, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_SHOCK, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); func_80251474(partner); dispatch_damage_event_partner_1(1, EVENT_SHOCK_HIT); return -1; @@ -369,7 +369,7 @@ s32 calc_partner_damage_enemy(void) { if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS)) { retVal = 2; dispatchEvent = EVENT_SCRIPTED_IMMUNE; - sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else { retVal = 2; dispatchEvent = (target->currentHP <= 0) ? EVENT_DEATH : EVENT_SCRIPTED_IMMUNE; @@ -402,13 +402,13 @@ s32 calc_partner_damage_enemy(void) { !(targetPart->eventFlags & ACTOR_EVENT_FLAG_ELECTRIFIED)) || battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT || battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_8) { dispatchEvent = (!(gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE)) ? EVENT_SCRIPTED_IMMUNE : EVENT_IMMUNE; - sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_event_actor(target, dispatchEvent); func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3); return (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) ? 1 : 0; } - sfx_play_sound_at_position(SOUND_HIT_SHOCK, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_SHOCK, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); func_80251474(partner); dispatch_damage_event_partner_1(1, EVENT_SHOCK_HIT); return -1; @@ -592,7 +592,7 @@ s32 calc_partner_damage_enemy(void) { retVal = 0; tempBinary = TRUE; gBattleStatus.flags1 |= (BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10 | BS_FLAGS1_8 | BS_FLAGS1_ACTORS_VISIBLE); - sfx_play_sound_at_position(SOUND_231, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else { dispatchEvent = EVENT_IMMUNE; retVal = 2; @@ -634,7 +634,7 @@ s32 calc_partner_damage_enemy(void) { retVal = 0; tempBinary = TRUE; gBattleStatus.flags1 |= (BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10 | BS_FLAGS1_8 | BS_FLAGS1_ACTORS_VISIBLE); - sfx_play_sound_at_position(SOUND_231, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else { dispatchEvent = EVENT_IMMUNE; retVal = 2; @@ -672,7 +672,7 @@ s32 calc_partner_damage_enemy(void) { if (tempBinary && gBattleStatus.flags1 & (BS_FLAGS1_200 | BS_FLAGS1_40) || gBattleStatus.flags1 & (BS_FLAGS1_200 | BS_FLAGS1_40) && !(gBattleStatus.flags1 & BS_FLAGS1_80)) { if ((battleStatus->lastAttackDamage > 0 && - ((sfx_play_sound_at_position(SOUND_231, 0, state->goalPos.x, state->goalPos.y, + ((sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z), //TODO remove sfx_play from conditional battleStatus->lastAttackDamage > 0))) || (battleStatus->currentAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS && tempBinary)) { if (gBattleStatus.flags1 & BS_FLAGS1_40) { @@ -690,25 +690,25 @@ s32 calc_partner_damage_enemy(void) { if (battleStatus->lastAttackDamage > 0) { if (sp2C == 0) { if (partner->actorTypeData1[5] != 0) { - sfx_play_sound_at_position(partner->actorTypeData1[5], 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(partner->actorTypeData1[5], SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } func_80267018(target, 1); if (isFireDamage) { - sfx_play_sound_at_position(SOUND_HIT_FIRE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_FIRE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else if (isElectricDamage) { - sfx_play_sound_at_position(SOUND_HIT_SHOCK, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_SHOCK, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else if (isIceDamage) { - sfx_play_sound_at_position(SOUND_HIT_ICE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_ICE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else { - sfx_play_sound_at_position(SOUND_HIT_NORMAL, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_NORMAL, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } } } if (battleStatus->lastAttackDamage <= 0 && !tempBinary && !wasStatusInflicted || targetPart->flags & ACTOR_PART_FLAG_2000) { - sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->currentAttackStatus & STATUS_FLAG_SLEEP && wasStatusInflicted) { @@ -716,7 +716,7 @@ s32 calc_partner_damage_enemy(void) { evt->varTable[0] = state->goalPos.x; evt->varTable[1] = state->goalPos.y; evt->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_SLEEP, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_SLEEP, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->currentAttackStatus & STATUS_FLAG_DIZZY && wasStatusInflicted) { @@ -724,7 +724,7 @@ s32 calc_partner_damage_enemy(void) { evt->varTable[0] = state->goalPos.x; evt->varTable[1] = state->goalPos.y; evt->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->currentAttackStatus & STATUS_FLAG_PARALYZE && wasStatusInflicted) { @@ -732,7 +732,7 @@ s32 calc_partner_damage_enemy(void) { evt->varTable[0] = state->goalPos.x; evt->varTable[1] = state->goalPos.y; evt->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->currentAttackStatus & STATUS_FLAG_POISON && wasStatusInflicted) { @@ -740,7 +740,7 @@ s32 calc_partner_damage_enemy(void) { evt->varTable[0] = state->goalPos.x; evt->varTable[1] = state->goalPos.y; evt->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->currentAttackStatus & STATUS_FLAG_STOP && wasStatusInflicted) { @@ -748,7 +748,7 @@ s32 calc_partner_damage_enemy(void) { evt->varTable[0] = state->goalPos.x; evt->varTable[1] = state->goalPos.y; evt->varTable[2] = state->goalPos.z; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->currentAttackStatus & STATUS_FLAG_FROZEN && wasStatusInflicted) { @@ -757,7 +757,7 @@ s32 calc_partner_damage_enemy(void) { evt->varTable[1] = state->goalPos.y; evt->varTable[2] = state->goalPos.z; evt->varTablePtr[3] = target; - sfx_play_sound_at_position(SOUND_HIT_ICE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_ICE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->currentAttackStatus & STATUS_FLAG_SHRINK && wasStatusInflicted) { @@ -766,11 +766,11 @@ s32 calc_partner_damage_enemy(void) { evt->varTable[1] = state->goalPos.y; evt->varTable[2] = state->goalPos.z; evt->varTablePtr[3] = target; - sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_INFLICT_STATUS, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->currentAttackElement & DAMAGE_TYPE_SMASH && target->actorType == ACTOR_TYPE_GOOMNUT_TREE) { - sfx_play_sound_at_position(SOUND_SMASH_GOOMNUT_TREE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_SMASH_GOOMNUT_TREE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } func_80266ADC(target); @@ -788,7 +788,7 @@ s32 calc_partner_damage_enemy(void) { if (partner->staticStatus != STATUS_STATIC && (target->staticStatus == STATUS_STATIC || targetPart->eventFlags & ACTOR_EVENT_FLAG_ELECTRIFIED) && !(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT) && !(battleStatus->currentAttackEventSuppression & ATTACK_EVENT_FLAG_8)) { - sfx_play_sound_at_position(SOUND_HIT_SHOCK, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_SHOCK, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); func_80251474(partner); dispatch_damage_event_partner_1(1, EVENT_SHOCK_HIT); return -1; diff --git a/src/23680.c b/src/23680.c index dfe3d98f0b..16560926de 100644 --- a/src/23680.c +++ b/src/23680.c @@ -532,14 +532,14 @@ s32 ai_check_player_dist(Enemy* enemy, s32 chance, f32 radius, f32 moveSpeed) { void ai_enemy_play_sound(Npc* npc, s32 soundID, s32 upperSoundFlags) { Enemy* enemy = get_enemy(npc->npcID); - s32 soundFlags = (upperSoundFlags & 0xFFFF0000) | 2; + s32 soundFlags = (upperSoundFlags & SOUND_SPACE_PARAMS_MASK) | SOUND_SPACE_FULL; if (upperSoundFlags & 1) { - soundFlags |= 0x10000; + soundFlags |= SOUND_PARAM_MUTE; } if (enemy->npcSettings->actionFlags & AI_ACTION_20) { - soundFlags |= 0x20000; + soundFlags |= SOUND_PARAM_CLIP_OFFSCREEN_ANY; } sfx_play_sound_at_position(soundID, soundFlags, npc->pos.x, npc->pos.y, npc->pos.z); @@ -593,7 +593,7 @@ void basic_ai_wander(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolum yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); if (!npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, aiSettings->chaseSpeed, yaw, npc->collisionHeight, npc->collisionRadius)) { npc->yaw = yaw; - ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + ai_enemy_play_sound(npc, SOUND_2F4, 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; @@ -689,7 +689,7 @@ void basic_ai_loiter(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolum yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); if (!npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, aiSettings->chaseSpeed, yaw, npc->collisionHeight, npc->collisionRadius)) { npc->yaw = yaw; - ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + ai_enemy_play_sound(npc, SOUND_2F4, 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; diff --git a/src/7bb60_len_41b0.c b/src/7bb60_len_41b0.c index cf5643c979..c2a3dc4c9a 100644 --- a/src/7bb60_len_41b0.c +++ b/src/7bb60_len_41b0.c @@ -387,7 +387,7 @@ void phys_player_land(void) { playerStatus->landPos.x = playerStatus->position.x; playerStatus->landPos.z = playerStatus->position.z; playerStatus->flags &= ~PS_FLAG_AIRBORNE; - sfx_play_sound_at_player(SOUND_SOFT_LAND, 0); + sfx_play_sound_at_player(SOUND_SOFT_LAND, SOUND_SPACE_MODE_0); if (!(collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT)) { phys_adjust_cam_on_landing(); } @@ -1128,7 +1128,7 @@ void try_player_footstep_sounds(s32 interval) { soundID = altSoundID; } - sfx_play_sound_at_player(soundID, 0); + sfx_play_sound_at_player(soundID, SOUND_SPACE_MODE_0); FootstepSoundSelector ^= 1; } } diff --git a/src/C50A0.c b/src/C50A0.c index 62c2be67a4..e60ccee469 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -2322,34 +2322,34 @@ void update_item_entity_collectable(ItemEntity* item) { item->flags |= ITEM_ENTITY_FLAG_20000000; } else { if (IS_BADGE(item->itemID)) { - sfx_play_sound_at_position(SOUND_21B, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_21B, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); } else if (IS_ITEM(item->itemID)) { - sfx_play_sound_at_position(SOUND_21A, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_21A, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); } else { switch (item->itemID) { case ITEM_HEART: - sfx_play_sound_at_position(SOUND_214, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_214, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); break; case ITEM_COIN: - sfx_play_sound_at_position(SOUND_212, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_212, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); break; case ITEM_KOOPA_FORTRESS_KEY: - sfx_play_sound_at_position(SOUND_212, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_212, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); break; case ITEM_HEART_PIECE: - sfx_play_sound_at_position(SOUND_214, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_214, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); break; case ITEM_STAR_POINT: - sfx_play_sound_at_position(SOUND_212, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_212, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); break; case ITEM_HEART_POINT: - sfx_play_sound_at_position(SOUND_214, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_214, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); break; case ITEM_STAR_PIECE: - sfx_play_sound_at_position(SOUND_219, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_219, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); break; case ITEM_FLOWER_POINT: - sfx_play_sound_at_position(SOUND_218, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_218, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); break; } } @@ -2390,25 +2390,25 @@ void update_item_entity_collectable(ItemEntity* item) { case ITEM_HEART: if (playerData->curHP < playerData->curMaxHP) { fx_recover(0, playerStatus->position.x, playerStatus->position.y + playerStatus->colliderHeight, playerStatus->position.z, 1); - sfx_play_sound_at_position(SOUND_2056, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_2056, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); } playerData->curHP++; if (playerData->curHP > playerData->curMaxHP) { playerData->curHP = playerData->curMaxHP; } - sfx_play_sound_at_position(SOUND_213, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_213, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); fx_sparkles(4, playerStatus->position.x, playerStatus->position.y + playerStatus->colliderHeight, playerStatus->position.z, 30.0f); break; case ITEM_FLOWER_POINT: if (playerData->curFP < playerData->curMaxFP) { fx_recover(1, playerStatus->position.x, playerStatus->position.y + playerStatus->colliderHeight, playerStatus->position.z, 1); - sfx_play_sound_at_position(SOUND_2056, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_2056, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); } playerData->curFP++; if (playerData->curFP > playerData->curMaxFP) { playerData->curFP = playerData->curMaxFP; } - sfx_play_sound_at_position(SOUND_217, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_217, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); fx_sparkles(4, playerStatus->position.x, playerStatus->position.y + playerStatus->colliderHeight, playerStatus->position.z, 30.0f); break; case ITEM_COIN: @@ -2416,7 +2416,7 @@ void update_item_entity_collectable(ItemEntity* item) { if (playerData->coins > 999) { playerData->coins = 999; } - sfx_play_sound_at_position(SOUND_211, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_211, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); playerData->totalCoinsEarned++; if (playerData->totalCoinsEarned > 99999) { playerData->totalCoinsEarned = 99999; @@ -2424,19 +2424,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, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_211, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); break; case ITEM_STAR_POINT: playerData->starPoints++; if (playerData->starPoints > 100) { playerData->starPoints = 100; } - sfx_play_sound_at_position(SOUND_211, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_211, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); break; case ITEM_HEART_POINT: playerData->curHP = playerData->curMaxHP; playerData->curFP = playerData->curMaxFP; - sfx_play_sound_at_position(SOUND_213, 0, item->position.x, item->position.y, item->position.z); + sfx_play_sound_at_position(SOUND_213, SOUND_SPACE_MODE_0, item->position.x, item->position.y, item->position.z); break; } D_801565A8 = 0; diff --git a/src/audio.h b/src/audio.h index 3ce46a03a5..c85cfb6d61 100644 --- a/src/audio.h +++ b/src/audio.h @@ -70,18 +70,18 @@ typedef enum AuPriority { AU_PRIORITY_MSEQ_MANAGER = 6, } AuPriority; -enum AuVoiceFlags3D { - AU_VOICE_3D_FLAG_1 = 0x01, - AU_VOICE_3D_FLAG_HANDLED_VOL_CHANGE = 0x02, - AU_VOICE_3D_FLAG_10 = 0x10, - AU_VOICE_3D_FLAG_VOL_CHANGED = 0x20, +enum AuVoiceEnvelopeFlags { + AU_VOICE_ENV_FLAG_STOP = 0x01, + AU_VOICE_ENV_FLAG_HANDLED_VOL_CHANGE = 0x02, + AU_VOICE_ENV_FLAG_KEY_RELEASED = 0x10, + AU_VOICE_ENV_FLAG_VOL_CHANGED = 0x20, }; -enum AuVoiceFlags43 { - AU_VOICE_SYNC_FLAG_ALL = 0x02, - AU_VOICE_SYNC_FLAG_4 = 0x04, - AU_VOICE_SYNC_FLAG_PITCH = 0x08, - AU_VOICE_SYNC_FLAG_10 = 0x10, +enum AuVoiceSyncFlags { + AU_VOICE_SYNC_FLAG_ALL = 0x02, + AU_VOICE_SYNC_FLAG_PARAMS = 0x04, + AU_VOICE_SYNC_FLAG_PITCH = 0x08, + AU_VOICE_SYNC_FLAG_PAN_FXMIX = 0x10, }; typedef enum AuEffectType { @@ -117,27 +117,146 @@ typedef enum SegmentControlCommands { } SegmentControlCommands; typedef enum FxBus { - FX_BUS_0 = 0, - FX_BUS_1 = 1, - FX_BUS_2 = 2, - FX_BUS_3 = 3, + FX_BUS_BGMA_MAIN = 0, + FX_BUS_SOUND = 1, + FX_BUS_BGMB = 2, + FX_BUS_BGMA_AUX = 3, } FxBus; -typedef union Q32 { - u8 u8[4]; - u16 u16[2]; - s32 s32; -} Q32; +typedef enum EnvelopeCommand { + ENV_CMD_END_LOOP = 0xFB, + ENV_CMD_START_LOOP = 0xFC, + ENV_CMD_ADD_MULTIPLIER = 0xFD, + ENV_CMD_SET_MULTIPLIER = 0xFE, + ENV_CMD_END = 0xFF, +} EnvelopeCommand; -typedef union Vol32 { - s32 full; - s16 half; - s8 byte; -} Vol32; +enum EnvelopeTimeIntervals { + ENV_TIME_60S = 0, + ENV_TIME_55S = 1, + ENV_TIME_50S = 2, + ENV_TIME_45S = 3, + ENV_TIME_40S = 4, + ENV_TIME_35S = 5, + ENV_TIME_30S = 6, + ENV_TIME_27_5S = 7, + ENV_TIME_25S = 8, + ENV_TIME_22_5S = 9, + ENV_TIME_20S = 10, + ENV_TIME_19S = 11, + ENV_TIME_18S = 12, + ENV_TIME_17S = 13, + ENV_TIME_16S = 14, + ENV_TIME_15S = 15, + ENV_TIME_14S = 16, + ENV_TIME_13S = 17, + ENV_TIME_12S = 18, + ENV_TIME_11S = 19, + ENV_TIME_10S = 20, + ENV_TIME_9S = 21, + ENV_TIME_8S = 22, + ENV_TIME_7S = 23, + ENV_TIME_6S = 24, + ENV_TIME_5S = 25, + ENV_TIME_4_5S = 26, + ENV_TIME_4S = 27, + ENV_TIME_3_5S = 28, + ENV_TIME_3S = 29, + ENV_TIME_2750MS = 30, + ENV_TIME_2500MS = 31, + ENV_TIME_2250MS = 32, + ENV_TIME_2S = 33, + ENV_TIME_1900MS = 34, + ENV_TIME_1800MS = 35, + ENV_TIME_1700MS = 36, + ENV_TIME_1600MS = 37, + ENV_TIME_1500MS = 38, + ENV_TIME_1400MS = 39, + ENV_TIME_1300MS = 40, + ENV_TIME_1200MS = 41, + ENV_TIME_1100MS = 42, + ENV_TIME_1S = 43, + ENV_TIME_950MS = 44, + ENV_TIME_900MS = 45, + ENV_TIME_850MS = 46, + ENV_TIME_800MS = 47, + ENV_TIME_750MS = 48, + ENV_TIME_700MS = 49, + ENV_TIME_650MS = 50, + ENV_TIME_600MS = 51, + ENV_TIME_550MS = 52, + ENV_TIME_500MS = 53, + ENV_TIME_450MS = 54, + ENV_TIME_400MS = 55, + ENV_TIME_375MS = 56, + ENV_TIME_350MS = 57, + ENV_TIME_325MS = 58, + ENV_TIME_300MS = 59, + ENV_TIME_290MS = 60, + ENV_TIME_280MS = 61, + ENV_TIME_270MS = 62, + ENV_TIME_260MS = 63, + ENV_TIME_250MS = 64, + ENV_TIME_240MS = 65, + ENV_TIME_230MS = 66, + ENV_TIME_220MS = 67, + ENV_TIME_210MS = 68, + ENV_TIME_200MS = 69, + ENV_TIME_190MS = 70, + ENV_TIME_180MS = 71, + ENV_TIME_170MS = 72, + ENV_TIME_160MS = 73, + ENV_TIME_150MS = 74, + ENV_TIME_140MS = 75, + ENV_TIME_130MS = 76, + ENV_TIME_120MS = 77, + ENV_TIME_110MS = 78, + ENV_TIME_100MS = 79, + ENV_TIME_16UNITS = 80, + ENV_TIME_14UNITS = 81, + ENV_TIME_12UNITS = 81, + ENV_TIME_11UNITS = 83, + ENV_TIME_10UNITS = 84, + ENV_TIME_9UNITS = 85, + ENV_TIME_8UNITS = 86, + ENV_TIME_7UNITS = 87, + ENV_TIME_6UNITS = 88, + ENV_TIME_5UNITS = 89, + ENV_TIME_4UNITS = 90, + ENV_TIME_3UNITS = 91, + ENV_TIME_2UNITS = 92, + ENV_TIME_1UNITS = 93, + ENV_TIME_0 = 94, +}; + +enum SoundPlayerState { + SND_PLAYER_STATE_CONTINUE = 0, + SND_PLAYER_STATE_INIT = 1, +}; + +enum SoundManagerState { + SND_MANAGER_STATE_ENABLED = 0, + SND_MANAGER_STATE_DISABLED = 1, +}; + +enum SoundInstanceFlags { + SOUND_INSTANCE_FLAG_ACTIVE = 1, + SOUND_INSTANCE_FLAG_POSITION_CHANGED = 2, +}; + +typedef union AmbVoiceStateInfo { + struct { + u8 playerIndex; + u8 trackIndex; + u8 tune; + u8 released; + }; + s32 all; +} AmbVoiceStateInfo; struct BGMPlayer; struct AuGlobals; -struct AlUnkVoice; +struct AuVoice; typedef void (*AuCallback)(void); @@ -153,7 +272,7 @@ typedef union SeqArgs { u8 cent; } MasterPitchShift; struct { // cmd E3 - u8 bank; + u8 effectType; } UnkCmdE3; struct { // cmd E4 u16 time; @@ -382,7 +501,7 @@ typedef struct AuPVoice { /* 0x48 */ AuEnvMixer envMixer; /* 0x74 */ s16 unk_74; /* 0x76 */ s16 unk_76; - /* 0x78 */ u8 groupID; //? + /* 0x78 */ u8 busId; /* 0x79 */ u8 index; /* 0x7A */ u8 unk_7A[2]; } AuPVoice; @@ -411,21 +530,21 @@ typedef struct SoundSFXEntry { /* 0x9 */ char unk_9[0x1]; } SoundSFXEntry; // size = 0xA -typedef struct AlUnkInstrumentData { - /* 0x00 */ s32* unk_00; - /* 0x04 */ s32* unk_04; -} AlUnkInstrumentData; // size = 0x8 +typedef struct EnvelopeData { + /* 0x00 */ u8* cmdListPress; + /* 0x04 */ u8* cmdListRelease; +} EnvelopeData; // size = 0x8 -typedef struct InstrumentEffectSub { - /* 0x00 */ u16 unkOffset1; - /* 0x02 */ u16 unkOffset2; -} InstrumentEffectSub; // size = 0x4; +typedef struct EnvelopeOffset { + /* 0x00 */ u16 offsetPress; + /* 0x02 */ u16 offsetRelease; +} EnvelopeOffset; // size = 0x4; -typedef struct InstrumentEffect { +typedef struct EnvelopePreset { /* 0x00 */ u8 count; /* 0x01 */ char unk_01[3]; - /* 0x04 */ InstrumentEffectSub unk_04[1]; // variable size -} InstrumentEffect; + /* 0x04 */ EnvelopeOffset offsets[1]; // variable size +} EnvelopePreset; // partially ALWaveTable? typedef struct Instrument { @@ -438,7 +557,10 @@ typedef struct Instrument { /* 0x18 */ u16* predictor; /* 0x1C */ u16 dc_bookSize; /* 0x1E */ u16 keyBase; - /* 0x20 */ f32 pitchRatio; + /* 0x20 */ union { + f32 pitchRatio; + s32 outputRate; + }; /* 0x24 */ u8 type; /* 0x25 */ u8 unk_25; /* 0x26 */ s8 unk_26; @@ -447,7 +569,7 @@ typedef struct Instrument { /* 0x29 */ s8 unk_29; /* 0x2A */ s8 unk_2A; /* 0x2B */ s8 unk_2B; - /* 0x2C */ InstrumentEffect* unkOffset; + /* 0x2C */ EnvelopePreset* envelopes; } Instrument; // size = 0x30; typedef Instrument* InstrumentGroup[16]; @@ -474,45 +596,38 @@ typedef struct SoundPlayChange { typedef struct SoundPlayer { /* 0x00 */ AuFilePos sefDataReadPos; /* 0x04 */ char pad4[0xC]; - /* 0x10 */ AlUnkInstrumentData unk_10; - /* 0x18 */ s32* unk_18; + /* 0x10 */ EnvelopeData envelope; + /* 0x18 */ u8* envelopCustomPressProfile; /* 0x1C */ Instrument* sfxInstrumentRef; /* 0x20 */ Instrument sfxInstrument; /* 0x50 */ AuFilePos sefReadStart; /* 0x54 */ SoundPlayChange changed; /* 0x58 */ f32 pitchRatio; /* 0x5C */ s16 sfxVolume; - /* 0x5E */ s16 unk_5E; + /* 0x5E */ s16 alternativeVolume; /* 0x60 */ SoundLerp tuneLerp; /* 0x6C */ SoundLerp volumeLerp; - /* 0x78 */ u8 locatorB; - /* 0x79 */ u8 locatorC; - /* 0x7A */ u8 locatorD; - /* 0x7B */ u8 unk_7B; - /* 0x7C */ u8 unk_7C; - /* 0x7D */ u8 unk_7D; - /* 0x7E */ u8 unk_7E; - /* 0x7F */ u8 unk_7F; - /* 0x80 */ AuFilePos unk_80; - /* 0x84 */ s8 unk_84; - /* 0x85 */ u8 soundC00; + /* 0x78 */ u8 cmdList_mode2[8]; + /* 0x80 */ AuFilePos alternativeDataPos; + /* 0x84 */ s8 alternativeType; + /* 0x85 */ u8 triggers; /* 0x86 */ char unk_86[0x2]; /* 0x88 */ s8* loopStartPos; /* 0x8C */ u8 loopIterCount; /* 0x8D */ char unk_8D; /* 0x8E */ u16 delay; /* 0x90 */ u16 playLength; - /* 0x92 */ s16 unk_92; - /* 0x94 */ s8 unk_94; + /* 0x92 */ s16 coarseTune; + /* 0x94 */ s8 fineTune; /* 0x95 */ char unk_05; /* 0x96 */ u16 currentSoundID; - /* 0x98 */ u8 unk_98; - /* 0x99 */ u8 unk_99; + /* 0x98 */ u8 priority; + /* 0x99 */ u8 exclusiveID; /* 0x9A */ u8 sfxParamsFlags; /* 0x9B */ u8 sfxPan; /* 0x9C */ u8 reverb; /* 0x9D */ u8 instrumentIndex; // ? - /* 0x9E */ u8 unk_9E; + /* 0x9E */ u8 envelopePreset; /* 0x9F */ u8 playVelocity; /* 0xA0 */ u8 unk_A0; /* 0xA1 */ u8 randomPitch; @@ -521,7 +636,7 @@ typedef struct SoundPlayer { /* 0xA4 */ s16 masterPitchShift; /* 0xA6 */ s16 masterVolume; /* 0xA8 */ u8 masterPan; - /* 0xA8 */ u8 unk_A9; + /* 0xA8 */ u8 state; /* 0xA9 */ char unk_AA[0x2]; } SoundPlayer; // size = 0xAC @@ -537,39 +652,37 @@ typedef struct SoundManager90 { }; } SoundManager90; // size = 4 -typedef struct SoundManagerA0 { - /* 0x0 */ u16 unk_00; - /* 0x2 */ u16 unk_02; - /* 0x4 */ u16 unk_04; -} SoundManagerA0; // size = 6 +typedef struct SoundManagerCustomCmdList { + /* 0x0 */ u16 data[3]; +} SoundManagerCustomCmdList; // size = 6 typedef struct SoundManager { /* 0x000 */ struct AuGlobals* globals; - /* 0x004 */ struct AlUnkVoice* currentVoice; + /* 0x004 */ struct AuVoice* currentVoice; /* 0x008 */ u8* sefData; /* 0x00C */ s32* normalSounds[8]; - /* 0x02C */ s32* soundsWithBit2000; + /* 0x02C */ s32* extraSounds; /* 0x030 */ s32 playCounter; //? /* 0x034 */ s32 nextUpdateStep; /* 0x038 */ s32 nextUpdateInterval; /* 0x03C */ s32 nextUpdateCounter; /* 0x040 */ struct Fade fadeInfo; - /* 0x05C */ s32 unk_5C; + /* 0x05C */ s32 busVolume; /* 0x060 */ s32 randomValue; /* 0x064 */ s32* customReverbParams[8]; /* 0x084 */ s8 customReverbAmounts[8]; /* 0x08C */ u8 lastCustomEffectIdx; /* 0x08D */ s8 defaultReverbAmt; /* 0x08E */ char unk_8E[0x2]; - /* 0x090 */ SoundManager90 unk_90[4]; - /* 0x0A0 */ SoundManagerA0 unk_A0[4]; - /* 0x0B8 */ u16 unk_B8; + /* 0x090 */ SoundManager90 bgmSounds[4]; + /* 0x0A0 */ SoundManagerCustomCmdList customCmdList[4]; + /* 0x0B8 */ u16 baseVolume; /* 0x0BA */ s16 unk_BA; /* 0x0BC */ u8 priority; /* 0x0BD */ u8 sfxPlayerSelector; - /* 0x0BE */ u8 defaultReverbType; - /* 0x0BF */ u8 unk_BF; - /* 0x0C0 */ u8 unk_C0; + /* 0x0BE */ u8 busId; + /* 0x0BF */ u8 currentVoiceIndex; + /* 0x0C0 */ u8 state; /* 0x0C1 */ char unk_C1[0x1]; /* 0x0C2 */ SoundSFXEntry soundQueue[16]; /* 0x162 */ s8 unk_162; @@ -577,7 +690,7 @@ typedef struct SoundManager { /* 0x164 */ u8 sfxQueueNextPos; /* 0x165 */ s8 unk_165; /* 0x166 */ char unk_166[0x2]; - /* 0x168 */ s32 unk_168; + /* 0x168 */ s32 resetPending; /* 0x16C */ SoundPlayer players[8]; } SoundManager; // size = 0x6CC @@ -597,38 +710,38 @@ typedef struct AlternatingSoundSet { /* 0x06 */ s16 currentIndex; } AlternatingSoundSet; // size = 0x08 -typedef struct AlUnkVoice { +typedef struct AuVoice { /* 0x00 */ Instrument* instrument; /* 0x04 */ f32 pitchRatio; - /* 0x08 */ s32 unk_08; - /* 0x0C */ s16 volume; + /* 0x08 */ s32 delta; + /* 0x0C */ s16 p_volume; // volume for pvoice /* 0x0E */ u8 pan; - /* 0x0F */ u8 reverbAmt; - /* 0x10 */ u8 reverbType; + /* 0x0F */ u8 reverb; + /* 0x10 */ u8 busId; /* 0x11 */ char unk_11[0x3]; - /* 0x14 */ AlUnkInstrumentData unk_14; - /* 0x1C */ u8* unk_1C; + /* 0x14 */ EnvelopeData envelope; + /* 0x1C */ u8* cmdPtr; /* 0x20 */ s32 unk_20; - /* 0x24 */ s32 unk_24; - /* 0x28 */ s32 unk_28; - /* 0x2C */ f32 unk_2C; - /* 0x30 */ s32 unk_30; - /* 0x34 */ u8* unk_34; - /* 0x38 */ u8 unk_38; - /* 0x39 */ u8 unk_39; - /* 0x3A */ u8 unk_3A; - /* 0x3B */ u8 unk_3B; + /* 0x24 */ s32 volChangeTime; + /* 0x28 */ s32 timeLeft; + /* 0x2C */ f32 rate; + /* 0x30 */ s32 volMult; + /* 0x34 */ u8* loopStart; + /* 0x38 */ u8 loopCounter; + /* 0x39 */ u8 initialAmp; + /* 0x3A */ u8 targetAmp; + /* 0x3B */ u8 timeIntervalIndex; /* 0x3C */ u8 unk_3C; - /* 0x3D */ u8 unk_flags_3D; - /* 0x3E */ u8 unk_3E; - /* 0x3F */ u8 unk_3F; - /* 0x40 */ s16 adjustedVolume; - /* 0x42 */ u8 unk_42; - /* 0x43 */ u8 unk_flags_43; - /* 0x44 */ s8 priorityCopy; + /* 0x3D */ u8 envelopeFlags; + /* 0x3E */ u8 relativeReleaseVolumes; + /* 0x3F */ u8 releaseVolumeMult; + /* 0x40 */ s16 clientVolume; + /* 0x42 */ u8 stopPending; + /* 0x43 */ u8 syncFlags; + /* 0x44 */ s8 clientPriority; /* 0x45 */ u8 priority; /* 0x46 */ char unk_46[2]; -} AlUnkVoice; // size = 0x48 +} AuVoice; // size = 0x48 typedef struct BGMFileInfo { /* 0x10 */ u8 numSegments; @@ -699,8 +812,8 @@ typedef struct SEFHeader { /* 0x0E */ u8 hasExtraSection; // 1 /* 0x0F */ s8 unkF; // 0 /* 0x10 */ u16 sections[8]; - /* 0x14 */ u16 section2000; -} SEFHeader; // size = 0x16 + /* 0x20 */ u16 section2000; +} SEFHeader; // size = 0x22 typedef struct INITHeader { /* 0x00 */ s32 signature; // 'INIT' @@ -795,7 +908,7 @@ typedef struct AuGlobals { /* 0x003C */ u16* mseqFileList; /* 0x0040 */ AuEffectChange effectChanges[4]; /* 0x0050 */ u8 channelDelayPending; - /* 0x0051 */ u8 channelDelayGroupIdx; + /* 0x0051 */ u8 channelDelayBusId; /* 0x0052 */ u8 channelDelayTime; /* 0x0053 */ u8 channelDelaySide; /* 0x0054 */ PEREntry* dataPER; @@ -828,7 +941,7 @@ typedef struct AuGlobals { /* 0x130D */ char unk_130D[3]; /* 0x1310 */ SoundBank* banks[3]; /* 0x131C */ char unk_131C[4]; - /* 0x1320 */ AlUnkVoice voices[24]; + /* 0x1320 */ AuVoice voices[24]; } AuGlobals; // size = 0x19E0 typedef struct BGMPlayerTrack { @@ -836,7 +949,7 @@ typedef struct BGMPlayerTrack { /* 0x04 */ AuFilePos savedPos; /* 0x08 */ AuFilePos prevReadPos; /* 0x0C */ Instrument* instrument; - /* 0x10 */ AlUnkInstrumentData unk_10; + /* 0x10 */ EnvelopeData envelope; /* 0x18 */ s32 subTrackVolume; /* 0x1C */ s32 subTrackVolumeStep; /* 0x20 */ s32 subTrackVolumeTarget; @@ -873,7 +986,7 @@ typedef struct BGMPlayerTrack { /* 0x58 */ u8 isDrumTrack; /* 0x59 */ u8 parentTrackIdx; /* 0x5A */ u8 unk_5A; - /* 0x5B */ s8 subtrackReverbType; + /* 0x5B */ s8 subtrackBusId; /* 0x5C */ u8 index; /* 0x5D */ char unk_5D[0x3]; } BGMPlayerTrack; // size = 0x60; @@ -905,7 +1018,7 @@ typedef struct BGMPlayer { /* 0x024 */ s32 bgmFileIndex; /* 0x028 */ s32 songID; /* 0x02C */ Fade fadeInfo; - /* 0x048 */ s32 unk_48; + /* 0x048 */ s32 busVolume; /* 0x04C */ u8 effectIndices[4]; /* 0x050 */ s32 randomValue1; /* 0x054 */ s32 randomValue2; @@ -964,7 +1077,7 @@ typedef struct BGMPlayer { /* 0x232 */ u8 bFadeConfigSetsVolume; /* 0x233 */ u8 unk_233; /* 0x234 */ u8 priority; - /* 0x235 */ u8 defaultReverbType; + /* 0x235 */ u8 busId; /* 0x236 */ char unk_236[0x2]; /* 0x238 */ s32 unk_238[8]; /* 0x258 */ u8 unk_258; @@ -975,101 +1088,93 @@ typedef struct BGMPlayer { /* 0x85C */ SeqNote notes[24]; } BGMPlayer; // size = 0xA9C -typedef struct AlUnkMSEQData { - /* 0x0 */ u8 unk_00; - /* 0x1 */ u8 unk_01; - /* 0x2 */ s16 unk_02; - /* 0x4 */ s16 unk_04; - /* 0x6 */ u16 unk_06; -} AlUnkMSEQData; // size = 0x8 +typedef struct MSEQTrackData { + /* 0x0 */ u8 trackIndex; + /* 0x1 */ u8 type; + /* 0x2 */ s16 time; + /* 0x4 */ s16 delta; + /* 0x6 */ u16 goal; +} MSEQTrackData; // size = 0x8 typedef struct MSEQHeader { /* 0x00 */ s32 signature; // 'MSEQ ' /* 0x04 */ s32 size; // including header /* 0x08 */ s32 name; - /* 0x0C */ u8 first_iota; - /* 0x0D */ u8 unkCount; - /* 0x0E */ u16 unkOffset; + /* 0x0C */ u8 firstVoiceIdx; + /* 0x0D */ u8 trackSettingsCount; + /* 0x0E */ u16 trackSettingsOffset; /* 0x10 */ u16 dataStart; } MSEQHeader; // size variable -typedef struct AlUnkXi { +typedef struct AmbienceTrack { /* 0x00 */ Instrument* instrument; - /* 0x04 */ AlUnkInstrumentData unk_04; - /* 0x0C */ s16 pitch; - /* 0x0E */ s16 unk_0E; - /* 0x10 */ s32 unk_10; - /* 0x14 */ s16 unk_14; - /* 0x16 */ s16 unk_16; - /* 0x18 */ Vol32 unk_18; - /* 0x1C */ s32 unk_1C; - /* 0x20 */ s16 unk_20; - /* 0x22 */ s16 unk_22; + /* 0x04 */ EnvelopeData envelope; + /* 0x0C */ SoundLerp tuneLerp; + /* 0x18 */ SoundLerp volumeLerp; /* 0x24 */ s8 pan; /* 0x25 */ s8 reverb; /* 0x26 */ u8 flags; - /* 0x27 */ char unk_26[1]; -} AlUnkXi; // size = 0x28 + /* 0x27 */ char unk_27[1]; +} AmbienceTrack; // size = 0x28 -typedef struct AlUnkOmega { - /* 0x0 */ u8 unk_00; - /* 0x1 */ u8 unk_01; - /* 0x2 */ s8 unk_02; - /* 0x4 */ s8 unk__03; -} AlUnkOmega; // size = 0x4 +typedef struct AmbienceSavedVoice { + /* 0x0 */ u8 trackIndex; + /* 0x1 */ u8 tune; + /* 0x2 */ s8 volume; + /* 0x4 */ char unk_03[1]; +} AmbienceSavedVoice; // size = 0x4 -typedef struct AlUnkIota { - /* 0x00 */ Q32 unk_00; +typedef struct AmbienceVoiceState { + /* 0x00 */ AmbVoiceStateInfo info; /* 0x04 */ s16 pitch; /* 0x06 */ s8 volume; - /* 0x07 */ u8 unk_07; -} AlUnkIota; // size = 0x8 + /* 0x07 */ u8 isResumable; +} AmbienceVoiceState; // size = 0x8 -//TODO AuStreamPlayer? -typedef struct AuAmbPlayer { +typedef struct AmbiencePlayer { /* 0x000 */ MSEQHeader* mseqFile; /* 0x004 */ AuFilePos mseqReadStart; /* 0x008 */ AuFilePos mseqReadPos; - /* 0x00C */ AuFilePos unk_0C; - /* 0x010 */ AuFilePos unk_10; - /* 0x014 */ Q32 unk_14; - /* 0x018 */ s32 unk_18; + /* 0x00C */ AuFilePos loopStartPos[2]; + /* 0x014 */ AmbVoiceStateInfo id; + /* 0x018 */ s32 delay; /* 0x01C */ s32 unk_1C; /* 0x020 */ s32 mseqName; - /* 0x024 */ u8 unk_24; + /* 0x024 */ u8 mode; /* 0x025 */ u8 playState; - /* 0x026 */ u8 unk_26; - /* 0x027 */ u8 unk_27; - /* 0x028 */ u16 time; - /* 0x02A */ u8 unk_2A; - /* 0x02B */ u8 volume; - /* 0x02C */ char unk_2C[4]; - /* 0x030 */ s32 firstVoiceIdx; + /* 0x026 */ u8 fadeSettingsType; + /* 0x027 */ char unk_27[1]; + /* 0x028 */ u16 fadeSettingsTime; + /* 0x02A */ u8 fadeSettingsInitial; // 255 means from current volume + /* 0x02B */ u8 fadeSettingsGoal; + /* 0x02C */ u8 loopCount[2]; + /* 0x02E */ char unk_2E[2]; + /* 0x030 */ u32 firstVoiceIdx; /* 0x034 */ u32 lastVoiceIdx; - /* 0x038 */ s32 unk_38; - /* 0x03C */ s32 volInterpStep; - /* 0x040 */ u16 volInterpTime; - /* 0x042 */ u8 unk_42; - /* 0x043 */ u8 unk_43; - /* 0x044 */ AlUnkXi unk_44[10]; - /* 0x1D4 */ AlUnkOmega unk_1D4[4]; -} AuAmbPlayer; // size = 0x1E4 + /* 0x038 */ s32 fadeVolume; + /* 0x03C */ s32 fadeStep; + /* 0x040 */ u16 fadeTime; + /* 0x042 */ u8 fadeGoal; + /* 0x043 */ u8 resetRequired; + /* 0x044 */ AmbienceTrack tracks[10]; + /* 0x1D4 */ AmbienceSavedVoice savedVoices[4]; +} AmbiencePlayer; // size = 0x1E4 //TODO AuStreamingManager ? // 801D57A0 -typedef struct AuAmbienceManager { +typedef struct AmbienceManager { /* 0x000 */ AuGlobals* globals; /* 0x004 */ s32 nextUpdateStep; /* 0x008 */ s32 nextUpdateInterval; /* 0x00C */ s32 nextUpdateCounter; /* 0x010 */ MSEQHeader* mseqFiles[4]; - /* 0x020 */ u8 unk_20; - /* 0x021 */ u8 unk_21; + /* 0x020 */ u8 numActivePlayers; + /* 0x021 */ u8 loadTracksFadeInfo; /* 0x022 */ u8 priority; - /* 0x023 */ u8 defaultReverbType; - /* 0x024 */ AuAmbPlayer mseqPlayers[4]; - /* 0x7B4 */ AlUnkIota mseqVoiceStates[16]; -} AuAmbienceManager; + /* 0x023 */ u8 busId; + /* 0x024 */ AmbiencePlayer players[4]; + /* 0x7B4 */ AmbienceVoiceState voiceStates[16]; +} AmbienceManager; typedef struct AlUnkGemini { /* 0x00 */ u16 sound1; @@ -1094,11 +1199,11 @@ extern s32 CUSTOM_SMALL_ROOM_PARAMS[]; extern s32 CUSTOM_ECHO_PARAMS_1[]; extern s32 CUSTOM_ECHO_PARAMS_3[]; extern s32 CUSTOM_ECHO_PARAMS_2[]; -extern s32 D_80078544[]; +extern EnvelopePreset DummyInstrumentEnvelope; extern u8 AmbientSoundIDtoMSEQFileIndex[]; -extern s32 D_800785A0[]; +extern s32 AuEnvelopeIntervals[]; extern s32 PreventBGMPlayerUpdate; -extern u16 D_80078DB6; +extern u16 AuAmbiencePlayOnlyIndex; extern AuSynDriver* gActiveSynDriverPtr; extern AuSynDriver* gSynDriverPtr; @@ -1110,7 +1215,7 @@ extern AuGlobals* gSoundGlobals; extern BGMPlayer* gBGMPlayerC; extern BGMPlayer* gBGMPlayerB; extern AuCallback BeginSoundUpdateCallback; -extern AuAmbienceManager* gAuAmbienceManager; +extern AmbienceManager* gAuAmbienceManager; extern SoundManager* gSoundManager; extern BGMPlayer* gBGMPlayerA; diff --git a/src/audio/25f00_len_940.c b/src/audio/25f00_len_940.c index ef9e1399f1..da46df7984 100644 --- a/src/audio/25f00_len_940.c +++ b/src/audio/25f00_len_940.c @@ -14,7 +14,7 @@ u8 volatile AuSynUseStereo = TRUE; //bss extern Acmd* AlCmdListBuffers[3]; -extern NUScTask D_800A3520[3]; +extern NUScTask nuAuTasks[3]; extern u8* D_800A3628[3]; extern s32 AlFrameSize; extern s32 AlMinFrameSize; @@ -25,7 +25,6 @@ extern NUDMABuffer* D_800A3BD4; extern NUDMABuffer nuAuDmaBufList[50]; extern AuSynDriver auSynDriver; extern u64 rspbootUcodeBuffer[]; -extern s32 AlNumFields; extern u64 n_aspMain_text_bin[]; extern u64 n_aspMain_data_bin[]; extern u8 AuHeapBase[AUDIO_HEAP_SIZE]; @@ -41,7 +40,7 @@ void create_audio_system(void) { config.num_pvoice = 24; config.num_bus = 4; outputRate = osAiSetFrequency(32000); - frameSize = (AlNumFields * outputRate + 59) / 60; + frameSize = (nusched.retraceCount * outputRate + 59) / 60; config.outputRate = outputRate; config.unk_0C = 0; config.heap = &nuAuHeap; @@ -53,21 +52,21 @@ void create_audio_system(void) { AlCmdListBuffers[i] = alHeapAlloc(config.heap, 1, AUDIO_COMMAND_LIST_BUFFER_SIZE); } - for (i = 0; i < ARRAY_COUNT(D_800A3520); i++) { - D_800A3520[i].next = NULL; - D_800A3520[i].msg = 0; - D_800A3520[i].list.t.type = M_AUDTASK; - D_800A3520[i].list.t.ucode_boot = rspbootUcodeBuffer; - D_800A3520[i].list.t.ucode_boot_size = 0x100; - D_800A3520[i].list.t.ucode = n_aspMain_text_bin; - D_800A3520[i].list.t.ucode_data = n_aspMain_data_bin; - D_800A3520[i].list.t.ucode_data_size = SP_UCODE_DATA_SIZE; - D_800A3520[i].list.t.dram_stack = NULL; - D_800A3520[i].list.t.dram_stack_size = 0; - D_800A3520[i].list.t.output_buff = NULL; - D_800A3520[i].list.t.output_buff_size = 0; - D_800A3520[i].list.t.yield_data_ptr = NULL; - D_800A3520[i].list.t.yield_data_size = 0; + for (i = 0; i < ARRAY_COUNT(nuAuTasks); i++) { + nuAuTasks[i].next = NULL; + nuAuTasks[i].msg = 0; + nuAuTasks[i].list.t.type = M_AUDTASK; + nuAuTasks[i].list.t.ucode_boot = rspbootUcodeBuffer; + nuAuTasks[i].list.t.ucode_boot_size = 0x100; + nuAuTasks[i].list.t.ucode = n_aspMain_text_bin; + nuAuTasks[i].list.t.ucode_data = n_aspMain_data_bin; + nuAuTasks[i].list.t.ucode_data_size = SP_UCODE_DATA_SIZE; + nuAuTasks[i].list.t.dram_stack = NULL; + nuAuTasks[i].list.t.dram_stack_size = 0; + nuAuTasks[i].list.t.output_buff = NULL; + nuAuTasks[i].list.t.output_buff_size = 0; + nuAuTasks[i].list.t.yield_data_ptr = NULL; + nuAuTasks[i].list.t.yield_data_size = 0; } for (i = 0; i < ARRAY_COUNT(D_800A3628); i++) { @@ -128,10 +127,10 @@ void nuAuMgr(void* arg) { switch (*mesg_type) { case NU_SC_RETRACE_MSG: if (cmdList_len != 0 && nuAuTaskStop == NU_AU_TASK_RUN) { - D_800A3520[cmdListIndex].msgQ = &auRtnMesgQ; - D_800A3520[cmdListIndex].list.t.data_ptr = (u64*)cmdListBuf; - D_800A3520[cmdListIndex].list.t.data_size = (cmdListAfter_ptr - cmdListBuf) * sizeof(Acmd); - osSendMesg(&nusched.audioRequestMQ, &D_800A3520[cmdListIndex], OS_MESG_BLOCK); + nuAuTasks[cmdListIndex].msgQ = &auRtnMesgQ; + nuAuTasks[cmdListIndex].list.t.data_ptr = (u64*)cmdListBuf; + nuAuTasks[cmdListIndex].list.t.data_size = (cmdListAfter_ptr - cmdListBuf) * sizeof(Acmd); + osSendMesg(&nusched.audioRequestMQ, &nuAuTasks[cmdListIndex], OS_MESG_BLOCK); nuAuCleanDMABuffers(); osRecvMesg(&auRtnMesgQ, NULL, 1); if (++bufferIndex == 3) { diff --git a/src/audio/28910_len_5090.c b/src/audio/28910_len_5090.c index 1ba15ac484..fc5b0070ce 100644 --- a/src/audio/28910_len_5090.c +++ b/src/audio/28910_len_5090.c @@ -1,6 +1,6 @@ #include "audio.h" -extern s32 D_80078554; +extern u8 EnvelopeReleaseDefaultFast[]; extern u8 BgmDivisors[8]; extern u8 D_80078558[40]; @@ -513,12 +513,12 @@ AuResult func_8004E0F4(SongUpdateEvent* update) { return status; } -void au_bgm_player_init(BGMPlayer* player, s32 priority, s32 reverbType, AuGlobals* globals) { +void au_bgm_player_init(BGMPlayer* player, s32 priority, s32 busId, AuGlobals* globals) { s16 i; player->globals = globals; func_8004E880(player, BGM_SAMPLE_RATE, 48); - player->unk_48 = 0x8000; + player->busVolume = 0x8000; player->masterTempo = BGM_DEFAULT_TEMPO; player->masterVolume = 0x7F000000; player->updateCounter = 0; @@ -543,7 +543,7 @@ void au_bgm_player_init(BGMPlayer* player, s32 priority, s32 reverbType, AuGloba player->bFadeConfigSetsVolume = FALSE; player->masterState = BGM_PLAY_STATE_IDLE; player->priority = priority; - player->defaultReverbType = reverbType; + player->busId = busId; *(s32*)player->segLoopCounters = 0; player->unk_222 = 0; player->unk_223 = 0; @@ -638,12 +638,12 @@ void func_8004E444(BGMPlayer* arg0) { s32 i; for (i = 0; i < ARRAY_COUNT(arg0->effectIndices); i++) { - s8 temp = arg0->effectIndices[i]; + s8 busId = arg0->effectIndices[i]; - if (temp < 0) { + if (busId < 0) { return; } - func_80053A98(temp, mult, arg0->unk_48); + au_fade_set_volume(busId, mult, arg0->busVolume); } } @@ -729,7 +729,7 @@ void au_bgm_player_initialize(BGMPlayer* player) { track->isDrumTrack = FALSE; track->parentTrackIdx = 0; track->unk_5A = 0; - track->subtrackReverbType = player->defaultReverbType; + track->subtrackBusId = player->busId; track->index = i; } @@ -1006,7 +1006,7 @@ void au_bgm_player_update_playing(BGMPlayer *player) { s16 notePitch; u8 bFinished; - AlUnkVoice* voice; + AuVoice* voice; BGMDrumInfo* drumInfo; BGMPlayerTrack* track; SeqNote* note; @@ -1190,7 +1190,7 @@ void au_bgm_player_update_playing(BGMPlayer *player) { if (!bAcquiredVoiceIdx) { s32 shortestLength = 0xFFFF; u8 voice_it; - AlUnkVoice* curVoice; + AuVoice* curVoice; SeqNote* curNote; for (voice_it = track->unk_52; voice_it < track->unk_53; voice_it++) { curVoice = &player->globals->voices[voice_it]; @@ -1238,13 +1238,13 @@ void au_bgm_player_update_playing(BGMPlayer *player) { } else { drumInfo = player->drums[notePitch - 72]; // = 6 * 12 } - note->ins = au_get_instrument(player->globals, (u16)drumInfo->bankPatch >> 8, (u16)drumInfo->bankPatch & 0xFF, &voice->unk_14); + note->ins = au_get_instrument(player->globals, (u16)drumInfo->bankPatch >> 8, (u16)drumInfo->bankPatch & 0xFF, &voice->envelope); if (drumInfo->randVolume != 0) { note->volume = note->noteVelocity * au_bgm_get_random_vol(player->randomValue1, drumInfo->volume, drumInfo->randVolume); } else { note->volume = note->noteVelocity * drumInfo->volume; } - voice->adjustedVolume = (( + voice->clientVolume = (( ((player->masterVolume >> 0x15) * (track->subTrackVolume >> 0x15) * (track->unkVolume >> 0x15)) >> 0x14) * (track->segTrackVolume * note->volume)) >> 0x10; note->adjustedPitch = @@ -1264,15 +1264,15 @@ void au_bgm_player_update_playing(BGMPlayer *player) { voice->pan = drumInfo->pan; } if (drumInfo->randReverb != 0) { - voice->reverbAmt = au_bgm_get_random_reverb(player->randomValue1, drumInfo->reverb, drumInfo->randReverb); + voice->reverb = au_bgm_get_random_reverb(player->randomValue1, drumInfo->reverb, drumInfo->randReverb); } else { - voice->reverbAmt = drumInfo->reverb; + voice->reverb = drumInfo->reverb; } } else { note->volume = (( ((player->masterVolume >> 0x15) * (track->subTrackVolume >> 0x15) * (track->unkVolume >> 0x15)) >> 0x14) * (track->segTrackVolume * note->noteVelocity)) >> 9; - voice->adjustedVolume = note->volume; + voice->clientVolume = note->volume; note->ins = track->instrument; note->adjustedPitch = (notePitch * 100) @@ -1291,26 +1291,26 @@ void au_bgm_player_update_playing(BGMPlayer *player) { } else { voice->pan = track->subTrackPan; } - voice->reverbAmt = track->subTrackReverb; + voice->reverb = track->subTrackReverb; if (track->unk_4C != 0) { - voice->unk_14.unk_00 = (s32*) player->unk_174[track->unk_4C - 1]; //TODO ??? + voice->envelope.cmdListPress = (u8*) player->unk_174[track->unk_4C - 1]; //TODO ??? } else { - voice->unk_14.unk_00 = track->unk_10.unk_00; + voice->envelope.cmdListPress = track->envelope.cmdListPress; } - voice->unk_14.unk_04 = track->unk_10.unk_04; + voice->envelope.cmdListRelease = track->envelope.cmdListRelease; } voice->instrument = note->ins; voice->pitchRatio = note->pitchRatio; - voice->reverbType = track->subtrackReverbType; + voice->busId = track->subtrackBusId; if (note->noteLength >= 2) { note->unk_note_17 = 1; note->tremoloTime = track->trackTremoloTime; note->unk_13 = 0; note->tremoloAmount = track->trackTremoloAmount; - voice->unk_flags_43 = AU_VOICE_SYNC_FLAG_ALL; + voice->syncFlags = AU_VOICE_SYNC_FLAG_ALL; voice->priority = player->priority; - voice->priorityCopy = voice->priority; + voice->clientPriority = voice->priority; } } } else { @@ -1355,7 +1355,7 @@ void au_bgm_player_update_playing(BGMPlayer *player) { if (note->noteLength > 0) { note->noteLength--; if (note->noteLength == 0) { - voice->unk_flags_3D |= AU_VOICE_3D_FLAG_10; + voice->envelopeFlags |= AU_VOICE_ENV_FLAG_KEY_RELEASED; } } if (track->isDrumTrack) { @@ -1363,16 +1363,16 @@ void au_bgm_player_update_playing(BGMPlayer *player) { note->pitchRatio = au_compute_pitch_ratio(((note->adjustedPitch + note->unk_14) + track->segTrackTune) + player->detune) * note->ins->pitchRatio; if (voice->pitchRatio != note->pitchRatio) { voice->pitchRatio = note->pitchRatio; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_PITCH; + voice->syncFlags |= AU_VOICE_SYNC_FLAG_PITCH; } } if (track->changed.volume) { - voice->adjustedVolume = ( + voice->clientVolume = ( ((((player->masterVolume >> 0x15) * (track->subTrackVolume >> 0x15)) * (track->unkVolume >> 0x15)) >> 0x14) * (track->segTrackVolume * note->volume)) >> 0x10; - voice->unk_flags_3D |= AU_VOICE_3D_FLAG_VOL_CHANGED; + voice->envelopeFlags |= AU_VOICE_ENV_FLAG_VOL_CHANGED; } } else { if (note->tremoloTime != 0) { @@ -1401,7 +1401,7 @@ void au_bgm_player_update_playing(BGMPlayer *player) { note->pitchRatio = au_compute_pitch_ratio(var_a1_5 + ((note->adjustedPitch + track->segTrackTune) + player->detune)) * note->ins->pitchRatio; if (voice->pitchRatio != note->pitchRatio) { voice->pitchRatio = note->pitchRatio; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_PITCH; + voice->syncFlags |= AU_VOICE_SYNC_FLAG_PITCH; } } } else if (track->changed.tune || (player->detune != 0)) { @@ -1409,20 +1409,20 @@ void au_bgm_player_update_playing(BGMPlayer *player) { note->pitchRatio = au_compute_pitch_ratio((note->adjustedPitch + track->segTrackTune) + player->detune) * note->ins->pitchRatio; if (voice->pitchRatio != note->pitchRatio) { voice->pitchRatio = note->pitchRatio; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_PITCH; + voice->syncFlags |= AU_VOICE_SYNC_FLAG_PITCH; } } if (track->changed.volume) { s32 tempVolume = ((player->masterVolume >> 0x15) * (track->subTrackVolume >> 0x15) * (track->unkVolume >> 0x15)) >> 0x14; note->volume = (tempVolume * (track->segTrackVolume * note->noteVelocity)) >> 9; - voice->adjustedVolume = note->volume; - voice->unk_flags_3D |= AU_VOICE_3D_FLAG_VOL_CHANGED; + voice->clientVolume = note->volume; + voice->envelopeFlags |= AU_VOICE_ENV_FLAG_VOL_CHANGED; voice->pan = track->subTrackPan; - voice->reverbAmt = track->subTrackReverb; + voice->reverb = track->subTrackReverb; } else if (track->changed.pan || track->changed.reverb) { voice->pan = track->subTrackPan; - voice->reverbAmt = track->subTrackReverb; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_10; + voice->reverb = track->subTrackReverb; + voice->syncFlags |= AU_VOICE_SYNC_FLAG_PAN_FXMIX; } } } @@ -1488,18 +1488,18 @@ void au_BGMCmd_E2_MasterPitchShift(BGMPlayer* player, BGMPlayerTrack* track) { } void au_BGMCmd_E3(BGMPlayer* player, BGMPlayerTrack* track) { - player->globals->effectChanges[player->defaultReverbType].type = player->seqCmdArgs.UnkCmdE3.bank; - player->globals->effectChanges[player->defaultReverbType].changed = TRUE; + player->globals->effectChanges[player->busId].type = player->seqCmdArgs.UnkCmdE3.effectType; + player->globals->effectChanges[player->busId].changed = TRUE; } void au_BGMCmd_E6_MasterEffect(BGMPlayer* player, BGMPlayerTrack* track) { u8 index = player->seqCmdArgs.MasterEffect.index; - u32 temp_v1 = player->effectIndices[index]; + u32 busId = player->effectIndices[index]; - if ((index < 4) && (temp_v1 < 0x80)) { - if (player->globals->effectChanges[temp_v1].type != player->seqCmdArgs.MasterEffect.value) { - player->globals->effectChanges[temp_v1].type = player->seqCmdArgs.MasterEffect.value; - player->globals->effectChanges[temp_v1].changed = TRUE; + if ((index < 4) && (busId < 0x80)) { + if (player->globals->effectChanges[busId].type != player->seqCmdArgs.MasterEffect.value) { + player->globals->effectChanges[busId].type = player->seqCmdArgs.MasterEffect.value; + player->globals->effectChanges[busId].changed = TRUE; } player->effectValues[index] = player->seqCmdArgs.MasterEffect.value; } @@ -1537,7 +1537,7 @@ void au_BGMCmd_E5_MasterVolumeFade(BGMPlayer* player, BGMPlayerTrack* track) { void au_BGMCmd_E8_TrackOverridePatch(BGMPlayer* player, BGMPlayerTrack* track) { track->patch = player->seqCmdArgs.TrackOverridePatch.patch; - track->instrument = au_get_instrument(player->globals, player->seqCmdArgs.TrackOverridePatch.bank, track->patch, &track->unk_10); + track->instrument = au_get_instrument(player->globals, player->seqCmdArgs.TrackOverridePatch.bank, track->patch, &track->envelope); } void au_BGMCmd_E9_SubTrackVolume(BGMPlayer* arg0, BGMPlayerTrack* track) { @@ -1648,7 +1648,7 @@ void au_BGMCmd_F5_TrackVoice(BGMPlayer* player, BGMPlayerTrack* track) { patch = (u8)instrument->bankPatch; volume = instrument->volume & 0x7F; track->patch = patch; - track->instrument = au_get_instrument(player->globals, bank, patch, &track->unk_10); + track->instrument = au_get_instrument(player->globals, bank, patch, &track->envelope); if (volume != 0) { volume <<= 0x18; } @@ -1662,12 +1662,12 @@ void au_BGMCmd_F5_TrackVoice(BGMPlayer* player, BGMPlayerTrack* track) { void au_BGMCmd_F7_SubTrackReverbType(BGMPlayer* player, BGMPlayerTrack* track) { u8 index = player->seqCmdArgs.SubTrackReverbType.index; - s8 type = player->effectIndices[index]; + s8 busId = player->effectIndices[index]; - if ((index < 4) && (type >= 0)) { - track->subtrackReverbType = type; + if ((index < 4) && (busId >= 0)) { + track->subtrackBusId = busId; } else { - track->subtrackReverbType = player->defaultReverbType; + track->subtrackBusId = player->busId; } } @@ -1703,8 +1703,8 @@ void au_BGMCmd_FC_Jump(BGMPlayer* player, BGMPlayerTrack* track) { track->unk_4D = 0; track->unkVolume = 0; for (i = track->unk_52; i < track->unk_53; i++) { - AlUnkVoice* voice = &player->globals->voices[i]; - if ((voice->priority == player->priority) && (voice->unk_1C != NULL)) { + AuVoice* voice = &player->globals->voices[i]; + if ((voice->priority == player->priority) && (voice->cmdPtr != NULL)) { au_reset_voice(voice, i); } } @@ -1720,7 +1720,7 @@ void au_BGMCmd_FC_Jump(BGMPlayer* player, BGMPlayerTrack* track) { track->trackTremoloTime = 0; track->subTrackVolumeTime = 0; track->unk_57 = 0; - track->subtrackReverbType = player->defaultReverbType; + track->subtrackBusId = player->busId; } void au_BGMCmd_FF(BGMPlayer* player, BGMPlayerTrack* track) { @@ -1736,7 +1736,7 @@ void au_BGMCmd_FF(BGMPlayer* player, BGMPlayerTrack* track) { switch (arg0) { case 1: if ((arg1 < ARRAY_COUNT(player->effectIndices)) && ((s8)player->effectIndices[arg1] >= 0)) { - player->globals->channelDelayGroupIdx = player->effectIndices[arg1]; + player->globals->channelDelayBusId = player->effectIndices[arg1]; if (arg2 != 0) { temp_a3 = arg2 & 0xF; temp_a1 = ((arg2 >> 4) & 1) + 1; @@ -1785,10 +1785,10 @@ void au_BGMCmd_FF(BGMPlayer* player, BGMPlayerTrack* track) { break; case 5: if (player->soundManager != NULL) { - for (i = 0; i < ARRAY_COUNT(player->soundManager->unk_90); i++) { - if ((player->soundManager->unk_90[i].unk_0) == 0) { - player->soundManager->unk_90[i].unk_0 = arg1; - player->soundManager->unk_90[i].volume = ((player->fadeInfo.currentVolume.u16 * player->fadeInfo.volScale.u16) + 0x7FFF) >> 0x17; + for (i = 0; i < ARRAY_COUNT(player->soundManager->bgmSounds); i++) { + if ((player->soundManager->bgmSounds[i].unk_0) == 0) { + player->soundManager->bgmSounds[i].unk_0 = arg1; + player->soundManager->bgmSounds[i].volume = ((player->fadeInfo.currentVolume.u16 * player->fadeInfo.volScale.u16) + 0x7FFF) >> 0x17; break; } } @@ -1990,7 +1990,7 @@ void func_80050900(BGMPlayer* player) { u8 i; for (i = 0; i < ARRAY_COUNT(player->globals->voices); i++) { - AlUnkVoice* voice = &player->globals->voices[i]; + AuVoice* voice = &player->globals->voices[i]; if (voice->priority == player->priority) { au_reset_voice(voice, i); } @@ -2001,7 +2001,7 @@ AuResult func_80050970(SongUpdateEvent* update) { BGMPlayer* player; BGMPlayerTrack* track; BGMPlayerTrack* parentTrack; - AlUnkVoice* voice; + AuVoice* voice; s32 i; s32 j; s8 oldVolume; @@ -2025,8 +2025,8 @@ AuResult func_80050970(SongUpdateEvent* update) { for (j = parentTrack->unk_52; j < parentTrack->unk_53; j++) { voice = &player->globals->voices[j]; if (voice->priority == player->priority) { - voice->unk_14.unk_04 = &D_80078554; - voice->unk_flags_3D |= AU_VOICE_3D_FLAG_10; + voice->envelope.cmdListRelease = EnvelopeReleaseDefaultFast; + voice->envelopeFlags |= AU_VOICE_ENV_FLAG_KEY_RELEASED; } } oldVolume = track->subTrackVolume >> 24; @@ -2043,8 +2043,8 @@ AuResult func_80050970(SongUpdateEvent* update) { for (j = track->unk_52; j < track->unk_53; j++) { voice = &player->globals->voices[j]; if (voice->priority == player->priority) { - voice->unk_14.unk_04 = &D_80078554; - voice->unk_flags_3D |= AU_VOICE_3D_FLAG_10; + voice->envelope.cmdListRelease = EnvelopeReleaseDefaultFast; + voice->envelopeFlags |= AU_VOICE_ENV_FLAG_KEY_RELEASED; } } oldVolume = parentTrack->subTrackVolume >> 24; diff --git a/src/audio/2BF90.c b/src/audio/2BF90.c index f702433c62..3c081a6da8 100644 --- a/src/audio/2BF90.c +++ b/src/audio/2BF90.c @@ -1,31 +1,52 @@ #include "audio.h" -extern s8 BlankMseqData; +extern u8 BlankMseqData[]; -enum LambdaState24 { - LAMBDA_24_0 = 0, - LAMBDA_24_1 = 1, - LAMBDA_24_2 = 2, - LAMBDA_24_3 = 3 +#define TRACK_ID_DRUM 9 + +enum AmbientMode { + AMB_MODE_NORMAL = 0, + AMB_MODE_RESUMING = 1, + AMB_MODE_STOPPED = 2, + AMB_MODE_PAUSING = 3 }; -enum MseqPlayState { - MSEQ_PLAYER_PLAYING = 0, - MSEQ_PLAYER_STOPPED = 1, - MSEQ_PLAYER_STOPPING = 2 +enum AmbientFadeState { + AMB_FADE_IN = 0, + AMB_FADE_OUT = 1, + AMB_FADE_OUT_PAUSING = 2, }; -void au_mseq_manager_init(AuAmbienceManager* manager, s8 priority, s8 reverbType, AuGlobals* globals) { - AuAmbPlayer* lambda; +enum AmbientPlayState { + AMB_PLAYER_PLAYING = 0, + AMB_PLAYER_STOPPED = 1, + AMB_PLAYER_STOPPING = 2 +}; + +enum MSEQCommand { + MSEQ_CMD_80_STOP_SOUND = 0x80, + MSEQ_CMD_90_PLAY_SOUND = 0x90, + MSEQ_CMD_A0_SET_VOLUME_PAN = 0xA0, + MSEQ_CMD_B0_MULTI = 0xB0, + MSEQ_CMD_C0_SET_INSTRUMENT = 0xC0, + MSEQ_CMD_E0_TUNING = 0xE0, + MSEQ_CMD_SUB_66_START_LOOP = 0x66, + MSEQ_CMD_SUB_67_END_LOOP = 0x67, + MSEQ_CMD_SUB_68_SET_REVERB = 0x68, + MSEQ_CMD_SUB_69_SET_RESUMABLE = 0x69, +}; + +void au_amb_manager_init(AmbienceManager* manager, s8 priority, s8 busId, AuGlobals* globals) { + AmbiencePlayer* player; s32 i; au_memset(manager, sizeof(*manager), 0); - for (i = 0; i < ARRAY_COUNT(manager->mseqPlayers); i++) { - lambda = &manager->mseqPlayers[i]; - lambda->unk_14.u8[0] = i; - lambda->unk_18 = 1; - lambda->unk_38 = 0x7F000000; + for (i = 0; i < ARRAY_COUNT(manager->players); i++) { + player = &manager->players[i]; + player->id.playerIndex = i; + player->delay = 1; + player->fadeVolume = 0x7F000000; } manager->globals = globals; @@ -33,46 +54,46 @@ void au_mseq_manager_init(AuAmbienceManager* manager, s8 priority, s8 reverbType manager->nextUpdateCounter = 2; manager->nextUpdateInterval = 2; manager->priority = priority; - manager->defaultReverbType = reverbType; + manager->busId = busId; } -AuResult func_80050C30(u32 arg0) { - if (gAuAmbienceManager->unk_20 <= arg0) { +AuResult au_amb_check_player_index(u32 index) { + if (gAuAmbienceManager->numActivePlayers <= index) { return AU_AMBIENCE_ERROR_3; } else { return AU_RESULT_OK; } } -void func_80050C54(s32 arg0, s32 arg1) { - gAuAmbienceManager->unk_21 = arg1; +void au_amb_load_tracks_fade(s32 arg0, s32 arg1) { + gAuAmbienceManager->loadTracksFadeInfo = arg1; } -void au_mseq_set_disabled(s32 index, s32 disable) { - AuAmbienceManager* manager = gAuAmbienceManager; - AuAmbPlayer* ambPlayer = &manager->mseqPlayers[index]; +void au_amb_set_disabled(s32 index, s32 disable) { + AmbienceManager* manager = gAuAmbienceManager; + AmbiencePlayer* ambPlayer = &manager->players[index]; if (!disable) { - ambPlayer->playState = MSEQ_PLAYER_PLAYING; + ambPlayer->playState = AMB_PLAYER_PLAYING; } else { - ambPlayer->playState = MSEQ_PLAYER_STOPPING; + ambPlayer->playState = AMB_PLAYER_STOPPING; } } -AuResult func_80050CA0(s32 index, s32 time) { - AuAmbPlayer* lambda = &gAuAmbienceManager->mseqPlayers[index]; +AuResult au_amb_start(s32 index, s32 time) { + AmbiencePlayer* player = &gAuAmbienceManager->players[index]; MSEQHeader* mseq = gAuAmbienceManager->mseqFiles[index]; AuResult status = AU_RESULT_OK; if (mseq != NULL) { - if (lambda->mseqName == 0) { - func_800510A4(gAuAmbienceManager, mseq, index); + if (player->mseqName == 0) { + au_amb_play_sequence(gAuAmbienceManager, mseq, index); if (time != 0) { - lambda->time = time; - lambda->unk_2A = 0; - lambda->volume = 0x7F; - lambda->unk_26 = 0; - func_80050D50(lambda); + player->fadeSettingsTime = time; + player->fadeSettingsInitial = 0; + player->fadeSettingsGoal = 127; + player->fadeSettingsType = AMB_FADE_IN; + au_amb_fade_setup(player); } } else { status = AU_AMBIENCE_ERROR_1; @@ -83,299 +104,645 @@ AuResult func_80050CA0(s32 index, s32 time) { return status; } -void func_80050D50(AuAmbPlayer* lambda) { - u16 time = lambda->time; +void au_amb_fade_setup(AmbiencePlayer* player) { + u16 time = player->fadeSettingsTime; - if (lambda->unk_2A == 0xFF) { - lambda->unk_2A = lambda->unk_38 >> 0x18; + if (player->fadeSettingsInitial == 255) { + player->fadeSettingsInitial = player->fadeVolume >> 0x18; } if (time >= SND_MIN_DURATION && time <= SND_MAX_DURATION) { - lambda->unk_38 = lambda->unk_2A << 0x18; - lambda->unk_42 = lambda->volume; - lambda->volInterpTime = (u32)(time * 10) / 115; - lambda->volInterpStep = ((lambda->volume - lambda->unk_2A) << 0x18) / ((s16)lambda->volInterpTime & 0xFFFF); + player->fadeVolume = player->fadeSettingsInitial << 0x18; + player->fadeGoal = player->fadeSettingsGoal; + player->fadeTime = (u32)(time * 10) / 115; // TODO figure out why is the ratio like this + player->fadeStep = ((player->fadeSettingsGoal - player->fadeSettingsInitial) << 0x18) / ((s16)player->fadeTime & 0xFFFF); } - lambda->time = 0; - lambda->unk_2A = 0; - lambda->volume = 0; + player->fadeSettingsTime = 0; + player->fadeSettingsInitial = 0; + player->fadeSettingsGoal = 0; } -void func_80050EF0_fade_out_unk(s32 index, s32 time) { - AuAmbPlayer* lambda = &gAuAmbienceManager->mseqPlayers[index]; +void au_amb_pause(s32 index, s32 time) { + AmbiencePlayer* player = &gAuAmbienceManager->players[index]; - if ((lambda->mseqReadStart != NULL) && (lambda->mseqReadPos != NULL)) { + if (player->mseqReadStart != NULL && player->mseqReadPos != NULL) { if (time != 0) { - lambda->unk_2A = 0xFF; - lambda->time = time; - lambda->volume = 0; - lambda->unk_26 = 2; + player->fadeSettingsInitial = 255; + player->fadeSettingsTime = time; + player->fadeSettingsGoal = 0; + player->fadeSettingsType = AMB_FADE_OUT_PAUSING; return; } - lambda->unk_24 = LAMBDA_24_3; + player->mode = AMB_MODE_PAUSING; } } -void func_80050EF0_fade_in_unk(s32 index, s32 time) { - AuAmbPlayer* lambda = &gAuAmbienceManager->mseqPlayers[index]; +void au_amb_resume(s32 index, s32 time) { + AmbiencePlayer* player = &gAuAmbienceManager->players[index]; - if ((lambda->mseqReadStart != NULL) && (lambda->mseqReadPos != NULL)) { - lambda->unk_24 = LAMBDA_24_1; + if (player->mseqReadStart != NULL && player->mseqReadPos != NULL) { + player->mode = AMB_MODE_RESUMING; if (time != 0) { - lambda->time = time; + player->fadeSettingsTime = time; } else { - lambda->time = SND_MIN_DURATION; + player->fadeSettingsTime = SND_MIN_DURATION; } - lambda->unk_2A = 0; - lambda->volume = SND_MAX_VOLUME_8; - lambda->unk_26 = 0; + player->fadeSettingsInitial = 0; + player->fadeSettingsGoal = SND_MAX_VOLUME_8; + player->fadeSettingsType = AMB_FADE_IN; } } -void func_80050EF0_fade_out_quick(s32 index) { - AuAmbPlayer* lambda = &gAuAmbienceManager->mseqPlayers[index]; +void au_amb_stop_quick(s32 index) { + AmbiencePlayer* player = &gAuAmbienceManager->players[index]; - if ((lambda->mseqReadStart != NULL) && (lambda->mseqReadPos != NULL)) { - if (lambda->unk_24 != LAMBDA_24_0) { - lambda->mseqReadPos = NULL; - lambda->mseqName = 0; - lambda->unk_24 = LAMBDA_24_0; + if (player->mseqReadStart != NULL && player->mseqReadPos != NULL) { + if (player->mode != AMB_MODE_NORMAL) { + player->mseqReadPos = NULL; + player->mseqName = 0; + player->mode = AMB_MODE_NORMAL; return; } - lambda->mseqReadPos = &BlankMseqData; - lambda->unk_18 = 1; + player->mseqReadPos = BlankMseqData; + player->delay = 1; } } -void func_80050EF0_fade_out_slow(s32 index, s32 time) { - AuAmbPlayer* lambda = &gAuAmbienceManager->mseqPlayers[index]; +void au_amb_stop_slow(s32 index, s32 time) { + AmbiencePlayer* player = &gAuAmbienceManager->players[index]; - if ((lambda->mseqReadStart != NULL) && (lambda->mseqReadPos != NULL)) { + if (player->mseqReadStart != NULL && player->mseqReadPos != NULL) { if (time != 0) { - lambda->time = time; + player->fadeSettingsTime = time; } else { - lambda->time = SND_MIN_DURATION; + player->fadeSettingsTime = SND_MIN_DURATION; } - lambda->unk_2A = -1; - lambda->volume = 0; - lambda->unk_26 = 1; + player->fadeSettingsInitial = 255; + player->fadeSettingsGoal = 0; + player->fadeSettingsType = AMB_FADE_OUT; } } -void au_mseq_set_volume(s32 index, s32 time, s32 volume) { - AuAmbPlayer* lambda = &gAuAmbienceManager->mseqPlayers[index]; - if ((lambda->mseqReadStart != 0) && (lambda->mseqReadPos != 0)) { +void au_amb_set_volume(s32 index, s32 time, s32 volume) { + AmbiencePlayer* player = &gAuAmbienceManager->players[index]; + if ((player->mseqReadStart != 0) && (player->mseqReadPos != 0)) { if (volume <= 0) { volume = 1; } else if (volume > SND_MAX_VOLUME_8) { volume = SND_MAX_VOLUME_8; } if (time != 0) { - lambda->time = time; + player->fadeSettingsTime = time; } else { - lambda->time = SND_MIN_DURATION; + player->fadeSettingsTime = SND_MIN_DURATION; } - lambda->unk_2A = -1; - lambda->volume = volume; - lambda->unk_26 = 0; + player->fadeSettingsInitial = 255; + player->fadeSettingsGoal = volume; + player->fadeSettingsType = AMB_FADE_IN; } } -AuResult func_80051050(s32 arg0) { - AuAmbPlayer* lambda = &gAuAmbienceManager->mseqPlayers[arg0]; +AuResult au_amb_is_stopped(s32 index) { + AmbiencePlayer* player = &gAuAmbienceManager->players[index]; AuResult status = AU_RESULT_OK; - if ((lambda->mseqReadStart != NULL) && (lambda->mseqReadPos != NULL)) { + if (player->mseqReadStart != NULL && player->mseqReadPos != NULL) { status = AU_AMBIENCE_ERROR_1; - if (lambda->unk_24 != LAMBDA_24_0) { + if (player->mode != AMB_MODE_NORMAL) { status = AU_AMBIENCE_ERROR_2; } } return status; } -void func_800510A4(AuAmbienceManager* manager, MSEQHeader* mseqFile, s32 index) { - AuAmbPlayer* lambda; - AlUnkXi* xi; +void au_amb_play_sequence(AmbienceManager* manager, MSEQHeader* mseqFile, s32 index) { + AmbiencePlayer* player; + AmbienceTrack* track; AuFilePos readPos; s32 i; - lambda = &manager->mseqPlayers[index]; - au_memset(lambda, sizeof(*lambda), 0); + player = &manager->players[index]; + au_memset(player, sizeof(*player), 0); - lambda->mseqFile = mseqFile; + player->mseqFile = mseqFile; readPos = AU_FILE_RELATIVE(mseqFile->dataStart, mseqFile); - lambda->unk_14.u8[0] = index; - lambda->mseqReadPos = readPos; - lambda->unk_10 = readPos; - lambda->unk_0C = readPos; - lambda->mseqReadStart = readPos; + player->id.playerIndex = index; + player->mseqReadPos = readPos; + player->loopStartPos[1] = readPos; + player->loopStartPos[0] = readPos; + player->mseqReadStart = readPos; - lambda->unk_18 = 1; - lambda->unk_38 = 0x7F000000; - lambda->unk_42 = 0x7F; + player->delay = 1; + player->fadeVolume = 0x7F000000; + player->fadeGoal = 0x7F; - lambda->mseqName = lambda->mseqFile->name; - lambda->firstVoiceIdx = lambda->mseqFile->first_iota; - lambda->lastVoiceIdx = lambda->firstVoiceIdx + 16; - if (lambda->lastVoiceIdx > 24) { - lambda->lastVoiceIdx = 24; + player->mseqName = player->mseqFile->name; + player->firstVoiceIdx = player->mseqFile->firstVoiceIdx; + player->lastVoiceIdx = player->firstVoiceIdx + 16; + if (player->lastVoiceIdx > 24) { + player->lastVoiceIdx = 24; } - for (i = 0; i < 10; i++) { - xi = &lambda->unk_44[i]; - xi->instrument = manager->globals->defaultInstrument; - xi->unk_18.full = 0x7FFFFFFF; - xi->pan = 0x40; + for (i = 0; i < ARRAY_COUNT(player->tracks); i++) { + track = &player->tracks[i]; + track->instrument = manager->globals->defaultInstrument; + track->volumeLerp.current = 0x7FFFFFFF; + track->pan = 64; } - lambda->unk_43 = 1; + player->resetRequired = TRUE; } -void snd_ambient_manager_update(AuAmbienceManager* manager) { +void au_amb_manager_update(AmbienceManager* manager) { u32 i; s32 j; - for (i = 0; i < ARRAY_COUNT(manager->mseqVoiceStates); i++) { - AlUnkIota* temp = &manager->mseqVoiceStates[i]; + for (i = 0; i < ARRAY_COUNT(manager->voiceStates); i++) { + AmbienceVoiceState* voiceState = &manager->voiceStates[i]; - if ((temp->unk_00.u8[3] == 1) && (manager->globals->voices[i].priority != manager->priority)) { - temp->unk_00.s32 = 0; + if (voiceState->info.released == TRUE && manager->globals->voices[i].priority != manager->priority) { + voiceState->info.all = 0; } } - for (j = 0; j < ARRAY_COUNT(manager->mseqPlayers); j++) { - AuAmbPlayer* lambda = &manager->mseqPlayers[j]; - s32 var; + for (j = 0; j < ARRAY_COUNT(manager->players); j++) { + AmbiencePlayer* player = &manager->players[j]; + s32 mode; - if (lambda->mseqReadPos != NULL) { - if (manager->unk_21) { - // not usually taken - func_80051334(manager, lambda); + if (player->mseqReadPos != NULL) { + if (manager->loadTracksFadeInfo) { + au_amb_load_track_fade_info(manager, player); } - var = lambda->unk_24; - if (var != LAMBDA_24_0) { - if (var == LAMBDA_24_3) { - lambda->unk_24 = LAMBDA_24_2; - func_800522A8(manager, lambda); - au_mseq_player_stop(manager, lambda); - } else if (lambda->unk_24 == LAMBDA_24_1) { - lambda->unk_24 = LAMBDA_24_0; - if (lambda->time != 0) { - func_80050D50(lambda); + mode = player->mode; + if (mode != AMB_MODE_NORMAL) { + if (mode == AMB_MODE_PAUSING) { + player->mode = AMB_MODE_STOPPED; + au_amb_save_voices(manager, player); + au_amb_player_stop(manager, player); + } else if (player->mode == AMB_MODE_RESUMING) { + player->mode = AMB_MODE_NORMAL; + if (player->fadeSettingsTime != 0) { + au_amb_fade_setup(player); } - func_8005232C(manager, lambda); + au_amb_restore_voices(manager, player); } } else { - if (lambda->time != 0) { - func_80050D50(lambda); + // case AMB_MODE_NORMAL + if (player->fadeSettingsTime != 0) { + au_amb_fade_setup(player); } - if (lambda->playState == MSEQ_PLAYER_STOPPING) { - au_mseq_player_stop(manager, lambda); - lambda->playState = MSEQ_PLAYER_STOPPED; + if (player->playState == AMB_PLAYER_STOPPING) { + au_amb_player_stop(manager, player); + player->playState = AMB_PLAYER_STOPPED; } - func_80051434(manager, lambda); + au_amb_player_update(manager, player); } } } - manager->unk_21 = FALSE; + manager->loadTracksFadeInfo = FALSE; } -void func_80051334(AuAmbienceManager* manager, AuAmbPlayer* lambda) { +void au_amb_load_track_fade_info(AmbienceManager* manager, AmbiencePlayer* player) { MSEQHeader* mseqFile; - AlUnkMSEQData* var_a0; - AlUnkXi* xi; + MSEQTrackData* trackData; + AmbienceTrack* track; s32 offset; s32 count; - s32 lim; - mseqFile = lambda->mseqFile; - count = mseqFile->unkCount; - if (count != 0 && mseqFile->unkOffset != 0) { - var_a0 = AU_FILE_RELATIVE(mseqFile->unkOffset, mseqFile); + mseqFile = player->mseqFile; + count = mseqFile->trackSettingsCount; + if (count != 0 && mseqFile->trackSettingsOffset != 0) { + trackData = AU_FILE_RELATIVE(mseqFile->trackSettingsOffset, mseqFile); while (count--) { - xi = &lambda->unk_44[var_a0->unk_00]; - if (var_a0->unk_01 == 0) { - xi->unk_14 = var_a0->unk_02; - xi->unk_10 = (var_a0->unk_04 << 0x10) / var_a0->unk_02; - xi->unk_16 = var_a0->unk_06; - } else if (var_a0->unk_01 == 1) { - xi->unk_20 = var_a0->unk_02; - xi->unk_1C = (var_a0->unk_04 << 0x10) / var_a0->unk_02; - xi->unk_22 = var_a0->unk_06; + track = &player->tracks[trackData->trackIndex]; + if (trackData->type == 0) { + track->tuneLerp.time = trackData->time; + track->tuneLerp.step = (trackData->delta << 0x10) / trackData->time; + track->tuneLerp.goal = trackData->goal; + } else if (trackData->type == 1) { + track->volumeLerp.time = trackData->time; + track->volumeLerp.step = (trackData->delta << 0x10) / trackData->time; + track->volumeLerp.goal = trackData->goal; } - var_a0++; + trackData++; } } } -INCLUDE_ASM(void, "audio/2BF90", func_80051434, AuAmbienceManager* arg0, AuAmbPlayer* arg1); +void au_amb_player_update(AmbienceManager* manager, AmbiencePlayer* player) { + u8 isVolumeChanged[16]; + u8 isPitchChanged[16]; + AuGlobals* globals; + u8 fadeVolChanged; + AmbienceVoiceState* voiceState; + AuVoice* voice; + BGMDrumInfo* drum; + u32 trackIdx; + s32 temp; + s32 i; + u16 bankPatch; + u32 count; + s32 loopId; + u8 op, arg1, arg2; + AmbienceTrack* track; -// could return u8? -s32 au_mseq_read_next(AuAmbPlayer* state) { + globals = manager->globals; + fadeVolChanged = FALSE; + for (i = 0; i < 16U; i++) { // required to use unsigned literal + isVolumeChanged[i] = FALSE; + isPitchChanged[i] = FALSE; + } + + if (player->resetRequired == TRUE) { + au_amb_player_stop(manager, player); + player->resetRequired = FALSE; + } + + if (player->fadeTime != 0) { + player->fadeVolume += player->fadeStep; + player->fadeTime--; + if (player->fadeTime == 0) { + player->fadeVolume = player->fadeGoal << 0x18; + if (player->fadeSettingsType == AMB_FADE_IN) { + // do nothing + } else if (player->fadeSettingsType == AMB_FADE_OUT) { + player->mseqReadPos = BlankMseqData; + player->delay = 1; + } else if (player->fadeSettingsType == AMB_FADE_OUT_PAUSING) { + player->mode = AMB_MODE_PAUSING; + } + } + fadeVolChanged = TRUE; + } + + // update pitch + for (trackIdx = 0; trackIdx < ARRAY_COUNT(player->tracks); trackIdx++) { + track = &player->tracks[trackIdx]; + if (track->tuneLerp.time != 0) { + track->tuneLerp.time--; + if (track->tuneLerp.time != 0) { + track->tuneLerp.current += track->tuneLerp.step; + } else { + track->tuneLerp.current = track->tuneLerp.goal << 0x10; + } + + temp = player->id.all + (trackIdx << 0x10); + for (i = player->firstVoiceIdx; i < player->lastVoiceIdx; i++) { + voiceState = &manager->voiceStates[i - player->firstVoiceIdx]; + // update all voices belonging to current track + if ((voiceState->info.all & 0xFFFF0000) == temp) { + voice = &globals->voices[i]; + if (voice->priority == manager->priority && trackIdx != TRACK_ID_DRUM) { + voice->pitchRatio = au_compute_pitch_ratio(voiceState->pitch + (track->tuneLerp.current >> 0x10)) * track->instrument->pitchRatio; + voice->syncFlags |= AU_VOICE_SYNC_FLAG_PITCH; + isPitchChanged[i - player->firstVoiceIdx] = TRUE; + } + } + } + } + } + + // update volume + for (trackIdx = 0; trackIdx < ARRAY_COUNT(player->tracks); trackIdx++) { + track = &player->tracks[trackIdx]; + if (track->volumeLerp.time != 0) { + track->volumeLerp.time--; + if (track->volumeLerp.time != 0) { + track->volumeLerp.current += track->volumeLerp.step; + } else { + track->volumeLerp.current = track->volumeLerp.goal << 0x10; + } + + temp = player->id.all + (trackIdx << 0x10); + for (i = player->firstVoiceIdx; i < player->lastVoiceIdx; i++) { + voiceState = &manager->voiceStates[i - player->firstVoiceIdx]; + // update all voices belonging to current track + if ((voiceState->info.all & 0xFFFF0000) == temp) { + voice = &globals->voices[i]; + if (voice->priority == manager->priority) { + track = &player->tracks[voiceState->info.trackIndex]; + voice->clientVolume = ((player->fadeVolume >> 0x18) * (track->volumeLerp.current >> 0x10) * voiceState->volume) >> 0xE; + voice->envelopeFlags |= AU_VOICE_ENV_FLAG_VOL_CHANGED; + } + } + } + } + } + + player->delay--; + if (player->delay <= 0) { + while (player->delay == 0) { + op = au_amb_read_next(player); + if ((s8)op >= 0) { + if (op == 0) { + // stop + player->mseqReadPos = NULL; + player->mseqName = 0; + au_amb_player_stop(manager, player); + break; + } + if (op >= 0x78) { + // long delay + player->delay = ((op & 7) << 8) + au_amb_read_next(player) + 0x78; + } else { + //short delay + player->delay = op; + } + continue; + } + + // op >= 0x80 + // op & 0xF0 : command + // op & 0xF : track index + + arg1 = au_amb_read_next(player); + trackIdx = op & 0xF; + track = &player->tracks[trackIdx]; + + switch (op & 0xF0) { + case MSEQ_CMD_80_STOP_SOUND: + // arg1: sound index + if (player->playState == AMB_PLAYER_PLAYING) { + temp = player->id.all + (trackIdx << 0x10) + (arg1 << 8); + for (i = player->firstVoiceIdx; i < player->lastVoiceIdx; i++) { + if (manager->voiceStates[i - player->firstVoiceIdx].info.all == temp) { + manager->voiceStates[i - player->firstVoiceIdx].info.released = 1; + voice = &globals->voices[i]; + if (voice->priority == manager->priority) { + voice->envelopeFlags |= AU_VOICE_ENV_FLAG_KEY_RELEASED; + } + } + } + } + break; + case MSEQ_CMD_90_PLAY_SOUND: + // arg1: pitch or drum sound id + // arg2: volume + arg2 = au_amb_read_next(player); + if (player->playState == AMB_PLAYER_PLAYING) { + // find free voice + for (i = player->firstVoiceIdx; i < player->lastVoiceIdx; i++) { + voice = &globals->voices[i]; + if (voice->priority == AU_PRIORITY_FREE) { + break; + } + } + if (i >= player->lastVoiceIdx) { + // use another ambience voice + for (i = player->firstVoiceIdx; i < player->lastVoiceIdx; i++) { + voice = &globals->voices[i]; + if (voice->priority == manager->priority) { + au_reset_voice(voice, i); + break; + } + } + } + if (i >= player->lastVoiceIdx) { + // try stealing voice with lower priority + for (i = player->firstVoiceIdx; i < player->lastVoiceIdx; i++) { + voice = &globals->voices[i]; + if (voice->priority < manager->priority) { + au_reset_voice(voice, i); + break; + } + } + } + if (i < player->lastVoiceIdx) { + isVolumeChanged[i - player->firstVoiceIdx] = TRUE; + isPitchChanged[i - player->firstVoiceIdx] = TRUE; + voiceState = &manager->voiceStates[i - player->firstVoiceIdx]; + // set playerIndex, trackIndex and tune + voiceState->info.all = player->id.all + (trackIdx << 0x10) + (arg1 << 8); + if (track->flags & 1) { + voiceState->isResumable = TRUE; + } else { + voiceState->isResumable = FALSE; + } + if (trackIdx != TRACK_ID_DRUM) { + if (track->flags & 1) { + voiceState->isResumable = TRUE; + } else { + voiceState->isResumable = FALSE; + } + + voiceState->pitch = (arg1 & 0x7F) * 100 - track->instrument->keyBase; + voiceState->volume = arg2 & 0x7F; + voice->clientVolume = ((player->fadeVolume >> 0x18) * (track->volumeLerp.current >> 0x10) * voiceState->volume) >> 0xE; + voice->pitchRatio = au_compute_pitch_ratio(voiceState->pitch + (track->tuneLerp.current >> 0x10)) * track->instrument->pitchRatio; + voice->pan = track->pan; + voice->reverb = track->reverb; + voice->instrument = track->instrument; + voice->busId = manager->busId; + voice->envelope.cmdListPress = track->envelope.cmdListPress; + voice->envelope.cmdListRelease = track->envelope.cmdListRelease; + } else { + voiceState->isResumable = FALSE; + drum = &manager->globals->dataPER->drums[arg1 & 0x7F]; + bankPatch = drum->bankPatch; + voice->instrument = au_get_instrument(manager->globals, bankPatch >> 8, bankPatch & 0xFF, &voice->envelope); + voiceState->pitch = drum->keyBase - voice->instrument->keyBase; + voiceState->volume = ((arg2 & 0x7F) * drum->volume) >> 7; + voice->clientVolume = ((player->fadeVolume >> 0x18) * (track->volumeLerp.current >> 0x10) * voiceState->volume) >> 0xE; + voice->pitchRatio = au_compute_pitch_ratio(voiceState->pitch) * voice->instrument->pitchRatio; + voice->pan = drum->pan; + voice->reverb = drum->reverb; + voice->busId = manager->busId; + } + voice->syncFlags = AU_VOICE_SYNC_FLAG_ALL; + voice->priority = manager->priority; + voice->clientPriority = voice->priority; + } + } + break; + case MSEQ_CMD_A0_SET_VOLUME_PAN: + // higher bit: set pan (1) or volume (0) + // lower 7 bits: value + if (arg1 & 0x80) { + track->pan = arg1 & 0x7F; + temp = player->id.all + (trackIdx << 0x10); + for (i = player->firstVoiceIdx; i < player->lastVoiceIdx; i++) { + voiceState = &manager->voiceStates[i - player->firstVoiceIdx]; + if ((voiceState->info.all & 0xFFFF0000) == temp) { + voice = &globals->voices[i]; + if (voice->priority == manager->priority && trackIdx != TRACK_ID_DRUM) { + voice->pan = track->pan; + voice->syncFlags |= AU_VOICE_SYNC_FLAG_PAN_FXMIX; + } + } + } + } else { + track->volumeLerp.current = arg1 << 0x18; + if (track->volumeLerp.current != 0) { + track->volumeLerp.current |= 0xFFFFFF; + } + temp = player->id.all + (trackIdx << 0x10); + for (i = player->firstVoiceIdx; i < player->lastVoiceIdx; i++) { + voiceState = &manager->voiceStates[i - player->firstVoiceIdx]; + if ((voiceState->info.all & 0xFFFF0000) == temp) { + voice = &globals->voices[i]; + if (voice->priority == manager->priority) { + voice->clientVolume = ((player->fadeVolume >> 0x18) * (track->volumeLerp.current >> 0x10) * voiceState->volume) >> 0xE; + if (!isVolumeChanged[i - player->firstVoiceIdx]) { + voice->envelopeFlags |= AU_VOICE_ENV_FLAG_VOL_CHANGED; + isVolumeChanged[i - player->firstVoiceIdx] = TRUE; + } + } + } + } + } + break; + case MSEQ_CMD_B0_MULTI: + // arg1: sub command + // arg2: depends on sub command + arg2 = au_amb_read_next(player); + switch (arg1) { + case MSEQ_CMD_SUB_66_START_LOOP: + // arg2: loop id + player->loopStartPos[arg2 & 1] = player->mseqReadPos; + break; + case MSEQ_CMD_SUB_67_END_LOOP: + // arg2 lower bit: loop id + // (arg2 & 0x7C) >> 2: loop count + loopId = arg2 & 1; + count = (arg2 & 0x7C) >> 2; + if (count != 0) { + if (player->loopCount[loopId] != 0) { + player->loopCount[loopId]--; + // if it's the last iteration then don't jump to the loop start + if (player->loopCount[loopId] != 0) { + player->mseqReadPos = player->loopStartPos[loopId]; + } + } else { + // first iteration, set loop counter + player->mseqReadPos = player->loopStartPos[loopId]; + player->loopCount[loopId] = count; + } + } else { + // infinite loop + player->mseqReadPos = player->loopStartPos[loopId]; + player->loopCount[loopId] = 0; + } + break; + case MSEQ_CMD_SUB_68_SET_REVERB: + track->reverb = arg2; + break; + case MSEQ_CMD_SUB_69_SET_RESUMABLE: + if (arg2 == 1) { + track->flags |= 1; + } + break; + } + break; + case MSEQ_CMD_C0_SET_INSTRUMENT: + // arg1: bank + // arg2: patch + arg2 = au_amb_read_next(player); + if (trackIdx != TRACK_ID_DRUM) { + track->instrument = au_get_instrument(manager->globals, arg1, arg2, &track->envelope); + } + break; + case MSEQ_CMD_E0_TUNING: + // arg1: coarse tune + // arg2: fine tune + track->tuneLerp.current = (arg1 << 0x18) + (au_amb_read_next(player) << 0x10); + temp = player->id.all + (trackIdx << 0x10); + for (i = player->firstVoiceIdx; i < player->lastVoiceIdx; i++) { + voiceState = &manager->voiceStates[i - player->firstVoiceIdx]; + if ((voiceState->info.all & 0xFFFF0000) == temp) { + voice = &globals->voices[i]; + if (voice->priority == manager->priority && trackIdx != TRACK_ID_DRUM) { + voice->pitchRatio = au_compute_pitch_ratio(voiceState->pitch + (track->tuneLerp.current >> 0x10)) * track->instrument->pitchRatio; + voice->syncFlags |= AU_VOICE_SYNC_FLAG_PITCH; + isPitchChanged[i - player->firstVoiceIdx] = 1; + } + } + } + break; + case 0xF0: // required to match + break; + } + } + } + if (fadeVolChanged) { + for (i = player->firstVoiceIdx; i < player->lastVoiceIdx; i++) { + voiceState = &manager->voiceStates[i - player->firstVoiceIdx]; + // update all voices belonging to this player + if ((voiceState->info.all & 0xFF000000) == player->id.all) { + voice = &globals->voices[i]; + if (voice->priority == manager->priority && !isVolumeChanged[i - player->firstVoiceIdx]) { + track = &player->tracks[voiceState->info.trackIndex]; + voice->clientVolume = ((player->fadeVolume >> 0x18) * (track->volumeLerp.current >> 0x10) * voiceState->volume) >> 0xE; + voice->envelopeFlags |= AU_VOICE_ENV_FLAG_VOL_CHANGED; + } + } + } + } +} + +u8 au_amb_read_next(AmbiencePlayer* state) { u8 value = *state->mseqReadPos++; return value; } -void au_mseq_player_stop(AuAmbienceManager* manager, AuAmbPlayer* lambda) { - AlUnkVoice* voice; - Q32* temp_s1; +void au_amb_player_stop(AmbienceManager* manager, AmbiencePlayer* player) { + AuVoice* voice; + AmbienceVoiceState* voiceState; s32 i; - for (i = lambda->firstVoiceIdx; i < lambda->lastVoiceIdx; i++) { - temp_s1 = &manager->mseqVoiceStates[i - lambda->firstVoiceIdx].unk_00; - if (*temp_s1->u8 == lambda->unk_14.u8[0]) { + for (i = player->firstVoiceIdx; i < player->lastVoiceIdx; i++) { + voiceState = &manager->voiceStates[i - player->firstVoiceIdx]; + if (voiceState->info.playerIndex == player->id.playerIndex) { voice = &manager->globals->voices[i]; if (voice->priority == manager->priority) { au_reset_voice(voice, i); } - temp_s1->s32 = 0; + voiceState->info.all = 0; } } } -void func_800522A8(AuAmbienceManager* arg0, AuAmbPlayer* lambda) { - AlUnkOmega* omega = lambda->unk_1D4; - u32 copied = 0; +void au_amb_save_voices(AmbienceManager* arg0, AmbiencePlayer* player) { + AmbienceSavedVoice* savedVoice = player->savedVoices; + u32 numSaved = 0; s32 i; - for (i = lambda->firstVoiceIdx; i < lambda->lastVoiceIdx; i++) { - AlUnkIota* iota = &arg0->mseqVoiceStates[i - lambda->firstVoiceIdx]; + for (i = player->firstVoiceIdx; i < player->lastVoiceIdx; i++) { + AmbienceVoiceState* voiceState = &arg0->voiceStates[i - player->firstVoiceIdx]; - if (iota->unk_07 == 0) { + if (!voiceState->isResumable) { continue; } - omega->unk_00 = iota->unk_00.u8[1]; - omega->unk_01 = iota->unk_00.u8[2]; - omega->unk_02 = iota->volume; + savedVoice->trackIndex = voiceState->info.trackIndex; + savedVoice->tune = voiceState->info.tune; + savedVoice->volume = voiceState->volume; - omega++; - copied++; - if (copied >= 4) { + savedVoice++; + numSaved++; + if (numSaved >= ARRAY_COUNT(player->savedVoices)) { break; } } } -void func_8005232C(AuAmbienceManager* manager, AuAmbPlayer* lambda) { +void au_amb_restore_voices(AmbienceManager* manager, AmbiencePlayer* player) { AuGlobals* globals; - AlUnkVoice* voice; - AlUnkOmega* omega; - AlUnkIota* iota; - AlUnkXi* xi; + AuVoice* voice; + AmbienceSavedVoice* savedVoice; + AmbienceVoiceState* voiceState; + AmbienceTrack* track; u32 i, j; globals = manager->globals; - if (lambda->playState == MSEQ_PLAYER_PLAYING) { - for (i = 0; i < ARRAY_COUNT(lambda->unk_1D4); i++) { - omega = &lambda->unk_1D4[i]; - if (omega->unk_01 != 0) { - xi = &lambda->unk_44[omega->unk_00]; + if (player->playState == AMB_PLAYER_PLAYING) { + for (i = 0; i < ARRAY_COUNT(player->savedVoices); i++) { + savedVoice = &player->savedVoices[i]; + if (savedVoice->tune != 0) { + track = &player->tracks[savedVoice->trackIndex]; // find first free voice - for (j = lambda->firstVoiceIdx; j < lambda->lastVoiceIdx; j++) { + for (j = player->firstVoiceIdx; j < player->lastVoiceIdx; j++) { voice = &globals->voices[j]; if (voice->priority == AU_PRIORITY_FREE) { break; @@ -383,8 +750,8 @@ void func_8005232C(AuAmbienceManager* manager, AuAmbPlayer* lambda) { } // try stealing a voice with lower priority - if (j >= lambda->lastVoiceIdx) { - for (j = lambda->firstVoiceIdx; j < lambda->lastVoiceIdx; j++) { + if (j >= player->lastVoiceIdx) { + for (j = player->firstVoiceIdx; j < player->lastVoiceIdx; j++) { voice = &globals->voices[j]; if (voice->priority < manager->priority) { au_reset_voice(voice, j); @@ -393,27 +760,27 @@ void func_8005232C(AuAmbienceManager* manager, AuAmbPlayer* lambda) { } } - if (j < lambda->lastVoiceIdx) { - iota = &manager->mseqVoiceStates[j - lambda->firstVoiceIdx]; - iota->unk_00.s32 = lambda->unk_14.s32 + (omega->unk_00 << 0x10) + (omega->unk_01 << 8); - iota->pitch = ((omega->unk_01 & 0x7F) * 100) - xi->instrument->keyBase; - iota->volume = omega->unk_02 & 0x7F; - voice->adjustedVolume = ((lambda->unk_38 >> 0x18) * xi->unk_18.half * iota->volume) >> 0xE; - voice->pitchRatio = au_compute_pitch_ratio(iota->pitch + xi->pitch) * xi->instrument->pitchRatio; - voice->pan = xi->pan; - voice->reverbAmt = xi->reverb; - voice->instrument = xi->instrument; - voice->reverbType = manager->defaultReverbType; - voice->unk_14.unk_00 = xi->unk_04.unk_00; - voice->unk_14.unk_04 = xi->unk_04.unk_04; - voice->unk_flags_43 = AU_VOICE_SYNC_FLAG_ALL; + if (j < player->lastVoiceIdx) { + voiceState = &manager->voiceStates[j - player->firstVoiceIdx]; + voiceState->info.all = player->id.all + (savedVoice->trackIndex << 0x10) + (savedVoice->tune << 8); + voiceState->pitch = (savedVoice->tune & 0x7F) * 100 - track->instrument->keyBase; + voiceState->volume = savedVoice->volume & 0x7F; + voice->clientVolume = ((player->fadeVolume >> 0x18) * (track->volumeLerp.current >> 0x10) * voiceState->volume) >> 0xE; + voice->pitchRatio = au_compute_pitch_ratio(voiceState->pitch + (track->tuneLerp.current >> 0x10)) * track->instrument->pitchRatio; + voice->pan = track->pan; + voice->reverb = track->reverb; + voice->instrument = track->instrument; + voice->busId = manager->busId; + voice->envelope.cmdListPress = track->envelope.cmdListPress; + voice->envelope.cmdListRelease = track->envelope.cmdListRelease; + voice->syncFlags = AU_VOICE_SYNC_FLAG_ALL; voice->priority = manager->priority; - voice->priorityCopy = voice->priority; + voice->clientPriority = voice->priority; } } - omega->unk_00 = 0; - omega->unk_01 = 0; - omega->unk_02 = 0; + savedVoice->trackIndex = 0; + savedVoice->tune = 0; + savedVoice->volume = 0; } } } diff --git a/src/audio/2d9a0_len_890.c b/src/audio/2d9a0_len_890.c index 80b435eb75..ddfbda7d0d 100644 --- a/src/audio/2d9a0_len_890.c +++ b/src/audio/2d9a0_len_890.c @@ -1,155 +1,165 @@ #include "common.h" #include "audio.h" -void func_800525A0(AuGlobals* globals) { +void au_update_stopped_voices(AuGlobals* globals) { s32 i; for (i = 0; i < ARRAY_COUNT(globals->voices); i++) { - AlUnkVoice* voice = &globals->voices[i]; + AuVoice* voice = &globals->voices[i]; - if (voice->unk_42 != 0) { + if (voice->stopPending) { au_syn_stop_voice(i); - voice->unk_42 = 0; - voice->unk_1C = NULL; + voice->stopPending = FALSE; + voice->cmdPtr = NULL; voice->priority = AU_PRIORITY_FREE; } } } -void func_80052614(AuGlobals* globals) { +void au_init_voices(AuGlobals* globals) { s32 i; for (i = 0; i < ARRAY_COUNT(globals->voices); i++) { - AlUnkVoice* temp = &globals->voices[i]; + AuVoice* voice = &globals->voices[i]; - temp->unk_1C = NULL; - temp->unk_20 = 0; - temp->unk_24 = 0; - temp->unk_28 = 0; - temp->unk_3B = 0; - temp->unk_3C = 0; - temp->unk_flags_3D = 0; - temp->unk_3E = 0; - temp->unk_3F = 0x80; + voice->cmdPtr = NULL; + voice->unk_20 = 0; + voice->volChangeTime = 0; + voice->timeLeft = 0; + voice->timeIntervalIndex = 0; + voice->unk_3C = 0; + voice->envelopeFlags = 0; + voice->relativeReleaseVolumes = FALSE; + voice->releaseVolumeMult = 0x80; } } -void func_80052660(AuGlobals* globals) { - AlUnkVoice* voice; +void au_update_voices(AuGlobals* globals) { + AuVoice* voice; s8 var_a0; - s16 unkTemp; + s16 currentAmp; s32 i; for (i = 0; i < ARRAY_COUNT(globals->voices); i++) { voice = &globals->voices[i]; - if (voice->unk_1C == NULL) { + if (voice->cmdPtr == NULL) { continue; } - if (voice->unk_flags_3D & AU_VOICE_3D_FLAG_HANDLED_VOL_CHANGE) { - func_80052B44(voice); + if (voice->envelopeFlags & AU_VOICE_ENV_FLAG_HANDLED_VOL_CHANGE) { + // client volume changed on previous frame + au_voice_after_volume_change(voice); continue; } - if (voice->unk_flags_3D & AU_VOICE_3D_FLAG_10) { - voice->unk_flags_3D &= ~AU_VOICE_3D_FLAG_10; - voice->unk_flags_3D |= AU_VOICE_3D_FLAG_1; - voice->unk_1C = (u8*)voice->unk_14.unk_04; - if (voice->unk_28 > AU_5750) { - voice->unk_39 = voice->unk_39 + (s32) (voice->unk_2C * (f32) (voice->unk_24 - voice->unk_28)); + if (voice->envelopeFlags & AU_VOICE_ENV_FLAG_KEY_RELEASED) { + // client released the key + voice->envelopeFlags &= ~AU_VOICE_ENV_FLAG_KEY_RELEASED; + voice->envelopeFlags |= AU_VOICE_ENV_FLAG_STOP; + voice->cmdPtr = (u8*)voice->envelope.cmdListRelease; + + // the key can be released before press cmdlist processed completely, we must handle this case properly + if (voice->timeLeft > AU_5750) { + voice->initialAmp = voice->initialAmp + (s32) (voice->rate * (f32) (voice->volChangeTime - voice->timeLeft)); } else { - voice->unk_39 = voice->unk_3A; + voice->initialAmp = voice->targetAmp; } - voice->unk_3B = *voice->unk_1C++; - var_a0 = *voice->unk_1C; - if (*(s8*)voice->unk_1C++ < 0) { + voice->timeIntervalIndex = *voice->cmdPtr++; + var_a0 = *voice->cmdPtr; + if (*(s8*)voice->cmdPtr++ < 0) { + // in this case release volumes are relative to last press volume var_a0 &= 0x7F; - voice->unk_3E = 1; - voice->unk_3F = voice->unk_39; + voice->relativeReleaseVolumes = TRUE; + voice->releaseVolumeMult = voice->initialAmp; } - voice->unk_3A = var_a0; + voice->targetAmp = var_a0; - voice->unk_28 = D_800785A0[voice->unk_3B]; - voice->unk_24 = voice->unk_28; - if (voice->unk_flags_3D & AU_VOICE_3D_FLAG_VOL_CHANGED) { - voice->unk_flags_3D &= ~AU_VOICE_3D_FLAG_VOL_CHANGED; - if (voice->unk_28 > AU_5750) { - voice->unk_28 -= AU_5750; - voice->unk_flags_3D |= AU_VOICE_3D_FLAG_HANDLED_VOL_CHANGE; - unkTemp = voice->unk_39 + (s32) (voice->unk_2C * (voice->unk_24 - voice->unk_28)); + voice->timeLeft = AuEnvelopeIntervals[voice->timeIntervalIndex]; + voice->volChangeTime = voice->timeLeft; + if (voice->envelopeFlags & AU_VOICE_ENV_FLAG_VOL_CHANGED) { + voice->envelopeFlags &= ~AU_VOICE_ENV_FLAG_VOL_CHANGED; + if (voice->timeLeft > AU_5750) { + voice->timeLeft -= AU_5750; + voice->envelopeFlags |= AU_VOICE_ENV_FLAG_HANDLED_VOL_CHANGE; + currentAmp = voice->initialAmp + (s32) (voice->rate * (voice->volChangeTime - voice->timeLeft)); } else { - unkTemp = voice->unk_3A; + currentAmp = voice->targetAmp; } - voice->unk_08 = AUDIO_SAMPLES; + voice->delta = AUDIO_SAMPLES; } else { - voice->unk_08 = func_80052BC0(voice->unk_24); - unkTemp = voice->unk_3A; + voice->delta = au_voice_get_delta(voice->volChangeTime); + currentAmp = voice->targetAmp; } - voice->volume = (((unkTemp * voice->adjustedVolume * voice->unk_3F) >> 0xE) * voice->unk_30) >> 7; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_4; + voice->p_volume = (((currentAmp * voice->clientVolume * voice->releaseVolumeMult) >> 0xE) * voice->volMult) >> 7; + voice->syncFlags |= AU_VOICE_SYNC_FLAG_PARAMS; } else { - if (voice->unk_28 == -1) { - if (voice->unk_flags_3D & AU_VOICE_3D_FLAG_VOL_CHANGED) { - voice->unk_flags_3D &= ~AU_VOICE_3D_FLAG_VOL_CHANGED; - voice->volume = (((voice->unk_39 * voice->adjustedVolume * voice->unk_3F) >> 0xE) * voice->unk_30) >> 7; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_4; + if (voice->timeLeft == -1) { + // keep current volume, this is 'sustain' phase + if (voice->envelopeFlags & AU_VOICE_ENV_FLAG_VOL_CHANGED) { + voice->envelopeFlags &= ~AU_VOICE_ENV_FLAG_VOL_CHANGED; + voice->p_volume = (((voice->initialAmp * voice->clientVolume * voice->releaseVolumeMult) >> 0xE) * voice->volMult) >> 7; + voice->syncFlags |= AU_VOICE_SYNC_FLAG_PARAMS; } } else { - voice->unk_28 -= AU_5750; - if (voice->unk_28 <= 0) { - if (*voice->unk_1C == 0xFF) { - if (voice->unk_flags_3D & AU_VOICE_3D_FLAG_1) { - voice->unk_flags_3D = 0; - voice->unk_1C = NULL; - voice->unk_42 = 1; + voice->timeLeft -= AU_5750; + if (voice->timeLeft <= 0) { + if (*voice->cmdPtr == ENV_CMD_END) { + if (voice->envelopeFlags & AU_VOICE_ENV_FLAG_STOP) { + // if we reached the end after key release, stop the voice completely + voice->envelopeFlags = 0; + voice->cmdPtr = NULL; + voice->stopPending = TRUE; } else { - voice->unk_28 = -1; - voice->unk_24 = -1; - voice->unk_3B = 0x3B; - voice->unk_08 = AUDIO_SAMPLES; - voice->unk_2C = 0.0f; - voice->unk_39 = voice->unk_3A; + // we reached the end of press cmdlist, keep the last volume until the key is released + voice->timeLeft = -1; + voice->volChangeTime = -1; + voice->timeIntervalIndex = ENV_TIME_300MS; // doesn't seem to affect anything + voice->delta = AUDIO_SAMPLES; + voice->rate = 0.0f; + voice->initialAmp = voice->targetAmp; } } else { - voice->unk_3B = func_80052CFC(voice); - voice->unk_39 = voice->unk_3A; - voice->unk_3A = (*voice->unk_1C++) & 0x7F; - voice->unk_28 = D_800785A0[voice->unk_3B]; - voice->unk_24 = voice->unk_28; - if (voice->unk_24 != 0) { - voice->unk_2C = ((f32) voice->unk_3A - (f32) voice->unk_39) / (f32) voice->unk_24; + // get next envelope point + voice->timeIntervalIndex = au_voice_step(voice); + voice->initialAmp = voice->targetAmp; + voice->targetAmp = (*voice->cmdPtr++) & 0x7F; + voice->timeLeft = AuEnvelopeIntervals[voice->timeIntervalIndex]; + voice->volChangeTime = voice->timeLeft; + if (voice->volChangeTime != 0) { + voice->rate = ((f32) voice->targetAmp - (f32) voice->initialAmp) / (f32) voice->volChangeTime; } else { - voice->unk_2C = 0.0f; + voice->rate = 0.0f; } - if (voice->unk_flags_3D & AU_VOICE_3D_FLAG_VOL_CHANGED) { - voice->unk_flags_3D &= ~AU_VOICE_3D_FLAG_VOL_CHANGED; - if (voice->unk_28 > AU_5750) { - voice->unk_28 -= AU_5750; - voice->unk_flags_3D |= AU_VOICE_3D_FLAG_HANDLED_VOL_CHANGE; - unkTemp = voice->unk_39 + (s32) (voice->unk_2C * (voice->unk_24 - voice->unk_28)); + if (voice->envelopeFlags & AU_VOICE_ENV_FLAG_VOL_CHANGED) { + voice->envelopeFlags &= ~AU_VOICE_ENV_FLAG_VOL_CHANGED; + if (voice->timeLeft > AU_5750) { + voice->timeLeft -= AU_5750; + voice->envelopeFlags |= AU_VOICE_ENV_FLAG_HANDLED_VOL_CHANGE; + currentAmp = voice->initialAmp + (s32) (voice->rate * (voice->volChangeTime - voice->timeLeft)); } else { - unkTemp = voice->unk_3A; + currentAmp = voice->targetAmp; } - voice->unk_08 = AUDIO_SAMPLES; + voice->delta = AUDIO_SAMPLES; } else { - voice->unk_08 = func_80052BC0(voice->unk_24); - unkTemp = voice->unk_3A; + voice->delta = au_voice_get_delta(voice->volChangeTime); + currentAmp = voice->targetAmp; } - voice->volume = (((unkTemp * voice->adjustedVolume * voice->unk_3F) >> 0xE) * voice->unk_30) >> 7; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_4; + voice->p_volume = (((currentAmp * voice->clientVolume * voice->releaseVolumeMult) >> 0xE) * voice->volMult) >> 7; + voice->syncFlags |= AU_VOICE_SYNC_FLAG_PARAMS; } } else { - if (voice->unk_flags_3D & AU_VOICE_3D_FLAG_VOL_CHANGED) { - voice->unk_flags_3D &= ~AU_VOICE_3D_FLAG_VOL_CHANGED; - if (voice->unk_28 > AU_5750) { - voice->unk_28 -= AU_5750; - voice->unk_flags_3D |= AU_VOICE_3D_FLAG_HANDLED_VOL_CHANGE; - unkTemp = voice->unk_39 + (s32) (voice->unk_2C * (voice->unk_24 - voice->unk_28)); + // we are between two envelope points, do nothing, just handle client volume change + if (voice->envelopeFlags & AU_VOICE_ENV_FLAG_VOL_CHANGED) { + voice->envelopeFlags &= ~AU_VOICE_ENV_FLAG_VOL_CHANGED; + if (voice->timeLeft > AU_5750) { + voice->timeLeft -= AU_5750; + voice->envelopeFlags |= AU_VOICE_ENV_FLAG_HANDLED_VOL_CHANGE; + currentAmp = voice->initialAmp + (s32) (voice->rate * (voice->volChangeTime - voice->timeLeft)); } else { - unkTemp = voice->unk_3A; + currentAmp = voice->targetAmp; } - voice->unk_08 = AUDIO_SAMPLES; - voice->volume = (((unkTemp * voice->adjustedVolume * voice->unk_3F) >> 0xE) * voice->unk_30) >> 7; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_4; + voice->delta = AUDIO_SAMPLES; + voice->p_volume = (((currentAmp * voice->clientVolume * voice->releaseVolumeMult) >> 0xE) * voice->volMult) >> 7; + voice->syncFlags |= AU_VOICE_SYNC_FLAG_PARAMS; } } } @@ -157,81 +167,82 @@ void func_80052660(AuGlobals* globals) { } } -void func_80052B44(AlUnkVoice* arg0) { - arg0->volume = (((arg0->unk_3A * arg0->adjustedVolume * arg0->unk_3F) >> 14) * arg0->unk_30) >> 7; - arg0->unk_08 = func_80052BC0(arg0->unk_28); - arg0->unk_flags_3D &= ~AU_VOICE_3D_FLAG_HANDLED_VOL_CHANGE; - arg0->unk_flags_43 |= AU_VOICE_SYNC_FLAG_4; +void au_voice_after_volume_change(AuVoice* voice) { + voice->p_volume = (((voice->targetAmp * voice->clientVolume * voice->releaseVolumeMult) >> 14) * voice->volMult) >> 7; + voice->delta = au_voice_get_delta(voice->timeLeft); + voice->envelopeFlags &= ~AU_VOICE_ENV_FLAG_HANDLED_VOL_CHANGE; + voice->syncFlags |= AU_VOICE_SYNC_FLAG_PARAMS; } -s32 func_80052BC0(s32 arg0) { - return (arg0 / AU_5750) * AUDIO_SAMPLES; +s32 au_voice_get_delta(s32 msecs) { + return (msecs / AU_5750) * AUDIO_SAMPLES; } -void func_80052BF8(AlUnkVoice* voice, AlUnkInstrumentData* arg1) { - s32 x; +void au_voice_start(AuVoice* voice, EnvelopeData* envData) { + s32 intervalIndex; - voice->unk_14.unk_00 = arg1->unk_00; - voice->unk_1C = (u8*) voice->unk_14.unk_00; - voice->unk_14.unk_04 = arg1->unk_04; - voice->unk_30 = 0x80; - voice->unk_34 = 0; + voice->envelope.cmdListPress = envData->cmdListPress; + voice->cmdPtr = voice->envelope.cmdListPress; + voice->envelope.cmdListRelease = envData->cmdListRelease; + voice->volMult = 0x80; + voice->loopStart = NULL; - x = func_80052CFC(voice); - voice->unk_flags_3D = 0; - voice->unk_39 = 0; - voice->unk_3A = *voice->unk_1C++; - voice->unk_3B = x; - voice->unk_24 = D_800785A0[x]; - voice->unk_28 = voice->unk_24; + intervalIndex = au_voice_step(voice); + voice->envelopeFlags = 0; + voice->initialAmp = 0; + voice->targetAmp = *voice->cmdPtr++; + voice->timeIntervalIndex = intervalIndex; + voice->volChangeTime = AuEnvelopeIntervals[intervalIndex]; + voice->timeLeft = voice->volChangeTime; - voice->volume = (voice->unk_3A * voice->adjustedVolume * voice->unk_30) >> 14; - voice->unk_08 = func_80052BC0(voice->unk_24); - if (voice->unk_24 != 0) { - voice->unk_2C = ((f32) voice->unk_3A - (f32) voice->unk_39) / voice->unk_24; + voice->p_volume = (voice->targetAmp * voice->clientVolume * voice->volMult) >> 14; + voice->delta = au_voice_get_delta(voice->volChangeTime); + if (voice->volChangeTime != 0) { + voice->rate = ((f32) voice->targetAmp - (f32) voice->initialAmp) / voice->volChangeTime; } else { - voice->unk_2C = 0.0f; + voice->rate = 0.0f; } - voice->unk_3E = 0; - voice->unk_3F = 0x80; + voice->relativeReleaseVolumes = FALSE; + voice->releaseVolumeMult = 0x80; } -u8 func_80052CFC(AlUnkVoice* voice) { +// performs special commands and returns interval index +u8 au_voice_step(AuVoice* voice) { u32 op; u8 arg; while (TRUE) { - if (((s8)(op = *voice->unk_1C++)) >= 0) { + if (((s8)(op = *voice->cmdPtr++)) >= 0) { break; } switch ((u8)op) { - case 0xFE: - arg = *voice->unk_1C++; + case ENV_CMD_SET_MULTIPLIER: + arg = *voice->cmdPtr++; if (arg > 0x80) { arg = 0x80; } - voice->unk_30 = arg; + voice->volMult = arg; break; - case 0xFD: - voice->unk_30 += (s8) *voice->unk_1C++; - if (voice->unk_30 > 0x80) { - voice->unk_30 = 0x80; - } else if (voice->unk_30 < 0) { - voice->unk_30 = 0; + case ENV_CMD_ADD_MULTIPLIER: + voice->volMult += (s8) *voice->cmdPtr++; + if (voice->volMult > 0x80) { + voice->volMult = 0x80; + } else if (voice->volMult < 0) { + voice->volMult = 0; } break; - case 0xFC: - voice->unk_38 = *voice->unk_1C++; - voice->unk_34 = voice->unk_1C; + case ENV_CMD_START_LOOP: + voice->loopCounter = *voice->cmdPtr++; // 0 means infinite loop + voice->loopStart = voice->cmdPtr; break; - case 0xFB: - voice->unk_1C++; - if (voice->unk_38 == 0 || --voice->unk_38 != 0) { - voice->unk_1C = voice->unk_34; + case ENV_CMD_END_LOOP: + voice->cmdPtr++; + if (voice->loopCounter == 0 || --voice->loopCounter != 0) { + voice->cmdPtr = voice->loopStart; } break; default: - voice->unk_1C++; + voice->cmdPtr++; break; } } @@ -239,6 +250,6 @@ u8 func_80052CFC(AlUnkVoice* voice) { } -void func_80052E18(AlUnkVoice* arg0) { - arg0->unk_flags_3D |= AU_VOICE_3D_FLAG_VOL_CHANGED; +void au_voice_set_vol_changed(AuVoice* voice) { + voice->envelopeFlags |= AU_VOICE_ENV_FLAG_VOL_CHANGED; } diff --git a/src/audio/2e230_len_2190.c b/src/audio/2e230_len_2190.c index c74c8332e8..b8adfd687b 100644 --- a/src/audio/2e230_len_2190.c +++ b/src/audio/2e230_len_2190.c @@ -3,7 +3,8 @@ // data extern u16 D_80078530[9]; -extern s32 D_8007854C[2]; +extern u8 EnvelopePressDefault[]; +extern u8 EnvelopeReleaseDefault[]; extern f32 AlTuneScaling[]; @@ -14,9 +15,9 @@ extern f32 AlTuneScaling[]; #endif void func_80052E30(u8 index) { - AlUnkVoice* voice = &gSoundGlobals->voices[index]; + AuVoice* voice = &gSoundGlobals->voices[index]; - voice->unk_1C = NULL; + voice->cmdPtr = NULL; voice->priority = AU_PRIORITY_FREE; } @@ -77,19 +78,19 @@ void au_engine_init(s32 outputRate) { } for (i = 0; i < ARRAY_COUNT(globals->voices); i++) { - AlUnkVoice* voice; - au_pvoice_set_group(i, 0); + AuVoice* voice; + au_pvoice_set_bus(i, 0); au_syn_set_wavetable(i, globals->defaultInstrument); voice = &globals->voices[i]; voice->instrument = NULL; voice->pitchRatio = 0; - voice->volume = -1; + voice->p_volume = -1; voice->pan = 0xFF; - voice->reverbAmt = 0xFF; - voice->reverbType = 0; - voice->unk_42 = 0; - voice->unk_flags_43 = 0; - voice->priorityCopy = AU_PRIORITY_FREE; + voice->reverb = 0xFF; + voice->busId = 0; + voice->stopPending = FALSE; + voice->syncFlags = 0; + voice->clientPriority = AU_PRIORITY_FREE; voice->priority = AU_PRIORITY_FREE; } @@ -99,23 +100,23 @@ void au_engine_init(s32 outputRate) { globals->banks[i] = alHeapAlloc(alHeap, 1, 0x840); } - au_bgm_player_init(gBGMPlayerA, AU_PRIORITY_BGM_PLAYER_MAIN, AU_FX_NONE, globals); - effects[0] = 0; - effects[1] = 3; + au_bgm_player_init(gBGMPlayerA, AU_PRIORITY_BGM_PLAYER_MAIN, FX_BUS_BGMA_MAIN, globals); + effects[0] = FX_BUS_BGMA_MAIN; + effects[1] = FX_BUS_BGMA_AUX; effects[2] = -1; effects[3] = -1; au_bgm_set_effect_indices(gBGMPlayerA, effects); - au_bgm_player_init(gBGMPlayerB, AU_PRIORITY_BGM_PLAYER_AUX, AU_FX_BIGROOM, globals); - effects[0] = 2; + au_bgm_player_init(gBGMPlayerB, AU_PRIORITY_BGM_PLAYER_AUX, FX_BUS_BGMB, globals); + effects[0] = FX_BUS_BGMB; effects[1] = -1; effects[2] = -1; effects[3] = -1; au_bgm_set_effect_indices(gBGMPlayerB, effects); - au_sfx_init(gSoundManager, AU_PRIORITY_SFX_MANAGER, AU_FX_SMALLROOM, globals, 16); - au_mseq_manager_init(gAuAmbienceManager, AU_PRIORITY_MSEQ_MANAGER, AU_FX_SMALLROOM, globals); - func_80052614(globals); + au_sfx_init(gSoundManager, AU_PRIORITY_SFX_MANAGER, FX_BUS_SOUND, globals, 16); + au_amb_manager_init(gAuAmbienceManager, AU_PRIORITY_MSEQ_MANAGER, FX_BUS_SOUND, globals); + au_init_voices(globals); au_load_BK_headers(globals, alHeap); if (au_fetch_SBN_file(globals->mseqFileList[0], AU_FMT_SEF, &fileEntry) == AU_RESULT_OK) { au_read_rom(fileEntry.offset, globals->dataSEF, fileEntry.data & 0xFFFFFF); @@ -138,7 +139,7 @@ void au_engine_init(s32 outputRate) { globals->instrumentGroups[7] = globals->instrumentGroup1; globals->channelDelaySide = 0; globals->channelDelayTime = 0; - globals->channelDelayGroupIdx = 0; + globals->channelDelayBusId = 0; globals->channelDelayPending = 0; au_delay_channel(0); @@ -160,7 +161,7 @@ static void au_reset_instrument(Instrument* instrument) { instrument->loopCount = 0; instrument->type = 0; instrument->unk_25 = 0; - instrument->unkOffset = (InstrumentEffect*) &D_80078544; //TODO: fix type of data + instrument->envelopes = &DummyInstrumentEnvelope; instrument->unk_26 = 0; instrument->unk_27 = 0; instrument->unk_28 = 0; @@ -171,7 +172,7 @@ static void au_reset_instrument(Instrument* instrument) { } static void au_reset_drum_entry(BGMDrumInfo* arg0) { - arg0->bankPatch = 8208; + arg0->bankPatch = 0x2010; arg0->keyBase = 4800; // middle C? arg0->volume = 0x7F; arg0->pan = 64; @@ -194,20 +195,20 @@ static void au_reset_instrument_entry(BGMInstrumentInfo* arg0) { void au_update_clients_2(void) { AuGlobals* globals = gSoundGlobals; SoundManager* sfxManager = gSoundManager; - AuAmbienceManager* ambManager = gAuAmbienceManager; + AmbienceManager* ambManager = gAuAmbienceManager; BGMPlayer* bgmPlayer; - func_80053654(globals); + au_syn_update(globals); ambManager->nextUpdateCounter -= ambManager->nextUpdateStep; if (ambManager->nextUpdateCounter <= 0) { ambManager->nextUpdateCounter += ambManager->nextUpdateInterval; - snd_ambient_manager_update(ambManager); + au_amb_manager_update(ambManager); } if (sfxManager->fadeInfo.fadeTime != 0) { au_fade_update(&sfxManager->fadeInfo); - func_80053A98(sfxManager->defaultReverbType, sfxManager->fadeInfo.currentVolume.u16, sfxManager->unk_5C); + au_fade_set_volume(sfxManager->busId, sfxManager->fadeInfo.currentVolume.u16, sfxManager->busVolume); } sfxManager->nextUpdateCounter -= sfxManager->nextUpdateStep; @@ -258,7 +259,7 @@ void au_update_clients_2(void) { bgmPlayer->unk_5C = au_bgm_player_update_main(bgmPlayer); } } - func_80052660(globals); + au_update_voices(globals); } void au_update_players_main(void) { @@ -283,7 +284,7 @@ void au_update_players_main(void) { au_sfx_update_main(manager); } -void func_80053654(AuGlobals* globals) { +void au_syn_update(AuGlobals* globals) { u32 i; if (globals->unk_130C == 2) { @@ -295,12 +296,12 @@ void func_80053654(AuGlobals* globals) { switch (globals->channelDelaySide) { case 1: au_set_delay_time(globals->channelDelayTime); - au_delay_left_channel(globals->channelDelayGroupIdx); + au_delay_left_channel(globals->channelDelayBusId); globals->channelDelayPending = FALSE; break; case 2: au_set_delay_time(globals->channelDelayTime); - au_delay_right_channel(globals->channelDelayGroupIdx); + au_delay_right_channel(globals->channelDelayBusId); globals->channelDelayPending = FALSE; break; default: @@ -310,68 +311,69 @@ void func_80053654(AuGlobals* globals) { } } - if (globals->effectChanges[FX_BUS_0].changed) { - au_bus_set_effect(FX_BUS_0, globals->effectChanges[FX_BUS_0].type); - globals->effectChanges[FX_BUS_0].changed = FALSE; + if (globals->effectChanges[FX_BUS_BGMA_MAIN].changed) { + au_bus_set_effect(FX_BUS_BGMA_MAIN, globals->effectChanges[FX_BUS_BGMA_MAIN].type); + globals->effectChanges[FX_BUS_BGMA_MAIN].changed = FALSE; } - if (globals->effectChanges[FX_BUS_1].changed) { - au_bus_set_effect(FX_BUS_1, globals->effectChanges[FX_BUS_1].type); - globals->effectChanges[FX_BUS_1].changed = FALSE; + if (globals->effectChanges[FX_BUS_SOUND].changed) { + au_bus_set_effect(FX_BUS_SOUND, globals->effectChanges[FX_BUS_SOUND].type); + globals->effectChanges[FX_BUS_SOUND].changed = FALSE; - } if (globals->effectChanges[FX_BUS_2].changed) { - au_bus_set_effect(FX_BUS_2, globals->effectChanges[FX_BUS_2].type); - globals->effectChanges[FX_BUS_2].changed = FALSE; + } if (globals->effectChanges[FX_BUS_BGMB].changed) { + au_bus_set_effect(FX_BUS_BGMB, globals->effectChanges[FX_BUS_BGMB].type); + globals->effectChanges[FX_BUS_BGMB].changed = FALSE; } - if (globals->effectChanges[FX_BUS_3].changed) { - au_bus_set_effect(FX_BUS_3, globals->effectChanges[FX_BUS_3].type); - globals->effectChanges[FX_BUS_3].changed = FALSE; + if (globals->effectChanges[FX_BUS_BGMA_AUX].changed) { + au_bus_set_effect(FX_BUS_BGMA_AUX, globals->effectChanges[FX_BUS_BGMA_AUX].type); + globals->effectChanges[FX_BUS_BGMA_AUX].changed = FALSE; } for (i = 0; i < ARRAY_COUNT(globals->voices); i++) { - AlUnkVoice* voice = &globals->voices[i]; - u8 voiceUpdateFlags = voice->unk_flags_43; + AuVoice* voice = &globals->voices[i]; + u8 voiceUpdateFlags = voice->syncFlags; - if (voice->unk_42 != 0) { + if (voice->stopPending) { au_syn_stop_voice(i); - voice->unk_42 = 0; - voice->unk_1C = NULL; + voice->stopPending = FALSE; + voice->cmdPtr = NULL; voice->priority = AU_PRIORITY_FREE; } if (voiceUpdateFlags & AU_VOICE_SYNC_FLAG_ALL) { - func_80052BF8(voice, &voice->unk_14); - au_syn_start_voice_params(i, voice->reverbType, voice->instrument, voice->pitchRatio, voice->volume, voice->pan, voice->reverbAmt, voice->unk_08); - voice->priority = voice->priorityCopy; + au_voice_start(voice, &voice->envelope); + au_syn_start_voice_params(i, voice->busId, voice->instrument, voice->pitchRatio, voice->p_volume, voice->pan, voice->reverb, voice->delta); + // priority may be AU_PRIORITY_FREE if this voice was stolen and reset + voice->priority = voice->clientPriority; } else { if (voiceUpdateFlags & AU_VOICE_SYNC_FLAG_PITCH) { au_syn_set_pitch(i, voice->pitchRatio); } - if (voiceUpdateFlags & AU_VOICE_SYNC_FLAG_4) { - au_syn_set_mixer_params(i, voice->volume, voice->unk_08, voice->pan, voice->reverbAmt); - } else if (voiceUpdateFlags & AU_VOICE_SYNC_FLAG_10) { - au_syn_set_pan_fxmix(i, voice->pan, voice->reverbAmt); + if (voiceUpdateFlags & AU_VOICE_SYNC_FLAG_PARAMS) { + au_syn_set_mixer_params(i, voice->p_volume, voice->delta, voice->pan, voice->reverb); + } else if (voiceUpdateFlags & AU_VOICE_SYNC_FLAG_PAN_FXMIX) { + au_syn_set_pan_fxmix(i, voice->pan, voice->reverb); } } - voice->unk_flags_43 = 0; + voice->syncFlags = 0; } } -void func_80053888(AlUnkVoice* voice, u8 index) { - if (voice->priority != 0) { - voice->unk_1C = NULL; - voice->unk_42 = 1; - voice->unk_flags_43 = 0; +void au_reset_nonfree_voice(AuVoice* voice, u8 index) { + if (voice->priority != AU_PRIORITY_FREE) { + voice->cmdPtr = NULL; + voice->stopPending = TRUE; + voice->syncFlags = 0; au_syn_set_volume_delta(index, 0, AUDIO_SAMPLES); } } // uncertain name -void au_reset_voice(AlUnkVoice* voice, u8 index) { - voice->unk_1C = NULL; - voice->unk_42 = 1; - voice->unk_flags_43 = 0; - au_syn_set_volume_delta(index, 0, AUDIO_SAMPLES); +void au_reset_voice(AuVoice* voice, u8 voiceIdx) { + voice->cmdPtr = NULL; + voice->stopPending = TRUE; + voice->syncFlags = 0; + au_syn_set_volume_delta(voiceIdx, 0, AUDIO_SAMPLES); } // array offsets into AlTuneScaling @@ -427,8 +429,8 @@ void au_fade_update(Fade* fade) { } } -void func_80053A98(u8 busId, u16 arg1, s32 arg2) { - au_bus_set_volume(busId, (u32)(arg1 * arg2) >> 15); +void au_fade_set_volume(u8 busId, u16 volume, s32 busVolume) { + au_bus_set_volume(busId, (u32)(volume * busVolume) >> 15); } void func_80053AC8(Fade* fade) { @@ -475,17 +477,17 @@ void func_80053BA8(Fade* fade) { } //TODO cleanup and documentation -Instrument* au_get_instrument(AuGlobals* globals, u32 bank, u32 patch, AlUnkInstrumentData* arg3) { +Instrument* au_get_instrument(AuGlobals* globals, u32 bank, u32 patch, EnvelopeData* envData) { Instrument* instrument = (*globals->instrumentGroups[(bank & 0x70) >> 4])[patch]; - InstrumentEffect* temp_a0 = instrument->unkOffset; - u32 sampleIdx = bank & 3; + EnvelopePreset* preset = instrument->envelopes; + u32 envelopeIdx = bank & 3; - if (sampleIdx < temp_a0->count) { - arg3->unk_00 = AU_FILE_RELATIVE(temp_a0, temp_a0->unk_04[sampleIdx].unkOffset1); - arg3->unk_04 = AU_FILE_RELATIVE(temp_a0, temp_a0->unk_04[sampleIdx].unkOffset2); + if (envelopeIdx < preset->count) { + envData->cmdListPress = AU_FILE_RELATIVE(preset, preset->offsets[envelopeIdx].offsetPress); + envData->cmdListRelease = AU_FILE_RELATIVE(preset, preset->offsets[envelopeIdx].offsetRelease); } else { - arg3->unk_00 = &D_8007854C[0]; - arg3->unk_04 = &D_8007854C[1]; + envData->cmdListPress = EnvelopePressDefault; + envData->cmdListRelease = &EnvelopePressDefault[4]; //EnvelopeReleaseDefault; } return instrument; } @@ -643,7 +645,7 @@ BGMPlayer* func_80053F64(s32 arg0) { #define SBN_LOOKUP(i,fmt,e) (au_fetch_SBN_file(globals->mseqFileList[AmbientSoundIDtoMSEQFileIndex[i]], fmt, &e)) AuResult au_ambient_load(u32 ambSoundID) { - AuAmbienceManager* manager; + AmbienceManager* manager; SBNFileEntry fileEntry; AuGlobals* globals; MSEQHeader* mseqFile; @@ -652,19 +654,19 @@ AuResult au_ambient_load(u32 ambSoundID) { globals = gSoundGlobals; manager = gAuAmbienceManager; if (ambSoundID < AMBIENT_RADIO) { - if (manager->mseqPlayers[0].mseqName == 0 && SBN_LOOKUP(ambSoundID, AU_FMT_MSEQ, fileEntry) == AU_RESULT_OK) { + if (manager->players[0].mseqName == 0 && SBN_LOOKUP(ambSoundID, AU_FMT_MSEQ, fileEntry) == AU_RESULT_OK) { au_read_rom(fileEntry.offset, globals->dataMSEQ[0], fileEntry.data & 0xFFFFFF); manager->mseqFiles[0] = globals->dataMSEQ[0]; for (i = 1; i < ARRAY_COUNT(manager->mseqFiles); i++) { manager->mseqFiles[i] = NULL; } - manager->unk_20 = 1; + manager->numActivePlayers = 1; } } else if (ambSoundID == AMBIENT_RADIO - && manager->mseqPlayers[0].mseqName == 0 - && manager->mseqPlayers[1].mseqName == 0 - && manager->mseqPlayers[2].mseqName == 0) { - manager->unk_20 = 0; + && manager->players[0].mseqName == 0 + && manager->players[1].mseqName == 0 + && manager->players[2].mseqName == 0) { + manager->numActivePlayers = 0; for (i = 0; i < ARRAY_COUNT(manager->mseqFiles); i++) { manager->mseqFiles[i] = NULL; } @@ -689,7 +691,7 @@ AuResult au_ambient_load(u32 ambSoundID) { au_read_rom(fileEntry.offset, mseqFile, fileEntry.data & 0xFFFFFF); manager->mseqFiles[3] = mseqFile; - manager->unk_20 = 4; + manager->numActivePlayers = 4; if (SBN_LOOKUP(ambSoundID + 4, AU_FMT_BK, fileEntry) == AU_RESULT_OK) { snd_load_BK(fileEntry.offset, 2); } @@ -1027,11 +1029,11 @@ void au_swizzle_BK_instruments(s32 bkFileOffset, SoundBank* bank, InstrumentGrou if (instrument->predictor != NULL) { instrument->predictor = AU_FILE_RELATIVE(bank, instrument->predictor); } - if (instrument->unkOffset != NULL) { - instrument->unkOffset = AU_FILE_RELATIVE(bank, instrument->unkOffset); + if (instrument->envelopes != NULL) { + instrument->envelopes = AU_FILE_RELATIVE(bank, instrument->envelopes); } instrument->unk_25 = arg4; - instrument->pitchRatio = *((s32*)(&instrument->pitchRatio)) / outputRate; // what is happening here? + instrument->pitchRatio = instrument->outputRate / outputRate; } else { instruments[i] = defaultInstrument; } @@ -1134,13 +1136,13 @@ void func_80054CE0(s32 arg0, u32 idx) { if (idx < ARRAY_COUNT(D_80078530)) { s32 temp_s0 = D_80078530[idx]; if (arg0 & 1) { - gBGMPlayerA->unk_48 = temp_s0; + gBGMPlayerA->busVolume = temp_s0; func_80053AC8(&gBGMPlayerA->fadeInfo); - gBGMPlayerB->unk_48 = temp_s0; + gBGMPlayerB->busVolume = temp_s0; func_80053AC8(&gBGMPlayerB->fadeInfo); } if (arg0 & 0x10) { - gSoundManager->unk_5C = temp_s0; + gSoundManager->busVolume = temp_s0; func_80053AC8(&gSoundManager->fadeInfo); } } @@ -1148,7 +1150,7 @@ void func_80054CE0(s32 arg0, u32 idx) { s32 func_80054D74(s32 arg0, s32 arg1) { if (arg0 & 0x10) { - return func_8004B9E4(gSoundManager, arg1); + return au_sfx_set_reverb_type(gSoundManager, arg1); } return 0; } diff --git a/src/audio/30450.c b/src/audio/30450.c index 1f2382b777..2b8b176092 100644 --- a/src/audio/30450.c +++ b/src/audio/30450.c @@ -5,7 +5,7 @@ static u8* snd_song_get_track_volumes_set(MusicTrackVols arg0); s32 PreventBGMPlayerUpdate = FALSE; u16 D_80078DB4 = 0; -u16 D_80078DB6 = 0; +u16 AuAmbiencePlayOnlyIndex = 0; // lists of data: // u8 trackIdx @@ -229,7 +229,7 @@ void snd_adjust_sound(s32 soundID, u8 volume, u8 pan) { pan = 0x7F; } - au_sfx_enqueue_event(soundManager, soundID | 0x1000, vol, 0, pan); + au_sfx_enqueue_event(soundManager, soundID | SOUND_ID_ADJUST, vol, 0, pan); } void snd_adjust_sound_with_shift(s32 soundID, u8 volume, u8 pan, s16 pitchShift) { @@ -250,17 +250,17 @@ void snd_adjust_sound_with_shift(s32 soundID, u8 volume, u8 pan, s16 pitchShift) pitchShift = -2400; } - au_sfx_enqueue_event(soundManager, soundID | 0x1000, vol, pitchShift, pan); + au_sfx_enqueue_event(soundManager, soundID | SOUND_ID_ADJUST, vol, pitchShift, pan); } void snd_stop_sound(s32 soundID) { SoundManager* soundManager = gSoundManager; - au_sfx_enqueue_event(soundManager, soundID | 0x8000, 0, 0, 0); + au_sfx_enqueue_event(soundManager, soundID | SOUND_ID_STOP, 0, 0, 0); } -void func_800553F4(void) { - gSoundManager->unk_168 = 1; +void snd_reset(void) { + gSoundManager->resetPending = 1; } void snd_start_sound_raw(s32 soundID, s16 volume, s16 pitchShift, s32 pan) { @@ -269,137 +269,135 @@ void snd_start_sound_raw(s32 soundID, s16 volume, s16 pitchShift, s32 pan) { au_sfx_enqueue_event(soundManager, soundID, volume, pitchShift, pan); } -AuResult snd_ambient_load(s32 ambSoundID) { +AuResult snd_load_ambient(s32 ambSoundID) { return au_ambient_load(ambSoundID); } -AuResult snd_ambient_80055464(s32 arg0, s32 arg1) { - AuResult status = func_80050C30(arg0); +AuResult snd_ambient_play(s32 index, s32 fadeInTime) { + AuResult status = au_amb_check_player_index(index); if (status != AU_RESULT_OK) { return status; } - return func_80050CA0(arg0, arg1); + return au_amb_start(index, fadeInTime); } -AuResult snd_ambient_quick_fade_out(s32 arg0) { - AuResult status = func_80050C30(arg0); +AuResult snd_ambient_stop_quick(s32 index) { + AuResult status = au_amb_check_player_index(index); if (status == AU_RESULT_OK) { - func_80050EF0_fade_out_quick(arg0); + au_amb_stop_quick(index); } return status; } -AuResult snd_ambient_slow_fade_out(s32 arg0, s32 arg1) { - AuResult status = func_80050C30(arg0); +AuResult snd_ambient_stop_slow(s32 index, s32 fadeOutTime) { + AuResult status = au_amb_check_player_index(index); if (status == AU_RESULT_OK) { - func_80050EF0_fade_out_slow(arg0, arg1); + au_amb_stop_slow(index, fadeOutTime); } return status; } -// fade out sounds (kmr_00) -AuResult snd_ambient_8005553C(s32 arg0, s32 arg1) { - AuResult status = func_80050C30(arg0); +AuResult snd_ambient_pause(s32 index, s32 fadeOutTime) { + AuResult status = au_amb_check_player_index(index); if (status == AU_RESULT_OK) { - func_80050EF0_fade_out_unk(arg0, arg1); + au_amb_pause(index, fadeOutTime); } return status; } -// fade in sounds (kmr_00) -- restart? -AuResult snd_ambient_80055590(s32 arg0, s32 arg1) { - AuResult status = func_80050C30(arg0); +AuResult snd_ambient_resume(s32 index, s32 fadeInTime) { + AuResult status = au_amb_check_player_index(index); if (status == AU_RESULT_OK) { - func_80050EF0_fade_in_unk(arg0, arg1); + au_amb_resume(index, fadeInTime); } return status; } -AuResult snd_ambient_800555E4(s32 arg0) { - AuResult status = func_80050C30(arg0); +AuResult snd_ambient_is_stopped(s32 index) { + AuResult status = au_amb_check_player_index(index); if (status != AU_RESULT_OK) { return status; } - return func_80051050(arg0); + return au_amb_is_stopped(index); } -//TODO sets a flag which tells the manager to mute players -AuResult snd_ambient_80055618(s32 index, s32 arg1) { - AuResult status = func_80050C30(index); +// TODO perhaps inaccurate name +AuResult snd_ambient_mute(s32 index, s32 arg1) { + AuResult status = au_amb_check_player_index(index); if (status == AU_RESULT_OK) { - func_80050C54(index, arg1); + au_amb_load_tracks_fade(index, arg1); } return status; } AuResult snd_ambient_set_volume(s32 index, s32 time, s32 volume) { - AuResult status = func_80050C30(index); + AuResult status = au_amb_check_player_index(index); if (status == AU_RESULT_OK) { - au_mseq_set_volume(index, time, volume); + au_amb_set_volume(index, time, volume); } return status; } AuResult snd_ambient_disable(s32 index) { - AuResult status = func_80050C30(index); + AuResult status = au_amb_check_player_index(index); if (status == AU_RESULT_OK) { - au_mseq_set_disabled(index, TRUE); + au_amb_set_disabled(index, TRUE); } return status; } AuResult snd_ambient_enable(s32 index) { - AuResult status = func_80050C30(index); + AuResult status = au_amb_check_player_index(index); if (status == AU_RESULT_OK) { - au_mseq_set_disabled(index, FALSE); + au_amb_set_disabled(index, FALSE); } return status; } -// snd_ambient_init_tracks? -void snd_ambient_80055760(s32 trackIdx) { +// snd_ambient_init_tracks ? +void snd_ambient_80055760(s32 index) { u32 i; s32 lim = 4; - D_80078DB6 = 0xFF; + AuAmbiencePlayOnlyIndex = 0xFF; for (i = 0; i < lim; i++) { - if (snd_ambient_80055464(i, 0) != AU_RESULT_OK) { + if (snd_ambient_play(i, 0) != AU_RESULT_OK) { return; } } - snd_ambient_set_track(trackIdx); + snd_ambient_play_only(index); } -AuResult snd_ambient_800557CC(s32 fadeTime) { +AuResult snd_ambient_stop_all(s32 time) { AuResult status = AU_RESULT_OK; s32 lim = 4; u32 i; for (i = 0; i < lim; i++) { - if (i == D_80078DB6) { - status = snd_ambient_slow_fade_out(i, fadeTime); + if (i == AuAmbiencePlayOnlyIndex) { + status = snd_ambient_stop_slow(i, time); } else { - status = snd_ambient_quick_fade_out(i); + status = snd_ambient_stop_quick(i); } if (status != AU_RESULT_OK) { break; @@ -408,11 +406,11 @@ AuResult snd_ambient_800557CC(s32 fadeTime) { return status; } -AuResult snd_ambient_set_track(s32 index) { +AuResult snd_ambient_play_only(s32 index) { AuResult status = AU_RESULT_OK; s32 lim = 4; - if (index != D_80078DB6) { + if (index != AuAmbiencePlayOnlyIndex) { u32 i; for (i = 0; i < lim; i++) { @@ -428,7 +426,7 @@ AuResult snd_ambient_set_track(s32 index) { } if (status == AU_RESULT_OK) { - D_80078DB6 = index; + AuAmbiencePlayOnlyIndex = index; } } @@ -860,10 +858,10 @@ void func_800561E4(s32 arg0) { func_80054D74(0x10, arg0); } -void func_80056204(void) { - func_8004BA54(gSoundManager, 0); +void enable_sounds(void) { + au_sfx_set_state(gSoundManager, SND_MANAGER_STATE_ENABLED); } -void func_80056228(void) { - func_8004BA54(gSoundManager, 1); +void disable_sounds(void) { + au_sfx_set_state(gSoundManager, SND_MANAGER_STATE_DISABLED); } diff --git a/src/audio/31650.c b/src/audio/31650.c index 3102a894ea..798c4d757f 100644 --- a/src/audio/31650.c +++ b/src/audio/31650.c @@ -70,7 +70,7 @@ void au_driver_init(AuSynDriver* driver, ALConfig* config) { voice->envMixer.pan = 64; voice->unk_74 = 0; voice->next = NULL; - voice->groupID = 0; + voice->busId = FX_BUS_BGMA_MAIN; voice->index = i; } @@ -141,8 +141,8 @@ Acmd* alAudioFrame(Acmd* cmdList, s32* cmdLen, s16* outBuf, s32 outLen) { for (i = 0; i < gSynDriverPtr->num_pvoice; i++) { pvoice = &gSynDriverPtr->pvoices[i]; - if ((pvoice->groupID != 0xFF) && (pvoice->groupID < gSynDriverPtr->num_bus)) { - fxBus = &gSynDriverPtr->fxBus[pvoice->groupID]; + if ((pvoice->busId != 0xFF) && (pvoice->busId < gSynDriverPtr->num_bus)) { + fxBus = &gSynDriverPtr->fxBus[pvoice->busId]; if (fxBus->tail != NULL) { fxBus->tail->next = pvoice; } else { @@ -284,10 +284,10 @@ void au_bus_set_fx_params(u8 index, s16 delayIndex, s16 paramID, s32 value) { au_fx_param_hdl(fxBus->fxR, delayIndex, paramID, value); } -void au_pvoice_set_group(u8 index, s8 groupID) { +void au_pvoice_set_bus(u8 index, s8 busId) { AuPVoice* pvoice = &gSynDriverPtr->pvoices[index]; - pvoice->groupID = groupID; + pvoice->busId = busId; } // based on n_alSynStopVoice @@ -325,13 +325,13 @@ void au_syn_start_voice(u8 voiceIdx) { } // based on n_alSynStartVoiceParams -void au_syn_start_voice_params(u8 voiceIdx, u8 groupIdx, Instrument* instrument, f32 pitch, s16 vol, u8 pan, u8 fxMix, s32 delta) { +void au_syn_start_voice_params(u8 voiceIdx, u8 busId, Instrument* instrument, f32 pitch, s16 vol, u8 pan, u8 fxMix, s32 delta) { AuPVoice* pvoice = &gSynDriverPtr->pvoices[voiceIdx]; AuLoadFilter* decoder = &pvoice->decoder; AuEnvMixer* envMixer = &pvoice->envMixer; AuResampler* resampler = &pvoice->resampler; - pvoice->groupID = groupIdx; + pvoice->busId = busId; decoder->instrument = instrument; pvoice->decoder.memin = (s32)decoder->instrument->base; @@ -591,7 +591,7 @@ s32 au_syn_get_playing(u8 voiceIdx) { s32 au_syn_get_bus(u8 voiceIdx) { AuPVoice* pvoice = &gSynDriverPtr->pvoices[voiceIdx]; - return pvoice->groupID; + return pvoice->busId; } f32 au_syn_get_pitch(u8 voiceIdx) { diff --git a/src/audio/ambience.c b/src/audio/ambience.c index c5596a1d78..0d4de78dd6 100644 --- a/src/audio/ambience.c +++ b/src/audio/ambience.c @@ -39,9 +39,9 @@ void update_ambient_sounds(void) { case AMBIENT_SOUND_FADE_OUT: if (ambientSoundState->flags & 1) { if (ambientSoundState->fadeTime < 250) { - error = snd_ambient_quick_fade_out(0); + error = snd_ambient_stop_quick(0); } else { - error = snd_ambient_slow_fade_out(0, ambientSoundState->fadeTime); + error = snd_ambient_stop_slow(0, ambientSoundState->fadeTime); } if (error != AU_RESULT_OK) { @@ -52,15 +52,15 @@ void update_ambient_sounds(void) { break; case AMBIENT_SOUND_FADE_IN: if (ambientSoundState->flags & 1) { - if (snd_ambient_800555E4(0) != AU_RESULT_OK) { + if (snd_ambient_is_stopped(0) != AU_RESULT_OK) { return; } ambientSoundState->flags &= ~1; } if (ambientSoundState->soundID < 0) { ambientSoundState->fadeState = AMBIENT_SOUND_IDLE; - } else if (snd_ambient_load(ambientSoundState->soundID) == AU_RESULT_OK) { - if (snd_ambient_80055464(0, 0) == AU_RESULT_OK) { + } else if (snd_load_ambient(ambientSoundState->soundID) == AU_RESULT_OK) { + if (snd_ambient_play(0, 0) == AU_RESULT_OK) { ambientSoundState->fadeState = AMBIENT_SOUND_IDLE; ambientSoundState->flags |= 1; } @@ -73,7 +73,7 @@ s32 play_ambient_sounds(s32 soundID, s32 fadeTime) { AmbientSoundSettings* state = &AmbientSoundData; if (!gGameStatusPtr->musicEnabled) { - snd_ambient_quick_fade_out(state->soundID); + snd_ambient_stop_quick(state->soundID); state->flags &= ~1; return 1; } diff --git a/src/audio/e0b30_len_b80.c b/src/audio/e0b30_len_b80.c index 2994f2e75c..58cd3d9425 100644 --- a/src/audio/e0b30_len_b80.c +++ b/src/audio/e0b30_len_b80.c @@ -84,7 +84,7 @@ void bgm_update_music_settings(void) { s16 state2 = 2; s16 flag4 = MUSIC_SETTINGS_FLAG_4; s32 flags; - + for (i; i < 2; i++, music++) { switch (music->state) { case 0: @@ -165,7 +165,7 @@ void bgm_update_music_settings(void) { music->variation = music->savedVariation; music->songName = music->savedSongName; music->state = 0; - music->flags |= MUSIC_SETTINGS_FLAG_1; + music->flags |= MUSIC_SETTINGS_FLAG_1; music->flags &= ~MUSIC_SETTINGS_FLAG_8; } } @@ -401,7 +401,7 @@ void bgm_pop_battle_song(void) { } else { musicSetting->flags |= MUSIC_SETTINGS_FLAG_8; _bgm_set_song(0, musicSetting->savedSongID, musicSetting->savedVariation, 0, 8); - snd_ambient_80055590(0, 250); + snd_ambient_resume(0, 250); } } } @@ -410,7 +410,7 @@ void bgm_push_battle_song(void) { MusicSettings* musicSetting = gMusicSettings; if (gGameStatusPtr->demoState == 0 && !(gOverrideFlags & GLOBAL_OVERRIDES_20000)) { - snd_ambient_8005553C(0, 250); + snd_ambient_pause(0, 250); musicSetting->savedSongID = musicSetting->songID; musicSetting->savedVariation = musicSetting->variation; musicSetting->savedSongName = musicSetting->songName; diff --git a/src/audio/private.h b/src/audio/private.h index b7b133666f..7946e5554f 100644 --- a/src/audio/private.h +++ b/src/audio/private.h @@ -1,34 +1,34 @@ // 2BF90.c -void au_mseq_manager_init(AuAmbienceManager* arg0, s8 arg1, s8 reverbType, AuGlobals* arg3); -AuResult func_80050C30(u32 arg0); -void func_80050C54(s32 arg0, s32 arg1); -void au_mseq_set_disabled(s32 arg0, s32 arg1); -AuResult func_80050CA0(s32 arg0, s32 arg1); -void func_80050D50(AuAmbPlayer* arg0); -void func_80050EF0_fade_out_unk(s32 arg0, s32 arg1); -void func_80050EF0_fade_in_unk(s32 arg0, s32 arg1); -void func_80050EF0_fade_out_quick(s32 arg0); -void func_80050EF0_fade_out_slow(s32 arg0, s32 arg1); -void au_mseq_set_volume(s32 arg0, s32 arg1, s32 arg2); -AuResult func_80051050(s32 arg0); -void func_800510A4(AuAmbienceManager* arg0, MSEQHeader* mseq, s32 index); -void snd_ambient_manager_update(AuAmbienceManager* arg0); -void func_80051334(AuAmbienceManager* manager, AuAmbPlayer* lambda); -void func_80051434(AuAmbienceManager* manager, AuAmbPlayer* lambda); -s32 au_mseq_read_next(AuAmbPlayer* arg0); -void au_mseq_player_stop(AuAmbienceManager* arg0, AuAmbPlayer* arg1); -void func_800522A8(AuAmbienceManager* arg0, AuAmbPlayer* lambda); -void func_8005232C(AuAmbienceManager* manager, AuAmbPlayer* lambda); +void au_amb_manager_init(AmbienceManager* arg0, s8 arg1, s8 reverbType, AuGlobals* arg3); +AuResult au_amb_check_player_index(u32 arg0); +void au_amb_load_tracks_fade(s32 arg0, s32 arg1); +void au_amb_set_disabled(s32 arg0, s32 arg1); +AuResult au_amb_start(s32 arg0, s32 arg1); +void au_amb_fade_setup(AmbiencePlayer* arg0); +void au_amb_pause(s32 arg0, s32 arg1); +void au_amb_resume(s32 arg0, s32 arg1); +void au_amb_stop_quick(s32 arg0); +void au_amb_stop_slow(s32 arg0, s32 arg1); +void au_amb_set_volume(s32 arg0, s32 arg1, s32 arg2); +AuResult au_amb_is_stopped(s32 arg0); +void au_amb_play_sequence(AmbienceManager* arg0, MSEQHeader* mseq, s32 index); +void au_amb_manager_update(AmbienceManager* arg0); +void au_amb_load_track_fade_info(AmbienceManager* manager, AmbiencePlayer* lambda); +void au_amb_player_update(AmbienceManager* manager, AmbiencePlayer* lambda); +u8 au_amb_read_next(AmbiencePlayer* arg0); +void au_amb_player_stop(AmbienceManager* arg0, AmbiencePlayer* arg1); +void au_amb_save_voices(AmbienceManager* arg0, AmbiencePlayer* lambda); +void au_amb_restore_voices(AmbienceManager* manager, AmbiencePlayer* lambda); // 2d9a0_len_890.c -void func_800525A0(AuGlobals* globals); -void func_80052614(AuGlobals* globals); -void func_80052660(AuGlobals* globals); -void func_80052B44(AlUnkVoice* arg0); -s32 func_80052BC0(s32 arg0); -void func_80052BF8(AlUnkVoice* voice, AlUnkInstrumentData* arg1); -u8 func_80052CFC(AlUnkVoice* voice); -void func_80052E18(AlUnkVoice* arg0); +void au_update_stopped_voices(AuGlobals* globals); +void au_init_voices(AuGlobals* globals); +void au_update_voices(AuGlobals* globals); +void au_voice_after_volume_change(AuVoice* arg0); +s32 au_voice_get_delta(s32 arg0); +void au_voice_start(AuVoice* voice, EnvelopeData* arg1); +u8 au_voice_step(AuVoice* voice); +void au_voice_set_vol_changed(AuVoice* arg0); //2e230_len_2190.c void func_80052E30(u8 index); @@ -38,19 +38,19 @@ static void au_reset_drum_entry(BGMDrumInfo* arg0); static void au_reset_instrument_entry(BGMInstrumentInfo* arg0); void au_update_clients_2(void); void au_update_players_main(void); -void func_80053654(AuGlobals* globals); -void func_80053888(AlUnkVoice* arg0, u8 arg1); -void au_reset_voice(AlUnkVoice* arg0, u8 arg1); +void au_syn_update(AuGlobals* globals); +void au_reset_nonfree_voice(AuVoice* arg0, u8 arg1); +void au_reset_voice(AuVoice* arg0, u8 arg1); f32 au_compute_pitch_ratio(s32 arg0); void au_fade_init(Fade* fade, s32 time, s32 startValue, s32 endValue); void au_fade_clear(Fade* fade); void au_fade_update(Fade* fade); -void func_80053A98(u8 arg0, u16 arg1, s32 arg2); +void au_fade_set_volume(u8 arg0, u16 arg1, s32 arg2); void func_80053AC8(Fade* fade); void au_fade_set_vol_scale(Fade* fade, s16 value); void func_80053B04(Fade* fade, u32 arg1, s32 target); void func_80053BA8(Fade* fade); -Instrument* au_get_instrument(AuGlobals* globals, u32 bank, u32 patch, AlUnkInstrumentData* arg3); +Instrument* au_get_instrument(AuGlobals* globals, u32 bank, u32 patch, EnvelopeData* arg3); void au_get_bgm_player_and_file(u32 playerIndex, BGMHeader** outCurrentTrackData, BGMPlayer** outPlayer); void au_get_bgm_player(u32 playerIndex, BGMPlayer** outPlayer); AuResult au_load_song_files(u32 arg0, BGMHeader* arg1, BGMPlayer* arg2); @@ -97,9 +97,9 @@ void au_sfx_load_groups_from_SEF(SoundManager* sndMgr); void au_sfx_clear_queue(SoundManager* manager); void au_sfx_enqueue_event(SoundManager* manager, u32 soundID, s16 volume, s16 pitchShift, u8 pan); void au_sfx_update_main(SoundManager* manager); -s32 func_8004B9E4(SoundManager* manager, s32 arg1); -void func_8004BA54(SoundManager* manager, s32 arg1); -void func_8004BA74(SoundManager* manager, SoundSFXEntry* entry, SoundManagerA0*); +s32 au_sfx_set_reverb_type(SoundManager* manager, s32 arg1); +void au_sfx_set_state(SoundManager* manager, s32 arg1); +void au_sfx_load_sound(SoundManager* manager, SoundSFXEntry* entry, SoundManagerCustomCmdList*); s16 au_sfx_manager_update(SoundManager* manager); // 28910_len_5090.c @@ -179,22 +179,22 @@ void snd_start_sound_with_shift(s32 soundID, u8 volume, u8 pan, s16 pitchShift); void snd_adjust_sound(s32 soundID, u8 volume, u8 pan); void snd_adjust_sound_with_shift(s32 soundID, u8 volume, u8 pan, s16 pitchShift); void snd_stop_sound(s32 soundID); -void func_800553F4(void); +void snd_reset(void); void snd_start_sound_raw(s32 soundID, s16 volume, s16 pitchShift, s32 pan); -AuResult snd_ambient_load(s32 arg0); -AuResult snd_ambient_80055464(s32 arg0, s32 arg1); -AuResult snd_ambient_quick_fade_out(s32 arg0); -AuResult snd_ambient_slow_fade_out(s32 arg0, s32 arg1); -AuResult snd_ambient_8005553C(s32 arg0, s32 arg1); -AuResult snd_ambient_80055590(s32 arg0, s32 arg1); -AuResult snd_ambient_800555E4(s32 arg0); -AuResult snd_ambient_80055618(s32 arg0, s32 arg1); +AuResult snd_load_ambient(s32 arg0); +AuResult snd_ambient_play(s32 arg0, s32 arg1); +AuResult snd_ambient_stop_quick(s32 arg0); +AuResult snd_ambient_stop_slow(s32 arg0, s32 arg1); +AuResult snd_ambient_pause(s32 arg0, s32 arg1); +AuResult snd_ambient_resume(s32 arg0, s32 arg1); +AuResult snd_ambient_is_stopped(s32 arg0); +AuResult snd_ambient_mute(s32 arg0, s32 arg1); AuResult snd_ambient_set_volume(s32 arg0, s32 arg1, s32 arg2); AuResult snd_ambient_disable(s32 arg0); AuResult snd_ambient_enable(s32 arg0); void snd_ambient_80055760(s32 arg0); -AuResult snd_ambient_800557CC(s32 arg0); -AuResult snd_ambient_set_track(s32 arg0); +AuResult snd_ambient_stop_all(s32 arg0); +AuResult snd_ambient_play_only(s32 arg0); AuResult au_song_load(s32 songID, s32 playerIndex); AuResult au_song_start(s32 songName); AuResult au_song_start_variation(s32 songName, s32 variation); @@ -240,8 +240,8 @@ void audio_set_mono(void); void func_800561A4(s32 arg0); void func_800561C4(s32 arg0); void func_800561E4(s32 arg0); -void func_80056204(void); -void func_80056228(void); +void enable_sounds(void); +void disable_sounds(void); */ // 31650.c @@ -256,7 +256,7 @@ void au_bus_set_volume(u8 arg0, u16 arg1); u16 au_bus_get_volume(u8 arg0, u16 arg1); void au_bus_set_effect(u8 arg0, u8 effectID); void au_bus_set_fx_params(u8 arg0, s16 arg1, s16 arg2, s32 arg3); -void au_pvoice_set_group(u8 arg0, s8 arg1); +void au_pvoice_set_bus(u8 arg0, s8 arg1); void au_syn_stop_voice(u8 voiceIdx); void au_syn_start_voice(u8 index); void au_syn_start_voice_params(u8 index, u8 reverbType, Instrument* table, f32 pitch, s16 vol, u8 pan, u8 fxMix, s32 delta); @@ -301,7 +301,7 @@ s32 au_fx_param_hdl(AuFX* fx, s16 index, s16 paramID, s32 value); void sfx_reset_door_sounds(void); void sfx_clear_sounds(void); void sfx_clear_env_sounds(s16 playSounds); -void sfx_update_looping_sound_params(void); +void sfx_update_env_sound_params(void); void sfx_set_reverb_mode(s32 arg0); s32 sfx_get_reverb_mode(void); void sfx_stop_env_sounds(void); @@ -311,7 +311,7 @@ SoundInstance* sfx_get_env_sound_instance(s32 soundID); void sfx_play_sound_looping(s32 soundId, u8 volume, u8 pan, s16 pitchShift); void sfx_register_looping_sound_at_position(s32 soundID, s32 flags, f32 x, f32 y, f32 z); s32 sfx_adjust_env_sound_pos(s32 soundID, s32 sourceFlags, f32 x, f32 y, f32 z); -void func_80149A6C(s32 soundID, s32 keepPlaying); +void snd_stop_tracking_env_sound_pos(s32 soundID, s32 keepPlaying); void sfx_play_sound_with_params(s32 soundID, u8 volume, u8 pan, s16 pitchShift); void sfx_adjust_env_sound_params(s32 soundID, u8 volume, u8 pan, s16 pitchShift); void sfx_stop_sound(s32 soundID); diff --git a/src/audio/public.h b/src/audio/public.h index fc5f8e8c5c..a547def7db 100644 --- a/src/audio/public.h +++ b/src/audio/public.h @@ -11,22 +11,22 @@ void snd_start_sound_with_shift(s32 soundID, u8 volume, u8 pan, s16 pitchShift); void snd_adjust_sound(s32 soundID, u8 volume, u8 pan); void snd_adjust_sound_with_shift(s32 soundID, u8 volume, u8 pan, s16 pitchShift); void snd_stop_sound(s32 soundID); -void func_800553F4(void); +void snd_reset(void); void snd_start_sound_raw(s32 soundID, s16 volume, s16 pitchShift, s32 pan); -AuResult snd_ambient_load(s32 arg0); -AuResult snd_ambient_80055464(s32 arg0, s32 arg1); -AuResult snd_ambient_quick_fade_out(s32 arg0); -AuResult snd_ambient_slow_fade_out(s32 arg0, s32 arg1); -AuResult snd_ambient_8005553C(s32 arg0, s32 arg1); -AuResult snd_ambient_80055590(s32 arg0, s32 arg1); -AuResult snd_ambient_800555E4(s32 arg0); -AuResult snd_ambient_80055618(s32 arg0, s32 arg1); +AuResult snd_load_ambient(s32 arg0); +AuResult snd_ambient_play(s32 arg0, s32 arg1); +AuResult snd_ambient_stop_quick(s32 arg0); +AuResult snd_ambient_stop_slow(s32 arg0, s32 arg1); +AuResult snd_ambient_pause(s32 arg0, s32 arg1); +AuResult snd_ambient_resume(s32 arg0, s32 arg1); +AuResult snd_ambient_is_stopped(s32 arg0); +AuResult snd_ambient_mute(s32 arg0, s32 arg1); AuResult snd_ambient_set_volume(s32 arg0, s32 arg1, s32 arg2); AuResult snd_ambient_disable(s32 arg0); AuResult snd_ambient_enable(s32 arg0); void snd_ambient_80055760(s32 arg0); -AuResult snd_ambient_800557CC(s32 arg0); -AuResult snd_ambient_set_track(s32 arg0); +AuResult snd_ambient_stop_all(s32 arg0); +AuResult snd_ambient_play_only(s32 arg0); AuResult au_song_load(s32 songID, s32 playerIndex); AuResult au_song_start(s32 songName); AuResult au_song_start_variation(s32 songName, s32 variation); @@ -66,14 +66,14 @@ void audio_set_mono(void); void func_800561A4(s32 arg0); void func_800561C4(s32 arg0); void func_800561E4(s32 arg0); -void func_80056204(void); -void func_80056228(void); +void enable_sounds(void); +void disable_sounds(void); // sfx.h void sfx_reset_door_sounds(void); void sfx_clear_sounds(void); void sfx_clear_env_sounds(s16 playSounds); -void sfx_update_looping_sound_params(void); +void sfx_update_env_sound_params(void); void sfx_set_reverb_mode(s32 arg0); s32 sfx_get_reverb_mode(void); void sfx_stop_env_sounds(void); @@ -81,7 +81,7 @@ void sfx_stop_env_sounds(void); void sfx_play_sound_looping(s32 soundId, u8 volume, u8 pan, s16 pitchShift); void sfx_register_looping_sound_at_position(s32 soundID, s32 flags, f32 x, f32 y, f32 z); s32 sfx_adjust_env_sound_pos(s32 soundID, s32 sourceFlags, f32 x, f32 y, f32 z); -void func_80149A6C(s32 soundID, s32 keepPlaying); +void snd_stop_tracking_env_sound_pos(s32 soundID, s32 keepPlaying); void sfx_play_sound_with_params(s32 soundID, u8 volume, u8 pan, s16 pitchShift); void sfx_adjust_env_sound_params(s32 soundID, u8 volume, u8 pan, s16 pitchShift); void sfx_stop_sound(s32 soundID); diff --git a/src/audio/sfx.c b/src/audio/sfx.c index 00b157d5ef..18aa4633a0 100644 --- a/src/audio/sfx.c +++ b/src/audio/sfx.c @@ -5,56 +5,56 @@ // sound IDs s32 LoopingSounds[] = { - 0x00000287, 0x000002A8, 0x00000054, 0x00000056, 0x00000024, 0x00000027, 0x00000021, 0x00000022, 0x00000349, - 0x00000273, 0x00000275, 0x00000275, 0x00000274, 0x00000273, 0x00000274, 0x00000099, 0x0000009E, 0x0000032E, - 0x0000008E, 0x00000089, 0x00000083, 0x00000388, 0x000000A0, 0x0000004A, 0x0000009F, 0x00000168, 0x00000185, - 0x00000052, 0x0000004E, 0x0000004F, 0x00000189, 0x00000000, 0x00000000, 0x00000198, 0x00000199, 0x00000194, - 0x0000019A, 0x00000091, 0x00000164, 0x00000271, 0x00000271, 0x00000274, 0x00000275, 0x00000271, 0x00000273, - 0x00000271, 0x00000273, 0x00000271, 0x00000274, 0x00000275, 0x00000276, 0x00000271, 0x00000273, 0x00000271, - 0x00000274, 0x00000276, 0x00000275, 0x00000271, 0x00000271, 0x00000271, 0x00000271, 0x00000276, 0x00000275, - 0x00000274, 0x0000039E, 0x00000341, 0x00000207, 0x00000271, 0x00000271, 0x00000275, 0x00000276, 0x00000271, - 0x00000271, 0x00000271, 0x00000050, 0x00000070, 0x0000036C, 0x0000036D, 0x00000295, 0x00000043, 0x00000197, - 0x00000221, 0x0000022A, 0x0000022B, 0x00002040, 0x00000046, 0x00000033, 0x00000034, 0x00000039, 0x0000004C, - 0x0000004D, 0x000001B1, 0x000001B2, 0x00000094, 0x0000005D, 0x0000005B, 0x00000060, 0x000001B3, 0x00000000, - 0x000000AD, 0x000000AE, 0x000000AF, 0x0000023D, 0x000000A2, 0x00000248, 0x00000249, 0x00000391, 0x000003BC, - 0x000003AD, 0x0000022C, 0x0000022D, + 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, }; // all sound IDs for alternating sounds -s32 D_8014F48C[] = { 0x00000336, 0x00000316 }; -s32 D_8014F494[] = { 0x00000337, 0x00000317 }; -s32 D_8014F49C[] = { 0x00000338, 0x00000318 }; -s32 D_8014F4A4[] = { 0x00000339, 0x00000319 }; -s32 D_8014F4AC[] = { 0x0000033A, 0x0000031A }; -s32 D_8014F4B4[] = { 0x0000033B, 0x0000031B }; -s32 D_8014F4BC[] = { 0x0000033C, 0x0000031C }; -s32 D_8014F4C4[] = { 0x0000033D, 0x0000031D }; -s32 D_8014F4CC[] = { 0x0000033E, 0x0000031E }; -s32 D_8014F4D4[] = { 0x0000033F, 0x0000031F }; -s32 D_8014F4DC[] = { 0x00000340, 0x00000340 }; -s32 D_8014F4E4[] = { 0x000002F4, 0x000002F5 }; -s32 D_8014F4EC[] = { 0x0000032F, 0x00000330 }; -s32 D_8014F4F4[] = { 0x00000334, 0x00000335 }; -s32 D_8014F4FC[] = { 0x000002F1, 0x000002F2 }; -s32 D_8014F504[] = { 0x000000C1, 0x000000C2 }; -s32 D_8014F50C[] = { 0x000000C3, 0x000000C4 }; -s32 D_8014F514[] = { 0x000001CB, 0x000001CD }; -s32 D_8014F51C[] = { 0x000001CC, 0x000001CE }; -s32 D_8014F524[] = { 0x000002A6, 0x000002A7 }; -s32 D_8014F52C[] = { 0x0000020C, 0x0000020D, 0x0000020E }; -s32 D_8014F538[] = { 0x00000259, 0x0000025A }; -s32 D_8014F540[] = { 0x0000025C, 0x0000025D }; -s32 D_8014F548[] = { 0x00000331, 0x00000332, 0x00000333 }; -s32 D_8014F554[] = { 0x00002078, 0x00002079 }; -s32 D_8014F55C[] = { 0x00000179, 0x0000017A }; -s32 D_8014F564[] = { 0x000001FB, 0x000001FC }; -s32 D_8014F56C[] = { 0x0000203A, 0x0000203B }; -s32 D_8014F574[] = { 0x0000022E, 0x0000022F }; -s32 D_8014F57C[] = { 0x0000202A, 0x0000202B }; -s32 D_8014F584[] = { 0x00002041, 0x00002042 }; -s32 D_8014F58C[] = { 0x00002043, 0x00002044 }; -s32 D_8014F594[] = { 0x00002078, 0x00002079 }; -s32 D_8014F59C[] = { 0x000003B6, 0x000003B7 }; +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_8014F504[] = { SOUND_BOO_VANISH, SOUND_C2 }; +s32 D_8014F50C[] = { SOUND_BOO_APPEAR, SOUND_C4 }; +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 }; AlternatingSoundSet AlternatingSounds[] = { { @@ -205,10 +205,10 @@ s32 OpenCloseSounds[][2] = { { SOUND_20A3, SOUND_20A4 }, }; -extern SoundInstance D_801598A0[MAX_SOUND_INSTANCES]; -extern SoundInstance D_801599B8[MAX_SOUND_INSTANCES]; -extern SoundInstance* D_80159AD0; -extern s32 D_80159AD4; +extern SoundInstance wEnvSounds[MAX_SOUND_INSTANCES]; +extern SoundInstance bEnvSounds[MAX_SOUND_INSTANCES]; +extern SoundInstance* gCurrentEnvSounds; +extern s32 SfxReverbMode; void sfx_compute_spatialized_sound_params_full(f32 x, f32 y, f32 z, s16* volume, s16* pan, s32 flags) { s32 screenX, screenY, screenZ; @@ -298,9 +298,9 @@ void sfx_reset_door_sounds(void) { } void sfx_clear_sounds(void) { - bzero(&D_801598A0, sizeof(D_801598A0)); - bzero(&D_801599B8, sizeof(D_801599B8)); - D_80159AD0 = D_801598A0; + bzero(&wEnvSounds, sizeof(wEnvSounds)); + bzero(&bEnvSounds, sizeof(bEnvSounds)); + gCurrentEnvSounds = wEnvSounds; sfx_set_reverb_mode(0); sfx_reset_door_sounds(); } @@ -308,34 +308,34 @@ void sfx_clear_sounds(void) { // name might be incorrect? void sfx_clear_env_sounds(s16 playSounds) { if (!gGameStatusPtr->isBattle) { - D_80159AD0 = D_801598A0; + gCurrentEnvSounds = wEnvSounds; } else { - D_80159AD0 = D_801599B8; + gCurrentEnvSounds = bEnvSounds; } if (playSounds) { - SoundInstance* sound = D_80159AD0; + SoundInstance* sound = gCurrentEnvSounds; s32 i; for (i = 0; i < MAX_SOUND_INSTANCES; i++, sound++) { - if (sound->flags & SOUND_INSTANCE_FLAG_1) { + if (sound->flags & SOUND_INSTANCE_FLAG_ACTIVE) { snd_start_sound_with_shift(sound->soundID, sound->volume, sound->pan, sound->pitchShift); } } } else { - bzero(D_80159AD0, MAX_SOUND_INSTANCES * sizeof(SoundInstance)); + bzero(gCurrentEnvSounds, MAX_SOUND_INSTANCES * sizeof(SoundInstance)); } } -void sfx_update_looping_sound_params(void) { - SoundInstance* sound = D_80159AD0; +void sfx_update_env_sound_params(void) { + SoundInstance* sound = gCurrentEnvSounds; u16 volume; u16 pan; s32 i; for (i = 0; i < MAX_SOUND_INSTANCES; i++, sound++) { - if (sound->flags & SOUND_INSTANCE_FLAG_1) { - if (sound->flags & SOUND_INSTANCE_FLAG_2) { + if (sound->flags & SOUND_INSTANCE_FLAG_ACTIVE) { + if (sound->flags & SOUND_INSTANCE_FLAG_POSITION_CHANGED) { sfx_get_spatialized_sound_params(sound->position.x, sound->position.y, sound->position.z, &volume, &pan, sound->sourceFlags); sound->volume = volume; sound->pan = pan; @@ -347,11 +347,11 @@ void sfx_update_looping_sound_params(void) { void sfx_set_reverb_mode(s32 mode) { func_800561E4(mode); - D_80159AD4 = mode; + SfxReverbMode = mode; } s32 sfx_get_reverb_mode(void) { - return D_80159AD4; + return SfxReverbMode; } void sfx_stop_env_sounds(void) { @@ -359,25 +359,25 @@ void sfx_stop_env_sounds(void) { s32 i; if (!gGameStatusPtr->isBattle) { - D_80159AD0 = D_801598A0; + gCurrentEnvSounds = wEnvSounds; } else { - D_80159AD0 = D_801599B8; + gCurrentEnvSounds = bEnvSounds; } - sound = D_80159AD0; + sound = gCurrentEnvSounds; for (i = 0; i < MAX_SOUND_INSTANCES; i++, sound++) { - if (sound->flags & SOUND_INSTANCE_FLAG_1) { + if (sound->flags & SOUND_INSTANCE_FLAG_ACTIVE) { snd_stop_sound(sound->soundID); } } } SoundInstance* sfx_get_env_sound_instance(s32 soundID) { - SoundInstance* sound = D_80159AD0; + SoundInstance* sound = gCurrentEnvSounds; s32 i; for (i = 0; i < MAX_SOUND_INSTANCES; i++, sound++) { - if (sound->flags & SOUND_INSTANCE_FLAG_1 && sound->soundID == soundID) { + if (sound->flags & SOUND_INSTANCE_FLAG_ACTIVE && sound->soundID == soundID) { return sound; } } @@ -386,11 +386,11 @@ SoundInstance* sfx_get_env_sound_instance(s32 soundID) { } void sfx_play_sound_looping(s32 soundId, u8 volume, u8 pan, s16 pitchShift) { - SoundInstance* sound = D_80159AD0; + SoundInstance* sound = gCurrentEnvSounds; s32 i; for (i = 0; i < MAX_SOUND_INSTANCES; i++, sound++) { - if (!(sound->flags & SOUND_INSTANCE_FLAG_1)) { + if (!(sound->flags & SOUND_INSTANCE_FLAG_ACTIVE)) { break; } } @@ -399,17 +399,17 @@ void sfx_play_sound_looping(s32 soundId, u8 volume, u8 pan, s16 pitchShift) { sound->soundID = soundId; sound->volume = volume; sound->pitchShift = pitchShift; - sound->flags |= SOUND_INSTANCE_FLAG_1; + sound->flags |= SOUND_INSTANCE_FLAG_ACTIVE; snd_start_sound_with_shift(soundId, volume, pan, pitchShift); } void sfx_register_looping_sound_at_position(s32 soundID, s32 flags, f32 x, f32 y, f32 z) { - SoundInstance* sound = D_80159AD0; + SoundInstance* sound = gCurrentEnvSounds; s32 i; for (i = 0; i < MAX_SOUND_INSTANCES; i++, sound++) { - if (!(sound->flags & SOUND_INSTANCE_FLAG_1)) { + if (!(sound->flags & SOUND_INSTANCE_FLAG_ACTIVE)) { break; } } @@ -419,7 +419,7 @@ void sfx_register_looping_sound_at_position(s32 soundID, s32 flags, f32 x, f32 y sound->position.y = y; sound->position.z = z; sound->soundID = soundID; - sound->flags |= (SOUND_INSTANCE_FLAG_1 | SOUND_INSTANCE_FLAG_2); + sound->flags |= SOUND_INSTANCE_FLAG_ACTIVE | SOUND_INSTANCE_FLAG_POSITION_CHANGED; sfx_play_sound_at_position(soundID, flags, x, y, z); } @@ -436,15 +436,15 @@ s32 sfx_adjust_env_sound_pos(s32 soundID, s32 sourceFlags, f32 x, f32 y, f32 z) sound->position.y = y; sound->position.z = z; sound->soundID = soundID; - sound->flags |= (SOUND_INSTANCE_FLAG_1 | SOUND_INSTANCE_FLAG_2); + sound->flags |= SOUND_INSTANCE_FLAG_ACTIVE | SOUND_INSTANCE_FLAG_POSITION_CHANGED; return TRUE; } -void func_80149A6C(s32 soundID, s32 keepPlaying) { +void snd_stop_tracking_env_sound_pos(s32 soundID, s32 keepPlaying) { SoundInstance* sound = sfx_get_env_sound_instance(soundID); if (sound != NULL) { - sound->flags &= -SOUND_INSTANCE_FLAG_4; //TODO use logical negate here + sound->flags &= ~(SOUND_INSTANCE_FLAG_ACTIVE | SOUND_INSTANCE_FLAG_POSITION_CHANGED); if (!keepPlaying) { snd_stop_sound(sound->soundID); } @@ -463,6 +463,7 @@ void sfx_play_sound_with_params(s32 soundID, u8 volume, u8 pan, s16 pitchShift) s32 soundType = (soundID & 0x70000000) >> 0x1C; switch (soundType) { case SOUND_TYPE_LOOPING: + // 0x8xxxxxxx sfx_play_sound_looping(LoopingSounds[soundIndex], volume, pan, pitchShift); return; case SOUND_TYPE_EXIT_DOOR: @@ -472,6 +473,7 @@ void sfx_play_sound_with_params(s32 soundID, u8 volume, u8 pan, s16 pitchShift) soundID = OpenCloseSounds[gCurrentRoomDoorSounds][soundIndex]; break; case SOUND_TYPE_ALTERNATING: + // 0xBxxxxxxx alternatingSet = &AlternatingSounds[soundIndex]; if (alternatingSet->currentIndex >= alternatingSet->soundCount) { alternatingSet->currentIndex = 0; @@ -502,7 +504,7 @@ void sfx_stop_sound(s32 soundID) { s32 sound = soundID; if (sound & SOUND_TYPE_SPECIAL) { - func_80149A6C(LoopingSounds[sound & 0xFFFF], 0); + snd_stop_tracking_env_sound_pos(LoopingSounds[sound & 0xFFFF], FALSE); } else { snd_stop_sound(sound); } @@ -518,16 +520,16 @@ void sfx_play_sound_at_player(s32 soundID, s32 flags) { sfx_play_sound_at_position(soundID, flags, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); } -void sfx_play_sound_at_npc(s32 soundID, s32 arg1, s32 npcID) { +void sfx_play_sound_at_npc(s32 soundID, s32 flags, s32 npcID) { Npc* npc = get_npc_safe(npcID); if (npc != NULL) { - sfx_play_sound_at_position(soundID, arg1, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(soundID, flags, npc->pos.x, npc->pos.y, npc->pos.z); } } void sfx_play_sound_at_position(s32 soundID, s32 flags, f32 posX, f32 posY, f32 posZ) { - if ((soundID & 0xF0000000) == 0x80000000) { + if ((soundID & 0xF0000000) == SOUND_TYPE_SPECIAL) { s32 id = LoopingSounds[soundID & 0xFFFF]; sfx_register_looping_sound_at_position(id, flags, posX, posY, posZ); @@ -614,6 +616,7 @@ void sfx_compute_spatialized_sound_params_0(f32 x, f32 y, f32 z, s16* volume, s1 } if (!gGameStatusPtr->isBattle) { + // 25/75 at screen edge *pan = (screenX * 0.2f) + 32.0f; } else { f32 temp_f20 = ((screenX * 127.0) / SCREEN_WIDTH) - 64.0; diff --git a/src/audio/sfx_player.c b/src/audio/sfx_player.c index d5ef495646..8caa13a053 100644 --- a/src/audio/sfx_player.c +++ b/src/audio/sfx_player.c @@ -1,56 +1,61 @@ #include "common.h" #include "audio.h" -static void func_8004C0E4(SoundManager* manager, SoundPlayer* player, s8* readPos, SoundSFXEntry* sfxEntry, s32 arg4, s32 arg5); -static void au_sfx_set_bits_C00(SoundManager* manager, u32 soundID); +static void au_sfx_play_sound(SoundManager* manager, SoundPlayer* player, s8* readPos, SoundSFXEntry* sfxEntry, s32 arg4, s32 arg5); +static void au_sfx_set_triggers(SoundManager* manager, u32 soundID); static void au_sfx_stop_by_id(SoundManager* manager, u32 soundID); -static void func_8004C300(SoundManager* manager, u32 soundID); +static void au_sfx_stop_by_exlusive_id(SoundManager* manager, u32 soundID); static void au_sfx_set_modifiers(SoundManager* manager, SoundSFXEntry* sfxEntry); static void au_sfx_set_player_modifiers(SoundPlayer* player, SoundSFXEntry* sfxEntry); -static void au_sfx_update_mode_0(SoundManager* manager, SoundPlayer* player, AlUnkVoice* arg2, u8 arg3); +static void au_sfx_update_basic(SoundManager* manager, SoundPlayer* player, AuVoice* arg2, u8 arg3); static s16 au_sfx_get_scaled_volume(SoundManager* manager, SoundPlayer* player); -static void au_sfx_update_mode_1(SoundManager* manager, SoundPlayer* player, AlUnkVoice* arg2, u8 arg3); -static void snd_set_voice_volume(AlUnkVoice* voice, SoundManager* manager, SoundPlayer* player); +static void au_sfx_update_sequence(SoundManager* manager, SoundPlayer* player, AuVoice* arg2, u8 arg3); +static void snd_set_voice_volume(AuVoice* voice, SoundManager* manager, SoundPlayer* player); static u8 au_sfx_get_random_pan(s32 arg0, s32 arg1, s32 arg2); static void au_SEFCmd_00_SetVolume(SoundManager* manager, SoundPlayer* player); static void au_SEFCmd_01_SetPan(SoundManager* manager, SoundPlayer* player); static void au_SEFCmd_02_SetInstrument(SoundManager* manager, SoundPlayer* player); static void au_SEFCmd_03_SetReverb(SoundManager* manager, SoundPlayer* player); -static void au_SEFCmd_04(SoundManager* manager, SoundPlayer* player); -static void au_SEFCmd_05(SoundManager* manager, SoundPlayer* player); -static void au_SEFCmd_06(SoundManager* manager, SoundPlayer* player); -static void au_SEFCmd_07(SoundManager* manager, SoundPlayer* player); -static void au_SEFCmd_08(SoundManager* manager, SoundPlayer* player); +static void au_SEFCmd_04_SetEnvelope(SoundManager* manager, SoundPlayer* player); +static void au_SEFCmd_05_CoarseTune(SoundManager* manager, SoundPlayer* player); +static void au_SEFCmd_06_FineTune(SoundManager* manager, SoundPlayer* player); +static void au_SEFCmd_07_WaitForEnd(SoundManager* manager, SoundPlayer* player); +static void au_SEFCmd_08_PitchSweep(SoundManager* manager, SoundPlayer* player); static void au_SEFCmd_09_StartLoop(SoundManager* manager, SoundPlayer* player); static void au_SEFCmd_0A_EndLoop(SoundManager* manager, SoundPlayer* player); -static void au_SEFCmd_0B(SoundManager* manager, SoundPlayer* player); -static void au_SEFCmd_0C(SoundManager* manager, SoundPlayer* player); -static void au_SEFCmd_0D(SoundManager* manager, SoundPlayer* player); -static void au_SEFCmd_0E(SoundManager* manager, SoundPlayer* player); -static void au_SEFCmd_0F(SoundManager* manager, SoundPlayer* player); +static void au_SEFCmd_0B_WaitForRelease(SoundManager* manager, SoundPlayer* player); +static void au_SEFCmd_0C_SetCurrentVolume(SoundManager* manager, SoundPlayer* player); +static void au_SEFCmd_0D_VolumeRamp(SoundManager* manager, SoundPlayer* player); +static void au_SEFCmd_0E_SetAlternativeSound(SoundManager* manager, SoundPlayer* player); +static void au_SEFCmd_0F_Stop(SoundManager* manager, SoundPlayer* player); static void au_SEFCmd_10_Jump(SoundManager* manager, SoundPlayer* player); static void au_SEFCmd_11_Restart(SoundManager* manager, SoundPlayer* player); static void au_SEFCmd_12_NOP(SoundManager* manager, SoundPlayer* player); -static void au_SEFCmd_SetRandomPitch(SoundManager* manager, SoundPlayer* player); -static void au_SEFCmd_SetRandomVelocity(SoundManager* manager, SoundPlayer* player); -static void au_SEFCmd_SetUnkA3(SoundManager* manager, SoundPlayer* player); -static void au_SEFCmd_16(SoundManager* manager, SoundPlayer* player); -static void au_SEFCmd_17(SoundManager* manager, SoundPlayer* player); -static void au_SEFCmd_18(SoundManager* manager, SoundPlayer* player); +static void au_SEFCmd_13_SetRandomPitch(SoundManager* manager, SoundPlayer* player); +static void au_SEFCmd_14_SetRandomVelocity(SoundManager* manager, SoundPlayer* player); +static void au_SEFCmd_15_SetUnkA3(SoundManager* manager, SoundPlayer* player); +static void au_SEFCmd_16_SetEnvelopePress(SoundManager* manager, SoundPlayer* player); +static void au_SEFCmd_17_PlaySound(SoundManager* manager, SoundPlayer* player); +static void au_SEFCmd_18_SetAlternativeVolume(SoundManager* manager, SoundPlayer* player); static s32 au_sfx_get_random_pitch(s32 arg0, s32 arg1, s32 arg2); static u8 au_sfx_get_random_vol(s32 arg0, s32 arg1, s32 arg2); static void au_sfx_reset_players(SoundManager* manager); enum SoundEffectParamFlags { - SFX_PARAM_MODE_0 = 0x00000000, - SFX_PARAM_MODE_1 = 0x00000001, - SFX_PARAM_MODE_2 = 0x00000002, - SFX_PARAM_FLAG_MODE = 0x00000003, + // 8 bytes: flags, instrument, volume, pan, reverb, pitch, randomPitch + SFX_PARAM_MODE_ADVANCED = 0x00000000, + // arbitrary sequence of commands + SFX_PARAM_MODE_SEQUENCE = 0x00000001, + // 4 bytes: flags, instrument, volume and randomPitch + SFX_PARAM_MODE_BASIC = 0x00000002, + SFX_PARAM_FLAG_MODE = 0x00000003, + // when flags below are set, these params can't be changed from api functions like sfx_play_sound_with_params SFX_PARAM_FLAG_VOLUME = 0x00000004, SFX_PARAM_FLAG_PAN = 0x00000008, SFX_PARAM_FLAG_PITCH = 0x00000010, - SFX_PARAM_FLAG_REVERB = 0x00000020 + // prevents from changing reverb amount via SetReverb command + SFX_PARAM_FLAG_FIXED_REVERB = 0x00000020 }; u16 DummyInstrumentPredictor[32] = { @@ -121,34 +126,67 @@ AlUnkGemini D_80078370[] = { } }; -//TODO type: InstrumentEffect -s32 D_80078378[] = { - 0x01000000, 0x00080012, 0x3C7F2D7F, 0x2B5F1D00, 0xFF002700, 0xFF000000 +// TODO: figure out how to make struct properly +EnvelopePreset SFXEnvelopeFast = { + .count = 1, + .offsets = { { 0x08, 0x12 } }, }; -//TODO type: InstrumentEffect -s32 D_80078390[] = { - 0x01000000, 0x0008001A, 0x3C7F237F, 0x3C3F2A1F, 0x2A0F2A07, 0x2A033600, 0xFF003600, 0xFF000000, +u8 SFXEnvelopeFastData[] = { + // press + ENV_TIME_290MS, 127, + ENV_TIME_900MS, 127, + ENV_TIME_1S, 95, + ENV_TIME_3S, 0, + ENV_CMD_END, 0, + // release + ENV_TIME_1400MS, 0, + ENV_CMD_END, 0 +}; + +EnvelopePreset SFXEnvelopeSlow = { + .count = 1, + .offsets = { { 0x08, 0x1A } }, +}; + +u8 SFXEnvelopeSlowData[] = { + // press + ENV_TIME_290MS, 127, + ENV_TIME_1800MS, 127, + ENV_TIME_290MS, 63, + ENV_TIME_1100MS, 31, + ENV_TIME_1100MS, 15, + ENV_TIME_1100MS, 7, + ENV_TIME_1100MS, 3, + ENV_TIME_450MS, 0, + ENV_CMD_END, 0, + // release + ENV_TIME_450MS, 0, + ENV_CMD_END, 0, +}; + +// looks like envelope data, but it's not aligned and not used +s32 D_800783B0[] = { 0x34337F26, 0x3F1600FF, 0x343B7F3B, 0x3FFF0000 }; -InstrumentEffect* D_800783C0[] = { - (InstrumentEffect*) &D_80078378, - (InstrumentEffect*) &D_80078390, - (InstrumentEffect*) &D_80078390, - (InstrumentEffect*) &D_80078390, - (InstrumentEffect*) &D_80078390, - (InstrumentEffect*) &D_80078390, - (InstrumentEffect*) &D_80078390, - (InstrumentEffect*) &D_80078390, - (InstrumentEffect*) &D_80078390, - (InstrumentEffect*) &D_80078390, - (InstrumentEffect*) &D_80078390, - (InstrumentEffect*) &D_80078390, - (InstrumentEffect*) &D_80078390, - (InstrumentEffect*) &D_80078390, - (InstrumentEffect*) &D_80078390, - (InstrumentEffect*) &D_80078390 +EnvelopePreset* SFXEnvelopePresets[] = { + &SFXEnvelopeFast, + &SFXEnvelopeSlow, + &SFXEnvelopeSlow, + &SFXEnvelopeSlow, + &SFXEnvelopeSlow, + &SFXEnvelopeSlow, + &SFXEnvelopeSlow, + &SFXEnvelopeSlow, + &SFXEnvelopeSlow, + &SFXEnvelopeSlow, + &SFXEnvelopeSlow, + &SFXEnvelopeSlow, + &SFXEnvelopeSlow, + &SFXEnvelopeSlow, + &SFXEnvelopeSlow, + &SFXEnvelopeSlow }; void (*SefCmdHandlers[])(SoundManager*, SoundPlayer*) = { @@ -156,27 +194,27 @@ void (*SefCmdHandlers[])(SoundManager*, SoundPlayer*) = { au_SEFCmd_01_SetPan, au_SEFCmd_02_SetInstrument, au_SEFCmd_03_SetReverb, - au_SEFCmd_04, - au_SEFCmd_05, - au_SEFCmd_06, - au_SEFCmd_07, - au_SEFCmd_08, + au_SEFCmd_04_SetEnvelope, + au_SEFCmd_05_CoarseTune, + au_SEFCmd_06_FineTune, + au_SEFCmd_07_WaitForEnd, + au_SEFCmd_08_PitchSweep, au_SEFCmd_09_StartLoop, au_SEFCmd_0A_EndLoop, - au_SEFCmd_0B, - au_SEFCmd_0C, - au_SEFCmd_0D, - au_SEFCmd_0E, - au_SEFCmd_0F, + au_SEFCmd_0B_WaitForRelease, + au_SEFCmd_0C_SetCurrentVolume, + au_SEFCmd_0D_VolumeRamp, + au_SEFCmd_0E_SetAlternativeSound, + au_SEFCmd_0F_Stop, au_SEFCmd_10_Jump, au_SEFCmd_11_Restart, au_SEFCmd_12_NOP, - au_SEFCmd_SetRandomPitch, - au_SEFCmd_SetRandomVelocity, - au_SEFCmd_SetUnkA3, - au_SEFCmd_16, - au_SEFCmd_17, - au_SEFCmd_18 + au_SEFCmd_13_SetRandomPitch, + au_SEFCmd_14_SetRandomVelocity, + au_SEFCmd_15_SetUnkA3, + au_SEFCmd_16_SetEnvelopePress, + au_SEFCmd_17_PlaySound, + au_SEFCmd_18_SetAlternativeVolume }; u8 BlankSEFData[] = { @@ -252,22 +290,30 @@ s16 D_80078530[] = { 0x0000, 0x0200, 0x0800, 0x1200, 0x2000, 0x3200, 0x4800, 0x6200, 0x8000 }; -// InstrumentEffect -s32 D_80078544[] = { - 0x01000000, 0x0008000C +// TODO: figure out how to make struct properly +EnvelopePreset DummyInstrumentEnvelope = { + .count = 1, + .offsets = { { 0x8, 0xC } }, // EnvelopePressDefault, EnvelopePressDefault }; -s32 D_8007854C[] = { - 0x3D7FFF00, 0x3400FF00 +u8 EnvelopePressDefault[] = { + ENV_TIME_280MS, 127, + ENV_CMD_END, 0 +}; + +u8 EnvelopeReleaseDefault[] = { + ENV_TIME_550MS, 0, + ENV_CMD_END, 0 +}; + +u8 EnvelopeReleaseDefaultFast[] = { + ENV_TIME_2UNITS, 0, + ENV_CMD_END, 0 }; // -------------------------------------------- // the following are only referenced in 28910_len_5090 -s32 D_80078554[] = { - 0x5C00FF00 -}; - s8 D_80078558[] = { 0x5E, 0x5D, 0x5C, 0x5B, 0x5A, 0x58, 0x56, 0x53, 0x51, 0x4F, 0x4A, 0x45, 0x40, 0x3B, 0x37, 0x35, @@ -289,22 +335,25 @@ u8 AmbientSoundIDtoMSEQFileIndex[] = { // -------------------------------------------- // the following are only referenced in audio/2d9a0_len_890 -s32 D_800785A0[] = { - 0x0393756C, 0x034736DE, 0x02FAE1DA, 0x02AEA34C, 0x02624E48, 0x0215F944, 0x01C9BAB6, 0x01A39034, - 0x017D65B2, 0x015751A6, 0x01312724, 0x0121E2F0, 0x01129EBC, 0x01035A88, 0x00F41654, 0x00E4D220, - 0x00D58DEC, 0x00C649B8, 0x00B70584, 0x00A7D7C6, 0x00989392, 0x00894F5E, 0x007A0B2A, 0x006AC6F6, - 0x005B82C2, 0x004C3E8E, 0x00449C74, 0x003CFA5A, 0x00355840, 0x002DB626, 0x0029F054, 0x0026140C, - 0x00224E3A, 0x001E71F2, 0x001CF41C, 0x001B7646, 0x0019E1FA, 0x00186424, 0x0016CFD8, 0x00155202, - 0x0013D42C, 0x00123FE0, 0x0010C20A, 0x000F2DBE, 0x000E7A0E, 0x000DAFE8, 0x000CE5C2, 0x000C3212, - 0x000B67EC, 0x000A9DC6, 0x0009EA16, 0x00091FF0, 0x000855CA, 0x00078BA4, 0x0006D7F4, 0x00060DCE, - 0x0005B3F6, 0x000543A8, 0x0004E9D0, 0x00048FF8, 0x0004630C, 0x00043620, 0x00040934, 0x0003F2BE, - 0x0003C5D2, 0x000398E6, 0x00038270, 0x00035584, 0x00032898, 0x0002FBAC, 0x0002E536, 0x0002B84A, - 0x00028B5E, 0x00025E72, 0x000247FC, 0x00021B10, 0x0001EE24, 0x0001C138, 0x0001AAC2, 0x00017DD6, - 0x00016760, 0x00013A74, 0x00010D88, 0x0000F712, 0x0000E09C, 0x0000CA26, 0x0000B3B0, 0x00009D3A, - 0x000086C4, 0x0000704E, 0x000059D8, 0x00004362, 0x00002CEC, 0x00001676, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000 +// convert seconds to microseconds and round to number multiple to 5750 +#define SEC(x) ((s32)(x * 1000000) / AU_5750 * AU_5750) + +s32 AuEnvelopeIntervals[] = { + SEC(60), SEC(55), SEC(50), SEC(45), SEC(40), SEC(35), SEC(30), SEC(27.5), SEC(25), SEC(22.5), + SEC(20), SEC(19), SEC(18), SEC(17), SEC(16), SEC(15), SEC(14), SEC(13), SEC(12), SEC(11), + SEC(10), SEC(9), SEC(8), SEC(7), SEC(6), SEC(5), SEC(4.5), SEC(4), SEC(3.5), SEC(3), + SEC(2.75), SEC(2.5), SEC(2.25), SEC(2), SEC(1.9), SEC(1.8), SEC(1.7), SEC(1.6), SEC(1.5), SEC(1.4), + SEC(1.3), SEC(1.2), SEC(1.1), SEC(1), SEC(0.95), SEC(0.9), SEC(0.85), SEC(0.8), SEC(0.75), SEC(0.7), + SEC(0.65), SEC(0.6), SEC(0.55), SEC(0.5), SEC(0.45), SEC(0.4), SEC(0.375), SEC(0.35), SEC(0.325), SEC(0.3), + SEC(0.29), SEC(0.28), SEC(0.27), SEC(0.26), SEC(0.25), SEC(0.24), SEC(0.23), SEC(0.22), SEC(0.21), SEC(0.2), + SEC(0.19), SEC(0.18), SEC(0.17), SEC(0.16), SEC(0.15), SEC(0.14), SEC(0.13), SEC(0.12), SEC(0.11), SEC(0.1), + 16 * AU_5750, 14 * AU_5750, 12 * AU_5750, 11 * AU_5750, 10 * AU_5750, + 9 * AU_5750, 8 * AU_5750, 7 * AU_5750, 6 * AU_5750, 5 * AU_5750, + 4 * AU_5750, 3 * AU_5750, 2 * AU_5750, 1 * AU_5750, 0, 0, 0, 0, 0, 0, }; +#undef SEC + // -------------------------------------------- // the following are only referenced in audio/2e230_len_2190 @@ -372,66 +421,66 @@ extern s32* AU_FX_CUSTOM_PARAMS[0]; // points to 80078290 extern void (*CurrentSeqCmdHandler)(BGMPlayer*, BGMPlayerTrack*); extern void (*CurrentSefCmdHandler)(SoundManager*, SoundPlayer*); -void au_sfx_init(SoundManager* manager, u8 priority, u8 reverbType, AuGlobals* globals, u8 arg4) { +void au_sfx_init(SoundManager* manager, u8 priority, u8 busId, AuGlobals* globals, u8 minVoiceIdx) { u32 i; - s32 c = 0x6A25E; + s32 c = 434782; manager->globals = globals; manager->nextUpdateStep = 312500; manager->nextUpdateCounter = c; manager->nextUpdateInterval = c; manager->priority = priority; - manager->defaultReverbType = reverbType; + manager->busId = busId; - if (arg4 > 16) { + if (minVoiceIdx > 16) { manager->sfxPlayerSelector = 16; } else { - manager->sfxPlayerSelector = arg4; + manager->sfxPlayerSelector = minVoiceIdx; } - manager->unk_5C = 0x8000; - manager->unk_B8 = 0x8000; + manager->busVolume = 0x8000; + manager->baseVolume = 0x8000; manager->playCounter = 0; manager->randomValue = 0; for (i = 0; i < ARRAY_COUNT(manager->players); i++) { - SoundPlayer* sub = &manager->players[i]; + SoundPlayer* player = &manager->players[i]; - sub->sefDataReadPos = NULL; - sub->sfxVolume = 0; - sub->delay = 0; - sub->playLength = 0; - sub->unk_92 = 0; - sub->unk_94 = 0; - sub->sfxPan = 0; - sub->reverb = 0; - sub->instrumentIndex = 0; - sub->unk_9E = 0; - sub->playVelocity = 0; - sub->unk_99 = 0; - sub->locatorB = 0; - sub->locatorC = 0; - sub->locatorD = 0; - sub->unk_7B = 0x40; - sub->unk_7C = 0; - sub->unk_7D = 0xB0; - sub->unk_7E = 0; - sub->unk_7F = 0; + player->sefDataReadPos = NULL; + player->sfxVolume = 0; + player->delay = 0; + player->playLength = 0; + player->coarseTune = 0; + player->fineTune = 0; + player->sfxPan = 0; + player->reverb = 0; + player->instrumentIndex = 0; + player->envelopePreset = 0; + player->playVelocity = 0; + player->exclusiveID = 0; + player->cmdList_mode2[0] = 0; + player->cmdList_mode2[1] = 0; + player->cmdList_mode2[2] = 0; + player->cmdList_mode2[3] = 64; // default pan + player->cmdList_mode2[4] = 0; + player->cmdList_mode2[5] = 0x80 + 48; // default tune, higher bit is meaningless + player->cmdList_mode2[6] = 0; + player->cmdList_mode2[7] = 0; } - for (i = 0; i < ARRAY_COUNT(manager->unk_90); i++) { - manager->unk_90[i].s32 = 0; + for (i = 0; i < ARRAY_COUNT(manager->bgmSounds); i++) { + manager->bgmSounds[i].s32 = 0; } - for (i = 0; i < ARRAY_COUNT(manager->unk_A0); i++) { - manager->unk_A0[i].unk_00 = 0; + for (i = 0; i < ARRAY_COUNT(manager->customCmdList); i++) { + manager->customCmdList[i].data[0] = 0; } - manager->unk_168 = 0; - func_8004BA54(manager, 0); + manager->resetPending = FALSE; + au_sfx_set_state(manager, SND_MANAGER_STATE_ENABLED); au_sfx_clear_queue(manager); au_fade_init(&manager->fadeInfo, 0, 0x7FFF, 0x7FFF); - func_80053A98(manager->defaultReverbType, manager->fadeInfo.currentVolume.u16, manager->unk_5C); + au_fade_set_volume(manager->busId, manager->fadeInfo.currentVolume.u16, manager->busVolume); manager->lastCustomEffectIdx = 0xFF; manager->customReverbParams[0] = CUSTOM_SMALL_ROOM_PARAMS; @@ -452,7 +501,7 @@ void au_sfx_init(SoundManager* manager, u8 priority, u8 reverbType, AuGlobals* g manager->customReverbAmounts[6] = 0x40; manager->customReverbAmounts[7] = 0x50; - func_8004B9E4(manager, 0); + au_sfx_set_reverb_type(manager, 0); } void au_sfx_load_groups_from_SEF(SoundManager* manager) { @@ -470,7 +519,7 @@ void au_sfx_load_groups_from_SEF(SoundManager* manager) { if (sefData->hasExtraSection == 1) { if (sefData->section2000 != 0) { - manager->soundsWithBit2000 = AU_FILE_RELATIVE(sefData, sefData->section2000); + manager->extraSounds = AU_FILE_RELATIVE(sefData, sefData->section2000); } } } @@ -503,7 +552,7 @@ void au_sfx_enqueue_event(SoundManager* manager, u32 soundID, s16 volume, s16 pi if (queueAmt < 16) { u32 queueNextPos = queuePos; - manager->soundQueue[queueNextPos].soundID = soundID & 0xBFFF; + manager->soundQueue[queueNextPos].soundID = soundID & (SOUND_ID_LOWER | SOUND_ID_STOP | SOUND_ID_ADJUST | SOUND_ID_TRIGGER_MASK); manager->soundQueue[queueNextPos].upperSoundID = ((soundID >> 0x10) & 0x3FF); manager->soundQueue[queueNextPos].volume = volume; manager->soundQueue[queueNextPos].pitchShift = pitchShift; @@ -525,13 +574,14 @@ void au_sfx_update_main(SoundManager* manager) { s32 count; manager->playCounter++; - if (manager->unk_168 != 0) { + if (manager->resetPending) { au_sfx_reset_players(manager); - manager->unk_168 = 0; + manager->resetPending = FALSE; } - for (i = 0; i < ARRAY_COUNT(manager->unk_90); i++) { - k = manager->unk_90[i].unk_0; + // sounds started by special seq command FF-05 + for (i = 0; i < ARRAY_COUNT(manager->bgmSounds); i++) { + k = manager->bgmSounds[i].unk_0; if (k == 0) { // do nothing } else if (k < 2) { @@ -543,13 +593,13 @@ void au_sfx_update_main(SoundManager* manager) { newEntry.soundID = unkData->sound1; newEntry.upperSoundID = 0; newEntry.pitchShift = 0; - if ((unkData->flags & 1) && (manager->unk_90[i].volume != 0)) { - newEntry.volume = (manager->unk_90[i].volume << 8) + 0xFF; + if ((unkData->flags & 1) && (manager->bgmSounds[i].volume != 0)) { + newEntry.volume = (manager->bgmSounds[i].volume << 8) + 0xFF; } else { newEntry.volume = 0; } newEntry.pan = 0; - func_8004BA74(manager, &newEntry, NULL); + au_sfx_load_sound(manager, &newEntry, NULL); break; } } @@ -559,22 +609,23 @@ void au_sfx_update_main(SoundManager* manager) { newEntry.volume = 0; newEntry.pitchShift = 0; newEntry.pan = 0; - func_8004BA74(manager, &newEntry, NULL); + au_sfx_load_sound(manager, &newEntry, NULL); } } - manager->unk_90[i].s32 = 0; + manager->bgmSounds[i].s32 = 0; } - for (i = 0; i < ARRAY_COUNT(manager->unk_A0); i++) { - if (manager->unk_A0[i].unk_00 != 0) { + // sounds started from sef command 17 + for (i = 0; i < ARRAY_COUNT(manager->customCmdList); i++) { + if (manager->customCmdList[i].data[0] != 0) { newEntry.soundID = 1; newEntry.upperSoundID = 0; newEntry.volume = 0; newEntry.pitchShift = 0; newEntry.pan = 0; - func_8004BA74(manager, &newEntry, &manager->unk_A0[i]); + au_sfx_load_sound(manager, &newEntry, &manager->customCmdList[i]); } - manager->unk_A0[i].unk_00 = 0; + manager->customCmdList[i].data[0] = 0; } count = manager->sfxQueueNextPos - manager->sfxQueuePosOffset; @@ -585,16 +636,16 @@ void au_sfx_update_main(SoundManager* manager) { if (count > 0 && count < ARRAY_COUNT(manager->soundQueue)) { for (i = 0; i < count; i++) { sfxEntry = &manager->soundQueue[j]; - if (sfxEntry->soundID & 0x23FF) { - if (sfxEntry->soundID & 0x8000) { + if (sfxEntry->soundID & SOUND_ID_LOWER) { + if (sfxEntry->soundID & SOUND_ID_STOP) { au_sfx_stop_by_id(manager, sfxEntry->soundID); - } else if (!(sfxEntry->soundID & 0x1C00)) { - func_8004BA74(manager, sfxEntry, NULL); + } else if (!(sfxEntry->soundID & (SOUND_ID_ADJUST | SOUND_ID_TRIGGER_MASK))) { + au_sfx_load_sound(manager, sfxEntry, NULL); } else { - if (sfxEntry->soundID & 0xC00) { - au_sfx_set_bits_C00(manager, sfxEntry->soundID); + if (sfxEntry->soundID & SOUND_ID_TRIGGER_MASK) { + au_sfx_set_triggers(manager, sfxEntry->soundID); } - if (sfxEntry->soundID & 0x1000) { + if (sfxEntry->soundID & SOUND_ID_ADJUST) { au_sfx_set_modifiers(manager, sfxEntry); } } @@ -610,15 +661,16 @@ void au_sfx_update_main(SoundManager* manager) { } } -s32 func_8004B9E4(SoundManager* manager, s32 arg1) { +// also affects ambience because it uses same fx bus +s32 au_sfx_set_reverb_type(SoundManager* manager, s32 arg1) { s32 customIdx = (u8) arg1; if (customIdx != 0xF0) { if (customIdx < ARRAY_COUNT(manager->customReverbParams)) { if (manager->lastCustomEffectIdx != customIdx) { manager->lastCustomEffectIdx = customIdx; - manager->globals->effectChanges[1].type = AU_FX_CUSTOM_0; - manager->globals->effectChanges[1].changed = TRUE; + manager->globals->effectChanges[FX_BUS_SOUND].type = AU_FX_CUSTOM_0; + manager->globals->effectChanges[FX_BUS_SOUND].changed = TRUE; AU_FX_CUSTOM_PARAMS[0] = manager->customReverbParams[customIdx]; } manager->defaultReverbAmt = manager->customReverbAmounts[customIdx]; @@ -630,42 +682,43 @@ s32 func_8004B9E4(SoundManager* manager, s32 arg1) { return manager->lastCustomEffectIdx; } -void func_8004BA54(SoundManager* manager, s32 arg1) { - if (arg1 == 0) { - manager->unk_C0 = 0; - } else if (arg1 == 1) { - manager->unk_C0 = 1; +void au_sfx_set_state(SoundManager* manager, s32 state) { + if (state == SND_MANAGER_STATE_ENABLED) { + manager->state = SND_MANAGER_STATE_ENABLED; + } else if (state == SND_MANAGER_STATE_DISABLED) { + manager->state = SND_MANAGER_STATE_DISABLED; } } -void func_8004BA74(SoundManager* manager, SoundSFXEntry* entry, SoundManagerA0* arg2) { +void au_sfx_load_sound(SoundManager* manager, SoundSFXEntry* entry, SoundManagerCustomCmdList* customSEF) { SoundPlayer* player; s32 playerIndex; u16* cmdList; - s32 s1; + s32 trackCount; s32 cond = FALSE; - u32 unk_99; + u32 exclusiveID; s32 sectionIndex; u16 soundInfo; - u32 unk_98, s0, s3; + u32 priority, polyphonyMode, useSpecificPlayerMode; s32 v1; s32* normalSounds; - #define NEXT_CMD s1--; if (s1 <= 0 ) { break; } cmdList += 2; + #define NEXT_CMD trackCount--; if (trackCount <= 0 ) { break; } cmdList += 2; u32 soundIndex = (entry->soundID - 1) & 0xFF; - u16 soundIDMasked = entry->soundID & SOUND_ID_LOWER; + u16 soundIDLower = entry->soundID & SOUND_ID_LOWER; u16 soundID = entry->soundID; if (soundID & 0x2000) { + // sound from extra section soundIndex = (entry->soundID - 1) & 0x1FF; if (soundIndex < 0x140) { - cmdList = (u16*)&manager->soundsWithBit2000[soundIndex]; + cmdList = (u16*)&manager->extraSounds[soundIndex]; if (*cmdList != 0) { // check if any player is playing this sound for (playerIndex = 7; playerIndex >= 0; playerIndex--) { player = &manager->players[playerIndex]; - if (player->currentSoundID == soundIDMasked) { + if (player->currentSoundID == soundIDLower) { cond = TRUE; break; } @@ -683,16 +736,16 @@ void func_8004BA74(SoundManager* manager, SoundSFXEntry* entry, SoundManagerA0* } if (cond) { - func_8004C0E4(manager, player, (s8*)cmdList, entry, 0, 0); + au_sfx_play_sound(manager, player, (s8*)cmdList, entry, 0, 0); } } } } else { if (soundIndex >= 0xC0) { - if (arg2 != NULL) { - cmdList = (u16*)arg2; + if (customSEF != NULL) { + cmdList = (u16*)customSEF; } else { - sectionIndex = ((soundIDMasked - 1) >> 8) + 4; + sectionIndex = ((soundIDLower - 1) >> 8) + 4; normalSounds = manager->normalSounds[sectionIndex]; v1 = soundIndex - 0xC0; cmdList = (u16*)&manager->normalSounds[sectionIndex][v1]; @@ -702,7 +755,7 @@ void func_8004BA74(SoundManager* manager, SoundSFXEntry* entry, SoundManagerA0* // check if any player is playing this sound for (playerIndex = 7; playerIndex >= 0; playerIndex--) { player = &manager->players[playerIndex]; - if (player->currentSoundID == soundIDMasked) { + if (player->currentSoundID == soundIDLower) { cond = TRUE; break; } @@ -720,12 +773,12 @@ void func_8004BA74(SoundManager* manager, SoundSFXEntry* entry, SoundManagerA0* } if (cond) { - func_8004C0E4(manager, player, (u8*)cmdList, entry, 0, 0); + au_sfx_play_sound(manager, player, (u8*)cmdList, entry, 0, 0); } } } else { - if (arg2 != NULL) { - cmdList = (u16*)arg2; + if (customSEF != NULL) { + cmdList = (u16*)customSEF; } else { sectionIndex = ((soundID) >> 8) & 3; cmdList = (u16*)&manager->normalSounds[sectionIndex][soundIndex]; @@ -734,12 +787,12 @@ void func_8004BA74(SoundManager* manager, SoundSFXEntry* entry, SoundManagerA0* if (*cmdList != 0) { soundInfo = cmdList[1]; - unk_98 = (soundInfo & 0x300) >> 8; // bits 8, 9 - s0 = (soundInfo & 0x60) >> 5; // bits 5, 6 - s3 = soundInfo; - s3 = (s3 & 0x80) >> 7; // bit 7 + priority = (soundInfo & 0x300) >> 8; // bits 8, 9 + polyphonyMode = (soundInfo & 0x60) >> 5; // bits 5, 6, + useSpecificPlayerMode = soundInfo; + useSpecificPlayerMode = (useSpecificPlayerMode & 0x80) >> 7; // bit 7 - if (s0 == 0) { + if (polyphonyMode == 0) { if (entry->upperSoundID != 0) { for (playerIndex = 0; playerIndex < 8; playerIndex++) { player = &manager->players[playerIndex]; @@ -750,21 +803,23 @@ void func_8004BA74(SoundManager* manager, SoundSFXEntry* entry, SoundManagerA0* } } - if (s3 == 0) { + if (useSpecificPlayerMode == 0) { if (!cond) { playerIndex = soundInfo & 0x7; player = &manager->players[playerIndex]; - if (player->sefDataReadPos == NULL || unk_98 >= player->unk_98) { - func_8004C0E4(manager, player, AU_FILE_RELATIVE(manager->sefData, *cmdList), entry, unk_98, 0); + if (player->sefDataReadPos == NULL || priority >= player->priority) { + au_sfx_play_sound(manager, player, AU_FILE_RELATIVE(manager->sefData, *cmdList), entry, priority, 0); } return; } } if (!cond) { + // lower 4 bits of soundInfo: max playerIndex + // check if any player is playing this sound for (playerIndex = soundInfo & 0x7; playerIndex >= 0; playerIndex--) { player = &manager->players[playerIndex]; - if (player->currentSoundID == soundIDMasked) { + if (player->currentSoundID == soundIDLower) { cond = TRUE; break; } @@ -772,6 +827,7 @@ void func_8004BA74(SoundManager* manager, SoundSFXEntry* entry, SoundManagerA0* } if (!cond) { + // find free player for (playerIndex = soundInfo & 0x7; playerIndex >= 0; playerIndex--) { player = &manager->players[playerIndex]; if (player->sefDataReadPos == NULL) { @@ -782,9 +838,10 @@ void func_8004BA74(SoundManager* manager, SoundSFXEntry* entry, SoundManagerA0* } if (!cond) { + // if there is no free player try stealing one with lower priority for (playerIndex = soundInfo & 0x7; playerIndex >= 0; playerIndex--) { player = &manager->players[playerIndex]; - if (player->unk_98 < unk_98) { + if (player->priority < priority) { cond = TRUE; break; } @@ -794,31 +851,32 @@ void func_8004BA74(SoundManager* manager, SoundSFXEntry* entry, SoundManagerA0* if (!cond) { playerIndex = soundInfo & 0x7; player = &manager->players[playerIndex]; - if (player->unk_98 <= unk_98) { + if (player->priority <= priority) { cond = TRUE; } } if (cond) { - func_8004C0E4(manager, player, AU_FILE_RELATIVE(manager->sefData, *cmdList), entry, unk_98, 0); + au_sfx_play_sound(manager, player, AU_FILE_RELATIVE(manager->sefData, *cmdList), entry, priority, 0); } } else { cmdList = AU_FILE_RELATIVE(manager->sefData, *cmdList); - unk_99 = (soundInfo & 0x1800) >> 11; // bits 11, 12, 13 - if (unk_99 != 0) { - func_8004C300(manager, unk_99); + exclusiveID = (soundInfo & 0x1800) >> 11; // bits 11, 12 + if (exclusiveID != 0) { + au_sfx_stop_by_exlusive_id(manager, exclusiveID); } else { au_sfx_stop_by_id(manager, entry->soundID); } - s1 = 2 << (s0 - 1); // 2 or 4 or 8 + trackCount = 2 << (polyphonyMode - 1); // 2 or 4 or 8 - if (s3 != 0) { + if (useSpecificPlayerMode != 0) { for (playerIndex = 7; playerIndex >= 0; playerIndex--) { if (*cmdList != 0) { + // first check the players that were stopped just now player = &manager->players[playerIndex]; if (player->sefDataReadPos == BlankSEFData) { - func_8004C0E4(manager, player, AU_FILE_RELATIVE(manager->sefData, *cmdList), entry, unk_98, unk_99); + au_sfx_play_sound(manager, player, AU_FILE_RELATIVE(manager->sefData, *cmdList), entry, priority, exclusiveID); NEXT_CMD; } } else { @@ -827,12 +885,13 @@ void func_8004BA74(SoundManager* manager, SoundSFXEntry* entry, SoundManagerA0* } - if (s1 != 0) { + if (trackCount != 0) { for (playerIndex = 7; playerIndex >= 0;){ if (*cmdList != 0) { + // then check any free players player = &manager->players[playerIndex]; if (player->sefDataReadPos == NULL) { - func_8004C0E4(manager, player, AU_FILE_RELATIVE(manager->sefData, *cmdList), entry, unk_98, unk_99); + au_sfx_play_sound(manager, player, AU_FILE_RELATIVE(manager->sefData, *cmdList), entry, priority, exclusiveID); NEXT_CMD; } playerIndex--; @@ -842,12 +901,13 @@ void func_8004BA74(SoundManager* manager, SoundSFXEntry* entry, SoundManagerA0* } } - if (s1 != 0) { + if (trackCount != 0) { for (playerIndex = 7; playerIndex >= 0; playerIndex--) { - if (*cmdList) { + if (*cmdList != 0) { + // then try to steal player = &manager->players[playerIndex]; - if (unk_99 > player->unk_99 && unk_98 >= player->unk_98) { - func_8004C0E4(manager, player, AU_FILE_RELATIVE(manager->sefData, *cmdList), entry, unk_98, unk_99); + if (exclusiveID > player->exclusiveID && priority >= player->priority) { + au_sfx_play_sound(manager, player, AU_FILE_RELATIVE(manager->sefData, *cmdList), entry, priority, exclusiveID); NEXT_CMD; } } else { @@ -857,14 +917,14 @@ void func_8004BA74(SoundManager* manager, SoundSFXEntry* entry, SoundManagerA0* } } else { s32 i; - for (i = 0; i < s1; i++) { + for (i = 0; i < trackCount; i++) { if (*cmdList != 0) { soundInfo = cmdList[1]; playerIndex = soundInfo & 7; player = &manager->players[playerIndex]; - unk_98 = (soundInfo & 0x300) >> 8; - if (player->sefDataReadPos == NULL || unk_98 >= player->unk_98) { - func_8004C0E4(manager, player, AU_FILE_RELATIVE(manager->sefData, *cmdList), entry, unk_98, unk_99); + priority = (soundInfo & 0x300) >> 8; // bits 8, 9 + if (player->sefDataReadPos == NULL || priority >= player->priority) { + au_sfx_play_sound(manager, player, AU_FILE_RELATIVE(manager->sefData, *cmdList), entry, priority, exclusiveID); } cmdList += 2; } @@ -877,28 +937,28 @@ void func_8004BA74(SoundManager* manager, SoundSFXEntry* entry, SoundManagerA0* #undef NEXT_CMD } -static void func_8004C0E4(SoundManager* manager, SoundPlayer* player, s8* readPos, SoundSFXEntry* sfxEntry, s32 arg4, s32 arg5) { - if (manager->unk_C0 == 0) { +static void au_sfx_play_sound(SoundManager* manager, SoundPlayer* player, s8* readPos, SoundSFXEntry* sfxEntry, s32 priority, s32 exclusiveID) { + if (manager->state == SND_MANAGER_STATE_ENABLED) { player->sefDataReadPos = readPos; player->sefReadStart = readPos; player->sfxInstrumentRef = manager->globals->defaultInstrument; player->sfxPan = 0x40; player->sfxVolume = 0x7FFF; - player->unk_5E = 0x7FFF; + player->alternativeVolume = 0x7FFF; player->reverb = 0; player->instrumentIndex = 0; - player->unk_9E = 0; + player->envelopePreset = 0; player->playVelocity = 0x7F; - player->unk_92 = 0; - player->unk_94 = 0; + player->coarseTune = 0; + player->fineTune = 0; player->loopStartPos = NULL; player->loopIterCount = 0; player->delay = 1; player->playLength = 0; player->currentSoundID = sfxEntry->soundID & SOUND_ID_LOWER; - player->unk_98 = arg4; - player->unk_99 = arg5; - player->unk_18 = 0; + player->priority = priority; + player->exclusiveID = exclusiveID; + player->envelopCustomPressProfile = NULL; player->changed.all = 0; player->unk_A0 = 0; player->randomPitch = 0; @@ -912,39 +972,40 @@ static void func_8004C0E4(SoundManager* manager, SoundPlayer* player, s8* readPo player->tuneLerp.time = 0; player->tuneLerp.step = 0; player->tuneLerp.goal = 0; - player->unk_80 = NULL; - player->unk_84 = 0; - player->soundC00 = 0; + player->alternativeDataPos = NULL; + player->alternativeType = 0; + player->triggers = 0; player->sfxParamsFlags = *player->sefDataReadPos++; switch (player->sfxParamsFlags & SFX_PARAM_FLAG_MODE) { - case SFX_PARAM_MODE_0: - player->unk_A9 = 1; + case SFX_PARAM_MODE_ADVANCED: + player->state = SND_PLAYER_STATE_INIT; break; - case SFX_PARAM_MODE_1: - player->unk_A9 = 1; + case SFX_PARAM_MODE_SEQUENCE: + player->state = SND_PLAYER_STATE_INIT; break; - case SFX_PARAM_MODE_2: - player->sfxParamsFlags &= ~SFX_PARAM_FLAG_MODE; - player->unk_A9 = 1; - player->locatorB = player->sefDataReadPos[0]; - player->locatorC = player->sefDataReadPos[1]; - player->locatorD = (player->sefDataReadPos[2] >> 1) | 3; - player->unk_7E = player->sefDataReadPos[2] & 7; - player->sefDataReadPos = &player->locatorB; + case SFX_PARAM_MODE_BASIC: + player->sfxParamsFlags = (player->sfxParamsFlags & ~SFX_PARAM_FLAG_MODE) | SFX_PARAM_MODE_ADVANCED; + player->state = SND_PLAYER_STATE_INIT; + player->cmdList_mode2[0] = player->sefDataReadPos[0]; // instrument bank + player->cmdList_mode2[1] = player->sefDataReadPos[1]; // instrument patch + // volume and random pitch may overlap + player->cmdList_mode2[2] = (player->sefDataReadPos[2] >> 1) | 3; // volume + player->cmdList_mode2[6] = player->sefDataReadPos[2] & 7; // random pitch + player->sefDataReadPos = player->cmdList_mode2; break; } au_sfx_set_player_modifiers(player, sfxEntry); } } -static void au_sfx_set_bits_C00(SoundManager* manager, u32 soundID) { - s32 soundUpper = (soundID & SOUND_ID_MID) >> 0xA; +static void au_sfx_set_triggers(SoundManager* manager, u32 soundID) { + s32 triggers = (soundID & SOUND_ID_TRIGGER_MASK) >> 0xA; s32 i; for (i = 0; i < ARRAY_COUNT(manager->players); i++) { SoundPlayer* player = &manager->players[i]; if (player->currentSoundID == (soundID & SOUND_ID_LOWER)) { - player->soundC00 = soundUpper; + player->triggers = triggers; } } } @@ -956,29 +1017,29 @@ static void au_sfx_stop_by_id(SoundManager* manager, u32 soundID) { SoundPlayer* player = &manager->players[i]; if (player->currentSoundID == (soundID & SOUND_ID_LOWER)) { player->sefDataReadPos = BlankSEFData; - player->unk_80 = NULL; - player->sfxParamsFlags = SFX_PARAM_MODE_1; - player->unk_A9 = 0; + player->alternativeDataPos = NULL; + player->sfxParamsFlags = SFX_PARAM_MODE_SEQUENCE; + player->state = SND_PLAYER_STATE_CONTINUE; player->delay = 1; - player->unk_98 = 0; - player->unk_99 = 0; + player->priority = 0; + player->exclusiveID = 0; } } } -static void func_8004C300(SoundManager* manager, u32 soundID) { +static void au_sfx_stop_by_exlusive_id(SoundManager* manager, u32 exclusiveID) { s32 i; for (i = 0; i < ARRAY_COUNT(manager->players); i++) { SoundPlayer* player = &manager->players[i]; - if (soundID == player->unk_99) { + if (exclusiveID == player->exclusiveID) { player->sefDataReadPos = BlankSEFData; - player->unk_80 = NULL; - player->sfxParamsFlags = SFX_PARAM_MODE_1; - player->unk_A9 = 0; + player->alternativeDataPos = NULL; + player->sfxParamsFlags = SFX_PARAM_MODE_SEQUENCE; + player->state = SND_PLAYER_STATE_CONTINUE; player->delay = 1; - player->unk_98 = 0; - player->unk_99 = 0; + player->priority = 0; + player->exclusiveID = 0; } } } @@ -1017,8 +1078,8 @@ static void au_sfx_set_player_modifiers(SoundPlayer* player, SoundSFXEntry* sfxE } s16 au_sfx_manager_update(SoundManager* manager) { - SoundPlayer* sndPlayer; - AlUnkVoice* voice; + SoundPlayer* player; + AuVoice* voice; u32 start; u8 end; u8 i; @@ -1028,51 +1089,51 @@ s16 au_sfx_manager_update(SoundManager* manager) { start = manager->sfxPlayerSelector; for (i = start, end = start + 8; i < end; i++) { - sndPlayer = &manager->players[i - manager->sfxPlayerSelector]; - if (sndPlayer->sefDataReadPos != NULL) { + player = &manager->players[i - manager->sfxPlayerSelector]; + if (player->sefDataReadPos != NULL) { voice = &manager->globals->voices[i]; manager->currentVoice = voice; if (voice->priority <= manager->priority) { - manager->unk_BF = i; - switch (sndPlayer->sfxParamsFlags & SFX_PARAM_FLAG_MODE) { - case SFX_PARAM_MODE_0: - au_sfx_update_mode_0(manager, sndPlayer, voice, i); + manager->currentVoiceIndex = i; + switch (player->sfxParamsFlags & SFX_PARAM_FLAG_MODE) { + case SFX_PARAM_MODE_ADVANCED: + au_sfx_update_basic(manager, player, voice, i); break; - case SFX_PARAM_MODE_1: - au_sfx_update_mode_1(manager, sndPlayer, voice, i); + case SFX_PARAM_MODE_SEQUENCE: + au_sfx_update_sequence(manager, player, voice, i); break; - case SFX_PARAM_MODE_2: + case SFX_PARAM_MODE_BASIC: break; } } else { - sndPlayer->sefDataReadPos = NULL; - sndPlayer->currentSoundID = 0; - sndPlayer->unk_98 = 0; + player->sefDataReadPos = NULL; + player->currentSoundID = 0; + player->priority = 0; } } } return 0; } -static void au_sfx_update_mode_0(SoundManager* manager, SoundPlayer* player, AlUnkVoice* voice, u8 index) { +static void au_sfx_update_basic(SoundManager* manager, SoundPlayer* player, AuVoice* voice, u8 voiceIdx) { s16 volume; s32 tune; s32 pan; s32 a; s32 b; - switch (player->unk_A9) { - case 0: + switch (player->state) { + case SND_PLAYER_STATE_CONTINUE: if (voice->priority != manager->priority) { player->sefDataReadPos = NULL; player->currentSoundID = 0; - player->unk_98 = 0; + player->priority = 0; } else { if (!(player->sfxParamsFlags & SFX_PARAM_FLAG_PITCH)) { player->pitchRatio = au_compute_pitch_ratio( ((player->tuneLerp.current >> 0x10) - player->sfxInstrumentRef->keyBase) + player->masterPitchShift) * player->sfxInstrumentRef->pitchRatio; if (voice->pitchRatio != player->pitchRatio) { - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_PITCH; + voice->syncFlags |= AU_VOICE_SYNC_FLAG_PITCH; voice->pitchRatio = player->pitchRatio; } } @@ -1084,23 +1145,23 @@ static void au_sfx_update_mode_0(SoundManager* manager, SoundPlayer* player, AlU } if (voice->pan != pan) { voice->pan = pan; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_10; + voice->syncFlags |= AU_VOICE_SYNC_FLAG_PAN_FXMIX; } volume = au_sfx_get_scaled_volume(manager, player); - if (voice->adjustedVolume != volume) { - voice->adjustedVolume = volume; - voice->unk_flags_3D |= AU_VOICE_3D_FLAG_VOL_CHANGED; + if (voice->clientVolume != volume) { + voice->clientVolume = volume; + voice->envelopeFlags |= AU_VOICE_ENV_FLAG_VOL_CHANGED; } } break; - case 1: - au_SEFCmd_02_SetInstrument(manager, player); - au_SEFCmd_00_SetVolume(manager, player); - au_SEFCmd_01_SetPan(manager, player); - au_SEFCmd_03_SetReverb(manager, player); - a = (*player->sefDataReadPos++ & 0x7F); - b = (*player->sefDataReadPos & 0xF) << 3; + case SND_PLAYER_STATE_INIT: + au_SEFCmd_02_SetInstrument(manager, player); // 2 bytes + au_SEFCmd_00_SetVolume(manager, player); // 1 byte + au_SEFCmd_01_SetPan(manager, player); // 1 byte + au_SEFCmd_03_SetReverb(manager, player); // 1 byte + a = (*player->sefDataReadPos++ & 0x7F); // 1 byte + b = (*player->sefDataReadPos & 0xF) << 3; // 1 byte tune = a * 100; player->randomPitch = b; if (player->randomPitch != 0) { @@ -1115,30 +1176,30 @@ static void au_sfx_update_mode_0(SoundManager* manager, SoundPlayer* player, AlU } player->pitchRatio = au_compute_pitch_ratio(tune) * player->sfxInstrumentRef->pitchRatio; if (voice->priority <= manager->priority) { - func_80053888(voice, index); + au_reset_nonfree_voice(voice, voiceIdx); if (!(player->sfxParamsFlags & SFX_PARAM_FLAG_PAN) && player->masterPan != 0) { voice->pan = player->masterPan; } else { voice->pan = player->sfxPan; } - voice->reverbAmt = player->reverb; - voice->adjustedVolume = au_sfx_get_scaled_volume(manager, player); - voice->unk_14.unk_00 = player->unk_10.unk_00; - voice->unk_14.unk_04 = player->unk_10.unk_04; + voice->reverb = player->reverb; + voice->clientVolume = au_sfx_get_scaled_volume(manager, player); + voice->envelope.cmdListPress = player->envelope.cmdListPress; + voice->envelope.cmdListRelease = player->envelope.cmdListRelease; voice->instrument = player->sfxInstrumentRef; voice->pitchRatio = player->pitchRatio; - voice->unk_flags_43 = AU_VOICE_SYNC_FLAG_ALL; + voice->syncFlags = AU_VOICE_SYNC_FLAG_ALL; voice->priority = manager->priority; - voice->priorityCopy = voice->priority; - voice->reverbType = manager->defaultReverbType; + voice->clientPriority = voice->priority; + voice->busId = manager->busId; } - player->unk_A9 = 0; + player->state = SND_PLAYER_STATE_CONTINUE; break; default: player->sefDataReadPos = NULL; player->currentSoundID = 0; - player->unk_98 = 0; + player->priority = 0; break; } } @@ -1146,55 +1207,55 @@ static void au_sfx_update_mode_0(SoundManager* manager, SoundPlayer* player, AlU static s16 au_sfx_get_scaled_volume(SoundManager* manager, SoundPlayer* player) { s32 outVolume; - outVolume = (manager->unk_B8 * player->sfxVolume) >> 0xF; + outVolume = (manager->baseVolume * player->sfxVolume) >> 15; if (!(player->sfxParamsFlags & SFX_PARAM_FLAG_VOLUME) && (player->masterVolume != 0)) { - outVolume = (outVolume * player->masterVolume) >> 0xF; + outVolume = (outVolume * player->masterVolume) >> 15; } return outVolume; } -static void au_sfx_update_mode_1(SoundManager* manager, SoundPlayer* player, AlUnkVoice* voice, u8 arg3) { +static void au_sfx_update_sequence(SoundManager* manager, SoundPlayer* player, AuVoice* voice, u8 voiceIdx) { s32* var_v0_3; s32 pitchShift; s32 temp_a0; u8 opcode; u32 playLength; - s32 var_s3; + s32 startedNewVoice; void (**CmdHandlers)(SoundManager*, SoundPlayer*); - var_s3 = FALSE; - if (player->unk_A9 == 1) { - player->unk_A9 = 0; + startedNewVoice = FALSE; + if (player->state == SND_PLAYER_STATE_INIT) { + player->state = SND_PLAYER_STATE_CONTINUE; if (voice->priority == manager->priority) { - au_reset_voice(voice, arg3); + au_reset_voice(voice, voiceIdx); } } - if (player->unk_80 != NULL) { - if (player->soundC00 == 1) { - player->sefDataReadPos = player->unk_80; - player->unk_80 = NULL; - player->soundC00 = 0; + if (player->alternativeDataPos != NULL) { + if (player->triggers == 1) { + player->sefDataReadPos = player->alternativeDataPos; + player->alternativeDataPos = NULL; + player->triggers = 0; player->delay = 1; } } - if (player->soundC00 == 2) { - player->changed.volume = 1; - player->sfxVolume = player->unk_5E; + if (player->triggers == 2) { + player->changed.volume = TRUE; + player->sfxVolume = player->alternativeVolume; } player->delay--; - while ((player->delay) == 0) { + while (player->delay == 0) { CmdHandlers = SefCmdHandlers; opcode = *player->sefDataReadPos++; if (opcode < 0x80) { if (opcode == 0) { if (voice->priority == manager->priority) { - au_reset_voice(voice, arg3); + au_reset_voice(voice, voiceIdx); } player->sefDataReadPos = NULL; player->currentSoundID = 0; - player->unk_98 = 0; - player->unk_99 = 0; + player->priority = 0; + player->exclusiveID = 0; return; } if (opcode >= 0x78) { @@ -1229,31 +1290,31 @@ static void au_sfx_update_mode_1(SoundManager* manager, SoundPlayer* player, AlU player->playLength = playLength; if (voice->priority <= manager->priority) { - func_80053888(voice, arg3); + au_reset_nonfree_voice(voice, voiceIdx); if ((player->sfxParamsFlags & SFX_PARAM_FLAG_PAN) || (player->masterPan == 0)) { voice->pan = player->sfxPan; } else { voice->pan = player->masterPan; } - voice->reverbAmt = player->reverb; + voice->reverb = player->reverb; snd_set_voice_volume(voice, manager, player); - if (player->unk_18 == 0) { - voice->unk_14.unk_00 = player->unk_10.unk_00; - voice->unk_14.unk_04 = player->unk_10.unk_04; + if (player->envelopCustomPressProfile == NULL) { + voice->envelope.cmdListPress = player->envelope.cmdListPress; + voice->envelope.cmdListRelease = player->envelope.cmdListRelease; } else { - voice->unk_14.unk_00 = player->unk_18; - voice->unk_14.unk_04 = player->unk_10.unk_04; + voice->envelope.cmdListPress = player->envelopCustomPressProfile; + voice->envelope.cmdListRelease = player->envelope.cmdListRelease; } voice->instrument = player->sfxInstrumentRef; - voice->reverbType = manager->defaultReverbType; + voice->busId = manager->busId; voice->priority = manager->priority; - voice->unk_flags_43 = AU_VOICE_SYNC_FLAG_ALL; - var_s3 = TRUE; - voice->priorityCopy = manager->priority; - player->changed.tune = 1; + voice->syncFlags = AU_VOICE_SYNC_FLAG_ALL; + startedNewVoice = TRUE; + voice->clientPriority = manager->priority; + player->changed.tune = TRUE; } } else { s32 index = opcode - 0xE0; @@ -1272,11 +1333,11 @@ static void au_sfx_update_mode_1(SoundManager* manager, SoundPlayer* player, AlU player->changed.volume = TRUE; } - if (!var_s3) { + if (!startedNewVoice) { if (player->playLength != 0) { player->playLength--; if ((player->playLength == 0) && (voice->priority == manager->priority)) { - voice->unk_flags_3D |= AU_VOICE_3D_FLAG_10; + voice->envelopeFlags |= AU_VOICE_ENV_FLAG_KEY_RELEASED; } } if (player->tuneLerp.time != 0) { @@ -1294,43 +1355,43 @@ static void au_sfx_update_mode_1(SoundManager* manager, SoundPlayer* player, AlU } else { voice->pan = player->masterPan; } - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_10; - voice->reverbAmt = player->reverb; + voice->syncFlags |= AU_VOICE_SYNC_FLAG_PAN_FXMIX; + voice->reverb = player->reverb; } } - if (player->changed.volume && (voice->priority == manager->priority)) { + if (player->changed.volume && voice->priority == manager->priority) { snd_set_voice_volume(voice, manager, player); - voice->unk_flags_3D |= AU_VOICE_3D_FLAG_VOL_CHANGED; + voice->envelopeFlags |= AU_VOICE_ENV_FLAG_VOL_CHANGED; } if (player->changed.tune) { - f32 adjustedSampleRate; + f32 adjustedPitchRatio; if (player->sfxParamsFlags & SFX_PARAM_FLAG_PITCH) { - pitchShift = (player->unk_92 + (s16)(player->tuneLerp.current >> 0x10)) - player->sfxInstrumentRef->keyBase; - adjustedSampleRate = au_compute_pitch_ratio(pitchShift + player->unk_94) * player->sfxInstrumentRef->pitchRatio; - player->pitchRatio = adjustedSampleRate; + pitchShift = (player->coarseTune + (s16)(player->tuneLerp.current >> 0x10)) - player->sfxInstrumentRef->keyBase; + adjustedPitchRatio = au_compute_pitch_ratio(pitchShift + player->fineTune) * player->sfxInstrumentRef->pitchRatio; + player->pitchRatio = adjustedPitchRatio; } else { - pitchShift = ((player->unk_92 + (s16)(player->tuneLerp.current >> 0x10)) - player->sfxInstrumentRef->keyBase) + player->unk_94; - adjustedSampleRate = au_compute_pitch_ratio(pitchShift + player->masterPitchShift) * player->sfxInstrumentRef->pitchRatio; - player->pitchRatio = adjustedSampleRate; + pitchShift = ((player->coarseTune + (s16)(player->tuneLerp.current >> 0x10)) - player->sfxInstrumentRef->keyBase) + player->fineTune; + adjustedPitchRatio = au_compute_pitch_ratio(pitchShift + player->masterPitchShift) * player->sfxInstrumentRef->pitchRatio; + player->pitchRatio = adjustedPitchRatio; } - if ((voice->priority == manager->priority) && (voice->pitchRatio != adjustedSampleRate)) { - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_PITCH; + if ((voice->priority == manager->priority) && (voice->pitchRatio != adjustedPitchRatio)) { + voice->syncFlags |= AU_VOICE_SYNC_FLAG_PITCH; voice->pitchRatio = player->pitchRatio; } } player->changed.all = 0; } -static void snd_set_voice_volume(AlUnkVoice* voice, SoundManager* manager, SoundPlayer* player) { - s32 x = ((((manager->unk_B8 +static void snd_set_voice_volume(AuVoice* voice, SoundManager* manager, SoundPlayer* player) { + s32 x = ((((manager->baseVolume * player->sfxVolume) >> 0xF) * player->playVelocity) >> 7) * (player->volumeLerp.current >> 0x10) >> 0xF; if (player->sfxParamsFlags & SFX_PARAM_FLAG_VOLUME || player->masterVolume == 0) { - voice->adjustedVolume = x; + voice->clientVolume = x; } else { - voice->adjustedVolume = (x * player->masterVolume) >> 0xF; + voice->clientVolume = (x * player->masterVolume) >> 0xF; } } @@ -1390,7 +1451,7 @@ static void au_SEFCmd_02_SetInstrument(SoundManager* manager, SoundPlayer* playe player->sefDataReadPos = &buf[2]; player->instrumentIndex = patch; - player->sfxInstrumentRef = au_get_instrument(manager->globals, bank, patch, &player->unk_10); + player->sfxInstrumentRef = au_get_instrument(manager->globals, bank, patch, &player->envelope); } static void au_SEFCmd_03_SetReverb(SoundManager* manager, SoundPlayer* player) { @@ -1398,22 +1459,22 @@ static void au_SEFCmd_03_SetReverb(SoundManager* manager, SoundPlayer* player) { u8 reverb = buf[0]; player->sefDataReadPos = &buf[1]; - if (player->sfxParamsFlags & SFX_PARAM_FLAG_REVERB) { + if (player->sfxParamsFlags & SFX_PARAM_FLAG_FIXED_REVERB) { reverb = manager->defaultReverbAmt; } player->reverb = reverb; player->changed.reverb = TRUE; } -static void au_SEFCmd_04(SoundManager* manager, SoundPlayer* player) { +static void au_SEFCmd_04_SetEnvelope(SoundManager* manager, SoundPlayer* player) { Instrument* other; - InstrumentEffect* temp_v0_2; + EnvelopePreset* envPreset; AuFilePos buf = player->sefDataReadPos; u8 temp_v1 = buf[0]; player->sefDataReadPos = &buf[1]; - player->unk_9E = temp_v1 & 0x7F; + player->envelopePreset = temp_v1 & 0x7F; other = player->sfxInstrumentRef; player->sfxInstrument.base = other->base; @@ -1429,36 +1490,36 @@ static void au_SEFCmd_04(SoundManager* manager, SoundPlayer* player) { player->sfxInstrument.type = other->type; player->sfxInstrument.unk_25 = other->unk_25; - player->sfxInstrument.unkOffset = D_800783C0[player->unk_9E]; + player->sfxInstrument.envelopes = SFXEnvelopePresets[player->envelopePreset]; player->sfxInstrumentRef = &player->sfxInstrument; - temp_v0_2 = player->sfxInstrument.unkOffset; - if (temp_v0_2 != NULL && temp_v0_2->count != 0) { - player->unk_10.unk_00 = (s32*)(temp_v0_2->unk_04[0].unkOffset1 + (s32)temp_v0_2); - player->unk_10.unk_04 = (s32*)(temp_v0_2->unk_04[0].unkOffset2 + (s32)temp_v0_2); + envPreset = player->sfxInstrument.envelopes; + if (envPreset != NULL && envPreset->count != 0) { + player->envelope.cmdListPress = AU_FILE_RELATIVE(envPreset, envPreset->offsets[0].offsetPress); + player->envelope.cmdListRelease = AU_FILE_RELATIVE(envPreset, envPreset->offsets[0].offsetRelease); } } -static void au_SEFCmd_05(SoundManager* manager, SoundPlayer* player) { - player->unk_92 = (*(s8*)player->sefDataReadPos++) * 100; +static void au_SEFCmd_05_CoarseTune(SoundManager* manager, SoundPlayer* player) { + player->coarseTune = (*(s8*)player->sefDataReadPos++) * 100; } -static void au_SEFCmd_06(SoundManager* manager, SoundPlayer* player) { +static void au_SEFCmd_06_FineTune(SoundManager* manager, SoundPlayer* player) { AuFilePos buf = player->sefDataReadPos; s32 unkTemp = buf[0]; player->sefDataReadPos = &buf[1]; - player->unk_94 = unkTemp; + player->fineTune = unkTemp; } -static void au_SEFCmd_07(SoundManager* manager, SoundPlayer* player) { +static void au_SEFCmd_07_WaitForEnd(SoundManager* manager, SoundPlayer* player) { if (manager->currentVoice->priority == manager->priority) { player->delay = 2; player->sefDataReadPos--; } } -static void au_SEFCmd_08(SoundManager* manager, SoundPlayer* player) { +static void au_SEFCmd_08_PitchSweep(SoundManager* manager, SoundPlayer* player) { AuFilePos buf = player->sefDataReadPos; s32 hi = buf[0]; s32 lo = buf[1]; @@ -1477,7 +1538,7 @@ static void au_SEFCmd_08(SoundManager* manager, SoundPlayer* player) { static void au_SEFCmd_09_StartLoop(SoundManager* manager, SoundPlayer* player) { AuFilePos buf = player->sefDataReadPos; - s32 loopIterCount = buf[0]; + s32 loopIterCount = buf[0]; // loopIterCount = 0 for infinite loop player->sefDataReadPos = &buf[1]; player->loopStartPos = player->sefDataReadPos; @@ -1485,20 +1546,19 @@ static void au_SEFCmd_09_StartLoop(SoundManager* manager, SoundPlayer* player) { } static void au_SEFCmd_0A_EndLoop(SoundManager* manager, SoundPlayer* player) { - //TODO logic is incorrect? if (player->loopIterCount == 0 || --player->loopIterCount != 0) { player->sefDataReadPos = player->loopStartPos; } } -static void au_SEFCmd_0B(SoundManager* manager, SoundPlayer* player) { +static void au_SEFCmd_0B_WaitForRelease(SoundManager* manager, SoundPlayer* player) { if (player->playLength != 0) { player->delay = 3; player->sefDataReadPos--; } } -static void au_SEFCmd_0C(SoundManager* manager, SoundPlayer* player) { +static void au_SEFCmd_0C_SetCurrentVolume(SoundManager* manager, SoundPlayer* player) { AuFilePos buf = player->sefDataReadPos; s32 vol = buf[0]; player->sefDataReadPos = &buf[1]; @@ -1507,10 +1567,10 @@ static void au_SEFCmd_0C(SoundManager* manager, SoundPlayer* player) { vol = (vol << 0x18) | 0xFFFFFF; } player->volumeLerp.current = vol; - player->changed.volume = 1; + player->changed.volume = TRUE; } -static void au_SEFCmd_0D(SoundManager* manager, SoundPlayer* player) { +static void au_SEFCmd_0D_VolumeRamp(SoundManager* manager, SoundPlayer* player) { AuFilePos buf = player->sefDataReadPos; s32 hi = buf[0]; s32 lo = buf[1]; @@ -1530,33 +1590,33 @@ static void au_SEFCmd_0D(SoundManager* manager, SoundPlayer* player) { player->volumeLerp.step = ((newValue << 0x10) - player->volumeLerp.current) / time; } -static void au_SEFCmd_0E(SoundManager* manager, SoundPlayer* player) { +static void au_SEFCmd_0E_SetAlternativeSound(SoundManager* manager, SoundPlayer* player) { AuFilePos buf = player->sefDataReadPos; AuFilePos pos = AU_FILE_RELATIVE(manager->sefData, (buf[1] << 8) + buf[2]); u8 type = buf[0]; player->sefDataReadPos = &buf[3]; - player->unk_84 = type; + player->alternativeType = type; switch (type) { case 1: - player->unk_80 = pos; + player->alternativeDataPos = pos; break; case 2: - player->unk_80 = pos; + player->alternativeDataPos = pos; break; case 3: - player->unk_80 = pos; + player->alternativeDataPos = pos; break; default: - player->unk_80 = NULL; + player->alternativeDataPos = NULL; break; } } -static void au_SEFCmd_0F(SoundManager* manager, SoundPlayer* player) { - AlUnkVoice* voice = manager->currentVoice; +static void au_SEFCmd_0F_Stop(SoundManager* manager, SoundPlayer* player) { + AuVoice* voice = manager->currentVoice; if (voice->priority == manager->priority) { - au_reset_voice(voice, manager->unk_BF); + au_reset_voice(voice, manager->currentVoiceIndex); } } @@ -1573,7 +1633,7 @@ static void au_SEFCmd_11_Restart(SoundManager* manager, SoundPlayer* player) { static void au_SEFCmd_12_NOP(SoundManager* manager, SoundPlayer* player) { } -static void au_SEFCmd_SetRandomPitch(SoundManager* manager, SoundPlayer* player) { +static void au_SEFCmd_13_SetRandomPitch(SoundManager* manager, SoundPlayer* player) { AuFilePos buf = player->sefDataReadPos; s32 randomPitch = buf[0]; player->sefDataReadPos = &buf[1]; @@ -1581,7 +1641,7 @@ static void au_SEFCmd_SetRandomPitch(SoundManager* manager, SoundPlayer* player) player->randomPitch = randomPitch; } -static void au_SEFCmd_SetRandomVelocity(SoundManager* manager, SoundPlayer* player) { +static void au_SEFCmd_14_SetRandomVelocity(SoundManager* manager, SoundPlayer* player) { AuFilePos buf = player->sefDataReadPos; s32 unkTemp = buf[0]; player->sefDataReadPos = &buf[1]; @@ -1589,7 +1649,7 @@ static void au_SEFCmd_SetRandomVelocity(SoundManager* manager, SoundPlayer* play player->randomVelocity = unkTemp; } -static void au_SEFCmd_SetUnkA3(SoundManager* manager, SoundPlayer* player) { +static void au_SEFCmd_15_SetUnkA3(SoundManager* manager, SoundPlayer* player) { AuFilePos buf = player->sefDataReadPos; s32 unkTemp = buf[0]; player->sefDataReadPos = &buf[1]; @@ -1597,37 +1657,37 @@ static void au_SEFCmd_SetUnkA3(SoundManager* manager, SoundPlayer* player) { player->unk_A3 = unkTemp; } -static void au_SEFCmd_16(SoundManager* manager, SoundPlayer* player) { +static void au_SEFCmd_16_SetEnvelopePress(SoundManager* manager, SoundPlayer* player) { AuFilePos buf = player->sefDataReadPos; s32 offset = (buf[0] << 8) + buf[1]; if (offset != 0) { - player->unk_18 = AU_FILE_RELATIVE(manager->sefData, offset); + player->envelopCustomPressProfile = AU_FILE_RELATIVE(manager->sefData, offset); } else { - player->unk_18 = NULL; + player->envelopCustomPressProfile = NULL; } player->sefDataReadPos = &buf[2]; } -static void au_SEFCmd_17(SoundManager* manager, SoundPlayer* player) { +static void au_SEFCmd_17_PlaySound(SoundManager* manager, SoundPlayer* player) { AuFilePos buf = player->sefDataReadPos; u32 i; - for (i = 0; i < 4; i++) { - if (manager->unk_A0[i].unk_00 == 0) { - manager->unk_A0[i].unk_00 = buf[1] + (buf[0] << 8); - manager->unk_A0[i].unk_02 = buf[3] + (buf[2] << 8); + for (i = 0; i < ARRAY_COUNT(manager->customCmdList); i++) { + if (manager->customCmdList[i].data[0] == 0) { + manager->customCmdList[i].data[0] = buf[1] + (buf[0] << 8); + manager->customCmdList[i].data[1] = buf[3] + (buf[2] << 8); break; } } player->sefDataReadPos = &buf[4]; } -static void au_SEFCmd_18(SoundManager* manager, SoundPlayer* player) { - player->unk_5E = *(u8*)player->sefDataReadPos++; - if (player->unk_5E != 0) { - player->unk_5E = player->unk_5E << 8 | 0xFF; +static void au_SEFCmd_18_SetAlternativeVolume(SoundManager* manager, SoundPlayer* player) { + player->alternativeVolume = *(u8*)player->sefDataReadPos++; + if (player->alternativeVolume != 0) { + player->alternativeVolume = player->alternativeVolume << 8 | 0xFF; } } @@ -1670,11 +1730,11 @@ static void au_sfx_reset_players(SoundManager* manager) { for (i = 0; i < ARRAY_COUNT(manager->players); i++) { SoundPlayer* player = &manager->players[i]; player->sefDataReadPos = BlankSEFData; - player->unk_80 = NULL; - player->sfxParamsFlags = SFX_PARAM_MODE_1; - player->unk_A9 = 0; + player->alternativeDataPos = NULL; + player->sfxParamsFlags = SFX_PARAM_MODE_SEQUENCE; + player->state = SND_PLAYER_STATE_CONTINUE; player->delay = 1; - player->unk_98 = 0; - player->unk_99 = 0; + player->priority = 0; + player->exclusiveID = 0; } } diff --git a/src/battle/area_isk_part_1/actor/stone_chomp.c b/src/battle/area_isk_part_1/actor/stone_chomp.c index 3ed2e24c3f..910b3259a5 100644 --- a/src/battle/area_isk_part_1/actor/stone_chomp.c +++ b/src/battle/area_isk_part_1/actor/stone_chomp.c @@ -285,7 +285,7 @@ ApiStatus b_area_isk_part_1_ChompChainUpdate(Evt* script, s32 isInitialCall) { if (animState->unk_18 < 2.0f * -animState->unk_14) { animState->unk_18 = 2.0f * -animState->unk_14; if (actor->state.varTable[8] != 0 && i == 0) { - sfx_play_sound_at_position(SOUND_2063, 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(SOUND_2063, SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } } animState->currentPos.y += animState->unk_18; 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 f32bb658a2..8e2f0a1fd5 100644 --- a/src/battle/area_isk_part_2/actor/chain_chomp.c +++ b/src/battle/area_isk_part_2/actor/chain_chomp.c @@ -300,7 +300,7 @@ ApiStatus b_area_isk_part_2_chain_chomp_ChompChainUpdate(Evt* script, s32 isInit if (animState->unk_18 < 2.0f * -animState->unk_14) { animState->unk_18 = 2.0f * -animState->unk_14; if (actor->state.varTable[8] != 0 && i == 0) { - sfx_play_sound_at_position(SOUND_2063, 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(SOUND_2063, SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } } animState->currentPos.y += animState->unk_18; diff --git a/src/battle/area_jan/actor/spear_guy.c b/src/battle/area_jan/actor/spear_guy.c index c0188b77b2..1b6ddad086 100644 --- a/src/battle/area_jan/actor/spear_guy.c +++ b/src/battle/area_jan/actor/spear_guy.c @@ -1450,7 +1450,7 @@ EvtScript N(8021CD50) = { 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_749) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim07) 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 4e94f72c01..1801e11a22 100644 --- a/src/battle/area_kmr_part_2/actor/goomnut_tree.c +++ b/src/battle/area_kmr_part_2/actor/goomnut_tree.c @@ -225,7 +225,7 @@ EvtScript N(EVS_ShakeTree) = { EVT_BUF_READ1(LVar5) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar6, LVarF, LVar8) EVT_CALL(PlaySound, SOUND_SMASH_GOOMNUT_TREE) - EVT_CALL(PlaySound, 0x166) + EVT_CALL(PlaySound, SOUND_SHAKE_TREE) EVT_THREAD EVT_SET(LocalFlag(0), 0) EVT_IF_NE(LVar1, 0) @@ -238,7 +238,7 @@ EvtScript N(EVS_ShakeTree) = { EVT_CALL(N(TransformFoliage), LVar3, EVT_FLOAT(0.1), EVT_FLOAT(0.2), LVarF, 0) EVT_IF_EQ(LocalFlag(0), 0) EVT_SET(LocalFlag(0), 1) - EVT_CALL(PlaySoundAtModel, LVar3, 358, 0) + EVT_CALL(PlaySoundAtModel, LVar3, SOUND_SHAKE_TREE, SOUND_SPACE_MODE_0) EVT_END_IF EVT_END_LOOP EVT_WAIT(1) @@ -270,7 +270,7 @@ EvtScript N(EVS_ShakeTree) = { EVT_CALL(N(TransformFoliage), LVar4, EVT_FLOAT(0.1), EVT_FLOAT(0.2), LVarF, 0) EVT_IF_EQ(LocalFlag(0), 0) EVT_SET(LocalFlag(0), 1) - EVT_CALL(PlaySoundAtModel, LVar4, 357, 0) + EVT_CALL(PlaySoundAtModel, LVar4, SOUND_SMASH_GOOMNUT_TREE, SOUND_SPACE_MODE_0) EVT_END_IF EVT_END_LOOP EVT_WAIT(1) diff --git a/src/battle/area_kpa2/actor/bowser_intro.c b/src/battle/area_kpa2/actor/bowser_intro.c index 6d9b3b8550..3a137abcd1 100644 --- a/src/battle/area_kpa2/actor/bowser_intro.c +++ b/src/battle/area_kpa2/actor/bowser_intro.c @@ -418,7 +418,7 @@ EvtScript N(attackFireBreath) = { EVT_CALL(N(StartRumbleWithParams), 50, 148) EVT_CALL(PlaySound, SOUND_3BD) EVT_WAIT(70) - EVT_CALL(PlaySound, SOUND_7BD) + EVT_CALL(PlaySound, SOUND_3BD | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_CALL(SetNpcAnimation, 0, ANIM_ParadePeach_Weep) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) diff --git a/src/battle/area_kpa2/actor/bowser_phase_1.c b/src/battle/area_kpa2/actor/bowser_phase_1.c index 07b739ec3a..5374cc2e01 100644 --- a/src/battle/area_kpa2/actor/bowser_phase_1.c +++ b/src/battle/area_kpa2/actor/bowser_phase_1.c @@ -1505,7 +1505,7 @@ EvtScript N(attackFlameBreath) = { EVT_CALL(N(StartRumbleWithParams), 50, 148) EVT_CALL(PlaySound, SOUND_3BD) EVT_WAIT(70) - EVT_CALL(PlaySound, SOUND_7BD) + EVT_CALL(PlaySound, SOUND_3BD | 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 9d58fefad6..8c2fc8a7cb 100644 --- a/src/battle/area_kpa2/actor/bowser_phase_2.c +++ b/src/battle/area_kpa2/actor/bowser_phase_2.c @@ -1363,7 +1363,7 @@ EvtScript N(attackFlameBreath) = { EVT_CALL(N(StartRumbleWithParams), 50, 148) EVT_CALL(PlaySound, SOUND_3BD) EVT_WAIT(70) - EVT_CALL(PlaySound, SOUND_7BD) + EVT_CALL(PlaySound, SOUND_3BD | 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_3.c b/src/battle/area_kpa2/actor/bowser_phase_3.c index db53993469..df281274c6 100644 --- a/src/battle/area_kpa2/actor/bowser_phase_3.c +++ b/src/battle/area_kpa2/actor/bowser_phase_3.c @@ -1596,7 +1596,7 @@ EvtScript N(attackFlameBreath) = { EVT_CALL(N(StartRumbleWithParams), 50, 148) EVT_CALL(PlaySound, SOUND_3BD) EVT_WAIT(70) - EVT_CALL(PlaySound, SOUND_7BD) + EVT_CALL(PlaySound, SOUND_3BD | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/area_kpa3/actor/anti_guy.c b/src/battle/area_kpa3/actor/anti_guy.c index 43df6915d8..0378bc900e 100644 --- a/src/battle/area_kpa3/actor/anti_guy.c +++ b/src/battle/area_kpa3/actor/anti_guy.c @@ -440,7 +440,7 @@ EvtScript N(acrobaticAttack) = { 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_749) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim07) diff --git a/src/battle/area_kzn/actor/lava_bubble.c b/src/battle/area_kzn/actor/lava_bubble.c index 1041ef71cc..70862826fa 100644 --- a/src/battle/area_kzn/actor/lava_bubble.c +++ b/src/battle/area_kzn/actor/lava_bubble.c @@ -278,7 +278,7 @@ EvtScript N(handleEvent_80219500) = { EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_759) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_359 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_LavaBubble_Anim07) EVT_EXEC_WAIT(DoShockHit) @@ -287,7 +287,7 @@ EvtScript N(handleEvent_80219500) = { EVT_EXEC_WAIT(DoJumpBack) EVT_EXEC_WAIT(N(80219464)) EVT_CASE_EQ(EVENT_SHOCK_DEATH) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_759) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_359 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_LavaBubble_Anim07) EVT_EXEC_WAIT(DoShockHit) diff --git a/src/battle/area_kzn2/actor/lava_piranha.c b/src/battle/area_kzn2/actor/lava_piranha.c index c5d1a4d474..3115761bfa 100644 --- a/src/battle/area_kzn2/actor/lava_piranha.c +++ b/src/battle/area_kzn2/actor/lava_piranha.c @@ -652,9 +652,9 @@ EvtScript N(spawnColorado) = { EVT_CALL(SpeakToPlayer, 0, -1, -1, 0, MSG_CH5_0104) EVT_THREAD EVT_LOOP(9) - EVT_CALL(PlaySoundAtNpc, 0, SOUND_20BA, 0) + EVT_CALL(PlaySoundAtNpc, 0, SOUND_20BA, SOUND_SPACE_MODE_0) EVT_WAIT(2) - EVT_CALL(PlaySoundAtNpc, 0, SOUND_3B4, 0) + EVT_CALL(PlaySoundAtNpc, 0, SOUND_3B4, SOUND_SPACE_MODE_0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD @@ -662,7 +662,7 @@ EvtScript N(spawnColorado) = { EVT_CALL(SetNpcAnimationSpeed, 0, EVT_FLOAT(2.0)) EVT_CALL(SetNpcSpeed, 0, EVT_FLOAT(10.0)) EVT_CALL(NpcMoveTo, 0, 70, 0, 0) - EVT_CALL(PlaySoundAtNpc, 0, SOUND_E8, 0) + EVT_CALL(PlaySoundAtNpc, 0, SOUND_E8, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimationSpeed, 0, EVT_FLOAT(1.0)) EVT_CALL(SetNpcJumpscale, 0, EVT_FLOAT(1.0)) EVT_CALL(SetNpcAnimation, 0, ANIM_BattleKolorado_Injured) @@ -693,9 +693,9 @@ EvtScript N(spawnColorado) = { EVT_CALL(NpcJump0, 0, 50, 0, 0, 12) EVT_THREAD EVT_LOOP(4) - EVT_CALL(PlaySoundAtNpc, 0, SOUND_20BA, 0) + EVT_CALL(PlaySoundAtNpc, 0, SOUND_20BA, SOUND_SPACE_MODE_0) EVT_WAIT(2) - EVT_CALL(PlaySoundAtNpc, 0, SOUND_3B4, 0) + EVT_CALL(PlaySoundAtNpc, 0, SOUND_3B4, SOUND_SPACE_MODE_0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD @@ -1373,7 +1373,7 @@ EvtScript N(onDeath) = { EVT_THREAD EVT_CALL(PlaySound, SOUND_3BC) EVT_CALL(ShakeCam, 1, 0, 119, EVT_FLOAT(0.3)) - EVT_CALL(PlaySound, SOUND_7BC) + EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 234) EVT_CALL(func_8027D32C, ACTOR_SELF) @@ -1471,7 +1471,7 @@ EvtScript N(onDeath) = { EVT_THREAD EVT_CALL(PlaySound, SOUND_3BC) EVT_CALL(ShakeCam, 1, 0, 165, EVT_FLOAT(1.2)) - EVT_CALL(PlaySound, SOUND_7BC) + EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 300) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) @@ -1644,7 +1644,7 @@ EvtScript N(onDeath) = { EVT_CALL(PlaySound, SOUND_3BC) EVT_CALL(ShakeCam, 1, 0, 100, EVT_FLOAT(0.5)) EVT_CALL(ShakeCam, 1, 0, 8, EVT_FLOAT(0.2)) - EVT_CALL(PlaySound, SOUND_7BC) + EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 216) EVT_THREAD diff --git a/src/battle/area_omo/actor/anti_guy.c b/src/battle/area_omo/actor/anti_guy.c index d951d8d5bb..b570f17fb0 100644 --- a/src/battle/area_omo/actor/anti_guy.c +++ b/src/battle/area_omo/actor/anti_guy.c @@ -440,7 +440,7 @@ EvtScript N(80222824) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_749) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim07) diff --git a/src/battle/area_omo/actor/blue_shy_guy.c b/src/battle/area_omo/actor/blue_shy_guy.c index d138b39355..dd4f4ddcf9 100644 --- a/src/battle/area_omo/actor/blue_shy_guy.c +++ b/src/battle/area_omo/actor/blue_shy_guy.c @@ -441,7 +441,7 @@ EvtScript N(8021BC2C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_749) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim07) diff --git a/src/battle/area_omo/actor/green_shy_guy.c b/src/battle/area_omo/actor/green_shy_guy.c index 2ef5df8b34..55b8746134 100644 --- a/src/battle/area_omo/actor/green_shy_guy.c +++ b/src/battle/area_omo/actor/green_shy_guy.c @@ -441,7 +441,7 @@ EvtScript N(80220D2C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_749) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim07) diff --git a/src/battle/area_omo/actor/pink_shy_guy.c b/src/battle/area_omo/actor/pink_shy_guy.c index 854d641078..9236c8716b 100644 --- a/src/battle/area_omo/actor/pink_shy_guy.c +++ b/src/battle/area_omo/actor/pink_shy_guy.c @@ -441,7 +441,7 @@ EvtScript N(8021F22C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_749) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim07) diff --git a/src/battle/area_omo/actor/sky_guy.c b/src/battle/area_omo/actor/sky_guy.c index 9ad0a134cd..4c9a5a653a 100644 --- a/src/battle/area_omo/actor/sky_guy.c +++ b/src/battle/area_omo/actor/sky_guy.c @@ -955,7 +955,7 @@ EvtScript N(8022BF14) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_749) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim07) diff --git a/src/battle/area_omo/actor/yellow_shy_guy.c b/src/battle/area_omo/actor/yellow_shy_guy.c index d2c80a9976..f53b84209b 100644 --- a/src/battle/area_omo/actor/yellow_shy_guy.c +++ b/src/battle/area_omo/actor/yellow_shy_guy.c @@ -441,7 +441,7 @@ EvtScript N(8021D72C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_749) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim07) diff --git a/src/battle/area_omo2_2/actor/stilt_guy.c b/src/battle/area_omo2_2/actor/stilt_guy.c index 8ffc8f030d..858f8bb9cf 100644 --- a/src/battle/area_omo2_2/actor/stilt_guy.c +++ b/src/battle/area_omo2_2/actor/stilt_guy.c @@ -1272,7 +1272,7 @@ EvtScript N(shy_guy_attack2) = { 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_749) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim07) 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 3a6e21d9db..23eb16c541 100644 --- a/src/battle/area_trd_part_2/actor/fake_bowser.c +++ b/src/battle/area_trd_part_2/actor/fake_bowser.c @@ -425,42 +425,42 @@ EvtScript N(8021B0E4) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 5, EVT_FLOAT(0.5)) EVT_CALL(JumpPartTo, ACTOR_SELF, 5, LVar0, LVar1, LVar2, 60, 1) EVT_WAIT(30) - EVT_CALL(PlaySoundAtModel, 15, 482, 0) + EVT_CALL(PlaySoundAtModel, 15, SOUND_1E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) EVT_WAIT(20) - EVT_CALL(PlaySoundAtModel, 11, 482, 0) + EVT_CALL(PlaySoundAtModel, 11, SOUND_1E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.5)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 150, 20) EVT_WAIT(30) - EVT_CALL(PlaySoundAtModel, 9, 482, 0) + EVT_CALL(PlaySoundAtModel, 9, SOUND_1E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) EVT_WAIT(30) - EVT_CALL(PlaySoundAtModel, 31, 482, 0) + EVT_CALL(PlaySoundAtModel, 31, SOUND_1E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.7)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 70, 20) EVT_WAIT(20) - EVT_CALL(PlaySoundAtModel, 25, 482, 0) + EVT_CALL(PlaySoundAtModel, 25, SOUND_1E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) EVT_WAIT(20) - EVT_CALL(PlaySoundAtModel, 43, 482, 0) + EVT_CALL(PlaySoundAtModel, 43, SOUND_1E2, SOUND_SPACE_MODE_0) EVT_CALL(N(StartRumbleWithParams), 60, 20) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) diff --git a/src/battle/common/actor/ember.inc.c b/src/battle/common/actor/ember.inc.c index b60a00909f..0510d8379b 100644 --- a/src/battle/common/actor/ember.inc.c +++ b/src/battle/common/actor/ember.inc.c @@ -379,7 +379,7 @@ EvtScript N(handleEvent_8021B8BC) = { EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(47) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_759) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_359 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_LavaBubble_Blue_Anim07) EVT_EXEC_WAIT(DoShockHit) @@ -388,7 +388,7 @@ EvtScript N(handleEvent_8021B8BC) = { EVT_EXEC_WAIT(DoJumpBack) EVT_EXEC_WAIT(N(8021B2FC)) EVT_CASE_EQ(38) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_759) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_359 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_LavaBubble_Blue_Anim07) EVT_EXEC_WAIT(DoShockHit) diff --git a/src/battle/common/actor/red_shy_guy.inc.c b/src/battle/common/actor/red_shy_guy.inc.c index 4ecaa1ddcc..b5706596be 100644 --- a/src/battle/common/actor/red_shy_guy.inc.c +++ b/src/battle/common/actor/red_shy_guy.inc.c @@ -439,7 +439,7 @@ EvtScript N(acrobaticAttack) = { 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_749) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim09) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim07) diff --git a/src/battle/item/insecticide_herb.c b/src/battle/item/insecticide_herb.c index 3acf51a860..d2d8108ceb 100644 --- a/src/battle/item/insecticide_herb.c +++ b/src/battle/item/insecticide_herb.c @@ -20,7 +20,7 @@ ApiStatus N(func_802A1280_72A9D0)(Evt* script, s32 isInitialCall) { Actor* enemy = get_actor(script->owner1.enemyID); Actor* target; - sfx_play_sound_at_position(SOUND_231, 0, enemy->state.goalPos.x, enemy->state.goalPos.y, enemy->state.goalPos.z); + sfx_play_sound_at_position(SOUND_231, 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/partner/lakilester.c b/src/battle/partner/lakilester.c index 5bd52a918f..282da03ad7 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -465,7 +465,7 @@ ApiStatus N(SpinyFlipActionCommand)(Evt* script, s32 isInitialCall) { } else { sAimingTimer = 80; hud_element_set_script(hudStick, &HES_StickTapRight); - sfx_play_sound_at_position(SOUND_312, 0, 0.0f, 0.0f, 0.0f); + sfx_play_sound_at_position(SOUND_312, SOUND_SPACE_MODE_0, 0.0f, 0.0f, 0.0f); script->functionTemp[0] = 2; } break; @@ -1466,7 +1466,7 @@ ApiStatus N(ProcessHurricane)(Evt* script, s32 isInitialCall) { sHuffPuffBreathEffect->data.huffPuffBreath->pos.z = 0.0f; if (script->functionTemp[2] != 0) { - sfx_play_sound_at_position(SOUND_201E, 0, partner->currentPos.x, partner->currentPos.y, partner->currentPos.z); + sfx_play_sound_at_position(SOUND_201E, SOUND_SPACE_MODE_0, partner->currentPos.x, partner->currentPos.y, partner->currentPos.z); } script->functionTemp[2] = 0; @@ -1489,7 +1489,7 @@ ApiStatus N(ProcessHurricane)(Evt* script, s32 isInitialCall) { sHuffPuffBreathEffect->data.huffPuffBreath->speedX = 2.0f; if (script->functionTemp[2] == 0) { - sfx_play_sound_at_position(SOUND_201F, 0, partner->currentPos.x, partner->currentPos.y, partner->currentPos.z); + sfx_play_sound_at_position(SOUND_201F, SOUND_SPACE_MODE_0, partner->currentPos.x, partner->currentPos.y, partner->currentPos.z); } script->functionTemp[2] = 1; diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index 2c635b89b5..f864da7587 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -436,7 +436,7 @@ ApiStatus N(CarryAway)(Evt* evt, s32 isInitialCall) { parakarry->state.moveTime = clamp_angle(parakarry->state.moveTime); if (gGameStatusPtr->frameCounter % 10 == 0) { - sfx_play_sound_at_position(SOUND_2009, 0, parakarry->state.currentPos.x, parakarry->state.currentPos.y, parakarry->state.currentPos.z); + sfx_play_sound_at_position(SOUND_2009, SOUND_SPACE_MODE_0, parakarry->state.currentPos.x, parakarry->state.currentPos.y, parakarry->state.currentPos.z); } if (parakarry->state.currentPos.x > 240.0f) { @@ -499,9 +499,9 @@ ApiStatus N(FlyAround)(Evt* script, s32 isInitialCall) { } if (script->functionTemp[3] != 0) { - sfx_play_sound_at_position(SOUND_200A, 0, state->currentPos.x, state->currentPos.y, state->currentPos.z); + sfx_play_sound_at_position(SOUND_200A, SOUND_SPACE_MODE_0, state->currentPos.x, state->currentPos.y, state->currentPos.z); } else { - sfx_play_sound_at_position(SOUND_200B, 0, state->currentPos.x, state->currentPos.y, state->currentPos.z); + sfx_play_sound_at_position(SOUND_200B, SOUND_SPACE_MODE_0, state->currentPos.x, state->currentPos.y, state->currentPos.z); } script->functionTemp[3] = 1 - script->functionTemp[3]; } @@ -521,9 +521,9 @@ ApiStatus N(FlyAround)(Evt* script, s32 isInitialCall) { } while (0); if (script->functionTemp[3] != 0) { - sfx_play_sound_at_position(SOUND_200A, 0, state->currentPos.x, state->currentPos.y, state->currentPos.z); + sfx_play_sound_at_position(SOUND_200A, SOUND_SPACE_MODE_0, state->currentPos.x, state->currentPos.y, state->currentPos.z); } else { - sfx_play_sound_at_position(SOUND_200B, 0, state->currentPos.x, state->currentPos.y, state->currentPos.z); + sfx_play_sound_at_position(SOUND_200B, SOUND_SPACE_MODE_0, state->currentPos.x, state->currentPos.y, state->currentPos.z); } script->functionTemp[3] = 1 - script->functionTemp[3]; } @@ -543,9 +543,9 @@ ApiStatus N(FlyAround)(Evt* script, s32 isInitialCall) { } while (0); // TODO macro? if (script->functionTemp[3] != 0) { - sfx_play_sound_at_position(SOUND_200A, 0, state->currentPos.x, state->currentPos.y, state->currentPos.z); + sfx_play_sound_at_position(SOUND_200A, SOUND_SPACE_MODE_0, state->currentPos.x, state->currentPos.y, state->currentPos.z); } else { - sfx_play_sound_at_position(SOUND_200B, 0, state->currentPos.x, state->currentPos.y, state->currentPos.z); + sfx_play_sound_at_position(SOUND_200B, SOUND_SPACE_MODE_0, state->currentPos.x, state->currentPos.y, state->currentPos.z); } script->functionTemp[3] = 1 - script->functionTemp[3]; } @@ -565,9 +565,9 @@ ApiStatus N(FlyAround)(Evt* script, s32 isInitialCall) { } while (0); // TODO macro? if (script->functionTemp[3] != 0) { - sfx_play_sound_at_position(SOUND_200A, 0, state->currentPos.x, state->currentPos.y, state->currentPos.z); + sfx_play_sound_at_position(SOUND_200A, SOUND_SPACE_MODE_0, state->currentPos.x, state->currentPos.y, state->currentPos.z); } else { - sfx_play_sound_at_position(SOUND_200B, 0, state->currentPos.x, state->currentPos.y, state->currentPos.z); + sfx_play_sound_at_position(SOUND_200B, SOUND_SPACE_MODE_0, state->currentPos.x, state->currentPos.y, state->currentPos.z); } script->functionTemp[3] = 1 - script->functionTemp[3]; } diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c index 6247cb30a5..2dabbf0606 100644 --- a/src/battle/partner/sushie.c +++ b/src/battle/partner/sushie.c @@ -255,9 +255,9 @@ ApiStatus N(ProcessTidalWave)(Evt* script, s32 isInitialCall) { } while (0); if (script->functionTemp[2] != 0) { - sfx_play_sound_at_position(SOUND_29B, 0, state->currentPos.x, state->currentPos.y, state->currentPos.z); + sfx_play_sound_at_position(SOUND_29B, SOUND_SPACE_MODE_0, state->currentPos.x, state->currentPos.y, state->currentPos.z); } else { - sfx_play_sound_at_position(SOUND_29C, 0, state->currentPos.x, state->currentPos.y, state->currentPos.z); + sfx_play_sound_at_position(SOUND_29C, SOUND_SPACE_MODE_0, state->currentPos.x, state->currentPos.y, state->currentPos.z); } script->functionTemp[2] = 1 - script->functionTemp[2]; } @@ -279,9 +279,9 @@ ApiStatus N(ProcessTidalWave)(Evt* script, s32 isInitialCall) { } while (0); // TODO macro? if (script->functionTemp[2] != 0) { - sfx_play_sound_at_position(SOUND_29B, 0, state->currentPos.x, state->currentPos.y, state->currentPos.z); + sfx_play_sound_at_position(SOUND_29B, SOUND_SPACE_MODE_0, state->currentPos.x, state->currentPos.y, state->currentPos.z); } else { - sfx_play_sound_at_position(SOUND_29C, 0, state->currentPos.x, state->currentPos.y, state->currentPos.z); + sfx_play_sound_at_position(SOUND_29C, SOUND_SPACE_MODE_0, state->currentPos.x, state->currentPos.y, state->currentPos.z); } script->functionTemp[2] = 1 - script->functionTemp[2]; } @@ -303,9 +303,9 @@ ApiStatus N(ProcessTidalWave)(Evt* script, s32 isInitialCall) { } while (0); // TODO macro? if (script->functionTemp[2] != 0) { - sfx_play_sound_at_position(SOUND_29B, 0, state->currentPos.x, state->currentPos.y, state->currentPos.z); + sfx_play_sound_at_position(SOUND_29B, SOUND_SPACE_MODE_0, state->currentPos.x, state->currentPos.y, state->currentPos.z); } else { - sfx_play_sound_at_position(SOUND_29C, 0, state->currentPos.x, state->currentPos.y, state->currentPos.z); + sfx_play_sound_at_position(SOUND_29C, SOUND_SPACE_MODE_0, state->currentPos.x, state->currentPos.y, state->currentPos.z); } script->functionTemp[2] = 1 - script->functionTemp[2]; } @@ -328,7 +328,7 @@ ApiStatus N(ProcessTidalWave)(Evt* script, s32 isInitialCall) { 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, 0, 0.0f, 0.0f, 0.0f); + sfx_play_sound_at_position(SOUND_29D, SOUND_SPACE_MODE_0, 0.0f, 0.0f, 0.0f); fx_underwater(0, -50.0f, 20.0f, 0.0f, 1.0f, 120); } diff --git a/src/battle/star/common/peach_star_beam.inc.c b/src/battle/star/common/peach_star_beam.inc.c index 32ee63c2b0..173542945e 100644 --- a/src/battle/star/common/peach_star_beam.inc.c +++ b/src/battle/star/common/peach_star_beam.inc.c @@ -458,9 +458,9 @@ ApiStatus N(ProcessPeachStarBeam)(Evt* script, s32 isInitialCall) { } if (script->functionTemp[2] == 0) { - sfx_play_sound(SOUND_648); + sfx_play_sound(SOUND_248 | SOUND_ID_TRIGGER_CHANGE_SOUND); } else { - sfx_play_sound(SOUND_649); + sfx_play_sound(SOUND_249 | SOUND_ID_TRIGGER_CHANGE_SOUND); } script->functionTemp[0] = PEACH_STAR_BEAM_FLY_TO_TARGET; } else { @@ -637,11 +637,11 @@ ApiStatus N(ProcessPeachStarBeam)(Evt* script, s32 isInitialCall) { script->functionTemp[1]--; if (script->functionTemp[1] == 0) { if (script->functionTemp[2] == 0) { - func_80149A6C(SOUND_248, TRUE); - sfx_play_sound(SOUND_648); + snd_stop_tracking_env_sound_pos(SOUND_248, TRUE); + sfx_play_sound(SOUND_248 | SOUND_ID_TRIGGER_CHANGE_SOUND); } else { - func_80149A6C(SOUND_249, TRUE); - sfx_play_sound(SOUND_649); + snd_stop_tracking_env_sound_pos(SOUND_249, TRUE); + sfx_play_sound(SOUND_249 | SOUND_ID_TRIGGER_CHANGE_SOUND); } } } @@ -680,9 +680,9 @@ ApiStatus N(ProcessPeachStarBeam)(Evt* script, s32 isInitialCall) { } if (script->functionTemp[2] == 0) { - func_80149A6C(SOUND_248, FALSE); + snd_stop_tracking_env_sound_pos(SOUND_248, FALSE); } else { - func_80149A6C(SOUND_249, FALSE); + snd_stop_tracking_env_sound_pos(SOUND_249, FALSE); } script->functionTemp[0] = PEACH_STAR_BEAM_SPIRITS_SCATTER; break; diff --git a/src/common/UnkSfxFunc.inc.c b/src/common/UnkSfxFunc.inc.c index dd8fce8b23..3676942f34 100644 --- a/src/common/UnkSfxFunc.inc.c +++ b/src/common/UnkSfxFunc.inc.c @@ -11,13 +11,13 @@ ApiStatus N(UnkSfxFunc)(Evt* script, s32 isInitialCall) { distY = actor->state.goalPos.y - actor->currentPos.y; distZ = actor->state.goalPos.z - actor->currentPos.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, 0.0f, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(SOUND_359, SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } if (script->functionTemp[0]-- > 0) { return ApiStatus_BLOCK; } - sfx_play_sound_at_position(SOUND_759, 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(SOUND_359 | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); return ApiStatus_DONE2; } diff --git a/src/common/foliage.inc.c b/src/common/foliage.inc.c index dc3b01f772..eb739aa1dd 100644 --- a/src/common/foliage.inc.c +++ b/src/common/foliage.inc.c @@ -18,7 +18,7 @@ EvtScript N(EVS_SearchBush) = { EVT_CALL(N(TransformFoliage), LVar3, EVT_FLOAT(0.1), 1, LVarF, 0) EVT_IF_EQ(LocalFlag(0), 0) EVT_SET(LocalFlag(0), 1) - EVT_CALL(PlaySoundAtModel, LVar3, SOUND_SEARCH_BUSH, 0) + EVT_CALL(PlaySoundAtModel, LVar3, SOUND_SEARCH_BUSH, SOUND_SPACE_MODE_0) EVT_END_IF EVT_END_LOOP EVT_WAIT(1) @@ -87,7 +87,7 @@ EvtScript N(EVS_ShakeTree) = { EVT_CALL(N(TransformFoliage), LVar3, EVT_FLOAT(0.1), EVT_FLOAT(0.2), LVarF, 0) EVT_IF_EQ(LocalFlag(0), 0) EVT_SET(LocalFlag(0), 1) - EVT_CALL(PlaySoundAtModel, LVar3, SOUND_SHAKE_TREE, 0) + EVT_CALL(PlaySoundAtModel, LVar3, SOUND_SHAKE_TREE, SOUND_SPACE_MODE_0) EVT_END_IF EVT_END_LOOP EVT_WAIT(1) @@ -119,7 +119,7 @@ EvtScript N(EVS_ShakeTree) = { EVT_CALL(N(TransformFoliage), LVar4, EVT_FLOAT(0.1), EVT_FLOAT(0.2), LVarF, 0) EVT_IF_EQ(LocalFlag(0), 0) EVT_SET(LocalFlag(0), 1) - EVT_CALL(PlaySoundAtModel, LVar4, SOUND_SMASH_GOOMNUT_TREE, 0) + EVT_CALL(PlaySoundAtModel, LVar4, SOUND_SMASH_GOOMNUT_TREE, SOUND_SPACE_MODE_0) EVT_END_IF EVT_END_LOOP EVT_WAIT(1) diff --git a/src/effects/disable_x.c b/src/effects/disable_x.c index 37bc4574bb..4717ea2d2f 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) { - shim_sfx_play_sound_at_position(SOUND_2107, 0, data->pos.x, data->pos.y, data->pos.z); + shim_sfx_play_sound_at_position(SOUND_2107, SOUND_SPACE_MODE_0, data->pos.x, data->pos.y, data->pos.z); } } else if (unk_3C < unk_38) { shim_load_effect(EFFECT_DISABLE_X); diff --git a/src/effects/star.c b/src/effects/star.c index ceafb870e6..bdfcaeb438 100644 --- a/src/effects/star.c +++ b/src/effects/star.c @@ -150,7 +150,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) { - shim_sfx_play_sound_at_position(SOUND_B0000016, 0, data->unk_04, data->unk_08, data->unk_0C); + shim_sfx_play_sound_at_position(SOUND_B0000016, 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 06c5907202..8f7f1cda49 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -756,7 +756,7 @@ void update_encounters_neutral(void) { cond = TRUE; } if (cond) { - sfx_play_sound_at_position(SOUND_HIT_PLAYER_NORMAL, 0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); + sfx_play_sound_at_position(SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); currentEncounter->hitType = ENCOUNTER_TRIGGER_HAMMER; currentEncounter->hitTier = gPlayerData.hammerLevel; enemy->encountered = ENCOUNTER_TRIGGER_HAMMER; @@ -842,7 +842,7 @@ void update_encounters_neutral(void) { currentEncounter->hitTier = 2; break; } - sfx_play_sound_at_position(SOUND_HIT_PLAYER_NORMAL, 0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); + sfx_play_sound_at_position(SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); enemy->encountered = ENCOUNTER_STATE_NEUTRAL; currentEncounter->currentEncounter = encounter; currentEncounter->currentEnemy = enemy; @@ -890,7 +890,7 @@ void update_encounters_neutral(void) { cond = TRUE; } if ((playerStatus->animFlags & PA_FLAG_SPINNING) && !(enemy->flags & ENEMY_FLAG_20000000) && cond) { - sfx_play_sound_at_position(SOUND_HIT_PLAYER_NORMAL, 0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); + sfx_play_sound_at_position(SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); testX = playerStatus->position.x + ((npc->pos.x - playerStatus->position.x) * 0.5f); testY = playerStatus->position.y + (((npc->pos.y + npc->collisionHeight) - (playerStatus->position.y + playerStatus->colliderHeight)) * 0.5f); testZ = playerStatus->position.z + ((npc->pos.z - playerStatus->position.z) * 0.5f); @@ -981,7 +981,7 @@ START_BATTLE: if (!is_ability_active(ABILITY_CHILL_OUT) && currentEncounter->firstStrikeType == FIRST_STRIKE_ENEMY) { set_action_state(ACTION_STATE_ENEMY_FIRST_STRIKE); npc = get_npc_unsafe(enemy->npcID); - sfx_play_sound_at_position(SOUND_HIT_PLAYER_NORMAL, 0, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); } currentEncounter->scriptedBattle = FALSE; gEncounterState = ENCOUNTER_STATE_PRE_BATTLE; diff --git a/src/entity/Block.c b/src/entity/Block.c index 7906f652d9..2de45cd85b 100644 --- a/src/entity/Block.c +++ b/src/entity/Block.c @@ -386,7 +386,7 @@ s32 entity_block_handle_collision(Entity* entity) { return TRUE; } set_entity_commandlist(entity, Entity_BreakingBlock_Script); - sfx_play_sound_at_position(SOUND_14F, 0, entity->position.x, entity->position.y, entity->position.z); + sfx_play_sound_at_position(SOUND_14F, SOUND_SPACE_MODE_0, entity->position.x, entity->position.y, entity->position.z); break; case ENTITY_TYPE_HAMMER2_BLOCK: case ENTITY_TYPE_HAMMER2_BLOCK_TINY: @@ -401,7 +401,7 @@ s32 entity_block_handle_collision(Entity* entity) { return TRUE; } set_entity_commandlist(entity, Entity_BreakingBlock_Script); - sfx_play_sound_at_position(SOUND_150, 0, entity->position.x, entity->position.y, entity->position.z); + sfx_play_sound_at_position(SOUND_150, SOUND_SPACE_MODE_0, entity->position.x, entity->position.y, entity->position.z); break; case ENTITY_TYPE_HAMMER3_BLOCK: case ENTITY_TYPE_HAMMER3_BLOCK_TINY: @@ -409,7 +409,7 @@ s32 entity_block_handle_collision(Entity* entity) { return TRUE; } set_entity_commandlist(entity, Entity_BreakingBlock_Script); - sfx_play_sound_at_position(SOUND_151, 0, entity->position.x, entity->position.y, entity->position.z); + sfx_play_sound_at_position(SOUND_151, SOUND_SPACE_MODE_0, entity->position.x, entity->position.y, entity->position.z); break; case ENTITY_TYPE_MULTI_TRIGGER_BLOCK: case ENTITY_TYPE_HEALING_BLOCK: diff --git a/src/entity/ShatteringBlock.c b/src/entity/ShatteringBlock.c index f757d220c9..0e7942dd75 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, 0, entity->position.x, entity->position.y, entity->position.z); + sfx_play_sound_at_position(SOUND_158, SOUND_SPACE_MODE_0, entity->position.x, entity->position.y, entity->position.z); fragmentDisplayLists = Entity_ShatteringBrickBlock_FragmentsRender; fragmentMatrices = Entity_ShatteringBrickBlock_FragmentsMatrices; break; diff --git a/src/entity/SimpleSpring.c b/src/entity/SimpleSpring.c index 83e3687828..92f58a9d8e 100644 --- a/src/entity/SimpleSpring.c +++ b/src/entity/SimpleSpring.c @@ -22,7 +22,7 @@ void entity_ScriptSpring_idle(Entity* entity) { set_action_state(ACTION_STATE_USE_SPRING); } exec_entity_commandlist(entity); - sfx_play_sound_at_position(SOUND_2086, 0, entity->position.x, entity->position.y, entity->position.z); + sfx_play_sound_at_position(SOUND_2086, SOUND_SPACE_MODE_0, entity->position.x, entity->position.y, entity->position.z); } } @@ -37,7 +37,7 @@ void entity_SimpleSpring_idle(Entity* entity) { play_model_animation(entity->virtualModelIndex, Entity_SimpleSpring_AnimLaunch); entity_start_script(entity); exec_entity_commandlist(entity); - sfx_play_sound_at_position(SOUND_2086, 0, entity->position.x, entity->position.y, entity->position.z); + sfx_play_sound_at_position(SOUND_2086, SOUND_SPACE_MODE_0, entity->position.x, entity->position.y, entity->position.z); disable_player_input(); playerStatus->currentSpeed = 0; } diff --git a/src/entity/jan_iwa/Plants1.c b/src/entity/jan_iwa/Plants1.c index 503d0a3ccb..d620c2c3cc 100644 --- a/src/entity/jan_iwa/Plants1.c +++ b/src/entity/jan_iwa/Plants1.c @@ -138,12 +138,12 @@ void entity_SpinningFlower_init(Entity* entity) { } void func_802BB314_E2DC44(Entity* entity) { - sfx_play_sound_at_position(SOUND_8000006A, 0, entity->position.x, entity->position.y, entity->position.z); + sfx_play_sound_at_position(SOUND_8000006A, SOUND_SPACE_MODE_0, entity->position.x, entity->position.y, entity->position.z); } void func_802BB34C_E2DC7C(void) { - sfx_play_sound(SOUND_791); - func_80149A6C(0x391, 1); + sfx_play_sound(SOUND_391 | SOUND_ID_TRIGGER_CHANGE_SOUND); + snd_stop_tracking_env_sound_pos(SOUND_391, TRUE); } void entity_PinkFlowerLight_setupGfx(s32 entityIndex) { diff --git a/src/evt/fa4c0_len_3bf0.c b/src/evt/fa4c0_len_3bf0.c index 27bf49bdda..98c9eca044 100644 --- a/src/evt/fa4c0_len_3bf0.c +++ b/src/evt/fa4c0_len_3bf0.c @@ -237,7 +237,7 @@ ApiStatus func_802D62E4(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 soundID = evt_get_variable(script, *args++); - func_80149A6C(soundID, TRUE); + snd_stop_tracking_env_sound_pos(soundID, TRUE); return ApiStatus_DONE2; } diff --git a/src/evt/fx_api.c b/src/evt/fx_api.c index 31b8d2298a..fadedb958e 100644 --- a/src/evt/fx_api.c +++ b/src/evt/fx_api.c @@ -16,7 +16,7 @@ ApiStatus ShowStartRecoveryShimmer(Evt* script, s32 isInitialCall) { f32 z = evt_get_float_variable(script, *args++); show_start_recovery_shimmer(x, y, z, evt_get_variable(script, *args++)); - sfx_play_sound_at_position(SOUND_2055, 0, x, y, z); + sfx_play_sound_at_position(SOUND_2055, SOUND_SPACE_MODE_0, x, y, z); return ApiStatus_DONE2; } @@ -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, 0, x, y, z); + sfx_play_sound_at_position(SOUND_378, SOUND_SPACE_MODE_0, x, y, z); return ApiStatus_DONE2; } diff --git a/src/evt/player_api.c b/src/evt/player_api.c index afb6ecf93d..513f67656e 100644 --- a/src/evt/player_api.c +++ b/src/evt/player_api.c @@ -266,7 +266,7 @@ s32 player_jump(Evt* script, s32 isInitialCall, s32 mode) { anim = ANIM_Mario_90005; } suggest_player_anim_clearUnkFlag(anim); - sfx_play_sound_at_player(SOUND_JUMP_2081, 0); + sfx_play_sound_at_player(SOUND_JUMP_2081, SOUND_SPACE_MODE_0); } script->functionTemp[0] = 1; } diff --git a/src/i_spy.c b/src/i_spy.c index 1c03915e41..07f76c95c8 100644 --- a/src/i_spy.c +++ b/src/i_spy.c @@ -136,7 +136,7 @@ void func_802B735C_E2290C(void) { case 2: D_802B7C78_E23228->scale = 0.57f; D_802B7C78_E23228->unk_24++; - sfx_play_sound_at_player(SOUND_17B, 0); + sfx_play_sound_at_player(SOUND_17B, SOUND_SPACE_MODE_0); break; case 3: D_802B7C78_E23228->scale = 0.53f; diff --git a/src/main_loop.c b/src/main_loop.c index e45ca2347f..491618f88f 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -111,7 +111,7 @@ void step_game_loop(void) { func_80138198(); bgm_update_music_settings(); update_ambient_sounds(); - sfx_update_looping_sound_params(); + sfx_update_env_sound_params(); update_windows(); update_curtains(); diff --git a/src/pulse_stone.c b/src/pulse_stone.c index 452e030a6e..699ee31c58 100644 --- a/src/pulse_stone.c +++ b/src/pulse_stone.c @@ -126,7 +126,7 @@ void func_802B71D4(void) { D_802B7D18_E22588->unk_20++; if (D_802B7D18_E22588->unk_20 >= var_v1 + 2) { D_802B7D18_E22588->unk_20 = 0; - sfx_play_sound_at_player(SOUND_7D, 0); + sfx_play_sound_at_player(SOUND_7D, SOUND_SPACE_MODE_0); } if (D_802B7D18_E22588->unk_20 < 2) { part.palette = D_802B7C80_E224F0; diff --git a/src/state_demo.c b/src/state_demo.c index da0b7e5437..1733304528 100644 --- a/src/state_demo.c +++ b/src/state_demo.c @@ -48,7 +48,7 @@ void state_init_demo(void) { gGameStatusPtr->demoStickX = 0; gGameStatusPtr->demoStickY = 0; - func_80056228(); + disable_sounds(); set_map_transition_effect(2); set_screen_overlay_params_front(0, 255.0f); clear_saved_variables(); @@ -87,7 +87,7 @@ void state_step_demo(void) { gGameStatusPtr->nextDemoScene = 0; gGameStatusPtr->demoState = 0; gGameStatusPtr->peachFlags = 0; - func_80056204(); + enable_sounds(); gGameStatusPtr->isBattle = FALSE; gGameStatusPtr->unk_76 = 0; gGameStatusPtr->disableScripts = FALSE; diff --git a/src/world/action/hammer.c b/src/world/action/hammer.c index 183aeadfa4..089e336370 100644 --- a/src/world/action/hammer.c +++ b/src/world/action/hammer.c @@ -109,7 +109,7 @@ void action_hammer_play_hit_fx(s32 hitID) { break; } - sfx_play_sound_at_player(soundID, 0); + sfx_play_sound_at_player(soundID, SOUND_SPACE_MODE_0); start_rumble(256, 50); } @@ -265,7 +265,7 @@ void action_update_hammer(void) { } suggest_player_anim_clearUnkFlag(anim); - sfx_play_sound_at_player(soundID, 0); + sfx_play_sound_at_player(soundID, SOUND_SPACE_MODE_0); HammerHit->unk_0C = 0; HammerHit->unk_14 = 0; } @@ -378,7 +378,7 @@ void func_802B6820_E256F0(void) { } else { soundID = SOUND_2115; } - sfx_play_sound_at_player(soundID, 0); + sfx_play_sound_at_player(soundID, SOUND_SPACE_MODE_0); action_hammer_play_hit_fx(HammerHit->hitID); diff --git a/src/world/action/hit_lava.c b/src/world/action/hit_lava.c index 1da94c073d..61b8222245 100644 --- a/src/world/action/hit_lava.c +++ b/src/world/action/hit_lava.c @@ -48,7 +48,7 @@ void action_update_hit_lava(void) { subtract_hp(1); open_status_menu_long(); gOverrideFlags |= GLOBAL_OVERRIDES_40; - sfx_play_sound_at_player(SOUND_E8, 0); + sfx_play_sound_at_player(SOUND_E8, SOUND_SPACE_MODE_0); } switch (playerStatus->actionSubstate) { @@ -173,7 +173,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, 0); + sfx_play_sound_at_player(SOUND_3FB, SOUND_SPACE_MODE_0); suggest_player_anim_setUnkFlag(ANIM_Mario_8001A); playerStatus->flags &= ~PS_FLAG_HIT_FIRE; playerStatus->flags &= ~PS_FLAG_FLYING; diff --git a/src/world/action/jump.c b/src/world/action/jump.c index 6f533afc99..249b68ae51 100644 --- a/src/world/action/jump.c +++ b/src/world/action/jump.c @@ -53,10 +53,10 @@ void action_update_jump(void) { if (playerStatus->actionState == ACTION_STATE_JUMP) { if (playerStatus->animFlags & PA_FLAG_8BIT_MARIO) { - sfx_play_sound_at_player(SOUND_JUMP_8BIT_MARIO, 0); + sfx_play_sound_at_player(SOUND_JUMP_8BIT_MARIO, SOUND_SPACE_MODE_0); } else { - sfx_play_sound_at_player(SOUND_JUMP_2081, 0); + sfx_play_sound_at_player(SOUND_JUMP_2081, SOUND_SPACE_MODE_0); } } } diff --git a/src/world/action/land.c b/src/world/action/land.c index 1938c20c15..67826b5429 100644 --- a/src/world/action/land.c +++ b/src/world/action/land.c @@ -44,8 +44,8 @@ void action_update_land(void) { } suggest_player_anim_clearUnkFlag(anim); - sfx_play_sound_at_player(SOUND_8161, 0); - sfx_play_sound_at_player(SOUND_SOFT_LAND, 0); + 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); if (!(collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT)) { phys_adjust_cam_on_landing(); @@ -132,7 +132,7 @@ void action_update_peach_land(void) { playerStatus->landPos.x = playerStatus->position.x; playerStatus->landPos.z = playerStatus->position.z; - sfx_play_sound_at_player(SOUND_SOFT_LAND, 0); + sfx_play_sound_at_player(SOUND_SOFT_LAND, SOUND_SPACE_MODE_0); if (!(collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT)) { phys_adjust_cam_on_landing(); diff --git a/src/world/action/slide.c b/src/world/action/slide.c index e9d9362bdf..5688db963f 100644 --- a/src/world/action/slide.c +++ b/src/world/action/slide.c @@ -56,7 +56,7 @@ void action_update_sliding(void) { D_802B6798 = 0.0f; D_802B679C = 0; suggest_player_anim_clearUnkFlag(ANIM_Mario_1000A); - sfx_play_sound_at_player(SOUND_167, 0); + sfx_play_sound_at_player(SOUND_167, SOUND_SPACE_MODE_0); gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; } speed = playerStatus->currentSpeed; @@ -119,7 +119,7 @@ void action_update_sliding(void) { } playerStatus->currentSpeed -= speed; if (playerStatus->currentSpeed <= 0.0f) { - sfx_play_sound_at_player(SOUND_DUST_OFF, 0); + sfx_play_sound_at_player(SOUND_DUST_OFF, SOUND_SPACE_MODE_0); suggest_player_anim_setUnkFlag(ANIM_Mario_DustOff); playerStatus->actionSubstate = SUBSTATE_DUST_OFF; playerStatus->currentStateTime = 15; @@ -149,7 +149,7 @@ void action_update_sliding(void) { if (hitID >= 0) { SlideLaunchSpeed = -1; suggest_player_anim_setUnkFlag(ANIM_Mario_80003); - sfx_play_sound_at_player(SOUND_162, 0); + sfx_play_sound_at_player(SOUND_162, SOUND_SPACE_MODE_0); playerStatus->actionSubstate++; // SUBSTATE_CRASH } break; @@ -170,7 +170,7 @@ void action_update_sliding(void) { } if (playerStatus->animNotifyValue != 0) { suggest_player_anim_setUnkFlag(ANIM_Mario_DustOff); - sfx_play_sound_at_player(SOUND_DUST_OFF, 0); + sfx_play_sound_at_player(SOUND_DUST_OFF, SOUND_SPACE_MODE_0); playerStatus->currentStateTime = 15; playerStatus->actionSubstate++; // SUBSTATE_DUST_OFF } diff --git a/src/world/action/sneaky_parasol.c b/src/world/action/sneaky_parasol.c index 1a064345bc..a50a26e0a3 100644 --- a/src/world/action/sneaky_parasol.c +++ b/src/world/action/sneaky_parasol.c @@ -111,7 +111,7 @@ void action_update_parasol(void) { disguiseNpc = get_npc_by_index(PeachDisguiseNpcIndex); disguiseNpc->flags |= NPC_FLAG_40000; playerStatus->flags |= PS_FLAG_ROTATION_LOCKED; - sfx_play_sound_at_player(SOUND_FD, 0); + sfx_play_sound_at_player(SOUND_FD, SOUND_SPACE_MODE_0); } } @@ -120,7 +120,7 @@ void action_update_parasol(void) { if (playerStatus->flipYaw[CAM_DEFAULT] == 0) { if (peach_disguise_check_overlaps() < 0) { suggest_player_anim_clearUnkFlag(ANIM_Peach_C0024); - sfx_play_sound_at_player(SOUND_92, 0); + sfx_play_sound_at_player(SOUND_92, SOUND_SPACE_MODE_0); playerStatus->actionSubstate++; // SUBSTATE_USE_PARASOL } else { suggest_player_anim_clearUnkFlag(ANIM_Peach_C0027); @@ -145,7 +145,7 @@ void action_update_parasol(void) { playerStatus->currentStateTime = 12; playerStatus->flags |= PS_FLAG_ROTATION_LOCKED; playerStatus->actionSubstate++; // SUBSTATE_DISGUISE_BEGIN - sfx_play_sound_at_player(SOUND_FD, 0); + sfx_play_sound_at_player(SOUND_FD, SOUND_SPACE_MODE_0); } break; case SUBSTATE_DISGUISE_BEGIN: @@ -384,7 +384,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, 0); + sfx_play_sound_at_player(SOUND_FE, 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 b72fb4019b..8992553c9f 100644 --- a/src/world/action/spin.c +++ b/src/world/action/spin.c @@ -107,7 +107,7 @@ void action_update_spin(void) { playerSpinState->spinSoundID = SOUND_2114; } - sfx_play_sound_at_player(playerSpinState->spinSoundID, 0); + sfx_play_sound_at_player(playerSpinState->spinSoundID, SOUND_SPACE_MODE_0); suggest_player_anim_setUnkFlag(anim); if ((clamp_angle(playerStatus->targetYaw - gCameras[gCurrentCameraID].currentYaw) <= 180.0f)) { diff --git a/src/world/action/spin_jump.c b/src/world/action/spin_jump.c index a582c5993c..9d33129df2 100644 --- a/src/world/action/spin_jump.c +++ b/src/world/action/spin_jump.c @@ -39,7 +39,7 @@ void action_update_spin_jump(void) { disable_player_input(); playerStatus->flags |= PS_FLAG_SPECIAL_JUMP; gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; - sfx_play_sound_at_player(SOUND_SPIN_JUMP, 0); + sfx_play_sound_at_player(SOUND_SPIN_JUMP, SOUND_SPACE_MODE_0); } landed = FALSE; @@ -135,7 +135,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, 0); + sfx_play_sound_at_player(SOUND_149, 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 5394d0cf04..2ef5bade6f 100644 --- a/src/world/action/tornado_jump.c +++ b/src/world/action/tornado_jump.c @@ -91,7 +91,7 @@ void action_update_tornado_jump(void) { playerStatus->currentStateTime = 3; playerStatus->flags |= PS_FLAG_FALLING; playerStatus->actionSubstate++; - sfx_play_sound_at_player(SOUND_TORNADO_JUMP, 0); + sfx_play_sound_at_player(SOUND_TORNADO_JUMP, SOUND_SPACE_MODE_0); } if (colliderBelow >= 0) { playerStatus->flags &= ~(PS_FLAG_SPINNING | PS_FLAG_FLYING); @@ -123,7 +123,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, 0); + sfx_play_sound_at_player(SOUND_14A, SOUND_SPACE_MODE_0); start_rumble(256, 50); gCurrentHiddenPanels.tryFlipTrigger = TRUE; @@ -150,7 +150,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, 0); + sfx_play_sound_at_player(SOUND_14A, 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 12119d78a8..0a24a3647f 100644 --- a/src/world/action/use_munchlesia.c +++ b/src/world/action/use_munchlesia.c @@ -58,7 +58,7 @@ void action_update_use_munchlesia(void) { gCameras[CAM_DEFAULT].targetPos.z = playerStatus->position.z; hitPosY = player_check_collision_below(Munchlesia_LaunchVelocity, &colliderID); if (colliderID >= 0) { - sfx_play_sound_at_player(SOUND_162, 0); + sfx_play_sound_at_player(SOUND_162, SOUND_SPACE_MODE_0); suggest_player_anim_setUnkFlag(ANIM_Mario_80003); playerStatus->position.y = hitPosY; D_802B62E0 = 10; diff --git a/src/world/action/use_tweester.c b/src/world/action/use_tweester.c index 3407fc8b42..aa940a4d37 100644 --- a/src/world/action/use_tweester.c +++ b/src/world/action/use_tweester.c @@ -30,7 +30,7 @@ void action_update_use_tweester(void) { PlayerTweesterPhysics->angularVelocity = 6.0f; PlayerTweesterPhysics->liftoffVelocityPhase = 50.0f; PlayerTweesterPhysics->countdown = 120; - sfx_play_sound_at_player(SOUND_TWEESTER_LAUNCH, 0); + sfx_play_sound_at_player(SOUND_TWEESTER_LAUNCH, SOUND_SPACE_MODE_0); } switch (playerStatus->actionSubstate) { 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 cebf8da727..54a59a8a1b 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 @@ -316,7 +316,7 @@ StaticNpc N(NpcData_Boo_01)[] = { EvtScript N(EVS_TubbaWalking) = { EVT_LOOP(LVar0) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.5)) EVT_WAIT(5) EVT_END_LOOP @@ -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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Boo_03, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(GetNpcPos, NPC_Boo_03, LVar0, LVar1, LVar2) @@ -350,12 +350,12 @@ EvtScript N(EVS_Scene_TubbaRaid) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_Boo_03, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_00A0) - EVT_CALL(PlaySoundAt, SOUND_20F6, 0, 450, 200, 160) + 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, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_262, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_262, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_05, SOUND_262, 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_05, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Boo_01, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Boo_02, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Boo_03, EMOTE_EXCLAMATION, -45, 20, TRUE, 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, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_262, 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(ShowEmote, NPC_Boo_01, EMOTE_EXCLAMATION, 45, 20, TRUE, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Boo_02, EMOTE_EXCLAMATION, 45, 20, TRUE, 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) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_315, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_315, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(40) 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 826fe1ffa9..e486d6b43e 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 @@ -26,7 +26,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_CALL(PlaySound, SOUND_80000067) EVT_CALL(N(StarSpiritEffectFunc1)) EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, 0, 145, 65, 0) + EVT_CALL(PlaySoundAt, SOUND_B2, SOUND_SPACE_MODE_0, 145, 65, 0) EVT_END_THREAD EVT_THREAD EVT_WAIT(12) @@ -35,7 +35,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_THREAD EVT_WAIT(50) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, 0, 145, 65, 0) + EVT_CALL(PlaySoundAt, SOUND_137, SOUND_SPACE_MODE_0, 145, 65, 0) EVT_END_THREAD EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD @@ -61,7 +61,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_138, 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_14) @@ -88,7 +88,7 @@ EvtScript N(EVS_RespawnStarCard) = { EVT_CALL(PlaySound, SOUND_80000067) EVT_CALL(N(StarSpiritEffectFunc1)) EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, 0, 145, 65, 0) + EVT_CALL(PlaySoundAt, SOUND_B2, SOUND_SPACE_MODE_0, 145, 65, 0) EVT_END_THREAD EVT_THREAD EVT_WAIT(12) @@ -97,7 +97,7 @@ EvtScript N(EVS_RespawnStarCard) = { EVT_THREAD EVT_WAIT(50) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, 0, 145, 65, 0) + EVT_CALL(PlaySoundAt, SOUND_137, SOUND_SPACE_MODE_0, 145, 65, 0) EVT_END_THREAD EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD @@ -123,7 +123,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_138, 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_14) @@ -152,20 +152,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_TubbasHeart, EVT_FLOAT(2.5)) EVT_CALL(NpcJump0, NPC_TubbasHeart, 0, 20, -120, 8) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, 0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, 0, 10, -60, 12) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, 0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, 0, 0, 0, 12) EVT_WAIT(1) EVT_CALL(SetNpcVar, NPC_TubbasHeart, 0, 0) EVT_THREAD EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, 0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, 0, 0, 0, 10) EVT_WAIT(1) EVT_CALL(GetNpcVar, NPC_TubbasHeart, 0, LVar0) @@ -185,7 +185,7 @@ EvtScript N(EVS_Scene_TubbaReunion) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_tt3, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tt3, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(NpcFaceNpc, NPC_TubbasHeart, NPC_Tubba, 0) EVT_CALL(SpeakToPlayer, NPC_TubbasHeart, ANIM_TubbasHeart_Anim0A, ANIM_TubbasHeart_Anim01, 5, MSG_CH3_00C7) @@ -197,10 +197,10 @@ EvtScript N(EVS_Scene_TubbaReunion) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, 0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, 75, 0, 10, 12) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, 0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, 150, 0, 20, 12) EVT_WAIT(1) EVT_THREAD @@ -215,7 +215,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, 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) @@ -226,7 +226,7 @@ EvtScript N(EVS_Scene_TubbaReunion) = { EVT_END_THREAD EVT_WAIT(20) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_tt3, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tt3, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -262,7 +262,7 @@ EvtScript N(EVS_Scene_TubbaReunion) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_tt3, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tt3, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(PlayerMoveTo, 200, 0, 35) EVT_WAIT(5) 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 80229a4964..30a96d75da 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, 0) + EVT_CALL(PlaySoundAtModel, MODEL_o36, SOUND_8000004A, 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 d199332d1f..a9839520fd 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 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 6b44fe953a..1328de5c7f 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 @@ -17,7 +17,7 @@ API_CALLABLE(N(UpgradeStarPowerCh3)) { EvtScript N(EVS_TubbaWalking) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.8)) EVT_END_LOOP EVT_RETURN @@ -54,22 +54,22 @@ EvtScript N(EVS_Scene_BossDefeated) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim22) EVT_WAIT(15) EVT_LOOP(4) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_02, 0, 1) EVT_WAIT(4) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_05, 0, 1) EVT_WAIT(4) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_01, 0, 1) EVT_WAIT(6) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_03, 0, 1) EVT_WAIT(8) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_04, 0, 1) EVT_WAIT(6) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_06, 0, 1) EVT_WAIT(6) EVT_END_LOOP @@ -78,7 +78,7 @@ EvtScript N(EVS_Scene_BossDefeated) = { EVT_WAIT(30) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim22) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000010, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcVar, NPC_Boo_02, 0, 1) EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim21) @@ -451,7 +451,7 @@ EvtScript N(EVS_Scene_SkolarRescued) = { EVT_CALL(SetNpcAnimation, NPC_Skolar, ANIM_WorldSkolar_Leap) EVT_WAIT(20) EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) - EVT_CALL(PlaySoundAtPlayer, SOUND_139, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) EVT_ADD(LVar1, 50) @@ -464,7 +464,7 @@ EvtScript N(EVS_Scene_SkolarRescued) = { EVT_WAIT(6) EVT_END_LOOP EVT_WAIT(20) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_188, 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) @@ -530,7 +530,7 @@ EvtScript N(EVS_Scene_SkolarRescued) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_2045, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_2045, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) 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 d97476a4ca..f6fe9b9b82 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, -50, 0, 50, 10) 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, -110, 0, 110, 10) 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, -180, 0, 180, 10) EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim07) EVT_WAIT(1) @@ -73,7 +73,7 @@ EvtScript N(EVS_EnterMap) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_tts, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tts, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_WAIT(20) EVT_CALL(SetPlayerPos, 0, 0, 0) EVT_CALL(SetNpcPos, NPC_PARTNER, 0, 0, 0) 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 ebcaa02797..a0421594e3 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 0, 25, -10, 6) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2086, 0) + 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 0, 200, 0, 15) 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 2f6ed6f7e4..3bab95095d 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, 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 3fd2130f16..35f3e37de5 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 @@ -34,10 +34,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 10) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, 0) + EVT_CALL(PlaySoundAtNpc, NPC_TubbasHeart, SOUND_20C8, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 10) EVT_END_THREAD EVT_WAIT(40) 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 858cc09cc0..75d43248dd 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 @@ -28,7 +28,7 @@ EvtScript N(EVS_NpcIdle_TubbasHeart) = { EvtScript N(EVS_Heart_OpenDoor) = { EVT_WAIT(15) - EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -52,7 +52,7 @@ EvtScript N(EVS_Heart_CloseDoor) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; @@ -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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 12) 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 12) 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 12) 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 9b4d134ef4..6a0a007721 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, 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 6d448d5d57..7f9d5123ef 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C8, 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_dgb/dgb_00/dgb_00_3_npc.c b/src/world/area_dgb/dgb_00/dgb_00_3_npc.c index a9930aacaf..28a255b74e 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 @@ -4,7 +4,7 @@ API_CALLABLE(N(PlaySentinelSounds)) { Npc* npc = get_npc_unsafe(get_enemy(NPC_Sentinel)->npcID); - sfx_adjust_env_sound_pos(SOUND_32E, 0, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_adjust_env_sound_pos(SOUND_32E, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); return ApiStatus_DONE2; } @@ -21,7 +21,7 @@ EvtScript N(EVS_SetDoorRots) = { EVT_SET(LVar3, 0) EVT_SUB(LVar3, LVar2) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliwt, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deiliwt, SOUND_CREAKY_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deiliwt, SOUND_CREAKY_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 80, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -48,7 +48,7 @@ EvtScript N(EVS_CloseDoors) = { EVT_GOTO(10) EVT_END_IF EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deiliwt, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deiliwt, SOUND_CREAKY_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deiliwt, SOUND_CREAKY_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; @@ -211,7 +211,7 @@ EvtScript N(EVS_TubbaTaunting) = { EVT_WAIT(LVar0) EVT_IF_EQ(MV_PreventTaunting, FALSE) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAt, SOUND_B4, 0, 240, 10, -125) + EVT_CALL(PlaySoundAt, SOUND_B4, 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) @@ -251,10 +251,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, 0, 240, 10, -125) + EVT_CALL(PlaySoundAt, SOUND_B4, SOUND_SPACE_MODE_0, 240, 10, -125) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0)) EVT_WAIT(10) - EVT_CALL(PlaySoundAt, SOUND_B4, 0, 240, 10, -125) + EVT_CALL(PlaySoundAt, SOUND_B4, 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) @@ -270,12 +270,12 @@ EvtScript N(EVS_Scene_BoosApproachManor) = { EvtScript N(EVS_Scene_EscapeFromTubba) = { EVT_CALL(SetPlayerSpeed, EVT_FLOAT(8.0)) EVT_CALL(PlayerMoveTo, 184, -44, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_01, SOUND_262, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_262, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_262, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_04, SOUND_262, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_05, SOUND_262, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_06, SOUND_262, 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(ShowEmote, NPC_Boo_01, EMOTE_EXCLAMATION, 45, 20, TRUE, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Boo_02, EMOTE_EXCLAMATION, 45, 20, TRUE, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Boo_03, EMOTE_EXCLAMATION, 45, 20, TRUE, 0, 0, 0, 0) @@ -329,10 +329,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, 0, 240, 10, -125) + EVT_CALL(PlaySoundAt, SOUND_B4, SOUND_SPACE_MODE_0, 240, 10, -125) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0)) EVT_WAIT(5) - EVT_CALL(PlaySoundAt, SOUND_B4, 0, 240, 10, -125) + EVT_CALL(PlaySoundAt, SOUND_B4, 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)) @@ -556,7 +556,7 @@ 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Sentinel, SOUND_2F7, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_Sentinel, ANIM_Sentinel_Anim02) EVT_CALL(SetNpcPos, NPC_Sentinel, 175, 70, -33) EVT_THREAD @@ -573,7 +573,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Sentinel, SOUND_162, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerAnimation, ANIM_Mario_80003) EVT_THREAD EVT_WAIT(2) @@ -617,9 +617,9 @@ EvtScript N(EVS_Scene_ThrownOutBySentinel) = { EVT_WAIT(20) EVT_CALL(SetPlayerAnimation, ANIM_Mario_DustOff) EVT_WAIT(7) - EVT_CALL(PlaySoundAtPlayer, SOUND_DUST_OFF, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_DUST_OFF, SOUND_SPACE_MODE_0) EVT_WAIT(8) - EVT_CALL(PlaySoundAtPlayer, SOUND_DUST_OFF, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_DUST_OFF, SOUND_SPACE_MODE_0) EVT_WAIT(15) EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001B) EVT_WAIT(25) 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 75573695e9..4950b3d2d9 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 @@ -21,9 +21,9 @@ EvtScript N(EVS_Scene_TubbaSmashBridges) = { EVT_CALL(InterruptUsePartner) EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000A) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_MODE_0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_MODE_0) EVT_WAIT(5) EVT_END_THREAD EVT_THREAD @@ -32,7 +32,7 @@ EvtScript N(EVS_Scene_TubbaSmashBridges) = { EVT_WAIT(30) EVT_THREAD EVT_LOOP(12) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_MODE_0) EVT_WAIT(5) EVT_END_LOOP EVT_END_THREAD @@ -133,10 +133,10 @@ EvtScript N(EVS_Scene_TubbaSmashBridges) = { EVT_CALL(NpcMoveTo, NPC_Tubba, 176, 0, 0) EVT_END_THREAD EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.3)) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(0.15)) EVT_WAIT(8) EVT_END_THREAD @@ -160,10 +160,10 @@ EvtScript N(EVS_Scene_TubbaSmashBridges) = { EVT_END_THREAD EVT_THREAD EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.3)) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(0.15)) EVT_WAIT(8) EVT_END_LOOP 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 d472edf27d..402de2d9b9 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 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 50c7cfb7d4..611f9c89c1 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 @@ -20,7 +20,7 @@ EvtScript N(EVS_NpcIdle_Tubba_Floor3) = { EVT_WAIT(1) EVT_END_LOOP EVT_SET(GB_ARN_Tubba_MapID, 1) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_CREAKY_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_CREAKY_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -48,7 +48,7 @@ EvtScript N(EVS_NpcIdle_Tubba_Floor3) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_CREAKY_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_CREAKY_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_Tubba, ANIM_WorldTubba_Anim10, ANIM_WorldTubba_Anim06, 0, MSG_CH3_0101) EVT_THREAD @@ -66,7 +66,7 @@ EvtScript N(EVS_NpcIdle_Tubba_Floor3) = { EVT_CALL(SetNpcJumpscale, NPC_Tubba, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_Tubba, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Tubba, LVar0, LVar1, LVar2, 30) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20A0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20A0, SOUND_SPACE_MODE_0) EVT_CALL(PlaySound, SOUND_8000005D) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(4.0)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(2.0)) @@ -121,7 +121,7 @@ EvtScript N(EVS_NpcIdle_Tubba_Floor1) = { EVT_CALL(AwaitPlayerApproach, 0, 420, 400) EVT_SET(GB_ARN_Tubba_MapID, 1) EVT_SET(GB_StoryProgress, STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittse, SOUND_CREAKY_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittse, SOUND_CREAKY_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -148,7 +148,7 @@ EvtScript N(EVS_NpcIdle_Tubba_Floor1) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittse, SOUND_CREAKY_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittse, SOUND_CREAKY_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_THREAD EVT_LOOP(0) 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 5f694c305d..7d40ba959f 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o77, SOUND_80000010, SOUND_SPACE_MODE_0) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_o77, LVar0, 0, 0) 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 60fa49e55b..d3430f95e8 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 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 b3e5f8bdaf..6430ebd0ff 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 @@ -34,7 +34,7 @@ EvtScript N(EVS_NpcIdle_Tubba) = { EVT_END_LOOP EVT_SET(GB_ARN_Tubba_MapID, 8) EVT_SET(GB_StoryProgress, STORY_CH3_TUBBA_CHASED_MARIO_IN_HALL) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_CREAKY_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_CREAKY_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -61,7 +61,7 @@ EvtScript N(EVS_NpcIdle_Tubba) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_CREAKY_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_CREAKY_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(NpcMoveTo, NPC_SELF, -500, 80, 10) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Tubba))) @@ -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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2F1, 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_11/dgb_11_3_entity.c b/src/world/area_dgb/dgb_11/dgb_11_3_entity.c index 9c9f374ce4..ba44826fda 100644 --- a/src/world/area_dgb/dgb_11/dgb_11_3_entity.c +++ b/src/world/area_dgb/dgb_11/dgb_11_3_entity.c @@ -68,7 +68,7 @@ EvtScript N(EVS_UseSpring) = { EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.0)) EVT_CALL(PlayerJump1, 375, 25, -250, 10) EVT_CALL(N(PlaySpringAnimation)) - EVT_CALL(PlaySoundAtPlayer, SOUND_2086, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_2086, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.7)) EVT_CALL(PlayerJump, 375, 0, -175, 15) EVT_KILL_THREAD(LVarA) diff --git a/src/world/area_dgb/dgb_12/dgb_12_3_spikes.c b/src/world/area_dgb/dgb_12/dgb_12_3_spikes.c index 08c6f8a2ad..9ab4d92c0d 100644 --- a/src/world/area_dgb/dgb_12/dgb_12_3_spikes.c +++ b/src/world/area_dgb/dgb_12/dgb_12_3_spikes.c @@ -32,7 +32,7 @@ EvtScript N(EVS_SetupSpikes) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(60) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o215, SOUND_2093, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o215, SOUND_2093, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o215, COLLIDER_FLAGS_UPPER_MASK) EVT_END_THREAD diff --git a/src/world/area_dgb/dgb_15/dgb_15_4_entity.c b/src/world/area_dgb/dgb_15/dgb_15_4_entity.c index fabcb3c787..8c56a462ac 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 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 87adcb43d0..7644ce7cb3 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 @@ -61,7 +61,7 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { EVT_CALL(FadeOutMusic, 0, 500) EVT_LOOP(3) EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001E) - EVT_CALL(PlaySoundAt, SOUND_20F6, 0, 382, 0, 218) + EVT_CALL(PlaySoundAt, SOUND_20F6, SOUND_SPACE_MODE_0, 382, 0, 218) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(20) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) @@ -83,7 +83,7 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000C) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_CREAKY_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_CREAKY_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -96,7 +96,7 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { EVT_END_LOOP EVT_THREAD EVT_LOOP(3) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20F6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20F6, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.3)) EVT_WAIT(5) EVT_END_LOOP @@ -117,7 +117,7 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_CREAKY_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_CREAKY_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldTubba_Anim10, ANIM_WorldTubba_Anim06, 5, MSG_CH3_00F4) @@ -130,14 +130,14 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { EVT_IF_EQ(LVar0, 1) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20F6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20F6, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.3)) EVT_WAIT(9) EVT_CALL(GetSelfVar, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20F6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20F6, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(0.15)) EVT_WAIT(12) EVT_END_LOOP @@ -227,7 +227,7 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim24) EVT_WAIT(30) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2038, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2038, SOUND_SPACE_MODE_0) EVT_WAIT(30) EVT_THREAD EVT_CALL(SetSelfVar, 1, 0) @@ -236,12 +236,12 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { EVT_IF_EQ(LVar0, 1) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2039, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2039, SOUND_SPACE_MODE_0) EVT_CALL(RandInt, 10, LVar1) EVT_ADD(LVar1, 15) EVT_CALL(ShowSleepBubble, NPC_Tubba, 0, 0, 2, 628, 121, 127, LVar1, LVar0) EVT_WAIT(48) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2038, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2038, SOUND_SPACE_MODE_0) EVT_CALL(RandInt, 10, LVar1) EVT_ADD(LVar1, 10) EVT_CALL(SetSleepBubbleTimeLeft, LVar0, LVar1) @@ -270,7 +270,7 @@ EvtScript N(EVS_NpcIdle_Tubba_Asleep) = { EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim24) EVT_WAIT(30) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2038, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2038, SOUND_SPACE_MODE_0) EVT_WAIT(30) EVT_THREAD EVT_CALL(SetSelfVar, 1, 0) @@ -279,12 +279,12 @@ EvtScript N(EVS_NpcIdle_Tubba_Asleep) = { EVT_IF_EQ(LVar0, 1) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2039, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2039, SOUND_SPACE_MODE_0) EVT_CALL(RandInt, 10, LVar1) EVT_ADD(LVar1, 15) EVT_CALL(ShowSleepBubble, NPC_Tubba, 0, 0, 2, 628, 121, 127, LVar1, LVar0) EVT_WAIT(48) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2038, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2038, SOUND_SPACE_MODE_0) EVT_CALL(RandInt, 10, LVar1) EVT_ADD(LVar1, 10) EVT_CALL(SetSleepBubbleTimeLeft, LVar0, LVar1) @@ -297,13 +297,13 @@ EvtScript N(EVS_NpcIdle_Tubba_Asleep) = { EvtScript N(EVS_NpcAI_Tubba_WakeUp) = { EVT_SET_GROUP(EVT_GROUP_0B) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2039, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2039, SOUND_SPACE_MODE_0) EVT_CALL(ShowSleepBubble, NPC_Tubba, 0, 50, 2, 552, 111, 128, 30, LVar0) EVT_WAIT(360) EVT_CALL(SetSleepBubbleTimeLeft, LVar0, 20) EVT_CALL(SetNpcVar, NPC_SELF, 1, 2) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2F1, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2F1, 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_5_rooms.c b/src/world/area_dro/dro_01/dro_01_5_rooms.c index feb0075f8d..93e2fd3595 100644 --- a/src/world/area_dro/dro_01/dro_01_5_rooms.c +++ b/src/world/area_dro/dro_01/dro_01_5_rooms.c @@ -219,7 +219,7 @@ EvtScript N(EVS_SwingSign_Shop) = { EvtScript N(EVS_OpenShopDoor) = { EVT_CALL(SetGroupEnabled, MODEL_mise_naka, 1) - EVT_CALL(PlaySoundAtCollider, COLLIDER_em_1, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_em_1, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 100, 15, EASING_QUADRATIC_OUT) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -241,7 +241,7 @@ EvtScript N(EVS_CloseShopDoor) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_em_1, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_em_1, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(SetGroupEnabled, MODEL_mise_naka, 0) EVT_RETURN EVT_END 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 51076da112..2eff9c4fd4 100644 --- a/src/world/area_dro/dro_01/npc_shop_owner.c +++ b/src/world/area_dro/dro_01/npc_shop_owner.c @@ -54,7 +54,7 @@ EvtScript N(EVS_NpcIdle_ShopOwner) = { EVT_CALL(NpcMoveTo, NPC_SELF, 103, 11, 20) EVT_CALL(NpcMoveTo, NPC_SELF, 150, 18, 20) EVT_CALL(EnableNpcBlur, NPC_SELF, TRUE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, SOUND_SPACE_MODE_0) EVT_CALL(NpcMoveTo, NPC_SELF, 554, -12, 20) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_WAIT(30) @@ -71,7 +71,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcPos, NPC_SELF, 470, 0, 18) EVT_CALL(NpcMoveTo, NPC_SELF, 287, 9, 20) EVT_CALL(NpcMoveTo, NPC_SELF, 102, -14, 20) diff --git a/src/world/area_dro/dro_02/dro_02_4_rooms.c b/src/world/area_dro/dro_02/dro_02_4_rooms.c index a42b0c17aa..f57a9a07c5 100644 --- a/src/world/area_dro/dro_02/dro_02_4_rooms.c +++ b/src/world/area_dro/dro_02/dro_02_4_rooms.c @@ -134,7 +134,7 @@ EvtScript N(EVS_OpenSecretDoor_FromOutside) = { EVT_CALL(func_802D2C14, 1) EVT_CALL(PlayerMoveTo, 230, 10, 20) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1287, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o1287, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1287, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 18, 80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -154,7 +154,7 @@ EvtScript N(EVS_OpenSecretDoor_FromOutside) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o1287, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1287, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1287, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(func_802D2C14, 0) EVT_CALL(DisablePlayerInput, FALSE) @@ -168,7 +168,7 @@ EvtScript N(EVS_OpenSecretDoor_FromInside) = { EVT_CALL(func_802D2C14, 1) EVT_CALL(PlayerMoveTo, 230, -70, 20) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1289, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o1289, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1289, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 18, 80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -188,7 +188,7 @@ EvtScript N(EVS_OpenSecretDoor_FromInside) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o1289, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1289, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1289, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(func_802D2C14, 0) EVT_CALL(DisablePlayerInput, FALSE) 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 77cfedf045..3aef225bea 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 @@ -268,7 +268,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, SOUND_SPACE_MODE_0) EVT_CALL(NpcMoveTo, NPC_SELF, -83, 11, 20) EVT_CALL(NpcMoveTo, NPC_SELF, -239, 5, 20) EVT_CALL(NpcMoveTo, NPC_SELF, -371, 5, 20) diff --git a/src/world/area_dro/dro_02/npc_merlee.c b/src/world/area_dro/dro_02/npc_merlee.c index f945741443..97af483f9b 100644 --- a/src/world/area_dro/dro_02/npc_merlee.c +++ b/src/world/area_dro/dro_02/npc_merlee.c @@ -606,7 +606,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Merlee, SOUND_201, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(MakeLerp, 720, 0, 60, EASING_LINEAR) EVT_LOOP(0) @@ -637,7 +637,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Merlee, SOUND_202, 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) 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 adabda9696..00b0c9ab26 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 @@ -6,7 +6,7 @@ EvtScript N(EVS_ParadePhase_Luigi) = { EVT_WAIT(80) EVT_THREAD EVT_LOOP(9) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi, SOUND_11, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi, SOUND_11, SOUND_SPACE_MODE_0) EVT_WAIT(15) EVT_END_LOOP EVT_END_THREAD @@ -20,7 +20,7 @@ EvtScript N(EVS_ParadePhase_Luigi) = { EVT_THREAD EVT_WAIT(10) EVT_LOOP(4) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi, SOUND_14, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi, SOUND_14, SOUND_SPACE_MODE_0) EVT_WAIT(15) EVT_END_LOOP EVT_END_THREAD diff --git a/src/world/area_flo/common/DroppingVine.inc.c b/src/world/area_flo/common/DroppingVine.inc.c index 97e4e6f4ea..59578d098d 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, 0, LVar3, LVar4, LVar5) + EVT_CALL(PlaySoundAt, SOUND_F8, 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 7f80a8fca0..9459d1dbad 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, 0x400000, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_1DB, 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_1DC, 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 134a259766..a650e1fce4 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_1CF, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_1D0, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_1CF, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_1D0, 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 feda36f13e..78b50ca32d 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 @@ -477,7 +477,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Leap) EVT_WAIT(20) EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) - EVT_CALL(PlaySoundAtPlayer, SOUND_139, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) EVT_ADD(LVar1, 50) @@ -490,7 +490,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_WAIT(6) EVT_END_LOOP EVT_WAIT(20) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_188, 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) @@ -556,7 +556,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_Klevar, SOUND_2045, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Klevar, SOUND_2045, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) 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 9f7a5d7134..e7ddcaf0c3 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 @@ -360,7 +360,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { }; EvtScript N(EVS_Scene_BeanstalkGrowing) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o261, SOUND_19B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o261, SOUND_19B, 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 d592b0b713..e559c79724 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 @@ -167,10 +167,10 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, 0) + 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_QUESTION, -45, 30, TRUE, 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) @@ -184,7 +184,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim00) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_SURFACE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcPos, NPC_MontyMole_02, LVar0, LVar1, LVar2) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(20) @@ -225,7 +225,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Dayzee, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Dayzee, EMOTE_EXCLAMATION, 45, 30, TRUE, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0056) @@ -400,12 +400,12 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 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_10000000, 1) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_DIG, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim11) EVT_WAIT(20) EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleA, FALSE) @@ -428,7 +428,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_SET(AF_FLO_IsUnderground_Mole_01, FALSE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_01, 1) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) @@ -479,12 +479,12 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_02, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 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_10000000, 1) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_DIG, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim11) EVT_WAIT(20) EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleB, FALSE) @@ -507,7 +507,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_SET(AF_FLO_IsUnderground_Mole_02, FALSE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_02, 1) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_SURFACE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) @@ -558,12 +558,12 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_03, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 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_10000000, 1) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_DIG, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim11) EVT_WAIT(20) EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleC, FALSE) @@ -586,7 +586,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_SET(AF_FLO_IsUnderground_Mole_03, FALSE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_03, 1) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_SURFACE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) @@ -637,12 +637,12 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_04, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 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_10000000, 1) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_DIG, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim11) EVT_WAIT(20) EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleD, FALSE) @@ -665,7 +665,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_SET(AF_FLO_IsUnderground_Mole_04, FALSE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_04, 1) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_SURFACE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) 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 e63ee940c9..0a8864d496 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 @@ -65,7 +65,7 @@ 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_7BC) + EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(func_802D62E4, SOUND_3BC) EVT_SET(AF_FLO_MadeCrystalBerry, TRUE) EVT_WAIT(20) 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 2ae1ac4d06..9e83e5e21c 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 @@ -33,17 +33,17 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CALL(N(FlowerGuard_JudgeItemTastiness), LVar0) EVT_CALL(MakeItemEntity, LVar8, -695, 20, -29, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVar7, LVar0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Yellow_Eat) EVT_WAIT(20) EVT_CALL(RemoveItemEntity, LVar7) EVT_SWITCH(LVar8) EVT_CASE_EQ(160) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Yellow_Chew, ANIM_GateFlower_Yellow_Idle, 0, MSG_CH6_0046) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_21C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_21C, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o96, SOUND_METAL_GATE_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o96, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(MakeLerp, 0, 100, 30, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -74,7 +74,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CASE_DEFAULT EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Yellow_Chew, ANIM_GateFlower_Yellow_Idle, 0, MSG_CH6_0044) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Yellow_Disgust) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, SOUND_SPACE_MODE_0) EVT_CALL(MakeItemEntity, LVar8, 125, 20, 0, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVar7, LVar0) EVT_WAIT(5) diff --git a/src/world/area_flo/flo_10/flo_10_5_npc.c b/src/world/area_flo/flo_10/flo_10_5_npc.c index 5a72f9163e..457b3fd87d 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 @@ -136,7 +136,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, TRUE, 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/area_flo/flo_13/flo_13_4_npc.c b/src/world/area_flo/flo_13/flo_13_4_npc.c index 22f813df39..87c3e4fc71 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 @@ -205,7 +205,7 @@ EvtScript N(EVS_Lakilulu_SpinyToss) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(2.0)) EVT_END_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_HIT_PLAYER_NORMAL, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerAnimation, ANIM_Mario_FallBack) EVT_SET(LVar0, 90) EVT_LOOP(20) 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 6cd26bc425..d37b1e038b 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, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_194, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); return ApiStatus_DONE2; } @@ -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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_2F3, 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, 0, 591, 55, 121) + EVT_CALL(PlaySoundAt, SOUND_193, 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 e2c33c258b..1dcc1b242b 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 @@ -5,13 +5,13 @@ s32 N(ShakeCamParams)[] = { 10, EVT_FLOAT(0.6), 13, EVT_FLOAT(0.75), 16, EVT_FLOAT(0.9), - 19, EVT_FLOAT(1.05), + 19, EVT_FLOAT(1.05), 22, EVT_FLOAT(1.2), 25, EVT_FLOAT(1.05), 24, EVT_FLOAT(0.9), - 25, EVT_FLOAT(0.75), + 25, EVT_FLOAT(0.75), 24, EVT_FLOAT(0.6), - 10, EVT_FLOAT(1.7), + 10, EVT_FLOAT(1.7), }; EvtScript N(EVS_MonitorFallingStairs) = { @@ -44,7 +44,7 @@ EvtScript N(EVS_MonitorFallingStairs) = { EVT_END_THREAD EVT_THREAD EVT_LOOP(6) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_187, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_187, 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 852d0ffa0d..b2e5ca66aa 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_80000025, 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 7c63ce2cdf..ce68da5192 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o130, SOUND_1E6, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_1E7, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o174, SOUND_1E7, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o127, SOUND_1E7, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o131, SOUND_1E6, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_1E6, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar4, EVT_FLOAT(-0.5)) @@ -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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_190, 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_190, 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_190, 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, 0, 70, 40, 10) + EVT_CALL(PlaySoundAt, SOUND_1A0, 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, 0, 0, 30, 30) + EVT_CALL(PlaySoundAt, SOUND_1A0, 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_491, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_91 | 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 acb8e0d692..d4693f8fc4 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 @@ -88,7 +88,7 @@ EvtScript N(EVS_Scene_LakilesterLikesBeingGood) = { EvtScript N(EVS_GangRetreat) = { EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_FlyingMagikoopa, SOUND_19E, 0) + EVT_CALL(PlaySoundAtNpc, NPC_FlyingMagikoopa, SOUND_19E, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcFlagBits, NPC_FlyingMagikoopa, NPC_FLAG_100, TRUE) EVT_CALL(InterpNpcYaw, NPC_FlyingMagikoopa, 270, 0) EVT_CALL(LoadPath, 60, EVT_PTR(N(RetreatPath_Magikoopa)), ARRAY_COUNT(N(RetreatPath_Magikoopa)), EASING_LINEAR) @@ -103,7 +103,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_END_THREAD EVT_WAIT(15) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_01, SOUND_19F, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_01, SOUND_19F, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcFlagBits, NPC_Lakitu_01, NPC_FLAG_100, 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) @@ -129,7 +129,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_03, SOUND_19F, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_03, SOUND_19F, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcFlagBits, NPC_Lakitu_03, NPC_FLAG_100, 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/area_flo/flo_21/flo_21_2_main.c b/src/world/area_flo/flo_21/flo_21_2_main.c index 9436b307b1..c8714e76e6 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 @@ -39,7 +39,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_CALL(PlaySound, SOUND_80000067) EVT_CALL(N(StarSpiritEffectFunc1)) EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, 0, 650, 205, 0) + EVT_CALL(PlaySoundAt, SOUND_B2, SOUND_SPACE_MODE_0, 650, 205, 0) EVT_END_THREAD EVT_THREAD EVT_WAIT(45) @@ -48,7 +48,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_THREAD EVT_WAIT(180) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, 0, 650, 205, 0) + EVT_CALL(PlaySoundAt, SOUND_137, SOUND_SPACE_MODE_0, 650, 205, 0) EVT_END_THREAD EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD @@ -74,7 +74,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_WAIT(1) EVT_END_IF EVT_CALL(N(StarSpiritEffectFunc4), 3) - EVT_CALL(PlaySoundAtPlayer, SOUND_138, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_138, 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_14) 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 9536a9cf57..07d9e02736 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 @@ -39,7 +39,7 @@ EvtScript N(EVS_PlayRumbleSounds) = { }; EvtScript N(EVS_HuffNPuff_JumpOut) = { - EVT_CALL(PlaySoundAtNpc, NPC_HuffNPuff_01, SOUND_3C0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_HuffNPuff_01, SOUND_3C0, 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)) @@ -315,7 +315,7 @@ EvtScript N(EVS_HuffNPuff_Defeat_AnimateScale) = { EVT_CHILD_THREAD EVT_USE_BUF(EVT_PTR(N(BeginAnimScaleX))) EVT_LOOP(ARRAY_COUNT(N(BeginAnimScaleX))) - EVT_CALL(PlaySoundAtNpc, NPC_HuffNPuff_01, SOUND_20B6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_HuffNPuff_01, SOUND_20B6, SOUND_SPACE_MODE_0) EVT_BUF_READ3(LVar6, LVar7, LVar8) EVT_CALL(MakeLerp, LVar6, LVar7, LVar8, EASING_SIN_OUT) EVT_LOOP(0) @@ -332,7 +332,7 @@ EvtScript N(EVS_HuffNPuff_Defeat_AnimateScale) = { EVT_LOOP(0) EVT_USE_BUF(EVT_PTR(N(LoopAnimScaleX))) EVT_LOOP(ARRAY_COUNT(N(LoopAnimScaleX))) - EVT_CALL(PlaySoundAtNpc, NPC_HuffNPuff_01, SOUND_20B6, 0) + EVT_CALL(PlaySoundAtNpc, NPC_HuffNPuff_01, SOUND_20B6, SOUND_SPACE_MODE_0) EVT_BUF_READ2(LVar6, LVar7) EVT_CALL(MakeLerp, LVar6, LVar7, 4, EASING_SIN_OUT) EVT_LOOP(0) @@ -417,7 +417,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, 0) + EVT_CALL(PlaySoundAtNpc, LVar8, SOUND_3D5, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, LVar8, LVar3, LVar4, -15, LVar5) EVT_CALL(SetNpcPos, LVar8, NPC_DISPOSE_LOCATION) EVT_END_THREAD @@ -430,7 +430,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, 0) + EVT_CALL(PlaySoundAtNpc, LVar8, SOUND_3D6, 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 1595447c58..190fb480d6 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 @@ -44,7 +44,7 @@ EvtScript N(EVS_TossItemIntoWell) = { EVT_CALL(RemoveItemEntity, LVar7) EVT_END_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAt, SOUND_302, 0, 35, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_302, SOUND_SPACE_MODE_0, 35, 0, 0) EVT_WAIT(5) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) 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 ab7f8edd20..3974e37ea9 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 @@ -33,17 +33,17 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CALL(N(FlowerGuard_JudgeItemTastiness), LVar0) EVT_CALL(MakeItemEntity, LVar8, 385, 20, -34, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVar7, LVar0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Blue_Eat) EVT_WAIT(20) EVT_CALL(RemoveItemEntity, LVar7) EVT_SWITCH(LVar8) EVT_CASE_EQ(158) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Blue_Chew, ANIM_GateFlower_Blue_Idle, 0, MSG_CH6_004D) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_21C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_21C, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o95, SOUND_METAL_GATE_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o95, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(MakeLerp, 0, 100, 30, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -74,7 +74,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CASE_DEFAULT EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Blue_Chew, ANIM_GateFlower_Blue_Idle, 0, MSG_CH6_004B) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Blue_Disgust) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, SOUND_SPACE_MODE_0) EVT_CALL(MakeItemEntity, LVar8, 375, 20, 0, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVar7, LVar0) EVT_WAIT(5) 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 03ebb19d8b..6acd33eed7 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 @@ -33,17 +33,17 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CALL(N(FlowerGuard_JudgeItemTastiness), LVar0) EVT_CALL(MakeItemEntity, LVar8, 505, 20, -24, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVar7, LVar0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Red_Eat) EVT_WAIT(20) EVT_CALL(RemoveItemEntity, LVar7) EVT_SWITCH(LVar8) EVT_CASE_EQ(159) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Red_Chew, ANIM_GateFlower_Red_Idle, 0, MSG_CH6_003F) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_21C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_21C, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o94, SOUND_METAL_GATE_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o94, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(MakeLerp, 0, 100, 30, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -74,7 +74,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CASE_DEFAULT EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Red_Chew, ANIM_GateFlower_Red_Idle, 0, MSG_CH6_003D) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Red_Disgust) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, SOUND_SPACE_MODE_0) EVT_CALL(MakeItemEntity, LVar8, -125, 20, 0, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVar7, LVar0) EVT_WAIT(5) diff --git a/src/world/area_hos/hos_03/hos_03_5_foliage.c b/src/world/area_hos/hos_03/hos_03_5_foliage.c index 595fcb718f..b2c8da703b 100644 --- a/src/world/area_hos/hos_03/hos_03_5_foliage.c +++ b/src/world/area_hos/hos_03/hos_03_5_foliage.c @@ -9,8 +9,8 @@ EvtScript N(EVS_ShakeTree_StarHaven) = { EVT_BUF_READ4(LVar1, LVar2, LVar3, LVar4) EVT_BUF_READ1(LVar5) EVT_CALL(GetPlayerPos, LVar6, LVarF, LVar8) - EVT_CALL(PlaySoundAtPlayer, SOUND_SMASH_GOOMNUT_TREE, 0) - EVT_CALL(PlaySoundAtPlayer, SOUND_SHAKE_TREE, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_SMASH_GOOMNUT_TREE, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtPlayer, SOUND_SHAKE_TREE, SOUND_SPACE_MODE_0) EVT_THREAD EVT_IF_NE(LVar1, 0) EVT_WAIT(1) 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 3e64d337c7..1802037ec3 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 @@ -163,7 +163,7 @@ EvtScript N(EVS_SetupStarship) = { }; s32 N(MostSolidGeometry)[] = { - MODEL_g283, MODEL_o4, MODEL_o6, MODEL_g5, MODEL_g97, MODEL_g157, 0xFFFF + MODEL_g283, MODEL_o4, MODEL_o6, MODEL_g5, MODEL_g97, MODEL_g157, 0xFFFF }; EvtScript N(EVS_SetupLightBeam) = { @@ -239,7 +239,7 @@ EvtScript N(EVS_Starship_Summon) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(40) - EVT_CALL(PlaySoundAt, SOUND_4A3, 0, 0, 250, 0) + EVT_CALL(PlaySoundAt, SOUND_A3 | SOUND_ID_TRIGGER_CHANGE_SOUND, 0, 0, 250, 0) EVT_CALL(func_802D7B10, LVar9) EVT_CALL(EnableGroup, MODEL_g277, TRUE) EVT_CALL(MakeLerp, 200, 0, 45, EASING_QUADRATIC_OUT) diff --git a/src/world/area_hos/hos_06/hos_06_5_merluvlee.c b/src/world/area_hos/hos_06/hos_06_5_merluvlee.c index 6997336c3b..0e67e8600b 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 @@ -629,7 +629,7 @@ EvtScript N(EVS_PerformHintRitual) = { EVT_WAIT(70) EVT_CALL(func_802D7B10, ArrayVar(2)) EVT_WAIT(40) - EVT_CALL(PlaySoundAt, SOUND_607, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_207 | 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 868a664f86..dc80354f72 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_4A4) + EVT_CALL(PlaySound, SOUND_A4 | 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 b76067ce2d..7c79c4634d 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 @@ -93,7 +93,7 @@ EvtScript N(EVS_Starship_Flight1) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(100) - EVT_CALL(PlaySound, SOUND_57C) + EVT_CALL(PlaySound, SOUND_17C | 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_57C) + EVT_CALL(PlaySound, SOUND_17C | 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_57C) + EVT_CALL(PlaySound, SOUND_17C | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(GotoMap, EVT_PTR("kpa_60"), kpa_60_ENTRY_4) EVT_END_IF EVT_WAIT(100) @@ -154,7 +154,7 @@ EvtScript N(EVS_Starship_Flight2) = { EVT_SET(MV_Starship_Yaw, 0) EVT_EXEC(N(EVS_AnimateStarship)) EVT_WAIT(100) - EVT_CALL(PlaySound, SOUND_57C) + EVT_CALL(PlaySound, SOUND_17C | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(PlaySound, SOUND_20A1) EVT_CALL(MakeLerp, 0, 300, 60, EASING_CUBIC_IN) 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_57C) + EVT_CALL(PlaySound, SOUND_17C | 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_57C) + EVT_CALL(PlaySound, SOUND_17C | 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 0ae20a1590..ac6cc304c6 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, 0, 272, 60, 486) + EVT_CALL(PlaySoundAt, SOUND_269, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_265, 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 11a968f778..7d2e7a048c 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, 0) + EVT_CALL(PlaySoundAtModel, LVar3, SOUND_1D1, 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 83dfc415f7..224d41eeaa 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 @@ -226,12 +226,12 @@ EvtScript N(EVS_Scene_DrainSand) = { EVT_WAIT(30) EVT_EXEC(N(EVS_TexPan_LowerSand)) EVT_EXEC(N(EVS_FillLowerSand)) - EVT_CALL(PlaySound, SOUND_453) + EVT_CALL(PlaySound, SOUND_53 | 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_453) + EVT_CALL(PlaySound, SOUND_53 | 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_03/isk_03_4_switch.c b/src/world/area_isk/isk_03/isk_03_4_switch.c index f612e37c0f..73d7243923 100644 --- a/src/world/area_isk/isk_03/isk_03_4_switch.c +++ b/src/world/area_isk/isk_03/isk_03_4_switch.c @@ -38,7 +38,7 @@ EvtScript N(EVS_OnTouch_DrainSwitch) = { EVT_CALL(EnablePartnerAI) EVT_END_THREAD EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o1990, SOUND_208A, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1990, SOUND_208A, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -49,7 +49,7 @@ EvtScript N(EVS_OnTouch_DrainSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o1990, SOUND_208B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1990, SOUND_208B, SOUND_SPACE_MODE_0) EVT_SET(AF_ISK03_SandSwitchActivated, TRUE) EVT_UNBIND EVT_RETURN 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 1ec1e3bc44..89c6d5d0c0 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, 0, 600, -330, 100) + EVT_CALL(PlaySoundAt, SOUND_269, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittsw, SOUND_265, 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 40c476a536..b244d7b4fc 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_266, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_267, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_265, 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 1dfb1cc801..3bc94ae3d5 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 @@ -230,12 +230,12 @@ EvtScript N(EVS_Scene_DrainSand) = { EVT_WAIT(30) EVT_EXEC(N(EVS_TexPan_LowerSand)) EVT_EXEC(N(EVS_FillLowerSand)) - EVT_CALL(PlaySound, SOUND_453) + EVT_CALL(PlaySound, SOUND_53 | 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_453) + EVT_CALL(PlaySound, SOUND_53 | 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_06/isk_06_4_switch.c b/src/world/area_isk/isk_06/isk_06_4_switch.c index f2a6d61eef..94c3cd89e6 100644 --- a/src/world/area_isk/isk_06/isk_06_4_switch.c +++ b/src/world/area_isk/isk_06/isk_06_4_switch.c @@ -38,7 +38,7 @@ EvtScript N(EVS_OnTouch_DrainSwitch) = { EVT_CALL(EnablePartnerAI) EVT_END_THREAD EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_208A, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_208A, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -49,7 +49,7 @@ EvtScript N(EVS_OnTouch_DrainSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_208B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_208B, SOUND_SPACE_MODE_0) EVT_SET(AF_ISK06_SandSwitchActivated, TRUE) EVT_UNBIND EVT_RETURN diff --git a/src/world/area_isk/isk_07/isk_07_4_stairs.c b/src/world/area_isk/isk_07/isk_07_4_stairs.c index 8795f1a9b8..a9067c8e2b 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2000, SOUND_80000002, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 90, 30, EASING_QUADRATIC_OUT) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1994, SOUND_80000002, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 90, 0, 30, EASING_QUADRATIC_OUT) EVT_LABEL(10) EVT_CALL(UpdateLerp) 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 d8c64df4e6..0b05a7e792 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, 0, -300, -380, 530) + EVT_CALL(PlaySoundAt, SOUND_269, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_265, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitte, SOUND_266, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitte, SOUND_267, 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_6_switch.c b/src/world/area_isk/isk_07/isk_07_6_switch.c index e4670a8dfd..fcf3eb9296 100644 --- a/src/world/area_isk/isk_07/isk_07_6_switch.c +++ b/src/world/area_isk/isk_07/isk_07_6_switch.c @@ -23,7 +23,7 @@ EvtScript N(EVS_OnTouch_StairSwitch) = { EVT_RETURN EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2022, SOUND_208A, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2022, SOUND_208A, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -33,7 +33,7 @@ EvtScript N(EVS_OnTouch_StairSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2022, SOUND_208B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2022, SOUND_208B, SOUND_SPACE_MODE_0) EVT_SET(AF_ISK07_FlippingRedStairs, TRUE) EVT_LABEL(15) EVT_WAIT(1) 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 696c880875..c690b73ea3 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 @@ -86,7 +86,7 @@ EvtScript N(EVS_SetupSarcophagi) = { }; EvtScript N(EVS_OpenSarcophagusAnim) = { - EVT_CALL(PlaySoundAtModel, LVar3, SOUND_1D1, 0) + EVT_CALL(PlaySoundAtModel, LVar3, SOUND_1D1, 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 09cca4f628..0112b76727 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, 0) + EVT_CALL(PlaySoundAtCollider, LVar4, SOUND_80000002, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 90, LVar5, EASING_COS_IN) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -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, 0) + EVT_CALL(PlaySoundAtCollider, LVar3, SOUND_80000002, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 90, 0, LVar5, EASING_COS_IN) EVT_LABEL(10) EVT_CALL(UpdateLerp) diff --git a/src/world/area_isk/isk_09/isk_09_5_switch.c b/src/world/area_isk/isk_09/isk_09_5_switch.c index 1566ae6056..6a6698c38e 100644 --- a/src/world/area_isk/isk_09/isk_09_5_switch.c +++ b/src/world/area_isk/isk_09/isk_09_5_switch.c @@ -34,7 +34,7 @@ EvtScript N(EVS_OnTouch_BlueSwitchCenter) = { EVT_RETURN EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2096, SOUND_208A, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2096, SOUND_208A, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -44,7 +44,7 @@ EvtScript N(EVS_OnTouch_BlueSwitchCenter) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2096, SOUND_208B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2096, SOUND_208B, SOUND_SPACE_MODE_0) EVT_SET(AF_ISK09_FlippingBlueStairs, TRUE) EVT_LABEL(15) EVT_WAIT(1) @@ -71,7 +71,7 @@ EvtScript N(EVS_OnTouch_BlueSwitchMidLeft) = { EVT_RETURN EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2099, SOUND_208A, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2099, SOUND_208A, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -81,7 +81,7 @@ EvtScript N(EVS_OnTouch_BlueSwitchMidLeft) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2099, SOUND_208B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2099, SOUND_208B, SOUND_SPACE_MODE_0) EVT_SET(AF_ISK09_FlippingBlueStairs, TRUE) EVT_LABEL(15) EVT_WAIT(1) @@ -108,7 +108,7 @@ EvtScript N(EVS_OnTouch_BlueSwitchTopLeft) = { EVT_RETURN EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2102, SOUND_208A, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2102, SOUND_208A, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -118,7 +118,7 @@ EvtScript N(EVS_OnTouch_BlueSwitchTopLeft) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2102, SOUND_208B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2102, SOUND_208B, SOUND_SPACE_MODE_0) EVT_SET(AF_ISK09_FlippingBlueStairs, TRUE) EVT_LABEL(15) EVT_WAIT(1) @@ -145,7 +145,7 @@ EvtScript N(EVS_OnTouch_RedSwitch) = { EVT_RETURN EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2105, SOUND_208A, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2105, SOUND_208A, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -155,7 +155,7 @@ EvtScript N(EVS_OnTouch_RedSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2105, SOUND_208B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2105, SOUND_208B, SOUND_SPACE_MODE_0) EVT_SET(AF_ISK09_FlippingRedStairs, TRUE) EVT_LABEL(15) EVT_WAIT(1) 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 b458134583..924686833f 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 @@ -30,7 +30,7 @@ EvtScript N(EVS_DropHiddenStairs) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_57, 0, 16, -562, 621) + EVT_CALL(PlaySoundAt, SOUND_57, SOUND_SPACE_MODE_0, 16, -562, 621) EVT_CALL(MakeLerp, LVar0, -550, 25, EASING_LINEAR) EVT_CALL(UpdateLerp) EVT_LABEL(20) @@ -47,7 +47,7 @@ EvtScript N(EVS_DropHiddenStairs) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(20) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_57, 0, 41, -587, 618) + EVT_CALL(PlaySoundAt, SOUND_57, SOUND_SPACE_MODE_0, 41, -587, 618) EVT_CALL(MakeLerp, LVar0, -800, 25, EASING_LINEAR) EVT_CALL(UpdateLerp) EVT_LABEL(30) @@ -62,7 +62,7 @@ EvtScript N(EVS_DropHiddenStairs) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(30) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_57, 0, 66, -612, 616) + EVT_CALL(PlaySoundAt, SOUND_57, SOUND_SPACE_MODE_0, 66, -612, 616) EVT_CALL(MakeLerp, LVar0, 0xFFFFFBE6, 25, EASING_LINEAR) EVT_CALL(UpdateLerp) EVT_LABEL(40) @@ -75,7 +75,7 @@ EvtScript N(EVS_DropHiddenStairs) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(40) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_57, 0, 95, -637, 614) + EVT_CALL(PlaySoundAt, SOUND_57, SOUND_SPACE_MODE_0, 95, -637, 614) EVT_RETURN EVT_END }; @@ -110,7 +110,7 @@ EvtScript N(EVS_ManageSecretPassage) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2092, SOUND_55, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2092, SOUND_55, SOUND_SPACE_MODE_0) EVT_CALL(N(SpawnLensFlare), -16, -438, 510, 240) EVT_CALL(N(SpawnLensFlare), 16, -438, 510, 240) EVT_WAIT(5) 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 02a1308e46..355124f89c 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 @@ -9,7 +9,7 @@ extern EvtScript N(EVS_ItemPrompt_Socket5); API_CALLABLE(N(GetItemNameInSocket)) { Bytecode* args = script->ptrReadPos; s32 itemID = evt_get_variable(script, *args++); - + evt_set_variable(script, *args++, gItemTable[itemID & 0xFFF0FFFF].nameMsg); return ApiStatus_DONE2; } @@ -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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2087, SOUND_261, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2087, SOUND_261, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_261, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_261, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_261, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_261, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2089, SOUND_261, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2089, SOUND_261, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2088, SOUND_261, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2088, SOUND_261, 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 a973448965..0afb2dd099 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, 0, 355, -460, 430) + EVT_CALL(PlaySoundAt, SOUND_269, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_265, 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 12730be759..72e7cea3c2 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 @@ -223,12 +223,12 @@ EvtScript N(EVS_Scene_DrainSand) = { EVT_WAIT(30) EVT_EXEC(N(EVS_TexPan_LowerSand)) EVT_EXEC(N(EVS_FillLowerSand)) - EVT_CALL(PlaySound, SOUND_453) + EVT_CALL(PlaySound, SOUND_53 | 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_453) + EVT_CALL(PlaySound, SOUND_53 | 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 e0abac8ba0..1fd2627ab1 100644 --- a/src/world/area_isk/isk_12/isk_12_4_switch.c +++ b/src/world/area_isk/isk_12/isk_12_4_switch.c @@ -23,7 +23,7 @@ EvtScript N(EVS_OnTouch_DrainSwitch) = { EVT_CALL(EnablePartnerAI) EVT_END_THREAD EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2059, SOUND_208A, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2059, SOUND_208A, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -34,7 +34,7 @@ EvtScript N(EVS_OnTouch_DrainSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2059, SOUND_208B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2059, SOUND_208B, SOUND_SPACE_MODE_0) EVT_SET(AF_ISK12_SandSwitchActivated, TRUE) EVT_UNBIND EVT_RETURN @@ -48,7 +48,7 @@ EvtScript N(EVS_OnTouch_StaircaseSwitch) = { EVT_RETURN EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_208A, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_208A, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -58,11 +58,11 @@ EvtScript N(EVS_OnTouch_StaircaseSwitch) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_208B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_208B, SOUND_SPACE_MODE_0) EVT_CALL(InterpPlayerYaw, 260, 0) EVT_SET(AF_ISK12_StairSwitchActivated, TRUE) EVT_THREAD - EVT_CALL(PlaySoundAt, SOUND_58, 0, 449, -822, 148) + EVT_CALL(PlaySoundAt, SOUND_58, 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, 0, 449, -822, 148) + EVT_CALL(PlaySoundAt, SOUND_59, 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, 0, 460, -806, 108) + EVT_CALL(PlaySoundAt, SOUND_58, 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, 0, 460, -806, 108) + EVT_CALL(PlaySoundAt, SOUND_59, 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, 0, 432, -825, 189) + EVT_CALL(PlaySoundAt, SOUND_58, 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, 0, 432, -825, 189) + EVT_CALL(PlaySoundAt, SOUND_59, 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, 0, 451, -812, 137) + EVT_CALL(PlaySoundAt, SOUND_58, 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, 0, 451, -812, 137) + EVT_CALL(PlaySoundAt, SOUND_59, 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 e3cf2b633d..a813f7391c 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 @@ -28,7 +28,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_CALL(PlaySound, SOUND_80000067) EVT_CALL(N(StarSpiritEffectFunc1)) EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, 0, 408, -825, 414) + EVT_CALL(PlaySoundAt, SOUND_B2, SOUND_SPACE_MODE_0, 408, -825, 414) EVT_END_THREAD EVT_THREAD EVT_WAIT(45) @@ -37,7 +37,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_THREAD EVT_WAIT(180) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, 0, 408, -825, 414) + EVT_CALL(PlaySoundAt, SOUND_137, SOUND_SPACE_MODE_0, 408, -825, 414) 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, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_138, 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_14) 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 d309dd5a4c..5a57c232f5 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 @@ -104,7 +104,7 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = { EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim01) EVT_THREAD EVT_WAIT(59) - EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_3EF, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_3EF, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(func_802CFD30, 0, FOLD_TYPE_7, 255, 0, 0, 0) EVT_CALL(func_802CFE2C, 0, 0x00000800) @@ -137,7 +137,7 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = { EvtScript N(EVS_PlayChompSounds) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_ChainChomp, SOUND_2061, 0) + EVT_CALL(PlaySoundAtNpc, NPC_ChainChomp, SOUND_2061, SOUND_SPACE_MODE_0) EVT_WAIT(5) EVT_END_LOOP EVT_RETURN @@ -153,11 +153,11 @@ EvtScript N(EVS_Scene_TutankoopaDefeated) = { EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim06) EVT_CALL(SetNpcJumpscale, NPC_Tutankoopa_01, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_20E3, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_20E3, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Tutankoopa_01, 442, -910, 393, 30) - EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_JUMP_3E2, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_JUMP_3E2, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Tutankoopa_01, 416, -910, 420, 20) - EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_JUMP_3E2, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_JUMP_3E2, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Tutankoopa_01, 395, -910, 440, 10) EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim01) @@ -183,7 +183,7 @@ EvtScript N(EVS_Scene_TutankoopaDefeated) = { EVT_CALL(NpcFaceNpc, NPC_Tutankoopa_01, NPC_ChainChomp, 0) EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim06) EVT_CALL(GetNpcPos, NPC_Tutankoopa_01, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_JUMP_3E2, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_JUMP_3E2, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Tutankoopa_01, LVar0, LVar1, LVar2, 20) EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim01) EVT_CALL(SpeakToPlayer, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim0B, ANIM_Tutankoopa_Anim01, 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 c19dc14aca..ae9f1f44df 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, 1, 35, -80, -120) - EVT_CALL(PlaySoundAtF, SOUND_8000000C, 1, 500, 85, -120) + 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_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 4d8f8c7c9b..f331672876 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_2; } if (script->functionTemp[1] == 15) { - sfx_play_sound_at_position(SOUND_DEATH, 0, npc->pos.x, npc->pos.y + (npc->collisionHeight / 2), npc->pos.z); + sfx_play_sound_at_position(SOUND_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); } @@ -192,7 +192,7 @@ EvtScript N(EVS_NpcIdle_Whacka_01) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(SetNpcPos, NPC_Whacka_01, LVarA, LVarB, LVarC) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Whacka_PopUp) EVT_WAIT(15) EVT_CALL(SetNpcPos, NPC_Whacka_02, LVarA, LVarB, LVarC) @@ -253,7 +253,7 @@ EvtScript N(EVS_NpcHit_Whacka_02) = { EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) - EVT_CALL(PlaySoundAtNpc, NPC_Whacka_01, SOUND_HIT_PLAYER_NORMAL, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Whacka_01, SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_SWITCH(LVarA) diff --git a/src/world/area_iwa/iwa_00/iwa_00_4_slide.c b/src/world/area_iwa/iwa_00/iwa_00_4_slide.c index de2ab42709..c7486e9043 100644 --- a/src/world/area_iwa/iwa_00/iwa_00_4_slide.c +++ b/src/world/area_iwa/iwa_00/iwa_00_4_slide.c @@ -25,7 +25,7 @@ EvtScript N(EVS_UseSlide) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -42,7 +42,7 @@ EvtScript N(EVS_UseSlide) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_WAIT(100) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 80, 0, 30, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) 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 27041a6756..ab4f7f448e 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, 1, -570, -180, 425) - EVT_CALL(PlaySoundAtF, SOUND_8000000E, 1, 740, -170, 330) + 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(GetLoadType, LVar1) EVT_IF_EQ(LVar1, 1) EVT_EXEC(EnterSavePoint) diff --git a/src/world/area_iwa/iwa_01/iwa_01_5_slide.c b/src/world/area_iwa/iwa_01/iwa_01_5_slide.c index 84edb841b8..eb031727e7 100644 --- a/src/world/area_iwa/iwa_01/iwa_01_5_slide.c +++ b/src/world/area_iwa/iwa_01/iwa_01_5_slide.c @@ -40,7 +40,7 @@ EvtScript N(EVS_UseSlide1) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -57,7 +57,7 @@ EvtScript N(EVS_UseSlide1) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_WAIT(100) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, -80, 0, 30, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -77,7 +77,7 @@ EvtScript N(EVS_UseSlide2) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_st2, SOUND_20A2, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_st2, SOUND_20A2, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -94,7 +94,7 @@ EvtScript N(EVS_UseSlide2) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_WAIT(100) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_st2, SOUND_20A2, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_st2, SOUND_20A2, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 80, 0, 30, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_iwa/iwa_02/iwa_02_3_npc.c b/src/world/area_iwa/iwa_02/iwa_02_3_npc.c index 4c501b495e..7166221dfd 100644 --- a/src/world/area_iwa/iwa_02/iwa_02_3_npc.c +++ b/src/world/area_iwa/iwa_02/iwa_02_3_npc.c @@ -142,8 +142,8 @@ EvtScript N(EVS_Bubulb_Conversation) = { EvtScript N(EVS_NpcInteract_Bubulb) = { EVT_IF_EQ(GF_IWA02_Gift_MagicalSeed2, FALSE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_MOLE_POP, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_MOLE_POP, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bubulb_Purple_PopUp) EVT_WAIT(45) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bubulb_Purple_Idle) diff --git a/src/world/area_iwa/iwa_03/iwa_03_4_slide.c b/src/world/area_iwa/iwa_03/iwa_03_4_slide.c index 8d36c82a00..0a3d6a42cc 100644 --- a/src/world/area_iwa/iwa_03/iwa_03_4_slide.c +++ b/src/world/area_iwa/iwa_03/iwa_03_4_slide.c @@ -25,7 +25,7 @@ EvtScript N(EVS_UseSlide) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -43,7 +43,7 @@ EvtScript N(EVS_UseSlide) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_WAIT(100) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, -80, 0, 30, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_iwa/iwa_04/iwa_04_4_npc.c b/src/world/area_iwa/iwa_04/iwa_04_4_npc.c index 80209be5b1..d78d43f064 100644 --- a/src/world/area_iwa/iwa_04/iwa_04_4_npc.c +++ b/src/world/area_iwa/iwa_04/iwa_04_4_npc.c @@ -16,7 +16,7 @@ API_CALLABLE(N(func_8024107C_91C95C)) { EvtScript N(EVS_FlapWingSounds) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20EF, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20EF, SOUND_SPACE_MODE_0) EVT_WAIT(16) EVT_END_LOOP EVT_RETURN 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 3467445372..6176621ae0 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 @@ -17,7 +17,7 @@ EvtScript N(EVS_PopSong) = { EVT_CALL(FadeOutMusic, 0, 500) EVT_WAIT(15) EVT_CALL(PopSong) - EVT_CALL(PlaySoundAtF, SOUND_80000009, 1, -560, 0, -233) + EVT_CALL(PlaySoundAtF, SOUND_80000009, 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 b97a45a819..ff5f34daa7 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 @@ -49,7 +49,7 @@ EvtScript N(EVS_Main) = { EVT_WAIT(1) EVT_EXEC(N(EVS_SetupMusic)) EVT_EXEC(N(EVS_SetupFoliage)) - EVT_CALL(PlaySoundAtF, SOUND_80000009, 1, -560, 0, -233) + EVT_CALL(PlaySoundAtF, SOUND_80000009, 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 e75046623b..4302dd5d85 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, 0) + EVT_CALL(PlaySoundAtModel, MODEL_07, SOUND_B000001A, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, MV_TrainMoveDist) EVT_IF_EQ(MF_TrainReverseDir, FALSE) EVT_ADDF(LVar0, -310) @@ -191,7 +191,7 @@ EvtScript N(EVS_AnimateTrain) = { EVT_CALL(ScaleModel, MODEL_08, LVar1, LVar0, LVar1) EVT_END_IF EVT_IF_EQ(MF_TrainArriveDoorOpen, TRUE) - EVT_CALL(PlaySoundAt, SOUND_20A5, 0, -435, 84, 37) + EVT_CALL(PlaySoundAt, SOUND_20A5, SOUND_SPACE_MODE_0, -435, 84, 37) EVT_SET(LVar8, 10) EVT_SET(LocalFlag(1), TRUE) EVT_SET(MF_TrainArriveDoorOpen, FALSE) @@ -202,7 +202,7 @@ EvtScript N(EVS_AnimateTrain) = { EVT_SET(MF_TrainArrivePlayerDisembark, FALSE) EVT_END_IF EVT_IF_EQ(MF_TrainDepartDoorOpen, TRUE) - EVT_CALL(PlaySoundAt, SOUND_20A5, 0, -413, 84, 38) + EVT_CALL(PlaySoundAt, SOUND_20A5, SOUND_SPACE_MODE_0, -413, 84, 38) EVT_SET(LVar8, 10) EVT_SET(LocalFlag(2), TRUE) EVT_SET(MF_TrainDepartDoorOpen, FALSE) @@ -221,7 +221,7 @@ EvtScript N(EVS_AnimateTrain) = { EVT_IF_LE(LVar9, 0) EVT_SET(LVar9, 0) EVT_SET(LocalFlag(1), FALSE) - EVT_CALL(PlaySoundAt, SOUND_20A6, 0, -435, 84, 37) + EVT_CALL(PlaySoundAt, SOUND_20A6, SOUND_SPACE_MODE_0, -435, 84, 37) EVT_END_IF EVT_END_IF EVT_IF_EQ(LocalFlag(2), TRUE) @@ -233,7 +233,7 @@ EvtScript N(EVS_AnimateTrain) = { EVT_IF_LE(LVarA, 0) EVT_SET(LVarA, 0) EVT_SET(LocalFlag(2), FALSE) - EVT_CALL(PlaySoundAt, SOUND_20A6, 0, -413, 84, 38) + EVT_CALL(PlaySoundAt, SOUND_20A6, SOUND_SPACE_MODE_0, -413, 84, 38) EVT_END_IF EVT_END_IF EVT_CALL(RotateModel, MODEL_omote, LVar9, 0, -1, 0) 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 b764592bd0..cbb124da5b 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 @@ -21,7 +21,7 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_CALL(ShowMessageAtScreenPos, MSG_CH2_000E, 320, 150) EVT_THREAD EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_TrainToad_01, EMOTE_QUESTION, 0, 20, FALSE, 0, 0, 0, 0) EVT_END_THREAD EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), 30, 300, EVT_FLOAT(15.0), EVT_FLOAT(-9.5)) @@ -81,7 +81,7 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_DIV(LVar0, 2) EVT_ADD(LVar2, LVar5) EVT_DIV(LVar2, 2) - EVT_CALL(PlaySoundAt, SOUND_HIT_PLAYER_NORMAL, 0, LVar0, 230, LVar2) + EVT_CALL(PlaySoundAt, SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0, LVar0, 230, LVar2) EVT_PLAY_EFFECT(EFFECT_DAMAGE_STARS, 3, LVar0, 230, LVar2, 0, -1, 0, 2) EVT_SET(LVarA, LVar0) EVT_SET(LVarB, 230) @@ -104,7 +104,7 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_SUB(LVar0, 30) EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 15) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_162, 0, LVarA, LVarB, LVarC) + EVT_CALL(PlaySoundAt, SOUND_162, 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 f4c8951f1c..7bc6ad053d 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 @@ -4,20 +4,20 @@ API_CALLABLE(N(GetSmallWheelsAngle)) { f32 angle = clamp_angle(script->varTable[2] * -2.4f); - + evt_set_float_variable(script, LVar0, angle); return ApiStatus_DONE2; } API_CALLABLE(N(GetLargeWheelAngle)) { f32 angle = clamp_angle(script->varTable[2] * -2.4f * 0.6f); - + evt_set_float_variable(script, LVar0, angle); return ApiStatus_DONE2; } EvtScript N(EVS_SpawnSmoke) = { - EVT_CALL(PlaySoundAtModel, MODEL_07, SOUND_B000001A, 0) + EVT_CALL(PlaySoundAtModel, MODEL_07, SOUND_B000001A, 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_2_npc.c b/src/world/area_jan/jan_00/jan_00_2_npc.c index ac93dc051e..377a2ccc5a 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 @@ -44,7 +44,7 @@ EvtScript N(EVS_NpcInteract_HeartPlant_01) = { EVT_CALL(GetSelfVar, 1, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(SetSelfVar, 1, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2099, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2099, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HeartPlant_Anim00) EVT_WAIT(1) EVT_CALL(N(HeartPlant_SpawnHeart)) @@ -357,7 +357,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_32C, 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) @@ -402,7 +402,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_32C, 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) @@ -517,7 +517,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_32C, 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) @@ -617,7 +617,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_80000055, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(func_80241134_B21674) EVT_END_THREAD @@ -639,7 +639,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Charge) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) EVT_CALL(StopSound, SOUND_80000055) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_JR_TROOPA_SPLASH, 0) + 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) EVT_THREAD @@ -652,7 +652,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(NpcJump0, NPC_SELF, 250, 0, 90, 10) @@ -672,9 +672,9 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.5)) EVT_CALL(NpcJump0, NPC_SELF, 80, -50, 90, 20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_JR_TROOPA_SPLASH, 0) + 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_80000055, 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_06/B52B40.c b/src/world/area_jan/jan_06/B52B40.c index a4992f9d8c..8cf9c8aab1 100644 --- a/src/world/area_jan/jan_06/B52B40.c +++ b/src/world/area_jan/jan_06/B52B40.c @@ -2,11 +2,11 @@ ApiStatus func_80240310_B52B40(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - + 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, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); - + sfx_adjust_env_sound_pos(SOUND_9E, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + return ApiStatus_DONE2; } diff --git a/src/world/area_jan/jan_13/B767B0.c b/src/world/area_jan/jan_13/B767B0.c index c5f113f211..b60f7c171d 100644 --- a/src/world/area_jan/jan_13/B767B0.c +++ b/src/world/area_jan/jan_13/B767B0.c @@ -28,7 +28,7 @@ ApiStatus func_80240214_B769C4(Evt* script, s32 isInitialCall) { 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, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_4E, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); } return ApiStatus_DONE2; } diff --git a/src/world/area_jan/jan_22/B851A0.c b/src/world/area_jan/jan_22/B851A0.c index 9c581d36df..5fa758f7ca 100644 --- a/src/world/area_jan/jan_22/B851A0.c +++ b/src/world/area_jan/jan_22/B851A0.c @@ -7,7 +7,7 @@ ApiStatus func_80241020_B851A0(Evt* script, s32 isInitialCall) { 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, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_168, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); } return ApiStatus_DONE2; } @@ -19,7 +19,7 @@ ApiStatus func_802410C4_B85244(Evt* script, s32 isInitialCall) { 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, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_185, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); } return ApiStatus_DONE2; } 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 c358c27acc..1e4d07e47b 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 @@ -128,19 +128,19 @@ EvtScript N(EVS_Fuzzipede_ReactToLight) = { EvtScript N(EVS_Fuzzipede_JumpAround) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20D9, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20D9, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -100, 80, -80, 20) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20D9, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20D9, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 100, 80, -80, 20) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20D9, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20D9, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 30, 40, -80, 20) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20D9, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20D9, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 135, 15, -100, 20) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20D9, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20D9, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 30, 0, 0, 20) EVT_WAIT(10) EVT_END_LOOP diff --git a/src/world/area_kkj/kkj_13/AD6200.c b/src/world/area_kkj/kkj_13/AD6200.c index 0006ad7885..7bbc619702 100644 --- a/src/world/area_kkj/kkj_13/AD6200.c +++ b/src/world/area_kkj/kkj_13/AD6200.c @@ -7,7 +7,7 @@ ApiStatus func_80240330_AD6200(Evt* script, s32 isInitialCall) { f32 y = npc->pos.y; f32 z = npc->pos.z; - sfx_adjust_env_sound_pos(SOUND_23D, 0, x, y, z); + sfx_adjust_env_sound_pos(SOUND_23D, SOUND_SPACE_MODE_0, x, y, z); script->varTable[0] = y; return ApiStatus_DONE2; @@ -19,7 +19,7 @@ ApiStatus func_80240390_AD6260(Evt* script, s32 isInitialCall) { f32 y = npc->pos.y; f32 z = npc->pos.z; - sfx_adjust_env_sound_pos(SOUND_23D, 0, x, y, z); + sfx_adjust_env_sound_pos(SOUND_23D, SOUND_SPACE_MODE_0, x, y, z); script->varTable[0] = y; return ApiStatus_DONE2; diff --git a/src/world/area_kkj/kkj_23/B028A0.c b/src/world/area_kkj/kkj_23/B028A0.c index c7c5f12ddf..77a6372304 100644 --- a/src/world/area_kkj/kkj_23/B028A0.c +++ b/src/world/area_kkj/kkj_23/B028A0.c @@ -20,7 +20,7 @@ ApiStatus func_80240080_B02900(Evt* script, s32 isInitialCall) { f32 y = npc->pos.y; f32 z = npc->pos.z; - sfx_adjust_env_sound_pos(SOUND_23D, 0, x, y, z); + sfx_adjust_env_sound_pos(SOUND_23D, SOUND_SPACE_MODE_0, x, y, z); script->varTable[0] = y; return ApiStatus_DONE2; 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 48251ab62c..ee20be31f9 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 @@ -81,17 +81,17 @@ API_CALLABLE(N(func_80240530_8AC4C0)) { } API_CALLABLE(N(func_80240584_8AC514)) { - snd_ambient_8005553C(0, 2000); + snd_ambient_pause(0, 2000); return ApiStatus_DONE2; } API_CALLABLE(N(func_802405A8_8AC538)) { - snd_ambient_80055590(0, 2000); + snd_ambient_resume(0, 2000); return ApiStatus_DONE2; } API_CALLABLE(N(func_802405CC_8AC55C)) { - snd_ambient_slow_fade_out(0, 1000); + snd_ambient_stop_slow(0, 1000); return ApiStatus_DONE2; } @@ -127,7 +127,7 @@ API_CALLABLE(N(func_802405F0_8AC580)) { npc->pos.y = 100.0f; add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); npc->pos.y += (-npc->pos.z + -50.0f + 70.0f) * 0.15f; - sfx_play_sound_at_position(SOUND_B000001E, 0, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(SOUND_B000001E, 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; } @@ -190,7 +190,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, 0, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(SOUND_B000001E, 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; } @@ -413,7 +413,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_CALL(GetNpcPos, NPC_Eldstar, LVar6, LVar7, LVar8) EVT_CALL(NpcJump0, NPC_Eldstar, LVar6, LVar7, LVar8, 5) EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Idle) - EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 0, 0, 3, 10) EVT_END_THREAD EVT_THREAD @@ -473,29 +473,29 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_WAIT(30) EVT_THREAD EVT_WAIT(45) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_188, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802404A0_8AC430)) EVT_END_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 10, 10, 3, 10) EVT_WAIT(6) - EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 0, 10, 3, 15) EVT_WAIT(6) - EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, -10, 10, 3, 20) EVT_WAIT(6) - EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 10, 10, 3, 25) EVT_WAIT(6) EVT_LOOP(3) - EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 0, 10, 3, 30) EVT_WAIT(6) - EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, -10, 10, 3, 30) EVT_WAIT(6) - EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 10, 10, 3, 30) EVT_WAIT(6) EVT_END_LOOP @@ -549,7 +549,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) EVT_WAIT(25) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_LeanOver) - EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_263, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Goombaria, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) EVT_WAIT(25) 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 5d26afb9b3..e08f1136f7 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 @@ -102,7 +102,7 @@ EvtScript N(EVS_ShowMessage_ItsLocked) = { EvtScript N(EVS_OpenGoombaRoadGate) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_tt2, SOUND_1D2, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tt2, SOUND_1D2, 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 fd3d1d661c..a413229257 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 @@ -223,7 +223,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_214, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; @@ -424,9 +424,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_269, SOUND_SPACE_MODE_0) EVT_WAIT(15) - EVT_CALL(PlaySoundAtCollider, COLLIDER_mm1, SOUND_1D2, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_mm1, SOUND_1D2, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 120, 20, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -516,7 +516,7 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyWalk) EVT_CALL(NpcMoveTo, NPC_PARTNER, 41, -147, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyIdle) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_ADD(LVar0, 3) @@ -533,7 +533,7 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(RotateModel, MODEL_syoumen_enter, LVar0, 0, 1, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(NpcFacePlayer, NPC_Goombaria, 3) EVT_CALL(NpcFacePlayer, NPC_Goombario, 3) EVT_CALL(PlayerFaceNpc, NPC_Goombario, 3) @@ -616,7 +616,7 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_0029) EVT_WAIT(10) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_ADD(LVar0, 3) @@ -643,7 +643,7 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(RotateModel, MODEL_syoumen_enter, LVar0, 0, 1, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_002A) EVT_WAIT(10) EVT_CALL(SpeakToNpc, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, NPC_PARTNER, MSG_CH0_002B) @@ -723,7 +723,7 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Run) EVT_CALL(NpcMoveTo, NPC_PARTNER, 41, -143, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_ADD(LVar0, 3) @@ -743,7 +743,7 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(RotateModel, MODEL_syoumen_enter, LVar0, 0, 1, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(N(RemoveGoompaPartner)) EVT_CALL(N(IsPlayerHPFull)) EVT_IF_EQ(LVar0, 1) @@ -1470,7 +1470,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario_80009) EVT_CALL(GetPlayerPos, -220, 33, -342) EVT_WAIT(90) - EVT_CALL(PlaySoundAtNpc, NPC_Eldstar_02, SOUND_2041, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Eldstar_02, SOUND_2041, 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) @@ -1550,7 +1550,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_CALL(GetNpcPos, NPC_Eldstar_02, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_Eldstar_02, SOUND_2041, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Eldstar_02, SOUND_2041, 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) @@ -1591,7 +1591,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_CALL(SetNpcAnimation, NPC_Toad, ANIM_Toad_Red_Walk) EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_GRAVITY, TRUE) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit7, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit7, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 90, 10, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -1609,7 +1609,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(11) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit7, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit7, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(NpcMoveTo, NPC_Toad, -192, -230, 20) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) @@ -1630,7 +1630,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_WAIT(20) 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) - EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Goompa, EMOTE_EXCLAMATION, 0, 30, FALSE, 0, 0, 0, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario_80016) EVT_WAIT(20) @@ -1643,7 +1643,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_WAIT(20) EVT_CALL(SetPlayerAnimation, ANIM_Mario_Question) EVT_WAIT(20) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Goompa, EMOTE_QUESTION, 0, 60, FALSE, 0, 0, 0, 0) EVT_WAIT(55) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) @@ -2109,10 +2109,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Goombaria, EMOTE_EXCLAMATION, 0, 30, TRUE, 0, 0, 0, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Goombario, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Goombario, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Goombario, EMOTE_EXCLAMATION, 0, 30, TRUE, 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 55b91d4b9b..ca88001818 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 @@ -164,7 +164,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, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_161, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario_80019) 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 04d4c927f6..13f2e80807 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 @@ -66,11 +66,11 @@ EvtScript N(EVS_OnSmash_GateBlock) = { }; EvtScript N(EVS_SummonGateBlock) = { - EVT_CALL(PlaySoundAt, SOUND_207A, 0, 373, 88, 255) + EVT_CALL(PlaySoundAt, SOUND_207A, SOUND_SPACE_MODE_0, 373, 88, 255) EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, 373, 88, 255, 1, 100) EVT_WAIT(20) - EVT_CALL(PlaySoundAt, SOUND_207B, 0, 326, 150, 261) + EVT_CALL(PlaySoundAt, SOUND_207B, SOUND_SPACE_MODE_0, 326, 150, 261) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, 326, 150, 261, 1, 60) EVT_WAIT(20) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, 326, 150, 261, 1, 60) @@ -94,14 +94,14 @@ EvtScript N(EVS_SummonGateBlock) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_207C, 0, LVar2, LVar0, LVar4) + EVT_CALL(PlaySoundAt, SOUND_207C, SOUND_SPACE_MODE_0, LVar2, LVar0, LVar4) EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) EVT_THREAD EVT_WAIT(15) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar2, 0, LVar4, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_207D, 0, LVar2, LVar0, LVar4) + EVT_CALL(PlaySoundAt, SOUND_207D, SOUND_SPACE_MODE_0, LVar2, LVar0, LVar4) EVT_CALL(MakeLerp, 300, 0, 20, EASING_CUBIC_IN) EVT_LABEL(20) EVT_CALL(UpdateLerp) @@ -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, 0, LVar2, LVar0, LVar4) + EVT_CALL(PlaySoundAt, SOUND_DD, SOUND_SPACE_MODE_0, LVar2, LVar0, LVar4) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, 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 ab00894c7d..5ac89eeb7f 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 @@ -44,7 +44,7 @@ Vec3f N(FlightPath_KammyDepart)[] = { EvtScript N(EVS_PlayKammyFlightSounds) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_295, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_295, SOUND_SPACE_MODE_0) EVT_WAIT(4) EVT_END_LOOP EVT_RETURN @@ -148,7 +148,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_32B, 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 64a5bd6c44..9ee6592d92 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 @@ -63,7 +63,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Goompa, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Goompa, EMOTE_EXCLAMATION, 45, 15, TRUE, 0, 0, 0, 0) EVT_WAIT(15) 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 0678378c1b..57c66544b9 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 @@ -33,11 +33,11 @@ EvtScript N(EVS_Scene_FallingDown) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_THREAD EVT_WAIT(18) - EVT_CALL(PlaySoundAtPlayer, SOUND_175, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_175, SOUND_SPACE_MODE_0) EVT_WAIT(30) - EVT_CALL(PlaySoundAtPlayer, SOUND_176, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_176, SOUND_SPACE_MODE_0) EVT_WAIT(28) - EVT_CALL(PlaySoundAtPlayer, SOUND_175, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_175, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(HidePlayerShadow, TRUE) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) 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 385da0c3af..959e4c2b0f 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_61, SOUND_SPACE_MODE_0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00AD) EVT_WAIT(10) 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 e34520331d..effbd746d2 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 @@ -18,7 +18,7 @@ API_CALLABLE(N(PlaySpringReboundAnimation)) { EvtScript N(EVS_PlayWalkingSounds) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_3AC, 0) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_3AC, SOUND_SPACE_MODE_0) EVT_WAIT(4) EVT_END_LOOP EVT_RETURN @@ -85,14 +85,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Blue, SOUND_10F, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_GoombaBros_Blue, 267, 0, 28, 30) EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Red, SOUND_10F, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_GoombaBros_Red, 276, 0, 55, 30) EVT_END_THREAD EVT_WAIT(15) @@ -122,10 +122,10 @@ 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Blue, SOUND_10F, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_GoombaBros_Blue, 307, 25, 49, 20) EVT_CALL(N(PlaySpringReboundAnimation)) - EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Blue, SOUND_2086, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Blue, SOUND_2086, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_GoombaBros_Blue, 401, 80, 25, 30) EVT_WAIT(5) EVT_CALL(SetNpcSpeed, NPC_GoombaBros_Blue, EVT_FLOAT(6.0)) @@ -140,10 +140,10 @@ EvtScript N(EVS_NpcDefeat_GoombaBros_Red) = { EVT_WAIT(30) 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Red, SOUND_10F, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_GoombaBros_Red, 307, 25, 49, 20) EVT_CALL(N(PlaySpringReboundAnimation)) - EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Red, SOUND_2086, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Red, SOUND_2086, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_GoombaBros_Red, 401, 80, 25, 30) EVT_WAIT(5) EVT_CALL(SetNpcSpeed, NPC_GoombaBros_Red, EVT_FLOAT(6.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 b4c7d44338..084dd3e606 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_F8, SOUND_SPACE_MODE_0) EVT_CALL(func_802CFE2C, NPC_SELF, 0x00002000) EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_5, 6, 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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 25715e5cca..e29d173ef0 100644 --- a/src/world/area_kmr/kmr_10/kmr_10_4_entity.c +++ b/src/world/area_kmr/kmr_10/kmr_10_4_entity.c @@ -35,8 +35,8 @@ EvtScript N(EVS_OnShakeTree1) = { EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_Dummy, EVT_FLOAT(0.8)) EVT_CALL(NpcJump0, NPC_Dummy, 370, 10, 20, 15) - EVT_CALL(PlaySoundAt, SOUND_48, 0, 370, 10, 20) - EVT_CALL(PlaySoundAt, SOUND_2086, 0, 370, 10, 20) + EVT_CALL(PlaySoundAt, SOUND_48, 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) EVT_ADD(GF_KMR10_UnreadFlagForSpring, 1) diff --git a/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c b/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c index ec3696a545..56beec7447 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 @@ -34,7 +34,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, 0, -1600, 1000, -1600) + EVT_CALL(PlaySoundAt, SOUND_55, 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) @@ -214,7 +214,7 @@ EvtScript N(EVS_Scene_SelfDestruct) = { EVT_WAIT(20) EVT_CALL(SetNpcJumpscale, NPC_GoombaKing, EVT_FLOAT(0.8)) EVT_CALL(NpcFacePlayer, NPC_GoombaKing, 0) - EVT_CALL(PlaySoundAtNpc, NPC_GoombaKing, SOUND_3E7, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GoombaKing, SOUND_3E7, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump1, NPC_GoombaKing, -380, 120, -42, 25) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(10) @@ -258,7 +258,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_4A5) + EVT_CALL(PlaySound, SOUND_A5 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_EXEC(N(EVS_PlayFortressAnimation)) EVT_EXEC(N(EVS_FortressCollapse_PlayFX)) @@ -331,7 +331,7 @@ EvtScript N(EVS_Scene_MeetGoombaKing_Impl) = { EVT_CALL(NpcMoveTo, NPC_RedGoombaBro, -504, -74, 0) EVT_CALL(SpeakToPlayer, NPC_RedGoombaBro, ANIM_GoombaBros_Red_CryWalk, ANIM_GoombaBros_Red_CryIdle, 5, MSG_CH0_00C3) EVT_CALL(SpeakToPlayer, NPC_BlueGoombaBro, ANIM_GoombaBros_Blue_CryWalk, ANIM_GoombaBros_Blue_CryIdle, 5, MSG_CH0_00C4) - EVT_CALL(PlaySoundAtCollider, COLLIDER_tt, SOUND_METAL_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tt, SOUND_METAL_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 90, 30, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -354,9 +354,9 @@ EvtScript N(EVS_Scene_MeetGoombaKing_Impl) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(1) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_tt, SOUND_METAL_DOOR_CLOSE, 0) - EVT_CALL(PlaySoundAt, SOUND_20EC, 0, -330, 0, -130) - EVT_CALL(PlaySoundAt, SOUND_20B4, 0, -330, 0, -130) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tt, SOUND_METAL_DOOR_CLOSE, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_MODE_0, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_MODE_0, -330, 0, -130) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -725, 117, -137, 100) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -617, 108, -137, 100) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.5)) @@ -370,32 +370,32 @@ EvtScript N(EVS_Scene_MeetGoombaKing_Impl) = { EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_00C5) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(40) - EVT_CALL(PlaySoundAt, SOUND_20EC, 0, -330, 0, -130) - EVT_CALL(PlaySoundAt, SOUND_20B4, 0, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_MODE_0, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_MODE_0, -330, 0, -130) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -725, 117, -137, 100) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -617, 108, -137, 100) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.2)) EVT_SET(LVar3, 2) EVT_EXEC(N(EVS_BouncePlayerAndPartner)) EVT_WAIT(60) - EVT_CALL(PlaySoundAt, SOUND_20EC, 0, -330, 0, -130) - EVT_CALL(PlaySoundAt, SOUND_20B4, 0, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_MODE_0, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_MODE_0, -330, 0, -130) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -725, 117, -137, 100) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -617, 108, -137, 100) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.6)) EVT_SET(LVar3, 4) EVT_EXEC(N(EVS_BouncePlayerAndPartner)) EVT_WAIT(60) - EVT_CALL(PlaySoundAt, SOUND_20EC, 0, -330, 0, -130) - EVT_CALL(PlaySoundAt, SOUND_20B4, 0, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_MODE_0, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_MODE_0, -330, 0, -130) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -725, 117, -137, 100) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -617, 108, -137, 100) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_SET(LVar3, 6) EVT_EXEC(N(EVS_BouncePlayerAndPartner)) EVT_WAIT(60) - EVT_CALL(PlaySoundAt, SOUND_20EC, 0, -330, 0, -130) - EVT_CALL(PlaySoundAt, SOUND_20B4, 0, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_MODE_0, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_MODE_0, -330, 0, -130) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -725, 117, -137, 100) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -617, 108, -137, 100) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.5)) @@ -410,20 +410,20 @@ 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_BlueGoombaBro, SOUND_10F, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_BlueGoombaBro, -432, 130, -146, 30) EVT_END_THREAD EVT_CALL(SetNpcPos, NPC_RedGoombaBro, -400, 0, -41) - EVT_CALL(PlaySoundAtNpc, NPC_RedGoombaBro, SOUND_10F, 0) + EVT_CALL(PlaySoundAtNpc, NPC_RedGoombaBro, SOUND_10F, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_RedGoombaBro, -412, 130, -35, 30) EVT_WAIT(10) 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GoombaKing, SOUND_3E7, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_GoombaKing, -419, 119, -91, 30) - EVT_CALL(PlaySoundAt, SOUND_20EC, 0, -330, 0, -130) - EVT_CALL(PlaySoundAt, SOUND_20B4, 0, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_MODE_0, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_MODE_0, -330, 0, -130) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -725, 117, -137, 100) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -617, 108, -137, 100) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.0)) 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 8ebe6a3c3d..3b7e1b3abd 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_RedGoombaBro, SOUND_10F, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_RedGoombaBro, LVar0, 0, LVar2, 30) 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_BlueGoombaBro, SOUND_10F, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_BlueGoombaBro, LVar0, 0, LVar2, 30) 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GoombaKing, SOUND_3E7, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_GoombaKing, LVar0, 0, LVar2, 30) EVT_END_THREAD EVT_WAIT(15) @@ -92,7 +92,7 @@ EvtScript N(EVS_Scene_BossDefeated) = { EVT_CALL(NpcMoveTo, NPC_RedGoombaBro, -396, -89, 0) EVT_END_THREAD EVT_WAIT(2) - EVT_CALL(PlaySoundAtCollider, COLLIDER_tt, SOUND_METAL_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tt, SOUND_METAL_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 90, 20, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -112,7 +112,7 @@ EvtScript N(EVS_Scene_BossDefeated) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(1) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_tt, SOUND_METAL_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tt, SOUND_METAL_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(2.0)) EVT_SET(GB_StoryProgress, STORY_CH0_DEFEATED_GOOMBA_KING) EVT_EXEC(N(EVS_SetupMusic)) @@ -213,7 +213,7 @@ EvtScript N(EVS_NpcAux_Kammy) = { s32 N(KammyFloatingOffsets)[] = { 1, 2, 3, 2, 1, - -1, -2, -3, -2, -1, + -1, -2, -3, -2, -1, }; EvtScript N(EVS_NpcAI_Kammy) = { 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 56aee266e5..b7cb1ba6f5 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) - EVT_CALL(PlaySoundAt, SOUND_48, 0, -469, 1, 92) + EVT_CALL(PlaySoundAt, SOUND_48, 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) EVT_KILL_THREAD(LVarB) @@ -64,7 +64,7 @@ EvtScript N(EVS_Interact_SwitchBush) = { EvtScript N(EVS_OnBreak_SpecialBrick) = { EVT_CALL(PlaySound, SOUND_B) - EVT_CALL(PlaySoundAt, SOUND_2108, 0, 665, 35, 70) + EVT_CALL(PlaySoundAt, SOUND_2108, 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 ed458b08bd..e75a8b903d 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) - EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_295, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_295, 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 9ef61bcfe0..8fc4e7e4aa 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_F8, SOUND_SPACE_MODE_0) EVT_CALL(func_802CFE2C, NPC_SELF, 0x00002000) EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_5, 6, 1, 1, 0) EVT_WAIT(12) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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 19bfc9bcd0..d271050d12 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 @@ -121,7 +121,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, -30, 40, TRUE, 0, 0, 0, 0) EVT_WAIT(25) EVT_THREAD @@ -136,7 +136,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_EXCLAMATION, -30, 20, TRUE, 0, 0, 0, 0) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) EVT_CALL(GetNpcPos, NPC_Luigi_1, LVar0, LVar1, LVar2) @@ -186,7 +186,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, -30, 30, TRUE, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) @@ -202,7 +202,7 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { EVT_END_THREAD EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_ELLIPSIS, 20, 85, TRUE, 0, 0, 0, 0) EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_263, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_QUESTION, -20, 70, TRUE, 0, 0, 0, 0) EVT_WAIT(110) EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 5, MSG_CH0_00DE) @@ -378,7 +378,7 @@ EvtScript N(EVS_Scene_CaughtLuigiInBasement) = { EVT_CALL(SetNpcAnimation, NPC_Luigi_0, ANIM_Luigi_Run) EVT_CALL(NpcMoveTo, NPC_Luigi_0, -130, -17, 15) EVT_CALL(NpcJump0, NPC_Luigi_0, -145, -54, -45, 10) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_0, SOUND_2086, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_0, SOUND_2086, SOUND_SPACE_MODE_0) EVT_CALL(N(PlaySpringLaunchAnimation)) EVT_THREAD EVT_WAIT(3) @@ -421,7 +421,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, -30, 15, TRUE, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Idle) @@ -684,31 +684,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 482, 0, -286, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 726, 0, -153, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 603, 0, 0, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 557, 0, 130, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 357, 0, 87, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 344, 30, -8, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 276, 138, 22, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 360, 61, -117, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 427, 55, -182, 15) EVT_WAIT(5) EVT_END_LOOP @@ -721,14 +721,14 @@ EvtScript N(EVS_NpcAI_ShyGuy) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim0C) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203F, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203F, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 594, 30, -220, 15) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_ENTER_PIPE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_ENTER_PIPE, SOUND_SPACE_MODE_0) EVT_CALL(func_802CFE2C, NPC_SELF, 0x00000800) EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_5, 2, 1, 1, 0) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) @@ -745,7 +745,7 @@ EvtScript N(EVS_NpcAI_ShyGuy) = { }; EvtScript N(EVS_NpcHit_ShyGuy) = { - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, SOUND_SPACE_MODE_0) EVT_SET(GF_KMR20_ChasedOffShyGuy, TRUE) EVT_CALL(SetNpcVar, NPC_Luigi_1, 0, 1) EVT_WAIT(2) 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 2a6b17b4a5..8d08c411f8 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_B0000019, SOUND_SPACE_MODE_0) EVT_WAIT(LVar1) EVT_END_LOOP EVT_END_CHILD_THREAD @@ -68,7 +68,7 @@ EvtScript N(EVS_Player_EnterPipe_Intro) = { EVT_CALL(N(Pipe_GetEntryPos_Intro)) EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) EVT_WAIT(2) - EVT_CALL(PlaySoundAtPlayer, SOUND_ENTER_PIPE, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_ENTER_PIPE, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_THREAD EVT_WAIT(4) @@ -96,7 +96,7 @@ EvtScript N(EVS_Luigi_EnterPipe_Intro) = { EVT_CALL(N(Pipe_GetEntryPos_Intro)) EVT_CALL(SetNpcPos, NPC_Scene_Luigi, LVar1, LVar2, LVar3) EVT_WAIT(2) - EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_ENTER_PIPE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_ENTER_PIPE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Still) EVT_THREAD EVT_CALL(GetNpcPos, NPC_Scene_Luigi, LVar0, LVar1, LVar2) @@ -143,7 +143,7 @@ EvtScript N(EVS_TetherCamToLuigi) = { }; EvtScript N(EVS_OpenAndCloseDoor_Intro_Impl) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o246, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o246, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 80, 14, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -163,7 +163,7 @@ EvtScript N(EVS_OpenAndCloseDoor_Intro_Impl) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o246, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o246, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; @@ -268,7 +268,7 @@ EvtScript N(EVS_Scene_BeginGame) = { EVT_CALL(NpcFlyTo, NPC_Scene_Parakarry, 430, 20, -165, 60, -10, EASING_LINEAR) EVT_CALL(InterpNpcYaw, NPC_Scene_Parakarry, 45, 10) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_Scene_Parakarry, SOUND_E0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Scene_Parakarry, SOUND_E0, 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) - EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_E0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_E0, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(TranslateModel, MODEL_o222, 1, 0, 0) EVT_CALL(TranslateModel, MODEL_o223, 1, 0, 0) @@ -427,11 +427,11 @@ EvtScript N(EVS_Scene_SettingOff) = { EVT_WAIT(10) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Jump) - EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_JUMP_2081, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_JUMP_2081, SOUND_SPACE_MODE_0) EVT_WAIT(7) EVT_WAIT(7) EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_SOFT_LAND, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_SOFT_LAND, 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) 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 08300dffd2..ad5bba3385 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_B0000019, SOUND_SPACE_MODE_0) EVT_WAIT(LVar1) EVT_END_LOOP EVT_END_CHILD_THREAD @@ -90,7 +90,7 @@ EvtScript N(EVS_Luigi_PlayWalkSounds_Epilogue) = { }; EvtScript N(EVS_OpenFrontDoor) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o246, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o246, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 90, 10, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -114,7 +114,7 @@ EvtScript N(EVS_CloseFrontDoor) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o246, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o246, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; @@ -140,7 +140,7 @@ EvtScript N(EVS_Player_EnterPipe_Epilogue) = { EVT_CALL(N(Pipe_GetEntryPos_Epilogue)) EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) EVT_WAIT(2) - EVT_CALL(PlaySoundAtPlayer, SOUND_ENTER_PIPE, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_ENTER_PIPE, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_THREAD EVT_WAIT(4) @@ -168,7 +168,7 @@ EvtScript N(EVS_Luigi_EnterPipe_Epilogue) = { EVT_CALL(N(Pipe_GetEntryPos_Epilogue)) EVT_CALL(SetNpcPos, NPC_Luigi_1, LVar1, LVar2, LVar3) EVT_WAIT(2) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_ENTER_PIPE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_ENTER_PIPE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Still) EVT_THREAD EVT_CALL(GetNpcPos, NPC_Luigi_1, LVar0, LVar1, LVar2) @@ -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, 0, 430, 0, -185) + EVT_CALL(PlaySoundAt, SOUND_E0, SOUND_SPACE_MODE_0, 430, 0, -185) EVT_WAIT(25) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Luigi_0, EMOTE_QUESTION, 0, 20, FALSE, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_263, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_TalkSit, ANIM_Luigi_IdleSit, 0, MSG_Outro_0021) @@ -234,12 +234,12 @@ EvtScript N(EVS_Scene_EpilogueGetLetter) = { EVT_CALL(NpcJump0, NPC_Luigi_1, 180, 30, -20, 10) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_JUMP_2081, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_JUMP_2081, SOUND_SPACE_MODE_0) EVT_WAIT(5) 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_SOFT_LAND, 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) @@ -312,11 +312,11 @@ EvtScript N(EVS_Scene_EpilogueGetLetter) = { EVT_WAIT(10) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_JUMP_2081, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_JUMP_2081, SOUND_SPACE_MODE_0) EVT_WAIT(7) EVT_WAIT(7) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_SOFT_LAND, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_SOFT_LAND, 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_1_music.c b/src/world/area_kmr/kmr_20/kmr_20_1_music.c index d51e011531..be3a0acb51 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_1_music.c +++ b/src/world/area_kmr/kmr_20/kmr_20_1_music.c @@ -1,7 +1,7 @@ #include "kmr_20.h" API_CALLABLE(N(FadeOutAmbientSounds)){ - snd_ambient_slow_fade_out(0, 500); + snd_ambient_stop_slow(0, 500); return ApiStatus_DONE2; } 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 8dada450df..aeb904b28d 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 @@ -61,11 +61,11 @@ s32 N(LetterStoryRequirements)[] = { STORY_CH3_STAR_SPIRIT_RESCUED, STORY_CH3_STAR_SPIRIT_RESCUED, STORY_CH4_STAR_SPIRIT_RESCUED, - STORY_CH4_GAVE_CAKE_TO_GOURMET_GUY, + STORY_CH4_GAVE_CAKE_TO_GOURMET_GUY, STORY_CH5_RETURNED_TO_TOAD_TOWN, STORY_CH6_STAR_SPRIT_DEPARTED, STORY_CH4_GOT_TAYCE_TS_CAKE, - STORY_CH7_STAR_SPIRIT_RESCUED, + STORY_CH7_STAR_SPIRIT_RESCUED, }; s32 N(LetterSenderStringIDs)[] = { @@ -76,11 +76,11 @@ s32 N(LetterSenderStringIDs)[] = { MSG_Document_Letter_Mario05_From, MSG_Document_Letter_Mario06_From, MSG_Document_Letter_Mario07_From, - MSG_Document_Letter_Mario08_From, + MSG_Document_Letter_Mario08_From, MSG_Document_Letter_Mario09_From, MSG_Document_Letter_Mario10_From, MSG_Document_Letter_Mario11_From, - MSG_Document_Letter_Mario12_From, + MSG_Document_Letter_Mario12_From, }; s32 N(LetterBodyStringIDs)[] = { @@ -91,11 +91,11 @@ s32 N(LetterBodyStringIDs)[] = { MSG_Document_Letter_Mario05_Body, MSG_Document_Letter_Mario06_Body, MSG_Document_Letter_Mario07_Body, - MSG_Document_Letter_Mario08_Body, + MSG_Document_Letter_Mario08_Body, MSG_Document_Letter_Mario09_Body, MSG_Document_Letter_Mario10_Body, MSG_Document_Letter_Mario11_Body, - MSG_Document_Letter_Mario12_Body, + MSG_Document_Letter_Mario12_Body, }; //TODO shiftability -- these are offsets relative to 0x10F1B0 @@ -231,7 +231,7 @@ API_CALLABLE(N(ReadLetters)){ dma_copy(charset_ROM_START + N(LetterDmaOffsets)[1], charset_ROM_START + N(LetterDmaOffsets)[1] + sizeof(N(LetterBackgroundPal)), N(LetterBackgroundPal)); - + N(LetterImgData)[0].raster = N(LetterBackgroundImg); N(LetterImgData)[0].palette = N(LetterBackgroundPal); N(LetterImgData)[0].width = 150; @@ -245,7 +245,7 @@ API_CALLABLE(N(ReadLetters)){ dma_copy(charset_ROM_START + N(LetterDmaOffsets)[(userIndex * 2) + 3], charset_ROM_START + N(LetterDmaOffsets)[(userIndex * 2) + 3] + sizeof(N(N(LetterPhotoPal))), N(N(LetterPhotoPal))); - + N(LetterImgData)[1].raster = N(LetterPhotoImg); N(LetterImgData)[1].palette = N(N(LetterPhotoPal)); N(LetterImgData)[1].width = 70; @@ -307,11 +307,11 @@ s32 N(DiaryStoryRequirements)[] = { STORY_CH5_TRADED_VASE_FOR_SEED, STORY_CH5_TRADED_VASE_FOR_SEED, STORY_CH6_RETURNED_TO_TOAD_TOWN, - STORY_CH6_RETURNED_TO_TOAD_TOWN, + STORY_CH6_RETURNED_TO_TOAD_TOWN, STORY_CH7_STAR_SPRIT_DEPARTED, STORY_CH7_STAR_SPRIT_DEPARTED, STORY_EPILOGUE, - STORY_EPILOGUE, + STORY_EPILOGUE, }; s32 N(DiaryEntryStringIDs)[] = { @@ -445,7 +445,7 @@ EvtScript N(EVS_Inspect_LuigisDiary) = { }; EvtScript N(EVS_Shake_Mailbox) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o305, SOUND_E0, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o305, SOUND_E0, 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) @@ -471,7 +471,7 @@ EvtScript N(EVS_Shake_Mailbox) = { EvtScript N(EVS_SecretPanel_Flip) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o252, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_20AB, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_20AB, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 2160, 60, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -481,7 +481,7 @@ EvtScript N(EVS_SecretPanel_Flip) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_20AC, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_20AC, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o252, COLLIDER_FLAGS_UPPER_MASK) EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_20/kmr_20_5_entity.c b/src/world/area_kmr/kmr_20/kmr_20_5_entity.c index 5575186467..891cb61081 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_5_entity.c +++ b/src/world/area_kmr/kmr_20/kmr_20_5_entity.c @@ -10,7 +10,7 @@ API_CALLABLE(N(SetAmbienceVolumeHalf_Entity)){ EvtScript N(EVS_SecretPanel_FlipBack) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o252, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_20AB, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_20AB, SOUND_SPACE_MODE_0) EVT_CALL(N(SetAmbienceVolumeHalf_Entity)) EVT_CALL(MakeLerp, 0, -2160, 60, EASING_QUADRATIC_OUT) EVT_LOOP(0) @@ -21,7 +21,7 @@ EvtScript N(EVS_SecretPanel_FlipBack) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_20AC, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_20AC, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o252, COLLIDER_FLAGS_UPPER_MASK) EVT_RETURN EVT_END 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 b7da47b89a..7a8c0c4831 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o160, SOUND_80000010, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 100, EVT_FLOAT(0.6)) EVT_END_THREAD 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 c299e4d23e..da4e066bd7 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_227, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_228, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o90, SOUND_227, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o90, SOUND_228, 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 060a53073d..0f2b74b672 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_227, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_228, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o106, SOUND_227, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o106, SOUND_228, 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 35c14b03b7..b16ba76199 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, 0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_80000010, SOUND_SPACE_MODE_0) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_g21, LVar0, 0, 0) 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 83942a32bb..a86fddaf1f 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, 0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_80000010, SOUND_SPACE_MODE_0) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_g19, LVar0, 0, 0) 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 0182676066..a6b7c69f77 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, 0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_80000010, SOUND_SPACE_MODE_0) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_g20, LVar0, 0, 0) 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 ecea0c2fd1..d7977ada7f 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 @@ -98,7 +98,7 @@ EvtScript N(EVS_SetupHiddenSpring) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(18) - EVT_CALL(PlaySoundAtNpc, NPC_Dummy, SOUND_1EF, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Dummy, SOUND_1EF, 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 ea0cab73c9..3cb81c99f0 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 @@ -44,7 +44,7 @@ s32 N(ChainAnimOffsets)[] = { -2, -3, -2, -1, 0, 1, 1, 1, 1, 1, 0, 0, 0, -1, -1, - -1, -2, -2, -2, -1, + -1, -2, -2, -2, -1, }; API_CALLABLE(N(CreateLowerChainShadow)) { @@ -84,7 +84,7 @@ EvtScript N(EVS_SetupLowerChain) = { EVT_CALL(N(DetectLowerChainGrab)) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtPlayer, SOUND_229, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_229, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_WAIT(1) EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000D) @@ -158,7 +158,7 @@ EvtScript N(EVS_LowerWaterLevel0) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(30) EVT_END_IF - EVT_CALL(PlaySound, SOUND_62B) + EVT_CALL(PlaySound, SOUND_22B | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(func_802D62E4, SOUND_22B) EVT_CALL(SetGroupEnabled, MODEL_sui1, 0) EVT_CALL(EnableModel, MODEL_s_sui, FALSE) @@ -211,7 +211,7 @@ EvtScript N(EVS_RaiseWaterLevel1) = { EVT_GOTO(15) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_80000052, 0, 118, 115, -11) + EVT_CALL(PlaySoundAt, SOUND_80000052, SOUND_SPACE_MODE_0, 118, 115, -11) EVT_WAIT(20) EVT_THREAD EVT_CALL(SetTexPanner, MODEL_o388, 2) @@ -265,7 +265,7 @@ EvtScript N(EVS_RaiseWaterLevel1) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(40) EVT_END_IF - EVT_CALL(PlaySound, SOUND_62A) + EVT_CALL(PlaySound, SOUND_22A | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(func_802D62E4, SOUND_22A) EVT_CALL(EnableModel, MODEL_o389, FALSE) EVT_CALL(EnableModel, MODEL_o388, FALSE) @@ -331,7 +331,7 @@ EvtScript N(EVS_SetupUpperChain) = { EVT_CALL(N(DetectUpperChainGrab)) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtPlayer, SOUND_229, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_229, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_WAIT(1) EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000D) @@ -406,7 +406,7 @@ EvtScript N(EVS_LowerWaterLevel1) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(30) EVT_END_IF - EVT_CALL(PlaySound, SOUND_62B) + EVT_CALL(PlaySound, SOUND_22B | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(func_802D62E4, SOUND_22B) EVT_WAIT(10) EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096) @@ -455,7 +455,7 @@ EvtScript N(EVS_RaiseWaterLevel2) = { EVT_GOTO(15) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_80000052, 0, 500, 240, -25) + EVT_CALL(PlaySoundAt, SOUND_80000052, SOUND_SPACE_MODE_0, 500, 240, -25) EVT_WAIT(20) EVT_THREAD EVT_CALL(SetTexPanner, MODEL_o388, 2) @@ -508,7 +508,7 @@ EvtScript N(EVS_RaiseWaterLevel2) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(40) EVT_END_IF - EVT_CALL(PlaySound, SOUND_62A) + EVT_CALL(PlaySound, SOUND_22A | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(func_802D62E4, SOUND_22A) EVT_CALL(EnableModel, MODEL_o389, FALSE) EVT_CALL(EnableModel, MODEL_o388, FALSE) 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 239496c7dc..8bcd9d36f5 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 @@ -2,20 +2,20 @@ s32 N(WallPanels)[] = { MODEL_o371, -230, 272, -100, - MODEL_o372, -160, 272, -100, + MODEL_o372, -160, 272, -100, MODEL_o373, -103, 272, -100, - MODEL_o374, -46, 272, -100, + MODEL_o374, -46, 272, -100, MODEL_o375, 10, 272, -100, - MODEL_o376, 67, 272, -100, + MODEL_o376, 67, 272, -100, MODEL_o377, 135, 272, -100, - MODEL_o382, 245, 272, -100, + MODEL_o382, 245, 272, -100, MODEL_o381, 318, 272, -100, - MODEL_o380, 375, 272, -100, + MODEL_o380, 375, 272, -100, MODEL_o379, 432, 272, -100, - MODEL_o378, 490, 272, -100, + MODEL_o378, 490, 272, -100, MODEL_o383, 547, 272, -100, - MODEL_o384, 615, 272, -100, - -1, + MODEL_o384, 615, 272, -100, + -1, }; EvtScript N(EVS_FocusCam_Wall) = { @@ -67,7 +67,7 @@ EvtScript N(EVS_FlipWallPanels) = { EVT_IF_EQ(LVar5, -1) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_2040, 0, LVar6, LVar7, LVar8) + EVT_CALL(PlaySoundAt, SOUND_2040, SOUND_SPACE_MODE_0, LVar6, LVar7, LVar8) EVT_EXEC(N(EVS_FlipWallPanel)) EVT_WAIT(10) EVT_END_LOOP 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 32108c4c0c..275093c320 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 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 0c2f4d809f..51bffe9505 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 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 265f73936d..3452aeac7d 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 @@ -6,13 +6,13 @@ API_CALLABLE(N(SetScreenBlackFadeAmount)) { Bytecode* args = script->ptrReadPos; f32 amount = evt_get_variable(script, *args++); - + set_screen_overlay_params_front(0, amount); return ApiStatus_DONE2; } API_CALLABLE(N(MuteAmbience)) { - snd_ambient_80055618(0, 1); + snd_ambient_mute(0, TRUE); return ApiStatus_DONE2; } @@ -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, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_02, SOUND_262, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_03, SOUND_262, 0) + 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(ShowEmote, NPC_Koopatrol_01, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Koopatrol_02, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Koopatrol_03, EMOTE_EXCLAMATION, 0, 15, TRUE, 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 eecf295821..d7d9aecb1f 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 @@ -20,7 +20,7 @@ EvtScript N(EVS_Scene_FallIntoCell) = { EVT_ELSE EVT_CALL(func_802CF56C, 1) EVT_END_IF - EVT_CALL(PlaySoundAtPlayer, SOUND_161, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_161, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerAnimation, ANIM_Mario_80018) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_LOOP(0) @@ -29,7 +29,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, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_3FB, 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 7e76d32bbb..3f1b04cede 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 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 063cf8bb0c..23493e2675 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 @@ -49,7 +49,7 @@ EvtScript N(EVS_NpcAI_Duplighost_Flee) = { EVT_END_IF EVT_END_LOOP EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 45, 20, TRUE, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 5) @@ -74,7 +74,7 @@ EvtScript N(EVS_NpcAI_Duplighost_Caught) = { EVT_WAIT(5) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Follower, SOUND_20B8, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Follower, SOUND_20B8, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 1440, 20, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -84,7 +84,7 @@ EvtScript N(EVS_NpcAI_Duplighost_Caught) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_Follower, SOUND_SMOKE_BURST, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Follower, SOUND_SMOKE_BURST, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcPos, NPC_Guardian, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcPos, NPC_Follower, NPC_DISPOSE_LOCATION) EVT_CALL(EnableNpcShadow, NPC_Follower, FALSE) 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 0f54ed1008..37e558be0a 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 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 2cd89e46cd..c0be2a0ee1 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 @@ -4,7 +4,7 @@ #include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_OpenAirshipDockDoor) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1DF, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1DF, SOUND_SPACE_MODE_0) EVT_CALL(EnableModel, MODEL_o1616, FALSE) EVT_CALL(MakeLerp, 0, -10, 20, EASING_CUBIC_IN) EVT_LOOP(0) @@ -48,7 +48,7 @@ EvtScript N(EVS_CloseAirshipDockDoor) = { EVT_END_IF EVT_END_LOOP EVT_CALL(EnableModel, MODEL_o1616, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1E0, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1E0, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; 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 eecb6509c1..70708e3c7f 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 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 fd86af2acd..c9927d47c1 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 @@ -4,7 +4,7 @@ #include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_OpenAirshipDockDoor) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1DF, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1DF, SOUND_SPACE_MODE_0) EVT_CALL(EnableModel, MODEL_o1616, FALSE) EVT_CALL(MakeLerp, 0, -10, 20, EASING_CUBIC_IN) EVT_LOOP(0) @@ -29,7 +29,7 @@ EvtScript N(EVS_OpenAirshipDockDoor) = { }; EvtScript N(EVS_CloseAirshipDockDoor) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1E0, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1E0, 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 bb11bc68d0..4d6c636629 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tts, SOUND_1DF, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tts, SOUND_1E0, 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 f012ad4a52..4bba502152 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, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_17E, 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, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_17F, 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 e7341c369f..389c3b12fd 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 @@ -80,10 +80,10 @@ EvtScript N(EVS_Main) = { EVT_CALL(InitAnimatedModels) EVT_EXEC(N(EVS_SetupChainDrive)) EVT_THREAD - EVT_CALL(PlaySoundAt, SOUND_80000051, 0, 800, 100, -200) + EVT_CALL(PlaySoundAt, SOUND_80000051, SOUND_SPACE_MODE_0, 800, 100, -200) EVT_WAIT(28) EVT_LOOP(0) - EVT_CALL(PlaySoundAt, SOUND_222, 0, 800, 100, -200) + EVT_CALL(PlaySoundAt, SOUND_222, 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 bf2be54029..63a7e214b5 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 @@ -163,7 +163,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_WAIT(25) EVT_CALL(EnableModel, MODEL_o165, FALSE) EVT_END_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_2091, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_2091, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 90, 30, EASING_COS_SLOW_OVERSHOOT) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -179,7 +179,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario_80018) EVT_WAIT(10) - EVT_CALL(PlaySoundAtPlayer, SOUND_161, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_161, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_LOOP(65) 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 0c4daa2cee..a30f5e8742 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 @@ -121,7 +121,7 @@ EvtScript N(EVS_KoopaBros_SpinAround) = { EvtScript N(EVS_KoopaBros_FlingAway) = { EVT_THREAD - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_HIT_NORMAL, 0) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_HIT_NORMAL, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.6)) EVT_END_THREAD EVT_SWITCH(LVar0) @@ -200,7 +200,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosRed, SOUND_3E9, 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_Anim05) @@ -215,7 +215,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosBlk, SOUND_3E9, 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_Anim05) @@ -230,7 +230,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosYlw, SOUND_3E9, 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_Anim05) @@ -245,7 +245,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosGrn, SOUND_3E9, 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_Anim05) @@ -258,7 +258,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosRed, SOUND_20F3, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosRed, SOUND_20F3, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim1A) EVT_END_THREAD EVT_THREAD @@ -267,7 +267,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosBlk, SOUND_20F3, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosBlk, SOUND_20F3, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_Anim1A) EVT_END_THREAD EVT_THREAD @@ -276,7 +276,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosYlw, SOUND_20F3, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosYlw, SOUND_20F3, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_Anim1A) EVT_END_THREAD EVT_THREAD @@ -285,7 +285,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosGrn, SOUND_20F3, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosGrn, SOUND_20F3, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_Anim1A) EVT_END_THREAD EVT_WAIT(45) diff --git a/src/world/area_kpa/kpa_91/kpa_91_2_main.c b/src/world/area_kpa/kpa_91/kpa_91_2_main.c index 9a3a97173e..927331a337 100644 --- a/src/world/area_kpa/kpa_91/kpa_91_2_main.c +++ b/src/world/area_kpa/kpa_91/kpa_91_2_main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_OpenCellDoor) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(PlayerMoveTo, -30, 15, 20) EVT_CALL(InterpPlayerYaw, 90, 2) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_METAL_GATE_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_METAL_GATE_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 140, 60, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) 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 7ae2c01ee5..f194d901ea 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 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 b618a5c8ab..29ddb1f239 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 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_3_main.c b/src/world/area_kpa/kpa_95/kpa_95_3_main.c index 42ff81d61a..270e55368d 100644 --- a/src/world/area_kpa/kpa_95/kpa_95_3_main.c +++ b/src/world/area_kpa/kpa_95/kpa_95_3_main.c @@ -4,7 +4,7 @@ EvtScript N(EVS_OpenCellDoor) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(PlayerMoveTo, -30, 15, 20) EVT_CALL(InterpPlayerYaw, 90, 2) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_METAL_GATE_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_METAL_GATE_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 140, 60, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_kzn/kzn_01/kzn_01_2_npc.c b/src/world/area_kzn/kzn_01/kzn_01_2_npc.c index 33a566b31e..9b55af1053 100644 --- a/src/world/area_kzn/kzn_01/kzn_01_2_npc.c +++ b/src/world/area_kzn/kzn_01/kzn_01_2_npc.c @@ -18,13 +18,13 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_CALL(SetNpcPos, NPC_SELF, 320, -220, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim17) EVT_WAIT(30) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim01) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_LargePiranha_Putrid_Anim04, ANIM_LargePiranha_Putrid_Anim01, 0, MSG_CH5_00ED) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_DIG, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim18) EVT_WAIT(25) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) 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 e75547d064..edc0895a65 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 @@ -47,7 +47,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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) @@ -87,7 +87,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_GOTO(15) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_E8, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_E8, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -700, 150, 0, 35) EVT_THREAD EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) @@ -98,7 +98,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -760, 50, -40, 10) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_WAIT(4) @@ -107,7 +107,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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 c8b42f894e..293f330bd6 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 @@ -68,7 +68,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 9) EVT_CALL(GetSelfVar, 0, LVar0) EVT_IF_EQ(LVar0, 1) @@ -102,7 +102,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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 d70a686328..72daeaf531 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 @@ -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, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_168, 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, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_185, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); } return ApiStatus_DONE2; } 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 86502ca6c5..b6a6fd6651 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 @@ -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, 0, LVar1, LVar2, LVar3) + EVT_CALL(PlaySoundAt, SOUND_B000000A, 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_06/kzn_06_3_extra.c b/src/world/area_kzn/kzn_06/kzn_06_3_extra.c index 4563914ef6..e4fec02bb9 100644 --- a/src/world/area_kzn/kzn_06/kzn_06_3_extra.c +++ b/src/world/area_kzn/kzn_06/kzn_06_3_extra.c @@ -57,7 +57,7 @@ API_CALLABLE(N(AdjustFog)) { } API_CALLABLE(N(func_80240A44_C6D364)) { - snd_ambient_80055618(0, 1); + snd_ambient_mute(0, TRUE); return ApiStatus_DONE2; } 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 60bfc742c5..4fb37f7b18 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 @@ -7,7 +7,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, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_168, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); } return ApiStatus_DONE2; } @@ -19,7 +19,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, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_185, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); } return ApiStatus_DONE2; } 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 39fa7242da..980817d51d 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 @@ -72,14 +72,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) EVT_WAIT(25) 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -410, 870, -15, 10) EVT_CALL(GetSelfVar, 0, LVar0) EVT_IF_NE(LVar0, 1) @@ -107,11 +107,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10) EVT_ADD(LVar3, 90) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Thrown) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) EVT_CALL(SetSelfVar, 0, 1) @@ -150,7 +150,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_161, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) EVT_CALL(SetSelfVar, 0, 0) @@ -173,7 +173,7 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_END_THREAD EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00F5, 160, 40) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_162, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_162, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(7.0)) EVT_WAIT(10) 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 da6b253458..9f683ac750 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 @@ -144,14 +144,14 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_END_IF EVT_END_SWITCH EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_1E3, 0, -465, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_1E3, 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, 0, -465, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_8000001B, 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,7 +200,7 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.5)) EVT_END_THREAD EVT_CALL(StopSound, SOUND_8000001B) - EVT_CALL(PlaySoundAt, SOUND_1E4, 0, 415, -240, 0) + EVT_CALL(PlaySoundAt, SOUND_1E4, 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 8bb3dd521c..5e9d5ee63f 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 @@ -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, 0, LVar1, LVar2, LVar3) + EVT_CALL(PlaySoundAt, SOUND_B000000A, 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_3_npc.c b/src/world/area_kzn/kzn_17/kzn_17_3_npc.c index 39a27749b6..484953bad3 100644 --- a/src/world/area_kzn/kzn_17/kzn_17_3_npc.c +++ b/src/world/area_kzn/kzn_17/kzn_17_3_npc.c @@ -46,7 +46,7 @@ EvtScript N(EVS_Kolorado_TrompImpact) = { EVT_CALL(SetNpcRotation, NPC_Kolorado, 0, 0, 250) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_HurtStill) EVT_CALL(func_802CFD30, 0, FOLD_TYPE_4, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Kolorado, SOUND_HIT_PLAYER_NORMAL, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado, SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(SetNpcCollisionSize, NPC_Kolorado, 20, 24) EVT_CALL(LoadPath, 30, EVT_PTR(N(KoloradoThrownPath)), ARRAY_COUNT(N(KoloradoThrownPath)), EASING_LINEAR) 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 3f6ea89b2d..a66be2b233 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 @@ -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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_gogo, SOUND_1E4, 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) 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 43ac5e52b5..0b0a426e36 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10) EVT_CALL(SetNpcYaw, NPC_SELF, 90) EVT_SET(MV_KoloradoJumpDone, TRUE) @@ -115,13 +115,13 @@ EvtScript N(EVS_NpcIdle_Piranha) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_CALL(SetNpcPos, NPC_SELF, 285, 25, 35) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim17) EVT_WAIT(30) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim01) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_LargePiranha_Putrid_Anim04, ANIM_LargePiranha_Putrid_Anim01, 0, MSG_CH5_00FF) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_DIG, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim18) EVT_WAIT(25) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) 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 ca1f75bed4..2e97640218 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 @@ -39,7 +39,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_CALL(PlaySound, SOUND_80000067) EVT_CALL(N(StarSpiritEffectFunc1)) EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, 0, 185, 110, -30) + EVT_CALL(PlaySoundAt, SOUND_B2, SOUND_SPACE_MODE_0, 185, 110, -30) EVT_END_THREAD EVT_THREAD EVT_WAIT(45) @@ -48,7 +48,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_THREAD EVT_WAIT(180) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, 0, 185, 110, -30) + EVT_CALL(PlaySoundAt, SOUND_137, SOUND_SPACE_MODE_0, 185, 110, -30) EVT_END_THREAD EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD @@ -76,7 +76,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_IF // wait for pickup EVT_CALL(N(StarSpiritEffectFunc4), 3) - EVT_CALL(PlaySoundAtPlayer, SOUND_138, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_4, TRANSITION_14) 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 84c8e05f99..c996caba9e 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 @@ -302,7 +302,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, 0, 330, 25, -50) + EVT_CALL(PlaySoundAt, SOUND_3C5, SOUND_SPACE_MODE_0, 330, 25, -50) EVT_EXEC(N(EVS_PlayVinesAnim_Emerge)) EVT_WAIT(59) EVT_THREAD @@ -557,7 +557,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, 0, 330, 25, -50) + EVT_CALL(PlaySoundAt, SOUND_3C6, 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_3_npc.c b/src/world/area_kzn/kzn_20/kzn_20_3_npc.c index a621c91ae6..ea29d5308d 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 @@ -163,7 +163,7 @@ EvtScript N(EVS_KoloradoBurned_PlayerReaction) = { }; API_CALLABLE(N(func_80240A68_C96998)) { - snd_ambient_80055618(0, 1); + snd_ambient_mute(0, TRUE); return ApiStatus_DONE2; } @@ -186,9 +186,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -25, 125, -20, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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) @@ -213,7 +213,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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)) @@ -226,7 +226,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) @@ -253,11 +253,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -30, 100, 40, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -15, 75, 80, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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)) @@ -280,7 +280,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_E8, 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) @@ -298,9 +298,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -25, 125, -20, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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)) @@ -446,7 +446,7 @@ EvtScript N(EVS_NpcIdle_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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, TRUE, 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_4_npc.c b/src/world/area_kzn/kzn_22/kzn_22_4_npc.c index 6ad7d46432..7ab826ffa9 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 @@ -9,7 +9,7 @@ API_CALLABLE(N(GetFloorCollider2)) { } API_CALLABLE(N(func_8024036C_C9A56C)) { - snd_ambient_80055618(0, 1); + snd_ambient_mute(0, TRUE); return ApiStatus_DONE2; } @@ -49,7 +49,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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 0f287fc2a0..385681b2e2 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 @@ -144,10 +144,10 @@ EvtScript N(EVS_PlayPyroclastSounds) = { EVT_BUF_READ1(LVar1) EVT_END_LOOP EVT_IF_EQ(AF_KZN23_UseAlternateSound, FALSE) - EVT_CALL(PlaySoundAt, SOUND_1AD, 0, LVar1, 2800, 0) + EVT_CALL(PlaySoundAt, SOUND_1AD, SOUND_SPACE_MODE_0, LVar1, 2800, 0) EVT_SET(AF_KZN23_UseAlternateSound, TRUE) EVT_ELSE - EVT_CALL(PlaySoundAt, SOUND_1AE, 0, LVar1, 2800, 0) + EVT_CALL(PlaySoundAt, SOUND_1AE, 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_12_intro.c b/src/world/area_mac/mac_00/mac_00_12_intro.c index d1f4f7c401..c90f2c5502 100644 --- a/src/world/area_mac/mac_00/mac_00_12_intro.c +++ b/src/world/area_mac/mac_00/mac_00_12_intro.c @@ -6,7 +6,7 @@ EvtScript N(EVS_PlayerExitPipe_Intro) = { EVT_CALL(SetPlayerPos, -100, -10, -370) EVT_CALL(InterpPlayerYaw, 135, 0) EVT_WAIT(2) - EVT_CALL(PlaySoundAtPlayer, SOUND_ENTER_PIPE, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_ENTER_PIPE, SOUND_SPACE_MODE_0) EVT_CALL(func_802D286C, 0x100) EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 2, 1, 1, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -27,7 +27,7 @@ EvtScript N(EVS_LuigiExitPipe_Intro) = { EVT_CALL(SetNpcPos, NPC_Luigi_Intro, -100, -35, -370) EVT_CALL(SetNpcYaw, NPC_Luigi_Intro, 135) EVT_WAIT(2) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_Intro, SOUND_ENTER_PIPE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_Intro, SOUND_ENTER_PIPE, SOUND_SPACE_MODE_0) EVT_CALL(func_802CFE2C, 0, 0x100) EVT_CALL(func_802CFD30, 0, FOLD_TYPE_5, 2, 1, 1, 0) EVT_CALL(SetNpcPos, NPC_Luigi_Intro, -100, -10, -370) diff --git a/src/world/area_mac/mac_00/mac_00_14_epilogue.c b/src/world/area_mac/mac_00/mac_00_14_epilogue.c index 45393d0826..544fbf8dc1 100644 --- a/src/world/area_mac/mac_00/mac_00_14_epilogue.c +++ b/src/world/area_mac/mac_00/mac_00_14_epilogue.c @@ -6,7 +6,7 @@ EvtScript N(EVS_PlayerExitPipe_Epilogue) = { EVT_CALL(SetPlayerPos, -100, -10, -370) EVT_CALL(InterpPlayerYaw, 135, 0) EVT_WAIT(2) - EVT_CALL(PlaySoundAtPlayer, SOUND_ENTER_PIPE, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_ENTER_PIPE, SOUND_SPACE_MODE_0) EVT_CALL(func_802D286C, 0x100) EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 2, 1, 1, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -27,7 +27,7 @@ EvtScript N(EVS_LuigiExitPipe_Epilogue) = { EVT_CALL(SetNpcPos, NPC_Luigi_Epilogue, -100, -35, -370) EVT_CALL(SetNpcYaw, NPC_Luigi_Epilogue, 135) EVT_WAIT(2) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_Epilogue, SOUND_ENTER_PIPE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_Epilogue, SOUND_ENTER_PIPE, SOUND_SPACE_MODE_0) EVT_CALL(func_802CFE2C, 25, 0x100) EVT_CALL(func_802CFD30, 25, FOLD_TYPE_5, 2, 1, 1, 0) EVT_CALL(SetNpcPos, NPC_Luigi_Epilogue, -100, -10, -370) 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 67e0e4294e..8ecf7a41b6 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_02, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_ShyGuy_02, 400, 20, -300, 20) EVT_CALL(NpcFacePlayer, NPC_ShyGuy_02, 0) EVT_WAIT(10) @@ -37,7 +37,7 @@ EvtScript N(EVS_NpcAI_ShyGuy_03) = { EVT_CALL(PlayerMoveTo, 410, -340, 0) EVT_END_THREAD EVT_SET(LVar0, 22) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, 0) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, SOUND_SPACE_MODE_0) EVT_EXEC_GET_TID(N(EVS_ShyGuy_PlayRunningSounds), LVarA) EVT_CALL(SetNpcSpeed, NPC_ShyGuy_02, EVT_FLOAT(8.0)) EVT_CALL(NpcMoveTo, NPC_ShyGuy_02, 170, -140, 0) @@ -88,8 +88,8 @@ EvtScript N(EVS_NpcHit_ShyGuy_03) = { EVT_IF_EQ(LVar0, PLANE_SIDE_POSITIVE) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HIT_PLAYER_NORMAL, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, SOUND_SPACE_MODE_0) EVT_SET(GF_MAC00_ShyGuyChasedFromShop, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(SetEnemyFlagBits, NPC_ShyGuy_02, ENEMY_FLAG_8000000, 1) 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 814b916b1f..21e5048161 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 @@ -1,6 +1,6 @@ s32 N(LetterList_RussT)[] = { ITEM_LETTER_TO_RUSS_T, - ITEM_NONE + ITEM_NONE }; EvtScript N(EVS_LetterPrompt_RussT) = { @@ -24,7 +24,7 @@ EvtScript N(EVS_LetterReward_RussT) = { EvtScript N(EVS_ShyGuy_PlayRunningSounds) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_B0000021, 0) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_B0000021, SOUND_SPACE_MODE_0) EVT_WAIT(2) EVT_END_LOOP EVT_RETURN @@ -40,42 +40,42 @@ typedef struct RussTLoreEntry { } RussTLoreEntry; // size = 0x14 RussTLoreEntry N(RussTLore)[] = { - { MSG_RussTHint_0000, STORY_CH0_WAKE_UP, AF_MAC_45, GF_MAC00_RussT_HeardLore_00, AF_MAC_77 }, - { MSG_RussTHint_0001, STORY_CH0_WAKE_UP, AF_MAC_46, GF_MAC00_RussT_HeardLore_01, AF_MAC_78 }, - { MSG_RussTHint_0002, STORY_CH0_WAKE_UP, AF_MAC_47, GF_MAC00_RussT_HeardLore_02, AF_MAC_79 }, - { MSG_RussTHint_0003, STORY_CH0_WAKE_UP, AF_MAC_48, GF_MAC00_RussT_HeardLore_03, AF_MAC_7A }, - { MSG_RussTHint_0004, STORY_CH0_BEGAN_PEACH_MISSION, AF_MAC_49, GF_MAC00_RussT_HeardLore_04, AF_MAC_7B }, - { MSG_RussTHint_0005, STORY_CH0_BEGAN_PEACH_MISSION, AF_MAC_4A, GF_MAC00_RussT_HeardLore_05, AF_MAC_7C }, - { MSG_RussTHint_0006, STORY_CH0_BEGAN_PEACH_MISSION, AF_MAC_4B, GF_MAC00_RussT_HeardLore_06, AF_MAC_7D }, - { MSG_RussTHint_0007, STORY_CH0_BEGAN_PEACH_MISSION, AF_MAC_4C, GF_MAC00_RussT_HeardLore_07, AF_MAC_7E }, - { MSG_RussTHint_0008, STORY_CH1_BEGAN_PEACH_MISSION, AF_MAC_4D, GF_MAC00_RussT_HeardLore_08, AF_MAC_7F }, - { MSG_RussTHint_0009, STORY_CH1_BEGAN_PEACH_MISSION, AF_MAC_4E, GF_MAC00_RussT_HeardLore_09, AF_MAC_80 }, - { MSG_RussTHint_000A, STORY_CH1_BEGAN_PEACH_MISSION, AF_MAC_4F, GF_MAC00_RussT_HeardLore_0A, AF_MAC_81 }, - { MSG_RussTHint_000B, STORY_CH1_BEGAN_PEACH_MISSION, AF_MAC_50, GF_MAC00_RussT_HeardLore_0B, AF_MAC_82 }, - { MSG_RussTHint_000C, STORY_CH2_BEGAN_PEACH_MISSION, AF_MAC_51, GF_MAC00_RussT_HeardLore_0C, AF_MAC_83 }, - { MSG_RussTHint_000D, STORY_CH2_BEGAN_PEACH_MISSION, AF_MAC_52, GF_MAC00_RussT_HeardLore_0D, AF_MAC_84 }, - { MSG_RussTHint_000E, STORY_CH2_BEGAN_PEACH_MISSION, AF_MAC_53, GF_MAC00_RussT_HeardLore_0E, AF_MAC_85 }, - { MSG_RussTHint_000F, STORY_CH2_BEGAN_PEACH_MISSION, AF_MAC_54, GF_MAC00_RussT_HeardLore_0F, AF_MAC_86 }, - { MSG_RussTHint_0010, STORY_CH3_BEGAN_PEACH_MISSION, AF_MAC_55, GF_MAC00_RussT_HeardLore_10, AF_MAC_87 }, - { MSG_RussTHint_0011, STORY_CH3_BEGAN_PEACH_MISSION, AF_MAC_56, GF_MAC00_RussT_HeardLore_11, AF_MAC_88 }, - { MSG_RussTHint_0012, STORY_CH3_BEGAN_PEACH_MISSION, AF_MAC_57, GF_MAC00_RussT_HeardLore_12, AF_MAC_89 }, - { MSG_RussTHint_0013, STORY_CH3_BEGAN_PEACH_MISSION, AF_MAC_58, GF_MAC00_RussT_HeardLore_13, AF_MAC_8A }, - { MSG_RussTHint_0014, STORY_CH4_BEGAN_PEACH_MISSION, AF_MAC_59, GF_MAC00_RussT_HeardLore_14, AF_MAC_8B }, - { MSG_RussTHint_0015, STORY_CH4_BEGAN_PEACH_MISSION, AF_MAC_5A, GF_MAC00_RussT_HeardLore_15, AF_MAC_8C }, - { MSG_RussTHint_0016, STORY_CH4_BEGAN_PEACH_MISSION, AF_MAC_5B, GF_MAC00_RussT_HeardLore_16, AF_MAC_8D }, - { MSG_RussTHint_0017, STORY_CH4_BEGAN_PEACH_MISSION, AF_MAC_5C, GF_MAC00_RussT_HeardLore_17, AF_MAC_8E }, - { MSG_RussTHint_0018, STORY_CH5_BEGAN_PEACH_MISSION, AF_MAC_5D, GF_MAC00_RussT_HeardLore_18, AF_MAC_8F }, - { MSG_RussTHint_0019, STORY_CH5_BEGAN_PEACH_MISSION, AF_MAC_5E, GF_MAC00_RussT_HeardLore_19, AF_MAC_90 }, - { MSG_RussTHint_001A, STORY_CH5_BEGAN_PEACH_MISSION, AF_MAC_5F, GF_MAC00_RussT_HeardLore_1A, AF_MAC_91 }, - { MSG_RussTHint_001B, STORY_CH5_BEGAN_PEACH_MISSION, AF_MAC_60, GF_MAC00_RussT_HeardLore_1B, AF_MAC_92 }, - { MSG_RussTHint_001C, STORY_CH6_BEGAN_PEACH_MISSION, AF_MAC_61, GF_MAC00_RussT_HeardLore_1C, AF_MAC_93 }, - { MSG_RussTHint_001D, STORY_CH6_BEGAN_PEACH_MISSION, AF_MAC_62, GF_MAC00_RussT_HeardLore_1D, AF_MAC_94 }, - { MSG_RussTHint_001E, STORY_CH6_BEGAN_PEACH_MISSION, AF_MAC_63, GF_MAC00_RussT_HeardLore_1E, AF_MAC_95 }, - { MSG_RussTHint_001F, STORY_CH6_BEGAN_PEACH_MISSION, AF_MAC_64, GF_MAC00_RussT_HeardLore_1F, AF_MAC_96 }, - { MSG_RussTHint_0020, STORY_CH7_BEGAN_PEACH_MISSION, AF_MAC_65, GF_MAC00_RussT_HeardLore_20, AF_MAC_97 }, - { MSG_RussTHint_0021, STORY_CH7_BEGAN_PEACH_MISSION, AF_MAC_66, GF_MAC00_RussT_HeardLore_21, AF_MAC_98 }, - { MSG_RussTHint_0022, STORY_CH7_BEGAN_PEACH_MISSION, AF_MAC_67, GF_MAC00_RussT_HeardLore_22, AF_MAC_99 }, - { MSG_RussTHint_0023, STORY_CH7_BEGAN_PEACH_MISSION, AF_MAC_68, GF_MAC00_RussT_HeardLore_23, AF_MAC_9A }, + { MSG_RussTHint_0000, STORY_CH0_WAKE_UP, AF_MAC_45, GF_MAC00_RussT_HeardLore_00, AF_MAC_77 }, + { MSG_RussTHint_0001, STORY_CH0_WAKE_UP, AF_MAC_46, GF_MAC00_RussT_HeardLore_01, AF_MAC_78 }, + { MSG_RussTHint_0002, STORY_CH0_WAKE_UP, AF_MAC_47, GF_MAC00_RussT_HeardLore_02, AF_MAC_79 }, + { MSG_RussTHint_0003, STORY_CH0_WAKE_UP, AF_MAC_48, GF_MAC00_RussT_HeardLore_03, AF_MAC_7A }, + { MSG_RussTHint_0004, STORY_CH0_BEGAN_PEACH_MISSION, AF_MAC_49, GF_MAC00_RussT_HeardLore_04, AF_MAC_7B }, + { MSG_RussTHint_0005, STORY_CH0_BEGAN_PEACH_MISSION, AF_MAC_4A, GF_MAC00_RussT_HeardLore_05, AF_MAC_7C }, + { MSG_RussTHint_0006, STORY_CH0_BEGAN_PEACH_MISSION, AF_MAC_4B, GF_MAC00_RussT_HeardLore_06, AF_MAC_7D }, + { MSG_RussTHint_0007, STORY_CH0_BEGAN_PEACH_MISSION, AF_MAC_4C, GF_MAC00_RussT_HeardLore_07, AF_MAC_7E }, + { MSG_RussTHint_0008, STORY_CH1_BEGAN_PEACH_MISSION, AF_MAC_4D, GF_MAC00_RussT_HeardLore_08, AF_MAC_7F }, + { MSG_RussTHint_0009, STORY_CH1_BEGAN_PEACH_MISSION, AF_MAC_4E, GF_MAC00_RussT_HeardLore_09, AF_MAC_80 }, + { MSG_RussTHint_000A, STORY_CH1_BEGAN_PEACH_MISSION, AF_MAC_4F, GF_MAC00_RussT_HeardLore_0A, AF_MAC_81 }, + { MSG_RussTHint_000B, STORY_CH1_BEGAN_PEACH_MISSION, AF_MAC_50, GF_MAC00_RussT_HeardLore_0B, AF_MAC_82 }, + { MSG_RussTHint_000C, STORY_CH2_BEGAN_PEACH_MISSION, AF_MAC_51, GF_MAC00_RussT_HeardLore_0C, AF_MAC_83 }, + { MSG_RussTHint_000D, STORY_CH2_BEGAN_PEACH_MISSION, AF_MAC_52, GF_MAC00_RussT_HeardLore_0D, AF_MAC_84 }, + { MSG_RussTHint_000E, STORY_CH2_BEGAN_PEACH_MISSION, AF_MAC_53, GF_MAC00_RussT_HeardLore_0E, AF_MAC_85 }, + { MSG_RussTHint_000F, STORY_CH2_BEGAN_PEACH_MISSION, AF_MAC_54, GF_MAC00_RussT_HeardLore_0F, AF_MAC_86 }, + { MSG_RussTHint_0010, STORY_CH3_BEGAN_PEACH_MISSION, AF_MAC_55, GF_MAC00_RussT_HeardLore_10, AF_MAC_87 }, + { MSG_RussTHint_0011, STORY_CH3_BEGAN_PEACH_MISSION, AF_MAC_56, GF_MAC00_RussT_HeardLore_11, AF_MAC_88 }, + { MSG_RussTHint_0012, STORY_CH3_BEGAN_PEACH_MISSION, AF_MAC_57, GF_MAC00_RussT_HeardLore_12, AF_MAC_89 }, + { MSG_RussTHint_0013, STORY_CH3_BEGAN_PEACH_MISSION, AF_MAC_58, GF_MAC00_RussT_HeardLore_13, AF_MAC_8A }, + { MSG_RussTHint_0014, STORY_CH4_BEGAN_PEACH_MISSION, AF_MAC_59, GF_MAC00_RussT_HeardLore_14, AF_MAC_8B }, + { MSG_RussTHint_0015, STORY_CH4_BEGAN_PEACH_MISSION, AF_MAC_5A, GF_MAC00_RussT_HeardLore_15, AF_MAC_8C }, + { MSG_RussTHint_0016, STORY_CH4_BEGAN_PEACH_MISSION, AF_MAC_5B, GF_MAC00_RussT_HeardLore_16, AF_MAC_8D }, + { MSG_RussTHint_0017, STORY_CH4_BEGAN_PEACH_MISSION, AF_MAC_5C, GF_MAC00_RussT_HeardLore_17, AF_MAC_8E }, + { MSG_RussTHint_0018, STORY_CH5_BEGAN_PEACH_MISSION, AF_MAC_5D, GF_MAC00_RussT_HeardLore_18, AF_MAC_8F }, + { MSG_RussTHint_0019, STORY_CH5_BEGAN_PEACH_MISSION, AF_MAC_5E, GF_MAC00_RussT_HeardLore_19, AF_MAC_90 }, + { MSG_RussTHint_001A, STORY_CH5_BEGAN_PEACH_MISSION, AF_MAC_5F, GF_MAC00_RussT_HeardLore_1A, AF_MAC_91 }, + { MSG_RussTHint_001B, STORY_CH5_BEGAN_PEACH_MISSION, AF_MAC_60, GF_MAC00_RussT_HeardLore_1B, AF_MAC_92 }, + { MSG_RussTHint_001C, STORY_CH6_BEGAN_PEACH_MISSION, AF_MAC_61, GF_MAC00_RussT_HeardLore_1C, AF_MAC_93 }, + { MSG_RussTHint_001D, STORY_CH6_BEGAN_PEACH_MISSION, AF_MAC_62, GF_MAC00_RussT_HeardLore_1D, AF_MAC_94 }, + { MSG_RussTHint_001E, STORY_CH6_BEGAN_PEACH_MISSION, AF_MAC_63, GF_MAC00_RussT_HeardLore_1E, AF_MAC_95 }, + { MSG_RussTHint_001F, STORY_CH6_BEGAN_PEACH_MISSION, AF_MAC_64, GF_MAC00_RussT_HeardLore_1F, AF_MAC_96 }, + { MSG_RussTHint_0020, STORY_CH7_BEGAN_PEACH_MISSION, AF_MAC_65, GF_MAC00_RussT_HeardLore_20, AF_MAC_97 }, + { MSG_RussTHint_0021, STORY_CH7_BEGAN_PEACH_MISSION, AF_MAC_66, GF_MAC00_RussT_HeardLore_21, AF_MAC_98 }, + { MSG_RussTHint_0022, STORY_CH7_BEGAN_PEACH_MISSION, AF_MAC_67, GF_MAC00_RussT_HeardLore_22, AF_MAC_99 }, + { MSG_RussTHint_0023, STORY_CH7_BEGAN_PEACH_MISSION, AF_MAC_68, GF_MAC00_RussT_HeardLore_23, AF_MAC_9A }, }; API_CALLABLE(N(ResetRussHintsGiven)) { @@ -126,7 +126,7 @@ API_CALLABLE(N(GetRussHintMessage)) { s32 chosenHint = rand_int(count - 1); count = 0; - + for (i = hasHintMessage; i < ARRAY_COUNT(N(RussTLore)); i++, entry++) { if (evt_get_variable(script, entry->isAvailableFlag) && !evt_get_variable(script, entry->hasBeenGivenFlag) && @@ -194,7 +194,7 @@ EvtScript N(EVS_ShyGuy_StealDictionary) = { EVT_EXEC(N(EVS_ManageCarriedDictionary)) EVT_THREAD EVT_CALL(SetGroupEnabled, MODEL_intel_inn, 1) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit3, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit3, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_ADD(LVar0, 8) @@ -206,7 +206,7 @@ EvtScript N(EVS_ShyGuy_StealDictionary) = { EVT_CALL(RotateModel, MODEL_o210, LVar0, 0, 1, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit3, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit3, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(SetGroupEnabled, MODEL_intel_inn, 0) EVT_END_THREAD EVT_WAIT(5) @@ -215,10 +215,10 @@ 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuyThief, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_ShyGuyThief, -10, 0, -340, 0) EVT_SET(LVar0, 21) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, 0) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, SOUND_SPACE_MODE_0) EVT_EXEC_GET_TID(N(EVS_ShyGuy_PlayRunningSounds), LVarA) EVT_CALL(NpcMoveTo, NPC_ShyGuyThief, 45, -186, 0) EVT_CALL(NpcMoveTo, NPC_ShyGuyThief, 139, -67, 0) diff --git a/src/world/area_mac/mac_00/npc/trading_toad.inc.c b/src/world/area_mac/mac_00/npc/trading_toad.inc.c index 6a61a729ca..8b3feb0215 100644 --- a/src/world/area_mac/mac_00/npc/trading_toad.inc.c +++ b/src/world/area_mac/mac_00/npc/trading_toad.inc.c @@ -15,7 +15,7 @@ EvtScript N(EVS_NpcInteract_TradingToad) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_MAC_Gate_0119) EVT_WAIT(10) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_SET(GF_TradingEvent1_Active, FALSE) @@ -39,7 +39,7 @@ EvtScript N(EVS_NpcInteract_TradingToad) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_MAC_Gate_011D) EVT_WAIT(10) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_SET(GF_TradingEvent1_Active, FALSE) diff --git a/src/world/area_mac/mac_01/mac_01_2_main.c b/src/world/area_mac/mac_01/mac_01_2_main.c index abf820081f..25b0dce106 100644 --- a/src/world/area_mac/mac_01/mac_01_2_main.c +++ b/src/world/area_mac/mac_01/mac_01_2_main.c @@ -22,13 +22,13 @@ EvtScript N(EVS_ExitWalk_nok_11_0) = { s32 N(Models_CastleGateL)[] = { MODEL_o306, MODEL_o307, - -1 + -1 }; s32 N(Models_CastleGateR)[] = { MODEL_o308, MODEL_o309, - -1 + -1 }; EvtScript N(EVS_ExitDoors_osr_01_0) = { @@ -94,7 +94,7 @@ EvtScript N(EVS_EnterMap) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitn, SOUND_LARGE_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitn, SOUND_LARGE_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilitn, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(DisablePlayerInput, FALSE) EVT_CASE_EQ(mac_01_ENTRY_4) 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 8c37ac6961..8d9a54bb17 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 @@ -175,7 +175,7 @@ EvtScript N(EVS_ArtifactPrompt_Kolorado) = { EvtScript N(D_8024E6F8_80EF78) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_B0000021, 0) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_B0000021, SOUND_SPACE_MODE_0) EVT_WAIT(2) EVT_END_LOOP EVT_RETURN @@ -183,7 +183,7 @@ EvtScript N(D_8024E6F8_80EF78) = { }; EvtScript N(D_8024E740_80EFC0) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitd, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitd, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -80, 30, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -207,7 +207,7 @@ EvtScript N(D_8024E7F0_80F070) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitd, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitd, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; @@ -391,7 +391,7 @@ EvtScript N(EVS_MerlonBargeOut) = { EVT_CALL(ShowMessageAtScreenPos, MSG_MAC_Plaza_0020, 160, 40) EVT_CALL(SetGroupEnabled, MODEL_dr_in, 1) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitd, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitd, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -80, 15, EASING_COS_FAST_OVERSHOOT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -430,7 +430,7 @@ EvtScript N(EVS_MerlonBargeOut) = { EVT_END_IF EVT_END_LOOP EVT_CALL(N(KnockDownPlayerD), -215, 21, -158) - EVT_CALL(PlaySoundAtPlayer, SOUND_162, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_162, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(50) EVT_CALL(SetNpcPos, NPC_Merlon, -241, 20, -270) @@ -585,7 +585,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_Merlon, SOUND_209, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Merlon, SOUND_209, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Gather1) EVT_CALL(GetNpcPos, NPC_Merlon, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) @@ -605,14 +605,14 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_SET(MF_KoopaBrosSceneLock, TRUE) EVT_END_THREAD EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_20A, 0) + EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_20A, 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) EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar3, LVar4, LVar5, 1, 30) EVT_CALL(SetNpcAnimation, NPC_DarkToad_01, ANIM_DarkToad_Red_Hurt) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_2049, 0) + EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_2049, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_DarkToad_01, LVar3, LVar4, LVar5) EVT_CALL(SetNpcPos, NPC_DarkToad_01, LVar3, NPC_DISPOSE_POS_Y, LVar2) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, LVar3, LVar4, LVar5) @@ -622,14 +622,14 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_20A, 0) + EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_20A, 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) EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar3, LVar4, LVar5, 1, 30) EVT_CALL(SetNpcAnimation, NPC_DarkToad_02, ANIM_DarkToad_Black_Hurt) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_02, SOUND_2049, 0) + EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_02, SOUND_2049, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_DarkToad_02, LVar3, LVar4, LVar5) EVT_CALL(SetNpcPos, NPC_DarkToad_02, LVar3, NPC_DISPOSE_POS_Y, LVar2) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, LVar3, LVar4, LVar5) @@ -639,14 +639,14 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_20A, 0) + EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_20A, 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) EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar3, LVar4, LVar5, 1, 30) EVT_CALL(SetNpcAnimation, NPC_DarkToad_03, ANIM_DarkToad_Yellow_Hurt) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_03, SOUND_2049, 0) + EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_03, SOUND_2049, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_DarkToad_03, LVar3, LVar4, LVar5) EVT_CALL(SetNpcPos, NPC_DarkToad_03, LVar3, NPC_DISPOSE_POS_Y, LVar2) EVT_CALL(SetNpcPos, NPC_KoopaBros_03, LVar3, LVar4, LVar5) @@ -655,14 +655,14 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_CALL(NpcJump0, NPC_KoopaBros_03, LVar3, LVar4, LVar5, 10) EVT_END_THREAD EVT_WAIT(30) - EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_20A, 0) + EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_20A, 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) EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar3, LVar4, LVar5, 1, 30) EVT_CALL(SetNpcAnimation, NPC_DarkToad_04, ANIM_DarkToad_Green_Hurt) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_04, SOUND_2049, 0) + EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_04, SOUND_2049, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_DarkToad_04, LVar3, LVar4, LVar5) EVT_CALL(SetNpcPos, NPC_DarkToad_04, LVar3, NPC_DISPOSE_POS_Y, LVar2) EVT_CALL(SetNpcPos, NPC_KoopaBros_04, LVar3, LVar4, LVar5) @@ -695,7 +695,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim03) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim03) EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_174, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_174, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(8.0)) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, 700, 0, 0) @@ -782,7 +782,7 @@ EvtScript N(EVS_NpcInteract_Merlon) = { EVT_CALL(NpcMoveTo, NPC_Merlon, -230, -270, 0) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Idle) EVT_CALL(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_100, FALSE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitud, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitud, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -80, 15, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -805,7 +805,7 @@ EvtScript N(EVS_NpcInteract_Merlon) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitud, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitud, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcPos, NPC_SELF, -150, 10, -160) EVT_CALL(SetNpcYaw, NPC_Merlon, 90) EVT_EXEC(N(D_80250D14_811594)) @@ -1016,7 +1016,7 @@ EvtScript N(EVS_Scene_MerlonAndNinji) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(25) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitud, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitud, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_ADD(LVar0, 8) @@ -1029,7 +1029,7 @@ EvtScript N(EVS_Scene_MerlonAndNinji) = { EVT_CALL(RotateModel, MODEL_door, LVar0, 0, -1, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitud, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitud, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_004B) @@ -1743,7 +1743,7 @@ EvtScript N(D_8025B854_81C0D4) = { EVT_CALL(SpeakToPlayer, NPC_Rowf, ANIM_Rowf_Talk, ANIM_Rowf_Idle, 0, MSG_MAC_Plaza_0007) EVT_EXEC(N(D_8025B760_81BFE0)) EVT_SET(LVar0, 6) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, 0) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, SOUND_SPACE_MODE_0) EVT_EXEC_GET_TID(N(D_8024E6F8_80EF78), LVarA) EVT_CALL(NpcMoveTo, NPC_PostOfficeShyGuy, -45, 330, 30) EVT_CALL(NpcMoveTo, NPC_PostOfficeShyGuy, -45, 710, 30) @@ -1876,14 +1876,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_END_IF EVT_CALL(NpcJump0, NPC_SELF, 572, 36, -226, 8) EVT_WAIT(2) @@ -1901,11 +1901,11 @@ 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 550, 20, -161, 0) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit2u, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit2u, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_ADD(LVar0, 8) @@ -1917,11 +1917,11 @@ EvtScript N(EVS_NpcAI_ShyGuy_02) = { EVT_CALL(RotateModel, MODEL_door_k, LVar0, 0, -1, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit2u, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit2u, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(ShowSweat, -1, 1, -45, 1, 0, 0, 0, 0, 20) EVT_SET(LVar0, -1) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, 0) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, SOUND_SPACE_MODE_0) EVT_EXEC_GET_TID(N(D_8024E6F8_80EF78), LVarA) EVT_CALL(NpcMoveTo, NPC_SELF, 420, -118, 0) EVT_KILL_THREAD(LVarA) @@ -1951,8 +1951,8 @@ EvtScript N(EVS_NpcHit_ShyGuy_02) = { EVT_IF_EQ(LVar0, ENCOUNTER_TRIGGER_NONE) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HIT_PLAYER_NORMAL, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, SOUND_SPACE_MODE_0) EVT_SET(GF_MAC01_ChasedShyGuyFromToadHouse, TRUE) EVT_SET(AF_MAC_43, TRUE) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy_02))) 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 39ac020095..9d6dc7afbf 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 310, 27, 250, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 350, 280, 15) EVT_END_LOOP @@ -65,7 +65,7 @@ EvtScript N(EVS_GardenShyGuy_RunAway) = { EVT_CALL(ShowSweat, -1, 1, -45, 1, 0, 0, 0, 0, 20) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) EVT_SET(LVar0, -1) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, 0) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, SOUND_SPACE_MODE_0) EVT_EXEC_GET_TID(N(D_8024E6F8_80EF78), LVar9) EVT_CALL(NpcMoveTo, NPC_SELF, 160, 400, 0) EVT_KILL_THREAD(LVar9) @@ -74,10 +74,10 @@ EvtScript N(EVS_GardenShyGuy_RunAway) = { EVT_EXEC(N(EVS_MinhThankYou)) EVT_END_IF EVT_CALL(ShowSweat, -1, 1, -45, 1, 0, 0, 0, 0, 20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 110, 20, 420, 0) EVT_CALL(ShowSweat, -1, 1, -45, 1, 0, 0, 0, 0, 20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 40, 0, 450, 0) EVT_CALL(ShowSweat, -1, 1, -45, 1, 0, 0, 0, 0, 20) EVT_CALL(NpcMoveTo, NPC_SELF, -30, 550, 0) @@ -104,8 +104,8 @@ EvtScript N(EVS_GardenShyGuy_PlayHitReactionSounds) = { EVT_IF_LE(LVar3, 80) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HIT_PLAYER_NORMAL, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, SOUND_SPACE_MODE_0) EVT_SET(LVar0, 0) EVT_RETURN EVT_END @@ -269,7 +269,7 @@ EvtScript N(EVS_Scene_FlowerGateAppears) = { EVT_CALL(SetCamProperties, CAM_DEFAULT, 1, 266, 27, 373, 300, 15, -6) EVT_EXEC(N(EVS_PlayFlowerGateSong)) EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 0, 266, 50, 338, 1, LVar9) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_2A2, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_2A2, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_FadeInFlowerGateGlowAlpha)) EVT_THREAD EVT_WAIT(10) @@ -283,7 +283,7 @@ EvtScript N(EVS_Scene_FlowerGateAppears) = { EVT_EXEC_GET_TID(N(EVS_ModulateFlowerGateGlowAlpha), LVar2) EVT_WAIT(30) EVT_CALL(EnableModel, MODEL_r_door, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_2A3, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_2A3, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 3060, 80, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -296,7 +296,7 @@ EvtScript N(EVS_Scene_FlowerGateAppears) = { EVT_CALL(EnableModel, MODEL_r_door, FALSE) EVT_CALL(EnableGroup, MODEL_to_flo, TRUE) EVT_CALL(func_802D7B10, LVar9) - EVT_CALL(PlaySoundAt, SOUND_2A4, 0, 266, 50, 338) + EVT_CALL(PlaySoundAt, SOUND_2A4, 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) @@ -317,7 +317,7 @@ EvtScript N(EVS_Scene_FlowerGateAppears) = { s32 N(LetterList_MinhT_Unused)[] = { ITEM_LETTER_TO_MINHT, - ITEM_NONE + ITEM_NONE }; s32 N(ItemList_MagicalSeeds)[] = { @@ -325,7 +325,7 @@ s32 N(ItemList_MagicalSeeds)[] = { ITEM_MAGICAL_SEED2, ITEM_MAGICAL_SEED3, ITEM_MAGICAL_SEED4, - ITEM_NONE + ITEM_NONE }; EvtScript N(EVS_MinhT_PlantSeed) = { @@ -355,7 +355,7 @@ EvtScript N(EVS_MinhT_PlantSeed) = { EVT_END_SWITCH EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MinhT_Cheer) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2A1, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2A1, SOUND_SPACE_MODE_0) EVT_SWITCH(LVar5) EVT_CASE_EQ(0) EVT_CALL(EnableModel, MODEL_o375, TRUE) @@ -636,14 +636,14 @@ EvtScript N(EVS_ExitFlowerGate) = { EVT_RETURN EVT_END_IF EVT_CALL(N(SetPartnerTetherClose)) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_2A2, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_2A2, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_1CF, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -120, 15, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -663,7 +663,7 @@ EvtScript N(EVS_ExitFlowerGate) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_1D0, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_1D0, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(15) EVT_CALL(PlayerMoveTo, 257, 300, 30) @@ -680,7 +680,7 @@ EvtScript N(EVS_ExitFlowerGate) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_6A2, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_2A2 | 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) @@ -713,11 +713,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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_2A2, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_1CF, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -120, 15, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -739,7 +739,7 @@ EvtScript N(EVS_EnterFlowerGate) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_1D0, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_1D0, SOUND_SPACE_MODE_0) EVT_LOOP(0) EVT_WAIT(1) EVT_IS_THREAD_RUNNING(LVar2, LVar0) @@ -750,7 +750,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_6A2, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_2A2 | 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 b4c2ad3e45..8063f5c1cc 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,10 +443,10 @@ 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PostOfficeShyGuy, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_PostOfficeShyGuy, 247, 20, -440, 20) EVT_SET(LVar0, 6) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, 0) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, SOUND_SPACE_MODE_0) EVT_EXEC_GET_TID(N(D_8024E6F8_80EF78), LVarA) EVT_CALL(NpcMoveTo, NPC_PostOfficeShyGuy, 180, -410, 20) EVT_CALL(NpcMoveTo, NPC_PostOfficeShyGuy, 150, -333, 8) 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 73e9eb8dac..4df605dab3 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_207, 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_208, 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_208, 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_208, 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(func_802D7B10, ArrayVar(2)) EVT_WAIT(40) - EVT_CALL(PlaySoundAt, SOUND_607, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_207 | SOUND_ID_TRIGGER_CHANGE_SOUND, 0, LVar0, LVar1, LVar2) EVT_CALL(N(func_802446AC_804F2C), ArrayVar(1)) EVT_WAIT(15) EVT_CALL(func_802D7B10, 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 48006eb5e0..f2e18403f2 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 @@ -154,7 +154,7 @@ EvtScript N(EVS_NpcInteract_Rowf_B) = { s32 N(ItemList_Calculator)[] = { ITEM_CALCULATOR, - ITEM_NONE + ITEM_NONE }; EvtScript N(EVS_NpcInteract_Rowf_C) = { @@ -382,38 +382,38 @@ EvtScript N(EVS_UpdateRhuffAnims) = { }; s32 N(D_802555AC_815E2C)[] = { - 600, 0, 598, 0, - 595, 0, 590, 0, - 583, 0, 574, 0, - 562, 0, 547, 0, - 529, 0, 509, 0, - 489, 0, 469, 0, - 449, 0, 429, 0, - 409, 0, 389, 0, - 369, 0, 349, 0, - 329, 0, 309, 0, - 289, 0, 269, 0, - 249, 0, 229, 0, - 209, 0, 189, 0, - 169, 0, 149, 0, - 129, 0, 109, 0, - 89, 0, 69, 0, + 600, 0, 598, 0, + 595, 0, 590, 0, + 583, 0, 574, 0, + 562, 0, 547, 0, + 529, 0, 509, 0, + 489, 0, 469, 0, + 449, 0, 429, 0, + 409, 0, 389, 0, + 369, 0, 349, 0, + 329, 0, 309, 0, + 289, 0, 269, 0, + 249, 0, 229, 0, + 209, 0, 189, 0, + 169, 0, 149, 0, + 129, 0, 109, 0, + 89, 0, 69, 0, 49, 0, 29, 0, - 9, 0, -11, -11, + 9, 0, -11, -11, -16, -16, -18, -18, - -19, -19, -19, -19, -19, -19, -19, -19, - -15, -15, -5, -5, + -19, -19, -19, -19, + -15, -15, -5, -5, 2, 2, 3, 3, - 1, 1, 0, 0, - 0, 0, 0, 0, + 1, 1, 0, 0, + 0, 0, 0, 0, }; EvtScript N(EVS_Rhuff_RevealBadges) = { EVT_SET(MF_BadgeShopOpen, TRUE) EVT_CALL(SetNpcYaw, NPC_Rowf, 270) EVT_THREAD - EVT_CALL(PlaySoundAt, SOUND_A9, 0, -220, 37, 271) + EVT_CALL(PlaySoundAt, SOUND_A9, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o295, SOUND_AA, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o295, SOUND_AC, 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, 0, -220, 37, 271) + EVT_CALL(PlaySoundAt, SOUND_AB, 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 31c644a32c..35bd46c9f9 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, 0, -470, 30, -155) + EVT_CALL(PlaySoundAt, SOUND_269, 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 4d223695fc..be9822d30b 100644 --- a/src/world/area_mac/mac_02/npc/bootler.inc.c +++ b/src/world/area_mac/mac_02/npc/bootler.inc.c @@ -1,9 +1,9 @@ EvtScript N(D_8024ACA4_82DF64) = { EVT_IF_EQ(LVar0, EVT_FLOAT(0.0)) - EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH, SOUND_SPACE_MODE_0) EVT_SETF(LVar1, EVT_FLOAT(24.0)) EVT_ELSE - EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR, SOUND_SPACE_MODE_0) EVT_SETF(LVar1, EVT_FLOAT(-24.0)) EVT_END_IF EVT_LOOP(10) @@ -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)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_293, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_293, 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) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_TayceT, EMOTE_QUESTION, 0, 30, FALSE, 0, 0, 0, 0) EVT_WAIT(30) 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) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_TayceT, EMOTE_QUESTION, 0, 30, FALSE, 0, 0, 0, 0) EVT_WAIT(30) 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_293, SOUND_SPACE_MODE_0) EVT_CALL(NpcFlyTo, NPC_SELF, 550, 40, 10, 40, 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) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_TayceT, EMOTE_QUESTION, 0, 30, FALSE, 0, 0, 0, 0) EVT_WAIT(40) EVT_CALL(InterpPlayerYaw, 270, 0) diff --git a/src/world/area_mac/mac_02/npc/bubulb.inc.c b/src/world/area_mac/mac_02/npc/bubulb.inc.c index bbc2afbddc..25ce7859ef 100644 --- a/src/world/area_mac/mac_02/npc/bubulb.inc.c +++ b/src/world/area_mac/mac_02/npc/bubulb.inc.c @@ -1,8 +1,8 @@ EvtScript N(EVS_NpcInteract_Bubulb) = { EVT_IF_EQ(GF_MAC02_Gift_MagicalSeed1, FALSE) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Bubulb_Pink_BuriedIdle, ANIM_Bubulb_Pink_BuriedIdle, 0, MSG_MAC_Bridge_0085) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_MOLE_POP, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_MOLE_POP, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bubulb_Pink_PopUp) EVT_WAIT(45) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bubulb_Pink_Idle) 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 562483a5da..32c40a1389 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy, SOUND_B0000021, SOUND_SPACE_MODE_0) EVT_WAIT(2) EVT_END_LOOP EVT_RETURN @@ -43,7 +43,7 @@ EvtScript N(D_8024B6E8_82E9A8) = { EVT_EXEC(N(D_8024B5AC_82E86C)) EVT_THREAD EVT_CALL(EnableGroup, MODEL_cook_in, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit1u, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit1u, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_ADD(LVar0, 8) @@ -56,11 +56,11 @@ EvtScript N(D_8024B6E8_82E9A8) = { EVT_CALL(RotateModel, MODEL_c_door, LVar0, 0, -1, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit1u, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit1u, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(EnableGroup, MODEL_cook_in, FALSE) EVT_END_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy, SOUND_203F, 0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy, SOUND_203F, SOUND_SPACE_MODE_0) EVT_EXEC_GET_TID(N(D_8024B6A0_82E960), LVarA) EVT_CALL(SetNpcSpeed, NPC_ShyGuy, 8) EVT_CALL(NpcMoveTo, NPC_ShyGuy, -140, -240, 0) 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 bcc0a2aded..30c8c506cc 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, 0) + EVT_CALL(PlaySoundAtModel, MODEL_07, SOUND_B000001A, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, MV_TrainMoveDist) EVT_IF_EQ(MF_TrainReverseDir, FALSE) EVT_ADDF(LVar0, -310) @@ -196,7 +196,7 @@ EvtScript N(EVS_AnimateTrain) = { EVT_CALL(ScaleModel, MODEL_08, LVar1, LVar0, LVar1) EVT_END_IF EVT_IF_EQ(MF_TrainDepartDoorOpen, TRUE) - EVT_CALL(PlaySoundAt, SOUND_20A5, 0, -435, 84, 37) + EVT_CALL(PlaySoundAt, SOUND_20A5, SOUND_SPACE_MODE_0, -435, 84, 37) EVT_SET(LVar8, 10) EVT_SET(LocalFlag(1), TRUE) EVT_SET(MF_TrainDepartDoorOpen, FALSE) @@ -207,7 +207,7 @@ EvtScript N(EVS_AnimateTrain) = { EVT_SET(MF_TrainDepartPlayerBoard, FALSE) EVT_END_IF EVT_IF_EQ(MF_TrainArriveDoorOpen, TRUE) - EVT_CALL(PlaySoundAt, SOUND_20A5, 0, -413, 84, 38) + EVT_CALL(PlaySoundAt, SOUND_20A5, SOUND_SPACE_MODE_0, -413, 84, 38) EVT_SET(LVar8, 10) EVT_SET(LocalFlag(2), TRUE) EVT_SET(MF_TrainArriveDoorOpen, FALSE) @@ -226,7 +226,7 @@ EvtScript N(EVS_AnimateTrain) = { EVT_IF_LE(LVar9, 0) EVT_SET(LVar9, 0) EVT_SET(LocalFlag(1), FALSE) - EVT_CALL(PlaySoundAt, SOUND_20A6, 0, -435, 84, 37) + EVT_CALL(PlaySoundAt, SOUND_20A6, SOUND_SPACE_MODE_0, -435, 84, 37) EVT_END_IF EVT_END_IF EVT_IF_EQ(LocalFlag(2), TRUE) @@ -238,7 +238,7 @@ EvtScript N(EVS_AnimateTrain) = { EVT_IF_LE(LVarA, 0) EVT_SET(LVarA, 0) EVT_SET(LocalFlag(2), FALSE) - EVT_CALL(PlaySoundAt, SOUND_20A6, 0, -413, 84, 38) + EVT_CALL(PlaySoundAt, SOUND_20A6, SOUND_SPACE_MODE_0, -413, 84, 38) EVT_END_IF EVT_END_IF EVT_CALL(RotateModel, MODEL_omote, LVar9, 0, -1, 0) 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 ac593d6f13..0fbe31024c 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 @@ -41,7 +41,7 @@ API_CALLABLE(N(func_80241BD8_8333D8)) { f32 y = evt_get_variable(script, *args++); f32 z = evt_get_variable(script, *args++); f32 yaw = evt_get_variable(script, *args++); - + effect->data.lilOink->x[index] = x; effect->data.lilOink->y[index] = y; effect->data.lilOink->z[index] = z; @@ -51,7 +51,7 @@ API_CALLABLE(N(func_80241BD8_8333D8)) { s32 N(LetterList_A)[] = { ITEM_LETTER_CHAIN_DANE_T_1, - ITEM_NONE + ITEM_NONE }; EvtScript N(EVS_LetterPrompt_ToadKid1A) = { @@ -77,7 +77,7 @@ EvtScript N(EVS_LetterReward_ToadKid1A) = { s32 N(LetterList_B)[] = { ITEM_LETTER_CHAIN_DANE_T_2, - ITEM_NONE + ITEM_NONE }; EvtScript N(EVS_LetterPrompt_ToadKid1B) = { @@ -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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000021, 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -100, 0, -25, 15) EVT_END_LOOP EVT_RETURN @@ -508,10 +508,10 @@ EvtScript N(EVS_NpcAI_ShyGuy) = { EVT_KILL_THREAD(LVarA) EVT_CALL(ShowSweat, -1, 1, 45, 1, 0, 0, 0, 0, 20) EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -30, 0, 0, 20) EVT_CALL(ShowSweat, -1, 1, 45, 1, 0, 0, 0, 0, 20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203F, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203F, SOUND_SPACE_MODE_0) EVT_EXEC_GET_TID(N(D_8024A7F4_83BFF4), LVarA) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(8.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 30, -200, 0) @@ -543,8 +543,8 @@ EvtScript N(EVS_NpcHit_ShyGuy) = { EVT_IF_EQ(LVar1, 0) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HIT_PLAYER_NORMAL, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, SOUND_SPACE_MODE_0) EVT_SET(GF_MAC03_ShyGuyChasedOff, TRUE) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy))) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, 1) 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 bbdbc38dee..a34d871810 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 @@ -192,7 +192,7 @@ EvtScript N(EVS_TurnCrank) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAt, SOUND_20A7, 0, 111, 89, -358) + EVT_CALL(PlaySoundAt, SOUND_20A7, SOUND_SPACE_MODE_0, 111, 89, -358) EVT_SET(LVar0, 0) EVT_LOOP(5) EVT_ADD(LVar0, 6) @@ -231,13 +231,13 @@ EvtScript N(EVS_TurnCrank) = { EVT_CALL(ScaleModel, MODEL_boo, 1, LVar0, 1) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_20A8, 0, 134, 132, -399) + EVT_CALL(PlaySoundAt, SOUND_20A8, SOUND_SPACE_MODE_0, 134, 132, -399) EVT_LOOP(5) EVT_SUBF(LVar0, EVT_FLOAT(0.08)) EVT_CALL(ScaleModel, MODEL_boo, 1, LVar0, 1) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_2095, 0, 170, 73, -450) + EVT_CALL(PlaySoundAt, SOUND_2095, SOUND_SPACE_MODE_0, 170, 73, -450) EVT_SET(GB_MAC03_LilOinkCapsuleState, 1) EVT_CALL(SetPanTarget, CAM_DEFAULT, 230, 20, -270) EVT_CALL(SetCamPitch, CAM_DEFAULT, 15, -6) @@ -263,12 +263,12 @@ EvtScript N(EVS_TurnCrank) = { EVT_END_LOOP EVT_CALL(SetNpcJumpscale, NPC_Capsule, 1) EVT_CALL(NpcJump0, NPC_Capsule, LVar2, EVT_FLOAT(63.0), -273, 5) - EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_2095, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_2095, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_Capsule, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Capsule, LVar0, LVar1, LVar2, 10) - EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_2095, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_2095, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Capsule, LVar0, LVar1, LVar2, 5) - EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_2095, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_2095, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_capsule, COLLIDER_FLAGS_UPPER_MASK) EVT_WAIT(10) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -349,9 +349,9 @@ LilOinkReward N(LilOinkPrizes)[] = { [LIL_OINK_TYPE_SHROOM] { .itemID = ITEM_LIFE_SHROOM, .quantity = 1, .chance = 100 }, [LIL_OINK_TYPE_FLOWER] { .itemID = ITEM_MAPLE_SYRUP, .quantity = 1, .chance = 100 }, [LIL_OINK_TYPE_STAR] { .itemID = ITEM_SHOOTING_STAR, .quantity = 1, .chance = 100 }, - [LIL_OINK_TYPE_QUESTION] { .itemID = ITEM_REPEL_GEL, .quantity = 1, .chance = 100 }, + [LIL_OINK_TYPE_QUESTION] { .itemID = ITEM_REPEL_GEL, .quantity = 1, .chance = 100 }, [LIL_OINK_TYPE_SILVER] { .itemID = ITEM_JAMMIN_JELLY, .quantity = 1, .chance = 100 }, - [LIL_OINK_TYPE_GOLD] { .itemID = ITEM_ULTRA_SHROOM, .quantity = 1, .chance = 100 }, + [LIL_OINK_TYPE_GOLD] { .itemID = ITEM_ULTRA_SHROOM, .quantity = 1, .chance = 100 }, }; API_CALLABLE(N(GetLilOinkPrize)) { @@ -435,7 +435,7 @@ EvtScript N(EVS_OpenCapsule) = { EVT_CASE_DEFAULT EVT_SET(LVar3, LIL_OINK_TYPE_PIKACHU) EVT_END_SWITCH - EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_TORNADO_JUMP, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_TORNADO_JUMP, SOUND_SPACE_MODE_0) EVT_CALL(N(CreateLilOink), 10, LVar3, LVar0, LVar1, LVar2, 90) EVT_WAIT(10) EVT_IF_GE(GB_MAC03_LilOinkCount, 10) @@ -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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_LilOink_01, SOUND_15E, 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, 0) + EVT_CALL(PlaySoundAtNpc, LVar1, SOUND_15E, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcSpeed, LVar1, 8) EVT_CALL(NpcMoveTo, LVar1, 580, LVar4, 0) EVT_CALL(NpcJump0, LVar1, 620, 20, LVar4, 15) @@ -531,7 +531,7 @@ EvtScript N(EVS_EnterPen) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deili, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deili, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deili, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -551,7 +551,7 @@ EvtScript N(EVS_EnterPen) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deili, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deili, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deili, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) EVT_CALL(func_802D2C14, 0) @@ -585,7 +585,7 @@ EvtScript N(EVS_ExitPen) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(func_802D2C14, 1) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliu, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deiliu, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deiliu, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -605,7 +605,7 @@ EvtScript N(EVS_ExitPen) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deiliu, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deiliu, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deiliu, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(func_802D2C14, 0) EVT_CALL(DisablePlayerInput, FALSE) 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 699a1fd92c..7978805078 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 @@ -67,7 +67,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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_1AA, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -90, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -93,7 +93,7 @@ EvtScript N(EVS_ItemPrompt_ToyTrain) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_1AA, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_1AA, 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 19a82e55c1..31f7e5d16f 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_1AA, 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, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_D9, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_1AA, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_EXEC_GET_TID(N(EVS_FocusCameraOnPlayer), LVarA) - EVT_CALL(PlaySoundAtPlayer, SOUND_DA, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_DA, 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, 0, 155, 48, -480) + EVT_CALL(PlaySoundAt, SOUND_269, 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 cade5edcb0..b9715b5749 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_ChetRippo, SOUND_24B, 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) @@ -179,7 +179,7 @@ EvtScript N(EVS_NpcInteract_ChetRippo) = { EVT_CALL(SpeakToPlayer, NPC_ChetRippo, ANIM_ChetRippo_Talk, ANIM_ChetRippo_Idle, 0, LVar7) EVT_WAIT(10) EVT_CALL(GetNpcPos, NPC_ChetRippo, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_ChetRippo, SOUND_2098, 0) + EVT_CALL(PlaySoundAtNpc, NPC_ChetRippo, SOUND_2098, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1) EVT_CALL(SetNpcPos, NPC_ChetRippo, NPC_DISPOSE_LOCATION) EVT_SET(AF_MAC_32, TRUE) diff --git a/src/world/area_mac/mac_04/npc_muskular.inc.c b/src/world/area_mac/mac_04/npc_muskular.inc.c index 63d4a519ab..a155ac205c 100644 --- a/src/world/area_mac/mac_04/npc_muskular.inc.c +++ b/src/world/area_mac/mac_04/npc_muskular.inc.c @@ -66,7 +66,7 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Leap) EVT_WAIT(20) EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) - EVT_CALL(PlaySoundAtPlayer, SOUND_139, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) EVT_ADD(LVar0, 10) @@ -80,7 +80,7 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_WAIT(6) EVT_END_LOOP EVT_WAIT(20) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_188, 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) @@ -164,7 +164,7 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_Muskular, SOUND_2045, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Muskular, SOUND_2045, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) 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 2ccdd96e52..7f377c4ae4 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, 0) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_B0000021, SOUND_SPACE_MODE_0) EVT_WAIT(2) EVT_END_LOOP EVT_RETURN @@ -19,7 +19,7 @@ EvtScript N(D_802480E0_84ACB0) = { }; EvtScript N(D_80248128_84ACF8) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hu, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hu, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_SET(LVar0, 0) EVT_LOOP(20) EVT_ADD(LVar0, 3) @@ -41,13 +41,13 @@ EvtScript N(D_802481E0_84ADB0) = { EVT_END_LOOP EVT_SET(LVar0, 0) EVT_CALL(RotateModel, MODEL_hh_door, LVar0, 0, -1, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hu, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hu, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; EvtScript N(D_80248298_84AE68) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hk, SOUND_1AB, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hk, SOUND_1AB, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hk, SOUND_1AC, SOUND_SPACE_MODE_0) EVT_CALL(PlaySound, SOUND_A) EVT_RETURN EVT_END @@ -102,8 +102,8 @@ EvtScript N(D_802483B8_84AF88) = { }; EvtScript N(D_80248624_84B1F4) = { - EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_203E, 0) - EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_262, 0) + 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(ShowEmote, NPC_ShyGuy_01, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim11, ANIM_ShyGuy_Pink_Anim01, 0, MSG_MAC_Housing_00B2) @@ -222,7 +222,7 @@ EvtScript N(EVS_80248B08) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(23) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_mu, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_mu, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_ADD(LVar0, 8) @@ -234,7 +234,7 @@ EvtScript N(EVS_80248B08) = { EVT_CALL(RotateModel, MODEL_msdoor, LVar0, 0, -1, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_mu, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_mu, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_EXEC(N(D_80248A14_84B5E4)) EVT_SET(LVar0, 15) 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 de34932756..52277c6c37 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 @@ -50,7 +50,7 @@ EvtScript N(EVS_LetterPrompt_Fishmael) = { }; s32 N(Kolorado_LetterList)[] = { - ITEM_LETTER_TO_KOLORADO, ITEM_NONE + ITEM_LETTER_TO_KOLORADO, ITEM_NONE }; EvtScript N(EVS_LetterPrompt_Kolorado) = { @@ -394,7 +394,7 @@ EvtScript N(EVS_80248878) = { EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.5)) EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) EVT_CALL(SetPlayerPos, -120, 24, 375) - EVT_CALL(PlaySoundAtPlayer, SOUND_44, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_44, SOUND_SPACE_MODE_0) EVT_CALL(PlayerJump1, -310, -10, 372, 80) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) EVT_CALL(PlayerFaceNpc, NPC_Whale, FALSE) @@ -403,7 +403,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_44, 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) @@ -413,7 +413,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzipede, SOUND_44, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Fuzzipede, -280, -10, 372, 90) EVT_CALL(NpcFaceNpc, NPC_Fuzzipede, NPC_Whale, 0) EVT_END_THREAD @@ -467,7 +467,7 @@ EvtScript N(EVS_80248878) = { EVT_CALL(FadeOutMusic, 0, 3000) EVT_LOOP(10) EVT_ADD(LVar2, -60) - EVT_CALL(PlaySoundAtNpc, NPC_Fuzzipede, SOUND_20D9, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzipede, SOUND_20D9, 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) @@ -598,7 +598,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado, SOUND_32C, 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) @@ -750,7 +750,7 @@ EvtScript N(D_80249E84_85BFF4) = { EVT_CALL(PlayerJump1, LVar2, LVar3, LVar4, 10) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_41, 0, 0, 0, 480) + EVT_CALL(PlaySoundAt, SOUND_41, 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) @@ -780,7 +780,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, 0, 0, 0, 480) + EVT_CALL(PlaySoundAt, SOUND_41, SOUND_SPACE_MODE_0, 0, 0, 480) EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Panic) EVT_WAIT(10) EVT_CALL(DisablePlayerPhysics, TRUE) @@ -1018,7 +1018,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado, SOUND_32C, 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) @@ -1189,7 +1189,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, 0, x, y, z); + sfx_adjust_env_sound_pos(SOUND_JR_TROOPA_SWIM, SOUND_SPACE_MODE_0, x, y, z); } return ApiStatus_DONE2; } @@ -1245,9 +1245,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, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Whale, EMOTE_EXCLAMATION, 0, 30, FALSE, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 30, TRUE, 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(NpcMoveTo, NPC_SELF, -40, 490, 0) EVT_KILL_THREAD(LVar9) EVT_CALL(StopSound, SOUND_80000055) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_JR_TROOPA_SPLASH, 0) + 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) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Charge) @@ -1739,7 +1739,7 @@ EvtScript N(EVS_NpcInit_Toad_02) = { }; s32 N(D_8024D704_85F874)[] = { - 104, 0 + 104, 0 }; EvtScript N(EVS_NpcInteract_ArtistToad) = { @@ -2016,7 +2016,7 @@ EvtScript N(EVS_NpcInteract_Toad_03) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_MAC_Port_00C0) EVT_WAIT(10) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_SET(GF_TradingEvent3_Active, FALSE) @@ -2037,7 +2037,7 @@ EvtScript N(EVS_NpcInteract_Toad_03) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_MAC_Port_00C3) EVT_WAIT(10) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_SET(GF_TradingEvent3_Active, FALSE) 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 6dc8410115..4e966b11c3 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_8000004F, 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,7 +296,7 @@ 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_443) + EVT_CALL(PlaySound, SOUND_43 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(func_802D62E4, SOUND_43) EVT_CALL(N(DisposeWhaleGeyser), LVar0) EVT_CALL(SetNpcVar, NPC_Whale, 0, 0) @@ -304,12 +304,12 @@ EvtScript N(EVS_8025194C) = { EVT_END_IF EVT_SWITCH(LVarB) EVT_CASE_EQ(ANIM_Kolorado_IdleSad) - EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2037, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2037, SOUND_SPACE_MODE_0) EVT_SET(LVarD, EVT_PTR(N(D_80250D58_862EC8))) EVT_CASE_EQ(ANIM_Kolorado_Still) EVT_SET(LVarD, EVT_PTR(N(D_80250A5C_862BCC))) EVT_CASE_EQ(ANIM_Kolorado_Yell) - EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2036, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2036, SOUND_SPACE_MODE_0) EVT_SET(LVarD, EVT_PTR(N(D_80250AD4_862C44))) EVT_CASE_EQ(ANIM_Kolorado_Idle) EVT_SET(LVarD, EVT_PTR(N(D_80251654_8637C4))) diff --git a/src/world/area_mac/mac_06/mac_06_2_whale.c b/src/world/area_mac/mac_06/mac_06_2_whale.c index 8cf2224338..7910346c1f 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_8000004F, 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,7 +292,7 @@ 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_443) + EVT_CALL(PlaySound, SOUND_43 | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(func_802D62E4, SOUND_43) EVT_CALL(N(DisposeWhaleGeyser), LVar0) EVT_CALL(SetNpcVar, NPC_Whale, 0, 0) @@ -300,12 +300,12 @@ EvtScript N(EVS_WhaleMain) = { EVT_END_IF EVT_SWITCH(LVarB) EVT_CASE_EQ(ANIM_Kolorado_IdleSad) - EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2037, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2037, SOUND_SPACE_MODE_0) EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_IdleSad))) EVT_CASE_EQ(ANIM_Kolorado_Still) EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_Still))) EVT_CASE_EQ(ANIM_Kolorado_Yell) - EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2036, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2036, SOUND_SPACE_MODE_0) EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_2))) EVT_CASE_EQ(ANIM_Kolorado_Idle) EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_Idle))) diff --git a/src/world/area_mac/mac_06/mac_06_3_npc.c b/src/world/area_mac/mac_06/mac_06_3_npc.c index 039abebf23..e1797071df 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(0x46, 0, x, y, z); + sfx_adjust_env_sound_pos(SOUND_JR_TROOPA_SWIM, SOUND_SPACE_MODE_0, x, y, z); } return ApiStatus_DONE2; } 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 030c83f129..85226ebe02 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 @@ -438,7 +438,7 @@ API_CALLABLE(N(RunMinigame)) { if (data->box[i].stateTimer <= 0) { npc->currentAnim = ANIM_Fuzzy_Walk; data->box[i].state = BOX_STATE_FUZZY_POPUP; - sfx_play_sound_at_position(enemy->varTable[8], SOUND_PARAM_MOST_QUIET, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(enemy->varTable[8], SOUND_SPACE_MODE_0 | SOUND_PARAM_MOST_QUIET, 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->jumpVelocity = 10.5f; npc->pos.x = centerX; @@ -565,7 +565,7 @@ API_CALLABLE(N(RunMinigame)) { data->box[i].stateTimer--; if (data->box[i].stateTimer <= 0) { data->box[i].state = BOX_STATE_BOMB_POPUP; - sfx_play_sound_at_position(enemy->varTable[8], SOUND_PARAM_MOST_QUIET, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(enemy->varTable[8], 0x100000, 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->jumpVelocity = 10.5f; npc->pos.x = centerX; @@ -669,7 +669,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, 0x200000, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(SOUND_214, 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->jumpVelocity = 10.0f; npc->pos.y = npc->moveToPos.y; diff --git a/src/world/area_mim/common/AnimateGates.inc.c b/src/world/area_mim/common/AnimateGates.inc.c index aaf1b96320..d77a30b82f 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, 0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D4, SOUND_SPACE_MODE_0) EVT_WAIT(19) - EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D5, 0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D5, 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 07fdce7013..0161355833 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 @@ -9,9 +9,9 @@ API_CALLABLE(N(GetFlowerNormal)) { s32 treeIndex = get_model_list_index_from_tree_index(modelID); Model* mdl = get_model_from_list_index(treeIndex); f32 x, y, z; - + N(GetFirstTriangleNormal)(mdl->modelNode->displayData->displayList, &x, &y, &z); - + evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(x)); evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(y)); evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(z)); @@ -19,7 +19,7 @@ API_CALLABLE(N(GetFlowerNormal)) { } EvtScript N(EVS_LaughingFlowers) = { - EVT_CALL(PlaySoundAt, SOUND_DF, 0, 301, 0, -27) + EVT_CALL(PlaySoundAt, SOUND_DF, SOUND_SPACE_MODE_0, 301, 0, -27) EVT_LOOP(6) EVT_SET(LVar0, 2) EVT_CALL(TranslateModel, MODEL_ea_1, 0, 0, LVar0) @@ -52,7 +52,7 @@ EvtScript N(EVS_LaughingFlowers) = { EVT_WAIT(2) EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, -0x10000) EVT_WAIT(2) - EVT_CALL(PlaySoundAt, SOUND_205B, 0, 301, 0, -27) + EVT_CALL(PlaySoundAt, SOUND_205B, SOUND_SPACE_MODE_0, 301, 0, -27) EVT_CALL(MakeLerp, 0, 30, 50, EASING_COS_IN_OUT) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -69,7 +69,7 @@ EvtScript N(EVS_LaughingFlowers) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_205B, 0, 301, 0, -27) + EVT_CALL(PlaySoundAt, SOUND_205B, SOUND_SPACE_MODE_0, 301, 0, -27) EVT_CALL(MakeLerp, 30, -30, 50, EASING_COS_IN_OUT) EVT_LABEL(20) EVT_CALL(UpdateLerp) @@ -86,7 +86,7 @@ EvtScript N(EVS_LaughingFlowers) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(20) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_205B, 0, 301, 0, -27) + EVT_CALL(PlaySoundAt, SOUND_205B, SOUND_SPACE_MODE_0, 301, 0, -27) EVT_CALL(MakeLerp, -30, 0, 50, EASING_COS_IN_OUT) EVT_LABEL(30) EVT_CALL(UpdateLerp) diff --git a/src/world/area_mim/mim_01/mim_01_5_gate.c b/src/world/area_mim/mim_01/mim_01_5_gate.c index de2bb0cb3e..38d608b495 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, 0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D4, SOUND_SPACE_MODE_0) EVT_WAIT(19) - EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D5, 0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D5, 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 2a0d5697bc..e6e7477f0b 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_Oaklie, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_Oaklie, -426, 58, -70, 20) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) @@ -60,7 +60,7 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Oaklie, -333, 0, -81, 20) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) EVT_WAIT(5) @@ -69,7 +69,7 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Oaklie, -300, 0, -170, 15) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) EVT_WAIT(5) @@ -78,7 +78,7 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Oaklie, -226, 0, -245, 15) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) EVT_WAIT(5) @@ -87,7 +87,7 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_Oaklie, -160, 0, -296, 15) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) EVT_WAIT(5) @@ -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)) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_SELF, -455, 0, 0, 20) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) diff --git a/src/world/area_mim/mim_02/mim_02_5_hint.c b/src/world/area_mim/mim_02/mim_02_5_hint.c index 6146abb098..0e2d8e226b 100644 --- a/src/world/area_mim/mim_02/mim_02_5_hint.c +++ b/src/world/area_mim/mim_02/mim_02_5_hint.c @@ -11,7 +11,7 @@ EvtScript N(EVS_SetupExitHint) = { EVT_ADD(LVar2, 1) EVT_CALL(EnableModel, MODEL_o414, FALSE) EVT_CALL(EnableModel, MODEL_me, TRUE) - EVT_CALL(PlaySoundAt, SOUND_2060, 0, 10, 110, -200) + EVT_CALL(PlaySoundAt, SOUND_2060, SOUND_SPACE_MODE_0, 10, 110, -200) EVT_LOOP(LVar2) EVT_CALL(EnableModel, MODEL_o414, TRUE) EVT_CALL(EnableModel, MODEL_me, FALSE) diff --git a/src/world/area_mim/mim_03/mim_03_4_hint.c b/src/world/area_mim/mim_03/mim_03_4_hint.c index a1ef06fcfb..72e2dd339f 100644 --- a/src/world/area_mim/mim_03/mim_03_4_hint.c +++ b/src/world/area_mim/mim_03/mim_03_4_hint.c @@ -9,9 +9,9 @@ API_CALLABLE(N(GetFlowerNormal)) { s32 treeIndex = get_model_list_index_from_tree_index(modelID); Model* mdl = get_model_from_list_index(treeIndex); f32 x, y, z; - + N(GetFirstTriangleNormal)(mdl->modelNode->displayData->displayList, &x, &y, &z); - + evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(x)); evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(y)); evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(z)); @@ -124,7 +124,7 @@ EvtScript N(EVS_FlowersReact_Correct) = { }; EvtScript N(EVS_CheckFlowers_North) = { - EVT_CALL(PlaySoundAt, SOUND_2059, 0, 0, 0, -300) + EVT_CALL(PlaySoundAt, SOUND_2059, SOUND_SPACE_MODE_0, 0, 0, -300) EVT_SET(LVar8, EVT_PTR(N(FlowerModels_North))) EVT_SET(LVar9, 0) EVT_EXEC_WAIT(N(EVS_FlowersReact_Wrong)) @@ -133,7 +133,7 @@ EvtScript N(EVS_CheckFlowers_North) = { }; EvtScript N(EVS_CheckFlowers_West) = { - EVT_CALL(PlaySoundAt, SOUND_205A, 0, -300, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_205A, SOUND_SPACE_MODE_0, -300, 0, 0) EVT_SET(LVar8, EVT_PTR(N(FlowerModels_West))) EVT_SET(LVar9, 1) EVT_EXEC_WAIT(N(EVS_FlowersReact_Correct)) @@ -142,7 +142,7 @@ EvtScript N(EVS_CheckFlowers_West) = { }; EvtScript N(EVS_CheckFlowers_South) = { - EVT_CALL(PlaySoundAt, SOUND_2059, 0, 0, 0, 300) + EVT_CALL(PlaySoundAt, SOUND_2059, SOUND_SPACE_MODE_0, 0, 0, 300) EVT_SET(LVar8, EVT_PTR(N(FlowerModels_South))) EVT_SET(LVar9, 2) EVT_EXEC_WAIT(N(EVS_FlowersReact_Wrong)) @@ -151,7 +151,7 @@ EvtScript N(EVS_CheckFlowers_South) = { }; EvtScript N(EVS_CheckFlowers_East) = { - EVT_CALL(PlaySoundAt, SOUND_2059, 0, 300, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_2059, SOUND_SPACE_MODE_0, 300, 0, 0) EVT_SET(LVar8, EVT_PTR(N(FlowerModels_East))) EVT_SET(LVar9, 3) EVT_EXEC_WAIT(N(EVS_FlowersReact_Wrong)) diff --git a/src/world/area_mim/mim_04/mim_04_4_hint.c b/src/world/area_mim/mim_04/mim_04_4_hint.c index 80e8889862..4b243d9395 100644 --- a/src/world/area_mim/mim_04/mim_04_4_hint.c +++ b/src/world/area_mim/mim_04/mim_04_4_hint.c @@ -60,7 +60,7 @@ EvtScript N(EVS_ManageEvilTree) = { EVT_CALL(AwaitPlayerApproach, 0, -340, 50) EVT_CALL(AwaitPlayerLeave, 0, -340, 50) EVT_CALL(N(TryEvilTreeLaugh)) - EVT_CALL(PlaySoundAt, SOUND_205F, 0, 55, 96, -254) + EVT_CALL(PlaySoundAt, SOUND_205F, SOUND_SPACE_MODE_0, 55, 96, -254) EVT_GOTO(0) EVT_RETURN EVT_END diff --git a/src/world/area_mim/mim_04/mim_04_6_npc.c b/src/world/area_mim/mim_04/mim_04_6_npc.c index 7845740ad5..edfe6d2b1c 100644 --- a/src/world/area_mim/mim_04/mim_04_6_npc.c +++ b/src/world/area_mim/mim_04/mim_04_6_npc.c @@ -8,8 +8,8 @@ EvtScript N(EVS_NpcInteract_Bubulb) = { EVT_IF_EQ(GF_MIM04_Gift_MagicalSeed3, FALSE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_MOLE_POP, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_MOLE_POP, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bubulb_Green_PopUp) EVT_WAIT(45) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bubulb_Green_Idle) 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 ecfbb82506..f461161c3a 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, 0, -300, 0, -10) + EVT_CALL(PlaySoundAt, SOUND_3A0, 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, 0, -300, 0, -10) + EVT_CALL(PlaySoundAt, SOUND_3A0, 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, 0, -20, 0, 300) + EVT_CALL(PlaySoundAt, SOUND_3A0, 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, 0, 20, 0, -300) + EVT_CALL(PlaySoundAt, SOUND_3A0, 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, 0, 300, 0, 10) + EVT_CALL(PlaySoundAt, SOUND_3A0, 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_06/mim_06_4_hint.c b/src/world/area_mim/mim_06/mim_06_4_hint.c index f51b1e1c90..e5d773d50e 100644 --- a/src/world/area_mim/mim_06/mim_06_4_hint.c +++ b/src/world/area_mim/mim_06/mim_06_4_hint.c @@ -9,9 +9,9 @@ API_CALLABLE(N(GetFlowerNormal)) { s32 treeIndex = get_model_list_index_from_tree_index(modelID); Model* mdl = get_model_from_list_index(treeIndex); f32 x, y, z; - + N(GetFirstTriangleNormal)(mdl->modelNode->displayData->displayList, &x, &y, &z); - + evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(x)); evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(y)); evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(z)); @@ -21,7 +21,7 @@ API_CALLABLE(N(GetFlowerNormal)) { API_CALLABLE(N(GetWitherTranslation)) { Bytecode* args = script->ptrReadPos; s32 angle = evt_get_variable(script, *args++); - + evt_set_variable(script, *args++, sin_deg(angle) * 10.0f); return ApiStatus_DONE2; } @@ -84,7 +84,7 @@ EvtScript N(EVS_InspectFlowers_South) = { EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, -0x8000) EVT_WAIT(2) EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, -0x10000) - EVT_CALL(PlaySoundAt, SOUND_205B, 0, -10, 0, -300) + EVT_CALL(PlaySoundAt, SOUND_205B, SOUND_SPACE_MODE_0, -10, 0, -300) EVT_CALL(MakeLerp, 0, 30, 50, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -141,7 +141,7 @@ EvtScript N(EVS_InspectFlowers_West) = { EVT_WAIT(2) EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, -0x10000) EVT_WAIT(15) - EVT_CALL(PlaySoundAt, SOUND_205C, 0, -300, 0, -10) + EVT_CALL(PlaySoundAt, SOUND_205C, SOUND_SPACE_MODE_0, -300, 0, -10) EVT_USE_BUF(EVT_PTR(N(FlowerModels_West))) EVT_BUF_READ2(LVarA, LVarB) EVT_EXEC(N(EVS_FlowersWither)) @@ -159,7 +159,7 @@ EvtScript N(EVS_InspectFlowers_North) = { EVT_WAIT(2) EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, 0, -0x10000) EVT_WAIT(15) - EVT_CALL(PlaySoundAt, SOUND_205C, 0, 10, 0, 300) + EVT_CALL(PlaySoundAt, SOUND_205C, SOUND_SPACE_MODE_0, 10, 0, 300) EVT_USE_BUF(EVT_PTR(N(FlowerModels_North))) EVT_BUF_READ2(LVarA, LVarB) EVT_EXEC(N(EVS_FlowersWither)) @@ -177,7 +177,7 @@ EvtScript N(EVS_InspectFlowers_East) = { EVT_WAIT(2) EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, 0, -0x10000) EVT_WAIT(15) - EVT_CALL(PlaySoundAt, SOUND_205C, 0, 300, 0, -10) + EVT_CALL(PlaySoundAt, SOUND_205C, SOUND_SPACE_MODE_0, 300, 0, -10) EVT_USE_BUF(EVT_PTR(N(FlowerModels_East))) EVT_BUF_READ2(LVarA, LVarB) EVT_EXEC(N(EVS_FlowersWither)) diff --git a/src/world/area_mim/mim_07/mim_07_4_hint.c b/src/world/area_mim/mim_07/mim_07_4_hint.c index a92d2c0d79..beb7bd8ee7 100644 --- a/src/world/area_mim/mim_07/mim_07_4_hint.c +++ b/src/world/area_mim/mim_07/mim_07_4_hint.c @@ -85,7 +85,7 @@ EvtScript N(EVS_OnInspectEvilRock) = { EVT_IF_EQ(LVar0, 1) EVT_WAIT(10) EVT_EXEC_GET_TID(N(EVS_ManageEvilRock), LVar9) - EVT_CALL(PlaySoundAt, SOUND_205E, 0, -34, 0, -300) + EVT_CALL(PlaySoundAt, SOUND_205E, SOUND_SPACE_MODE_0, -34, 0, -300) EVT_LOOP(18) EVT_CALL(TranslateModel, MODEL_o289, EVT_FLOAT(1.0), 0, EVT_FLOAT(1.0)) EVT_CALL(TranslateModel, MODEL_o440, EVT_FLOAT(1.0), 0, EVT_FLOAT(1.0)) diff --git a/src/world/area_mim/mim_07/mim_07_5_gate.c b/src/world/area_mim/mim_07/mim_07_5_gate.c index 4f9af5752b..a0c5e1c23a 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, 0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D4, SOUND_SPACE_MODE_0) EVT_WAIT(19) - EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D5, 0) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D5, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_SWITCH(AB_MIM_1) EVT_CASE_EQ(0) diff --git a/src/world/area_mim/mim_09/mim_09_4_hint.c b/src/world/area_mim/mim_09/mim_09_4_hint.c index e660b85942..badcec28c7 100644 --- a/src/world/area_mim/mim_09/mim_09_4_hint.c +++ b/src/world/area_mim/mim_09/mim_09_4_hint.c @@ -5,7 +5,7 @@ EvtScript N(EVS_FlowersGentleRocking) = { EVT_WAIT(2) EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, -0x10000) EVT_WAIT(2) - EVT_CALL(PlaySoundAt, SOUND_205B, 0, -23, 0, 300) + EVT_CALL(PlaySoundAt, SOUND_205B, SOUND_SPACE_MODE_0, -23, 0, 300) EVT_CALL(MakeLerp, 0, 30, 50, EASING_COS_IN_OUT) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -19,7 +19,7 @@ EvtScript N(EVS_FlowersGentleRocking) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_205B, 0, -23, 0, 300) + EVT_CALL(PlaySoundAt, SOUND_205B, SOUND_SPACE_MODE_0, -23, 0, 300) EVT_CALL(MakeLerp, 30, -30, 50, EASING_COS_IN_OUT) EVT_LABEL(20) EVT_CALL(UpdateLerp) @@ -33,7 +33,7 @@ EvtScript N(EVS_FlowersGentleRocking) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(20) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_205B, 0, -23, 0, 300) + EVT_CALL(PlaySoundAt, SOUND_205B, SOUND_SPACE_MODE_0, -23, 0, 300) EVT_CALL(MakeLerp, -30, 0, 50, EASING_COS_IN_OUT) EVT_LABEL(30) EVT_CALL(UpdateLerp) diff --git a/src/world/area_mim/mim_10/mim_10_4_npc.c b/src/world/area_mim/mim_10/mim_10_4_npc.c index 66cfb26e02..8ddd573bb5 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 @@ -121,7 +121,7 @@ EvtScript N(EVS_Scene_BootlersInvitation) = { EVT_WAIT(20) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_LOOP(20) EVT_ADDF(LVar0, EVT_FLOAT(12.0)) @@ -146,7 +146,7 @@ EvtScript N(EVS_Scene_BootlersInvitation) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_0001) - EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(240.0)) EVT_LOOP(20) EVT_SUBF(LVar0, EVT_FLOAT(12.0)) @@ -167,7 +167,7 @@ EvtScript N(EVS_Scene_BootlersInvitation) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_292, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_292, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_Bootler_SpookPlayer)) EVT_CALL(SetCamDistance, CAM_DEFAULT, 450) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) diff --git a/src/world/area_mim/mim_11/mim_11_3_gate.c b/src/world/area_mim/mim_11/mim_11_3_gate.c index 13a4b1c267..fba0e5143c 100644 --- a/src/world/area_mim/mim_11/mim_11_3_gate.c +++ b/src/world/area_mim/mim_11/mim_11_3_gate.c @@ -2,7 +2,7 @@ EvtScript N(D_80242560_BB95D0) = { EVT_WAIT(30) - EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 80, 30, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -28,7 +28,7 @@ EvtScript N(D_80242560_BB95D0) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(1.5)) EVT_WAIT(20) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) @@ -42,7 +42,7 @@ EvtScript N(D_80242560_BB95D0) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetMusicTrack, 0, SONG_BOOS_MANSION, 0, 8) - EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_LOOP(90) EVT_ADDF(LVar0, EVT_FLOAT(2.667)) @@ -65,7 +65,7 @@ EvtScript N(D_80242560_BB95D0) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_002A) - EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(240.0)) EVT_LOOP(90) EVT_SUBF(LVar0, EVT_FLOAT(2.667)) @@ -85,7 +85,7 @@ EvtScript N(D_80242560_BB95D0) = { }; EvtScript N(D_80242B90_BB9C00) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_mon, COLLIDER_FLAGS_UPPER_MASK) EVT_THREAD EVT_CALL(MakeLerp, 0, 80, 30, EASING_LINEAR) @@ -116,13 +116,13 @@ EvtScript N(D_80242B90_BB9C00) = { EVT_END_IF EVT_END_LOOP EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_mon, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_CLOSE, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; EvtScript N(D_80242DC8_BB9E38) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_mon, COLLIDER_FLAGS_UPPER_MASK) EVT_THREAD EVT_CALL(MakeLerp, 0, 80, 30, EASING_LINEAR) @@ -152,7 +152,7 @@ EvtScript N(D_80242DC8_BB9E38) = { EVT_END_IF EVT_END_LOOP EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_mon, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_CLOSE, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; diff --git a/src/world/area_mim/mim_12/mim_12_5_gate.c b/src/world/area_mim/mim_12/mim_12_5_gate.c index 59fc2fe4b5..70f74b8b69 100644 --- a/src/world/area_mim/mim_12/mim_12_5_gate.c +++ b/src/world/area_mim/mim_12/mim_12_5_gate.c @@ -25,16 +25,16 @@ API_CALLABLE(N(InitializeForestFogProperties)) { API_CALLABLE(N(InterpFogDistance)) { Bytecode* args = script->ptrReadPos; s32 retVal = ApiStatus_BLOCK; - + if (isInitialCall) { script->functionTemp[1] = evt_get_variable(script, *args++); script->functionTemp[2] = evt_get_variable(script, *args++); script->functionTemp[0] = evt_get_variable(script, *args++); script->functionTemp[3] = evt_get_variable(script, *args++); } - + script->functionTemp[1] += script->functionTemp[3]; - + if (script->functionTemp[3] >= 0) { if (script->functionTemp[1] >= script->functionTemp[2]) { script->functionTemp[1] = script->functionTemp[2]; @@ -54,15 +54,15 @@ API_CALLABLE(N(InterpFogDistance)) { API_CALLABLE(N(InterpBackgroundDarkness)) { Bytecode* args = script->ptrReadPos; s32 retVal = ApiStatus_BLOCK; - + if (isInitialCall) { script->functionTemp[1] = evt_get_variable(script, *args++); script->functionTemp[2] = evt_get_variable(script, *args++); script->functionTemp[3] = evt_get_variable(script, *args++); } - + script->functionTemp[1] += script->functionTemp[3]; - + if (script->functionTemp[3] >= 0) { if (script->functionTemp[1] >= script->functionTemp[2]) { script->functionTemp[1] = script->functionTemp[2]; @@ -82,7 +82,7 @@ API_CALLABLE(N(InterpBackgroundDarkness)) { API_CALLABLE(N(InterpSpriteShadingColor)) { SpriteShadingProfile* shadingProfile = D_80151328; Bytecode* args = script->ptrReadPos; - + if (isInitialCall) { script->varTable[0] = evt_get_variable(script, *args++); script->varTable[1] = evt_get_variable(script, *args++); @@ -93,7 +93,7 @@ API_CALLABLE(N(InterpSpriteShadingColor)) { script->varTable[6] = 0; D_80151328->flags |= 1; } - + script->varTable[6]++; shadingProfile->ambientColor.r = update_lerp(0, script->varTable[3], script->varTable[0], script->varTable[6], 20); shadingProfile->ambientColor.g = update_lerp(0, script->varTable[4], script->varTable[1], script->varTable[6], 20); @@ -111,7 +111,7 @@ API_CALLABLE(N(InterpSpriteShadingColor)) { API_CALLABLE(N(MoveNpcAlongArc)) { Npc* npc = resolve_npc(script, script->varTable[0]); f32 angle, sinAngle, cosAngle; - + if (isInitialCall) { script->varTable[6] = script->varTable[5]; script->varTable[7] = dist2D(npc->pos.x, npc->pos.z, script->varTable[1], script->varTable[2]); @@ -160,7 +160,7 @@ EvtScript N(EVS_FadeToGustyShading) = { }; EvtScript N(EVS_OpenGate) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o67, SOUND_METAL_GATE_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o67, SOUND_METAL_GATE_OPEN, SOUND_SPACE_MODE_0) EVT_SET(LVar3, 0) EVT_SUB(LVar3, LVar2) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o67, COLLIDER_FLAGS_UPPER_MASK) @@ -189,7 +189,7 @@ EvtScript N(EVS_CloseGate) = { EVT_IF_NE(LVar1, 0) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_o67, SOUND_METAL_GATE_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o67, SOUND_METAL_GATE_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o67, COLLIDER_FLAGS_UPPER_MASK) EVT_RETURN EVT_END @@ -325,7 +325,7 @@ EvtScript N(EVS_Scene_UnlockGate) = { EVT_CALL(EnablePartnerAI) EVT_CALL(SetNpcPos, NPC_GateBoo_01, -103, 65, 64) EVT_CALL(SetNpcPos, NPC_GateBoo_02, -45, 65, -66) - EVT_CALL(PlaySoundAtNpc, NPC_GateBoo_01, SOUND_BOO_VANISH, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GateBoo_01, SOUND_BOO_VANISH, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_LOOP(20) EVT_ADDF(LVar0, EVT_FLOAT(12.0)) @@ -355,7 +355,7 @@ EvtScript N(EVS_Scene_UnlockGate) = { EVT_EXEC_WAIT(N(EVS_StartGustyMusic)) EVT_EXEC_WAIT(N(EVS_HaveBoosCloseGate)) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_GateBoo_01, SOUND_BOO_APPEAR, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GateBoo_01, SOUND_BOO_APPEAR, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(240.0)) EVT_LOOP(20) EVT_SUBF(LVar0, EVT_FLOAT(12.0)) diff --git a/src/world/area_nok/nok_01/nok_01_7_radio.c b/src/world/area_nok/nok_01/nok_01_7_radio.c index 211bef513b..c01a8f3b76 100644 --- a/src/world/area_nok/nok_01/nok_01_7_radio.c +++ b/src/world/area_nok/nok_01/nok_01_7_radio.c @@ -8,7 +8,7 @@ API_CALLABLE(N(InitializeRadio)) { Bytecode* args = script->ptrReadPos; evt_get_variable(script, *args++); - snd_ambient_load(AMBIENT_RADIO); + snd_load_ambient(AMBIENT_RADIO); snd_ambient_80055760(4); snd_ambient_set_volume(0, 250, 1); return ApiStatus_DONE2; @@ -18,7 +18,7 @@ API_CALLABLE(N(SetRadioVolumeMax)) { Bytecode* args = script->ptrReadPos; s32 idx = evt_get_variable(script, *args++); - snd_ambient_set_track(N(StationMseqMapping)[idx]); + snd_ambient_play_only(N(StationMseqMapping)[idx]); snd_ambient_set_volume(N(StationMseqMapping)[idx], 1500, 127); return ApiStatus_DONE2; } @@ -32,12 +32,12 @@ API_CALLABLE(N(SetRadioVolumeMute)) { } API_CALLABLE(N(func_80242898_9C7C78)) { - snd_ambient_set_track(4); + snd_ambient_play_only(4); return ApiStatus_DONE2; } API_CALLABLE(N(func_802428B8_9C7C98)) { - snd_ambient_800557CC(100); + snd_ambient_stop_all(100); return ApiStatus_DONE2; } @@ -45,7 +45,7 @@ API_CALLABLE(N(SetRadioStation)) { Bytecode* args = script->ptrReadPos; s32 index = evt_get_variable(script, *args++); - snd_ambient_set_track(N(StationMseqMapping)[index]); + snd_ambient_play_only(N(StationMseqMapping)[index]); return ApiStatus_DONE2; } 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 db46ac3f67..9467531e7a 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) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_SELF, -230, 0, -157, 15) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) @@ -78,7 +78,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) EVT_CALL(NpcJump1, NPC_SELF, -191, 0, -32, 5) EVT_EXEC_GET_TID(N(EVS_JrTroopa_RunFX), LVarA) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_167, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_167, SOUND_SPACE_MODE_0) EVT_CALL(NpcMoveTo, NPC_SELF, -165, 50, 15) EVT_KILL_THREAD(LVarA) EVT_CALL(StopSound, SOUND_167) @@ -87,7 +87,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { EVT_WAIT(15) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20AD, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20AD, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_PLAY_EFFECT(EFFECT_WATER_SPLASH, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.7), 30) @@ -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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_301, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.5)) EVT_CALL(NpcJump0, NPC_SELF, -165, -90, 50, 20) EVT_WAIT(30) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_74, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_74, 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_14/nok_14_4_bridge.c b/src/world/area_nok/nok_14/nok_14_4_bridge.c index e269b4ca74..9ca4a70530 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, 0, 0, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_71, 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, 0, -84, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_67, 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, 0, -56, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_68, 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, 0, -28, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_69, 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, 0, 0, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_6A, 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, 0, 28, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_6B, 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, 0, 56, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_6C, 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, 0, 84, 0, -60) + EVT_CALL(PlaySoundAt, SOUND_6D, 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_14/nok_14_5_npc.c b/src/world/area_nok/nok_14/nok_14_5_npc.c index c982a84308..ac8a64e7de 100644 --- a/src/world/area_nok/nok_14/nok_14_5_npc.c +++ b/src/world/area_nok/nok_14/nok_14_5_npc.c @@ -8,7 +8,7 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa_01) = { EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(AwaitPlayerApproach, -650, -35, 100) - EVT_CALL(PlaySoundAt, SOUND_SEARCH_BUSH, 0, -650, 75, -120) + EVT_CALL(PlaySoundAt, SOUND_SEARCH_BUSH, SOUND_SPACE_MODE_0, -650, 75, -120) EVT_THREAD EVT_LOOP(5) EVT_CALL(TranslateModel, MODEL_o122, 2, 0, 0) diff --git a/src/world/area_obk/common/RockingChair.inc.c b/src/world/area_obk/common/RockingChair.inc.c index 2ba63bdfa8..26cb8fec20 100644 --- a/src/world/area_obk/common/RockingChair.inc.c +++ b/src/world/area_obk/common/RockingChair.inc.c @@ -161,7 +161,7 @@ API_CALLABLE(N(UpdateRockingChair)) { if (physics->rotationAngle <= -7.0f) { if (script->functionTemp[2] != -1) { get_collider_center(COLLIDER_i3, ¢erX, ¢erY, ¢erZ); - sfx_play_sound_at_position(SOUND_CREAKY_ROCKING_CHAIR, 0, centerX, centerY, centerZ); + sfx_play_sound_at_position(SOUND_CREAKY_ROCKING_CHAIR, SOUND_SPACE_MODE_0, centerX, centerY, centerZ); script->functionTemp[2] = -1; } } else { 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 f89ae835cf..c2d0841435 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 @@ -15,7 +15,7 @@ s32 N(ChandelierModels)[] = { MODEL_kusari_1, MODEL_kusari_2, MODEL_wa, - MODEL_hi + MODEL_hi }; API_CALLABLE(N(SetCameraVFOV)) { @@ -127,7 +127,7 @@ API_CALLABLE(N(UpdateChandelier)) { chandelier = script->functionTempPtr[1]; model = chandelier->models[0]; lastDropDistance = chandelier->dropDistance; - + if (chandelier->controlData->controlState == CONTROL_STATE_RETRACT) { script->functionTemp[0] = CHANDELIER_STATE_PRE_RETRACT; chandelier->controlData->controlState = CONTROL_STATE_RETRACTING; @@ -206,7 +206,7 @@ API_CALLABLE(N(UpdateChandelier)) { } // detect direction reversal if (nextSwingAngle * chandelier->swingAngle <= 0.0f) { - sfx_play_sound_at_player(SOUND_9D, 0); + sfx_play_sound_at_player(SOUND_9D, SOUND_SPACE_MODE_0); } chandelier->swingAngle = nextSwingAngle; } @@ -215,7 +215,7 @@ API_CALLABLE(N(UpdateChandelier)) { if (!script->functionTemp[2]) { // is chain moving? if (chandelier->dropDistance != lastDropDistance) { - sfx_play_sound_at_position(SOUND_8000000F, 0, 440.0f, chandelier->dropDistance, 271.0f); + sfx_play_sound_at_position(SOUND_8000000F, SOUND_SPACE_MODE_0, 440.0f, chandelier->dropDistance, 271.0f); script->functionTemp[2] = TRUE; } } else { @@ -232,9 +232,9 @@ API_CALLABLE(N(UpdateChandelier)) { // is cabinet moving? if (cabinetPos != script->varTable[1]) { f32 x, y, z; - + get_collider_center(COLLIDER_o557, &x, &y, &z); - sfx_play_sound_at_position(SOUND_80000010, 0, x, y, z); + sfx_play_sound_at_position(SOUND_80000010, SOUND_SPACE_MODE_0, x, y, z); script->functionTemp[3] = TRUE; } } else { @@ -418,7 +418,7 @@ EvtScript N(EVS_LaunchFromCouch_GrabChandelier) = { EVT_SET(CONTROL_DATA_8, FALSE) EVT_SET(LVar8, MODEL_tobu1) EVT_EXEC(N(EVS_Couch_AnimateCushion)) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o567, SOUND_2086, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o567, SOUND_2086, SOUND_SPACE_MODE_0) EVT_SET(LVar8, MODEL_bane1) EVT_EXEC(N(EVS_Couch_AnimateSpring)) EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) @@ -553,7 +553,7 @@ EvtScript N(EVS_LaunchFromCouch_Crash) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_SET(LVar8, MODEL_tobu1) EVT_EXEC(N(EVS_Couch_AnimateCushion)) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o567, SOUND_2086, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o567, SOUND_2086, SOUND_SPACE_MODE_0) EVT_SET(LVar8, MODEL_bane1) EVT_EXEC(N(EVS_Couch_AnimateSpring)) EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) @@ -569,16 +569,16 @@ 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, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_162, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerAnimation, ANIM_Mario_80003) EVT_WAIT(30) EVT_CALL(SetPlayerAnimation, ANIM_Mario_GetUp) EVT_WAIT(20) EVT_CALL(SetPlayerAnimation, ANIM_Mario_DustOff) EVT_WAIT(7) - EVT_CALL(PlaySoundAtPlayer, SOUND_DUST_OFF, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_DUST_OFF, SOUND_SPACE_MODE_0) EVT_WAIT(8) - EVT_CALL(PlaySoundAtPlayer, SOUND_DUST_OFF, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_DUST_OFF, SOUND_SPACE_MODE_0) EVT_WAIT(15) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_KILL_THREAD(LVarA) 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 29348a60a5..21d8c76e6d 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 @@ -104,7 +104,7 @@ EvtScript N(EVS_Interact_LowerPortrait) = { EVT_WAIT(1) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(PlayerJump, 812, -170, -2, 20) - EVT_CALL(PlaySoundAtPlayer, SOUND_D9, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_D9, SOUND_SPACE_MODE_0) EVT_WAIT(10) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 812, 0, 28) EVT_CALL(SetPanTarget, CAM_DEFAULT, 812, 0, 28) @@ -114,7 +114,7 @@ EvtScript N(EVS_Interact_LowerPortrait) = { EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) EVT_WAIT(1) - EVT_CALL(PlaySoundAtPlayer, SOUND_DA, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_DA, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerPos, 812, 61, -2) EVT_CALL(PlayerJump, 812, 0, 28, 8) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) @@ -147,7 +147,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, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_D9, SOUND_SPACE_MODE_0) EVT_WAIT(10) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 812, -210, 28) EVT_CALL(SetPanTarget, CAM_DEFAULT, 812, -210, 28) @@ -157,7 +157,7 @@ EvtScript N(EVS_Interact_UpperPortrait) = { EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) EVT_WAIT(1) - EVT_CALL(PlaySoundAtPlayer, SOUND_DA, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_DA, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerPos, 812, -146, -2) EVT_CALL(PlayerJump, 812, -210, 28, 8) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) @@ -244,12 +244,12 @@ EvtScript N(EVS_SetupPortrait) = { }; s32 N(Unused_80243C7C_3C7C)[] = { - 0, 1, 0, 5, 1, 0, 5, 1, - 0, 5, 1, 1, 5, 1, 1, 5, - 2, 2, 5, 2, 2, 5, 2, 2, - 5, 2, 3, 5, 2, 3, 5, 3, - 4, 5, 3, 4, 5, 3, 4, 5, - 3, 5, 5, 3, 5, 5, 4, 6, - 5, 4, 6, 5, 4, 6, 5, 4, - 7, 5, 4, 7, 5, + 0, 1, 0, 5, 1, 0, 5, 1, + 0, 5, 1, 1, 5, 1, 1, 5, + 2, 2, 5, 2, 2, 5, 2, 2, + 5, 2, 3, 5, 2, 3, 5, 3, + 4, 5, 3, 4, 5, 3, 4, 5, + 3, 5, 5, 3, 5, 5, 4, 6, + 5, 4, 6, 5, 4, 6, 5, 4, + 7, 5, 4, 7, 5, }; diff --git a/src/world/area_obk/obk_01/obk_01_5_jump_scare.c b/src/world/area_obk/obk_01/obk_01_5_jump_scare.c index ef737e286c..47bac54847 100644 --- a/src/world/area_obk/obk_01/obk_01_5_jump_scare.c +++ b/src/world/area_obk/obk_01/obk_01_5_jump_scare.c @@ -11,7 +11,7 @@ EvtScript N(EVS_Scene_JumpScareBoo) = { EVT_SUB(LVar3, 10) EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 0, LVar3, LVar4, LVar5, EVT_FLOAT(2.8), 50) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_JumpScareBoo, SOUND_2094, 0) + EVT_CALL(PlaySoundAtNpc, NPC_JumpScareBoo, SOUND_2094, SOUND_SPACE_MODE_0) EVT_SUB(LVar4, 12) EVT_CALL(MakeLerp, 10, 450, 8, EASING_QUADRATIC_IN) EVT_LOOP(0) 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 8587029365..ef8b44ce64 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 @@ -4,7 +4,7 @@ EvtScript N(EVS_ChestTrap) = { EVT_WAIT(15) EVT_THREAD - EVT_CALL(PlaySoundAt, SOUND_212A, 0, 4, 26, -12) + EVT_CALL(PlaySoundAt, SOUND_212A, SOUND_SPACE_MODE_0, 4, 26, -12) EVT_CALL(MakeLerp, 0, -80, 10, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -14,10 +14,10 @@ EvtScript N(EVS_ChestTrap) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_212B, 0, 4, 26, -12) + EVT_CALL(PlaySoundAt, SOUND_212B, SOUND_SPACE_MODE_0, 4, 26, -12) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.5)) EVT_WAIT(40) - EVT_CALL(PlaySoundAt, SOUND_212C, 0, 4, 26, -12) + EVT_CALL(PlaySoundAt, SOUND_212C, SOUND_SPACE_MODE_0, 4, 26, -12) EVT_CALL(MakeLerp, -80, 0, 20, 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 4a9b4bf776..4bd28d3772 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 @@ -12,7 +12,7 @@ EvtScript N(EVS_SecondSwitch_Drop) = { EVT_THREAD EVT_WAIT(10) EVT_CALL(N(GetEntityPosition), LVar7, LVarA, LVarB, LVarC) - EVT_CALL(PlaySoundAt, SOUND_301, 0, LVarA, LVarB, LVarC) + EVT_CALL(PlaySoundAt, SOUND_301, SOUND_SPACE_MODE_0, LVarA, LVarB, LVarC) EVT_END_THREAD EVT_CALL(MakeLerp, LVar3, LVar5, LVar6, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -24,7 +24,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, 0, LVarA, LVarB, LVarC) + EVT_CALL(PlaySoundAt, SOUND_48, 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) @@ -37,7 +37,7 @@ EvtScript N(EVS_ThirdSwitch_Drop) = { EVT_THREAD EVT_WAIT(10) EVT_CALL(N(GetEntityPosition), LVar7, LVarA, LVarB, LVarC) - EVT_CALL(PlaySoundAt, SOUND_303, 0, LVarA, LVarB, LVarC) + EVT_CALL(PlaySoundAt, SOUND_303, SOUND_SPACE_MODE_0, LVarA, LVarB, LVarC) EVT_END_THREAD EVT_CALL(MakeLerp, LVar3, LVar5, LVar6, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -49,7 +49,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, 0, LVarA, LVarB, LVarC) + EVT_CALL(PlaySoundAt, SOUND_DD, 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_03/obk_03_5_stairs.c b/src/world/area_obk/obk_03/obk_03_5_stairs.c index 0bbc18798f..a439d6009e 100644 --- a/src/world/area_obk/obk_03/obk_03_5_stairs.c +++ b/src/world/area_obk/obk_03/obk_03_5_stairs.c @@ -15,7 +15,7 @@ EvtScript N(EVS_DropStep) = { }; EvtScript N(EVS_PlayDropStepFX) = { - EVT_CALL(PlaySoundAt, SOUND_203D, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_203D, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_WAIT(LVarA) EVT_SET(LVar3, LVar0) EVT_SET(LVar4, LVar1) 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 8ea2a42a7a..47cbd9cba9 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, 0, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(SOUND_B000000F, 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_04/obk_04_6_game.c b/src/world/area_obk/obk_04/obk_04_6_game.c index 256052156b..6daeb49040 100644 --- a/src/world/area_obk/obk_04/obk_04_6_game.c +++ b/src/world/area_obk/obk_04/obk_04_6_game.c @@ -323,7 +323,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { EVT_SET(LVar1, 30) EVT_CALL(N(GetKeepAwayCarrierYaw)) EVT_CALL(N(GetItemJumpDest)) - EVT_CALL(PlaySoundAtNpc, NPC_DummyBoo, SOUND_THROW, 0) + EVT_CALL(PlaySoundAtNpc, NPC_DummyBoo, SOUND_THROW, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_DummyBoo, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_DummyBoo, LVar0, LVar1, LVar2, 14) EVT_CALL(SetNpcPos, NPC_DummyBoo, NPC_DISPOSE_LOCATION) @@ -358,7 +358,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { EVT_SET(LVar1, 30) EVT_CALL(N(GetKeepAwayCarrierYaw)) EVT_CALL(N(GetItemJumpDest)) - EVT_CALL(PlaySoundAtNpc, NPC_DummyBoo, SOUND_THROW, 0) + EVT_CALL(PlaySoundAtNpc, NPC_DummyBoo, SOUND_THROW, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_DummyBoo, EVT_FLOAT(1.5)) EVT_CALL(NpcJump0, NPC_DummyBoo, LVar0, LVar1, LVar2, 14) EVT_CALL(SetNpcPos, NPC_DummyBoo, NPC_DISPOSE_LOCATION) @@ -415,7 +415,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { EVT_END_IF EVT_END_LOOP EVT_CALL(SpeakToPlayer, MV_ItemCarrierNpc, ANIM_Boo_Talk, ANIM_Boo_Idle, 5, MSG_CH3_003E) - EVT_CALL(PlaySoundAtNpc, NPC_DummyBoo, SOUND_THROW, 0) + EVT_CALL(PlaySoundAtNpc, NPC_DummyBoo, SOUND_THROW, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_DummyBoo, EVT_FLOAT(2.0)) EVT_CALL(NpcJump0, NPC_DummyBoo, 0, 65, 0, 10) EVT_CALL(SpeakToPlayer, NPC_LeaderBoo, ANIM_Boo_Talk, ANIM_Boo_Idle, 5, MSG_CH3_003B) @@ -442,7 +442,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { EVT_WAIT(1) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) - EVT_CALL(PlaySoundAtNpc, NPC_DummyBoo, SOUND_THROW, 0) + EVT_CALL(PlaySoundAtNpc, NPC_DummyBoo, SOUND_THROW, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_DummyBoo, EVT_FLOAT(2.0)) EVT_CALL(NpcJump0, NPC_DummyBoo, LVar0, LVar1, LVar2, 10) EVT_WAIT(10) diff --git a/src/world/area_obk/obk_05/obk_05_2_main.c b/src/world/area_obk/obk_05/obk_05_2_main.c index df13f459e6..35f54aeb88 100644 --- a/src/world/area_obk/obk_05/obk_05_2_main.c +++ b/src/world/area_obk/obk_05/obk_05_2_main.c @@ -61,12 +61,12 @@ EvtScript N(EVS_ManageRetroJar) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(1) EVT_IF_EQ(MF_IsRetroMario, FALSE) - EVT_CALL(PlaySoundAtPlayer, SOUND_JUMP_8BIT_MARIO, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_JUMP_8BIT_MARIO, SOUND_SPACE_MODE_0) EVT_CALL(Disable8bitMario, FALSE) EVT_CALL(SetMusicTrack, 0, SONG_CHAPTER_START, 1, 8) EVT_SET(MF_IsRetroMario, TRUE) EVT_ELSE - EVT_CALL(PlaySoundAtPlayer, SOUND_JUMP_2081, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_JUMP_2081, SOUND_SPACE_MODE_0) EVT_CALL(Disable8bitMario, TRUE) EVT_EXEC(N(EVS_SetupMusic)) EVT_SET(MF_IsRetroMario, FALSE) 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 cb5ac776b1..8b01d75df1 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 @@ -95,7 +95,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, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_F5, 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_07/obk_07_6_phonograph.c b/src/world/area_obk/obk_07/obk_07_6_phonograph.c index 12c2089bf2..e55a4dbe2e 100644 --- a/src/world/area_obk/obk_07/obk_07_6_phonograph.c +++ b/src/world/area_obk/obk_07/obk_07_6_phonograph.c @@ -1079,7 +1079,7 @@ EvtScript N(EVS_DummyUpdateGuardBoo) = { EvtScript N(EVS_GuardBooVanish) = { EVT_THREAD EVT_WAIT(25) - EVT_CALL(PlaySoundAtNpc, NPC_GuardBoo, SOUND_BOO_SPOOK, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GuardBoo, SOUND_BOO_SPOOK, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_GuardBoo, ANIM_Boo_Spook) EVT_WAIT(10) 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 d40816bb49..6b6103ef75 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 @@ -156,7 +156,7 @@ Vec2i N(DustEmitters_NearCabinet)[] = { }; EvtScript N(EVS_MiddleCabinet_OpenDoors) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu2, SOUND_F6, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu2, SOUND_F6, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 120, 15, EASING_QUARTIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -182,7 +182,7 @@ EvtScript N(EVS_MiddleCabinet_CloseDoors) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu2, SOUND_F6, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu2, SOUND_F6, SOUND_SPACE_MODE_0) EVT_RETURN EVT_END }; @@ -214,12 +214,12 @@ EvtScript N(EVS_Interact_NearCabinet) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(InterruptUsePartner) EVT_LOOP(3) - EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu1, SOUND_F6, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu1, SOUND_F6, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu1, SOUND_F6, 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) @@ -238,7 +238,7 @@ EvtScript N(EVS_Interact_NearCabinet) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu1, SOUND_F7, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu1, SOUND_F7, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(1.5)) EVT_END_THREAD @@ -269,12 +269,12 @@ EvtScript N(EVS_Interact_FarCabinet) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(InterruptUsePartner) EVT_LOOP(5) - EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu3, SOUND_F6, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu3, SOUND_F6, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu3, SOUND_F6, 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) @@ -293,7 +293,7 @@ EvtScript N(EVS_Interact_FarCabinet) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(20) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu3, SOUND_F7, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tansu3, SOUND_F7, 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 a2964b8418..0b536e612b 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 @@ -3,7 +3,7 @@ API_CALLABLE(N(ShutterCrashRumble)) { Bytecode* args = script->ptrReadPos; - + start_rumble(100, evt_get_variable(script, *args++) & 0xFFFF); return ApiStatus_DONE2; } @@ -15,7 +15,7 @@ API_CALLABLE(N(EnableItemTransparency)) { EvtScript N(EVS_AnimateShutterLeft) = { EVT_CALL(PlaySoundWithVolume, SOUND_B0000011, 0) - EVT_CALL(PlaySoundAtModel, LVar2, SOUND_B0000011, 0) + EVT_CALL(PlaySoundAtModel, LVar2, SOUND_B0000011, SOUND_SPACE_MODE_0) EVT_CALL(N(ShutterCrashRumble), 5) EVT_SET(LVar3, 90) EVT_CALL(MakeLerp, 0, LVar3, 15, EASING_COS_FAST_OVERSHOOT) @@ -64,7 +64,7 @@ EvtScript N(EVS_AnimateShutterLeft) = { EVT_GOTO(40) EVT_END_IF EVT_CALL(PlaySoundWithVolume, SOUND_B0000012, 0) - EVT_CALL(PlaySoundAtModel, LVar2, SOUND_B0000012, 0) + EVT_CALL(PlaySoundAtModel, LVar2, SOUND_B0000012, 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 c4608070a2..999690508f 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, 0, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(SOUND_B000000F, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); script->functionTemp[1] = RING_STATE_2; npc->duration = 0; npc->moveToPos.x = npc->pos.x; diff --git a/src/world/area_obk/obk_08/obk_08_6_game.c b/src/world/area_obk/obk_08/obk_08_6_game.c index 54448ee50b..35601af7b1 100644 --- a/src/world/area_obk/obk_08/obk_08_6_game.c +++ b/src/world/area_obk/obk_08/obk_08_6_game.c @@ -271,7 +271,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { EVT_END_IF EVT_END_LOOP EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_LeaderBoo, SOUND_THROW, 0) + EVT_CALL(PlaySoundAtNpc, NPC_LeaderBoo, SOUND_THROW, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_LeaderBoo, LVar3, LVar4, LVar5) EVT_ADD(LVar5, 20) EVT_SET(LVar6, LVar4) @@ -316,7 +316,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { EVT_SET(LVar0, NPC_DummyBoo) EVT_VEC3I_SET(LVar3, 0, 0, -20) EVT_EXEC(N(EVS_TetherItemToNpcWithOffset)) - EVT_CALL(PlaySoundAtNpc, NPC_DummyBoo, SOUND_THROW, 0) + EVT_CALL(PlaySoundAtNpc, NPC_DummyBoo, SOUND_THROW, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcJumpscale, NPC_DummyBoo, EVT_FLOAT(2.0)) EVT_CALL(NpcJump0, NPC_DummyBoo, 0, 0, 0, 20) EVT_CALL(SetNpcPos, NPC_DummyBoo, NPC_DISPOSE_LOCATION) 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 b022f11b02..3fb110a7be 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 @@ -44,7 +44,7 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_CALL(SetNpcPos, NPC_Bootler, 30, 70, -75) EVT_CALL(SetNpcYaw, NPC_Bow, 270) EVT_CALL(SetNpcYaw, NPC_Bootler, 270) - EVT_CALL(PlaySoundAtNpc, NPC_Bow, SOUND_BOO_VANISH, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bow, SOUND_BOO_VANISH, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_LOOP(20) EVT_ADDF(LVar0, EVT_FLOAT(12.0)) @@ -102,7 +102,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_8000000F, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, -280, -480, 100, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -115,7 +115,7 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_END_IF EVT_END_LOOP EVT_CALL(StopSound, SOUND_8000000F) - EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_9B, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_9B, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(0.2)) EVT_WAIT(40) EVT_CALL(SetCamType, CAM_DEFAULT, 4, TRUE) @@ -138,7 +138,7 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_WAIT(30) EVT_CALL(SetNpcPos, NPC_Skolar, 1, 620, 80) EVT_CALL(EnableNpcShadow, NPC_Skolar, FALSE) - EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_8000000F, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_8000000F, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, -480, -280, 100, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_omo/common/RockingHorse.inc.c b/src/world/area_omo/common/RockingHorse.inc.c index 698173fedd..41c4675394 100644 --- a/src/world/area_omo/common/RockingHorse.inc.c +++ b/src/world/area_omo/common/RockingHorse.inc.c @@ -47,7 +47,7 @@ API_CALLABLE(N(UpdateRockingHorses)) { offsetY = SQ(rockAngle) / 90.0f; if (i == 0) { if ((horse->lastRockAngle >= 0.0f && rockAngle < 0.0f) || (horse->lastRockAngle < 0.0f && rockAngle >= 0.0f)) { - sfx_play_sound_at_position(SOUND_CREAKY_ROCKING_CHAIR, 0, ROCKING_SOUND_LOCATION); + sfx_play_sound_at_position(SOUND_CREAKY_ROCKING_CHAIR, SOUND_SPACE_MODE_0, ROCKING_SOUND_LOCATION); } horse->lastRockAngle = rockAngle; } 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 b2b0e46d37..a01b79a863 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 @@ -4,14 +4,14 @@ s32 N(BarricadeModels)[] = { MODEL_t2, MODEL_t3, MODEL_t4, MODEL_t5, - MODEL_t2_2, MODEL_t2_3, MODEL_t2_4, MODEL_t2_5, - MODEL_t3_1, MODEL_t3_3, MODEL_t3_4, MODEL_t3_5, + MODEL_t2_2, MODEL_t2_3, MODEL_t2_4, MODEL_t2_5, + MODEL_t3_1, MODEL_t3_3, MODEL_t3_4, MODEL_t3_5, }; s32 N(BarricadeColliders)[] = { COLLIDER_t2, COLLIDER_t3, COLLIDER_t4, COLLIDER_t5, - COLLIDER_t2_2, COLLIDER_t2_3, COLLIDER_t2_4, COLLIDER_t2_5, - COLLIDER_t3_1, COLLIDER_t3_3, COLLIDER_t3_4, COLLIDER_t3_5, + COLLIDER_t2_2, COLLIDER_t2_3, COLLIDER_t2_4, COLLIDER_t2_5, + COLLIDER_t3_1, COLLIDER_t3_3, COLLIDER_t3_4, COLLIDER_t3_5, }; typedef struct BarricadePart { @@ -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, 0) + EVT_CALL(PlaySoundAtModel, MODEL_t1, SOUND_1F4, 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, 0) + EVT_CALL(PlaySoundAtModel, MODEL_t2_1, SOUND_1F4, 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,7 +334,7 @@ EvtScript N(EVS_Scene_BreakBarricade) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtModel, MODEL_t3_2, SOUND_1F4, 0) + EVT_CALL(PlaySoundAtModel, MODEL_t3_2, SOUND_1F4, 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)) @@ -366,7 +366,7 @@ 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_76D) + EVT_CALL(PlaySound, SOUND_36D | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(func_802D62E4, SOUND_36D) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Red_Anim04) EVT_CALL(SetNpcPos, NPC_ShyGuy_01, -285, 0, 35) @@ -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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_MISS_JUMP, 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, 0) + EVT_CALL(PlaySoundAtNpc, LVar9, SOUND_3E4, SOUND_SPACE_MODE_0) EVT_WAIT(7) EVT_END_LOOP EVT_CALL(SetNpcRotationPivot, NPC_ShyGuy_01, 0) @@ -401,7 +401,7 @@ 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_3A2, 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) 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 54f8bf4097..c2d2fde2b7 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_B0000021, 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)) EVT_CALL(NpcMoveTo, NPC_SELF, -575, 0, 0) EVT_KILL_THREAD(LVarA) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -460, 0, -20, 40) 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) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -460, 0, -20, 40) EVT_END_IF EVT_RETURN @@ -160,7 +160,7 @@ s32* N(CrowdFleeScripts)[] = { N(CrowdScriptA), N(CrowdScriptD), N(CrowdScriptA), - N(CrowdScriptB), + N(CrowdScriptB), }; EvtScript N(EVS_NpcIdle_ShyGuy_Crowd) = { 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 40fa49fd96..4c791c2be4 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, 0, -440, 10, 40) + EVT_CALL(PlaySoundAt, SOUND_1F1, 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, 0, -130, 0, -215) + EVT_CALL(PlaySoundAt, SOUND_1F2, 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, 0, -130, 0, -215) + EVT_CALL(PlaySoundAt, SOUND_51, 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 90fda74676..d0d5ecae25 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, 0) + EVT_CALL(PlaySoundAtModel, MODEL_p_8, SOUND_A1, 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, 0) + EVT_CALL(PlaySoundAtModel, MODEL_p_8, SOUND_A1, 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, 0) + EVT_CALL(PlaySoundAtModel, MODEL_p_8, SOUND_A1, 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 e321a7f0d6..34e6658d74 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 @@ -3,7 +3,7 @@ s32 N(HoverOffsets)[] = { 1, 2, 3, 2, 1, - -1, -2, -3, -2, -1, + -1, -2, -3, -2, -1, }; EvtScript N(EVS_NpcIdle_Kammy) = { @@ -90,7 +90,7 @@ Vec3f N(FlightPath_Kammy3)[] = { EvtScript N(EVS_PlayKammyFlightSounds) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_295, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_295, SOUND_SPACE_MODE_0) EVT_WAIT(4) EVT_END_LOOP EVT_RETURN @@ -142,7 +142,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_32B, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim10) EVT_WAIT(1) @@ -183,12 +183,12 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 25) EVT_ADD(LVar1, 38) - EVT_CALL(PlaySoundAt, SOUND_207A, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_207A, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 100) EVT_WAIT(100) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) EVT_ADD(LVar0, 55) - EVT_CALL(PlaySoundAt, SOUND_2098, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_2098, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, 0, 0, 1, 15, 3, 8) EVT_WAIT(5) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) @@ -232,7 +232,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_END_THREAD EVT_WAIT(90) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) - EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, 0) + EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) EVT_WAIT(5) 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 279176334a..81fb3c907c 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 @@ -90,12 +90,12 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_Eat) EVT_LOOP(6) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, SOUND_SPACE_MODE_0) EVT_END_LOOP EVT_IF_NE(LVar9, 2) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(10.0)) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_SpitOut) EVT_CALL(SetItemFlags, LVar7, 64, 0) EVT_CALL(GetAngleToPlayer, NPC_SELF, LVar0) @@ -233,21 +233,21 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(25.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_381, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_381, SOUND_SPACE_MODE_0) EVT_WAIT(33) 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)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_382, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_382, SOUND_SPACE_MODE_0) EVT_WAIT(33) 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)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_383, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_383, SOUND_SPACE_MODE_0) EVT_WAIT(18) EVT_CALL(SetMusicTrack, 0, SONG_GOURMET_GUY_FREAKOUT, 0, 8) EVT_WAIT(30) @@ -289,19 +289,19 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_GOTO(19) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_384, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_384, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_Panic) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(20.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 0, 110, 0) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_384, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_384, 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) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_384, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_384, 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, EASING_LINEAR) @@ -322,7 +322,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_GOTO(10) EVT_END_IF EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_384, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_384, 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) @@ -336,7 +336,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_385, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_385, 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) 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 b447ea9217..0a5869d19e 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, 0, -395, 0, -185) + EVT_CALL(PlaySoundAt, SOUND_1F1, SOUND_SPACE_MODE_0, -395, 0, -185) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o930, COLLIDER_FLAGS_UPPER_MASK) EVT_WAIT(20) 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) - EVT_CALL(PlaySoundAt, SOUND_1F2, 0, 265, 0, -235) + EVT_CALL(PlaySoundAt, SOUND_1F2, SOUND_SPACE_MODE_0, 265, 0, -235) EVT_CALL(MakeLerp, 0, 180, 30, 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, 0, 265, 0, -235) + EVT_CALL(PlaySoundAt, SOUND_51, 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 8151b96b08..5490f4e926 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, 0, 25, 0, -55) + EVT_CALL(PlaySoundAt, SOUND_1D9, 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, 0, 25, 0, -55) + EVT_CALL(PlaySoundAt, SOUND_1D9, 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 5c70fcb1f1..4ae1b7de62 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 @@ -3,7 +3,7 @@ s32 N(HoverOffsets)[] = { 1, 2 , 3, 2, 1, - -1, -2, -3, -2, -1, + -1, -2, -3, -2, -1, }; EvtScript N(EVS_NpcIdle_Kammy) = { @@ -89,12 +89,12 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 25) EVT_ADD(LVar1, 38) - EVT_CALL(PlaySoundAt, SOUND_207A, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_207A, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 75) EVT_WAIT(75) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) EVT_ADD(LVar0, 55) - EVT_CALL(PlaySoundAt, SOUND_2098, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_2098, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, 0, 0, 1, 15, 3, 8) EVT_WAIT(5) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) @@ -107,7 +107,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(SetNpcVar, NPC_Kammy, 0, 0) EVT_WAIT(5) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) - EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, 0) + EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) EVT_WAIT(5) 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 e7f29e7db3..96267d20cb 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_1A6, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_GreenLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_1A5, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_1A5, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_YellowLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_1A7, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_1A7, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_RedLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_1A8, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_1A8, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_BlueLightOn)) EVT_WAIT(LVar0) EVT_SUB(LVar0, 1) @@ -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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_1A6, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_GreenLightOn)) EVT_WAIT(3) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_1A5, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_1A5, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_YellowLightOn)) EVT_WAIT(3) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_1A7, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_1A7, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_RedLightOn)) EVT_WAIT(3) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_1A8, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_1A8, 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_1F3, 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_1F3, 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_1F3, 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_1F3, 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 @@ -409,7 +409,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_THREAD EVT_CALL(GetModelCenter, MODEL_b1_1) EVT_CALL(SetGroupEnabled, MODEL_b1, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_2098, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_2098, SOUND_SPACE_MODE_0) EVT_LOOP(4) EVT_SET(LVar3, 20) EVT_CALL(RandInt, 40, LVar6) @@ -431,7 +431,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_THREAD EVT_CALL(GetModelCenter, MODEL_b2_1) EVT_CALL(SetGroupEnabled, MODEL_b2, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_2098, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_2098, SOUND_SPACE_MODE_0) EVT_LOOP(4) EVT_SET(LVar3, 20) EVT_CALL(RandInt, 40, LVar6) @@ -453,7 +453,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_THREAD EVT_CALL(GetModelCenter, MODEL_b3_1) EVT_CALL(SetGroupEnabled, MODEL_b3, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_2098, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_2098, SOUND_SPACE_MODE_0) EVT_LOOP(4) EVT_SET(LVar3, 20) EVT_CALL(RandInt, 40, LVar6) @@ -475,7 +475,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_THREAD EVT_CALL(GetModelCenter, MODEL_b4_1) EVT_CALL(SetGroupEnabled, MODEL_b4, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_2098, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_2098, SOUND_SPACE_MODE_0) EVT_LOOP(4) EVT_SET(LVar3, 20) EVT_CALL(RandInt, 40, LVar6) @@ -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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_1A6, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_BlueLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_1A5, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_1A5, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_RedLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_1A7, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_1A7, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_YellowLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_1A8, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_1A8, SOUND_SPACE_MODE_0) EVT_EXEC(N(EVS_GreenLightOn)) EVT_WAIT(LVar0) EVT_SUB(LVar0, 1) @@ -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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_32C, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_32C, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_32C, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_32C, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_1A2, SOUND_SPACE_MODE_0) EVT_CASE_EQ(EVT_PTR(N(YellowBoxInfo))) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_1A1, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_1A1, SOUND_SPACE_MODE_0) EVT_CASE_EQ(EVT_PTR(N(RedBoxInfo))) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_1A3, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_1A3, SOUND_SPACE_MODE_0) EVT_CASE_EQ(EVT_PTR(N(BlueBoxInfo))) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_1A4, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_1A4, 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 5419e89fd1..0738c10a6d 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 @@ -11,7 +11,7 @@ enum SlotSymbol { SYM_SHYGUY = 1, SYM_COIN = 2, SYM_STAR = 3, -}; +}; enum SlotMachineProgress { SLOT_PROGRESS_HIT_ONE = 2, @@ -45,8 +45,8 @@ EvtScript N(EVS_SetCam_ViewPayout) = { s32 N(HitBlockRecoilOffsets)[] = { 3, 0, -3, 0, - 2, 0, -2, 0, - 1, 0, -1, 0, + 2, 0, -2, 0, + 1, 0, -1, 0, }; EvtScript N(EVS_HitBlockRecoil) = { @@ -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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_s1, SOUND_80000015, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_h1, SOUND_3F3, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_h2, SOUND_3F3, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_h3, SOUND_3F3, SOUND_SPACE_MODE_0) EVT_END_IF EVT_RETURN EVT_END @@ -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_B88, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o881, SOUND_388 | SOUND_ID_TRIGGER_CHANGE_VOLUME, SOUND_SPACE_MODE_0) EVT_END_IF EVT_END_IF EVT_WAIT(1) @@ -769,7 +769,7 @@ s32 N(SlotMachineBlocks)[] = { MODEL_s1, MODEL_h1, MODEL_h2, - MODEL_h3, + MODEL_h3, }; API_CALLABLE(N(UpdateSlotMachineBlockShadows)) { 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 4ab99a76be..52cf87e7c7 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 @@ -3,7 +3,7 @@ s32 N(HoverOffsets)[] = { 1, 2 , 3, 2, 1, - -1, -2, -3, -2, -1, + -1, -2, -3, -2, -1, }; EvtScript N(EVS_NpcIdle_Kammy) = { @@ -89,12 +89,12 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 25) EVT_ADD(LVar1, 38) - EVT_CALL(PlaySoundAt, SOUND_207A, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_207A, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 75) EVT_WAIT(75) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) EVT_ADD(LVar0, 55) - EVT_CALL(PlaySoundAt, SOUND_2098, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_2098, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, 150, 0, 1, 15, 3, 8) EVT_WAIT(5) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) @@ -107,7 +107,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(SetNpcVar, NPC_Kammy, 0, 0) EVT_WAIT(5) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) - EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, 0) + EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) EVT_WAIT(5) 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 f151059e86..dc755021fe 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,13 +125,13 @@ API_CALLABLE(N(UpdateRotatingPlatforms)) { s32 j, k; if (isInitialCall) { - sfx_play_sound_at_position(SOUND_80000016, 0, 315.0f, 125.0f, -100.0f); + sfx_play_sound_at_position(SOUND_80000016, 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; for (i = 0; i < ARRAY_COUNT(N(RotatingPlatformModels)); it++, i += 2) { loopModel = get_model_from_list_index(get_model_list_index_from_tree_index(N(RotatingPlatformModels)[i])); - + it->relativePos.x = x = loopModel->center.x - axisModel->center.x; it->relativePos.y = y = loopModel->center.y - axisModel->center.y; it->relativePos.z = z = loopModel->center.z - axisModel->center.z; @@ -148,7 +148,7 @@ API_CALLABLE(N(UpdateRotatingPlatforms)) { it++; loopModel = get_model_from_list_index(get_model_list_index_from_tree_index(N(RotatingPlatformModels)[i + 1])); - + it->relativePos.x = ox; it->relativePos.y = oy; it->relativePos.z = oz; 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 49b5c973f7..95644e5431 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 @@ -313,7 +313,7 @@ EvtScript N(EVS_Scene_ReleaseWatt) = { EVT_CALL(func_802D2C14, 0) EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_Watt, ANIM_WorldWatt_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_Watt, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Watt, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Watt, EMOTE_EXCLAMATION, 0, 30, TRUE, 0, 0, 0, 0) EVT_WAIT(40) 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 3e0f463500..5f4d28861e 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 @@ -16,7 +16,7 @@ NpcSettings N(NpcSettings_AntiGuy) = { s32 N(BribeItemList)[] = { ITEM_LEMON_CANDY, - -1 + -1 }; EvtScript N(EVS_NpcInteract_AntiGuy) = { @@ -51,7 +51,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 30, TRUE, 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 a4f665e1c0..bb8193db64 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 @@ -27,7 +27,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_8000004C, SOUND_SPACE_MODE_0) EVT_END_IF EVT_EXEC(N(EVS_SetupDarkness)) 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 18c4bd77bd..cf3b9ab13e 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 @@ -203,7 +203,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_tt1, SOUND_1E4, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tt1, SOUND_1E4, 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 c1705631df..a4b41a38b2 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 @@ -30,7 +30,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_CALL(PlaySound, SOUND_80000067) EVT_CALL(N(StarSpiritEffectFunc1)) EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, 0, -100, 85, 0) + EVT_CALL(PlaySoundAt, SOUND_B2, SOUND_SPACE_MODE_0, -100, 85, 0) EVT_END_THREAD EVT_THREAD EVT_WAIT(45) @@ -39,7 +39,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_THREAD EVT_WAIT(180) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, 0, -100, 85, 0) + EVT_CALL(PlaySoundAt, SOUND_137, SOUND_SPACE_MODE_0, -100, 85, 0) EVT_END_THREAD EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD @@ -67,7 +67,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_IF // wait for pickup EVT_CALL(N(StarSpiritEffectFunc4), 3) - EVT_CALL(PlaySoundAtPlayer, SOUND_138, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_138, 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_14) 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 7b6549238d..5d2807d6ab 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 @@ -16,8 +16,8 @@ s32 N(BeginSurroundCrowdPositions)[] = { 6, 25, 60, 6, 10, 120, 7, -5, 180, - 8, -35, 240, - 6, 30, 0, + 8, -35, 240, + 6, 30, 0, }; EvtScript N(EVS_Scene_MeetingGeneralGuy) = { @@ -215,12 +215,12 @@ s32* N(CrowdFleeScripts)[] = { N(CrowdFleeScriptE), N(CrowdFleeScriptB), N(CrowdFleeScriptA), - N(CrowdFleeScriptD), - N(CrowdPratfallScript), + N(CrowdFleeScriptD), + N(CrowdPratfallScript), }; s32* N(GeneralGuyFleeScripts)[] = { - N(GeneralGuyFleeScript), + N(GeneralGuyFleeScript), }; Vec3i N(FinalSurroundCrowdPositions)[] = { @@ -236,7 +236,7 @@ Vec3i N(FinalSurroundCrowdPositions)[] = { }; Vec3i N(PostBattleGeneralPosition) = { - -182, 0, 0, + -182, 0, 0, }; EvtScript N(EVS_NpcIdle_ShyGuy) = { @@ -296,7 +296,7 @@ EvtScript N(EVS_BossDefeated_RunAway) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySound, SOUND_76D) + EVT_CALL(PlaySound, SOUND_36D | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(func_802D62E4, SOUND_36D) EVT_ELSE EVT_SET(LVar0, LVar9) @@ -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, 0) + EVT_CALL(PlaySoundAtNpc, LVar9, SOUND_MISS_JUMP, 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, 0) + EVT_CALL(PlaySoundAtNpc, LVar9, SOUND_3E4, SOUND_SPACE_MODE_0) EVT_WAIT(7) EVT_END_LOOP EVT_WAIT(6) @@ -351,7 +351,7 @@ EvtScript N(EVS_BossDefeated_RunAway) = { EVT_CALL(InterpNpcYaw, LVar9, 90, 0) EVT_WAIT(20) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, LVar9, SOUND_3A2, 0) + EVT_CALL(PlaySoundAtNpc, LVar9, SOUND_3A2, SOUND_SPACE_MODE_0) EVT_WAIT(45) EVT_CALL(StopSound, SOUND_3A2) EVT_CALL(SetNpcVar, NPC_ShyGuy_09, 0, MANAGER_ARMY_FLEE) 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 1903821d62..7c884658a9 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 @@ -82,7 +82,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, 1, 300, 0, 400) + EVT_CALL(PlaySoundAtF, SOUND_80000059, 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 b5c31b2cb2..0c639a0404 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 @@ -45,7 +45,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, 1, 300, 2, 399) + EVT_CALL(PlaySoundAtF, SOUND_8000005A, 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 a75e473d97..59d71b3053 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 @@ -115,7 +115,7 @@ EvtScript N(EVS_Twink_FlyAway) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Twink, SOUND_62, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Twink, SOUND_62, 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) @@ -283,42 +283,42 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) EVT_THREAD EVT_SET(LVar4, NPC_Eldstar) - EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2045, 0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2045, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_StarSpirit_FlyAway)) EVT_END_THREAD EVT_THREAD EVT_WAIT(30) EVT_SET(LVar4, NPC_Misstar) - EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2046, 0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2046, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_StarSpirit_FlyAway)) EVT_END_THREAD EVT_THREAD EVT_WAIT(60) EVT_SET(LVar4, NPC_Skolar) - EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2045, 0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2045, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_StarSpirit_FlyAway)) EVT_END_THREAD EVT_THREAD EVT_WAIT(90) EVT_SET(LVar4, NPC_Mamar) - EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2046, 0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2046, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_StarSpirit_FlyAway)) EVT_END_THREAD EVT_THREAD EVT_WAIT(120) EVT_SET(LVar4, NPC_Kalmar) - EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2045, 0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2045, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_StarSpirit_FlyAway)) EVT_END_THREAD EVT_THREAD EVT_WAIT(150) EVT_SET(LVar4, NPC_Muskular) - EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2046, 0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2046, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_StarSpirit_FlyAway)) EVT_END_THREAD EVT_WAIT(180) EVT_SET(LVar4, NPC_Klevar) - EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2045, 0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2045, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_StarSpirit_FlyAway)) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_WAIT(20) 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 8d17af67e0..75444db8f5 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 @@ -75,7 +75,7 @@ EvtScript N(EVS_Scene_RescuedKalmar) = { EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Leap) EVT_WAIT(20) EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) - EVT_CALL(PlaySoundAtPlayer, SOUND_139, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) EVT_ADD(LVar1, 50) @@ -88,7 +88,7 @@ EvtScript N(EVS_Scene_RescuedKalmar) = { EVT_WAIT(6) EVT_END_LOOP EVT_WAIT(20) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_188, 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) @@ -154,7 +154,7 @@ EvtScript N(EVS_Scene_RescuedKalmar) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_Kalmar, SOUND_2045, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kalmar, SOUND_2045, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) 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 c4de6753a7..c267cecef7 100644 --- a/src/world/area_pra/pra_02/pra_02_4_entity.c +++ b/src/world/area_pra/pra_02/pra_02_4_entity.c @@ -35,7 +35,7 @@ EvtScript N(EVS_RaisePoundableSwitch) = { }; EvtScript N(EVS_LowerPoundableSwitch) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o1344, SOUND_208B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1344, SOUND_208B, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -10, 10, EASING_LINEAR) EVT_LOOP(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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_CALL(N(GetEntityPosition), MV_FarRedPadlock, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_CALL(N(GetEntityPosition), MV_FarBluePadlock, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 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_19/pra_19_3_npc.c b/src/world/area_pra/pra_19/pra_19_3_npc.c index a68c2ebb70..2b0813385f 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 @@ -44,7 +44,7 @@ API_CALLABLE(N(ChooseImposterBattleFormation)) { Enemy* enemy = script->owner1.enemy; Encounter* encounter; s32 unmaskedCount = 0; - + if (evt_get_variable(script, *args++) == 0) { unmaskedCount++; } @@ -257,7 +257,7 @@ EvtScript N(EVS_Imposter_Unmask) = { EVT_CALL(SetNpcPos, LVar3, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_100, FALSE) EVT_CALL(SetNpcPos, LVar4, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_SMOKE_BURST, 0) + EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_SMOKE_BURST, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 8 * 360, 40, EASING_QUADRATIC_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) @@ -273,7 +273,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_2CB, SOUND_SPACE_MODE_0) EVT_CALL(NpcMoveTo, LVar4, 0, LVar2, 0) EVT_CALL(SetNpcPos, LVar4, NPC_DISPOSE_LOCATION) EVT_END_THREAD @@ -299,7 +299,7 @@ EvtScript N(EVS_RevealEveryImposter) = { EVT_CALL(SetNpcPos, NPC_FakeGoompa, NPC_DISPOSE_LOCATION) EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_GoompaGhost, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_GoompaGhost, SOUND_SMOKE_BURST, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GoompaGhost, SOUND_SMOKE_BURST, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(NpcMoveTo, NPC_GoompaGhost, LVar0, LVar2, 30) EVT_END_THREAD @@ -310,7 +310,7 @@ EvtScript N(EVS_RevealEveryImposter) = { EVT_CALL(SetNpcPos, NPC_FakeLuigi, NPC_DISPOSE_LOCATION) EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_LuigiGhost, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_LuigiGhost, SOUND_SMOKE_BURST, 0) + EVT_CALL(PlaySoundAtNpc, NPC_LuigiGhost, SOUND_SMOKE_BURST, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(NpcMoveTo, NPC_LuigiGhost, LVar0, LVar2, 30) EVT_END_THREAD @@ -321,7 +321,7 @@ EvtScript N(EVS_RevealEveryImposter) = { EVT_CALL(SetNpcPos, NPC_FakeKoopaKoot, NPC_DISPOSE_LOCATION) EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_KoopaKootGhost, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaKootGhost, SOUND_SMOKE_BURST, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaKootGhost, SOUND_SMOKE_BURST, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(NpcMoveTo, NPC_KoopaKootGhost, LVar0, LVar2, 30) EVT_END_THREAD @@ -332,7 +332,7 @@ EvtScript N(EVS_RevealEveryImposter) = { EVT_CALL(SetNpcPos, NPC_FakeKolorado, NPC_DISPOSE_LOCATION) EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_KoloradoGhost, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_KoloradoGhost, SOUND_SMOKE_BURST, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoloradoGhost, SOUND_SMOKE_BURST, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(NpcMoveTo, NPC_KoloradoGhost, LVar0, LVar2, 30) EVT_END_THREAD @@ -627,11 +627,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_Mario_Question) - EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_FakeKooper, EMOTE_QUESTION, 0, 30, FALSE, 0, 0, 0, 0) EVT_WAIT(35) EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o1054, SOUND_1E4, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1054, SOUND_1E4, 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 686eda9cc7..d678f71164 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 @@ -157,7 +157,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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1064, SOUND_80000010, SOUND_SPACE_MODE_0) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_o1005, LVar0, 0, 0) 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 10c7aa225a..3400dd52c7 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1063, SOUND_2E, SOUND_SPACE_MODE_0) EVT_CALL(N(CheckPlayerOnDais)) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1063, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(N(GetDaisRelativePlayerPos)) diff --git a/src/world/area_sam/sam_06/sam_06_4_npc.c b/src/world/area_sam/sam_06/sam_06_4_npc.c index 048a51c93b..cdb62b20ca 100644 --- a/src/world/area_sam/sam_06/sam_06_4_npc.c +++ b/src/world/area_sam/sam_06/sam_06_4_npc.c @@ -334,7 +334,7 @@ EvtScript N(EVS_Scene_Merle_EnterHouse) = { EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, 15, -90, 0) EVT_CALL(SetGroupEnabled, MODEL_k_naiso, 1) - EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 90, 10, EASING_QUADRATIC_OUT) EVT_LABEL(70) EVT_CALL(UpdateLerp) @@ -376,7 +376,7 @@ EvtScript N(EVS_Scene_Merle_EnterHouse) = { EVT_GOTO(71) EVT_END_IF EVT_CALL(SetGroupEnabled, MODEL_km_sita, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(PlayerMoveTo, 0, -240, 0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_k_d1, COLLIDER_FLAGS_UPPER_MASK) @@ -491,7 +491,7 @@ EvtScript N(EVS_Scene_Merle_OneLastThing) = { EVT_CALL(SetGroupEnabled, MODEL_k_naiso, 1) EVT_CALL(SetGroupEnabled, MODEL_km_sita, 1) EVT_CALL(SetNpcPos, NPC_Merle, 0, 90, -180) - EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 90, 10, EASING_QUADRATIC_IN) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -512,7 +512,7 @@ EvtScript N(EVS_Scene_Merle_OneLastThing) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(1) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(SetGroupEnabled, MODEL_k_naiso, 0) EVT_CALL(GetNpcPos, NPC_Merle, LVar0, LVar1, LVar2) EVT_CALL(PlayerFaceNpc, NPC_Merle, FALSE) @@ -527,7 +527,7 @@ EvtScript N(EVS_Scene_Merle_OneLastThing) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_Merle, ANIM_Merle_Talk, ANIM_Merle_Idle, 0, MSG_CH7_00F3) EVT_CALL(SetGroupEnabled, MODEL_k_naiso, 1) - EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 90, 10, EASING_QUADRATIC_IN) EVT_LABEL(2) EVT_CALL(UpdateLerp) @@ -551,7 +551,7 @@ EvtScript N(EVS_Scene_Merle_OneLastThing) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(3) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(SetGroupEnabled, MODEL_k_naiso, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) 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 b1c832f3bc..4419bc5865 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 @@ -8,7 +8,8 @@ API_CALLABLE(N(AdjustFightingSoundsPos)) { s32 y = evt_get_variable(script, *args++); s32 z = evt_get_variable(script, *args++); - sfx_adjust_env_sound_pos(SOUND_8000006C, 0, x, y, z); + // @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); return ApiStatus_DONE2; } 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 85bedd232a..454015d704 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_iwa, SOUND_5F, SOUND_SPACE_MODE_0) EVT_SET(LVar2, 0) EVT_CALL(MakeLerp, 0, -50, 50, EASING_LINEAR) EVT_LOOP(0) @@ -553,7 +553,7 @@ EvtScript N(EVS_Steps_FinishRising) = { }; EvtScript N(EVS_Steps_Unfold) = { - EVT_CALL(PlaySoundAt, SOUND_5E, 0, 0, 39, -80) + EVT_CALL(PlaySoundAt, SOUND_5E, SOUND_SPACE_MODE_0, 0, 39, -80) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.2)) EVT_END_THREAD 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 e894813703..19c92693eb 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 @@ -78,7 +78,7 @@ EvtScript N(EVS_Scene_RescuedMamar) = { EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Leap) EVT_WAIT(20) EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) - EVT_CALL(PlaySoundAtPlayer, SOUND_139, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) EVT_ADD(LVar1, 50) @@ -91,7 +91,7 @@ EvtScript N(EVS_Scene_RescuedMamar) = { EVT_WAIT(6) EVT_END_LOOP EVT_WAIT(20) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_188, 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) @@ -159,7 +159,7 @@ EvtScript N(EVS_Scene_RescuedMamar) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_Mamar, SOUND_2045, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Mamar, SOUND_2045, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) @@ -205,7 +205,7 @@ EvtScript N(EVS_NpcInteract_TradingToad) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_CH2_00EE) EVT_WAIT(10) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_SET(GF_TradingEvent2_Active, FALSE) @@ -229,7 +229,7 @@ EvtScript N(EVS_NpcInteract_TradingToad) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_CH2_00F2) EVT_WAIT(10) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_SET(GF_TradingEvent2_Active, FALSE) 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 188d300cf3..4a533ddecc 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_B) - EVT_CALL(PlaySoundAt, SOUND_2108, 0, -80, 60, -200) + EVT_CALL(PlaySoundAt, SOUND_2108, 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_B) - EVT_CALL(PlaySoundAt, SOUND_2108, 0, -180, 60, -200) + EVT_CALL(PlaySoundAt, SOUND_2108, 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_B) - EVT_CALL(PlaySoundAt, SOUND_2108, 0, -130, 60, -150) + EVT_CALL(PlaySoundAt, SOUND_2108, 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_tik/tik_01/tik_01_4_entity.c b/src/world/area_tik/tik_01/tik_01_4_entity.c index ed3a8bf87e..fa0a43ccad 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, 0, LVar2, 200, 25) + EVT_CALL(PlaySoundAt, SOUND_301, 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, 0, LVar2, LVar0, 25) + EVT_CALL(PlaySoundAt, SOUND_48, 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 ec6922650d..8718553a31 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, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, 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(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, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3DD, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, 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 f45e40ed73..68dbc90012 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 @@ -19,8 +19,8 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(PlaySound, SOUND_80000028) - EVT_CALL(PlaySoundAtF, SOUND_80000029, 1, -230, -180, 120) - EVT_CALL(PlaySoundAtF, SOUND_8000002A, 1, 20, -180, 120) + 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_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 721ff68bc1..98a933d997 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, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, 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(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, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3DD, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, 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 f8c32e15b4..5854b57d4a 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 @@ -84,7 +84,7 @@ EvtScript N(EVS_Main) = { EVT_END_IF EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(PlaySound, SOUND_8000002B) - EVT_CALL(PlaySoundAtF, SOUND_8000002C, 1, -10, -20, 120) + EVT_CALL(PlaySoundAtF, SOUND_8000002C, 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 9af5a93999..f3c2f51f6c 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 @@ -19,7 +19,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(PlaySound, SOUND_8000002D) - EVT_CALL(PlaySoundAtF, SOUND_8000002E, 1, -85, -20, 120) + EVT_CALL(PlaySoundAtF, SOUND_8000002E, 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 c611cea2a9..2a6bc6e4ac 100644 --- a/src/world/area_tik/tik_05/tik_05_4_entity.c +++ b/src/world/area_tik/tik_05/tik_05_4_entity.c @@ -46,8 +46,8 @@ EvtScript N(EVS_BreakBlock_DropSpring) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_48, 0, LVar5, LVar0, 0) - EVT_CALL(PlaySoundAt, SOUND_2086, 0, LVar5, LVar0, 0) + EVT_CALL(PlaySoundAt, SOUND_48, 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) EVT_RETURN 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 2d354025a0..6f4cf332fb 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 @@ -70,9 +70,9 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(PlaySound, SOUND_8000002F) - EVT_CALL(PlaySoundAtF, SOUND_80000030, 1, -85, -180, 120) - EVT_CALL(PlaySoundAtF, SOUND_80000031, 1, -25, -140, -130) - EVT_CALL(PlaySoundAtF, SOUND_80000032, 1, -35, -180, 130) + 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_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 6dd48b4e58..c03d7463bc 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 @@ -16,7 +16,7 @@ EvtScript N(EVS_GotoMap_tik_06_2) = { EVT_END }; -EvtScript N(EVS_ExitPipe_tik_06_2) = EVT_EXIT_PIPE_HORIZONTAL(tik_06_ENTRY_3, COLLIDER_ttd, N(EVS_GotoMap_tik_06_2)); +EvtScript N(EVS_ExitPipe_tik_06_2) = EVT_EXIT_PIPE_HORIZONTAL(tik_06_ENTRY_3, COLLIDER_ttd, N(EVS_GotoMap_tik_06_2)); EvtScript N(EVS_BindExitTriggers) = { EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_09_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) @@ -35,7 +35,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(PlaySound, SOUND_80000033) - EVT_CALL(PlaySoundAtF, SOUND_80000034, 1, -30, -30, -85) + EVT_CALL(PlaySoundAtF, SOUND_80000034, 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 24a4ae9d3a..0857b7de43 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, 0, 90, 200, 100) + EVT_CALL(PlaySoundAt, SOUND_301, 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, 0, 90, LVar0, 100) + EVT_CALL(PlaySoundAt, SOUND_48, 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 fa6007226d..109732bd9b 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, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, 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(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, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3DD, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, 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 541845bb49..6b27e2d58f 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 @@ -11,7 +11,7 @@ EvtScript N(EVS_CloseGates) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(PlaySound, SOUND_A) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o59, SOUND_26B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o59, SOUND_26B, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 60, 0, 25, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -22,7 +22,7 @@ EvtScript N(EVS_CloseGates) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o59, SOUND_26C, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o59, SOUND_26C, 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) @@ -70,9 +70,9 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(PlaySound, SOUND_80000035) - EVT_CALL(PlaySoundAtF, SOUND_80000036, 1, -190, -20, -120) - EVT_CALL(PlaySoundAtF, SOUND_80000037, 1, 50, -20, -120) - EVT_CALL(PlaySoundAtF, SOUND_80000038, 1, 290, -20, -120) + 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_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 7e97022583..006ffc8767 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_B) - EVT_CALL(PlaySoundAt, SOUND_301, 0, -10, 200, 10) + EVT_CALL(PlaySoundAt, SOUND_301, 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, 0, -10, LVar0, 10) + EVT_CALL(PlaySoundAt, SOUND_48, 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_18/tik_18_4_npc.c b/src/world/area_tik/tik_18/tik_18_4_npc.c index 508677851e..c221ce5f82 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E1, 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 370b6135cd..7a8a9a3492 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 @@ -29,8 +29,8 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(PlaySound, SOUND_80000044) - EVT_CALL(PlaySoundAtF, SOUND_80000045, 1, 0, -20, 30) - EVT_CALL(PlaySoundAtF, SOUND_80000046, 1, 270, -20, 30) + 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(EnableTexPanning, MODEL_nagare, TRUE) EVT_THREAD TEX_PAN_PARAMS_ID(TEX_PANNER_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 763127288f..190c1a3591 100644 --- a/src/world/area_tik/tik_25/tik_25_3_entity.c +++ b/src/world/area_tik/tik_25/tik_25_3_entity.c @@ -53,8 +53,8 @@ EvtScript N(EVS_OnBreakBlock_SpringR) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_48, 0, LVar5, LVar0, 0) - EVT_CALL(PlaySoundAt, SOUND_2086, 0, LVar5, LVar0, 0) + EVT_CALL(PlaySoundAt, SOUND_48, 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) EVT_RETURN @@ -88,8 +88,8 @@ EvtScript N(EVS_OnBreakBlock_SpringL) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_48, 0, LVar5, LVar0, 0) - EVT_CALL(PlaySoundAt, SOUND_2086, 0, LVar5, LVar0, 0) + EVT_CALL(PlaySoundAt, SOUND_48, 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) 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 234e08ca84..016b00f679 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 @@ -28,7 +28,7 @@ EvtScript N(EVS_NpcIdle_KoopaBros) = { EVT_CALL(AwaitPlayerApproach, -580, 276, 50) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_tt2, SOUND_METAL_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tt2, SOUND_METAL_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 100, 10, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -62,7 +62,7 @@ EvtScript N(EVS_NpcIdle_KoopaBros) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_KoopaBros_Black_Anim14, ANIM_KoopaBros_Black_Anim04, 0, MSG_CH1_00D2) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim02) EVT_CALL(InterpNpcYaw, NPC_SELF, 45, 2) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_173, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_173, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim03) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) @@ -70,7 +70,7 @@ EvtScript N(EVS_NpcIdle_KoopaBros) = { EVT_WAIT(8) EVT_WAIT(12) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(8.0)) EVT_CALL(NpcMoveTo, NPC_SELF, -496, 101, 0) EVT_END_THREAD @@ -88,7 +88,7 @@ EvtScript N(EVS_NpcIdle_KoopaBros) = { EVT_IF_NE(LVar1, 0) EVT_GOTO(1) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_tt2, SOUND_METAL_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tt2, SOUND_METAL_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_WAIT(10) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.5)) @@ -167,7 +167,7 @@ EvtScript N(D_80241DA4_99BA14) = { EVT_CALL(EnableNpcAI, NPC_Eldstar, FALSE) EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Leap) EVT_WAIT(20) - EVT_CALL(PlaySoundAtPlayer, SOUND_139, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) @@ -184,7 +184,7 @@ EvtScript N(D_80241DA4_99BA14) = { EVT_WAIT(20) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_188, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) EVT_WAIT(40) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) @@ -270,7 +270,7 @@ EvtScript N(D_80241DA4_99BA14) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_Eldstar, SOUND_2045, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Eldstar, SOUND_2045, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) 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 5546a904b3..d3e3fb3b1b 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 @@ -126,13 +126,13 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_263, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_KoopaTroopa_02, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) EVT_WAIT(120) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_02, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_02, ANIM_KoopaTroopa_Panic) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_KoopaTroopa_02, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) EVT_LOOP(4) EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_02, 270, 0) @@ -163,7 +163,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_03, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_03, ANIM_KoopaTroopa_Panic) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_03, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_03, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_KoopaTroopa_03, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) EVT_LOOP(4) EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_03, 270, 0) 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 7b6d72c83a..bbf9c0296e 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 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_2_entity.c b/src/world/area_trd/trd_02/trd_02_2_entity.c index 3dc66526c3..f5c7e0fc98 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 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 6df2fafbde..3aaf03d27d 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) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_01, ANIM_KoopaTroopa_Idle) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_ori1, SOUND_26B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ori1, SOUND_26B, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 100, 0, 40, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ori1, SOUND_26C, SOUND_SPACE_MODE_0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_END_THREAD @@ -75,7 +75,7 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) EVT_WAIT(10) - EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_METAL_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_METAL_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -98,13 +98,13 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_CALL(SpeakToPlayer, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim14, ANIM_KoopaBros_Green_Anim04, 0, MSG_CH1_00D4) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim02) EVT_CALL(InterpNpcYaw, NPC_KoopaBros, 45, 2) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros, SOUND_173, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros, SOUND_173, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim03) 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) EVT_WAIT(8) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros, SOUND_174, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros, SOUND_174, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcSpeed, NPC_KoopaBros, EVT_FLOAT(8.0)) 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_04/trd_04_2_entity.c b/src/world/area_trd/trd_04/trd_04_2_entity.c index e6c28cef7c..c53c85db0f 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 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) - EVT_CALL(PlaySoundAt, SOUND_301, 0, -180, 175, -35) + EVT_CALL(PlaySoundAt, SOUND_301, SOUND_SPACE_MODE_0, -180, 175, -35) EVT_CALL(MakeLerp, 175, 0, 20, 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, 0, -180, 0, -35) + EVT_CALL(PlaySoundAt, SOUND_48, SOUND_SPACE_MODE_0, -180, 0, -35) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(20) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) 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 6d154e2944..70351a9dde 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 @@ -144,7 +144,7 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim14, ANIM_KoopaBros_Yellow_Anim04, 5, MSG_CH1_00D5) EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_KoopaBros_01, EMOTE_EXCLAMATION, 0, 25, 2, LVar0, LVar1, LVar2, 40) EVT_WAIT(25) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 270, 2) 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 e9307b554b..cfbbc3f814 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 @@ -110,7 +110,7 @@ EvtScript N(EVS_NpcInteract_Bombette) = { EVT_WAIT(15) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_WAIT(25) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, -45, 30, TRUE, 0, 0, 0, 0) EVT_WAIT(40) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00E0) @@ -139,7 +139,7 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_METAL_DOOR_OPEN, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_METAL_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 90, 15, EASING_COS_IN_OUT) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -192,7 +192,7 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(20) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_METAL_DOOR_CLOSE, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_METAL_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_THREAD EVT_CALL(NpcMoveTo, NPC_Jailer_KoopaTroopa, -233, 147, 0) 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 9f849eca53..0727414d68 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 @@ -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, 0, LVar1, LVar2, LVar3) + EVT_CALL(PlaySoundAt, SOUND_B000000A, 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 87b1968de3..f8a9eb4fef 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, 808, 0x00200000) + EVT_CALL(func_80045838, -1, SOUND_328, 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, 0xB0000018, 0) + EVT_CALL(func_80045838, -1, SOUND_B0000018, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BulletBill_Anim05) 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 aa172510c9..5d215ce9e3 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 @@ -44,7 +44,7 @@ EvtScript N(EVS_BossDefeated) = { EVT_CALL(PlaySound, SOUND_80000067) EVT_CALL(N(StarSpiritEffectFunc1)) EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, 0, -135, 85, 0) + EVT_CALL(PlaySoundAt, SOUND_B2, SOUND_SPACE_MODE_0, -135, 85, 0) EVT_END_THREAD EVT_THREAD EVT_WAIT(45) @@ -53,7 +53,7 @@ EvtScript N(EVS_BossDefeated) = { EVT_THREAD EVT_WAIT(180) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, 0, -135, 85, 0) + EVT_CALL(PlaySoundAt, SOUND_137, SOUND_SPACE_MODE_0, -135, 85, 0) EVT_END_THREAD EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD @@ -79,7 +79,7 @@ EvtScript N(EVS_BossDefeated) = { EVT_WAIT(1) EVT_END_IF EVT_CALL(N(StarSpiritEffectFunc4), 3) - EVT_CALL(PlaySoundAtPlayer, SOUND_138, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_138, 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_14) 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 e8b9950268..af30abeca1 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, 0, 0, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_1E2, 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) @@ -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, 0, 0, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_1E2, 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 121e741d82..780aa25013 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, EASING_QUADRATIC_OUT) - EVT_CALL(PlaySoundAt, SOUND_3BE, 0, 50, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_3BE, 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 31c639ff18..254ba05d3f 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->position.y = source->varTable[0] - (N(PushBlockFallCurve)[source->functionTemp[0]] * BLOCK_GRID_SIZE); if (source->functionTemp[0] == 0) { - sfx_play_sound_at_position(SOUND_1DA, 0, block->position.x, block->position.y, block->position.z); + sfx_play_sound_at_position(SOUND_1DA, SOUND_SPACE_MODE_0, block->position.x, block->position.y, block->position.z); } if ((source->functionTemp[0] > 4) && (source->functionTemp[0] & 1)) { diff --git a/src/world/common/enemy/ai/CleftAI.inc.c b/src/world/common/enemy/ai/CleftAI.inc.c index cc02febf7f..5597792ad0 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->currentAnim = 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, 0x200000); + ai_enemy_play_sound(npc, SOUND_2F4, 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 8b29ec066a..93ddd5d7a6 100644 --- a/src/world/common/enemy/ai/ClubbaNappingAI.inc.c +++ b/src/world/common/enemy/ai/ClubbaNappingAI.inc.c @@ -74,7 +74,7 @@ void N(ClubbaNappingAI_Sleep)(Evt* script, MobileAISettings* aiSettings, EnemyDe npc->currentAnim = 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, 0x200000); + ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); script->AI_TEMP_STATE = AI_STATE_NAPPING_CLUBBA_WAKE_UP; } diff --git a/src/world/common/enemy/ai/FireBarAI.inc.c b/src/world/common/enemy/ai/FireBarAI.inc.c index db9be7d436..bdd6f9a91e 100644 --- a/src/world/common/enemy/ai/FireBarAI.inc.c +++ b/src/world/common/enemy/ai/FireBarAI.inc.c @@ -91,7 +91,7 @@ ApiStatus N(FireBarAI_Main)(Evt* script, s32 isInitialCall) { clampedYaw = clamp_angle(data->yaw); if (clampedYaw != data->yaw) { data->yaw = clampedYaw; - sfx_play_sound_at_position(N(FireBar_Sounds)[data->soundIndex], 0, data->centerPos.x, data->centerPos.y, data->centerPos.z); + sfx_play_sound_at_position(N(FireBar_Sounds)[data->soundIndex], SOUND_SPACE_MODE_0, data->centerPos.x, data->centerPos.y, data->centerPos.z); } distToPlayer = dist2D(data->centerPos.x, data->centerPos.z, playerStatus->position.x, playerStatus->position.z); distToNpc = dist2D(data->centerPos.x, data->centerPos.z, npc->pos.x, npc->pos.z) @@ -103,7 +103,7 @@ ApiStatus N(FireBarAI_Main)(Evt* script, s32 isInitialCall) { 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, 0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); + sfx_play_sound_at_position(SOUND_E8, SOUND_SPACE_MODE_0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); gCurrentEncounter.battleTriggerCooldown = 45; playerStatus->blinkTimer = 45; playerStatus->lastGoodPosition.x = playerStatus->position.x; diff --git a/src/world/common/enemy/ai/FlyingAI.inc.c b/src/world/common/enemy/ai/FlyingAI.inc.c index bd0664789c..6b8a1394f5 100644 --- a/src/world/common/enemy/ai/FlyingAI.inc.c +++ b/src/world/common/enemy/ai/FlyingAI.inc.c @@ -52,9 +52,9 @@ void N(FlyingAI_Wander)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVo f32 vt1 = (f32)enemy->varTable[1] / 100.0; f32 posX, posY, posZ, posW; f32 temp_f24; - + enemy->varTable[4] = npc->pos.y * 100.0; - + temp_f24 = vt3 + vt7; if ((enemy->varTable[0] & 0x11) == 1) { @@ -73,7 +73,7 @@ void N(FlyingAI_Wander)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVo } } } - + if ((enemy->varTable[0] & 0x11) == 0x11) { f64 test; f32 yTemp; @@ -132,14 +132,14 @@ void N(FlyingAI_Wander)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVo if (aiSettings->playerSearchInterval >= 0) { if (script->functionTemp[1] <= 0) { script->functionTemp[1] = aiSettings->playerSearchInterval; - if (gPlayerStatusPtr->position.y < (npc->pos.y + npc->collisionHeight) + 10.0 && - basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0) != 0) + if (gPlayerStatusPtr->position.y < (npc->pos.y + npc->collisionHeight) + 10.0 && + basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0) != 0) { s32 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, 0x200000); - + ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + if (enemy->npcSettings->actionFlags & AI_ACTION_JUMP_WHEN_SEE_PLAYER) { script->AI_TEMP_STATE = AI_STATE_ALERT_INIT; } else { @@ -153,9 +153,9 @@ void N(FlyingAI_Wander)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVo } else { enemy->varTable[9]--; } - - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.centerPos.x, + + if (is_point_within_region(enemy->territory->wander.wanderShape, + enemy->territory->wander.centerPos.x, enemy->territory->wander.centerPos.z, npc->pos.x, npc->pos.z, enemy->territory->wander.wanderSize.x, enemy->territory->wander.wanderSize.z)) { @@ -236,7 +236,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, 0x200000); + ai_enemy_play_sound(npc, SOUND_2F4, 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 6ca18fbd10..676e2a1965 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, 0x200000); + ai_enemy_play_sound(npc, SOUND_2F4, 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 f7f967b441..9e664b9773 100644 --- a/src/world/common/enemy/ai/GuardAI.inc.c +++ b/src/world/common/enemy/ai/GuardAI.inc.c @@ -41,7 +41,7 @@ void N(GuardAI_Idle)(Evt* script, GuardAISettings* aiSettings, EnemyDetectVolume Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 emoteTemp; - + 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); @@ -159,7 +159,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, 0x200000); + ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.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 229c36ef27..e6d1f11349 100644 --- a/src/world/common/enemy/ai/HoppingAI.inc.c +++ b/src/world/common/enemy/ai/HoppingAI.inc.c @@ -13,12 +13,12 @@ void N(HoppingAI_HopInit)(Evt* script, MobileAISettings* aiSettings, EnemyDetect npc->jumpVelocity = (rand_int(45) / 10.0) + 8.0; npc->jumpScale = 1.5f; ai_enemy_play_sound(npc, SOUND_B0000017, 0); - - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.centerPos.x, - enemy->territory->wander.centerPos.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSize.x, enemy->territory->wander.wanderSize.z)) + + if (is_point_within_region(enemy->territory->wander.wanderShape, + enemy->territory->wander.centerPos.x, + enemy->territory->wander.centerPos.z, + npc->pos.x, npc->pos.z, + enemy->territory->wander.wanderSize.x, enemy->territory->wander.wanderSize.z)) { npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.centerPos.x, enemy->territory->wander.centerPos.z); x = npc->pos.x; @@ -26,8 +26,8 @@ void N(HoppingAI_HopInit)(Evt* script, MobileAISettings* aiSettings, EnemyDetect z = npc->pos.z; for (i = 0; i < 6; i++) { - if (npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, 25.0f, - npc->yaw, npc->collisionHeight, npc->collisionRadius)) + if (npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, 25.0f, + npc->yaw, npc->collisionHeight, npc->collisionRadius)) { npc->yaw += 30.0; } else { @@ -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) { s32 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, 0x200000); + ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); script->AI_TEMP_STATE = 12; return; @@ -75,7 +75,7 @@ void N(HoppingAI_Hop)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolu if (!npc_test_move_simple_with_slipping(npc->collisionChannel, &posX, &posY, &posZ, - moveSpeed, npc->yaw, collHeight, collRadius * 1.2)) + moveSpeed, npc->yaw, collHeight, collRadius * 1.2)) { npc_move_heading(npc, npc->moveSpeed, npc->yaw); } else { @@ -89,8 +89,8 @@ void N(HoppingAI_Hop)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolu posZ = npc->pos.z; hitDepth = fabsf(npc->jumpVelocity) + 16.0; - if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &hitDepth) && - hitDepth <= fabsf(npc->jumpVelocity) + 13.0) + if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &hitDepth) && + hitDepth <= fabsf(npc->jumpVelocity) + 13.0) { npc->jumpVelocity = 0.0f; npc->pos.y = posY; @@ -107,7 +107,7 @@ void N(HoppingAI_Hop)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolu } return; } - } + } npc->pos.y += npc->jumpVelocity; npc->jumpVelocity -= npc->jumpScale; } @@ -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) { s32 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, 0x200000); + ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); script->AI_TEMP_STATE = 12; } else if (npc->turnAroundYawAdjustment == 0) { diff --git a/src/world/common/enemy/ai/LakituAI.inc.c b/src/world/common/enemy/ai/LakituAI.inc.c index 55f525b1c3..a30b330761 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, 0x200000); + ai_enemy_play_sound(npc, SOUND_2F4, 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, 0x200000); + ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; return; } diff --git a/src/world/common/enemy/ai/SentinelAI.inc.c b/src/world/common/enemy/ai/SentinelAI.inc.c index 22d43d2d9f..526154fcca 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, 2, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(SOUND_80000011, SOUND_SPACE_FULL, npc->pos.x, npc->pos.y, npc->pos.z); npc->duration = 0; script->AI_TEMP_STATE = AI_STATE_SENTINEL_DESCEND; } @@ -116,7 +116,8 @@ void N(SentinelAI_Descend)(Evt* script, MobileAISettings* aiSettings, EnemyDetec f32 posX, posY, posZ, hitDepth; s32 color; - sfx_adjust_env_sound_pos(SOUND_80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); + // @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); if (!basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 1)) { enemy->varTable[0] &= ~SENTINEL_AI_FLAG_CHASING; npc->rotation.y = 0.0f; @@ -254,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, 0x200000); + ai_enemy_play_sound(npc, SOUND_2F4, 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 5005c2713c..86d6708167 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, 0x200000); + ai_enemy_play_sound(npc, SOUND_2F4, 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->position.x, gPlayerStatusPtr->position.z); - ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + ai_enemy_play_sound(npc, SOUND_2F4, 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/complete/MontyMole_GroundAmbush.inc.c b/src/world/common/enemy/complete/MontyMole_GroundAmbush.inc.c index 7b0c143e73..07fe4df944 100644 --- a/src/world/common/enemy/complete/MontyMole_GroundAmbush.inc.c +++ b/src/world/common/enemy/complete/MontyMole_GroundAmbush.inc.c @@ -59,7 +59,7 @@ EvtScript N(EVS_NpcAI_MontyMole_GroundAmbush) = { EVT_CALL(GetNpcPos, NPC_SELF, LVar4, LVar5, LVar6) EVT_ADD(LVar5, 30) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_MOLE_POP, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_MOLE_POP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar4, LVar5, LVar6, 20) EVT_CALL(SetNpcPos, LVar0, NPC_DISPOSE_LOCATION) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 0) diff --git a/src/world/common/enemy/complete/MontyMole_WallAmbush.inc.c b/src/world/common/enemy/complete/MontyMole_WallAmbush.inc.c index 90a2ea5f48..15c3a4cb01 100644 --- a/src/world/common/enemy/complete/MontyMole_WallAmbush.inc.c +++ b/src/world/common/enemy/complete/MontyMole_WallAmbush.inc.c @@ -63,7 +63,7 @@ EvtScript N(EVS_NpcAI_MontyMole_WallAmbush) = { EVT_SUB(LVar2, 30) EVT_ADD(LVar3, 80) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.7)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_MOLE_POP, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_MOLE_POP, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar1, LVar2, LVar3, 20) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 0) diff --git a/src/world/common/enemy/complete/Sentinel.inc.c b/src/world/common/enemy/complete/Sentinel.inc.c index dfa310ccca..9cd81e3cdc 100644 --- a/src/world/common/enemy/complete/Sentinel.inc.c +++ b/src/world/common/enemy/complete/Sentinel.inc.c @@ -49,12 +49,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, 759, 0) + EVT_CALL(func_80045838, -1, SOUND_2F7, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Sentinel_Anim08) EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_Mario_80017) EVT_WAIT(10) - EVT_CALL(func_80045838, -1, 1838, 0) + EVT_CALL(func_80045838, -1, SOUND_32E | 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/wip/PiranhaPlantAI_01.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_01.inc.c index 1c753c8d3a..a03315b242 100644 --- a/src/world/common/enemy/wip/PiranhaPlantAI_01.inc.c +++ b/src/world/common/enemy/wip/PiranhaPlantAI_01.inc.c @@ -8,9 +8,9 @@ void N(PiranhaPlantAI_01)(Evt* script, MobileAISettings* aiSettings, EnemyDetect s32 temp; if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0)) { - ai_enemy_play_sound(npc, 802, 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, 0x200000); + ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_MELEE_PRE]; npc->duration = enemy->varTable[8]; script->functionTemp[0] = 10; diff --git a/src/world/common/todo/StarSpiritEffectFunc.inc.c b/src/world/common/todo/StarSpiritEffectFunc.inc.c index ff102803e4..37d16cd0b4 100644 --- a/src/world/common/todo/StarSpiritEffectFunc.inc.c +++ b/src/world/common/todo/StarSpiritEffectFunc.inc.c @@ -15,7 +15,7 @@ ApiStatus N(StarSpiritEffectFunc1)(Evt* script, s32 isInitialCall) { StarSpiritData* ptr = script->varTablePtr[0]; - sfx_adjust_env_sound_pos(SOUND_A2, 0, ptr->unk_00, ptr->unk_04, ptr->unk_08); + sfx_adjust_env_sound_pos(SOUND_A2, 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 a4a449689b..f5abbaed34 100644 --- a/src/world/common/todo/UnkFunc51.inc.c +++ b/src/world/common/todo/UnkFunc51.inc.c @@ -7,7 +7,7 @@ ApiStatus N(UnkFunc51)(Evt* script, s32 isInitialCall) { 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, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_52, 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 d2eeddb74e..e8dcc605f5 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_1CF, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_1D0, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_1CF, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_1D0, 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 feda36f13e..78b50ca32d 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 @@ -477,7 +477,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Leap) EVT_WAIT(20) EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) - EVT_CALL(PlaySoundAtPlayer, SOUND_139, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) EVT_ADD(LVar1, 50) @@ -490,7 +490,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_WAIT(6) EVT_END_LOOP EVT_WAIT(20) - EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_188, 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) @@ -556,7 +556,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_Klevar, SOUND_2045, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Klevar, SOUND_2045, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) 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 9f7a5d7134..e7ddcaf0c3 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 @@ -360,7 +360,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { }; EvtScript N(EVS_Scene_BeanstalkGrowing) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o261, SOUND_19B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o261, SOUND_19B, 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 41af5d18b6..345edb24a3 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 @@ -169,10 +169,10 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, 0) + 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_QUESTION, -45, 30, TRUE, 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) @@ -186,7 +186,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim00) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_SURFACE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcPos, NPC_MontyMole_02, LVar0, LVar1, LVar2) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(20) @@ -227,7 +227,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Dayzee, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Dayzee, EMOTE_EXCLAMATION, 45, 30, TRUE, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0056) @@ -404,12 +404,12 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 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_10000000, 1) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_DIG, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim11) EVT_WAIT(20) EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleA, FALSE) @@ -432,7 +432,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_SET(AF_FLO_IsUnderground_Mole_01, FALSE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_01, 1) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) @@ -483,12 +483,12 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_02, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 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_10000000, 1) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_DIG, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim11) EVT_WAIT(20) EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleB, FALSE) @@ -511,7 +511,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_SET(AF_FLO_IsUnderground_Mole_02, FALSE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_02, 1) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_SURFACE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) @@ -562,12 +562,12 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_03, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 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_10000000, 1) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_DIG, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim11) EVT_WAIT(20) EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleC, FALSE) @@ -590,7 +590,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_SET(AF_FLO_IsUnderground_Mole_03, FALSE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_03, 1) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_SURFACE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) @@ -641,12 +641,12 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_MontyMole_04, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 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_10000000, 1) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_DIG, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim11) EVT_WAIT(20) EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleD, FALSE) @@ -669,7 +669,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_SET(AF_FLO_IsUnderground_Mole_04, FALSE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_04, 1) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_SURFACE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) 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 e63ee940c9..d37d74d060 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 @@ -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_7BC) - EVT_CALL(func_802D62E4, SOUND_3BC) + EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(func_802D62E4, 956) 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 592c1073a7..f2d50f7d1c 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 @@ -33,17 +33,17 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CALL(N(FlowerGuard_JudgeItemTastiness), LVar0) EVT_CALL(MakeItemEntity, LVar8, -695, 20, -29, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVar7, LVar0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Yellow_Eat) EVT_WAIT(20) EVT_CALL(RemoveItemEntity, LVar7) EVT_SWITCH(LVar8) EVT_CASE_EQ(160) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Yellow_Chew, ANIM_GateFlower_Yellow_Idle, 0, MSG_CH6_0046) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_21C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_21C, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o96, SOUND_METAL_GATE_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o96, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(MakeLerp, 0, 100, 30, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -74,7 +74,7 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CASE_DEFAULT EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Yellow_Chew, ANIM_GateFlower_Yellow_Idle, 0, MSG_CH6_0044) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Yellow_Disgust) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2096, SOUND_SPACE_MODE_0) EVT_CALL(MakeItemEntity, LVar8, 125, 20, 0, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVar7, LVar0) EVT_WAIT(5) diff --git a/src/world/dead/area_flo/flo_10/flo_10_5_npc.c b/src/world/dead/area_flo/flo_10/flo_10_5_npc.c index 5a72f9163e..457b3fd87d 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 @@ -136,7 +136,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, TRUE, 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_13/flo_13_4_npc.c b/src/world/dead/area_flo/flo_13/flo_13_4_npc.c index 0996c44d4e..80a3a6db3a 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 @@ -206,7 +206,7 @@ EvtScript N(EVS_Lakilulu_SpinyToss) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(2.0)) EVT_END_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_HIT_PLAYER_NORMAL, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerAnimation, ANIM_Mario_FallBack) EVT_SET(LVar0, 90) EVT_LOOP(20) 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 c1d9c7f9ed..a8d0612257 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, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_194, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); return ApiStatus_DONE2; } @@ -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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_2F3, 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, 0, 591, 55, 121) + EVT_CALL(PlaySoundAt, SOUND_193, 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 e2c33c258b..1dcc1b242b 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 @@ -5,13 +5,13 @@ s32 N(ShakeCamParams)[] = { 10, EVT_FLOAT(0.6), 13, EVT_FLOAT(0.75), 16, EVT_FLOAT(0.9), - 19, EVT_FLOAT(1.05), + 19, EVT_FLOAT(1.05), 22, EVT_FLOAT(1.2), 25, EVT_FLOAT(1.05), 24, EVT_FLOAT(0.9), - 25, EVT_FLOAT(0.75), + 25, EVT_FLOAT(0.75), 24, EVT_FLOAT(0.6), - 10, EVT_FLOAT(1.7), + 10, EVT_FLOAT(1.7), }; EvtScript N(EVS_MonitorFallingStairs) = { @@ -44,7 +44,7 @@ EvtScript N(EVS_MonitorFallingStairs) = { EVT_END_THREAD EVT_THREAD EVT_LOOP(6) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_187, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_187, 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 852d0ffa0d..b2e5ca66aa 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_80000025, 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 6ec3f5403d..2ffeefc32c 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o130, SOUND_1E6, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_1E7, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o174, SOUND_1E7, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o127, SOUND_1E7, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o131, SOUND_1E6, 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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_1E6, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar4, EVT_FLOAT(-0.5)) @@ -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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_190, 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_190, 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, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_190, 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, 0, 70, 40, 10) + EVT_CALL(PlaySoundAt, SOUND_1A0, 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, 0, 0, 30, 30) + EVT_CALL(PlaySoundAt, SOUND_1A0, 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_491, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o126, SOUND_91 | 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 09d54bd365..695dbf8004 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 @@ -88,7 +88,7 @@ EvtScript N(EVS_Scene_LakilesterLikesBeingGood) = { EvtScript N(EVS_GangRetreat) = { EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_FlyingMagikoopa, SOUND_19E, 0) + EVT_CALL(PlaySoundAtNpc, NPC_FlyingMagikoopa, SOUND_19E, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcFlagBits, NPC_FlyingMagikoopa, NPC_FLAG_100, TRUE) EVT_CALL(InterpNpcYaw, NPC_FlyingMagikoopa, 270, 0) EVT_CALL(LoadPath, 60, EVT_PTR(N(RetreatPath_Magikoopa)), ARRAY_COUNT(N(RetreatPath_Magikoopa)), EASING_LINEAR) @@ -103,7 +103,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_END_THREAD EVT_WAIT(15) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_01, SOUND_19F, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_01, SOUND_19F, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcFlagBits, NPC_Lakitu_01, NPC_FLAG_100, 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) @@ -129,7 +129,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_03, SOUND_19F, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_03, SOUND_19F, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcFlagBits, NPC_Lakitu_03, NPC_FLAG_100, 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_kzn/kzn_11/kzn_11_3_npc.c b/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c index 3f2b0c3a58..bc2a36d29c 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 @@ -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, 0, LVar1, LVar2, LVar3) + EVT_CALL(PlaySoundAt, SOUND_B000000A, 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_3_npc.c b/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c index dd7f42c8cc..4c7bf75861 100644 --- a/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c +++ b/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c @@ -46,7 +46,7 @@ EvtScript N(EVS_Kolorado_TrompImpact) = { EVT_CALL(SetNpcRotation, NPC_Kolorado, 0, 0, 250) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_HurtStill) EVT_CALL(func_802CFD30, 0, FOLD_TYPE_4, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Kolorado, SOUND_HIT_PLAYER_NORMAL, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado, SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(SetNpcCollisionSize, NPC_Kolorado, 20, 24) EVT_CALL(LoadPath, 30, EVT_PTR(N(KoloradoThrownPath)), ARRAY_COUNT(N(KoloradoThrownPath)), EASING_LINEAR) 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 d15239dfd7..3527f261b4 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 @@ -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, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_gogo, SOUND_1E4, 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) 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 43ac5e52b5..0b0a426e36 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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10) EVT_CALL(SetNpcYaw, NPC_SELF, 90) EVT_SET(MV_KoloradoJumpDone, TRUE) @@ -115,13 +115,13 @@ EvtScript N(EVS_NpcIdle_Piranha) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_CALL(SetNpcPos, NPC_SELF, 285, 25, 35) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim17) EVT_WAIT(30) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim01) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_LargePiranha_Putrid_Anim04, ANIM_LargePiranha_Putrid_Anim01, 0, MSG_CH5_00FF) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_DIG, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim18) EVT_WAIT(25) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) 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 f0ae396e33..2c492f0145 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 @@ -39,7 +39,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_CALL(PlaySound, SOUND_80000067) EVT_CALL(N(StarSpiritEffectFunc1)) EVT_CALL(StopSound, SOUND_80000067) - EVT_CALL(PlaySoundAt, SOUND_B2, 0, 185, 110, -30) + EVT_CALL(PlaySoundAt, SOUND_B2, SOUND_SPACE_MODE_0, 185, 110, -30) EVT_END_THREAD EVT_THREAD EVT_WAIT(45) @@ -48,7 +48,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_THREAD EVT_WAIT(180) EVT_WAIT(115) - EVT_CALL(PlaySoundAt, SOUND_137, 0, 185, 110, -30) + EVT_CALL(PlaySoundAt, SOUND_137, SOUND_SPACE_MODE_0, 185, 110, -30) EVT_END_THREAD EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD @@ -76,7 +76,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_IF // wait for pickup EVT_CALL(N(StarSpiritEffectFunc4), 3) - EVT_CALL(PlaySoundAtPlayer, SOUND_138, 0) + EVT_CALL(PlaySoundAtPlayer, SOUND_138, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_4, TRANSITION_14) 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 537ee30779..93eae65557 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 @@ -667,7 +667,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, 0, 330, 25, -50) + EVT_CALL(PlaySoundAt, SOUND_3C5, SOUND_SPACE_MODE_0, 330, 25, -50) EVT_EXEC(N(EVS_PlayVinesAnim_Emerge)) EVT_WAIT(59) EVT_THREAD @@ -922,7 +922,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, 0, 330, 25, -50) + EVT_CALL(PlaySoundAt, SOUND_3C6, 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_3_npc.c b/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c index a621c91ae6..ea29d5308d 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 @@ -163,7 +163,7 @@ EvtScript N(EVS_KoloradoBurned_PlayerReaction) = { }; API_CALLABLE(N(func_80240A68_C96998)) { - snd_ambient_80055618(0, 1); + snd_ambient_mute(0, TRUE); return ApiStatus_DONE2; } @@ -186,9 +186,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -25, 125, -20, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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) @@ -213,7 +213,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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)) @@ -226,7 +226,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) @@ -253,11 +253,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -30, 100, 40, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -15, 75, 80, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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)) @@ -280,7 +280,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_E8, 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) @@ -298,9 +298,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -25, 125, -20, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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)) @@ -446,7 +446,7 @@ EvtScript N(EVS_NpcIdle_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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, TRUE, 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_4_npc.c b/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c index 6ad7d46432..7ab826ffa9 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 @@ -9,7 +9,7 @@ API_CALLABLE(N(GetFloorCollider2)) { } API_CALLABLE(N(func_8024036C_C9A56C)) { - snd_ambient_80055618(0, 1); + snd_ambient_mute(0, TRUE); return ApiStatus_DONE2; } @@ -49,7 +49,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, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 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 0f287fc2a0..385681b2e2 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 @@ -144,10 +144,10 @@ EvtScript N(EVS_PlayPyroclastSounds) = { EVT_BUF_READ1(LVar1) EVT_END_LOOP EVT_IF_EQ(AF_KZN23_UseAlternateSound, FALSE) - EVT_CALL(PlaySoundAt, SOUND_1AD, 0, LVar1, 2800, 0) + EVT_CALL(PlaySoundAt, SOUND_1AD, SOUND_SPACE_MODE_0, LVar1, 2800, 0) EVT_SET(AF_KZN23_UseAlternateSound, TRUE) EVT_ELSE - EVT_CALL(PlaySoundAt, SOUND_1AE, 0, LVar1, 2800, 0) + EVT_CALL(PlaySoundAt, SOUND_1AE, 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 bf9b19aa95..ebede7a870 100644 --- a/src/world/partner/bombette.c +++ b/src/world/partner/bombette.c @@ -297,7 +297,7 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { evt->functionTemp[1]--; break; } - sfx_play_sound_at_npc(SOUND_80000000, 0, -4); + sfx_play_sound_at_npc(SOUND_80000000, SOUND_SPACE_MODE_0, NPC_PARTNER); D_802BE924 = 1; add_vec2D_polar(&npc->pos.x, &npc->pos.z, 0.0f, npc->yaw); npc->currentAnim = ANIM_WorldBombette_WalkLit; @@ -340,9 +340,9 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { } else { if (!(evt->functionTemp[1] & 3)) { if (gGameStatusPtr->frameCounter & 1) { - sfx_play_sound_at_npc(SOUND_STEP_NORMAL1, 0, -4); + sfx_play_sound_at_npc(SOUND_STEP_NORMAL1, SOUND_SPACE_MODE_0, NPC_PARTNER); } else { - sfx_play_sound_at_npc(SOUND_STEP_NORMAL2, 0, -4); + sfx_play_sound_at_npc(SOUND_STEP_NORMAL2, SOUND_SPACE_MODE_0, NPC_PARTNER); } } if (evt->functionTemp[1] == 40) { @@ -386,13 +386,13 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { fx_explosion(gPlayerData.partners[gPlayerData.currentPartner].level, npc->pos.x, npc->pos.y + (npc->collisionHeight * 0.5f), npc->pos.z); switch (gPlayerData.partners[gPlayerData.currentPartner].level) { case 0: - sfx_play_sound_at_npc(SOUND_CANNON1, 0, -4); + sfx_play_sound_at_npc(SOUND_CANNON1, SOUND_SPACE_MODE_0, NPC_PARTNER); break; case 1: - sfx_play_sound_at_npc(SOUND_CANNON2, 0, -4); + sfx_play_sound_at_npc(SOUND_CANNON2, SOUND_SPACE_MODE_0, NPC_PARTNER); break; case 2: - sfx_play_sound_at_npc(SOUND_CANNON3, 0, -4); + sfx_play_sound_at_npc(SOUND_CANNON3, SOUND_SPACE_MODE_0, NPC_PARTNER); break; } exec_ShakeCam1(0, 0, 20); diff --git a/src/world/partner/bow.c b/src/world/partner/bow.c index de50ddc556..ccbc57c319 100644 --- a/src/world/partner/bow.c +++ b/src/world/partner/bow.c @@ -269,7 +269,7 @@ ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) { bow->yaw = playerStatus->targetYaw; func_8003D624(bow, 7, playerStatus->alpha1, 0, 0, 0, 0); suggest_player_anim_setUnkFlag(ANIM_Mario_Crouch); - sfx_play_sound_at_npc(SOUND_BOW_VANISH, 0, -4); + sfx_play_sound_at_npc(SOUND_BOW_VANISH, SOUND_SPACE_MODE_0, NPC_PARTNER); script->functionTemp[0] = 1; } break; @@ -330,7 +330,7 @@ ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) { break; } - sfx_play_sound_at_npc(SOUND_BOW_APPEAR, 0, -4); + sfx_play_sound_at_npc(SOUND_BOW_APPEAR, SOUND_SPACE_MODE_0, NPC_PARTNER); func_802BDDF0_324740(bow); return ApiStatus_DONE1; } @@ -380,7 +380,7 @@ ApiStatus func_802BDF08_324858(Evt* script, s32 isInitialCall) { if (isInitialCall) { partner_init_put_away(bow); if (D_802BE0C0) { - sfx_play_sound_at_npc(SOUND_BOW_APPEAR, 0, -4); + sfx_play_sound_at_npc(SOUND_BOW_APPEAR, SOUND_SPACE_MODE_0, NPC_PARTNER); } func_802BDDF0_324740(bow); } diff --git a/src/world/partner/kooper.c b/src/world/partner/kooper.c index 507dff1d69..7138f1d502 100644 --- a/src/world/partner/kooper.c +++ b/src/world/partner/kooper.c @@ -299,7 +299,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { suggest_player_anim_clearUnkFlag(ANIM_Mario_AnimMidairStill); D_802BEC60 = 0; - sfx_play_sound_at_npc(SOUND_JUMP_2081, 0, -4); + sfx_play_sound_at_npc(SOUND_JUMP_2081, SOUND_SPACE_MODE_0, NPC_PARTNER); script->functionTemp[0] = 2; } } @@ -353,8 +353,8 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 3; D_802BEC60 = 0; gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; - sfx_play_sound_at_npc(SOUND_283, 0, -4); - sfx_play_sound_at_npc(SOUND_284, 0, -4); + 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); } } break; @@ -370,13 +370,13 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { kooper->yaw - 20.0f, kooper->collisionHeight, (kooper->collisionRadius / 2)) != 0) { if (func_802BD100_31B120(kooper) == 0) { - sfx_play_sound_at_npc(SOUND_IMMUNE, 0, -4); + sfx_play_sound_at_npc(SOUND_IMMUNE, SOUND_SPACE_MODE_0, NPC_PARTNER); } temp_f20_3 = sin_deg(kooper->yaw); fx_damage_stars(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z, temp_f20_3, -1.0f, -cos_deg(kooper->yaw), 1); - sfx_play_sound_at_npc(0, 0, -4); + sfx_play_sound_at_npc(SOUND_0, SOUND_SPACE_MODE_0, NPC_PARTNER); script->functionTemp[0] = 7; break; } @@ -413,11 +413,11 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { if (!(kooper->flags & NPC_FLAG_SIMPLIFIED_PHYSICS)) { if (func_802BD17C_31B19C(kooper) != 0) { - sfx_play_sound_at_npc(SOUND_286, 0, -4); + sfx_play_sound_at_npc(SOUND_286, SOUND_SPACE_MODE_0, NPC_PARTNER); temp_f20_3 = sin_deg(kooper->yaw); fx_damage_stars(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z, temp_f20_3, -1.0f, -cos_deg(kooper->yaw), 1); - sfx_play_sound_at_npc(0, 0, -4); + sfx_play_sound_at_npc(SOUND_0, SOUND_SPACE_MODE_0, NPC_PARTNER); script->functionTemp[0] = 4; D_802BEC50 = 8; kooper->moveSpeed -= 4.0; @@ -427,7 +427,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { } } else if (D_802BEB40_31CB60 == 2) { - sfx_play_sound_at_npc(0, 0, -4); + sfx_play_sound_at_npc(SOUND_0, SOUND_SPACE_MODE_0, NPC_PARTNER); script->functionTemp[0] = 5; D_802BEC50 = 30; kooper->moveSpeed = 0.0f; @@ -436,7 +436,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { label2: script->functionTemp[0] = 7; kooper->moveSpeed = 0.0f; - sfx_play_sound_at_npc(0, 0, -4); + sfx_play_sound_at_npc(SOUND_0, SOUND_SPACE_MODE_0, NPC_PARTNER); } else if (kooper->planarFlyDist > 105.0f) { @@ -454,13 +454,13 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { } } else { if (func_802BD100_31B120(kooper) == 0) { - sfx_play_sound_at_npc(SOUND_IMMUNE, 0, -4); + sfx_play_sound_at_npc(SOUND_IMMUNE, SOUND_SPACE_MODE_0, NPC_PARTNER); } temp_f20_3 = sin_deg(kooper->yaw); fx_damage_stars(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z, temp_f20_3, -1.0f, -cos_deg(kooper->yaw), 1); - sfx_play_sound_at_npc(0, 0, -4); + sfx_play_sound_at_npc(SOUND_0, SOUND_SPACE_MODE_0, NPC_PARTNER); script->functionTemp[0] = 7; } } else { @@ -533,7 +533,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { kooper->pos.x = sp20; kooper->pos.y = sp24; kooper->pos.z = sp28; - sfx_play_sound_at_npc(SOUND_IMMUNE, 0, -4); + sfx_play_sound_at_npc(SOUND_IMMUNE, SOUND_SPACE_MODE_0, NPC_PARTNER); temp_f20_3 = sin_deg(kooper->yaw + 180.0f); fx_damage_stars(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z, temp_f20_3, -1.0f, -cos_deg(kooper->yaw + 180.0f), 1); diff --git a/src/world/partner/lakilester.c b/src/world/partner/lakilester.c index ba84eb2c03..959ed51f11 100644 --- a/src/world/partner/lakilester.c +++ b/src/world/partner/lakilester.c @@ -708,7 +708,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { D_802BFF14 = 101; break; case 101: - sfx_play_sound_at_npc(SOUND_JUMP_2081, 0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_JUMP_2081, SOUND_SPACE_MODE_0, NPC_PARTNER); suggest_player_anim_clearUnkFlag(ANIM_Mario_AnimMidairStill); /* fallthrough */ case 102: @@ -796,7 +796,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { D_802BFF14 = 3; } else { if (!(playerStatus->animFlags & PA_FLAG_PARTNER_USAGE_STOPPED)) { - sfx_play_sound_at_npc(SOUND_MENU_ERROR, 0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_MENU_ERROR, SOUND_SPACE_MODE_0, NPC_PARTNER); } playerStatus->animFlags &= ~PA_FLAG_PARTNER_USAGE_STOPPED; } @@ -1152,7 +1152,7 @@ s32 func_802BFBA0_3236F0(Evt* script, s32 isInitialCall) { } } - sfx_play_sound_at_npc(SOUND_295, 0, -4); + sfx_play_sound_at_npc(SOUND_295, SOUND_SPACE_MODE_0, NPC_PARTNER); playerStatus->anim = ANIM_Mario_8000E; playerStatus->animNotifyValue = 0; playerStatus->flags |= PS_FLAG_FACE_FORWARDS; diff --git a/src/world/partner/parakarry.c b/src/world/partner/parakarry.c index 58a6c05180..9eeff3a610 100644 --- a/src/world/partner/parakarry.c +++ b/src/world/partner/parakarry.c @@ -282,7 +282,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { parakarry->currentAnim = ANIM_WorldParakarry_CarryHeavy; parakarry->planarFlyDist = 0; suggest_player_anim_setUnkFlag(ANIM_Mario_8000D); - sfx_play_sound_at_npc(SOUND_2009, 0, -4); + sfx_play_sound_at_npc(SOUND_2009, SOUND_SPACE_MODE_0, NPC_PARTNER); gCollisionStatus.lastTouchedFloor = -1; gCollisionStatus.currentFloor = -1; parakarry->currentFloor = -1; @@ -301,7 +301,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { tempFrameCounterU32 = tempFrameCounter; tempFrameCounterU32 /= 6; if (!((tempFrameCounter - tempFrameCounterU32 * 6) & 0xFFFF)) { - sfx_play_sound_at_npc(SOUND_2009, 0, -4); + sfx_play_sound_at_npc(SOUND_2009, SOUND_SPACE_MODE_0, NPC_PARTNER); } sp2C = fabsf(sin_rad(DEG_TO_RAD((20 - D_802BEBC4) * 18))) * 1.3; playerStatus->position.y += sp2C; @@ -429,7 +429,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { tempFrameCounterTwo = tempFrameCounterTwoU32; tempFrameCounterTwoU32 /= 6; if (!((tempFrameCounterTwo - tempFrameCounterTwoU32 * 6) & 0xFFFF)) { - sfx_play_sound_at_npc(SOUND_2009, 0, -4); + sfx_play_sound_at_npc(SOUND_2009, SOUND_SPACE_MODE_0, NPC_PARTNER); } parakarry->jumpVelocity -= parakarry->jumpScale; diff --git a/src/world/partner/sushie.c b/src/world/partner/sushie.c index 2e4719785b..a83876237d 100644 --- a/src/world/partner/sushie.c +++ b/src/world/partner/sushie.c @@ -91,8 +91,6 @@ void func_802BD368_31E0D8(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 } } -// void func_802BD414_31E184(Npc*); -// INCLUDE_ASM(s32, "world/partner/sushie", func_802BD414_31E184); void func_802BD414_31E184(Npc* npc) { PlayerStatus* playerStatus = &gPlayerStatus; PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; @@ -270,7 +268,7 @@ void func_802BD414_31E184(Npc* npc) { } if (bss_802BFEE8 >= 10 && (!(partnerActionStatus->currentButtons & BUTTON_C_DOWN) || bss_802BFEE8 >= 30)) { npc->currentAnim = ANIM_WorldSushie_Rise; - sfx_play_sound_at_npc(SOUND_694, 0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_294 | SOUND_ID_TRIGGER_CHANGE_SOUND, SOUND_SPACE_MODE_0, NPC_PARTNER); bss_802BFEE4 = 3; } } @@ -439,7 +437,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { npc->duration--; if (npc->duration != 0) { if (npc->duration == 2) { - sfx_play_sound_at_npc(SOUND_JUMP_2081, 0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_JUMP_2081, SOUND_SPACE_MODE_0, NPC_PARTNER); suggest_player_anim_clearUnkFlag(ANIM_Mario_BeforeJump); } break; @@ -485,7 +483,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { disable_player_shadow(); playerStatus->flags &= ~PS_FLAG_MOVEMENT_LOCKED; suggest_player_anim_setUnkFlag(ANIM_Mario_8000F); - sfx_play_sound_at_npc(SOUND_2013, 0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_2013, SOUND_SPACE_MODE_0, NPC_PARTNER); playerStatus->position.x = npc->pos.x; playerStatus->position.y = npc->pos.y; playerStatus->position.z = npc->pos.z; @@ -515,9 +513,9 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { func_802BD20C_31DF7C(&angle, &sp34); if (bss_802BFEE4 == 0) { if (sp34 != 0.0f) { - sfx_play_sound_at_npc(SOUND_2015, 0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_2015, SOUND_SPACE_MODE_0, NPC_PARTNER); } else { - sfx_play_sound_at_npc(SOUND_2014, 0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_2014, SOUND_SPACE_MODE_0, NPC_PARTNER); } } } @@ -563,14 +561,14 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { if (npc->currentWall < 0 || npc->currentWall & COLLISION_WITH_ENTITY_BIT) { if (bss_802BFEE4 == 2 && bss_802BFEE8 == 1) { - sfx_play_sound_at_npc(SOUND_294, 0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_294, SOUND_SPACE_MODE_0, NPC_PARTNER); } break; } collider = get_collider_flags(npc->currentWall) & COLLIDER_FLAGS_SURFACE_TYPE_MASK; if (collider != SURFACE_TYPE_DOCK_WALL) { if (bss_802BFEE4 == 2 && bss_802BFEE8 == 1) { - sfx_play_sound_at_npc(SOUND_294, 0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_294, SOUND_SPACE_MODE_0, NPC_PARTNER); } break; } @@ -602,7 +600,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { npc->duration = (2.0f * npc->jumpVelocity) / 0.6f; npc->moveSpeed = dist / npc->duration; npc->jumpVelocity += (npc->moveToPos.y - playerStatus->position.y) / npc->duration; - sfx_play_sound_at_npc(SOUND_JUMP_2081, 0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_JUMP_2081, SOUND_SPACE_MODE_0, NPC_PARTNER); suggest_player_anim_clearUnkFlag(ANIM_Mario_BeforeJump); enable_player_shadow(); playerStatus->flags |= PS_FLAG_MOVEMENT_LOCKED; diff --git a/src/world/script_api/enter_exit.c b/src/world/script_api/enter_exit.c index 387611bd3c..cf1c3feb78 100644 --- a/src/world/script_api/enter_exit.c +++ b/src/world/script_api/enter_exit.c @@ -4,8 +4,6 @@ extern s32 DoorModelsSwingCCW[3]; extern s32 DoorModelsSwingCW[3]; -extern API_CALLABLE(func_802D2148); - API_CALLABLE(CheckRideScriptForEnterExit) { PlayerStatus* playerStatus = &gPlayerStatus; diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index ee5a39de31..de574e717c 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -236,7 +236,7 @@ dead_PlayAmbientSounds = 0x802E376C; dead_SetTexPanner = 0x802D6480; dead_func_802D7B10 = 0x802E5160; dead_Entity_Chest = 0x802F92E0; -dead_snd_ambient_80055618 = 0x80059AC8; +dead_snd_ambient_mute = 0x80059AC8; dead_GetPlayerAnimation = 0x802DF4B4; dead_SetPlayerSpeed = 0x802DE644; dead_SetItemPos = 0x802E4720; diff --git a/ver/us/asm/bss.s b/ver/us/asm/bss.s index ad08f9065c..2eb957f82a 100644 --- a/ver/us/asm/bss.s +++ b/ver/us/asm/bss.s @@ -484,11 +484,8 @@ dlabel AlCmdListBuffers dlabel D_800A351C .space 4 -dlabel D_800A3520 -.space 4 - -dlabel D_800A3524 -.space 0x00000104 +dlabel nuAuTasks +.space 0x00000108 dlabel D_800A3628 .space 0x0000000c @@ -1001,13 +998,7 @@ dlabel D_800DA040 .space 0x00000400 dlabel nusched -.space 0x678 - -dlabel AlNumFields -.space 4 - -dlabel D_800DAABC -.space 4 +.space 0x00000680 dlabel __osEepromTimerQ .space 0x00000018 diff --git a/ver/us/asm/bss3.s b/ver/us/asm/bss3.s index d7ae9af98c..ec84ab89d2 100644 --- a/ver/us/asm/bss3.s +++ b/ver/us/asm/bss3.s @@ -658,16 +658,16 @@ dlabel D_801597D0 dlabel D_80159880 .space 0x00000020 -dlabel D_801598A0 +dlabel wEnvSounds .space 0x00000118 -dlabel D_801599B8 +dlabel bEnvSounds .space 0x00000118 -dlabel D_80159AD0 +dlabel gCurrentEnvSounds .space 4 -dlabel D_80159AD4 +dlabel SfxReverbMode .space 4 dlabel D_80159AD8 diff --git a/ver/us/asm/nonmatchings/audio/2BF90/func_80051434.s b/ver/us/asm/nonmatchings/audio/2BF90/func_80051434.s deleted file mode 100644 index 3f97c765e1..0000000000 --- a/ver/us/asm/nonmatchings/audio/2BF90/func_80051434.s +++ /dev/null @@ -1,941 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80051434 -/* 2C834 80051434 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 2C838 80051438 AFB5005C */ sw $s5, 0x5c($sp) -/* 2C83C 8005143C 00A0A82D */ daddu $s5, $a1, $zero -/* 2C840 80051440 AFB00048 */ sw $s0, 0x48($sp) -/* 2C844 80051444 0000802D */ daddu $s0, $zero, $zero -/* 2C848 80051448 27A50010 */ addiu $a1, $sp, 0x10 -/* 2C84C 8005144C AFBF006C */ sw $ra, 0x6c($sp) -/* 2C850 80051450 AFBE0068 */ sw $fp, 0x68($sp) -/* 2C854 80051454 AFB70064 */ sw $s7, 0x64($sp) -/* 2C858 80051458 AFB60060 */ sw $s6, 0x60($sp) -/* 2C85C 8005145C AFB40058 */ sw $s4, 0x58($sp) -/* 2C860 80051460 AFB30054 */ sw $s3, 0x54($sp) -/* 2C864 80051464 AFB20050 */ sw $s2, 0x50($sp) -/* 2C868 80051468 AFB1004C */ sw $s1, 0x4c($sp) -/* 2C86C 8005146C AFA40070 */ sw $a0, 0x70($sp) -/* 2C870 80051470 8C880000 */ lw $t0, ($a0) -/* 2C874 80051474 27A40020 */ addiu $a0, $sp, 0x20 -/* 2C878 80051478 A3A00034 */ sb $zero, 0x34($sp) -/* 2C87C 8005147C AFA80030 */ sw $t0, 0x30($sp) -.L80051480: -/* 2C880 80051480 00B01021 */ addu $v0, $a1, $s0 -/* 2C884 80051484 00901821 */ addu $v1, $a0, $s0 -/* 2C888 80051488 26100001 */ addiu $s0, $s0, 1 -/* 2C88C 8005148C A0400000 */ sb $zero, ($v0) -/* 2C890 80051490 2E020010 */ sltiu $v0, $s0, 0x10 -/* 2C894 80051494 1440FFFA */ bnez $v0, .L80051480 -/* 2C898 80051498 A0600000 */ sb $zero, ($v1) -/* 2C89C 8005149C 92A20043 */ lbu $v0, 0x43($s5) -/* 2C8A0 800514A0 24100001 */ addiu $s0, $zero, 1 -/* 2C8A4 800514A4 14500005 */ bne $v0, $s0, .L800514BC -/* 2C8A8 800514A8 00000000 */ nop -/* 2C8AC 800514AC 8FA40070 */ lw $a0, 0x70($sp) -/* 2C8B0 800514B0 0C01487A */ jal au_mseq_player_stop -/* 2C8B4 800514B4 02A0282D */ daddu $a1, $s5, $zero -/* 2C8B8 800514B8 A2A00043 */ sb $zero, 0x43($s5) -.L800514BC: -/* 2C8BC 800514BC 96A20040 */ lhu $v0, 0x40($s5) -/* 2C8C0 800514C0 10400024 */ beqz $v0, .L80051554 -/* 2C8C4 800514C4 0000B02D */ daddu $s6, $zero, $zero -/* 2C8C8 800514C8 8EA20038 */ lw $v0, 0x38($s5) -/* 2C8CC 800514CC 8EA4003C */ lw $a0, 0x3c($s5) -/* 2C8D0 800514D0 96A30040 */ lhu $v1, 0x40($s5) -/* 2C8D4 800514D4 00441021 */ addu $v0, $v0, $a0 -/* 2C8D8 800514D8 2463FFFF */ addiu $v1, $v1, -1 -/* 2C8DC 800514DC A6A30040 */ sh $v1, 0x40($s5) -/* 2C8E0 800514E0 3063FFFF */ andi $v1, $v1, 0xffff -/* 2C8E4 800514E4 14600018 */ bnez $v1, .L80051548 -/* 2C8E8 800514E8 AEA20038 */ sw $v0, 0x38($s5) -/* 2C8EC 800514EC 92A20042 */ lbu $v0, 0x42($s5) -/* 2C8F0 800514F0 92A30026 */ lbu $v1, 0x26($s5) -/* 2C8F4 800514F4 00021600 */ sll $v0, $v0, 0x18 -/* 2C8F8 800514F8 10600013 */ beqz $v1, .L80051548 -/* 2C8FC 800514FC AEA20038 */ sw $v0, 0x38($s5) -/* 2C900 80051500 1470000D */ bne $v1, $s0, .L80051538 -/* 2C904 80051504 24020002 */ addiu $v0, $zero, 2 -/* 2C908 80051508 3C028008 */ lui $v0, %hi(BlankMseqData) -/* 2C90C 8005150C 24428520 */ addiu $v0, $v0, %lo(BlankMseqData) -/* 2C910 80051510 AEA20008 */ sw $v0, 8($s5) -/* 2C914 80051514 08014552 */ j .L80051548 -/* 2C918 80051518 AEA30018 */ sw $v1, 0x18($s5) -.L8005151C: -/* 2C91C 8005151C 8FA40070 */ lw $a0, 0x70($sp) -/* 2C920 80051520 02A0282D */ daddu $a1, $s5, $zero -/* 2C924 80051524 AEA00008 */ sw $zero, 8($s5) -/* 2C928 80051528 0C01487A */ jal au_mseq_player_stop -/* 2C92C 8005152C AEA00020 */ sw $zero, 0x20($s5) -/* 2C930 80051530 0801482F */ j .L800520BC -/* 2C934 80051534 00000000 */ nop -.L80051538: -/* 2C938 80051538 14620004 */ bne $v1, $v0, .L8005154C -/* 2C93C 8005153C 24080001 */ addiu $t0, $zero, 1 -/* 2C940 80051540 24020003 */ addiu $v0, $zero, 3 -/* 2C944 80051544 A2A20024 */ sb $v0, 0x24($s5) -.L80051548: -/* 2C948 80051548 24080001 */ addiu $t0, $zero, 1 -.L8005154C: -/* 2C94C 8005154C A3A80034 */ sb $t0, 0x34($sp) -/* 2C950 80051550 0000B02D */ daddu $s6, $zero, $zero -.L80051554: -/* 2C954 80051554 27A80020 */ addiu $t0, $sp, 0x20 -/* 2C958 80051558 AFA80038 */ sw $t0, 0x38($sp) -/* 2C95C 8005155C 241E0044 */ addiu $fp, $zero, 0x44 -.L80051560: -/* 2C960 80051560 02BE9821 */ addu $s3, $s5, $fp -/* 2C964 80051564 86620014 */ lh $v0, 0x14($s3) -/* 2C968 80051568 96630014 */ lhu $v1, 0x14($s3) -/* 2C96C 8005156C 10400042 */ beqz $v0, .L80051678 -/* 2C970 80051570 2462FFFF */ addiu $v0, $v1, -1 -/* 2C974 80051574 A6620014 */ sh $v0, 0x14($s3) -/* 2C978 80051578 00021400 */ sll $v0, $v0, 0x10 -/* 2C97C 8005157C 10400005 */ beqz $v0, .L80051594 -/* 2C980 80051580 00000000 */ nop -/* 2C984 80051584 8E62000C */ lw $v0, 0xc($s3) -/* 2C988 80051588 8E630010 */ lw $v1, 0x10($s3) -/* 2C98C 8005158C 08014567 */ j .L8005159C -/* 2C990 80051590 00431021 */ addu $v0, $v0, $v1 -.L80051594: -/* 2C994 80051594 86620016 */ lh $v0, 0x16($s3) -/* 2C998 80051598 00021400 */ sll $v0, $v0, 0x10 -.L8005159C: -/* 2C99C 8005159C AE62000C */ sw $v0, 0xc($s3) -/* 2C9A0 800515A0 00162400 */ sll $a0, $s6, 0x10 -/* 2C9A4 800515A4 8EB00030 */ lw $s0, 0x30($s5) -/* 2C9A8 800515A8 8EA30014 */ lw $v1, 0x14($s5) -/* 2C9AC 800515AC 8EA20034 */ lw $v0, 0x34($s5) -/* 2C9B0 800515B0 0202102B */ sltu $v0, $s0, $v0 -/* 2C9B4 800515B4 10400030 */ beqz $v0, .L80051678 -/* 2C9B8 800515B8 0064B821 */ addu $s7, $v1, $a0 -/* 2C9BC 800515BC 001010C0 */ sll $v0, $s0, 3 -/* 2C9C0 800515C0 00501021 */ addu $v0, $v0, $s0 -/* 2C9C4 800515C4 000210C0 */ sll $v0, $v0, 3 -/* 2C9C8 800515C8 24541320 */ addiu $s4, $v0, 0x1320 -.L800515CC: -/* 2C9CC 800515CC 8EA20030 */ lw $v0, 0x30($s5) -/* 2C9D0 800515D0 8FA80070 */ lw $t0, 0x70($sp) -/* 2C9D4 800515D4 02021023 */ subu $v0, $s0, $v0 -/* 2C9D8 800515D8 000210C0 */ sll $v0, $v0, 3 -/* 2C9DC 800515DC 244207B4 */ addiu $v0, $v0, 0x7b4 -/* 2C9E0 800515E0 01029021 */ addu $s2, $t0, $v0 -/* 2C9E4 800515E4 8E420000 */ lw $v0, ($s2) -/* 2C9E8 800515E8 3C08FFFF */ lui $t0, 0xffff -/* 2C9EC 800515EC 00481024 */ and $v0, $v0, $t0 -/* 2C9F0 800515F0 1457001C */ bne $v0, $s7, .L80051664 -/* 2C9F4 800515F4 00000000 */ nop -/* 2C9F8 800515F8 8FA80030 */ lw $t0, 0x30($sp) -/* 2C9FC 800515FC 01148821 */ addu $s1, $t0, $s4 -/* 2CA00 80051600 8FA80070 */ lw $t0, 0x70($sp) -/* 2CA04 80051604 92230045 */ lbu $v1, 0x45($s1) -/* 2CA08 80051608 91020022 */ lbu $v0, 0x22($t0) -/* 2CA0C 8005160C 14620015 */ bne $v1, $v0, .L80051664 -/* 2CA10 80051610 24080009 */ addiu $t0, $zero, 9 -/* 2CA14 80051614 12C80013 */ beq $s6, $t0, .L80051664 -/* 2CA18 80051618 00000000 */ nop -/* 2CA1C 8005161C 86420004 */ lh $v0, 4($s2) -/* 2CA20 80051620 8664000C */ lh $a0, 0xc($s3) -/* 2CA24 80051624 0C014E3E */ jal au_compute_pitch_ratio -/* 2CA28 80051628 00442021 */ addu $a0, $v0, $a0 -/* 2CA2C 8005162C 8E620000 */ lw $v0, ($s3) -/* 2CA30 80051630 C4420020 */ lwc1 $f2, 0x20($v0) -/* 2CA34 80051634 46020002 */ mul.s $f0, $f0, $f2 -/* 2CA38 80051638 00000000 */ nop -/* 2CA3C 8005163C 92220043 */ lbu $v0, 0x43($s1) -/* 2CA40 80051640 34420008 */ ori $v0, $v0, 8 -/* 2CA44 80051644 A2220043 */ sb $v0, 0x43($s1) -/* 2CA48 80051648 E6200004 */ swc1 $f0, 4($s1) -/* 2CA4C 8005164C 8EA20030 */ lw $v0, 0x30($s5) -/* 2CA50 80051650 8FA80038 */ lw $t0, 0x38($sp) -/* 2CA54 80051654 02021023 */ subu $v0, $s0, $v0 -/* 2CA58 80051658 01021021 */ addu $v0, $t0, $v0 -/* 2CA5C 8005165C 24080001 */ addiu $t0, $zero, 1 -/* 2CA60 80051660 A0480000 */ sb $t0, ($v0) -.L80051664: -/* 2CA64 80051664 8EA20034 */ lw $v0, 0x34($s5) -/* 2CA68 80051668 26100001 */ addiu $s0, $s0, 1 -/* 2CA6C 8005166C 0202102B */ sltu $v0, $s0, $v0 -/* 2CA70 80051670 1440FFD6 */ bnez $v0, .L800515CC -/* 2CA74 80051674 26940048 */ addiu $s4, $s4, 0x48 -.L80051678: -/* 2CA78 80051678 26D60001 */ addiu $s6, $s6, 1 -/* 2CA7C 8005167C 2EC2000A */ sltiu $v0, $s6, 0xa -/* 2CA80 80051680 1440FFB7 */ bnez $v0, .L80051560 -/* 2CA84 80051684 27DE0028 */ addiu $fp, $fp, 0x28 -/* 2CA88 80051688 0000B02D */ daddu $s6, $zero, $zero -/* 2CA8C 8005168C 3C06FFFF */ lui $a2, 0xffff -/* 2CA90 80051690 24050044 */ addiu $a1, $zero, 0x44 -.L80051694: -/* 2CA94 80051694 02A59821 */ addu $s3, $s5, $a1 -/* 2CA98 80051698 86620020 */ lh $v0, 0x20($s3) -/* 2CA9C 8005169C 96630020 */ lhu $v1, 0x20($s3) -/* 2CAA0 800516A0 1040003F */ beqz $v0, .L800517A0 -/* 2CAA4 800516A4 2462FFFF */ addiu $v0, $v1, -1 -/* 2CAA8 800516A8 A6620020 */ sh $v0, 0x20($s3) -/* 2CAAC 800516AC 00021400 */ sll $v0, $v0, 0x10 -/* 2CAB0 800516B0 10400005 */ beqz $v0, .L800516C8 -/* 2CAB4 800516B4 00000000 */ nop -/* 2CAB8 800516B8 8E620018 */ lw $v0, 0x18($s3) -/* 2CABC 800516BC 8E63001C */ lw $v1, 0x1c($s3) -/* 2CAC0 800516C0 080145B4 */ j .L800516D0 -/* 2CAC4 800516C4 00431021 */ addu $v0, $v0, $v1 -.L800516C8: -/* 2CAC8 800516C8 86620022 */ lh $v0, 0x22($s3) -/* 2CACC 800516CC 00021400 */ sll $v0, $v0, 0x10 -.L800516D0: -/* 2CAD0 800516D0 AE620018 */ sw $v0, 0x18($s3) -/* 2CAD4 800516D4 00162400 */ sll $a0, $s6, 0x10 -/* 2CAD8 800516D8 8EB00030 */ lw $s0, 0x30($s5) -/* 2CADC 800516DC 8EA30014 */ lw $v1, 0x14($s5) -/* 2CAE0 800516E0 8EA20034 */ lw $v0, 0x34($s5) -/* 2CAE4 800516E4 0202102B */ sltu $v0, $s0, $v0 -/* 2CAE8 800516E8 1040002D */ beqz $v0, .L800517A0 -/* 2CAEC 800516EC 0064B821 */ addu $s7, $v1, $a0 -/* 2CAF0 800516F0 001010C0 */ sll $v0, $s0, 3 -/* 2CAF4 800516F4 00501021 */ addu $v0, $v0, $s0 -/* 2CAF8 800516F8 000210C0 */ sll $v0, $v0, 3 -/* 2CAFC 800516FC 24441320 */ addiu $a0, $v0, 0x1320 -.L80051700: -/* 2CB00 80051700 8EA20030 */ lw $v0, 0x30($s5) -/* 2CB04 80051704 8FA80070 */ lw $t0, 0x70($sp) -/* 2CB08 80051708 02021023 */ subu $v0, $s0, $v0 -/* 2CB0C 8005170C 000210C0 */ sll $v0, $v0, 3 -/* 2CB10 80051710 244207B4 */ addiu $v0, $v0, 0x7b4 -/* 2CB14 80051714 01029021 */ addu $s2, $t0, $v0 -/* 2CB18 80051718 8E420000 */ lw $v0, ($s2) -/* 2CB1C 8005171C 00461024 */ and $v0, $v0, $a2 -/* 2CB20 80051720 1457001A */ bne $v0, $s7, .L8005178C -/* 2CB24 80051724 00000000 */ nop -/* 2CB28 80051728 8FA80030 */ lw $t0, 0x30($sp) -/* 2CB2C 8005172C 01048821 */ addu $s1, $t0, $a0 -/* 2CB30 80051730 8FA80070 */ lw $t0, 0x70($sp) -/* 2CB34 80051734 92230045 */ lbu $v1, 0x45($s1) -/* 2CB38 80051738 91020022 */ lbu $v0, 0x22($t0) -/* 2CB3C 8005173C 14620013 */ bne $v1, $v0, .L8005178C -/* 2CB40 80051740 00000000 */ nop -/* 2CB44 80051744 92430001 */ lbu $v1, 1($s2) -/* 2CB48 80051748 00031080 */ sll $v0, $v1, 2 -/* 2CB4C 8005174C 00431021 */ addu $v0, $v0, $v1 -/* 2CB50 80051750 000210C0 */ sll $v0, $v0, 3 -/* 2CB54 80051754 00559821 */ addu $s3, $v0, $s5 -/* 2CB58 80051758 82A30038 */ lb $v1, 0x38($s5) -/* 2CB5C 8005175C 8662005C */ lh $v0, 0x5c($s3) -/* 2CB60 80051760 00620018 */ mult $v1, $v0 -/* 2CB64 80051764 00004012 */ mflo $t0 -/* 2CB68 80051768 82420006 */ lb $v0, 6($s2) -/* 2CB6C 8005176C 00000000 */ nop -/* 2CB70 80051770 01020018 */ mult $t0, $v0 -/* 2CB74 80051774 9222003D */ lbu $v0, 0x3d($s1) -/* 2CB78 80051778 34420020 */ ori $v0, $v0, 0x20 -/* 2CB7C 8005177C A222003D */ sb $v0, 0x3d($s1) -/* 2CB80 80051780 00004012 */ mflo $t0 -/* 2CB84 80051784 00081383 */ sra $v0, $t0, 0xe -/* 2CB88 80051788 A6220040 */ sh $v0, 0x40($s1) -.L8005178C: -/* 2CB8C 8005178C 8EA20034 */ lw $v0, 0x34($s5) -/* 2CB90 80051790 26100001 */ addiu $s0, $s0, 1 -/* 2CB94 80051794 0202102B */ sltu $v0, $s0, $v0 -/* 2CB98 80051798 1440FFD9 */ bnez $v0, .L80051700 -/* 2CB9C 8005179C 24840048 */ addiu $a0, $a0, 0x48 -.L800517A0: -/* 2CBA0 800517A0 26D60001 */ addiu $s6, $s6, 1 -/* 2CBA4 800517A4 2EC2000A */ sltiu $v0, $s6, 0xa -/* 2CBA8 800517A8 1440FFBA */ bnez $v0, .L80051694 -/* 2CBAC 800517AC 24A50028 */ addiu $a1, $a1, 0x28 -/* 2CBB0 800517B0 8EA20018 */ lw $v0, 0x18($s5) -/* 2CBB4 800517B4 2442FFFF */ addiu $v0, $v0, -1 -/* 2CBB8 800517B8 1C400240 */ bgtz $v0, .L800520BC -/* 2CBBC 800517BC AEA20018 */ sw $v0, 0x18($s5) -/* 2CBC0 800517C0 1440023E */ bnez $v0, .L800520BC -/* 2CBC4 800517C4 00000000 */ nop -/* 2CBC8 800517C8 241E0001 */ addiu $fp, $zero, 1 -/* 2CBCC 800517CC 27A80010 */ addiu $t0, $sp, 0x10 -/* 2CBD0 800517D0 AFA80040 */ sw $t0, 0x40($sp) -/* 2CBD4 800517D4 27A80020 */ addiu $t0, $sp, 0x20 -/* 2CBD8 800517D8 AFA8003C */ sw $t0, 0x3c($sp) -.L800517DC: -/* 2CBDC 800517DC 0C014874 */ jal au_mseq_read_next -/* 2CBE0 800517E0 02A0202D */ daddu $a0, $s5, $zero -/* 2CBE4 800517E4 0040802D */ daddu $s0, $v0, $zero -/* 2CBE8 800517E8 00101600 */ sll $v0, $s0, 0x18 -/* 2CBEC 800517EC 0440000E */ bltz $v0, .L80051828 -/* 2CBF0 800517F0 320300FF */ andi $v1, $s0, 0xff -/* 2CBF4 800517F4 1060FF49 */ beqz $v1, .L8005151C -/* 2CBF8 800517F8 2C620078 */ sltiu $v0, $v1, 0x78 -/* 2CBFC 800517FC 5440022C */ bnel $v0, $zero, .L800520B0 -/* 2CC00 80051800 AEA30018 */ sw $v1, 0x18($s5) -/* 2CC04 80051804 0C014874 */ jal au_mseq_read_next -/* 2CC08 80051808 02A0202D */ daddu $a0, $s5, $zero -/* 2CC0C 8005180C 32030007 */ andi $v1, $s0, 7 -/* 2CC10 80051810 00031A00 */ sll $v1, $v1, 8 -/* 2CC14 80051814 304200FF */ andi $v0, $v0, 0xff -/* 2CC18 80051818 00621821 */ addu $v1, $v1, $v0 -/* 2CC1C 8005181C 24630078 */ addiu $v1, $v1, 0x78 -/* 2CC20 80051820 0801482C */ j .L800520B0 -/* 2CC24 80051824 AEA30018 */ sw $v1, 0x18($s5) -.L80051828: -/* 2CC28 80051828 0C014874 */ jal au_mseq_read_next -/* 2CC2C 8005182C 02A0202D */ daddu $a0, $s5, $zero -/* 2CC30 80051830 3216000F */ andi $s6, $s0, 0xf -/* 2CC34 80051834 00161880 */ sll $v1, $s6, 2 -/* 2CC38 80051838 00761821 */ addu $v1, $v1, $s6 -/* 2CC3C 8005183C 000318C0 */ sll $v1, $v1, 3 -/* 2CC40 80051840 24630044 */ addiu $v1, $v1, 0x44 -/* 2CC44 80051844 02A39821 */ addu $s3, $s5, $v1 -/* 2CC48 80051848 0040B82D */ daddu $s7, $v0, $zero -/* 2CC4C 8005184C 320300F0 */ andi $v1, $s0, 0xf0 -/* 2CC50 80051850 240200B0 */ addiu $v0, $zero, 0xb0 -/* 2CC54 80051854 1062018E */ beq $v1, $v0, .L80051E90 -/* 2CC58 80051858 286200B1 */ slti $v0, $v1, 0xb1 -/* 2CC5C 8005185C 1040000E */ beqz $v0, .L80051898 -/* 2CC60 80051860 24020090 */ addiu $v0, $zero, 0x90 -/* 2CC64 80051864 10620047 */ beq $v1, $v0, .L80051984 -/* 2CC68 80051868 28620091 */ slti $v0, $v1, 0x91 -/* 2CC6C 8005186C 10400005 */ beqz $v0, .L80051884 -/* 2CC70 80051870 24020080 */ addiu $v0, $zero, 0x80 -/* 2CC74 80051874 10620011 */ beq $v1, $v0, .L800518BC -/* 2CC78 80051878 00000000 */ nop -/* 2CC7C 8005187C 0801482C */ j .L800520B0 -/* 2CC80 80051880 00000000 */ nop -.L80051884: -/* 2CC84 80051884 240200A0 */ addiu $v0, $zero, 0xa0 -/* 2CC88 80051888 10620111 */ beq $v1, $v0, .L80051CD0 -/* 2CC8C 8005188C 32E20080 */ andi $v0, $s7, 0x80 -/* 2CC90 80051890 0801482C */ j .L800520B0 -/* 2CC94 80051894 00000000 */ nop -.L80051898: -/* 2CC98 80051898 240200E0 */ addiu $v0, $zero, 0xe0 -/* 2CC9C 8005189C 106201C8 */ beq $v1, $v0, .L80051FC0 -/* 2CCA0 800518A0 286200E1 */ slti $v0, $v1, 0xe1 -/* 2CCA4 800518A4 10400202 */ beqz $v0, .L800520B0 -/* 2CCA8 800518A8 240200C0 */ addiu $v0, $zero, 0xc0 -/* 2CCAC 800518AC 106201B7 */ beq $v1, $v0, .L80051F8C -/* 2CCB0 800518B0 00000000 */ nop -/* 2CCB4 800518B4 0801482C */ j .L800520B0 -/* 2CCB8 800518B8 00000000 */ nop -.L800518BC: -/* 2CCBC 800518BC 92A20025 */ lbu $v0, 0x25($s5) -/* 2CCC0 800518C0 144001FB */ bnez $v0, .L800520B0 -/* 2CCC4 800518C4 00161400 */ sll $v0, $s6, 0x10 -/* 2CCC8 800518C8 8EB00030 */ lw $s0, 0x30($s5) -/* 2CCCC 800518CC 8EA40014 */ lw $a0, 0x14($s5) -/* 2CCD0 800518D0 8EA30034 */ lw $v1, 0x34($s5) -/* 2CCD4 800518D4 00822021 */ addu $a0, $a0, $v0 -/* 2CCD8 800518D8 32E200FF */ andi $v0, $s7, 0xff -/* 2CCDC 800518DC 00021200 */ sll $v0, $v0, 8 -/* 2CCE0 800518E0 0203182B */ sltu $v1, $s0, $v1 -/* 2CCE4 800518E4 106001F2 */ beqz $v1, .L800520B0 -/* 2CCE8 800518E8 0082B821 */ addu $s7, $a0, $v0 -/* 2CCEC 800518EC 001010C0 */ sll $v0, $s0, 3 -/* 2CCF0 800518F0 00501021 */ addu $v0, $v0, $s0 -/* 2CCF4 800518F4 000210C0 */ sll $v0, $v0, 3 -/* 2CCF8 800518F8 24441320 */ addiu $a0, $v0, 0x1320 -.L800518FC: -/* 2CCFC 800518FC 8EA20030 */ lw $v0, 0x30($s5) -/* 2CD00 80051900 8FA80070 */ lw $t0, 0x70($sp) -/* 2CD04 80051904 02021023 */ subu $v0, $s0, $v0 -/* 2CD08 80051908 000210C0 */ sll $v0, $v0, 3 -/* 2CD0C 8005190C 01021821 */ addu $v1, $t0, $v0 -/* 2CD10 80051910 8C6207B4 */ lw $v0, 0x7b4($v1) -/* 2CD14 80051914 1457000C */ bne $v0, $s7, .L80051948 -/* 2CD18 80051918 00000000 */ nop -/* 2CD1C 8005191C 8FA80030 */ lw $t0, 0x30($sp) -/* 2CD20 80051920 A07E07B7 */ sb $fp, 0x7b7($v1) -/* 2CD24 80051924 01048821 */ addu $s1, $t0, $a0 -/* 2CD28 80051928 8FA80070 */ lw $t0, 0x70($sp) -/* 2CD2C 8005192C 92230045 */ lbu $v1, 0x45($s1) -/* 2CD30 80051930 91020022 */ lbu $v0, 0x22($t0) -/* 2CD34 80051934 14620004 */ bne $v1, $v0, .L80051948 -/* 2CD38 80051938 00000000 */ nop -/* 2CD3C 8005193C 9222003D */ lbu $v0, 0x3d($s1) -/* 2CD40 80051940 34420010 */ ori $v0, $v0, 0x10 -/* 2CD44 80051944 A222003D */ sb $v0, 0x3d($s1) -.L80051948: -/* 2CD48 80051948 8EA20034 */ lw $v0, 0x34($s5) -/* 2CD4C 8005194C 26100001 */ addiu $s0, $s0, 1 -/* 2CD50 80051950 0202102B */ sltu $v0, $s0, $v0 -/* 2CD54 80051954 1440FFE9 */ bnez $v0, .L800518FC -/* 2CD58 80051958 24840048 */ addiu $a0, $a0, 0x48 -/* 2CD5C 8005195C 0801482C */ j .L800520B0 -/* 2CD60 80051960 00000000 */ nop -.L80051964: -/* 2CD64 80051964 0C014E31 */ jal au_reset_voice -/* 2CD68 80051968 320500FF */ andi $a1, $s0, 0xff -/* 2CD6C 8005196C 0801468F */ j .L80051A3C -/* 2CD70 80051970 00000000 */ nop -.L80051974: -/* 2CD74 80051974 0C014E31 */ jal au_reset_voice -/* 2CD78 80051978 320500FF */ andi $a1, $s0, 0xff -/* 2CD7C 8005197C 080146A8 */ j .L80051AA0 -/* 2CD80 80051980 00000000 */ nop -.L80051984: -/* 2CD84 80051984 0C014874 */ jal au_mseq_read_next -/* 2CD88 80051988 02A0202D */ daddu $a0, $s5, $zero -/* 2CD8C 8005198C 92A30025 */ lbu $v1, 0x25($s5) -/* 2CD90 80051990 146001C7 */ bnez $v1, .L800520B0 -/* 2CD94 80051994 0040A02D */ daddu $s4, $v0, $zero -/* 2CD98 80051998 8EB00030 */ lw $s0, 0x30($s5) -/* 2CD9C 8005199C 8EA40034 */ lw $a0, 0x34($s5) -/* 2CDA0 800519A0 0204102B */ sltu $v0, $s0, $a0 -/* 2CDA4 800519A4 10400012 */ beqz $v0, .L800519F0 -/* 2CDA8 800519A8 001010C0 */ sll $v0, $s0, 3 -/* 2CDAC 800519AC 00501021 */ addu $v0, $v0, $s0 -/* 2CDB0 800519B0 000210C0 */ sll $v0, $v0, 3 -/* 2CDB4 800519B4 24431320 */ addiu $v1, $v0, 0x1320 -/* 2CDB8 800519B8 8FA80030 */ lw $t0, 0x30($sp) -.L800519BC: -/* 2CDBC 800519BC 01038821 */ addu $s1, $t0, $v1 -/* 2CDC0 800519C0 92220045 */ lbu $v0, 0x45($s1) -/* 2CDC4 800519C4 10400005 */ beqz $v0, .L800519DC -/* 2CDC8 800519C8 00000000 */ nop -/* 2CDCC 800519CC 26100001 */ addiu $s0, $s0, 1 -/* 2CDD0 800519D0 0204102B */ sltu $v0, $s0, $a0 -/* 2CDD4 800519D4 1440FFF9 */ bnez $v0, .L800519BC -/* 2CDD8 800519D8 24630048 */ addiu $v1, $v1, 0x48 -.L800519DC: -/* 2CDDC 800519DC 8EA20034 */ lw $v0, 0x34($s5) -/* 2CDE0 800519E0 0202102B */ sltu $v0, $s0, $v0 -/* 2CDE4 800519E4 14400032 */ bnez $v0, .L80051AB0 -/* 2CDE8 800519E8 00000000 */ nop -/* 2CDEC 800519EC 8EB00030 */ lw $s0, 0x30($s5) -.L800519F0: -/* 2CDF0 800519F0 8EA30034 */ lw $v1, 0x34($s5) -/* 2CDF4 800519F4 0203102B */ sltu $v0, $s0, $v1 -/* 2CDF8 800519F8 10400014 */ beqz $v0, .L80051A4C -/* 2CDFC 800519FC 001010C0 */ sll $v0, $s0, 3 -/* 2CE00 80051A00 0060202D */ daddu $a0, $v1, $zero -/* 2CE04 80051A04 00501021 */ addu $v0, $v0, $s0 -/* 2CE08 80051A08 000210C0 */ sll $v0, $v0, 3 -/* 2CE0C 80051A0C 8FA80070 */ lw $t0, 0x70($sp) -/* 2CE10 80051A10 24431320 */ addiu $v1, $v0, 0x1320 -/* 2CE14 80051A14 91050022 */ lbu $a1, 0x22($t0) -/* 2CE18 80051A18 8FA80030 */ lw $t0, 0x30($sp) -.L80051A1C: -/* 2CE1C 80051A1C 01038821 */ addu $s1, $t0, $v1 -/* 2CE20 80051A20 92220045 */ lbu $v0, 0x45($s1) -/* 2CE24 80051A24 5045FFCF */ beql $v0, $a1, .L80051964 -/* 2CE28 80051A28 0220202D */ daddu $a0, $s1, $zero -/* 2CE2C 80051A2C 26100001 */ addiu $s0, $s0, 1 -/* 2CE30 80051A30 0204102B */ sltu $v0, $s0, $a0 -/* 2CE34 80051A34 1440FFF9 */ bnez $v0, .L80051A1C -/* 2CE38 80051A38 24630048 */ addiu $v1, $v1, 0x48 -.L80051A3C: -/* 2CE3C 80051A3C 8EA20034 */ lw $v0, 0x34($s5) -/* 2CE40 80051A40 0202102B */ sltu $v0, $s0, $v0 -/* 2CE44 80051A44 1440001A */ bnez $v0, .L80051AB0 -/* 2CE48 80051A48 00000000 */ nop -.L80051A4C: -/* 2CE4C 80051A4C 8EB00030 */ lw $s0, 0x30($s5) -/* 2CE50 80051A50 8EA30034 */ lw $v1, 0x34($s5) -/* 2CE54 80051A54 0203102B */ sltu $v0, $s0, $v1 -/* 2CE58 80051A58 10400195 */ beqz $v0, .L800520B0 -/* 2CE5C 80051A5C 001010C0 */ sll $v0, $s0, 3 -/* 2CE60 80051A60 0060202D */ daddu $a0, $v1, $zero -/* 2CE64 80051A64 00501021 */ addu $v0, $v0, $s0 -/* 2CE68 80051A68 000210C0 */ sll $v0, $v0, 3 -/* 2CE6C 80051A6C 8FA80070 */ lw $t0, 0x70($sp) -/* 2CE70 80051A70 24431320 */ addiu $v1, $v0, 0x1320 -/* 2CE74 80051A74 91050022 */ lbu $a1, 0x22($t0) -/* 2CE78 80051A78 8FA80030 */ lw $t0, 0x30($sp) -.L80051A7C: -/* 2CE7C 80051A7C 01038821 */ addu $s1, $t0, $v1 -/* 2CE80 80051A80 92220045 */ lbu $v0, 0x45($s1) -/* 2CE84 80051A84 0045102B */ sltu $v0, $v0, $a1 -/* 2CE88 80051A88 5440FFBA */ bnel $v0, $zero, .L80051974 -/* 2CE8C 80051A8C 0220202D */ daddu $a0, $s1, $zero -/* 2CE90 80051A90 26100001 */ addiu $s0, $s0, 1 -/* 2CE94 80051A94 0204102B */ sltu $v0, $s0, $a0 -/* 2CE98 80051A98 1440FFF8 */ bnez $v0, .L80051A7C -/* 2CE9C 80051A9C 24630048 */ addiu $v1, $v1, 0x48 -.L80051AA0: -/* 2CEA0 80051AA0 8EA20034 */ lw $v0, 0x34($s5) -/* 2CEA4 80051AA4 0202102B */ sltu $v0, $s0, $v0 -/* 2CEA8 80051AA8 10400181 */ beqz $v0, .L800520B0 -/* 2CEAC 80051AAC 00000000 */ nop -.L80051AB0: -/* 2CEB0 80051AB0 8EA20030 */ lw $v0, 0x30($s5) -/* 2CEB4 80051AB4 8FA80040 */ lw $t0, 0x40($sp) -/* 2CEB8 80051AB8 02021023 */ subu $v0, $s0, $v0 -/* 2CEBC 80051ABC 01021021 */ addu $v0, $t0, $v0 -/* 2CEC0 80051AC0 A05E0000 */ sb $fp, ($v0) -/* 2CEC4 80051AC4 8EA20030 */ lw $v0, 0x30($s5) -/* 2CEC8 80051AC8 8FA8003C */ lw $t0, 0x3c($sp) -/* 2CECC 80051ACC 02021023 */ subu $v0, $s0, $v0 -/* 2CED0 80051AD0 01021021 */ addu $v0, $t0, $v0 -/* 2CED4 80051AD4 A05E0000 */ sb $fp, ($v0) -/* 2CED8 80051AD8 8EA20030 */ lw $v0, 0x30($s5) -/* 2CEDC 80051ADC 8FA80070 */ lw $t0, 0x70($sp) -/* 2CEE0 80051AE0 8EA30014 */ lw $v1, 0x14($s5) -/* 2CEE4 80051AE4 02021023 */ subu $v0, $s0, $v0 -/* 2CEE8 80051AE8 000210C0 */ sll $v0, $v0, 3 -/* 2CEEC 80051AEC 244207B4 */ addiu $v0, $v0, 0x7b4 -/* 2CEF0 80051AF0 01029021 */ addu $s2, $t0, $v0 -/* 2CEF4 80051AF4 00161400 */ sll $v0, $s6, 0x10 -/* 2CEF8 80051AF8 00621821 */ addu $v1, $v1, $v0 -/* 2CEFC 80051AFC 32E200FF */ andi $v0, $s7, 0xff -/* 2CF00 80051B00 00021200 */ sll $v0, $v0, 8 -/* 2CF04 80051B04 00621821 */ addu $v1, $v1, $v0 -/* 2CF08 80051B08 AE430000 */ sw $v1, ($s2) -/* 2CF0C 80051B0C 92620026 */ lbu $v0, 0x26($s3) -/* 2CF10 80051B10 30420001 */ andi $v0, $v0, 1 -/* 2CF14 80051B14 50400002 */ beql $v0, $zero, .L80051B20 -/* 2CF18 80051B18 A2400007 */ sb $zero, 7($s2) -/* 2CF1C 80051B1C A25E0007 */ sb $fp, 7($s2) -.L80051B20: -/* 2CF20 80051B20 24080009 */ addiu $t0, $zero, 9 -/* 2CF24 80051B24 12C80033 */ beq $s6, $t0, .L80051BF4 -/* 2CF28 80051B28 32E3007F */ andi $v1, $s7, 0x7f -/* 2CF2C 80051B2C 92620026 */ lbu $v0, 0x26($s3) -/* 2CF30 80051B30 30420001 */ andi $v0, $v0, 1 -/* 2CF34 80051B34 50400002 */ beql $v0, $zero, .L80051B40 -/* 2CF38 80051B38 A2400007 */ sb $zero, 7($s2) -/* 2CF3C 80051B3C A25E0007 */ sb $fp, 7($s2) -.L80051B40: -/* 2CF40 80051B40 3284007F */ andi $a0, $s4, 0x7f -/* 2CF44 80051B44 8E620000 */ lw $v0, ($s3) -/* 2CF48 80051B48 32E3007F */ andi $v1, $s7, 0x7f -/* 2CF4C 80051B4C 9445001E */ lhu $a1, 0x1e($v0) -/* 2CF50 80051B50 00031040 */ sll $v0, $v1, 1 -/* 2CF54 80051B54 00431021 */ addu $v0, $v0, $v1 -/* 2CF58 80051B58 000210C0 */ sll $v0, $v0, 3 -/* 2CF5C 80051B5C 00431021 */ addu $v0, $v0, $v1 -/* 2CF60 80051B60 00021080 */ sll $v0, $v0, 2 -/* 2CF64 80051B64 A2440006 */ sb $a0, 6($s2) -/* 2CF68 80051B68 00451023 */ subu $v0, $v0, $a1 -/* 2CF6C 80051B6C A6420004 */ sh $v0, 4($s2) -/* 2CF70 80051B70 82A30038 */ lb $v1, 0x38($s5) -/* 2CF74 80051B74 86620018 */ lh $v0, 0x18($s3) -/* 2CF78 80051B78 00620018 */ mult $v1, $v0 -/* 2CF7C 80051B7C 00004012 */ mflo $t0 -/* 2CF80 80051B80 00000000 */ nop -/* 2CF84 80051B84 00000000 */ nop -/* 2CF88 80051B88 01040018 */ mult $t0, $a0 -/* 2CF8C 80051B8C 00004012 */ mflo $t0 -/* 2CF90 80051B90 00081383 */ sra $v0, $t0, 0xe -/* 2CF94 80051B94 A6220040 */ sh $v0, 0x40($s1) -/* 2CF98 80051B98 86420004 */ lh $v0, 4($s2) -/* 2CF9C 80051B9C 8664000C */ lh $a0, 0xc($s3) -/* 2CFA0 80051BA0 0C014E3E */ jal au_compute_pitch_ratio -/* 2CFA4 80051BA4 00442021 */ addu $a0, $v0, $a0 -/* 2CFA8 80051BA8 8E620000 */ lw $v0, ($s3) -/* 2CFAC 80051BAC C4420020 */ lwc1 $f2, 0x20($v0) -/* 2CFB0 80051BB0 46020002 */ mul.s $f0, $f0, $f2 -/* 2CFB4 80051BB4 00000000 */ nop -/* 2CFB8 80051BB8 E6200004 */ swc1 $f0, 4($s1) -/* 2CFBC 80051BBC 92620024 */ lbu $v0, 0x24($s3) -/* 2CFC0 80051BC0 A222000E */ sb $v0, 0xe($s1) -/* 2CFC4 80051BC4 92620025 */ lbu $v0, 0x25($s3) -/* 2CFC8 80051BC8 A222000F */ sb $v0, 0xf($s1) -/* 2CFCC 80051BCC 8E620000 */ lw $v0, ($s3) -/* 2CFD0 80051BD0 AE220000 */ sw $v0, ($s1) -/* 2CFD4 80051BD4 8FA80070 */ lw $t0, 0x70($sp) -/* 2CFD8 80051BD8 91020023 */ lbu $v0, 0x23($t0) -/* 2CFDC 80051BDC A2220010 */ sb $v0, 0x10($s1) -/* 2CFE0 80051BE0 8E620004 */ lw $v0, 4($s3) -/* 2CFE4 80051BE4 AE220014 */ sw $v0, 0x14($s1) -/* 2CFE8 80051BE8 8E620008 */ lw $v0, 8($s3) -/* 2CFEC 80051BEC 0801472D */ j .L80051CB4 -/* 2CFF0 80051BF0 AE220018 */ sw $v0, 0x18($s1) -.L80051BF4: -/* 2CFF4 80051BF4 A2400007 */ sb $zero, 7($s2) -/* 2CFF8 80051BF8 8FA80070 */ lw $t0, 0x70($sp) -/* 2CFFC 80051BFC 00031040 */ sll $v0, $v1, 1 -/* 2D000 80051C00 8D040000 */ lw $a0, ($t0) -/* 2D004 80051C04 00431021 */ addu $v0, $v0, $v1 -/* 2D008 80051C08 8C900054 */ lw $s0, 0x54($a0) -/* 2D00C 80051C0C 00021080 */ sll $v0, $v0, 2 -/* 2D010 80051C10 02028021 */ addu $s0, $s0, $v0 -/* 2D014 80051C14 96060000 */ lhu $a2, ($s0) -/* 2D018 80051C18 26270014 */ addiu $a3, $s1, 0x14 -/* 2D01C 80051C1C 00062A02 */ srl $a1, $a2, 8 -/* 2D020 80051C20 0C014EFA */ jal au_get_instrument -/* 2D024 80051C24 30C600FF */ andi $a2, $a2, 0xff -/* 2D028 80051C28 AE220000 */ sw $v0, ($s1) -/* 2D02C 80051C2C 96030002 */ lhu $v1, 2($s0) -/* 2D030 80051C30 9442001E */ lhu $v0, 0x1e($v0) -/* 2D034 80051C34 00621823 */ subu $v1, $v1, $v0 -/* 2D038 80051C38 A6430004 */ sh $v1, 4($s2) -/* 2D03C 80051C3C 92030004 */ lbu $v1, 4($s0) -/* 2D040 80051C40 3282007F */ andi $v0, $s4, 0x7f -/* 2D044 80051C44 00430018 */ mult $v0, $v1 -/* 2D048 80051C48 00004012 */ mflo $t0 -/* 2D04C 80051C4C 000819C3 */ sra $v1, $t0, 7 -/* 2D050 80051C50 A2430006 */ sb $v1, 6($s2) -/* 2D054 80051C54 82A40038 */ lb $a0, 0x38($s5) -/* 2D058 80051C58 86620018 */ lh $v0, 0x18($s3) -/* 2D05C 80051C5C 00820018 */ mult $a0, $v0 -/* 2D060 80051C60 00004012 */ mflo $t0 -/* 2D064 80051C64 00031E00 */ sll $v1, $v1, 0x18 -/* 2D068 80051C68 00031E03 */ sra $v1, $v1, 0x18 -/* 2D06C 80051C6C 01030018 */ mult $t0, $v1 -/* 2D070 80051C70 00004012 */ mflo $t0 -/* 2D074 80051C74 00081383 */ sra $v0, $t0, 0xe -/* 2D078 80051C78 A6220040 */ sh $v0, 0x40($s1) -/* 2D07C 80051C7C 0C014E3E */ jal au_compute_pitch_ratio -/* 2D080 80051C80 86440004 */ lh $a0, 4($s2) -/* 2D084 80051C84 8E220000 */ lw $v0, ($s1) -/* 2D088 80051C88 C4420020 */ lwc1 $f2, 0x20($v0) -/* 2D08C 80051C8C 46020002 */ mul.s $f0, $f0, $f2 -/* 2D090 80051C90 00000000 */ nop -/* 2D094 80051C94 E6200004 */ swc1 $f0, 4($s1) -/* 2D098 80051C98 92020005 */ lbu $v0, 5($s0) -/* 2D09C 80051C9C A222000E */ sb $v0, 0xe($s1) -/* 2D0A0 80051CA0 92020006 */ lbu $v0, 6($s0) -/* 2D0A4 80051CA4 A222000F */ sb $v0, 0xf($s1) -/* 2D0A8 80051CA8 8FA80070 */ lw $t0, 0x70($sp) -/* 2D0AC 80051CAC 91020023 */ lbu $v0, 0x23($t0) -/* 2D0B0 80051CB0 A2220010 */ sb $v0, 0x10($s1) -.L80051CB4: -/* 2D0B4 80051CB4 24020002 */ addiu $v0, $zero, 2 -/* 2D0B8 80051CB8 A2220043 */ sb $v0, 0x43($s1) -/* 2D0BC 80051CBC 8FA80070 */ lw $t0, 0x70($sp) -/* 2D0C0 80051CC0 91020022 */ lbu $v0, 0x22($t0) -/* 2D0C4 80051CC4 A2220045 */ sb $v0, 0x45($s1) -/* 2D0C8 80051CC8 0801482C */ j .L800520B0 -/* 2D0CC 80051CCC A2220044 */ sb $v0, 0x44($s1) -.L80051CD0: -/* 2D0D0 80051CD0 1040002C */ beqz $v0, .L80051D84 -/* 2D0D4 80051CD4 32E2007F */ andi $v0, $s7, 0x7f -/* 2D0D8 80051CD8 00162400 */ sll $a0, $s6, 0x10 -/* 2D0DC 80051CDC A2620024 */ sb $v0, 0x24($s3) -/* 2D0E0 80051CE0 8EB00030 */ lw $s0, 0x30($s5) -/* 2D0E4 80051CE4 8EA30014 */ lw $v1, 0x14($s5) -/* 2D0E8 80051CE8 8EA20034 */ lw $v0, 0x34($s5) -/* 2D0EC 80051CEC 0202102B */ sltu $v0, $s0, $v0 -/* 2D0F0 80051CF0 104000EF */ beqz $v0, .L800520B0 -/* 2D0F4 80051CF4 0064B821 */ addu $s7, $v1, $a0 -/* 2D0F8 80051CF8 001010C0 */ sll $v0, $s0, 3 -/* 2D0FC 80051CFC 00501021 */ addu $v0, $v0, $s0 -/* 2D100 80051D00 000210C0 */ sll $v0, $v0, 3 -/* 2D104 80051D04 24441320 */ addiu $a0, $v0, 0x1320 -.L80051D08: -/* 2D108 80051D08 8EA20030 */ lw $v0, 0x30($s5) -/* 2D10C 80051D0C 8FA80070 */ lw $t0, 0x70($sp) -/* 2D110 80051D10 02021023 */ subu $v0, $s0, $v0 -/* 2D114 80051D14 000210C0 */ sll $v0, $v0, 3 -/* 2D118 80051D18 00489021 */ addu $s2, $v0, $t0 -/* 2D11C 80051D1C 8E4207B4 */ lw $v0, 0x7b4($s2) -/* 2D120 80051D20 3C08FFFF */ lui $t0, 0xffff -/* 2D124 80051D24 00481024 */ and $v0, $v0, $t0 -/* 2D128 80051D28 1457000F */ bne $v0, $s7, .L80051D68 -/* 2D12C 80051D2C 00000000 */ nop -/* 2D130 80051D30 8FA80030 */ lw $t0, 0x30($sp) -/* 2D134 80051D34 01048821 */ addu $s1, $t0, $a0 -/* 2D138 80051D38 8FA80070 */ lw $t0, 0x70($sp) -/* 2D13C 80051D3C 92230045 */ lbu $v1, 0x45($s1) -/* 2D140 80051D40 91020022 */ lbu $v0, 0x22($t0) -/* 2D144 80051D44 14620008 */ bne $v1, $v0, .L80051D68 -/* 2D148 80051D48 24080009 */ addiu $t0, $zero, 9 -/* 2D14C 80051D4C 12C80006 */ beq $s6, $t0, .L80051D68 -/* 2D150 80051D50 00000000 */ nop -/* 2D154 80051D54 92220043 */ lbu $v0, 0x43($s1) -/* 2D158 80051D58 92630024 */ lbu $v1, 0x24($s3) -/* 2D15C 80051D5C 34420010 */ ori $v0, $v0, 0x10 -/* 2D160 80051D60 A223000E */ sb $v1, 0xe($s1) -/* 2D164 80051D64 A2220043 */ sb $v0, 0x43($s1) -.L80051D68: -/* 2D168 80051D68 8EA20034 */ lw $v0, 0x34($s5) -/* 2D16C 80051D6C 26100001 */ addiu $s0, $s0, 1 -/* 2D170 80051D70 0202102B */ sltu $v0, $s0, $v0 -/* 2D174 80051D74 1440FFE4 */ bnez $v0, .L80051D08 -/* 2D178 80051D78 24840048 */ addiu $a0, $a0, 0x48 -/* 2D17C 80051D7C 0801482C */ j .L800520B0 -/* 2D180 80051D80 00000000 */ nop -.L80051D84: -/* 2D184 80051D84 00171E00 */ sll $v1, $s7, 0x18 -/* 2D188 80051D88 10600005 */ beqz $v1, .L80051DA0 -/* 2D18C 80051D8C AE630018 */ sw $v1, 0x18($s3) -/* 2D190 80051D90 3C0200FF */ lui $v0, 0xff -/* 2D194 80051D94 3442FFFF */ ori $v0, $v0, 0xffff -/* 2D198 80051D98 00621025 */ or $v0, $v1, $v0 -/* 2D19C 80051D9C AE620018 */ sw $v0, 0x18($s3) -.L80051DA0: -/* 2D1A0 80051DA0 00162400 */ sll $a0, $s6, 0x10 -/* 2D1A4 80051DA4 8EB00030 */ lw $s0, 0x30($s5) -/* 2D1A8 80051DA8 8EA30014 */ lw $v1, 0x14($s5) -/* 2D1AC 80051DAC 8EA20034 */ lw $v0, 0x34($s5) -/* 2D1B0 80051DB0 0202102B */ sltu $v0, $s0, $v0 -/* 2D1B4 80051DB4 104000BE */ beqz $v0, .L800520B0 -/* 2D1B8 80051DB8 0064B821 */ addu $s7, $v1, $a0 -/* 2D1BC 80051DBC 001010C0 */ sll $v0, $s0, 3 -/* 2D1C0 80051DC0 00501021 */ addu $v0, $v0, $s0 -/* 2D1C4 80051DC4 000210C0 */ sll $v0, $v0, 3 -/* 2D1C8 80051DC8 24441320 */ addiu $a0, $v0, 0x1320 -.L80051DCC: -/* 2D1CC 80051DCC 8EA20030 */ lw $v0, 0x30($s5) -/* 2D1D0 80051DD0 8FA80070 */ lw $t0, 0x70($sp) -/* 2D1D4 80051DD4 02021023 */ subu $v0, $s0, $v0 -/* 2D1D8 80051DD8 000210C0 */ sll $v0, $v0, 3 -/* 2D1DC 80051DDC 244207B4 */ addiu $v0, $v0, 0x7b4 -/* 2D1E0 80051DE0 01029021 */ addu $s2, $t0, $v0 -/* 2D1E4 80051DE4 8E420000 */ lw $v0, ($s2) -/* 2D1E8 80051DE8 3C08FFFF */ lui $t0, 0xffff -/* 2D1EC 80051DEC 00481024 */ and $v0, $v0, $t0 -/* 2D1F0 80051DF0 14570020 */ bne $v0, $s7, .L80051E74 -/* 2D1F4 80051DF4 00000000 */ nop -/* 2D1F8 80051DF8 8FA80030 */ lw $t0, 0x30($sp) -/* 2D1FC 80051DFC 01048821 */ addu $s1, $t0, $a0 -/* 2D200 80051E00 8FA80070 */ lw $t0, 0x70($sp) -/* 2D204 80051E04 92230045 */ lbu $v1, 0x45($s1) -/* 2D208 80051E08 91020022 */ lbu $v0, 0x22($t0) -/* 2D20C 80051E0C 14620019 */ bne $v1, $v0, .L80051E74 -/* 2D210 80051E10 00000000 */ nop -/* 2D214 80051E14 82A30038 */ lb $v1, 0x38($s5) -/* 2D218 80051E18 86620018 */ lh $v0, 0x18($s3) -/* 2D21C 80051E1C 00620018 */ mult $v1, $v0 -/* 2D220 80051E20 00004012 */ mflo $t0 -/* 2D224 80051E24 82420006 */ lb $v0, 6($s2) -/* 2D228 80051E28 00000000 */ nop -/* 2D22C 80051E2C 01020018 */ mult $t0, $v0 -/* 2D230 80051E30 00004012 */ mflo $t0 -/* 2D234 80051E34 00081383 */ sra $v0, $t0, 0xe -/* 2D238 80051E38 A6220040 */ sh $v0, 0x40($s1) -/* 2D23C 80051E3C 8EA20030 */ lw $v0, 0x30($s5) -/* 2D240 80051E40 8FA80040 */ lw $t0, 0x40($sp) -/* 2D244 80051E44 02021023 */ subu $v0, $s0, $v0 -/* 2D248 80051E48 01021021 */ addu $v0, $t0, $v0 -/* 2D24C 80051E4C 90420000 */ lbu $v0, ($v0) -/* 2D250 80051E50 14400008 */ bnez $v0, .L80051E74 -/* 2D254 80051E54 00000000 */ nop -/* 2D258 80051E58 9222003D */ lbu $v0, 0x3d($s1) -/* 2D25C 80051E5C 34420020 */ ori $v0, $v0, 0x20 -/* 2D260 80051E60 A222003D */ sb $v0, 0x3d($s1) -/* 2D264 80051E64 8EA20030 */ lw $v0, 0x30($s5) -/* 2D268 80051E68 02021023 */ subu $v0, $s0, $v0 -/* 2D26C 80051E6C 01021021 */ addu $v0, $t0, $v0 -/* 2D270 80051E70 A05E0000 */ sb $fp, ($v0) -.L80051E74: -/* 2D274 80051E74 8EA20034 */ lw $v0, 0x34($s5) -/* 2D278 80051E78 26100001 */ addiu $s0, $s0, 1 -/* 2D27C 80051E7C 0202102B */ sltu $v0, $s0, $v0 -/* 2D280 80051E80 1440FFD2 */ bnez $v0, .L80051DCC -/* 2D284 80051E84 24840048 */ addiu $a0, $a0, 0x48 -/* 2D288 80051E88 0801482C */ j .L800520B0 -/* 2D28C 80051E8C 00000000 */ nop -.L80051E90: -/* 2D290 80051E90 0C014874 */ jal au_mseq_read_next -/* 2D294 80051E94 02A0202D */ daddu $a0, $s5, $zero -/* 2D298 80051E98 0040A02D */ daddu $s4, $v0, $zero -/* 2D29C 80051E9C 32E300FF */ andi $v1, $s7, 0xff -/* 2D2A0 80051EA0 24020067 */ addiu $v0, $zero, 0x67 -/* 2D2A4 80051EA4 10620013 */ beq $v1, $v0, .L80051EF4 -/* 2D2A8 80051EA8 28620068 */ slti $v0, $v1, 0x68 -/* 2D2AC 80051EAC 10400005 */ beqz $v0, .L80051EC4 -/* 2D2B0 80051EB0 24020066 */ addiu $v0, $zero, 0x66 -/* 2D2B4 80051EB4 1062000A */ beq $v1, $v0, .L80051EE0 -/* 2D2B8 80051EB8 32820001 */ andi $v0, $s4, 1 -/* 2D2BC 80051EBC 0801482C */ j .L800520B0 -/* 2D2C0 80051EC0 00000000 */ nop -.L80051EC4: -/* 2D2C4 80051EC4 24020068 */ addiu $v0, $zero, 0x68 -/* 2D2C8 80051EC8 10620027 */ beq $v1, $v0, .L80051F68 -/* 2D2CC 80051ECC 24020069 */ addiu $v0, $zero, 0x69 -/* 2D2D0 80051ED0 10620027 */ beq $v1, $v0, .L80051F70 -/* 2D2D4 80051ED4 328300FF */ andi $v1, $s4, 0xff -/* 2D2D8 80051ED8 0801482C */ j .L800520B0 -/* 2D2DC 80051EDC 00000000 */ nop -.L80051EE0: -/* 2D2E0 80051EE0 00021080 */ sll $v0, $v0, 2 -/* 2D2E4 80051EE4 8EA30008 */ lw $v1, 8($s5) -/* 2D2E8 80051EE8 02A21021 */ addu $v0, $s5, $v0 -/* 2D2EC 80051EEC 0801482C */ j .L800520B0 -/* 2D2F0 80051EF0 AC43000C */ sw $v1, 0xc($v0) -.L80051EF4: -/* 2D2F4 80051EF4 3282007C */ andi $v0, $s4, 0x7c -/* 2D2F8 80051EF8 00022882 */ srl $a1, $v0, 2 -/* 2D2FC 80051EFC 10A00013 */ beqz $a1, .L80051F4C -/* 2D300 80051F00 32840001 */ andi $a0, $s4, 1 -/* 2D304 80051F04 02A41821 */ addu $v1, $s5, $a0 -/* 2D308 80051F08 9062002C */ lbu $v0, 0x2c($v1) -/* 2D30C 80051F0C 10400009 */ beqz $v0, .L80051F34 -/* 2D310 80051F10 2442FFFF */ addiu $v0, $v0, -1 -/* 2D314 80051F14 A062002C */ sb $v0, 0x2c($v1) -/* 2D318 80051F18 304200FF */ andi $v0, $v0, 0xff -/* 2D31C 80051F1C 10400064 */ beqz $v0, .L800520B0 -/* 2D320 80051F20 00041080 */ sll $v0, $a0, 2 -/* 2D324 80051F24 02A21021 */ addu $v0, $s5, $v0 -/* 2D328 80051F28 8C42000C */ lw $v0, 0xc($v0) -/* 2D32C 80051F2C 0801482C */ j .L800520B0 -/* 2D330 80051F30 AEA20008 */ sw $v0, 8($s5) -.L80051F34: -/* 2D334 80051F34 00041080 */ sll $v0, $a0, 2 -/* 2D338 80051F38 02A21021 */ addu $v0, $s5, $v0 -/* 2D33C 80051F3C 8C42000C */ lw $v0, 0xc($v0) -/* 2D340 80051F40 AEA20008 */ sw $v0, 8($s5) -/* 2D344 80051F44 0801482C */ j .L800520B0 -/* 2D348 80051F48 A065002C */ sb $a1, 0x2c($v1) -.L80051F4C: -/* 2D34C 80051F4C 00041080 */ sll $v0, $a0, 2 -/* 2D350 80051F50 02A21021 */ addu $v0, $s5, $v0 -/* 2D354 80051F54 8C42000C */ lw $v0, 0xc($v0) -/* 2D358 80051F58 AEA20008 */ sw $v0, 8($s5) -/* 2D35C 80051F5C 02A41021 */ addu $v0, $s5, $a0 -/* 2D360 80051F60 0801482C */ j .L800520B0 -/* 2D364 80051F64 A040002C */ sb $zero, 0x2c($v0) -.L80051F68: -/* 2D368 80051F68 0801482C */ j .L800520B0 -/* 2D36C 80051F6C A2740025 */ sb $s4, 0x25($s3) -.L80051F70: -/* 2D370 80051F70 24020001 */ addiu $v0, $zero, 1 -/* 2D374 80051F74 1462004E */ bne $v1, $v0, .L800520B0 -/* 2D378 80051F78 00000000 */ nop -/* 2D37C 80051F7C 92620026 */ lbu $v0, 0x26($s3) -/* 2D380 80051F80 34420001 */ ori $v0, $v0, 1 -/* 2D384 80051F84 0801482C */ j .L800520B0 -/* 2D388 80051F88 A2620026 */ sb $v0, 0x26($s3) -.L80051F8C: -/* 2D38C 80051F8C 0C014874 */ jal au_mseq_read_next -/* 2D390 80051F90 02A0202D */ daddu $a0, $s5, $zero -/* 2D394 80051F94 24080009 */ addiu $t0, $zero, 9 -/* 2D398 80051F98 12C80045 */ beq $s6, $t0, .L800520B0 -/* 2D39C 80051F9C 0040A02D */ daddu $s4, $v0, $zero -/* 2D3A0 80051FA0 32E500FF */ andi $a1, $s7, 0xff -/* 2D3A4 80051FA4 8FA80070 */ lw $t0, 0x70($sp) -/* 2D3A8 80051FA8 328600FF */ andi $a2, $s4, 0xff -/* 2D3AC 80051FAC 8D040000 */ lw $a0, ($t0) -/* 2D3B0 80051FB0 0C014EFA */ jal au_get_instrument -/* 2D3B4 80051FB4 26670004 */ addiu $a3, $s3, 4 -/* 2D3B8 80051FB8 0801482C */ j .L800520B0 -/* 2D3BC 80051FBC AE620000 */ sw $v0, ($s3) -.L80051FC0: -/* 2D3C0 80051FC0 0C014874 */ jal au_mseq_read_next -/* 2D3C4 80051FC4 02A0202D */ daddu $a0, $s5, $zero -/* 2D3C8 80051FC8 00171E00 */ sll $v1, $s7, 0x18 -/* 2D3CC 80051FCC 304200FF */ andi $v0, $v0, 0xff -/* 2D3D0 80051FD0 00021400 */ sll $v0, $v0, 0x10 -/* 2D3D4 80051FD4 00621821 */ addu $v1, $v1, $v0 -/* 2D3D8 80051FD8 00162400 */ sll $a0, $s6, 0x10 -/* 2D3DC 80051FDC AE63000C */ sw $v1, 0xc($s3) -/* 2D3E0 80051FE0 8EB00030 */ lw $s0, 0x30($s5) -/* 2D3E4 80051FE4 8EA30014 */ lw $v1, 0x14($s5) -/* 2D3E8 80051FE8 8EA20034 */ lw $v0, 0x34($s5) -/* 2D3EC 80051FEC 0202102B */ sltu $v0, $s0, $v0 -/* 2D3F0 80051FF0 1040002F */ beqz $v0, .L800520B0 -/* 2D3F4 80051FF4 0064B821 */ addu $s7, $v1, $a0 -/* 2D3F8 80051FF8 001010C0 */ sll $v0, $s0, 3 -/* 2D3FC 80051FFC 00501021 */ addu $v0, $v0, $s0 -/* 2D400 80052000 000210C0 */ sll $v0, $v0, 3 -/* 2D404 80052004 24541320 */ addiu $s4, $v0, 0x1320 -.L80052008: -/* 2D408 80052008 8EA20030 */ lw $v0, 0x30($s5) -/* 2D40C 8005200C 8FA80070 */ lw $t0, 0x70($sp) -/* 2D410 80052010 02021023 */ subu $v0, $s0, $v0 -/* 2D414 80052014 000210C0 */ sll $v0, $v0, 3 -/* 2D418 80052018 244207B4 */ addiu $v0, $v0, 0x7b4 -/* 2D41C 8005201C 01029021 */ addu $s2, $t0, $v0 -/* 2D420 80052020 8E420000 */ lw $v0, ($s2) -/* 2D424 80052024 3C08FFFF */ lui $t0, 0xffff -/* 2D428 80052028 00481024 */ and $v0, $v0, $t0 -/* 2D42C 8005202C 1457001B */ bne $v0, $s7, .L8005209C -/* 2D430 80052030 00000000 */ nop -/* 2D434 80052034 8FA80030 */ lw $t0, 0x30($sp) -/* 2D438 80052038 01148821 */ addu $s1, $t0, $s4 -/* 2D43C 8005203C 8FA80070 */ lw $t0, 0x70($sp) -/* 2D440 80052040 92230045 */ lbu $v1, 0x45($s1) -/* 2D444 80052044 91020022 */ lbu $v0, 0x22($t0) -/* 2D448 80052048 14620014 */ bne $v1, $v0, .L8005209C -/* 2D44C 8005204C 24080009 */ addiu $t0, $zero, 9 -/* 2D450 80052050 12C80012 */ beq $s6, $t0, .L8005209C -/* 2D454 80052054 00000000 */ nop -/* 2D458 80052058 86420004 */ lh $v0, 4($s2) -/* 2D45C 8005205C 8664000C */ lh $a0, 0xc($s3) -/* 2D460 80052060 0C014E3E */ jal au_compute_pitch_ratio -/* 2D464 80052064 00442021 */ addu $a0, $v0, $a0 -/* 2D468 80052068 8E620000 */ lw $v0, ($s3) -/* 2D46C 8005206C C4420020 */ lwc1 $f2, 0x20($v0) -/* 2D470 80052070 46020002 */ mul.s $f0, $f0, $f2 -/* 2D474 80052074 00000000 */ nop -/* 2D478 80052078 92220043 */ lbu $v0, 0x43($s1) -/* 2D47C 8005207C 34420008 */ ori $v0, $v0, 8 -/* 2D480 80052080 A2220043 */ sb $v0, 0x43($s1) -/* 2D484 80052084 E6200004 */ swc1 $f0, 4($s1) -/* 2D488 80052088 8EA20030 */ lw $v0, 0x30($s5) -/* 2D48C 8005208C 8FA8003C */ lw $t0, 0x3c($sp) -/* 2D490 80052090 02021023 */ subu $v0, $s0, $v0 -/* 2D494 80052094 01021021 */ addu $v0, $t0, $v0 -/* 2D498 80052098 A05E0000 */ sb $fp, ($v0) -.L8005209C: -/* 2D49C 8005209C 8EA20034 */ lw $v0, 0x34($s5) -/* 2D4A0 800520A0 26100001 */ addiu $s0, $s0, 1 -/* 2D4A4 800520A4 0202102B */ sltu $v0, $s0, $v0 -/* 2D4A8 800520A8 1440FFD7 */ bnez $v0, .L80052008 -/* 2D4AC 800520AC 26940048 */ addiu $s4, $s4, 0x48 -.L800520B0: -/* 2D4B0 800520B0 8EA20018 */ lw $v0, 0x18($s5) -/* 2D4B4 800520B4 1040FDC9 */ beqz $v0, .L800517DC -/* 2D4B8 800520B8 00000000 */ nop -.L800520BC: -/* 2D4BC 800520BC 93A20034 */ lbu $v0, 0x34($sp) -/* 2D4C0 800520C0 10400037 */ beqz $v0, .L800521A0 -/* 2D4C4 800520C4 00000000 */ nop -/* 2D4C8 800520C8 8EB00030 */ lw $s0, 0x30($s5) -/* 2D4CC 800520CC 8EA20034 */ lw $v0, 0x34($s5) -/* 2D4D0 800520D0 0202102B */ sltu $v0, $s0, $v0 -/* 2D4D4 800520D4 10400032 */ beqz $v0, .L800521A0 -/* 2D4D8 800520D8 001010C0 */ sll $v0, $s0, 3 -/* 2D4DC 800520DC 3C07FF00 */ lui $a3, 0xff00 -/* 2D4E0 800520E0 27A60010 */ addiu $a2, $sp, 0x10 -/* 2D4E4 800520E4 00501021 */ addu $v0, $v0, $s0 -/* 2D4E8 800520E8 000210C0 */ sll $v0, $v0, 3 -/* 2D4EC 800520EC 24451320 */ addiu $a1, $v0, 0x1320 -.L800520F0: -/* 2D4F0 800520F0 8EA20030 */ lw $v0, 0x30($s5) -/* 2D4F4 800520F4 8FA80070 */ lw $t0, 0x70($sp) -/* 2D4F8 800520F8 02022023 */ subu $a0, $s0, $v0 -/* 2D4FC 800520FC 000410C0 */ sll $v0, $a0, 3 -/* 2D500 80052100 244207B4 */ addiu $v0, $v0, 0x7b4 -/* 2D504 80052104 01029021 */ addu $s2, $t0, $v0 -/* 2D508 80052108 8E420000 */ lw $v0, ($s2) -/* 2D50C 8005210C 8EA30014 */ lw $v1, 0x14($s5) -/* 2D510 80052110 00471024 */ and $v0, $v0, $a3 -/* 2D514 80052114 1443001D */ bne $v0, $v1, .L8005218C -/* 2D518 80052118 00000000 */ nop -/* 2D51C 8005211C 8FA80030 */ lw $t0, 0x30($sp) -/* 2D520 80052120 01058821 */ addu $s1, $t0, $a1 -/* 2D524 80052124 8FA80070 */ lw $t0, 0x70($sp) -/* 2D528 80052128 92230045 */ lbu $v1, 0x45($s1) -/* 2D52C 8005212C 91020022 */ lbu $v0, 0x22($t0) -/* 2D530 80052130 14620016 */ bne $v1, $v0, .L8005218C -/* 2D534 80052134 00C41021 */ addu $v0, $a2, $a0 -/* 2D538 80052138 90420000 */ lbu $v0, ($v0) -/* 2D53C 8005213C 14400013 */ bnez $v0, .L8005218C -/* 2D540 80052140 00000000 */ nop -/* 2D544 80052144 92430001 */ lbu $v1, 1($s2) -/* 2D548 80052148 00031080 */ sll $v0, $v1, 2 -/* 2D54C 8005214C 00431021 */ addu $v0, $v0, $v1 -/* 2D550 80052150 000210C0 */ sll $v0, $v0, 3 -/* 2D554 80052154 00559821 */ addu $s3, $v0, $s5 -/* 2D558 80052158 82A30038 */ lb $v1, 0x38($s5) -/* 2D55C 8005215C 8662005C */ lh $v0, 0x5c($s3) -/* 2D560 80052160 00620018 */ mult $v1, $v0 -/* 2D564 80052164 00004012 */ mflo $t0 -/* 2D568 80052168 82420006 */ lb $v0, 6($s2) -/* 2D56C 8005216C 00000000 */ nop -/* 2D570 80052170 01020018 */ mult $t0, $v0 -/* 2D574 80052174 9222003D */ lbu $v0, 0x3d($s1) -/* 2D578 80052178 34420020 */ ori $v0, $v0, 0x20 -/* 2D57C 8005217C A222003D */ sb $v0, 0x3d($s1) -/* 2D580 80052180 00004012 */ mflo $t0 -/* 2D584 80052184 00081383 */ sra $v0, $t0, 0xe -/* 2D588 80052188 A6220040 */ sh $v0, 0x40($s1) -.L8005218C: -/* 2D58C 8005218C 8EA20034 */ lw $v0, 0x34($s5) -/* 2D590 80052190 26100001 */ addiu $s0, $s0, 1 -/* 2D594 80052194 0202102B */ sltu $v0, $s0, $v0 -/* 2D598 80052198 1440FFD5 */ bnez $v0, .L800520F0 -/* 2D59C 8005219C 24A50048 */ addiu $a1, $a1, 0x48 -.L800521A0: -/* 2D5A0 800521A0 8FBF006C */ lw $ra, 0x6c($sp) -/* 2D5A4 800521A4 8FBE0068 */ lw $fp, 0x68($sp) -/* 2D5A8 800521A8 8FB70064 */ lw $s7, 0x64($sp) -/* 2D5AC 800521AC 8FB60060 */ lw $s6, 0x60($sp) -/* 2D5B0 800521B0 8FB5005C */ lw $s5, 0x5c($sp) -/* 2D5B4 800521B4 8FB40058 */ lw $s4, 0x58($sp) -/* 2D5B8 800521B8 8FB30054 */ lw $s3, 0x54($sp) -/* 2D5BC 800521BC 8FB20050 */ lw $s2, 0x50($sp) -/* 2D5C0 800521C0 8FB1004C */ lw $s1, 0x4c($sp) -/* 2D5C4 800521C4 8FB00048 */ lw $s0, 0x48($sp) -/* 2D5C8 800521C8 03E00008 */ jr $ra -/* 2D5CC 800521CC 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/shiftable/audio/2e230_len_2190/au_engine_init.s b/ver/us/asm/shiftable/audio/2e230_len_2190/au_engine_init.s index 5e77da744b..eb2ad9ca7a 100644 --- a/ver/us/asm/shiftable/audio/2e230_len_2190/au_engine_init.s +++ b/ver/us/asm/shiftable/audio/2e230_len_2190/au_engine_init.s @@ -144,7 +144,7 @@ glabel au_engine_init .L8005307C: /* 2E47C 8005307C 327000FF */ andi $s0, $s3, 0xff /* 2E480 80053080 0200202D */ daddu $a0, $s0, $zero -/* 2E484 80053084 0C015BB0 */ jal au_pvoice_set_group +/* 2E484 80053084 0C015BB0 */ jal au_pvoice_set_bus /* 2E488 80053088 0000282D */ daddu $a1, $zero, $zero /* 2E48C 8005308C 0200202D */ daddu $a0, $s0, $zero /* 2E490 80053090 8E850004 */ lw $a1, 4($s4) @@ -225,9 +225,9 @@ glabel au_engine_init /* 2E5B8 800531B8 24060001 */ addiu $a2, $zero, 1 /* 2E5BC 800531BC 3C04800A */ lui $a0, %hi(gAuAmbienceManager) /* 2E5C0 800531C0 8C84A628 */ lw $a0, %lo(gAuAmbienceManager)($a0) -/* 2E5C4 800531C4 0C0142E4 */ jal au_mseq_manager_init +/* 2E5C4 800531C4 0C0142E4 */ jal au_amb_manager_init /* 2E5C8 800531C8 0280382D */ daddu $a3, $s4, $zero -/* 2E5CC 800531CC 0C014985 */ jal func_80052614 +/* 2E5CC 800531CC 0C014985 */ jal au_init_voices /* 2E5D0 800531D0 0280202D */ daddu $a0, $s4, $zero /* 2E5D4 800531D4 0280202D */ daddu $a0, $s4, $zero /* 2E5D8 800531D8 0C0153F0 */ jal au_load_BK_headers diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 202cafa356..62b17e4819 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -12209,7 +12209,7 @@ segments: - [0xB37B70, c, jan_03_5_entity] - [0xB37C20, c, jan_03_6_rooms] - [0xB37C20, c, jan_03_7_foliage] - - [0xB37E60] + - [0xB37E60] - name: jan_04 dir: world/area_jan/jan_04 type: code @@ -14082,7 +14082,7 @@ segments: - [0xD2FC80, c, sam_08_3_entity] - [0xD309C0, c, sam_08_4_npc] - [0xD31290, c, sam_08_5_scenes] - - [0xD31430] + - [0xD31430] - name: sam_09 dir: world/area_sam/sam_09 type: code diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 49e99709c4..35623e42fa 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -502,46 +502,46 @@ au_sfx_load_groups_from_SEF = 0x8004B62C; // type:func rom:0x26A2C au_sfx_clear_queue = 0x8004B698; // type:func rom:0x26A98 au_sfx_enqueue_event = 0x8004B6D8; // type:func rom:0x26AD8 au_sfx_update_main = 0x8004B748; // type:func rom:0x26B48 -func_8004B9E4 = 0x8004B9E4; // type:func rom:0x26DE4 -func_8004BA54 = 0x8004BA54; // type:func rom:0x26E54 -func_8004BA74 = 0x8004BA74; // type:func rom:0x26E74 -func_8004C0E4 = 0x8004C0E4; // type:func rom:0x274E4 -au_sfx_set_bits_C00 = 0x8004C268; // type:func rom:0x27668 +au_sfx_set_reverb_type = 0x8004B9E4; // type:func rom:0x26DE4 +au_sfx_set_state = 0x8004BA54; // type:func rom:0x26E54 +au_sfx_load_sound = 0x8004BA74; // type:func rom:0x26E74 +au_sfx_play_sound = 0x8004C0E4; // type:func rom:0x274E4 +au_sfx_set_triggers = 0x8004C268; // type:func rom:0x27668 au_sfx_stop_by_id = 0x8004C2A4; // type:func rom:0x276A4 -func_8004C300 = 0x8004C300; // type:func rom:0x27700 +au_sfx_stop_by_exlusive_id = 0x8004C300; // type:func rom:0x27700 au_sfx_set_modifiers = 0x8004C358; // type:func rom:0x27758 au_sfx_set_player_modifiers = 0x8004C3D4; // type:func rom:0x277D4 au_sfx_manager_update = 0x8004C444; // type:func rom:0x27844 -au_sfx_update_mode_0 = 0x8004C578; // type:func rom:0x27978 +au_sfx_update_basic = 0x8004C578; // type:func rom:0x27978 au_sfx_get_scaled_volume = 0x8004C844; // type:func rom:0x27C44 -au_sfx_update_mode_1 = 0x8004C884; // type:func rom:0x27C84 +au_sfx_update_sequence = 0x8004C884; // type:func rom:0x27C84 snd_set_voice_volume = 0x8004CD94; // type:func rom:0x28194 func_8004CDF8 = 0x8004CDF8; // type:func rom:0x281F8 au_SEFCmd_00_SetVolume = 0x8004CE70; // type:func rom:0x28270 au_SEFCmd_01_SetPan = 0x8004CEA4; // type:func rom:0x282A4 au_SEFCmd_02_SetInstrument = 0x8004CEC4; // type:func rom:0x282C4 au_SEFCmd_03_SetReverb = 0x8004CF0C; // type:func rom:0x2830C -au_SEFCmd_04 = 0x8004CF3C; // type:func rom:0x2833C -au_SEFCmd_05 = 0x8004D00C; // type:func rom:0x2840C -au_SEFCmd_06 = 0x8004D038; // type:func rom:0x28438 -au_SEFCmd_07 = 0x8004D050; // type:func rom:0x28450 -au_SEFCmd_08 = 0x8004D07C; // type:func rom:0x2847C +au_SEFCmd_04_SetEnvelope = 0x8004CF3C; // type:func rom:0x2833C +au_SEFCmd_05_CoarseTune = 0x8004D00C; // type:func rom:0x2840C +au_SEFCmd_06_FineTune = 0x8004D038; // type:func rom:0x28438 +au_SEFCmd_07_WaitForEnd = 0x8004D050; // type:func rom:0x28450 +au_SEFCmd_08_PitchSweep = 0x8004D07C; // type:func rom:0x2847C au_SEFCmd_09_StartLoop = 0x8004D114; // type:func rom:0x28514 au_SEFCmd_0A_EndLoop = 0x8004D130; // type:func rom:0x28530 -au_SEFCmd_0B = 0x8004D15C; // type:func rom:0x2855C -au_SEFCmd_0C = 0x8004D180; // type:func rom:0x28580 -au_SEFCmd_0D = 0x8004D1B4; // type:func rom:0x285B4 -au_SEFCmd_0E = 0x8004D23C; // type:func rom:0x2863C -au_SEFCmd_0F = 0x8004D2B0; // type:func rom:0x286B0 +au_SEFCmd_0B_WaitForRelease = 0x8004D15C; // type:func rom:0x2855C +au_SEFCmd_0C_SetCurrentVolume = 0x8004D180; // type:func rom:0x28580 +au_SEFCmd_0D_VolumeRamp = 0x8004D1B4; // type:func rom:0x285B4 +au_SEFCmd_0E_SetAlternativeSound = 0x8004D23C; // type:func rom:0x2863C +au_SEFCmd_0F_Stop = 0x8004D2B0; // type:func rom:0x286B0 au_SEFCmd_10_Jump = 0x8004D2E4; // type:func rom:0x286E4 au_SEFCmd_11_Restart = 0x8004D310; // type:func rom:0x28710 au_SEFCmd_12_NOP = 0x8004D31C; // type:func rom:0x2871C -au_SEFCmd_SetRandomPitch = 0x8004D324; // type:func rom:0x28724 -au_SEFCmd_SetRandomVelocity = 0x8004D33C; // type:func rom:0x2873C -au_SEFCmd_SetUnkA3 = 0x8004D354; // type:func rom:0x28754 -au_SEFCmd_16 = 0x8004D36C; // type:func rom:0x2876C -au_SEFCmd_17 = 0x8004D3A0; // type:func rom:0x287A0 -au_SEFCmd_18 = 0x8004D3F8; // type:func rom:0x287F8 +au_SEFCmd_13_SetRandomPitch = 0x8004D324; // type:func rom:0x28724 +au_SEFCmd_14_SetRandomVelocity = 0x8004D33C; // type:func rom:0x2873C +au_SEFCmd_15_SetUnkA3 = 0x8004D354; // type:func rom:0x28754 +au_SEFCmd_16_SetEnvelopePress = 0x8004D36C; // type:func rom:0x2876C +au_SEFCmd_17_PlaySound = 0x8004D3A0; // type:func rom:0x287A0 +au_SEFCmd_18_SetAlternativeVolume = 0x8004D3F8; // type:func rom:0x287F8 func_8004D428 = 0x8004D428; // type:func rom:0x28828 func_8004D484 = 0x8004D484; // type:func rom:0x28884 au_sfx_reset_players = 0x8004D4BC; // type:func rom:0x288BC @@ -613,34 +613,34 @@ func_8005087C = 0x8005087C; // type:func rom:0x2BC7C func_80050888 = 0x80050888; // type:func rom:0x2BC88 func_80050900 = 0x80050900; // type:func rom:0x2BD00 func_80050970 = 0x80050970; // type:func rom:0x2BD70 -au_mseq_manager_init = 0x80050B90; // type:func rom:0x2BF90 -func_80050C30 = 0x80050C30; // type:func rom:0x2C030 -func_80050C54 = 0x80050C54; // type:func rom:0x2C054 +au_amb_manager_init = 0x80050B90; // type:func rom:0x2BF90 +au_amb_check_player_index = 0x80050C30; // type:func rom:0x2C030 +au_amb_load_tracks_fade = 0x80050C54; // type:func rom:0x2C054 func_80050C64 = 0x80050C64; // type:func rom:0x2C064 -func_80050CA0 = 0x80050CA0; // type:func rom:0x2C0A0 -func_80050D50 = 0x80050D50; // type:func rom:0x2C150 +au_amb_start = 0x80050CA0; // type:func rom:0x2C0A0 +au_amb_fade_setup = 0x80050D50; // type:func rom:0x2C150 func_80050E18 = 0x80050E18; // type:func rom:0x2C218 func_80050E84 = 0x80050E84; // type:func rom:0x2C284 func_80050EF0 = 0x80050EF0; // type:func rom:0x2C2F0 func_80050F64 = 0x80050F64; // type:func rom:0x2C364 -au_mseq_set_volume = 0x80050FD0; // type:func rom:0x2C3D0 -func_80051050 = 0x80051050; // type:func rom:0x2C450 -func_800510A4 = 0x800510A4; // type:func rom:0x2C4A4 -snd_ambient_manager_update = 0x800511BC; // type:func rom:0x2C5BC -func_80051334 = 0x80051334; // type:func rom:0x2C734 -func_80051434 = 0x80051434; // type:func rom:0x2C834 -au_mseq_read_next = 0x800521D0; // type:func rom:0x2D5D0 -au_mseq_player_stop = 0x800521E8; // type:func rom:0x2D5E8 -func_800522A8 = 0x800522A8; // type:func rom:0x2D6A8 -func_8005232C = 0x8005232C; // type:func rom:0x2D72C -func_800525A0 = 0x800525A0; // type:func rom:0x2D9A0 -func_80052614 = 0x80052614; // type:func rom:0x2DA14 +au_amb_set_volume = 0x80050FD0; // type:func rom:0x2C3D0 +au_amb_is_stopped = 0x80051050; // type:func rom:0x2C450 +au_amb_play_sequence = 0x800510A4; // type:func rom:0x2C4A4 +au_amb_manager_update = 0x800511BC; // type:func rom:0x2C5BC +au_amb_load_track_fade_info = 0x80051334; // type:func rom:0x2C734 +au_amb_player_update = 0x80051434; // type:func rom:0x2C834 +au_amb_read_next = 0x800521D0; // type:func rom:0x2D5D0 +au_amb_player_stop = 0x800521E8; // type:func rom:0x2D5E8 +au_amb_save_voices = 0x800522A8; // type:func rom:0x2D6A8 +au_amb_restore_voices = 0x8005232C; // type:func rom:0x2D72C +au_update_stopped_voices = 0x800525A0; // type:func rom:0x2D9A0 +au_init_voices = 0x80052614; // type:func rom:0x2DA14 func_80052660 = 0x80052660; // type:func rom:0x2DA60 -func_80052B44 = 0x80052B44; // type:func rom:0x2DF44 -func_80052BC0 = 0x80052BC0; // type:func rom:0x2DFC0 -func_80052BF8 = 0x80052BF8; // type:func rom:0x2DFF8 -func_80052CFC = 0x80052CFC; // type:func rom:0x2E0FC -func_80052E18 = 0x80052E18; // type:func rom:0x2E218 +au_voice_after_volume_change = 0x80052B44; // type:func rom:0x2DF44 +au_voice_get_delta = 0x80052BC0; // type:func rom:0x2DFC0 +au_voice_start = 0x80052BF8; // type:func rom:0x2DFF8 +au_voice_step = 0x80052CFC; // type:func rom:0x2E0FC +au_voice_set_vol_changed = 0x80052E18; // type:func rom:0x2E218 func_80052E30 = 0x80052E30; // type:func rom:0x2E230 au_engine_init = 0x80052E5C; // type:func rom:0x2E25C au_reset_instrument = 0x800532F4; // type:func rom:0x2E6F4 @@ -648,14 +648,14 @@ au_reset_drum_entry = 0x80053370; // type:func rom:0x2E770 au_reset_instrument_entry = 0x800533A8; // type:func rom:0x2E7A8 au_update_clients_2 = 0x800533D0; // type:func rom:0x2E7D0 snd_add_sfx_output = 0x800535C0; // type:func rom:0x2E9C0 -func_80053654 = 0x80053654; // type:func rom:0x2EA54 -func_80053888 = 0x80053888; // type:func rom:0x2EC88 +au_syn_update = 0x80053654; // type:func rom:0x2EA54 +au_reset_nonfree_voice = 0x80053888; // type:func rom:0x2EC88 au_reset_voice = 0x800538C4; // type:func rom:0x2ECC4 au_compute_pitch_ratio = 0x800538F8; // type:func rom:0x2ECF8 au_fade_init = 0x80053974; // type:func rom:0x2ED74 au_fade_clear = 0x80053A18; // type:func rom:0x2EE18 au_fade_update = 0x80053A28; // type:func rom:0x2EE28 -func_80053A98 = 0x80053A98; // type:func rom:0x2EE98 +au_fade_set_volume = 0x80053A98; // type:func rom:0x2EE98 func_80053AC8 = 0x80053AC8; // type:func rom:0x2EEC8 au_fade_set_vol_scale = 0x80053AEC; // type:func rom:0x2EEEC func_80053B04 = 0x80053B04; // type:func rom:0x2EF04 @@ -696,22 +696,22 @@ snd_start_sound_with_shift = 0x80055240; // type:func rom:0x30640 snd_adjust_sound = 0x800552D0; // type:func rom:0x306D0 snd_adjust_sound_with_shift = 0x80055330; // type:func rom:0x30730 snd_stop_sound = 0x800553C0; // type:func rom:0x307C0 -func_800553F4 = 0x800553F4; // type:func rom:0x307F4 +snd_reset = 0x800553F4; // type:func rom:0x307F4 snd_start_sound_raw = 0x80055408; // type:func rom:0x30808 -snd_ambient_load = 0x80055448; // type:func rom:0x30848 -snd_ambient_80055464 = 0x80055464; // type:func rom:0x30864 -snd_ambient_quick_fade_out = 0x800554A4; // type:func rom:0x308A4 -snd_ambient_slow_fade_out = 0x800554E8; // type:func rom:0x308E8 -snd_ambient_8005553C = 0x8005553C; // type:func rom:0x3093C -snd_ambient_80055590 = 0x80055590; // type:func rom:0x30990 -snd_ambient_800555E4 = 0x800555E4; // type:func rom:0x309E4 -snd_ambient_80055618 = 0x80055618; // type:func rom:0x30A18 +snd_load_ambient = 0x80055448; // type:func rom:0x30848 +snd_ambient_play = 0x80055464; // type:func rom:0x30864 +snd_ambient_stop_quick = 0x800554A4; // type:func rom:0x308A4 +snd_ambient_stop_slow = 0x800554E8; // type:func rom:0x308E8 +snd_ambient_pause = 0x8005553C; // type:func rom:0x3093C +snd_ambient_resume = 0x80055590; // type:func rom:0x30990 +snd_ambient_is_stopped = 0x800555E4; // type:func rom:0x309E4 +snd_ambient_mute = 0x80055618; // type:func rom:0x30A18 snd_ambient_set_volume = 0x8005566C; // type:func rom:0x30A6C snd_ambient_disable = 0x800556D0; // type:func rom:0x30AD0 snd_ambient_enable = 0x80055718; // type:func rom:0x30B18 snd_ambient_80055760 = 0x80055760; // type:func rom:0x30B60 -snd_ambient_800557CC = 0x800557CC; // type:func rom:0x30BCC -snd_ambient_set_track = 0x80055848; // type:func rom:0x30C48 +snd_ambient_stop_all = 0x800557CC; // type:func rom:0x30BCC +snd_ambient_play_only = 0x80055848; // type:func rom:0x30C48 au_song_load = 0x800558D4; // type:func rom:0x30CD4 au_song_start = 0x8005591C; // type:func rom:0x30D1C au_song_start_variation = 0x80055970; // type:func rom:0x30D70 @@ -753,8 +753,8 @@ audio_set_mono = 0x80056180; // type:func rom:0x31580 func_800561A4 = 0x800561A4; // type:func rom:0x315A4 func_800561C4 = 0x800561C4; // type:func rom:0x315C4 func_800561E4 = 0x800561E4; // type:func rom:0x315E4 -func_80056204 = 0x80056204; // type:func rom:0x31604 -func_80056228 = 0x80056228; // type:func rom:0x31628 +enable_sounds = 0x80056204; // type:func rom:0x31604 +disable_sounds = 0x80056228; // type:func rom:0x31628 au_driver_init = 0x80056250; // type:func rom:0x31650 au_driver_release = 0x800565A4; // type:func rom:0x319A4 alAudioFrame = 0x800565C0; // type:func rom:0x319C0 @@ -766,7 +766,7 @@ au_bus_set_volume = 0x80056D78; // type:func rom:0x32178 au_bus_get_volume = 0x80056DA4; // type:func rom:0x321A4 au_bus_set_effect = 0x80056DCC; // type:func rom:0x321CC au_bus_set_fx_params = 0x80056E34; // type:func rom:0x32234 -au_pvoice_set_group = 0x80056EC0; // type:func rom:0x322C0 +au_pvoice_set_bus = 0x80056EC0; // type:func rom:0x322C0 func_80056EE8 = 0x80056EE8; // type:func rom:0x322E8 au_syn_start_voice = 0x80056F78; // type:func rom:0x32378 func_80056FA4 = 0x80056FA4; // type:func rom:0x323A4 @@ -1412,7 +1412,7 @@ nuAuTaskStop = 0x80078180; // type:data rom:0x53580 AuSynUseStereo = 0x80078181; // type:data rom:0x53581 PreventBGMPlayerUpdate = 0x80078DB0; // rom:0x541B0 D_80078DB4 = 0x80078DB4; // rom:0x541B4 -D_80078DB6 = 0x80078DB6; // type:data rom:0x541B6 +AuAmbienceEnabledOnlyPlayer = 0x80078DB6; // type:data rom:0x541B6 D_80078DB8 = 0x80078DB8; // type:data rom:0x541B8 D_80078DC4 = 0x80078DC4; // type:data rom:0x541C4 D_80078DCC = 0x80078DCC; // type:data rom:0x541CC @@ -2811,8 +2811,7 @@ func_800E5348 = 0x800E5348; // type:func rom:0x7E7F8 AlCmdListBuffers = 0x800A3510; // type:data rom:0x7E910 D_800A3514 = 0x800A3514; // type:data rom:0x7E914 player_get_camera_facing_angle = 0x800E546C; // type:func rom:0x7E91C -D_800A3520 = 0x800A3520; // type:data rom:0x7E920 -D_800A3524 = 0x800A3524; // type:data rom:0x7E924 +nuAuTasks = 0x800A3520; // type:data rom:0x7E920 phys_save_ground_pos = 0x800E54E0; // type:func rom:0x7E990 func_800E5520 = 0x800E5520; // type:func rom:0x7E9D0 phys_adjust_cam_on_landing = 0x800E5530; // type:func rom:0x7E9E0 @@ -4116,7 +4115,6 @@ nusched = 0x800DA440; // rom:0xB5840 render_animated_model = 0x8011F304; // type:func rom:0xB5A04 render_animated_model_with_vertices = 0x8011F3E8; // type:func rom:0xB5AE8 appendGfx_animator = 0x8011F4D4; // type:func rom:0xB5BD4 -AlNumFields = 0x800DAAB8; // type:data rom:0xB5EB8 D_800DAAC0 = 0x800DAAC0; // type:data rom:0xB5EC0 nuContPfs = 0x800DAAD8; // rom:0xB5ED8 nuSiMesgQ = 0x800DAC78; // rom:0xB6078 @@ -4449,7 +4447,7 @@ sfx_compute_spatialized_sound_params_full = 0x80149250; // type:func rom:0xDF950 sfx_reset_door_sounds = 0x80149600; // type:func rom:0xDFD00 sfx_clear_sounds = 0x80149618; // type:func rom:0xDFD18 sfx_clear_env_sounds = 0x80149670; // type:func rom:0xDFD70 -sfx_update_looping_sound_params = 0x80149734; // type:func rom:0xDFE34 +sfx_update_env_sound_params = 0x80149734; // type:func rom:0xDFE34 sfx_set_reverb_mode = 0x801497FC; // type:func rom:0xDFEFC sfx_get_reverb_mode = 0x80149828; // type:func rom:0xDFF28 sfx_stop_env_sounds = 0x80149838; // type:func rom:0xDFF38 @@ -4457,7 +4455,7 @@ sfx_get_env_sound_instance = 0x801498C4; // type:func rom:0xDFFC4 sfx_play_sound_looping = 0x80149908; // type:func rom:0xE0008 sfx_register_looping_sound_at_position = 0x80149974; // type:func rom:0xE0074 sfx_adjust_env_sound_pos = 0x801499EC; // type:func rom:0xE00EC -func_80149A6C = 0x80149A6C; // type:func rom:0xE016C +snd_stop_tracking_env_sound_pos = 0x80149A6C; // type:func rom:0xE016C sfx_play_sound_with_params = 0x80149AB8; // type:func rom:0xE01B8 sfx_adjust_env_sound_params = 0x80149BE4; // type:func rom:0xE02E4 sfx_stop_sound = 0x80149C6C; // type:func rom:0xE036C @@ -5238,13 +5236,13 @@ D_801597D0 = 0x801597D0; // type:data rom:0xEFED0 exec_ShakeCam1 = 0x802CB56C; // type:func rom:0xEFF1C exec_ShakeCamX = 0x802CB5C8; // type:func rom:0xEFF78 D_80159880 = 0x80159880; // type:data rom:0xEFF80 -D_801598A0 = 0x801598A0; // type:data rom:0xEFFA0 +wEnvSounds = 0x801598A0; // type:data rom:0xEFFA0 SetCamLeadPlayer = 0x802CB680; // type:func rom:0xF0030 -D_801599B8 = 0x801599B8; // type:data rom:0xF00B8 +bEnvSounds = 0x801599B8; // type:data rom:0xF00B8 func_802CB710 = 0x802CB710; // type:func rom:0xF00C0 PanToTarget = 0x802CB79C; // type:func rom:0xF014C -D_80159AD0 = 0x80159AD0; // type:data rom:0xF01D0 -D_80159AD4 = 0x80159AD4; // type:data rom:0xF01D4 +gCurrentEnvSounds = 0x80159AD0; // type:data rom:0xF01D0 +SfxReverbMode = 0x80159AD4; // type:data rom:0xF01D4 D_80159AD8 = 0x80159AD8; // type:data rom:0xF01D8 MusicDefaultVolume = 0x80159AE0; // rom:0xF01E0 MusicTargetVolume = 0x80159AE2; // rom:0xF01E2 diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 98bf4608cc..fa48c9d6c4 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -126,7 +126,7 @@ dead_basic_ai_chase = basic_ai_chase + 0x4420; dead_basic_ai_lose_player = basic_ai_lose_player + 0x4420; dead_BasicAI_Main = BasicAI_Main + 0x4420; dead_basic_ai_suspend = basic_ai_suspend + 0x4450; -dead_snd_ambient_80055618 = snd_ambient_80055618 + 0x44B0; +dead_snd_ambient_mute = snd_ambient_mute + 0x44B0; dead_get_current_map_settings = get_current_map_settings + 0x4540; dead_load_asset_by_name = load_asset_by_name + 0x4550; dead_osVirtualToPhysical = osVirtualToPhysical + 0x5150;