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

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

28
src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
View file

@ -403,7 +403,7 @@ void EnDodongo_SetupStunned(EnDodongo* this) {
if (this->damageEffect == 0xF) {
this->iceTimer = 36;
}
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
EnDodongo_SetupAction(this, EnDodongo_Stunned);
}
@ -430,10 +430,10 @@ void EnDodongo_BreatheFire(EnDodongo* this, PlayState* play) {
s16 fireFrame;
if ((s32)this->skelAnime.curFrame == 24) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_J_CRY);
Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_J_CRY);
}
if ((29.0f <= this->skelAnime.curFrame) && (this->skelAnime.curFrame <= 43.0f)) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_J_FIRE - SFX_FLAG);
Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_J_FIRE - SFX_FLAG);
fireFrame = this->skelAnime.curFrame - 29.0f;
pos = this->actor.world.pos;
pos.y += 35.0f;
@ -441,7 +441,7 @@ void EnDodongo_BreatheFire(EnDodongo* this, PlayState* play) {
EnDodongo_ShiftVecRadial(this->actor.world.rot.y, 2.5f, &accel);
EffectSsDFire_SpawnFixedScale(play, &pos, &velocity, &accel, 255 - (fireFrame * 10), fireFrame + 3);
} else if ((2.0f <= this->skelAnime.curFrame) && (this->skelAnime.curFrame <= 20.0f)) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_J_BREATH - SFX_FLAG);
Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_J_BREATH - SFX_FLAG);
}
if (SkelAnime_Update(&this->skelAnime)) {
EnDodongo_SetupEndBreatheFire(this);
@ -470,7 +470,7 @@ void EnDodongo_SwallowBomb(EnDodongo* this, PlayState* play) {
}
if ((s32)this->skelAnime.curFrame == 28) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_J_EAT);
Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_J_EAT);
if (this->actor.child != NULL) {
Actor_Kill(this->actor.child);
this->actor.child = NULL;
@ -496,7 +496,7 @@ void EnDodongo_SwallowBomb(EnDodongo* this, PlayState* play) {
func_8002836C(play, &pos, &deathFireVel, &deathFireAccel, &this->bombSmokePrimColor,
&this->bombSmokeEnvColor, 400, 10, 10);
}
Audio_PlayActorSfx2(&this->actor, NA_SE_IT_BOMB_EXPLOSION);
Actor_PlaySfx(&this->actor, NA_SE_IT_BOMB_EXPLOSION);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 120, COLORFILTER_BUFFLAG_OPA, 8);
}
}
@ -549,13 +549,13 @@ void EnDodongo_Walk(EnDodongo* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if ((s32)this->skelAnime.curFrame < 21) {
if (!this->rightFootStep) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_J_WALK);
Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_J_WALK);
Actor_SpawnFloorDustRing(play, &this->actor, &this->leftFootPos, 10.0f, 3, 2.0f, 200, 15, false);
this->rightFootStep = true;
}
} else {
if (this->rightFootStep) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_J_WALK);
Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_J_WALK);
Actor_SpawnFloorDustRing(play, &this->actor, &this->rightFootPos, 10.0f, 3, 2.0f, 200, 15, false);
this->rightFootStep = false;
}
@ -593,7 +593,7 @@ void EnDodongo_Walk(EnDodongo* this, PlayState* play) {
void EnDodongo_SetupSweepTail(EnDodongo* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &gDodongoDamageAnim, -4.0f);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_J_DAMAGE);
Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_J_DAMAGE);
this->actionState = DODONGO_SWEEP_TAIL;
this->timer = 0;
this->actor.speedXZ = 0.0f;
@ -625,7 +625,7 @@ void EnDodongo_SweepTail(EnDodongo* this, PlayState* play) {
} else {
animation = &gDodongoSweepTailRightAnim;
}
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_J_TAIL);
Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_J_TAIL);
Animation_PlayOnceSetSpeed(&this->skelAnime, animation, 2.0f);
this->timer = 18;
this->colliderBody.base.atFlags = this->sphElements[1].info.toucherFlags =
@ -651,7 +651,7 @@ void EnDodongo_SweepTail(EnDodongo* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if (this->colliderBody.base.at == &player->actor) {
Audio_PlayActorSfx2(&player->actor, NA_SE_PL_BODY_HIT);
Actor_PlaySfx(&player->actor, NA_SE_PL_BODY_HIT);
}
}
CollisionCheck_SetAT(play, &play->colChkCtx, &this->colliderBody.base);
@ -661,7 +661,7 @@ void EnDodongo_SweepTail(EnDodongo* this, PlayState* play) {
void EnDodongo_SetupDeath(EnDodongo* this, PlayState* play) {
Animation_MorphToPlayOnce(&this->skelAnime, &gDodongoDieAnim, -8.0f);
this->timer = 0;
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_J_DEAD);
Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_J_DEAD);
this->actionState = DODONGO_DEATH;
this->actor.flags &= ~ACTOR_FLAG_0;
this->actor.speedXZ = 0.0f;
@ -688,7 +688,7 @@ void EnDodongo_Death(EnDodongo* this, PlayState* play) {
}
}
} else if ((s32)this->skelAnime.curFrame == 52) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_DOWN);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_DOWN);
}
if (this->timer != 0) {
this->timer--;
@ -774,7 +774,7 @@ void EnDodongo_Update(Actor* thisx, PlayState* play) {
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
UPDBGCHECKINFO_FLAG_4);
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_DOWN);
Actor_PlaySfx(&this->actor, NA_SE_EN_RIZA_DOWN);
}
}
CollisionCheck_SetOC(play, &play->colChkCtx, &this->colliderBody.base);