From aedae12e6324285608d6fc3bc4c23896156d1ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20Dub=C3=A9?=
 <159546+serprex@users.noreply.github.com>
Date: Fri, 17 Apr 2026 03:50:17 +0000
Subject: Hookify DropsDontDie, NoFishDespawn, NoBugsDespawn (#6513)

---
 soh/src/code/z_en_item00.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'soh/src/code')

diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c
index e8e29a19d..b2da1c40d 100644
--- a/soh/src/code/z_en_item00.c
+++ b/soh/src/code/z_en_item00.c
@@ -3,7 +3,6 @@
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h"
 #include "textures/icon_item_static/icon_item_static.h"
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/OTRGlobals.h"
 
@@ -781,11 +780,8 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
         }
     }
 
-    if (this->unk_15A > 0) {
+    if (GameInteractor_Should(VB_ITEM00_TIMER_TICK, this->unk_15A > 0, this)) {
         this->unk_15A--;
-        if (CVarGetInteger(CVAR_CHEAT("DropsDontDie"), 0) && (this->unk_154 <= 0)) {
-            this->unk_15A++;
-        }
     }
 
     if ((this->unk_15A > 0) && (this->unk_15A < 41) && (this->unk_154 <= 0)) {
-- 
cgit v1.2.3