From 6b4f300eda39ca72a3e00e8c4287ceb0b38e8f8b Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Mon, 15 Aug 2022 02:17:06 -0400
Subject: [PATCH] Makes sure we aren't using getItemEntry when not randoed.

---
 soh/src/code/z_en_item00.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c
index 89bf5b3eb..5245e45c0 100644
--- a/soh/src/code/z_en_item00.c
+++ b/soh/src/code/z_en_item00.c
@@ -511,7 +511,8 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
 
     if ((gSaveContext.n64ddFlag || getItemId != GI_NONE) && !Actor_HasParent(&this->actor, globalCtx)) {
         getItem = Randomizer_GetRandomizedItem(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
-        func_8002F554(&this->actor, globalCtx, getItem.getItemId);
+        getItemId = getItem.getItemId;
+        func_8002F554(&this->actor, globalCtx, getItemId);
         GET_PLAYER(globalCtx)->getItemEntry = getItem;
     }
 
@@ -886,8 +887,9 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
         if (gSaveContext.n64ddFlag) {
             getItem = Randomizer_GetRandomizedItem(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
             GET_PLAYER(globalCtx)->getItemEntry = getItem;
+            getItemId = getItem.getItemId;
         }
-        func_8002F554(&this->actor, globalCtx, getItem.getItemId);
+        func_8002F554(&this->actor, globalCtx, getItemId);
     }
 
     switch (*params) {