1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-15 03:20:35 +00:00

Rename "Sound" to "Sfx" (#1292)

* 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

View file

@ -255,7 +255,7 @@ void ObjLightswitch_SetupTurnOn(ObjLightswitch* this) {
void ObjLightswitch_TurnOn(ObjLightswitch* this, PlayState* play) {
if (func_8005B198() == this->actor.category || this->toggleDelay <= 0) {
if (this->timer == 0) {
Audio_PlayActorSound2(&this->actor, NA_SE_EV_TRIFORCE_FLASH);
Audio_PlayActorSfx2(&this->actor, NA_SE_EV_TRIFORCE_FLASH);
}
this->timer++;
@ -270,7 +270,7 @@ void ObjLightswitch_TurnOn(ObjLightswitch* this, PlayState* play) {
ObjLightswitch_SetupOn(this);
} else if (this->timer == 15) {
this->faceTextureIndex = FACE_EYES_OPEN;
Audio_PlayActorSound2(&this->actor, NA_SE_EV_FOOT_SWITCH);
Audio_PlayActorSfx2(&this->actor, NA_SE_EV_FOOT_SWITCH);
}
}
}
@ -339,7 +339,7 @@ void ObjLightswitch_TurnOff(ObjLightswitch* this, PlayState* play) {
ObjLightswitch_SetupOff(this);
} else if (this->timer == 15) {
this->faceTextureIndex = FACE_EYES_CLOSED;
Audio_PlayActorSound2(&this->actor, NA_SE_EV_FOOT_SWITCH);
Audio_PlayActorSfx2(&this->actor, NA_SE_EV_FOOT_SWITCH);
}
}
}