diff --git a/soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h b/soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h
index db2326948..080e6556b 100644
--- a/soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h
+++ b/soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h
@@ -1994,7 +1994,7 @@ typedef enum {
 
     // #### `result`
     // ```c
-    // true
+    // varies, never set should to true
     // ```
     // #### `args`
     // - `*Actor`
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
index 0cc25131d..3d46f41c5 100644
--- a/soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
+++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
@@ -166,10 +166,8 @@ void BgHidanFwbig_Lower(BgHidanFwbig* this, PlayState* play) {
 }
 
 void BgHidanFwbig_WaitForTimer(BgHidanFwbig* this, PlayState* play) {
-    if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, true, this, &this->timer)) {
-        if (this->timer != 0) {
-            this->timer--;
-        }
+    if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, this->timer != 0, this, &this->timer)) {
+        this->timer--;
     }
 
     if (this->timer == 0) {
diff --git a/soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
index 105b01dfb..20851b200 100644
--- a/soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
+++ b/soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
@@ -91,10 +91,9 @@ void BgMenkuriEye_Update(Actor* thisx, PlayState* play) {
 
     if (!Flags_GetSwitch(play, this->actor.params)) {
         if (this->framesUntilDisable != -1) {
-            if (this->framesUntilDisable != 0) {
-                if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, true, this, &this->framesUntilDisable)) {
-                    this->framesUntilDisable -= 1;
-                }
+            if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, this->framesUntilDisable != 0, this,
+                                      &this->framesUntilDisable)) {
+                this->framesUntilDisable -= 1;
             }
             if (this->framesUntilDisable == 0) {
                 this->framesUntilDisable = -1;
diff --git a/soh/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/soh/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
index ca8e040fc..40887b202 100644
--- a/soh/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
+++ b/soh/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
@@ -134,10 +134,8 @@ void func_808A90F4(BgRelayObjects* this, PlayState* play) {
 
 void func_808A91AC(BgRelayObjects* this, PlayState* play) {
     if (this->unk_169 != 5) {
-        if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, true, this, &this->timer)) {
-            if (this->timer != 0) {
-                this->timer--;
-            }
+        if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, this->timer != 0, this, &this->timer)) {
+            this->timer--;
         }
         func_8002F994(&this->dyna.actor, this->timer);
     }
@@ -171,10 +169,8 @@ void BgRelayObjects_DoNothing(BgRelayObjects* this, PlayState* play) {
 }
 
 void func_808A932C(BgRelayObjects* this, PlayState* play) {
-    if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, true, &this->timer)) {
-        if (this->timer != 0) {
-            this->timer--;
-        }
+    if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, this->timer != 0, &this->timer)) {
+        this->timer--;
     }
     if (this->timer == 0) {
         if (!Player_InCsMode(play)) {
diff --git a/soh/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c b/soh/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c
index 236ad7fec..6715d140c 100644
--- a/soh/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c
+++ b/soh/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c
@@ -127,10 +127,8 @@ void BgYdanHasi_MoveWater(BgYdanHasi* this, PlayState* play) {
 }
 
 void BgYdanHasi_DecWaterTimer(BgYdanHasi* this, PlayState* play) {
-    if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, true, this, &this->timer)) {
-        if (this->timer != 0) {
-            this->timer--;
-        }
+    if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, this->timer != 0, this, &this->timer)) {
+        this->timer--;
     }
 
     func_8002F994(&this->dyna.actor, this->timer);
@@ -149,10 +147,8 @@ void BgYdanHasi_SetupThreeBlocks(BgYdanHasi* this, PlayState* play) {
 }
 
 void BgYdanHasi_UpdateThreeBlocks(BgYdanHasi* this, PlayState* play) {
-    if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, true, this, &this->timer)) {
-        if (this->timer != 0) {
-            this->timer--;
-        }
+    if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, this->timer != 0, this, &this->timer)) {
+        this->timer--;
     }
 
     if (this->timer == 0) {
diff --git a/soh/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/soh/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
index 9d69aa248..ab81c8421 100644
--- a/soh/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
+++ b/soh/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
@@ -240,10 +240,8 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) {
     Collider_UpdateCylinder(&this->actor, &this->colliderFlame);
     CollisionCheck_SetAC(play, &play->colChkCtx, &this->colliderFlame.base);
 
-    if (this->litTimer > 0) {
-        if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, true, this, &this->litTimer)) {
-            this->litTimer--;
-        }
+    if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, this->litTimer > 0, this, &this->litTimer)) {
+        this->litTimer--;
         if ((this->litTimer == 0) && (torchType != 0)) {
             sLitTorchCount--;
         }