mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-24 00:25:48 +00:00
Code Issues Projects Releases Wiki Activity

redocument EnGo2 .alpha as .shadowAlpha

Browse source 
and `func_80A45360` as `EnGo2_UpdateShadowAlpha`
This commit is contained in:
feacur 2024-11-11 21:57:20 +01:00
parent 960c8b5d93
commit 3b0e2cec03
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -1109,7 +1109,7 @@ void func_80A45288(EnGo2* this, PlayState* play) {
} }
} }
void func_80A45360(EnGo2* this, f32* alpha) { void EnGo2_UpdateShadowAlpha(EnGo2* this, f32* alpha) {
f32 alphaTarget = f32 alphaTarget =
(this->skelAnime.animation == &gGoronUncurlSitStandAnim) && (this->skelAnime.curFrame <= 32.0f) ? 0.0f : 255.0f; (this->skelAnime.animation == &gGoronUncurlSitStandAnim) && (this->skelAnime.curFrame <= 32.0f) ? 0.0f : 255.0f;
@ -1556,7 +1556,7 @@ void EnGo2_Init(Actor* thisx, PlayState* play) {
EnGo2_SetShape(this); EnGo2_SetShape(this);
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENGO2_ANIM_UNCURL_SIT_STAND_IDLE); Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENGO2_ANIM_UNCURL_SIT_STAND_IDLE);
this->actor.gravity = -1.0f; this->actor.gravity = -1.0f;
this->alpha = this->actor.shape.shadowAlpha = 0; this->shadownAlpha = this->actor.shape.shadowAlpha = 0;
this->reverse = 0; this->reverse = 0;
this->isAwake = false; this->isAwake = false;
this->isUncurled = false; this->isUncurled = false;
@ -1992,8 +1992,8 @@ void EnGo2_GoronFireGenericAction(EnGo2* this, PlayState* play) {
void EnGo2_Update(Actor* thisx, PlayState* play) { void EnGo2_Update(Actor* thisx, PlayState* play) {
EnGo2* this = (EnGo2*)thisx; EnGo2* this = (EnGo2*)thisx;
func_80A45360(this, &this->alpha); EnGo2_UpdateShadowAlpha(this, &this->shadownAlpha);
EnGo2_SitDownAnimation(this); EnGo2_UpdateStandUpAnim(this);
SkelAnime_Update(&this->skelAnime); SkelAnime_Update(&this->skelAnime);
EnGo2_RollForward(this); EnGo2_RollForward(this);
Actor_UpdateBgCheckInfo(play, &this->actor, this->collider.dim.height * 0.5f, this->collider.dim.radius * 0.6f, Actor_UpdateBgCheckInfo(play, &this->actor, this->collider.dim.height * 0.5f, this->collider.dim.radius * 0.6f,

3
src/overlays/actors/ovl_En_Go2/z_en_go2.h
View file

@ -86,8 +86,7 @@ typedef struct EnGo2 {
/* 0x0216 */ u8 reverseWaypoint; // Set to z rotation, checked by waypoint /* 0x0216 */ u8 reverseWaypoint; // Set to z rotation, checked by waypoint
/* 0x0218 */ f32 interactRange; /* 0x0218 */ f32 interactRange;
/* 0x021C */ char unk_21C[0x04]; /* 0x021C */ char unk_21C[0x04];
/* 0x0220 */ f32 /* 0x0220 */ f32 shadownAlpha;
alpha; // Set to 0, used by func_80A45360, smoothed to this->actor.shape.shadowAlpha from either 0 or 255.0f
/* 0x0224 */ s16 blinkTimer; /* 0x0224 */ s16 blinkTimer;
/* 0x0226 */ s16 unk_226[GORON_LIMB_MAX]; // Remains unknown /* 0x0226 */ s16 unk_226[GORON_LIMB_MAX]; // Remains unknown
/* 0x024A */ s16 unk_24A[GORON_LIMB_MAX]; // Remains unknown /* 0x024A */ s16 unk_24A[GORON_LIMB_MAX]; // Remains unknown