mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 06:21:16 +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

42
src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
View file

@ -398,7 +398,7 @@ void BossDodongo_IntroCutscene(BossDodongo* this, PlayState* play) {
}
if (this->unk_198 == 0x64) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_OTAKEBI);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_OTAKEBI);
}
if (this->unk_198 == 0x5A) {
@ -550,8 +550,8 @@ void BossDodongo_Explode(BossDodongo* this, PlayState* play) {
Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_004E0C, 1.0f, 0.0f,
Animation_GetLastFrame(&object_kingdodongo_Anim_004E0C), ANIMMODE_ONCE, -5.0f);
this->actionFunc = BossDodongo_LayDown;
Audio_PlayActorSound2(&this->actor, NA_SE_IT_BOMB_EXPLOSION);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_DAMAGE);
Audio_PlayActorSfx2(&this->actor, NA_SE_IT_BOMB_EXPLOSION);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_DAMAGE);
func_80033E88(&this->actor, play, 4, 10);
this->health -= 2;
@ -576,7 +576,7 @@ void BossDodongo_LayDown(BossDodongo* this, PlayState* play) {
}
void BossDodongo_Vulnerable(BossDodongo* this, PlayState* play) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_DOWN - SFX_FLAG);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_DOWN - SFX_FLAG);
this->unk_1BE = 10;
Math_SmoothStepToF(&this->unk_1F8, 1.0f, 0.5f, 0.02f, 0.001f);
Math_SmoothStepToF(&this->unk_208, 0.05f, 1.0f, 0.005f, 0.0f);
@ -605,7 +605,7 @@ void BossDodongo_BlowFire(BossDodongo* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (Animation_OnFrame(&this->skelAnime, 12.0f)) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_CRY);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_CRY);
}
if (Animation_OnFrame(&this->skelAnime, 17.0f)) {
@ -627,7 +627,7 @@ void BossDodongo_Inhale(BossDodongo* this, PlayState* play) {
this->unk_1E2 = 1;
if (this->unk_1AC > 20) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_BREATH - SFX_FLAG);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_BREATH - SFX_FLAG);
}
Math_SmoothStepToF(&this->unk_208, 0.05f, 1.0f, 0.005f, 0.0f);
@ -639,7 +639,7 @@ void BossDodongo_Inhale(BossDodongo* this, PlayState* play) {
this->unk_1AC++;
if ((this->unk_1AC > 20) && (this->unk_1AC < 82) && BossDodongo_AteExplosive(this, play)) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_DRINK);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_DRINK);
BossDodongo_SetupExplode(this);
}
}
@ -673,7 +673,7 @@ void BossDodongo_Walk(BossDodongo* this, PlayState* play) {
if (this->unk_1BC != 0) {
func_80078884(NA_SE_EN_DODO_K_WALK);
} else {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_WALK);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_WALK);
}
if (this->subCamId == SUB_CAM_ID_DONE) {
@ -737,11 +737,11 @@ void BossDodongo_Roll(BossDodongo* this, PlayState* play) {
if (this->unk_1DA == 10) {
this->actor.velocity.y = 15.0f;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_CRY);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_CRY);
}
if (this->unk_1DA == 1) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_COLI2);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_COLI2);
}
sp5C = &sCornerPositions[this->unk_1A0];
@ -755,7 +755,7 @@ void BossDodongo_Roll(BossDodongo* this, PlayState* play) {
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) {
this->unk_228 = 7700.0f;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_ROLL - SFX_FLAG);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_ROLL - SFX_FLAG);
if ((this->unk_19E & 7) == 0) {
Camera_AddQuake(&play->mainCamera, 2, 1, 8);
@ -786,7 +786,7 @@ void BossDodongo_Roll(BossDodongo* this, PlayState* play) {
BossDodongo_SetupWalk(this);
this->unk_228 = 9200.0f;
this->actor.velocity.y = 20.0f;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_COLI);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_COLI);
Camera_AddQuake(&play->mainCamera, 2, 6, 8);
sp50.x = this->actor.world.pos.x;
sp50.y = this->actor.world.pos.y + 60.0f;
@ -795,7 +795,7 @@ void BossDodongo_Roll(BossDodongo* this, PlayState* play) {
func_80033E88(&this->actor, play, 6, 15);
} else {
this->actor.velocity.y = 15.0f;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_COLI2);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_COLI2);
}
if (this->unk_1A2 == 0) {
@ -1263,7 +1263,7 @@ void BossDodongo_UpdateDamage(BossDodongo* this, PlayState* play) {
swordDamage = damage = CollisionCheck_GetSwordDamage(item1->toucher.dmgFlags);
if (damage != 0) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_DAMAGE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_DAMAGE);
BossDodongo_SetupDamaged(this);
this->unk_1C0 = 5;
this->health -= swordDamage;
@ -1279,7 +1279,7 @@ void BossDodongo_SetupDeathCutscene(BossDodongo* this) {
Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_002D0C, 1.0f, 0.0f,
Animation_GetLastFrame(&object_kingdodongo_Anim_002D0C), ANIMMODE_ONCE, -5.0f);
this->actionFunc = BossDodongo_DeathCutscene;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_DEAD);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_DEAD);
this->unk_1DA = 0;
this->csState = 0;
this->actor.flags &= ~(ACTOR_FLAG_0 | ACTOR_FLAG_2);
@ -1393,7 +1393,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
Math_SmoothStepToF(&this->actor.world.pos.x, cornerPos->x + sp184.x, 1.0f, this->unk_1E4, 0.0f);
Math_SmoothStepToF(&this->actor.world.pos.z, cornerPos->z + sp184.z, 1.0f, this->unk_1E4, 0.0f);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_ROLL - SFX_FLAG);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_ROLL - SFX_FLAG);
if ((this->unk_19E & 7) == 0) {
Camera_AddQuake(&play->mainCamera, 2, 1, 8);
}
@ -1411,7 +1411,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
Vec3f dustPos;
this->actor.velocity.y = 15.0f;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_COLI2);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_COLI2);
if (this->unk_1A2 == 0) {
this->unk_1A0 = this->unk_1A0 + 1;
if (this->unk_1A0 >= 4) {
@ -1455,13 +1455,13 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
Math_SmoothStepToS(&this->unk_1C4, -0x4000, 0xA, 0x12C, 0);
}
if (this->unk_1DA == 904) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_END);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_END);
}
if (this->unk_1DA < 854) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_LAST - SFX_FLAG);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_LAST - SFX_FLAG);
}
if (this->unk_1DA == 960) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_LAVA);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_LAVA);
}
if (this->unk_1DA < 960) {
Math_SmoothStepToF(&this->actor.shape.shadowScale, 0.0f, 1.0f, 10.0f, 0.0f);
@ -1521,7 +1521,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
}
}
} else {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_ROLL - SFX_FLAG);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_ROLL - SFX_FLAG);
if (!(this->unk_19E & 1)) {
Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, 40.0f, 3, 8.0f, 500, 10,
false);