mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-22 06:45:31 +00:00
Code Issues Projects Releases Wiki Activity

redocument EnGo2 message states

Browse source
This commit is contained in:
feacur 2024-11-11 21:46:28 +01:00
parent 50d3b84115
commit 7f30ab6ae5
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -281,14 +281,14 @@ void EnGo2_GetItem(EnGo2* this, PlayState* play, s32 getItemId) {
s32 EnGo2_GetDialogState(EnGo2* this, PlayState* play) { s32 EnGo2_GetDialogState(EnGo2* this, PlayState* play) {
s16 dialogState = Message_GetState(&play->msgCtx); s16 dialogState = Message_GetState(&play->msgCtx);
if ((this->dialogState == TEXT_STATE_AWAITING_NEXT) || (this->dialogState == TEXT_STATE_EVENT) || if ((this->messageState == TEXT_STATE_AWAITING_NEXT) || (this->messageState == TEXT_STATE_EVENT) ||
(this->dialogState == TEXT_STATE_CLOSING) || (this->dialogState == TEXT_STATE_DONE_HAS_NEXT)) { (this->messageState == TEXT_STATE_CLOSING) || (this->messageState == TEXT_STATE_DONE_HAS_NEXT)) {
if (dialogState != this->dialogState) { if (dialogState != this->messageState) {
this->unk_20C++; this->messageEntry++;
} }
} }
this->dialogState = dialogState; this->messageState = dialogState;
return dialogState; return dialogState;
} }
@ -492,8 +492,8 @@ u16 EnGo2_GetTextIdGoronCityLink(PlayState* play, EnGo2* this) {
} else if (CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON)) { } else if (CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON)) {
return GET_INFTABLE(INFTABLE_10E) ? 0x3038 : 0x3037; return GET_INFTABLE(INFTABLE_10E) ? 0x3038 : 0x3037;
} else if (GET_INFTABLE(INFTABLE_10C)) { } else if (GET_INFTABLE(INFTABLE_10C)) {
this->unk_20C = 0; this->messageEntry = 0;
this->dialogState = TEXT_STATE_NONE; this->messageState = TEXT_STATE_NONE;
return GET_INFTABLE(INFTABLE_10A) ? 0x3033 : 0x3032; return GET_INFTABLE(INFTABLE_10A) ? 0x3033 : 0x3032;
} else { } else {
return 0x3030; return 0x3030;
@ -529,7 +529,7 @@ s16 EnGo2_UpdateTalkStateGoronCityLink(PlayState* play, EnGo2* this) {
} }
} }
Message_ContinueTextbox(play, this->actor.textId); Message_ContinueTextbox(play, this->actor.textId);
this->unk_20C = 0; this->messageEntry = 0;
} }
} else { } else {
break; break;
@ -575,7 +575,7 @@ u16 EnGo2_GetTextIdGoronDmtBiggoron(PlayState* play, EnGo2* this) {
s16 EnGo2_UpdateTalkStateGoronDmtBiggoron(PlayState* play, EnGo2* this) { s16 EnGo2_UpdateTalkStateGoronDmtBiggoron(PlayState* play, EnGo2* this) {
s32 unusedPad; s32 unusedPad;
u8 dialogState = this->dialogState; u8 dialogState = this->messageState;
switch (EnGo2_GetDialogState(this, play)) { switch (EnGo2_GetDialogState(this, play)) {
#if OOT_VERSION < PAL_1_0 #if OOT_VERSION < PAL_1_0
@ -1464,16 +1464,16 @@ void EnGo2_GoronLinkAnimation(EnGo2* this, PlayState* play) {
s32 animation = ARRAY_COUNT(sAnimationInfo); s32 animation = ARRAY_COUNT(sAnimationInfo);
if (PARAMS_GET_S(this->actor.params, 0, 5) == GORON_CITY_LINK) { if (PARAMS_GET_S(this->actor.params, 0, 5) == GORON_CITY_LINK) {
if ((this->actor.textId == 0x3035 && this->unk_20C == 0) || if ((this->actor.textId == 0x3035 && this->messageEntry == 0) ||
(this->actor.textId == 0x3036 && this->unk_20C == 0)) { (this->actor.textId == 0x3036 && this->messageEntry == 0)) {
if (this->skelAnime.animation != &gGoronShakingLoopAnim) { if (this->skelAnime.animation != &gGoronShakingLoopAnim) {
animation = ENGO2_ANIM_SHAKING_LOOP; animation = ENGO2_ANIM_SHAKING_LOOP;
this->eyeMouthTexState = 0; this->eyeMouthTexState = 0;
} }
} }
if ((this->actor.textId == 0x3032 && this->unk_20C == 12) || (this->actor.textId == 0x3033) || if ((this->actor.textId == 0x3032 && this->messageEntry == 12) || (this->actor.textId == 0x3033) ||
(this->actor.textId == 0x3035 && this->unk_20C == 6)) { (this->actor.textId == 0x3035 && this->messageEntry == 6)) {
if (this->skelAnime.animation != &gGoronSobbingLoopAnim) { if (this->skelAnime.animation != &gGoronSobbingLoopAnim) {
animation = ENGO2_ANIM_SOBBING_LOOP; animation = ENGO2_ANIM_SOBBING_LOOP;
this->eyeMouthTexState = 1; this->eyeMouthTexState = 1;
@ -1850,7 +1850,7 @@ void EnGo2_BiggoronEyedrops(EnGo2* this, PlayState* play) {
this->trackingMode = NPC_TRACKING_NONE; this->trackingMode = NPC_TRACKING_NONE;
this->animTimer = this->skelAnime.endFrame + 60.0f + 60.0f; // eyeDrops animation timer this->animTimer = this->skelAnime.endFrame + 60.0f + 60.0f; // eyeDrops animation timer
this->eyeMouthTexState = 2; this->eyeMouthTexState = 2;
this->unk_20C = 0; this->messageEntry = 0;
this->goronState++; this->goronState++;
Audio_SetMainBgmVolume(0x28, 5); Audio_SetMainBgmVolume(0x28, 5);
OnePointCutscene_Init(play, 4190, -99, &this->actor, CAM_ID_MAIN); OnePointCutscene_Init(play, 4190, -99, &this->actor, CAM_ID_MAIN);

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

@ -73,8 +73,8 @@ typedef struct EnGo2 {
/* 0x0194 */ NpcInteractInfo interactInfo; /* 0x0194 */ NpcInteractInfo interactInfo;
/* 0x01BC */ ColliderCylinder collider; /* 0x01BC */ ColliderCylinder collider;
/* 0x0208 */ Path* path; /* 0x0208 */ Path* path;
/* 0x020C */ u8 unk_20C; // counter for GORON_CITY_LINK animation /* 0x020C */ u8 messageEntry; // tracks message state changes, like with `BOX_BREAK` or `TEXTID`
/* 0x020D */ u8 dialogState; /* 0x020D */ u8 messageState; // last known result of `Message_GetState`
/* 0x020E */ u8 reverse; /* 0x020E */ u8 reverse;
/* 0x020F */ u8 isAwake; /* 0x020F */ u8 isAwake;
/* 0x0210 */ s8 waypoint; /* 0x0210 */ s8 waypoint;