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

@ -177,7 +177,7 @@ void func_80ABCDBC(EnNy* this) {
}
void EnNy_SetupTurnToStone(EnNy* this) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_NYU_HIT_STOP);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_NYU_HIT_STOP);
this->actionFunc = EnNy_TurnToStone;
this->unk_1E8 = 0.0f;
}
@ -253,7 +253,7 @@ void EnNy_TurnToStone(EnNy* this, PlayState* play) {
phi_f0 = 0.25f;
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH) {
if (!(this->unk_1F0 < this->actor.yDistToWater)) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_M_GND);
}
this->actor.bgCheckFlags &= ~BGCHECKFLAG_GROUND_TOUCH;
this->actor.speedXZ = 0.0f;
@ -444,7 +444,7 @@ void EnNy_SetupDie(EnNy* this, PlayState* play) {
} else {
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_ARROWS_SMALL);
}
Audio_PlayActorSound2(&this->actor, NA_SE_EN_NYU_DEAD);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_NYU_DEAD);
this->actionFunc = EnNy_Die;
}
}