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_Mo/z_boss_mo.c
View file

@ -594,7 +594,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
case MO_TENT_READY:
case MO_TENT_SWING:
if (sMorphaCore->csState == MO_BATTLE) {
func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_APPEAR - SFX_FLAG);
Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_APPEAR - SFX_FLAG);
}
Math_ApproachF(&this->waterLevelMod, -5.0f, 0.1f, 0.4f);
for (indS1 = 0; indS1 < 41; indS1++) {
@ -647,7 +647,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
break;
case MO_TENT_ATTACK:
this->actor.flags |= ACTOR_FLAG_24;
func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_ATTACK - SFX_FLAG);
Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_ATTACK - SFX_FLAG);
Math_ApproachF(&this->waterLevelMod, -5.0f, 0.1f, 0.4f);
for (indS1 = 0; indS1 < 41; indS1++) {
Math_ApproachF(&this->tentStretch[indS1].y,
@ -729,7 +729,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
if (play->grabPlayer(play, player)) {
player->actor.parent = &this->actor;
this->work[MO_TENT_ACTION_STATE] = MO_TENT_GRAB;
func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_CATCH);
Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_CATCH);
Audio_PlaySfxGeneral(NA_SE_VO_LI_DAMAGE_S, &player->actor.projectedPos, 4,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultReverb);
@ -861,7 +861,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
}
break;
case MO_TENT_CUT:
func_80078914(&this->tentTipPos, NA_SE_EV_WATER_WALL - SFX_FLAG);
Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EV_WATER_WALL - SFX_FLAG);
if (&this->actor == player->actor.parent) {
player->unk_850 = 0x65;
player->actor.parent = NULL;
@ -1079,7 +1079,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
this->drawActor = false;
this->work[MO_TENT_ACTION_STATE] = MO_TENT_DEATH_6;
this->timers[0] = 60;
func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_CORE_JUMP);
Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_CORE_JUMP);
for (indS1 = 0; indS1 < 300; indS1++) {
spC8.x = 0.0;
spC8.y = 0.0;
@ -1150,7 +1150,7 @@ void BossMo_TentCollisionCheck(BossMo* this, PlayState* play) {
hurtbox = this->tentCollider.elements[i1].info.acHitInfo;
this->work[MO_TENT_INVINC_TIMER] = 5;
if (hurtbox->toucher.dmgFlags & DMG_MAGIC_FIRE) {
func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_CUT);
Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_CUT);
this->cutIndex = 15;
this->meltIndex = this->cutIndex + 1;
this->work[MO_TENT_ACTION_STATE] = MO_TENT_CUT;
@ -1262,7 +1262,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) {
EffectSsBubble_Spawn(play, &bubblePos, 0.0f, 10.0f, 50.0f, Rand_ZeroFloat(0.05f) + 0.13f);
}
if (this->timers[2] == 40) {
func_80078914(&sAudioZeroVec, NA_SE_EN_MOFER_BUBLE_DEMO);
Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EN_MOFER_BUBLE_DEMO);
}
break;
case MO_INTRO_SWIM:
@ -1295,7 +1295,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) {
Math_ApproachF(&this->subCamVelFactor, 0.02f, 1.0f, 0.001f);
}
if (this->work[MO_TENT_MOVE_TIMER] == 190) {
func_80078914(&sAudioZeroVec, NA_SE_EN_MOFER_BUBLE_DEMO);
Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EN_MOFER_BUBLE_DEMO);
}
if ((this->work[MO_TENT_MOVE_TIMER] > 150) && (this->work[MO_TENT_MOVE_TIMER] < 180)) {
bubblePos2.x = (this->subCamEye.x + 20.0f) + 10.0f;
@ -1489,9 +1489,9 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) {
}
if ((this->csState > MO_INTRO_START) && (this->work[MO_TENT_MOVE_TIMER] > 540)) {
func_80078914(&sMorphaTent1->tentTipPos, NA_SE_EN_MOFER_APPEAR - SFX_FLAG);
Sfx_PlaySfxAtPos(&sMorphaTent1->tentTipPos, NA_SE_EN_MOFER_APPEAR - SFX_FLAG);
} else if (this->csState >= MO_INTRO_START) {
func_80078914(&sAudioZeroVec, NA_SE_EN_MOFER_MOVE_DEMO - SFX_FLAG);
Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EN_MOFER_MOVE_DEMO - SFX_FLAG);
}
}
@ -1693,13 +1693,13 @@ void BossMo_DeathCs(BossMo* this, PlayState* play) {
}
if ((this->csState > MO_DEATH_START) && (this->csState < MO_DEATH_FINISH)) {
if (this->work[MO_TENT_MOVE_TIMER] < 500) {
func_80078914(&sAudioZeroVec, NA_SE_EN_MOFER_APPEAR - SFX_FLAG);
Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EN_MOFER_APPEAR - SFX_FLAG);
}
if ((this->work[MO_TENT_MOVE_TIMER] < 490) && (this->work[MO_TENT_MOVE_TIMER] > 230)) {
func_80078914(&sAudioZeroVec, NA_SE_EV_DROP_FALL - SFX_FLAG);
Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EV_DROP_FALL - SFX_FLAG);
}
if (this->work[MO_TENT_MOVE_TIMER] < 220) {
func_80078914(&sAudioZeroVec, NA_SE_EV_SCOOPUP_WATER - SFX_FLAG);
Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EV_SCOOPUP_WATER - SFX_FLAG);
}
}
if (sMorphaCore->waterLevel < -200.0f) {
@ -1795,7 +1795,7 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) {
this->work[MO_TENT_INVINC_TIMER] = 10;
} else if (!(hurtbox->toucher.dmgFlags & DMG_SHIELD) && (hurtbox->toucher.dmgFlags & DMG_HOOKSHOT)) {
if (this->work[MO_TENT_ACTION_STATE] >= MO_CORE_ATTACK) {
func_80078914(&sMorphaTent1->tentTipPos, NA_SE_EN_MOFER_CUT);
Sfx_PlaySfxAtPos(&sMorphaTent1->tentTipPos, NA_SE_EN_MOFER_CUT);
sMorphaTent1->cutIndex = this->work[MO_CORE_POS_IN_TENT];
sMorphaTent1->meltIndex = sMorphaTent1->cutIndex + 1;
sMorphaTent1->cutScale = 1.0f;
@ -2361,7 +2361,7 @@ void BossMo_UpdateTent(Actor* thisx, PlayState* play) {
} else {
i = 0;
if (this->work[MO_TENT_ACTION_STATE] < MO_TENT_CUT) {
func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_CORE_ROLL - SFX_FLAG);
Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_CORE_ROLL - SFX_FLAG);
}
}
bubblePos.x = this->tentPos[i].x + sp7C.x;
@ -3582,7 +3582,7 @@ void BossMo_Unknown(void) {
if (BREG(32) != 0) {
BREG(32)--;
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 1);
func_80078914(&zeroVec, unkSfx[BREG(33)]);
Sfx_PlaySfxAtPos(&zeroVec, unkSfx[BREG(33)]);
}
if (BREG(34) != 0) {
BREG(34) = 0;