diff --git a/include/functions.h b/include/functions.h index e3ff8fddda..0aa19e492e 100644 --- a/include/functions.h +++ b/include/functions.h @@ -706,8 +706,8 @@ void func_800B8D50(PlayState* play, Actor* actor, f32 arg2, s16 yaw, f32 arg4, u void func_800B8D98(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4); void func_800B8DD4(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5); void func_800B8E1C(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4); -void func_800B8E58(Player* player, u16 sfxId); -void Actor_PlaySfxAtPos(Actor* actor, u16 sfxId); +void Player_PlaySfx(Player* player, u16 sfxId); +void Actor_PlaySfx(Actor* actor, u16 sfxId); void func_800B8EF4(PlayState* play, Actor* actor); void func_800B8F98(Actor* actor, u16 sfxId); void func_800B8FC0(Actor* actor, u16 sfxId); diff --git a/include/z64actor.h b/include/z64actor.h index 04c8fd02a3..7c48cd5cfa 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -218,7 +218,6 @@ typedef struct { /* 0x148 */ f32 pushForce; /* 0x14C */ f32 unk14C; /* 0x150 */ s16 yRotation; - /* 0x152 */ u16 unk152; /* 0x154 */ u32 flags; /* 0x158 */ u8 stateFlags; /* 0x15A */ s16 pad15A; diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 912c3ee81c..6ba05d4f96 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -2130,7 +2130,10 @@ void func_800B8E1C(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4) func_800B8DD4(play, actor, arg2, arg3, arg4, 0); } -void func_800B8E58(Player* player, u16 sfxId) { +/** + * Play a sound effect at the player's position + */ +void Player_PlaySfx(Player* player, u16 sfxId) { if (player->currentMask == PLAYER_MASK_GIANT) { func_8019F170(&player->actor.projectedPos, sfxId); } else { @@ -2140,9 +2143,9 @@ void func_800B8E58(Player* player, u16 sfxId) { } /** - * Plays the sound effect at the actor's position + * Play a sound effect at the actor's position */ -void Actor_PlaySfxAtPos(Actor* actor, u16 sfxId) { +void Actor_PlaySfx(Actor* actor, u16 sfxId) { Audio_PlaySfxAtPos(&actor->projectedPos, sfxId); } @@ -3839,7 +3842,7 @@ void Actor_SpawnShieldParticlesMetal(PlayState* play, Vec3f* pos) { void Actor_SetColorFilter(Actor* actor, u16 colorFlag, u16 colorIntensityMax, u16 xluFlag, u16 duration) { if ((colorFlag == 0x8000) && !(colorIntensityMax & 0x8000)) { - Actor_PlaySfxAtPos(actor, NA_SE_EN_LIGHT_ARROW_HIT); + Actor_PlaySfx(actor, NA_SE_EN_LIGHT_ARROW_HIT); } actor->colorFilterParams = colorFlag | xluFlag | ((colorIntensityMax & 0xF8) << 5) | duration; @@ -4476,13 +4479,13 @@ void Actor_DrawDamageEffects(PlayState* play, Actor* actor, Vec3f limbPos[], s16 // Apply sfx along with damage effect if ((actor != NULL) && (effectAlpha > 0.05f) && (play->gameOverCtx.state == GAMEOVER_INACTIVE)) { if (type == ACTOR_DRAW_DMGEFF_FIRE) { - Actor_PlaySfxAtPos(actor, NA_SE_EV_BURN_OUT - SFX_FLAG); + Actor_PlaySfx(actor, NA_SE_EV_BURN_OUT - SFX_FLAG); } else if (type == ACTOR_DRAW_DMGEFF_BLUE_FIRE) { - Actor_PlaySfxAtPos(actor, NA_SE_EN_COMMON_EXTINCT_LEV - SFX_FLAG); + Actor_PlaySfx(actor, NA_SE_EN_COMMON_EXTINCT_LEV - SFX_FLAG); } else if (type == ACTOR_DRAW_DMGEFF_FROZEN_SFX) { - Actor_PlaySfxAtPos(actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG); + Actor_PlaySfx(actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG); } else if ((type == ACTOR_DRAW_DMGEFF_LIGHT_ORBS) || (type == ACTOR_DRAW_DMGEFF_BLUE_LIGHT_ORBS)) { - Actor_PlaySfxAtPos(actor, NA_SE_EN_COMMON_DEADLIGHT - SFX_FLAG); + Actor_PlaySfx(actor, NA_SE_EN_COMMON_DEADLIGHT - SFX_FLAG); } } diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index 4f24651d13..0b08f4dd07 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -805,7 +805,7 @@ void EffectSsEnIce_SpawnFlying(PlayState* play, Actor* actor, Vec3f* pos, Color_ initParams.scale = scale; if (actor != NULL) { - Actor_PlaySfxAtPos(actor, NA_SE_PL_FREEZE_S); + Actor_PlaySfx(actor, NA_SE_PL_FREEZE_S); } EffectSs_Spawn(play, EFFECT_SS_EN_ICE, 80, &initParams); @@ -897,7 +897,7 @@ void EffectSsEnFire_SpawnVec3f(PlayState* play, Actor* actor, Vec3f* pos, s16 sc initParams.bodyPart = bodyPart; if (actor != NULL) { - Actor_PlaySfxAtPos(actor, NA_SE_EV_FLAME_IGNITION); + Actor_PlaySfx(actor, NA_SE_EV_FLAME_IGNITION); } EffectSs_Spawn(play, EFFECT_SS_EN_FIRE, 128, &initParams); @@ -917,7 +917,7 @@ void EffectSsEnFire_SpawnVec3s(PlayState* play, Actor* actor, Vec3s* pos, s16 sc initParams.bodyPart = bodyPart; if (actor != NULL) { - Actor_PlaySfxAtPos(actor, NA_SE_EV_FLAME_IGNITION); + Actor_PlaySfx(actor, NA_SE_EV_FLAME_IGNITION); } EffectSs_Spawn(play, EFFECT_SS_EN_FIRE, 128, &initParams); diff --git a/src/code/z_en_hy_code.c b/src/code/z_en_hy_code.c index 66645753e5..85a5e7e84f 100644 --- a/src/code/z_en_hy_code.c +++ b/src/code/z_en_hy_code.c @@ -267,12 +267,12 @@ s32 EnHy_PlayWalkingSound(EnHy* enHy, PlayState* play, f32 distAboveThreshold) { enHy->isLeftFootOnGround = isFootOnGround = SubS_IsFloorAbove(play, &enHy->leftFootPos, distAboveThreshold); if (enHy->isLeftFootOnGround && !wasLeftFootOnGround && isFootOnGround) { - Actor_PlaySfxAtPos(&enHy->actor, sfxId); + Actor_PlaySfx(&enHy->actor, sfxId); } enHy->isRightFootOnGround = isFootOnGround = SubS_IsFloorAbove(play, &enHy->rightFootPos, distAboveThreshold); if (enHy->isRightFootOnGround && !wasRightFootOnGround && isFootOnGround) { - Actor_PlaySfxAtPos(&enHy->actor, sfxId); + Actor_PlaySfx(&enHy->actor, sfxId); } return false; diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 41a3f25eca..971b778be5 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -186,7 +186,7 @@ void FireArrow_Fly(ArrowFire* this, PlayState* play) { FireArrow_Lerp(&this->firedPos, &this->actor.world.pos, 0.05f); if (arrow->unk_261 & 1) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_EXPLOSION_FRAME); + Actor_PlaySfx(&this->actor, NA_SE_IT_EXPLOSION_FRAME); ArrowFire_SetupAction(this, FireArrow_Hit); this->timer = 32; this->alpha = 255; diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 5c5cd0c872..62c97ccde0 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -160,7 +160,7 @@ void ArrowIce_Fly(ArrowIce* this, PlayState* play) { ArrowIce_LerpFiredPosition(&this->firedPos, &this->actor.world.pos, 0.05f); if (arrow->unk_261 & 1) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_EXPLOSION_ICE); + Actor_PlaySfx(&this->actor, NA_SE_IT_EXPLOSION_ICE); ArrowIce_SetupAction(this, ArrowIce_Hit); this->timer = 32; this->alpha = 255; diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index b7918b5b46..360afa4ac9 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -154,7 +154,7 @@ void ArrowLight_Fly(ArrowLight* this, PlayState* play) { ArrowLight_Lerp(&this->firedPos, &this->actor.world.pos, 0.05f); if (arrow->unk_261 & 1) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_EXPLOSION_LIGHT); + Actor_PlaySfx(&this->actor, NA_SE_IT_EXPLOSION_LIGHT); ArrowLight_SetupAction(this, ArrowLight_Hit); this->timer = 32; this->alpha = 255; diff --git a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c index dcf37d848e..647fabf73f 100644 --- a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c @@ -184,7 +184,7 @@ void func_80C0A458(BgAstrBombwall* this, PlayState* play) { func_800C62BC(play, &play->colCtx.dyna, this->dyna.bgId); this->dyna.actor.draw = NULL; func_80C0A120(this, play); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WALL_BROKEN); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WALL_BROKEN); this->actionFunc = func_80C0A4BC; } diff --git a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c index 0320912931..ef2ca52738 100644 --- a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c +++ b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c @@ -343,7 +343,7 @@ void BgCraceMovebg_ClosingDoor_SetupDoNothing(BgCraceMovebg* this, PlayState* pl this->targetDoorHeight = 0.0f; this->doorHeight = 0.0f; this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); this->actionFunc = BgCraceMovebg_ClosingDoor_DoNothing; } diff --git a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c index 68b2d77d2e..533ce6292b 100644 --- a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c +++ b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c @@ -108,7 +108,7 @@ void BgCtowerGear_Splash(BgCtowerGear* this, PlayState* play) { } } } - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WATERWHEEL_LEVEL); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WATERWHEEL_LEVEL); } } diff --git a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c index 85dcb0aca7..5cc9d4b8df 100644 --- a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c +++ b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c @@ -99,7 +99,7 @@ void BgCtowerRot_DoorDoNothing(BgCtowerRot* this, PlayState* play) { void BgCtowerRot_DoorClose(BgCtowerRot* this, PlayState* play) { if (!Math_SmoothStepToF(&this->timer, 0.0f, 0.1f, 15.0f, 0.1f)) { if (this->dyna.actor.params == BGCTOWERROT_STONE_DOOR_MAIN) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); ActorCutscene_Stop(this->dyna.actor.cutscene); } this->actionFunc = BgCtowerRot_DoorDoNothing; diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c index c962cf8efd..064b14f7bd 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c @@ -485,7 +485,7 @@ void func_80B82DE0(BgDblueBalance* this, PlayState* play) { this->unk_178 *= -0.6f; this->unk_17C++; if (this->unk_182) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_SEESAW_WATER_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_SEESAW_WATER_BOUND); sp5C = this->unk_15C; Matrix_Push(); Matrix_RotateYS(BINANG_SUB(this->dyna.actor.shape.rot.y, 0x4000), MTXMODE_NEW); @@ -498,7 +498,7 @@ void func_80B82DE0(BgDblueBalance* this, PlayState* play) { func_80B8296C(play, &sp50, 70.0f); } else { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_SEESAW_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_SEESAW_BOUND); } } else { this->dyna.actor.shape.rot.z = 0x1C72; @@ -510,7 +510,7 @@ void func_80B82DE0(BgDblueBalance* this, PlayState* play) { this->unk_178 *= -0.6f; this->unk_17C++; if (this->unk_182) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_SEESAW_WATER_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_SEESAW_WATER_BOUND); sp3C = this->unk_160; Matrix_Push(); Matrix_RotateYS(BINANG_ADD(this->dyna.actor.shape.rot.y, 0x4000), MTXMODE_NEW); @@ -523,7 +523,7 @@ void func_80B82DE0(BgDblueBalance* this, PlayState* play) { func_80B8296C(play, &sp30, 47.0f); } else { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_SEESAW_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_SEESAW_BOUND); } } else { this->dyna.actor.shape.rot.z = -0x1C72; diff --git a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c index 45b42942b0..b597f695a3 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c @@ -422,7 +422,7 @@ void func_80A2A444(BgDblueMovebg* this, PlayState* play) { player->stateFlags2 &= ~PLAYER_STATE2_10; this->dyna.pushForce = 0.0f; Flags_SetSwitch(play, this->unk_1C0); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); if (func_80A29A80(play, this->unk_1C8, this->unk_1C4)) { this->unk_172 |= 1; @@ -524,7 +524,7 @@ void func_80A2A7F8(BgDblueMovebg* this, PlayState* play) { this->unk_18A = 0; this->unk_17E = 0; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); if (func_80A29A80(play, this->unk_1C8, this->unk_1C4)) { this->unk_172 |= 1; diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c index b4c97fddef..3ba003ee5f 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c @@ -223,7 +223,7 @@ void func_80B841A0(BgDblueWaterfall* this, PlayState* play) { EffectSsGSplash_Spawn(play, &sp94, NULL, NULL, 0, 250); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_REFLECTION_WATER); + Actor_PlaySfx(&this->actor, NA_SE_IT_REFLECTION_WATER); } } diff --git a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c index 6ec845e2c2..1244695578 100644 --- a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c +++ b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c @@ -164,7 +164,7 @@ void BgDkjailIvy_BeginCutscene(BgDkjailIvy* this, PlayState* play) { func_800C62BC(play, &play->colCtx.dyna, this->dyna.bgId); Flags_SetSwitch(play, BG_DKJAIL_GET_SWITCH(&this->dyna.actor)); BgDkjailIvy_IvyCutEffects(this, play); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_GRASS_WALL_BROKEN); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_GRASS_WALL_BROKEN); BgDkjailIvy_SetupFadeOut(this); } else { ActorCutscene_SetIntentToPlay(this->dyna.actor.cutscene); diff --git a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c index 71aa958dc7..b110ba68f1 100644 --- a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c +++ b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c @@ -278,14 +278,14 @@ void func_80BC4228(BgF40Block* this, PlayState* play) { } else { this->actionFunc = func_80BC4530; ActorCutscene_Stop(this->dyna.actor.cutscene); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_STOP_C); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_STOP_C); } } if (func_80BC3D08(this, play, 0)) { ActorCutscene_Stop(this->dyna.actor.cutscene); this->actionFunc = func_80BC41AC; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_STOP_F); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_STOP_F); return; } @@ -338,14 +338,14 @@ void func_80BC4448(BgF40Block* this, PlayState* play) { } else { this->actionFunc = func_80BC4380; ActorCutscene_Stop(this->dyna.actor.cutscene); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_STOP_C); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_STOP_C); } } if (func_80BC3D08(this, play, 0)) { ActorCutscene_Stop(this->dyna.actor.cutscene); this->actionFunc = func_80BC43CC; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_STOP_F); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_STOP_F); } } diff --git a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c index 3a7916e7d3..558c77064a 100644 --- a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c +++ b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c @@ -129,7 +129,7 @@ void BgF40Switch_Destroy(Actor* thisx, PlayState* play) { void BgF40Switch_Unpress(BgF40Switch* this, PlayState* play) { this->dyna.actor.scale.y += 0.0495f; if (this->dyna.actor.scale.y >= 0.165f) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_SWITCH); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_SWITCH); this->actionFunc = BgF40Switch_IdleUnpressed; this->dyna.actor.scale.y = 0.165f; } @@ -144,7 +144,7 @@ void BgF40Switch_IdlePressed(BgF40Switch* this, PlayState* play) { void BgF40Switch_Press(BgF40Switch* this, PlayState* play) { this->dyna.actor.scale.y -= 0.0495f; if (this->dyna.actor.scale.y <= 0.0165f) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_SWITCH); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_SWITCH); Rumble_Request(this->dyna.actor.xyzDistToPlayerSq, 120, 20, 10); if (this->isInitiator) { ActorCutscene_Stop(this->dyna.actor.cutscene); diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c index 0b8d2490b5..42a7c4e055 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c @@ -68,7 +68,7 @@ void func_80ABD92C(BgHakuginElvpole* this, PlayState* play) { sp28 = true; } else if (this->unk_15E > 0) { if (this->unk_15E == 100) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); } this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 120.0f; //! FAKE: @@ -83,7 +83,7 @@ void func_80ABD92C(BgHakuginElvpole* this, PlayState* play) { this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 320.0f; Flags_UnsetSwitch(play, BGHAKUGINELVPOLE_GET_SWITCHFLAG(&this->dyna.actor)); this->unk_15E = -1; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); } } else if ((BGHAKUGINELVPOLE_GET_SWITCHFLAG(&this->dyna.actor) != 0x7F) && Flags_GetSwitch(play, BGHAKUGINELVPOLE_GET_SWITCHFLAG(&this->dyna.actor))) { diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c index 7f77b66453..d4d7e1724b 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c @@ -839,7 +839,7 @@ void func_80A9CE1C(BgHakuginPost* this, PlayState* play) { temp = (s16)(this->dyna.actor.yawTowardsPlayer + 0x58F0); D_80A9E028.unk_0000[i].unk_28 = ((s16)(player->actor.shape.rot.y - temp) / 3) + temp; D_80A9E028.unk_0000[i].unk_34 = 2; - func_800B8E58(player, NA_SE_IT_HAMMER_HIT); + Player_PlaySfx(player, NA_SE_IT_HAMMER_HIT); func_8019F128(NA_SE_EV_SLIDE_DOOR_OPEN); Flags_SetSwitch(play, D_80A9E028.unk_0000[i].unk_2E); this->unk_178 = 20; diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c index aa22dd8af8..3f7379d34d 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c @@ -102,7 +102,7 @@ static InitChainEntry sInitChain2[] = { void func_80B15790(BgHakuginSwitch* this, u16 sfxId) { if (this->unk_1B2 <= 0) { - Actor_PlaySfxAtPos(&this->dyna.actor, sfxId); + Actor_PlaySfx(&this->dyna.actor, sfxId); } } diff --git a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c index 265490e52b..27e5d2fee9 100644 --- a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c +++ b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c @@ -86,7 +86,7 @@ void func_80AC4A80(BgIcefloe* this, PlayState* play) { this->timer = 20; SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &this->dyna.actor.world.pos, &this->dyna.actor.projectedPos, &this->dyna.actor.projectedW); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_ICE_STAND_APPEAR); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_ICE_STAND_APPEAR); this->actionFunc = BgIcefloe_Grow; } @@ -133,7 +133,7 @@ void func_80AC4C34(BgIcefloe* this, PlayState* play) { void func_80AC4CF0(BgIcefloe* this) { this->timer = 50; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_ICE_MELT_LEVEL); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_ICE_MELT_LEVEL); this->actionFunc = func_80AC4D2C; } diff --git a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c index 7432136529..0e8c0f493d 100644 --- a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c +++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c @@ -142,7 +142,7 @@ void BgIcicle_Shiver(BgIcicle* this, PlayState* play) { } if (!(this->shiverTimer % 4)) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_ICE_SWING); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_ICE_SWING); } if (this->shiverTimer == 0) { diff --git a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c index 9d249314a5..b6206ecb76 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c @@ -294,7 +294,7 @@ void func_80B7F290(BgIkanaBlock* this, PlayState* play) { Player* player = GET_PLAYER(play); if (!func_80B7EB94(this, play)) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); } player->stateFlags2 &= ~PLAYER_STATE2_10; @@ -334,10 +334,10 @@ void func_80B7F398(BgIkanaBlock* this, PlayState* play) { this->dyna.actor.world.pos.y += this->dyna.actor.velocity.y; if (func_80B7EE70(this, play)) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); - Actor_PlaySfxAtPos(&this->dyna.actor, - SurfaceType_GetSfx(&play->colCtx, this->dyna.actor.floorPoly, this->dyna.actor.floorBgId) + - SFX_FLAG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + Actor_PlaySfx(&this->dyna.actor, + SurfaceType_GetSfx(&play->colCtx, this->dyna.actor.floorPoly, this->dyna.actor.floorBgId) + + SFX_FLAG); func_80B7F0A4(this); } } diff --git a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c index 678080ae16..3c31f8846c 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c @@ -158,7 +158,7 @@ void BgIkanaDharma_WaitForHit(BgIkanaDharma* this, PlayState* play) { tempAngle2 = (BINANG_SUB(player->actor.shape.rot.y, tempAngle1) >> 1); this->dyna.actor.world.rot.y = tempAngle1 + tempAngle2 + 0xF000; this->dyna.actor.speedXZ = 20.0f; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_DARUMA_VANISH); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_DARUMA_VANISH); BgIkanaDharma_SetupStartCutscene(this); } else if ((this->dyna.actor.flags & ACTOR_FLAG_40) == ACTOR_FLAG_40 && sFirstHitBgIkanaDharma == NULL && this->dyna.actor.xzDistToPlayer < 420.0f) { @@ -234,7 +234,7 @@ void BgIkanaDharma_Update(Actor* thisx, PlayState* play) { Quake_SetQuakeValues(quakeIndex, 4, 0, 0, 0); Quake_SetCountdown(quakeIndex, 12); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); } } else { if (actorBelow->actor.id == ACTOR_BG_IKANA_DHARMA) { diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c index 4561d4049a..3a0107e11c 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c @@ -648,9 +648,9 @@ void func_80B814B8(BgIkanaRotaryroom* this, PlayState* play) { if (ActorCutscene_GetCurrentIndex() == this->dyna.actor.cutscene) { if (player->actor.bgCheckFlags & 0x100) { - func_800B8E58(player, NA_SE_VO_LI_DAMAGE_S + player->ageProperties->voiceSfxIdOffset); + Player_PlaySfx(player, NA_SE_VO_LI_DAMAGE_S + player->ageProperties->voiceSfxIdOffset); func_80169EFC(&play->state); - func_800B8E58(player, NA_SE_VO_LI_TAKEN_AWAY + player->ageProperties->voiceSfxIdOffset); + Player_PlaySfx(player, NA_SE_VO_LI_TAKEN_AWAY + player->ageProperties->voiceSfxIdOffset); play->haltAllActors = true; play_sound(NA_SE_OC_ABYSS); this->actionFunc = NULL; diff --git a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c index f9a9fcc379..a9070cb8b3 100644 --- a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c +++ b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c @@ -156,7 +156,7 @@ void func_80C0ABA8(BgIkninSusceil* this, PlayState* play) { if (this->dyna.actor.world.pos.y <= this->dyna.actor.home.pos.y) { func_80C0A86C(this, play, 4, 14, 1); Flags_UnsetSwitch(play, SUSCEIL_GET_SWITCHFLAG(&this->dyna.actor)); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BIGWALL_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BIGWALL_BOUND); func_80C0AC74(this); } else { func_800B9010(&this->dyna.actor, NA_SE_EV_ICE_PILLAR_FALL - SFX_FLAG); @@ -230,7 +230,7 @@ void BgIkninSusceil_Update(Actor* thisx, PlayState* play) { (player->unk_B48 > 1000.0f)) { this->unk168 = 2; if ((func_80C0A95C(this, play) != 0) && (this->actionFunc != func_80C0AE5C)) { - func_800B8E58(player, NA_SE_PL_BODY_HIT); + Player_PlaySfx(player, NA_SE_PL_BODY_HIT); func_80C0AE3C(this); } } diff --git a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c index ba65baca42..2651c52bc9 100644 --- a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c +++ b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c @@ -149,7 +149,7 @@ s32 func_80BD7E0C(BgIknvObj* this, s16 targetRotation, PlayState* play) { func_800B9010(&this->dyna.actor, NA_SE_EV_STONEDOOR_OPEN_S - SFX_FLAG); return false; } - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); return true; } diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index 4bfa17c1c3..55940f3fa7 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -207,7 +207,7 @@ void func_80953F9C(BgIngate* this, PlayState* play) { this->actionFunc = func_809542A0; } } else if ((ActorCutscene_GetCurrentIndex() == -1) && (this->timePath != NULL)) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_CRUISER - SFX_FLAG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_CRUISER - SFX_FLAG); func_80953BEC(this); } } diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c index 12bfc0f3c2..282a43925a 100644 --- a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c +++ b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c @@ -61,10 +61,10 @@ void func_80A5389C(BgKeikokuSaku* this, PlayState* play) { } void func_80A538E0(BgKeikokuSaku* this, PlayState* play) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_METALGATE_OPEN - SFX_FLAG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_METALGATE_OPEN - SFX_FLAG); this->dyna.actor.world.pos.z -= 2.0f + BREG(8); if (this->dyna.actor.world.pos.z < (BREG(9) + 2660.0f)) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BRIDGE_OPEN_STOP); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BRIDGE_OPEN_STOP); this->timer = 30; this->actionFunc = func_80A53994; } diff --git a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c index 5892376ba1..5a23089a21 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c @@ -207,7 +207,7 @@ void BgKin2Picture_Wait(BgKin2Picture* this, PlayState* play) { } else { // Gold Skulltula can be heard behind Skullkid's painting. if (this->skulltulaNoiseTimer >= 0) { if (this->skulltulaNoiseTimer == 0) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EN_STALGOLD_ROLL); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EN_STALGOLD_ROLL); if (Rand_ZeroOne() < 0.1f) { this->skulltulaNoiseTimer = Rand_S16Offset(40, 80); @@ -297,7 +297,7 @@ void BgKin2Picture_Fall(BgKin2Picture* this, PlayState* play) { } if (this->landTimer < 3) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_SMALL_WOODPLATE_BOUND_0); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_SMALL_WOODPLATE_BOUND_0); } } } @@ -318,7 +318,7 @@ void BgKin2Picture_Fall(BgKin2Picture* this, PlayState* play) { } func_800C6314(play, &play->colCtx.dyna, this->dyna.bgId); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WOODPLATE_BROKEN); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WOODPLATE_BROKEN); BgKin2Picture_SetupDoNothing(this); } else { this->dyna.actor.shape.yOffset = Math_SinS(this->dyna.actor.shape.rot.x) * 40.0f; diff --git a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c index f766fef784..1443516149 100644 --- a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c +++ b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c @@ -100,7 +100,7 @@ void BgLadder_StartCutscene(BgLadder* this, PlayState* play) { if (ActorCutscene_GetCanPlayNext(this->dyna.actor.cutscene)) { ActorCutscene_StartAndSetUnkLinkFields(this->dyna.actor.cutscene, &this->dyna.actor); this->dyna.actor.draw = BgLadder_Draw; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_SECRET_LADDER_APPEAR); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_SECRET_LADDER_APPEAR); this->action = BgLadder_FadeIn; } else { ActorCutscene_SetIntentToPlay(this->dyna.actor.cutscene); diff --git a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c index d704adf861..521e14d631 100644 --- a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c +++ b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c @@ -248,7 +248,7 @@ void func_80C188C4(BgLastBwall* this, PlayState* play) { func_800C62BC(play, &play->colCtx.dyna, this->dyna.bgId); this->dyna.actor.draw = NULL; func_80C184EC(this, play); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WALL_BROKEN); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WALL_BROKEN); this->actionFunc = BgLastBwall_DoNothing; } diff --git a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c index 497ed10abc..0c12374a1b 100644 --- a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c +++ b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c @@ -216,7 +216,7 @@ void BgNumaHana_SetupClosedIdle(BgNumaHana* this) { */ void BgNumaHana_ClosedIdle(BgNumaHana* this, PlayState* play) { if (this->fire.state != 3) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_FLAME_IGNITION); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_FLAME_IGNITION); if (ActorCutscene_GetCanPlayNext(this->dyna.actor.cutscene)) { ActorCutscene_StartAndSetUnkLinkFields(this->dyna.actor.cutscene, &this->dyna.actor); SET_WEEKEVENTREG(WEEKEVENTREG_12_01); @@ -247,7 +247,7 @@ void BgNumaHana_UnfoldInnerPetals(BgNumaHana* this, PlayState* play) { this->settleZRotation = 0; this->settleAngle = 0; this->settleScale = 420.0f; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_FLOWERPETAL_STOP); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_FLOWERPETAL_STOP); } this->transitionTimer++; } @@ -279,7 +279,7 @@ void BgNumaHana_UnfoldOuterPetals(BgNumaHana* this, PlayState* play) { this->settleZRotation = 0; this->settleAngle = 0x5120; this->settleScale = 130.0f; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_FLOWERPETAL_STOP); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_FLOWERPETAL_STOP); } this->transitionTimer++; } diff --git a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c index c264b9775d..3f7e45f673 100644 --- a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c +++ b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c @@ -111,7 +111,7 @@ void func_80ACAD88(BgOpenShutter* this, PlayState* play) { if (this->unk_15C != 0) { Player* player = GET_PLAYER(play); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_SLIDE_DOOR_OPEN); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_SLIDE_DOOR_OPEN); Camera_ChangeDoorCam(play->cameraPtrs[CAM_ID_MAIN], &this->dyna.actor, player->unk_3BA, 0.0f, 12, 15, 10); this->unk_164 = 0; this->actionFunc = func_80ACAE5C; @@ -136,7 +136,7 @@ void func_80ACAE5C(BgOpenShutter* this, PlayState* play) { this->unk_164++; } if (this->unk_164 >= 10) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_SLIDE_DOOR_CLOSE); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_SLIDE_DOOR_CLOSE); this->actionFunc = func_80ACAEF0; } } @@ -149,7 +149,7 @@ void func_80ACAEF0(BgOpenShutter* this, PlayState* play) { if (Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y, this->dyna.actor.velocity.y)) { this->dyna.actor.floorHeight = this->dyna.actor.home.pos.y; Actor_SpawnFloorDustRing(play, &this->dyna.actor, &this->dyna.actor.world.pos, 60.0f, 10, 8.0f, 500, 10, true); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BIGWALL_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BIGWALL_BOUND); quakeIndex = Quake_Add(Play_GetCamera(play, CAM_ID_MAIN), QUAKE_TYPE_3); Quake_SetSpeed(quakeIndex, -32536); @@ -172,14 +172,14 @@ void BgOpenShutter_Update(Actor* thisx, PlayState* play2) { index = Cutscene_GetActorActionIndex(play, 0x7C); if (play->csCtx.actorActions[index]->action == BGOPENSHUTTER_DOOR_OPEN) { if (this->actionFunc == func_80ACAD88) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_SLIDE_DOOR_OPEN); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_SLIDE_DOOR_OPEN); this->actionFunc = func_80ACAE5C; this->dyna.actor.velocity.y = 0.0f; } this->unk_164 = 0; } else if (play->csCtx.actorActions[index]->action == BGOPENSHUTTER_DOOR_CLOSED) { if (this->actionFunc == func_80ACAE5C) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_SLIDE_DOOR_CLOSE); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_SLIDE_DOOR_CLOSE); this->actionFunc = func_80ACAEF0; } } diff --git a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c index fb8d464c8b..5a886d5b30 100644 --- a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c +++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c @@ -336,7 +336,7 @@ void func_809CE4C8(BgSpdweb* this, PlayState* play) { } } else if (this->unk_162 == 11) { if (this->unk_164 > 3.0f) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WEB_VIBRATION); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WEB_VIBRATION); } else { AudioSfx_StopById(NA_SE_EV_WEB_VIBRATION); } diff --git a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c index d6617ef1c0..46fe15007b 100644 --- a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c +++ b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c @@ -62,7 +62,7 @@ void BgTobira01_Open(BgTobira01* this, PlayState* play) { if (this->timer != prevTimer) { if (1) {} - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_STONEDOOR_OPEN_S - SFX_FLAG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_STONEDOOR_OPEN_S - SFX_FLAG); this->dyna.actor.world.pos.y = (this->yOffset = (this->timer * (5.0f / 3.0f)) + this->dyna.actor.home.pos.y); this->timer2 = 180; } diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.c b/src/overlays/actors/ovl_Boss_02/z_boss_02.c index 805d79170f..7269a61e7e 100644 --- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c @@ -732,7 +732,7 @@ void func_809DAB78(Boss02* this, PlayState* play) { this->unk_0170 = this->unk_017C; this->unk_0170.y = temp_f0; this->unk_016C = 120; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_INBOSS_ROAR_OLD); + Actor_PlaySfx(&this->actor, NA_SE_EN_INBOSS_ROAR_OLD); } this->actor.flags &= ~ACTOR_FLAG_1; @@ -941,7 +941,7 @@ void func_809DAB78(Boss02* this, PlayState* play) { sTwinmoldStatic->subCamAtVel = 0.0f; play_sound(NA_SE_EN_INBOSS_DEAD_PRE2_OLD); } else if (!(this->unk_0146[1] & 0xF) && (Rand_ZeroOne() < 0.5f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_INBOSS_DAMAGE_OLD); + Actor_PlaySfx(&this->actor, NA_SE_EN_INBOSS_DAMAGE_OLD); } return; @@ -982,7 +982,7 @@ void func_809DAB78(Boss02* this, PlayState* play) { Audio_QueueSeqCmd(NA_BGM_CLEAR_BOSS | 0x8000); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_INBOSS_DEAD_OLD); + Actor_PlaySfx(&this->actor, NA_SE_EN_INBOSS_DEAD_OLD); } } return; @@ -1075,7 +1075,7 @@ void func_809DBFB4(Boss02* this, PlayState* play) { this->unk_0156 = 15; if (i == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_INBOSS_DAMAGE_OLD); + Actor_PlaySfx(&this->actor, NA_SE_EN_INBOSS_DAMAGE_OLD); this->unk_015C = 1; } else { Audio_PlaySfxAtPos(&this->unk_167C, NA_SE_EN_INBOSS_DAMAGE_OLD); @@ -1201,9 +1201,9 @@ void Boss02_Twinmold_Update(Actor* thisx, PlayState* play) { if (this->unk_016C != 0) { if ((this->unk_016C == 60) && (this->unk_0144 < 20)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_INBOSS_ROAR_OLD); + Actor_PlaySfx(&this->actor, NA_SE_EN_INBOSS_ROAR_OLD); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_INBOSS_SAND_OLD - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_INBOSS_SAND_OLD - SFX_FLAG); if (this->unk_0144 > 20) { sp3C.x = randPlusMinusPoint5Scaled(100.0f * D_809DF5B0) + this->unk_0170.x; diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.c b/src/overlays/actors/ovl_Boss_03/z_boss_03.c index f51c944582..c5d729729e 100644 --- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c +++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c @@ -1190,7 +1190,7 @@ void Boss03_IntroCutscene(Boss03* this, PlayState* play) { this->subCamFov = 80.0f; case 2: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KONB_DEMO_MOVE_OLD - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_KONB_DEMO_MOVE_OLD - SFX_FLAG); xDiff = D_809E9104[this->unk_242].x - this->actor.world.pos.x; yDiff = D_809E9104[this->unk_242].y - this->actor.world.pos.y; @@ -1206,7 +1206,7 @@ void Boss03_IntroCutscene(Boss03* this, PlayState* play) { } if ((this->csTimer == 40) || (this->csTimer == (u32)(KREG(91) + 270))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_WATER_DEEP); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_WATER_DEEP); } if (this->csTimer > 50) { @@ -1230,10 +1230,10 @@ void Boss03_IntroCutscene(Boss03* this, PlayState* play) { this->csTimer = 0; } if (this->csTimer == 165) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_WATER_MID); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_WATER_MID); } if (this->csTimer == 180) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_WATER_DEEP); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_WATER_DEEP); } } } @@ -1304,14 +1304,14 @@ void Boss03_IntroCutscene(Boss03* this, PlayState* play) { this->actor.speedXZ = 20.0f; Audio_QueueSeqCmd(NA_BGM_BOSS | 0x8000); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KONB_JUMP_OLD); + Actor_PlaySfx(&this->actor, NA_SE_EN_KONB_JUMP_OLD); this->skelAnime.playSpeed = 1.0f; } } break; case 6: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KONB_JUMP_LEV_OLD - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_KONB_JUMP_LEV_OLD - SFX_FLAG); if (this->csTimer == 30) { TitleCard_InitBossName(&play->state, &play->actorCtx.titleCtxt, @@ -1514,10 +1514,10 @@ void Boss03_DeathCutscene(Boss03* this, PlayState* play) { Math_ApproachF(&this->actor.world.pos.z, sp84.z, 0.1f, 5.0f); if (Animation_OnFrame(&this->skelAnime, this->floppingAnimLastFrame)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KONB_DEAD_JUMP2_OLD); + Actor_PlaySfx(&this->actor, NA_SE_EN_KONB_DEAD_JUMP2_OLD); } if (Animation_OnFrame(&this->skelAnime, this->floppingAnimLastFrame * 0.5f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KONB_DEAD_JUMP_OLD); + Actor_PlaySfx(&this->actor, NA_SE_EN_KONB_DEAD_JUMP_OLD); } if ((this->workTimer[WORK_TIMER_UNK0_C] == 0) && ((this->waterHeight - 100.0f) < this->actor.world.pos.y)) { @@ -1547,7 +1547,7 @@ void Boss03_DeathCutscene(Boss03* this, PlayState* play) { this->actor.speedXZ = 10.0f; this->actor.world.rot.y = this->unk_2BE + 0x8000; this->unk_240 = 0; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KONB_DEAD_JUMP2_OLD); + Actor_PlaySfx(&this->actor, NA_SE_EN_KONB_DEAD_JUMP2_OLD); } } Math_ApproachF(&this->unk_56C, 0.01f, 1.0f, 0.0005f); @@ -1704,7 +1704,7 @@ void Boss03_SpawnSmallFishesCutscene(Boss03* this, PlayState* play) { this->numSpawnedSmallFish++; } if ((this->csTimer % 8) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KONB_MINI_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_KONB_MINI_APPEAR); } } } @@ -2003,7 +2003,7 @@ void Boss03_Update(Actor* thisx, PlayState* play2) { ((this->waterHeight - 50.0f < this->actor.world.pos.y) && (this->actor.prevPos.y <= this->waterHeight - 50.0f))) { if ((this->actor.velocity.y < 0.0f) && (this->actionFunc != Boss03_DeathCutscene)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KONB_SINK_OLD); + Actor_PlaySfx(&this->actor, NA_SE_EN_KONB_SINK_OLD); } Actor_Spawn(&play->actorCtx, play, ACTOR_EN_WATER_EFFECT, this->actor.world.pos.x, this->waterHeight, diff --git a/src/overlays/actors/ovl_Boss_04/z_boss_04.c b/src/overlays/actors/ovl_Boss_04/z_boss_04.c index 00892063c3..832466fa7c 100644 --- a/src/overlays/actors/ovl_Boss_04/z_boss_04.c +++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.c @@ -289,7 +289,7 @@ void func_809EC568(Boss04* this, PlayState* play) { case 10: if (this->unk_704 == 3) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_DEMO_EYE); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_DEMO_EYE); this->unk_74A = 1; } this->unk_2D0 = 10000.0f; @@ -319,7 +319,7 @@ void func_809EC568(Boss04* this, PlayState* play) { } case 12: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_ME_ATTACK - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_ME_ATTACK - SFX_FLAG); Math_ApproachF(&this->subCamAt.x, this->actor.world.pos.x, 0.5f, 1000.0f); Math_ApproachF(&this->subCamAt.y, this->actor.world.pos.y, 0.5f, 1000.0f); Math_ApproachF(&this->subCamAt.z, this->actor.world.pos.z, 0.5f, 1000.0f); @@ -331,7 +331,7 @@ void func_809EC568(Boss04* this, PlayState* play) { this->unk_2DA = 10; Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, CLEAR_TAG_SPLASH); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KONB_JUMP_LEV_OLD - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_KONB_JUMP_LEV_OLD - SFX_FLAG); this->subCamAtOscillator = 20; } break; @@ -501,7 +501,7 @@ void func_809ECF58(Boss04* this, PlayState* play) { sp3C.y = this->actor.floorHeight + 2.0f; sp3C.z = this->actor.world.pos.z; EffectSsGRipple_Spawn(play, &sp3C, 1400, 500, 0); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_ME_ATTACK - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_ME_ATTACK - SFX_FLAG); } } @@ -520,7 +520,7 @@ void func_809ED224(Boss04* this) { this->actor.speedXZ = 0.0f; this->unk_2D0 = 10000.0f; this->unk_2C8 = 200; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_ME_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_ME_DEAD); this->actor.flags &= ~ACTOR_FLAG_1; Audio_RestorePrevBgm(); this->unk_1F6 = 10; @@ -569,7 +569,7 @@ void func_809ED45C(Boss04* this, PlayState* play) { if ((this->unk_1FE == 0) && (this->collider1.elements[0].info.bumperFlags & BUMP_HIT)) { this->collider1.elements[0].info.bumperFlags &= ~BUMP_HIT; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_ME_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_ME_DAMAGE); damage = this->actor.colChkInfo.damage; this->actor.colChkInfo.health = this->actor.colChkInfo.health - damage; if ((s8)this->actor.colChkInfo.health <= 0) { @@ -765,7 +765,7 @@ void Boss04_Update(Actor* thisx, PlayState* play2) { } if (this->unk_74A != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_ME_EXIST - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_ME_EXIST - SFX_FLAG); } } diff --git a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c index 60f9e898bb..a91877288f 100644 --- a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c +++ b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c @@ -226,7 +226,7 @@ void func_80C16A74(DemoSyoten* this, PlayState* play) { if ((play->csCtx.frames >= 160) && (play->csCtx.frames < 322)) { func_800B9010(&this->actor, NA_SE_EV_IKANA_SOUL_LV - SFX_FLAG); } else if (play->csCtx.frames == 322) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_IKANA_SOUL_TRANSFORM); + Actor_PlaySfx(&this->actor, NA_SE_EV_IKANA_SOUL_TRANSFORM); } temp_a0 = play->csCtx.actorActions[Cutscene_GetActorActionIndex(play, this->unk_3F0)]->action; @@ -344,7 +344,7 @@ void func_80C16DD4(DemoSyoten* this, PlayState* play) { case 2: this->actor.draw = DemoSyoten_Draw; this->unk_3E6 = -6; - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_DM_FLYING_GOD_DASH); + Actor_PlaySfx(&this->actor, NA_SE_IT_DM_FLYING_GOD_DASH); break; } } diff --git a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c index 43cc626037..997004fea7 100644 --- a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c +++ b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c @@ -157,15 +157,15 @@ void func_80AA561C(DmChar00* this, PlayState* play) { case 1222: case 1682: case 2194: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); break; case 1858: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FAIRY_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EV_FAIRY_ATTACK); break; case 2043: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FAIRY_SURPRISE); + Actor_PlaySfx(&this->actor, NA_SE_EV_FAIRY_SURPRISE); break; } } else { @@ -177,11 +177,11 @@ void func_80AA561C(DmChar00* this, PlayState* play) { case 1687: case 2194: case 2210: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); break; case 2043: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_MONDO_SURPRISE); + Actor_PlaySfx(&this->actor, NA_SE_EV_MONDO_SURPRISE); break; } } @@ -189,7 +189,7 @@ void func_80AA561C(DmChar00* this, PlayState* play) { void func_80AA5720(DmChar00* this, PlayState* play) { if ((DMCHAR00_GET(&this->actor) == DMCHAR00_0) && (play->csCtx.frames == 505)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SPOT_LIGHT_OPEN); + Actor_PlaySfx(&this->actor, NA_SE_EV_SPOT_LIGHT_OPEN); } } @@ -207,51 +207,51 @@ void func_80AA575C(DmChar00* this, PlayState* play) { case 877: case 882: case 887: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FAIRY_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EV_FAIRY_ATTACK); break; case 520: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BELL_SPIT); + Actor_PlaySfx(&this->actor, NA_SE_EV_BELL_SPIT); break; case 774: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FAIRY_SURPRISE); + Actor_PlaySfx(&this->actor, NA_SE_EV_FAIRY_SURPRISE); break; case 904: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BELL_SIGH); + Actor_PlaySfx(&this->actor, NA_SE_EV_BELL_SIGH); break; case 813: case 972: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BELL_BRAKE); + Actor_PlaySfx(&this->actor, NA_SE_EV_BELL_BRAKE); break; } } else if (play->csCtx.frames == 660) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_MONDO_SURPRISE); + Actor_PlaySfx(&this->actor, NA_SE_EV_MONDO_SURPRISE); } } void func_80AA5890(DmChar00* this, PlayState* play) { if ((DMCHAR00_GET(&this->actor) == DMCHAR00_0) && (play->csCtx.frames == 20)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); } } void func_80AA58CC(DmChar00* this, PlayState* play) { if (DMCHAR00_GET(&this->actor) == DMCHAR00_0) { if (play->csCtx.frames == 568) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FAIRY_SURPRISE); + Actor_PlaySfx(&this->actor, NA_SE_EV_FAIRY_SURPRISE); } } else { switch (play->csCtx.frames) { case 375: case 479: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); break; case 534: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FAIRY_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EV_FAIRY_ATTACK); break; } } @@ -263,17 +263,17 @@ void func_80AA5950(DmChar00* this, PlayState* play) { void func_80AA5960(DmChar00* this, PlayState* play) { if (DMCHAR00_GET(&this->actor) == DMCHAR00_0) { if (play->csCtx.frames == 280) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FAIRY_SURPRISE); + Actor_PlaySfx(&this->actor, NA_SE_EV_FAIRY_SURPRISE); } } else { switch (play->csCtx.frames) { case 87: case 190: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); break; case 244: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FAIRY_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EV_FAIRY_ATTACK); break; } } @@ -283,16 +283,16 @@ void func_80AA59E4(DmChar00* this, PlayState* play) { if (DMCHAR00_GET(&this->actor) == DMCHAR00_0) { switch (play->csCtx.frames) { case 125: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); break; case 1832: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_WHITE_OUT_INTO_MOON); + Actor_PlaySfx(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_SY_WHITE_OUT_INTO_MOON); break; } } else if (play->csCtx.frames == 125) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); } } @@ -300,16 +300,16 @@ void func_80AA5A6C(DmChar00* this, PlayState* play) { if (DMCHAR00_GET(&this->actor) == DMCHAR00_0) { switch (play->csCtx.frames) { case 44: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); break; case 891: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_WHITE_OUT_INTO_MOON); + Actor_PlaySfx(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_SY_WHITE_OUT_INTO_MOON); break; } } else if (play->csCtx.frames == 44) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); } } @@ -318,31 +318,31 @@ void func_80AA5AF4(DmChar00* this, PlayState* play) { switch (play->csCtx.frames) { case 352: case 401: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); break; case 440: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); break; case 550: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BELL_BRAKE); + Actor_PlaySfx(&this->actor, NA_SE_EV_BELL_BRAKE); break; } } else { switch (play->csCtx.frames) { case 362: case 401: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); break; case 454: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); break; } if ((play->csCtx.frames >= 500) && (play->csCtx.frames < 602)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FAIRY_SHIVER - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EV_FAIRY_SHIVER - SFX_FLAG); } } } @@ -351,32 +351,32 @@ void func_80AA5BF8(DmChar00* this, PlayState* play) { if (DMCHAR00_GET(&this->actor) == DMCHAR00_0) { switch (play->csCtx.frames) { case 762: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WHITE_FAIRY_SHOT_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_WHITE_FAIRY_SHOT_DASH); break; case 797: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); break; } } else { switch (play->csCtx.frames) { case 762: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BLACK_FAIRY_SHOT_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_BLACK_FAIRY_SHOT_DASH); break; case 797: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); break; } } if ((this->unk_261 == 53) && Animation_OnFrame(&this->skelAnime, 16.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); } } void func_80AA5CD4(DmChar00* this, PlayState* play) { if ((DMCHAR00_GET(&this->actor) != DMCHAR00_0) && (play->csCtx.frames == 467)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); } } @@ -384,11 +384,11 @@ void func_80AA5D10(DmChar00* this, PlayState* play) { if (DMCHAR00_GET(&this->actor) == DMCHAR00_0) { switch (play->csCtx.frames) { case 8: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FAIRY_SURPRISE); + Actor_PlaySfx(&this->actor, NA_SE_EV_FAIRY_SURPRISE); break; case 130: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_NAVY_VANISH); + Actor_PlaySfx(&this->actor, NA_SE_EV_NAVY_VANISH); break; } } @@ -399,11 +399,11 @@ void func_80AA5D6C(DmChar00* this, PlayState* play) { switch (play->csCtx.frames) { case 2: case 166: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); break; case 31: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FAIRY_SURPRISE); + Actor_PlaySfx(&this->actor, NA_SE_EV_FAIRY_SURPRISE); break; } } @@ -415,11 +415,11 @@ void func_80AA5DC8(DmChar00* this, PlayState* play) { case 233: case 415: case 593: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); break; case 130: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_NAVY_VANISH); + Actor_PlaySfx(&this->actor, NA_SE_EV_NAVY_VANISH); break; } } @@ -429,19 +429,19 @@ void func_80AA5E2C(DmChar00* this, PlayState* play) { if (DMCHAR00_GET(&this->actor) == DMCHAR00_1) { switch (play->csCtx.frames) { case 32: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); break; case 42: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_BLACK_FAIRY_DASH); break; case 192: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BELL_BRAKE); + Actor_PlaySfx(&this->actor, NA_SE_EV_BELL_BRAKE); break; case 215: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_DIVE_INTO_WEED); + Actor_PlaySfx(&this->actor, NA_SE_EV_DIVE_INTO_WEED); break; } } diff --git a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c index 7e13a8e7ff..dab5b3c08a 100644 --- a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c +++ b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c @@ -201,7 +201,7 @@ void func_80AA88A8(DmChar01* this, PlayState* play) { if (Cutscene_CheckActorAction(play, 135)) { if (play->csCtx.frames == play->csCtx.actorActions[Cutscene_GetActorActionIndex(play, 135)]->startFrame) { D_80AAAE24 = 1; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_FORT_RISING); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_FORT_RISING); } } else { D_80AAAE24 = 0; @@ -277,7 +277,7 @@ void func_80AA8C28(DmChar01* this, PlayState* play) { switch (this->unk_346) { case 0: - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WATER_PURIFICATION); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WATER_PURIFICATION); D_80AAAE22 = -2200; D_80AAAE20 = 100; this->unk_346++; diff --git a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c index b618281c2d..3fc6e7edfb 100644 --- a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c +++ b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c @@ -63,13 +63,13 @@ void DmChar02_ChangeAnim(SkelAnime* skelAnime, AnimationInfo* animationInfo, u16 void DmChar02_PlaySfxForDroppingOcarinaCutscene(DmChar02* this, PlayState* play) { switch (play->csCtx.frames) { case 95: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_OCARINA_BOUND_0); + Actor_PlaySfx(&this->actor, NA_SE_EV_OCARINA_BOUND_0); break; case 101: case 105: case 112: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_OCARINA_BOUND_1); + Actor_PlaySfx(&this->actor, NA_SE_EV_OCARINA_BOUND_1); break; } } diff --git a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c index 714913231b..b960ce6981 100644 --- a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c +++ b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c @@ -130,10 +130,10 @@ void func_80AAB710(DmChar03* this, PlayState* play) { void func_80AAB838(DmChar03* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, 5.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_MASK_BOUND_0); + Actor_PlaySfx(&this->actor, NA_SE_IT_MASK_BOUND_0); } else if ((Animation_OnFrame(&this->skelAnime, 10.0f)) || (Animation_OnFrame(&this->skelAnime, 18.0f)) || (Animation_OnFrame(&this->skelAnime, 30.0f)) || (Animation_OnFrame(&this->skelAnime, 38.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_MASK_BOUND_1); + Actor_PlaySfx(&this->actor, NA_SE_IT_MASK_BOUND_1); } } diff --git a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c index 7e368b9e3c..77c7c5dabd 100644 --- a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c +++ b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c @@ -493,21 +493,21 @@ void func_80AACF04(DmChar05* this, PlayState* play) { void func_80AAD3F8(DmChar05* this, PlayState* play) { if (play->csCtx.frames == 490) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EVIL_POWER); + Actor_PlaySfx(&this->actor, NA_SE_EN_EVIL_POWER); } if (play->csCtx.frames > 550) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_MASK_FLOAT - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_MASK_FLOAT - SFX_FLAG); } } void func_80AAD450(DmChar05* this, PlayState* play) { if (play->csCtx.frames == 262) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EVIL_POWER); + Actor_PlaySfx(&this->actor, NA_SE_EN_EVIL_POWER); } if (play->csCtx.frames > 318) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_MASK_FLOAT - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_MASK_FLOAT - SFX_FLAG); } } @@ -516,31 +516,31 @@ void func_80AAD4A8(DmChar05* this, PlayState* play) { if (Cutscene_CheckActorAction(play, 109) && (play->csCtx.actorActions[Cutscene_GetActorActionIndex(play, 109)]->action == 3)) { if (Animation_OnFrame(&this->skelAnime, 14.0f) || Animation_OnFrame(&this->skelAnime, 15.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_MASK_BOUND_0); + Actor_PlaySfx(&this->actor, NA_SE_IT_MASK_BOUND_0); } else if (Animation_OnFrame(&this->skelAnime, 19.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_MASK_BOUND_1); + Actor_PlaySfx(&this->actor, NA_SE_IT_MASK_BOUND_1); } } } else if (DMCHAR05_GET(&this->actor) == DMCHAR05_1) { if (Cutscene_CheckActorAction(play, 473)) { if ((play->csCtx.actorActions[Cutscene_GetActorActionIndex(play, 473)]->action == 3) && Animation_OnFrame(&this->skelAnime, 5.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_MASK_BOUND_SAND); + Actor_PlaySfx(&this->actor, NA_SE_IT_MASK_BOUND_SAND); } } } else if (DMCHAR05_GET(&this->actor) == DMCHAR05_2) { if (Cutscene_CheckActorAction(play, 518) && (play->csCtx.actorActions[Cutscene_GetActorActionIndex(play, 518)]->action == 2)) { if (Animation_OnFrame(&this->skelAnime, 7.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_MASK_BOUND_0); + Actor_PlaySfx(&this->actor, NA_SE_IT_MASK_BOUND_0); } if (Animation_OnFrame(&this->skelAnime, 14.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_MASK_BOUND_1); + Actor_PlaySfx(&this->actor, NA_SE_IT_MASK_BOUND_1); } if (Animation_OnFrame(&this->skelAnime, 18.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_MASK_BOUND_1); + Actor_PlaySfx(&this->actor, NA_SE_IT_MASK_BOUND_1); } } } else if (DMCHAR05_GET(&this->actor) == DMCHAR05_3) { @@ -555,10 +555,10 @@ void func_80AAD4A8(DmChar05* this, PlayState* play) { } else if (play->sceneId == SCENE_SPOT00) { if (gSaveContext.sceneLayer == 9) { if ((play->csCtx.currentCsIndex == 0) && (play->csCtx.frames == 255)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EVIL_POWER); + Actor_PlaySfx(&this->actor, NA_SE_EN_EVIL_POWER); } } else if ((gSaveContext.sceneLayer == 0xB) && (play->csCtx.frames == 115)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EVIL_POWER_PREDEMO); + Actor_PlaySfx(&this->actor, NA_SE_EN_EVIL_POWER_PREDEMO); } } } diff --git a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c index 4129adfbef..5f08b839fd 100644 --- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c +++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c @@ -509,7 +509,7 @@ void func_80AAFE88(DmChar08* this, PlayState* play) { break; case 14: - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BIG_TORTOISE_ROLL); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BIG_TORTOISE_ROLL); this->animIndex = TURTLE_ANIM_FLOAT; break; } @@ -896,11 +896,11 @@ void func_80AB096C(DmChar08* this, PlayState* play) { if ((play->csCtx.state != 0) && (play->sceneId == SCENE_31MISAKI) && (gSaveContext.sceneLayer == 0) && (play->csCtx.currentCsIndex == 0)) { if ((play->csCtx.frames >= 890) && (play->csCtx.frames < 922)) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_EARTHQUAKE_LAST2 - SFX_FLAG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_EARTHQUAKE_LAST2 - SFX_FLAG); } } if ((this->animIndex == TURTLE_ANIM_SWIM) && Animation_OnFrame(&this->skelAnime, 16.0f)) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BIG_TORTOISE_SWIM); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BIG_TORTOISE_SWIM); } } diff --git a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c index 654bc6c07c..425bcdcfb1 100644 --- a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c +++ b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c @@ -203,7 +203,7 @@ void DmChar09_Update(Actor* thisx, PlayState* play) { func_80AB2268(this, play); func_80AB24BC(this, play); if ((play->csCtx.state != 0) && this->unk_22E && DMCHAR09_GET_100(thisx)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_POSTMAN_WALK + SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EV_POSTMAN_WALK + SFX_FLAG); } } diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c index 931ca2ad07..f2f7a9ae5d 100644 --- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c @@ -338,7 +338,7 @@ void DmStk_ChangeAnim(DmStk* this, PlayState* play, SkelAnime* skelAnime, Animat void DmStk_PlaySfxForIntroCutsceneFirstPart(DmStk* this, PlayState* play) { switch (play->csCtx.frames + 20) { case 1195: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_APPEAR); break; case 1232: @@ -346,48 +346,48 @@ void DmStk_PlaySfxForIntroCutsceneFirstPart(DmStk* this, PlayState* play) { case 1252: case 1255: case 1257: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_SHAKEHEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_SHAKEHEAD); break; case 1285: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL03_LAUGH_BIG); + Actor_PlaySfx(&this->actor, NA_SE_EN_STAL03_LAUGH_BIG); break; case 1343: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); break; case 1410: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_MASK_ON); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_MASK_ON); break; case 1603: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_WALK); break; case 1610: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_REVERSE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_REVERSE); break; case 2095: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_SURPRISED); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_SURPRISED); break; case 2190: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_JUMP); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_JUMP); break; case 2212: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_ONGND); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_ONGND); break; case 2214: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL02_LAUGH_SHORT); + Actor_PlaySfx(&this->actor, NA_SE_EN_STAL02_LAUGH_SHORT); break; case 2250: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL06_SURPRISED); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_DOWN_K); + Actor_PlaySfx(&this->actor, NA_SE_EN_STAL06_SURPRISED); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_DOWN_K); break; case 2255: @@ -416,7 +416,7 @@ void DmStk_PlaySfxForIntroCutsceneFirstPart(DmStk* this, PlayState* play) { case 2508: case 2519: case 2530: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_RIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_RIDE); break; } } @@ -455,11 +455,11 @@ void DmStk_PlaySfxForIntroCutsceneSecondPart(DmStk* this, PlayState* play) { case 232: case 243: case 254: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_RIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_RIDE); break; case 173: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL03_LAUGH_BIG); + Actor_PlaySfx(&this->actor, NA_SE_EN_STAL03_LAUGH_BIG); break; } } @@ -471,15 +471,15 @@ void DmStk_PlaySfxForIntroCutsceneSecondPart(DmStk* this, PlayState* play) { void DmStk_PlaySfxForObtainingMajorasMaskCutscene(DmStk* this, PlayState* play) { switch (play->csCtx.frames) { case 18: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_GASAGOSO); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_GASAGOSO); break; case 90: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_MASK_ON); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_MASK_ON); break; case 142: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EVIL_POWER); + Actor_PlaySfx(&this->actor, NA_SE_EN_EVIL_POWER); break; } } @@ -501,11 +501,11 @@ void DmStk_PlaySfxForCurseCutsceneFirstPart(DmStk* this, PlayState* play) { break; case 560: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL02_LAUGH_SHORT); + Actor_PlaySfx(&this->actor, NA_SE_EN_STAL02_LAUGH_SHORT); break; case 890: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL21_PSYCHO_VOICE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STAL21_PSYCHO_VOICE); break; } } @@ -524,7 +524,7 @@ void DmStk_PlaySfxForCurseCutsceneSecondPart(DmStk* this, PlayState* play) { break; case 71: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_BODY); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_BODY); break; case 365: @@ -536,30 +536,30 @@ void DmStk_PlaySfxForCurseCutsceneSecondPart(DmStk* this, PlayState* play) { break; case 265: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL03_LAUGH_BIG); + Actor_PlaySfx(&this->actor, NA_SE_EN_STAL03_LAUGH_BIG); break; case 126: - Actor_PlaySfxAtPos(&player->actor, NA_SE_VO_DUMMY_150); + Actor_PlaySfx(&player->actor, NA_SE_VO_DUMMY_150); break; case 197: - Actor_PlaySfxAtPos(&player->actor, NA_SE_VO_DUMMY_134); + Actor_PlaySfx(&player->actor, NA_SE_VO_DUMMY_134); break; case 207: - Actor_PlaySfxAtPos(&player->actor, NA_SE_VO_DUMMY_135); + Actor_PlaySfx(&player->actor, NA_SE_VO_DUMMY_135); break; case 217: - Actor_PlaySfxAtPos(&player->actor, NA_SE_VO_DUMMY_136); + Actor_PlaySfx(&player->actor, NA_SE_VO_DUMMY_136); break; } if (player) {} if ((play->csCtx.frames >= 263) && (play->csCtx.frames < 698)) { - Actor_PlaySfxAtPos(&player->actor, NA_SE_EN_STALKIDS_BODY_LEV - SFX_FLAG); + Actor_PlaySfx(&player->actor, NA_SE_EN_STALKIDS_BODY_LEV - SFX_FLAG); } } @@ -577,37 +577,37 @@ void DmStk_PlaySfxForClockTowerIntroCutsceneVersion1(DmStk* this, PlayState* pla break; case 258: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_TURN); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_TURN); break; case 524: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_TURN); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL04_ANGER); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_TURN); + Actor_PlaySfx(&this->actor, NA_SE_EN_STAL04_ANGER); break; case 534: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_ROLL); break; case 678: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_STRETCH); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_STRETCH); break; } if ((this->animIndex == SK_ANIM_OCARINA_JUGGLE) && (play->csCtx.frames < 700)) { if (Animation_OnFrame(&this->skelAnime, 5.0f) || Animation_OnFrame(&this->skelAnime, 25.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_OTEDAMA1); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_OTEDAMA1); } else if (Animation_OnFrame(&this->skelAnime, 17.0f) || Animation_OnFrame(&this->skelAnime, 40.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_OTEDAMA2); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_OTEDAMA2); } } if (play->csCtx.frames >= 700) { if (sMoonCallTimer < 128) { if ((sMoonCallTimer & 0x1F) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL20_CALL_MOON); + Actor_PlaySfx(&this->actor, NA_SE_EN_STAL20_CALL_MOON); } else if ((sMoonCallTimer & 0x1F) == 16) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL20_CALL_MOON2); + Actor_PlaySfx(&this->actor, NA_SE_EN_STAL20_CALL_MOON2); } sMoonCallTimer++; @@ -622,8 +622,8 @@ void DmStk_PlaySfxForClockTowerIntroCutsceneVersion1(DmStk* this, PlayState* pla */ void DmStk_PlaySfxForDroppingOcarinaCutscene(DmStk* this, PlayState* play) { if (play->csCtx.frames == 3) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL06_SURPRISED); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_DOWN_K); + Actor_PlaySfx(&this->actor, NA_SE_EN_STAL06_SURPRISED); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_DOWN_K); } } @@ -632,7 +632,7 @@ void DmStk_PlaySfxForDroppingOcarinaCutscene(DmStk* this, PlayState* play) { */ void DmStk_PlaySfxForShiveringInRainCutscene(DmStk* this, PlayState* play) { if ((play->csCtx.frames >= 642) && (play->csCtx.frames < 845)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_NE_STAL23_COLD - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_NE_STAL23_COLD - SFX_FLAG); } } @@ -648,16 +648,16 @@ void DmStk_PlaySfxForPlayingWithFairiesCutscene(DmStk* this, PlayState* play) { case 72: case 77: case 79: - Actor_PlaySfxAtPos(&this->actor, NA_SE_PL_WALK_WATER2); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_PL_WALK_WATER2); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_WALK); break; case 186: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_UP); break; case 230: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL22_LAUGH_KID_L); + Actor_PlaySfx(&this->actor, NA_SE_EN_STAL22_LAUGH_KID_L); break; } } @@ -674,7 +674,7 @@ void DmStk_PlaySfxForEndingCutsceneFirstPart(DmStk* this, PlayState* play) { break; case 660: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_SHAKEHEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_SHAKEHEAD); break; } } @@ -692,27 +692,27 @@ void DmStk_PlaySfxForEndingCutsceneSecondPart(DmStk* this, PlayState* play) { break; case 45: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_RIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_RIDE); break; case 93: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); break; case 245: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_RIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_RIDE); break; case 269: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL11_LAUGH_SHY2); + Actor_PlaySfx(&this->actor, NA_SE_EN_STAL11_LAUGH_SHY2); break; case 327: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_SHAKEHEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_SHAKEHEAD); break; case 455: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_RIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_RIDE); break; case 1730: @@ -720,7 +720,7 @@ void DmStk_PlaySfxForEndingCutsceneSecondPart(DmStk* this, PlayState* play) { break; case 1395: - func_800B8E58(player, NA_SE_VO_DUMMY_34); + Player_PlaySfx(player, NA_SE_VO_DUMMY_34); break; case 1850: @@ -735,20 +735,20 @@ void DmStk_PlaySfxForEndingCutsceneSecondPart(DmStk* this, PlayState* play) { if (this->animIndex == SK_ANIM_SHAKE_HEAD) { if (Animation_OnFrame(&this->skelAnime, 8.0f) || Animation_OnFrame(&this->skelAnime, 17.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); } if (Animation_OnFrame(&this->skelAnime, 28.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_RIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_RIDE); } } else if (this->animIndex == SK_ANIM_LAUGH_AFTER_SNIFF) { if (Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 6.0f) || Animation_OnFrame(&this->skelAnime, 12.0f) || Animation_OnFrame(&this->skelAnime, 18.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); } } else if ((this->animIndex == SK_ANIM_SNIFF) && (Animation_OnFrame(&this->skelAnime, 16.0f) || Animation_OnFrame(&this->skelAnime, 23.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_NOSE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_NOSE); } } @@ -766,25 +766,25 @@ void DmStk_PlaySfxForClockTowerIntroCutsceneVersion2(DmStk* this, PlayState* pla break; case 234: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_TURN); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL04_ANGER); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_TURN); + Actor_PlaySfx(&this->actor, NA_SE_EN_STAL04_ANGER); break; case 244: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_ROLL); break; case 388: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_STRETCH); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_STRETCH); break; } if (play->csCtx.frames >= 408) { if (sMoonCallTimer < 128) { if ((sMoonCallTimer & 0x1F) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL20_CALL_MOON); + Actor_PlaySfx(&this->actor, NA_SE_EN_STAL20_CALL_MOON); } else if ((sMoonCallTimer & 0x1F) == 16) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL20_CALL_MOON2); + Actor_PlaySfx(&this->actor, NA_SE_EN_STAL20_CALL_MOON2); } sMoonCallTimer++; @@ -812,19 +812,19 @@ void DmStk_PlaySfxForCutsceneAfterPlayingOathToOrder(DmStk* this, PlayState* pla case 332: case 335: case 344: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); break; case 367: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_BODY_LEV); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_BODY_LEV); break; case 470: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_HEADACHE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_HEADACHE); break; case 486: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); Audio_PlaySfxAtPos(&this->oathToOrderCutsceneVoicePos, NA_SE_EN_STAL08_CRY_BIG); break; @@ -833,11 +833,11 @@ void DmStk_PlaySfxForCutsceneAfterPlayingOathToOrder(DmStk* this, PlayState* pla break; case 590: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); break; case 592: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_RIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_RIDE); break; case 594: @@ -849,16 +849,16 @@ void DmStk_PlaySfxForCutsceneAfterPlayingOathToOrder(DmStk* this, PlayState* pla if ((play->csCtx.frames >= 62) && (play->csCtx.frames < 273)) { if ((Rand_ZeroOne() < 0.75f) && ((play->state.frames % 2) != 0)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_EARTHQUAKE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_EARTHQUAKE); } } if ((play->csCtx.frames >= 498) && (play->csCtx.frames < 577)) { if ((play->state.frames % 4) == 0) { if ((play->state.frames & 4) != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_BODY_LEV); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_BODY_LEV); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); } } } @@ -876,16 +876,16 @@ void DmStk_PlaySfxForCutsceneAfterPlayingOathToOrder(DmStk* this, PlayState* pla void DmStk_PlaySfxForMoonWarpCutsceneVersion1(DmStk* this, PlayState* play) { switch (play->csCtx.frames) { case 551: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_PULLED); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_PULLED); break; case 711: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); break; case 716: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_MASK_ON); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_ONGND); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_MASK_ON); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_ONGND); break; } } @@ -898,16 +898,16 @@ void DmStk_PlaySfxForMoonWarpCutsceneVersion1(DmStk* this, PlayState* play) { void DmStk_PlaySfxForMoonWarpCutsceneVersion2(DmStk* this, PlayState* play) { switch (play->csCtx.frames) { case 311: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_PULLED); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_PULLED); break; case 365: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF); break; case 372: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_MASK_ON); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_ONGND); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_MASK_ON); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_ONGND); break; } } @@ -984,24 +984,24 @@ void DmStk_PlaySfxForCutscenes(DmStk* this, PlayState* play) { if (this->animIndex == SK_ANIM_WALK) { if (Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 6.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_WALK); } } else if (this->animIndex == SK_ANIM_SEARCH_LINK) { if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 13.0f) || Animation_OnFrame(&this->skelAnime, 20.0f) || Animation_OnFrame(&this->skelAnime, 27.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_PL_CALM_HIT); + Actor_PlaySfx(&this->actor, NA_SE_PL_CALM_HIT); } } else if (this->animIndex == SK_ANIM_PICK_UP_OCARINA_AND_START_PLAYING) { if (Animation_OnFrame(&this->skelAnime, 3.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_PL_PUT_OUT_ITEM); + Actor_PlaySfx(&this->actor, NA_SE_PL_PUT_OUT_ITEM); } } else if (this->animIndex == SK_ANIM_PLAY_OCARINA_AND_LAUGH) { if (Animation_OnFrame(&this->skelAnime, 14.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_UNSKILLFUL_OCARINA); + Actor_PlaySfx(&this->actor, NA_SE_EV_UNSKILLFUL_OCARINA); } if (Animation_OnFrame(&this->skelAnime, 45.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL01_LAUGH); + Actor_PlaySfx(&this->actor, NA_SE_EN_STAL01_LAUGH); } } } @@ -1225,7 +1225,7 @@ void DmStk_ClockTower_WaitForIntroCutsceneVersion2ToEnd(DmStk* this, PlayState* void DmStk_ClockTower_StartDropOcarinaCutscene(DmStk* this, PlayState* play) { if (ActorCutscene_GetCanPlayNext(10)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_DAMAGE); ActorCutscene_Start(10, &this->actor); this->actor.shape.rot.x = 0; this->actor.world.rot.x = this->actor.shape.rot.x; @@ -1280,7 +1280,7 @@ void DmStk_ClockTower_DeflectHit(DmStk* this, PlayState* play) { this->animIndex = SK_ANIM_DEFLECT_ATTACK; DmStk_ChangeAnim(this, play, &this->skelAnime, &sAnimationInfo[this->animIndex], 0); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_DOWN_K); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_DOWN_K); this->actionFunc = DmStk_ClockTower_WaitForDeflectionToEnd; } diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index cfad99d2ab..7a365e5472 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -346,9 +346,9 @@ void func_808A1090(DoorShutter* this, PlayState* play) { Flags_SetSwitch(play, DOORSHUTTER_GET_7F(&this->actor)); if (this->doorType != 5) { gSaveContext.save.inventory.dungeonKeys[gSaveContext.mapIndex]--; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHAIN_KEY_UNLOCK); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHAIN_KEY_UNLOCK); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHAIN_KEY_UNLOCK_B); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHAIN_KEY_UNLOCK_B); } } } else { @@ -416,7 +416,7 @@ s32 func_808A1340(DoorShutter* this, PlayState* play) { if (this->actor.velocity.y == 0.0f) { func_808A1288(this, play); if (this->unk_163 != 7) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SLIDE_DOOR_OPEN); + Actor_PlaySfx(&this->actor, NA_SE_EV_SLIDE_DOOR_OPEN); } } @@ -449,9 +449,9 @@ s32 func_808A1478(DoorShutter* this, PlayState* play, f32 arg2) { if (temp == this->unk_168) { if (arg2 == 1.0f) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_METALDOOR_CLOSE); + Actor_PlaySfx(&this->actor, NA_SE_EV_METALDOOR_CLOSE); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_METALDOOR_OPEN); + Actor_PlaySfx(&this->actor, NA_SE_EV_METALDOOR_OPEN); } if ((this->unk_160 != -1) && (ActorCutscene_GetCurrentIndex() == this->unk_160)) { @@ -512,7 +512,7 @@ void func_808A1684(DoorShutter* this, PlayState* play) { if (DoorShutter_SetupDoor(this, play)) { this->actor.velocity.y = 30.0f; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SLIDE_DOOR_CLOSE); + Actor_PlaySfx(&this->actor, NA_SE_EV_SLIDE_DOOR_CLOSE); } DoorShutter_SetupAction(this, func_808A1B48); } @@ -608,7 +608,7 @@ void func_808A1B48(DoorShutter* this, PlayState* play) { this->actor.floorHeight = this->actor.home.pos.y; Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, 45.0f, 10, 8.0f, 500, 10, 0); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BIGWALL_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EV_BIGWALL_BOUND); quakeIndex = Quake_Add(Play_GetCamera(play, CAM_ID_MAIN), QUAKE_TYPE_3); Quake_SetSpeed(quakeIndex, -32536); diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index df067d0a9c..00f1693a5b 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -328,7 +328,7 @@ void func_808B90CC(DoorWarp1* this, PlayState* play) { DoorWarp1_SetupAction(this, func_808B921C); } - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WARP_HOLE_ENERGY - SFX_FLAG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WARP_HOLE_ENERGY - SFX_FLAG); } void func_808B921C(DoorWarp1* this, PlayState* play) { @@ -349,7 +349,7 @@ void func_808B921C(DoorWarp1* this, PlayState* play) { DoorWarp1_SetupAction(this, func_808B93A0); } - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BOSS_WARP_HOLE - SFX_FLAG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BOSS_WARP_HOLE - SFX_FLAG); } void func_808B93A0(DoorWarp1* this, PlayState* play) { @@ -372,7 +372,7 @@ void func_808B93A0(DoorWarp1* this, PlayState* play) { } } func_808BB8D4(this, play, 1); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BOSS_WARP_HOLE - SFX_FLAG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BOSS_WARP_HOLE - SFX_FLAG); } void func_808B94A4(DoorWarp1* this, PlayState* play) { @@ -380,7 +380,7 @@ void func_808B94A4(DoorWarp1* this, PlayState* play) { DoorWarp1_SetupAction(this, func_808B921C); } func_808BB8D4(this, play, 1); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BOSS_WARP_HOLE - SFX_FLAG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BOSS_WARP_HOLE - SFX_FLAG); } void func_808B9524(DoorWarp1* this, PlayState* play) { @@ -415,14 +415,14 @@ void func_808B958C(DoorWarp1* this, PlayState* play) { } Math_SmoothStepToF(&this->unk_1A8, 6.0f, 0.2f, 0.02f, 0.01f); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_LINK_WARP - SFX_FLAG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_LINK_WARP - SFX_FLAG); } void func_808B96A0(DoorWarp1* this, PlayState* play) { } void func_808B96B0(DoorWarp1* this, PlayState* play) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WARP_HOLE - SFX_FLAG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WARP_HOLE - SFX_FLAG); Math_SmoothStepToF(&this->unk_1B0, 255.0f, 0.4f, 10.0f, 0.01f); Math_SmoothStepToF(&this->unk_1B4, 255.0f, 0.4f, 10.0f, 0.01f); @@ -442,7 +442,7 @@ void func_808B96B0(DoorWarp1* this, PlayState* play) { } void func_808B977C(DoorWarp1* this, PlayState* play) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WARP_HOLE - SFX_FLAG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WARP_HOLE - SFX_FLAG); if (func_808B866C(this, play) && !Play_InCsMode(play)) { Player* player = GET_PLAYER(play); @@ -515,7 +515,7 @@ void func_808B9B30(DoorWarp1* this, PlayState* play) { } void func_808B9BE8(DoorWarp1* this, PlayState* play) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WARP_HOLE - SFX_FLAG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WARP_HOLE - SFX_FLAG); Math_SmoothStepToF(&this->unk_1B0, 255.0f, 0.2f, 2.0f, 0.1f); Math_SmoothStepToF(&this->unk_1B4, 255.0f, 0.2f, 2.0f, 0.1f); if (this->unk_1C4 < 10) { @@ -594,7 +594,7 @@ void func_808B9ED8(DoorWarp1* this, PlayState* play) { } void func_808B9F10(DoorWarp1* this, PlayState* play) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WARP_HOLE - SFX_FLAG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WARP_HOLE - SFX_FLAG); if ((this->unk_203 == 0) && func_808B866C(this, play) && !Play_InCsMode(play) && (this->unk_203 == 0)) { Player* player = GET_PLAYER(play); diff --git a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c index 75ff275a14..0ebb5139dc 100644 --- a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c +++ b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c @@ -90,7 +90,7 @@ void func_80BCEC6C(EffKamejimaWave* this, PlayState* play) { this->actor.draw = EffKamejimaWave_Draw; sVtxAlpha = 255; this->actor.shape.rot.x = 0; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_TORTOISE_WAKE_UP); + Actor_PlaySfx(&this->actor, NA_SE_EV_TORTOISE_WAKE_UP); } } else { this->actor.draw = NULL; diff --git a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c index 0041f1e99c..015e9e715d 100644 --- a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c +++ b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c @@ -195,7 +195,7 @@ void func_80BEBF78(EffLastday* this, PlayState* play) { case EFFLASTDAY_ACTION_2: if (!this->actor.home.rot.z) { this->actor.home.rot.z = true; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_COMING_FIRE); + Actor_PlaySfx(&this->actor, NA_SE_EV_COMING_FIRE); } this->actor.draw = EffLastday_Draw; if (this->alpha < 255) { diff --git a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c index d2bdf0ceec..6b48c9779e 100644 --- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c +++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c @@ -1173,7 +1173,7 @@ void func_80BEEB20(EnAkindonuts* this, PlayState* play) { } if (phi_v0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); this->actionFunc = func_80BEEDC0; this->unk_338 = 3; this->collider.dim.height = 64; @@ -1186,12 +1186,12 @@ void func_80BEEB20(EnAkindonuts* this, PlayState* play) { if ((this->unk_338 == 4) || (this->unk_338 == 18)) { this->unk_338 = 17; this->collider.dim.height = 0; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DOWN); SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimationInfo, 17); } else if (this->unk_338 == 2) { this->unk_338 = 16; this->collider.dim.height = 32; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_UP); SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimationInfo, 16); } else if (this->unk_338 == 17) { phi_v0 = DECR(this->unk_33A); @@ -1433,7 +1433,7 @@ void func_80BEF518(EnAkindonuts* this, PlayState* play) { this->unk_33E = 3; this->unk_338 = 19; SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimationInfo, this->unk_338); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DOWN); this->unk_32C &= ~2; this->unk_32C |= 0x80; this->unk_358 = this->actor.world.pos.y; @@ -1492,7 +1492,7 @@ void func_80BEF83C(EnAkindonuts* this, PlayState* play) { this->unk_34C = 0.3f; this->unk_338 = 9; SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimationInfo, this->unk_338); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); this->actionFunc = func_80BEF9F0; } } diff --git a/src/overlays/actors/ovl_En_Al/z_en_al.c b/src/overlays/actors/ovl_En_Al/z_en_al.c index da1cc7d7e1..4430656334 100644 --- a/src/overlays/actors/ovl_En_Al/z_en_al.c +++ b/src/overlays/actors/ovl_En_Al/z_en_al.c @@ -257,7 +257,7 @@ s32 func_80BDE4E0(EnAl* this, s16* arg1, s16 arg2) { } if (arg2 == *arg1) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHAIR_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHAIR_ROLL); func_80BDE27C(this, 3); this->unk_4E8 = 0; (*arg1)++; @@ -292,7 +292,7 @@ s32 func_80BDE678(EnAl* this, s16* arg1, s16 arg2) { } if (arg2 == *arg1) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHAIR_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHAIR_ROLL); func_80BDE27C(this, 4); this->unk_4E8 = 0; (*arg1)++; diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index 4ef21564d5..79ec20df6f 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -198,7 +198,7 @@ void EnAm_SpawnEffects(EnAm* this, PlayState* play) { effectPos.z = randPlusMinusPoint5Scaled(65.0f) + this->actor.world.pos.z; EffectSsKirakira_SpawnSmall(play, &effectPos, &sVelocity, &sAccel, &D_808B1118, &D_808B111C); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AMOS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_AMOS_WALK); Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, 4.0f, 3, 8.0f, 300, 15, 0); } @@ -231,8 +231,8 @@ void EnAm_RemoveEnemyTexture(EnAm* this, PlayState* play) { } void EnAm_WakeUp(EnAm* this) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AMOS_WAVE); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AMOS_VOICE); + Actor_PlaySfx(&this->actor, NA_SE_EN_AMOS_WAVE); + Actor_PlaySfx(&this->actor, NA_SE_EN_AMOS_VOICE); this->returnHomeTimer = 300; this->actionFunc = EnAm_ApplyEnemyTexture; } @@ -372,7 +372,7 @@ void func_808B066C(EnAm* this, PlayState* play) { this->armosYaw = this->actor.yawTowardsPlayer; func_808B0208(this, play); if (this->armosYaw == this->actor.shape.rot.y) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AMOS_VOICE); + Actor_PlaySfx(&this->actor, NA_SE_EN_AMOS_VOICE); func_808B0358(this); } } @@ -384,7 +384,7 @@ void EnAm_TakeDamage(EnAm* this, PlayState* play) { func_800BE504(&this->actor, &this->enemyCollider); this->actor.speedXZ = 6.0f; Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, Animation_GetLastFrame(&gArmosTakeDamageAnim) - 10); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_DAMAGE); this->enemyCollider.base.acFlags &= ~AC_ON; this->textureBlend = 255; this->actionFunc = func_808B07A8; @@ -426,7 +426,7 @@ void func_808B0894(EnAm* this, PlayState* play) { if (bomb != NULL) { bomb->timer = 0; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_DEAD); Item_DropCollectibleRandom(play, &this->actor, &this->actor.world.pos, 0xB0); for (i = 0; i < 8; i++) { 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 8e98ae8a33..9d0600b2e8 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -225,7 +225,7 @@ void EnAni_FallToGround(EnAni* this, PlayState* play) { Quake_SetQuakeValues(quakeIndex, 7, 0, 0, 0); Quake_SetCountdown(quakeIndex, 20); - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_HAMMER_HIT); + Actor_PlaySfx(&this->actor, NA_SE_IT_HAMMER_HIT); } Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 0x2, 0x7D0, 0x100); diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index d41da13260..8fe5c121e0 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -176,22 +176,22 @@ void func_8088A594(EnArrow* this, PlayState* play) { switch (this->actor.params) { case ENARROW_6: - func_800B8E58(player, NA_SE_IT_SLING_SHOT); + Player_PlaySfx(player, NA_SE_IT_SLING_SHOT); break; case ENARROW_0: case ENARROW_1: case ENARROW_2: - func_800B8E58(player, NA_SE_IT_ARROW_SHOT); + Player_PlaySfx(player, NA_SE_IT_ARROW_SHOT); break; case ENARROW_3: case ENARROW_4: case ENARROW_5: - func_800B8E58(player, NA_SE_IT_MAGIC_ARROW_SHOT); + Player_PlaySfx(player, NA_SE_IT_MAGIC_ARROW_SHOT); case ENARROW_7: - func_800B8E58(player, NA_SE_PL_DEKUNUTS_FIRE); + Player_PlaySfx(player, NA_SE_PL_DEKUNUTS_FIRE); break; } @@ -289,7 +289,7 @@ void func_8088AA98(EnArrow* this, PlayState* play) { EffectSsGSplash_Spawn(play, &sp44, NULL, NULL, 0, 300); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_DIVE_INTO_WATER_L); + Actor_PlaySfx(&this->actor, NA_SE_EV_DIVE_INTO_WATER_L); EffectSsGRipple_Spawn(play, &sp44, 100, 500, 0); EffectSsGRipple_Spawn(play, &sp44, 100, 500, 4); @@ -403,7 +403,7 @@ void func_8088ACE0(EnArrow* this, PlayState* play) { this->unk_261 |= 2; Math_Vec3f_Copy(&this->actor.world.pos, &this->actor.prevPos); func_8088A7D8(play, this); - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_HOOKSHOT_STICK_CRE); + Actor_PlaySfx(&this->actor, NA_SE_IT_HOOKSHOT_STICK_CRE); } } else if (this->unk_262 != 0) { this->actionFunc = func_8088B630; @@ -416,7 +416,7 @@ void func_8088ACE0(EnArrow* this, PlayState* play) { if ((this->actor.params >= ENARROW_3) && (this->actor.params < ENARROW_6)) { this->actor.draw = NULL; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_ARROW_STICK_OBJ); + Actor_PlaySfx(&this->actor, NA_SE_IT_ARROW_STICK_OBJ); this->unk_261 |= 1; } } diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index b4501ffa08..18ccfb030c 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -408,12 +408,12 @@ void EnAttackNiw_Update(Actor* thisx, PlayState* play) { if (this->crySfxTimer == 0) { this->crySfxTimer = 30; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHICKEN_CRY_A); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHICKEN_CRY_A); } if (this->flutterSfxTimer == 0) { this->flutterSfxTimer = 7; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_CHICKEN_FLUTTER); + Actor_PlaySfx(&this->actor, NA_SE_EN_CHICKEN_FLUTTER); } } } diff --git a/src/overlays/actors/ovl_En_Az/z_en_az.c b/src/overlays/actors/ovl_En_Az/z_en_az.c index 90b611529a..38690e122c 100644 --- a/src/overlays/actors/ovl_En_Az/z_en_az.c +++ b/src/overlays/actors/ovl_En_Az/z_en_az.c @@ -593,7 +593,7 @@ void func_80A95CEC(EnAz* this, PlayState* play) { func_800B9010(&this->actor, NA_SE_EV_HONEYCOMB_FALL - SFX_FLAG); } else { if (this->actor.bgCheckFlags & 2) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GERUDOFT_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_GERUDOFT_DOWN); } if (SubS_StartActorCutscene(&this->actor, 0x7C, this->unk_3D0[0], SUBS_CUTSCENE_NORMAL)) { func_80A97C0C(this, play); @@ -625,7 +625,7 @@ void func_80A95E88(EnAz* this, PlayState* play) { if (this->actor.depthInWater > 8.0f) { if (this->unk_374 & 2) { if ((this->skelAnime.curFrame < this->skelAnime.playSpeed) && (this->skelAnime.curFrame >= 0.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BEAVER_SWIM_HAND); + Actor_PlaySfx(&this->actor, NA_SE_EV_BEAVER_SWIM_HAND); } } else { func_800B9010(&this->actor, NA_SE_EV_BEAVER_SWIM_MOTOR - SFX_FLAG); @@ -1574,7 +1574,7 @@ void func_80A97F9C(EnAz* this, PlayState* play) { if (this->actor.depthInWater > 8.0f) { if (this->unk_374 & 2) { if ((this->skelAnime.curFrame < this->skelAnime.playSpeed) && (this->skelAnime.curFrame >= 0.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BEAVER_SWIM_HAND); + Actor_PlaySfx(&this->actor, NA_SE_EV_BEAVER_SWIM_HAND); } } else { func_800B9010(&this->actor, NA_SE_EV_BEAVER_SWIM_MOTOR - SFX_FLAG); @@ -1638,10 +1638,10 @@ void EnAz_Update(Actor* thisx, PlayState* play2) { this->actionFunc(this, play); Actor_SetFocus(&this->actor, 40.0f); if (this->unk_374 & 0x200) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_DIVE_INTO_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EV_DIVE_INTO_WATER); } if (this->unk_374 & 0x400) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_JUMP_OUT_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EV_JUMP_OUT_WATER); } this->unk_37E++; if (this->unk_37E >= 4) { diff --git a/src/overlays/actors/ovl_En_Baba/z_en_baba.c b/src/overlays/actors/ovl_En_Baba/z_en_baba.c index 6040076f4d..dd8c5a96fb 100644 --- a/src/overlays/actors/ovl_En_Baba/z_en_baba.c +++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.c @@ -690,7 +690,7 @@ void EnBaba_KnockedOver(EnBaba* this, PlayState* play) { if (this->animIndex == BOMB_SHOP_LADY_ANIM_KNOCKED_OVER) { if (Animation_OnFrame(&this->skelAnime, 0.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_BBVO00); + Actor_PlaySfx(&this->actor, NA_SE_VO_BBVO00); } if (curFrame == endFrame) { diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c index 9017e0f89a..2a4afb087a 100644 --- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c +++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c @@ -160,7 +160,7 @@ void EnBaguo_UndergroundIdle(EnBaguo* this, PlayState* play) { this->action = NEJIRON_ACTION_INACTIVE; if (this->actor.xzDistToPlayer < 200.0f && Player_GetMask(play) != PLAYER_MASK_STONE) { this->actor.draw = EnBaguo_DrawBody; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BAKUO_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_BAKUO_APPEAR); this->actor.world.rot.z = 0; this->actor.world.rot.x = this->actor.world.rot.z; this->actor.flags &= ~ACTOR_FLAG_8000000; @@ -205,7 +205,7 @@ void EnBaguo_Idle(EnBaguo* this, PlayState* play) { if ((play->gameplayFrames % 8) == 0) { Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, this->actor.shape.shadowScale - 20.0f, 10, 8.0f, 500, 10, 1); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BAKUO_VOICE); + Actor_PlaySfx(&this->actor, NA_SE_EN_BAKUO_VOICE); } } } @@ -265,7 +265,7 @@ void EnBaguo_Roll(EnBaguo* this, PlayState* play) { } } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BAKUO_ROLL - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_BAKUO_ROLL - SFX_FLAG); } } @@ -290,7 +290,7 @@ void EnBaguo_RetreatUnderground(EnBaguo* this, PlayState* play) { this->actor.shape.yOffset = -3000.0f; this->actor.draw = EnBaguo_DrawBody; Math_Vec3f_Copy(&this->actor.world.pos, &this->actor.home.pos); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BAKUO_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_BAKUO_APPEAR); this->actor.flags |= ACTOR_FLAG_8000000; this->actor.flags &= ~ACTOR_FLAG_1; this->actionFunc = EnBaguo_UndergroundIdle; @@ -346,8 +346,8 @@ void EnBaguo_CheckForDetonation(EnBaguo* this, PlayState* play) { Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, CLEAR_TAG_POP); - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_BOMB_EXPLOSION); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BAKUO_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_IT_BOMB_EXPLOSION); + Actor_PlaySfx(&this->actor, NA_SE_EN_BAKUO_DEAD); this->timer = 30; this->actor.flags |= ACTOR_FLAG_8000000; diff --git a/src/overlays/actors/ovl_En_Bat/z_en_bat.c b/src/overlays/actors/ovl_En_Bat/z_en_bat.c index e30612c17c..a8b93fc2f8 100644 --- a/src/overlays/actors/ovl_En_Bat/z_en_bat.c +++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.c @@ -193,7 +193,7 @@ void EnBat_StepAnimation(EnBat* this, s32 frameStep) { this->animationFrame -= ARRAY_COUNT(sWingsDLs); } if ((prevFrame < BAD_BAT_FLAP_FRAME) && (this->animationFrame >= BAD_BAT_FLAP_FRAME)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FFLY_FLY); + Actor_PlaySfx(&this->actor, NA_SE_EN_FFLY_FLY); } } @@ -299,7 +299,7 @@ void EnBat_DiveAttack(EnBat* this, PlayState* play) { (this->actor.depthInWater > -40.0f)) { if (this->collider.base.atFlags & AT_HIT) { this->collider.base.atFlags &= ~AT_HIT; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FFLY_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_FFLY_ATTACK); } this->collider.base.atFlags &= ~AT_ON; sNumberAttacking--; @@ -320,7 +320,7 @@ void EnBat_SetupDie(EnBat* this, PlayState* play) { this->actor.speedXZ *= Math_CosS(this->actor.world.rot.x); this->actor.bgCheckFlags &= ~1; this->actor.velocity.y = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FFLY_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_FFLY_DEAD); if (this->actor.colChkInfo.damageEffect == BAD_BAT_DMGEFF_ICE) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX; @@ -400,7 +400,7 @@ void EnBat_SetupStunned(EnBat* this) { this->actor.speedXZ = 0.0f; this->actor.world.pos.y += 13.0f; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); Actor_SetColorFilter(&this->actor, 0, 255, 0, this->timer); this->actionFunc = EnBat_Stunned; } diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 21c3465ba6..793054c330 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -255,9 +255,9 @@ void EnBb_FlyIdle(EnBb* this, PlayState* play) { EnBb_UpdateStateForFlying(this); if (Animation_OnFrame(&this->skelAnime, 5.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLE_WING); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLE_WING); } else if ((Animation_OnFrame(&this->skelAnime, 0.0f)) && (Rand_ZeroOne() < 0.1f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLE_LAUGH); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLE_LAUGH); } DECR(this->attackWaitTimer); @@ -288,11 +288,11 @@ void EnBb_Attack(EnBb* this, PlayState* play) { EnBb_UpdateStateForFlying(this); if ((Animation_OnFrame(&this->skelAnime, 0.0f)) || (Animation_OnFrame(&this->skelAnime, 5.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLE_MOUTH); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLE_MOUTH); } else if ((Animation_OnFrame(&this->skelAnime, 2.0f)) || (Animation_OnFrame(&this->skelAnime, 7.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLE_WING); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLE_WING); } else if ((Animation_OnFrame(&this->skelAnime, 0.0f)) && (Rand_ZeroOne() < 0.1f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLE_LAUGH); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLE_LAUGH); } this->timer--; @@ -313,7 +313,7 @@ void EnBb_SetupDown(EnBb* this) { this->flameScaleY = 0.0f; this->flameScaleX = 0.0f; this->actor.gravity = -2.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLE_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLE_DOWN); this->actor.world.rot.y = this->actor.shape.rot.y; this->actionFunc = EnBb_Down; } @@ -326,9 +326,9 @@ void EnBb_Down(EnBb* this, PlayState* play) { EnBb_CheckForWall(this); if (this->actor.bgCheckFlags & 1) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); if (this->timer == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLE_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLE_UP); EnBb_SetupFlyIdle(this); return; } @@ -346,7 +346,7 @@ void EnBb_Down(EnBb* this, PlayState* play) { this->actor.world.rot.y = this->actor.shape.rot.y; if (Animation_OnFrame(&this->skelAnime, 5.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLE_WING); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLE_WING); } if (this->timer > 0) { @@ -412,7 +412,7 @@ void EnBb_Dead(EnBb* this, PlayState* play) { void EnBb_SetupDamage(EnBb* this) { this->collider.base.acFlags &= ~AC_ON; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLE_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLE_DAMAGE); func_800BE568(&this->actor, &this->collider); if (this->actor.colChkInfo.damageEffect == EN_BB_DMGEFF_ZORA_MAGIC) { @@ -565,7 +565,7 @@ void EnBb_UpdateDamage(EnBb* this, PlayState* play) { this->collider.base.atFlags &= ~AT_HIT; this->actor.world.rot.y = this->actor.yawTowardsPlayer + 0x8000; this->actor.shape.rot.y = this->actor.world.rot.y; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLE_BITE); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLE_BITE); if (this->flameScaleX > 0.0f) { gSaveContext.jinxTimer = 1200; diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c index 1dfc74a222..faaf9c67ae 100644 --- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c @@ -223,7 +223,7 @@ s32 EnBbfall_IsTouchingLava(EnBbfall* this, PlayState* play) { void EnBbfall_PlaySfx(EnBbfall* this) { if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 5.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLE_MOUTH); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLE_MOUTH); } func_800B9010(&this->actor, NA_SE_EN_BUBLEFALL_FIRE - SFX_FLAG); @@ -306,7 +306,7 @@ void EnBbfall_SetupEmerge(EnBbfall* this) { this->actor.velocity.y = 17.0f; EnBbfall_EnableColliders(this); this->actor.flags |= ACTOR_FLAG_1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLEFALL_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLEFALL_APPEAR); this->actionFunc = EnBbfall_Emerge; } @@ -376,7 +376,7 @@ void EnBbfall_SetupDown(EnBbfall* this) { this->flameScaleY = 0.0f; this->flameScaleX = 0.0f; this->actor.gravity = -2.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLE_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLE_DOWN); this->actor.world.rot.y = this->actor.shape.rot.y; this->actionFunc = EnBbfall_Down; } @@ -391,9 +391,9 @@ void EnBbfall_Down(EnBbfall* this, PlayState* play) { return; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); if (this->timer == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLE_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLE_UP); EnBbfall_EnableColliders(this); this->actor.velocity.y = 8.0f; EnBbfall_SetupFly(this); @@ -413,7 +413,7 @@ void EnBbfall_Down(EnBbfall* this, PlayState* play) { this->actor.world.rot.y = this->actor.shape.rot.y; if (Animation_OnFrame(&this->skelAnime, 5.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLE_WING); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLE_WING); } if (this->timer > 0) { @@ -478,7 +478,7 @@ void EnBbfall_Dead(EnBbfall* this, PlayState* play) { void EnBbfall_SetupDamage(EnBbfall* this) { this->collider.base.acFlags &= ~AC_ON; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLE_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLE_DAMAGE); func_800BE5CC(&this->actor, &this->collider, 0); if (this->actor.colChkInfo.damageEffect == EN_BBFALL_DMGEFF_ZORA_MAGIC) { diff --git a/src/overlays/actors/ovl_En_Bee/z_en_bee.c b/src/overlays/actors/ovl_En_Bee/z_en_bee.c index cf8c5f68a4..602d428020 100644 --- a/src/overlays/actors/ovl_En_Bee/z_en_bee.c +++ b/src/overlays/actors/ovl_En_Bee/z_en_bee.c @@ -262,7 +262,7 @@ void EnBee_Update(Actor* thisx, PlayState* play) { } } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BEE_FLY - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_BEE_FLY - SFX_FLAG); EnBee_UpdateDamage(this, play); Math_Vec3s_Copy(&this->actor.shape.rot, &this->actor.world.rot); Actor_SetFocus(&this->actor, 0.0f); diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index e3097696dd..142328b1ad 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -237,7 +237,7 @@ void EnBigokuta_SetupRise(EnBigokuta* this, PlayState* play) { EffectSsGSplash_Spawn(play, &splashPos, NULL, NULL, 0, Rand_S16Offset(1000, 200)); angle = BINANG_ADD(angle, 0x2000); } - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_DAIOCTA_LAND); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_DAIOCTA_LAND); this->actionFunc = EnBigokuta_RiseOutOfWater; } @@ -259,7 +259,7 @@ void EnBigokuta_IdleAboveWater(EnBigokuta* this, PlayState* play) { Math_ApproachS(&this->picto.actor.shape.rot.y, this->picto.actor.yawTowardsPlayer, 5, 0x1000); if ((this->picto.actor.xzDistToPlayer > 400.0f) || (this->picto.actor.playerHeightRel > 200.0f)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_DAIOCTA_SINK); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_DAIOCTA_SINK); EnBigokuta_SetupIdle(this); } else if ((this->picto.actor.xzDistToPlayer < 200.0f) && play->grabPlayer(play, GET_PLAYER(play))) { EnBigokuta_SetupSuckInPlayer(this, play); @@ -295,7 +295,7 @@ void EnBigokuta_SetupSuckInPlayer(EnBigokuta* this, PlayState* play) { this->playerHoldPos.y = (this->picto.actor.home.pos.y - 49.5f) + 42.899998f; this->playerHoldPos.z = (Math_CosS(this->picto.actor.shape.rot.y) * 66.0f) + this->picto.actor.world.pos.z; - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_SLIME_DEAD); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_SLIME_DEAD); this->actionFunc = EnBigokuta_SuckInPlayer; } @@ -347,7 +347,7 @@ void EnBigokuta_HoldPlayer(EnBigokuta* this, PlayState* play) { if (this->timer == 0) { EnBigokuta_ShootPlayer(this, play); - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_DAIOCTA_REVERSE); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_DAIOCTA_REVERSE); } } else if (this->timer == -24) { EnBigokuta_SetupIdleAboveWater(this); @@ -396,7 +396,7 @@ void EnBigokuta_PlayDeathCutscene(EnBigokuta* this, PlayState* play) { void EnBigokuta_SetupDeathEffects(EnBigokuta* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gBigOctoDeathAnim, -5.0f); - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_DAIOCTA_DEAD2); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_DAIOCTA_DEAD2); this->picto.actor.flags &= ~1; this->timer = 10; this->actionFunc = EnBigokuta_PlayDeathEffects; @@ -422,7 +422,7 @@ void EnBigokuta_PlayDeathEffects(EnBigokuta* this, PlayState* play) { dustPos.z = this->picto.actor.world.pos.z; func_800B0DE0(play, &dustPos, &gZeroVec3f, &gZeroVec3f, &D_80AC45B0, &D_80AC45B4, 1200, 20); - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_OCTAROCK_DEAD2); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_OCTAROCK_DEAD2); } } else { this->picto.actor.world.pos.y -= 0.2f; diff --git a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c index 3dad5b9c6a..af18596bfe 100644 --- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c +++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c @@ -219,7 +219,7 @@ void func_80A2778C(EnBigpamet* this) { ptr->unk_20 = Rand_ZeroFloat(0.0025000002f) + 0.002f; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_B_PAMET_BREAK); + Actor_PlaySfx(&this->actor, NA_SE_EN_B_PAMET_BREAK); } void func_80A27970(EnBigpamet* this, PlayState* play2) { @@ -295,7 +295,7 @@ void func_80A27B58(EnBigpamet* this) { ptr->unk_20 = Rand_ZeroFloat(0.0025000002f) + 0.002f; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_B_PAMET_BREAK); + Actor_PlaySfx(&this->actor, NA_SE_EN_B_PAMET_BREAK); } void func_80A27DD8(EnBigpamet* this, PlayState* play) { @@ -447,8 +447,8 @@ void func_80A284E4(EnBigpamet* this) { this->unk_2A8 = 1.0f; this->unk_2A4 = 1.0f; this->actor.speedXZ = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_B_PAMET_VOICE); - Actor_PlaySfxAtPos(this->actor.parent, NA_SE_EN_FROG_VOICE1); + Actor_PlaySfx(&this->actor, NA_SE_EN_B_PAMET_VOICE); + Actor_PlaySfx(this->actor.parent, NA_SE_EN_FROG_VOICE1); this->actionFunc = func_80A2855C; } @@ -469,7 +469,7 @@ void func_80A28618(EnBigpamet* this) { this->actor.draw = func_80A2966C; this->unk_2A8 = 0.5f; this->actor.speedXZ = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PAMET_CUTTER_ON); + Actor_PlaySfx(&this->actor, NA_SE_EN_PAMET_CUTTER_ON); this->actionFunc = func_80A2866C; } @@ -557,7 +557,7 @@ void func_80A287E8(EnBigpamet* this, PlayState* play) { } void func_80A28970(EnBigpamet* this) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PAMET_CUTTER_OFF); + Actor_PlaySfx(&this->actor, NA_SE_EN_PAMET_CUTTER_OFF); this->actor.shape.rot.z = 0; this->collider.base.atFlags &= ~AT_ON; this->collider.info.bumper.dmgFlags = 0xF7CFFFFF; @@ -642,14 +642,14 @@ void func_80A28B98(EnBigpamet* this, PlayState* play) { collectible->world.rot.y = Actor_WorldYawTowardPoint(&this->actor, &this->actor.home.pos); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_B_PAMET_REVERSE); + Actor_PlaySfx(&this->actor, NA_SE_EN_B_PAMET_REVERSE); this->actionFunc = func_80A28D0C; } void func_80A28D0C(EnBigpamet* this, PlayState* play) { SkelAnime_Update(&this->skelAnime2); if (this->actor.bgCheckFlags & 1) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_HIPLOOP_LAND); + Actor_PlaySfx(&this->actor, NA_SE_EN_HIPLOOP_LAND); func_80A27FE8(this, play); func_80A28D80(this); } diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c index b8e4eee137..f5aab7460f 100644 --- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c +++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c @@ -259,7 +259,7 @@ void EnBigpo_UpdateSpin(EnBigpo* this) { this->actor.shape.rot.y += this->rotVelocity; if ((oldYaw < 0) && (this->actor.shape.rot.y > 0)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_ROLL); // spinning sfx during spin attack + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_ROLL); // spinning sfx during spin attack } } @@ -395,7 +395,7 @@ void EnBigpo_SpawnCutsceneStage5(EnBigpo* this) { Animation_PlayLoop(&this->skelAnime, &gBigpoAwakenStretchAnim); this->actor.draw = EnBigpo_DrawMainBigpo; Actor_SetScale(&this->actor, 0.014f); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_APPEAR); this->actionFunc = EnBigpo_SpawnCutsceneStage6; } @@ -483,7 +483,7 @@ void EnBigpo_SetupWarpOut(EnBigpo* this) { this->idleTimer = 32; this->actor.flags &= ~ACTOR_FLAG_1; // targetable OFF this->actor.speedXZ = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_DISAPPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DISAPPEAR); this->actionFunc = EnBigpo_WarpingOut; } @@ -505,7 +505,7 @@ void EnBigpo_SetupWarpIn(EnBigpo* this, PlayState* play) { f32 distance = CLAMP_MIN(this->actor.xzDistToPlayer, 200.0f); s16 randomYaw = ((s32)Rand_Next() >> 0x14) + this->actor.yawTowardsPlayer; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_APPEAR); Animation_PlayLoop(&this->skelAnime, &gBigpoAwakenStretchAnim); this->rotVelocity = 0x2000; this->actor.world.pos.x = (Math_SinS(randomYaw) * distance) + player->actor.world.pos.x; @@ -725,7 +725,7 @@ void EnBigpo_BurnAwayDeath(EnBigpo* this, PlayState* play) { func_800B9010(&this->actor, NA_SE_EN_COMMON_EXTINCT_LEV - SFX_FLAG); // burning sfx } if (this->idleTimer == 18) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_DISAPPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_DISAPPEAR); } } @@ -795,7 +795,7 @@ void EnBigpo_SpawnScoopSoul(EnBigpo* this) { this->actor.scale.x = 0.0f; this->actor.scale.y = 0.0f; this->savedHeight = this->actor.world.pos.y; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_METAL_BOX_BOUND); // misnamed? + Actor_PlaySfx(&this->actor, NA_SE_EV_METAL_BOX_BOUND); // misnamed? this->actionFunc = EnBigpo_ScoopSoulAppearing; } @@ -824,7 +824,7 @@ void EnBigpo_ScoopSoulIdle(EnBigpo* this, PlayState* play) { if (this->idleTimer == 0) { // took too long, soul is leaving - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_LAUGH); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_LAUGH); EnBigpo_SetupScoopSoulLeaving(this); } else { Actor_PickUp(&this->actor, play, GI_MAX, 35.0f, 60.0f); @@ -1123,13 +1123,13 @@ s32 EnBigpo_ApplyDamage(EnBigpo* this, PlayState* play) { if (Actor_ApplyDamage(&this->actor) == 0) { this->actor.flags &= ~ACTOR_FLAG_1; // targetable OFF - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DEAD); Enemy_StartFinishingBlow(play, &this->actor); if (this->actor.params == ENBIGPO_SUMMONED) { // dampe type Audio_RestorePrevBgm(); } } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DAMAGE); } // light arrows @@ -1164,7 +1164,7 @@ void EnBigpo_Update(Actor* thisx, PlayState* play) { this->unk20C = 0; } if (this->unk20C == 40) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_LAUGH); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_LAUGH); EnBigpo_SetupWarpOut(this); } } diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c index bfe668b3fc..22ccb33940 100644 --- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c @@ -772,7 +772,7 @@ void EnBigslime_BreakIntoMinislime(EnBigslime* this, PlayState* play) { this->actor.bgCheckFlags &= ~1; this->formBigslimeTimer = 2; EnBigslime_AddIceShardEffect(this, play); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_B_SLIME_BREAK); + Actor_PlaySfx(&this->actor, NA_SE_EN_B_SLIME_BREAK); EnBigslime_SetupJumpGekko(this); } @@ -1213,7 +1213,7 @@ void EnBigslime_SetTargetVtxToWideCone(EnBigslime* this) { } void EnBigslime_SetupSquishFlat(EnBigslime* this) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_B_SLIME_JUMP2); + Actor_PlaySfx(&this->actor, NA_SE_EN_B_SLIME_JUMP2); this->squishFlatTimer = 20; this->actor.scale.x = 0.2f; this->actor.scale.z = 0.2f; @@ -1412,7 +1412,7 @@ void EnBigslime_SetupRise(EnBigslime* this) { Animation_PlayLoop(&this->skelAnime, &gGekkoSwimForwardAnim); EnBigslime_GekkoSfxOutsideBigslime(this, NA_SE_EN_FROG_JUMP_ABOVE); EnBigslime_GekkoSfxOutsideBigslime(this, NA_SE_EN_UTSUBO_APPEAR_TRG); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_B_SLIME_JUMP1); + Actor_PlaySfx(&this->actor, NA_SE_EN_B_SLIME_JUMP1); this->riseCounter = 0; this->bigslimeCollider[0].base.atFlags &= ~AT_ON; this->actor.gravity = 0.0f; @@ -1515,7 +1515,7 @@ void EnBigslime_SetupCutsceneGrabPlayer(EnBigslime* this, PlayState* play) { this->subCamYawGrabPlayer += this->actor.world.rot.y; Animation_PlayLoop(&this->skelAnime, &gGekkoBoxingStanceAnim); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_B_SLIME_EAT); + Actor_PlaySfx(&this->actor, NA_SE_EN_B_SLIME_EAT); this->actionFunc = EnBigslime_CutsceneGrabPlayer; } @@ -1624,7 +1624,7 @@ void EnBigslime_AttackPlayerInBigslime(EnBigslime* this, PlayState* play) { } play->damagePlayer(play, -4); - func_800B8E58(player, player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_DAMAGE_S); + Player_PlaySfx(player, player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_DAMAGE_S); this->gekkoRot.y += (s16)(Rand_S16Offset(0x4000, 0x4000) * (Rand_ZeroOne() < 0.5f ? -1 : 1)); this->gekkoPosOffset.x = Math_SinS(this->gekkoRot.y) * -50.0f; this->gekkoPosOffset.z = Math_CosS(this->gekkoRot.y) * -50.0f; @@ -1701,7 +1701,7 @@ void EnBigslime_WindupThrowPlayer(EnBigslime* this, PlayState* play) { this->gekkoPosOffset.z = Math_CosS(this->gekkoRot.y) * -50.0f; } else { if (this->windupPunchTimer == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_B_SLIME_REVERSE); + Actor_PlaySfx(&this->actor, NA_SE_EN_B_SLIME_REVERSE); EnBigslime_GekkoSfxInsideBigslime(this, NA_SE_EN_FROG_PUNCH1); } @@ -2284,7 +2284,7 @@ void EnBigslime_FormBigslime(EnBigslime* this, PlayState* play) { this->actor.speedXZ = 0.0f; Animation_PlayLoop(&this->skelAnime, &gGekkoSwimForwardAnim); this->formBigslimeCutsceneTimer--; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_B_SLIME_COMBINE); + Actor_PlaySfx(&this->actor, NA_SE_EN_B_SLIME_COMBINE); } else if (this->isAnimUpdate) { this->formBigslimeCutsceneTimer--; if (this->formBigslimeCutsceneTimer == 0) { @@ -2644,7 +2644,7 @@ void EnBigslime_ApplyDamageEffectGekko(EnBigslime* this, PlayState* play) { EnBigslime_SetupCutscene(this); } else if (this->actor.colChkInfo.damageEffect == BIGSLIME_DMGEFF_ELECTRIC_STUN) { this->stunTimer = 40; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->gekkoDrawDmgEffType = ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_SMALL; this->gekkoDrawDmgEffScale = 0.75f; this->gekkoDrawDmgEffAlpha = 2.0f; @@ -2652,7 +2652,7 @@ void EnBigslime_ApplyDamageEffectGekko(EnBigslime* this, PlayState* play) { } else if (this->actor.colChkInfo.damageEffect == BIGSLIME_DMGEFF_STUN || this->actor.colChkInfo.damageEffect == BIGSLIME_DMGEFF_DEKU_STUN) { this->stunTimer = 40; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); EnBigslime_SetupStunGekko(this); } else if (this->actor.colChkInfo.damageEffect == BIGSLIME_DMGEFF_ICE) { EnBigslime_GekkoFreeze(this); @@ -2722,7 +2722,7 @@ void EnBigslime_AddIceShardEffect(EnBigslime* this, PlayState* play) { } } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ICE_BROKEN); + Actor_PlaySfx(&this->actor, NA_SE_EV_ICE_BROKEN); EnBigslime_InitShockwave(this, play); } diff --git a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c index 08070b61d7..207e4f9620 100644 --- a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c +++ b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c @@ -182,7 +182,7 @@ s32 EnBjt_Appear(EnBjt* this) { s32 finished = false; if (!this->playedSfx) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_TOILET_HAND_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EV_TOILET_HAND_APPEAR); this->playedSfx = true; } @@ -207,7 +207,7 @@ s32 EnBjt_Vanish(EnBjt* this) { s32 finished = false; if (!this->playedSfx) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_TOILET_HAND_VANISH); + Actor_PlaySfx(&this->actor, NA_SE_EV_TOILET_HAND_VANISH); this->playedSfx = true; } @@ -292,7 +292,7 @@ s32 EnBjt_ChooseBehaviour(Actor* thisx, PlayState* play) { this->playedSfx = false; this->behaviour++; } else if (this->timer == 10) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_TOILET_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EV_TOILET_WATER); } break; diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 9e49ca0b17..bfedfda2c1 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -217,7 +217,7 @@ void func_80871058(EnBom* this, PlayState* play) { BINANG_SUB(this->actor.wallYaw - this->actor.world.rot.y + this->actor.wallYaw, 0x8000); } - Actor_PlaySfxAtPos(&this->actor, this->isPowderKeg ? NA_SE_EV_PUT_DOWN_WOODBOX : NA_SE_EV_BOMB_BOUND); + Actor_PlaySfx(&this->actor, this->isPowderKeg ? NA_SE_EV_PUT_DOWN_WOODBOX : NA_SE_EV_BOMB_BOUND); Actor_MoveWithGravity(&this->actor); this->actor.speedXZ *= 0.7f; this->actor.bgCheckFlags &= ~8; @@ -281,7 +281,7 @@ void func_80871058(EnBom* this, PlayState* play) { } if (this->actor.bgCheckFlags & 2) { - Actor_PlaySfxAtPos(&this->actor, this->isPowderKeg ? NA_SE_EV_TRE_BOX_BOUND : NA_SE_EV_BOMB_BOUND); + Actor_PlaySfx(&this->actor, this->isPowderKeg ? NA_SE_EV_TRE_BOX_BOUND : NA_SE_EV_BOMB_BOUND); if (this->actor.velocity.y < sp58->y) { if ((sp54 == 4) || (sp54 == 14) || (sp54 == 15)) { this->actor.velocity.y = 0.0f; @@ -462,7 +462,7 @@ void EnBom_Update(Actor* thisx, PlayState* play) { } if ((!this->isPowderKeg && (this->timer == 67)) || (this->isPowderKeg && (this->timer <= 2400))) { - Actor_PlaySfxAtPos(thisx, NA_SE_PL_TAKE_OUT_SHIELD); + Actor_PlaySfx(thisx, NA_SE_PL_TAKE_OUT_SHIELD); Actor_SetScale(thisx, enBomScales[this->isPowderKeg]); } @@ -491,7 +491,7 @@ void EnBom_Update(Actor* thisx, PlayState* play) { : (this->flashSpeedScale == 3) ? 1 : 2); } else { - Actor_PlaySfxAtPos(thisx, NA_SE_IT_BOMB_IGNIT - SFX_FLAG); + Actor_PlaySfx(thisx, NA_SE_IT_BOMB_IGNIT - SFX_FLAG); } sp80.y += 3.0f; @@ -545,9 +545,9 @@ void EnBom_Update(Actor* thisx, PlayState* play) { this->actionFunc = func_808715B8; if (this->isPowderKeg) { gSaveContext.powderKegTimer = 0; - Actor_PlaySfxAtPos(thisx, NA_SE_IT_BIG_BOMB_EXPLOSION); + Actor_PlaySfx(thisx, NA_SE_IT_BIG_BOMB_EXPLOSION); } else { - Actor_PlaySfxAtPos(thisx, NA_SE_IT_BOMB_EXPLOSION); + Actor_PlaySfx(thisx, NA_SE_IT_BOMB_EXPLOSION); } } } @@ -581,7 +581,7 @@ void EnBom_Update(Actor* thisx, PlayState* play) { this->unk_1FC = KREG(81) + 10; } else if (thisx->bgCheckFlags & 0x40) { thisx->bgCheckFlags &= ~0x40; - Actor_PlaySfxAtPos(thisx, NA_SE_EV_BOMB_DROP_WATER); + Actor_PlaySfx(thisx, NA_SE_EV_BOMB_DROP_WATER); } } } diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index da6e8d6d05..0e06574d80 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -123,27 +123,27 @@ void func_809C49CC(EnBomBowlMan* this) { if ((this->unk_2F8 == 5) && (Animation_OnFrame(&this->skelAnime, 9.0f) || Animation_OnFrame(&this->skelAnime, 10.0f) || Animation_OnFrame(&this->skelAnime, 17.0f) || Animation_OnFrame(&this->skelAnime, 18.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMBERS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMBERS_WALK); } if ((this->unk_2F8 == 0xB) && (Animation_OnFrame(&this->skelAnime, 4.0f) || Animation_OnFrame(&this->skelAnime, 8.0f) || Animation_OnFrame(&this->skelAnime, 12.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMBERS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMBERS_WALK); } if ((this->unk_2F8 == 0x12) && (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 4.0f) || Animation_OnFrame(&this->skelAnime, 6.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMBERS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMBERS_WALK); } if ((this->unk_2F8 == 0xF) && Animation_OnFrame(&this->skelAnime, 15.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMBERS_LAND); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMBERS_LAND); } if ((this->unk_2F8 == 6) && Animation_OnFrame(&this->skelAnime, 8.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMBERS_LAND); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMBERS_LAND); } } diff --git a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c index bcb7cb5348..cccddedfdf 100644 --- a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c +++ b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c @@ -136,7 +136,7 @@ void func_80C05C44(EnBombal* this, PlayState* play) { } SET_WEEKEVENTREG(WEEKEVENTREG_83_04); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_MUJURA_BALLOON_BROKEN); + Actor_PlaySfx(&this->actor, NA_SE_EV_MUJURA_BALLOON_BROKEN); this->timer = 30; this->isPopped = true; this->actionFunc = func_80C05DE8; diff --git a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c index 2ca62ef0a0..7d678b8add 100644 --- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c +++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c @@ -165,13 +165,13 @@ void func_80C038B4(EnBombers* this) { if ((this->unk_2C4 == 2) && (Animation_OnFrame(&this->skelAnime, 9.0f) || Animation_OnFrame(&this->skelAnime, 10.0f) || Animation_OnFrame(&this->skelAnime, 17.0f) || Animation_OnFrame(&this->skelAnime, 18.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMBERS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMBERS_WALK); } if ((this->unk_2C4 == 15) && (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 4.0f) || Animation_OnFrame(&this->skelAnime, 6.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMBERS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMBERS_WALK); } } diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c index 74575628f6..3157c9d5b1 100644 --- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c +++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c @@ -234,7 +234,7 @@ void func_80C04D8C(EnBombers2* this, PlayState* play) { this->textIdIndex = 6; this->actor.textId = sTextIds[this->textIdIndex]; func_80151938(play, this->actor.textId); - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_PIECE_OF_HEART); + Actor_PlaySfx(&this->actor, NA_SE_SY_PIECE_OF_HEART); this->talkState = TEXT_STATE_5; return; } @@ -266,7 +266,7 @@ void func_80C04D8C(EnBombers2* this, PlayState* play) { this->correctDigitSlots[j] = false; } this->textIdIndex = 4; - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_ERROR); + Actor_PlaySfx(&this->actor, NA_SE_SY_ERROR); this->actor.textId = sTextIds[this->textIdIndex]; func_80151938(play, this->actor.textId); this->talkState = TEXT_STATE_5; @@ -357,7 +357,7 @@ void EnBombers2_Update(Actor* thisx, PlayState* play) { if ((this->animIndex == 2) && (Animation_OnFrame(&this->skelAnime, 9.0f) || Animation_OnFrame(&this->skelAnime, 10.0f) || Animation_OnFrame(&this->skelAnime, 17.0f) || Animation_OnFrame(&this->skelAnime, 18.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMBERS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMBERS_WALK); } this->actor.shape.rot.y = this->actor.world.rot.y; if (this->unk_2C0 != 2) { diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 0b5ffff54d..fe0101ab4f 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -156,7 +156,7 @@ void func_808AEAE0(EnBombf* this, PlayState* play) { func_800B8C20(&this->actor, &bombf->actor, play); this->timer = 180; this->unk_204 = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_PL_PULL_UP_ROCK); + Actor_PlaySfx(&this->actor, NA_SE_PL_PULL_UP_ROCK); this->actor.flags &= ~ACTOR_FLAG_1; } else { player->actor.child = NULL; @@ -352,7 +352,7 @@ void EnBombf_Update(Actor* thisx, PlayState* play) { this->actor.world.rot.y = BINANG_SUB(this->actor.wallYaw - this->actor.world.rot.y + this->actor.wallYaw, 0x8000); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMB_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMB_BOUND); Actor_MoveWithGravity(&this->actor); DREG(6) = 1; Actor_UpdateBgCheckInfo(play, &this->actor, 5.0f, 10.0f, 0.0f, 0x1F); @@ -378,7 +378,7 @@ void EnBombf_Update(Actor* thisx, PlayState* play) { if ((play->gameplayFrames % 2) == 0) { EffectSsGSpk_SpawnFuse(play, &this->actor, &sp68, &sp8C, &sp74); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_BOMB_IGNIT - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_IT_BOMB_IGNIT - SFX_FLAG); sp68.y += 3.0f; func_800B0DE0(play, &sp68, &sp8C, &sp5C, &sp58, &sp58, 0x32, 5); } @@ -407,7 +407,7 @@ void EnBombf_Update(Actor* thisx, PlayState* play) { Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, sp68.x, sp68.y, sp68.z, 0, 0, 0, CLEAR_TAG_SMALL_EXPLOSION); - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_BOMB_EXPLOSION); + Actor_PlaySfx(&this->actor, NA_SE_IT_BOMB_EXPLOSION); play->envCtx.lightSettings.diffuseColor1[0] = play->envCtx.lightSettings.diffuseColor1[1] = play->envCtx.lightSettings.diffuseColor1[2] = 250; @@ -445,7 +445,7 @@ void EnBombf_Update(Actor* thisx, PlayState* play) { if (this->actor.bgCheckFlags & 0x40) { this->actor.bgCheckFlags &= ~0x40; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMB_DROP_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMB_DROP_WATER); } } } diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c index b17079b6eb..b0c879d0e7 100644 --- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c @@ -219,21 +219,21 @@ void func_80BFE524(EnBomjima* this) { if ((this->animIndex == 5) && (Animation_OnFrame(&this->skelAnime, 9.0f) || Animation_OnFrame(&this->skelAnime, 10.0f) || Animation_OnFrame(&this->skelAnime, 17.0f) || Animation_OnFrame(&this->skelAnime, 18.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMBERS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMBERS_WALK); } if ((this->animIndex == 18) && (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 4.0f) || Animation_OnFrame(&this->skelAnime, 6.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMBERS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMBERS_WALK); } if ((this->animIndex == 15) && Animation_OnFrame(&this->skelAnime, 15.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMBERS_LAND); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMBERS_LAND); } if ((this->animIndex == 6) && Animation_OnFrame(&this->skelAnime, 8.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMBERS_LAND); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMBERS_LAND); } } @@ -409,7 +409,7 @@ void func_80BFEB64(EnBomjima* this, PlayState* play) { this->unk_2DC = Math_Vec3f_Yaw(&this->actor.world.pos, &this->bombal->actor.world.pos); if (Animation_OnFrame(&this->skelAnime, 19.0f)) { this->unk_2C0 = 5; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMBERS_SHOT_BREATH); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMBERS_SHOT_BREATH); } if (this->unk_2C0 == 1) { @@ -848,7 +848,7 @@ void func_80BFFF54(EnBomjima* this, PlayState* play) { if (this->animIndex == 8) { if ((D_80C009F4 == 1) && Animation_OnFrame(&this->skelAnime, 7.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_HUMAN_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EV_HUMAN_BOUND); D_80C009F4 = 2; } diff --git a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c index 7e07ed9d6d..5f852993ba 100644 --- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c +++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c @@ -185,20 +185,20 @@ void func_80C011CC(EnBomjimb* this) { if ((this->unk_2DC == 5) && (Animation_OnFrame(&this->skelAnime, 9.0f) || Animation_OnFrame(&this->skelAnime, 10.0f) || Animation_OnFrame(&this->skelAnime, 17.0f) || Animation_OnFrame(&this->skelAnime, 18.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMBERS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMBERS_WALK); } if ((this->unk_2DC == 19) && (Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 6.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMBERS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMBERS_WALK); } if ((this->unk_2DC == 18) && Animation_OnFrame(&this->skelAnime, 15.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMBERS_LAND); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMBERS_LAND); } if ((this->unk_2DC == 7) && Animation_OnFrame(&this->skelAnime, 8.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMBERS_LAND); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMBERS_LAND); } } @@ -451,7 +451,7 @@ void func_80C01CD0(EnBomjimb* this, PlayState* play) { } if ((this->unk_2C0 == 0) && (this->unk_2E4->bgCheckFlags & 1)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PUT_DOWN_WOODBOX); + Actor_PlaySfx(&this->actor, NA_SE_EV_PUT_DOWN_WOODBOX); this->unk_2C0 = 1; } @@ -693,7 +693,7 @@ void func_80C02740(EnBomjimb* this, PlayState* play) { if (gSaveContext.save.bombersCaughtNum > 4) { Audio_PlayFanfare(NA_BGM_GET_ITEM | 0x900); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_PIECE_OF_HEART); + Actor_PlaySfx(&this->actor, NA_SE_SY_PIECE_OF_HEART); } switch (this->unk_2C8) { @@ -749,7 +749,7 @@ void func_80C02A14(EnBomjimb* this, PlayState* play) { player->actor.freezeTimer = 3; if (this->unk_2E0 == 0) { if (Animation_OnFrame(&this->skelAnime, 7.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_HUMAN_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EV_HUMAN_BOUND); this->unk_2E0 = 1; } } diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index aeaed963b0..afc91770f6 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -95,7 +95,7 @@ void func_808A24DC(EnBoom* this, PlayState* play) { EffectSsGSplash_Spawn(play, &sp34, NULL, NULL, 0, 300); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_DIVE_INTO_WATER_L); + Actor_PlaySfx(&this->actor, NA_SE_EV_DIVE_INTO_WATER_L); EffectSsGRipple_Spawn(play, &sp34, 100, 500, 0); EffectSsGRipple_Spawn(play, &sp34, 100, 500, 4); diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index cbf9e9f3ca..6cfb05c686 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -247,7 +247,7 @@ void EnBubble_Fly(EnBubble* this, PlayState* play) { this->velocityFromBounce.y = this->bounceDirection.y * bounceSpeed; this->velocityFromBounce.z = this->bounceDirection.z * bounceSpeed; this->yVelocity = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AWA_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EN_AWA_BOUND); this->modelRotSpeed = 128.0f; this->modelEllipticity = 0.48f; } else if ((this->actor.bgCheckFlags & 0x20) && (bounceDirection.y < 0.0f)) { @@ -266,7 +266,7 @@ void EnBubble_Fly(EnBubble* this, PlayState* play) { this->velocityFromBounce.y = (this->bounceDirection.y * bounceSpeed); this->velocityFromBounce.z = (this->bounceDirection.z * bounceSpeed); this->yVelocity = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AWA_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EN_AWA_BOUND); this->modelRotSpeed = 128.0f; this->modelEllipticity = 0.48f; } diff --git a/src/overlays/actors/ovl_En_Cha/z_en_cha.c b/src/overlays/actors/ovl_En_Cha/z_en_cha.c index d32fe32ac9..92030934f3 100644 --- a/src/overlays/actors/ovl_En_Cha/z_en_cha.c +++ b/src/overlays/actors/ovl_En_Cha/z_en_cha.c @@ -84,12 +84,12 @@ void EnCha_Ring(EnCha* this, PlayState* play) { void EnCha_Idle(EnCha* this, PlayState* play) { if (CHECK_WEEKEVENTREG(WEEKEVENTREG_60_04)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_DOOR_BELL); + Actor_PlaySfx(&this->actor, NA_SE_EV_DOOR_BELL); CLEAR_WEEKEVENTREG(WEEKEVENTREG_60_04); this->actor.home.rot.z = 0x7D0; } if (this->collider.base.acFlags & AC_HIT) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_DOOR_BELL); + Actor_PlaySfx(&this->actor, NA_SE_EV_DOOR_BELL); this->actor.home.rot.z = 0x7D0; if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_51_04)) { SET_WEEKEVENTREG(WEEKEVENTREG_51_04); diff --git a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c index b3038dd608..61304db8e8 100644 --- a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c +++ b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c @@ -167,7 +167,7 @@ void func_80AFDFB4(EnColMan* this, PlayState* play) { this->actor.speedXZ = 2.0f + BREG(56) + Rand_ZeroFloat(2.0f); this->actor.velocity.y = 12.0f + BREG(57) + Rand_ZeroFloat(5.0f); this->hasSetRandomValues = true; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_ANSATSUSYA_ROCK); + Actor_PlaySfx(&this->actor, NA_SE_EN_ANSATSUSYA_ROCK); return; } @@ -210,7 +210,7 @@ void func_80AFE25C(EnColMan* this, PlayState* play) { } } - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_BOMB_EXPLOSION); + Actor_PlaySfx(&this->actor, NA_SE_IT_BOMB_EXPLOSION); Actor_Kill(&this->actor); } } diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index 4e9040d83a..e6262dad02 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -344,7 +344,7 @@ void EnCow_Update(Actor* thisx, PlayState* play2) { if (SkelAnime_Update(&this->skelAnime)) { if (this->skelAnime.animation == &gCowChewAnim) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_COW_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EV_COW_CRY); Animation_Change(&this->skelAnime, &gCowMooAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gCowMooAnim), ANIMMODE_ONCE, 1.0f); } else { diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index 8ffdc6b247..43f6349408 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -189,7 +189,7 @@ void EnCrow_FlyIdle(EnCrow* this, PlayState* play) { } else { this->yawTarget -= Rand_S16Offset(0x1000, 0x1000); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KAICHO_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_CRY); } if ((this->actor.depthInWater > -40.0f) || (this->actor.bgCheckFlags & 1)) { @@ -278,7 +278,7 @@ void EnCrow_DiveAttack(EnCrow* this, PlayState* play) { if (this->collider.base.atFlags & AT_HIT) { this->collider.base.atFlags &= ~AT_HIT; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KAICHO_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_ATTACK); } EnCrow_SetupFlyIdle(this); } @@ -303,7 +303,7 @@ void EnCrow_SetupDamaged(EnCrow* this, PlayState* play) { this->actor.bgCheckFlags &= ~1; scale = (this->actor.scale.x * 100.0f); this->actor.world.pos.y += 20.0f * scale; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KAICHO_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_DEAD); if (this->actor.colChkInfo.damageEffect == GUAY_DMGEFF_ICE) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX; @@ -393,7 +393,7 @@ void EnCrow_SetupTurnAway(EnCrow* this) { } else { Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->actionFunc = EnCrow_TurnAway; } @@ -528,7 +528,7 @@ void EnCrow_Update(Actor* thisx, PlayState* play) { Actor_SetFocus(&this->actor, height); if ((this->actor.colChkInfo.health != 0) && (Animation_OnFrame(&this->skelAnime, 3.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KAICHO_FLUTTER); + Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_FLUTTER); } if (this->drawDmgEffAlpha > 0.0f) { if (this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) { diff --git a/src/overlays/actors/ovl_En_Dai/z_en_dai.c b/src/overlays/actors/ovl_En_Dai/z_en_dai.c index 2101797744..4e4285b521 100644 --- a/src/overlays/actors/ovl_En_Dai/z_en_dai.c +++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.c @@ -291,7 +291,7 @@ s32 func_80B3E96C(EnDai* this, PlayState* play) { break; case 1: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SNOWSTORM_HARD); + Actor_PlaySfx(&this->actor, NA_SE_EV_SNOWSTORM_HARD); Actor_Spawn(&play->actorCtx, play, ACTOR_EN_WEATHER_TAG, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0x1388, 0x708, 0x3E8, 0); func_80B3E5DC(this, 3); @@ -456,7 +456,7 @@ void func_80B3F044(EnDai* this, PlayState* play) { break; case 2: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ROLL_AND_FALL); + Actor_PlaySfx(&this->actor, NA_SE_EV_ROLL_AND_FALL); break; case 3: @@ -479,27 +479,27 @@ void func_80B3F044(EnDai* this, PlayState* play) { case 2: if (play->csCtx.frames == 360) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DAIGOLON_SLEEP3 - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_DAIGOLON_SLEEP3 - SFX_FLAG); } if (Animation_OnFrame(&this->skelAnime, 43.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_GORON_BOUND_1); + Actor_PlaySfx(&this->actor, NA_SE_EV_GORON_BOUND_1); } this->unk_1D6 = func_80B3E8BC(this, this->unk_1CC); break; case 3: if (Animation_OnFrame(&this->skelAnime, 6.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DAIGOLON_SLEEP1); + Actor_PlaySfx(&this->actor, NA_SE_EN_DAIGOLON_SLEEP1); } this->unk_1D6 = func_80B3E8BC(this, this->unk_1CC); break; case 4: if (Animation_OnFrame(&this->skelAnime, 30.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DAIGOLON_SLEEP2); + Actor_PlaySfx(&this->actor, NA_SE_EN_DAIGOLON_SLEEP2); } if (Animation_OnFrame(&this->skelAnime, 35.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_GORON_BOUND_0); + Actor_PlaySfx(&this->actor, NA_SE_EV_GORON_BOUND_0); } this->unk_1D6 = func_80B3E8BC(this, this->unk_1CC); break; diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c index 0e5e7a3eab..f0c1dd47ad 100644 --- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c +++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c @@ -234,7 +234,7 @@ void func_80BE66E4(EnDaiku2* this, PlayState* play) { func_800B8614(&this->actor, play, 80.0f); if ((this->unk_276 == 8) && Animation_OnFrame(&this->skelAnime, 6.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ROCK_BROKEN); + Actor_PlaySfx(&this->actor, NA_SE_EV_ROCK_BROKEN); for (i = 0; i < 10; i++) { Math_Vec3f_Copy(&sp70, &this->actor.world.pos); diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index 45b851271a..6a75aedc34 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -363,7 +363,7 @@ void EnDekubaba_SetupGrow(EnDekubaba* this) { this->collider.base.colType = COLTYPE_HIT6; this->collider.base.acFlags &= ~AC_HARD; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKU_WAKEUP); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKU_WAKEUP); this->actionFunc = EnDekubaba_Grow; } @@ -520,9 +520,9 @@ void EnDekubaba_DecideLunge(EnDekubaba* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 12.0f)) { if (this->actor.params == DEKUBABA_BIG) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKU_MOUTH); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKU_MOUTH); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_MIZUBABA1_MOUTH); + Actor_PlaySfx(&this->actor, NA_SE_EN_MIZUBABA1_MOUTH); } } @@ -604,9 +604,9 @@ void EnDekubaba_Lunge(EnDekubaba* this, PlayState* play) { if (this->timer == 0) { if (Animation_OnFrame(&this->skelAnime, 1.0f)) { if (this->actor.params == DEKUBABA_BIG) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKU_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKU_ATTACK); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_MIZUBABA1_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_MIZUBABA1_ATTACK); } } @@ -638,9 +638,9 @@ void EnDekubaba_Lunge(EnDekubaba* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 12.0f)) { if (this->actor.params == DEKUBABA_BIG) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKU_MOUTH); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKU_MOUTH); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_MIZUBABA1_MOUTH); + Actor_PlaySfx(&this->actor, NA_SE_EN_MIZUBABA1_MOUTH); } } } @@ -729,7 +729,7 @@ void EnDekubaba_PullBack(EnDekubaba* this, PlayState* play) { } else { this->timer++; if (this->timer == 10) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKU_SCRAPE); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKU_SCRAPE); } if (this->timer >= 12) { @@ -872,7 +872,7 @@ void EnDekubaba_PrunedSomersaultDie(EnDekubaba* this, PlayState* play) { } if (this->actor.bgCheckFlags & 2) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); this->timer = 1; } } else if (this->timer == 1) { @@ -1149,9 +1149,9 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) { if (this->actor.colChkInfo.health != 0) { if ((this->timer == 2) || (this->timer == 3)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKU_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKU_DAMAGE); } } else { Enemy_StartFinishingBlow(play, &this->actor); @@ -1164,9 +1164,9 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) { } if (this->actor.params == DEKUBABA_BIG) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKU_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKU_DEAD); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKU_JR_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKU_JR_DEAD); } } } diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index 4bf0f20d5b..15a2401f86 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -188,7 +188,7 @@ void func_808BD49C(EnDekunuts* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, 9.0f)) { this->collider.base.acFlags |= AC_ON; } else if (Animation_OnFrame(&this->skelAnime, 8.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_UP); } this->collider.dim.height = (s32)((CLAMP(this->skelAnime.curFrame, 9.0f, 12.0f) - 9.0f) * 9.0f) + 5; @@ -320,7 +320,7 @@ void func_808BDA4C(EnDekunuts* this, PlayState* play) { if (Actor_Spawn(&play->actorCtx, play, ACTOR_EN_NUTSBALL, pos.x, pos.y, pos.z, this->actor.world.rot.x, this->actor.shape.rot.y, 0, params) != NULL) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_THROW); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_THROW); } } else if ((this->unk_190 >= 2) && Animation_OnFrame(&this->skelAnime, 12.0f)) { Animation_MorphToPlayOnce(&this->skelAnime, &gDekuScrubSpitAnim, -3.0f); @@ -333,7 +333,7 @@ void func_808BDA4C(EnDekunuts* this, PlayState* play) { void func_808BDC9C(EnDekunuts* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gDekuScrubBurrowAnim, -5.0f); this->unk_190 = 0; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DOWN); this->actionFunc = func_808BDD54; } @@ -341,7 +341,7 @@ void func_808BDCF0(EnDekunuts* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gDekuScrubBurrowAnim, -5.0f); this->collider.base.acFlags &= ~AC_ON; this->unk_190 = 80; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DOWN); this->actionFunc = func_808BDD54; } @@ -369,7 +369,7 @@ void func_808BDE7C(EnDekunuts* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gDekuScrubUnburrowAnim, -3.0f); this->collider.dim.height = 37; this->actor.colChkInfo.mass = 50; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DAMAGE); this->actor.world.rot.x = 0; this->actor.flags |= ACTOR_FLAG_20; this->collider.base.acFlags &= ~AC_ON; @@ -405,7 +405,7 @@ void func_808BDFB8(EnDekunuts* this, PlayState* play) { } if (this->unk_18C != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_WALK); this->unk_18C = 0; } else { this->unk_18C = 1; @@ -477,8 +477,8 @@ void func_808BE294(EnDekunuts* this, s32 arg1) { this->actor.world.rot.x = 0; this->collider.base.acFlags &= ~AC_ON; this->actionFunc = func_808BE358; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DAMAGE); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_CUTBODY); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_CUTBODY); Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, Animation_GetLastFrame(&gDekuScrubDamageAnim)); } @@ -521,7 +521,7 @@ void func_808BE484(EnDekunuts* this) { Animation_PlayOnce(&this->skelAnime, &gDekuScrubDieAnim); this->actionFunc = func_808BE4D4; this->actor.speedXZ = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DEAD); } void func_808BE4D4(EnDekunuts* this, PlayState* play) { @@ -594,7 +594,7 @@ void func_808BE73C(EnDekunuts* this, PlayState* play) { if (this->actor.colChkInfo.damageEffect == 1) { this->unk_190 = 40; Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); func_808BE3A8(this); return; } diff --git a/src/overlays/actors/ovl_En_Dg/z_en_dg.c b/src/overlays/actors/ovl_En_Dg/z_en_dg.c index d9bebb4046..fe8143b15e 100644 --- a/src/overlays/actors/ovl_En_Dg/z_en_dg.c +++ b/src/overlays/actors/ovl_En_Dg/z_en_dg.c @@ -368,31 +368,31 @@ void EnDg_SpawnFloorDustRing(EnDg* this, PlayState* play) { void EnDg_PlaySfxWalk(EnDg* this) { if (Animation_OnFrame(&this->skelAnime, 1.0f) || Animation_OnFrame(&this->skelAnime, 7.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_MONKEY_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_MONKEY_WALK); } } void EnDg_PlaySfxBark(EnDg* this, f32 frame) { if (Animation_OnFrame(&this->skelAnime, frame)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SMALL_DOG_BARK); + Actor_PlaySfx(&this->actor, NA_SE_EV_SMALL_DOG_BARK); } } void EnDg_PlaySfxAngryBark(EnDg* this, f32 frame) { if (Animation_OnFrame(&this->skelAnime, frame)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SMALL_DOG_ANG_BARK); + Actor_PlaySfx(&this->actor, NA_SE_EV_SMALL_DOG_ANG_BARK); } } void EnDg_PlaySfxWhine(EnDg* this) { if (Animation_OnFrame(&this->skelAnime, 23.0f) || Animation_OnFrame(&this->skelAnime, 28.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SMALL_DOG_WHINE); + Actor_PlaySfx(&this->actor, NA_SE_EV_SMALL_DOG_WHINE); } } void EnDg_PlaySfxGrowl(EnDg* this, f32 frame) { if (Animation_OnFrame(&this->skelAnime, frame)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SMALL_DOG_GROAN); + Actor_PlaySfx(&this->actor, NA_SE_EV_SMALL_DOG_GROAN); } } @@ -481,7 +481,7 @@ void EnDg_TryPickUp(EnDg* this, PlayState* play) { } if (Actor_HasParent(&this->actor, play)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SMALL_DOG_BARK); + Actor_PlaySfx(&this->actor, NA_SE_EV_SMALL_DOG_BARK); this->grabState = DOG_GRAB_STATE_HELD; sSelectedRacetrackDogInfo = sRacetrackDogInfo[this->index]; if (!sIsAnyDogHeld) { @@ -562,7 +562,7 @@ void EnDg_CheckForBremenMaskMarch(EnDg* this, PlayState* play) { } else if ((this->actionFunc == EnDg_ApproachPlayer) || (this->actionFunc == EnDg_SitNextToPlayer)) { if (DECR(this->bremenBarkTimer) == 0) { this->bremenBarkTimer = 10; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SMALL_DOG_BARK); + Actor_PlaySfx(&this->actor, NA_SE_EV_SMALL_DOG_BARK); } } } @@ -778,9 +778,9 @@ void EnDg_RunAwayFromGoron(EnDg* this, PlayState* play) { EnDg_PlaySfxWalk(this); if (Animation_OnFrame(&this->skelAnime, 3.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SMALL_DOG_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EV_SMALL_DOG_CRY); } else if (Animation_OnFrame(&this->skelAnime, 6.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_MONKEY_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_MONKEY_WALK); } } @@ -960,7 +960,7 @@ void EnDg_WalkToPlayer(EnDg* this, PlayState* play) { void EnDg_SetupBremenMaskApproachPlayer(EnDg* this, PlayState* play) { if (func_801A46F8() == 1) { this->bremenBarkTimer = 10; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SMALL_DOG_BARK); + Actor_PlaySfx(&this->actor, NA_SE_EV_SMALL_DOG_BARK); this->actionFunc = EnDg_ApproachPlayer; } } @@ -1064,7 +1064,7 @@ void EnDg_BackAwayFromPlayer(EnDg* this, PlayState* play) { } EnDg_PlaySfxWalk(this); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SMALL_DOG_GROAN); + Actor_PlaySfx(&this->actor, NA_SE_EV_SMALL_DOG_GROAN); } /** @@ -1106,7 +1106,7 @@ void EnDg_SetupSwim(EnDg* this, PlayState* play) { this->actor.gravity = 0.0f; this->actor.velocity.y = -3.0f; this->swimTimer = 10; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMB_DROP_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMB_DROP_WATER); this->actionFunc = EnDg_Swim; } @@ -1138,7 +1138,7 @@ void EnDg_Swim(EnDg* this, PlayState* play) { if (DECR(this->swimTimer) == 0) { if (!(this->dogFlags & DOG_FLAG_SWIMMING)) { this->dogFlags |= DOG_FLAG_SWIMMING; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_OUT_OF_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EV_OUT_OF_WATER); } this->swimTimer = 5; @@ -1181,7 +1181,7 @@ void EnDg_Swim(EnDg* this, PlayState* play) { this->dogFlags &= ~DOG_FLAG_SWIMMING; this->behavior = DOG_BEHAVIOR_DEFAULT; this->timer = Rand_S16Offset(60, 60); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_OUT_OF_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EV_OUT_OF_WATER); EnDg_ChangeAnim(&this->skelAnime, sAnimationInfo, DOG_ANIM_RUN); Math_ApproachF(&this->actor.speedXZ, 3.5f, 0.2f, 1.0f); this->actionFunc = EnDg_IdleMove; @@ -1227,7 +1227,7 @@ void EnDg_JumpOutOfWater(EnDg* this, PlayState* play) { this->actor.velocity.y = 10.0f; this->actor.gravity = -3.0f; this->timer = Rand_S16Offset(60, 60); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_OUT_OF_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EV_OUT_OF_WATER); EnDg_ChangeAnim(&this->skelAnime, sAnimationInfo, DOG_ANIM_RUN); this->actionFunc = EnDg_IdleMove; Math_ApproachF(&this->actor.speedXZ, 3.5f, 0.2f, 1.0f); @@ -1263,7 +1263,7 @@ void EnDg_Thrown(EnDg* this, PlayState* play) { if (this->actor.bgCheckFlags & 1) { if (this->dogFlags & DOG_FLAG_THROWN) { this->dogFlags &= ~DOG_FLAG_THROWN; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_MONKEY_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_MONKEY_WALK); } this->actor.speedXZ = 0.0f; diff --git a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c index 687ea75578..53889ac175 100644 --- a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c +++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c @@ -418,7 +418,7 @@ s32 func_8089AE00(EnDinofos* this, PlayState* play) { temp_v1 = (Actor_WorldYawTowardActor(&this->actor, temp_v0) - this->actor.shape.rot.y) - this->unk_28E; if (ABS_ALT(temp_v1) < 0x3000) { func_8089D11C(this, temp_v1 + this->unk_28E); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_WARAU); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_WARAU); return true; } } @@ -428,7 +428,7 @@ s32 func_8089AE00(EnDinofos* this, PlayState* play) { temp_v1_2 = (Actor_WorldYawTowardActor(&this->actor, temp_v0) - this->actor.shape.rot.y) - this->unk_28E; if (ABS_ALT(temp_v1_2) < 0x3000) { func_8089C024(this, 1); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_WARAU); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_WARAU); return true; } } @@ -445,7 +445,7 @@ s32 func_8089AE00(EnDinofos* this, PlayState* play) { } else { func_8089C024(this, 3); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_WARAU); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_WARAU); return true; } @@ -496,7 +496,7 @@ void func_8089B288(EnDinofos* this, PlayState* play) { void func_8089B320(EnDinofos* this) { this->actor.gravity = -2.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_CRY); this->unk_2BC.x = (Math_SinS(this->actor.shape.rot.y - 0x0E00) * 86.0f) + this->actor.world.pos.x; this->unk_2BC.y = this->actor.floorHeight + 6.0f; this->unk_2BC.z = (Math_CosS(this->actor.shape.rot.y - 0x0E00) * 86.0f) + this->actor.world.pos.z; @@ -536,7 +536,7 @@ void func_8089B4A4(EnDinofos* this) { this->unk_2BC.x = (Math_SinS(this->actor.shape.rot.y + 0x200) * 123.0f) + this->actor.world.pos.x; this->unk_2BC.y = this->actor.floorHeight + 11.0f; this->unk_2BC.z = (Math_CosS(this->actor.shape.rot.y + 0x200) * 123.0f) + this->actor.world.pos.z; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BOMCHU_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_BOMCHU_WALK); this->unk_290 = 0; this->unk_292 = -1; this->actionFunc = func_8089B580; @@ -578,7 +578,7 @@ void func_8089B6E8(EnDinofos* this) { void func_8089B72C(EnDinofos* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, 2.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_ATTACK); } if (SkelAnime_Update(&this->skelAnime)) { @@ -666,7 +666,7 @@ void func_8089B98C(EnDinofos* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 6.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_WALK); } } } @@ -787,7 +787,7 @@ void func_8089BD28(EnDinofos* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 5.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_WALK); } } } @@ -836,7 +836,7 @@ void func_8089C164(EnDinofos* this) { } this->actor.bgCheckFlags &= ~1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_JUMP); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_JUMP); this->actionFunc = func_8089C1F8; } @@ -851,7 +851,7 @@ void func_8089C244(EnDinofos* this) { this->actor.bgCheckFlags &= ~1; this->actor.speedXZ = 8.0f; this->actor.velocity.y = 16.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_JUMP); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_JUMP); this->unk_290 = 0; this->unk_292 = -1; this->actionFunc = func_8089C2A8; @@ -888,7 +888,7 @@ void func_8089C398(EnDinofos* this) { this->actor.speedXZ = 0.0f; func_8089AD70(this); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BOMCHU_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_BOMCHU_WALK); this->actionFunc = func_8089C44C; } @@ -906,7 +906,7 @@ void func_8089C44C(EnDinofos* this, PlayState* play) { void func_8089C4F8(EnDinofos* this) { Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_0025B4); this->colliderQuad.base.atFlags &= ~AT_BOUNCED; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_CRY); this->unk_290 = 0; this->unk_292 = -1; this->actor.speedXZ = 0.0f; @@ -928,7 +928,7 @@ void func_8089C56C(EnDinofos* this, PlayState* play) { } else if (Animation_OnFrame(&this->skelAnime, 13.0f)) { this->colliderQuad.base.atFlags &= ~AT_ON; } else if (Animation_OnFrame(&this->skelAnime, 11.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_ATTACK); } else if (this->skelAnime.curFrame < 7.0f) { func_8089AE00(this, play); } @@ -994,7 +994,7 @@ void func_8089C87C(EnDinofos* this, s32 arg1) { this->actor.velocity.y = 0.0f; } this->unk_28E = 0; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_DAMAGE); this->colliderJntSph.base.acFlags &= ~AC_ON; Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 18); this->actionFunc = func_8089C938; @@ -1129,7 +1129,7 @@ void func_8089CF70(EnDinofos* this, PlayState* play) { void func_8089CFAC(EnDinofos* this) { Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_00ABD0); this->actor.flags &= ~ACTOR_FLAG_1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_DEAD); this->actor.speedXZ = 0.0f; this->actor.world.rot.y = this->actor.shape.rot.y; this->actionFunc = func_8089D018; @@ -1157,7 +1157,7 @@ void func_8089D018(EnDinofos* this, PlayState* play) { this->actor.shape.shadowAlpha = this->unk_288; } else if (Animation_OnFrame(&this->skelAnime, 26.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GERUDOFT_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_GERUDOFT_DOWN); } } @@ -1191,7 +1191,7 @@ void func_8089D1E0(EnDinofos* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 5.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_WALK); } } @@ -1304,7 +1304,7 @@ s32 func_8089D60C(EnDinofos* this, PlayState* play) { if (this->actor.colChkInfo.damageEffect == 1) { this->unk_290 = 40; Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); func_8089C784(this); return true; } @@ -1315,7 +1315,7 @@ s32 func_8089D60C(EnDinofos* this, PlayState* play) { this->drawDmgEffScale = 0.55f; this->drawDmgEffAlpha = 2.0f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_MEDIUM; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); func_8089C784(this); return true; } diff --git a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c index ee035f06b1..fd60eca757 100644 --- a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c +++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c @@ -433,11 +433,11 @@ void func_80A52074(EnDnk* this, PlayState* play) { break; case 438: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKNUTS_DANCE_BIG); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKNUTS_DANCE_BIG); break; case 493: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_APPEAR); break; } diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.c b/src/overlays/actors/ovl_En_Dno/z_en_dno.c index 15a34821ad..c7f3ee2dc4 100644 --- a/src/overlays/actors/ovl_En_Dno/z_en_dno.c +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.c @@ -637,7 +637,7 @@ void func_80A725F8(EnDno* this, PlayState* play) { if (this->skelAnime.curFrame <= 23.0f) { this->unk_452 = 3; if (Animation_OnFrame(&this->skelAnime, 23.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_OPEN_AMBRELLA); + Actor_PlaySfx(&this->actor, NA_SE_EV_OPEN_AMBRELLA); } } else if (this->skelAnime.curFrame <= 24.0f) { this->unk_452 = 4; @@ -903,7 +903,7 @@ void func_80A732C8(EnDno* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 4.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CLOSE_AMBRELLA); + Actor_PlaySfx(&this->actor, NA_SE_EV_CLOSE_AMBRELLA); this->unk_452 = 4; } else if (Animation_OnFrame(&this->skelAnime, 5.0f)) { this->unk_452 = 3; diff --git a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c index b504e9a115..f067c3988c 100644 --- a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c +++ b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c @@ -133,37 +133,37 @@ s32 func_80B3CA20(EnDnp* this) { if ((this->animIndex == EN_DNP_ANIM_CUTSCENE_HURRY) || (this->animIndex == EN_DNP_ANIM_RUN)) { if (Animation_OnFrame(&this->skelAnime, 1.0f) || Animation_OnFrame(&this->skelAnime, 5.0f) || Animation_OnFrame(&this->skelAnime, 9.0f) || Animation_OnFrame(&this->skelAnime, 13.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKUHIME_TURN); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKUHIME_TURN); } } else if ((this->animIndex == EN_DNP_ANIM_GLARE_START) || (this->animIndex == EN_DNP_ANIM_TURN_AROUND)) { if (Animation_OnFrame(&this->skelAnime, 1.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKUHIME_TURN); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKUHIME_TURN); } } else if (this->animIndex == EN_DNP_ANIM_GREETING) { if (Animation_OnFrame(&this->skelAnime, 7.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKUHIME_GREET); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKUHIME_GREET); } if (Animation_OnFrame(&this->skelAnime, 22.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKUHIME_GREET2); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKUHIME_GREET2); } } else if (this->animIndex == EN_DNP_ANIM_BOW) { if (Animation_OnFrame(&this->skelAnime, 9.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKUHIME_GREET); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKUHIME_GREET); } if (Animation_OnFrame(&this->skelAnime, 18.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKUHIME_GREET2); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKUHIME_GREET2); } } else if ((this->animIndex == EN_DNP_ANIM_UNUSED_WALK) && (this->animIndex == EN_DNP_ANIM_WALK)) { if (Animation_OnFrame(&this->skelAnime, 7.0f) || Animation_OnFrame(&this->skelAnime, 15.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKUHIME_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKUHIME_WALK); } } else if (this->animIndex == EN_DNP_ANIM_JUMP) { if (Animation_OnFrame(&this->skelAnime, 17.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKUHIME_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKUHIME_WALK); } } else if (this->animIndex == EN_DNP_ANIM_BOUNCE_LOOP) { if (Animation_OnFrame(&this->skelAnime, 3.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKUHIME_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKUHIME_WALK); } } @@ -311,7 +311,7 @@ void func_80B3D11C(EnDnp* this, PlayState* play) { } if (this->animIndex == EN_DNP_ANIM_ANGRY_START) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_DHVO04); + Actor_PlaySfx(&this->actor, NA_SE_VO_DHVO04); } if (this->animIndex == EN_DNP_ANIM_GLARE_START) { diff --git a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c index 4b1087311c..131a27d74a 100644 --- a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c +++ b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c @@ -403,7 +403,7 @@ void func_80A53038(EnDnq* this, PlayState* play) { } if ((this->unk_398 == 4) && Animation_OnFrame(&this->skelAnime, 2.0f)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_KINGNUTS_DAMAGE); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_KINGNUTS_DAMAGE); } if (((this->unk_398 == 3) || (this->unk_398 == 6)) && diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index a8a94d9a4e..7210e4cc6c 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -92,7 +92,7 @@ void func_8092C5C0(EnDns* this) { if (((this->animIndex == EN_DNS_ANIM_WALK_1) || (this->animIndex == EN_DNS_ANIM_WALK_2) || (this->animIndex == EN_DNS_ANIM_RUN_START) || (this->animIndex == EN_DNS_ANIM_RUN_LOOP)) && (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 3.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_WALK); } } @@ -315,7 +315,7 @@ s32 func_8092CE38(EnDns* this) { this->unk_2C6 &= ~0x200; this->skelAnime.curFrame = 0.0f; if (this->unk_2D2 == 2) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_JUMP); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_JUMP); } this->unk_2D2++; if (this->unk_2D2 >= 3) { @@ -328,7 +328,7 @@ s32 func_8092CE38(EnDns* this) { this->actor.world.rot.y = BINANG_ROT180(this->actor.world.rot.y); this->unk_2E4 = 0.0f; this->actor.shape.rot.y = this->actor.world.rot.y; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_JUMP); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_JUMP); } else if (this->skelAnime.curFrame < 13.0f) { frame = this->skelAnime.curFrame; this->actor.shape.rot.y = this->actor.world.rot.y; @@ -339,7 +339,7 @@ s32 func_8092CE38(EnDns* this) { } else { if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 6.0f) || Animation_OnFrame(&this->skelAnime, 13.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_WALK); } if (this->skelAnime.curFrame > 7.0f) { diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index e883a6f507..81044f5da5 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -568,13 +568,13 @@ void func_80877500(EnDodongo* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if (Animation_OnFrame(&this->skelAnime, 19.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DODO_J_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_J_WALK); sp30.x = this->collider1Elements[2].dim.worldSphere.center.x; sp30.y = this->collider1Elements[2].dim.worldSphere.center.y; sp30.z = this->collider1Elements[2].dim.worldSphere.center.z; func_80876930(this, play, &sp30); } else if (Animation_OnFrame(&this->skelAnime, 39.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DODO_J_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_J_WALK); sp30.x = this->collider1Elements[1].dim.worldSphere.center.x; sp30.y = this->collider1Elements[1].dim.worldSphere.center.y; sp30.z = this->collider1Elements[1].dim.worldSphere.center.z; @@ -641,7 +641,7 @@ void func_8087784C(EnDodongo* this, PlayState* play) { f32 temp_f12; if (Animation_OnFrame(&this->skelAnime, 24.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DODO_J_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_J_CRY); } if (func_8087721C(this)) { @@ -728,7 +728,7 @@ void func_80877E60(EnDodongo* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 28.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DODO_J_EAT); + Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_J_EAT); if (this->actor.child != NULL) { Actor_Kill(this->actor.child); this->actor.child = NULL; @@ -751,7 +751,7 @@ void func_80877E60(EnDodongo* this, PlayState* play) { this->unk_334 * 10.0f, 10); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_BOMB_EXPLOSION); + Actor_PlaySfx(&this->actor, NA_SE_IT_BOMB_EXPLOSION); if (this->actor.colChkInfo.health <= 4) { this->actor.colChkInfo.health = 0; Enemy_StartFinishingBlow(play, &this->actor); @@ -810,7 +810,7 @@ void func_80878354(EnDodongo* this) { sp18 = &object_dodongo_Anim_003B14; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DODO_J_TAIL); + Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_J_TAIL); Animation_PlayOnceSetSpeed(&this->skelAnime, sp18, 2.0f); this->timer = 0; this->collider1.base.atFlags |= AT_ON; @@ -871,7 +871,7 @@ void func_808785B0(EnDodongo* this, PlayState* play) { void func_8087864C(EnDodongo* this) { Animation_MorphToPlayOnce(&this->skelAnime, &object_dodongo_Anim_001A44, -4.0f); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DODO_J_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_J_DAMAGE); this->timer = 0; this->unk_304 = 0; this->actor.speedXZ = 0.0f; @@ -893,7 +893,7 @@ void func_80878724(EnDodongo* this) { Animation_MorphToPlayOnce(&this->skelAnime, &object_dodongo_Anim_0013C4, -8.0f); this->timer = 0; this->unk_304 = 0; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DODO_J_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_J_DEAD); this->actor.flags &= ~ACTOR_FLAG_1; this->actor.speedXZ = 0.0f; Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, 8); @@ -921,7 +921,7 @@ void func_808787B0(EnDodongo* this, PlayState* play) { this->timer = 8; } } else if (Animation_OnFrame(&this->skelAnime, 52.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GERUDOFT_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_GERUDOFT_DOWN); } if (this->timer != 0) { @@ -995,12 +995,12 @@ void EnDodongo_UpdateDamage(EnDodongo* this, PlayState* play) { } else if (this->actor.colChkInfo.damageEffect == 1) { this->timer = 40; Actor_SetColorFilter(&this->actor, 0, 0xFF, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); func_80878594(this); } else if (this->actor.colChkInfo.damageEffect == 5) { this->timer = 40; Actor_SetColorFilter(&this->actor, 0, 0xFF, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->drawDmgEffType = ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_SMALL; this->drawDmgEffScale = 0.75f; this->drawDmgEffAlpha = 2.0f; @@ -1026,7 +1026,7 @@ void EnDodongo_Update(Actor* thisx, PlayState* play2) { Actor_MoveWithGravity(&this->actor); Actor_UpdateBgCheckInfo(play, &this->actor, 75.0f, 60.0f, 70.0f, 0x1D); if (this->actor.bgCheckFlags & 2) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GERUDOFT_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_GERUDOFT_DOWN); } CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider1.base); diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index 0df2b693eb..bb0b1d37ff 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -484,11 +484,11 @@ void func_80866B20(EnDoor* this, PlayState* play) { if (this->unk_1A6 != 0) { gSaveContext.save.inventory.dungeonKeys[gSaveContext.mapIndex]--; Flags_SetSwitch(play, this->switchFlag); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_CHAIN_KEY_UNLOCK); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_CHAIN_KEY_UNLOCK); } } else if (this->unk_1A7 != 0) { this->actionFunc = func_80866F94; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_DOOR_OPEN); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_DOOR_OPEN); } else if (!Player_InCsMode(play)) { Actor_OffsetOfPointInActorCoords(&this->dyna.actor, &playerPosRelToDoor, &player->actor.world.pos); if (D_80867BC0 || ((fabsf(playerPosRelToDoor.y) < 20.0f) && (fabsf(playerPosRelToDoor.x) < 20.0f) && @@ -545,7 +545,7 @@ void func_80866B20(EnDoor* this, PlayState* play) { func_80122F28(player); } } else if ((this->unk_1A4 == 4) && (this->dyna.actor.xzDistToPlayer > 240.0f)) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_DOOR_OPEN); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_DOOR_OPEN); this->actionFunc = func_80867080; } } @@ -566,7 +566,7 @@ void func_80866F94(EnDoor* this, PlayState* play) { } else { if (Math_ScaledStepToS(&this->dyna.actor.world.rot.y, 0, 0x7D0)) { this->actionFunc = func_80866B20; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_AUTO_DOOR_CLOSE); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_AUTO_DOOR_CLOSE); } } } @@ -587,7 +587,7 @@ void func_80867080(EnDoor* this, PlayState* play) { void func_808670F0(EnDoor* this, PlayState* play) { if (Math_ScaledStepToS(&this->dyna.actor.world.rot.y, 0, 0x700)) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_DOOR_CLOSE); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_DOOR_CLOSE); this->actionFunc = func_80866B20; } } @@ -601,7 +601,7 @@ void func_80867144(EnDoor* this, PlayState* play) { this->actionFunc = func_80866B20; this->unk_1A1 = 0; } else if (Animation_OnFrame(&this->skelAnime, sAnimOpenFrames[this->animIndex])) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_OC_DOOR_OPEN); + Actor_PlaySfx(&this->dyna.actor, NA_SE_OC_DOOR_OPEN); if (this->skelAnime.playSpeed < 1.5f) { numEffects = (s32)(Rand_ZeroOne() * 30.0f) + 50; for (i = 0; i < numEffects; i++) { @@ -609,7 +609,7 @@ void func_80867144(EnDoor* this, PlayState* play) { } } } else if (Animation_OnFrame(&this->skelAnime, sAnimCloseFrames[this->animIndex])) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_DOOR_CLOSE); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_DOOR_CLOSE); } } } diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c index 83b93cf529..4ff68de3e7 100644 --- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c +++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c @@ -362,7 +362,7 @@ void EnDragon_RetreatOrIdle(EnDragon* this, PlayState* play) { void EnDragon_SetupExtend(EnDragon* this) { this->state = 0; this->behindJawRetreatTimer = this->state; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_UTSUBO_APPEAR_TRG); + Actor_PlaySfx(&this->actor, NA_SE_EN_UTSUBO_APPEAR_TRG); this->retreatTimer = 250; this->actionFunc = EnDragon_Extend; } @@ -375,17 +375,17 @@ void EnDragon_Extend(EnDragon* this, PlayState* play) { EnDragon_SpawnBubbles(this, play, this->jawPos); if (this->action >= DEEP_PYTHON_ACTION_DAMAGE) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_UTSUBO_BACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_UTSUBO_BACK); EnDragon_SetupRetreatOrIdle(this); } else if (this->retreatTimer == 0) { this->action = DEEP_PYTHON_ACTION_RETREAT; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_UTSUBO_BACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_UTSUBO_BACK); EnDragon_SetupRetreatOrIdle(this); } else if (this->state == DEEP_PYTHON_EXTEND_STATE_NOT_FULLY_EXTENDED) { Vec3f extendedPos; Math_Vec3f_Copy(&extendedPos, &this->burrowEntrancePos); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_UTSUBO_APPEAR - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_UTSUBO_APPEAR - SFX_FLAG); extendedPos.x += Math_SinS(this->actor.world.rot.y) * -530.0f; extendedPos.z += Math_CosS(this->actor.world.rot.y) * -530.0f; this->actor.speedXZ = 40.0f; @@ -439,7 +439,7 @@ void EnDragon_Extend(EnDragon* this, PlayState* play) { this->behindJawRetreatTimer++; if (this->behindJawRetreatTimer > 60) { this->action = DEEP_PYTHON_ACTION_RETREAT; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_UTSUBO_BACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_UTSUBO_BACK); EnDragon_SetupRetreatOrIdle(this); } } @@ -543,7 +543,7 @@ void EnDragon_Grab(EnDragon* this, PlayState* play) { player->actor.parent = &this->actor; player->unk_AE8 = 50; this->action = DEEP_PYTHON_ACTION_GRAB; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_UTSUBO_EAT); + Actor_PlaySfx(&this->actor, NA_SE_EN_UTSUBO_EAT); EnDragon_SetupAttack(this); } } @@ -572,8 +572,8 @@ void EnDragon_Attack(EnDragon* this, PlayState* play) { //! @bug: This function should only pass Player*: it uses *(this + 0x153), which is meant to be //! player->currentMask, but in this case is garbage in the skelAnime - func_800B8E58((Player*)this, player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_DAMAGE_S); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_UTSUBO_BITE); + Player_PlaySfx((Player*)&this->actor, player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_DAMAGE_S); + Actor_PlaySfx(&this->actor, NA_SE_EN_UTSUBO_BITE); CollisionCheck_GreenBlood(play, NULL, &player->actor.world.pos); } @@ -603,7 +603,7 @@ void EnDragon_Attack(EnDragon* this, PlayState* play) { Math_ApproachF(&this->actor.world.pos.z, pos.z, 0.3f, 200.0f); if ((this->state <= DEEP_PYTHON_ATTACK_STATE_START) && (this->endFrame <= currentFrame)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_UTSUBO_BITE); + Actor_PlaySfx(&this->actor, NA_SE_EN_UTSUBO_BITE); if (this->animIndex != DEEP_PYTHON_ANIM_LARGE_SIDE_SWAY) { EnDragon_ChangeAnim(this, DEEP_PYTHON_ANIM_LARGE_SIDE_SWAY); } @@ -737,11 +737,11 @@ void EnDragon_UpdateDamage(EnDragon* this, PlayState* play) { Actor_ApplyDamage(&this->actor); Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 25); if (this->actor.colChkInfo.health > 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_UTSUBO_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_UTSUBO_DAMAGE); this->action = DEEP_PYTHON_ACTION_DAMAGE; } else { Enemy_StartFinishingBlow(play, &this->actor); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_UTSUBO_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_UTSUBO_DEAD); this->actor.flags |= ACTOR_FLAG_8000000; this->actor.flags &= ~ACTOR_FLAG_1; this->actor.flags |= ACTOR_FLAG_100000; diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index dfd97196a9..b25e4eb474 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -80,7 +80,7 @@ void EnDyExtra_Update(Actor* thisx, PlayState* play) { EnDyExtra* this = THIS; DECR(this->unk14C); - Actor_PlaySfxAtPos(&this->actor, NA_SE_PL_SPIRAL_HEAL_BEAM - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_PL_SPIRAL_HEAL_BEAM - SFX_FLAG); this->actionFunc(this, play); Actor_MoveWithGravity(&this->actor); } diff --git a/src/overlays/actors/ovl_En_Egol/z_en_egol.c b/src/overlays/actors/ovl_En_Egol/z_en_egol.c index f115ada7c4..816be30338 100644 --- a/src/overlays/actors/ovl_En_Egol/z_en_egol.c +++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.c @@ -331,7 +331,7 @@ void EnEgol_FootstepEffects(EnEgol* this, PlayState* play, f32 leftFootFrame, f3 s32 quakeSize; s32 pad; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_WALK); quakeSize = 4 - (s32)(fabsf(player->actor.world.pos.y - this->actor.world.pos.y) * 0.02f); if (quakeSize > 4) { quakeSize = 4; @@ -384,7 +384,7 @@ void EnEgol_DestroyBlocks(EnEgol* this, PlayState* play, Vec3f pos1, Vec3f pos2) dist2 = sqrtf(SQ(blockTo2.y)); if ((dist1 < 40.0f) || (dist2 < 40.0f)) { prop->colChkInfo.health = 0; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WALL_BROKEN); + Actor_PlaySfx(&this->actor, NA_SE_EV_WALL_BROKEN); break; } } @@ -495,7 +495,7 @@ void EnEgol_SetupStand(EnEgol* this) { EnEgol_ChangeAnim(this, EYEGORE_ANIM_STAND); this->actor.flags &= ~ACTOR_FLAG_8000000; this->action = EYEGORE_ACTION_STAND; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_STAND); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_STAND); this->actionFunc = EnEgol_Stand; } @@ -741,7 +741,7 @@ void EnEgol_Laser(EnEgol* this, PlayState* play) { this->laserCount++; } } else if (this->laserState >= EYEGORE_LASER_FIRE) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_BEAM - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_BEAM - SFX_FLAG); if (this->laserState != EYEGORE_LASER_OFF) { EnEgol_DestroyBlocks(this, play, this->laserCollider.dim.quad[0], this->laserCollider.dim.quad[1]); } @@ -782,7 +782,7 @@ void EnEgol_Laser(EnEgol* this, PlayState* play) { if (player->stateFlags3 != PLAYER_STATE3_1000000) { func_800BC848(&this->actor, play, quakeSize, 2); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_EXPLOSION); + Actor_PlaySfx(&this->actor, NA_SE_EV_EXPLOSION); func_800B31BC(play, &hitPos, 40, -2, 255, 20); func_800BBFB0(play, &hitPos, 6.0f, 2, 120, 20, true); @@ -855,7 +855,7 @@ void EnEgol_Stop(EnEgol* this, PlayState* play) { this->isRetreating ^= true; if (!this->isRetreating) { EnEgol_ChangeAnim(this, EYEGORE_ANIM_SIT); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_SIT); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_SIT); this->laserCount = 0; this->actionFunc = EnEgol_Wait; } else { @@ -882,7 +882,7 @@ void EnEgol_Slam(EnEgol* this, PlayState* play) { f32 dyToPlayer = fabsf(player->actor.world.pos.y - this->actor.world.pos.y); s32 quakeSize; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_EXPLOSION); + Actor_PlaySfx(&this->actor, NA_SE_EV_EXPLOSION); quakeSize = 4 - (s32)(dyToPlayer * 0.02f); if (quakeSize > 4) { quakeSize = 4; @@ -1033,7 +1033,7 @@ void EnEgol_Damaged(EnEgol* this, PlayState* play) { EnEgol_SetupWalk(this); } else { Enemy_StartFinishingBlow(play, &this->actor); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_DEAD); this->actor.flags |= ACTOR_FLAG_8000000; this->actor.flags &= ~ACTOR_FLAG_1; this->actor.flags |= ACTOR_FLAG_100000; @@ -1079,7 +1079,7 @@ void EnEgol_Death(EnEgol* this, PlayState* play) { Actor_Kill(&this->actor); } else { if (Animation_OnFrame(&this->skelAnime, 46.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_EXPLOSION); + Actor_PlaySfx(&this->actor, NA_SE_EV_EXPLOSION); func_800BC848(&this->actor, play, 10, 5); } if ((curFrame >= this->animEndFrame) && (this->action != EYEGORE_ACTION_DEAD)) { @@ -1088,7 +1088,7 @@ void EnEgol_Death(EnEgol* this, PlayState* play) { Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, CLEAR_TAG_SMALL_EXPLOSION); this->waitTimer = 30; - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_BOMB_EXPLOSION); + Actor_PlaySfx(&this->actor, NA_SE_IT_BOMB_EXPLOSION); this->action = EYEGORE_ACTION_DEAD; for (i = 0; i < 20; i++) { EnEgol_SpawnEffect(this, &this->actor.world.pos, &gZeroVec3s, 10.0f + Rand_ZeroFloat(20.0f), @@ -1146,7 +1146,7 @@ void EnEgol_CollisionCheck(EnEgol* this, PlayState* play) { Math_Vec3f_Copy(&this->laserCollider.dim.quad[0], &this->laserBase); Math_Vec3f_Copy(&this->laserCollider.dim.quad[2], &this->laserBase); Actor_SetColorFilter(&this->actor, 0, 120, false, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); EnEgol_SetupStunned(this); } } @@ -1168,7 +1168,7 @@ void EnEgol_CollisionCheck(EnEgol* this, PlayState* play) { CollisionCheck_BlueBlood(play, NULL, &this->eyePos); CollisionCheck_BlueBlood(play, NULL, &this->eyePos); Actor_SetColorFilter(&this->actor, 0x4000, 255, false, 25); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_DAMAGE); EnEgol_SetupDamaged(this); } else if (reaction == EYEGORE_HIT_IMMUNE) { Vec3f hitPos; @@ -1176,7 +1176,7 @@ void EnEgol_CollisionCheck(EnEgol* this, PlayState* play) { hitPos.x = this->eyeCollider.elements[0].info.bumper.hitPos.x; hitPos.y = this->eyeCollider.elements[0].info.bumper.hitPos.y; hitPos.z = this->eyeCollider.elements[0].info.bumper.hitPos.z; - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_SHIELD_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_IT_SHIELD_BOUND); EffectSsHitmark_SpawnFixedScale(play, EFFECT_HITMARK_METAL, &hitPos); CollisionCheck_SpawnShieldParticlesMetal(play, &hitPos); } diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c index 54d5c3210b..406d3bd9d1 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -768,7 +768,7 @@ void func_8088E0F0(EnElf* this, PlayState* play) { this->unk_258 = Math_Atan2S_XY(this->actor.velocity.z, this->actor.velocity.x); func_8088F5F4(this, play, 32); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); } void func_8088E304(EnElf* this, PlayState* play) { @@ -802,7 +802,7 @@ void func_8088E304(EnElf* this, PlayState* play) { func_8088D7F8(this, &player->bodyPartsPos[PLAYER_BODYPART_WAIST]); this->unk_258 = Math_Atan2S_XY(this->actor.velocity.z, this->actor.velocity.x); func_8088F5F4(this, play, 0x20); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); } void func_8088E484(EnElf* this, PlayState* play) { @@ -827,7 +827,7 @@ void func_8088E484(EnElf* this, PlayState* play) { Actor_SetScale(&this->actor, (1.0f - (SQ(this->unk_250) * SQ(1.0f / 9.0f))) * 0.008f); this->unk_258 = Math_Atan2S_XY(this->actor.velocity.z, this->actor.velocity.x); func_8088F5F4(this, play, 32); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); } void func_8088E5A8(EnElf* this, PlayState* play) { @@ -906,12 +906,12 @@ void func_8088E850(EnElf* this, PlayState* play) { if ((play->sceneId == SCENE_CLOCKTOWER) && (gSaveContext.sceneLayer == 0) && (play->csCtx.currentCsIndex == 0) && ((play->csCtx.frames == 149) || (play->csCtx.frames == 381) || (play->csCtx.frames == 591))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); } if ((play->sceneId == SCENE_SECOM) && (gSaveContext.sceneLayer == 0) && (play->csCtx.currentCsIndex == 4) && (play->csCtx.frames == 95)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_WHITE_FAIRY_DASH); } } else { this->actor.shape.rot.x = 0; @@ -994,7 +994,7 @@ void func_8088E850(EnElf* this, PlayState* play) { if (distFromLinksHead > 100.0f) { this->fairyFlags |= 2; if (this->unk_269 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BELL_DASH_NORMAL); + Actor_PlaySfx(&this->actor, NA_SE_EV_BELL_DASH_NORMAL); } this->unk_25C = 100; } @@ -1064,7 +1064,7 @@ void func_8088EFA4(EnElf* this, PlayState* play) { this->unk_268 = 0; this->unk_238 = 1.0f; if (!this->unk_269) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BELL_DASH_NORMAL); + Actor_PlaySfx(&this->actor, NA_SE_EV_BELL_DASH_NORMAL); } } else if (this->unk_268 == 0) { if ((arrayPointerActor == NULL) || @@ -1093,7 +1093,7 @@ void func_8088EFA4(EnElf* this, PlayState* play) { u16 targetSfxId = this->unk_269 == 0 ? NA_SE_PL_WALK_GROUND - SFX_FLAG : NA_SE_PL_WALK_GROUND - SFX_FLAG; if (!temp) { - Actor_PlaySfxAtPos(&this->actor, targetSfxId); + Actor_PlaySfx(&this->actor, targetSfxId); } this->fairyFlags |= 1; } @@ -1149,7 +1149,7 @@ void func_8088F214(EnElf* this, PlayState* play) { sp34 = 0; } else if (!(player->stateFlags1 & PLAYER_STATE1_40)) { if (this->unk_269 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_NAVY_VANISH); + Actor_PlaySfx(&this->actor, NA_SE_EV_NAVY_VANISH); } sp34 = 5; } else { @@ -1198,7 +1198,7 @@ void func_8088F214(EnElf* this, PlayState* play) { if (!(player->stateFlags2 & PLAYER_STATE2_100000)) { sp34 = 5; if (this->unk_269 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_NAVY_VANISH); + Actor_PlaySfx(&this->actor, NA_SE_EV_NAVY_VANISH); } } break; @@ -1208,7 +1208,7 @@ void func_8088F214(EnElf* this, PlayState* play) { sp34 = 9; this->unk_25C = 0x2A; if (this->unk_269 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BELL_DASH_NORMAL); + Actor_PlaySfx(&this->actor, NA_SE_EV_BELL_DASH_NORMAL); } } else if (player->stateFlags1 & PLAYER_STATE1_40) { player->stateFlags2 |= PLAYER_STATE2_100000; diff --git a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c index 169d56fddc..2189bba99d 100644 --- a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c +++ b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c @@ -486,7 +486,7 @@ void func_80A3A610(EnElfgrp* this, PlayState* play) { if (this->unk_144 > 0) { player->actor.freezeTimer = 100; player->stateFlags1 |= PLAYER_STATE1_20000000; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FAIRY_GROUP_HEAL - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EV_FAIRY_GROUP_HEAL - SFX_FLAG); } else { player->actor.freezeTimer = 0; player->stateFlags1 &= ~PLAYER_STATE1_20000000; @@ -579,7 +579,7 @@ void EnElfgrp_Update(Actor* thisx, PlayState* play) { this->actionFunc(this, play); if (this->unk_14A & 8) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FAIRY_GROUP_FRY - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EV_FAIRY_GROUP_FRY - SFX_FLAG); } if (this->unk_144 != 0) { diff --git a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c index 803a66ac4f..366f86f6c0 100644 --- a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c +++ b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c @@ -539,7 +539,7 @@ void EnElforg_TrappedByEnemy(EnElforg* this, PlayState* play) { EnElforg_InitializeParams(this); this->actionFunc = EnElforg_FreeFloating; this->actor.draw = EnElforg_Draw; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHIBI_FAIRY_SAVED); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHIBI_FAIRY_SAVED); } else { // The enemy is still alive, so have the Stray Fairy // track the enemy in case it's moving around. @@ -573,7 +573,7 @@ void EnElforg_HiddenByCollider(EnElforg* this, PlayState* play) { this->actor.draw = EnElforg_Draw; this->actor.world.pos.y += 40.0f; this->actor.home.pos.y += 40.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHIBI_FAIRY_SAVED); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHIBI_FAIRY_SAVED); } else { CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base); } diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index 656ec7936f..c93c8e005c 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -171,7 +171,7 @@ void EnEncount2_Popped(EnEncount2* this, PlayState* play) { EnEncount2_InitEffects(this, &curPos, 10); } - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_MUJURA_BALLOON_BROKEN); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_MUJURA_BALLOON_BROKEN); this->deathTimer = 30; this->actionFunc = EnEncount2_Die; } diff --git a/src/overlays/actors/ovl_En_Estone/z_en_estone.c b/src/overlays/actors/ovl_En_Estone/z_en_estone.c index c55ab52720..2338e1c0c0 100644 --- a/src/overlays/actors/ovl_En_Estone/z_en_estone.c +++ b/src/overlays/actors/ovl_En_Estone/z_en_estone.c @@ -143,7 +143,7 @@ void EnEstone_Active(EnEstone* this, PlayState* play) { this->actor.shape.shadowScale = 0.0f; this->inactive = true; this->timer = 50; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WALL_BROKEN); + Actor_PlaySfx(&this->actor, NA_SE_EV_WALL_BROKEN); this->actionFunc = EnEstone_Inactive; } else { //! FAKE: https://decomp.me/scratch/YiPVN diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.c b/src/overlays/actors/ovl_En_Fall/z_en_fall.c index f64001b84a..93c9ebb414 100644 --- a/src/overlays/actors/ovl_En_Fall/z_en_fall.c +++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.c @@ -380,7 +380,7 @@ void EnFall_StoppedOpenMouthMoon_PerformCutsceneActions(EnFall* this, PlayState* switch (play->csCtx.actorActions[Cutscene_GetActorActionIndex(play, 133)]->action) { case 3: if (this->eyeGlowIntensity == 0.0f) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_MOON_EYE_FLASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_MOON_EYE_FLASH); } this->eyeGlowIntensity += 1 / 30.0f; if (this->eyeGlowIntensity > 1.0f) { @@ -413,15 +413,15 @@ void EnFall_StoppedClosedMouthMoon_PerformCutsceneActions(EnFall* this, PlayStat case 0: switch (play->csCtx.frames) { case 1060: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_MOON_SCREAM1); + Actor_PlaySfx(&this->actor, NA_SE_EN_MOON_SCREAM1); break; case 1089: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_MOON_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EV_MOON_CRY); break; case 1303: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SLIP_MOON); + Actor_PlaySfx(&this->actor, NA_SE_EV_SLIP_MOON); break; } if (play->csCtx.frames >= 1145) { @@ -432,15 +432,15 @@ void EnFall_StoppedClosedMouthMoon_PerformCutsceneActions(EnFall* this, PlayStat case 1: switch (play->csCtx.frames) { case 561: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_MOON_SCREAM1); + Actor_PlaySfx(&this->actor, NA_SE_EN_MOON_SCREAM1); break; case 590: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_MOON_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EV_MOON_CRY); break; case 737: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SLIP_MOON); + Actor_PlaySfx(&this->actor, NA_SE_EV_SLIP_MOON); break; } if (play->csCtx.frames >= 650) { @@ -517,7 +517,7 @@ void EnFall_MoonsTear_Fall(EnFall* this, PlayState* play) { if (this->actor.draw != NULL) { if (Math_Vec3f_StepTo(&this->actor.world.pos, &this->actor.home.pos, this->actor.speedXZ) <= 0.0f) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_GORON_BOUND_1); + Actor_PlaySfx(&this->actor, NA_SE_EV_GORON_BOUND_1); SET_WEEKEVENTREG(WEEKEVENTREG_74_80); SET_WEEKEVENTREG(WEEKEVENTREG_74_20); Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_TEST, this->actor.world.pos.x, @@ -702,7 +702,7 @@ void EnFall_FireRing_Update(Actor* thisx, PlayState* play) { if (Cutscene_CheckActorAction(play, 450) && play->csCtx.actorActions[Cutscene_GetActorActionIndex(play, 450)]->action == 5) { if (!(this->flags & FLAG_FIRE_RING_APPEARS)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_DM_RING_EXPLOSION); + Actor_PlaySfx(&this->actor, NA_SE_IT_DM_RING_EXPLOSION); } this->flags |= FLAG_FIRE_RING_APPEARS; } diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.c b/src/overlays/actors/ovl_En_Famos/z_en_famos.c index fd45368985..dd6ba07cb1 100644 --- a/src/overlays/actors/ovl_En_Famos/z_en_famos.c +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c @@ -308,12 +308,12 @@ void EnFamos_UpdateFlipStatus(EnFamos* this) { if (this->hasFinishedRotating == true) { if (this->animatedMaterialIndex != FAMOS_ANIMATED_MAT_NORMAL) { this->animatedMaterialIndex = FAMOS_ANIMATED_MAT_NORMAL; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FAMOS_REVERSE2); + Actor_PlaySfx(&this->actor, NA_SE_EN_FAMOS_REVERSE2); } else { this->animatedMaterialIndex = FAMOS_ANIMATED_MAT_FLIPPED; this->flippedTimer = 100; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FAMOS_REVERSE1); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_FAMOS_REVERSE1); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_DAMAGE); } this->hasFinishedRotating = false; } @@ -322,7 +322,7 @@ void EnFamos_UpdateFlipStatus(EnFamos* this) { this->flippedTimer--; if (this->flippedTimer == 0) { if (this->animatedMaterialIndex != FAMOS_ANIMATED_MAT_NORMAL) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FAMOS_REVERSE2); + Actor_PlaySfx(&this->actor, NA_SE_EN_FAMOS_REVERSE2); } this->animatedMaterialIndex = FAMOS_ANIMATED_MAT_NORMAL; @@ -515,7 +515,7 @@ void EnFamos_Chase(EnFamos* this, PlayState* play) { void EnFamos_SetupAttackAim(EnFamos* this) { Animation_PlayOnce(&this->skelAnime, &gFamosShakeAnim); this->actor.speedXZ = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AMOS_VOICE); + Actor_PlaySfx(&this->actor, NA_SE_EN_AMOS_VOICE); this->actionFunc = EnFamos_AttackAim; } @@ -586,7 +586,7 @@ void EnFamos_SetupFinishAttack(EnFamos* this) { this->emblemCollider.base.acFlags |= AC_ON; this->stateTimer = 3; this->actor.speedXZ = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_EXPLOSION); + Actor_PlaySfx(&this->actor, NA_SE_EV_EXPLOSION); this->actionFunc = EnFamos_FinishAttack; } @@ -655,7 +655,7 @@ void EnFamos_SetupDeathSlam(EnFamos* this) { Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 20); this->flippedTimer = -1; this->actor.world.pos.y = this->actor.floorHeight - 60.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_DEAD); this->actionFunc = EnFamos_DeathSlam; } diff --git a/src/overlays/actors/ovl_En_Fg/z_en_fg.c b/src/overlays/actors/ovl_En_Fg/z_en_fg.c index 6a4c357d9b..cc06fe2e12 100644 --- a/src/overlays/actors/ovl_En_Fg/z_en_fg.c +++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.c @@ -178,7 +178,7 @@ void EnFg_Idle(EnFg* this, PlayState* play) { switch (EnFg_GetDamageEffect(this)) { case FG_DMGEFFECT_DEKUSTICK: this->actor.flags &= ~ACTOR_FLAG_1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FROG_CRY_1); + Actor_PlaySfx(&this->actor, NA_SE_EV_FROG_CRY_1); this->skelAnime.playSpeed = 0.0f; this->actor.shape.shadowDraw = NULL; this->actor.scale.x *= 1.5f; @@ -204,7 +204,7 @@ void EnFg_Idle(EnFg* this, PlayState* play) { break; case FG_DMGEFFECT_EXPLOSION: this->actor.flags &= ~ACTOR_FLAG_1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FROG_CRY_0); + Actor_PlaySfx(&this->actor, NA_SE_EV_FROG_CRY_0); if (1) {} this->actor.params = FG_BLACK; this->skelAnime.playSpeed = 0.0f; @@ -220,7 +220,7 @@ void EnFg_Idle(EnFg* this, PlayState* play) { break; default: if (DECR(this->timer) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FROG_JUMP); + Actor_PlaySfx(&this->actor, NA_SE_EV_FROG_JUMP); EnFg_ChangeAnim(&this->skelAnime, 3); this->actor.velocity.y = 10.0f; this->timer = Rand_S16Offset(30, 30); @@ -255,7 +255,7 @@ void EnFg_Jump(EnFg* this, PlayState* play) { break; case FG_DMGEFFECT_EXPLOSION: this->actor.flags &= ~ACTOR_FLAG_1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FROG_CRY_0); + Actor_PlaySfx(&this->actor, NA_SE_EV_FROG_CRY_0); EnFg_ChangeAnim(&this->skelAnime, 0); this->actor.params = FG_BLACK; this->skelAnime.playSpeed = 0.0f; diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index 226874c816..4f5de6c914 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -340,7 +340,7 @@ void EnFirefly_SetupFall(EnFirefly* this, PlayState* play) { this->timer = 40; this->actor.velocity.y = 0.0f; Animation_Change(&this->skelAnime, &object_firefly_Anim_00017C, 0.0f, 6.0f, 6.0f, ANIMMODE_ONCE, 0.0f); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FFLY_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_FFLY_DEAD); this->actor.flags |= ACTOR_FLAG_10; if (this->isInvisible) { @@ -554,7 +554,7 @@ void EnFirefly_SetupStunned(EnFirefly* this) { } this->auraType = KEESE_AURA_NONE; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->actionFunc = EnFirefly_Stunned; } @@ -676,7 +676,7 @@ void EnFirefly_Update(Actor* thisx, PlayState* play2) { if (this->collider.base.atFlags & AT_HIT) { this->collider.base.atFlags &= ~AT_HIT; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FFLY_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_FFLY_ATTACK); if (this->currentType != KEESE_NORMAL) { EnFirefly_Extinguish(this); @@ -716,7 +716,7 @@ void EnFirefly_Update(Actor* thisx, PlayState* play2) { this->actor.world.rot.y = this->actor.shape.rot.y; if (Animation_OnFrame(&this->skelAnime, 5.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FFLY_FLY); + Actor_PlaySfx(&this->actor, NA_SE_EN_FFLY_FLY); } } diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index 5f9bbb2daa..d164bf0703 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -511,7 +511,7 @@ void func_8091E880(Actor* thisx, PlayState* play) { this->unk_240 = 400; func_8091E9A4(this); } else if (this->actor.bgCheckFlags & 0x20) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_DIVE_INTO_WATER_L); + Actor_PlaySfx(&this->actor, NA_SE_EV_DIVE_INTO_WATER_L); func_8091D840(thisx, play, 10, 15.0f); if (func_8091DA14(this, play)) { func_8091EF30(this); @@ -554,7 +554,7 @@ void func_8091E9A4(EnFish* this) { this->unk_248 = 5; this->unk_24C = 0.0f; if (sp24 && (this->actor.draw != NULL)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FISH_LEAP); + Actor_PlaySfx(&this->actor, NA_SE_EV_FISH_LEAP); } } diff --git a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c index c7dd18369b..110a596b0b 100644 --- a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c +++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c @@ -530,7 +530,7 @@ void func_80B2951C(EnFish2* this) { Actor_Kill(this->unk_350); this->unk_350 = NULL; D_80B2B2F4 = &this->actor; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DODO_M_EAT); + Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_M_EAT); this->actionFunc = func_80B295A4; } @@ -638,7 +638,7 @@ void func_80B297FC(EnFish2* this, PlayState* play) { } this->unk_2B6 = 4; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FISH_GROW_UP); + Actor_PlaySfx(&this->actor, NA_SE_EV_FISH_GROW_UP); this->unk_2C4++; } break; @@ -889,7 +889,7 @@ void func_80B2A498(EnFish2* this, PlayState* play) { if (temp_v0 != NULL) { temp_v0->speedXZ = 4.0f; temp_v0->velocity.y = 15.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_PIECE_OF_HEART); + Actor_PlaySfx(&this->actor, NA_SE_SY_PIECE_OF_HEART); CLEAR_WEEKEVENTREG(WEEKEVENTREG_81_10); CLEAR_WEEKEVENTREG(WEEKEVENTREG_81_20); CLEAR_WEEKEVENTREG(WEEKEVENTREG_81_40); diff --git a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c index aac1cb6374..79ca3a14b8 100644 --- a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c +++ b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c @@ -2789,7 +2789,7 @@ void func_80903C60(EnFishing* this, u8 arg1) { } } - Actor_PlaySfxAtPos(&this->actor, sfxId); + Actor_PlaySfx(&this->actor, sfxId); } void EnFishing_HandleAquariumDialog(EnFishing* this, PlayState* play) { @@ -3202,7 +3202,7 @@ void EnFishing_UpdateFish(Actor* thisx, PlayState* play2) { EnFishing_SpawnRipple(&this->actor.projectedPos, play->specialEffects, &spB8, 30.0f, 400.0f, 150, 90); - Actor_PlaySfxAtPos(&this->actor, NA_SE_PL_CATCH_BOOMERANG); + Actor_PlaySfx(&this->actor, NA_SE_PL_CATCH_BOOMERANG); break; } } @@ -3478,7 +3478,7 @@ void EnFishing_UpdateFish(Actor* thisx, PlayState* play2) { this->unk_18C = 2000.0f; } else if (sp124 < 10.0f) { if (sLurePos.y > (WATER_SURFACE_Y(play) - 10.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_JUMP_OUT_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EV_JUMP_OUT_WATER); play_sound(NA_SE_PL_CATCH_BOOMERANG); } @@ -4114,7 +4114,7 @@ void EnFishing_UpdateFish(Actor* thisx, PlayState* play2) { this->actor.velocity.x = this->actor.world.pos.x * -0.003f; this->actor.velocity.z = this->actor.world.pos.z * -0.003f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FISH_LEAP); + Actor_PlaySfx(&this->actor, NA_SE_EV_FISH_LEAP); func_809036BC(this, play); if (Rand_ZeroOne() < 0.5f) { diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index 94fc2dfc16..04e9631388 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -224,7 +224,7 @@ void func_808D0930(EnFloormas* this, PlayState* play) { func_808D19D4((EnFloormas*)this->actor.child); func_808D19D4((EnFloormas*)this->actor.parent); func_808D19D4(this); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KUSAMUSHI_HIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_KUSAMUSHI_HIDE); } else { Item_DropCollectibleRandom(play, &this->actor, &this->actor.world.pos, 0x90); func_808D1ED4(this, play); @@ -316,7 +316,7 @@ void func_808D0D70(EnFloormas* this, PlayState* play) { if ((temp_v0 != 0) || Animation_OnFrame(&this->skelAnime, 12.0f) || Animation_OnFrame(&this->skelAnime, 24.0f) || Animation_OnFrame(&this->skelAnime, 36.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FALL_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_WALK); } if ((this->actor.xzDistToPlayer < 320.0f) && Actor_IsFacingPlayer(&this->actor, 0x4000)) { @@ -355,7 +355,7 @@ void func_808D0F80(EnFloormas* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 12.0f) || Animation_OnFrame(&this->skelAnime, 24.0f) || Animation_OnFrame(&this->skelAnime, 36.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FALL_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_WALK); } Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 0x71C); @@ -400,9 +400,9 @@ void func_808D11BC(EnFloormas* this, PlayState* play) { if (((this->skelAnime.playSpeed > 0.0f) && Animation_OnFrame(&this->skelAnime, 21.0f)) || ((this->skelAnime.playSpeed < 0.0f) && Animation_OnFrame(&this->skelAnime, 6.0f))) { if (this->actor.scale.x > 0.009f) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FALL_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_WALK); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FLOORMASTER_SM_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_FLOORMASTER_SM_WALK); } } @@ -423,7 +423,7 @@ void func_808D1380(EnFloormas* this, PlayState* play) { this->actor.gravity = 0.0f; func_808D08D0(this); Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, 15.0f, 6, 20.0f, 300, 100, 1); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FLOORMASTER_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_FLOORMASTER_ATTACK); this->actionFunc = func_808D1458; } @@ -511,9 +511,9 @@ void func_808D17EC(EnFloormas* this, PlayState* play) { if (this->actor.velocity.y < -4.0f) { if (this->actor.scale.x > 0.009f) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FALL_LAND); + Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_LAND); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FLOORMASTER_SM_LAND); + Actor_PlaySfx(&this->actor, NA_SE_EN_FLOORMASTER_SM_LAND); } } } @@ -590,7 +590,7 @@ void func_808D1B44(EnFloormas* this, PlayState* play) { Math_StepToF(&this->actor.speedXZ, 0.0f, 1.0f); } if (this->actor.bgCheckFlags & 2) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FLOORMASTER_SM_LAND); + Actor_PlaySfx(&this->actor, NA_SE_EN_FLOORMASTER_SM_LAND); } } @@ -607,7 +607,7 @@ void func_808D1C1C(EnFloormas* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 18.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FLOORMASTER_SM_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_FLOORMASTER_SM_WALK); } if (this->unk_194 == 0) { @@ -634,7 +634,7 @@ void func_808D1D6C(EnFloormas* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 18.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FLOORMASTER_SM_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_FLOORMASTER_SM_WALK); } flags = this->actor.bgCheckFlags & 8; @@ -702,7 +702,7 @@ void func_808D2040(EnFloormas* this, PlayState* play) { } else if (this->actor.bgCheckFlags & 2) { this->unk_18E = 50; this->actor.speedXZ = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FLOORMASTER_SM_LAND); + Actor_PlaySfx(&this->actor, NA_SE_EN_FLOORMASTER_SM_LAND); func_808D1740(this); } else if ((this->actor.playerHeightRel < -10.0f) && (this->collider.base.ocFlags1 & OC1_HIT) && (&player->actor == this->collider.base.oc)) { @@ -762,10 +762,10 @@ void func_808D22C8(EnFloormas* this, PlayState* play) { this->actor.speedXZ = -3.0f; func_808D1740(this); } else if ((this->unk_190 % 20) == 0) { - func_800B8E58(player, NA_SE_VO_LI_DAMAGE_S + player->ageProperties->voiceSfxIdOffset); + Player_PlaySfx(player, NA_SE_VO_LI_DAMAGE_S + player->ageProperties->voiceSfxIdOffset); play->damagePlayer(play, -4); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FLOORMASTER_SM_STICK - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_FLOORMASTER_SM_STICK - SFX_FLAG); } void func_808D2484(EnFloormas* this) { @@ -802,7 +802,7 @@ void func_808D24F0(EnFloormas* this, PlayState* play) { this->collider.base.ocFlags1 |= OC1_ON; } else if (this->actor.bgCheckFlags & 2) { this->actor.speedXZ = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FLOORMASTER_SM_LAND); + Actor_PlaySfx(&this->actor, NA_SE_EN_FLOORMASTER_SM_LAND); func_808D1740(this); } @@ -862,7 +862,7 @@ void func_808D2764(EnFloormas* this, PlayState* play) { this->actor.scale.y = this->actor.scale.z = this->actor.scale.x; if (((temp_f2 == 0.007f) || (temp_f2 == 0.004f)) && (temp_f2 != this->actor.scale.x)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FLOORMASTER_EXPAND); + Actor_PlaySfx(&this->actor, NA_SE_EN_FLOORMASTER_EXPAND); } this->collider.dim.radius = sCylinderInit.dim.radius * 100.0f * this->actor.scale.x; @@ -954,9 +954,9 @@ void func_808D2C08(EnFloormas* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, 13.0f)) { if (this->actor.scale.x > 0.009f) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); } } @@ -1022,14 +1022,14 @@ void func_808D2E34(EnFloormas* this, PlayState* play) { if (this->collider.base.colType != COLTYPE_HARD) { if (!Actor_ApplyDamage(&this->actor)) { if (this->actor.scale.x > 0.009f) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DAIOCTA_REVERSE); + Actor_PlaySfx(&this->actor, NA_SE_EN_DAIOCTA_REVERSE); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FLOORMASTER_SM_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_FLOORMASTER_SM_DEAD); } Enemy_StartFinishingBlow(play, &this->actor); this->actor.flags &= ~ACTOR_FLAG_1; } else if (this->actor.colChkInfo.damage != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FALL_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_DAMAGE); } func_808D0A48(this, play); @@ -1045,12 +1045,12 @@ void func_808D2E34(EnFloormas* this, PlayState* play) { } else if (this->actor.colChkInfo.damageEffect == 1) { this->unk_18E = 40; Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); func_808D2D6C(this); } else if (this->actor.colChkInfo.damageEffect == 5) { this->unk_18E = 40; Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->drawDmgEffScale = 0.55f; this->drawDmgEffAlpha = 2.0f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_MEDIUM; diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c index 0fa23e71a7..dda8764e3c 100644 --- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c @@ -766,7 +766,7 @@ void EnFsn_Haggle(EnFsn* this, PlayState* play) { SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimationInfo, this->animIndex); } else { if (this->animIndex == FSN_ANIM_SLAM_COUNTER_LOOP && Animation_OnFrame(&this->skelAnime, 18.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_HANKO); + Actor_PlaySfx(&this->actor, NA_SE_EV_HANKO); } if (this->flags & ENFSN_CALM_DOWN) { this->flags &= ~ENFSN_CALM_DOWN; @@ -783,7 +783,7 @@ void EnFsn_Haggle(EnFsn* this, PlayState* play) { SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimationInfo, this->animIndex); } else { if (Animation_OnFrame(&this->skelAnime, 28.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_HANKO); + Actor_PlaySfx(&this->actor, NA_SE_EV_HANKO); } return; } diff --git a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c index b232210f50..e793483660 100644 --- a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c +++ b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c @@ -136,7 +136,7 @@ s32 func_80ACF8B8(EnFuKago* this, PlayState* play) { return false; } - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_SY_TRE_BOX_APPEAR); + Actor_PlaySfx(&this->dyna.actor, NA_SE_SY_TRE_BOX_APPEAR); return true; } else { CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); @@ -227,7 +227,7 @@ void func_80ACFA78(EnFuKago* this, PlayState* play) { this->unk_338 = 60; this->unk_33A = 1; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WOODBOX_BREAK); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WOODBOX_BREAK); func_800C62BC(play, &play->colCtx.dyna, this->dyna.bgId); this->actionFunc = func_80AD0028; } diff --git a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c index 6f9706a2ba..0fa4927a97 100644 --- a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c +++ b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c @@ -174,7 +174,7 @@ void func_80ACE680(EnFuMato* this) { this->unk_2FC.y = Rand_Next() & 0xFFF; this->unk_2FC.z = Rand_Next() & 0xFFF; this->unk_302 = 3; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WOODPLATE_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WOODPLATE_BOUND); this->actionFunc = func_80ACE718; } @@ -241,7 +241,7 @@ void func_80ACE850(EnFuMato* this, PlayState* play) { this->dyna.actor.freezeTimer = 2; EffectSsHahen_SpawnBurst(play, &this->dyna.actor.world.pos, 13.0f, 0, 7, 8, 20, HAHEN_OBJECT_DEFAULT, 10, NULL); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WOODPLATE_BROKEN); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WOODPLATE_BROKEN); this->actionFunc = func_80ACECFC; } @@ -368,7 +368,7 @@ s32 func_80ACF04C(EnFuMato* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; this->collider.base.ocFlags1 &= ~OC1_HIT; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_SY_TRE_BOX_APPEAR); + Actor_PlaySfx(&this->dyna.actor, NA_SE_SY_TRE_BOX_APPEAR); fu->unk_548++; if ((fu->unk_542 == 2) || (gSaveContext.save.playerForm == PLAYER_FORM_DEKU)) { diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index f7d1d7cd13..171c6a397c 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -375,8 +375,8 @@ void func_80932C98(EnFz* this, PlayState* play) { if ((parent->update == NULL) || (parent->colChkInfo.health <= 0)) { this->actor.colChkInfo.health = 0; this->unk_BC4 = 5; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FREEZAD_DEAD); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ICE_BROKEN); + Actor_PlaySfx(&this->actor, NA_SE_EN_FREEZAD_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EV_ICE_BROKEN); sp3C.x = this->actor.world.pos.x; sp3C.y = this->actor.world.pos.y; sp3C.z = this->actor.world.pos.z; @@ -388,8 +388,8 @@ void func_80932C98(EnFz* this, PlayState* play) { if ((this->actor.colChkInfo.health != 0) && (this->unk_BC4 == 1)) { this->actor.colChkInfo.health = 0; this->unk_BC4 = 5; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FREEZAD_DEAD); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ICE_BROKEN); + Actor_PlaySfx(&this->actor, NA_SE_EN_FREEZAD_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EV_ICE_BROKEN); sp3C.x = this->actor.world.pos.x; sp3C.y = this->actor.world.pos.y; sp3C.z = this->actor.world.pos.z; @@ -422,7 +422,7 @@ void func_80932C98(EnFz* this, PlayState* play) { Actor_ApplyDamage(&this->actor); Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0x2000, 8); if (this->actor.colChkInfo.health != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FREEZAD_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_FREEZAD_DAMAGE); sp3C.x = this->actor.world.pos.x; sp3C.y = this->actor.world.pos.y; sp3C.z = this->actor.world.pos.z; @@ -430,8 +430,8 @@ void func_80932C98(EnFz* this, PlayState* play) { this->unk_BCF++; break; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FREEZAD_DEAD); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ICE_BROKEN); + Actor_PlaySfx(&this->actor, NA_SE_EN_FREEZAD_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EV_ICE_BROKEN); sp3C.x = this->actor.world.pos.x; sp3C.y = this->actor.world.pos.y; sp3C.z = this->actor.world.pos.z; @@ -440,7 +440,7 @@ void func_80932C98(EnFz* this, PlayState* play) { break; case 2: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FREEZAD_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_FREEZAD_DEAD); func_80933790(this); break; } diff --git a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c index 40c3d5c05f..3ad6c77352 100644 --- a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c +++ b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c @@ -140,7 +140,7 @@ void func_80AF69A8(EnGamelupy* this, PlayState* play) { void func_80AF6A38(EnGamelupy* this) { this->unk_19C = 0; this->actor.gravity = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_GET_RUPY); + Actor_PlaySfx(&this->actor, NA_SE_SY_GET_RUPY); this->actionFunc = func_80AF6A78; } 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 7007e7ed9c..b9c81ebad5 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -243,9 +243,9 @@ s32 EnGe1_FollowPath(EnGe1* this) { void EnGe1_Scream(EnGe1* this) { if ((s32)Rand_ZeroFloat(2.0f) == 0) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_VO_FPVO00); + Actor_PlaySfx(&this->picto.actor, NA_SE_VO_FPVO00); } else { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_VO_FPVO01); + Actor_PlaySfx(&this->picto.actor, NA_SE_VO_FPVO01); } } @@ -330,11 +330,11 @@ void EnGe1_PerformCutsceneActions(EnGe1* this, PlayState* play) { if ((this->animIndex == GERUDO_WHITE_ANIM_TRUDGING_OFF) && (Animation_OnFrame(&this->skelAnime, 12.0f) || Animation_OnFrame(&this->skelAnime, 25.0f))) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EV_PIRATE_WALK); + Actor_PlaySfx(&this->picto.actor, NA_SE_EV_PIRATE_WALK); } if ((this->animIndex == GERUDO_WHITE_ANIM_SALUTE) && Animation_OnFrame(&this->skelAnime, 14.0f)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EV_PIRATE_WALK); + Actor_PlaySfx(&this->picto.actor, NA_SE_EV_PIRATE_WALK); } } else { this->picto.actor.draw = NULL; 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 a4b28fa85f..bcbed04115 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -358,9 +358,9 @@ void EnGe2_SpawnEffects(EnGe2* this, PlayState* play) { void EnGe2_Scream(EnGe2* this) { if ((s32)Rand_ZeroFloat(2.0f) == 0) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_VO_FPVO00); + Actor_PlaySfx(&this->picto.actor, NA_SE_VO_FPVO00); } else { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_VO_FPVO01); + Actor_PlaySfx(&this->picto.actor, NA_SE_VO_FPVO01); } } @@ -417,7 +417,7 @@ void EnGe2_Charge(EnGe2* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 6.0f)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EV_PIRATE_WALK); + Actor_PlaySfx(&this->picto.actor, NA_SE_EV_PIRATE_WALK); } } @@ -513,7 +513,7 @@ void EnGe2_PatrolDuties(EnGe2* this, PlayState* play) { this->timer = 200; this->picto.actor.speedXZ = 0.0f; this->actionFunc = EnGe2_KnockedOut; - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_PIRATE_DEAD); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_PIRATE_DEAD); this->picto.actor.flags &= ~ACTOR_FLAG_1; this->stateFlags |= GERUDO_PURPLE_STATE_KO; } @@ -637,7 +637,7 @@ void EnGe2_PerformCutsceneActions(EnGe2* this, PlayState* play) { this->picto.actor.speedXZ = 5.0f; if (Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 6.0f)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EV_PIRATE_WALK); + Actor_PlaySfx(&this->picto.actor, NA_SE_EV_PIRATE_WALK); } if (this->screamTimer > 0) { diff --git a/src/overlays/actors/ovl_En_Geg/z_en_geg.c b/src/overlays/actors/ovl_En_Geg/z_en_geg.c index 1da6c1a612..2d0b819152 100644 --- a/src/overlays/actors/ovl_En_Geg/z_en_geg.c +++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.c @@ -716,7 +716,7 @@ void func_80BB2E00(EnGeg* this, PlayState* play) { func_80BB2020(this, play); this->actionFunc = func_80BB30B4; } else if (Animation_OnFrame(&this->skelAnime, 24.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_STAND_IMT); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_STAND_IMT); } } else if (this->unk_4AC == 4) { if (Animation_OnFrame(&this->skelAnime, 0.0f)) { @@ -729,7 +729,7 @@ void func_80BB2E00(EnGeg* this, PlayState* play) { this->actionFunc = func_80BB3318; } } else if (Animation_OnFrame(&this->skelAnime, 24.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_SIT_IMT); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_SIT_IMT); } } } @@ -756,7 +756,7 @@ void func_80BB2F7C(EnGeg* this, PlayState* play) { func_800B9010(&this->actor, NA_SE_EN_GOLON_SIRLOIN_ROLL - SFX_FLAG); } else { this->unk_230 |= 0x80; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); } } } diff --git a/src/overlays/actors/ovl_En_Giant/z_en_giant.c b/src/overlays/actors/ovl_En_Giant/z_en_giant.c index dbd1803591..078c136b95 100644 --- a/src/overlays/actors/ovl_En_Giant/z_en_giant.c +++ b/src/overlays/actors/ovl_En_Giant/z_en_giant.c @@ -371,10 +371,10 @@ void EnGiant_PlaySound(EnGiant* this) { if (this->actor.draw != NULL && this->alpha > 0) { if (this->animIndex == GIANT_ANIM_WALKING_LOOP && (Animation_OnFrame(&this->skelAnime, 40.0f) || Animation_OnFrame(&this->skelAnime, 100.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_KYOJIN_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_KYOJIN_WALK); } if (this->animIndex == GIANT_ANIM_FALLING_OVER && Animation_OnFrame(&this->skelAnime, 40.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_KYOJIN_VOICE_FAIL); + Actor_PlaySfx(&this->actor, NA_SE_EV_KYOJIN_VOICE_FAIL); } if (this->sfxId != 0xFFFF && ((this->animIndex == GIANT_ANIM_BIG_CALL_START && this->skelAnime.curFrame >= 18.0f) || diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c index 88d55dc14c..c660ec04eb 100644 --- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c +++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c @@ -510,7 +510,7 @@ void EnGinkoMan_Dialogue(EnGinkoMan* this, PlayState* play) { if ((this->skelAnime.animation == &object_boj_Anim_0008C0) && Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BANK_MAN_HAND_HIT); + Actor_PlaySfx(&this->actor, NA_SE_EV_BANK_MAN_HAND_HIT); } } @@ -579,7 +579,7 @@ void EnGinkoMan_SetupStamp(EnGinkoMan* this) { void EnGinkoMan_Stamp(EnGinkoMan* this, PlayState* play) { if ((this->curTextId == 0x464) // "Hey, relax! It doesn't leave any marks, and it's not gonna hurt." && (Animation_OnFrame(&this->skelAnime, 10.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_HANKO); // "stamp" + Actor_PlaySfx(&this->actor, NA_SE_EV_HANKO); // "stamp" } if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { diff --git a/src/overlays/actors/ovl_En_Gk/z_en_gk.c b/src/overlays/actors/ovl_En_Gk/z_en_gk.c index 9704d62049..7312cbbc86 100644 --- a/src/overlays/actors/ovl_En_Gk/z_en_gk.c +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.c @@ -268,7 +268,7 @@ s32 func_80B50854(EnGk* this, PlayState* play) { void func_80B50954(EnGk* this) { if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 4.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLONKID_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLONKID_WALK); } } @@ -511,7 +511,7 @@ void func_80B51410(EnGk* this, PlayState* play) { } if (ActorCutscene_GetCanPlayNext(this->unk_318)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLONKID_SOB_TALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLONKID_SOB_TALK); ActorCutscene_Start(this->unk_318, &this->actor); this->unk_1E4 &= ~0x20; return; @@ -897,7 +897,7 @@ void func_80B5227C(EnGk* this, PlayState* play) { if (!(this->unk_1E4 & 0x80)) { SET_WEEKEVENTREG(WEEKEVENTREG_22_04); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_SIT_IMT); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_SIT_IMT); this->unk_350 = 0x4000; this->actionFunc = func_80B52654; } @@ -993,7 +993,7 @@ void func_80B52654(EnGk* this, PlayState* play) { this->actor.scale.z = 0.006f - this->unk_354; this->actor.scale.x = 0.006f + this->unk_354; if (this->unk_350 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLONKID_SNORE); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLONKID_SNORE); } } diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index 01146c0cf1..763e353113 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -500,7 +500,7 @@ s32 func_8094E69C(EnGm* this, PlayState* play) { switch (this->unk_3E0) { case 0: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHAIR_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHAIR_ROLL); func_8094E054(this, play, 2); this->unk_3E2 = 0; this->unk_3E0++; @@ -552,7 +552,7 @@ s32 func_8094E69C(EnGm* this, PlayState* play) { break; case 8: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHAIR_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHAIR_ROLL); ActorCutscene_Stop(sp4A); this->unk_3E2 = 0; this->unk_3E0++; @@ -637,7 +637,7 @@ s32 func_8094EB1C(EnGm* this, PlayState* play) { ret = true; break; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHAIR_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHAIR_ROLL); func_8094E054(this, play, 2); this->unk_3E2 = 0; this->unk_3E0++; @@ -657,7 +657,7 @@ s32 func_8094EB1C(EnGm* this, PlayState* play) { break; case 2: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHAIR_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHAIR_ROLL); this->unk_3E2 = 0; this->unk_3E0++; @@ -965,7 +965,7 @@ s32 func_8094F53C(EnGm* this, PlayState* play) { if ((this->unk_3E8 == 6) && !(play->actorCtx.flags & ACTORCTX_FLAG_5) && Animation_OnFrame(&this->skelAnime, 20.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_HANKO); + Actor_PlaySfx(&this->actor, NA_SE_EV_HANKO); } return false; @@ -1427,7 +1427,7 @@ s32 func_80950690(EnGm* this, PlayState* play) { case 7: this->unk_3D0 += 992; if (DECR(this->unk_3B8) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_GO_SLEEP); + Actor_PlaySfx(&this->actor, NA_SE_VO_GO_SLEEP); this->unk_3B8 = 30; } break; @@ -1465,7 +1465,7 @@ s32 func_80950804(EnGm* this, PlayState* play) { Lib_Vec3f_TranslateAndRotateY(&this->unk_278, this->actor.world.rot.y, &sp38, &this->actor.world.pos); this->unk_3BA += this->timePathTimeSpeed; if (Animation_OnFrame(&this->skelAnime, 3.0f) || Animation_OnFrame(&this->skelAnime, 13.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PIRATE_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_PIRATE_WALK); } } @@ -1521,7 +1521,7 @@ s32 func_8095097C(EnGm* this, PlayState* play) { this->timePathWaypoint = sp50; this->timePathTargetPos = timePathTargetPos; } else if (Animation_OnFrame(&this->skelAnime, 3.0f) || Animation_OnFrame(&this->skelAnime, 13.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PIRATE_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_PIRATE_WALK); } return false; } @@ -1641,7 +1641,7 @@ void func_80950F2C(EnGm* this, PlayState* play) { sp2C = play->csCtx.actorActions[Cutscene_GetActorActionIndex(play, 526)]->action; if (this->unk_259 != (sp2C & 0xFF)) { if (sp2C == 3) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHAIR_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHAIR_ROLL); } this->unk_259 = sp2C; func_8094E054(this, play, sp50[sp2C]); diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index e1250dbc67..f5f36e5240 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -759,19 +759,19 @@ s32 func_80A12B78(EnGo* this, PlayState* play) { if (play->csCtx.state == 0) { if (this->unk_3DC == 4) { if (Animation_OnFrame(&this->skelAnime, 2.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_CIRCLE); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_CIRCLE); } if (Animation_OnFrame(&this->skelAnime, 22.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_SIT_IMT); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_SIT_IMT); } } else if ((this->unk_3DC == 2) || (this->unk_3DC == 3)) { if (Animation_OnFrame(&this->skelAnime, 2.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_CIRCLE_OFF); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_CIRCLE_OFF); } if (Animation_OnFrame(&this->skelAnime, 24.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_STAND_IMT); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_STAND_IMT); } } } @@ -1165,7 +1165,7 @@ s32 func_80A13B1C(EnGo* this, PlayState* play) { case 3: this->unk_3C2++; if (this->unk_3C2 >= 10) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_JUMP); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_JUMP); this->actor.velocity.y = 10.0f; this->actor.gravity = -1.0f; this->unk_3C4++; @@ -1174,7 +1174,7 @@ s32 func_80A13B1C(EnGo* this, PlayState* play) { case 4: if (func_80A13564(this, 10.0f, 0.004f, 6)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_LAND_BIG); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_LAND_BIG); func_80A13728(this, play); this->unk_3C4++; this->unk_3C2 = 0; @@ -1242,7 +1242,7 @@ s32 func_80A13E80(EnGo* this, PlayState* play) { case 2: if (Animation_OnFrame(&this->skelAnime, 16.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_GORON_HAND_HIT); + Actor_PlaySfx(&this->actor, NA_SE_EV_GORON_HAND_HIT); } if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { @@ -1515,7 +1515,7 @@ void func_80A149B0(EnGo* this, PlayState* play) { s16 sp26 = this->actor.world.rot.y; if ((ENGO_GET_F(&this->actor) == ENGO_F_2) && (gSaveContext.save.entrance == ENTRANCE(GORON_RACETRACK, 1))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_GORON_CHEER - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EV_GORON_CHEER - SFX_FLAG); } else if (ENGO_GET_F(&this->actor) != ENGO_F_8) { if (func_80A1222C(this, play)) { SubS_UpdateFlags(&this->unk_390, 0, 7); @@ -1582,7 +1582,7 @@ void func_80A14B30(EnGo* this, PlayState* play) { } else { sfxId = NA_SE_EN_GOLON_SNORE2; } - Actor_PlaySfxAtPos(&this->actor, sfxId); + Actor_PlaySfx(&this->actor, sfxId); } this->unk_3AE += 0x400; this->actor.shape.yOffset = (this->actor.scale.y / this->unk_3A4) * 14.0f; @@ -1620,7 +1620,7 @@ void func_80A14EB0(EnGo* this, PlayState* play) { EnGo* sp24 = (EnGo*)this->actor.child; if ((s32)(this->unk_39C * 3.0f) != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ICE_MELT_LEVEL - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EV_ICE_MELT_LEVEL - SFX_FLAG); Math_ApproachF(&this->unk_39C, 0.0f, 0.02f, 1.0f); this->unk_3A0 = (this->unk_39C / 0.9f) * 100.0f; func_80A139E4(this); @@ -1696,7 +1696,7 @@ void func_80A14FC8(EnGo* this, PlayState* play) { case 6: if ((s32)(this->unk_39C * 3.0f) != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ICE_MELT_LEVEL - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EV_ICE_MELT_LEVEL - SFX_FLAG); Math_ApproachF(&this->unk_39C, 0.0f, 0.02f, 1.0f); this->unk_3A0 = (this->unk_39C / 0.9f) * 100.0f; func_80A139E4(this); @@ -1711,42 +1711,42 @@ void func_80A14FC8(EnGo* this, PlayState* play) { case 55: case 100: case 130: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_COLD); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_COLD); break; case 185: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_WAKE_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_WAKE_UP); break; case 250: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_EYE_BIG); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_EYE_BIG); break; case 465: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IWAIGORON_SOLO); + Actor_PlaySfx(&this->actor, NA_SE_EN_IWAIGORON_SOLO); break; case 490: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_VOICE_EATFULL); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_VOICE_EATFULL); break; } } else if (actorActionCmd == 129) { switch (play->csCtx.frames) { case 360: case 390: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_COLD); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_COLD); break; case 430: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_WAKE_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_WAKE_UP); break; case 450: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_EYE_BIG); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_EYE_BIG); break; case 480: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_VOICE_EATFULL); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_VOICE_EATFULL); break; } } @@ -1763,7 +1763,7 @@ void func_80A153FC(EnGo* this, PlayState* play) { Vec3f sp44; if ((this->unk_390 & 0x1000) && (this->actor.colChkInfo.damageEffect == 0xF)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SNOWBALL_BROKEN); + Actor_PlaySfx(&this->actor, NA_SE_EV_SNOWBALL_BROKEN); this->actor.flags &= ~ACTOR_FLAG_10; this->actor.flags |= ACTOR_FLAG_2000000; @@ -1772,7 +1772,7 @@ void func_80A153FC(EnGo* this, PlayState* play) { this->actor.shape.rot.x = 0; this->actor.speedXZ = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_COLD); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_COLD); if (gSaveContext.save.day == 3) { func_80A141D4(this, play); @@ -1783,7 +1783,7 @@ void func_80A153FC(EnGo* this, PlayState* play) { } } else if (this->unk_284 != NULL) { if (this->unk_390 & 0x800) { - func_800B8E58(GET_PLAYER(play), NA_SE_PL_BODY_HIT); + Player_PlaySfx(GET_PLAYER(play), NA_SE_PL_BODY_HIT); func_800B8D50(play, &this->actor, 2.0f, this->actor.yawTowardsPlayer, 0.0f, 0); } @@ -1802,7 +1802,7 @@ void func_80A153FC(EnGo* this, PlayState* play) { this->actor.shape.rot.y = this->actor.world.rot.y; if (this->actor.bgCheckFlags & 1) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BIGBALL_ROLL - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EV_BIGBALL_ROLL - SFX_FLAG); func_800AE930(&play->colCtx, Effect_GetByIndex(this->unk_3E8), &this->actor.world.pos, 18.0f, this->actor.shape.rot.y, this->actor.floorPoly, this->actor.floorBgId); } else { diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index 98d27f735c..a081c68edc 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -483,7 +483,7 @@ s32 func_8093F6F8(EnGoroiwa* this, PlayState* play) { func_8093EF54(play, &sp48, &D_80942E30[ENGOROIWA_GET_C000(&this->actor)], &D_80942E3C[ENGOROIWA_GET_C000(&this->actor)], this->actor.scale.x); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BIGBALL_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EV_BIGBALL_BOUND); } } } @@ -1168,7 +1168,7 @@ void func_80941A10(EnGoroiwa* this, PlayState* play) { func_80941DB4(this); } - func_800B8E58(player, NA_SE_PL_BODY_HIT); + Player_PlaySfx(player, NA_SE_PL_BODY_HIT); if ((sp34 == 1) || (sp34 == 2)) { this->unk_1CC = 50; @@ -1208,7 +1208,7 @@ void func_80941A10(EnGoroiwa* this, PlayState* play) { } if (this->actor.bgCheckFlags & 1) { - Actor_PlaySfxAtPos(&this->actor, D_80942E9C[this->unk_1E4][this->actor.home.rot.x & 1]); + Actor_PlaySfx(&this->actor, D_80942E9C[this->unk_1E4][this->actor.home.rot.x & 1]); } } } @@ -1266,7 +1266,7 @@ void func_80941FA4(EnGoroiwa* this, PlayState* play) { if (func_8094156C(this, play) == 0) { if ((this->collider.base.atFlags & AT_HIT) && !(player->stateFlags3 & PLAYER_STATE3_80000)) { func_800B8D50(play, &this->actor, 2.0f, this->actor.yawTowardsPlayer, 0.0f, 0); - func_800B8E58(player, NA_SE_PL_BODY_HIT); + Player_PlaySfx(player, NA_SE_PL_BODY_HIT); if (((this->actor.home.rot.z & 3) == 1) || ((this->actor.home.rot.z & 3) == 2)) { this->unk_1CC = 50; } @@ -1294,7 +1294,7 @@ void func_809420F0(EnGoroiwa* this, PlayState* play) { if (func_8094156C(this, play) == 0) { if ((this->collider.base.atFlags & AT_HIT) && !(player->stateFlags3 & PLAYER_STATE3_80000)) { func_800B8D50(play, &this->actor, 2.0f, this->actor.yawTowardsPlayer, 0.0f, 0); - func_800B8E58(player, NA_SE_PL_BODY_HIT); + Player_PlaySfx(player, NA_SE_PL_BODY_HIT); if (((this->actor.home.rot.z & 3) == 1) || ((this->actor.home.rot.z & 3) == 2)) { this->unk_1CC = 50; } diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c index eb7948ffb2..6600aa2bbb 100644 --- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c +++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c @@ -354,7 +354,7 @@ void EnGrasshopper_Fly(EnGrasshopper* this, PlayState* play) { f32 targetSpeed; Vec3f collisionCheckPos; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BATTA_FLY - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_BATTA_FLY - SFX_FLAG); diffX = this->flyingHomePos.x - this->actor.world.pos.x; diffZ = this->flyingHomePos.z - this->actor.world.pos.z; if ((this->type != EN_GRASSHOPPER_TYPE_WOODFALL_TEMPLE_FINAL_ROOM) && @@ -430,7 +430,7 @@ void EnGrasshopper_RoamInCircles(EnGrasshopper* this, PlayState* play) { Vec3f collisionCheckPos; Player* player = GET_PLAYER(play); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BATTA_FLY - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_BATTA_FLY - SFX_FLAG); if (Player_GetMask(play) == PLAYER_MASK_STONE) { EnGrasshopper_SetupFly(this); } else { @@ -474,7 +474,7 @@ void EnGrasshopper_RoamInCircles(EnGrasshopper* this, PlayState* play) { * Unused in the final game. */ void EnGrasshopper_SetupBank(EnGrasshopper* this) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BATTA_FLY - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_BATTA_FLY - SFX_FLAG); this->targetBankRot.y = this->actor.world.rot.y + 0x8000; this->action = EN_GRASSHOPPER_ACTION_BANK; this->bankState = EN_GRASSHOPPER_BANK_STATE_BANKING; @@ -487,7 +487,7 @@ void EnGrasshopper_SetupBank(EnGrasshopper* this) { * it flies forward for 100 frames. */ void EnGrasshopper_Bank(EnGrasshopper* this, PlayState* play) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BATTA_FLY - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_BATTA_FLY - SFX_FLAG); switch (this->bankState) { case EN_GRASSHOPPER_BANK_STATE_BANKING: Math_SmoothStepToS(&this->actor.world.rot.y, this->targetBankRot.y, 0x64, 0x3E8, 0x3E8); @@ -529,7 +529,7 @@ void EnGrasshopper_SetupBounced(EnGrasshopper* this) { void EnGrasshopper_Bounced(EnGrasshopper* this, PlayState* play) { f32 targetSpeed; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BATTA_FLY - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_BATTA_FLY - SFX_FLAG); targetSpeed = (this->index * 0.05f) + 7.0f; Math_ApproachF(&this->actor.speedXZ, targetSpeed, 0.4f, 0.8f); Math_SmoothStepToS(&this->actor.world.rot.z, this->targetRot.z, 5, 0x3E8, 5); @@ -564,7 +564,7 @@ void EnGrasshopper_ApproachPlayer(EnGrasshopper* this, PlayState* play) { WaterBox* waterBox; Vec3f splashPos; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BATTA_FLY - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_BATTA_FLY - SFX_FLAG); this->bobPhase += 0xAF0; this->targetApproachPos.y = (Math_SinS(this->bobPhase) * 10.0f) + (player->actor.world.pos.y + 120.0f); @@ -607,7 +607,7 @@ void EnGrasshopper_SetupAttack(EnGrasshopper* this) { this->baseFlyHeight = this->actor.world.pos.y; this->collider.elements[0].info.toucherFlags &= ~(TOUCH_ON | TOUCH_SFX_WOOD); this->collider.elements[1].info.toucherFlags |= (TOUCH_ON | TOUCH_SFX_WOOD); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BATTA_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_BATTA_ATTACK); this->action = EN_GRASSHOPPER_ACTION_ATTACK; this->actionFunc = EnGrasshopper_Attack; } @@ -739,7 +739,7 @@ void EnGrasshopper_SetupDead(EnGrasshopper* this, PlayState* play) { Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 25); Enemy_StartFinishingBlow(play, &this->actor); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BATTA_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_BATTA_DEAD); this->action = EN_GRASSHOPPER_ACTION_DEAD; this->actionFunc = EnGrasshopper_Dead; } @@ -887,7 +887,7 @@ void EnGrasshopper_UpdateDamage(EnGrasshopper* this, PlayState* play) { if (attackDealsDamage) { Actor_ApplyDamage(&this->actor); if (this->actor.colChkInfo.health > 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BATTA_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_BATTA_DAMAGE); EnGrasshopper_SetupDamaged(this, play); } else { EnGrasshopper_SetupDead(this, play); diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index 08133cc63b..4ff4c1d1b4 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -281,7 +281,7 @@ void func_8099807C(EnGs* this, PlayState* play) { if (!Flags_GetSwitch(play, this->unk_196)) { 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, 2); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BUTTERFRY_TO_FAIRY); + Actor_PlaySfx(&this->actor, NA_SE_EV_BUTTERFRY_TO_FAIRY); Flags_SetSwitch(play, this->unk_196); } break; @@ -290,7 +290,7 @@ void func_8099807C(EnGs* this, PlayState* play) { if (!Flags_GetSwitch(play, this->unk_196)) { 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, 7); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BUTTERFRY_TO_FAIRY); + Actor_PlaySfx(&this->actor, NA_SE_EV_BUTTERFRY_TO_FAIRY); Flags_SetSwitch(play, this->unk_196); } break; @@ -411,7 +411,7 @@ void func_809985B8(EnGs* this, PlayState* play) { void func_80998704(EnGs* this, PlayState* play) { this->unk_19D = 0; this->unk_19A &= ~(0x100 | 0x4); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_G_STONE_CHANGE_COLOR); + Actor_PlaySfx(&this->actor, NA_SE_EV_G_STONE_CHANGE_COLOR); this->actionFunc = func_8099874C; } @@ -518,7 +518,7 @@ s32 func_80998A48(EnGs* this, PlayState* play) { if (this->unk_19D == 0) { this->unk_216 = 200; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_ATTACK); this->unk_1D4 = 0; this->unk_19A |= 1; @@ -536,7 +536,7 @@ s32 func_80998A48(EnGs* this, PlayState* play) { if ((this->actor.params != ENGS_0) && !Play_InCsMode(play) && (Message_GetState(&play->msgCtx) == TEXT_STATE_NONE)) { this->unk_216 = 0; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FAIVE_LUPY_COUNT); + Actor_PlaySfx(&this->actor, NA_SE_EV_FAIVE_LUPY_COUNT); Message_StartTextbox(play, 0x20D2, NULL); } this->unk_19A &= ~1; @@ -551,7 +551,7 @@ s32 func_80998BBC(EnGs* this, PlayState* play) { if (this->unk_19D == 0) { this->unk_216 = 200; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_ATTACK); this->unk_1DC = 0.3f; this->unk_1E0 = 0.0f; @@ -582,7 +582,7 @@ s32 func_80998D44(EnGs* this, PlayState* play) { this->unk_216 = 200; this->unk_1DC = this->unk_1B0[0].y - 1.0f; this->unk_1E0 = -0.8f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_G_STONE_CRUSH); + Actor_PlaySfx(&this->actor, NA_SE_EV_G_STONE_CRUSH); this->unk_19A |= 1; this->unk_21C = 40; this->unk_21E = 11; @@ -613,7 +613,7 @@ s32 func_80998D44(EnGs* this, PlayState* play) { this->unk_21C = 10; this->unk_21E = 10; this->unk_1DC = 0.5f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_ATTACK); this->unk_19D += 1; } } else if ((this->unk_19D == 4) && (func_80998334(this, play, &this->unk_1DC, &this->unk_1E0, &this->unk_1D4, 1.0f, @@ -662,7 +662,7 @@ s32 func_80998F9C(EnGs* this, PlayState* play) { this->unk_1E0 = 1.5f; this->unk_1E4 = this->unk_1B0[1].y - 1.0f; this->unk_1E8 = -0.3f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_STONE_GROW_UP); + Actor_PlaySfx(&this->actor, NA_SE_EV_STONE_GROW_UP); this->unk_19D = 3; } } @@ -712,7 +712,7 @@ s32 func_80998F9C(EnGs* this, PlayState* play) { this->unk_1E8 = 0.0f; this->unk_1F0 = 0.0f; this->unk_1EC = 0.5f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_ATTACK); this->unk_21C = 20; this->unk_21E = 2; this->unk_19D = 6; @@ -735,7 +735,7 @@ s32 func_80998F9C(EnGs* this, PlayState* play) { } if ((u16)this->unk_19E[0].y < sp3A) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_STONE_ROLLING); + Actor_PlaySfx(&this->actor, NA_SE_EV_STONE_ROLLING); } return sp4C; @@ -849,7 +849,7 @@ s32 func_809995A4(EnGs* this, PlayState* play) { sp54.x = this->actor.world.pos.x; sp54.y = this->actor.world.pos.y; sp54.z = this->actor.world.pos.z; - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_BOMB_EXPLOSION); + Actor_PlaySfx(&this->actor, NA_SE_IT_BOMB_EXPLOSION); EffectSsBomb2_SpawnLayered(play, &sp54, &bomb2Velocity, &bomb2Accel, 100, 20); this->unk_1D4 = 10; this->unk_19A |= 8; diff --git a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c index b13bca1dd5..2fef196bf6 100644 --- a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c +++ b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c @@ -278,8 +278,8 @@ void EnGuardNuts_Burrow(EnGuardNuts* this, PlayState* play) { this->targetHeadPos.y = 0; this->actor.flags |= ACTOR_FLAG_8000000; this->targetHeadPos.x = this->targetHeadPos.y; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DOWN); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_UP); this->actionFunc = EnGuardNuts_SetupUnburrow; } @@ -306,7 +306,7 @@ void EnGuardNuts_Unburrow(EnGuardNuts* this, PlayState* play) { Math_Vec3f_Copy(&digPos, &this->actor.world.pos); digPos.y = this->actor.floorHeight; EffectSsHahen_SpawnBurst(play, &digPos, 4.0f, 0, 10, 3, 15, HAHEN_OBJECT_DEFAULT, 10, NULL); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_UP); D_80ABBE20 = 0; if (this->guardTextIndex == 9) { this->hasCompletedConversation = true; @@ -329,7 +329,7 @@ void EnGuardNuts_Update(Actor* thisx, PlayState* play) { } if ((this->animIndex == WALK_ANIM) && ((Animation_OnFrame(&this->skelAnime, 1.0f)) || (Animation_OnFrame(&this->skelAnime, 5.0f)))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_WALK); } this->actionFunc(this, play); diff --git a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c index 0e1d2f050d..7703520523 100644 --- a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c +++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c @@ -211,7 +211,7 @@ void func_80B221E8(EnHakurock* this, PlayState* play) { if ((this->collider.base.atFlags & AT_HIT) || ((this->counter == 0) && (this->collider.base.ocFlags1 & OC1_HIT)) || ((this->actor.bgCheckFlags & 1) && (this->actor.velocity.y < 0.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ROCK_BROKEN); + Actor_PlaySfx(&this->actor, NA_SE_EV_ROCK_BROKEN); func_80B21EA4(this, 0); func_80B21FFC(this); } @@ -246,7 +246,7 @@ void func_80B2242C(EnHakurock* this, PlayState* play) { func_80B21FFC(this); } else if ((this->actor.bgCheckFlags & 1)) { func_80B21EA4(this, 2); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_OBJECT_STICK); + Actor_PlaySfx(&this->actor, NA_SE_EV_OBJECT_STICK); func_80B224C0(this); } } diff --git a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c index 507bf9deb9..8eaa6b4448 100644 --- a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c +++ b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c @@ -297,7 +297,7 @@ void func_80B236C8(EnHanabi* this, PlayState* play) { this->actor.home.rot.y += (s16)((Rand_ZeroFloat(40.0f) + 80.0f) * 256.0f); this->unk_144 = (s32)Rand_ZeroFloat(5.0f) + 20; - Actor_PlaySfxAtPos(&this->actor, NA_SE_OC_FIREWORKS); + Actor_PlaySfx(&this->actor, NA_SE_OC_FIREWORKS); func_80B235CC(this, &sp34, sp28); } } @@ -332,7 +332,7 @@ void func_80B23934(EnHanabi* this, PlayState* play) { if ((play->sceneId == SCENE_00KEIKOKU) && (gSaveContext.sceneLayer == 7) && (play->csCtx.currentCsIndex == 0) && (play->csCtx.frames == 610)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_KYOJIN_GROAN); + Actor_PlaySfx(&this->actor, NA_SE_EV_KYOJIN_GROAN); } } diff --git a/src/overlays/actors/ovl_En_Hg/z_en_hg.c b/src/overlays/actors/ovl_En_Hg/z_en_hg.c index e100a2de30..a576cc8f4a 100644 --- a/src/overlays/actors/ovl_En_Hg/z_en_hg.c +++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.c @@ -177,7 +177,7 @@ void EnHg_Wait(EnHg* this, PlayState* play) { } if ((gSaveContext.sceneLayer == 0) && (play->csCtx.currentCsIndex == 0) && ((play->csCtx.frames == 20) || (play->csCtx.frames == 60))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_HALF_REDEAD_SURPRISE); + Actor_PlaySfx(&this->actor, NA_SE_EN_HALF_REDEAD_SURPRISE); } } } diff --git a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c index f7a9df82ab..d165c46e01 100644 --- a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c +++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c @@ -322,7 +322,7 @@ s32 EnHgo_HandleCsAction(EnHgo* this, PlayState* play) { this->isInCutscene = true; if ((gSaveContext.sceneLayer == 0) && ((play->csCtx.currentCsIndex == 2) || (play->csCtx.currentCsIndex == 4))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_GBVO02); + Actor_PlaySfx(&this->actor, NA_SE_VO_GBVO02); } } break; diff --git a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c index d8df99887b..67637d532d 100644 --- a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c +++ b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c @@ -145,7 +145,7 @@ void func_80BDB2B8(EnHiddenNuts* this, PlayState* play) { Player* player = GET_PLAYER(play); s32 i; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NEMURI_SLEEP - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_NEMURI_SLEEP - SFX_FLAG); if (player->stateFlags2 & PLAYER_STATE2_8000000) { if (this->unk_20A == 0) { @@ -202,7 +202,7 @@ void func_80BDB580(EnHiddenNuts* this) { void func_80BDB59C(EnHiddenNuts* this, PlayState* play) { s32 i; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NEMURI_SLEEP - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_NEMURI_SLEEP - SFX_FLAG); if (this->unk_218 == 0) { Vec3f sp98 = { 0.0f, 0.0f, 0.0f }; @@ -234,8 +234,8 @@ void func_80BDB59C(EnHiddenNuts* this, PlayState* play) { void func_80BDB788(EnHiddenNuts* this) { this->actor.flags |= ACTOR_FLAG_10; this->actor.flags |= ACTOR_FLAG_8000000; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_UP); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DEAD); this->unk_21A = 2; this->actionFunc = func_80BDB7E8; } @@ -262,7 +262,7 @@ void func_80BDB7E8(EnHiddenNuts* this, PlayState* play) { EffectSsHahen_SpawnBurst(play, &sp3C, 4.0f, 0, 10, 3, 15, HAHEN_OBJECT_DEFAULT, 10, NULL); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_UP); func_80BDB1B4(this, 7); this->actionFunc = func_80BDB8F4; } @@ -287,7 +287,7 @@ void func_80BDB978(EnHiddenNuts* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 8.0f) || Animation_OnFrame(&this->skelAnime, 18.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUT_FAINT); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUT_FAINT); } if (this->unk_22C <= curFrame) { @@ -309,7 +309,7 @@ void func_80BDBA28(EnHiddenNuts* this, PlayState* play) { EffectSsHahen_SpawnBurst(play, &sp44, 4.0f, 0, 10, 3, 15, HAHEN_OBJECT_DEFAULT, 10, NULL); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_UP); this->unk_208 = 1; if ((this->path != NULL) && !SubS_CopyPointFromPath(this->path, this->unk_208, &this->unk_20C)) { @@ -345,14 +345,14 @@ void func_80BDBB48(EnHiddenNuts* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 5.0f) || Animation_OnFrame(&this->skelAnime, 10.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WALK_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EV_WALK_WATER); sp4E = 1; } } if ((sp4E != 0) && (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 5.0f) || Animation_OnFrame(&this->skelAnime, 10.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_WALK); } Math_SmoothStepToS(&this->actor.world.rot.y, Math_Vec3f_Yaw(&this->actor.world.pos, &this->unk_20C), 1, 0x1388, 0); @@ -400,7 +400,7 @@ void func_80BDBED4(EnHiddenNuts* this, PlayState* play) { Math_Vec3f_Copy(&sp38, &this->actor.world.pos); sp38.y = this->actor.floorHeight; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DOWN); EffectSsHahen_SpawnBurst(play, &sp38, 4.0f, 0, 10, 3, 15, HAHEN_OBJECT_DEFAULT, 10, NULL); Actor_Kill(&this->actor); } diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c index c07bbc5da1..10e3138f42 100644 --- a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c +++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c @@ -188,7 +188,7 @@ void func_80C1FE30(EnHintSkb* this) { void func_80C1FE80(EnHintSkb* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, 8.0f) || Animation_OnFrame(&this->skelAnime, 15.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_WALK); } Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 1, 750, 0); this->actor.world.rot.y = this->actor.shape.rot.y; @@ -211,7 +211,7 @@ void func_80C1FF88(EnHintSkb* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 3.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_ATTACK); } if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { @@ -244,7 +244,7 @@ void func_80C2011C(EnHintSkb* this) { if (this->actor.bgCheckFlags & 1) { this->actor.speedXZ = 0.0f; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->actionFunc = func_80C2016C; } @@ -284,7 +284,7 @@ void func_80C20274(EnHintSkb* this) { this->actor.speedXZ = -4.0f; } } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_DAMAGE); this->actionFunc = func_80C20334; } @@ -337,7 +337,7 @@ void func_80C20540(EnHintSkb* this) { if (this->actor.bgCheckFlags & 1) { this->actor.speedXZ = 0.0f; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->actionFunc = func_80C20590; } @@ -349,7 +349,7 @@ void func_80C20590(EnHintSkb* this, PlayState* play) { if (this->actor.colChkInfo.health != 0) { Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 8); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 3); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_DAMAGE); this->unk_3E8 |= 1; func_80C20274(this); } else { @@ -376,7 +376,7 @@ void func_80C2069C(EnHintSkb* this, PlayState* play) { if (this->actor.colChkInfo.health != 0) { Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 8); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 3); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_DAMAGE); this->unk_3E8 |= 1; func_80C20274(this); } else { @@ -676,13 +676,13 @@ void func_80C20E90(EnHintSkb* this, PlayState* play) { this->drawDmgEffAlpha = 1.0f; this->drawDmgEffScale = 0.0f; Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 8); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_DAMAGE); this->unk_3E8 |= 1; func_80C20274(this); break; case 3: if (this->actor.colChkInfo.health != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_DAMAGE); this->drawDmgEffTimer = 80; } else { this->drawDmgEffTimer = 3; @@ -699,7 +699,7 @@ void func_80C20E90(EnHintSkb* this, PlayState* play) { this->drawDmgEffAlpha = 1.0f; this->drawDmgEffScale = 0.5f; Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 8); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_DAMAGE); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 3); func_80C2066C(this); break; @@ -718,7 +718,7 @@ void func_80C20E90(EnHintSkb* this, PlayState* play) { case 13: Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 8); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_DAMAGE); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 3); func_80C20274(this); break; diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index 101751b19f..1c17e4058b 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -408,7 +408,7 @@ void func_8087B7C0(EnHorse* this, PlayState* play, Path* path) { } else if (this->unk_590 > 0) { if (this->unk_590 == 0x1F4) { if (this->rider != NULL) { - Actor_PlaySfxAtPos(&this->rider->actor, NA_SE_VO_IN_CRY_0); + Actor_PlaySfx(&this->rider->actor, NA_SE_VO_IN_CRY_0); } } this->unk_590--; @@ -3383,12 +3383,12 @@ void func_80884A40(EnHorse* this, PlayState* play) { } if ((this->unk_538 == OBJ_UM_ANIM_TROT) || (this->unk_538 == OBJ_UM_ANIM_GALLOP)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_HORSE_RUN); + Actor_PlaySfx(&this->actor, NA_SE_EV_HORSE_RUN); } else if (this->unk_538 == OBJ_UM_ANIM_IDLE) { if (this->animIndex == ENHORSE_ANIM_IDLE) { EnHorse_IdleAnimSounds(this, play); } else if (this->animIndex == ENHORSE_ANIM_WHINNY) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_HORSE_GROAN); + Actor_PlaySfx(&this->actor, NA_SE_EV_HORSE_GROAN); } } } @@ -3400,7 +3400,7 @@ void func_80884D04(EnHorse* this, PlayState* play) { this->actor.speedXZ = 10.0f; this->action = ENHORSE_ACTION_25; this->unk_540 = this->actor.world.pos; - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_INGO_HORSE_NEIGH); + Actor_PlaySfx(&this->actor, NA_SE_IT_INGO_HORSE_NEIGH); this->animIndex = ENHORSE_ANIM_GALLOP; playSpeed = this->actor.speedXZ * 0.2f; Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animIndex], diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.c b/src/overlays/actors/ovl_En_Ig/z_en_ig.c index 2468e5961f..43f39a4b9a 100644 --- a/src/overlays/actors/ovl_En_Ig/z_en_ig.c +++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.c @@ -750,7 +750,7 @@ s32 func_80BF2470(EnIg* this, PlayState* play) { Lib_Vec3f_TranslateAndRotateY(&this->unk_2B0, this->actor.world.rot.y, &sp38, &this->actor.world.pos); this->unk_3E2 += this->timePathTimeSpeed; if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 13.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PIRATE_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_PIRATE_WALK); } } return false; @@ -804,7 +804,7 @@ s32 func_80BF25E8(EnIg* this, PlayState* play) { this->timePathWaypoint = sp50; this->timePathTargetPos = timePathTargetPos; } else if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 13.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PIRATE_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_PIRATE_WALK); } return false; } @@ -816,9 +816,9 @@ s32 func_80BF2890(EnIg* this, PlayState* play) { if (!(this->unk_3D0 & 0x100) && Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { if (this->unk_408 != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_SNORE1); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_SNORE1); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_SNORE2); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_SNORE2); } this->unk_408 ^= 1; } diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 4188f44c4b..7c22aa4111 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -386,7 +386,7 @@ void EnIk_Idle(EnIk* this, PlayState* play) { EnIk_CheckActions(this, play); } } else if (this->colliderCylinder.base.acFlags & AC_HIT) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IRONNACK_ARMOR_HIT); + Actor_PlaySfx(&this->actor, NA_SE_EN_IRONNACK_ARMOR_HIT); Audio_PlayBgm_StorePrevBgm(NA_BGM_MINI_BOSS); this->actor.hintId = TATL_HINT_ID_IRON_KNUCKLE; this->colliderCylinder.base.acFlags &= ~AC_HIT; @@ -407,7 +407,7 @@ void EnIk_WalkTowardsPlayer(EnIk* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 16.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IRONNACK_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_IRONNACK_WALK); } yawDiff = this->actor.wallYaw - this->actor.shape.rot.y; if ((this->actor.bgCheckFlags & 8) && (ABS_ALT(yawDiff) >= 0x4000)) { @@ -424,7 +424,7 @@ void EnIk_WalkTowardsPlayer(EnIk* this, PlayState* play) { void EnIk_SetupRun(EnIk* this) { Animation_MorphToLoop(&this->skelAnime, &gIronKnuckleRunAnim, -4.0f); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TWINROBA_SHOOT_VOICE); + Actor_PlaySfx(&this->actor, NA_SE_EN_TWINROBA_SHOOT_VOICE); this->actor.speedXZ = 2.5f; this->actor.world.rot.y = this->actor.shape.rot.y; this->actionFunc = EnIk_RunTowardsPlayer; @@ -435,7 +435,7 @@ void EnIk_RunTowardsPlayer(EnIk* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if (Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 9.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IRONNACK_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_IRONNACK_WALK); } yawDiff = this->actor.wallYaw - this->actor.shape.rot.y; if ((this->actor.bgCheckFlags & 8) && (ABS_ALT(yawDiff) >= 0x4000)) { @@ -473,13 +473,13 @@ void EnIk_VerticalAttack(EnIk* this, PlayState* play) { this->timer++; if (!(this->skelAnime.curFrame < 7.0f) || !EnIk_IsChangingAction(this, play)) { if (Animation_OnFrame(&this->skelAnime, 15.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IRONNACK_SWING_AXE); + Actor_PlaySfx(&this->actor, NA_SE_EN_IRONNACK_SWING_AXE); } else if (Animation_OnFrame(&this->skelAnime, 21.0f)) { particlePos.x = (Math_SinS((this->actor.shape.rot.y + 0x6A4)) * 70.0f) + this->actor.world.pos.x; particlePos.z = (Math_CosS((this->actor.shape.rot.y + 0x6A4)) * 70.0f) + this->actor.world.pos.z; particlePos.y = this->actor.world.pos.y; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IRONNACK_HIT_GND); + Actor_PlaySfx(&this->actor, NA_SE_EN_IRONNACK_HIT_GND); Camera_AddQuake(GET_ACTIVE_CAM(play), 2, 25, 5); Rumble_Request(this->actor.xyzDistToPlayerSq, 180, 20, 100); CollisionCheck_SpawnShieldParticles(play, &particlePos); @@ -508,7 +508,7 @@ void EnIk_VerticalAttack(EnIk* this, PlayState* play) { void EnIk_SetupTakeOutAxe(EnIk* this) { Animation_PlayOnce(&this->skelAnime, &gIronKnuckleEndVerticalAttackAnim); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IRONNACK_PULLOUT); + Actor_PlaySfx(&this->actor, NA_SE_EN_IRONNACK_PULLOUT); this->actionFunc = EnIk_TakeOutAxe; } @@ -539,7 +539,7 @@ void EnIk_HorizontalDoubleAttack(EnIk* this, PlayState* play) { this->timer++; if ((Animation_OnFrame(&this->skelAnime, 1.0f)) || (Animation_OnFrame(&this->skelAnime, 13.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IRONNACK_SWING_AXE); + Actor_PlaySfx(&this->actor, NA_SE_EN_IRONNACK_SWING_AXE); } if (((this->skelAnime.curFrame > 1.0f) && (this->skelAnime.curFrame < 9.0f)) || ((this->skelAnime.curFrame > 12.0f) && (this->skelAnime.curFrame < 20.0f))) { @@ -584,7 +584,7 @@ void EnIk_SetupSingleHorizontalAttack(EnIk* this) { void EnIk_SingleHorizontalAttack(EnIk* this, PlayState* play) { this->timer++; if (Animation_OnFrame(&this->skelAnime, 13.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IRONNACK_SWING_AXE); + Actor_PlaySfx(&this->actor, NA_SE_EN_IRONNACK_SWING_AXE); } if ((this->skelAnime.curFrame > 12.0f) && (this->skelAnime.curFrame < 20.0f)) { this->colliderQuad.base.atFlags |= AT_ON; @@ -667,7 +667,7 @@ void EnIk_SetupDie(EnIk* this) { this->actor.speedXZ = 0.0f; Animation_MorphToPlayOnce(&this->skelAnime, &gIronKnuckleDeathAnim, -4.0f); this->timer = 24; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IRONNACK_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_IRONNACK_DEAD); this->actionFunc = EnIk_Die; } @@ -698,7 +698,7 @@ void EnIk_Die(EnIk* this, PlayState* play) { } } } else if (Animation_OnFrame(&this->skelAnime, 23.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IRONNACK_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_IRONNACK_WALK); } } @@ -793,7 +793,7 @@ void EnIk_UpdateDamage(EnIk* this, PlayState* play) { this->drawArmorFlags = 1; this->colliderCylinder.base.colType = 3; this->actor.colChkInfo.damageTable = &sDamageTableNoArmor; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IRONNACK_ARMOR_OFF_DEMO); + Actor_PlaySfx(&this->actor, NA_SE_EN_IRONNACK_ARMOR_OFF_DEMO); EnIk_SetupCutscene(this); } else if (this->drawArmorFlags) { if (this->actor.colChkInfo.damageEffect == DMG_EFF_ICE) { @@ -811,7 +811,7 @@ void EnIk_UpdateDamage(EnIk* this, PlayState* play) { } else if (this->actor.colChkInfo.damageEffect == DMG_EFF_LIGHT_SPARKS) { EnIk_HitArmor(this, play); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IRONNACK_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_IRONNACK_DAMAGE); if (this->actor.colChkInfo.health != 0) { EnIk_SetupReactToAttack(this, true); } else { @@ -819,8 +819,8 @@ void EnIk_UpdateDamage(EnIk* this, PlayState* play) { } } } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IRONNACK_ARMOR_HIT); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IRONNACK_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_IRONNACK_ARMOR_HIT); + Actor_PlaySfx(&this->actor, NA_SE_EN_IRONNACK_DAMAGE); if (this->actor.colChkInfo.damageEffect == 4) { EnIk_HitArmor(this, play); } diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index 3a83564e56..df5c41b029 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -170,11 +170,11 @@ s32 func_808F3178(EnIn* this, PlayState* play) { this->unk260 = tmp = SubS_IsFloorAbove(play, &this->unk248, -6.0f); if (this->unk260 != 0 && prevUnk260 == 0 && tmp) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_PL_WALK_CONCRETE); + Actor_PlaySfx(&this->actor, NA_SE_PL_WALK_CONCRETE); } this->unk261 = tmp = SubS_IsFloorAbove(play, &this->unk254, -6.0f); if (this->unk261 != 0 && prevUnk261 == 0 && tmp) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_PL_WALK_CONCRETE); + Actor_PlaySfx(&this->actor, NA_SE_PL_WALK_CONCRETE); } return 0; @@ -214,7 +214,7 @@ s32 func_808F3334(EnIn* this, PlayState* play) { if (this->colliderJntSph.base.atFlags & AT_BOUNCED) { return 0; } - Actor_PlaySfxAtPos(&player->actor, NA_SE_PL_BODY_HIT); + Actor_PlaySfx(&player->actor, NA_SE_PL_BODY_HIT); func_800B8D98(play, &this->actor, 3.0f, this->actor.yawTowardsPlayer, 6.0f); } return 1; @@ -313,7 +313,7 @@ void func_808F374C(EnIn* this, PlayState* play) { } } if (this->skelAnime.animation == &object_in_Anim_0198A8 && Animation_OnFrame(&this->skelAnime, 20.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_IN_CRY_0); + Actor_PlaySfx(&this->actor, NA_SE_VO_IN_CRY_0); } if (SkelAnime_Update(&this->skelAnime)) { this->unk488 %= ARRAY_COUNT(sAnimations); @@ -376,9 +376,9 @@ void func_808F39DC(EnIn* this, PlayState* play) { this->actor.textId = textId; this->actionFunc = func_808F395C; if (this->unk4B0 == WEEKEVENTREG_RACE_FLAG_2) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_IN_LOST); + Actor_PlaySfx(&this->actor, NA_SE_VO_IN_LOST); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_IN_JOY0); + Actor_PlaySfx(&this->actor, NA_SE_VO_IN_JOY0); } } @@ -1335,9 +1335,9 @@ void func_808F5C98(EnIn* this, PlayState* play) { } if (this->unk4A8 == 2) { if (this->unk4B0 == WEEKEVENTREG_RACE_FLAG_2) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_IN_LOST); + Actor_PlaySfx(&this->actor, NA_SE_VO_IN_LOST); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_IN_JOY0); + Actor_PlaySfx(&this->actor, NA_SE_VO_IN_JOY0); } this->unk4A8 = 3; } else if (this->unk4A8 < 3) { 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 9eae19437c..9031e9ed34 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -112,7 +112,7 @@ void func_8091A9E4(EnInsect* this) { return; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_MUSI_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_MUSI_WALK); this->unk_316 = 3.0f / CLAMP_MIN(this->skelAnime.playSpeed, 0.1f); if (this->unk_316 < 2) { @@ -325,7 +325,7 @@ void func_8091B2D8(EnInsect* this, PlayState* play) { void func_8091B3D0(EnInsect* this) { this->unk_312 = 60; this->skelAnime.playSpeed = 1.9f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALTURA_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALTURA_BOUND); Math_Vec3f_Copy(&this->actor.home.pos, &this->actor.world.pos); this->actionFunc = func_8091B440; this->unk_30C &= ~0x100; diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c index 42104bd589..5d16c1fcde 100644 --- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c +++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c @@ -2575,7 +2575,7 @@ void func_80B48848(EnInvadepoh* this, PlayState* play) { func_80B43E6C(this, 6, this->behaviorInfo.unk4C, 0x46); if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_40) && (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 7.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_ROMANI_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_ROMANI_WALK); } if (this->actionTimer > 0) { this->actionTimer--; @@ -3028,7 +3028,7 @@ void func_80B49C38(EnInvadepoh* this, PlayState* play) { if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_40) && (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 7.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_ROMANI_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_ROMANI_WALK); } if (this->clockTime >= 0.9999f) { Actor_Kill(&this->actor); @@ -3254,7 +3254,7 @@ void func_80B4A67C(EnInvadepoh* this, PlayState* play) { } if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_40) && (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 7.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_ROMANI_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_ROMANI_WALK); } if (this->pathIndex == this->endPoint) { func_80B4A2C0(this); @@ -3528,7 +3528,7 @@ void func_80B4B3DC(EnInvadepoh* this) { s32 pad; if (Animation_OnFrame(&this->skelAnime, 1.0f) || Animation_OnFrame(&this->skelAnime, 7.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_MONKEY_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_MONKEY_WALK); } } @@ -3591,7 +3591,7 @@ void func_80B4B564(EnInvadepoh* this, PlayState* play) { this->actionTimer--; } else if (this->unk3BC >= 0) { if ((D_80B50348 == 0) && (Rand_ZeroOne() < 0.4f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SMALL_DOG_GROAN); + Actor_PlaySfx(&this->actor, NA_SE_EV_SMALL_DOG_GROAN); } func_80B4B724(this); } else { @@ -3612,7 +3612,7 @@ void func_80B4B768(EnInvadepoh* this, PlayState* play) { 0x64); func_80B44E90(this, play); if (Animation_OnFrame(&this->skelAnime, 13.0f) || Animation_OnFrame(&this->skelAnime, 19.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SMALL_DOG_ANG_BARK); + Actor_PlaySfx(&this->actor, NA_SE_EV_SMALL_DOG_ANG_BARK); } if (this->animPlayFlag) { func_80B4B510(this); @@ -3786,7 +3786,7 @@ void func_80B4BC4C(EnInvadepoh* this, PlayState* play) { if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_40) && (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 12.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_ROMANI_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_ROMANI_WALK); } if (gSaveContext.save.time > CLOCK_TIME(20, 15)) { Actor_Kill(&this->actor); @@ -4000,7 +4000,7 @@ void func_80B4C730(EnInvadepoh* this, PlayState* play) { if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_40) && (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 7.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_ROMANI_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_ROMANI_WALK); } if (this->clockTime >= 0.9999f) { diff --git a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c index 03cc41f20e..05855bb204 100644 --- a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c +++ b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c @@ -93,7 +93,7 @@ s32 EnJcMato_CheckForHit(EnJcMato* this, PlayState* play) { this->collider.dim.worldSphere.center.z = this->pos.z; if ((this->collider.base.acFlags & AC_HIT) && !this->hitFlag && (this->actor.colChkInfo.damageEffect == 0xF)) { this->collider.base.acFlags &= ~AC_HIT; - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); play->interfaceCtx.minigamePoints = 1; this->hitFlag = true; return 1; diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c index 2db753d01e..59e860c200 100644 --- a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c +++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c @@ -561,19 +561,19 @@ s32 func_80C14BCC(EnJgameTsn* this, PlayState* play) { } if (phi_s3 == this->unk_218) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); *this->unk_208[phi_s3] |= OBJLUPYGAMELIFT_DISPLAY_CORRECT; play->interfaceCtx.minigamePoints = 1; return true; } if (*this->unk_208[phi_s3] & OBJLUPYGAMELIFT_IGNITE_FIRE) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); *this->unk_208[phi_s3] |= OBJLUPYGAMELIFT_DISPLAY_CORRECT; play->interfaceCtx.minigamePoints = 1; } else { *this->unk_208[phi_s3] |= OBJLUPYGAMELIFT_DISPLAY_INCORRECT; - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_ERROR); + Actor_PlaySfx(&this->actor, NA_SE_SY_ERROR); } } diff --git a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c index 81415caf5e..fbe97b109c 100644 --- a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c +++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c @@ -539,7 +539,7 @@ void func_80B85FA8(EnKaizoku* this, PlayState* play) { func_800B7298(play, &this->picto.actor, 4); Actor_SpawnFloorDustRing(play, &this->picto.actor, &this->leftFootPos, 3.0f, 2, 2.0f, 0, 0, 0); Actor_SpawnFloorDustRing(play, &this->picto.actor, &this->rightFootPos, 3.0f, 2, 2.0f, 0, 0, 0); - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_PIRATE_ONGND); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_PIRATE_ONGND); } if (curFrame >= 11.0f) { @@ -583,7 +583,7 @@ void func_80B85FA8(EnKaizoku* this, PlayState* play) { case 5: Math_ApproachF(&this->unk_5E0, 2.0f, 0.2f, 1.0f); if (Animation_OnFrame(&this->skelAnime, 20.0f)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_BOSU_SWORD); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_BOSU_SWORD); } if (curFrame >= 30.0f) { this->unk_598 = 0; @@ -713,7 +713,7 @@ void func_80B868B8(EnKaizoku* this, PlayState* play) { EnKaizoku_ChangeAnim(this, EN_KAIZOKU_ANIM_15); textId = this->unk_2CA * 4 + this->unk_2C8; Message_StartTextbox(play, D_80B8A8D0[textId], &this->picto.actor); - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_LAST2_SHOUT); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_LAST2_SHOUT); this->unk_598 = 0; this->unk_59C++; } @@ -785,10 +785,10 @@ void func_80B86B74(EnKaizoku* this, PlayState* play) { case 1: if (this->frameCount <= curFrame) { if (this->unk_2D9 == 0) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_PIRATE_DAMM_BREATH); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_PIRATE_DAMM_BREATH); this->unk_2D9 = 1; } else { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_PIRATE_BREATH); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_PIRATE_BREATH); } } @@ -820,7 +820,7 @@ void func_80B86B74(EnKaizoku* this, PlayState* play) { if (this->unk_5A0 == 0x12) { Actor* temp_v0_2; - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_PIRATE_SHOUT); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_PIRATE_SHOUT); temp_v0_2 = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ARROW, this->picto.actor.world.pos.x, this->picto.actor.world.pos.y + 10.0f, this->picto.actor.world.pos.z, this->picto.actor.shape.rot.x, this->picto.actor.shape.rot.y, @@ -989,11 +989,11 @@ void func_80B8760C(EnKaizoku* this, PlayState* play) { temp_ft0 = this->skelAnime.curFrame - this->skelAnime.playSpeed; temp_ft1 = this->skelAnime.curFrame + this->skelAnime.playSpeed; if (this->skelAnime.curFrame != 0.0f && ((temp_ft0 < 0 && temp_ft1 > 0) || (temp_ft0 < 5 && temp_ft1 >= 6))) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_GERUDOFT_WALK); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_GERUDOFT_WALK); } if (!(play->gameplayFrames & 0x5F)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_PIRATE_BREATH); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_PIRATE_BREATH); } if (this->unk_2B2 == 0) { @@ -1091,7 +1091,7 @@ void func_80B87C7C(EnKaizoku* this) { EnKaizoku_ChangeAnim(this, EN_KAIZOKU_ANIM_8); this->picto.actor.speedXZ = 6.5f; this->picto.actor.velocity.y = 15.0f; - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_TEKU_JUMP); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_TEKU_JUMP); this->picto.actor.world.rot.y = this->picto.actor.shape.rot.y; this->bodyCollider.info.elemType = ELEMTYPE_UNK4; this->bodyCollider.base.colType = COLTYPE_NONE; @@ -1136,7 +1136,7 @@ void func_80B87D3C(EnKaizoku* this, PlayState* play) { void func_80B87E28(EnKaizoku* this) { EnKaizoku_ChangeAnim(this, EN_KAIZOKU_ANIM_8); this->picto.actor.speedXZ = -8.0f; - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_TEKU_JUMP); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_TEKU_JUMP); this->bodyCollider.info.elemType = ELEMTYPE_UNK4; this->bodyCollider.base.colType = COLTYPE_NONE; this->swordCollider.info.elemType = ELEMTYPE_UNK4; @@ -1158,7 +1158,7 @@ void func_80B87E9C(EnKaizoku* this, PlayState* play) { } } if (!(play->state.frames & 0x5F)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_PIRATE_BREATH); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_PIRATE_BREATH); } } @@ -1185,7 +1185,7 @@ void func_80B87FDC(EnKaizoku* this, PlayState* play2) { this->picto.actor.speedXZ = 0.0f; if (Animation_OnFrame(&this->skelAnime, 1.0f)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_PIRATE_ATTACK); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_PIRATE_ATTACK); this->swordState = 1; } else if (Animation_OnFrame(&this->skelAnime, 6.0f)) { this->swordState = -1; @@ -1235,7 +1235,7 @@ void func_80B88214(EnKaizoku* this) { this->unk_2B2 = 0; this->picto.actor.speedXZ = 10.0f; this->picto.actor.world.rot.y = this->picto.actor.shape.rot.y = this->picto.actor.yawTowardsPlayer; - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_TEKU_JUMP); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_TEKU_JUMP); this->action = KAIZOKU_ACTION_5; this->actionFunc = func_80B88278; } @@ -1254,7 +1254,7 @@ void func_80B88278(EnKaizoku* this, PlayState* play) { } } if (!(play->gameplayFrames & 0x5F)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_PIRATE_BREATH); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_PIRATE_BREATH); } } @@ -1325,11 +1325,11 @@ void func_80B88378(EnKaizoku* this, PlayState* play) { } if (!(play->gameplayFrames & 0x5F)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_PIRATE_BREATH); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_PIRATE_BREATH); } if ((this->skelAnime.curFrame != 0.0f) && ((sp30 < 0 && sp2C > 0) || (sp30 < 4 && sp2C >= 5))) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_GERUDOFT_WALK); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_GERUDOFT_WALK); } } } @@ -1364,7 +1364,7 @@ void func_80B887AC(EnKaizoku* this, PlayState* play) { } } if (!(play->gameplayFrames & 0x5F)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_PIRATE_BREATH); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_PIRATE_BREATH); } } } @@ -1401,7 +1401,7 @@ void func_80B88964(EnKaizoku* this, PlayState* play) { Actor_SpawnFloorDustRing(play, &this->picto.actor, &this->rightFootPos, 3.0f, 2, 2.0f, 0, 0, 0); this->swordState = 1; this->picto.actor.speedXZ = 10.0f; - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_PIRATE_ATTACK); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_PIRATE_ATTACK); } else if (Animation_OnFrame(&this->skelAnime, 21.0f)) { this->picto.actor.speedXZ = 0.0f; } else if (Animation_OnFrame(&this->skelAnime, 24.0f)) { @@ -1528,12 +1528,12 @@ void func_80B88D6C(EnKaizoku* this, PlayState* play) { temp_ft5 = this->skelAnime.curFrame + this->skelAnime.playSpeed; if (this->skelAnime.curFrame != 0.0f) { if (((temp_ft4 < 0 && temp_ft5 > 0) || (temp_ft4 < 5 && temp_ft5 > 5))) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_GERUDOFT_WALK); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_GERUDOFT_WALK); } } if (!(play->gameplayFrames & 0x5F)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_PIRATE_BREATH); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_PIRATE_BREATH); } if (this->picto.actor.xzDistToPlayer <= 65.0f) { @@ -1565,7 +1565,7 @@ void func_80B891B8(EnKaizoku* this) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; } - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_COMMON_FREEZE); this->unk_2D8 = 1; if ((this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_SFX) && @@ -1632,7 +1632,7 @@ void func_80B893CC(EnKaizoku* this, PlayState* play) { this->picto.actor.flags |= ACTOR_FLAG_400; } - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_PIRATE_DAMAGE); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_PIRATE_DAMAGE); this->action = KAIZOKU_ACTION_14; this->actionFunc = func_80B894C0; } @@ -1678,7 +1678,7 @@ void func_80B8960C(EnKaizoku* this, PlayState* play) { this->unk_2D8 = 1; func_800B7298(play, &this->picto.actor, 0x7B); Enemy_StartFinishingBlow(play, &this->picto.actor); - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_PIRATE_DEAD); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_PIRATE_DEAD); this->picto.actor.flags |= ACTOR_FLAG_8000000; this->picto.actor.flags &= ~ACTOR_FLAG_1; this->picto.actor.flags &= ~ACTOR_FLAG_400; @@ -1753,7 +1753,7 @@ void func_80B8971C(EnKaizoku* this, PlayState* play) { this->unk_2D8 = 0; func_80B86B58(this); } else if (Animation_OnFrame(&this->skelAnime, 10.0f)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_GERUDOFT_DOWN); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_GERUDOFT_DOWN); } } @@ -1940,7 +1940,7 @@ void func_80B89A08(EnKaizoku* this, PlayState* play) { } this->bodyCollider.base.acFlags &= ~AC_HIT; - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_IT_SHIELD_BOUND); + Actor_PlaySfx(&this->picto.actor, NA_SE_IT_SHIELD_BOUND); EffectSsHitmark_SpawnFixedScale(play, 3, &pos); CollisionCheck_SpawnShieldParticlesMetal(play, &pos); } diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index 3ef617aec1..e60efdf6b5 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -210,24 +210,24 @@ s32 EnKakasi_ValidatePictograph(PlayState* play, Actor* thisx) { void EnKakasi_CheckAnimationSfx(EnKakasi* this) { if (this->animIndex == ENKAKASI_ANIM_SIDEWAYS_SHAKING || this->animIndex == ENKAKASI_ANIM_ARMS_CROSSED_STILL) { if (Animation_OnFrame(&this->skelanime, 1.0f) || Animation_OnFrame(&this->skelanime, 8.0f)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EV_KAKASHI_SWING); + Actor_PlaySfx(&this->picto.actor, NA_SE_EV_KAKASHI_SWING); } } if (this->animIndex == ENKAKASI_ANIM_HOPPING_REGULAR || this->animIndex == ENKAKASI_ANIM_SLOWROLL) { if (Animation_OnFrame(&this->skelanime, 4.0f) || Animation_OnFrame(&this->skelanime, 8.0f)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EV_KAKASHI_SWING); + Actor_PlaySfx(&this->picto.actor, NA_SE_EV_KAKASHI_SWING); } if (Animation_OnFrame(&this->skelanime, 1.0f) || Animation_OnFrame(&this->skelanime, 9.0f) || Animation_OnFrame(&this->skelanime, 16.0f)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_IT_KAKASHI_JUMP); + Actor_PlaySfx(&this->picto.actor, NA_SE_IT_KAKASHI_JUMP); } if (Animation_OnFrame(&this->skelanime, 18.0f)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EV_KAKASHI_ROLL); + Actor_PlaySfx(&this->picto.actor, NA_SE_EV_KAKASHI_ROLL); } } if (this->animIndex == ENKAKASI_ANIM_SPIN_REACH_OFFER || this->animIndex == ENKAKASI_ANIM_TWIRL) { if (Animation_OnFrame(&this->skelanime, 1.0f)) { - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EV_KAKASH_LONGI_ROLL); + Actor_PlaySfx(&this->picto.actor, NA_SE_EV_KAKASH_LONGI_ROLL); } } } @@ -620,7 +620,7 @@ void EnKakasi_TeachingSong(EnKakasi* this, PlayState* play) { this->unk190 = 0; this->unkCounter1A4 = 0; ActorCutscene_Stop(this->actorCutscenes[0]); - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_YASE_DEAD); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_YASE_DEAD); if (this) {} this->unkState196 = 2; this->subCamId = SUB_CAM_ID_DONE; @@ -1007,7 +1007,7 @@ void EnKakasi_DiggingAway(EnKakasi* this, PlayState* play) { } else { Actor_SpawnFloorDustRing(play, &this->picto.actor, &this->picto.actor.world.pos, this->picto.actor.shape.shadowScale - 20.0f, 5, 4.0f, 200, 10, 1); - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_AKINDONUTS_HIDE); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_AKINDONUTS_HIDE); } } @@ -1056,7 +1056,7 @@ void EnKakasi_SetupRiseOutOfGround(EnKakasi* this, PlayState* play) { } else { ActorCutscene_StartAndSetUnkLinkFields(this->actorCutscenes[cutsceneIndex], &this->picto.actor); - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_AKINDONUTS_HIDE); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_AKINDONUTS_HIDE); this->picto.actor.draw = EnKakasi_Draw; this->unkState196 = 6; this->actionFunc = EnKakasi_RisingOutOfGround; @@ -1073,7 +1073,7 @@ void EnKakasi_RisingOutOfGround(EnKakasi* this, PlayState* play) { if ((play->gameplayFrames % 8) == 0) { Actor_SpawnFloorDustRing(play, &this->picto.actor, &this->picto.actor.world.pos, this->picto.actor.shape.shadowScale - 20.0f, 10, 8.0f, 500, 10, 1); - Actor_PlaySfxAtPos(&this->picto.actor, NA_SE_EN_AKINDONUTS_HIDE); + Actor_PlaySfx(&this->picto.actor, NA_SE_EN_AKINDONUTS_HIDE); } Math_ApproachF(&this->picto.actor.shape.yOffset, 0.0f, 0.5f, 200.0f); } else { diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.c b/src/overlays/actors/ovl_En_Kame/z_en_kame.c index e9139c9346..a54bfdc2da 100644 --- a/src/overlays/actors/ovl_En_Kame/z_en_kame.c +++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.c @@ -193,7 +193,7 @@ void func_80AD70EC(EnKame* this, PlayState* play) { Player* player = GET_PLAYER(play); if (Animation_OnFrame(&this->skelAnime1, 10.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PAMET_VOICE); + Actor_PlaySfx(&this->actor, NA_SE_EN_PAMET_VOICE); this->unk_2A0 = 40; } @@ -237,7 +237,7 @@ void func_80AD7254(EnKame* this, PlayState* play) { if (this->unk_29E == 0) { func_80AD70A0(this); } else if (Animation_OnFrame(&this->skelAnime1, 0.0f) || Animation_OnFrame(&this->skelAnime1, 15.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PAMET_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_PAMET_WALK); } } @@ -248,7 +248,7 @@ void func_80AD73A8(EnKame* this) { this->unk_2A8 = 1.0f; this->actor.speedXZ = 0.0f; if (this->unk_2A0 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PAMET_VOICE); + Actor_PlaySfx(&this->actor, NA_SE_EN_PAMET_VOICE); } this->actionFunc = func_80AD7424; } @@ -313,7 +313,7 @@ void func_80AD76CC(EnKame* this) { func_80AD7568(this); this->unk_29E = 15; this->actor.speedXZ = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PAMET_CUTTER_ON); + Actor_PlaySfx(&this->actor, NA_SE_EN_PAMET_CUTTER_ON); this->unk_2BC.y = this->actor.home.pos.y - 100.0f; } else { this->actor.world.rot.y = Actor_WorldYawTowardPoint(&this->actor, &this->actor.home.pos); @@ -383,7 +383,7 @@ void func_80AD7948(EnKame* this, PlayState* play) { if (Math_ScaledStepToS(&this->unk_2A6, this->unk_29E, (s32)(this->unk_2A6 * 0.09f) + 45)) { if (this->unk_29E == 0) { if (this->unk_2AC >= 1.0f) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PAMET_CUTTER_OFF); + Actor_PlaySfx(&this->actor, NA_SE_EN_PAMET_CUTTER_OFF); } this->unk_2AC -= 0.1f; this->collider.base.atFlags &= ~AT_ON; @@ -440,7 +440,7 @@ void func_80AD7C54(EnKame* this) { this->collider.base.atFlags &= ~(AT_BOUNCED | AT_HIT); this->actor.flags &= ~ACTOR_FLAG_10; this->actor.shape.rot.z = 0; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PAMET_REVERSE); + Actor_PlaySfx(&this->actor, NA_SE_EN_PAMET_REVERSE); this->actionFunc = func_80AD7D40; } @@ -472,7 +472,7 @@ void func_80AD7E0C(EnKame* this, PlayState* play) { Animation_PlayOnce(&this->skelAnime1, &object_tl_Anim_0027D8); } else { Animation_PlayOnce(&this->skelAnime1, &object_tl_Anim_002F88); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PAMET_ROAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_PAMET_ROAR); } } } else { @@ -482,7 +482,7 @@ void func_80AD7E0C(EnKame* this, PlayState* play) { void func_80AD7EC0(EnKame* this) { Animation_MorphToPlayOnce(&this->skelAnime1, &object_tl_Anim_002510, -3.0f); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PAMET_WAKEUP); + Actor_PlaySfx(&this->actor, NA_SE_EN_PAMET_WAKEUP); this->actionFunc = func_80AD7F10; } @@ -527,7 +527,7 @@ void func_80AD8060(EnKame* this) { Animation_Change(&this->skelAnime1, &object_tl_Anim_0008B4, 1.0f, 0.0f, sp36, ANIMMODE_ONCE, -3.0f); Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, sp36); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PAMET_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_PAMET_DAMAGE); this->collider.base.acFlags &= ~AC_ON; this->actionFunc = func_80AD810C; } @@ -557,7 +557,7 @@ void func_80AD8148(EnKame* this, PlayState* play) { this->actor.bgCheckFlags &= ~0x1; this->actor.flags &= ~ACTOR_FLAG_1; this->actor.flags |= ACTOR_FLAG_10; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PAMET_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_PAMET_DEAD); this->unk_29E = 0; this->actionFunc = func_80AD825C; } @@ -565,7 +565,7 @@ void func_80AD8148(EnKame* this, PlayState* play) { void func_80AD825C(EnKame* this, PlayState* play) { SkelAnime_Update(&this->skelAnime1); if ((this->actor.bgCheckFlags & 1) && (this->actor.velocity.y < 0.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_HIPLOOP_LAND); + Actor_PlaySfx(&this->actor, NA_SE_EN_HIPLOOP_LAND); func_80AD8364(this); } else { if (this->unk_29E == 1) { @@ -644,7 +644,7 @@ void func_80AD84C0(EnKame* this, PlayState* play) { if (this->actor.colChkInfo.damageEffect == 5) { this->unk_2A2 = 40; Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->drawDmgEffScale = 0.6f; this->drawDmgEffAlpha = 2.0f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_SMALL; @@ -652,7 +652,7 @@ void func_80AD84C0(EnKame* this, PlayState* play) { } else if (this->actor.colChkInfo.damageEffect == 1) { this->unk_2A2 = 40; Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); func_80AD7FA4(this); } else if (this->actor.colChkInfo.damageEffect == 3) { func_80AD6F9C(this); diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index 54df1bcd70..a718d141f5 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -384,7 +384,7 @@ void EnKanban_Update(Actor* thisx, PlayState* play) { piece->actor.flags &= ~ACTOR_FLAG_1; piece->actor.flags |= ACTOR_FLAG_2000000; this->cutMarkTimer = 5; - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_SWORD_STRIKE); + Actor_PlaySfx(&this->actor, NA_SE_IT_SWORD_STRIKE); } } } @@ -497,14 +497,14 @@ void EnKanban_Update(Actor* thisx, PlayState* play) { if (this->actor.bgCheckFlags & 8) { if (!(this->actor.bgCheckFlags & 1)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WOODPLATE_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EV_WOODPLATE_BOUND); } this->actor.speedXZ *= -0.5f; } if (this->actor.bgCheckFlags & 0x40) { this->actionState = ENKANBAN_WATER; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMB_DROP_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMB_DROP_WATER); this->bounceX = this->bounceZ = 0; this->actor.world.pos.y += this->actor.depthInWater; EffectSsGSplash_Spawn(play, &this->actor.world.pos, NULL, NULL, 0, (this->partCount * 20) + 300); @@ -622,9 +622,9 @@ void EnKanban_Update(Actor* thisx, PlayState* play) { if (bounced) { if (this->unk_197 > 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_PL_WALK_SNOW); + Actor_PlaySfx(&this->actor, NA_SE_PL_WALK_SNOW); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WOODPLATE_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EV_WOODPLATE_BOUND); } } diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index dd8d513e49..354bcb630f 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -260,7 +260,7 @@ void EnKarebaba_Idle(EnKarebaba* this, PlayState* play) { void EnKarebaba_SetupAwaken(EnKarebaba* this) { Animation_Change(&this->skelAnime, &gDekuBabaFastChompAnim, 4.0f, 0.0f, Animation_GetLastFrame(&gDekuBabaFastChompAnim), ANIMMODE_LOOP, -3.0f); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKU_WAKEUP); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKU_WAKEUP); this->actionFunc = EnKarebaba_Awaken; } @@ -313,7 +313,7 @@ void EnKarebaba_Upright(EnKarebaba* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 12.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_MIZUBABA1_MOUTH); + Actor_PlaySfx(&this->actor, NA_SE_EN_MIZUBABA1_MOUTH); } if (this->hurtCollider.base.acFlags & AC_HIT) { @@ -347,7 +347,7 @@ void EnKarebaba_Spin(EnKarebaba* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 12.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_MIZUBABA1_MOUTH); + Actor_PlaySfx(&this->actor, NA_SE_EN_MIZUBABA1_MOUTH); } temp = 20 - this->timer; @@ -385,7 +385,7 @@ void EnKarebaba_SetupDying(EnKarebaba* this) { this->timer = 3; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKU_JR_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKU_JR_DEAD); this->actor.flags |= (ACTOR_FLAG_10 | ACTOR_FLAG_20); this->actionFunc = EnKarebaba_Dying; } @@ -424,7 +424,7 @@ void EnKarebaba_Dying(EnKarebaba* this, PlayState* play) { } if (this->actor.bgCheckFlags & 2) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); this->timer = 1; } } else if (this->timer == 1) { @@ -448,7 +448,7 @@ void EnKarebaba_Dying(EnKarebaba* this, PlayState* play) { } void EnKarebaba_SetupShrinkDie(EnKarebaba* this) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEKU_JR_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEKU_JR_DEAD); this->actor.flags |= (ACTOR_FLAG_10 | ACTOR_FLAG_20); this->actor.flags &= ~ACTOR_FLAG_1; if (this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) { diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c index c02b00b5aa..ce98bfdc38 100644 --- a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c +++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c @@ -534,13 +534,13 @@ void func_80B27188(EnKendoJs* this, PlayState* play) { switch (func_80B26BF8(this, play)) { case 0: this->unk_286 = 0; - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); player->stateFlags1 |= PLAYER_STATE1_20; func_80B26EB4(this, play); break; case 1: - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_ERROR); + Actor_PlaySfx(&this->actor, NA_SE_SY_ERROR); this->unk_286 = 0; player->stateFlags1 |= PLAYER_STATE1_20; Message_StartTextbox(play, 0x2729, &this->actor); @@ -634,7 +634,7 @@ void func_80B274BC(EnKendoJs* this, PlayState* play) { } else { play->interfaceCtx.minigamePoints = 1; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); this->unk_28E = 0; } func_80B2783C(this, play); diff --git a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c index f2733c3c1c..a15d4d128e 100644 --- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c +++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c @@ -443,7 +443,7 @@ void func_80B4163C(EnKgy* this, PlayState* play) { this->lightInfo.params.point.y = this->unk_2C0.y; this->lightInfo.params.point.z = this->unk_2C0.z; this->unk_300 = 200; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SWORD_FORGE); + Actor_PlaySfx(&this->actor, NA_SE_EV_SWORD_FORGE); break; } diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c index 468368cd59..910bf49c3b 100644 --- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c +++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c @@ -981,7 +981,7 @@ void func_80A5D7C4(EnKusa2* this, PlayState* play) { } this->unk_1C8 = Rand_S16Offset(72, 16); this->actor.velocity.y = 8.8f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_WALK); func_80A5DC70(this); } @@ -1055,7 +1055,7 @@ void func_80A5D9C8(EnKusa2* this, PlayState* play) { this->unk_1D0--; if (this->unk_1D0 <= 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KUSAMUSHI_VIBE); + Actor_PlaySfx(&this->actor, NA_SE_EN_KUSAMUSHI_VIBE); this->unk_1D0 = (Rand_Next() >> 0x1D) + 14; } @@ -1090,7 +1090,7 @@ void func_80A5DC98(EnKusa2* this, PlayState* play) { if (this->actor.bgCheckFlags & 1) { func_80A5CD0C(this); func_80A5BB40(this, play, 1); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_WALK); func_80A5DE18(this); } else if (this->actor.bgCheckFlags & 0x20) { func_80A5BDB0(this, play); @@ -1122,14 +1122,14 @@ void func_80A5DEB4(EnKusa2* this, PlayState* play) { if (this->unk_1D0 > 0) { this->unk_1D0--; if (this->unk_1D0 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KUSAMUSHI_VIBE); + Actor_PlaySfx(&this->actor, NA_SE_EN_KUSAMUSHI_VIBE); } } if (this->unk_1D1 > 0) { this->unk_1D1--; if (this->unk_1D1 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KUSAMUSHI_VIBE); + Actor_PlaySfx(&this->actor, NA_SE_EN_KUSAMUSHI_VIBE); } } diff --git a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c index aafc12b516..9c0eafeb15 100644 --- a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c +++ b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c @@ -284,7 +284,7 @@ void func_80AE9FC8(EnLiftNuts* this) { Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, 3); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); this->actionFunc = func_80AEA044; } @@ -301,7 +301,7 @@ void func_80AEA0B4(EnLiftNuts* this) { this->actionFunc = func_80AEA1A0; } else { Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, 2); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); this->actionFunc = func_80AEA128; } } @@ -598,7 +598,7 @@ void func_80AEABF0(EnLiftNuts* this) { if (this->actionFunc != func_80AEB698) { if (func_80AE9B4C(0, 0)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); } Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, 16); } @@ -743,7 +743,7 @@ void func_80AEB148(EnLiftNuts* this, PlayState* play) { SET_EVENTINF(EVENTINF_34); Interface_StartTimer(4, 0); func_80AE9B4C(1, 2); - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_FOUND); + Actor_PlaySfx(&this->actor, NA_SE_SY_FOUND); func_80AEB280(this); } } diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c index b988fcce32..b1aa2f76b4 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -112,7 +112,7 @@ void EnLight_Update(Actor* thisx, PlayState* play) { func_80865BF8(this, play); if ((this->actor.params >= 0) && !ENLIGHT_GET_4000(&this->actor)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_TORCH - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EV_TORCH - SFX_FLAG); } } @@ -156,7 +156,7 @@ void func_80865F38(Actor* thisx, PlayState* play) { func_80865BF8(this, play); if ((this->actor.params >= 0) && (sp2C == true)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_TORCH - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EV_TORCH - SFX_FLAG); } } diff --git a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c index ac376bb166..1be03e655b 100644 --- a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c +++ b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c @@ -157,7 +157,7 @@ void EnLookNuts_Patrol(EnLookNuts* this, PlayState* play) { this->actor.speedXZ = 2.0f; if (Animation_OnFrame(&this->skelAnime, 1.0f) || Animation_OnFrame(&this->skelAnime, 5.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_WALK); } if (D_80A6862C != 0) { @@ -273,7 +273,7 @@ void EnLookNuts_DetectedPlayer(EnLookNuts* this, PlayState* play) { void EnLookNuts_RunToPlayer(EnLookNuts* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if (Animation_OnFrame(&this->skelAnime, 1.0f) || Animation_OnFrame(&this->skelAnime, 5.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_WALK); } this->actor.speedXZ = 4.0f; diff --git a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c index 973e915531..62d848dd9a 100644 --- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c @@ -267,7 +267,7 @@ void EnMa4_RunInCircles(EnMa4* this, PlayState* play) { } if (sAnimIndex == 13 && Animation_OnFrame(&this->skelAnime, 37.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ROMANI_BOW_FLICK); + Actor_PlaySfx(&this->actor, NA_SE_EV_ROMANI_BOW_FLICK); } sp34.x = this->pathPoints[this->pathIndex].x; @@ -300,7 +300,7 @@ void EnMa4_RunInCircles(EnMa4* this, PlayState* play) { Actor_MoveWithGravity(&this->actor); if (this->skelAnime.animation == &gRomaniRunAnim) { if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 4.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_ROMANI_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_ROMANI_WALK); } } } diff --git a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c index 65e3d8b387..95890455cf 100644 --- a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c +++ b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c @@ -525,7 +525,7 @@ void func_80B37CA0(EnMaruta* this, PlayState* play) { ((this->actionFunc == func_80B37428) && !(this->actor.world.pos.y < (this->actor.floorHeight - 20.0f)))) { if ((this->collider.base.acFlags & AC_HIT) && (this->actionFunc == func_80B372CC)) { this->collider.base.acFlags &= ~AC_HIT; - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_SWORD_STRIKE); + Actor_PlaySfx(&this->actor, NA_SE_IT_SWORD_STRIKE); if (D_80B386CC[player->meleeWeaponAnimation] != 0) { s32 temp = D_80B386CC[player->meleeWeaponAnimation] + 1; @@ -587,7 +587,7 @@ void func_80B37EC0(EnMaruta* this, PlayState* play) { if (this->actor.velocity.y < -this->actor.gravity) { func_80B382E4(play, sp34); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_LOG_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EV_LOG_BOUND); this->actor.velocity.y *= -0.6f; func_80B38060(this, &sp34); } diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c index a8a059c1ff..9eed098866 100644 --- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c @@ -189,7 +189,7 @@ void EnMinifrog_Jump(EnMinifrog* this) { if (Animation_OnFrame(&this->skelAnime, 4.0f)) { this->actor.bgCheckFlags &= ~1; this->actor.velocity.y = 6.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FROG_JUMP); + Actor_PlaySfx(&this->actor, NA_SE_EV_FROG_JUMP); this->jumpState = MINIFROG_STATE_AIR; } break; diff --git a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c index bf585ff61a..a18f712476 100644 --- a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c +++ b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c @@ -202,7 +202,7 @@ void EnMinislime_AddIceShardEffect(EnMinislime* this) { } this->frozenAlpha = 0; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ICE_BROKEN); + Actor_PlaySfx(&this->actor, NA_SE_EV_ICE_BROKEN); } void EnMinislime_AddIceSmokeEffect(EnMinislime* this, PlayState* play) { @@ -391,7 +391,7 @@ void EnMinislime_SetupGrowAndShrink(EnMinislime* this) { this->actor.scale.x = 0.19f; this->actor.scale.y = 0.044999998f; this->actor.scale.z = 0.19f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_SLIME_JUMP2); + Actor_PlaySfx(&this->actor, NA_SE_EN_SLIME_JUMP2); this->actionFunc = EnMinislime_GrowAndShrink; } @@ -453,7 +453,7 @@ void EnMinislime_Idle(EnMinislime* this, PlayState* play) { void EnMinislime_SetupBounce(EnMinislime* this) { this->actor.speedXZ = 0.0f; this->bounceTimer = (this->actionFunc == EnMinislime_GrowAndShrink) ? 1 : 4; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_SLIME_JUMP1); + Actor_PlaySfx(&this->actor, NA_SE_EN_SLIME_JUMP1); this->actionFunc = EnMinislime_Bounce; } diff --git a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c index c89fdcdfaa..612e0d3db4 100644 --- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c +++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c @@ -291,7 +291,7 @@ void func_80A4E58C(EnMkk* this) { this->unk_14B |= 1; this->actor.speedXZ = 3.0f; this->actor.velocity.y = 5.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KUROSUKE_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_KUROSUKE_ATTACK); this->collider.base.atFlags |= AT_ON; Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 0x800); this->actionFunc = func_80A4E60C; @@ -313,7 +313,7 @@ void func_80A4E67C(EnMkk* this) { this->actor.flags &= ~ACTOR_FLAG_1; this->collider.base.acFlags &= ~AC_ON; this->actor.flags |= ACTOR_FLAG_10; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DEAD); this->alpha = 254; func_800BE568(&this->actor, &this->collider); this->actor.speedXZ = 7.0f; @@ -334,7 +334,7 @@ void func_80A4E72C(EnMkk* this, PlayState* play) { temp.z = this->actor.world.pos.z; EffectSsDeadDb_Spawn(play, &temp, &gZeroVec3f, &gZeroVec3f, &sEffPrimColors[this->actor.params], &sEffEnvColors[this->actor.params], 0x46, 4, 0xC); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EXTINCT); + Actor_PlaySfx(&this->actor, NA_SE_EN_EXTINCT); if (this->unk_14C != 0) { Item_DropCollectibleRandom(play, &this->actor, &this->actor.world.pos, this->unk_14C * 0x10); } 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 d9b0bf5076..0cc91d53dc 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -124,7 +124,7 @@ void func_80965DB4(EnMm* this, PlayState* play) { if (Actor_HasParent(&this->actor, play)) { func_80965BBC(this); - Actor_PlaySfxAtPos(&this->actor, NA_SE_PL_PULL_UP_ROCK); + Actor_PlaySfx(&this->actor, NA_SE_PL_PULL_UP_ROCK); } else { if ((this->actor.velocity.y > 0.0f) && (this->actor.bgCheckFlags & 0x10)) { this->actor.velocity.y = 0.0f; @@ -135,7 +135,7 @@ void func_80965DB4(EnMm* this, PlayState* play) { this->actor.world.rot.y += BINANG_SUB(0x8000, (s16)(angle * 2)); this->actor.speedXZ *= 0.5f; CollisionCheck_SpawnShieldParticles(play, &this->actor.world.pos); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_HUMAN_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EV_HUMAN_BOUND); } if (!(this->actor.bgCheckFlags & 1)) { @@ -169,7 +169,7 @@ void func_80965DB4(EnMm* this, PlayState* play) { this->actor.bgCheckFlags &= ~1; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_HUMAN_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EV_HUMAN_BOUND); } else { Actor_PickUp(&this->actor, play, GI_NONE, 50.0f, 30.0f); } diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c index 3e58691cc7..a94ade409e 100644 --- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c @@ -365,7 +365,7 @@ void func_80A6F9DC(EnMm3* this, PlayState* play) { if (((this->unk_2B4 == 0x279D) || (this->unk_2B4 == 0x27A0) || (this->unk_2B4 == 0x278B)) && Animation_OnFrame(&this->skelAnime, 8.0f) && (this->unk_2AE == 0)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_LIE_DOWN_ON_BED); + Actor_PlaySfx(&this->actor, NA_SE_EV_LIE_DOWN_ON_BED); this->unk_2AE = 1; } } diff --git a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c index c10244e552..30e87a669d 100644 --- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c +++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c @@ -204,7 +204,7 @@ void func_80A68BC8(EnMushi2* this) { if (this->unk_36C > 0) { this->unk_36C--; } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_MUSI_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_MUSI_WALK); this->unk_36C = 3.0f / CLAMP_MIN(this->skelAnime.playSpeed, 0.12f); if (this->unk_36C < 2) { @@ -823,7 +823,7 @@ void func_80A6A36C(EnMushi2* this, PlayState* play) { if (this->actor.bgCheckFlags & 0x20) { func_80A6AAA4(this); } else if (this->actor.bgCheckFlags & 1) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GERUDOFT_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_GERUDOFT_WALK); func_80A68F24(this); func_80A691EC(this, this->actor.floorPoly, -1.0f); func_80A69388(this); @@ -1049,7 +1049,7 @@ void func_80A6B078(EnMushi2* this) { this->unk_30C &= ~1; this->unk_368 = 50; this->skelAnime.playSpeed = 1.9f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALTURA_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALTURA_BOUND); func_80A68B6C(this); this->actionFunc = func_80A6B0D8; } diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c index 483d58c3d8..c1fb5ebe67 100644 --- a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c +++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c @@ -224,7 +224,7 @@ void EnNeoReeba_ChooseAction(EnNeoReeba* this, PlayState* play) { void EnNeoReeba_SetupSink(EnNeoReeba* this) { this->sinkRiseRate = 0.0f; this->skelAnime.playSpeed = 2.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); this->actionFunc = EnNeoReeba_Sink; } @@ -247,7 +247,7 @@ void EnNeoReeba_SetupRise(EnNeoReeba* this) { this->actor.draw = EnNeoReeba_Draw; this->sinkRiseRate = 300.0f; this->skelAnime.playSpeed = 2.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_APPEAR); this->actor.flags |= ACTOR_FLAG_1; this->actionFunc = EnNeoReeba_RiseOutOfGround; } @@ -268,7 +268,7 @@ void EnNeoReeba_RiseOutOfGround(EnNeoReeba* this, PlayState* play) { } void EnNeoReeba_SetupMove(EnNeoReeba* this) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIVA_MOVE); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIVA_MOVE); this->sfxTimer = 10; this->actionTimer = 60; this->actionFunc = EnNeoReeba_Move; @@ -289,7 +289,7 @@ void EnNeoReeba_Move(EnNeoReeba* this, PlayState* play) { } if (this->sfxTimer == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIVA_MOVE); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIVA_MOVE); this->sfxTimer = 10; } else { this->sfxTimer--; @@ -345,7 +345,7 @@ void EnNeoReeba_Bounce(EnNeoReeba* this, PlayState* play) { } void EnNeoReeba_SetupStun(EnNeoReeba* this) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->actionFunc = EnNeoReeba_Stunned; } @@ -378,7 +378,7 @@ void EnNeoReeba_SetupFrozen(EnNeoReeba* this) { this->stunTimer = 12; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->actionFunc = EnNeoReeba_Frozen; } @@ -408,7 +408,7 @@ void EnNeoReeba_SetupDamageAnim(EnNeoReeba* this) { this->velToTarget.z = Math_CosS(this->actor.yawTowardsPlayer) * -12.0f; this->rotationSpeed = 4551.0f; Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 25); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIVA_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIVA_DAMAGE); this->actionFunc = EnNeoReeba_DamageAnim; } @@ -448,7 +448,7 @@ void EnNeoReeba_SetupDeathEffects(EnNeoReeba* this) { this->actor.flags |= ACTOR_FLAG_8000000; this->actor.flags &= ~ACTOR_FLAG_1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIVA_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIVA_DEAD); this->actionFunc = EnNeoReeba_PlayDeathEffects; } diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 1c9212a63a..105d4d735d 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -154,7 +154,7 @@ void EnNiw_Init(Actor* thisx, PlayState* play) { } if (this->niwType == NIW_TYPE_HELD) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHICKEN_CRY_M); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHICKEN_CRY_M); this->sfxTimer1 = 30; this->heldTimer = 30; this->actor.flags &= ~ACTOR_FLAG_1; // targetable OFF @@ -366,8 +366,8 @@ void EnNiw_Idle(EnNiw* this, PlayState* play) { s16 nextAnimIndex; if (this->niwType == NIW_TYPE_REGULAR) { - if (Actor_HasParent(&this->actor, play)) { // picked up - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHICKEN_CRY_M); // crow + if (Actor_HasParent(&this->actor, play)) { // picked up + Actor_PlaySfx(&this->actor, NA_SE_EV_CHICKEN_CRY_M); // crow this->sfxTimer1 = 30; this->heldTimer = 30; this->actor.flags &= ~ACTOR_FLAG_1; // targetable OFF @@ -519,7 +519,7 @@ void EnNiw_Thrown(EnNiw* this, PlayState* play) { if (Actor_HasParent(&this->actor, play)) { // picked up again before could run off - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHICKEN_CRY_M); // crow + Actor_PlaySfx(&this->actor, NA_SE_EV_CHICKEN_CRY_M); // crow this->sfxTimer1 = 30; this->unk2EC = 0; this->heldTimer = 30; @@ -629,7 +629,7 @@ void EnNiw_SetupCuccoStorm(EnNiw* this, PlayState* play) { this->targetLimbRots[1] = 0.0f; this->targetLimbRots[2] = 0.0f; this->unkTimer24C = 10; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHICKEN_CRY_M); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHICKEN_CRY_M); } if (this->cuccoStormTimer == 0) { @@ -715,7 +715,7 @@ void EnNiw_CheckRage(EnNiw* this, PlayState* play) { this->iframeTimer = 10; this->sfxTimer1 = 30; this->unk29E = 1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHICKEN_CRY_M); // crow + Actor_PlaySfx(&this->actor, NA_SE_EV_CHICKEN_CRY_M); // crow this->runAwayTimer = 100; this->unk2EC = 0; EnNiw_SetupRunAway(this); @@ -752,7 +752,7 @@ void EnNiw_CheckRage(EnNiw* this, PlayState* play) { this->iframeTimer = 10; this->sfxTimer1 = 30; this->unk29E = 1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHICKEN_CRY_M); // crow + Actor_PlaySfx(&this->actor, NA_SE_EV_CHICKEN_CRY_M); // crow this->runAwayTimer = 100; this->unk2EC = 0; EnNiw_SetupRunAway(this); @@ -911,16 +911,16 @@ void EnNiw_Update(Actor* thisx, PlayState* play) { EnNiw_CheckRage(this, play); if (this->flutterSfxTimer == 0 && this->niwState == NIW_STATE_HELD) { this->flutterSfxTimer = 7; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_CHICKEN_FLUTTER); + Actor_PlaySfx(&this->actor, NA_SE_EN_CHICKEN_FLUTTER); } if (this->sfxTimer1 == 0) { if (this->niwState != NIW_STATE_IDLE) { this->sfxTimer1 = 30; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHICKEN_CRY_A); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHICKEN_CRY_A); } else { this->sfxTimer1 = 300; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHICKEN_CRY_N); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHICKEN_CRY_N); } } diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index 74ac78b5f4..ee22e9abf5 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -293,7 +293,7 @@ void EnNwc_Follow(EnNwc* this, PlayState* play) { this->actor.velocity.y = 2.0f; // hop up and down } if ((this->stateTimer & 0x1B) == 24) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHICK_SONG); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHICK_SONG); } } @@ -306,7 +306,7 @@ void EnNwc_Follow(EnNwc* this, PlayState* play) { this->grog->actor.home.rot.x += 2; // increment grog's adult tranformation counter EnNwc_SpawnDust(this, play); Actor_SetScale(&this->actor, 0.002f); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHICK_TO_CHICKEN); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHICK_TO_CHICKEN); } } @@ -356,7 +356,7 @@ void EnNwc_Follow(EnNwc* this, PlayState* play) { } if (this->grog->actor.home.rot.x >= 20) { // all chicks have turned into adult cucco, stop and crow - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHICKEN_CRY_M); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHICKEN_CRY_M); this->actionFunc = EnNwc_CrowAtTheEnd; this->actor.speedXZ = 0.0f; Actor_SetScale(&this->actor, 0.01f); @@ -378,7 +378,7 @@ void EnNwc_HopForward(EnNwc* this, PlayState* play) { this->actor.velocity.y = 2.0f; // hop up and down } if ((this->stateTimer & 0xB) == 8) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHICK_SONG); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHICK_SONG); } // they only move forward while off the ground, which gives the visual of them hopping to move @@ -404,7 +404,7 @@ void EnNwc_RunAway(EnNwc* this, PlayState* play) { this->actor.velocity.y = 2.0f; // hop up and down } if ((this->stateTimer & 0xB) == 8) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHICK_SONG); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHICK_SONG); } this->actor.speedXZ = 2.0f; @@ -429,7 +429,7 @@ void EnNwc_Turn(EnNwc* this, PlayState* play) { } if ((this->stateTimer & 0xB) == 8) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CHICK_SONG); + Actor_PlaySfx(&this->actor, NA_SE_EV_CHICK_SONG); } // they only rotate when off the ground, giving the visual that they turn by hopping diff --git a/src/overlays/actors/ovl_En_Osk/z_en_osk.c b/src/overlays/actors/ovl_En_Osk/z_en_osk.c index ac3c5ef6b2..2b938a35f2 100644 --- a/src/overlays/actors/ovl_En_Osk/z_en_osk.c +++ b/src/overlays/actors/ovl_En_Osk/z_en_osk.c @@ -181,20 +181,20 @@ void func_80BF609C(EnOsk* this, PlayState* play) { case 0: if (Animation_OnFrame(&this->skelAnime, this->unk_25C) || Animation_OnFrame(&this->skelAnime, this->unk_25C + 8.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BOSU_TALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_BOSU_TALK); } break; case 1: if (Animation_OnFrame(&this->skelAnime, this->unk_25C)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BOSU_TALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_BOSU_TALK); } break; case 2: if (Animation_OnFrame(&this->skelAnime, this->unk_25C) || Animation_OnFrame(&this->skelAnime, this->unk_25C + 6.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BOSU_TALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_BOSU_TALK); } break; } @@ -280,19 +280,19 @@ void func_80BF6478(EnOsk* this) { case 1: if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 6.0f) || Animation_OnFrame(&this->skelAnime, 11.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEBU_HEAD_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEBU_HEAD_UP); } break; case 3: if (Animation_OnFrame(&this->skelAnime, 11.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEBU_HEAD_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEBU_HEAD_UP); } break; case 4: if (Animation_OnFrame(&this->skelAnime, 5.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEBU_HEAD_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEBU_HEAD_UP); } break; @@ -406,31 +406,31 @@ void func_80BF68E0(EnOsk* this) { case 7: if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 6.0f) || Animation_OnFrame(&this->skelAnime, 11.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEBU_HEAD_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEBU_HEAD_UP); } break; case 2: if (Animation_OnFrame(&this->skelAnime, 4.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEBU_HEAD_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEBU_HEAD_UP); } break; case 4: if (Animation_OnFrame(&this->skelAnime, 5.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEBU_HEAD_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEBU_HEAD_UP); } break; case 5: if ((Animation_OnFrame(&this->skelAnime, 6.0f)) || Animation_OnFrame(&this->skelAnime, 11.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEBU_HEAD_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEBU_HEAD_UP); } break; case 8: if (Animation_OnFrame(&this->skelAnime, 13.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DEBU_HEAD_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_DEBU_HEAD_UP); } break; } diff --git a/src/overlays/actors/ovl_En_Osn/z_en_osn.c b/src/overlays/actors/ovl_En_Osn/z_en_osn.c index 7df9d843d5..e9e12e311e 100644 --- a/src/overlays/actors/ovl_En_Osn/z_en_osn.c +++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.c @@ -851,7 +851,7 @@ void EnOsn_HandleCsAction(EnOsn* this, PlayState* play) { if ((this->animIndex == OSN_ANIM_BELIEVE) && (play->sceneId == SCENE_SPOT00) && (gSaveContext.sceneLayer == 0xB) && (play->csCtx.frames == 400)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_OMVO00); + Actor_PlaySfx(&this->actor, NA_SE_VO_OMVO00); } if (this->animIndex == OSN_ANIM_TURN_AROUND_START) { @@ -870,7 +870,7 @@ void EnOsn_HandleCsAction(EnOsn* this, PlayState* play) { (((Animation_OnFrame(&this->skelAnime, 17.0f))) || (Animation_OnFrame(&this->skelAnime, 27.0f)) || (Animation_OnFrame(&this->skelAnime, 37.0f)) || (Animation_OnFrame(&this->skelAnime, 47.0f)) || (Animation_OnFrame(&this->skelAnime, 57.0f)) || (Animation_OnFrame(&this->skelAnime, 67.0f)))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_OMENYA_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_OMENYA_WALK); } Cutscene_ActorTranslateAndYaw(&this->actor, play, actionIndex); } else { 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 d1f7dbec9e..071d311872 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -586,7 +586,7 @@ void EnOssan_Hello(EnOssan* this, PlayState* play) { SubS_ChangeAnimationByInfoS(&this->skelAnime, animationInfo, ANI_ANIM_APOLOGY_LOOP); } if ((this->animIndex == FSN_ANIM_SLAM_COUNTER_LOOP) && Animation_OnFrame(&this->skelAnime, 18.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_HANKO); + Actor_PlaySfx(&this->actor, NA_SE_EV_HANKO); } } diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.c b/src/overlays/actors/ovl_En_Ot/z_en_ot.c index c2abc359a9..193c246fa8 100644 --- a/src/overlays/actors/ovl_En_Ot/z_en_ot.c +++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.c @@ -554,7 +554,7 @@ void func_80B5C910(EnOt* this, PlayState* play) { void func_80B5C950(EnOt* this, PlayState* play) { if (this->unk_32C & 8) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SEAHORSE_OUT_BOTTLE); + Actor_PlaySfx(&this->actor, NA_SE_EV_SEAHORSE_OUT_BOTTLE); SET_WEEKEVENTREG(WEEKEVENTREG_25_04); func_80B5CAD0(this, play); } @@ -575,7 +575,7 @@ void func_80B5C9D0(EnOt* this, PlayState* play) { this->actor.world.rot.x = this->actor.world.rot.x; this->actor.world.rot.y = this->actor.world.rot.y; this->actor.world.rot.z = this->actor.world.rot.z; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SEAHORSE_OUT_BOTTLE); + Actor_PlaySfx(&this->actor, NA_SE_EV_SEAHORSE_OUT_BOTTLE); this->actionFunc = func_80B5CA30; } @@ -929,7 +929,7 @@ void EnOt_Update(Actor* thisx, PlayState* play) { EnOt* this = THIS; if ((this->animIndex == 1) && Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SEAHORSE_SWIM); + Actor_PlaySfx(&this->actor, NA_SE_EV_SEAHORSE_SWIM); } this->actionFunc(this, play); 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 8d7b92b69e..361f7fdec9 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -419,7 +419,7 @@ void func_8095B158(EnOwl* this) { if (Animation_OnFrame(&this->skelAnime1, 2.0f) || Animation_OnFrame(&this->skelAnime1, 9.0f) || Animation_OnFrame(&this->skelAnime1, 23.0f) || Animation_OnFrame(&this->skelAnime1, 40.0f) || Animation_OnFrame(&this->skelAnime1, 58.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_OWL_FLUTTER); + Actor_PlaySfx(&this->actor, NA_SE_EN_OWL_FLUTTER); } } @@ -899,7 +899,7 @@ void EnOwl_Update(Actor* thisx, PlayState* play) { CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); if (this->actor.update != NULL) { if ((this->skelAnime1.animation == &object_owl_Anim_001ADC) && Animation_OnFrame(&this->skelAnime1, 4.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_OWL_FLUTTER); + Actor_PlaySfx(&this->actor, NA_SE_EN_OWL_FLUTTER); } if (this->actionFlags & 2) { diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c index bcbb787166..c99c5c9d82 100644 --- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c +++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c @@ -501,11 +501,11 @@ void func_80BD93F4(EnPamera* this, PlayState* play) { (this->actionFunc == func_80BD8964) || (this->actionFunc == func_80BD8A7C)) { if (this->skelAnime.animation == &object_pamera_Anim_008AE0) { if (Animation_OnFrame(&this->skelAnime, 9.0f) || Animation_OnFrame(&this->skelAnime, 18.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PAMERA_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_PAMERA_WALK); } } else if ((this->skelAnime.animation == &object_pamera_Anim_008E38) && (Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 6.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PAMERA_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_PAMERA_WALK); } } } @@ -772,7 +772,7 @@ void func_80BD9F3C(EnPamera* this, PlayState* play) { Animation_OnFrame(&this->skelAnime, 10.0f) || Animation_OnFrame(&this->skelAnime, 14.0f) || Animation_OnFrame(&this->skelAnime, 18.0f) || Animation_OnFrame(&this->skelAnime, 22.0f) || Animation_OnFrame(&this->skelAnime, 25.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PAMERA_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_PAMERA_WALK); } if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { this->unk_31E = 0; @@ -820,7 +820,7 @@ void func_80BDA1C8(EnPamera* this, PlayState* play) { if (this->unk_31E == 1) { if (Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 6.0f) || Animation_OnFrame(&this->skelAnime, 10.0f) || Animation_OnFrame(&this->skelAnime, 14.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PAMERA_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_PAMERA_WALK); } if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { this->unk_31E = 0; diff --git a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c index 9eeae341dc..201172cf9a 100644 --- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c +++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c @@ -376,10 +376,10 @@ void EnPametfrog_PlaceSnapper(EnPametfrog* this, PlayState* play) { void EnPametfrog_JumpOnGround(EnPametfrog* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, 1.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FROG_JUMP); + Actor_PlaySfx(&this->actor, NA_SE_EN_FROG_JUMP); } else if (Animation_OnFrame(&this->skelAnime, 11.0f)) { EnPametfrog_JumpWaterEffects(this, play); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WALK_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EV_WALK_WATER); } } @@ -402,7 +402,7 @@ void EnPametfrog_ApplyMagicArrowEffects(EnPametfrog* this, PlayState* play) { void EnPametfrog_ApplyElectricStun(EnPametfrog* this) { this->freezeTimer = 40; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); this->drawDmgEffType = ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_SMALL; this->drawDmgEffScale = 0.75f; @@ -411,7 +411,7 @@ void EnPametfrog_ApplyElectricStun(EnPametfrog* this) { void EnPametfrog_ApplyStun(EnPametfrog* this) { this->freezeTimer = 40; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); } @@ -509,7 +509,7 @@ void EnPametfrog_SetupFallOffSnapper(EnPametfrog* this, PlayState* play) { subCamEye.y = this->actor.focus.pos.y + 100.0f; subCamEye.z = (Math_CosS(yaw) * 300.0f) + this->actor.focus.pos.z; Play_SetCameraAtEye(play, this->subCamId, &this->actor.focus.pos, &subCamEye); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FROG_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_FROG_DAMAGE); this->actionFunc = EnPametfrog_FallOffSnapper; } @@ -536,7 +536,7 @@ void EnPametfrog_SetupJumpToWall(EnPametfrog* this) { this->actor.shape.rot.x = 0; this->actor.shape.rot.z = 0; this->actor.bgCheckFlags &= ~8; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FROG_VOICE2); + Actor_PlaySfx(&this->actor, NA_SE_EN_FROG_VOICE2); this->actionFunc = EnPametfrog_JumpToWall; } @@ -579,7 +579,7 @@ void EnPametfrog_SetupWallCrawl(EnPametfrog* this) { this->skelAnime.playSpeed = 1.0f; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FROG_RUNAWAY); + Actor_PlaySfx(&this->actor, NA_SE_EN_FROG_RUNAWAY); this->actor.speedXZ = 8.0f; this->timer = Rand_S16Offset(35, 15); this->actionFunc = EnPametfrog_WallCrawl; @@ -636,11 +636,11 @@ void EnPametfrog_WallCrawl(EnPametfrog* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 15.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BOMCHU_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_BOMCHU_WALK); } if (((play->gameplayFrames % 60) == 0) && (Rand_ZeroOne() < 0.8f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FROG_REAL); + Actor_PlaySfx(&this->actor, NA_SE_EN_FROG_REAL); } if ((this->timer == 0) || @@ -668,7 +668,7 @@ void EnPametfrog_SetupWallPause(EnPametfrog* this) { this->wallRotation = (Rand_ZeroOne() < 0.5f ? -1 : 1) * (0x1000 + randFloat) * (M_PI / (15 * 0x8000)); } this->timer = 15; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FROG_RUNAWAY2); + Actor_PlaySfx(&this->actor, NA_SE_EN_FROG_RUNAWAY2); this->actionFunc = EnPametfrog_WallPause; } @@ -686,7 +686,7 @@ void EnPametfrog_WallPause(EnPametfrog* this, PlayState* play) { Math3D_CrossProduct(&this->unk_2DC, &this->unk_2D0, &this->unk_2E8); func_8086A238(this); if (((play->gameplayFrames % 60) == 0) && (Rand_ZeroOne() < 0.8f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FROG_REAL); + Actor_PlaySfx(&this->actor, NA_SE_EN_FROG_REAL); } if (this->timer == 0) { @@ -765,7 +765,7 @@ void EnPametfrog_SetupJumpOnSnapper(EnPametfrog* this) { this->actor.shape.rot.y = Actor_WorldYawTowardActor(&this->actor, this->actor.child); this->actor.world.rot.y = this->actor.shape.rot.y; this->actor.params = GEKKO_JUMP_ON_SNAPPER; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FROG_GREET); + Actor_PlaySfx(&this->actor, NA_SE_EN_FROG_GREET); this->actionFunc = EnPametfrog_JumpOnSnapper; } @@ -816,9 +816,9 @@ void EnPametfrog_SetupFallInAir(EnPametfrog* this, PlayState* play) { this->collider.base.acFlags &= ~AC_ON; this->timer = 10; if (this->actor.colChkInfo.health == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FROG_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_FROG_DEAD); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FROG_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_FROG_DAMAGE); } Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 16); @@ -875,7 +875,7 @@ void EnPametfrog_SetupFallOnGround(EnPametfrog* this, PlayState* play) { this->timer = 5; EnPametfrog_Thaw(this, play); EnPametfrog_JumpWaterEffects(this, play); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WALK_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EV_WALK_WATER); this->actionFunc = EnPametfrog_FallOnGround; } @@ -1099,9 +1099,9 @@ void EnPametfrog_MeleeAttack(EnPametfrog* this, PlayState* play) { ((this->skelAnime.animation == &gGekkoWindupPunchAnim) && Animation_OnFrame(&this->skelAnime, 27.0f))) { this->collider.base.atFlags |= AT_ON; if (this->skelAnime.animation == &gGekkoKickAnim) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FROG_KICK); + Actor_PlaySfx(&this->actor, NA_SE_EN_FROG_KICK); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FROG_PUNCH1); + Actor_PlaySfx(&this->actor, NA_SE_EN_FROG_PUNCH1); } } else { this->collider.base.atFlags &= ~AT_ON; @@ -1114,7 +1114,7 @@ void EnPametfrog_SetupDamage(EnPametfrog* this) { this->collider.base.atFlags &= ~AT_ON; this->collider.base.acFlags &= ~AC_ON; this->actor.speedXZ = 10.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FROG_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_FROG_DAMAGE); Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 20); func_800BE5CC(&this->actor, &this->collider, 0); this->actor.shape.rot.y = BINANG_ROT180(this->actor.world.rot.y); @@ -1168,7 +1168,7 @@ void EnPametfrog_SetupCallSnapper(EnPametfrog* this, PlayState* play) { s16 yawDiff; Animation_MorphToPlayOnce(&this->skelAnime, &gGekkoCallAnim, 3.0f); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FROG_GREET); + Actor_PlaySfx(&this->actor, NA_SE_EN_FROG_GREET); this->actor.flags &= ~ACTOR_FLAG_1; this->actor.colChkInfo.health = 6; this->actor.world.rot.y = Actor_WorldYawTowardPoint(&this->actor, &this->actor.home.pos); diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index d2a1458f35..fe63efd4ef 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -283,7 +283,7 @@ void func_80897390(EnPeehat* this, PlayState* play) { } this->unk_2B0 = 8; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PIHAT_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_PIHAT_DAMAGE); } void func_80897498(EnPeehat* this) { @@ -327,7 +327,7 @@ void func_80897648(EnPeehat* this) { Animation_GetLastFrame(&object_ph_Anim_0009C4), ANIMMODE_ONCE, 0.0f); } this->unk_2B0 = 16; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PIHAT_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_PIHAT_UP); this->actionFunc = func_808976DC; } @@ -474,7 +474,7 @@ void func_80897D48(EnPeehat* this, PlayState* play) { if (SkelAnime_Update(&this->skelAnime)) { func_80897498(this); this->actor.world.pos.y = this->actor.floorHeight; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PIHAT_LAND); + Actor_PlaySfx(&this->actor, NA_SE_EN_PIHAT_LAND); } else if (this->actor.floorHeight < this->actor.world.pos.y) { Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.floorHeight, 0.3f, 3.5f, 0.25f); if ((this->actor.world.pos.y - this->actor.floorHeight) < 60.0f) { @@ -622,7 +622,7 @@ void func_80898454(EnPeehat* this, PlayState* play) { void func_808984E0(EnPeehat* this) { Animation_MorphToPlayOnce(&this->skelAnime, &object_ph_Anim_000844, -4.0f); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PIHAT_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_PIHAT_DAMAGE); this->unk_2B2 = 4000; this->unk_2B0 = 14; this->actor.speedXZ = 10.0f; @@ -698,7 +698,7 @@ void func_8089874C(EnPeehat* this, PlayState* play) { if (this->actor.colChkInfo.damageEffect == 5) { this->unk_2B0 = 40; Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->drawDmgEffScale = 1.1f; this->drawDmgEffAlpha = 2.0f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_LARGE; @@ -706,7 +706,7 @@ void func_8089874C(EnPeehat* this, PlayState* play) { } else if (this->actor.colChkInfo.damageEffect == 1) { this->unk_2B0 = 40; Actor_SetColorFilter(&this->actor, 0, 200, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); func_80898414(this); } else if (this->actor.colChkInfo.damageEffect == 3) { func_80897170(this); diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.c b/src/overlays/actors/ovl_En_Pm/z_en_pm.c index c2846a26b8..f612a7927a 100644 --- a/src/overlays/actors/ovl_En_Pm/z_en_pm.c +++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.c @@ -1311,7 +1311,7 @@ s32 func_80AF91E8(EnPm* this, PlayState* play, ScheduleOutput* scheduleOutput) { this->unk_356 &= ~8; this->unk_356 &= ~0x10; if (this->unk_258 == 27) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ROOM_CARTAIN); + Actor_PlaySfx(&this->actor, NA_SE_EV_ROOM_CARTAIN); Flags_UnsetSwitch(play, 0); } @@ -1431,7 +1431,7 @@ s32 func_80AF95E8(EnPm* this, PlayState* play, ScheduleOutput* scheduleOutput) { switch (scheduleOutput->result) { case 27: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ROOM_CARTAIN); + Actor_PlaySfx(&this->actor, NA_SE_EV_ROOM_CARTAIN); Flags_SetSwitch(play, 0); this->unk_36C = 20; SubS_UpdateFlags(&this->unk_356, 3, 7); @@ -1717,7 +1717,7 @@ s32 func_80AF9D04(EnPm* this, PlayState* play) { Lib_Vec3f_TranslateAndRotateY(&this->unk_26C, this->actor.world.rot.y, &sp38, &this->actor.world.pos); this->unk_36E += this->timePathTimeSpeed; if (Animation_OnFrame(&this->skelAnime, 3.0f) || Animation_OnFrame(&this->skelAnime, 8.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_POSTMAN_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_POSTMAN_WALK); } } return false; @@ -1774,7 +1774,7 @@ s32 func_80AF9E7C(EnPm* this, PlayState* play) { this->timePathTargetPos = timePathTargetPos; } else if ((this->unk_258 != 91) && (Animation_OnFrame(&this->skelAnime, 3.0f) || Animation_OnFrame(&this->skelAnime, 8.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_POSTMAN_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_POSTMAN_WALK); } if ((this->unk_356 & 0x10) && (this->unk_258 == 90)) { @@ -1820,7 +1820,7 @@ s32 func_80AFA170(EnPm* this, PlayState* play) { } if ((this->unk_384 == 11) && Animation_OnFrame(&this->skelAnime, 8.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_POSTMACHINE_HIT_OPEN); + Actor_PlaySfx(&this->actor, NA_SE_EV_POSTMACHINE_HIT_OPEN); } if (this->unk_258 == 19) { @@ -1865,7 +1865,7 @@ s32 func_80AFA334(EnPm* this, PlayState* play) { case 21: case 22: if (Animation_OnFrame(&this->skelAnime, 0.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_NP_SLEEP_OUT); + Actor_PlaySfx(&this->actor, NA_SE_VO_NP_SLEEP_OUT); } break; @@ -2044,7 +2044,7 @@ void func_80AFA724(EnPm* this, PlayState* play) { Actor_MoveWithGravity(&this->actor); Actor_UpdateBgCheckInfo(play, &this->actor, 30.0f, 12.0f, 0.0f, 4); if (Animation_OnFrame(&this->skelAnime, 3.0f) || Animation_OnFrame(&this->skelAnime, 8.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_POSTMAN_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_POSTMAN_WALK); } } diff --git a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c index e7a2ae6071..809c738a44 100644 --- a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c +++ b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c @@ -240,7 +240,7 @@ void EnPoFusen_IncrementRomaniPop(EnPoFusen* this) { void EnPoFusen_Pop(EnPoFusen* this, PlayState* play) { Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->actor.world.pos.x, this->actor.world.pos.y + 20.0f, this->actor.world.pos.z, 255, 255, 200, CLEAR_TAG_POP); - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_BOMB_EXPLOSION); + Actor_PlaySfx(&this->actor, NA_SE_IT_BOMB_EXPLOSION); Actor_Kill(&this->actor); } 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 4928fd05b3..365930cd5d 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 @@ -318,7 +318,7 @@ void EnPoSisters_ObserverIdle(EnPoSisters* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if (DECR(this->laughTimer) == 0) { this->laughTimer = Rand_S16Offset(100, 50); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_LAUGH2); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_LAUGH2); } } @@ -433,7 +433,7 @@ void EnPoSisters_SpinUp(EnPoSisters* this, PlayState* play) { DECR(this->spinupTimer); this->actor.shape.rot.y += ((s32)((this->skelAnime.endFrame + 1.0f) * 3.0f) - this->spinupTimer) * 0x180; if ((this->spinupTimer == 18) || (this->spinupTimer == 7)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_ROLL); } else if (this->spinupTimer == 0) { EnPoSisters_SetupSpinAttack(this); } @@ -470,14 +470,14 @@ void EnPoSisters_SpinAttack(EnPoSisters* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HARD; EnPoSisters_SetupAimlessIdleFlying(this); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_LAUGH2); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_LAUGH2); EnPoSisters_MegCloneVanish(this, play); } } } if (Animation_OnFrame(&this->skelAnime, 1.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_ROLL); } } @@ -504,7 +504,7 @@ void EnPoSisters_AttackConnectDrift(EnPoSisters* this, PlayState* play) { if (this->type != POE_SISTERS_TYPE_MEG) { EnPoSisters_SetupAimlessIdleFlying(this); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_LAUGH2); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_LAUGH2); EnPoSisters_MegCloneVanish(this, play); } } @@ -590,8 +590,8 @@ void EnPoSisters_SetupSpinToInvis(EnPoSisters* this) { this->actor.speedXZ = 0.0f; this->actor.world.rot.y = this->actor.shape.rot.y; this->poSisterFlags &= ~(POE_SISTERS_FLAG_CHECK_Z_TARGET | POE_SISTERS_FLAG_CHECK_AC); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_DISAPPEAR); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_LAUGH2); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DISAPPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_LAUGH2); this->actionFunc = EnPoSisters_SpinToInvis; } @@ -621,7 +621,7 @@ void EnPoSisters_SetupSpinBackToVisible(EnPoSisters* this, PlayState* play) { this->spinInvisibleTimer = 15; this->actor.speedXZ = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_APPEAR); this->poSisterFlags &= ~POE_SISTERS_FLAG_CHECK_AC; this->actionFunc = EnPoSisters_SpinBackToVisible; } @@ -699,7 +699,7 @@ void EnPoSisters_DeathStage1(EnPoSisters* this, PlayState* play) { } if (this->deathTimer == 16) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_DISAPPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_DISAPPEAR); } } @@ -876,7 +876,7 @@ void EnPoSisters_MegSurroundPlayer(EnPoSisters* this, PlayState* play) { */ void EnPoSisters_SetupSpawnPo(EnPoSisters* this) { Animation_PlayOnce(&this->skelAnime, &gPoeSistersAppearDisappearAnim); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_APPEAR); this->color.a = 0; this->poSisterFlags = POE_SISTERS_FLAG_UPDATE_FIRES; this->actionFunc = EnPoSisters_PoeSpawn; @@ -909,7 +909,7 @@ void EnPoSisters_CheckCollision(EnPoSisters* this, PlayState* play) { if (this->megCloneId != POE_SISTERS_MEG_REAL) { ((EnPoSisters*)this->actor.parent)->megClonesRemaining--; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_LAUGH2); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_LAUGH2); EnPoSisters_MegCloneVanish(this, play); if (Rand_ZeroOne() < 0.2f) { pos.x = this->actor.world.pos.x; @@ -932,10 +932,10 @@ void EnPoSisters_CheckCollision(EnPoSisters* this, PlayState* play) { } } else { if (Actor_ApplyDamage(&this->actor)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DAMAGE); } else { Enemy_StartFinishingBlow(play, &this->actor); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_SISTER_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_SISTER_DEAD); } if (this->actor.colChkInfo.damageEffect == POE_SISTERS_DMGEFF_LIGHTARROWS) { diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index 0984506d6e..21cd9d8c44 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -316,14 +316,14 @@ void func_80B2CEC8(EnPoh* this) { Animation_MorphToLoop(&this->skelAnime, &object_po_Anim_0001A8, -6.0f); this->unk_18E = 12; this->actor.speedXZ = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_LAUGH); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_LAUGH); this->actionFunc = func_80B2CF28; } void func_80B2CF28(EnPoh* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if (Animation_OnFrame(&this->skelAnime, 0.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_KANTERA); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_KANTERA); if (this->unk_18E != 0) { this->unk_18E--; } @@ -379,7 +379,7 @@ void func_80B2D140(EnPoh* this, PlayState* play) { } if ((this->skelAnime.playSpeed < 0.5f) && (this->actor.xzDistToPlayer < 280.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_APPEAR); this->skelAnime.playSpeed = 1.0f; } } @@ -438,7 +438,7 @@ void func_80B2D300(EnPoh* this, PlayState* play) { } if (this->unk_18E == 18) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_DISAPPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_DISAPPEAR); } } @@ -484,8 +484,8 @@ void func_80B2D76C(EnPoh* this) { this->unk_192 = 0x2000; this->actor.speedXZ = 0.0f; this->actor.world.rot.y = this->actor.shape.rot.y; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_DISAPPEAR); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_LAUGH); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DISAPPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_LAUGH); this->colliderCylinder.base.acFlags &= ~AC_ON; this->actionFunc = func_80B2D7D4; } @@ -514,8 +514,8 @@ void func_80B2D924(EnPoh* this) { this->unk_18C = 0; this->unk_192 = 0x2000; this->actor.speedXZ = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_APPEAR); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_LAUGH); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_LAUGH); this->colliderCylinder.base.acFlags &= ~AC_ON; this->actionFunc = func_80B2D980; } @@ -629,7 +629,7 @@ void func_80B2E0B0(EnPoh* this) { this->actor.home.pos.y = this->actor.world.pos.y; this->actor.scale.x = 0.0f; this->actor.scale.y = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_METAL_BOX_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EV_METAL_BOX_BOUND); this->actionFunc = func_80B2E180; } @@ -680,7 +680,7 @@ void func_80B2E230(EnPoh* this, PlayState* play) { void func_80B2E3B0(EnPoh* this) { AudioSfx_StopByPosAndId(&this->actor.projectedPos, NA_SE_EN_PO_BIG_CRY - SFX_FLAG); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_LAUGH); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_LAUGH); this->actionFunc = func_80B2E3F8; } @@ -696,9 +696,9 @@ void func_80B2E438(EnPoh* this, PlayState* play) { this->colliderCylinder.base.acFlags &= ~AC_HIT; if (!Actor_ApplyDamage(&this->actor)) { Enemy_StartFinishingBlow(play, &this->actor); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DEAD); } else if (this->actor.colChkInfo.damage != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DAMAGE); } if (this->actor.colChkInfo.damageEffect != 14) { diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.c b/src/overlays/actors/ovl_En_Pp/z_en_pp.c index fad487e621..be4f1e3c30 100644 --- a/src/overlays/actors/ovl_En_Pp/z_en_pp.c +++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.c @@ -446,27 +446,27 @@ void EnPp_PlaySfxForAnimation(EnPp* this) { case EN_PP_ANIM_WALK: case EN_PP_ANIM_TURN_TO_FACE_PLAYER: if (Animation_OnFrame(&this->skelAnime, 0.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_HIPLOOP_FOOTSTEP); + Actor_PlaySfx(&this->actor, NA_SE_EN_HIPLOOP_FOOTSTEP); } break; case EN_PP_ANIM_WIND_UP: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_HIPLOOP_FOOT - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_HIPLOOP_FOOT - SFX_FLAG); break; case EN_PP_ANIM_CHARGE: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_HIPLOOP_RUN - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_HIPLOOP_RUN - SFX_FLAG); break; case EN_PP_ANIM_ATTACK: if (Animation_OnFrame(&this->skelAnime, 0.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_HIPLOOP_PAUSE); + Actor_PlaySfx(&this->actor, NA_SE_EN_HIPLOOP_PAUSE); } break; case EN_PP_ANIM_ROAR: if (Animation_OnFrame(&this->skelAnime, 6.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_HIPLOOP_PAUSE); + Actor_PlaySfx(&this->actor, NA_SE_EN_HIPLOOP_PAUSE); } break; @@ -925,7 +925,7 @@ void EnPp_SetupDamaged(EnPp* this, PlayState* play) { this->actor.speedXZ = 0.0f; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_HIPLOOP_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_HIPLOOP_DAMAGE); this->actionFunc = EnPp_Damaged; } @@ -1117,7 +1117,7 @@ void EnPp_Mask_Detach(EnPp* this, PlayState* play) { this->maskAccelY = 50.0f; this->maskVelocity.y = -230.0f; this->maskVelocity.x = -150.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_HIPLOOP_MASC_OFF); + Actor_PlaySfx(&this->actor, NA_SE_EN_HIPLOOP_MASC_OFF); this->actionVar.maskDetachState = EN_PP_MASK_DETACH_STATE_FALL; break; @@ -1276,7 +1276,7 @@ void EnPp_UpdateDamage(EnPp* this, PlayState* play) { (this->drawDmgEffTimer == 0)) { this->drawDmgEffTimer = 40; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_SMALL; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); EnPp_SetupStunnedOrFrozen(this); } @@ -1285,7 +1285,7 @@ void EnPp_UpdateDamage(EnPp* this, PlayState* play) { if (((this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_SFX) && (this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX)) || (this->drawDmgEffTimer == 0)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); this->secondaryTimer = 40; EnPp_SetupStunnedOrFrozen(this); @@ -1359,7 +1359,7 @@ void EnPp_UpdateDamage(EnPp* this, PlayState* play) { this->targetRotY = this->actor.yawTowardsPlayer; if (EN_PP_GET_TYPE(&this->actor) == EN_PP_TYPE_MASKED) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_SHIELD_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_IT_SHIELD_BOUND); } } } diff --git a/src/overlays/actors/ovl_En_Pr/z_en_pr.c b/src/overlays/actors/ovl_En_Pr/z_en_pr.c index 5068c96ee8..703d7a90b6 100644 --- a/src/overlays/actors/ovl_En_Pr/z_en_pr.c +++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.c @@ -410,7 +410,7 @@ void func_80A32EA4(EnPr* this, PlayState* play) { this->actor.flags |= ACTOR_FLAG_8000000; this->unk_2C4 = 0.0f; Enemy_StartFinishingBlow(play, &this->actor); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLEWALK_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLEWALK_DEAD); this->unk_216 = 0; this->actionFunc = func_80A32F48; } else { @@ -471,7 +471,7 @@ void func_80A33098(EnPr* this, PlayState* play) { if ((this->unk_206 != 6) && (this->unk_206 != 7)) { Actor_ApplyDamage(&this->actor); Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 8); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLEWALK_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLEWALK_DAMAGE); func_80A32E60(this); } } diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c index 0cc6dc1340..3f0b3ee86d 100644 --- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c +++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c @@ -267,7 +267,7 @@ void func_80A745FC(EnPr2* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PIRANHA_EXIST - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_PIRANHA_EXIST - SFX_FLAG); Math_ApproachF(&this->unk_204, 0.02f, 0.1f, 0.005f); if (this->path->unk2 < this->unk_1D0) { @@ -326,7 +326,7 @@ void func_80A748E8(EnPr2* this, PlayState* play) { Vec3f sp3C; Math_ApproachF(&this->unk_204, 0.02f, 0.1f, 0.005f); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PIRANHA_EXIST - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_PIRANHA_EXIST - SFX_FLAG); if (fabsf(this->actor.world.rot.y - this->unk_1EE) < 200.0f) { sp48 = true; @@ -430,7 +430,7 @@ void func_80A74DEC(EnPr2* this, PlayState* play) { this->unk_1F0 = 0; func_80A74510(this, 1); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PIRANHA_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_PIRANHA_ATTACK); Math_Vec3f_Copy(&this->unk_21C, &player->actor.world.pos); this->unk_1EE = Math_Vec3f_Yaw(&this->actor.world.pos, &this->unk_21C); @@ -615,7 +615,7 @@ void func_80A755D8(EnPr2* this, PlayState* play) { if ((this->actor.colChkInfo.health <= 0) && (this->unk_1D4 != 3)) { Enemy_StartFinishingBlow(play, &this->actor); this->actor.speedXZ = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PIRANHA_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_PIRANHA_DEAD); if (this->unk_218 >= 0) { Item_DropCollectibleRandom(play, NULL, &this->actor.world.pos, D_80A75C3C[this->unk_218]); diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.c b/src/overlays/actors/ovl_En_Prz/z_en_prz.c index dad8fc1263..d0e40b1a55 100644 --- a/src/overlays/actors/ovl_En_Prz/z_en_prz.c +++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.c @@ -363,7 +363,7 @@ void func_80A76A1C(EnPrz* this) { this->actor.flags |= ACTOR_FLAG_8000000; this->actor.flags &= ~ACTOR_FLAG_1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BUBLEWALK_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLEWALK_DEAD); this->unk_1EE = Rand_S16Offset(100, 30); this->unk_1FC = 0x4000; diff --git a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c index 0caa2f8caf..c6e33345d5 100644 --- a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c +++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c @@ -675,7 +675,7 @@ void EnRacedog_PlaySfxWalk(EnRacedog* this) { s16 curFrame = this->skelAnime.curFrame; if ((curFrame == 1) || (curFrame == 7)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_MONKEY_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_MONKEY_WALK); } } diff --git a/src/overlays/actors/ovl_En_Raf/z_en_raf.c b/src/overlays/actors/ovl_En_Raf/z_en_raf.c index 8421b20ac5..b72d6d41a8 100644 --- a/src/overlays/actors/ovl_En_Raf/z_en_raf.c +++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.c @@ -360,7 +360,7 @@ void EnRaf_Idle(EnRaf* this, PlayState* play) { void EnRaf_SetupGrab(EnRaf* this) { EnRaf_ChangeAnim(this, EN_RAF_ANIM_CLOSE); this->petalScaleType = EN_RAF_PETAL_SCALE_TYPE_GRAB; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EN_SUISEN_DRINK); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EN_SUISEN_DRINK); this->action = EN_RAF_ACTION_GRAB; this->actionFunc = EnRaf_Grab; } @@ -426,11 +426,15 @@ void EnRaf_Chew(EnRaf* this, PlayState* play) { this->chewCount++; } - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EN_SUISEN_EAT); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EN_SUISEN_EAT); switch (this->grabTarget) { case EN_RAF_GRAB_TARGET_PLAYER: play->damagePlayer(play, -2); - func_800B8E58((Player*)this, player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_DAMAGE_S); + + //! @bug: This function should only pass Player*: it uses *(this + 0x153), which is meant to be + //! player->currentMask, but in this case is padding in `DynaPolyActor` + Player_PlaySfx((Player*)&this->dyna.actor, + player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_DAMAGE_S); CollisionCheck_GreenBlood(play, NULL, &player->actor.world.pos); if ((this->chewCount > (BREG(53) + 5)) || !(player->stateFlags2 & PLAYER_STATE2_80)) { player->actor.freezeTimer = 10; @@ -478,7 +482,7 @@ void EnRaf_Throw(EnRaf* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, 10.0f)) { player->actor.freezeTimer = 0; player->actor.parent = NULL; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EN_SUISEN_THROW); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EN_SUISEN_THROW); func_800B8D50(play, &this->dyna.actor, BREG(55) + 3.0f, this->playerRotYWhenGrabbed + 0x8000, BREG(56) + 10.0f, 0); } else if (curFrame < 10.0f) { @@ -508,8 +512,8 @@ void EnRaf_Explode(EnRaf* this, PlayState* play) { explosionPos.y += 10.0f; Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, explosionPos.x, explosionPos.y, explosionPos.z, 0, 0, 0, CLEAR_TAG_SMALL_EXPLOSION); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_IT_BOMB_EXPLOSION); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EN_SUISEN_DEAD); + Actor_PlaySfx(&this->dyna.actor, NA_SE_IT_BOMB_EXPLOSION); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EN_SUISEN_DEAD); if (this->switchFlag >= 0) { Flags_SetSwitch(play, this->switchFlag); } @@ -710,7 +714,7 @@ void EnRaf_Update(Actor* thisx, PlayState* play) { if ((this->heightDiffFromPlayer > -0.1f) && !this->isCurrentlyInRidingMovingState) { this->heightDiffFromPlayer = -20.0f; this->isCurrentlyInRidingMovingState = true; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EN_COMMON_WATER_MID); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EN_COMMON_WATER_MID); } } else { this->isCurrentlyInRidingMovingState = false; diff --git a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c index 073f2045af..6b114dff5f 100644 --- a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c +++ b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c @@ -334,7 +334,7 @@ void func_80B70FF8(EnRailSkb* this, PlayState* play) { } void func_80B710AC(EnRailSkb* this) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->actionFunc = func_80B710E4; } @@ -345,7 +345,7 @@ void func_80B710E4(EnRailSkb* this, PlayState* play) { } void func_80B71114(EnRailSkb* this) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->actionFunc = func_80B7114C; } @@ -357,7 +357,7 @@ void func_80B7114C(EnRailSkb* this, PlayState* play) { if (this->actor.colChkInfo.health != 0) { Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 8); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 3); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_DAMAGE); this->unk_402 |= 1; func_80B712FC(this); } else { @@ -381,7 +381,7 @@ void func_80B7123C(EnRailSkb* this, PlayState* play) { if (this->actor.colChkInfo.health != 0) { Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 8); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 3); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_DAMAGE); this->unk_402 |= 1; func_80B712FC(this); } else { @@ -405,7 +405,7 @@ void func_80B71314(EnRailSkb* this, PlayState* play) { } void func_80B71354(EnRailSkb* this) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_ATTACK); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 2); this->actionFunc = func_80B713A4; } @@ -452,7 +452,7 @@ void func_80B7151C(EnRailSkb* this) { this->actor.colChkInfo.health = 2; this->unk_402 = 0; this->actor.flags |= ACTOR_FLAG_1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_APPEAR); this->actor.draw = EnRailSkb_Draw; this->actor.shape.shadowAlpha = 0; this->actor.shape.rot.y = this->actor.world.rot.y; @@ -575,7 +575,7 @@ void func_80B71954(EnRailSkb* this, PlayState* play) { } void func_80B71A08(EnRailSkb* this) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_ATTACK); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 2); this->actionFunc = func_80B71A58; } @@ -584,7 +584,7 @@ void func_80B71A58(EnRailSkb* this, PlayState* play) { s16 sp36 = Math_Vec3f_Yaw(&this->actor.world.pos, &this->unk_22C->dyna.actor.world.pos); if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_ATTACK); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 2); if (this->unk_2E8 < this->unk_22C->dyna.actor.colChkInfo.health) { this->unk_22C->dyna.actor.colChkInfo.health--; @@ -640,7 +640,7 @@ void func_80B71BB8(EnRailSkb* this, PlayState* play) { } if ((sp34 < 50.0f) && (this->actor.bgCheckFlags & 1)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_ATTACK); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 9); this->actor.velocity.y = 10.0f; @@ -773,7 +773,7 @@ void func_80B72190(EnRailSkb* this, PlayState* play) { if ((this->actionFunc != func_80B714D8) && (Animation_OnFrame(&this->skelAnime, 8.0f) || Animation_OnFrame(&this->skelAnime, 15.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_WALK); } if (this->actor.parent == NULL) { @@ -999,7 +999,7 @@ void func_80B72970(EnRailSkb* this, PlayState* play) { this->drawDmgEffAlpha = 1.0f; this->drawDmgEffScale = 0.0f; Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 8); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_DAMAGE); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 3); this->unk_402 |= 1; func_80B712FC(this); @@ -1007,7 +1007,7 @@ void func_80B72970(EnRailSkb* this, PlayState* play) { case 3: if (this->actor.colChkInfo.health != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_DAMAGE); this->drawDmgEffTimer = 80; } else { this->drawDmgEffTimer = 3; @@ -1025,7 +1025,7 @@ void func_80B72970(EnRailSkb* this, PlayState* play) { this->drawDmgEffAlpha = 1.0f; this->drawDmgEffScale = 0.5f; Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 8); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_DAMAGE); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 3); func_80B71228(this); break; @@ -1044,7 +1044,7 @@ void func_80B72970(EnRailSkb* this, PlayState* play) { case 13: Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 8); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_DAMAGE); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 3); func_80B712FC(this); break; diff --git a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c index 6c5980f4f3..c5a13412d5 100644 --- a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c +++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c @@ -350,7 +350,7 @@ void EnRailgibud_AttemptPlayerFreeze(EnRailgibud* this, PlayState* play) { player->actor.freezeTimer = 60; Rumble_Request(this->actor.xzDistToPlayer, 255, 20, 150); func_80123E90(play, &this->actor); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_AIM); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_AIM); EnRailgibud_SetupWalkToPlayer(this); } @@ -396,7 +396,7 @@ void EnRailgibud_WalkToPlayer(EnRailgibud* this, PlayState* play) { this->playerStunWaitTimer = 60; Rumble_Request(this->actor.xzDistToPlayer, 255, 20, 150); func_80123E90(play, &this->actor); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_AIM); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_AIM); } else { this->playerStunWaitTimer--; } @@ -412,9 +412,9 @@ void EnRailgibud_WalkToPlayer(EnRailgibud* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 10.0f) || Animation_OnFrame(&this->skelAnime, 22.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_WALK); } else if (!(play->gameplayFrames & 95)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_CRY); } } @@ -452,7 +452,7 @@ void EnRailgibud_Grab(EnRailgibud* this, PlayState* play) { damageSfxId = player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_DAMAGE_S; play->damagePlayer(play, -8); - func_800B8E58(player, damageSfxId); + Player_PlaySfx(player, damageSfxId); Rumble_Request(this->actor.xzDistToPlayer, 240, 1, 12); this->grabDamageTimer = 0; } else { @@ -460,7 +460,7 @@ void EnRailgibud_Grab(EnRailgibud* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 0.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_ATTACK); } if (!(player->stateFlags2 & PLAYER_STATE2_80) || (player->unk_B62 != 0)) { @@ -490,7 +490,7 @@ void EnRailgibud_Grab(EnRailgibud* this, PlayState* play) { void EnRailgibud_SetupGrabFail(EnRailgibud* this) { Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, EN_RAILGIBUD_ANIM_DAMAGE); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_DAMAGE); this->actor.speedXZ = -2.0f; this->actionFunc = EnRailgibud_GrabFail; } @@ -564,7 +564,7 @@ void EnRailgibud_WalkToHome(EnRailgibud* this, PlayState* play) { void EnRailgibud_SetupDamage(EnRailgibud* this) { Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, EN_RAILGIBUD_ANIM_DAMAGE); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_DAMAGE); this->stunTimer = 0; this->grabWaitTimer = 0; this->actor.world.rot.y = this->actor.yawTowardsPlayer; @@ -622,7 +622,7 @@ void EnRailgibud_Stunned(EnRailgibud* this, PlayState* play) { void EnRailgibud_SetupDead(EnRailgibud* this) { Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, EN_RAILGIBUD_ANIM_DEATH); this->actor.flags &= ~ACTOR_FLAG_1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_DEAD); this->deathTimer = 0; this->actionFunc = EnRailgibud_Dead; } @@ -963,7 +963,7 @@ void EnRailgibud_CheckIfTalkingToPlayer(EnRailgibud* this, PlayState* play) { this->isInvincible = true; Message_StartTextbox(play, 0x13B2, &this->actor); this->textId = 0x13B2; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_AIM); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_AIM); this->actor.speedXZ = 0.0f; } else if (CHECK_FLAG_ALL(this->actor.flags, (ACTOR_FLAG_1 | ACTOR_FLAG_8)) && !(this->collider.base.acFlags & AC_HIT)) { @@ -1189,7 +1189,7 @@ s32 EnRailgibud_PerformCutsceneActions(EnRailgibud* this, PlayState* play) { case 2: this->cutsceneAnimIndex = EN_RAILGIBUD_ANIM_SLUMP_START; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_WEAKENED2); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_WEAKENED2); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, EN_RAILGIBUD_ANIM_SLUMP_START); break; @@ -1232,9 +1232,9 @@ s32 EnRailgibud_PerformCutsceneActions(EnRailgibud* this, PlayState* play) { case 5: if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { if (play->csCtx.frames < 280) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_CRY); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_WEAKENED1); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_WEAKENED1); } } break; diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.c b/src/overlays/actors/ovl_En_Rat/z_en_rat.c index 017cd765ae..353f221fad 100644 --- a/src/overlays/actors/ovl_En_Rat/z_en_rat.c +++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.c @@ -585,14 +585,14 @@ void EnRat_Idle(EnRat* this, PlayState* play) { this->actor.speedXZ = 2.0f; if (Animation_OnFrame(&this->skelAnime, 0.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BOMCHU_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_BOMCHU_WALK); if (this->animLoopCounter != 0) { this->animLoopCounter--; } } if ((this->animLoopCounter == 0) && (Rand_ZeroOne() < 0.05f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BOMCHU_VOICE); + Actor_PlaySfx(&this->actor, NA_SE_EN_BOMCHU_VOICE); this->animLoopCounter = 5; } @@ -615,7 +615,7 @@ void EnRat_SetupSpottedPlayer(EnRat* this) { */ void EnRat_SpottedPlayer(EnRat* this, PlayState* play) { if ((this->animLoopCounter == 3) && Animation_OnFrame(&this->skelAnime, 5.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BOMCHU_AIM); + Actor_PlaySfx(&this->actor, NA_SE_EN_BOMCHU_AIM); } if (Animation_OnFrame(&this->skelAnime, 0.0f)) { @@ -674,7 +674,7 @@ void EnRat_ChasePlayer(EnRat* this, PlayState* play) { this->animLoopCounter--; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BOMCHU_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_BOMCHU_WALK); } DECR(this->timer); @@ -704,7 +704,7 @@ void EnRat_ChasePlayer(EnRat* this, PlayState* play) { } if ((this->animLoopCounter == 0) && (Rand_ZeroOne() < 0.05f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BOMCHU_AIM); + Actor_PlaySfx(&this->actor, NA_SE_EN_BOMCHU_AIM); this->animLoopCounter = 5; } @@ -790,7 +790,7 @@ void EnRat_Update(Actor* thisx, PlayState* play) { if (this->actor.colChkInfo.damageEffect == EN_RAT_DMGEFF_HOOKSHOT) { this->damageReaction.hookedState = EN_RAT_HOOK_STARTED; } else if (this->actor.colChkInfo.damageEffect == EN_RAT_DMGEFF_STUN) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); Actor_SetColorFilter(&this->actor, 0, 120, 0, 40); if (this->actionFunc == EnRat_Bounced) { this->actor.speedXZ = 0.0f; diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 40ed111f47..8d73d5de1e 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -410,7 +410,7 @@ void EnRd_Idle(EnRd* this, PlayState* play) { } if ((play->gameplayFrames & 0x5F) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_CRY); } } @@ -454,7 +454,7 @@ void EnRd_SquattingDance(EnRd* this, PlayState* play) { } if ((play->gameplayFrames & 0x5F) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_CRY); } } @@ -498,14 +498,14 @@ void EnRd_ClappingDance(EnRd* this, PlayState* play) { } if ((play->gameplayFrames & 0x5F) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_CRY); } } void EnRd_EndClappingOrSquattingDanceWhenPlayerIsClose(EnRd* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if ((play->gameplayFrames & 0x5F) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_CRY); } this->danceEndTimer++; @@ -558,7 +558,7 @@ void EnRd_Pirouette(EnRd* this, PlayState* play) { } if ((play->gameplayFrames & 0x5F) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_CRY); } if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { @@ -574,7 +574,7 @@ void EnRd_Pirouette(EnRd* this, PlayState* play) { void EnRd_EndPirouetteWhenPlayerIsClose(EnRd* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if ((play->gameplayFrames & 0x5F) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_CRY); } this->actor.world.rot.y -= this->pirouetteRotationalVelocity; @@ -613,7 +613,7 @@ void EnRd_RiseFromCoffin(EnRd* this, PlayState* play) { } } else { if (this->actor.world.pos.y == this->actor.home.pos.y) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_CRY); } if (Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.home.pos.y + 50.0f, 0.3f, 2.0f, 0.3f) == 0.0f) { @@ -665,7 +665,7 @@ void EnRd_WalkToPlayer(EnRd* this, PlayState* play) { Rumble_Request(this->actor.xzDistToPlayer, 255, 20, 150); } this->playerStunWaitTimer = 60; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_AIM); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_AIM); } } else { EnRd_SetupWalkToHome(this, play); @@ -700,9 +700,9 @@ void EnRd_WalkToPlayer(EnRd* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 10.0f) || Animation_OnFrame(&this->skelAnime, 22.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_WALK); } else if ((play->gameplayFrames & 0x5F) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_CRY); } } @@ -751,9 +751,9 @@ void EnRd_WalkToHome(EnRd* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 10.0f) || Animation_OnFrame(&this->skelAnime, 22.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_WALK); } else if ((play->gameplayFrames & 0x5F) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_CRY); } } @@ -802,9 +802,9 @@ void EnRd_WalkToParent(EnRd* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if (Animation_OnFrame(&this->skelAnime, 10.0f) || Animation_OnFrame(&this->skelAnime, 22.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_WALK); } else if ((play->gameplayFrames & 0x5F) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_CRY); } } @@ -873,7 +873,7 @@ void EnRd_Grab(EnRd* this, PlayState* play) { Math_SmoothStepToS(&this->actor.shape.rot.y, player->actor.shape.rot.y, 1, 6000, 0); if (Animation_OnFrame(&this->skelAnime, 0.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_ATTACK); } this->grabDamageTimer--; @@ -881,7 +881,7 @@ void EnRd_Grab(EnRd* this, PlayState* play) { play->damagePlayer(play, -8); Rumble_Request(this->actor.xzDistToPlayer, 240, 1, 12); this->grabDamageTimer = 20; - func_800B8E58(player, player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_DAMAGE_S); + Player_PlaySfx(player, player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_DAMAGE_S); } break; @@ -922,7 +922,7 @@ void EnRd_AttemptPlayerFreeze(EnRd* this, PlayState* play) { Rumble_Request(this->actor.xzDistToPlayer, 255, 20, 150); func_80123E90(play, &this->actor); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_AIM); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_AIM); EnRd_SetupWalkToPlayer(this, play); } } @@ -931,7 +931,7 @@ void EnRd_SetupGrabFail(EnRd* this) { this->action = EN_RD_ACTION_FAILING_GRAB; Animation_MorphToPlayOnce(&this->skelAnime, &gGibdoRedeadDamageAnim, -6.0f); this->actor.speedXZ = -2.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_DAMAGE); this->action = EN_RD_ACTION_FAILING_GRAB; this->actionFunc = EnRd_GrabFail; } @@ -1009,7 +1009,7 @@ void EnRd_SetupDamage(EnRd* this) { } this->actor.flags |= ACTOR_FLAG_1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_DAMAGE); this->action = EN_RD_ACTION_DAMAGE; this->actionFunc = EnRd_Damage; } @@ -1044,7 +1044,7 @@ void EnRd_SetupDead(EnRd* this) { this->deathTimer = 300; this->actor.flags &= ~ACTOR_FLAG_1; this->actor.speedXZ = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_DEAD); this->actionFunc = EnRd_Dead; } @@ -1075,7 +1075,7 @@ void EnRd_Dead(EnRd* this, PlayState* play) { this->deathTimer--; } } else if (Animation_OnFrame(&this->skelAnime, 33.0f) || Animation_OnFrame(&this->skelAnime, 40.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GERUDOFT_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_GERUDOFT_DOWN); } } @@ -1087,7 +1087,7 @@ void EnRd_SetupStunned(EnRd* this) { if (gSaveContext.sunsSongState != SUNSSONG_INACTIVE) { this->stunnedBySunsSong = true; this->sunsSongStunTimer = 600; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_LIGHT_ARROW_HIT); + Actor_PlaySfx(&this->actor, NA_SE_EN_LIGHT_ARROW_HIT); Actor_SetColorFilter(&this->actor, 0x8000, 0x80C8, 0, 255); } else if (this->damageEffect == EN_RD_DMGEFF_STUN) { Actor_SetColorFilter(&this->actor, 0, 0xC8, 0, 40); diff --git a/src/overlays/actors/ovl_En_Rg/z_en_rg.c b/src/overlays/actors/ovl_En_Rg/z_en_rg.c index 9e6e22098b..5cd8c78bc9 100644 --- a/src/overlays/actors/ovl_En_Rg/z_en_rg.c +++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.c @@ -285,11 +285,11 @@ void func_80BF3FF8(EnRg* this) { s32 func_80BF4024(EnRg* this, PlayState* play) { if ((play->csCtx.state == 0) && (this->unk_334 == 1)) { if (Animation_OnFrame(&this->skelAnime, 2.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_CIRCLE); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_CIRCLE); } if (Animation_OnFrame(&this->skelAnime, 22.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_SIT_IMT); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_SIT_IMT); } } @@ -319,7 +319,7 @@ void func_80BF40F4(EnRg* this) { s32 func_80BF416C(EnRg* this, PlayState* play) { if ((this->actor.bgCheckFlags & 1) && (this->actor.speedXZ >= 0.01f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_ROLLING - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_ROLLING - SFX_FLAG); func_800AE930(&play->colCtx, Effect_GetByIndex(this->unk_340), &this->actor.world.pos, 18.0f, this->actor.shape.rot.y, this->actor.floorPoly, this->actor.floorBgId); } else { @@ -501,7 +501,7 @@ s32 func_80BF47AC(EnRg* this, PlayState* play) { void func_80BF4934(EnRg* this) { if (this->unk_318 == 1) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_DASH); } } 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 0fd1007d0d..ae7da7d1ba 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 @@ -86,7 +86,7 @@ void EnRiverSound_Draw(Actor* thisx, PlayState* play) { s16 params = this->actor.params; if (params < RS_RIVER_DEFAULT_LOW_FREQ) { - Actor_PlaySfxAtPos(&this->actor, gAudioEnvironmentalSfx[params]); + Actor_PlaySfx(&this->actor, gAudioEnvironmentalSfx[params]); } else { Audio_PlaySfxForRiver(&this->actor.projectedPos, freqScale[this->soundFreqIndex]); } diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index 6c7ac273c0..10706fa9a5 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -215,7 +215,7 @@ void func_808FA19C(EnRr* this, PlayState* play) { void func_808FA238(EnRr* this, f32 arg1) { this->actor.speedXZ = arg1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_LIKE_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_LIKE_WALK); } void func_808FA260(EnRr* this) { @@ -236,7 +236,7 @@ void func_808FA260(EnRr* this) { this->actionFunc = func_808FB088; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_LIKE_UNARI); + Actor_PlaySfx(&this->actor, NA_SE_EN_LIKE_UNARI); } void func_808FA344(EnRr* this) { @@ -286,7 +286,7 @@ void func_808FA3F8(EnRr* this, Player* player) { } this->actionFunc = func_808FB1C0; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_SUISEN_DRINK); + Actor_PlaySfx(&this->actor, NA_SE_EN_SUISEN_DRINK); } void func_808FA4F4(EnRr* this, PlayState* play) { @@ -331,7 +331,7 @@ void func_808FA4F4(EnRr* this, PlayState* play) { player->actor.world.pos.z += sp30 * Math_CosS(this->actor.shape.rot.y); func_800B8D50(play, &this->actor, sp30, this->actor.shape.rot.y, sp2C, sp38); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_SUISEN_THROW); + Actor_PlaySfx(&this->actor, NA_SE_EN_SUISEN_THROW); } } @@ -360,7 +360,7 @@ void func_808FA6B8(EnRr* this) { } this->actionFunc = func_808FB398; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_LIKE_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_LIKE_DAMAGE); } void func_808FA7AC(EnRr* this) { @@ -415,7 +415,7 @@ void func_808FA910(EnRr* this) { } this->actionFunc = func_808FB42C; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_LIKE_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_LIKE_DEAD); this->actor.flags &= ~ACTOR_FLAG_1; } @@ -482,7 +482,7 @@ s32 func_808FAA94(EnRr* this, PlayState* play) { func_808FA910(this); } } else if (this->actor.colChkInfo.damageEffect == 1) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); Actor_SetColorFilter(&this->actor, 0, 255, 0, 80); this->unk_1EE = 80; func_808FA9CC(this); @@ -632,7 +632,7 @@ void func_808FB1C0(EnRr* this, PlayState* play) { Rumble_Request(this->actor.xyzDistToPlayerSq, 120, 2, 120); if (!(this->unk_1E4 & 7)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_DEMO_EYE); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_DEMO_EYE); } player->unk_AE8 = 0; diff --git a/src/overlays/actors/ovl_En_Ru/z_en_ru.c b/src/overlays/actors/ovl_En_Ru/z_en_ru.c index 042f2e46f8..fabf053597 100644 --- a/src/overlays/actors/ovl_En_Ru/z_en_ru.c +++ b/src/overlays/actors/ovl_En_Ru/z_en_ru.c @@ -161,12 +161,12 @@ s32 EnRu_PlayWalkingSound(EnRu* this, PlayState* play) { this->isLeftFootGrounded = isFootGrounded = SubS_IsFloorAbove(play, &this->leftFootPos, -6.0f); if (this->isLeftFootGrounded && !leftWasGrounded && isFootGrounded) { - Actor_PlaySfxAtPos(&this->actor, sfxId); + Actor_PlaySfx(&this->actor, sfxId); } this->isRightFootGrounded = isFootGrounded = SubS_IsFloorAbove(play, &this->rightFootPos, -6.0f); if (this->isRightFootGrounded && !rightWasGrounded && isFootGrounded) { - Actor_PlaySfxAtPos(&this->actor, sfxId); + Actor_PlaySfx(&this->actor, sfxId); } return false; diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c index f77993e5d6..6bb60af551 100644 --- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c +++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c @@ -282,7 +282,7 @@ void EnRuppecrow_SpawnRupee(EnRuppecrow* this, PlayState* play) { this->rupees[rupeeIndex] = rupee; this->rupees[rupeeIndex]->actor.gravity = -5.0f; this->rupees[rupeeIndex]->actor.velocity.y = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_RUPY_FALL); + Actor_PlaySfx(&this->actor, NA_SE_EV_RUPY_FALL); rupee = this->rupees[rupeeIndex]; rupee->unk152 = 60; this->rupees[rupeeIndex]->actor.flags |= ACTOR_FLAG_10; @@ -293,7 +293,7 @@ void EnRuppecrow_SpawnRupee(EnRuppecrow* this, PlayState* play) { this->rupees[rupeeIndex] = rupee; this->rupees[rupeeIndex]->actor.gravity = -5.0f; this->rupees[rupeeIndex]->actor.velocity.y = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_RUPY_FALL); + Actor_PlaySfx(&this->actor, NA_SE_EV_RUPY_FALL); rupee = this->rupees[rupeeIndex]; rupee->unk152 = 60; this->rupees[rupeeIndex]->actor.flags |= ACTOR_FLAG_10; @@ -305,7 +305,7 @@ void EnRuppecrow_SpawnRupee(EnRuppecrow* this, PlayState* play) { this->rupees[rupeeIndex] = rupee; this->rupees[rupeeIndex]->actor.gravity = -5.0f; this->rupees[rupeeIndex]->actor.velocity.y = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_RUPY_FALL); + Actor_PlaySfx(&this->actor, NA_SE_EV_RUPY_FALL); rupee = this->rupees[rupeeIndex]; rupee->unk152 = 60; this->rupees[rupeeIndex]->actor.flags |= ACTOR_FLAG_10; @@ -316,7 +316,7 @@ void EnRuppecrow_SpawnRupee(EnRuppecrow* this, PlayState* play) { this->rupees[rupeeIndex] = rupee; this->rupees[rupeeIndex]->actor.gravity = -5.0f; this->rupees[rupeeIndex]->actor.velocity.y = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_RUPY_FALL); + Actor_PlaySfx(&this->actor, NA_SE_EV_RUPY_FALL); rupee = this->rupees[rupeeIndex]; rupee->unk152 = 60; this->rupees[rupeeIndex]->actor.flags |= ACTOR_FLAG_10; @@ -449,7 +449,7 @@ void EnRuppecrow_HandleDeath(EnRuppecrow* this) { scale = this->actor.scale.x * 100.0f; this->actor.world.pos.y += 20.0f * scale; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KAICHO_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_DEAD); this->unk_2CC = 0.5f; if (this->actor.colChkInfo.damageEffect == 0x3) { @@ -518,7 +518,7 @@ void EnRuppecrow_HandleSong(EnRuppecrow* this, PlayState* play) { this->actor.shape.yOffset = Math_SinS(this->yOffset) * 500.0f; if ((play->state.frames % 43) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KAICHO_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_CRY); } } @@ -563,7 +563,7 @@ void EnRuppecrow_FlyWhileDroppingRupees(EnRuppecrow* this, PlayState* play) { this->actor.shape.yOffset = Math_SinS(this->yOffset) * 500.0f; if ((play->state.frames % 43) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KAICHO_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_CRY); } } } @@ -585,7 +585,7 @@ void EnRuppecrow_FlyToDespawn(EnRuppecrow* this, PlayState* play) { Actor_MoveWithGravity(&this->actor); if ((play->state.frames % 43) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KAICHO_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_CRY); } } } diff --git a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c index cc3cd2455d..a9485b6a87 100644 --- a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c +++ b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c @@ -765,10 +765,10 @@ void EnSGoro_UpdateSleeping(EnSGoro* this, PlayState* play) { if (this->snorePhase == 0) { if (this->actionFlags & EN_S_GORO_ACTIONFLAG_SNOREPHASE) { this->actionFlags &= ~EN_S_GORO_ACTIONFLAG_SNOREPHASE; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_SNORE2); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_SNORE2); } else { this->actionFlags |= EN_S_GORO_ACTIONFLAG_SNOREPHASE; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_SNORE1); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_SNORE1); } } } else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_22_04)) { diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index 868b489230..cae39cdae2 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -155,7 +155,7 @@ void EnSb_SetupOpen(EnSb* this) { ANIMMODE_ONCE, 0.0f); this->state = SHELLBLADE_OPEN; this->actionFunc = EnSb_Open; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KUSAMUSHI_VIBE); + Actor_PlaySfx(&this->actor, NA_SE_EN_KUSAMUSHI_VIBE); } void EnSb_SetupWaitOpen(EnSb* this) { @@ -172,7 +172,7 @@ void EnSb_SetupLunge(EnSb* this) { Animation_Change(&this->skelAnime, &object_sb_Anim_000124, playbackSpeed, 0.0f, frameCount, ANIMMODE_ONCE, 0); this->state = SHELLBLADE_LUNGE; this->actionFunc = EnSb_Lunge; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KUSAMUSHI_VIBE); + Actor_PlaySfx(&this->actor, NA_SE_EN_KUSAMUSHI_VIBE); } void EnSb_SetupBounce(EnSb* this) { @@ -270,7 +270,7 @@ void EnSb_Lunge(EnSb* this, PlayState* play) { Math_StepToF(&this->actor.speedXZ, 0.0f, 0.2f); if (this->actor.velocity.y <= -0.1f || this->actor.bgCheckFlags & 2) { if (!(this->actor.depthInWater > 0.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); } this->actor.bgCheckFlags &= ~2; EnSb_SetupBounce(this); diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c index fa017af877..41c7a3e640 100644 --- a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c +++ b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c @@ -116,7 +116,7 @@ void func_80BD6A8C(EnScRuppe* this, PlayState* play) { if (this->collider.base.ocFlags1 & OC1_HIT) { this->ruppeDisplayTime = 0; this->actor.gravity = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_GET_RUPY); + Actor_PlaySfx(&this->actor, NA_SE_SY_GET_RUPY); Rupees_ChangeBy(sRupeeInfo[this->ruppeIndex].amount); this->actionFunc = func_80BD6B18; } diff --git a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c index 4f82070461..3d5a774cc3 100644 --- a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c +++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c @@ -252,7 +252,7 @@ void func_80BCB230(EnScopenuts* this, PlayState* play) { if ((((this->actor.playerHeightRel < 50.0f) && (this->actor.playerHeightRel > -50.0f)) ? true : false) && ((this->actor.xzDistToPlayer < 200.0f) ? true : false)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); this->actionFunc = func_80BCB4DC; this->unk_348 = 3; this->collider.dim.height = 64; @@ -262,12 +262,12 @@ void func_80BCB230(EnScopenuts* this, PlayState* play) { if ((this->unk_348 == 4) || (this->unk_348 == 18)) { this->unk_348 = 17; this->collider.dim.height = 0; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DOWN); SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimationInfo, 17); } else if (this->unk_348 == 2) { this->unk_348 = 16; this->collider.dim.height = 32; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_UP); SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimationInfo, 16); } else if (this->unk_348 == 17) { if (DECR(this->unk_34E) == 0) { @@ -464,7 +464,7 @@ void func_80BCBA00(EnScopenuts* this, PlayState* play) { this->unk_35A = 3; this->unk_348 = 19; SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimationInfo, 19); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DOWN); this->unk_328 &= ~2; this->unk_34E = 50; this->unk_328 |= 8; @@ -528,7 +528,7 @@ void func_80BCBD28(EnScopenuts* this, PlayState* play) { this->unk_368 = 0.3f; this->unk_348 = 9; SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimationInfo, 9); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); func_80BCAC40(this, play); this->actionFunc = func_80BCBF0C; } diff --git a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c index b16153a53d..893ca400be 100644 --- a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c +++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c @@ -294,7 +294,7 @@ void func_80ADB254(EnSellnuts* this, PlayState* play) { Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 2, 0xE38); if (((this->actor.playerHeightRel < 50.0f) && (this->actor.playerHeightRel > -50.0f) ? true : false) && ((this->actor.xzDistToPlayer < 200.0f) ? true : false)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); this->actionFunc = func_80ADB4F4; this->unk_34C = 3; this->collider.dim.height = 64; @@ -303,12 +303,12 @@ void func_80ADB254(EnSellnuts* this, PlayState* play) { if ((this->unk_34C == 4) || (this->unk_34C == 18)) { this->unk_34C = 17; this->collider.dim.height = 0; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DOWN); SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimationInfo, 17); } else if (this->unk_34C == 2) { this->unk_34C = 16; this->collider.dim.height = 32; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_UP); SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimationInfo, 16); } else if (this->unk_34C == 17) { if (DECR(this->unk_34E) == 0) { @@ -548,7 +548,7 @@ void func_80ADBE80(EnSellnuts* this, PlayState* play) { this->unk_350 = 4; this->unk_34C = 19; SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimationInfo, 19); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DOWN); this->unk_338 &= ~1; this->unk_338 |= 8; this->unk_32C = this->actor.world.pos.y; @@ -617,7 +617,7 @@ void func_80ADC118(EnSellnuts* this, PlayState* play) { this->unk_34C = 9; this->unk_360 = 0.3f; SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimationInfo, 9); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); this->actionFunc = func_80ADC034; } } @@ -823,7 +823,7 @@ void func_80ADCA64(EnSellnuts* this, PlayState* play) { this->unk_34C = 19; this->actor.velocity.y = 0.0f; SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimationInfo, this->unk_34C); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DOWN); } return; } @@ -884,7 +884,7 @@ void func_80ADCD3C(EnSellnuts* this, PlayState* play) { this->collider.dim.height = 64; this->unk_34C = 3; this->unk_350 = 4; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimationInfo, this->unk_34C); this->actionFunc = func_80ADCC04; } else if (D_80ADD940 != 0) { diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index bb1fb7e0bb..5b08cfaa77 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -289,7 +289,7 @@ void func_80994DA8(EnSkb* this, PlayState* play) { void func_80994E2C(EnSkb* this) { Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 1); this->actor.flags &= ~ACTOR_FLAG_1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_APPEAR); this->unk_3D0 = 0; this->unk_3DE = 0; this->actionFunc = func_80994E94; @@ -495,7 +495,7 @@ void func_8099556C(EnSkb* this, PlayState* play) { } void func_8099571C(EnSkb* this) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_ATTACK); this->unk_3DC = 0; this->actor.shape.shadowScale = 0.0f; if (this->unk_3DE == 9) { @@ -540,7 +540,7 @@ void func_809958F4(EnSkb* this) { this->unk_3E4 = 0; this->actor.flags &= ~ACTOR_FLAG_1; this->actor.speedXZ = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); this->unk_3DE = 1; this->actionFunc = func_8099599C; } @@ -585,7 +585,7 @@ void func_80995A8C(EnSkb* this, PlayState* play) { Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer + this->unk_3DA, 1, 0x2EE, 0); this->actor.world.rot.y = this->actor.shape.rot.y; if (Animation_OnFrame(&this->skelAnime, 8.0f) || Animation_OnFrame(&this->skelAnime, 15.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_WALK); } if ((this->actor.xzDistToPlayer > 800.0f) || func_80996594(this, play)) { @@ -605,7 +605,7 @@ void func_80995C24(EnSkb* this) { void func_80995C84(EnSkb* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, 3.0f) && (this->unk_3E4 == 0)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_ATTACK); this->unk_3E4 = 1; } else if (Animation_OnFrame(&this->skelAnime, 6.0f)) { this->unk_3E4 = 0; @@ -638,7 +638,7 @@ void func_80995E08(EnSkb* this) { if (this->actor.bgCheckFlags & 1) { this->actor.speedXZ = 0.0f; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->unk_3E4 = 0; this->unk_3DE = 5; this->actionFunc = func_80995E64; @@ -697,7 +697,7 @@ void func_80995F98(EnSkb* this) { this->actor.speedXZ = -4.0f; } } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_DAMAGE); this->unk_3DE = 6; this->actionFunc = func_809960AC; } @@ -749,7 +749,7 @@ void func_80996284(EnSkb* this, PlayState* play) { } void func_809962D4(EnSkb* this) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->actionFunc = func_8099630C; } @@ -934,7 +934,7 @@ void func_8099672C(EnSkb* this, PlayState* play) { case 3: if (this->actor.colChkInfo.health != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_DAMAGE); this->drawDmgEffTimer = 80; } else { this->drawDmgEffTimer = 3; @@ -952,7 +952,7 @@ void func_8099672C(EnSkb* this, PlayState* play) { this->drawDmgEffAlpha = 1.0f; this->drawDmgEffScale = 0.5f; Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, 8); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALKID_DAMAGE); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 3); func_809963C4(this); break; diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c index d8ffd854e6..68f6f1606b 100644 --- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c +++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c @@ -415,7 +415,7 @@ void EnSnowman_MoveSnowPile(EnSnowman* this, PlayState* play) { void EnSnowman_SetupEmerge(EnSnowman* this, PlayState* play) { Animation_PlayOnce(&this->skelAnime, &gEenoEmergeAnim); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_YMAJIN_SURFACE); + Actor_PlaySfx(&this->actor, NA_SE_EN_YMAJIN_SURFACE); this->collider.dim.radius = this->eenoScale * 40.0f; this->collider.dim.height = this->eenoScale * 25.0f; this->actor.draw = EnSnowman_Draw; @@ -495,9 +495,9 @@ void EnSnowman_ReadySnowball(EnSnowman* this, PlayState* play) { EnSnowman_SetupThrowSnowball(this); } else if (Animation_OnFrame(&this->skelAnime, this->fwork.frameToStartHoldingSnowball)) { if (EN_SNOWMAN_GET_TYPE(&this->actor) == EN_SNOWMAN_TYPE_LARGE) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_YMAJIN_HOLD_SNOW); + Actor_PlaySfx(&this->actor, NA_SE_EN_YMAJIN_HOLD_SNOW); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_YMAJIN_MINI_HOLD); + Actor_PlaySfx(&this->actor, NA_SE_EN_YMAJIN_MINI_HOLD); } this->isHoldingSnowball = true; @@ -540,10 +540,10 @@ void EnSnowman_ThrowSnowball(EnSnowman* this, PlayState* play) { this->isHoldingSnowball = false; if (EN_SNOWMAN_GET_TYPE(&this->actor) == EN_SNOWMAN_TYPE_LARGE) { params = EN_SNOWMAN_TYPE_LARGE_SNOWBALL; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_YMAJIN_THROW); + Actor_PlaySfx(&this->actor, NA_SE_EN_YMAJIN_THROW); } else { params = EN_SNOWMAN_TYPE_SMALL_SNOWBALL; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_YMAJIN_MINI_THROW); + Actor_PlaySfx(&this->actor, NA_SE_EN_YMAJIN_MINI_THROW); } Actor_Spawn(&play->actorCtx, play, ACTOR_EN_SNOWMAN, this->snowballPos.x, this->snowballPos.y, @@ -573,7 +573,7 @@ void EnSnowman_SetupSubmerge(EnSnowman* this, PlayState* play) { Animation_Change(&this->skelAnime, &gEenoEmergeAnim, -1.0f, Animation_GetLastFrame(&gEenoEmergeAnim), 0.0f, ANIMMODE_ONCE, -3.0f); EnSnowman_SpawnCircularDustEffect(this, play); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_YMAJIN_HIDE); + Actor_PlaySfx(&this->actor, NA_SE_EN_YMAJIN_HIDE); this->actionFunc = EnSnowman_Submerge; } @@ -677,9 +677,9 @@ void EnSnowman_SetupDamaged(EnSnowman* this) { func_800BE504(&this->actor, &this->collider); if (EN_SNOWMAN_GET_TYPE(&this->actor) == EN_SNOWMAN_TYPE_LARGE) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_YMAJIN_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_YMAJIN_DAMAGE); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_YMAJIN_MINI_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_YMAJIN_MINI_DAMAGE); } this->actionFunc = EnSnowman_Damaged; @@ -707,7 +707,7 @@ void EnSnowman_Damaged(EnSnowman* this, PlayState* play) { if (this->work.timer > 0) { this->work.timer--; } else if (EN_SNOWMAN_GET_TYPE(&this->actor) == EN_SNOWMAN_TYPE_LARGE) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_YMAJIN_SPLIT); + Actor_PlaySfx(&this->actor, NA_SE_EN_YMAJIN_SPLIT); EnSnowman_SpawnCircularDustEffect(this, play); this->drawDmgEffAlpha = 0.0f; EnSnowman_CreateSplitEeno((EnSnowman*)this->actor.parent, &this->actor.world.pos, @@ -845,7 +845,7 @@ void EnSnowman_CreateSplitEeno(EnSnowman* this, Vec3f* basePos, s32 yRot) { * target scale increases. */ void EnSnowman_AbsorbEeno(EnSnowman* smallerEeno, EnSnowman* largerEeno) { - Actor_PlaySfxAtPos(&largerEeno->actor, NA_SE_EN_YMAJIN_UNITE); + Actor_PlaySfx(&largerEeno->actor, NA_SE_EN_YMAJIN_UNITE); largerEeno->fwork.targetScaleDuringCombine += 0.005f; smallerEeno->combineState = EN_SNOWMAN_COMBINE_STATE_BEING_ABSORBED_OR_DONE; smallerEeno->collider.base.ocFlags1 &= ~OC1_HIT; @@ -978,14 +978,14 @@ void EnSnowman_UpdateDamage(EnSnowman* this, PlayState* play) { EnSnowman_SetupEmerge(this, play); } else if (this->actor.colChkInfo.damageEffect == EN_SNOWMAN_DMGEFF_STUN) { Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); EnSnowman_SetupStun(this); } else if (this->actor.colChkInfo.damageEffect == EN_SNOWMAN_DMGEFF_ELECTRIC_STUN) { Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); this->drawDmgEffScale = 0.55f; this->drawDmgEffAlpha = 2.0f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_LARGE; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); EnSnowman_SetupStun(this); } else if (EN_SNOWMAN_GET_TYPE(&this->actor) == EN_SNOWMAN_TYPE_LARGE) { if (this->isHoldingSnowball == true) { diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 233c6c8114..d47d665886 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -228,7 +228,7 @@ void EnSsh_SetWaitAnimation(EnSsh* this) { } void EnSsh_SetReturnAnimation(EnSsh* this) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALTU_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALTU_UP); EnSsh_ChangeAnim(this, SSH_ANIM_UP); } @@ -297,8 +297,8 @@ s32 EnSsh_Damaged(EnSsh* this) { this->spinTimer = 30; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALTU_ROLL); - Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_ST_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALTU_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_VO_ST_ATTACK); return true; } @@ -477,8 +477,8 @@ s32 EnSsh_CheckHitPlayer(EnSsh* this, PlayState* play) { this->spinTimer = this->hitTimer; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALTU_ROLL); - Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_ST_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALTU_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_VO_ST_ATTACK); play->damagePlayer(play, -8); @@ -532,8 +532,8 @@ s32 EnSsh_CheckHitBack(EnSsh* this, PlayState* play) { } if (this->stunTimer == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); - Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_ST_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_VO_ST_DAMAGE); } EnSsh_SetStunned(this); @@ -553,8 +553,8 @@ s32 EnSsh_CollisionCheck(EnSsh* this, PlayState* play) { if (play->actorCtx.unk2 != 0) { this->invincibilityTimer = 8; if (this->stunTimer == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); - Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_ST_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_VO_ST_DAMAGE); } EnSsh_SetStunned(this); this->stateFlags |= SSH_STATE_STUNNED; @@ -739,7 +739,7 @@ void EnSsh_Idle(EnSsh* this, PlayState* play) { } if (DECR(this->sfxTimer) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALTU_LAUGH); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALTU_LAUGH); this->sfxTimer = 64; } @@ -780,7 +780,7 @@ void EnSsh_Drop(EnSsh* this, PlayState* play) { EnSsh_SetLandAnimation(this); EnSsh_SetupAction(this, EnSsh_Land); } else if (DECR(this->sfxTimer) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALTU_DOWN); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALTU_DOWN); this->sfxTimer = 3; } } diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index c5cc3232c6..66dbfca21f 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -348,7 +348,7 @@ s16 func_808A5BEC(EnSt* this) { } else { ret = this->actor.yawTowardsPlayer; if (DECR(this->unk_30E) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALTU_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALTU_ROLL); this->unk_18C ^= 2; this->unk_310 = 8; if (this->unk_18C & 1) { @@ -456,7 +456,7 @@ void func_808A60E0(EnSt* this) { if (sp1C == 1.0f) { SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimationInfo, animIndex); - Actor_PlaySfxAtPos(&this->actor, sfxId); + Actor_PlaySfx(&this->actor, sfxId); } this->unk_2D4 = (1.0f - sp1C) * sp20 * this->unk_2C8; @@ -587,7 +587,7 @@ s32 func_808A6580(EnSt* this, PlayState* play) { } else if (func_808A61F4(this)) { switch (this->actor.colChkInfo.damageEffect) { case 1: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->unk_312 = 40; Actor_SetColorFilter(&this->actor, 0, 200, 0, this->unk_312); break; @@ -600,7 +600,7 @@ s32 func_808A6580(EnSt* this, PlayState* play) { break; default: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALTU_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALTU_DAMAGE); this->unk_314 = 20; this->unk_312 = 0; Actor_SetColorFilter(&this->actor, 0x4000, 200, 0, this->unk_314); @@ -663,7 +663,7 @@ s32 func_808A6580(EnSt* this, PlayState* play) { if ((this->unk_316 == 0) && (this->unk_314 == 0) && (this->unk_312 == 0) && !(this->collider1.base.atFlags & AT_BOUNCED) && (this->actor.colChkInfo.health != 0)) { play->damagePlayer(play, -8); - Actor_PlaySfxAtPos(&sp3C->actor, NA_SE_PL_BODY_HIT); + Actor_PlaySfx(&sp3C->actor, NA_SE_PL_BODY_HIT); func_800B8D98(play, &this->actor, 4.0f, this->actor.yawTowardsPlayer, 6.0f); this->unk_316 = 10; this->unk_18C |= 1; @@ -784,7 +784,7 @@ void func_808A6E24(EnSt* this, PlayState* play) { this->actor.speedXZ = 0.0f; if ((s32)this->unk_2D0 != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); } else { this->actor.velocity.y = 0.0f; this->actionFunc = func_808A701C; diff --git a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c index 69efb56761..556b997fd9 100644 --- a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c +++ b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c @@ -346,7 +346,7 @@ void EnStoneheishi_DrinkBottleProcess(EnStoneheishi* this, PlayState* play) { if (this->timer != 0) { if ((this->timer < 10) && (this->bottleDisplay != EN_STONE_BOTTLE_EMPTY)) { this->bottleDisplay = EN_STONE_BOTTLE_EMPTY; - Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_NP_DRINK); + Actor_PlaySfx(&this->actor, NA_SE_VO_NP_DRINK); Player_UpdateBottleHeld(play, GET_PLAYER(play), ITEM_BOTTLE, PLAYER_IA_BOTTLE); } } else { diff --git a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c index 6d214b4fd5..089cb3ebaf 100644 --- a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c +++ b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c @@ -365,7 +365,7 @@ void func_80AE7F34(EnStopheishi* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if ((this->currentAnim == SOLDIER_ANIM_5) && (((s16)this->skelAnime.curFrame % 2) != 0)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SOLDIER_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_SOLDIER_WALK); } if (gSaveContext.save.day != 3) { EnStopheishi_UpdateHeadNormal(this, play); diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c index 93c93eef92..4016052baf 100644 --- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c +++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c @@ -1488,11 +1488,11 @@ void EnSuttari_Update(Actor* thisx, PlayState* play) { if (this->unk428 != 0) { if (this->animIndex == 2 || this->animIndex == 6) { if (Animation_OnFrame(&this->skelAnime, 8.0f) || Animation_OnFrame(&this->skelAnime, 16.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PAMERA_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_PAMERA_WALK); } } else if (this->animIndex == 0 || this->animIndex == 5) { if (Animation_OnFrame(&this->skelAnime, 8.0f) || Animation_OnFrame(&this->skelAnime, 17.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PAMERA_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_PAMERA_WALK); } } } diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index bbc010a2aa..0d0e75a092 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -524,9 +524,9 @@ s32 func_808D9A70(EnSw* this, PlayState* play) { } else { if (this->unk_456 != 0) { if (!ENSW_GET_3(&this->actor)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALWALL_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALWALL_ROLL); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALGOLD_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALGOLD_ROLL); } this->unk_456--; this->skelAnime.curFrame = 0.0f; @@ -575,7 +575,7 @@ s32 func_808D9C18(EnSw* this) { this->actor.world.rot.y = Math_Vec3f_Yaw(&sp3C, &sp30); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALTURA_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALTURA_APPEAR); if (ENSW_GET_3(&this->actor) == 1) { Actor_SetScale(&this->actor, 0.0f); @@ -721,12 +721,12 @@ s32 func_808DA08C(EnSw* this, PlayState* play) { ret = true; } else if (this->actor.colChkInfo.damageEffect == 1) { if (this->unk_45A == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->unk_45A = 40; Actor_SetColorFilter(&this->actor, 0, 200, 0, this->unk_45A); } } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALTU_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALTU_DAMAGE); this->unk_458 = 20; this->unk_45A = 0; Actor_SetColorFilter(&this->actor, 0x4000, 200, 0, this->unk_458); @@ -739,7 +739,7 @@ void func_808DA350(EnSw* this, PlayState* play) { Player* player = GET_PLAYER(play); if ((player->stateFlags1 & PLAYER_STATE1_200000) && (this->actor.xyzDistToPlayerSq < 8000.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALWALL_LAUGH); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALWALL_LAUGH); Math_Vec3f_Copy(&this->unk_374, &player->actor.world.pos); this->unk_410 &= ~0x20; this->unk_414 = 0.0f; @@ -764,7 +764,7 @@ void func_808DA3F4(EnSw* this, PlayState* play) { temp_v0 = Math_Atan2S_XY(sp38.z, sp38.x); if (ABS_ALT(temp_v0) < temp_s1) { this->skelAnime.curFrame = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALWALL_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALWALL_DASH); this->unk_414 = 0.0f; if (this->unk_410 & 0x20) { this->actionFunc = func_808DA6FC; @@ -775,7 +775,7 @@ void func_808DA3F4(EnSw* this, PlayState* play) { } temp_s1 *= (temp_v0 < 0) ? -1 : 1; } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALWALL_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALWALL_ROLL); this->skelAnime.curFrame = 0.0f; } func_808D94D0(this, play, 0, 0, temp_s1); @@ -801,7 +801,7 @@ void func_808DA578(EnSw* this, PlayState* play) { Math_Vec3f_Copy(&this->unk_374, &this->actor.home.pos); this->actionFunc = func_808DA3F4; } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALWALL_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALWALL_DASH); this->skelAnime.curFrame = 0.0f; } @@ -829,7 +829,7 @@ void func_808DA6FC(EnSw* this, PlayState* play) { func_808D94D0(this, play, 0, 0, temp2); } } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALWALL_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALWALL_DASH); this->skelAnime.curFrame = 0.0f; } @@ -882,7 +882,7 @@ void func_808DA89C(EnSw* this, PlayState* play) { this->unk_448 = temp_f2; this->actor.speedXZ = 0.0f; if ((s32)temp_f2 != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALTURA_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALTURA_BOUND); } else { this->actionFunc = func_808DAEB4; this->actor.velocity.y = 0.0f; @@ -919,7 +919,7 @@ void func_808DAA60(EnSw* this, PlayState* play) { temp_v0 = Math_Atan2S_XY(sp34.z, sp34.x); if (ABS_ALT(temp_v0) < sp40) { this->skelAnime.curFrame = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALWALL_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALWALL_DASH); Math_Vec3s_ToVec3f(&this->unk_374, &sp44[this->unk_4A0]); this->actionFunc = func_808DACF4; this->unk_414 = 0.0f; @@ -929,7 +929,7 @@ void func_808DAA60(EnSw* this, PlayState* play) { } } else { if (this->unk_456 != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALGOLD_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALGOLD_ROLL); this->unk_456--; this->skelAnime.curFrame = 0.0f; } else { @@ -971,7 +971,7 @@ void func_808DACF4(EnSw* this, PlayState* play) { func_808D94D0(this, play, 0, 0, temp_f6); } } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALWALL_DASH); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALWALL_DASH); this->skelAnime.curFrame = 0.0f; } @@ -1075,9 +1075,9 @@ void func_808DB100(EnSw* this, PlayState* play) { if ((DECR(this->unk_454) == 0) && Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { if (this->unk_456 != 0) { if (!ENSW_GET_3(&this->actor)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALWALL_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALWALL_ROLL); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALGOLD_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALGOLD_ROLL); } this->unk_456--; this->skelAnime.curFrame = 0.0f; @@ -1112,7 +1112,7 @@ void func_808DB2E0(EnSw* this, PlayState* play) { this->actor.velocity.z *= 0.5f; if ((s32)temp_f2 != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALTURA_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALTURA_BOUND); } else { func_800BC154(play, &play->actorCtx, &this->actor, 5); Math_Vec3f_Copy(&this->actor.velocity, &gZeroVec3f); diff --git a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c index 6f533b3a3a..aac4a27f6c 100644 --- a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c +++ b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c @@ -169,7 +169,7 @@ void EnSyatekiCrow_SetupWaitToMove(EnSyatekiCrow* this) { */ void EnSyatekiCrow_WaitToMove(EnSyatekiCrow* this, PlayState* play) { if (((EN_SYATEKI_CROW_GET_WAIT_MOD(&this->actor) * 20) + 20) < this->waitTimer) { - Actor_PlaySfxAtPos(this->actor.parent, NA_SE_EN_KAICHO_CRY); + Actor_PlaySfx(this->actor.parent, NA_SE_EN_KAICHO_CRY); this->waitTimer = 0; this->actor.speedXZ = EN_SYATEKI_CROW_GET_SPEED_MOD(&this->actor) + 6.0f; this->actor.gravity = -0.5f; @@ -213,7 +213,7 @@ void EnSyatekiCrow_Fly(EnSyatekiCrow* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); this->actor.shape.yOffset = (fabsf(this->skelAnime.curFrame - 3.0f) * 150.0f) + 1700.0f; if ((syatekiMan->perGameVar1.guaySpawnTimer % 90) == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KAICHO_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_CRY); } } @@ -226,7 +226,7 @@ void EnSyatekiCrow_SetupDead(EnSyatekiCrow* this) { this->actor.velocity.y = 0.0f; Animation_Change(&this->skelAnime, &gGuayFlyAnim, 0.4f, 0.0f, 0.0f, ANIMMODE_LOOP_INTERP, -3.0f); this->actor.bgCheckFlags &= ~1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KAICHO_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_DEAD); Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 40); this->actionFunc = EnSyatekiCrow_Dead; } diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c index c21eb61157..c678f37307 100644 --- a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c +++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c @@ -232,7 +232,7 @@ void EnSyatekiDekunuts_WaitToStart(EnSyatekiDekunuts* this, PlayState* play) { if (this->waitTimer > 20) { syatekiMan = (EnSyatekiMan*)this->actor.parent; - Actor_PlaySfxAtPos(&syatekiMan->actor, NA_SE_EN_NUTS_DAMAGE); + Actor_PlaySfx(&syatekiMan->actor, NA_SE_EN_NUTS_DAMAGE); this->waitTimer = 0; EnSyatekiDekunuts_SetupWaitToEmerge(this); } else { @@ -258,7 +258,7 @@ void EnSyatekiDekunuts_WaitToEmerge(EnSyatekiDekunuts* this, PlayState* play) { } void EnSyatekiDekunuts_SetupEmerge(EnSyatekiDekunuts* this) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_UP); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, EN_SYATEKI_DEKUNUTS_ANIM_UP); this->actor.shape.rot.y = this->actor.yawTowardsPlayer; this->actor.world.rot.y = this->actor.yawTowardsPlayer; @@ -379,7 +379,7 @@ void EnSyatekiDekunuts_SetupDead(EnSyatekiDekunuts* this, PlayState* play) { syatekiMan->dekuScrubHitCounter++; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DAMAGE); this->isAlive = false; Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, EN_SYATEKI_DEKUNUTS_ANIM_DAMAGE); this->timer = 160; @@ -394,7 +394,7 @@ void EnSyatekiDekunuts_Dead(EnSyatekiDekunuts* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { if (this->timer == 160) { Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, EN_SYATEKI_DEKUNUTS_ANIM_DIE); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DEAD); this->timer--; } else if (this->timer < 160) { Vec3f pos; diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 759e97206c..2066525fff 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -1012,7 +1012,7 @@ void EnSyatekiMan_Swamp_StartGame(EnSyatekiMan* this, PlayState* play) { this->flagsIndex = 0; this->score = 0; player->stateFlags1 &= ~PLAYER_STATE1_20; - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_FOUND); + Actor_PlaySfx(&this->actor, NA_SE_SY_FOUND); this->dekuScrubFlags = (1 << 4) | (1 << 3) | (1 << 2) | (1 << 1) | (1 << 0); this->guayFlags = 0; this->wolfosFlags = 0; @@ -1036,7 +1036,7 @@ void EnSyatekiMan_Swamp_RunGame(EnSyatekiMan* this, PlayState* play) { // Spawn three guays after the player has killed all Deku Scrubs, or after 140 frames. sHasSpawnedGuaysForThisWave = true; this->perGameVar1.guaySpawnTimer = 0; - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_FOUND); + Actor_PlaySfx(&this->actor, NA_SE_SY_FOUND); this->guayFlags = sGuayFlagsPerWave[this->flagsIndex]; if (this->flagsIndex == 3) { this->flagsIndex = 0; @@ -1168,7 +1168,7 @@ void EnSyatekiMan_Swamp_AddBonusPoints(EnSyatekiMan* this, PlayState* play) { gSaveContext.timerStopTimes[TIMER_ID_MINIGAME_1] += SECONDS_TO_TIMER(1); play->interfaceCtx.minigamePoints += 10; this->score += 10; - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); sBonusTimer = 0; } else { sBonusTimer++; @@ -1342,7 +1342,7 @@ void EnSyatekiMan_Town_RunGame(EnSyatekiMan* this, PlayState* play) { if ((sModFromLosingTime == (timer % 50)) && (this->perGameVar1.octorokState >= SG_OCTO_STATE_INITIAL)) { if (this->flagsIndex < 15) { this->octorokFlags = sOctorokFlagsPerWave[this->flagsIndex++]; - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_FOUND); + Actor_PlaySfx(&this->actor, NA_SE_SY_FOUND); this->perGameVar1.octorokState = SG_OCTO_STATE_SPAWNING; } } diff --git a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c index 162a6d7182..9aa5fbc9fc 100644 --- a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c +++ b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c @@ -195,7 +195,7 @@ void func_80A363B4(EnSyatekiOkuta* this, PlayState* play) { return; } else { func_80A361B0(this, play); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_OCTAROCK_JUMP); + Actor_PlaySfx(&this->actor, NA_SE_EN_OCTAROCK_JUMP); } } @@ -225,7 +225,7 @@ void func_80A364C0(EnSyatekiOkuta* this) { void func_80A36504(EnSyatekiOkuta* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, 4.0f)) { func_80A361B0(this, play); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DAIOCTA_LAND); + Actor_PlaySfx(&this->actor, NA_SE_EN_DAIOCTA_LAND); } else if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { func_80A362F8(this); } @@ -235,7 +235,7 @@ void func_80A3657C(EnSyatekiOkuta* this) { this->unk_2A4 = 0; this->unk_2AA = 300; if (this->unk_2A6 == 1) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_OCTAROCK_DEAD1); + Actor_PlaySfx(&this->actor, NA_SE_EN_OCTAROCK_DEAD1); } Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 1); @@ -261,7 +261,7 @@ void func_80A365EC(EnSyatekiOkuta* this, PlayState* play) { sp84.y = -0.5f; sp84.z = 0.0f; func_80A36148(&sp78, &sp84, -20, play); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_OCTAROCK_DEAD2); + Actor_PlaySfx(&this->actor, NA_SE_EN_OCTAROCK_DEAD2); } this->unk_2A4++; @@ -369,12 +369,12 @@ void EnSyatekiOkuta_Update(Actor* thisx, PlayState* play) { if (func_80A36A90(this, play)) { syatekiMan = (EnSyatekiMan*)this->actor.parent; if (this->unk_2A6 == 1) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); play->interfaceCtx.minigamePoints++; syatekiMan->score++; syatekiMan->perGameVar2.octorokHitType = SG_OCTO_HIT_TYPE_RED; } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_ERROR); + Actor_PlaySfx(&this->actor, NA_SE_SY_ERROR); syatekiMan->perGameVar2.octorokHitType = SG_OCTO_HIT_TYPE_BLUE; } diff --git a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c index 9f35d8bc72..ce044256a8 100644 --- a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c +++ b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c @@ -254,7 +254,7 @@ void EnSyatekiWf_SetupWaitToMove(EnSyatekiWf* this) { */ void EnSyatekiWf_WaitToMove(EnSyatekiWf* this, PlayState* play) { if (this->waitTimer >= 11) { - Actor_PlaySfxAtPos(this->actor.parent, NA_SE_EN_WOLFOS_APPEAR); + Actor_PlaySfx(this->actor.parent, NA_SE_EN_WOLFOS_APPEAR); this->waitTimer = 0; EnSyatekiWf_SetupRun(this); } else { @@ -337,7 +337,7 @@ void EnSyatekiWf_Run(EnSyatekiWf* this, PlayState* play) { } void EnSyatekiWf_SetupJump(EnSyatekiWf* this) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_JUMP); + Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_JUMP); this->actor.velocity.y = 20.0f; this->actor.speedXZ = 5.0f; Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, EN_SYATEKI_WF_ANIM_JUMP); @@ -368,7 +368,7 @@ void EnSyatekiWf_Land(EnSyatekiWf* this, PlayState* play) { void EnSyatekiWf_SetupHowl(EnSyatekiWf* this) { this->timer = 40; this->actor.speedXZ = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_APPEAR); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, EN_SYATEKI_WF_ANIM_DAMAGED); this->actionFunc = EnSyatekiWf_Howl; } @@ -391,7 +391,7 @@ void EnSyatekiWf_SetupDead(EnSyatekiWf* this, PlayState* play) { this->isActive = false; this->actor.speedXZ = 0.0f; EffectSsExtra_Spawn(play, &this->actor.world.pos, &sVelocity, &sAccel, 5, 2); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_DEAD); Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, EN_SYATEKI_WF_ANIM_REAR_UP_FALL_OVER); syatekiMan->score += 100; this->actionFunc = EnSyatekiWf_Dead; diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c index 4391140174..ab86647aaa 100644 --- a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c +++ b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c @@ -313,7 +313,7 @@ void EnTalkGibud_AttemptPlayerFreeze(EnTalkGibud* this, PlayState* play) { player->actor.freezeTimer = 60; Rumble_Request(this->actor.xzDistToPlayer, 255, 20, 150); func_80123E90(play, &this->actor); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_AIM); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_AIM); EnTalkGibud_SetupWalkToPlayer(this); } @@ -358,7 +358,7 @@ void EnTalkGibud_WalkToPlayer(EnTalkGibud* this, PlayState* play) { this->playerStunWaitTimer = 60; Rumble_Request(this->actor.xzDistToPlayer, 255, 20, 150); func_80123E90(play, &this->actor); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_AIM); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_AIM); } else { this->playerStunWaitTimer--; } @@ -374,9 +374,9 @@ void EnTalkGibud_WalkToPlayer(EnTalkGibud* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 10.0f) || Animation_OnFrame(&this->skelAnime, 22.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_WALK); } else if (!(play->gameplayFrames & 95)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_CRY); } } @@ -409,7 +409,7 @@ void EnTalkGibud_Grab(EnTalkGibud* this, PlayState* play) { damageSfxId = player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_DAMAGE_S; play->damagePlayer(play, -8); - func_800B8E58(player, damageSfxId); + Player_PlaySfx(player, damageSfxId); Rumble_Request(this->actor.xzDistToPlayer, 240, 1, 12); this->grabDamageTimer = 0; } else { @@ -417,7 +417,7 @@ void EnTalkGibud_Grab(EnTalkGibud* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 0.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_ATTACK); } if (!(player->stateFlags2 & PLAYER_STATE2_80) || (player->unk_B62 != 0)) { @@ -447,7 +447,7 @@ void EnTalkGibud_Grab(EnTalkGibud* this, PlayState* play) { void EnTalkGibud_SetupGrabFail(EnTalkGibud* this) { Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, EN_TALK_GIBUD_ANIM_DAMAGE); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_DAMAGE); this->actor.speedXZ = -2.0f; this->actionFunc = EnTalkGibud_GrabFail; } @@ -549,7 +549,7 @@ void EnTalkGibud_Stunned(EnTalkGibud* this, PlayState* play) { void EnTalkGibud_SetupDamage(EnTalkGibud* this) { Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, EN_TALK_GIBUD_ANIM_DAMAGE); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_DAMAGE); this->stunTimer = 0; this->grabWaitTimer = 0; this->actor.world.rot.y = this->actor.yawTowardsPlayer; @@ -586,7 +586,7 @@ void EnTalkGibud_Damage(EnTalkGibud* this, PlayState* play) { void EnTalkGibud_SetupDead(EnTalkGibud* this) { Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, EN_TALK_GIBUD_ANIM_DEATH); this->actor.flags &= ~ACTOR_FLAG_1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_DEAD); this->deathTimer = 0; this->actionFunc = EnTalkGibud_Dead; } @@ -612,7 +612,7 @@ void EnTalkGibud_SetupRevive(EnTalkGibud* this) { Animation_Change(&this->skelAnime, &gGibdoRedeadDeathAnim, -1.0f, Animation_GetLastFrame(&gGibdoRedeadDeathAnim), 0.0f, ANIMMODE_ONCE, -8.0f); this->actor.flags |= ACTOR_FLAG_1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_REVERSE); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_REVERSE); this->deathTimer = 0; this->actor.world.rot.y = this->actor.shape.rot.y; this->actionFunc = EnTalkGibud_Revive; @@ -777,7 +777,7 @@ void EnTalkGibud_PassiveIdle(EnTalkGibud* this, PlayState* play) { this->isTalking = true; Message_StartTextbox(play, 0x1388, &this->actor); this->textId = 0x1388; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_AIM); + Actor_PlaySfx(&this->actor, NA_SE_EN_REDEAD_AIM); EnTalkGibud_SetupTalk(this); } else if (this->actor.xzDistToPlayer < 100.0f && !(this->collider.base.acFlags & AC_HIT)) { Actor_TrackPlayer(play, &this->actor, &this->headRotation, &this->upperBodyRotation, this->actor.focus.pos); diff --git a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c index 3325604033..f6b0b2f31f 100644 --- a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c +++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c @@ -188,7 +188,7 @@ void func_80BB69FC(EnTanron2* this, PlayState* play) { if ((this->unk_158 == 0) && ((sp34 + sp30 + sp2C) < 2.0f)) { this->unk_158 = 1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_B_SLIME_EAT); + Actor_PlaySfx(&this->actor, NA_SE_EN_B_SLIME_EAT); } Math_ApproachF(&this->unk_15C, 1.0f, 1.0f, 0.02f); @@ -228,7 +228,7 @@ void func_80BB6BD8(EnTanron2* this, PlayState* play) { if (this->actor.world.pos.y <= this->actor.floorHeight) { this->actor.world.pos.y = this->actor.floorHeight; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IKURA_JUMP2); + Actor_PlaySfx(&this->actor, NA_SE_EN_IKURA_JUMP2); sp2C = D_80BB8450->unk_6BC.x - this->actor.world.pos.x; sp28 = D_80BB8450->unk_6BC.z - this->actor.world.pos.z; @@ -285,7 +285,7 @@ void func_80BB6BD8(EnTanron2* this, PlayState* play) { func_80BB69C0(this); } else { this->unk_150 = 10; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IKURA_JUMP1); + Actor_PlaySfx(&this->actor, NA_SE_EN_IKURA_JUMP1); } } } @@ -318,9 +318,9 @@ void func_80BB6F78(EnTanron2* this, PlayState* play) { if (this->actor.world.pos.y <= this->actor.floorHeight) { this->actor.world.pos.y = this->actor.floorHeight; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IKURA_JUMP2); + Actor_PlaySfx(&this->actor, NA_SE_EN_IKURA_JUMP2); if (D_80BB8450->unk_6F8 > 0.1f) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_OUT_OF_WATER_L); + Actor_PlaySfx(&this->actor, NA_SE_EV_OUT_OF_WATER_L); } this->actor.velocity.y = Rand_ZeroFloat(5.0f) + 12.0f; this->unk_14E = 5; @@ -344,7 +344,7 @@ void func_80BB6F78(EnTanron2* this, PlayState* play) { this->unk_159 = 0; } else { this->unk_150 = 0xA; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IKURA_JUMP1); + Actor_PlaySfx(&this->actor, NA_SE_EN_IKURA_JUMP1); } } } @@ -381,7 +381,7 @@ void func_80BB7398(EnTanron2* this, PlayState* play) { Enemy_StartFinishingBlow(play, &this->actor); SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 30, NA_SE_EN_IKURA_DEAD); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IKURA_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_IKURA_DAMAGE); } } @@ -427,7 +427,7 @@ void func_80BB7578(EnTanron2* this, PlayState* play) { if (acHitInfo->toucher.dmgFlags & 0x80) { func_80BB6B80(this); this->unk_158 = 1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IKURA_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_IKURA_DAMAGE); if ((player->targetedActor != NULL) && (&this->actor != player->targetedActor)) { player->targetedActor = &this->actor; play->actorCtx.targetContext.arrowPointedActor = &this->actor; @@ -448,7 +448,7 @@ void func_80BB7578(EnTanron2* this, PlayState* play) { func_80BB7398(this, play); } } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IKURA_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_IKURA_DAMAGE); goto block_18; } } diff --git a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c index 0e7be15f36..4de900cc4c 100644 --- a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c +++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c @@ -205,7 +205,7 @@ void EnTanron3_Live(EnTanron3* this, PlayState* play) { Math_Vec3f_Copy(&this->targetPos, &player->actor.world.pos); if (!(this->timer & 0xF)) { if (Rand_ZeroOne() < 0.5f && this->actor.xzDistToPlayer <= 200.0f) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PIRANHA_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_PIRANHA_ATTACK); } } @@ -347,7 +347,7 @@ void EnTanron3_SetupDie(EnTanron3* this, PlayState* play) { this->actor.world.rot.y = Math_Atan2S_XY(zDistance, xDistance); this->workTimer[WORK_TIMER_DIE] = 6; this->actor.speedXZ = 10.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KONB_MINI_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_KONB_MINI_DEAD); } void EnTanron3_Die(EnTanron3* this, PlayState* play) { @@ -413,7 +413,7 @@ void EnTanron3_Update(Actor* thisx, PlayState* play) { splashPos.y = this->waterSurfaceYPos + 10.0f; splashPos.z = this->actor.world.pos.z; EffectSsGSplash_Spawn(play, &splashPos, NULL, NULL, 1, 500); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_OUT_OF_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EV_OUT_OF_WATER); } } diff --git a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c index c052c33090..6893b30217 100644 --- a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c +++ b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c @@ -349,7 +349,7 @@ void EnTanron5_Update(Actor* thisx, PlayState* play2) { } this->actor.shape.rot.y += phi_v0; - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_BIG_BOMB_EXPLOSION); + Actor_PlaySfx(&this->actor, NA_SE_IT_BIG_BOMB_EXPLOSION); func_800BC848(&this->actor, play, 4, 4); this->unk_1A0++; } else { @@ -360,7 +360,7 @@ void EnTanron5_Update(Actor* thisx, PlayState* play2) { sp90.y = info->bumper.hitPos.y; sp90.z = info->bumper.hitPos.z; - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_SHIELD_REFLECT_SW); + Actor_PlaySfx(&this->actor, NA_SE_IT_SHIELD_REFLECT_SW); CollisionCheck_SpawnShieldParticlesMetal(play, &sp90); } } diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c index e08739547e..8b24fc38b5 100644 --- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c @@ -501,7 +501,7 @@ void func_80C11590(EnThiefbird* this, PlayState* play) { } else { this->unk_192 -= Rand_S16Offset(4096, 4096); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_THIEFBIRD_VOICE); + Actor_PlaySfx(&this->actor, NA_SE_EN_THIEFBIRD_VOICE); } if ((this->actor.depthInWater > -40.0f) || (this->actor.bgCheckFlags & 1)) { @@ -547,7 +547,7 @@ void func_80C1193C(EnThiefbird* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if (Animation_OnFrame(&this->skelAnime, 1.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KAICHO_FLUTTER); + Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_FLUTTER); } if (this->unk_18E != 0) { @@ -577,7 +577,7 @@ void func_80C1193C(EnThiefbird* this, PlayState* play) { (this->actor.bgCheckFlags & 1) || (this->actor.depthInWater > -40.0f)) { if (this->collider.base.atFlags & AT_HIT) { this->collider.base.atFlags &= ~AT_HIT; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_THIEFBIRD_VOICE); + Actor_PlaySfx(&this->actor, NA_SE_EN_THIEFBIRD_VOICE); if (!(this->collider.base.atFlags & AT_BOUNCED)) { if ((D_80C1392C != 0) && CUR_UPG_VALUE(UPG_QUIVER) && ((STOLEN_ITEM_1 == STOLEN_ITEM_NONE) || (STOLEN_ITEM_2 == STOLEN_ITEM_NONE)) && @@ -606,7 +606,7 @@ void func_80C11C60(EnThiefbird* this) { this->actor.shape.rot.x = 0; this->unk_18E = 40; this->actor.velocity.y = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_THIEFBIRD_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_THIEFBIRD_DEAD); Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 40); this->collider.base.acFlags &= ~AC_ON; this->actor.flags |= ACTOR_FLAG_10; @@ -683,13 +683,13 @@ void func_80C11F6C(EnThiefbird* this, PlayState* play) { if (this->actor.colChkInfo.damageEffect == 5) { Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); } else if (this->actor.colChkInfo.damageEffect == 1) { Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); } else { Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_THIEFBIRD_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_THIEFBIRD_DAMAGE); } this->collider.base.acFlags &= ~AC_ON; @@ -1043,7 +1043,7 @@ void EnThiefbird_Update(Actor* thisx, PlayState* play2) { func_80C12D00(this); if (((this->skelAnime.animation == &gTakkuriFlyAnim) && Animation_OnFrame(&this->skelAnime, 13.0f)) || ((this->skelAnime.animation == &gTakkuriFlyWithItemAnim) && Animation_OnFrame(&this->skelAnime, 1.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KAICHO_FLUTTER); + Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_FLUTTER); } } diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c index 4e09f01a9a..0683008647 100644 --- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c +++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c @@ -266,7 +266,7 @@ void func_80ACA724(EnTimeTag* this, PlayState* play) { play->nextEntrance = play->setupExitList[ENTIMETAG_GET_1F(&this->actor)]; play->transitionTrigger = TRANS_TRIGGER_START; if (!ENTIMETAG_GET_E000(&this->actor)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_OC_DOOR_OPEN); + Actor_PlaySfx(&this->actor, NA_SE_OC_DOOR_OPEN); } this->actionFunc = func_80ACA714; } diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index 2fe8752c29..6d25e639ea 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -259,7 +259,7 @@ void func_80893BCC(EnTite* this, PlayState* play) { } } } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); } } @@ -323,10 +323,10 @@ void func_80894024(EnTite* this, PlayState* play) { void func_8089408C(EnTite* this, PlayState* play) { Animation_PlayOnce(&this->skelAnime, &object_tite_Anim_0004F8); if (!func_80893ADC(this)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_JUMP); + Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_JUMP); } else { this->actor.world.pos.y += this->actor.depthInWater; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_JUMP_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_JUMP_WATER); } if (this->actor.shape.yOffset < 0.0f) { @@ -377,7 +377,7 @@ void func_808942B4(EnTite* this, PlayState* play) { func_8089452C(this, play); } else { this->actor.velocity.y = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_LAND_WATER2); + Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_LAND_WATER2); func_80894414(this); } } @@ -418,7 +418,7 @@ void func_8089452C(EnTite* this, PlayState* play) { sp2C.y += this->actor.depthInWater; this->actor.velocity.y *= 0.75f; EffectSsGRipple_Spawn(play, &sp2C, 0, 500, 0); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_LAND_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_LAND_WATER); this->actionFunc = func_808945B4; } @@ -454,9 +454,9 @@ void func_80894638(EnTite* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, 7.0f)) { if (func_80893ADC(this)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_WALK_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_WALK_WATER); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_WALK); } } @@ -483,9 +483,9 @@ void func_8089484C(EnTite* this) { this->actor.speedXZ = 4.0f; if (func_80893ADC(this)) { this->actor.world.pos.y += this->actor.depthInWater; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_JUMP_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_JUMP_WATER); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_JUMP); + Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_JUMP); } this->actionFunc = func_80894910; } @@ -496,7 +496,7 @@ void func_80894910(EnTite* this, PlayState* play) { Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.1f, 1.0f, 0.0f); SkelAnime_Update(&this->skelAnime); if (this->actor.bgCheckFlags & 0x40) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_LAND_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_LAND_WATER); if (func_80893ADC(this)) { Math_Vec3f_Copy(&sp34, &this->actor.world.pos); @@ -557,7 +557,7 @@ void func_80894BC8(EnTite* this, PlayState* play) { } if (this->actor.bgCheckFlags & 0x40) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_LAND_WATER2); + Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_LAND_WATER2); } else { func_80893BCC(this, play); } @@ -599,7 +599,7 @@ void func_80894E0C(EnTite* this, PlayState* play) { } if (this->actor.bgCheckFlags & 0x40) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_LAND_WATER2); + Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_LAND_WATER2); } else { func_80893BCC(this, play); } @@ -680,7 +680,7 @@ void func_808951B8(EnTite* this, PlayState* play) { void func_808952EC(EnTite* this) { Animation_PlayLoopSetSpeed(&this->skelAnime, &object_tite_Anim_000A14, 1.5f); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_LAST1_GROW_HEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_LAST1_GROW_HEAD); this->collider.base.acFlags &= ~AC_ON; func_80893A18(this); this->unk_2B9 = 1; @@ -708,7 +708,7 @@ void func_80895424(EnTite* this, PlayState* play) { this->collider.base.acFlags |= AC_ON; if (this->actor.bgCheckFlags & 2) { Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, 20.0f, 11, 4.0f, 0, 0, 0); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); } if (this->unk_2BC == 0) { @@ -724,7 +724,7 @@ void func_80895424(EnTite* this, PlayState* play) { void func_808955E4(EnTite* this) { this->unk_2B9 = 0; this->actor.velocity.y = 13.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_LAST1_GROW_HEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_LAST1_GROW_HEAD); this->actor.bgCheckFlags &= ~1; this->collider.base.acFlags &= ~AC_ON; this->actionFunc = func_80895640; @@ -828,7 +828,7 @@ void func_80895AC0(EnTite* this, PlayState* play) { if (Rand_ZeroOne() < 0.25f) { func_8089595C(this, play); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_WALK); } if ((this->unk_2BC == 1) || (this->unk_2BC == -1)) { @@ -874,7 +874,7 @@ void func_80895D08(EnTite* this, PlayState* play) { if (Rand_ZeroOne() < 0.5f) { func_8089595C(this, play); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_WALK); } if ((this->actor.xzDistToPlayer < 240.0f) && (Player_GetMask(play) != PLAYER_MASK_STONE)) { func_8089408C(this, play); @@ -957,7 +957,7 @@ void func_80895FF8(EnTite* this, PlayState* play) { if (this->actor.colChkInfo.damageEffect == 5) { this->unk_2BC = 40; Actor_SetColorFilter(&this->actor, 0, 200, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->drawDmgEffType = ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_LARGE; this->drawDmgEffScale = 0.5f; this->drawDmgEffAlpha = 2.0f; @@ -968,7 +968,7 @@ void func_80895FF8(EnTite* this, PlayState* play) { if (this->actor.colChkInfo.damageEffect == 1) { this->unk_2BC = 40; Actor_SetColorFilter(&this->actor, 0, 200, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); func_80894DD0(this); return; } @@ -1001,7 +1001,7 @@ void func_80895FF8(EnTite* this, PlayState* play) { if (this->actor.colChkInfo.health == 0) { func_80895020(this, play); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_DAMAGE); if (this->unk_2B9 == 0) { func_80894B2C(this); diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index dcc2403b8f..d73045928a 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -958,7 +958,7 @@ void func_80AEE4D0(EnTk* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 33.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_DIG_UP); + Actor_PlaySfx(&this->actor, NA_SE_EV_DIG_UP); } if (!(this->unk_2CA & 0x20)) { @@ -1264,7 +1264,7 @@ void func_80AEF2D8(Actor* thisx, PlayState* play) { if ((this->actor.draw != NULL) && ((this->unk_2D4 == 0) || (this->unk_2D4 == 1)) && (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 24.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_WALK); } this->actionFunc(this, play); @@ -1286,7 +1286,7 @@ void EnTk_Update(Actor* thisx, PlayState* play) { if (((this->unk_2D4 == 0) || (this->unk_2D4 == 1)) && (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 24.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_GOLON_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_WALK); } this->unk_2CA &= ~1; @@ -1324,7 +1324,7 @@ void EnTk_Update(Actor* thisx, PlayState* play) { if (!(this->actor.bgCheckFlags & 1)) { func_800B9010(&this->actor, NA_SE_EV_HONEYCOMB_FALL - SFX_FLAG); } else if (this->actor.bgCheckFlags & 2) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_HUMAN_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EV_HUMAN_BOUND); } } } diff --git a/src/overlays/actors/ovl_En_Trt/z_en_trt.c b/src/overlays/actors/ovl_En_Trt/z_en_trt.c index caceb62bd9..30ec220eb3 100644 --- a/src/overlays/actors/ovl_En_Trt/z_en_trt.c +++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.c @@ -880,7 +880,7 @@ void EnTrt_BeginInteraction(EnTrt* this, PlayState* play) { this->blinkFunc = EnTrt_OpenEyesThenSetToBlink; this->timer = 10; this->cutsceneState = ENTRT_CUTSCENESTATE_PLAYING; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KOTAKE_SURPRISED2); + Actor_PlaySfx(&this->actor, NA_SE_EN_KOTAKE_SURPRISED2); } } else { this->blinkFunc = EnTrt_OpenEyesThenSetToBlink; @@ -934,7 +934,7 @@ void EnTrt_Surprised(EnTrt* this, PlayState* play) { EnTrt_ChangeAnim(&this->skelAnime, sAnimationInfo, TRT_ANIM_SURPRISED); this->animIndex = TRT_ANIM_SURPRISED; this->blinkFunc = EnTrt_OpenEyes2; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KOTAKE_SURPRISED); + Actor_PlaySfx(&this->actor, NA_SE_EN_KOTAKE_SURPRISED); this->timer = 30; this->cutsceneState = ENTRT_CUTSCENESTATE_PLAYING; } diff --git a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c index 4018a5021c..bad027d349 100644 --- a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c +++ b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c @@ -229,7 +229,7 @@ void func_80AD36EC(EnTrt2* this, PlayState* play) { Actor_MoveWithGravity(&this->actor); func_800B9010(&this->actor, NA_SE_EN_KOTAKE_FLY - SFX_FLAG); if ((this->actor.shape.rot.y >= 0x2800) && (this->actor.shape.rot.y < 0x3800)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KOTAKE_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EN_KOTAKE_ROLL); } } @@ -514,7 +514,7 @@ void func_80AD434C(EnTrt2* this, PlayState* play) { Actor_MoveWithGravity(&this->actor); if ((this->actor.shape.rot.y >= 0x2800) && (this->actor.shape.rot.y < 0x3800)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KOTAKE_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EN_KOTAKE_ROLL); } } diff --git a/src/overlays/actors/ovl_En_Tru/z_en_tru.c b/src/overlays/actors/ovl_En_Tru/z_en_tru.c index 733ea0c576..f9654349e2 100644 --- a/src/overlays/actors/ovl_En_Tru/z_en_tru.c +++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.c @@ -915,9 +915,9 @@ s32 func_80A87880(Actor* thisx, PlayState* play) { this->unk_34E &= ~0x400; Player_UpdateBottleHeld(play, player, ITEM_BOTTLE, PLAYER_IA_BOTTLE); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KOUME_DRINK); + Actor_PlaySfx(&this->actor, NA_SE_EN_KOUME_DRINK); } else if (Animation_OnFrame(&this->skelAnime, 90.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KOUME_REGAIN); + Actor_PlaySfx(&this->actor, NA_SE_EN_KOUME_REGAIN); } if ((this->skelAnime.curFrame > 90.0f) && (this->skelAnime.curFrame < 95.0f)) { @@ -961,7 +961,7 @@ s32 func_80A87B48(Actor* thisx, PlayState* play) { this->unk_372 = 10; this->unk_364++; } else if (Animation_OnFrame(&this->skelAnime, 22.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KOUME_MAGIC); + Actor_PlaySfx(&this->actor, NA_SE_EN_KOUME_MAGIC); func_80A85AA4(this->unk_394, &this->unk_1F8, 1.0f, 0.1f, 40.0f); } break; @@ -1017,8 +1017,8 @@ s32 func_80A87DC0(Actor* thisx, PlayState* play) { case 2: AudioSfx_StopById(NA_SE_EN_KOUME_MAGIC); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KOUME_AWAY); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KOUME_LAUGH); + Actor_PlaySfx(&this->actor, NA_SE_EN_KOUME_AWAY); + Actor_PlaySfx(&this->actor, NA_SE_EN_KOUME_LAUGH); EnTru_ChangeAnim(this, KOUME_ANIM_TAKE_OFF); this->skelAnime.baseTransl.y = 0; this->skelAnime.moveFlags = 2; diff --git a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c index e5ff4350f2..504fffffaf 100644 --- a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c +++ b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c @@ -180,10 +180,10 @@ s32 func_80B761FC(EnTruMt* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; if (this->unk_3A4 == 0) { this->unk_3A4 = 1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KOUME_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_KOUME_DAMAGE); } else { this->unk_3A4 = 0; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KOUME_DAMAGE2); + Actor_PlaySfx(&this->actor, NA_SE_EN_KOUME_DAMAGE2); } play->interfaceCtx.minigameHiddenPoints = 1; Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 25); diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index 4f7b8b720a..c14e478d62 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -246,7 +246,7 @@ void EnTuboTrap_Idle(EnTuboTrap* this, PlayState* play) { this->targetHeight += transformationHeight; } this->originPos = this->actor.world.pos; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_POT_MOVE_START); + Actor_PlaySfx(&this->actor, NA_SE_EV_POT_MOVE_START); this->actionFunc = EnTuboTrap_Levitate; } } @@ -273,7 +273,7 @@ void EnTuboTrap_FlyAtPlayer(EnTuboTrap* this, PlayState* play) { // But in MM, certain sfxIds got reordered and devs forgot to update: // In MM, NA_SE_EN_MIZUBABA2_ATTACK is the old value 0x3837 // In MM, NA_SE_EN_TUBOOCK_FLY is the new value 0x3AE0 - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_MIZUBABA2_ATTACK - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_MIZUBABA2_ATTACK - SFX_FLAG); if ((SQ(dX) + SQ(dY) + SQ(dZ) > SQ(240.0f))) { Math_ApproachF(&this->actor.gravity, -3.0f, 0.2f, 0.5f); diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index 50109f8879..e5479a1d7d 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -265,7 +265,7 @@ void func_808CC610(EnVm* this, PlayState* play) { } void func_808CC788(EnVm* this) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BIMOS_AIM); + Actor_PlaySfx(&this->actor, NA_SE_EN_BIMOS_AIM); Animation_Change(&this->skelAnime, &object_vm_Anim_000068, 3.0f, 3.0f, 7.0f, ANIMMODE_ONCE, 0.0f); this->unk_214 = 305; this->unk_220 = 0.06f; @@ -328,7 +328,7 @@ void func_808CCA10(EnVm* this) { this->unk_210 = 0; this->unk_224 = 0.0f; this->unk_220 = 0.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->actionFunc = func_808CCAA4; } @@ -440,7 +440,7 @@ void EnVm_Update(Actor* thisx, PlayState* play) { if ((play->gameplayFrames % 2) != 0) { func_800BBFB0(play, &this->unk_234, 6.0f, 1, 120, 20, 1); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BIMOS_LAZER_GND - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_BIMOS_LAZER_GND - SFX_FLAG); } if (this->unk_224 > 0.0f) { 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 74bd4fec6b..910c03cc44 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -253,7 +253,7 @@ void EnWallmas_WaitToDrop(EnWallmas* this, PlayState* play) { } if (this->timer == 80) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FALL_AIM); + Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_AIM); } if (this->timer == 0) { @@ -298,7 +298,7 @@ void EnWallmas_SetupLand(EnWallmas* this, PlayState* play) { ANIMMODE_ONCE, -3.0f); Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, 15.0f, 6, 20.0f, 300, 100, true); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FALL_LAND); + Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_LAND); this->actionFunc = EnWallmas_Land; } @@ -337,7 +337,7 @@ void EnWallmas_Walk(EnWallmas* this, PlayState* play) { this->actor.world.rot.y = this->actor.shape.rot.y; if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 12.0f) || Animation_OnFrame(&this->skelAnime, 24.0f) || Animation_OnFrame(&this->skelAnime, 36.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FALL_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_WALK); } } @@ -372,7 +372,7 @@ void EnWallmas_ReturnToCeiling(EnWallmas* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 20.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FALL_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_UP); } if (this->actor.playerHeightRel < -900.0f) { @@ -413,7 +413,7 @@ void EnWallmas_Damage(EnWallmas* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 13.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_ATTACK); } Math_StepToF(&this->actor.speedXZ, 0.0f, 0.2f); @@ -466,8 +466,8 @@ void EnWallmas_TakePlayer(EnWallmas* this, PlayState* play) { Player* player = GET_PLAYER(play); if (Animation_OnFrame(&this->skelAnime, 1.0f)) { - func_800B8E58(player, player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_DAMAGE_S); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FALL_CATCH); + Player_PlaySfx(player, player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_DAMAGE_S); + Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_CATCH); } if (SkelAnime_Update(&this->skelAnime)) { @@ -482,11 +482,11 @@ void EnWallmas_TakePlayer(EnWallmas* this, PlayState* play) { player->actor.world.pos.y = this->actor.world.pos.y - sYOffsetPerForm[GET_PLAYER_FORM]; if (this->timer == -30) { - func_800B8E58(player, player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_TAKEN_AWAY); + Player_PlaySfx(player, player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_TAKEN_AWAY); } if (this->timer == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FALL_UP); + Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_UP); } this->timer += 2; @@ -564,10 +564,10 @@ void EnWallmas_UpdateDamage(EnWallmas* this, PlayState* play) { (!(this->collider.info.acHitInfo->toucher.dmgFlags & 0xDB0B3))) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DAIOCTA_REVERSE); + Actor_PlaySfx(&this->actor, NA_SE_EN_DAIOCTA_REVERSE); this->actor.flags &= ~ACTOR_FLAG_1; } else if (this->actor.colChkInfo.damage != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FALL_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_DAMAGE); } EnWallmas_ThawIfFrozen(this, play); @@ -584,12 +584,12 @@ void EnWallmas_UpdateDamage(EnWallmas* this, PlayState* play) { } else if (this->actor.colChkInfo.damageEffect == WALLMASTER_DMGEFF_STUN) { this->timer = 40; Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); EnWallmas_SetupStun(this); } else if (this->actor.colChkInfo.damageEffect == WALLMASTER_DMGEFF_ZORA_MAGIC) { this->timer = 40; Actor_SetColorFilter(&this->actor, 0, 255, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); this->drawDmgEffScale = 0.55f; this->drawDmgEffAlpha = 2.0f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_MEDIUM; diff --git a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c index ef1ae15bc1..6ffda6bf06 100644 --- a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c +++ b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c @@ -156,7 +156,7 @@ void EnWarpTag_RespawnPlayer(EnWarptag* this, PlayState* play) { } else { ActorCutscene_StartAndSetUnkLinkFields(play->playerActorCsIds[4], &this->dyna.actor); - func_800B8E58(player, NA_SE_PL_WARP_PLATE); + Player_PlaySfx(player, NA_SE_PL_WARP_PLATE); Play_EnableMotionBlur(0); } diff --git a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c index 9831040010..f1400d69ba 100644 --- a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c +++ b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c @@ -482,7 +482,7 @@ void func_80A59C04(Actor* thisx, PlayState* play2) { player->flameTimers[j] = Rand_S16Offset(0, 200); } player->isBurning = true; - func_800B8E58(player, player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_DEMO_DAMAGE); + Player_PlaySfx(player, player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_DEMO_DAMAGE); } } diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index b3841a887c..021212ebaa 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -501,7 +501,7 @@ void func_80990C6C(EnWf* this, PlayState* play, s32 arg2) { void func_80990E4C(EnWf* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, 1.0f) && (this->actor.bgCheckFlags & 1)) { func_80990C6C(this, play, 2); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_WALK); } } @@ -517,7 +517,7 @@ s32 func_80990EAC(EnWf* this) { void func_80990ED4(EnWf* this) { this->actor.child = NULL; this->actor.shape.rot.y = this->actor.yawTowardsPlayer; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_APPEAR); func_80991438(this); } @@ -561,7 +561,7 @@ void func_80991040(EnWf* this, PlayState* play) { Math_StepToF(&this->actor.shape.shadowScale, 70.0f, 14.0f); this->unk_2A0--; if (this->unk_2A0 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_APPEAR); } } else if (SkelAnime_Update(&this->skelAnime)) { this->actor.scale.y = this->actor.scale.x; @@ -633,7 +633,7 @@ void func_80991280(EnWf* this, PlayState* play) { } if (this->unk_2A2 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_CRY); } } } @@ -694,7 +694,7 @@ void func_8099149C(EnWf* this, PlayState* play) { } if (this->unk_2A2 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_CRY); } func_80990E4C(this, play); @@ -748,7 +748,7 @@ void func_8099177C(EnWf* this, PlayState* play) { } } if (this->unk_2A2 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_CRY); } } } @@ -787,7 +787,7 @@ void func_809919F4(EnWf* this, PlayState* play) { func_80990E4C(this, play); if (this->unk_2A2 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_CRY); } if ((Math_CosS(sp26 - this->actor.shape.rot.y) < -0.85f) && !Actor_OtherIsTargeted(play, &this->actor) && @@ -831,7 +831,7 @@ void func_80991C80(EnWf* this, PlayState* play) { if (((this->skelAnime.curFrame >= 9.0f) && (this->skelAnime.curFrame < 13.0f)) || ((this->skelAnime.curFrame >= 17.0f) && (this->skelAnime.curFrame < 20.0f))) { if (!(this->collider1.base.atFlags & AT_ON)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_ATTACK); } this->collider1.base.atFlags |= AT_ON; } else { @@ -928,7 +928,7 @@ void func_8099223C(EnWf* this) { this->actor.speedXZ = -6.0f; this->actor.shape.rot.y = this->actor.yawTowardsPlayer; this->actor.world.rot.y = this->actor.yawTowardsPlayer; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_JUMP); + Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_JUMP); this->actionFunc = func_809922B4; } @@ -944,7 +944,7 @@ void func_809922B4(EnWf* this, PlayState* play) { } } if (this->unk_2A2 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_CRY); } } @@ -979,7 +979,7 @@ void func_8099245C(EnWf* this) { } this->unk_298 = 0; this->actor.world.rot.y = this->actor.yawTowardsPlayer; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_DAMAGE); this->actionFunc = func_809924EC; } @@ -1026,7 +1026,7 @@ void func_809926D0(EnWf* this) { this->unk_2A0 = 0; this->actor.speedXZ = 6.5f; this->actor.velocity.y = 15.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_JUMP); + Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_JUMP); this->actor.world.rot.y = this->actor.shape.rot.y; this->actionFunc = func_80992784; } @@ -1146,7 +1146,7 @@ void func_80992B8C(EnWf* this, PlayState* play) { func_80990E4C(this, play); if (this->unk_2A2 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_CRY); } } } @@ -1160,7 +1160,7 @@ void func_80992D6C(EnWf* this) { } this->actor.flags &= ~ACTOR_FLAG_1; this->unk_2A0 = 25; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_DEAD); this->actionFunc = func_80992E0C; } @@ -1272,13 +1272,13 @@ void func_80993194(EnWf* this, PlayState* play) { } if (this->unk_2A2 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_CRY); } } void func_80993350(EnWf* this) { Animation_MorphToLoop(&this->skelAnime, &gWolfosRunAnim, -4.0f); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_APPEAR); this->actionFunc = func_809933A0; } @@ -1312,7 +1312,7 @@ void func_809933A0(EnWf* this, PlayState* play) { func_80990ED4(this); } if (this->unk_2A2 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_CRY); } } @@ -1365,7 +1365,7 @@ void func_8099357C(EnWf* this, PlayState* play) { } if (this->unk_2A2 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_CRY); + Actor_PlaySfx(&this->actor, NA_SE_EN_WOLFOS_CRY); } } @@ -1423,7 +1423,7 @@ void func_8099386C(EnWf* this, PlayState* play) { if (this->actor.colChkInfo.damageEffect == 1) { this->unk_2A0 = 40; Actor_SetColorFilter(&this->actor, 0, 0x78, 0, 40); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); func_809923B0(this); } else if (this->actor.colChkInfo.damageEffect == 5) { this->unk_2A0 = 40; @@ -1431,7 +1431,7 @@ void func_8099386C(EnWf* this, PlayState* play) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_SMALL; this->drawDmgEffScale = 0.75f; this->drawDmgEffAlpha = 2.0f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); func_809923B0(this); } else if (this->actor.colChkInfo.damageEffect == 3) { func_809907D4(this); diff --git a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c index 353fe01ab0..e769bcf905 100644 --- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c +++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c @@ -456,9 +456,9 @@ void EnWiz_HandleIntroCutscene(EnWiz* this, PlayState* play) { this->targetPlatformLightAlpha = 255; Math_Vec3f_Copy(&this->platformLightPos, &this->actor.world.pos); if (this->fightState == EN_WIZ_FIGHT_STATE_FIRST_PHASE) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_UNARI); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_UNARI); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_VOICE - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_VOICE - SFX_FLAG); } this->introCutsceneTimer = 40; @@ -504,7 +504,7 @@ void EnWiz_HandleIntroCutscene(EnWiz* this, PlayState* play) { break; case EN_WIZ_INTRO_CS_RUN_IN_CIRCLES: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_RUN - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_RUN - SFX_FLAG); if (this->introCutsceneTimer == 0) { this->animLoopCounter = this->introCutsceneCameraAngle = 0; this->introCutsceneState = EN_WIZ_INTRO_CS_DISAPPEAR; @@ -663,7 +663,7 @@ void EnWiz_MoveGhosts(EnWiz* this) { } if (playSfx) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_RUN - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_RUN - SFX_FLAG); } } @@ -702,9 +702,9 @@ void EnWiz_SetupAppear(EnWiz* this, PlayState* play) { Math_Vec3f_Copy(&this->platformLightPos, &this->actor.world.pos); if (this->fightState == EN_WIZ_FIGHT_STATE_FIRST_PHASE) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_UNARI); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_UNARI); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_VOICE - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_VOICE - SFX_FLAG); } } @@ -744,7 +744,7 @@ void EnWiz_Appear(EnWiz* this, PlayState* play) { this->shouldStartTimer = true; } } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_VOICE - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_VOICE - SFX_FLAG); } if (this->timer == 0) { @@ -803,7 +803,7 @@ void EnWiz_Dance(EnWiz* this, PlayState* play) { Math_SmoothStepToS(&this->alpha, 255, 1, 5, 0); Math_ApproachF(&this->scale, 0.015f, 0.05f, 0.001f); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_RUN - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_RUN - SFX_FLAG); this->actor.world.rot.y += this->rotationalVelocity; if (this->fightState >= EN_WIZ_FIGHT_STATE_SECOND_PHASE_GHOSTS_RUN_AROUND) { EnWiz_MoveGhosts(this); @@ -856,7 +856,7 @@ void EnWiz_SecondPhaseCutscene(EnWiz* this, PlayState* play) { Math_SmoothStepToS(&this->alpha, 255, 1, 5, 0); subCam = Play_GetCamera(play, this->subCamId); Math_Vec3f_Copy(&subCam->at, &this->actor.focus.pos); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_RUN - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_RUN - SFX_FLAG); if (this->platforms[this->nextPlatformIndex] != NULL) { f32 diffX = this->actor.world.pos.x - this->platforms[this->nextPlatformIndex]->world.pos.x; f32 diffZ = this->actor.world.pos.z - this->platforms[this->nextPlatformIndex]->world.pos.z; @@ -976,8 +976,8 @@ void EnWiz_Attack(EnWiz* this, PlayState* play) { Math_Vec3f_Pitch(&pos, &player->actor.world.pos), Math_Vec3f_Yaw(&pos, &player->actor.world.pos), 0, type * 4); this->hasActiveProjectile = true; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_ATTACK); - Actor_PlaySfxAtPos(&this->actor, NA_SE_PL_MAGIC_FIRE); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_ATTACK); + Actor_PlaySfx(&this->actor, NA_SE_PL_MAGIC_FIRE); } if ((curFrame >= 8.0f) && !this->shouldStartTimer) { @@ -1004,7 +1004,7 @@ void EnWiz_SetupDisappear(EnWiz* this) { this->targetPlatformLightAlpha = 0; this->actor.flags |= ACTOR_FLAG_8000000; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_DISAPPEAR); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_DISAPPEAR); Math_SmoothStepToS(&this->rotationalVelocity, 0x1388, 0x64, 0x3E8, 0x3E8); this->actor.world.rot.y += this->rotationalVelocity; this->actor.flags &= ~ACTOR_FLAG_1; @@ -1060,11 +1060,11 @@ void EnWiz_SetupDamaged(EnWiz* this, PlayState* play) { if ((this->fightState != EN_WIZ_FIGHT_STATE_FIRST_PHASE) && (this->actor.colChkInfo.health <= 0)) { Enemy_StartFinishingBlow(play, &this->actor); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_DEAD); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_DEAD); this->timer = 0; this->actor.flags &= ~ACTOR_FLAG_1; } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_DAMAGE); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_DAMAGE); } this->scale = 0.015f; diff --git a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c index 4ed3333fdb..daa71ac7b5 100644 --- a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c +++ b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c @@ -260,13 +260,13 @@ void EnWiz_MoveMagicProjectile(EnWizFire* this, PlayState* play) { arcingProjectileRotY += BINANG_ADD((s32)randPlusMinusPoint5Scaled(0x1000), 0x3333); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_BOMB_EXPLOSION); + Actor_PlaySfx(&this->actor, NA_SE_IT_BOMB_EXPLOSION); this->poolTimer = Rand_S16Offset(70, 30); if (this->poolTimer != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_EXP - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_EXP - SFX_FLAG); } } else if (this->poolTimer != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG); } Math_Vec3f_Copy(&this->actor.velocity, &gZeroVec3f); @@ -291,7 +291,7 @@ void EnWiz_MoveMagicProjectile(EnWizFire* this, PlayState* play) { } if (Player_HasMirrorShieldEquipped(play) && (this->collider.base.atFlags & AT_BOUNCED)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_SHIELD_REFLECT_MG); + Actor_PlaySfx(&this->actor, NA_SE_IT_SHIELD_REFLECT_MG); this->collider.base.atFlags &= ~(AT_TYPE_ENEMY | AT_BOUNCED | AT_HIT); this->collider.base.atFlags |= AT_TYPE_PLAYER; this->collider.info.toucher.dmgFlags = 0x20; @@ -351,7 +351,7 @@ void EnWiz_SmallFlame(EnWizFire* this, PlayState* play) { } if (this->timer != 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BURN_OUT - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EV_BURN_OUT - SFX_FLAG); } } @@ -392,7 +392,7 @@ void EnWiz_Pool(EnWizFire* this, PlayState* play) { this->collider.dim.height = 30; this->collider.dim.yShift = 15; EnWizFire_InitializeEffect(this, &pos, &accel); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG); return; } @@ -426,7 +426,7 @@ void EnWiz_Pool(EnWizFire* this, PlayState* play) { if (this->isIceType == true) { Math_ApproachZeroF(&this->poolScale, 0.046f, 0.001f); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG); + Actor_PlaySfx(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG); if (!this->shouldPoolFadeOut) { if ((this->actor.parent != NULL) && (this->actor.parent->id == ACTOR_EN_WIZ) && (this->poolScale < 0.05f)) { @@ -625,7 +625,7 @@ void EnWizFire_Update(Actor* thisx, PlayState* play2) { if (this->collider.base.atFlags & AT_HIT) { this->collider.base.atFlags &= ~AT_HIT; if (this->type == EN_WIZ_FIRE_TYPE_MAGIC_PROJECTILE) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WIZ_LAUGH2); + Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_LAUGH2); if (player->invincibilityTimer > 0) { player->invincibilityTimer += 40; if (this->isIceType) { diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index ba63b30212..5b207816ba 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -385,7 +385,7 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) { if ((thisx->params < WOOD_BUSH_GREEN_SMALL) || (thisx->params == WOOD_TREE_SPECIAL)) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - Actor_PlaySfxAtPos(thisx, NA_SE_IT_REFLECTION_WOOD); + Actor_PlaySfx(thisx, NA_SE_IT_REFLECTION_WOOD); } if (thisx->home.rot.y != 0) { @@ -404,7 +404,7 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) { (thisx->params == WOOD_TREE_OVAL_YELLOW_SPAWNED)) { leavesParams = WOOD_LEAF_YELLOW; } - Actor_PlaySfxAtPos(thisx, NA_SE_EV_TREE_SWING); + Actor_PlaySfx(thisx, NA_SE_EV_TREE_SWING); for (i = 3; i >= 0; i--) { Actor_Spawn(&play->actorCtx, play, ACTOR_EN_WOOD02, dropsSpawnPt.x, dropsSpawnPt.y, dropsSpawnPt.z, @@ -439,7 +439,7 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) { (player->rideActor->speedXZ != 0.0f)))) { func_808C4458(this, play, &thisx->world.pos, 1); this->unk_146 = -0x15; - Actor_PlaySfxAtPos(thisx, NA_SE_EV_TREE_SWING); + Actor_PlaySfx(thisx, NA_SE_EV_TREE_SWING); } } else { // Leaves this->unk_146++; diff --git a/src/overlays/actors/ovl_En_Yb/z_en_yb.c b/src/overlays/actors/ovl_En_Yb/z_en_yb.c index 2310a2eef3..f0c0d22387 100644 --- a/src/overlays/actors/ovl_En_Yb/z_en_yb.c +++ b/src/overlays/actors/ovl_En_Yb/z_en_yb.c @@ -377,7 +377,7 @@ void EnYb_Idle(EnYb* this, PlayState* play) { } else if ((player->stateFlags2 & PLAYER_STATE2_8000000) && this->actor.xzDistToPlayer < 180.0f && fabsf(this->actor.playerHeightRel) < 50.0f) { this->playerOcarinaOut |= 1; - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); } EnYb_EnableProximityMusic(this); diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index a16b828f9e..06591b3cd3 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -142,12 +142,12 @@ s32 EnZo_PlayWalkingSound(EnZo* this, PlayState* play) { this->isLeftFootGrounded = isFootGrounded = SubS_IsFloorAbove(play, &this->leftFootPos, -6.0f); if ((this->isLeftFootGrounded) && (!leftWasGrounded) && (isFootGrounded)) { - Actor_PlaySfxAtPos(&this->actor, sfxId); + Actor_PlaySfx(&this->actor, sfxId); } this->isRightFootGrounded = isFootGrounded = SubS_IsFloorAbove(play, &this->rightFootPos, -6.0f); if ((this->isRightFootGrounded) && (!rightWasGrounded) && (isFootGrounded)) { - Actor_PlaySfxAtPos(&this->actor, sfxId); + Actor_PlaySfx(&this->actor, sfxId); } return 0; diff --git a/src/overlays/actors/ovl_En_Zog/z_en_zog.c b/src/overlays/actors/ovl_En_Zog/z_en_zog.c index a165d91feb..d2de680676 100644 --- a/src/overlays/actors/ovl_En_Zog/z_en_zog.c +++ b/src/overlays/actors/ovl_En_Zog/z_en_zog.c @@ -465,7 +465,7 @@ s32 func_80B93EA0(EnZog* this, PlayState* play) { switch (this->unk_306) { case 2: if (play->csCtx.frames == 60) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_JUMP_SAND); + Actor_PlaySfx(&this->actor, NA_SE_EV_JUMP_SAND); } break; @@ -606,7 +606,7 @@ void func_80B943EC(EnZog* this, PlayState* play) { } } else if ((player->stateFlags2 & PLAYER_STATE2_8000000) && (this->actor.xzDistToPlayer < 120.0f)) { this->unk_30A |= 0x10; - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); } } @@ -781,15 +781,15 @@ void func_80B94A00(EnZog* this, PlayState* play) { if ((this->unk_304 == 4) && (Animation_OnFrame(&this->skelAnime, 136.0f) || Animation_OnFrame(&this->skelAnime, 155.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_PL_WALK_WATER0); + Actor_PlaySfx(&this->actor, NA_SE_PL_WALK_WATER0); } if ((this->unk_304 == 5) && (Animation_OnFrame(&this->skelAnime, 12.0f) || Animation_OnFrame(&this->skelAnime, 37.0f))) { if (this->actor.depthInWater > 0.0f) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_PL_WALK_WATER0); + Actor_PlaySfx(&this->actor, NA_SE_PL_WALK_WATER0); } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_PL_WALK_SAND); + Actor_PlaySfx(&this->actor, NA_SE_PL_WALK_SAND); } } } @@ -876,7 +876,7 @@ void func_80B94E34(EnZog* this, PlayState* play) { if ((player->actor.speedXZ > 3.0f) && (this->unk_324 == 0)) { this->unk_324 = 25; - func_800B8E58(player, player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_PUSH); + Player_PlaySfx(player, player->ageProperties->voiceSfxIdOffset + NA_SE_VO_LI_PUSH); } } this->actor.speedXZ *= 0.3f; @@ -966,7 +966,7 @@ void EnZog_Update(Actor* thisx, PlayState* play) { if (((this->unk_304 == 6) && Animation_OnFrame(&this->skelAnime, 43.0f)) || ((this->unk_304 == 17) && Animation_OnFrame(&this->skelAnime, 14.0f))) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_LAND_SAND); + Actor_PlaySfx(&this->actor, NA_SE_EV_LAND_SAND); } if (this->unk_30A & 1) { diff --git a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c index 2f6f0e7917..6dd9103707 100644 --- a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c +++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c @@ -318,7 +318,7 @@ void func_80B31E00(EnZoraegg* this) { } if ((this->unk_1E8 == 111) || (this->unk_1E8 == 32)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ZORA_KIDS_BORN); + Actor_PlaySfx(&this->actor, NA_SE_EV_ZORA_KIDS_BORN); } } @@ -437,7 +437,7 @@ void func_80B324B0(EnZoraegg* this, PlayState* play) { Cutscene_ActorTranslateAndYaw(&this->actor, play, Cutscene_GetActorActionIndex(play, this->actorActionCmd)); if ((this->unk_1EA & 4) && Animation_OnFrame(&this->skelAnime, this->unk_1E4)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ZORA_KIDS_SWIM_1); + Actor_PlaySfx(&this->actor, NA_SE_EV_ZORA_KIDS_SWIM_1); this->unk_1E4 = Rand_ZeroFloat(5.0f); } } else if (this->unk_1EA & 4) { @@ -478,13 +478,13 @@ void func_80B326F4(EnZoraegg* this, PlayState* play) { SET_WEEKEVENTREG(WEEKEVENTREG_19_40); this->unk_1EC = 2; this->unk_1EE = 100; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ZORA_KIDS_SWIM_2); + Actor_PlaySfx(&this->actor, NA_SE_EV_ZORA_KIDS_SWIM_2); } Cutscene_ActorTranslateAndYaw(&this->actor, play, Cutscene_GetActorActionIndex(play, this->actorActionCmd)); if (Animation_OnFrame(&this->skelAnime, 4.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ZORA_KIDS_SWIM_1); + Actor_PlaySfx(&this->actor, NA_SE_EV_ZORA_KIDS_SWIM_1); } } @@ -507,7 +507,7 @@ void func_80B32820(EnZoraegg* this, PlayState* play) { Cutscene_ActorTranslateAndYaw(&this->actor, play, Cutscene_GetActorActionIndex(play, this->actorActionCmd)); if (Animation_OnFrame(&this->skelAnime, 16.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ZORA_KIDS_SWIM_0); + Actor_PlaySfx(&this->actor, NA_SE_EV_ZORA_KIDS_SWIM_0); } } @@ -542,7 +542,7 @@ void func_80B32928(EnZoraegg* this, PlayState* play) { if (Animation_OnFrame(&this->skelAnime, 97.0f) || Animation_OnFrame(&this->skelAnime, 101.0f) || Animation_OnFrame(&this->skelAnime, 105.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ZORA_KIDS_SWIM_1); + Actor_PlaySfx(&this->actor, NA_SE_EV_ZORA_KIDS_SWIM_1); } } @@ -627,7 +627,7 @@ void func_80B32D08(EnZoraegg* this, PlayState* play) { EffectSsGRipple_Spawn(play, &sp34, 150, 500, 0); EffectSsGSplash_Spawn(play, &sp34, NULL, NULL, 0, 200); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_DIVE_INTO_WATER_L); + Actor_PlaySfx(&this->actor, NA_SE_EV_DIVE_INTO_WATER_L); this->actionFunc = func_80B32C34; this->actor.velocity.y = -1.0f; diff --git a/src/overlays/actors/ovl_En_Zot/z_en_zot.c b/src/overlays/actors/ovl_En_Zot/z_en_zot.c index 331a153df4..288424f7e4 100644 --- a/src/overlays/actors/ovl_En_Zot/z_en_zot.c +++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.c @@ -744,7 +744,7 @@ void func_80B97D6C(EnZot* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 5.0f)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ZORA_WALK); + Actor_PlaySfx(&this->actor, NA_SE_EV_ZORA_WALK); } } diff --git a/src/overlays/actors/ovl_En_Zow/z_en_zow.c b/src/overlays/actors/ovl_En_Zow/z_en_zow.c index 7e37091623..c4ef1aaffc 100644 --- a/src/overlays/actors/ovl_En_Zow/z_en_zow.c +++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.c @@ -405,7 +405,7 @@ void func_80BDD1E0(EnZow* this, PlayState* play) { void func_80BDD350(EnZow* this, PlayState* play) { if (this->unk_2CA & 2) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_DIVE_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EV_DIVE_WATER); func_80BDCDA8(this, this->unk_2D0); this->actor.flags &= ~ACTOR_FLAG_1; this->skelAnime.playSpeed = 0.0f; @@ -511,7 +511,7 @@ void func_80BDD6BC(EnZow* this, PlayState* play) { } if (this->actor.depthInWater < 54.0f) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_OUT_OF_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EV_OUT_OF_WATER); func_80BDCDA8(this, this->unk_2D0); func_80BDD04C(this, 1, ANIMMODE_ONCE); this->actor.flags |= ACTOR_FLAG_1; diff --git a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c index acea3daf10..b5a335d920 100644 --- a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c +++ b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c @@ -179,7 +179,7 @@ void func_80ACBC8C(ObjAqua* this, PlayState* play) { if (this->actor.bgCheckFlags & 1) { func_80ACB7F4(this, play); func_80ACBA10(this); - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOTTLE_WATERING); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOTTLE_WATERING); func_80ACBD34(this); } else { func_80ACB6A0(this, play); diff --git a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c index 565c995046..5f46b6596f 100644 --- a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c +++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c @@ -277,14 +277,14 @@ void func_809A562C(ObjArmos* this, PlayState* play) { if ((temp == OBJARMOS_ROT_7_4) || (temp == OBJARMOS_ROT_7_5) || (temp == OBJARMOS_ROT_7_6)) { if (!func_809A500C(this, this->unk_264) || func_809A4E00(this, play, 0x5A)) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); } } else if (func_809A500C(this, this->unk_264)) { if (func_809A4E00(this, play, 0x5A)) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); } } else { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); Flags_SetSwitch(play, OBJARMOS_GET_7F(&this->dyna.actor)); sp20 = true; } 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 35f37d5d8a..349521b26e 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -847,7 +847,7 @@ void func_80938AD8(ObjBean* this, PlayState* play) { func_80937160(this); if (this->unk_1B2 == 25) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_PL_PLANT_GROW_BIG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_PL_PLANT_GROW_BIG); } if (sp30 != 0) { diff --git a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c index f8534afea7..fb7f1466c8 100644 --- a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c +++ b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c @@ -188,11 +188,11 @@ s32 func_80A357A8(ObjBell* this, PlayState* play) { this->unk_20E = 10; switch (this->dyna.actor.colChkInfo.damageEffect) { case 15: - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BIGBELL); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BIGBELL); func_80A35510(this, 1); break; case 14: - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BIGBELL); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BIGBELL); func_80A35510(this, 2); break; default: diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index b033447080..6e0e7b6acb 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -406,7 +406,7 @@ void func_8098DC60(ObjComb* this, PlayState* play) { } else { if (this->unk_1B8 >= 0) { if (this->unk_1B8 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALGOLD_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALGOLD_ROLL); if (Rand_ZeroOne() < 0.1f) { this->unk_1B8 = Rand_S16Offset(40, 80); } else { diff --git a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c index fce6d99ece..4a0c5194fd 100644 --- a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c +++ b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c @@ -436,7 +436,7 @@ void func_80B13940(ObjDhouse* this, PlayState* play2) { if (Flags_GetSwitch(play, OBJDHOUSE_GET_7F(&this->dyna.actor))) { sp20 = true; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_EXPLSION_LONG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_EXPLSION_LONG); } if (sp20) { diff --git a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c index 509f285fe7..bdff9b3bc0 100644 --- a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c +++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c @@ -274,10 +274,10 @@ void ObjDora_UpdateCollision(ObjDora* this, PlayState* play) { case DORA_DMGEFF_STRONG: case DORA_DMGEFF_LIGHT: if (this->actor.colChkInfo.damageEffect == DORA_DMGEFF_LIGHT) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_DORA_S); + Actor_PlaySfx(&this->actor, NA_SE_EV_DORA_S); this->lastGongHitType = DORA_HIT_LIGHT; } else { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_DORA_L); + Actor_PlaySfx(&this->actor, NA_SE_EV_DORA_L); this->lastGongHitType = DORA_HIT_STRONG; } @@ -285,7 +285,7 @@ void ObjDora_UpdateCollision(ObjDora* this, PlayState* play) { ObjDora_SetupMoveGong(this); if ((ObjDora_IsHalfHour(time) == true) && (this->rupeeDropTimer == 0)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); + Actor_PlaySfx(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); itemDrop = Item_DropCollectible(play, &this->actor.world.pos, ITEM00_RUPEE_BLUE); itemDrop->world.rot.y = this->actor.world.rot.y; itemDrop->world.rot.y += (s32)(Rand_Centered() * 90.0f * (0x10000 / 360.0f)); diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c index 49e8ac9342..973c40b972 100644 --- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c +++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c @@ -454,7 +454,7 @@ void func_80A1C838(ObjFlowerpot* this, PlayState* play) { //! @bug: This function should only pass Player*: it uses *(this + 0x153), which is meant to be //! player->currentMask, but in this case is garbage in the collider - func_800B8E58((Player*)this, NA_SE_PL_PULL_UP_POT); + Player_PlaySfx((Player*)&this->actor, NA_SE_PL_PULL_UP_POT); } else if ((this->actor.bgCheckFlags & 0x20) && (this->actor.depthInWater > 19.0f)) { if (!(this->unk_1EA & 2)) { func_80A1B914(this, play); @@ -539,7 +539,7 @@ void func_80A1CC0C(ObjFlowerpot* this, PlayState* play) { this->actor.room = play->roomCtx.curRoom.num; if (fabsf(this->actor.speedXZ) < 0.1f) { func_80A1C818(this); - func_800B8E58(GET_PLAYER(play), NA_SE_PL_PUT_DOWN_POT); + Player_PlaySfx(GET_PLAYER(play), NA_SE_PL_PUT_DOWN_POT); this->collider.base.ocFlags1 &= ~OC1_TYPE_PLAYER; } else { Actor_MoveWithGravity(&this->actor); diff --git a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c index 9c38849c9a..9d390b2ab0 100644 --- a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c +++ b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c @@ -209,7 +209,7 @@ void func_80B145F4(ObjHakaisi* this) { this->unk_19A = 0; this->dyna.actor.flags |= ACTOR_FLAG_8000000; this->dyna.actor.flags &= ~ACTOR_FLAG_1; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WALL_BROKEN); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WALL_BROKEN); this->actionFunc = func_80B14648; } @@ -281,7 +281,7 @@ void func_80B14B6C(ObjHakaisi* this, PlayState* play, Vec3f vec, s16 arg3) { s16 temp_s1; Vec3f sp6C; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WALL_BROKEN); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WALL_BROKEN); for (i = 0; i < 5; i++) { temp_s1 = Rand_Next(); diff --git a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c index e3972be180..fa39be7df2 100644 --- a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c +++ b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c @@ -134,7 +134,7 @@ void ObjHgdoor_HandleCsAction(ObjHgdoor* this, PlayState* play) { this->csAction = play->csCtx.actorActions[actionIndex]->action; switch (play->csCtx.actorActions[actionIndex]->action) { case 1: - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WOOD_DOOR_OPEN_SPEEDY); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WOOD_DOOR_OPEN_SPEEDY); if ((this->dyna.actor.parent != NULL) && (this->dyna.actor.parent->id == ACTOR_EN_HG)) { this->dyna.actor.parent->colChkInfo.health = 1; } diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c index 13f49fd1f8..dc95eec27d 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -274,7 +274,7 @@ void func_80931E58(ObjIcePoly* this, PlayState* play) { } this->unk_14A = 40; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_ICE_MELT); + Actor_PlaySfx(&this->actor, NA_SE_EV_ICE_MELT); this->actionFunc = func_80931EEC; } else { ActorCutscene_SetIntentToPlay(this->actor.cutscene); diff --git a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c index 8c88c35eee..1e7b8c7679 100644 --- a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c +++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c @@ -1096,13 +1096,13 @@ void func_80A25BBC(ObjIceblock* this, PlayState* play) { func_80A23690(this); if (func_80A23F90(this, play)) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); } if (func_80A24954(this, play)) { func_80A2491C(this); if (this->unk_2B0 == 3) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_DIVE_INTO_WATER_L); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_DIVE_INTO_WATER_L); } } } @@ -1175,7 +1175,7 @@ void func_80A25E50(ObjIceblock* this, PlayState* play) { func_80A25BA0(this); } else if (sp38) { if (func_80A24118(this, play, 59.9f, &sp28)) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); } func_80A2541C(this, play); func_80A25CF4(this); @@ -1262,7 +1262,7 @@ void func_80A26144(ObjIceblock* this, PlayState* play) { func_80A23B88(this); func_80A25BA0(this); } else if (sp28) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); func_80A23B88(this); func_80A25FA0(this); } else { diff --git a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c index 3942fff76e..f3860b960e 100644 --- a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c +++ b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c @@ -403,7 +403,7 @@ void ObjKendoKanban_HandlePhysics(ObjKendoKanban* this, PlayState* play) { if (this->actor.bgCheckFlags & 2) { // Upon touching the ground... - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WOODPLATE_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EV_WOODPLATE_BOUND); this->hasNewRootCornerPos = false; this->actor.velocity.y *= 0.5f; } else if (this->actor.bgCheckFlags & 1) { @@ -412,7 +412,7 @@ void ObjKendoKanban_HandlePhysics(ObjKendoKanban* this, PlayState* play) { this->hasNewRootCornerPos = false; this->actor.velocity.x *= 0.3f; this->actor.velocity.z *= 0.3f; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_WOODPLATE_BOUND); + Actor_PlaySfx(&this->actor, NA_SE_EV_WOODPLATE_BOUND); // Adjust and (potentially) reverse rotation depending on the current // facing of the board and the direction in which it is rotating. diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index 36927b2629..e0c642131a 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -278,7 +278,7 @@ void ObjKibako_Idle(ObjKibako* this, PlayState* play) { //! @bug: This function should only pass Player*: it uses *(this + 0x153), which is meant to be //! player->currentMask, but in this case is garbage in the collider - func_800B8E58((Player*)this, NA_SE_PL_PULL_UP_WOODBOX); + Player_PlaySfx((Player*)&this->actor, NA_SE_PL_PULL_UP_WOODBOX); } else if ((this->actor.bgCheckFlags & 0x20) && (this->actor.depthInWater > 19.0f)) { ObjKibako_WaterBreak(this, play); ObjKibako_SpawnCollectible(this, play); @@ -343,7 +343,7 @@ void ObjKibako_Held(ObjKibako* this, PlayState* play) { if (fabsf(this->actor.speedXZ) < 0.1f) { ObjKibako_SetupIdle(this); this->collider.base.ocFlags1 &= ~OC1_TYPE_PLAYER; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PUT_DOWN_WOODBOX); + Actor_PlaySfx(&this->actor, NA_SE_EV_PUT_DOWN_WOODBOX); } else { Actor_MoveWithGravity(&this->actor); ObjKibako_SetupThrown(this); diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index 06af2a8e31..2f092a4f9f 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -233,7 +233,7 @@ void ObjKibako2_Update(Actor* thisx, PlayState* play) { if (this->skulltulaNoiseTimer >= 0) { if (this->skulltulaNoiseTimer == 0) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EN_STALGOLD_ROLL); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EN_STALGOLD_ROLL); if (Rand_ZeroOne() < 0.1f) { this->skulltulaNoiseTimer = Rand_S16Offset(40, 80); } else { diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index f2946d5362..4518e4e29f 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -231,7 +231,7 @@ void ObjLightSwitch_SetupAsleep(ObjLightswitch* this) { void ObjLightSwitch_Asleep(ObjLightswitch* this, PlayState* play) { if (this->colorShiftTimer == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SUN_MARK_FLASH); + Actor_PlaySfx(&this->actor, NA_SE_EV_SUN_MARK_FLASH); } this->colorShiftTimer++; @@ -244,7 +244,7 @@ void ObjLightSwitch_Asleep(ObjLightswitch* this, PlayState* play) { ObjLightSwitch_SetupEnabled(this); } else if (this->colorShiftTimer == 15) { this->faceState = LIGHTSWITCH_FACE_WAKING; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FOOT_SWITCH); + Actor_PlaySfx(&this->actor, NA_SE_EV_FOOT_SWITCH); } } @@ -302,7 +302,7 @@ void ObjLightSwitch_Disabled(ObjLightswitch* this, PlayState* play) { ObjLightswitch_SetupIdle(this); } else if (this->colorShiftTimer == 15) { this->faceState = LIGHTSWITCH_FACE_ASLEEP; - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_FOOT_SWITCH); + Actor_PlaySfx(&this->actor, NA_SE_EV_FOOT_SWITCH); } } diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index c46821ac15..5fea12dd0e 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -113,7 +113,7 @@ void ObjMakekinsuta_Update(Actor* thisx, PlayState* play) { } else { if (this->unk144 >= 0) { if (this->unk144 == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALGOLD_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALGOLD_ROLL); if (Rand_ZeroOne() < 0.1f) { this->unk144 = Rand_S16Offset(0x28, 0x50); } else { diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c index 933ea06d26..a0d1b85a66 100644 --- a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c +++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c @@ -199,7 +199,7 @@ void func_80BA27C4(ObjNozoki* this, PlayState* play) { void func_80BA28DC(ObjNozoki* this, PlayState* play) { if (this->unk_15E != 0) { if (DECR(this->unk_15E) == 0) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_SLIDE_DOOR_OPEN); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_SLIDE_DOOR_OPEN); } return; } @@ -239,7 +239,7 @@ void func_80BA28DC(ObjNozoki* this, PlayState* play) { ObjNozoki_SetupAction(this, func_80BA2AB4); this->dyna.actor.velocity.y = 0.0f; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_SLIDE_DOOR_CLOSE); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_SLIDE_DOOR_CLOSE); } void func_80BA2AB4(ObjNozoki* this, PlayState* play) { @@ -393,10 +393,10 @@ void func_80BA311C(ObjNozoki* this, PlayState* play) { } else if (this->unk_15D == 1) { if (D_80BA36B8 > 40.0f) { this->unk_15D = 2; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_PL_SIT_ON_HORSE); + Actor_PlaySfx(&this->dyna.actor, NA_SE_PL_SIT_ON_HORSE); } else if (this->unk_15E != 0) { if (DECR(this->unk_15E) == 0) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_CONVEYOR_SHUTTER_OPEN); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_CONVEYOR_SHUTTER_OPEN); } } else { Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y + 50.0f, 4.0f); diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index 1d7762c445..582d43f023 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -503,7 +503,7 @@ void ObjOshihiki_Push(ObjOshihiki* this, PlayState* play) { player = GET_PLAYER(play); if (ObjOshihiki_CheckWall(play, this->dyna.yRotation, this->dyna.pushForce, this)) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); } this->dyna.actor.home.pos.x = this->dyna.actor.world.pos.x; @@ -521,7 +521,7 @@ void ObjOshihiki_Push(ObjOshihiki* this, PlayState* play) { } } - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); } void ObjOshihiki_SetupFall(ObjOshihiki* this, PlayState* play) { @@ -553,10 +553,10 @@ void ObjOshihiki_Fall(ObjOshihiki* this, PlayState* play) { } else { ObjOshihiki_SetupOnActor(this, play); } - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); - Actor_PlaySfxAtPos(&this->dyna.actor, SurfaceType_GetSfx(&play->colCtx, this->floorPolys[this->highestFloor], - this->floorBgIds[this->highestFloor]) + - SFX_FLAG); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + Actor_PlaySfx(&this->dyna.actor, SurfaceType_GetSfx(&play->colCtx, this->floorPolys[this->highestFloor], + this->floorBgIds[this->highestFloor]) + + SFX_FLAG); } } diff --git a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c index 3aca23bcad..e2b17e48f8 100644 --- a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c +++ b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c @@ -287,14 +287,14 @@ void func_809A3BC0(ObjPzlblock* this, PlayState* play) { if ((params == 4) || (params == 5) || (params == 6)) { if (!func_809A35EC(this, this->unk_16C) || func_809A33E0(this, play, 0x5A)) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); } } else if (func_809A35EC(this, this->unk_16C)) { if (func_809A33E0(this, play, 0x5A)) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); } } else { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); Flags_SetSwitch(play, OBJPZLBLOCK_GET_7F(&this->dyna.actor)); sp20 = 1; } diff --git a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c index 6a469eea02..374a2f520e 100644 --- a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c +++ b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c @@ -563,7 +563,7 @@ void func_80A224A4(ObjSkateblock* this, PlayState* play) { *this->unk_16C += this->unk_164; if (func_80A21934(this, play)) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); func_80A21D1C(this); sp28 = true; } else { diff --git a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c index 068be3ea07..d38adaa7e4 100644 --- a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c +++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c @@ -440,7 +440,7 @@ void func_80B03FF8(ObjSnowball* this, PlayState* play) { sp18->unk_04(this, play); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SNOWBALL_BROKEN); + Actor_PlaySfx(&this->actor, NA_SE_EV_SNOWBALL_BROKEN); if (rotY == 5) { Flags_SetSwitch(play, OBJSNOWBALL_GET_3F(&this->actor)); @@ -571,7 +571,7 @@ void func_80B04350(ObjSnowball* this, PlayState* play) { } else { this->unk_209 = 10; } - Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_REFLECTION_SNOW); + Actor_PlaySfx(&this->actor, NA_SE_IT_REFLECTION_SNOW); } } diff --git a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c index d62002e731..de220e7a8d 100644 --- a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c +++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c @@ -356,7 +356,7 @@ void func_80B39C9C(ObjSnowball2* this, PlayState* play) { func_80B38E88(this, play); } func_80B38EFC(this, play); - func_800B8E58(GET_PLAYER(play), NA_SE_PL_PULL_UP_SNOWBALL); + Player_PlaySfx(GET_PLAYER(play), NA_SE_PL_PULL_UP_SNOWBALL); func_80B39F60(this); } else if ((this->actor.bgCheckFlags & 0x20) && ((this->actor.shape.yOffset * this->actor.scale.y) < this->actor.depthInWater)) { @@ -476,7 +476,7 @@ void func_80B3A13C(ObjSnowball2* this, PlayState* play) { func_80B395EC(&this->actor, play); } if (this->actor.bgCheckFlags & 0x40) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMB_DROP_WATER); + Actor_PlaySfx(&this->actor, NA_SE_EV_BOMB_DROP_WATER); } } else if ((((play->gameplayFrames % 16) == 0) || ((Rand_Next() >> 0x10) == 0)) && (this->actor.depthInWater < (1200.0f * this->actor.scale.y))) { diff --git a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c index 4708062da4..13e127c73e 100644 --- a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c +++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c @@ -762,7 +762,7 @@ void func_80B30AF8(ObjSpidertent* this, PlayState* play) { if (this->unk_3C7 > 0) { this->unk_3C7--; } else if (this->unk_3C1 > 50) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EN_EXTINCT); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EN_EXTINCT); this->unk_3C7 = Rand_S16Offset(2, 2); } else { SoundSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 11, NA_SE_EN_EXTINCT); diff --git a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c index 83959e1680..b4f3c3d98b 100644 --- a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c +++ b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c @@ -149,7 +149,7 @@ void func_80A1DA50(PlayState* play, ObjSpinyroll* this, Vec3f* arg2, Vec3f* arg3 Math_Vec3f_Sum(arg2, arg3, &sp1C); Math_Vec3f_Scale(&sp1C, 0.5f); EffectSsHitmark_SpawnFixedScale(play, 3, &sp1C); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_IT_SHIELD_REFLECT_SW); + Actor_PlaySfx(&this->dyna.actor, NA_SE_IT_SHIELD_REFLECT_SW); } void func_80A1DAAC(Vec3f* arg0, Vec3f* arg1, s16 arg2) { diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index ada5eadd31..76f5bc8727 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -273,13 +273,13 @@ void ObjSwitch_StopCutscene(ObjSwitch* this) { void ObjSwitch_PlayFootSwitchSfx(ObjSwitch* this) { if (this->sfxTimer <= 0) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_FOOT_SWITCH); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_FOOT_SWITCH); } } void ObjSwitch_PlayDiamondSwitchSfx(ObjSwitch* this) { if (this->sfxTimer <= 0) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_DIAMOND_SWITCH); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_DIAMOND_SWITCH); } } diff --git a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c index 791564b579..6b1058e105 100644 --- a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c +++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c @@ -316,7 +316,7 @@ void ObjTaru_Update(Actor* thisx, PlayState* play) { if (this->unk_1AD >= 0) { switch (this->unk_1AD) { case 0: - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EN_STALGOLD_ROLL); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EN_STALGOLD_ROLL); if (Rand_ZeroOne() < 0.1f) { this->unk_1AD = Rand_S16Offset(40, 80); } else { diff --git a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c index 306ca70292..d9e899a134 100644 --- a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c +++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c @@ -254,7 +254,7 @@ void func_809A48AC(ObjToge* this, PlayState* play) { } else { func_809A4744(this); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SPINE_TRAP_MOVE); + Actor_PlaySfx(&this->actor, NA_SE_EV_SPINE_TRAP_MOVE); } else { s16 yaw = Math_Vec3f_Yaw(&this->actor.world.pos, &this->unk_198[sp30]) - this->actor.world.rot.y; @@ -267,7 +267,7 @@ void func_809A48AC(ObjToge* this, PlayState* play) { } else { func_809A4744(this); } - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SPINE_TRAP_MOVE); + Actor_PlaySfx(&this->actor, NA_SE_EV_SPINE_TRAP_MOVE); } } } diff --git a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c index 694a5ac592..4f02a46b25 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c @@ -156,7 +156,7 @@ s32 ObjTokeiStep_OpenProcess(ObjTokeiStep* this, PlayState* play) { if (hasPrevBounced && (panel->numBounces < 3) && (panel->startFallingTimer <= 0)) { finalPosY = sPanelXOffsets[i] + this->dyna.actor.world.pos.y; if (!panel->hasSoundPlayed) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_CLOCK_TOWER_STAIR_MOVE); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_CLOCK_TOWER_STAIR_MOVE); panel->hasSoundPlayed = true; } panel->posChangeY += -2.5f; diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c index 7d2ed19995..ac238061eb 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -285,7 +285,7 @@ void ObjTokeidai_RotateOnMinuteChange(ObjTokeidai* this, s32 playSfx) { if (currentClockMinute != this->clockMinute) { if (this->minuteRingOrExteriorGearRotationTimer == 8 && playSfx) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CLOCK_TOWER_SECOND_HAND); + Actor_PlaySfx(&this->actor, NA_SE_EV_CLOCK_TOWER_SECOND_HAND); } if (this->minuteRingOrExteriorGearRotationTimer > 8) { @@ -505,15 +505,15 @@ void ObjTokeidai_TowerOpening_DropCounterweight(ObjTokeidai* this, PlayState* pl this->xRotation = 0x4000; switch (this->boundCount) { case 0: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CLOCK_TOWER_BOUND_0); + Actor_PlaySfx(&this->actor, NA_SE_EV_CLOCK_TOWER_BOUND_0); break; case 1: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CLOCK_TOWER_BOUND_1); + Actor_PlaySfx(&this->actor, NA_SE_EV_CLOCK_TOWER_BOUND_1); break; case 2: - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CLOCK_TOWER_BOUND_2); + Actor_PlaySfx(&this->actor, NA_SE_EV_CLOCK_TOWER_BOUND_2); break; } this->boundCount++; @@ -553,7 +553,7 @@ void ObjTokeidai_TowerOpening_FinishRaise(ObjTokeidai* this, PlayState* play) { type = OBJ_TOKEIDAI_TYPE(&this->actor); if ((type == OBJ_TOKEIDAI_TYPE_TOWER_CLOCK_CLOCK_TOWN) || (type == OBJ_TOKEIDAI_TYPE_TOWER_CLOCK_TERMINA_FIELD)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CLOCK_TOWER_FALL); + Actor_PlaySfx(&this->actor, NA_SE_EV_CLOCK_TOWER_FALL); } this->yTranslation = 3400; this->actionFunc = ObjTokeidai_TowerOpening_DropCounterweight; @@ -577,7 +577,7 @@ void ObjTokeidai_TowerOpening_RaiseTower(ObjTokeidai* this, PlayState* play) { type = OBJ_TOKEIDAI_TYPE(&this->actor); if ((type == OBJ_TOKEIDAI_TYPE_TOWER_CLOCK_CLOCK_TOWN) || (type == OBJ_TOKEIDAI_TYPE_TOWER_CLOCK_TERMINA_FIELD)) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_CLOCK_TOWER_STOP); + Actor_PlaySfx(&this->actor, NA_SE_EV_CLOCK_TOWER_STOP); } this->yTranslation = 3400; this->actionFunc = ObjTokeidai_TowerOpening_FinishRaise; diff --git a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c index 4dcfd4f748..6009affe46 100644 --- a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c +++ b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c @@ -141,7 +141,7 @@ void ObjTree_SetupSway(ObjTree* this) { this->timer = 0; this->swayAmplitude = 546.0f; this->swayVelocity = 35 * 0x10000 / 360; - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_TREE_SWING); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_TREE_SWING); this->actionFunc = ObjTree_Sway; } diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index 33b4932373..115e7d8b27 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -467,7 +467,7 @@ void func_809289E4(ObjTsubo* this, PlayState* play) { func_80927818(this, play, 0); //! @bug: This function should only pass Player*: it uses *(this + 0x153), which is meant to be //! player->currentMask, but in this case is garbage in the collider - func_800B8E58((Player*)&this->actor, NA_SE_PL_PULL_UP_POT); + Player_PlaySfx((Player*)&this->actor, NA_SE_PL_PULL_UP_POT); func_80928D6C(this); } else if ((this->unk_19B != 0) || (acHit && (this->cylinderCollider.info.acHitInfo->toucher.dmgFlags & 0x058BFFBC))) { @@ -673,7 +673,7 @@ void ObjTsubo_Update(Actor* thisx, PlayState* play) { } if (this->unk_19A >= 0) { if (this->unk_19A == 0) { - Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALGOLD_ROLL); + Actor_PlaySfx(&this->actor, NA_SE_EN_STALGOLD_ROLL); if (Rand_ZeroOne() < 0.1f) { this->unk_19A = Rand_S16Offset(40, 80); } else { diff --git a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c index c9ac4899c5..3538a5fabf 100644 --- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c @@ -1704,7 +1704,7 @@ void ObjUm_ChangeAnim(ObjUm* this, PlayState* play, ObjUmAnimation animIndex) { this->unk_420 = this->wheelRot / 0x199A; //! FAKE if (!&sUmAnims[0]) {} - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_CART_WHEEL); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_CART_WHEEL); } } diff --git a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c index 24e816644a..d527e4937b 100644 --- a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c +++ b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c @@ -139,7 +139,7 @@ void func_80C07F30(ObjUsiyane* this, PlayState* play) { } } - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_HOUSE_BROKEN); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_HOUSE_BROKEN); this->unk_740 = 0; this->unk_744 |= 4; } diff --git a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c index b7a1e59be5..514a68c5fa 100644 --- a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c +++ b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c @@ -208,7 +208,7 @@ s32 func_80A3C8D8(ObjVspinyroll* this, PlayState* play, Vec3f* arg2, s32 arg3) { spB4.z += this->dyna.actor.world.pos.z; EffectSsHitmark_SpawnFixedScale(play, 3, &spB4); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_IT_SHIELD_REFLECT_SW); + Actor_PlaySfx(&this->dyna.actor, NA_SE_IT_SHIELD_REFLECT_SW); } temp_f0 = Math3D_Vec3fDistSq(&spD8, &spC0); diff --git a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c index 3fa3260fdd..a26dd24e39 100644 --- a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c +++ b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c @@ -100,7 +100,7 @@ s32 ObjWarpstone_BeginOpeningCutscene(ObjWarpstone* this, PlayState* play) { if (this->dyna.actor.cutscene < 0 || ActorCutscene_GetCanPlayNext(this->dyna.actor.cutscene)) { ActorCutscene_StartAndSetUnkLinkFields(this->dyna.actor.cutscene, &this->dyna.actor); ObjWarpstone_SetupAction(this, ObjWarpstone_PlayOpeningCutscene); - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_OWL_WARP_SWITCH_ON); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_OWL_WARP_SWITCH_ON); } else { ActorCutscene_SetIntentToPlay(this->dyna.actor.cutscene); } diff --git a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c index 067618491d..4558a6a75a 100644 --- a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c +++ b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c @@ -97,7 +97,7 @@ void func_808A7C04(ObjWturn* this, PlayState* play) { this->actor.world.pos.y += this->actor.playerHeightRel; player->actor.shape.shadowAlpha = 0; func_800B7298(play, &this->actor, PLAYER_CSMODE_84); - func_800B8E58(player, NA_SE_VO_NAVY_ENEMY); + Player_PlaySfx(player, NA_SE_VO_NAVY_ENEMY); this->unk_14A = 0; Play_DisableMotionBlur(); this->actionFunc = func_808A7C78; diff --git a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c index 9d35288c59..1196cb0be0 100644 --- a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c +++ b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c @@ -73,7 +73,7 @@ void ObjY2shutter_SetupOpen(ObjY2shutter* this, ShutterInfo* info, ShutterType s this->openTimer = info->openTimer; this->settleTimer = info->openStartSettleTimer; if (shutterType == SHUTTER_BARRED) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_METALDOOR_OPEN); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_METALDOOR_OPEN); } } @@ -134,7 +134,7 @@ void ObjY2shutter_Update(Actor* thisx, PlayState* play) { this->openTimer = 0; this->settleTimer = info->openStartSettleTimer; if (shutterType == SHUTTER_BARRED) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_METALDOOR_CLOSE); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_METALDOOR_CLOSE); } } else { targetPosY = this->dyna.actor.home.pos.y; @@ -153,7 +153,7 @@ void ObjY2shutter_Update(Actor* thisx, PlayState* play) { this->isStationary = true; this->settleTimer = info->openEndAndCloseSettleTimer; if (shutterType != SHUTTER_BARRED) { - Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_METALDOOR_STOP); + Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_METALDOOR_STOP); } } } else { diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index a2358f653f..81eaf24484 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -800,8 +800,8 @@ 0x800B8D98:("func_800B8D98",), 0x800B8DD4:("func_800B8DD4",), 0x800B8E1C:("func_800B8E1C",), - 0x800B8E58:("func_800B8E58",), - 0x800B8EC8:("Actor_PlaySfxAtPos",), + 0x800B8E58:("Player_PlaySfx",), + 0x800B8EC8:("Actor_PlaySfx",), 0x800B8EF4:("func_800B8EF4",), 0x800B8F98:("func_800B8F98",), 0x800B8FC0:("func_800B8FC0",), diff --git a/tools/namefixer.py b/tools/namefixer.py index 012e6b436c..17c33fc5c1 100755 --- a/tools/namefixer.py +++ b/tools/namefixer.py @@ -301,7 +301,9 @@ wordReplace = { "Actor_ChangeAnimation": "Actor_ChangeAnimationByInfo", "func_80152498": "Message_GetState", "func_800B8898": "Actor_GetScreenPos", - "Audio_PlayActorSound2": "Actor_PlaySfxAtPos", + "Audio_PlayActorSound2": "Actor_PlaySfx", + "Actor_PlaySfxAtPos": "Actor_PlaySfx", + "func_800B8E58": "Player_PlaySfx", "func_800BF7CC": "Actor_SpawnIceEffects", "Actor_IsFacingPlayerAndWithinRange": "Actor_IsFacingAndNearPlayer", "func_800BC8B8": "Actor_DrawDoorLock", diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv index ee686ff7d6..4cafa01156 100644 --- a/tools/sizes/code_functions.csv +++ b/tools/sizes/code_functions.csv @@ -314,8 +314,8 @@ asm/non_matchings/code/z_actor/func_800B8D50.s,func_800B8D50,0x800B8D50,0x12 asm/non_matchings/code/z_actor/func_800B8D98.s,func_800B8D98,0x800B8D98,0xF asm/non_matchings/code/z_actor/func_800B8DD4.s,func_800B8DD4,0x800B8DD4,0x12 asm/non_matchings/code/z_actor/func_800B8E1C.s,func_800B8E1C,0x800B8E1C,0xF -asm/non_matchings/code/z_actor/func_800B8E58.s,func_800B8E58,0x800B8E58,0x1C -asm/non_matchings/code/z_actor/Actor_PlaySfxAtPos.s,Actor_PlaySfxAtPos,0x800B8EC8,0xB +asm/non_matchings/code/z_actor/Player_PlaySfx.s,Player_PlaySfx,0x800B8E58,0x1C +asm/non_matchings/code/z_actor/Actor_PlaySfx.s,Actor_PlaySfx,0x800B8EC8,0xB asm/non_matchings/code/z_actor/func_800B8EF4.s,func_800B8EF4,0x800B8EF4,0x29 asm/non_matchings/code/z_actor/func_800B8F98.s,func_800B8F98,0x800B8F98,0xA asm/non_matchings/code/z_actor/func_800B8FC0.s,func_800B8FC0,0x800B8FC0,0xA