mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-23 15:55:47 +00:00
Code Issues Projects Releases Wiki Activity

EnGo_IsCameraModified -> EnGo_IsAttentionDrawn

Browse source
This commit is contained in:
feacur 2024-11-11 01:01:56 +01:00
parent 8fb7fc2618
commit 4a793fa94d
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/overlays/actors/ovl_En_Go/z_en_go.c
View file

@ -439,7 +439,7 @@ void EnGo_UpdateBlinking(EnGo* this) {
} }
} }
s32 EnGo_IsCameraModified(EnGo* this, PlayState* play) { s32 EnGo_IsAttentionDrawn(EnGo* this, PlayState* play) {
f32 xyzDistSq; f32 xyzDistSq;
s16 yawDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; s16 yawDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y;
Camera* mainCam = play->cameraPtrs[CAM_ID_MAIN]; Camera* mainCam = play->cameraPtrs[CAM_ID_MAIN];
@ -459,9 +459,9 @@ s32 EnGo_IsCameraModified(EnGo* this, PlayState* play) {
Camera_RequestSetting(mainCam, CAM_SET_NORMAL0); Camera_RequestSetting(mainCam, CAM_SET_NORMAL0);
} }
return 0; return 0;
} else {
return 1;
} }
return 1;
} }
void EnGo_ReverseAnimation(EnGo* this) { void EnGo_ReverseAnimation(EnGo* this) {
@ -794,7 +794,7 @@ void EnGo_FireGenericActionFunc(EnGo* this, PlayState* play) {
} }
void EnGo_CurledUp(EnGo* this, PlayState* play) { void EnGo_CurledUp(EnGo* this, PlayState* play) {
if ((DECR(this->curledTimer) == 0) && EnGo_IsCameraModified(this, play)) { if ((DECR(this->curledTimer) == 0) && EnGo_IsAttentionDrawn(this, play)) {
Audio_PlaySfxGeneral(NA_SE_EN_GOLON_WAKE_UP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, Audio_PlaySfxGeneral(NA_SE_EN_GOLON_WAKE_UP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
@ -833,7 +833,7 @@ void EnGo_WakeUp(EnGo* this, PlayState* play) {
Audio_PlaySfxGeneral(NA_SE_EN_GOLON_SIT_DOWN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, Audio_PlaySfxGeneral(NA_SE_EN_GOLON_SIT_DOWN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
EnGo_SetupAction(this, func_80A405CC); EnGo_SetupAction(this, func_80A405CC);
} else if (!EnGo_IsCameraModified(this, play)) { } else if (!EnGo_IsAttentionDrawn(this, play)) {
EnGo_ReverseAnimation(this); EnGo_ReverseAnimation(this);
this->skelAnime.playSpeed = 0.0f; this->skelAnime.playSpeed = 0.0f;
EnGo_SetupAction(this, func_80A40494); EnGo_SetupAction(this, func_80A40494);
@ -909,7 +909,7 @@ void EnGo_BiggoronActionFunc(EnGo* this, PlayState* play) {
play->msgCtx.stateTimer = 4; play->msgCtx.stateTimer = 4;
play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING; play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
} else { } else {
if ((DECR(this->attentionCooldown) == 0) && !EnGo_IsCameraModified(this, play)) { if ((DECR(this->attentionCooldown) == 0) && !EnGo_IsAttentionDrawn(this, play)) {
EnGo_ReverseAnimation(this); EnGo_ReverseAnimation(this);
this->skelAnime.playSpeed = -0.1f; this->skelAnime.playSpeed = -0.1f;
this->skelAnime.playSpeed *= ENGO_GET_TYPE(this) == ENGO_TYPE_DMT_BIGGORON ? 0.5f : 1.0f; this->skelAnime.playSpeed *= ENGO_GET_TYPE(this) == ENGO_TYPE_DMT_BIGGORON ? 0.5f : 1.0f;
@ -940,7 +940,7 @@ void func_80A408D8(EnGo* this, PlayState* play) {
if (DECR(this->attentionCooldown) == 0) { if (DECR(this->attentionCooldown) == 0) {
EnGo_SetupAction(this, func_80A40494); EnGo_SetupAction(this, func_80A40494);
} else if (EnGo_IsCameraModified(this, play)) { } else if (EnGo_IsAttentionDrawn(this, play)) {
EnGo_ReverseAnimation(this); EnGo_ReverseAnimation(this);
Audio_PlaySfxGeneral(NA_SE_EN_GOLON_SIT_DOWN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, Audio_PlaySfxGeneral(NA_SE_EN_GOLON_SIT_DOWN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);