From d215c76ebaf28138d74ca614dad67de2a6c8d4b9 Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Fri, 23 Dec 2022 22:26:01 -0500 Subject: [PATCH] fix shopsanity spawning objects for actors (#2247) --- soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index faf5f92db..1ceb58e36 100644 --- a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -422,10 +422,10 @@ void EnGirlA_InitItem(EnGirlA* this, PlayState* play) { objectId = getItemEntry.objectId; } - // Weird edge case here, sold out object reports as loaded for Kokiri shop but doesn't render so we force it to load here - if (Object_IsLoaded(&play->objectCtx, objectId) && (params != SI_SOLD_OUT && play->sceneNum == SCENE_KOKIRI_SHOP)) { - this->objBankIndex = Object_GetIndex(&play->objectCtx, objectId); - } else { + this->objBankIndex = Object_GetIndex(&play->objectCtx, objectId); + + // If the object isn't normally spawned by the shop scene, then spawn it now + if (this->objBankIndex < 0) { this->objBankIndex = Object_Spawn(&play->objectCtx, objectId); } }