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

10
src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
View file

@ -212,7 +212,7 @@ void EnFirefly_SetupFall(EnFirefly* this) {
this->timer = 40;
this->actor.velocity.y = 0.0f;
Animation_Change(&this->skelAnime, &gKeeseFlyAnim, 0.5f, 0.0f, 0.0f, ANIMMODE_LOOP_INTERP, -3.0f);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_FFLY_DEAD);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_FFLY_DEAD);
this->actor.flags |= ACTOR_FLAG_4;
Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, 40);
this->actionFunc = EnFirefly_Fall;
@ -252,7 +252,7 @@ void EnFirefly_SetupStunned(EnFirefly* this) {
this->auraType = KEESE_AURA_NONE;
this->actor.velocity.y = 0.0f;
this->skelAnime.playSpeed = 3.0f;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
this->actionFunc = EnFirefly_Stunned;
}
@ -264,7 +264,7 @@ void EnFirefly_SetupFrozenFall(EnFirefly* this, PlayState* play) {
this->auraType = KEESE_AURA_NONE;
this->actor.speedXZ = 0.0f;
Actor_SetColorFilter(&this->actor, 0, 0xFF, 0, 0xFF);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_FFLY_DEAD);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_FFLY_DEAD);
for (i = 0; i <= 7; i++) {
iceParticlePos.x = (i & 1 ? 7.0f : -7.0f) + this->actor.world.pos.x;
@ -668,7 +668,7 @@ void EnFirefly_Update(Actor* thisx, PlayState* play2) {
if (this->collider.base.atFlags & AT_HIT) {
this->collider.base.atFlags &= ~AT_HIT;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_FFLY_ATTACK);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_FFLY_ATTACK);
if (this->onFire) {
EnFirefly_Extinguish(this);
}
@ -706,7 +706,7 @@ void EnFirefly_Update(Actor* thisx, PlayState* play2) {
CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base);
this->actor.world.rot.y = this->actor.shape.rot.y;
if (Animation_OnFrame(&this->skelAnime, 5.0f)) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_FFLY_FLY);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_FFLY_FLY);
}
}