From f531d58848716c7e6d432b47cb9b05565a28e938 Mon Sep 17 00:00:00 2001
From: Phlex <3514085+PhlexPlexico@users.noreply.github.com>
Date: Mon, 30 Dec 2024 10:51:56 -0600
Subject: [PATCH] Add additional check to see if item is received in skulltula
 token placements.

---
 code/source/rnd/item_override.cpp | 3 ++-
 code/source/rnd/models.cpp        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/source/rnd/item_override.cpp b/code/source/rnd/item_override.cpp
index 72b7947..ee8b8d9 100644
--- a/code/source/rnd/item_override.cpp
+++ b/code/source/rnd/item_override.cpp
@@ -726,7 +726,8 @@ namespace rnd {
       }
     } else if (override.key.type == ItemOverride_Type::OVR_SKULL &&
                (gctx->scene == game::SceneId::SwampSpiderHouse || gctx->scene == game::SceneId::OceansideSpiderHouse) &&
-               ItemOverride_IsSkullCollected(fromActor, gctx->scene)) {
+               (ItemOverride_IsSkullCollected(fromActor, gctx->scene) &&
+                ItemOverride_IsItemObtainedOrEmptyBottle(override))) {
       override.value.getItemId = 0x02;
       override.value.looksLikeItemId = 0x02;
     }
diff --git a/code/source/rnd/models.cpp b/code/source/rnd/models.cpp
index b1c5164..9b89fbe 100644
--- a/code/source/rnd/models.cpp
+++ b/code/source/rnd/models.cpp
@@ -202,7 +202,8 @@ namespace rnd {
     ItemOverride override = ItemOverride_Lookup(actor, (u16)globalCtx->scene, baseItemId);
 
     if (override.key.all != 0) {
-      if (override.key.type == ItemOverride_Type::OVR_SKULL && ItemOverride_IsSkullCollected(actor, globalCtx->scene)) {
+      if (override.key.type == ItemOverride_Type::OVR_SKULL && ItemOverride_IsSkullCollected(actor, globalCtx->scene) &&
+          ItemOverride_IsItemObtainedOrEmptyBottle(override)) {
         override.value.getItemId = 0x02;
         override.value.looksLikeItemId = 0x02;
       }