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

Document EnGo .unk_20C as .gaveSword

Browse source
This commit is contained in:
feacur 2024-11-11 01:45:42 +01:00
parent 705ff1b2af
commit 8fb7fc2618
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -981,11 +981,11 @@ void EnGo_GetItem(EnGo* this, PlayState* play) {
this->actor.parent = NULL;
EnGo_SetupAction(this, func_80A40C78);
} else {
this->unk_20C = 0;
this->gaveSword = 0;
if (ENGO_GET_TYPE(this) == ENGO_TYPE_DMT_BIGGORON) {
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK) {
getItemId = GI_SWORD_BIGGORON;
this->unk_20C = 1;
this->gaveSword = 1;
}
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYE_DROPS) {
getItemId = GI_CLAIM_CHECK;
@ -1010,7 +1010,7 @@ void func_80A40C78(EnGo* this, PlayState* play) {
EnGo_SetupAction(this, EnGo_BiggoronActionFunc);
if (ENGO_GET_TYPE(this) != ENGO_TYPE_DMT_BIGGORON) {
this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
} else if (this->unk_20C) {
} else if (this->gaveSword) {
this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
gSaveContext.save.info.playerData.bgsFlag = true;
} else if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_PRESCRIPTION) {

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

@ -52,7 +52,7 @@ typedef struct EnGo {
/* 0x0194 */ ColliderCylinder collider;
/* 0x01E0 */ NpcInteractInfo interactInfo;
/* 0x0208 */ char unk_208[0x4];
/* 0x020C */ s16 unk_20C;
/* 0x020C */ s16 gaveSword;
/* 0x020E */ s16 knockbackCooldown;
/* 0x0210 */ s16 curledTimer;
/* 0x0212 */ s16 attentionCooldown;