mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 06:21:16 +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_Fr/z_en_fr.c
View file

@ -353,9 +353,9 @@ void EnFr_DivingIntoWater(EnFr* this, PlayState* play) {
EffectSsGSplash_Spawn(play, &vec, NULL, NULL, 1, 1);
if (this->isBelowWaterSurfaceCurrent == false) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EV_DIVE_INTO_WATER_L);
Actor_PlaySfx(&this->actor, NA_SE_EV_DIVE_INTO_WATER_L);
} else {
Audio_PlayActorSfx2(&this->actor, NA_SE_EV_BOMB_DROP_WATER);
Actor_PlaySfx(&this->actor, NA_SE_EV_BOMB_DROP_WATER);
}
}
}
@ -479,7 +479,7 @@ void EnFr_JumpingUp(EnFr* this, PlayState* play) {
this->actor.velocity.y = 25.0f;
if (this->isJumpingToFrogSong) {
this->isJumpingToFrogSong = false;
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_M_EAT);
Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_M_EAT);
}
}
@ -741,7 +741,7 @@ void EnFr_ChildSong(EnFr* this, PlayState* play) {
if (frog->actionFunc == EnFr_ChooseJumpFromLogSpot) {
frog->isJumpingUp = true;
frog->isActive = true;
Audio_PlayActorSfx2(&frog->actor, NA_SE_EV_FROG_GROW_UP);
Actor_PlaySfx(&frog->actor, NA_SE_EV_FROG_GROW_UP);
this->actionFunc = EnFr_ChildSongFirstTime;
} else {
this->jumpCounter = 48;
@ -1008,7 +1008,7 @@ void EnFr_Deactivate(EnFr* this, PlayState* play) {
}
play->msgCtx.ocarinaMode = OCARINA_MODE_04;
Audio_PlayActorSfx2(&this->actor, NA_SE_EV_FROG_CRY_0);
Actor_PlaySfx(&this->actor, NA_SE_EV_FROG_CRY_0);
if (this->reward == GI_NONE) {
this->actionFunc = EnFr_Idle;
} else {