mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +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_Zl4/z_en_zl4.c
View file

@ -446,7 +446,7 @@ s32 EnZl4_CsMeetPlayer(EnZl4* this, PlayState* play) {
switch (this->talkState) {
case 0:
if (this->skelAnime.curFrame == 50.0f) {
Audio_PlayActorSfx2(&this->actor, NA_SE_VO_Z0_MEET);
Actor_PlaySfx(&this->actor, NA_SE_VO_Z0_MEET);
}
if (!EnZl4_SetNextAnim(this, ZL4_ANIM_4)) {
break;
@ -551,7 +551,7 @@ s32 EnZl4_CsAskStone(EnZl4* this, PlayState* play) {
break;
case 4:
if (this->skelAnime.curFrame == 16.0f) {
Audio_PlayActorSfx2(&this->actor, NA_SE_VO_Z0_QUESTION);
Actor_PlaySfx(&this->actor, NA_SE_VO_Z0_QUESTION);
}
if (EnZl4_SetNextAnim(this, ZL4_ANIM_10)) {
this->talkState++;
@ -598,7 +598,7 @@ s32 EnZl4_CsAskStone(EnZl4* this, PlayState* play) {
break;
case 7:
if (this->skelAnime.curFrame == 17.0f) {
Audio_PlayActorSfx2(&this->actor, NA_SE_VO_Z0_SMILE_0);
Actor_PlaySfx(&this->actor, NA_SE_VO_Z0_SMILE_0);
}
if (EnZl4_SetNextAnim(this, ZL4_ANIM_29)) {
this->talkState++;
@ -739,7 +739,7 @@ s32 EnZl4_CsAskName(EnZl4* this, PlayState* play) {
break;
case 12:
if (this->skelAnime.curFrame == 5.0f) {
Audio_PlayActorSfx2(&this->actor, NA_SE_VO_Z0_SIGH_0);
Actor_PlaySfx(&this->actor, NA_SE_VO_Z0_SIGH_0);
}
if (EnZl4_SetNextAnim(this, ZL4_ANIM_12)) {
this->talkState++;
@ -834,7 +834,7 @@ s32 EnZl4_CsTellLegend(EnZl4* this, PlayState* play) {
this->mouthExpression = ZL4_MOUTH_SURPRISED;
Message_StartTextbox(play, 0x7038, NULL);
this->talkState++;
Audio_PlayActorSfx2(&this->actor, NA_SE_VO_Z0_HURRY);
Actor_PlaySfx(&this->actor, NA_SE_VO_Z0_HURRY);
}
break;
case 5: