From 5d01a7179711fbc255d5b64bec7b089171672e9a Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Mon, 15 Aug 2022 23:28:08 -0400
Subject: [PATCH] Fixes Anju to set player->getItemEntry.

---
 .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c      | 17 ++++++++++-------
 .../actors/ovl_En_Niw_Lady/z_en_niw_lady.h      |  1 +
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
index 8de4ff44b..01f170506 100644
--- a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
+++ b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
@@ -88,6 +88,7 @@ void EnNiwLady_Init(Actor* thisx, GlobalContext* globalCtx) {
     osSyncPrintf("\n\n");
     this->actionFunc = func_80AB9F24;
     thisx->uncullZoneForward = 600.0f;
+    this->getItemEntry = (GetItemEntry)GET_ITEM_NONE;
 }
 
 void EnNiwLady_Destroy(Actor* thisx, GlobalContext* globalCtx) {
@@ -308,9 +309,8 @@ void func_80ABA654(EnNiwLady* this, GlobalContext* globalCtx) {
                 this->getItemId = GI_BOTTLE;
                 func_8002F434(&this->actor, globalCtx, GI_BOTTLE, 100.0f, 50.0f);
             } else {
-                GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_ANJU_AS_CHILD, GI_BOTTLE);
-                this->getItemId = getItemEntry.getItemId;
-                GiveItemEntryFromActor(&this->actor, globalCtx, getItemEntry, 100.0f, 50.0f);
+                this->getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_ANJU_AS_CHILD, GI_BOTTLE);
+                GiveItemEntryFromActor(&this->actor, globalCtx, this->getItemEntry, 100.0f, 50.0f);
             }
 
             this->actionFunc = func_80ABAC00;
@@ -399,8 +399,8 @@ void func_80ABA9B8(EnNiwLady* this, GlobalContext* globalCtx) {
                     func_8002F434(&this->actor, globalCtx, GI_POCKET_EGG, 200.0f, 100.0f);
                 } else {
                     // TODO: get-item-rework Adult trade sequence
-                    GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_ANJU_AS_ADULT, GI_POCKET_EGG);
-                    GiveItemEntryFromActor(&this->actor, globalCtx, getItemEntry, 200.0f, 100.0f);
+                    this->getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_ANJU_AS_ADULT, GI_POCKET_EGG);
+                    GiveItemEntryFromActor(&this->actor, globalCtx, this->getItemEntry, 200.0f, 100.0f);
                 }
 
                 this->actionFunc = func_80ABAC00;
@@ -458,10 +458,13 @@ void func_80ABAC00(EnNiwLady* this, GlobalContext* globalCtx) {
 
             if (gSaveContext.n64ddFlag && getItemId == GI_POCKET_EGG) {
                 // TODO: get-item-rework Adult trade sequence
-                getItemId = Randomizer_GetItemFromKnownCheck(RC_KAK_ANJU_AS_ADULT, GI_POCKET_EGG).getItemId;
+                this->getItemEntry = Randomizer_GetItemFromKnownCheck(RC_KAK_ANJU_AS_ADULT, GI_POCKET_EGG);
+                GiveItemEntryFromActor(&this->actor, globalCtx, this->getItemEntry, 200.0f, 100.0f);
             }
         }
-        func_8002F434(&this->actor, globalCtx, getItemId, 200.0f, 100.0f);
+        if (this->getItemEntry.getItemId == GI_NONE) {
+            func_8002F434(&this->actor, globalCtx, getItemId, 200.0f, 100.0f);
+        }
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h
index 57ba86f2d..5fe9684f4 100644
--- a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h
+++ b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h
@@ -40,6 +40,7 @@ typedef struct EnNiwLady {
     /* 0x0284 */ s32 getItemId;
     /* 0x0288 */ struct_80034A14_arg1 unk_288;
     /* 0x02B0 */ ColliderCylinder collider;
+    /* 0x02FC */ GetItemEntry getItemEntry;
 } EnNiwLady; // size = 0x02FC
 
 #endif