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

26
src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
View file

@ -306,7 +306,7 @@ void EnPeehat_HitWhenGrounded(EnPeehat* this, PlayState* play) {
}
this->unk_2D4 = 8;
}
Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_DAMAGE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_PIHAT_DAMAGE);
}
void EnPeehat_Ground_SetStateGround(EnPeehat* this) {
@ -384,7 +384,7 @@ void EnPeehat_Flying_SetStateFly(EnPeehat* this) {
}
void EnPeehat_Flying_StateFly(EnPeehat* this, PlayState* play) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_FLY - SFX_FLAG);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_PIHAT_FLY - SFX_FLAG);
SkelAnime_Update(&this->skelAnime);
if (!IS_DAY || this->xzDistToRise < this->actor.xzDistToPlayer) {
EnPeehat_Flying_SetStateLanding(this);
@ -411,7 +411,7 @@ void EnPeehat_Ground_SetStateRise(EnPeehat* this) {
}
this->state = PEAHAT_STATE_8;
this->animTimer = lastFrame;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_UP);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_PIHAT_UP);
EnPeehat_SetupAction(this, EnPeehat_Ground_StateRise);
}
@ -452,7 +452,7 @@ void EnPeehat_Flying_SetStateRise(EnPeehat* this) {
}
this->state = PEAHAT_STATE_9;
this->animTimer = lastFrame;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_UP);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_PIHAT_UP);
EnPeehat_SetupAction(this, EnPeehat_Flying_StateRise);
}
@ -518,7 +518,7 @@ void EnPeehat_Ground_StateSeekPlayer(EnPeehat* this, PlayState* play) {
Math_SmoothStepToS(&this->bladeRotVel, 4000, 1, 500, 0);
this->bladeRot += this->bladeRotVel;
Math_SmoothStepToF(&this->scaleShift, 0.075f, 1.0f, 0.005f, 0.0f);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_FLY - SFX_FLAG);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_PIHAT_FLY - SFX_FLAG);
}
void EnPeehat_Larva_SetStateSeekPlayer(EnPeehat* this) {
@ -553,7 +553,7 @@ void EnPeehat_Larva_StateSeekPlayer(EnPeehat* this, PlayState* play) {
Math_SmoothStepToS(&this->bladeRotVel, 4000, 1, 500, 0);
this->bladeRot += this->bladeRotVel;
Math_SmoothStepToF(&this->scaleShift, 0.075f, 1.0f, 0.005f, 0.0f);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_SM_FLY - SFX_FLAG);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_PIHAT_SM_FLY - SFX_FLAG);
if (this->colQuad.base.atFlags & AT_BOUNCED) {
this->actor.colChkInfo.health = 0;
this->colQuad.base.acFlags = this->colQuad.base.acFlags & ~AC_BOUNCED;
@ -603,7 +603,7 @@ void EnPeehat_Ground_StateLanding(EnPeehat* this, PlayState* play) {
if (SkelAnime_Update(&this->skelAnime)) {
EnPeehat_Ground_SetStateGround(this);
this->actor.world.pos.y = this->actor.floorHeight;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_LAND);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_PIHAT_LAND);
} else if (this->actor.floorHeight < this->actor.world.pos.y) {
Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.floorHeight, 0.3f, 3.5f, 0.25f);
if (this->actor.world.pos.y - this->actor.floorHeight < 60.0f) {
@ -629,7 +629,7 @@ void EnPeehat_Flying_StateLanding(EnPeehat* this, PlayState* play) {
Math_SmoothStepToS(&this->actor.shape.rot.x, 0, 1, 50, 0);
if (SkelAnime_Update(&this->skelAnime)) {
EnPeehat_Flying_SetStateGround(this);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_LAND);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_PIHAT_LAND);
this->actor.world.pos.y = this->actor.floorHeight;
} else if (this->actor.floorHeight < this->actor.world.pos.y) {
Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.floorHeight, 0.3f, 13.5f, 0.25f);
@ -689,7 +689,7 @@ void EnPeehat_Ground_StateHover(EnPeehat* this, PlayState* play) {
Math_SmoothStepToS(&this->bladeRotVel, 4000, 1, 500, 0);
this->bladeRot += this->bladeRotVel;
Math_SmoothStepToF(&this->scaleShift, 0.075f, 1.0f, 0.005f, 0.0f);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_FLY - SFX_FLAG);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_PIHAT_FLY - SFX_FLAG);
}
void EnPeehat_Ground_SetStateReturnHome(EnPeehat* this) {
@ -726,7 +726,7 @@ void EnPeehat_Ground_StateReturnHome(EnPeehat* this, PlayState* play) {
EnPeehat_Ground_SetStateSeekPlayer(this);
this->unk_2FA = (play->gameplayFrames & 1);
}
Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_FLY - SFX_FLAG);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_PIHAT_FLY - SFX_FLAG);
}
void EnPeehat_SetStateAttackRecoil(EnPeehat* this) {
@ -762,7 +762,7 @@ void EnPeehat_StateAttackRecoil(EnPeehat* this, PlayState* play) {
}
}
}
Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_FLY - SFX_FLAG);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_PIHAT_FLY - SFX_FLAG);
}
void EnPeehat_SetStateBoomerangStunned(EnPeehat* this) {
@ -773,7 +773,7 @@ void EnPeehat_SetStateBoomerangStunned(EnPeehat* this) {
this->bladeRotVel = 0;
this->actor.world.rot.y = this->actor.yawTowardsPlayer;
Actor_SetColorFilter(&this->actor, 0, 200, 0, 80);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
EnPeehat_SetupAction(this, EnPeehat_StateBoomerangStunned);
}
@ -895,7 +895,7 @@ void EnPeehat_Adult_CollisionCheck(EnPeehat* this, PlayState* play) {
} else {
Actor_ApplyDamage(&this->actor);
Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 8);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_DAMAGE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_PIHAT_DAMAGE);
}
if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_FIRE) {