diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2022-04-24 00:55:18 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-23 10:55:18 -0400 |
| commit | ef870bdd11c07ade54f0c92fa3470eed43ba12e4 (patch) | |
| tree | 31d9085c5918c26669b32a0b3317515ce7bf6185 /src/code/z_actor.c | |
| parent | 1e03b662f2a1d7ea5221695facb33b09eb6c0754 (diff) | |
Name variables for Audio_PlaySoundGeneral (#1198)
* Rename variables and function
* Improve comment
* PR Suggestion
* PR Suggestions
* Revert back to `Audio_PlaySoundGeneral`, make a separate PR `Sound` -> `Sfx`
* Oops, fixed that
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index b59039a85..12432b802 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1689,7 +1689,8 @@ void func_8002F7A0(GlobalContext* globalCtx, Actor* actor, f32 arg2, s16 arg3, f } void func_8002F7DC(Actor* actor, u16 sfxId) { - Audio_PlaySoundGeneral(sfxId, &actor->projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(sfxId, &actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, + &gSfxDefaultReverb); } void Audio_PlayActorSound2(Actor* actor, u16 sfxId) { @@ -2235,13 +2236,14 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) { void func_80030ED8(Actor* actor) { if (actor->flags & ACTOR_FLAG_19) { - Audio_PlaySoundGeneral(actor->sfx, &actor->projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(actor->sfx, &actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, + &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } else if (actor->flags & ACTOR_FLAG_20) { func_80078884(actor->sfx); } else if (actor->flags & ACTOR_FLAG_21) { func_800788CC(actor->sfx); } else if (actor->flags & ACTOR_FLAG_28) { - func_800F4C58(&D_801333D4, NA_SE_SY_TIMER - SFX_FLAG, (s8)(actor->sfx - 1)); + func_800F4C58(&gSfxDefaultPos, NA_SE_SY_TIMER - SFX_FLAG, (s8)(actor->sfx - 1)); } else { func_80078914(&actor->projectedPos, actor->sfx); } @@ -4967,8 +4969,8 @@ void func_80036E50(u16 textId, s16 arg1) { Flags_SetInfTable(0xC); return; case 0x1033: - Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, - &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, + &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); Flags_SetEventChkInf(0x4); Flags_SetInfTable(0xE); return; @@ -5431,7 +5433,8 @@ s32 func_80037CB8(GlobalContext* globalCtx, Actor* actor, s16 arg2) { case TEXT_STATE_CHOICE: case TEXT_STATE_EVENT: if (Message_ShouldAdvance(globalCtx) && func_80037C94(globalCtx, actor, arg2)) { - Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, + &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); msgCtx->msgMode = MSGMODE_TEXT_CLOSING; ret = true; } |