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

10
src/overlays/actors/ovl_En_Bom/z_en_bom.c
View file

@ -135,7 +135,7 @@ void EnBom_Move(EnBom* this, PlayState* play) {
if (ABS((s16)(this->actor.wallYaw - this->actor.world.rot.y)) > 0x4000) {
this->actor.world.rot.y = ((this->actor.wallYaw - this->actor.world.rot.y) + this->actor.wallYaw) - 0x8000;
}
Audio_PlayActorSfx2(&this->actor, NA_SE_EV_BOMB_BOUND);
Actor_PlaySfx(&this->actor, NA_SE_EV_BOMB_BOUND);
Actor_MoveForward(&this->actor);
this->actor.speedXZ *= 0.7f;
this->actor.bgCheckFlags &= ~BGCHECKFLAG_WALL;
@ -235,7 +235,7 @@ void EnBom_Update(Actor* thisx, PlayState* play2) {
}
if (this->timer == 67) {
Audio_PlayActorSfx2(thisx, NA_SE_PL_TAKE_OUT_SHIELD);
Actor_PlaySfx(thisx, NA_SE_PL_TAKE_OUT_SHIELD);
Actor_SetScale(thisx, 0.01f);
}
@ -260,7 +260,7 @@ void EnBom_Update(Actor* thisx, PlayState* play2) {
EffectSsGSpk_SpawnFuse(play, thisx, &effPos, &effVelocity, &effAccel);
}
Audio_PlayActorSfx2(thisx, NA_SE_IT_BOMB_IGNIT - SFX_FLAG);
Actor_PlaySfx(thisx, NA_SE_IT_BOMB_IGNIT - SFX_FLAG);
effPos.y += 3.0f;
func_8002829C(play, &effPos, &effVelocity, &dustAccel, &dustColor, &dustColor, 50, 5);
@ -313,7 +313,7 @@ void EnBom_Update(Actor* thisx, PlayState* play2) {
EffectSsBlast_SpawnWhiteShockwave(play, &effPos, &effVelocity, &effAccel);
}
Audio_PlayActorSfx2(thisx, NA_SE_IT_BOMB_EXPLOSION);
Actor_PlaySfx(thisx, NA_SE_IT_BOMB_EXPLOSION);
play->envCtx.adjLight1Color[0] = play->envCtx.adjLight1Color[1] = play->envCtx.adjLight1Color[2] = 250;
@ -349,7 +349,7 @@ void EnBom_Update(Actor* thisx, PlayState* play2) {
}
if (thisx->bgCheckFlags & BGCHECKFLAG_WATER_TOUCH) {
thisx->bgCheckFlags &= ~BGCHECKFLAG_WATER_TOUCH;
Audio_PlayActorSfx2(thisx, NA_SE_EV_BOMB_DROP_WATER);
Actor_PlaySfx(thisx, NA_SE_EV_BOMB_DROP_WATER);
}
}
}