mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +00:00
Code Issues Projects Releases Wiki Activity

Document z_lib Sfx Functions (#1470)

Browse source 
* document lib sfx

* rename functions
This commit is contained in:
engineer124 2023-08-15 15:44:20 +10:00 • committed by GitHub
parent 18d609c1a3
commit b8aa2a251e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
112 changed files with 399 additions and 388 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
View file

@ -881,7 +881,7 @@ s32 BossTw_CheckBeamReflection(BossTw* this, PlayState* play) {
BossTw_AddShieldDeflectEffect(play, 10.0f, this->actor.params);
play->envCtx.lightBlend = 1.0f;
this->timers[0] = 10;
func_80078884(NA_SE_IT_SHIELD_REFLECT_MG2);
Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_REFLECT_MG2);
}
sBeamDivertTimer++;
@ -1108,7 +1108,7 @@ void BossTw_ShootBeam(BossTw* this, PlayState* play) {
}
this->beamShootState = 1;
func_80078914(&player->actor.projectedPos, NA_SE_IT_SHIELD_REFLECT_MG);
Sfx_PlaySfxAtPos(&player->actor.projectedPos, NA_SE_IT_SHIELD_REFLECT_MG);
Matrix_MtxFToYXZRotS(&player->shieldMf, &sp128, 0);
sp128.y += 0x8000;
sp128.x = -sp128.x;
@ -1698,7 +1698,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, PlayState* play) {
if (this->timers[1] == 8) {
this->work[TW_BLINK_IDX] = 8;
func_80078884(NA_SE_EN_TWINROBA_YOUNG_WINK);
Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_YOUNG_WINK);
}
if (this->timers[2] == 4) {
sEnvType = 0;
@ -1776,12 +1776,12 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if (this->csSfxTimer > 220 && this->csSfxTimer < 630) {
func_80078884(NA_SE_EN_TWINROBA_UNARI - SFX_FLAG);
Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_UNARI - SFX_FLAG);
}
if (this->csSfxTimer == 180) {
func_80078914(&D_8094A7D0, NA_SE_EN_TWINROBA_LAUGH);
func_80078914(&D_8094A7D0, NA_SE_EN_TWINROBA_LAUGH2);
Sfx_PlaySfxAtPos(&D_8094A7D0, NA_SE_EN_TWINROBA_LAUGH);
Sfx_PlaySfxAtPos(&D_8094A7D0, NA_SE_EN_TWINROBA_LAUGH2);
SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_KOTAKE_KOUME);
}
@ -1842,7 +1842,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
}
if (this->work[CS_TIMER_1] == 180) {
func_80078884(NA_SE_EN_TWINROBA_APPEAR_MS);
Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_APPEAR_MS);
}
if (this->work[CS_TIMER_1] > 180) {
@ -2455,7 +2455,7 @@ void BossTw_DeathCSMsgSfx(BossTw* this, PlayState* play) {
}
if (this->work[CS_TIMER_2] > 440 && this->work[CS_TIMER_2] < 860) {
func_80078884(NA_SE_EN_TWINROBA_FIGHT - SFX_FLAG);
Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_FIGHT - SFX_FLAG);
}
if (this->work[CS_TIMER_2] == 430) {
@ -2650,7 +2650,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, PlayState* play) {
Vec3f spBC;
Vec3f spB0;
Vec3f spA4 = { 0.0f, 0.0f, 0.0f };
func_80078884(NA_SE_EN_TWINROBA_TRANSFORM);
Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_TRANSFORM);
for (i = 0; i < 100; i++) {
spB0.x = Rand_CenteredFloat(5.0f);
spB0.y = Rand_CenteredFloat(5.0f);
@ -2762,7 +2762,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, PlayState* play) {
Actor_SetScale(&sKotakePtr->actor, 0.0f);
sKoumePtr->visible = 1;
sKotakePtr->visible = 1;
func_80078884(NA_SE_EN_TWINROBA_TRANSFORM);
Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_TRANSFORM);
SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_KOTAKE_KOUME);
this->csState2 = 3;
this->work[CS_TIMER_2] = 0;
@ -3162,8 +3162,8 @@ void BossTw_TwinrovaUpdate(Actor* thisx, PlayState* play2) {
if (sFreezeState == 1) {
sFreezeState = 2;
BossTw_AddPlayerFreezeEffect(play, NULL);
func_80078914(&player->actor.projectedPos, NA_SE_VO_LI_FREEZE);
func_80078914(&player->actor.projectedPos, NA_SE_PL_FREEZE);
Sfx_PlaySfxAtPos(&player->actor.projectedPos, NA_SE_VO_LI_FREEZE);
Sfx_PlaySfxAtPos(&player->actor.projectedPos, NA_SE_PL_FREEZE);
if (sShieldFireCharge != 0) {
sShieldFireCharge = 4;
@ -3686,11 +3686,11 @@ void BossTw_ShieldChargeDraw(BossTw* this, PlayState* play) {
temp_t0 = sShieldFireCharge | sShieldIceCharge;
if (temp_t0 == 1) {
func_80078884(NA_SE_IT_SHIELD_CHARGE_LV1 & ~SFX_FLAG);
Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_CHARGE_LV1 & ~SFX_FLAG);
} else if (temp_t0 == 2) {
func_80078884(NA_SE_IT_SHIELD_CHARGE_LV2 & ~SFX_FLAG);
Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_CHARGE_LV2 & ~SFX_FLAG);
} else if (temp_t0 == 3) {
func_80078884(NA_SE_IT_SHIELD_CHARGE_LV3 & ~SFX_FLAG);
Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_CHARGE_LV3 & ~SFX_FLAG);
}
if (temp_t0 != 0 && temp_t0 < 4) {
@ -4376,7 +4376,7 @@ s32 BossTw_BlastShieldCheck(BossTw* this, PlayState* play) {
sEnvType = 0;
sShieldIceCharge = 0;
sShieldFireCharge = 0;
func_80078884(NA_SE_IT_SHIELD_REFLECT_MG2);
Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_REFLECT_MG2);
}
ret = true;