1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 06:21:16 +00:00

Rename "Sound" to "Sfx" (#1292)

* 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

View file

@ -334,7 +334,7 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) {
if (this->actor.params <= WOOD_TREE_KAKARIKO_ADULT) {
if (this->collider.base.acFlags & AC_HIT) {
this->collider.base.acFlags &= ~AC_HIT;
Audio_PlayActorSound2(&this->actor, NA_SE_IT_REFLECTION_WOOD);
Audio_PlayActorSfx2(&this->actor, NA_SE_IT_REFLECTION_WOOD);
}
if (this->actor.home.rot.y != 0) {
@ -361,7 +361,7 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) {
(this->actor.params == WOOD_TREE_OVAL_YELLOW_SPAWNED)) {
leavesParams = WOOD_LEAF_YELLOW;
}
Audio_PlayActorSound2(&this->actor, NA_SE_EV_TREE_SWING);
Audio_PlayActorSfx2(&this->actor, NA_SE_EV_TREE_SWING);
for (i = 3; i >= 0; i--) {
Actor_Spawn(&play->actorCtx, play, ACTOR_EN_WOOD02, dropsSpawnPt.x, dropsSpawnPt.y, dropsSpawnPt.z,
@ -390,7 +390,7 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) {
((this->unk_14C << 4) | 0x8000));
}
this->unk_14C = -0x15;
Audio_PlayActorSound2(&this->actor, NA_SE_EV_TREE_SWING);
Audio_PlayActorSfx2(&this->actor, NA_SE_EV_TREE_SWING);
}
}
} else { // Leaves