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

@ -161,7 +161,7 @@ s32 EnInsect_TryFindNearbySoil(EnInsect* this, PlayState* play) {
}
/**
* Update the crawl sound timer, and play the crawling sound when it reaches 0.
* Update the crawl sound timer, and play the crawling sound effect when it reaches 0.
*/
void EnInsect_UpdateCrawlSfx(EnInsect* this) {
if (this->crawlSoundDelay > 0) {
@ -169,7 +169,7 @@ void EnInsect_UpdateCrawlSfx(EnInsect* this) {
return;
}
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MUSI_WALK);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MUSI_WALK);
this->crawlSoundDelay = 3.0f / CLAMP_MIN(this->skelAnime.playSpeed, 0.1f);
if (this->crawlSoundDelay < 2) {
@ -413,7 +413,7 @@ void EnInsect_SetupDig(EnInsect* this) {
this->actionTimer = 60;
EnInsect_SetCrawlAnim(this);
this->skelAnime.playSpeed = 1.9f;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MUSI_SINK);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MUSI_SINK);
Math_Vec3f_Copy(&this->actor.home.pos, &this->actor.world.pos);
this->actionFunc = EnInsect_Dig;
this->insectFlags &= ~INSECT_FLAG_CRAWLING;
@ -664,7 +664,7 @@ void EnInsect_Dropped(EnInsect* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (!(this->insectFlags & INSECT_FLAG_DROPPED_HAS_LANDED) && (this->insectFlags & INSECT_FLAG_0) &&
(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MUSI_LAND);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MUSI_LAND);
this->insectFlags |= INSECT_FLAG_DROPPED_HAS_LANDED;
}