From 960c8b5d936cf3f7c5516cf479aa3dd7c67e87c1 Mon Sep 17 00:00:00 2001 From: feacur Date: Mon, 11 Nov 2024 21:56:31 +0100 Subject: [PATCH] move EnGo2 `.goronState` comments to the TU partially they already were there --- src/overlays/actors/ovl_En_Go2/z_en_go2.c | 10 +++++----- src/overlays/actors/ovl_En_Go2/z_en_go2.h | 5 +---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index c9f3ed0954..e47862b0d0 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -1843,7 +1843,7 @@ void EnGo2_SetGetItem(EnGo2* this, PlayState* play) { void EnGo2_BiggoronEyedrops(EnGo2* this, PlayState* play) { switch (this->goronState) { - case 0: + case 0: // give eyedrops Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENGO2_ANIM_EYEDROPS_LOOP); this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; this->actor.shape.rot.y += 0x5B0; @@ -1855,7 +1855,7 @@ void EnGo2_BiggoronEyedrops(EnGo2* this, PlayState* play) { Audio_SetMainBgmVolume(0x28, 5); OnePointCutscene_Init(play, 4190, -99, &this->actor, CAM_ID_MAIN); break; - case 1: + case 1: // applying eyedrops if (DECR(this->animTimer)) { if (this->animTimer == 60 || this->animTimer == 120) { Camera_SetFinishedFlag(GET_ACTIVE_CAM(play)); @@ -1870,7 +1870,7 @@ void EnGo2_BiggoronEyedrops(EnGo2* this, PlayState* play) { Audio_SetMainBgmVolume(0x7F, 5); } break; - case 2: + case 2: // getting claimcheck if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { this->eyeMouthTexState = 0; } @@ -1892,7 +1892,7 @@ void EnGo2_GoronLinkStopRolling(EnGo2* this, PlayState* play) { Player* player = GET_PLAYER(play); switch (this->goronState) { - case 0: + case 0: // rolling if (Message_GetState(&play->msgCtx) != TEXT_STATE_NONE) { return; } else { @@ -1900,7 +1900,7 @@ void EnGo2_GoronLinkStopRolling(EnGo2* this, PlayState* play) { player->actor.freezeTimer = 10; this->goronState++; } - case 1: + case 1: // stunned break; default: return; diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.h b/src/overlays/actors/ovl_En_Go2/z_en_go2.h index b6170ea1e5..531f1b1f82 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.h +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.h @@ -79,11 +79,8 @@ typedef struct EnGo2 { /* 0x020F */ u8 isAwake; /* 0x0210 */ s8 waypoint; /* 0x0211 */ u8 isUncurled; - // goron link: 0 - rolling, 1 - frozen - // biggoron: 0 - give eyedrops, 1 - applying eyedrops, 2 - getting claimcheck - // generic fire: 0 - /* 0x0212 */ u8 goronState; - /* 0x0213 */ u8 eyeMouthTexState; // 0, 1, 2, 3 + /* 0x0213 */ u8 eyeMouthTexState; /* 0x0214 */ u8 eyeTexIndex; /* 0x0215 */ u8 mouthTexIndex; /* 0x0216 */ u8 reverseWaypoint; // Set to z rotation, checked by waypoint