mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 15:01:17 +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

58
src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
View file

@ -168,7 +168,7 @@ void func_808FD4D4(BossGanon2* this, PlayState* play, s16 arg2, s16 arg3) {
Actor_SpawnFloorDustRing(play, &this->actor, &this->unk_1DC, 25.0f, arg3, 8.0f, 500, 10, true);
}
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_WALK);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_WALK);
func_80033E88(&this->actor, play, 2, 0xA);
}
@ -482,12 +482,12 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
this->subCamAt.x = this->actor.world.pos.x;
}
if ((play->gameplayFrames % 32) == 0) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_BREATH);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GANON_BREATH);
}
break;
case 15:
if (((play->gameplayFrames % 32) == 0) && (this->unk_398 < 100)) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_BREATH);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GANON_BREATH);
}
SkelAnime_Update(&this->skelAnime);
Math_ApproachF(&this->subCamAt.y, this->actor.world.pos.y + 77.0f, 0.05f, 5.0f);
@ -512,7 +512,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
this->unk_194 = Animation_GetLastFrame(&object_ganon_anime3_Anim_003754);
this->unk_339 = 55;
play->envCtx.lightBlend = 1.0f;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_CASBREAK);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GANON_CASBREAK);
} else {
break;
}
@ -538,8 +538,8 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
Math_ApproachF(&this->subCamEye.y, ((this->actor.world.pos.y + 60.0f) - 60.0f) - 70.0f, 0.1f, 13.0f);
Math_ApproachF(&this->subCamAt.y, this->actor.world.pos.y + 40.0f, 0.1f, 3.6999998f);
if (this->unk_398 == 30) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_BIGMASIC);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_THROW_BIG);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GANON_BIGMASIC);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GANON_THROW_BIG);
}
if (this->unk_398 <= 50) {
sp8D = true;
@ -865,7 +865,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
player->actor.world.pos.x = 140.0f;
player->actor.world.pos.z = -196.0f;
if (this->unk_398 == 50) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_ROAR);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_ROAR);
}
if (Animation_OnFrame(&this->skelAnime, this->unk_194)) {
Camera* camera = Play_GetCamera(play, CAM_ID_MAIN);
@ -888,7 +888,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
}
if ((this->unk_30C > 4.0f) && !sp8D) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_BODY_SPARK - SFX_FLAG);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GANON_BODY_SPARK - SFX_FLAG);
}
if (this->subCamId != SUB_CAM_ID_DONE) {
@ -1064,7 +1064,7 @@ void func_808FFDB0(BossGanon2* this, PlayState* play) {
void func_808FFEBC(BossGanon2* this, PlayState* play) {
if (this->unk_390 == 0) {
this->unk_390 = (s16)Rand_ZeroFloat(50.0f) + 30;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_UNARI);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_UNARI);
}
SkelAnime_Update(&this->skelAnime);
@ -1167,7 +1167,7 @@ void func_80900344(BossGanon2* this, PlayState* play) {
if (this->unk_390 == 0) {
this->unk_390 = (s16)Rand_ZeroFloat(50.0f) + 30;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_UNARI);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_UNARI);
}
Math_ApproachF(&this->unk_324, 255.0f, 1.0f, 10.0f);
@ -1230,8 +1230,8 @@ void func_80900650(BossGanon2* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (Animation_OnFrame(&this->skelAnime, this->unk_198)) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_SWORD);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_ROAR);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_SWORD);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_ROAR);
}
if (this->unk_311 == 0) {
@ -1271,7 +1271,7 @@ void func_80900818(BossGanon2* this, PlayState* play) {
this->actionFunc = func_80900890;
this->unk_1AC = 0;
this->unk_39C = 0;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_DEAD1);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_DEAD1);
this->unk_336 = 0;
}
@ -1398,7 +1398,7 @@ void func_80900890(BossGanon2* this, PlayState* play) {
break;
case 1:
if ((play->gameplayFrames % 32) == 0) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_BREATH);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_BREATH);
}
if ((this->unk_1A2[0] == 0) || (this->unk_334 != 0)) {
@ -1410,7 +1410,7 @@ void func_80900890(BossGanon2* this, PlayState* play) {
this->unk_194 = Animation_GetLastFrame(&object_ganon2_Anim_0334F8);
this->unk_1AC = 2;
this->unk_1A2[0] = 40;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_ROAR);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_ROAR);
}
}
break;
@ -1436,7 +1436,7 @@ void func_80901020(BossGanon2* this, PlayState* play) {
this->actionFunc = func_8090120C;
this->unk_1AC = 0;
this->unk_39C = 0;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_DEAD1);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_DEAD1);
this->unk_314 = 4;
}
@ -1514,8 +1514,8 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
}
if (this->unk_398 >= 110) {
if (this->unk_398 == 110) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_HIT_THUNDER);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_DAMAGE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GANON_HIT_THUNDER);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_DAMAGE);
}
Math_ApproachF(&this->unk_30C, 10.0f, 0.2f, 5.0f);
this->skelAnime.playSpeed = 3.0f;
@ -1718,7 +1718,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
break;
case 8:
if (this->unk_398 == 1025) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_STAND);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_STAND);
}
if (this->unk_398 >= 1000) {
if (this->unk_398 < 1040) {
@ -1727,7 +1727,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
}
}
if (this->unk_398 == 1040) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_DEAD2);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_DEAD2);
this->unk_336 = 2;
this->unk_339 = 0;
play->envCtx.prevLightSetting = 0;
@ -1745,7 +1745,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
this->subCamAt.y = this->unk_1B8.y;
this->subCamAt.z = this->unk_1B8.z;
if ((this->unk_398 < 1000) && ((this->unk_398 % 16) == 0)) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_SWORD);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_SWORD);
}
if (this->unk_398 == 40) {
this->unk_39C = 9;
@ -1778,7 +1778,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
if ((this->unk_398 >= 40) && (this->unk_398 <= 110)) {
Math_ApproachF(&play->envCtx.lightBlend, 1.0f, 1.0f, 0.02f);
Math_ApproachF(&this->unk_384, 10.0f, 0.1f, 0.2f);
Audio_PlayActorSound2(&sZelda->actor, NA_SE_EV_GOD_LIGHTBALL_2 - SFX_FLAG);
Audio_PlayActorSfx2(&sZelda->actor, NA_SE_EV_GOD_LIGHTBALL_2 - SFX_FLAG);
} else {
Math_ApproachZeroF(&this->unk_384, 1.0f, 0.2f);
}
@ -1797,7 +1797,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
sZelda->unk_3C8 = 13;
}
if (this->unk_398 == 140) {
Audio_PlayActorSound2(&sZelda->actor, NA_SE_EV_HUMAN_BOUND);
Audio_PlayActorSfx2(&sZelda->actor, NA_SE_EV_HUMAN_BOUND);
}
if (this->unk_398 < 160) {
break;
@ -1825,7 +1825,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
break;
case 1:
if ((this->unk_39C < 7) && ((play->gameplayFrames % 32) == 0)) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_BREATH);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_BREATH);
}
break;
}
@ -1898,14 +1898,14 @@ void func_80902524(BossGanon2* this, PlayState* play) {
acHitInfo = this->unk_424.elements[0].info.acHitInfo;
if ((acHitInfo->toucher.dmgFlags & DMG_ARROW_LIGHT) && (this->actionFunc != func_80900890)) {
func_809000A0(this, play);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_FANTOM_HIT_THUNDER);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_DAMAGE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_FANTOM_HIT_THUNDER);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_DAMAGE);
Audio_StopSfxById(NA_SE_EN_MGANON_UNARI);
} else if ((this->actionFunc == func_80900890) &&
(acHitInfo->toucher.dmgFlags & (DMG_JUMP_MASTER | DMG_SPIN_MASTER | DMG_SLASH_MASTER))) {
this->unk_316 = 60;
this->unk_342 = 5;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_DAMAGE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_DAMAGE);
Audio_StopSfxById(NA_SE_EN_MGANON_UNARI);
this->actor.colChkInfo.health -= 2;
temp_v0_4 = this->actor.colChkInfo.health;
@ -1920,7 +1920,7 @@ void func_80902524(BossGanon2* this, PlayState* play) {
}
} else if (this->actionFunc != func_80900890) {
func_808FFF90(this, play);
Audio_PlayActorSound2(&this->actor, NA_SE_IT_HOOKSHOT_REFLECT);
Audio_PlayActorSfx2(&this->actor, NA_SE_IT_HOOKSHOT_REFLECT);
}
}
}
@ -1931,7 +1931,7 @@ void func_80902524(BossGanon2* this, PlayState* play) {
this->unk_316 = 60;
this->unk_344 = 0x32;
this->unk_342 = 5;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_DAMAGE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MGANON_DAMAGE);
Audio_StopSfxById(NA_SE_EN_MGANON_UNARI);
phi_v1_2 = 1;
if (acHitInfo->toucher.dmgFlags & (DMG_JUMP_MASTER | DMG_SPIN_MASTER | DMG_SLASH_MASTER)) {