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

12
src/overlays/actors/ovl_En_Skb/z_en_skb.c
View file

@ -215,7 +215,7 @@ void EnSkb_SetupRiseFromGround(EnSkb* this) {
Animation_PlayOnceSetSpeed(&this->skelAnime, &gStalchildUncurlingAnim, 1.0f);
this->actionState = SKB_BEHAVIOR_BURIED;
this->actor.flags &= ~ACTOR_FLAG_0;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIVA_APPEAR);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIVA_APPEAR);
EnSkb_SetupAction(this, EnSkb_RiseFromGround);
}
@ -243,7 +243,7 @@ void EnSkb_SetupDespawn(EnSkb* this) {
this->setColliderAT = false;
this->actor.flags &= ~ACTOR_FLAG_0;
this->actor.speedXZ = 0.0f;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_AKINDONUTS_HIDE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_AKINDONUTS_HIDE);
EnSkb_SetupAction(this, EnSkb_Despawn);
}
@ -295,7 +295,7 @@ void EnSkb_WalkForward(EnSkb* this, PlayState* play) {
if (((prevKeyFrame < 9) && (((s32)playSpeed + thisKeyFrame) >= 8)) ||
!((prevKeyFrame >= 16) || (((s32)playSpeed + thisKeyFrame) < 15))) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALKID_WALK);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_STALKID_WALK);
}
}
if (Math_Vec3f_DistXZ(&this->actor.home.pos, &player->actor.world.pos) > 800.0f || IS_DAY) {
@ -320,7 +320,7 @@ void EnSkb_Attack(EnSkb* this, PlayState* play) {
frameData = this->skelAnime.curFrame;
if (frameData == 3) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALKID_ATTACK);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_STALKID_ATTACK);
this->setColliderAT = true;
} else if (frameData == 6) {
this->setColliderAT = false;
@ -352,7 +352,7 @@ void EnSkb_SetupStunned(EnSkb* this) {
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) {
this->actor.speedXZ = 0.0f;
}
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
this->setColliderAT = false;
this->actionState = SKB_BEHAVIOR_STUNNED;
EnSkb_SetupAction(this, EnSkb_Stunned);
@ -382,7 +382,7 @@ void EnSkb_SetupTakeDamage(EnSkb* this) {
this->actor.speedXZ = -4.0f;
}
this->actor.world.rot.y = this->actor.yawTowardsPlayer;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALKID_DAMAGE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_STALKID_DAMAGE);
this->actionState = SKB_BEHAVIOR_DAMAGED;
EnSkb_SetupAction(this, EnSkb_TakeDamage);
}