From c095530c907dac300a70f013adebe670bd8e8ca0 Mon Sep 17 00:00:00 2001
From: JordanLongstaff <jrdnlngstff@gmail.com>
Date: Fri, 21 Mar 2025 05:32:42 -0400
Subject: [PATCH] Move Rupee Dash Mode hook to its own file

---
 soh/soh/Enhancements/ExtraModes/RupeeDash.cpp | 42 +++++++++++++++++++
 soh/soh/Enhancements/mods.cpp                 | 26 ------------
 2 files changed, 42 insertions(+), 26 deletions(-)
 create mode 100644 soh/soh/Enhancements/ExtraModes/RupeeDash.cpp

diff --git a/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp b/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp
new file mode 100644
index 000000000..102468527
--- /dev/null
+++ b/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp
@@ -0,0 +1,42 @@
+#include <libultraship/bridge.h>
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+#include "functions.h"
+#include "macros.h"
+#include "variables.h"
+
+extern "C" PlayState* gPlayState;
+
+static constexpr int32_t CVAR_RUPEE_DASH_DEFAULT = 0;
+#define CVAR_RUPEE_DASH_NAME CVAR_ENHANCEMENT("RupeeDash")
+#define CVAR_RUPEE_DASH_VALUE CVarGetInteger(CVAR_RUPEE_DASH_NAME, CVAR_RUPEE_DASH_DEFAULT)
+
+static constexpr int32_t CVAR_RUPEE_DASH_INTERVAL_DEFAULT = 5;
+#define CVAR_RUPEE_DASH_INTERVAL_NAME CVAR_ENHANCEMENT("RupeeDashInterval")
+#define CVAR_RUPEE_DASH_INTERVAL_TIME \
+    CVarGetInteger(CVAR_RUPEE_DASH_INTERVAL_NAME, CVAR_RUPEE_DASH_INTERVAL_DEFAULT) * 20
+
+void UpdateRupeeDash() {
+    // Initialize Timer
+    static uint16_t rupeeDashTimer = 0;
+
+    // Did time change by DashInterval?
+    if (rupeeDashTimer < CVAR_RUPEE_DASH_INTERVAL_TIME) {
+        rupeeDashTimer++;
+        return;
+    }
+
+    rupeeDashTimer = 0;
+    if (gSaveContext.rupees > 0) {
+        uint16_t walletSize = (CUR_UPG_VALUE(UPG_WALLET) + 1) * -1;
+        Rupees_ChangeBy(walletSize);
+    } else {
+        Health_ChangeBy(gPlayState, -16);
+    }
+}
+
+void RegisterRupeeDash() {
+    COND_HOOK(OnPlayerUpdate, CVAR_RUPEE_DASH_VALUE, UpdateRupeeDash);
+}
+
+static RegisterShipInitFunc initFunc(RegisterRupeeDash, { CVAR_RUPEE_DASH_NAME });
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 38de50575..d357ea277 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -132,31 +132,6 @@ void RegisterOcarinaTimeTravel() {
     });
 }
 
-void RegisterRupeeDash() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>([]() {
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("RupeeDash"), 0)) {
-            return;
-        }
-        
-        // Initialize Timer
-        static uint16_t rupeeDashTimer = 0;
-        uint16_t rdmTime = CVarGetInteger(CVAR_ENHANCEMENT("RupeeDashInterval"), 5) * 20;
-        
-        // Did time change by DashInterval?
-        if (rupeeDashTimer >= rdmTime) {
-            rupeeDashTimer = 0;
-            if (gSaveContext.rupees > 0) {
-                uint16_t walletSize = (CUR_UPG_VALUE(UPG_WALLET) + 1) * -1;
-                Rupees_ChangeBy(walletSize);
-            } else {
-                Health_ChangeBy(gPlayState, -16);
-            }
-        } else {
-            rupeeDashTimer++;
-        }
-    });
-}
-
 void RegisterShadowTag() {
     static bool shouldSpawn = false;
     static uint16_t delayTimer = 60;
@@ -1031,7 +1006,6 @@ void InitMods() {
     RegisterTTS();
     RegisterOcarinaTimeTravel();
     RegisterDaytimeGoldSkultullas();
-    RegisterRupeeDash();
     RegisterShadowTag();
     RegisterPermanentHeartLoss();
     RegisterDeleteFileOnDeath();