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

@ -199,7 +199,7 @@ void EnHonotrap_InitFlame(Actor* thisx, PlayState* play) {
this->targetPos.y += 10.0f;
this->flameScroll = Rand_ZeroOne() * 511.0f;
EnHonotrap_SetupFlame(this);
Audio_PlayActorSfx2(&this->actor, NA_SE_EV_FLAME_IGNITION);
Actor_PlaySfx(&this->actor, NA_SE_EV_FLAME_IGNITION);
if (this->actor.params == HONOTRAP_FLAME_DROP) {
this->actor.room = -1;
this->collider.cyl.dim.radius = 12;
@ -248,7 +248,7 @@ void EnHonotrap_SetupEyeOpen(EnHonotrap* this) {
this->actionFunc = EnHonotrap_EyeOpen;
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 40);
this->timer = 30;
Audio_PlayActorSfx2(&this->actor, NA_SE_EV_RED_EYE);
Actor_PlaySfx(&this->actor, NA_SE_EV_RED_EYE);
}
void EnHonotrap_EyeOpen(EnHonotrap* this, PlayState* play) {
@ -478,7 +478,7 @@ void EnHonotrap_Update(Actor* thisx, PlayState* play) {
this->bobPhase += 0x640;
this->actor.shape.yOffset = (Math_SinS(this->bobPhase) * 1000.0f) + 600.0f;
Actor_SetFocus(&this->actor, 5.0f);
Audio_PlayActorSfx2(&this->actor, NA_SE_EV_BURN_OUT - SFX_FLAG);
Actor_PlaySfx(&this->actor, NA_SE_EV_BURN_OUT - SFX_FLAG);
}
this->actionFunc(this, play);
if (this->actor.params == HONOTRAP_EYE) {