From 42c995700a0126788b77b73686aec78a916225c4 Mon Sep 17 00:00:00 2001
From: Patrick12115 <115201185+Patrick12115@users.noreply.github.com>
Date: Sun, 30 Nov 2025 16:38:39 -0500
Subject: [PATCH] Seems to fix the cvar registrations (#32)

---
 soh/soh/Enhancements/Holiday/AGreenSpoon.cpp | 2 +-
 soh/soh/Enhancements/Holiday/Archez.cpp      | 2 +-
 soh/soh/Enhancements/Holiday/Fredomato.cpp   | 5 ++++-
 soh/soh/Enhancements/Holiday/Grimey.cpp      | 5 ++++-
 soh/soh/Enhancements/Holiday/NotProxySaw.cpp | 2 +-
 soh/soh/Enhancements/Holiday/ProxySaw.cpp    | 3 ++-
 soh/soh/Enhancements/Holiday/aMannus.cpp     | 2 +-
 soh/soh/Enhancements/Holiday/lilDavid.cpp    | 2 +-
 8 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/soh/soh/Enhancements/Holiday/AGreenSpoon.cpp b/soh/soh/Enhancements/Holiday/AGreenSpoon.cpp
index f9ed8b54e8..29c9903ed0 100644
--- a/soh/soh/Enhancements/Holiday/AGreenSpoon.cpp
+++ b/soh/soh/Enhancements/Holiday/AGreenSpoon.cpp
@@ -69,5 +69,5 @@ static void RegisterMenu() {
         .Options(UIWidgets::CheckboxOptions().Tooltip("Don't you dare talk to them."));
 }
 
-static RegisterShipInitFunc initFunc(OnConfigurationChanged);
+static RegisterShipInitFunc initFunc(OnConfigurationChanged, { CVAR("EvilGossipStone") });
 static RegisterMenuInitFunc menuInitFunc(RegisterMenu);
diff --git a/soh/soh/Enhancements/Holiday/Archez.cpp b/soh/soh/Enhancements/Holiday/Archez.cpp
index 642c66ea55..aaee3baf04 100644
--- a/soh/soh/Enhancements/Holiday/Archez.cpp
+++ b/soh/soh/Enhancements/Holiday/Archez.cpp
@@ -117,5 +117,5 @@ static void RegisterMenu() {
             "Overrides most charactor skeletons with snow balls to make them look like Snow Golems"));
 }
 
-static RegisterShipInitFunc initFunc(OnConfigurationChanged);
+static RegisterShipInitFunc initFunc(OnConfigurationChanged, { CVAR("SnowGolems") });
 static RegisterMenuInitFunc menuInitFunc(RegisterMenu);
diff --git a/soh/soh/Enhancements/Holiday/Fredomato.cpp b/soh/soh/Enhancements/Holiday/Fredomato.cpp
index 702e529883..86957255fe 100644
--- a/soh/soh/Enhancements/Holiday/Fredomato.cpp
+++ b/soh/soh/Enhancements/Holiday/Fredomato.cpp
@@ -525,5 +525,8 @@ static void RegisterMenu() {
         .Options(UIWidgets::IntSliderOptions().DefaultValue(1000).Min(40).Max(2000));
 }
 
-static RegisterShipInitFunc initFunc(OnConfigurationChanged);
+static RegisterShipInitFunc initFunc(OnConfigurationChanged, {
+                                                                 CVAR("FredsQuest.Enabled"),
+                                                                 CVAR("RandomTraps.Enabled"),
+                                                             });
 static RegisterMenuInitFunc menuInitFunc(RegisterMenu);
diff --git a/soh/soh/Enhancements/Holiday/Grimey.cpp b/soh/soh/Enhancements/Holiday/Grimey.cpp
index 6940577b7e..1ebf9cac8a 100644
--- a/soh/soh/Enhancements/Holiday/Grimey.cpp
+++ b/soh/soh/Enhancements/Holiday/Grimey.cpp
@@ -221,5 +221,8 @@ static void RegisterMenu() {
         .Options(UIWidgets::CheckboxOptions().Tooltip("Ever persistent hailstorm throughout hyrule"));
 }
 
-static RegisterShipInitFunc initFunc(OnConfigurationChanged);
+static RegisterShipInitFunc initFunc(OnConfigurationChanged, {
+                                                                 CVAR("Penguins"),
+                                                                 CVAR("Hailstorm"),
+                                                             });
 static RegisterMenuInitFunc menuInitFunc(RegisterMenu);
diff --git a/soh/soh/Enhancements/Holiday/NotProxySaw.cpp b/soh/soh/Enhancements/Holiday/NotProxySaw.cpp
index 4645f0ea2f..7045793123 100644
--- a/soh/soh/Enhancements/Holiday/NotProxySaw.cpp
+++ b/soh/soh/Enhancements/Holiday/NotProxySaw.cpp
@@ -131,5 +131,5 @@ static void RegisterMenu() {
                                                       "attempt to convince Ganon to join you instead."));
 }
 
-static RegisterShipInitFunc initFunc(OnConfigurationChanged);
+static RegisterShipInitFunc initFunc(OnConfigurationChanged, { CVAR("GanonDatingSim") });
 static RegisterMenuInitFunc menuInitFunc(RegisterMenu);
diff --git a/soh/soh/Enhancements/Holiday/ProxySaw.cpp b/soh/soh/Enhancements/Holiday/ProxySaw.cpp
index 175898b8e0..099105d132 100644
--- a/soh/soh/Enhancements/Holiday/ProxySaw.cpp
+++ b/soh/soh/Enhancements/Holiday/ProxySaw.cpp
@@ -222,5 +222,6 @@ static void RegisterMenu() {
     SohGui::mSohMenu->AddWidget(path, "Super Bonk", WIDGET_CVAR_CHECKBOX).CVar(CVAR("SuperBonk"));
 }
 
-static RegisterShipInitFunc initFunc(OnConfigurationChanged);
+static RegisterShipInitFunc initFunc(OnConfigurationChanged, { CVAR("Snowballs"), CVAR("Icebergs"),
+                                                               CVAR("DownTheRabbitHole"), CVAR("SuperBonk") });
 static RegisterMenuInitFunc menuInitFunc(RegisterMenu);
diff --git a/soh/soh/Enhancements/Holiday/aMannus.cpp b/soh/soh/Enhancements/Holiday/aMannus.cpp
index 1b91bc9163..4db1ca80ff 100644
--- a/soh/soh/Enhancements/Holiday/aMannus.cpp
+++ b/soh/soh/Enhancements/Holiday/aMannus.cpp
@@ -68,5 +68,5 @@ static void RegisterMenu() {
             "Using Nayru's Love will now act as Roc's Feather instead! No magic required."));
 }
 
-static RegisterShipInitFunc initFunc(OnConfigurationChanged);
+static RegisterShipInitFunc initFunc(OnConfigurationChanged, { CVAR("RocsFeather") });
 static RegisterMenuInitFunc menuInitFunc(RegisterMenu);
diff --git a/soh/soh/Enhancements/Holiday/lilDavid.cpp b/soh/soh/Enhancements/Holiday/lilDavid.cpp
index ea32c72fcd..a47b473956 100644
--- a/soh/soh/Enhancements/Holiday/lilDavid.cpp
+++ b/soh/soh/Enhancements/Holiday/lilDavid.cpp
@@ -123,5 +123,5 @@ static void RegisterMenu() {
         .Options(UIWidgets::CheckboxOptions().Tooltip("Equip bombs over an already equipped Bow to shoot bomb arrows"));
 }
 
-static RegisterShipInitFunc initFunc(OnConfigurationChanged);
+static RegisterShipInitFunc initFunc(OnConfigurationChanged, { CVAR("BombArrows.Enabled") });
 static RegisterMenuInitFunc menuInitFunc(RegisterMenu);