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; }