mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 22:41:14 +00:00
Code Issues Projects Releases Wiki Activity

Name variables for Audio_PlaySoundGeneral (#1198)

Browse source 
* Rename variables and function

* Improve comment

* PR Suggestion

* PR Suggestions

* Revert back to `Audio_PlaySoundGeneral`, make a separate PR `Sound` -> `Sfx`

* Oops, fixed that
This commit is contained in:
engineer124 2022-04-24 00:55:18 +10:00 • committed by GitHub
parent 1e03b662f2
commit ef870bdd11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
98 changed files with 1026 additions and 721 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/overlays/actors/ovl_En_Go/z_en_go.c
View file

@ -766,8 +766,8 @@ void EnGo_FireGenericActionFunc(EnGo* this, GlobalContext* globalCtx) {
void EnGo_CurledUp(EnGo* this, GlobalContext* globalCtx) {
if ((DECR(this->unk_210) == 0) && EnGo_IsCameraModified(this, globalCtx)) {
Audio_PlaySoundGeneral(NA_SE_EN_GOLON_WAKE_UP, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EN_GOLON_WAKE_UP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
this->skelAnime.playSpeed = 0.1f;
this->skelAnime.playSpeed *= (this->actor.params & 0xF0) == 0x90 ? 0.5f : 1.0f;
@ -801,8 +801,8 @@ void EnGo_WakeUp(EnGo* this, GlobalContext* globalCtx) {
}
if (DECR(this->unk_212) == 0) {
Audio_PlaySoundGeneral(NA_SE_EN_GOLON_SIT_DOWN, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EN_GOLON_SIT_DOWN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
EnGo_SetupAction(this, func_80A405CC);
} else if (!EnGo_IsCameraModified(this, globalCtx)) {
EnGo_ReverseAnimation(this);
@ -820,8 +820,8 @@ void func_80A40494(EnGo* this, GlobalContext* globalCtx) {
frame += this->skelAnime.playSpeed;
if (!(frame >= 0.0f)) {
Audio_PlaySoundGeneral(NA_SE_EN_DODO_M_GND, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EN_DODO_M_GND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
EnGo_SpawnDust(this, 10, 0.4f, 0.1f, 16, 26.0f, 2.0f);
EnGo_ReverseAnimation(this);
this->skelAnime.playSpeed = 0.0f;
@ -912,8 +912,8 @@ void func_80A408D8(EnGo* this, GlobalContext* globalCtx) {
EnGo_SetupAction(this, func_80A40494);
} else if (EnGo_IsCameraModified(this, globalCtx)) {
EnGo_ReverseAnimation(this);
Audio_PlaySoundGeneral(NA_SE_EN_GOLON_SIT_DOWN, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EN_GOLON_SIT_DOWN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
this->skelAnime.playSpeed = 0.0f;
EnGo_SetupAction(this, func_80A405CC);
}