mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 22:41:14 +00:00
Code Issues Projects Releases Wiki Activity

Name Actor_PlaySfx and Player_PlaySfx (#1469)

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

60
src/overlays/actors/ovl_En_Zf/z_en_zf.c
View file

@ -648,7 +648,7 @@ void EnZf_SetupDropIn(EnZf* this) {
void EnZf_DropIn(EnZf* this, PlayState* play) {
if (this->unk_3F0 == 1) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_CRY);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_CRY);
this->actor.flags |= ACTOR_FLAG_0;
if (this->actor.params == ENZF_TYPE_LIZALFOS_MINIBOSS_A) {
@ -662,7 +662,7 @@ void EnZf_DropIn(EnZf* this, PlayState* play) {
} else if (this->actor.xzDistToPlayer <= 160.0f) {
this->unk_3F0 = 0;
this->actor.flags |= ACTOR_FLAG_0;
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_CRY);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_CRY);
}
this->actor.world.pos.y = this->actor.floorHeight + 300.0f;
@ -671,7 +671,7 @@ void EnZf_DropIn(EnZf* this, PlayState* play) {
}
if ((this->actor.bgCheckFlags & (BGCHECKFLAG_GROUND | BGCHECKFLAG_GROUND_TOUCH)) && (this->hopAnimIndex != 0)) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_ONGND);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_ONGND);
Animation_Change(&this->skelAnime, &gZfLandingAnim, 1.0f, 0.0f, 17.0f, ANIMMODE_ONCE, 0.0f);
this->hopAnimIndex = 0;
this->actor.bgCheckFlags &= ~BGCHECKFLAG_GROUND_TOUCH;
@ -752,7 +752,7 @@ void func_80B4543C(EnZf* this, PlayState* play) {
}
if ((play->gameplayFrames & 0x5F) == 0) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_CRY);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_CRY);
}
}
}
@ -904,14 +904,14 @@ void EnZf_ApproachPlayer(EnZf* this, PlayState* play) {
}
if ((play->gameplayFrames & 0x5F) == 0) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_CRY);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_CRY);
}
if (prevFrame != (s32)this->skelAnime.curFrame) {
afterPrevFrame = absPlaySpeed + prevFrame;
if (((beforeCurFrame < 2) && (afterPrevFrame >= 4)) || ((beforeCurFrame < 32) && (afterPrevFrame >= 34))) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_WALK);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_WALK);
}
}
}
@ -930,7 +930,7 @@ void EnZf_SetupJumpForward(EnZf* this) {
}
this->action = ENZF_ACTION_JUMP_FORWARD;
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_JUMP);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_JUMP);
EnZf_SetupAction(this, EnZf_JumpForward);
}
@ -946,7 +946,7 @@ void EnZf_JumpForward(EnZf* this, PlayState* play) {
if (this->unk_3F0 == 0) {
Animation_Change(&this->skelAnime, &gZfLandingAnim, 3.0f, 0.0f, 17.0f, ANIMMODE_ONCE, -3.0f);
this->unk_3F0 = 10;
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_JUMP);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_JUMP);
} else {
this->actor.speedXZ = 0.0f;
this->hopAnimIndex = 0;
@ -954,7 +954,7 @@ void EnZf_JumpForward(EnZf* this, PlayState* play) {
}
}
if ((play->gameplayFrames & 0x5F) == 0) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_CRY);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_CRY);
}
if ((this->actor.params == ENZF_TYPE_DINOLFOS) &&
@ -1024,7 +1024,7 @@ void func_80B46098(EnZf* this, PlayState* play) {
}
}
if ((play->gameplayFrames & 0x5F) == 0) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_CRY);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_CRY);
}
}
}
@ -1141,12 +1141,12 @@ void func_80B463E4(EnZf* this, PlayState* play) {
if (((beforeCurFrame < 14) && (afterPrevFrame >= 16)) ||
((beforeCurFrame < 27) && (afterPrevFrame >= 29))) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_WALK);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_WALK);
}
}
if ((play->gameplayFrames & 0x5F) == 0) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_CRY);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_CRY);
}
if ((Math_CosS(angleBehindPlayer - this->actor.shape.rot.y) < -0.85f) || (this->unk_3F0 == 0)) {
@ -1174,7 +1174,7 @@ void EnZf_SetupSlash(EnZf* this) {
this->swordCollider.base.atFlags &= ~AT_BOUNCED;
this->action = ENZF_ACTION_SLASH;
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_CRY);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_CRY);
this->actor.speedXZ = 0.0f;
EnZf_SetupAction(this, EnZf_Slash);
}
@ -1187,7 +1187,7 @@ void EnZf_Slash(EnZf* this, PlayState* play) {
this->actor.speedXZ = 0.0f;
if ((s32)this->skelAnime.curFrame == 10) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_ATTACK);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_ATTACK);
}
if (SkelAnime_Update(&this->skelAnime)) {
@ -1260,7 +1260,7 @@ void EnZf_SetupJumpBack(EnZf* this) {
this->action = ENZF_ACTION_JUMP_BACK;
this->actor.velocity.y = 15.0f;
this->actor.speedXZ = -15.0f;
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_JUMP);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_JUMP);
EnZf_SetupAction(this, EnZf_JumpBack);
}
@ -1276,7 +1276,7 @@ void EnZf_JumpBack(EnZf* this, PlayState* play) {
if (this->unk_3F0 == 0) {
Animation_Change(&this->skelAnime, &gZfLandingAnim, 3.0f, 0.0f, 17.0f, ANIMMODE_ONCE, -3.0f);
this->unk_3F0 = 10;
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_JUMP);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_JUMP);
} else if ((play->gameplayFrames % 2) != 0) {
func_80B483E4(this, play);
} else {
@ -1285,7 +1285,7 @@ void EnZf_JumpBack(EnZf* this, PlayState* play) {
}
if ((play->state.frames & 0x5F) == 0) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_CRY);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_CRY);
}
}
@ -1304,7 +1304,7 @@ void EnZf_SetupStunned(EnZf* this) {
Animation_PlayOnceSetSpeed(&this->skelAnime, &gZfKnockedBackAnim, 0.0f);
}
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
this->action = ENZF_ACTION_STUNNED;
EnZf_SetupAction(this, EnZf_Stunned);
}
@ -1455,7 +1455,7 @@ void EnZf_HopAndTaunt(EnZf* this, PlayState* play) {
}
if ((play->gameplayFrames & 0x5F) == 0) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_CRY);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_CRY);
}
}
}
@ -1487,7 +1487,7 @@ void EnZf_HopAway(EnZf* this, PlayState* play) {
sp54 = this->hopAnimIndex;
if ((play->gameplayFrames & 0x5F) == 0) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_CRY);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_CRY);
}
// Upstairs
@ -1546,7 +1546,7 @@ void EnZf_HopAway(EnZf* this, PlayState* play) {
case 1:
if ((this->actor.bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH) ||
(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_ONGND);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_ONGND);
this->actor.velocity.y = 0.0f;
this->actor.world.pos.y = this->actor.floorHeight;
this->actor.speedXZ = 0.0f;
@ -1603,7 +1603,7 @@ void EnZf_DrawSword(EnZf* this, PlayState* play) {
}
if (SkelAnime_Update(&this->skelAnime)) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_CRY);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_CRY);
this->actor.world.rot.y = yawTowardsPlayer;
this->hopAnimIndex = -1;
func_80B45384(this);
@ -1634,7 +1634,7 @@ void EnZf_SetupDamaged(EnZf* this) {
this->actor.world.rot.y = this->actor.yawTowardsPlayer;
}
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_DAMAGE);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_DAMAGE);
this->action = ENZF_ACTION_DAMAGED;
EnZf_SetupAction(this, EnZf_Damaged);
}
@ -1709,7 +1709,7 @@ void EnZf_SetupJumpUp(EnZf* this) {
this->action = ENZF_ACTION_JUMP_UP;
this->actor.velocity.y = 22.0f;
this->actor.speedXZ = 7.5f;
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_JUMP);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_JUMP);
this->actor.world.rot.y = this->actor.shape.rot.y;
EnZf_SetupAction(this, EnZf_JumpUp);
}
@ -1731,7 +1731,7 @@ void EnZf_JumpUp(EnZf* this, PlayState* play) {
this->actor.speedXZ = 0.0f;
this->actor.world.pos.y = this->actor.floorHeight;
EnZf_SetupSlash(this);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_ATTACK);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_ATTACK);
this->skelAnime.curFrame = 13.0f;
}
}
@ -1893,11 +1893,11 @@ void EnZf_CircleAroundPlayer(EnZf* this, PlayState* play) {
if (((beforeCurFrame < 14) && (afterPrevFrame >= 16)) ||
((beforeCurFrame < 27) && (afterPrevFrame >= 29))) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_WALK);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_WALK);
}
}
if ((play->gameplayFrames & 0x5F) == 0) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_CRY);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_CRY);
}
}
}
@ -1934,7 +1934,7 @@ void EnZf_SetupDie(EnZf* this) {
}
D_80B4A1B0 = 0;
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_DEAD);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_DEAD);
EnZf_SetupAction(this, EnZf_Die);
}
@ -1970,7 +1970,7 @@ void EnZf_Die(EnZf* this, PlayState* play) {
s32 curFrame = this->skelAnime.curFrame;
if ((curFrame == 10) || (curFrame == 18)) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_DOWN);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_DOWN);
}
}
}
@ -2010,7 +2010,7 @@ void EnZf_UpdateDamage(EnZf* this, PlayState* play) {
EnZf_SetupStunned(this);
}
} else {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_CRY);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_CRY);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 8);
if (Actor_ApplyDamage(&this->actor) == 0) {