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

Name Actor_PlaySfx and Player_PlaySfx (#1469)

* name two main actor sfx functions

* adjust comments

* fix double s in player

* fix commas
This commit is contained in:
engineer124 2022-12-18 23:18:21 -05:00 committed by GitHub
parent f181c2f10e
commit be22b836f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
213 changed files with 1424 additions and 1414 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_PlayActorSfx2(&this->actor, NA_SE_EV_TRIFORCE_FLASH);
Actor_PlaySfx(&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_PlayActorSfx2(&this->actor, NA_SE_EV_FOOT_SWITCH);
Actor_PlaySfx(&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_PlayActorSfx2(&this->actor, NA_SE_EV_FOOT_SWITCH);
Actor_PlaySfx(&this->actor, NA_SE_EV_FOOT_SWITCH);
}
}
}