From b8aa2a251e38c4ca31d2e0ab5042a8ea84fd4be5 Mon Sep 17 00:00:00 2001 From: engineer124 <47598039+engineer124@users.noreply.github.com> Date: Tue, 15 Aug 2023 15:44:20 +1000 Subject: [PATCH] Document z_lib Sfx Functions (#1470) * document lib sfx * rename functions --- docs/tutorial/other_functions.md | 6 +-- include/functions.h | 6 +-- src/code/z_actor.c | 23 ++++---- src/code/z_camera.c | 18 +++---- src/code/z_demo.c | 8 +-- src/code/z_kankyo.c | 8 +-- src/code/z_lib.c | 18 +++++-- src/code/z_lifemeter.c | 2 +- src/code/z_onepointdemo.c | 2 +- src/code/z_play.c | 2 +- .../actors/ovl_Bg_Bombwall/z_bg_bombwall.c | 2 +- src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c | 2 +- .../actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c | 2 +- .../actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c | 2 +- .../actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c | 2 +- .../actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c | 10 ++-- .../ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c | 2 +- .../z_bg_hidan_kowarerukabe.c | 2 +- .../ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c | 2 +- .../ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c | 2 +- .../ovl_Bg_Jya_Megami/z_bg_jya_megami.c | 2 +- .../ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c | 2 +- .../ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c | 2 +- .../ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c | 4 +- .../z_bg_mori_kaitenkabe.c | 4 +- .../z_bg_mori_rakkatenjo.c | 4 +- .../actors/ovl_Bg_Po_Event/z_bg_po_event.c | 4 +- .../ovl_Bg_Relay_Objects/z_bg_relay_objects.c | 4 +- .../z_bg_spot01_idohashira.c | 2 +- .../z_bg_spot02_objects.c | 2 +- .../z_bg_spot08_bakudankabe.c | 2 +- .../z_bg_spot11_bakudankabe.c | 2 +- .../ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c | 2 +- .../ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c | 2 +- .../z_bg_spot16_bombstone.c | 2 +- .../z_bg_spot17_bakudankabe.c | 2 +- .../ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c | 4 +- .../ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c | 2 +- .../ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c | 2 +- .../actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c | 4 +- .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 2 +- .../actors/ovl_Boss_Ganon/z_boss_ganon.c | 36 ++++++------- .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 54 +++++++++---------- .../ovl_Boss_Ganondrof/z_boss_ganondrof.c | 2 +- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 32 +++++------ src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 2 +- src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 32 +++++------ src/overlays/actors/ovl_Demo_6K/z_demo_6k.c | 2 +- src/overlays/actors/ovl_Demo_Du/z_demo_du.c | 10 ++-- .../actors/ovl_Demo_Effect/z_demo_effect.c | 12 ++--- src/overlays/actors/ovl_Demo_Go/z_demo_go.c | 4 +- src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c | 12 ++--- src/overlays/actors/ovl_Demo_Im/z_demo_im.c | 2 +- .../actors/ovl_Demo_Kekkai/z_demo_kekkai.c | 2 +- src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c | 2 +- .../actors/ovl_Efc_Erupc/z_efc_erupc.c | 2 +- src/overlays/actors/ovl_En_Ani/z_en_ani.c | 2 +- .../ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c | 2 +- src/overlays/actors/ovl_En_Cs/z_en_cs.c | 2 +- .../ovl_En_Diving_Game/z_en_diving_game.c | 2 +- .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c | 6 +-- src/overlays/actors/ovl_En_Eg/z_en_eg.c | 2 +- .../actors/ovl_En_Ex_Item/z_en_ex_item.c | 2 +- .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 10 ++-- src/overlays/actors/ovl_En_Fr/z_en_fr.c | 8 +-- src/overlays/actors/ovl_En_Fu/z_en_fu.c | 2 +- .../actors/ovl_En_G_Switch/z_en_g_switch.c | 10 ++-- src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 2 +- src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 2 +- .../actors/ovl_En_Heishi1/z_en_heishi1.c | 4 +- .../actors/ovl_En_Heishi2/z_en_heishi2.c | 4 +- .../actors/ovl_En_Heishi3/z_en_heishi3.c | 4 +- .../actors/ovl_En_Hintnuts/z_en_hintnuts.c | 2 +- src/overlays/actors/ovl_En_Hs/z_en_hs.c | 2 +- .../actors/ovl_En_Insect/z_en_insect.c | 2 +- src/overlays/actors/ovl_En_Jj/z_en_jj.c | 2 +- .../actors/ovl_En_Kakasi2/z_en_kakasi2.c | 4 +- src/overlays/actors/ovl_En_Mk/z_en_mk.c | 4 +- src/overlays/actors/ovl_En_Mm/z_en_mm.c | 2 +- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 18 +++---- .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c | 10 ++-- .../ovl_En_Okarina_Tag/z_en_okarina_tag.c | 8 +-- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 44 +++++++-------- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 2 +- .../actors/ovl_En_Po_Field/z_en_po_field.c | 2 +- .../ovl_En_Po_Sisters/z_en_po_sisters.c | 2 +- .../ovl_En_River_Sound/z_en_river_sound.c | 2 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 36 ++++++------- src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 2 +- src/overlays/actors/ovl_En_Skj/z_en_skj.c | 8 +-- .../ovl_En_Syateki_Itm/z_en_syateki_itm.c | 2 +- src/overlays/actors/ovl_En_Ta/z_en_ta.c | 2 +- src/overlays/actors/ovl_En_Toryo/z_en_toryo.c | 2 +- .../actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c | 2 +- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 2 +- .../ovl_En_Wonder_Item/z_en_wonder_item.c | 2 +- src/overlays/actors/ovl_En_Xc/z_en_xc.c | 34 ++++++------ .../ovl_En_Yabusame_Mark/z_en_yabusame_mark.c | 4 +- src/overlays/actors/ovl_En_Zl2/z_en_zl2.c | 16 +++--- src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 14 ++--- src/overlays/actors/ovl_En_fHG/z_en_fhg.c | 8 +-- src/overlays/actors/ovl_Fishing/z_fishing.c | 32 +++++------ src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 2 +- .../ovl_Obj_Blockstop/z_obj_blockstop.c | 4 +- .../actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c | 2 +- .../ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c | 2 +- .../ovl_Obj_Roomtimer/z_obj_roomtimer.c | 2 +- .../ovl_Obj_Timeblock/z_obj_timeblock.c | 4 +- .../ovl_Obj_Warp2block/z_obj_warp2block.c | 2 +- .../ovl_Object_Kankyo/z_object_kankyo.c | 6 +-- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 4 +- .../actors/ovl_player_actor/z_player.c | 40 +++++++------- 112 files changed, 399 insertions(+), 388 deletions(-) diff --git a/docs/tutorial/other_functions.md b/docs/tutorial/other_functions.md index 10686e005e..ec886e175f 100644 --- a/docs/tutorial/other_functions.md +++ b/docs/tutorial/other_functions.md @@ -382,7 +382,7 @@ void func_80A87CEC(EnJj *this, PlayState *play) { func_8003EBF8(play, &play->colCtx.dyna, (s32) temp_v1->bgId); func_8005B1A4(play->cameraPtrs[play->activeCamId]); gSaveContext.unkEDA = (u16) (gSaveContext.unkEDA | 0x400); - func_80078884((u16)0x4802U); + Sfx_PlaySfxCentered((u16)0x4802U); } ``` @@ -420,7 +420,7 @@ void func_80A87CEC(EnJj *this, PlayState *play) { func_8003EBF8(play, &play->colCtx.dyna, child->bgId); func_8005B1A4(GET_ACTIVE_CAM(play)); gSaveContext.save.info.eventChkInf[3] |= 0x400; - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } ``` @@ -439,7 +439,7 @@ void func_80A87CEC(EnJj* this, PlayState* play) { func_8003EBF8(play, &play->colCtx.dyna, child->bgId); func_8005B1A4(GET_ACTIVE_CAM(play)); gSaveContext.save.info.eventChkInf[3] |= 0x400; - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } } ``` diff --git a/include/functions.h b/include/functions.h index 3af1691522..1e84a87170 100644 --- a/include/functions.h +++ b/include/functions.h @@ -877,9 +877,9 @@ f32 Math_SmoothStepToDegF(f32* pValue, f32 target, f32 fraction, f32 step, f32 m s16 Math_SmoothStepToS(s16* pValue, s16 target, s16 scale, s16 step, s16 minStep); void Math_ApproachS(s16* pValue, s16 target, s16 scale, s16 step); void Color_RGBA8_Copy(Color_RGBA8* dst, Color_RGBA8* src); -void func_80078884(u16 sfxId); -void func_800788CC(u16 sfxId); -void func_80078914(Vec3f* arg0, u16 sfxId); +void Sfx_PlaySfxCentered(u16 sfxId); +void Sfx_PlaySfxCentered2(u16 sfxId); +void Sfx_PlaySfxAtPos(Vec3f* projectedPos, u16 sfxId); void Health_InitMeter(PlayState* play); void Health_UpdateMeter(PlayState* play); void Health_DrawMeter(PlayState* play); diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 47bc082c6b..aa1f16291f 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -489,7 +489,7 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Pl lockOnSfxId = CHECK_FLAG_ALL(actorArg->flags, ACTOR_FLAG_0 | ACTOR_FLAG_2) ? NA_SE_SY_LOCK_ON : NA_SE_SY_LOCK_ON_HUMAN; - func_80078884(lockOnSfxId); + Sfx_PlaySfxCentered(lockOnSfxId); } targetCtx->targetCenterPos.x = actorArg->world.pos.x; @@ -1751,7 +1751,7 @@ void Player_PlaySfx(Player* player, u16 sfxId) { * Play a sound effect at the actor's position */ void Actor_PlaySfx(Actor* actor, u16 sfxId) { - func_80078914(&actor->projectedPos, sfxId); + Sfx_PlaySfxAtPos(&actor->projectedPos, sfxId); } void func_8002F850(PlayState* play, Actor* actor) { @@ -1767,8 +1767,8 @@ void func_8002F850(PlayState* play, Actor* actor) { surfaceSfxOffset = SurfaceType_GetSfxOffset(&play->colCtx, actor->floorPoly, actor->floorBgId); } - func_80078914(&actor->projectedPos, NA_SE_EV_BOMB_BOUND); - func_80078914(&actor->projectedPos, NA_SE_PL_WALK_GROUND + surfaceSfxOffset); + Sfx_PlaySfxAtPos(&actor->projectedPos, NA_SE_EV_BOMB_BOUND); + Sfx_PlaySfxAtPos(&actor->projectedPos, NA_SE_PL_WALK_GROUND + surfaceSfxOffset); } void func_8002F8F0(Actor* actor, u16 sfxId) { @@ -1965,7 +1965,8 @@ void Actor_DrawFaroresWindPointer(PlayState* play) { //! @bug One of the conditions for this block checks an entrance index to see if the light ball should draw. //! This does not account for the fact that some dungeons have multiple entrances. - //! If a dungeon is entered through a different entrance than the one that was saved, the light ball will not draw. + //! If a dungeon is entered through a different entrance than the one that was saved, the light ball will not + //! draw. if ((play->csCtx.state == CS_STATE_IDLE) && (((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].entranceIndex) == ((void)0, gSaveContext.save.entranceIndex)) && @@ -1998,8 +1999,8 @@ void Actor_DrawFaroresWindPointer(PlayState* play) { gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); } - //! @bug This function call is not contained in the above block, meaning the light for Farore's Wind will draw in - //! every scene at the same position that it was originally set. + //! @bug This function call is not contained in the above block, meaning the light for Farore's Wind will draw + //! in every scene at the same position that it was originally set. Lights_PointNoGlowSetInfo(&D_8015BC00, ((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x), ((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y) + yOffset, ((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z), 255, 255, 255, lightRadius); @@ -2214,7 +2215,7 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) { actor = NULL; if (actorCtx->targetCtx.unk_4B != 0) { actorCtx->targetCtx.unk_4B = 0; - func_80078884(NA_SE_SY_LOCK_OFF); + Sfx_PlaySfxCentered(NA_SE_SY_LOCK_OFF); } } @@ -2316,13 +2317,13 @@ void func_80030ED8(Actor* actor) { Audio_PlaySfxGeneral(actor->sfx, &actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } else if (actor->flags & ACTOR_FLAG_20) { - func_80078884(actor->sfx); + Sfx_PlaySfxCentered(actor->sfx); } else if (actor->flags & ACTOR_FLAG_21) { - func_800788CC(actor->sfx); + Sfx_PlaySfxCentered2(actor->sfx); } else if (actor->flags & ACTOR_FLAG_28) { func_800F4C58(&gSfxDefaultPos, NA_SE_SY_TIMER - SFX_FLAG, (s8)(actor->sfx - 1)); } else { - func_80078914(&actor->projectedPos, actor->sfx); + Sfx_PlaySfxAtPos(&actor->projectedPos, actor->sfx); } } diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 7e6fb10f03..a57155cf38 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -6220,7 +6220,7 @@ s32 Camera_Demo5(Camera* camera) { framesDiff = sDemo5PrevSfxFrame - camera->play->state.frames; if ((framesDiff > 50) || (framesDiff < -50)) { - func_80078884((u32)camera->data1); + Sfx_PlaySfxCentered((u32)camera->data1); } sDemo5PrevSfxFrame = camera->play->state.frames; @@ -7456,11 +7456,11 @@ s32 Camera_DbgChangeMode(Camera* camera) { if (!gDebugCamEnabled && camera->play->activeCamId == CAM_ID_MAIN) { if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CUP)) { osSyncPrintf("attention sound URGENCY\n"); - func_80078884(NA_SE_SY_ATTENTION_URGENCY); + Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_URGENCY); } if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CDOWN)) { osSyncPrintf("attention sound NORMAL\n"); - func_80078884(NA_SE_SY_ATTENTION_ON); + Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_ON); } if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CRIGHT)) { @@ -7884,7 +7884,7 @@ s32 Camera_ChangeModeFlags(Camera* camera, s16 mode, u8 flags) { if (!((sCameraSettings[camera->setting].unk_00 & 0x3FFFFFFF) & (1 << mode))) { if (mode == CAM_MODE_FIRST_PERSON) { osSyncPrintf("camera: error sound\n"); - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); } if (camera->mode != CAM_MODE_NORMAL) { @@ -7972,20 +7972,20 @@ s32 Camera_ChangeModeFlags(Camera* camera, s16 mode, u8 flags) { if (camera->status == CAM_STAT_ACTIVE) { switch (modeChangeFlags) { case 1: - func_80078884(0); + Sfx_PlaySfxCentered(0); break; case 2: if (camera->play->roomCtx.curRoom.behaviorType1 == ROOM_BEHAVIOR_TYPE1_1) { - func_80078884(NA_SE_SY_ATTENTION_URGENCY); + Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_URGENCY); } else { - func_80078884(NA_SE_SY_ATTENTION_ON); + Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_ON); } break; case 4: - func_80078884(NA_SE_SY_ATTENTION_URGENCY); + Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_URGENCY); break; case 8: - func_80078884(NA_SE_SY_ATTENTION_ON); + Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_ON); break; } } diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 744ac3a5a3..4a85639cf1 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -317,7 +317,7 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) { } if (csCtx->curFrame == 783) { - func_80078884(NA_SE_EV_DEKU_DEATH); + Sfx_PlaySfxCentered(NA_SE_EV_DEKU_DEATH); } else if (csCtx->curFrame == 717) { play->roomCtx.unk_74[0] = 0; } @@ -333,7 +333,7 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) { case CS_MISC_TRIFORCE_FLASH: if (play->roomCtx.unk_74[1] == 0) { - func_80078884(NA_SE_EV_TRIFORCE_FLASH); + Sfx_PlaySfxCentered(NA_SE_EV_TRIFORCE_FLASH); } if (play->roomCtx.unk_74[1] < 255) { @@ -471,7 +471,7 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) { play->envCtx.sandstormState = SANDSTORM_FILL; } - func_800788CC(NA_SE_EV_SAND_STORM - SFX_FLAG); + Sfx_PlaySfxCentered2(NA_SE_EV_SAND_STORM - SFX_FLAG); break; case CS_MISC_SUNSSONG_START: @@ -1435,7 +1435,7 @@ void CutsceneCmd_Transition(PlayState* play, CutsceneContext* csCtx, CsCmdTransi Audio_PlaySfxGeneral(NA_SE_EV_WHITE_OUT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } else if ((lerp == 0.0f) && (play->sceneId == SCENE_INSIDE_GANONS_CASTLE)) { - func_800788CC(NA_SE_EV_WHITE_OUT); + Sfx_PlaySfxCentered2(NA_SE_EV_WHITE_OUT); } } else { play->envCtx.screenFillColor[3] = (1.0f - lerp) * 255.0f; diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 9de3f4c257..97e15a6e25 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -912,10 +912,10 @@ void Environment_Update(PlayState* play, EnvironmentContext* envCtx, LightContex // delaying the chicken crow or dog howl sfx by 15 frames when loading the new area. if (((void)0, gSaveContext.nextDayTime) == (NEXT_TIME_DAY_SET - (15 * 0x10))) { - func_80078884(NA_SE_EV_CHICKEN_CRY_M); + Sfx_PlaySfxCentered(NA_SE_EV_CHICKEN_CRY_M); gSaveContext.nextDayTime = NEXT_TIME_NONE; } else if (((void)0, gSaveContext.nextDayTime) == (NEXT_TIME_NIGHT_SET - (15 * 0x10))) { - func_800788CC(NA_SE_EV_DOG_CRY_EVENING); + Sfx_PlaySfxCentered2(NA_SE_EV_DOG_CRY_EVENING); gSaveContext.nextDayTime = NEXT_TIME_NONE; } } @@ -2122,7 +2122,7 @@ void Environment_PlayTimeBasedSequence(PlayState* play) { case TIMESEQ_NIGHT_BEGIN_SFX: if (gSaveContext.save.dayTime > CLOCK_TIME(18, 0)) { - func_800788CC(NA_SE_EV_DOG_CRY_EVENING); + Sfx_PlaySfxCentered2(NA_SE_EV_DOG_CRY_EVENING); play->envCtx.timeSeqState++; } break; @@ -2158,7 +2158,7 @@ void Environment_PlayTimeBasedSequence(PlayState* play) { gSaveContext.save.totalDays++; gSaveContext.save.bgsDayCount++; gSaveContext.dogIsLost = true; - func_80078884(NA_SE_EV_CHICKEN_CRY_M); + Sfx_PlaySfxCentered(NA_SE_EV_CHICKEN_CRY_M); if ((Inventory_ReplaceItem(play, ITEM_WEIRD_EGG, ITEM_CHICKEN) || Inventory_ReplaceItem(play, ITEM_POCKET_EGG, ITEM_POCKET_CUCCO)) && diff --git a/src/code/z_lib.c b/src/code/z_lib.c index ac5220ab0b..2e00bcd596 100644 --- a/src/code/z_lib.c +++ b/src/code/z_lib.c @@ -590,16 +590,26 @@ void Color_RGBA8_Copy(Color_RGBA8* dst, Color_RGBA8* src) { dst->a = src->a; } -void func_80078884(u16 sfxId) { +/** + * Play a sound effect at the center of the screen. + */ +void Sfx_PlaySfxCentered(u16 sfxId) { Audio_PlaySfxGeneral(sfxId, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } -void func_800788CC(u16 sfxId) { +/** + * Play a sound effect at the center of the screen. Identical to `Sfx_PlaySfxCentered`. + */ +void Sfx_PlaySfxCentered2(u16 sfxId) { Audio_PlaySfxGeneral(sfxId, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } -void func_80078914(Vec3f* arg0, u16 sfxId) { - Audio_PlaySfxGeneral(sfxId, arg0, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); +/** + * Play a sound effect at the requested position. + */ +void Sfx_PlaySfxAtPos(Vec3f* projectedPos, u16 sfxId) { + Audio_PlaySfxGeneral(sfxId, projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, + &gSfxDefaultReverb); } diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index 8f1f07e35c..a1f04093bb 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -508,7 +508,7 @@ void Health_UpdateBeatingHeart(PlayState* play) { interfaceCtx->beatingHeartOscillatorDirection = 0; if (!Player_InCsMode(play) && (play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0) && Health_IsCritical() && !Play_InCsMode(play)) { - func_80078884(NA_SE_SY_HITPOINT_ALARM); + Sfx_PlaySfxCentered(NA_SE_SY_HITPOINT_ALARM); } } } else { diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index cfe61236f1..61548559a7 100644 --- a/src/code/z_onepointdemo.c +++ b/src/code/z_onepointdemo.c @@ -489,7 +489,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act Play_ChangeCameraSetting(play, subCamId, CAM_SET_CS_3); func_8002DF54(play, &player->actor, PLAYER_CSMODE_5); OnePointCutscene_SetCsCamPoints(subCam, D_80120304 | 0x2000, D_80120300, D_8012013C, D_8012021C); - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); OnePointCutscene_Vec3sToVec3f(&mainCam->at, &D_8012013C[D_801202FC - 2].pos); OnePointCutscene_Vec3sToVec3f(&mainCam->eye, &D_8012021C[D_801202FC - 2].pos); D_8012013C[D_801202FC - 3].pos.x += diff --git a/src/code/z_play.c b/src/code/z_play.c index 2a5727d2f4..4e3a7b2869 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -332,7 +332,7 @@ void Play_Init(GameState* thisx) { gSaveContext.sceneLayer == 6) { osSyncPrintf("エンディングはじまるよー\n"); // "The ending starts" ((void (*)(void))0x81000000)(); - osSyncPrintf("出戻り？\n"); // "Return?" + osSyncPrintf("出戻り？\n"); // "Return?" } Cutscene_HandleEntranceTriggers(this); diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c index 34eced1cbc..f30d3ba3d5 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c @@ -233,7 +233,7 @@ void func_8086EE40(BgBombwall* this, PlayState* play) { func_8086EE94(this, play); if (((this->dyna.actor.params >> 0xF) & 1) != 0) { - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } } } diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c index 1df1bf5fcd..8146c75c32 100644 --- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c +++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c @@ -103,7 +103,7 @@ void func_8087B938(BgHaka* this, PlayState* play) { this->dyna.unk_150 = 0.0f; player->stateFlags2 &= ~PLAYER_STATE2_4; if (this->dyna.actor.params == 1) { - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } else if (!IS_DAY && play->sceneId == SCENE_GRAVEYARD) { Actor_Spawn(&play->actorCtx, play, ACTOR_EN_POH, this->dyna.actor.home.pos.x, this->dyna.actor.home.pos.y, this->dyna.actor.home.pos.z, 0, this->dyna.actor.shape.rot.y, 0, 1); diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index 73339585f4..3fd2d74262 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -240,7 +240,7 @@ void BgHakaGate_FloorClosed(BgHakaGate* this, PlayState* play) { sPuzzleState = SKULL_OF_TRUTH_FOUND; this->actionFunc = BgHakaGate_DoNothing; } else { - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_GROUND_GATE_OPEN); DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId); this->vTimer = 60; diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c index 810f28cde4..1a0650e419 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c +++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c @@ -230,6 +230,6 @@ void BgHakaShip_Draw(Actor* thisx, PlayState* play) { sp2C.z = this->dyna.actor.world.pos.z; SkinMatrix_Vec3fMtxFMultXYZ(&play->viewProjectionMtxF, &sp2C, &this->bellSfxPos); - func_80078914(&this->bellSfxPos, NA_SE_EV_SHIP_BELL - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->bellSfxPos, NA_SE_EV_SHIP_BELL - SFX_FLAG); } } diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index 31801401e6..6c302d9a6c 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -544,6 +544,6 @@ void BgHakaTrap_Draw(Actor* thisx, PlayState* play) { sp2C.y = this->dyna.actor.world.pos.y + 110.0f; SkinMatrix_Vec3fMtxFMultXYZ(&play->viewProjectionMtxF, &sp2C, &this->unk_16C); - func_80078914(&this->unk_16C, NA_SE_EV_BRIDGE_CLOSE - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->unk_16C, NA_SE_EV_BRIDGE_CLOSE - SFX_FLAG); } } diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index 2b0af27b10..0ebe93a549 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -161,7 +161,7 @@ void BgHakaTubo_DropCollectible(BgHakaTubo* this, PlayState* play) { if (sPotsDestroyed == 3) { // All 3 pots destroyed collectibleParams = -1; - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); // Drop rupees for (i = 0; i < 9; i++) { collectible = Item_DropCollectible( @@ -177,7 +177,7 @@ void BgHakaTubo_DropCollectible(BgHakaTubo* this, PlayState* play) { Actor_Spawn(&play->actorCtx, play, ACTOR_EN_FIREFLY, this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y + 80.0f, this->dyna.actor.world.pos.z, 0, this->dyna.actor.shape.rot.y, 0, 2); - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); } else { // Random rewards if (rnd < 0.4f) { @@ -189,16 +189,16 @@ void BgHakaTubo_DropCollectible(BgHakaTubo* this, PlayState* play) { } else { collectibleParams = ITEM00_ARROWS_SMALL; } - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } } else if (Flags_GetCollectible(play, this->dyna.actor.params) != 0) { // If small key already collected, drop recovery heart instead collectibleParams = ITEM00_RECOVERY_HEART; - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } else { // Drops a small key and sets a collect flag collectibleParams = ((this->dyna.actor.params & 0x3F) << 8) | ITEM00_SMALL_KEY; - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } if (collectibleParams != -1) { collectible = Item_DropCollectible(play, &spawnPos, collectibleParams); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c index df428affbe..76a9fe86ed 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c @@ -378,7 +378,7 @@ void func_80888A58(BgHidanHamstep* this, PlayState* play) { func_808884C8(this, play); if ((this->dyna.actor.params & 0xFF) == 5) { - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } osSyncPrintf("B(%d)\n", this->dyna.actor.params); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index 268fd1ad6a..c125b879a8 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -312,7 +312,7 @@ void BgHidanKowarerukabe_Update(Actor* thisx, PlayState* play) { SfxSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 40, NA_SE_EV_WALL_BROKEN); } - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); Actor_Kill(&this->dyna.actor); return; } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c index 3f2662597c..9522259a3f 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c @@ -393,7 +393,7 @@ void BgHidanRock_Draw(Actor* thisx, PlayState* play) { SkinMatrix_Vec3fMtxFMultXYZ(&play->viewProjectionMtxF, &this->dyna.actor.home.pos, &this->unk_170); } - func_80078914(&this->unk_170, NA_SE_EV_FIRE_PILLAR - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->unk_170, NA_SE_EV_FIRE_PILLAR - SFX_FLAG); func_8088BC40(play, this); } } diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index 5c55f51bc0..341611055d 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -432,7 +432,7 @@ void BgIceShelter_Melt(BgIceShelter* this, PlayState* play) { } if (type == RED_ICE_KING_ZORA) { - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } Actor_Kill(&this->dyna.actor); diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index 3f1e793dd7..9be8f9db1d 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -278,7 +278,7 @@ void BgJyaMegami_Explode(BgJyaMegami* this, PlayState* play) { func_80033480(play, &sp8C, 100.0f, 1, 150, 100, 1); } if (this->explosionTimer == 60) { - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } if (this->explosionTimer >= 100) { Actor_Kill(&this->dyna.actor); diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c index 5a42618da2..6287d35215 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c @@ -108,7 +108,7 @@ void BgMenkuriEye_Update(Actor* thisx, PlayState* play) { this->framesUntilDisable = 416; if (D_8089C1A0 == 4) { Flags_SetSwitch(play, this->actor.params); - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } } if (this->framesUntilDisable == -1) { diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c index 0e39f4c454..79fbaaa3d0 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c @@ -203,7 +203,7 @@ void func_808A3E54(BgMoriHineri* this, PlayState* play) { this->moriHineriObjIdx = objBankIndex; this->dyna.actor.params ^= 1; sSubCamId = SUB_CAM_ID_DONE; - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } else { this->dyna.actor.draw = NULL; this->actionFunc = func_808A3D58; diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c index 5ec51ceed3..ea22541703 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c @@ -133,9 +133,9 @@ void BgMoriIdomizu_Main(BgMoriIdomizu* this, PlayState* play) { BgMoriIdomizu_SetWaterLevel(play, thisx->world.pos.y); if (this->drainTimer > 0) { if (switchFlagSet) { - func_800788CC(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); + Sfx_PlaySfxCentered2(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } else { - func_800788CC(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); + Sfx_PlaySfxCentered2(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } } } diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c index ca504c1b57..07276e6e61 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c @@ -136,11 +136,11 @@ void BgMoriKaitenkabe_Rotate(BgMoriKaitenkabe* this, PlayState* play) { thisx->home.rot.y -= 0x2000; } thisx->world.rot.y = thisx->shape.rot.y = thisx->home.rot.y; - func_800788CC(NA_SE_EV_STONEDOOR_STOP); + Sfx_PlaySfxCentered2(NA_SE_EV_STONEDOOR_STOP); } else { rotY = this->rotYdeg * (0x10000 / 360.0f); thisx->world.rot.y = thisx->shape.rot.y = thisx->home.rot.y + rotY; - func_800788CC(NA_SE_EV_WALL_SLIDE - SFX_FLAG); + Sfx_PlaySfxCentered2(NA_SE_EV_WALL_SLIDE - SFX_FLAG); } if (fabsf(this->dyna.unk_150) > 0.001f) { this->dyna.unk_150 = 0.0f; diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index 8b3bdab9e8..1ec1cc9a5d 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -133,7 +133,7 @@ void BgMoriRakkatenjo_Wait(BgMoriRakkatenjo* this, PlayState* play) { } } if (this->timer < 20) { - func_800788CC(NA_SE_EV_BLOCKSINK - SFX_FLAG); + Sfx_PlaySfxCentered2(NA_SE_EV_BLOCKSINK - SFX_FLAG); } } @@ -156,7 +156,7 @@ void BgMoriRakkatenjo_Fall(BgMoriRakkatenjo* this, PlayState* play) { } else { if (this->bounceCount == 0) { this->fallCount++; - func_800788CC(NA_SE_EV_STONE_BOUND); + Sfx_PlaySfxCentered2(NA_SE_EV_STONE_BOUND); Rumble_Request(SQ(thisx->yDistToPlayer), 255, 20, 150); } thisx->world.pos.y = diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index 67d54a21f3..af1e472525 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -341,7 +341,7 @@ void BgPoEvent_BlockIdle(BgPoEvent* this, PlayState* play) { if (amy != NULL) { OnePointCutscene_Init(play, 3170, 30, amy, CAM_ID_MAIN); } - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); gSaveContext.timerState = TIMER_STATE_STOP; } } else { @@ -535,7 +535,7 @@ void BgPoEvent_PaintingPresent(BgPoEvent* this, PlayState* play) { Actor_Spawn(&play->actorCtx, play, ACTOR_EN_PO_SISTERS, thisx->world.pos.x, thisx->world.pos.y - 40.0f, thisx->world.pos.z, 0, thisx->shape.rot.y, 0, thisx->params + ((this->type - 1) << 8)); OnePointCutscene_Init(play, 3160, 80, thisx, CAM_ID_MAIN); - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } else { Actor_PlaySfx(thisx, NA_SE_EN_PO_LAUGH2); diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c index 63abc030c6..08f9c25bff 100644 --- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c +++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c @@ -148,7 +148,7 @@ void func_808A9234(BgRelayObjects* this, PlayState* play) { Rumble_Request(this->dyna.actor.xyzDistToPlayerSq, 180, 20, 100); Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_STONE_BOUND); if (this->unk_169 != play->roomCtx.curRoom.num) { - func_800788CC(NA_SE_EN_PO_LAUGH); + Sfx_PlaySfxCentered2(NA_SE_EN_PO_LAUGH); this->timer = 5; this->actionFunc = func_808A932C; return; @@ -171,7 +171,7 @@ void func_808A932C(BgRelayObjects* this, PlayState* play) { } if (this->timer == 0) { if (!Player_InCsMode(play)) { - func_80078884(NA_SE_OC_ABYSS); + Sfx_PlaySfxCentered(NA_SE_OC_ABYSS); Play_TriggerRespawn(play); this->actionFunc = BgRelayObjects_DoNothing; } diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index dc7ae8fde5..4296cbe7c8 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -49,7 +49,7 @@ ActorInit Bg_Spot01_Idohashira_InitVars = { }; void BgSpot01Idohashira_PlayBreakSfx1(BgSpot01Idohashira* this) { - func_80078914(&this->dyna.actor.projectedPos, NA_SE_EV_BOX_BREAK); + Sfx_PlaySfxAtPos(&this->dyna.actor.projectedPos, NA_SE_EV_BOX_BREAK); } void BgSpot01Idohashira_PlayBreakSfx2(BgSpot01Idohashira* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index b303737467..3f1fbe432f 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c @@ -208,7 +208,7 @@ void func_808ACC34(BgSpot02Objects* this, PlayState* play) { } if (play->csCtx.curFrame == 245 || play->csCtx.curFrame == 351) { - func_800788CC(NA_SE_EV_LIGHTNING); + Sfx_PlaySfxCentered2(NA_SE_EV_LIGHTNING); } } diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index 9997c3a2bc..9e16602841 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -186,7 +186,7 @@ void BgSpot08Bakudankabe_Update(Actor* thisx, PlayState* play) { func_808B0324(this, play); Flags_SetSwitch(play, (this->dyna.actor.params & 0x3F)); SfxSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 40, NA_SE_EV_WALL_BROKEN); - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); Actor_Kill(&this->dyna.actor); } else if (this->dyna.actor.xzDistToPlayer < 800.0f) { CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base); diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index 074f5c5301..5983a7a0e1 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -138,7 +138,7 @@ void BgSpot11Bakudankabe_Update(Actor* thisx, PlayState* play) { func_808B2218(this, play); Flags_SetSwitch(play, (this->dyna.actor.params & 0x3F)); SfxSource_PlaySfxAtFixedWorldPos(play, &D_808B2738, 40, NA_SE_EV_WALL_BROKEN); - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); Actor_Kill(&this->dyna.actor); return; } diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c index 1631b3f3ac..e085137fe4 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c @@ -109,7 +109,7 @@ void func_808B29F0(BgSpot11Oasis* this, PlayState* play) { func_808B2AA8(this); Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ELF, this->actor.world.pos.x, this->actor.world.pos.y + 40.0f, this->actor.world.pos.z, 0, 0, 0, FAIRY_SPAWNER); - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } func_808B27F0(play, this->actor.world.pos.y); } diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index 1ccc86fdc4..6023ab6b9e 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -286,7 +286,7 @@ void func_808B4194(BgSpot15Rrbox* this, PlayState* play) { Actor_PlaySfx(actor, NA_SE_EV_WOOD_BOUND); } if (func_808B3A40(this, play)) { - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } actor->home.pos.x = actor->world.pos.x; actor->home.pos.z = actor->world.pos.z; diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index bf5f5d3236..10d1059998 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -472,7 +472,7 @@ void func_808B5A94(BgSpot16Bombstone* this, PlayState* play) { func_808B5240(this, play); if (this->unk_154 == 56) { - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } if (this->unk_154 > 60) { diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c index 655d14a016..1b5ba7bf65 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c @@ -117,7 +117,7 @@ void BgSpot17Bakudankabe_Update(Actor* thisx, PlayState* play) { func_808B6BC0(this, play); Flags_SetSwitch(play, (this->dyna.actor.params & 0x3F)); SfxSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 40, NA_SE_EV_WALL_BROKEN); - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); Actor_Kill(&this->dyna.actor); } } diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index 099754054c..7557c7a5a4 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -415,9 +415,9 @@ void func_808B81A0(BgSpot18Basket* this, PlayState* play) { } } else if (this->unk_216 == 2) { if (this->unk_218 == 2) { - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } else { - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } } else if (this->unk_216 == 200) { func_808B7BB0(this); diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index 8531ca1b31..82c3b10931 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -258,7 +258,7 @@ void func_808B8F08(BgSpot18Obj* this, PlayState* play) { this->dyna.unk_150 = 0.0f; player->stateFlags2 &= ~PLAYER_STATE2_4; Flags_SetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F); - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); } else { func_8002F974(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c index 9b7b452979..72848df393 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c @@ -148,7 +148,7 @@ void func_808BF078(BgYdanMaruta* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->unk_16A = 20; Flags_SetSwitch(play, this->switchFlag); - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); this->actionFunc = func_808BF108; OnePointCutscene_Init(play, 3010, 50, &this->dyna.actor, CAM_ID_MAIN); } else { diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c index 8831c99ff2..3c2038d725 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c @@ -169,7 +169,7 @@ void BgYdanSp_UpdateFloorWebCollision(BgYdanSp* this) { void BgYdanSp_BurnWeb(BgYdanSp* this, PlayState* play) { this->timer = 30; this = this; - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); Flags_SetSwitch(play, this->isDestroyedSwitchFlag); if (this->dyna.actor.params == WEB_FLOOR) { this->actionFunc = BgYdanSp_BurnFloorWeb; @@ -252,7 +252,7 @@ void BgYdanSp_FloorWebBreaking(BgYdanSp* this, PlayState* play) { if (this->dyna.actor.home.pos.y - this->dyna.actor.world.pos.y > 190.0f) { DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId); this->timer = 40; - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); Flags_SetSwitch(play, this->isDestroyedSwitchFlag); this->actionFunc = BgYdanSp_FloorWebBroken; pos.y = this->dyna.actor.world.pos.y - 60.0f; diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 2cffd30c8e..6f7efefd97 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -670,7 +670,7 @@ void BossDodongo_Walk(BossDodongo* this, PlayState* play) { } if (this->unk_1BC != 0) { - func_80078884(NA_SE_EN_DODO_K_WALK); + Sfx_PlaySfxCentered(NA_SE_EN_DODO_K_WALK); } else { Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_K_WALK); } diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index a6f6fd8b33..d920235bda 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -691,7 +691,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) { this->fwork[GDF_TRIFORCE_PRIM_A] = 0.0f; this->fwork[GDF_TRIFORCE_PRIM_B] = 255.0f; this->fwork[GDF_TRIFORCE_ENV_G] = 100.0f; - func_80078884(NA_SE_EV_TRIFORCE_MARK); + Sfx_PlaySfxCentered(NA_SE_EV_TRIFORCE_MARK); play->envCtx.lightBlend = 0.0f; FALLTHROUGH; case 7: @@ -738,7 +738,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) { this->fwork[GDF_TRIFORCE_PRIM_A] = 0.0f; this->fwork[GDF_TRIFORCE_PRIM_B] = 255.0f; this->fwork[GDF_TRIFORCE_ENV_G] = 100.0f; - func_80078884(NA_SE_EV_TRIFORCE_MARK); + Sfx_PlaySfxCentered(NA_SE_EV_TRIFORCE_MARK); play->envCtx.lightBlend = 0.0f; FALLTHROUGH; case 9: @@ -943,7 +943,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) { if (this->csTimer >= 30) { if (this->csTimer == 30) { - func_80078884(NA_SE_EV_TRIFORCE_MARK); + Sfx_PlaySfxCentered(NA_SE_EV_TRIFORCE_MARK); } // fade in ganondorf's triforce @@ -1435,7 +1435,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) { this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.2f; - func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG); skip_cam_and_quake: this->envLightMode = 15; @@ -1482,7 +1482,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) { } this->unk_70C = Math_SinS(this->csTimer * 0x6300) * this->unk_710; - func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG); if (this->csTimer < 100) { this->windowShatterState = GDF_WINDOW_SHATTER_PARTIAL; @@ -1679,7 +1679,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) { case 1055: this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.3f; - func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG); if (this->csTimer == 20) { sZelda->unk_3C8 = 5; @@ -1694,7 +1694,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) { case 1056: this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.3f; - func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG); this->csCamEye.x = -503.0f; this->csCamEye.y = 4128.0f; @@ -1712,7 +1712,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) { case 1057: this->unk_70C = Math_SinS(this->csTimer * 0x6300) * (50.0f * this->csCamMovementScale); - func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG); Math_ApproachF(&this->csCamEye.x, -1200.0f, 0.1f, this->csCamMovementScale * 697.0f); Math_ApproachF(&this->csCamEye.y, 4241.0f, 0.1f, this->csCamMovementScale * 113.0f); @@ -1736,7 +1736,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) { this->csCamAt.z = sZelda->actor.world.pos.z - 25.0f; this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.3f; - func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG); if (this->csTimer == 70) { sZelda->unk_3C8 = 6; @@ -1756,7 +1756,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) { case 107: this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.8f; - func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG); this->csCamEye.x = -380.0f; this->csCamEye.y = 4154.0f; @@ -1775,7 +1775,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) { case 108: this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.8f; - func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG); this->csCamAt.x = (sZelda->actor.world.pos.x - 5.0f) - 30.0f; this->csCamAt.y = (sZelda->actor.world.pos.y + 40.0f + 5.0f) - 20.0f; @@ -1798,7 +1798,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) { break; case 109: - func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG); break; } @@ -2241,7 +2241,7 @@ void BossGanon_Wait(BossGanon* this, PlayState* play) { this->actor.world.pos.y += this->actor.velocity.y; Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 5, 0xBB8); - func_80078914(&this->actor.projectedPos, NA_SE_EN_FANTOM_FLOAT - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EN_FANTOM_FLOAT - SFX_FLAG); } void BossGanon_SetupChargeLightBall(BossGanon* this, PlayState* play) { @@ -2738,7 +2738,7 @@ void BossGanon_UpdateDamage(BossGanon* this, PlayState* play) { BossGanon_SetupDeathCutscene(this, play); Actor_PlaySfx(&this->actor, NA_SE_EN_GANON_DEAD); Actor_PlaySfx(&this->actor, NA_SE_EN_GANON_DD_THUNDER); - func_80078914(&sZeroVec, NA_SE_EN_LAST_DAMAGE); + Sfx_PlaySfxAtPos(&sZeroVec, NA_SE_EN_LAST_DAMAGE); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 1); this->screenFlashTimer = 4; } else { @@ -2919,7 +2919,7 @@ void BossGanon_Update(Actor* thisx, PlayState* play2) { // player hit, spawn shock and play sound effect if (this->unk_2E8 != 0) { - func_80078914(&player->actor.projectedPos, NA_SE_PL_SPARK - SFX_FLAG); + Sfx_PlaySfxAtPos(&player->actor.projectedPos, NA_SE_PL_SPARK - SFX_FLAG); BossGanonEff_SpawnShock(play, 700.0f, GDF_SHOCK_PLAYER_YELLOW); } } @@ -4229,8 +4229,8 @@ void func_808E1EB4(Actor* thisx, PlayState* play2) { this->actor.speed = 0.0f; if (this->actor.params == 0xC8) { - func_80078884(NA_SE_EN_GANON_DAMAGE2); - func_80078884(NA_SE_EN_GANON_DD_THUNDER); + Sfx_PlaySfxCentered(NA_SE_EN_GANON_DAMAGE2); + Sfx_PlaySfxCentered(NA_SE_EN_GANON_DD_THUNDER); for (i = 0; i < 150; i++) { @@ -4735,7 +4735,7 @@ void BossGanon_UpdateEffects(PlayState* play) { Math_ApproachF(&eff->unk_40, 4.0f, 1.0f, 0.15f); } else if (eff->type == GDF_EFF_IMPACT_DUST_LIGHT) { if (i == 0) { - func_80078884(NA_SE_EN_GANON_WAVE_GND - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EN_GANON_WAVE_GND - SFX_FLAG); } eff->unk_30++; // unused diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index d62fbae4c8..04c71324a1 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -295,7 +295,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) { Math_ApproachF(&this->subCamAt.y, player->actor.world.pos.y + 47.0f + 7.0f, 0.1f, 2.0f); this->unk_339 = 4; if (this->unk_398 == 10) { - func_80078914(&D_80906D6C, NA_SE_EV_STONE_BOUND); + Sfx_PlaySfxAtPos(&D_80906D6C, NA_SE_EV_STONE_BOUND); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0); } if (this->unk_398 == 20) { @@ -359,7 +359,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) { this->subCamAt.y = (player->actor.world.pos.y + 200.0f) - 160.0f; this->subCamAt.z = player->actor.world.pos.z; if (this->unk_398 >= 20) { - func_80078884(NA_SE_EN_GOMA_LAST - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EN_GOMA_LAST - SFX_FLAG); Math_ApproachF(&this->unk_324, 255.0f, 1.0f, 10.0f); this->unk_339 = 5; if (this->unk_398 == 20) { @@ -380,7 +380,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) { break; case 11: this->unk_339 = 5; - func_80078884(NA_SE_EN_GOMA_LAST - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EN_GOMA_LAST - SFX_FLAG); player->actor.world.pos.x = 490.0f; player->actor.world.pos.y = 1086.0f; player->actor.world.pos.z = -166.0f; @@ -396,10 +396,10 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) { this->subCamAt.y = ((player->actor.world.pos.y + 200.0f) - 151.0f) - 2.0f; this->subCamAt.z = player->actor.world.pos.z + 2.0f; if (this->unk_398 == 10) { - func_80078914(&D_80906D6C, NA_SE_EV_STONE_BOUND); + Sfx_PlaySfxAtPos(&D_80906D6C, NA_SE_EV_STONE_BOUND); } if (this->unk_398 == 20) { - func_80078884(NA_SE_EV_STONE_BOUND); + Sfx_PlaySfxCentered(NA_SE_EV_STONE_BOUND); } if (this->unk_398 == 30) { func_8002DF54(play, &this->actor, PLAYER_CSMODE_82); @@ -434,7 +434,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) { Rumble_Override(0.0f, 200, 20, 20); } if (this->unk_398 == 30) { - func_80078884(NA_SE_EV_GRAVE_EXPLOSION); + Sfx_PlaySfxCentered(NA_SE_EV_GRAVE_EXPLOSION); } if (this->unk_398 >= 30) { Math_ApproachF(&this->actor.world.pos.y, 1289.0f, 0.1f, 10.0f); @@ -693,8 +693,8 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) { this->unk_312 = 2; } if ((this->unk_398 == 166) || (this->unk_398 == 185) || (this->unk_398 == 200)) { - func_80078884(NA_SE_EN_MGANON_SWORD); - func_80078884(NA_SE_EN_MGANON_ROAR); + Sfx_PlaySfxCentered(NA_SE_EN_MGANON_SWORD); + Sfx_PlaySfxCentered(NA_SE_EN_MGANON_ROAR); } if (this->unk_398 == 215) { this->unk_39C = 23; @@ -708,8 +708,8 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) { this->unk_312 = 2; } if (this->unk_398 == 222) { - func_80078884(NA_SE_EN_MGANON_SWORD); - func_80078884(NA_SE_EN_MGANON_ROAR); + Sfx_PlaySfxCentered(NA_SE_EN_MGANON_SWORD); + Sfx_PlaySfxCentered(NA_SE_EN_MGANON_ROAR); } this->subCamEye.x = (player->actor.world.pos.x - 40.0f) + 6.0f; this->subCamEye.y = player->actor.world.pos.y + 40.0f; @@ -718,7 +718,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) { this->subCamAt.y = ((player->actor.world.pos.y + 10.0f + 60.0f) - 20.0f) - 2.0f; this->subCamAt.z = player->actor.world.pos.z; if (this->unk_398 == 228) { - func_80078884(NA_SE_IT_SHIELD_REFLECT_SW); + Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_REFLECT_SW); func_8002DF54(play, &this->actor, PLAYER_CSMODE_86); Rumble_Override(0.0f, 255, 10, 50); } @@ -753,7 +753,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) { this->subCamEye.z = effects[0].position.z + 70.0f; } if ((this->unk_398 & 3) == 0) { - func_80078884(NA_SE_IT_SWORD_SWING); + Sfx_PlaySfxCentered(NA_SE_IT_SWORD_SWING); } if (this->unk_398 == 25) { func_8002DF54(play, &this->actor, PLAYER_CSMODE_87); @@ -935,11 +935,11 @@ void func_808FF898(BossGanon2* this, PlayState* play) { } if (this->unk_392 == 4) { - func_80078884(NA_SE_EV_GRAVE_EXPLOSION); + Sfx_PlaySfxCentered(NA_SE_EV_GRAVE_EXPLOSION); } if (this->unk_392 == 3) { - func_80078884(NA_SE_EN_MGANON_SWDIMP); + Sfx_PlaySfxCentered(NA_SE_EN_MGANON_SWDIMP); } } } @@ -1309,7 +1309,7 @@ void func_80900890(BossGanon2* this, PlayState* play) { FALLTHROUGH; case 1: if (this->unk_1A2[1] == 50) { - func_80078884(NA_SE_EN_MGANON_WALK); + Sfx_PlaySfxCentered(NA_SE_EN_MGANON_WALK); } Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y) + 0.3f, MTXMODE_NEW); sp5C.x = 0.0f; @@ -1506,12 +1506,12 @@ void func_8090120C(BossGanon2* this, PlayState* play) { Math_ApproachZeroF(&play->envCtx.lightBlend, 1.0f, 0.08f); } if (this->unk_398 == 50) { - func_80078884(NA_SE_EN_MGANON_WALK); + Sfx_PlaySfxCentered(NA_SE_EN_MGANON_WALK); } if (this->unk_398 > 90) { Math_ApproachF(&this->unk_380, 0.25f, 1.0f, 0.0125f); this->unk_37C = 200.0f; - func_80078884(NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); } if (this->unk_398 >= 110) { if (this->unk_398 == 110) { @@ -1546,7 +1546,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) { case 2: this->unk_339 = 22; Math_ApproachF(&play->envCtx.lightBlend, 1.0f, 1.0f, 0.1f); - func_80078884(NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); this->subCamEye.x = 250; this->subCamEye.y = 1150.0f; this->subCamEye.z = 0.0f; @@ -1560,7 +1560,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) { break; case 3: this->unk_339 = 22; - func_80078884(NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); this->subCamEye.x = 330.0f; this->subCamEye.y = 1120.0f; this->subCamEye.z = -150.0f; @@ -1597,7 +1597,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) { this->unk_339 = 23; if ((this->unk_398 >= 60) && (this->unk_398 <= 90)) { if (this->unk_398 == 62) { - func_80078884(NA_SE_EV_TRIFORCE_FLASH); + Sfx_PlaySfxCentered(NA_SE_EV_TRIFORCE_FLASH); } Math_ApproachF(&this->unk_38C, 200.0f, 1.0f, 8.0f); } else { @@ -1657,12 +1657,12 @@ void func_8090120C(BossGanon2* this, PlayState* play) { player->actor.shape.rot.y = -0x4000; player->actor.world.pos.z = 30.0f; if ((this->unk_398 == 20) || (this->unk_398 == 30) || (this->unk_398 == 65) || (this->unk_398 == 40)) { - func_80078884(NA_SE_VO_LI_SWORD_N); - func_80078884(NA_SE_IT_SWORD_SWING_HARD); + Sfx_PlaySfxCentered(NA_SE_VO_LI_SWORD_N); + Sfx_PlaySfxCentered(NA_SE_IT_SWORD_SWING_HARD); } if ((this->unk_398 == 22) || (this->unk_398 == 35) || (this->unk_398 == 72) || (this->unk_398 == 45)) { - func_80078884(NA_SE_EN_MGANON_DAMAGE); - func_80078884(NA_SE_IT_SHIELD_BOUND); + Sfx_PlaySfxCentered(NA_SE_EN_MGANON_DAMAGE); + Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_BOUND); play->envCtx.lightBlend = 1.0f; } if ((this->unk_398 == 22) || (this->unk_398 == 35) || (this->unk_398 == 72) || (this->unk_398 == 45)) { @@ -2005,7 +2005,7 @@ void BossGanon2_Update(Actor* thisx, PlayState* play) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { if (this->actor.velocity.y < -5.0f) { Actor_RequestQuakeAndRumble(&this->actor, play, 5, 20); - func_80078884(NA_SE_IT_BOMB_EXPLOSION); + Sfx_PlaySfxCentered(NA_SE_IT_BOMB_EXPLOSION); } this->actor.velocity.y = 0.0f; } @@ -2091,7 +2091,7 @@ void BossGanon2_Update(Actor* thisx, PlayState* play) { if (Rand_ZeroOne() < 0.5f) { D_8090EB20.z = Rand_ZeroFloat(1000.0f); } - func_80078914(&D_8090EB20, NA_SE_EV_LIGHTNING); + Sfx_PlaySfxAtPos(&D_8090EB20, NA_SE_EV_LIGHTNING); this->unk_328 = 0xFF; this->unk_330 = 5; this->unk_32C = 0.0f; @@ -2856,7 +2856,7 @@ void BossGanon2_UpdateEffects(BossGanon2* this, PlayState* play) { if (effect->velocity.y < -10.0f) { sp78 = effect->position; sp78.y = 1086.0f; - func_80078884(NA_SE_IT_SHIELD_REFLECT_SW); + Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_REFLECT_SW); CollisionCheck_SpawnShieldParticlesMetal(play, &sp78); } effect->velocity.y = 0.0f; diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index 48d49b5f43..9e2cb7d8c9 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -358,7 +358,7 @@ void BossGanondrof_Intro(BossGanondrof* this, PlayState* play) { } if (this->timers[1] == 30) { - func_80078914(&sAudioVec, NA_SE_EN_FANTOM_TRANSFORM); + Sfx_PlaySfxAtPos(&sAudioVec, NA_SE_EN_FANTOM_TRANSFORM); } if (horse->bossGndSignal == FHG_LIGHTNING) { diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index ef7b74aa55..7cf1166024 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -594,7 +594,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { case MO_TENT_READY: case MO_TENT_SWING: if (sMorphaCore->csState == MO_BATTLE) { - func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_APPEAR - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_APPEAR - SFX_FLAG); } Math_ApproachF(&this->waterLevelMod, -5.0f, 0.1f, 0.4f); for (indS1 = 0; indS1 < 41; indS1++) { @@ -647,7 +647,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { break; case MO_TENT_ATTACK: this->actor.flags |= ACTOR_FLAG_24; - func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_ATTACK - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_ATTACK - SFX_FLAG); Math_ApproachF(&this->waterLevelMod, -5.0f, 0.1f, 0.4f); for (indS1 = 0; indS1 < 41; indS1++) { Math_ApproachF(&this->tentStretch[indS1].y, @@ -729,7 +729,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { if (play->grabPlayer(play, player)) { player->actor.parent = &this->actor; this->work[MO_TENT_ACTION_STATE] = MO_TENT_GRAB; - func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_CATCH); + Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_CATCH); Audio_PlaySfxGeneral(NA_SE_VO_LI_DAMAGE_S, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); @@ -861,7 +861,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { } break; case MO_TENT_CUT: - func_80078914(&this->tentTipPos, NA_SE_EV_WATER_WALL - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EV_WATER_WALL - SFX_FLAG); if (&this->actor == player->actor.parent) { player->unk_850 = 0x65; player->actor.parent = NULL; @@ -1079,7 +1079,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { this->drawActor = false; this->work[MO_TENT_ACTION_STATE] = MO_TENT_DEATH_6; this->timers[0] = 60; - func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_CORE_JUMP); + Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_CORE_JUMP); for (indS1 = 0; indS1 < 300; indS1++) { spC8.x = 0.0; spC8.y = 0.0; @@ -1150,7 +1150,7 @@ void BossMo_TentCollisionCheck(BossMo* this, PlayState* play) { hurtbox = this->tentCollider.elements[i1].info.acHitInfo; this->work[MO_TENT_INVINC_TIMER] = 5; if (hurtbox->toucher.dmgFlags & DMG_MAGIC_FIRE) { - func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_CUT); + Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_CUT); this->cutIndex = 15; this->meltIndex = this->cutIndex + 1; this->work[MO_TENT_ACTION_STATE] = MO_TENT_CUT; @@ -1262,7 +1262,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) { EffectSsBubble_Spawn(play, &bubblePos, 0.0f, 10.0f, 50.0f, Rand_ZeroFloat(0.05f) + 0.13f); } if (this->timers[2] == 40) { - func_80078914(&sAudioZeroVec, NA_SE_EN_MOFER_BUBLE_DEMO); + Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EN_MOFER_BUBLE_DEMO); } break; case MO_INTRO_SWIM: @@ -1295,7 +1295,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) { Math_ApproachF(&this->subCamVelFactor, 0.02f, 1.0f, 0.001f); } if (this->work[MO_TENT_MOVE_TIMER] == 190) { - func_80078914(&sAudioZeroVec, NA_SE_EN_MOFER_BUBLE_DEMO); + Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EN_MOFER_BUBLE_DEMO); } if ((this->work[MO_TENT_MOVE_TIMER] > 150) && (this->work[MO_TENT_MOVE_TIMER] < 180)) { bubblePos2.x = (this->subCamEye.x + 20.0f) + 10.0f; @@ -1489,9 +1489,9 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) { } if ((this->csState > MO_INTRO_START) && (this->work[MO_TENT_MOVE_TIMER] > 540)) { - func_80078914(&sMorphaTent1->tentTipPos, NA_SE_EN_MOFER_APPEAR - SFX_FLAG); + Sfx_PlaySfxAtPos(&sMorphaTent1->tentTipPos, NA_SE_EN_MOFER_APPEAR - SFX_FLAG); } else if (this->csState >= MO_INTRO_START) { - func_80078914(&sAudioZeroVec, NA_SE_EN_MOFER_MOVE_DEMO - SFX_FLAG); + Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EN_MOFER_MOVE_DEMO - SFX_FLAG); } } @@ -1693,13 +1693,13 @@ void BossMo_DeathCs(BossMo* this, PlayState* play) { } if ((this->csState > MO_DEATH_START) && (this->csState < MO_DEATH_FINISH)) { if (this->work[MO_TENT_MOVE_TIMER] < 500) { - func_80078914(&sAudioZeroVec, NA_SE_EN_MOFER_APPEAR - SFX_FLAG); + Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EN_MOFER_APPEAR - SFX_FLAG); } if ((this->work[MO_TENT_MOVE_TIMER] < 490) && (this->work[MO_TENT_MOVE_TIMER] > 230)) { - func_80078914(&sAudioZeroVec, NA_SE_EV_DROP_FALL - SFX_FLAG); + Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EV_DROP_FALL - SFX_FLAG); } if (this->work[MO_TENT_MOVE_TIMER] < 220) { - func_80078914(&sAudioZeroVec, NA_SE_EV_SCOOPUP_WATER - SFX_FLAG); + Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EV_SCOOPUP_WATER - SFX_FLAG); } } if (sMorphaCore->waterLevel < -200.0f) { @@ -1795,7 +1795,7 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) { this->work[MO_TENT_INVINC_TIMER] = 10; } else if (!(hurtbox->toucher.dmgFlags & DMG_SHIELD) && (hurtbox->toucher.dmgFlags & DMG_HOOKSHOT)) { if (this->work[MO_TENT_ACTION_STATE] >= MO_CORE_ATTACK) { - func_80078914(&sMorphaTent1->tentTipPos, NA_SE_EN_MOFER_CUT); + Sfx_PlaySfxAtPos(&sMorphaTent1->tentTipPos, NA_SE_EN_MOFER_CUT); sMorphaTent1->cutIndex = this->work[MO_CORE_POS_IN_TENT]; sMorphaTent1->meltIndex = sMorphaTent1->cutIndex + 1; sMorphaTent1->cutScale = 1.0f; @@ -2361,7 +2361,7 @@ void BossMo_UpdateTent(Actor* thisx, PlayState* play) { } else { i = 0; if (this->work[MO_TENT_ACTION_STATE] < MO_TENT_CUT) { - func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_CORE_ROLL - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_CORE_ROLL - SFX_FLAG); } } bubblePos.x = this->tentPos[i].x + sp7C.x; @@ -3582,7 +3582,7 @@ void BossMo_Unknown(void) { if (BREG(32) != 0) { BREG(32)--; SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 1); - func_80078914(&zeroVec, unkSfx[BREG(33)]); + Sfx_PlaySfxAtPos(&zeroVec, unkSfx[BREG(33)]); } if (BREG(34) != 0) { BREG(34) = 0; diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index fe2d9cdabe..351832258e 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -2512,7 +2512,7 @@ void BossSst_HandSetInvulnerable(BossSst* this, s32 isInv) { } void BossSst_HeadSfx(BossSst* this, u16 sfxId) { - func_80078914(&this->center, sfxId); + Sfx_PlaySfxAtPos(&this->center, sfxId); } void BossSst_HandCollisionCheck(BossSst* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 67b9086c11..1d3e2bd39e 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -881,7 +881,7 @@ s32 BossTw_CheckBeamReflection(BossTw* this, PlayState* play) { BossTw_AddShieldDeflectEffect(play, 10.0f, this->actor.params); play->envCtx.lightBlend = 1.0f; this->timers[0] = 10; - func_80078884(NA_SE_IT_SHIELD_REFLECT_MG2); + Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_REFLECT_MG2); } sBeamDivertTimer++; @@ -1108,7 +1108,7 @@ void BossTw_ShootBeam(BossTw* this, PlayState* play) { } this->beamShootState = 1; - func_80078914(&player->actor.projectedPos, NA_SE_IT_SHIELD_REFLECT_MG); + Sfx_PlaySfxAtPos(&player->actor.projectedPos, NA_SE_IT_SHIELD_REFLECT_MG); Matrix_MtxFToYXZRotS(&player->shieldMf, &sp128, 0); sp128.y += 0x8000; sp128.x = -sp128.x; @@ -1698,7 +1698,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, PlayState* play) { if (this->timers[1] == 8) { this->work[TW_BLINK_IDX] = 8; - func_80078884(NA_SE_EN_TWINROBA_YOUNG_WINK); + Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_YOUNG_WINK); } if (this->timers[2] == 4) { sEnvType = 0; @@ -1776,12 +1776,12 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) { Player* player = GET_PLAYER(play); if (this->csSfxTimer > 220 && this->csSfxTimer < 630) { - func_80078884(NA_SE_EN_TWINROBA_UNARI - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_UNARI - SFX_FLAG); } if (this->csSfxTimer == 180) { - func_80078914(&D_8094A7D0, NA_SE_EN_TWINROBA_LAUGH); - func_80078914(&D_8094A7D0, NA_SE_EN_TWINROBA_LAUGH2); + Sfx_PlaySfxAtPos(&D_8094A7D0, NA_SE_EN_TWINROBA_LAUGH); + Sfx_PlaySfxAtPos(&D_8094A7D0, NA_SE_EN_TWINROBA_LAUGH2); SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_KOTAKE_KOUME); } @@ -1842,7 +1842,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) { } if (this->work[CS_TIMER_1] == 180) { - func_80078884(NA_SE_EN_TWINROBA_APPEAR_MS); + Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_APPEAR_MS); } if (this->work[CS_TIMER_1] > 180) { @@ -2455,7 +2455,7 @@ void BossTw_DeathCSMsgSfx(BossTw* this, PlayState* play) { } if (this->work[CS_TIMER_2] > 440 && this->work[CS_TIMER_2] < 860) { - func_80078884(NA_SE_EN_TWINROBA_FIGHT - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_FIGHT - SFX_FLAG); } if (this->work[CS_TIMER_2] == 430) { @@ -2650,7 +2650,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, PlayState* play) { Vec3f spBC; Vec3f spB0; Vec3f spA4 = { 0.0f, 0.0f, 0.0f }; - func_80078884(NA_SE_EN_TWINROBA_TRANSFORM); + Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_TRANSFORM); for (i = 0; i < 100; i++) { spB0.x = Rand_CenteredFloat(5.0f); spB0.y = Rand_CenteredFloat(5.0f); @@ -2762,7 +2762,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, PlayState* play) { Actor_SetScale(&sKotakePtr->actor, 0.0f); sKoumePtr->visible = 1; sKotakePtr->visible = 1; - func_80078884(NA_SE_EN_TWINROBA_TRANSFORM); + Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_TRANSFORM); SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_KOTAKE_KOUME); this->csState2 = 3; this->work[CS_TIMER_2] = 0; @@ -3162,8 +3162,8 @@ void BossTw_TwinrovaUpdate(Actor* thisx, PlayState* play2) { if (sFreezeState == 1) { sFreezeState = 2; BossTw_AddPlayerFreezeEffect(play, NULL); - func_80078914(&player->actor.projectedPos, NA_SE_VO_LI_FREEZE); - func_80078914(&player->actor.projectedPos, NA_SE_PL_FREEZE); + Sfx_PlaySfxAtPos(&player->actor.projectedPos, NA_SE_VO_LI_FREEZE); + Sfx_PlaySfxAtPos(&player->actor.projectedPos, NA_SE_PL_FREEZE); if (sShieldFireCharge != 0) { sShieldFireCharge = 4; @@ -3686,11 +3686,11 @@ void BossTw_ShieldChargeDraw(BossTw* this, PlayState* play) { temp_t0 = sShieldFireCharge | sShieldIceCharge; if (temp_t0 == 1) { - func_80078884(NA_SE_IT_SHIELD_CHARGE_LV1 & ~SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_CHARGE_LV1 & ~SFX_FLAG); } else if (temp_t0 == 2) { - func_80078884(NA_SE_IT_SHIELD_CHARGE_LV2 & ~SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_CHARGE_LV2 & ~SFX_FLAG); } else if (temp_t0 == 3) { - func_80078884(NA_SE_IT_SHIELD_CHARGE_LV3 & ~SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_CHARGE_LV3 & ~SFX_FLAG); } if (temp_t0 != 0 && temp_t0 < 4) { @@ -4376,7 +4376,7 @@ s32 BossTw_BlastShieldCheck(BossTw* this, PlayState* play) { sEnvType = 0; sShieldIceCharge = 0; sShieldFireCharge = 0; - func_80078884(NA_SE_IT_SHIELD_REFLECT_MG2); + Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_REFLECT_MG2); } ret = true; diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index 3c0c0fd732..7bc4fee6a9 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -231,7 +231,7 @@ void func_80966E98(Demo6K* this, PlayState* play) { } if (this->timer1 == 39) { - func_800788CC(NA_SE_EV_CONSENTRATION); + Sfx_PlaySfxCentered2(NA_SE_EV_CONSENTRATION); Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_6K, this->actor.world.pos.x, this->actor.world.pos.y + 10.0f, this->actor.world.pos.z, 0, 0, 0, 2); } diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index a796f9aeba..112c318088 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -303,14 +303,14 @@ void DemoDu_InitCs_GoronsRuby(DemoDu* this, PlayState* play) { // Cutscene: Darunia gives Link the Goron's Ruby. // Sfx played when Darunia lands at the floor at the start of the cutscene. void DemoDu_CsPlaySfx_GoronLanding(DemoDu* this) { - func_80078914(&this->actor.projectedPos, NA_SE_EN_GOLON_LAND_BIG); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EN_GOLON_LAND_BIG); } // Cutscene: Darunia gives Link the Goron's Ruby. // Sfx played when Darunia is falling at the start of the cutscene. void DemoDu_CsPlaySfx_DaruniaFalling(PlayState* play) { if (play->csCtx.curFrame == 160) { - func_800788CC(NA_SE_EV_OBJECT_FALL); + Sfx_PlaySfxCentered2(NA_SE_EV_OBJECT_FALL); } } @@ -319,14 +319,14 @@ void DemoDu_CsPlaySfx_DaruniaHitsLink(PlayState* play) { Player* player = GET_PLAYER(play); s32 pad; - func_80078914(&player->actor.projectedPos, NA_SE_EN_DARUNIA_HIT_LINK); + Sfx_PlaySfxAtPos(&player->actor.projectedPos, NA_SE_EN_DARUNIA_HIT_LINK); Audio_PlaySfxGeneral(NA_SE_VO_LI_DAMAGE_S_KID, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } // Cutscene: Darunia gives Link the Goron's Ruby. void DemoDu_CsPlaySfx_HitBreast(DemoDu* this) { - func_80078914(&this->actor.projectedPos, NA_SE_EN_DARUNIA_HIT_BREAST - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EN_DARUNIA_HIT_BREAST - SFX_FLAG); } // Cutscene: Darunia gives Link the Goron's Ruby. @@ -709,7 +709,7 @@ void DemoDu_InitCs_AfterGanon(DemoDu* this, PlayState* play) { } void DemoDu_CsPlaySfx_WhiteOut(void) { - func_800788CC(NA_SE_SY_WHITE_OUT_T); + Sfx_PlaySfxCentered2(NA_SE_SY_WHITE_OUT_T); } void DemoDu_CsAfterGanon_SpawnDemo6K(DemoDu* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 0fa769fed9..7b6a93278d 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -627,7 +627,7 @@ void DemoEffect_UpdateGetItem(DemoEffect* this, PlayState* play) { if (gSaveContext.save.entranceIndex == ENTR_TEMPLE_OF_TIME_0) { Actor_PlaySfx(thisx, NA_SE_EV_MEDAL_APPEAR_L - SFX_FLAG); } else { - func_800788CC(NA_SE_EV_MEDAL_APPEAR_S - SFX_FLAG); + Sfx_PlaySfxCentered2(NA_SE_EV_MEDAL_APPEAR_S - SFX_FLAG); } if (this->getItem.drawId != GID_ARROW_LIGHT) { this->actor.shape.rot.y += 0x3E80; @@ -642,7 +642,7 @@ void DemoEffect_UpdateGetItem(DemoEffect* this, PlayState* play) { if (gSaveContext.save.entranceIndex == ENTR_TEMPLE_OF_TIME_0) { Actor_PlaySfx(thisx, NA_SE_EV_MEDAL_APPEAR_L - SFX_FLAG); } else { - func_800788CC(NA_SE_EV_MEDAL_APPEAR_S - SFX_FLAG); + Sfx_PlaySfxCentered2(NA_SE_EV_MEDAL_APPEAR_S - SFX_FLAG); } break; case 4: @@ -946,7 +946,7 @@ void DemoEffect_UpdateCreationFireball(DemoEffect* this, PlayState* play) { Actor_SetScale(&effect->actor, 0.2f); } - func_800788CC(NA_SE_IT_DM_RING_EXPLOSION); + Sfx_PlaySfxCentered2(NA_SE_IT_DM_RING_EXPLOSION); Actor_Kill(&this->actor); } @@ -1761,13 +1761,13 @@ void DemoEffect_DrawGodLgt(Actor* thisx, PlayState* play) { if (gSaveContext.save.entranceIndex == ENTR_CUTSCENE_MAP_0) { if (gSaveContext.sceneLayer == 4) { if (play->csCtx.curFrame <= 680) { - func_80078914(&this->actor.projectedPos, NA_SE_EV_GOD_FLYING - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_GOD_FLYING - SFX_FLAG); } } else { - func_80078914(&this->actor.projectedPos, NA_SE_EV_GOD_FLYING - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_GOD_FLYING - SFX_FLAG); } } else { - func_80078914(&this->actor.projectedPos, NA_SE_EV_GOD_FLYING - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_GOD_FLYING - SFX_FLAG); } gSPSegment(POLY_XLU_DISP++, 8, diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index be4f4d36f8..f4771071cf 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -103,14 +103,14 @@ void func_8097C930(DemoGo* this) { } void func_8097C9B8(DemoGo* this) { - func_80078914(&this->actor.projectedPos, NA_SE_EN_DODO_M_GND); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EN_DODO_M_GND); } void func_8097C9DC(DemoGo* this) { s32 pad[2]; if (Animation_OnFrame(&this->skelAnime, 12.0f) || Animation_OnFrame(&this->skelAnime, 25.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_EN_MORIBLIN_WALK); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EN_MORIBLIN_WALK); } } diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index da65153be0..adba6544c5 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -20,7 +20,7 @@ void DemoGt_Destroy(Actor* thisx, PlayState* play) { } void DemoGt_PlayEarthquakeSfx(void) { - func_800788CC(NA_SE_EV_EARTHQUAKE - SFX_FLAG); + Sfx_PlaySfxCentered2(NA_SE_EV_EARTHQUAKE - SFX_FLAG); } void DemoGt_PlayExplosion1Sfx(PlayState* play, Vec3f* pos) { @@ -1189,7 +1189,7 @@ void func_80980F58(DemoGt* this, PlayState* play) { u16 csCurFrame = play->csCtx.curFrame; if (csCurFrame == 244) { - func_80078914(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); } } @@ -1312,7 +1312,7 @@ void func_80981424(DemoGt* this, PlayState* play) { u16 csCurFrame = play->csCtx.curFrame; if (csCurFrame == 789) { - func_80078914(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); } } @@ -1430,7 +1430,7 @@ void func_809818FC(DemoGt* this, PlayState* play) { u16 csCurFrame = play->csCtx.curFrame; if (csCurFrame == 845) { - func_80078914(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); } } void func_80981930(DemoGt* this, PlayState* play) { @@ -1521,7 +1521,7 @@ void func_80981CEC(DemoGt* this, PlayState* play) { u16 csCurFrame = play->csCtx.curFrame; if (csCurFrame == 183) { - func_80078914(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); } } @@ -1612,7 +1612,7 @@ void func_809820AC(DemoGt* this, PlayState* play) { u16 csCurFrame = play->csCtx.curFrame; if (csCurFrame == 154) { - func_80078914(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); } } diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index 39a95aac41..ced65628f6 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -431,7 +431,7 @@ void func_80985860(DemoIm* this, PlayState* play) { } void func_809858A8(void) { - func_800788CC(NA_SE_SY_WHITE_OUT_T); + Sfx_PlaySfxCentered2(NA_SE_SY_WHITE_OUT_T); } void DemoIm_SpawnLightBall(DemoIm* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index f23485143e..cd4597ecd7 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -251,7 +251,7 @@ void DemoKekkai_TrialBarrierIdle(Actor* thisx, PlayState* play) { CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider1.base); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider1.base); if (this->collider2.base.acFlags & AC_HIT) { - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); // "I got it" LOG_STRING("当ったよ", "../z_demo_kekkai.c", 572); this->actor.update = DemoKekkai_TrialBarrierDispel; diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 20770c0ff0..04cc3506d5 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -376,7 +376,7 @@ void func_8098EDB0(DemoSa* this) { } void func_8098EE08(void) { - func_800788CC(NA_SE_SY_WHITE_OUT_T); + Sfx_PlaySfxCentered2(NA_SE_SY_WHITE_OUT_T); } void func_8098EE28(DemoSa* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c index 6d53836aa1..1764d4671c 100644 --- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c +++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c @@ -54,7 +54,7 @@ void EfcErupc_UpdateAction(EfcErupc* this, PlayState* play) { if (play->csCtx.actorCues[1] != NULL) { if (play->csCtx.actorCues[1]->id == 2) { if (this->unk_150 == 30) { - func_800788CC(NA_SE_IT_EARTHQUAKE); + Sfx_PlaySfxCentered2(NA_SE_IT_EARTHQUAKE); } if (this->unk_150 <= 64) { if (this->unk_154 < 200) { diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index dd5ab1f454..12e44c1d31 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -260,7 +260,7 @@ void EnAni_Update(Actor* thisx, PlayState* play) { } if (play->csCtx.curFrame == 100) { - func_800788CC(NA_SE_IT_EARTHQUAKE); + Sfx_PlaySfxCentered2(NA_SE_IT_EARTHQUAKE); } } else { if (SkelAnime_Update(&this->skelAnime)) { diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c index 3e12a2b51d..ff3a23313b 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c @@ -105,7 +105,7 @@ void EnBomBowlPit_DetectHit(EnBomBowlPit* this, PlayState* play) { this->actor.textId = 0xF; Message_StartTextbox(play, this->actor.textId, NULL); this->unk_154 = TEXT_STATE_EVENT; - func_80078884(NA_SE_EV_HIT_SOUND); + Sfx_PlaySfxCentered(NA_SE_EV_HIT_SOUND); func_8002DF54(play, NULL, PLAYER_CSMODE_8); this->status = 1; this->actionFunc = EnBomBowlPit_CameraDollyIn; diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c index bf871fe14b..8e5c500686 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c @@ -245,7 +245,7 @@ void EnCs_HandleTalking(EnCs* this, PlayState* play) { } if (this->actor.textId == 0x2023) { - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } this->talkState = 1; diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index cb37bdf27e..f1156ee072 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -129,7 +129,7 @@ s32 EnDivingGame_HasMinigameFinished(EnDivingGame* this, PlayState* play) { // Failed. gSaveContext.timerState = TIMER_STATE_OFF; func_800F5B58(); - func_80078884(NA_SE_SY_FOUND); + Sfx_PlaySfxCentered(NA_SE_SY_FOUND); this->actor.textId = 0x71AD; Message_StartTextbox(play, this->actor.textId, NULL); this->unk_292 = TEXT_STATE_EVENT; diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index 4b98ea66b9..b1ddf03353 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -243,7 +243,7 @@ void EnDntNomal_TargetWait(EnDntNomal* this, PlayState* play) { scorePos.z = this->actor.world.pos.z; EffectSsExtra_Spawn(play, &scorePos, &scoreVel, &scoreAccel, 4, 2); Audio_StopSfxById(NA_SE_SY_TRE_BOX_APPEAR); - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); // "Big hit" osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 大当り ☆☆☆☆☆ %d\n" VT_RST, this->hitCounter); if (!LINK_IS_ADULT && !GET_ITEMGETINF(ITEMGETINF_1D)) { @@ -586,7 +586,7 @@ void EnDntNomal_StageDance(EnDntNomal* this, PlayState* play) { void EnDntNomal_SetupStageHide(EnDntNomal* this, PlayState* play) { if (this->timer3 != 0) { if ((this->timer3 == 1) && (this->ignore == 1)) { - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); } } else { this->endFrame = (f32)Animation_GetLastFrame(&gDntStageHideAnim); @@ -627,7 +627,7 @@ void EnDntNomal_StageHide(EnDntNomal* this, PlayState* play) { if (rupee->colorIdx == 2) { rupee->actor.velocity.y = 7.0f; } - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } this->action = DNT_ACTION_NONE; this->actionFunc = EnDntNomal_SetupStageWait; diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.c b/src/overlays/actors/ovl_En_Eg/z_en_eg.c index c14a5a5167..7e195d0398 100644 --- a/src/overlays/actors/ovl_En_Eg/z_en_eg.c +++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.c @@ -35,7 +35,7 @@ ActorInit En_Eg_InitVars = { }; void EnEg_PlayVoidOutSFX(void) { - func_800788CC(NA_SE_OC_ABYSS); + Sfx_PlaySfxCentered2(NA_SE_OC_ABYSS); } void EnEg_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c index 7a43b9c7bc..bb0b388f5a 100644 --- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c +++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c @@ -157,7 +157,7 @@ void EnExItem_WaitForObject(EnExItem* this, PlayState* play) { this->prizeRotateTimer = 35; this->scale = 0.5f; if (!onCounter) { - func_80078884(NA_SE_SY_PIECE_OF_HEART); + Sfx_PlaySfxCentered(NA_SE_SY_PIECE_OF_HEART); this->actionFunc = EnExItem_BowlPrize; } else { this->actionFunc = EnExItem_SetupBowlCounter; diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index 8d27e89e34..90c3bfb2b6 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -210,7 +210,7 @@ void EnExRuppy_DropIntoWater(EnExRuppy* this, PlayState* play) { this->actor.shape.rot.y += 0x7A8; Math_ApproachF(&this->actor.gravity, -2.0f, 0.3f, 1.0f); EnExRuppy_SpawnSparkles(this, play, 2, 0); - func_80078884(NA_SE_EV_RAINBOW_SHOWER - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EV_RAINBOW_SHOWER - SFX_FLAG); divingGame = (EnDivingGame*)this->actor.parent; if ((divingGame != NULL) && (divingGame->actor.update != NULL) && ((divingGame->unk_296 == 0) || (this->actor.bgCheckFlags & BGCHECKFLAG_WATER) || (this->timer == 0))) { @@ -218,7 +218,7 @@ void EnExRuppy_DropIntoWater(EnExRuppy* this, PlayState* play) { this->actor.speed = 0.0f; this->actor.velocity.x = this->actor.velocity.y = this->actor.velocity.z = 0.0f; this->actor.gravity = 0.0f; - func_80078914(&this->actor.projectedPos, NA_SE_EV_BOMB_DROP_WATER); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_BOMB_DROP_WATER); this->actionFunc = EnExRuppy_EnterWater; } } @@ -255,7 +255,7 @@ void EnExRuppy_Sink(EnExRuppy* this, PlayState* play) { this->actor.velocity.y = -1.0f; this->actor.gravity = -0.2f; EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 0, 800); - func_80078914(&this->actor.projectedPos, NA_SE_EV_BOMB_DROP_WATER); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_BOMB_DROP_WATER); this->actionFunc = EnExRuppy_WaitInGame; } divingGame = (EnDivingGame*)this->actor.parent; @@ -284,7 +284,7 @@ void EnExRuppy_WaitInGame(EnExRuppy* this, PlayState* play) { if (1) {} } else if (this->actor.xyzDistToPlayerSq < SQ(localConst)) { Rupees_ChangeBy(this->rupeeValue); - func_80078884(NA_SE_SY_GET_RUPY); + Sfx_PlaySfxCentered(NA_SE_SY_GET_RUPY); divingGame->grabbedRupeesCounter++; Actor_Kill(&this->actor); } @@ -347,7 +347,7 @@ void EnExRuppy_WaitAsCollectible(EnExRuppy* this, PlayState* play) { f32 localConst = 30.0f; if (this->actor.xyzDistToPlayerSq < SQ(localConst)) { - func_80078884(NA_SE_SY_GET_RUPY); + Sfx_PlaySfxCentered(NA_SE_SY_GET_RUPY); Item_DropCollectible(play, &this->actor.world.pos, (sEnExRuppyCollectibleTypes[this->colorIdx] | 0x8000)); Actor_Kill(&this->actor); } diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 3907f57b74..5958f28a18 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -737,7 +737,7 @@ void EnFr_ChildSong(EnFr* this, PlayState* play) { EnFr_SetupReward(this, play, false); } else if (!FROG_HAS_SONG_BEEN_PLAYED(songIndex)) { frog = sEnFrPointers.frogs[sSongToFrog[songIndex]]; - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); if (frog->actionFunc == EnFr_ChooseJumpFromLogSpot) { frog->isJumpingUp = true; frog->isActive = true; @@ -855,7 +855,7 @@ s32 EnFr_IsFrogSongComplete(EnFr* this, PlayState* play) { void EnFr_OcarinaMistake(EnFr* this, PlayState* play) { Message_CloseTextbox(play); this->reward = GI_NONE; - func_80078884(NA_SE_SY_OCARINA_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_OCARINA_ERROR); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); sEnFrPointers.flags = 12; EnFr_DeactivateButterfly(); @@ -916,9 +916,9 @@ void EnFr_ContinueFrogSong(EnFr* this, PlayState* play) { void EnFr_SetupReward(EnFr* this, PlayState* play, u8 unkCondition) { EnFr_DeactivateButterfly(); if (unkCondition) { - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } else { - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index e643723c31..d781e69920 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -169,7 +169,7 @@ void func_80A1DBD4(EnFu* this, PlayState* play) { play->msgCtx.ocarinaMode = OCARINA_MODE_04; this->actor.flags &= ~ACTOR_FLAG_16; } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) { - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); this->actionFunc = func_80A1DB60; this->actor.flags &= ~ACTOR_FLAG_16; play->csCtx.script = SEGMENTED_TO_VIRTUAL(gSongOfStormsCs); diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index 4f03b2fd91..c50826e472 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -225,10 +225,10 @@ void EnGSwitch_SilverRupeeTracker(EnGSwitch* this, PlayState* play) { if ((play->sceneId == SCENE_GERUDO_TRAINING_GROUND) && (this->actor.room == 2)) { Flags_SetTempClear(play, this->actor.room); } else { - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); Flags_SetSwitch(play, this->switchFlag); } - func_80078884(NA_SE_SY_GET_RUPY); + Sfx_PlaySfxCentered(NA_SE_SY_GET_RUPY); Actor_Kill(&this->actor); } } @@ -240,7 +240,7 @@ void EnGSwitch_SilverRupeeIdle(EnGSwitch* this, PlayState* play) { if (this->actor.xyzDistToPlayerSq < SQ(30.0f)) { Rupees_ChangeBy(5); sCollectedCount++; - func_80078884(NA_SE_SY_GET_RUPY); + Sfx_PlaySfxCentered(NA_SE_SY_GET_RUPY); this->actor.world.pos = player->actor.world.pos; this->actor.world.pos.y += 40.0f; if (LINK_IS_ADULT) { @@ -342,8 +342,8 @@ void EnGSwitch_GalleryRupee(EnGSwitch* this, PlayState* play) { if (gallery->actor.update != NULL) { gallery->hitCount++; gallery->targetState[this->index] = ENSYATEKIHIT_HIT; - func_80078884(NA_SE_EV_HIT_SOUND); - func_80078884(NA_SE_SY_GET_RUPY); + Sfx_PlaySfxCentered(NA_SE_EV_HIT_SOUND); + Sfx_PlaySfxCentered(NA_SE_SY_GET_RUPY); // "Yeah !" osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ いぇぇーす！ＨＩＴ！！ ☆☆☆☆☆ %d\n" VT_RST, gallery->hitCount); EnGSwitch_Break(this, play); diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index 7d1cfe79c0..8d636accb7 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -243,7 +243,7 @@ void EnGe1_SpotPlayer(EnGe1* this, PlayState* play) { this->cutsceneTimer = 30; this->actionFunc = EnGe1_KickPlayer; func_8002DF54(play, &this->actor, PLAYER_CSMODE_95); - func_80078884(NA_SE_SY_FOUND); + Sfx_PlaySfxCentered(NA_SE_SY_FOUND); Message_StartTextbox(play, 0x6000, &this->actor); } diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index 70eabb23ef..512eba2147 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -481,7 +481,7 @@ void EnGe2_SetupCapturePlayer(EnGe2* this, PlayState* play) { this->actor.speed = 0.0f; EnGe2_ChangeAction(this, GE2_ACTION_CAPTURETURN); func_8002DF54(play, &this->actor, PLAYER_CSMODE_95); - func_80078884(NA_SE_SY_FOUND); + Sfx_PlaySfxCentered(NA_SE_SY_FOUND); Message_StartTextbox(play, 0x6000, &this->actor); } diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index afc7c51692..3cf619fd8e 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -370,7 +370,7 @@ void EnHeishi1_WaitNight(EnHeishi1* this, PlayState* play) { if (this->actor.xzDistToPlayer < 100.0f) { Message_StartTextbox(play, 0x702D, &this->actor); - func_80078884(NA_SE_SY_FOUND); + Sfx_PlaySfxCentered(NA_SE_SY_FOUND); osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!" func_8002DF54(play, &this->actor, PLAYER_CSMODE_1); this->actionFunc = EnHeishi1_SetupKick; @@ -453,7 +453,7 @@ void EnHeishi1_Update(Actor* thisx, PlayState* play) { this->linkDetected = false; // this 60 unit height check is so the player doesn't get caught when on the upper path if (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 60.0f) { - func_80078884(NA_SE_SY_FOUND); + Sfx_PlaySfxCentered(NA_SE_SY_FOUND); // "Discovered!" osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); func_8002DF54(play, &this->actor, PLAYER_CSMODE_1); diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index 7b07b69e90..33febb17ae 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -404,7 +404,7 @@ void func_80A53AD4(EnHeishi2* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, play)) { exchangeItemId = func_8002F368(play); if (exchangeItemId == EXCH_ITEM_ZELDAS_LETTER) { - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); player->actor.textId = 0x2010; this->unk_300 = TEXT_STATE_EVENT; this->actionFunc = func_80A53C0C; @@ -725,7 +725,7 @@ void func_80A5475C(EnHeishi2* this, PlayState* play) { if (this->unk_300 == TEXT_STATE_CHOICE) { this->unk_309 = 1; - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); this->actionFunc = func_80A540C0; } return; diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index bc613eaf5f..c882d3479d 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -131,7 +131,7 @@ void EnHeishi3_StandSentinelInGrounds(EnHeishi3* this, PlayState* play) { (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 100.0f) && (sPlayerCaught == 0)) { sPlayerCaught = 1; Message_StartTextbox(play, 0x702D, &this->actor); - func_80078884(NA_SE_SY_FOUND); + Sfx_PlaySfxCentered(NA_SE_SY_FOUND); osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!" func_8002DF54(play, &this->actor, PLAYER_CSMODE_1); this->actionFunc = EnHeishi3_CatchStart; @@ -159,7 +159,7 @@ void EnHeishi3_StandSentinelInCastle(EnHeishi3* this, PlayState* play) { } sPlayerCaught = 1; Message_StartTextbox(play, 0x702D, &this->actor); - func_80078884(NA_SE_SY_FOUND); + Sfx_PlaySfxCentered(NA_SE_SY_FOUND); osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!" func_8002DF54(play, &this->actor, PLAYER_CSMODE_1); this->actionFunc = EnHeishi3_CatchStart; diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index 1248c11802..df626bd904 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -210,7 +210,7 @@ void EnHintnuts_SetupFreeze(EnHintnuts* this) { this->animFlagAndTimer = 0; Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_FAINT); if (sPuzzleCounter == -3) { - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); sPuzzleCounter = -4; } this->actionFunc = EnHintnuts_Freeze; diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index 039d0c3144..afafe3ef32 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -212,7 +212,7 @@ void func_80A6E9AC(EnHs* this, PlayState* play) { Animation_Change(&this->skelAnime, &object_hs_Anim_000304, 1.0f, 0.0f, Animation_GetLastFrame(&object_hs_Anim_000304), ANIMMODE_LOOP, 8.0f); this->unk_2AA = 40; - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } else { player->actor.textId = 0x10B1; func_80A6E3A0(this, func_80A6E6D8); diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 079f61aac5..6e12043bc4 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -674,7 +674,7 @@ void EnInsect_Dropped(EnInsect* this, PlayState* play) { if (this->soilActor != NULL) { if (!(GET_GS_FLAGS(((this->soilActor->actor.params >> 8) & 0x1F) - 1) & (this->soilActor->actor.params & 0xFF))) { - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } } this->insectFlags |= INSECT_FLAG_7; diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c index cc0c84380d..7aad14e845 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c @@ -220,7 +220,7 @@ void EnJj_BeginCutscene(EnJj* this, PlayState* play) { DynaPoly_DisableCollision(play, &play->colCtx.dyna, bodyCollisionActor->bgId); func_8005B1A4(GET_ACTIVE_CAM(play)); SET_EVENTCHKINF(EVENTCHKINF_3A); - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } } diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index 9d0aafc853..306e64c3f9 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -126,7 +126,7 @@ void func_80A90264(EnKakasi2* this, PlayState* play) { OnePointCutscene_Attention(play, &this->actor); this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_27; - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); if (this->switchFlag >= 0) { Flags_SetSwitch(play, this->switchFlag); } @@ -149,7 +149,7 @@ void func_80A90264(EnKakasi2* this, PlayState* play) { Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); SkelAnime_InitFlex(play, &this->skelAnime, &object_ka_Skel_0065B0, &object_ka_Anim_000214, NULL, NULL, 0); OnePointCutscene_Attention(play, &this->actor); - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_27; this->actionFunc = func_80A904D8; diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index d2fcb5dc7e..314397a9ff 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -254,7 +254,7 @@ void EnMk_Wait(EnMk* this, PlayState* play) { Animation_GetLastFrame(&object_mk_Anim_000368), ANIMMODE_ONCE, -4.0f); this->flags &= ~2; gSaveContext.subTimerState = SUBTIMER_STATE_OFF; - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); break; default: player->actor.textId = 0x4018; @@ -334,7 +334,7 @@ void EnMk_Update(Actor* thisx, PlayState* play) { if (!(this->flags & 4) && (this->swimFlag >= 8)) { this->flags |= 4; - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } } } diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c index 7146840136..a37c364aa0 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -294,7 +294,7 @@ void func_80AADCD0(EnMm* this, PlayState* play) { if (this->curAnimIndex != 5) { if ((this->actor.textId == 0x202A) || (this->actor.textId == 0x202B)) { EnMm_ChangeAnim(this, RM_ANIM_EXCITED, &this->curAnimIndex); - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } } } else { diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index 91bafad3ec..71778064f0 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -460,7 +460,7 @@ void EnNb_SetupLightArrowOrSealingCs(EnNb* this, PlayState* play) { } void EnNb_PlaySealingSfx(void) { - func_800788CC(NA_SE_SY_WHITE_OUT_T); + Sfx_PlaySfxCentered2(NA_SE_SY_WHITE_OUT_T); } void EnNb_InitializeDemo6K(EnNb* this, PlayState* play) { @@ -575,13 +575,13 @@ void EnNb_InitKidnap(EnNb* this, PlayState* play) { void EnNb_PlayCrySFX(EnNb* this, PlayState* play) { if (play->csCtx.curFrame == 3) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_NB_CRY_0); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_NB_CRY_0); } } void EnNb_PlayAgonySFX(EnNb* this, PlayState* play) { if (play->csCtx.curFrame == 420) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_NB_AGONY); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_NB_AGONY); } } @@ -709,8 +709,8 @@ void EnNb_PlayKnuckleDefeatSFX(EnNb* this, PlayState* play) { s32 pad[2]; if (play->csCtx.curFrame == 548) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_NB_CRY_0); - func_80078914(&this->actor.projectedPos, NA_SE_EN_FANTOM_HIT_THUNDER); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_NB_CRY_0); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EN_FANTOM_HIT_THUNDER); } } @@ -719,7 +719,7 @@ void EnNb_PlayKneelingOnGroundSFX(EnNb* this) { if ((this->skelAnime.mode == 2) && (Animation_OnFrame(&this->skelAnime, 18.0f) || Animation_OnFrame(&this->skelAnime, 25.0f))) { - func_80078914(&this->actor.projectedPos, NA_SE_EV_HUMAN_BOUND); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_HUMAN_BOUND); } } @@ -727,7 +727,7 @@ void EnNb_PlayLookRightSFX(EnNb* this) { s32 pad[2]; if ((this->skelAnime.mode == 2) && Animation_OnFrame(&this->skelAnime, 9.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE); } } @@ -735,7 +735,7 @@ void EnNb_PlayLookLeftSFX(EnNb* this) { s32 pad[2]; if (Animation_OnFrame(&this->skelAnime, 9.0f) || Animation_OnFrame(&this->skelAnime, 13.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE); } } @@ -1154,7 +1154,7 @@ void func_80AB359C(EnNb* this) { } void EnNb_SetNoticeSFX(EnNb* this) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_NB_NOTICE); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_NB_NOTICE); } s32 EnNb_GetNoticedStatus(EnNb* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index 9a00af8395..0d66faf11a 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -260,7 +260,7 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) { osSyncPrintf("\n\n"); if (Text_GetFaceReaction(play, 8) == 0) { if (this->actor.textId == 0x503C) { - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); this->unk_26C = 2; this->unk_262 = TEXT_STATE_EVENT; this->actionFunc = func_80ABA654; @@ -268,7 +268,7 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) { } this->unk_26E = phi_s1 + 1; if (phi_s1 == 7) { - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); this->unk_26C = 1; this->unk_262 = TEXT_STATE_EVENT; this->unk_26A = this->cuccosInPen; @@ -285,9 +285,9 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) { } if (this->unk_26A != this->cuccosInPen) { if (this->cuccosInPen < this->unk_26A) { - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); } else if (phi_s1 + 1 < 9) { - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } } if (this->unk_26A < this->cuccosInPen) { @@ -367,7 +367,7 @@ void func_80ABA878(EnNiwLady* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, play)) { playerExchangeItemId = func_8002F368(play); if ((playerExchangeItemId == EXCH_ITEM_POCKET_CUCCO) && GET_EVENTCHKINF(EVENTCHKINF_TALON_WOKEN_IN_KAKARIKO)) { - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); player->actor.textId = sTradeItemTextIds[5]; this->unk_26E = this->unk_27A + 21; this->unk_262 = TEXT_STATE_CHOICE; diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index 7624d4b797..0464a1346e 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -156,7 +156,7 @@ void func_80ABF0CC(EnOkarinaTag* this, PlayState* play) { (play->sceneId != SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS)) { play->msgCtx.ocarinaMode = OCARINA_MODE_04; } - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); this->actionFunc = func_80ABEF2C; return; } @@ -169,7 +169,7 @@ void func_80ABF0CC(EnOkarinaTag* this, PlayState* play) { Flags_SetSwitch(play, this->switchFlag); } play->msgCtx.ocarinaMode = OCARINA_MODE_04; - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); this->actionFunc = func_80ABEF2C; return; } @@ -232,7 +232,7 @@ void func_80ABF4C8(EnOkarinaTag* this, PlayState* play) { if (play->msgCtx.ocarinaMode == OCARINA_MODE_04) { this->actionFunc = func_80ABF28C; } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) { - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); if (this->switchFlag >= 0) { Flags_SetSwitch(play, this->switchFlag); } @@ -257,7 +257,7 @@ void func_80ABF4C8(EnOkarinaTag* this, PlayState* play) { : SEGMENTED_TO_VIRTUAL(spot02_scene_Cs_005020); gSaveContext.cutsceneTrigger = 1; SET_EVENTCHKINF(EVENTCHKINF_1D); - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); break; default: break; diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 0e0f3b4442..79f00094fe 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -725,7 +725,7 @@ void EnOssan_ChooseTalkToOwner(PlayState* play, EnOssan* this) { } void EnOssan_SetLookToShopkeeperFromShelf(PlayState* play, EnOssan* this) { - func_80078884(NA_SE_SY_CURSOR); + Sfx_PlaySfxCentered(NA_SE_SY_CURSOR); this->drawCursor = 0; this->stateFlag = OSSAN_STATE_LOOK_SHOPKEEPER; } @@ -898,7 +898,7 @@ void EnOssan_State_StartConversation(EnOssan* this, PlayState* play, Player* pla } } } else if (dialogState == TEXT_STATE_EVENT && Message_ShouldAdvance(play)) { - func_80078884(NA_SE_SY_MESSAGE_PASS); + Sfx_PlaySfxCentered(NA_SE_SY_MESSAGE_PASS); switch (this->happyMaskShopState) { case OSSAN_HAPPY_STATE_ALL_MASKS_SOLD: @@ -950,7 +950,7 @@ void EnOssan_State_FacingShopkeeper(EnOssan* this, PlayState* play, Player* play if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) && !EnOssan_TestEndInteraction(this, play, &play->state.input[0])) { if (Message_ShouldAdvance(play) && EnOssan_FacingShopkeeperDialogResult(this, play)) { - func_80078884(NA_SE_SY_DECIDE); + Sfx_PlaySfxCentered(NA_SE_SY_DECIDE); return; } // Stick Left @@ -961,7 +961,7 @@ void EnOssan_State_FacingShopkeeper(EnOssan* this, PlayState* play, Player* play this->stateFlag = OSSAN_STATE_LOOK_SHELF_LEFT; Interface_SetDoAction(play, DO_ACTION_DECIDE); this->stickLeftPrompt.isEnabled = false; - func_80078884(NA_SE_SY_CURSOR); + Sfx_PlaySfxCentered(NA_SE_SY_CURSOR); } } else if (this->stickAccumX > 0) { nextIndex = EnOssan_SetCursorIndexFromNeutral(this, 0); @@ -970,7 +970,7 @@ void EnOssan_State_FacingShopkeeper(EnOssan* this, PlayState* play, Player* play this->stateFlag = OSSAN_STATE_LOOK_SHELF_RIGHT; Interface_SetDoAction(play, DO_ACTION_DECIDE); this->stickRightPrompt.isEnabled = false; - func_80078884(NA_SE_SY_CURSOR); + Sfx_PlaySfxCentered(NA_SE_SY_CURSOR); } } } @@ -1126,23 +1126,23 @@ s32 EnOssan_HasPlayerSelectedItem(PlayState* play, EnOssan* this, Input* input) case SI_ZORA_MASK: case SI_GORON_MASK: case SI_GERUDO_MASK: - func_80078884(NA_SE_SY_DECIDE); + Sfx_PlaySfxCentered(NA_SE_SY_DECIDE); this->drawCursor = 0; this->stateFlag = OSSAN_STATE_SELECT_ITEM_MASK; return true; case SI_MILK_BOTTLE: - func_80078884(NA_SE_SY_DECIDE); + Sfx_PlaySfxCentered(NA_SE_SY_DECIDE); this->drawCursor = 0; this->stateFlag = OSSAN_STATE_SELECT_ITEM_BOTTLE_MILK_FULL; return true; case SI_WEIRD_EGG: - func_80078884(NA_SE_SY_DECIDE); + Sfx_PlaySfxCentered(NA_SE_SY_DECIDE); this->drawCursor = 0; this->stateFlag = OSSAN_STATE_SELECT_ITEM_WEIRD_EGG; return true; case SI_19: case SI_20: - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); this->drawCursor = 0; this->stateFlag = OSSAN_STATE_SELECT_ITEM_UNIMPLEMENTED; return true; @@ -1151,18 +1151,18 @@ s32 EnOssan_HasPlayerSelectedItem(PlayState* play, EnOssan* this, Input* input) case SI_BOMBS_20: case SI_BOMBS_30: case SI_BOMBS_5_R35: - func_80078884(NA_SE_SY_DECIDE); + Sfx_PlaySfxCentered(NA_SE_SY_DECIDE); this->drawCursor = 0; this->stateFlag = OSSAN_STATE_SELECT_ITEM_BOMBS; return true; default: - func_80078884(NA_SE_SY_DECIDE); + Sfx_PlaySfxCentered(NA_SE_SY_DECIDE); this->drawCursor = 0; this->stateFlag = OSSAN_STATE_SELECT_ITEM; return true; } } - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); return true; } return false; @@ -1223,7 +1223,7 @@ void EnOssan_State_BrowseLeftShelf(EnOssan* this, PlayState* play, Player* playe EnOssan_CursorUpDown(this); if (this->cursorIndex != prevIndex) { Message_ContinueTextbox(play, this->shelfSlots[this->cursorIndex]->actor.textId); - func_80078884(NA_SE_SY_CURSOR); + Sfx_PlaySfxCentered(NA_SE_SY_CURSOR); } } } @@ -1282,7 +1282,7 @@ void EnOssan_State_BrowseRightShelf(EnOssan* this, PlayState* play, Player* play EnOssan_CursorUpDown(this); if (this->cursorIndex != prevIndex) { Message_ContinueTextbox(play, this->shelfSlots[this->cursorIndex]->actor.textId); - func_80078884(NA_SE_SY_CURSOR); + Sfx_PlaySfxCentered(NA_SE_SY_CURSOR); } } } @@ -1362,19 +1362,19 @@ void EnOssan_HandleCanBuyItem(PlayState* play, EnOssan* this) { selectedItem->setOutOfStockFunc(play, selectedItem); break; case CANBUY_RESULT_CANT_GET_NOW: - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); EnOssan_SetStateCantGetItem(play, this, 0x86); break; case CANBUY_RESULT_NEED_BOTTLE: - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); EnOssan_SetStateCantGetItem(play, this, 0x96); break; case CANBUY_RESULT_NEED_RUPEES: - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); EnOssan_SetStateCantGetItem(play, this, 0x85); break; case CANBUY_RESULT_CANT_GET_NOW_5: - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); EnOssan_SetStateCantGetItem(play, this, 0x86); break; } @@ -1423,11 +1423,11 @@ void EnOssan_HandleCanBuyWeirdEgg(PlayState* play, EnOssan* this) { item->setOutOfStockFunc(play, item); break; case CANBUY_RESULT_CANT_GET_NOW: - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); EnOssan_SetStateCantGetItem(play, this, 0x9D); break; case CANBUY_RESULT_NEED_RUPEES: - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); EnOssan_SetStateCantGetItem(play, this, 0x85); break; } @@ -1446,11 +1446,11 @@ void EnOssan_HandleCanBuyBombs(PlayState* play, EnOssan* this) { item->setOutOfStockFunc(play, item); break; case CANBUY_RESULT_CANT_GET_NOW: - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); EnOssan_SetStateCantGetItem(play, this, 0x86); break; case CANBUY_RESULT_NEED_RUPEES: - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); EnOssan_SetStateCantGetItem(play, this, 0x85); break; } diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index da153249a5..fd29123944 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -948,7 +948,7 @@ void func_80ACC00C(EnOwl* this, PlayState* play) { break; } - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); gSaveContext.cutsceneTrigger = 1; func_800F44EC(0x14, 0xA); this->actionFunc = EnOwl_WaitDefault; diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index 81d4364f42..2090d17a6b 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -324,7 +324,7 @@ void func_80AD42B0(EnPoField* this) { this->actor.scale.y = 0.0f; Actor_PlaySfx(&this->actor, NA_SE_EV_METAL_BOX_BOUND); if (this->actor.params == EN_PO_FIELD_BIG) { - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } this->actionFunc = func_80AD587C; } diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index 2dbafa51df..7f2975ffa5 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -817,7 +817,7 @@ void func_80ADB17C(EnPoSisters* this, PlayState* play) { Flags_UnsetSwitch(play, 0x1B); } play->envCtx.lightSettingOverride = LIGHT_SETTING_OVERRIDE_NONE; - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); Actor_Kill(&this->actor); } else if (this->unk_19A < 32) { func_80AD9240(this, this->unk_19A, &this->actor.world.pos); diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c index 9ac0128d18..99f1c31f02 100644 --- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c @@ -289,7 +289,7 @@ void EnRiverSound_Draw(Actor* thisx, PlayState* play) { } else if ((this->actor.params == RS_SANDSTORM) || (this->actor.params == RS_CHAMBER_OF_SAGES_1) || (this->actor.params == RS_CHAMBER_OF_SAGES_2) || (this->actor.params == RS_RUMBLING)) { // Play sfx in the fixed center of the screen - func_800788CC(soundEffects[this->actor.params]); + Sfx_PlaySfxCentered2(soundEffects[this->actor.params]); } else { // Play sfx at the location of riverSounds projected position Actor_PlaySfx(&this->actor, soundEffects[this->actor.params]); diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 545bc7d0fd..d58a4a443a 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -558,14 +558,14 @@ void func_80AEBA2C(EnRu1* this, PlayState* play) { void func_80AEBAFC(EnRu1* this) { if (this->unk_298 == 0) { - func_80078914(&this->actor.projectedPos, NA_SE_EV_DIVE_INTO_WATER); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_DIVE_INTO_WATER); this->unk_298 = 1; } } void func_80AEBB3C(EnRu1* this) { if (Animation_OnFrame(&this->skelAnime, 5.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_PL_FACE_UP); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_FACE_UP); } } @@ -574,13 +574,13 @@ void func_80AEBB78(EnRu1* this) { if (Animation_OnFrame(skelAnime, 4.0f) || Animation_OnFrame(skelAnime, 13.0f) || Animation_OnFrame(skelAnime, 22.0f) || Animation_OnFrame(skelAnime, 31.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_PL_SWIM); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_SWIM); } } void func_80AEBBF4(EnRu1* this) { if (Animation_OnFrame(&this->skelAnime, 8.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_PL_SUBMERGE); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_SUBMERGE); } } @@ -596,7 +596,7 @@ void func_80AEBC30(PlayState* play) { void func_80AEBC84(EnRu1* this, PlayState* play) { if (play->csCtx.curFrame == 130) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_LAUGH_0); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_LAUGH_0); } } @@ -831,14 +831,14 @@ void func_80AEC650(EnRu1* this) { if (this->unk_280 == 0) { if (Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 7.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_JABU); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_JABU); } } } void func_80AEC6B0(EnRu1* this) { - func_80078914(&this->actor.projectedPos, NA_SE_EV_FALL_DOWN_DIRT); - func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_FALL); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_FALL_DOWN_DIRT); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_FALL); } void func_80AEC6E4(EnRu1* this, PlayState* play) { @@ -1189,7 +1189,7 @@ void func_80AED44C(EnRu1* this, PlayState* play) { } void func_80AED4FC(EnRu1* this) { - func_80078914(&this->actor.projectedPos, NA_SE_EV_LAND_DIRT); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_LAND_DIRT); } void func_80AED520(EnRu1* this, PlayState* play) { @@ -1197,25 +1197,25 @@ void func_80AED520(EnRu1* this, PlayState* play) { Audio_PlaySfxGeneral(NA_SE_PL_PULL_UP_RUTO, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_LIFT); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_LIFT); } void func_80AED57C(EnRu1* this) { if (this->actor.speed != 0.0f) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_THROW); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_THROW); } } void func_80AED5B8(EnRu1* this) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_CRASH); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_CRASH); } void func_80AED5DC(EnRu1* this) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_UNBALLANCE); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_UNBALLANCE); } void func_80AED600(EnRu1* this) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_DISCOVER); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_DISCOVER); } s32 func_80AED624(EnRu1* this, PlayState* play) { @@ -1804,7 +1804,7 @@ void func_80AEEFEC(EnRu1* this, PlayState* play) { void func_80AEF080(EnRu1* this) { if (Animation_OnFrame(&this->skelAnime, 11.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_EV_LAND_DIRT); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_LAND_DIRT); } } @@ -1897,7 +1897,7 @@ void func_80AEF40C(EnRu1* this) { if (Animation_OnFrame(skelAnime, 2.0f) || Animation_OnFrame(skelAnime, 7.0f) || Animation_OnFrame(skelAnime, 12.0f) || Animation_OnFrame(skelAnime, 18.0f) || Animation_OnFrame(skelAnime, 25.0f) || Animation_OnFrame(skelAnime, 33.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_JABU); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_JABU); } } @@ -1907,12 +1907,12 @@ void func_80AEF4A8(EnRu1* this, PlayState* play) { void func_80AEF4E0(EnRu1* this) { if (Animation_OnFrame(&this->skelAnime, 5.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_LAUGH_0); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_LAUGH_0); } } void func_80AEF51C(EnRu1* this) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_THROW); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_THROW); } void func_80AEF540(EnRu1* this) { diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index d50bdd8f86..9f9e6c52f6 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -382,7 +382,7 @@ void func_80AF2E1C(EnRu2* this, PlayState* play) { } void func_80AF2E64(void) { - func_800788CC(NA_SE_SY_WHITE_OUT_T); + Sfx_PlaySfxCentered2(NA_SE_SY_WHITE_OUT_T); } void func_80AF2E84(EnRu2* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index 7a321ed924..51d58798a5 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -917,7 +917,7 @@ void EnSkj_WaitInRange(EnSkj* this, PlayState* play) { player->actor.world.pos.y = sSmallStumpSkullKid.skullkid->actor.world.pos.y; player->actor.world.pos.z = sSmallStumpSkullKid.skullkid->actor.world.pos.z; if ((Player_GetMask(play) == PLAYER_MASK_SKULL) && !GET_ITEMGETINF(ITEMGETINF_39)) { - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); EnSkj_SetupMaskTrade(this); } else { EnSkj_SetupTalk(this); @@ -977,7 +977,7 @@ void EnSkj_WaitForSong(EnSkj* this, PlayState* play) { if (!GET_ITEMGETINF(ITEMGETINF_16)) { // Saria's song has been played for the first titme play->msgCtx.ocarinaMode = OCARINA_MODE_04; - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); player->unk_6A8 = &this->actor; func_8002F2CC(&this->actor, play, EnSkj_GetItemXzRange(this)); this->textId = 0x10BB; @@ -1423,7 +1423,7 @@ void EnSkj_WaitForPlayback(EnSkj* this, PlayState* play) { this->textId = 0x102D; this->actionFunc = EnSkj_FailedMiniGame; } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_0F) { // completed the game - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); Message_CloseTextbox(play); play->msgCtx.ocarinaMode = OCARINA_MODE_04; player->unk_6A8 = &this->actor; @@ -1457,7 +1457,7 @@ void EnSkj_WaitForPlayback(EnSkj* this, PlayState* play) { if (this->songFailTimer != 0) { this->songFailTimer--; } else { // took too long, game failed - func_80078884(NA_SE_SY_OCARINA_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_OCARINA_ERROR); Message_CloseTextbox(play); play->msgCtx.ocarinaMode = OCARINA_MODE_04; player->unk_6A8 = &this->actor; diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c index 2546911de3..cb0e5038a5 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c @@ -157,7 +157,7 @@ void EnSyatekiItm_StartRound(EnSyatekiItm* this, PlayState* play) { this->timer = (this->roundNum == 1) ? 50 : 30; - func_80078884(NA_SE_SY_FOUND); + Sfx_PlaySfxCentered(NA_SE_SY_FOUND); this->actionFunc = EnSyatekiItm_SpawnTargets; } } diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index 16a23fcb27..dbaf085306 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -803,7 +803,7 @@ void EnTa_RunCuccoGame(EnTa* this, PlayState* play) { if ((gSaveContext.timerSeconds == 0) && !Play_InCsMode(play)) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0); this->stateFlags &= ~TALON_STATE_FLAG_RESTORE_BGM_ON_DESTROY; - func_80078884(NA_SE_SY_FOUND); + Sfx_PlaySfxCentered(NA_SE_SY_FOUND); gSaveContext.timerState = TIMER_STATE_OFF; func_8002DF54(play, &this->actor, PLAYER_CSMODE_1); diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c index 498927cc46..0606474a8d 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c @@ -238,7 +238,7 @@ u32 EnToryo_ReactToExchangeItem(EnToryo* this, PlayState* play) { if (this->exchangeItemId != EXCH_ITEM_NONE) { if (this->exchangeItemId == EXCH_ITEM_POACHERS_SAW) { - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); if (GET_INFTABLE(INFTABLE_171)) { ret = 0x606E; } else { diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c index 2243a19f20..ecfc95833b 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c @@ -89,7 +89,7 @@ void EnWallTubo_DetectChu(EnWallTubo* this, PlayState* play) { (fabsf(chuPosDiff.z) < 40.0f || (BREG(2)))) { this->chuGirl->wallStatus[this->actor.params] = 1; chu->timer = 2; - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); this->timer = 60; EffectSsBomb2_SpawnLayered(play, &this->explosionCenter, &effVelocity, &effAccel, 200, 40); quakeIndex = Quake_Request(GET_ACTIVE_CAM(play), QUAKE_TYPE_1); diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 34f165c034..4b4d1f88f1 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -470,7 +470,7 @@ void EnWallmas_TakePlayer(EnWallmas* this, PlayState* play) { Math_StepToF(&this->actor.world.pos.z, player->actor.world.pos.z, 3.0f); if (this->timer == 0x1E) { - func_80078884(NA_SE_OC_ABYSS); + Sfx_PlaySfxCentered(NA_SE_OC_ABYSS); Play_TriggerRespawn(play); } } diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c index b4a60bdc6d..5ed6318c29 100644 --- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c +++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c @@ -74,7 +74,7 @@ void EnWonderItem_DropCollectible(EnWonderItem* this, PlayState* play, s32 autoC s32 i; s32 randomDrop; - func_80078884(NA_SE_SY_GET_ITEM); + Sfx_PlaySfxCentered(NA_SE_SY_GET_ITEM); if (this->dropCount == 0) { this->dropCount++; diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index b926b4087a..48c0159837 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -379,7 +379,7 @@ void EnXc_SetWalkingSFX(EnXc* this, PlayState* play) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { sfxId = NA_SE_PL_WALK_GROUND; sfxId += SurfaceType_GetSfxOffset(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); - func_80078914(&this->actor.projectedPos, sfxId); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, sfxId); } } } @@ -393,11 +393,11 @@ void EnXc_SetNutThrowSFX(EnXc* this, PlayState* play) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { sfxId = NA_SE_PL_WALK_GROUND; sfxId += SurfaceType_GetSfxOffset(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); - func_80078914(&this->actor.projectedPos, sfxId); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, sfxId); } } if (Animation_OnFrame(&this->skelAnime, 20.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_SK_SHOUT); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_SK_SHOUT); } } @@ -409,7 +409,7 @@ void EnXc_SetLandingSFX(EnXc* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, 11.0f)) { sfxId = NA_SE_PL_WALK_GROUND; sfxId += SurfaceType_GetSfxOffset(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); - func_80078914(&this->actor.projectedPos, sfxId); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, sfxId); } } } @@ -429,13 +429,13 @@ void EnXc_SetColossusAppearSFX(EnXc* this, PlayState* play) { Vec3f pos = { -611.0f, 728.0f, -2.0f }; SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &pos, &sXyzDist, wDest); - func_80078914(&sXyzDist, NA_SE_EV_JUMP_CONC); + Sfx_PlaySfxAtPos(&sXyzDist, NA_SE_EV_JUMP_CONC); } else if (csCurFrame == 164) { Vec3f pos = { -1069.0f, 38.0f, 0.0f }; s32 pad; SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &pos, &sXyzDist, wDest); - func_80078914(&sXyzDist, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE); + Sfx_PlaySfxAtPos(&sXyzDist, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE); } } } @@ -445,7 +445,7 @@ void func_80B3D118(PlayState* play) { s16 sceneId; if ((gSaveContext.sceneLayer != 4) || (sceneId = play->sceneId, sceneId != SCENE_DESERT_COLOSSUS)) { - func_800788CC(NA_SE_PL_SKIP); + Sfx_PlaySfxCentered2(NA_SE_PL_SKIP); } } @@ -1369,14 +1369,14 @@ void func_80B3F3C8(EnXc* this, PlayState* play) { } void func_80B3F3D8(void) { - func_800788CC(NA_SE_PL_SKIP); + Sfx_PlaySfxCentered2(NA_SE_PL_SKIP); } void EnXc_PlayDiveSFX(Vec3f* src, PlayState* play) { f32 wDest[2]; SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, src, &D_80B42DA0, wDest); - func_80078914(&D_80B42DA0, NA_SE_EV_DIVE_INTO_WATER); + Sfx_PlaySfxAtPos(&D_80B42DA0, NA_SE_EV_DIVE_INTO_WATER); } void EnXc_LakeHyliaDive(PlayState* play) { @@ -1552,7 +1552,7 @@ void EnXc_PlayTriforceSFX(Actor* thisx, PlayState* play) { void func_80B3FAE0(EnXc* this) { if (Animation_OnFrame(&this->skelAnime, 38.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_SK_SHOUT); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_SK_SHOUT); func_80B3FA2C(); } } @@ -1754,14 +1754,14 @@ void EnXc_SetThrownAroundSFX(EnXc* this) { SkelAnime* skelAnime = &this->skelAnime; if (Animation_OnFrame(skelAnime, 9.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_GRASS); - func_80078914(&this->actor.projectedPos, NA_SE_VO_SK_CRASH); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_GRASS); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_SK_CRASH); } else if (Animation_OnFrame(skelAnime, 26.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_GRASS); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_GRASS); } else if (Animation_OnFrame(skelAnime, 28.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_GRASS); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_GRASS); } else if (Animation_OnFrame(skelAnime, 34.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_GRASS); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_GRASS); } } @@ -1775,9 +1775,9 @@ void EnXc_SetCrySFX(EnXc* this, PlayState* play) { CutsceneContext* csCtx = &play->csCtx; if (csCtx->curFrame == 869) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_SK_CRY_0); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_SK_CRY_0); } else if (csCtx->curFrame == 939) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_SK_CRY_1); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_SK_CRY_1); } } diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c index 45e80d90af..e950380682 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c @@ -176,10 +176,10 @@ void func_80B42F74(EnYabusameMark* this, PlayState* play) { } if (scoreIndex == 1) { Audio_StopSfxById(NA_SE_SY_TRE_BOX_APPEAR); - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } if (scoreIndex == 0) { - func_80078884(NA_SE_SY_DECIDE); + Sfx_PlaySfxCentered(NA_SE_SY_DECIDE); } EffectSsExtra_Spawn(play, &arrowHitPos, &effectVelocity, &effectAccel, 5, scoreIndex); } diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index 915579331e..cbc290de76 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -590,34 +590,34 @@ void func_80B4FD90(EnZl2* this, PlayState* play) { void func_80B4FDD4(EnZl2* this) { if (Animation_OnFrame(&this->skelAnime, 14.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE); } } void func_80B4FE10(PlayState* play) { if ((play->csCtx.curFrame >= 830) && (play->csCtx.curFrame < 1081)) { - func_800788CC(NA_SE_EV_EARTHQUAKE - SFX_FLAG); + Sfx_PlaySfxCentered2(NA_SE_EV_EARTHQUAKE - SFX_FLAG); } } void func_80B4FE48(EnZl2* this) { - func_80078914(&this->actor.projectedPos, NA_SE_EV_GOTO_HEAVEN - SFX_FLAG); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_GOTO_HEAVEN - SFX_FLAG); } void func_80B4FE6C(EnZl2* this) { - func_80078914(&this->actor.projectedPos, NA_SE_EN_GANON_LAUGH); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EN_GANON_LAUGH); } void func_80B4FE90(EnZl2* this) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_SURPRISE); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_SURPRISE); } void func_80B4FEB4(EnZl2* this) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); } void func_80B4FED8(EnZl2* this) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_CRY_0); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_CRY_0); } void EnZl2_GiveLightArrows(EnZl2* this, PlayState* play) { @@ -1446,7 +1446,7 @@ void func_80B51D24(EnZl2* this, PlayState* play) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { sfxId = NA_SE_PL_WALK_GROUND; sfxId += SurfaceType_GetSfxOffset(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); - func_80078914(&this->actor.projectedPos, sfxId); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, sfxId); } } } diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 412edf6921..517dbc58a2 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -759,7 +759,7 @@ void func_80B54EA4(EnZl3* this, PlayState* play) { } void func_80B54EF4(EnZl3* this) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); } void func_80B54F18(EnZl3* this, PlayState* play) { @@ -997,7 +997,7 @@ void func_80B55780(EnZl3* this, PlayState* play) { } void func_80B55808(EnZl3* this) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); } static Vec3f D_80B5A488 = { 0.0f, 0.0f, 0.0f }; @@ -1010,7 +1010,7 @@ void func_80B5585C(EnZl3* this) { SkelAnime* skelAnime = &this->skelAnime; if ((skelAnime->mode == 2) && Animation_OnFrame(skelAnime, 4.0f)) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); } } @@ -1519,18 +1519,18 @@ void func_80B56D44(EnZl3* this, PlayState* play) { } void func_80B56DA4(EnZl3* this) { - func_800788CC(NA_SE_EV_ZELDA_POWER); + Sfx_PlaySfxCentered2(NA_SE_EV_ZELDA_POWER); } void func_80B56DC8(EnZl3* this) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); } void func_80B56DEC(EnZl3* this) { SkelAnime* skelAnime = &this->skelAnime; if ((skelAnime->mode == 2) && Animation_OnFrame(skelAnime, 9.0f) != 0) { - func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_OPENDOOR); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_OPENDOOR); } } @@ -1543,7 +1543,7 @@ void func_80B56E38(EnZl3* this, PlayState* play) { (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) { sfxId = NA_SE_PL_WALK_GROUND; sfxId += SurfaceType_GetSfxOffset(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); - func_80078914(&this->actor.projectedPos, sfxId); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, sfxId); } } diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index 5cd4904b3b..bcbf55800b 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -290,11 +290,11 @@ void EnfHG_Intro(EnfHG* this, PlayState* play) { bossGnd->work[GND_EYE_STATE] = GND_EYESTATE_BRIGHTEN; } if (this->timers[0] == 35) { - func_80078914(&audioVec, NA_SE_EN_FANTOM_EYE); + Sfx_PlaySfxAtPos(&audioVec, NA_SE_EN_FANTOM_EYE); } if (this->timers[0] == 130) { bossGnd->work[GND_EYE_STATE] = GND_EYESTATE_FADE; - func_80078914(&audioVec, NA_SE_EN_FANTOM_ST_LAUGH); + Sfx_PlaySfxAtPos(&audioVec, NA_SE_EN_FANTOM_ST_LAUGH); } if (this->timers[0] == 20) { SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_BOSS); @@ -467,7 +467,7 @@ void EnfHG_Approach(EnfHG* this, PlayState* play) { this->hoofSfxPos.y = this->actor.projectedPos.y / (this->actor.scale.x * 100.0f); this->hoofSfxPos.z = this->actor.projectedPos.z / (this->actor.scale.x * 100.0f); if ((this->gallopTimer % 8) == 0) { - func_80078914(&this->hoofSfxPos, NA_SE_EV_HORSE_RUN); + Sfx_PlaySfxAtPos(&this->hoofSfxPos, NA_SE_EV_HORSE_RUN); } } SkelAnime_Update(&this->skin.skelAnime); @@ -636,7 +636,7 @@ void EnfHG_Retreat(EnfHG* this, PlayState* play) { this->hoofSfxPos.y = this->actor.projectedPos.y / (this->actor.scale.x * 100.0f); this->hoofSfxPos.z = this->actor.projectedPos.z / (this->actor.scale.x * 100.0f); if ((this->gallopTimer % 8) == 0) { - func_80078914(&this->hoofSfxPos, NA_SE_EV_HORSE_RUN); + Sfx_PlaySfxAtPos(&this->hoofSfxPos, NA_SE_EV_HORSE_RUN); } } SkelAnime_Update(&this->skin.skelAnime); diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 66f60f5598..6f8629384d 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -2226,7 +2226,7 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) { D_80B7E11C = 0.5f; D_80B7E118 = Rand_ZeroFloat(1.9f); sFishMouthOffset.y = 500.0f; - func_80078914(&D_80B7AF94, NA_SE_IT_SWORD_SWING_HARD); + Sfx_PlaySfxAtPos(&D_80B7AF94, NA_SE_IT_SWORD_SWING_HARD); } } break; @@ -2246,7 +2246,7 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) { D_80B7E0E8.x *= 0.9f; D_80B7E0E8.z *= 0.9f; if (D_80B7A68C == 0) { - func_80078884(NA_SE_IT_FISHING_REEL_HIGH - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_IT_FISHING_REEL_HIGH - SFX_FLAG); } } @@ -2302,7 +2302,7 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) { D_80B7E154 = 0.0; } else { Math_ApproachF(&D_80B7E148, 0.0f, 1.0f, 0.05f); - func_80078914(&D_80B7AF94, NA_SE_EN_FANTOM_FLOAT - SFX_FLAG); + Sfx_PlaySfxAtPos(&D_80B7AF94, NA_SE_EN_FANTOM_FLOAT - SFX_FLAG); } } else { spE4 = WATER_SURFACE_Y(play); @@ -2320,7 +2320,7 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) { if ((sLurePos.y <= spE4) && (spE4 < spE0) && (spE4 == WATER_SURFACE_Y(play))) { D_80B7E114 = 10; - func_80078914(&D_80B7AF94, NA_SE_EV_BOMB_DROP_WATER); + Sfx_PlaySfxAtPos(&D_80B7AF94, NA_SE_EV_BOMB_DROP_WATER); D_80B7E0F8.y = 0.0f; D_80B7E0E8.y *= 0.2f; @@ -2346,7 +2346,7 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) { } } else { Math_ApproachZeroF(&D_80B7E148, 1.0f, 0.05f); - func_80078914(&D_80B7AF94, NA_SE_EN_FANTOM_FLOAT - SFX_FLAG); + Sfx_PlaySfxAtPos(&D_80B7AF94, NA_SE_EN_FANTOM_FLOAT - SFX_FLAG); } } @@ -2479,7 +2479,7 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) { sLureRot.x = 0.0f; if (CHECK_BTN_ALL(input->press.button, BTN_B)) { D_80B7E144 += 6.0f; - func_80078914(&D_80B7AF94, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_SAND); + Sfx_PlaySfxAtPos(&D_80B7AF94, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_SAND); } } else { if (D_80B7E144 > 150.0f) { @@ -2561,11 +2561,11 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) { if (CHECK_BTN_ALL(input->cur.button, BTN_A)) { if (CHECK_BTN_ALL(input->cur.button, BTN_R)) { D_80B7E144 += 1.5f; - func_80078884(NA_SE_IT_FISHING_REEL_HIGH - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_IT_FISHING_REEL_HIGH - SFX_FLAG); Math_ApproachF(&D_80B7E154, 1000.0f, 1.0f, 2.0f); } else { D_80B7E144 += D_80B7E11C; - func_80078884(NA_SE_IT_FISHING_REEL_SLOW - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_IT_FISHING_REEL_SLOW - SFX_FLAG); Math_ApproachF(&D_80B7E154, 1000.0f, 1.0f, 0.2f); } @@ -2622,7 +2622,7 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) { } else { D_80B7E144 += D_80B7E11C; } - func_80078884(NA_SE_IT_FISHING_REEL_SLOW - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_IT_FISHING_REEL_SLOW - SFX_FLAG); } if ((D_80B7E0AE & 0x1F) == 0) { @@ -3525,7 +3525,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) { } else if (sp124 < 10.0f) { if (sLurePos.y > (WATER_SURFACE_Y(play) - 10.0f)) { Actor_PlaySfx(&this->actor, NA_SE_EV_JUMP_OUT_WATER); - func_80078884(NA_SE_PL_CATCH_BOOMERANG); + Sfx_PlaySfxCentered(NA_SE_PL_CATCH_BOOMERANG); } func_80B70A2C(this, play, false); @@ -3602,7 +3602,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) { Rumble_Override(0.0f, spA4, 120, 5); D_80B7E0A4 = 40; D_80B7FDA8 = 10; - func_80078884(NA_SE_IT_FISHING_HIT); + Sfx_PlaySfxCentered(NA_SE_IT_FISHING_HIT); } } @@ -5205,7 +5205,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) { sSinkingLureLocation = 0; D_80B7A6CC = 20; Rumble_Override(0.0f, 150, 10, 10); - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 20); } @@ -5214,7 +5214,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) { D_80B7E0B6 = 0; D_80B7A6CC = 20; Rumble_Override(0.0f, 150, 10, 10); - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 20); } @@ -5292,9 +5292,9 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) { } if ((D_80B7E088 == 0) || (D_80B7E088 == 3)) { - func_80078884(NA_SE_SY_CAMERA_ZOOM_DOWN); + Sfx_PlaySfxCentered(NA_SE_SY_CAMERA_ZOOM_DOWN); } else { - func_80078884(NA_SE_SY_CAMERA_ZOOM_UP); + Sfx_PlaySfxCentered(NA_SE_SY_CAMERA_ZOOM_UP); } } } @@ -5669,7 +5669,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) { SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &sStreamSfxPos, &sStreamSfxProjectedPos, &sProjectedW); - func_80078914(&sStreamSfxProjectedPos, NA_SE_EV_WATER_WALL - SFX_FLAG); + Sfx_PlaySfxAtPos(&sStreamSfxProjectedPos, NA_SE_EV_WATER_WALL - SFX_FLAG); gSaveContext.minigameScore = (SQ((f32)D_80B7A678) * 0.0036f) + 0.5f; diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index df81286693..74a5f896c7 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -704,7 +704,7 @@ void ObjBean_GrowWaterPhase3(ObjBean* this, PlayState* play) { } this->stateFlags |= BEAN_STATE_BEEN_WATERED; Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BUTTERFRY_TO_FAIRY); - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } } else if (this->timer <= 0) { ObjBean_SetupGrowWaterPhase4(this); diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c index 2606c6ee64..4e7303cb37 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c @@ -52,9 +52,9 @@ void ObjBlockstop_Update(Actor* thisx, PlayState* play) { if (dynaPolyActor != NULL && dynaPolyActor->actor.id == ACTOR_OBJ_OSHIHIKI) { if ((dynaPolyActor->actor.params & 0x000F) == PUSHBLOCK_HUGE_START_ON || (dynaPolyActor->actor.params & 0x000F) == PUSHBLOCK_HUGE_START_OFF) { - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } else { - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } Flags_SetSwitch(play, this->actor.params); diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index 4c7abf7256..237d06cd43 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -130,7 +130,7 @@ void ObjBombiwa_Update(Actor* thisx, PlayState* play) { Flags_SetSwitch(play, this->actor.params & 0x3F); SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 80, NA_SE_EV_WALL_BROKEN); if (((this->actor.params >> 0xF) & 1) != 0) { - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } Actor_Kill(&this->actor); } else { diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index c65edb12df..c700c82f58 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -113,7 +113,7 @@ void ObjMakeoshihiki_Draw(Actor* thisx, PlayState* play) { } if (sfxCond1 || sfxCond2) { - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } } diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c index 44a70b168c..675d90f4fd 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -70,7 +70,7 @@ void func_80B9D0B0(ObjRoomtimer* this, PlayState* play) { } Flags_SetClear(play, this->actor.room); Flags_SetSwitch(play, this->switchFlag); - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); Actor_Kill(&this->actor); return; } diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c index e0867fc0c9..5146c4637f 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c @@ -248,7 +248,7 @@ void ObjTimeblock_Normal(ObjTimeblock* this, PlayState* play) { this->isVisible = newIsVisible; if (this->demoEffectTimer == 50) { - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } } @@ -283,7 +283,7 @@ void ObjTimeblock_AltBehaviorVisible(ObjTimeblock* this, PlayState* play) { func_80BA06AC(this, play); if (this->demoEffectTimer == 50) { - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } if (!this->isVisible && this->demoEffectTimer <= 0) { diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index de519b1c52..e2e2f48cfa 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -288,7 +288,7 @@ void func_80BA2610(ObjWarp2block* this, PlayState* play) { } } if (this->unk_16C == 0x32) { - func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); } } diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index d072d73e0f..bb9e3d5e3c 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -206,7 +206,7 @@ void ObjectKankyo_Fairies(ObjectKankyo* this, PlayState* play) { func_800F436C(&sSfxPos, NA_SE_EV_NAVY_FLY - SFX_FLAG, (0.4f * dist) + 0.6f); switch (play->csCtx.curFrame) { case 473: - func_800788CC(NA_SE_VO_NA_HELLO_3); + Sfx_PlaySfxCentered2(NA_SE_VO_NA_HELLO_3); break; case 583: @@ -214,11 +214,11 @@ void ObjectKankyo_Fairies(ObjectKankyo* this, PlayState* play) { break; case 763: - func_80078884(NA_SE_EV_NAVY_CRASH - SFX_FLAG); + Sfx_PlaySfxCentered(NA_SE_EV_NAVY_CRASH - SFX_FLAG); break; case 771: - func_80078884(NA_SE_VO_RT_THROW); + Sfx_PlaySfxCentered(NA_SE_VO_RT_THROW); break; default: diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index 704f2f498b..f176441b8e 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -121,7 +121,7 @@ void ShotSun_TriggerFairy(ShotSun* this, PlayState* play) { Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_KANKYO, this->actor.home.pos.x, this->actor.home.pos.y, this->actor.home.pos.z, 0, 0, 0, DEMOKANKYO_SPARKLES); - func_80078914(&this->actor.projectedPos, NA_SE_EV_TRE_BOX_APPEAR); + Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_TRE_BOX_APPEAR); } } @@ -166,7 +166,7 @@ void ShotSun_UpdateHyliaSun(ShotSun* this, PlayState* play) { Vec3f spawnPos; if (this->collider.base.acFlags & AC_HIT) { - func_80078884(NA_SE_SY_CORRECT_CHIME); + Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); osSyncPrintf(VT_FGCOL(CYAN) "SHOT_SUN HIT!!!!!!!\n" VT_RST); if (INV_CONTENT(ITEM_ARROW_FIRE) == ITEM_NONE) { Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_ETCETERA, 700.0f, -800.0f, 7261.0f, 0, 0, 0, 7); diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index c5af0b0cd8..9b6b3364a6 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -2444,7 +2444,7 @@ s32 func_8083442C(Player* this, PlayState* play) { if ((this->heldItemAction >= PLAYER_IA_BOW_FIRE) && (this->heldItemAction <= PLAYER_IA_BOW_0E) && (gSaveContext.magicState != MAGIC_STATE_IDLE)) { - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); } else { func_80833638(this, func_808351D4); @@ -3148,7 +3148,7 @@ void func_80835F44(PlayState* play, Player* this, s32 item) { (temp = Player_ActionToExplosive(this, itemAction), ((temp >= 0) && ((AMMO(sExplosiveInfos[temp].itemId) == 0) || (play->actorCtx.actorLists[ACTORCAT_EXPLOSIVE].length >= 3)))))) { - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); } else if (itemAction == PLAYER_IA_LENS_OF_TRUTH) { if (Magic_RequestChange(play, 0, MAGIC_CONSUME_LENS)) { if (play->actorCtx.lensActive) { @@ -3157,15 +3157,15 @@ void func_80835F44(PlayState* play, Player* this, s32 item) { play->actorCtx.lensActive = true; } - func_80078884((play->actorCtx.lensActive) ? NA_SE_SY_GLASSMODE_ON : NA_SE_SY_GLASSMODE_OFF); + Sfx_PlaySfxCentered((play->actorCtx.lensActive) ? NA_SE_SY_GLASSMODE_ON : NA_SE_SY_GLASSMODE_OFF); } else { - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); } } else if (itemAction == PLAYER_IA_DEKU_NUT) { if (AMMO(ITEM_DEKU_NUT) != 0) { func_8083C61C(play, this); } else { - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); } } else if ((temp = Player_ActionToMagicSpell(this, itemAction)) >= 0) { if (((itemAction == PLAYER_IA_FARORES_WIND) && (gSaveContext.respawn[RESPAWN_MODE_TOP].data > 0)) || @@ -3174,7 +3174,7 @@ void func_80835F44(PlayState* play, Player* this, s32 item) { this->itemAction = itemAction; this->unk_6AD = 4; } else { - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); } } else if (itemAction >= PLAYER_IA_MASK_KEATON) { if (this->currentMask != PLAYER_MASK_NONE) { @@ -4078,7 +4078,7 @@ s32 func_808382DC(Player* this, PlayState* play) { func_80832698(this, NA_SE_VO_LI_TAKEN_AWAY); play->haltAllActors = true; - func_80078884(NA_SE_OC_ABYSS); + Sfx_PlaySfxCentered(NA_SE_OC_ABYSS); } else if ((this->unk_8A1 != 0) && ((this->unk_8A1 >= 2) || (this->invincibilityTimer == 0))) { u8 sp5C[] = { 2, 1, 1 }; @@ -4338,7 +4338,7 @@ s32 func_80838FB8(PlayState* play, Player* this) { func_80838F5C(play, this); func_80832284(play, this, &gPlayerAnim_link_normal_landing_wait); func_80832698(this, NA_SE_VO_LI_FALL_S); - func_800788CC(NA_SE_OC_SECRET_WARP_IN); + Sfx_PlaySfxCentered2(NA_SE_OC_SECRET_WARP_IN); return 1; } @@ -4457,7 +4457,7 @@ s32 func_80839034(PlayState* play, Player* this, CollisionPoly* poly, u32 bgId) ((sp34 < 100) || (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND))) { if (temp == FLOOR_TYPE_11) { - func_800788CC(NA_SE_OC_SECRET_HOLE_OUT); + Sfx_PlaySfxCentered2(NA_SE_OC_SECRET_HOLE_OUT); func_800F6964(5); gSaveContext.seqId = (u8)NA_BGM_DISABLED; gSaveContext.natureAmbienceId = NATURE_ID_DISABLED; @@ -4509,7 +4509,7 @@ s32 func_80839034(PlayState* play, Player* this, CollisionPoly* poly, u32 bgId) Play_TriggerVoidOut(play); } play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; - func_80078884(NA_SE_OC_ABYSS); + Sfx_PlaySfxCentered(NA_SE_OC_ABYSS); } else { func_80838F5C(play, this); this->unk_850 = 9999; @@ -5326,12 +5326,12 @@ s32 func_8083B040(Player* this, PlayState* play) { func_8083B010(this); } this->stateFlags1 |= PLAYER_STATE1_20; - func_80078884(NA_SE_SY_CAMERA_ZOOM_UP); + Sfx_PlaySfxCentered(NA_SE_SY_CAMERA_ZOOM_UP); Player_ZeroSpeedXZ(this); return 1; } else { this->unk_6AD = 0; - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); return 0; } @@ -5442,7 +5442,7 @@ s32 func_8083B998(Player* this, PlayState* play) { } else if ((this->naviTextId == 0) && !func_8008E9C4(this) && CHECK_BTN_ALL(sControlInput->press.button, BTN_CUP) && (R_SCENE_CAM_TYPE != SCENE_CAM_TYPE_FIXED_SHOP_VIEWPOINT) && (R_SCENE_CAM_TYPE != SCENE_CAM_TYPE_FIXED_TOGGLE_VIEWPOINT) && !func_8083B8F4(this, play)) { - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); } return 0; @@ -5750,7 +5750,7 @@ s32 func_8083C6B8(PlayState* play, Player* this) { if (!(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) || (this->actor.world.pos.z > 1300.0f) || BgCheck_SphVsFirstPoly(&play->colCtx, &sp24, 20.0f)) { - func_80078884(NA_SE_SY_ERROR); + Sfx_PlaySfxCentered(NA_SE_SY_ERROR); return 0; } @@ -6397,7 +6397,7 @@ void func_8083E4C4(PlayState* play, Player* this, GetItemEntry* giEntry) { Item_Give(play, giEntry->itemId); } - func_80078884((this->getItemId < 0) ? NA_SE_SY_GET_BOXITEM : NA_SE_SY_GET_ITEM); + Sfx_PlaySfxCentered((this->getItemId < 0) ? NA_SE_SY_GET_BOXITEM : NA_SE_SY_GET_ITEM); } s32 func_8083E5A8(Player* this, PlayState* play) { @@ -10491,7 +10491,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { this->unk_A86++; if (this->unk_A86 == 0) { this->unk_A86 = 1; - func_80078884(NA_SE_OC_REVENGE); + Sfx_PlaySfxCentered(NA_SE_OC_REVENGE); } } @@ -11283,7 +11283,7 @@ void func_8084B1D8(Player* this, PlayState* play) { CHECK_BTN_ANY(sControlInput->press.button, BTN_A | BTN_B | BTN_R | BTN_CUP | BTN_CLEFT | BTN_CRIGHT | BTN_CDOWN)))) { func_8083C148(this, play); - func_80078884(NA_SE_SY_CAMERA_ZOOM_UP); + Sfx_PlaySfxCentered(NA_SE_SY_CAMERA_ZOOM_UP); } else if ((DECR(this->unk_850) == 0) || (this->unk_6AD != 2)) { if (func_8008F128(this)) { this->unk_6AE |= 0x43; @@ -13103,7 +13103,7 @@ void func_8084F88C(Player* this, PlayState* play) { } play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; - func_80078884(NA_SE_OC_ABYSS); + Sfx_PlaySfxCentered(NA_SE_OC_ABYSS); } else { play->transitionType = TRANS_TYPE_FADE_BLACK; gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK; @@ -13447,7 +13447,7 @@ void func_8085063C(Player* this, PlayState* play) { if (play->msgCtx.choiceIndex == 1) { gSaveContext.respawn[RESPAWN_MODE_TOP].data = -respawnData; gSaveContext.save.info.fw.set = 0; - func_80078914(&gSaveContext.respawn[RESPAWN_MODE_TOP].pos, NA_SE_PL_MAGIC_WIND_VANISH); + Sfx_PlaySfxAtPos(&gSaveContext.respawn[RESPAWN_MODE_TOP].pos, NA_SE_PL_MAGIC_WIND_VANISH); } func_80853080(this, play); @@ -13467,7 +13467,7 @@ void func_8085076C(Player* this, PlayState* play) { if (this->unk_850++ == 20) { gSaveContext.respawn[RESPAWN_MODE_TOP].data = respawnData + 1; - func_80078914(&gSaveContext.respawn[RESPAWN_MODE_TOP].pos, NA_SE_PL_MAGIC_WIND_WARP); + Sfx_PlaySfxAtPos(&gSaveContext.respawn[RESPAWN_MODE_TOP].pos, NA_SE_PL_MAGIC_WIND_WARP); } }