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

Document EnGo .unk_21E as .eyedropsTimer

Browse source
This commit is contained in:
feacur 2024-11-10 23:27:59 +01:00
parent 9de2038db8
commit 91d1382c88
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -890,7 +890,7 @@ void EnGo_BiggoronActionFunc(EnGo* this, PlayState* play) {
} else { } else {
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYE_DROPS) { if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYE_DROPS) {
EnGo_ChangeAnim(this, ENGO_ANIM_WALKING_LOOP); EnGo_ChangeAnim(this, ENGO_ANIM_WALKING_LOOP);
this->unk_21E = 100; this->eyedropsTimer = 100;
this->interactInfo.talkState = NPC_TALK_STATE_IDLE; this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
EnGo_SetupAction(this, EnGo_Eyedrops); EnGo_SetupAction(this, EnGo_Eyedrops);
play->msgCtx.msgMode = MSGMODE_PAUSED; play->msgCtx.msgMode = MSGMODE_PAUSED;
@ -1027,7 +1027,7 @@ void func_80A40C78(EnGo* this, PlayState* play) {
} }
void EnGo_Eyedrops(EnGo* this, PlayState* play) { void EnGo_Eyedrops(EnGo* this, PlayState* play) {
if (DECR(this->unk_21E) == 0) { if (DECR(this->eyedropsTimer) == 0) {
this->actor.textId = 0x305A; this->actor.textId = 0x305A;
Message_ContinueTextbox(play, this->actor.textId); Message_ContinueTextbox(play, this->actor.textId);
this->interactInfo.talkState = NPC_TALK_STATE_TALKING; this->interactInfo.talkState = NPC_TALK_STATE_TALKING;

2
src/overlays/actors/ovl_En_Go/z_en_go.h
View file

@ -61,7 +61,7 @@ typedef struct EnGo {
/* 0x0218 */ s16 waypoint; /* 0x0218 */ s16 waypoint;
/* 0x021A */ s16 bounceCounter; /* 0x021A */ s16 bounceCounter;
/* 0x021C */ s16 bounceTimer; /* 0x021C */ s16 bounceTimer;
/* 0x021E */ s16 unk_21E; /* 0x021E */ s16 eyedropsTimer;
/* 0x0220 */ s16 jointTable[GORON_LIMB_MAX]; /* 0x0220 */ s16 jointTable[GORON_LIMB_MAX];
/* 0x0244 */ s16 morphTable[GORON_LIMB_MAX]; /* 0x0244 */ s16 morphTable[GORON_LIMB_MAX];
/* 0x0268 */ EnGoEffect effects[EN_GO_EFFECT_COUNT]; /* 0x0268 */ EnGoEffect effects[EN_GO_EFFECT_COUNT];