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

6
src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
View file

@ -169,7 +169,7 @@ void ObjectKankyo_Snow(ObjectKankyo* this, PlayState* play) {
}
void ObjectKankyo_Fairies(ObjectKankyo* this, PlayState* play) {
static Vec3f sSoundPos = { 0.0f, 0.0f, 0.0f };
static Vec3f sSfxPos = { 0.0f, 0.0f, 0.0f };
Player* player;
f32 dist;
s32 playerMoved;
@ -203,7 +203,7 @@ void ObjectKankyo_Fairies(ObjectKankyo* this, PlayState* play) {
dist = 1.0f;
}
func_800F436C(&sSoundPos, NA_SE_EV_NAVY_FLY - SFX_FLAG, (0.4f * dist) + 0.6f);
func_800F436C(&sSfxPos, NA_SE_EV_NAVY_FLY - SFX_FLAG, (0.4f * dist) + 0.6f);
switch (play->csCtx.frames) {
case 473:
func_800788CC(NA_SE_VO_NA_HELLO_3);
@ -799,7 +799,7 @@ void ObjectKankyo_WaitForSunGraveSparkObject(ObjectKankyo* this, PlayState* play
void ObjectKankyo_SunGraveSpark(ObjectKankyo* this, PlayState* play) {
if (play->csCtx.state != 0) {
if (play->csCtx.npcActions[1] != NULL && play->csCtx.npcActions[1]->action == 2) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_BIRI_SPARK - SFX_FLAG);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_BIRI_SPARK - SFX_FLAG);
if ((s16)this->effects[0].alpha + 20 > 255) {
this->effects[0].alpha = 255;
} else {