mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-11 01:10:33 +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 known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
321 changed files with 2879 additions and 2904 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c
View file

@ -17,7 +17,7 @@
#define rEnvColorG regs[7]
#define rEnvColorB regs[8]
#define rScaleStep regs[9]
#define rPlaySound regs[10]
#define rPlaySfx regs[10]
#define rReg11 regs[11]
u32 EffectSsDeadDb_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx);
@ -44,7 +44,7 @@ u32 EffectSsDeadDb_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
this->update = EffectSsDeadDb_Update;
this->rScale = initParams->scale;
this->rTextIdx = 0;
this->rPlaySound = initParams->playSound;
this->rPlaySfx = initParams->playSfx;
this->rPrimColorR = initParams->primColor.r;
this->rPrimColorG = initParams->primColor.g;
this->rPrimColorB = initParams->primColor.b;
@ -130,9 +130,9 @@ void EffectSsDeadDb_Update(PlayState* play, u32 index, EffectSs* this) {
this->rEnvColorB = 0;
}
if (this->rPlaySound && (this->rTextIdx == 1)) {
if (this->rPlaySfx && (this->rTextIdx == 1)) {
SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &this->pos, &this->vec, &w);
Audio_PlaySoundGeneral(NA_SE_EN_EXTINCT, &this->vec, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
Audio_PlaySfxGeneral(NA_SE_EN_EXTINCT, &this->vec, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultReverb);
}
}

2
src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h
View file

@ -14,7 +14,7 @@ typedef struct {
/* 0x2C */ Color_RGBA8 envColor;
/* 0x30 */ s16 unused;
/* 0x34 */ s32 unk_34;
/* 0x38 */ s16 playSound;
/* 0x38 */ s16 playSfx;
} EffectSsDeadDbInitParams; // size = 0x3C
#endif

4
src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c
View file

@ -45,6 +45,6 @@ void EffectSsDeadSound_Update(PlayState* play, u32 index, EffectSs* this) {
return;
}
Audio_PlaySoundGeneral(this->rSfxId, &this->pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultReverb);
Audio_PlaySfxGeneral(this->rSfxId, &this->pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultReverb);
}