From f03bc01f7387106b8e42ce8fe2a274e41218421d Mon Sep 17 00:00:00 2001
From: Demur Rumed <junkmute@hotmail.com>
Date: Thu, 17 Apr 2025 02:32:12 +0000
Subject: [PATCH] shipinit

---
 .../TimeSavers/FasterBeanSkulltula.cpp        | 14 ++++++-------
 .../TimeSavers/FasterBottleEmpty.cpp          | 21 +++++++++----------
 .../Enhancements/TimeSavers/TimeSavers.cpp    |  2 --
 soh/soh/Enhancements/TimeSavers/TimeSavers.h  |  2 --
 4 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/soh/soh/Enhancements/TimeSavers/FasterBeanSkulltula.cpp b/soh/soh/Enhancements/TimeSavers/FasterBeanSkulltula.cpp
index 1b6fd2a81..20011bba3 100644
--- a/soh/soh/Enhancements/TimeSavers/FasterBeanSkulltula.cpp
+++ b/soh/soh/Enhancements/TimeSavers/FasterBeanSkulltula.cpp
@@ -1,15 +1,13 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/OTRGlobals.h"
+#include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "z64save.h"
 }
 
-void FasterBeanSkulltula_Register() {
-    REGISTER_VB_SHOULD(VB_SPAWN_BEAN_SKULLTULA, {
-        if (CVarGetInteger(CVAR_ENHANCEMENT("FasterBeanSkull"), 0)) {
-            *should = true;
-        }
-    });
+void RegisterFasterBeanSkulltula() {
+    COND_VB_SHOULD(VB_SPAWN_BEAN_SKULLTULA, CVarGetInteger(CVAR_ENHANCEMENT("FasterBeanSkull"), 0),
+                   { *should = true; });
 }
+
+static RegisterShipInitFunc initFunc(RegisterFasterBeanSkulltula, { CVAR_ENHANCEMENT("FasterBeanSkull") });
diff --git a/soh/soh/Enhancements/TimeSavers/FasterBottleEmpty.cpp b/soh/soh/Enhancements/TimeSavers/FasterBottleEmpty.cpp
index d01281c36..47b6b7461 100644
--- a/soh/soh/Enhancements/TimeSavers/FasterBottleEmpty.cpp
+++ b/soh/soh/Enhancements/TimeSavers/FasterBottleEmpty.cpp
@@ -1,20 +1,19 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/OTRGlobals.h"
+#include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "z64save.h"
 }
 
-void FasterEmptyBottle_Register() {
-    REGISTER_VB_SHOULD(VB_EMPTYING_BOTTLE, {
-        if (CVarGetInteger(CVAR_ENHANCEMENT("FasterBottleEmpty"), 0)) {
-            Player* player = va_arg(args, Player*);
-            if (player->skelAnime.curFrame <= 60.0f) {
-                player->skelAnime.playSpeed = 3.0f;
-            } else {
-                player->skelAnime.playSpeed = 1.0f;
-            }
+void RegisterFasterEmptyBottle() {
+    COND_VB_SHOULD(VB_EMPTYING_BOTTLE, CVarGetInteger(CVAR_ENHANCEMENT("FasterBottleEmpty"), 0), {
+        Player* player = va_arg(args, Player*);
+        if (player->skelAnime.curFrame <= 60.0f) {
+            player->skelAnime.playSpeed = 3.0f;
+        } else {
+            player->skelAnime.playSpeed = 1.0f;
         }
     });
 }
+
+static RegisterShipInitFunc initFunc(RegisterFasterEmptyBottle, { CVAR_ENHANCEMENT("FasterBottleEmpty") });
diff --git a/soh/soh/Enhancements/TimeSavers/TimeSavers.cpp b/soh/soh/Enhancements/TimeSavers/TimeSavers.cpp
index 283f568f0..a881675d6 100644
--- a/soh/soh/Enhancements/TimeSavers/TimeSavers.cpp
+++ b/soh/soh/Enhancements/TimeSavers/TimeSavers.cpp
@@ -15,6 +15,4 @@ void TimeSavers_Register() {
     SkipChildRutoInteractions_Register();
     FasterHeavyBlockLift_Register();
     FasterRupeeAccumulator_Register();
-    FasterEmptyBottle_Register();
-    FasterBeanSkulltula_Register();
 }
diff --git a/soh/soh/Enhancements/TimeSavers/TimeSavers.h b/soh/soh/Enhancements/TimeSavers/TimeSavers.h
index 450078cf6..9448260d6 100644
--- a/soh/soh/Enhancements/TimeSavers/TimeSavers.h
+++ b/soh/soh/Enhancements/TimeSavers/TimeSavers.h
@@ -17,7 +17,5 @@ void MoveMidoInKokiriForest_Register();
 void SkipChildRutoInteractions_Register();
 void FasterHeavyBlockLift_Register();
 void FasterRupeeAccumulator_Register();
-void FasterEmptyBottle_Register();
-void FasterBeanSkulltula_Register();
 
 #endif // TIME_SAVERS_H