mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-02 22:14:33 +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

6
src/overlays/actors/ovl_En_Ba/z_en_ba.c
View file

@ -237,7 +237,7 @@ void EnBa_SwingAtPlayer(EnBa* this, PlayState* play) {
Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.home.pos.y + 60.0f, 1.0f, 10.0f, 0.0f);
if ((this->actor.xzDistToPlayer <= 175.0f) || (this->unk_31A != 0)) {
if (this->unk_318 == 20) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_BALINADE_HAND_UP);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_BALINADE_HAND_UP);
this->unk_31C = 1500;
}
if (this->unk_318 != 0) {
@ -267,7 +267,7 @@ void EnBa_SwingAtPlayer(EnBa* this, PlayState* play) {
}
} else {
if (this->unk_31A == 10) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_BALINADE_HAND_DOWN);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_BALINADE_HAND_DOWN);
}
if (this->unk_31A != 0) {
this->unk_31C = 8000;
@ -324,7 +324,7 @@ void func_809B7174(EnBa* this) {
this->unk_318 = 20;
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
this->actor.speedXZ = 10.0f;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_BALINADE_HAND_DAMAGE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_BALINADE_HAND_DAMAGE);
Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 12);
EnBa_SetupAction(this, EnBa_RecoilFromDamage);
}