mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 23:11:20 +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 account linked to committer's email address
321 changed files with 2879 additions and 2904 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -611,8 +611,8 @@ s16 EnGo2_GetStateGoronDmtBiggoron(PlayState* play, EnGo2* this) {
FALLTHROUGH;
case 0x3054:
if (dialogState == TEXT_STATE_NONE) {
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
Audio_PlaySfxGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
}
break;
}
@ -893,8 +893,8 @@ s32 func_80A44AB0(EnGo2* this, PlayState* play) {
return false;
} else {
if (this->collider.base.acFlags & AC_HIT) {
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
Audio_PlaySfxGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
this->actor.flags &= ~ACTOR_FLAG_24;
this->collider.base.acFlags &= ~AC_HIT;
EnGo2_StopRolling(this, play);
@ -912,7 +912,7 @@ s32 func_80A44AB0(EnGo2* this, PlayState* play) {
play->damagePlayer(play, -4);
func_8002F71C(play, &this->actor, arg2, this->actor.yawTowardsPlayer, 6.0f);
Audio_PlayActorSound2(&player->actor, NA_SE_PL_BODY_HIT);
Audio_PlayActorSfx2(&player->actor, NA_SE_PL_BODY_HIT);
this->collider.base.ocFlags1 &= ~OC1_TYPE_PLAYER;
}
}
@ -1000,15 +1000,15 @@ s32 EnGo2_IsRollingOnGround(EnGo2* this, s16 arg1, f32 arg2, s16 arg3) {
} else {
this->actor.world.pos.y =
(this->unk_590 & 1) ? this->actor.world.pos.y + 1.5f : this->actor.world.pos.y - 1.5f;
Audio_PlayActorSound2(&this->actor, NA_SE_EV_BIGBALL_ROLL - SFX_FLAG);
Audio_PlayActorSfx2(&this->actor, NA_SE_EV_BIGBALL_ROLL - SFX_FLAG);
return true;
}
}
if (this->unk_59C >= 2) {
Audio_PlayActorSound2(&this->actor, (this->actor.params & 0x1F) == GORON_CITY_ROLLING_BIG
? NA_SE_EN_GOLON_LAND_BIG
: NA_SE_EN_DODO_M_GND);
Audio_PlayActorSfx2(&this->actor, (this->actor.params & 0x1F) == GORON_CITY_ROLLING_BIG
? NA_SE_EN_GOLON_LAND_BIG
: NA_SE_EN_DODO_M_GND);
}
this->unk_59C--;
@ -1276,17 +1276,17 @@ void EnGo2_SitDownAnimation(EnGo2* this) {
if ((this->skelAnime.playSpeed != 0.0f) && (this->skelAnime.animation == &gGoronAnim_004930)) {
if (this->skelAnime.playSpeed > 0.0f && this->skelAnime.curFrame == 14.0f) {
if ((this->actor.params & 0x1F) != GORON_DMT_BIGGORON) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOLON_SIT_DOWN);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GOLON_SIT_DOWN);
} else {
func_800F4524(&gSfxDefaultPos, NA_SE_EN_GOLON_SIT_DOWN, 60);
}
}
if (this->skelAnime.playSpeed < 0.0f) {
if (this->skelAnime.curFrame == 1.0f) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_M_GND);
}
if (this->skelAnime.curFrame == 40.0f) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOLON_SIT_DOWN);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GOLON_SIT_DOWN);
}
}
}
@ -1319,7 +1319,7 @@ void EnGo2_RollingAnimation(EnGo2* this, PlayState* play) {
void EnGo2_WakeUp(EnGo2* this, PlayState* play) {
if (this->skelAnime.playSpeed == 0.0f) {
if ((this->actor.params & 0x1F) != GORON_DMT_BIGGORON) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOLON_WAKE_UP);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GOLON_WAKE_UP);
} else {
func_800F4524(&gSfxDefaultPos, NA_SE_EN_GOLON_WAKE_UP, 60);
}
@ -1468,7 +1468,7 @@ void EnGo2_GoronLinkAnimation(EnGo2* this, PlayState* play) {
if (this->skelAnime.animation == &gGoronAnim_000750) {
if (this->skelAnime.curFrame == 20.0f) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOLON_CRY);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GOLON_CRY);
}
}
@ -1931,7 +1931,7 @@ void EnGo2_GoronFireGenericAction(EnGo2* this, PlayState* play) {
case 2: // Walking away
if (DECR(this->animTimer)) {
if (!(this->animTimer % 8)) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MORIBLIN_WALK);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MORIBLIN_WALK);
}
Actor_MoveForward(&this->actor);
} else {
@ -1948,13 +1948,13 @@ void EnGo2_GoronFireGenericAction(EnGo2* this, PlayState* play) {
case 3: // Walking away
this->animTimer++;
if (!(this->animTimer % 8) && (this->animTimer < 10)) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MORIBLIN_WALK);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MORIBLIN_WALK);
}
if (this->animTimer == 10) {
Audio_PlayActorSound2(&this->actor, NA_SE_EV_IRON_DOOR_OPEN);
Audio_PlayActorSfx2(&this->actor, NA_SE_EV_IRON_DOOR_OPEN);
}
if (this->animTimer > 44) {
SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 20, NA_SE_EV_IRON_DOOR_CLOSE);
SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 20, NA_SE_EV_IRON_DOOR_CLOSE);
} else {
break;
}