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

Rename "Sound" to "Sfx" (#1292)

Browse source 
* First attempt

* More

* rename

* more sound -> sfx / sound effect (#7)

* PR Suggestions

* PR Suggestions

* Small fix

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
engineer124 2022-07-30 07:05:27 -06:00 • committed by GitHub
parent 1652b7e5d7
commit 1d19f37b26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
321 changed files with 2879 additions and 2904 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

@ -490,7 +490,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
swingRateAccel = 30.0f;
swingSizeAccel = 60.0f;
if (((this->sfxTimer % 16) == 0) && (this->timers[0] < 30)) {
Audio_PlaySoundIncreasinglyTransposed(&this->tentTipPos, NA_SE_EN_MOFER_WAVE, gMorphaTransposeTable);
Audio_PlaySfxIncreasinglyTransposed(&this->tentTipPos, NA_SE_EN_MOFER_WAVE, gMorphaTransposeTable);
}
} else if (this->work[MO_TENT_ACTION_STATE] == MO_TENT_SHAKE) {
if (this->timers[0] > 40) {
@ -503,8 +503,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
swingRateAccel = 30.0f;
swingSizeAccel = 60.0f;
if ((this->sfxTimer % 32) == 0) {
Audio_PlaySoundIncreasinglyTransposed(&this->tentTipPos, NA_SE_EN_MOFER_WAVE,
gMorphaTransposeTable);
Audio_PlaySfxIncreasinglyTransposed(&this->tentTipPos, NA_SE_EN_MOFER_WAVE, gMorphaTransposeTable);
func_800AA000(0, 100, 5, 2);
func_8002F7DC(&player->actor, NA_SE_VO_LI_FREEZE + player->ageProperties->unk_92);
}
@ -518,8 +517,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
swingRateAccel = 70.0f;
swingSizeAccel = 70.0f;
if ((this->sfxTimer % 16) == 0) {
Audio_PlaySoundIncreasinglyTransposed(&this->tentTipPos, NA_SE_EN_MOFER_WAVE,
gMorphaTransposeTable);
Audio_PlaySfxIncreasinglyTransposed(&this->tentTipPos, NA_SE_EN_MOFER_WAVE, gMorphaTransposeTable);
func_800AA000(0, 160, 5, 4);
func_8002F7DC(&player->actor, NA_SE_VO_LI_FREEZE + player->ageProperties->unk_92);
}
@ -732,9 +730,9 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
player->actor.parent = &this->actor;
this->work[MO_TENT_ACTION_STATE] = MO_TENT_GRAB;
func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_CATCH);
Audio_PlaySoundGeneral(NA_SE_VO_LI_DAMAGE_S, &player->actor.projectedPos, 4,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultReverb);
Audio_PlaySfxGeneral(NA_SE_VO_LI_DAMAGE_S, &player->actor.projectedPos, 4,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultReverb);
} else {
this->work[MO_TENT_ACTION_STATE] = MO_TENT_READY;
this->tentMaxAngle = .001f;
@ -1548,7 +1546,7 @@ void BossMo_DeathCs(BossMo* this, PlayState* play) {
Math_ApproachF(&this->subCamEye.y, 100.0f, 0.05f, 2.0f);
this->subCamAt = this->subCamAtNext = this->actor.world.pos;
if (this->timers[0] > 20) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MOFER_DEAD - SFX_FLAG);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MOFER_DEAD - SFX_FLAG);
}
if (this->timers[0] == 20) {
for (i = 0; i < 300; i++) {
@ -1564,8 +1562,8 @@ void BossMo_DeathCs(BossMo* this, PlayState* play) {
}
this->drawActor = false;
this->actor.flags &= ~ACTOR_FLAG_0;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MOFER_CORE_JUMP);
SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 70, NA_SE_EN_MOFER_LASTVOICE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MOFER_CORE_JUMP);
SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 70, NA_SE_EN_MOFER_LASTVOICE);
}
if (this->timers[0] == 0) {
this->csState = MO_DEATH_DRAIN_WATER_1;
@ -1769,7 +1767,7 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) {
this->actor.world.rot.y = this->actor.yawTowardsPlayer + 0x8000;
this->work[MO_CORE_DMG_FLASH_TIMER] = 15;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MOFER_CORE_DAMAGE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MOFER_CORE_DAMAGE);
this->actor.colChkInfo.health -= damage;
this->hitCount++;
if ((s8)this->actor.colChkInfo.health <= 0) {
@ -2069,7 +2067,7 @@ void BossMo_Core(BossMo* this, PlayState* play) {
}
} else {
this->timers[1] = 2;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MOFER_CORE_LAND);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MOFER_CORE_LAND);
for (i = 0; i < 10; i++) {
effectVelocity.x = Rand_CenteredFloat(4.0f);
effectVelocity.y = Rand_ZeroFloat(2.0f) + 3.0f;
@ -2090,7 +2088,7 @@ void BossMo_Core(BossMo* this, PlayState* play) {
} else if (this->actor.world.pos.y < MO_WATER_LEVEL(play)) {
this->actor.velocity.y = BossMo_NearLand(&this->actor.world.pos, 40.0f) ? 15.0f : 6.0f;
if ((this->actor.world.pos.y + 15.0f) >= MO_WATER_LEVEL(play)) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MOFER_CORE_JUMP);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MOFER_CORE_JUMP);
}
}
} else if (this->work[MO_TENT_ACTION_STATE] >= MO_CORE_MOVE) {
@ -2124,7 +2122,7 @@ void BossMo_Core(BossMo* this, PlayState* play) {
if (this->timers[0] == 0) {
this->work[MO_CORE_WAIT_IN_WATER] = false;
this->timers[0] = (s16)Rand_ZeroFloat(20.0f) + 20;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MOFER_CORE_MOVE_WT);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MOFER_CORE_MOVE_WT);
}
break;
}
@ -2156,9 +2154,9 @@ void BossMo_Core(BossMo* this, PlayState* play) {
}
if ((this->actor.world.pos.y < MO_WATER_LEVEL(play)) && (MO_WATER_LEVEL(play) <= this->actor.prevPos.y)) {
if (this->actor.velocity.y < -5.0f) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MOFER_CORE_JUMP);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MOFER_CORE_JUMP);
} else {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MOFER_CORE_SMJUMP);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MOFER_CORE_SMJUMP);
}
if ((this->timers[3] != 0) || ((sMorphaTent1->fwork[MO_TENT_MAX_STRETCH] > 0.2f) &&
(fabsf(this->actor.world.pos.x - sMorphaTent1->actor.world.pos.x) < 30.0f) &&