HarbourMasters · garrettjoecox · Mar 21, 2026
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -160,6 +160,18 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 ################################################################################
 add_compile_definitions(CONTROLLERBUTTONS_T=uint32_t)
 
+################################################################################
+# Unity Build
+# Speeds up compilation by merging source files into batched translation units.
+# Decomp C files (src/) are automatically excluded due to static symbol conflicts.
+# Files with per-file COMPILE_FLAGS (mixer.c, .mm files) are auto-excluded by CMake.
+################################################################################
+option(2S2H_UNITY_BUILD "Enable unity builds for faster compilation" ON)
+if (2S2H_UNITY_BUILD)
+    set(CMAKE_UNITY_BUILD_BATCH_SIZE 16 CACHE STRING "Number of source files per unity batch")
+    message(STATUS "Unity build enabled (batch size: ${CMAKE_UNITY_BUILD_BATCH_SIZE})")
+endif()
+
 ################################################################################
 # Sub-projects
 ################################################################################

diff --git a/mm/2s2h/BenGui/BenInputEditorWindow.cpp b/mm/2s2h/BenGui/BenInputEditorWindow.cpp
@@ -1556,7 +1556,7 @@ void BenInputEditorWindow::OffsetMappingPopup() {
     ImGui::SetNextWindowPos(pos);
 }
 
-static RegisterShipInitFunc initFunc(
+REGISTER_SHIP_INIT_FUNC(
     []() {
         COND_HOOK(OnGameStateMainStart, true, []() {
             Input* input = CONTROLLER1(gGameState);

diff --git a/mm/2s2h/BenGui/MenuTypes.h b/mm/2s2h/BenGui/MenuTypes.h
@@ -326,6 +326,14 @@ struct RegisterMenuInitFunc {
     }
 };
 
+// Macro to declare a self-registering menu init function with a unique variable name,
+// safe to use in unity builds where multiple TUs share the same scope.
+#ifndef SHIP_INIT_CONCAT_
+#define SHIP_INIT_CONCAT_(a, b) a##b
+#define SHIP_INIT_CONCAT(a, b) SHIP_INIT_CONCAT_(a, b)
+#endif
+#define REGISTER_MENU_INIT_FUNC(...) static RegisterMenuInitFunc SHIP_INIT_CONCAT(sMenuInit_, __COUNTER__)(__VA_ARGS__)
+
 struct RegisterMenuUpdateFunc {
     RegisterMenuUpdateFunc(std::function<void()> updateFunc, std::string sectionName, std::string sidebarName) {
         auto& menuUpdateFuncs = MenuInit::GetUpdateFuncs();

diff --git a/mm/2s2h/BenGui/ResolutionEditor.cpp b/mm/2s2h/BenGui/ResolutionEditor.cpp
@@ -566,6 +566,6 @@ bool IsDroppingFrames() {
 }
 
 static RegisterMenuUpdateFunc updateFunc(UpdateResolutionVars, "Settings", "Graphics");
-static RegisterMenuInitFunc initFunc(RegisterResolutionWidgets);
+REGISTER_MENU_INIT_FUNC(RegisterResolutionWidgets);
 
 } // namespace BenGui
diff --git a/mm/2s2h/CustomItem/CustomItem.h b/mm/2s2h/CustomItem/CustomItem.h
@@ -1,3 +1,4 @@
+#pragma once
 extern "C" {
 #include "z64actor.h"
 }

diff --git a/mm/2s2h/DeveloperTools/ObjectDependency.cpp b/mm/2s2h/DeveloperTools/ObjectDependency.cpp
@@ -13,4 +13,4 @@ void RegisterObjectDependency() {
     COND_VB_SHOULD(VB_ENABLE_OBJECT_DEPENDENCY, CVAR, { *should = false; });
 }
 
-static RegisterShipInitFunc initFunc(RegisterObjectDependency, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterObjectDependency, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Accessibility/NoFinalDayQuakes.cpp b/mm/2s2h/Enhancements/Accessibility/NoFinalDayQuakes.cpp
@@ -9,4 +9,4 @@ static void RegisterDisableFinalDayQuakes() {
     COND_VB_SHOULD(VB_EARTHQUAKE_ON_DAY_3, CVAR, { *should = false; });
 }
 
-static RegisterShipInitFunc initFunc(RegisterDisableFinalDayQuakes, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterDisableFinalDayQuakes, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Accessibility/NoScreenFlashForEnemyKill.cpp b/mm/2s2h/Enhancements/Accessibility/NoScreenFlashForEnemyKill.cpp
@@ -9,4 +9,4 @@ static void RegisterDisableScreenFlash() {
     COND_VB_SHOULD(VB_FLASH_SCREEN_FOR_ENEMY_KILL, CVAR, { *should = false; });
 }
 
-static RegisterShipInitFunc initFunc(RegisterDisableScreenFlash, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterDisableScreenFlash, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Audio/AudioHook.cpp b/mm/2s2h/Enhancements/Audio/AudioHook.cpp
@@ -42,4 +42,4 @@ void RegisterAudioNotificationHooks() {
     COND_HOOK(OnSeqPlayerInit, CVAR_SEQOVERLAY_VALUE, NotifySequenceName);
 }
 
-static RegisterShipInitFunc initFunc(RegisterAudioNotificationHooks, { CVAR_SEQOVERLAY_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterAudioNotificationHooks, { CVAR_SEQOVERLAY_NAME });
diff --git a/mm/2s2h/Enhancements/Audio/Sfx/DisableEnemyProximityMusic.cpp b/mm/2s2h/Enhancements/Audio/Sfx/DisableEnemyProximityMusic.cpp
@@ -9,4 +9,4 @@ void RegisterDisableEnemyProximityMusic() {
     COND_VB_SHOULD(VB_PLAY_ENEMY_PROXIMITY_MUSIC, CVAR, { *should = false; });
 }
 
-static RegisterShipInitFunc initFunc(RegisterDisableEnemyProximityMusic, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterDisableEnemyProximityMusic, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Audio/Sfx/DisableTatlCallAudio.cpp b/mm/2s2h/Enhancements/Audio/Sfx/DisableTatlCallAudio.cpp
@@ -9,4 +9,4 @@ void RegisterDisableTatlCallAudio() {
     COND_VB_SHOULD(VB_PLAY_TATL_CALL_AUDIO, CVAR, { *should = false; });
 }
 
-static RegisterShipInitFunc initFunc(RegisterDisableTatlCallAudio, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterDisableTatlCallAudio, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Audio/Sfx/LinksVoicePitchMultiplier.cpp b/mm/2s2h/Enhancements/Audio/Sfx/LinksVoicePitchMultiplier.cpp
@@ -31,4 +31,4 @@ void RegisterLinksVoicePitchMultiplier() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterLinksVoicePitchMultiplier, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterLinksVoicePitchMultiplier, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Audio/Sfx/MuteCarpenterSfx.cpp b/mm/2s2h/Enhancements/Audio/Sfx/MuteCarpenterSfx.cpp
@@ -25,4 +25,4 @@ void RegisterMuteCarpenterSfx() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterMuteCarpenterSfx, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterMuteCarpenterSfx, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Audio/Sfx/MuteCryingGoronChild.cpp b/mm/2s2h/Enhancements/Audio/Sfx/MuteCryingGoronChild.cpp
@@ -9,4 +9,4 @@ void RegisterMuteCryingGoronChild() {
     COND_VB_SHOULD(VB_PLAY_GORON_CHILD_CRY, CVAR, { *should = false; });
 }
 
-static RegisterShipInitFunc initFunc(RegisterMuteCryingGoronChild, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterMuteCryingGoronChild, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Audio/Sfx/MuteLowHpAlarm.cpp b/mm/2s2h/Enhancements/Audio/Sfx/MuteLowHpAlarm.cpp
@@ -9,4 +9,4 @@ void RegisterMuteLowHpAlarm() {
     COND_VB_SHOULD(VB_PLAY_LOW_HP_ALARM, CVAR, { *should = false; });
 }
 
-static RegisterShipInitFunc initFunc(RegisterMuteLowHpAlarm, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterMuteLowHpAlarm, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Camera/CameraInterpolationFixes.cpp b/mm/2s2h/Enhancements/Camera/CameraInterpolationFixes.cpp
@@ -106,4 +106,4 @@ void RegisterCameraInterpolationFixes() {
               [](Camera* camera) { FrameInterpolation_ShouldInterpolateFrame(Camera_ShouldInterpolateDist(camera)); });
 }
 
-static RegisterShipInitFunc initFunc(RegisterCameraInterpolationFixes, {});
+REGISTER_SHIP_INIT_FUNC(RegisterCameraInterpolationFixes, {});
diff --git a/mm/2s2h/Enhancements/Camera/DebugCam.cpp b/mm/2s2h/Enhancements/Camera/DebugCam.cpp
@@ -236,4 +236,4 @@ void RegisterDebugCam() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterDebugCam, { "gEnhancements.Camera.DebugCam.Enable" });
+REGISTER_SHIP_INIT_FUNC(RegisterDebugCam, { "gEnhancements.Camera.DebugCam.Enable" });
diff --git a/mm/2s2h/Enhancements/Camera/FreeLook.cpp b/mm/2s2h/Enhancements/Camera/FreeLook.cpp
@@ -199,4 +199,4 @@ void RegisterCameraFreeLook() {
               [](Camera* camera) { UpdateFreeLookState(camera); });
 }
 
-static RegisterShipInitFunc initFunc(RegisterCameraFreeLook, { "gEnhancements.Camera.FreeLook.Enable" });
+REGISTER_SHIP_INIT_FUNC(RegisterCameraFreeLook, { "gEnhancements.Camera.FreeLook.Enable" });
diff --git a/mm/2s2h/Enhancements/Cheats/ClimbAnywhere.cpp b/mm/2s2h/Enhancements/Cheats/ClimbAnywhere.cpp
@@ -9,4 +9,4 @@ void RegisterClimbAnywhere() {
     COND_VB_SHOULD(VB_BE_CLIMBABLE_SURFACE, CVAR, { *should = true; });
 }
 
-static RegisterShipInitFunc initFunc(RegisterClimbAnywhere, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterClimbAnywhere, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cheats/EasyFrameAdvance.cpp b/mm/2s2h/Enhancements/Cheats/EasyFrameAdvance.cpp
@@ -34,4 +34,4 @@ void RegisterEasyFrameAdvance() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterEasyFrameAdvance, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterEasyFrameAdvance, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cheats/ElegyAnywhere.cpp b/mm/2s2h/Enhancements/Cheats/ElegyAnywhere.cpp
@@ -9,4 +9,4 @@ void RegisterElegyAnywhere() {
     COND_VB_SHOULD(VB_ELEGY_CHECK_SCENE, CVAR, { *should = true; });
 }
 
-static RegisterShipInitFunc initFunc(RegisterElegyAnywhere, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterElegyAnywhere, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cheats/HookshotAnywhere.cpp b/mm/2s2h/Enhancements/Cheats/HookshotAnywhere.cpp
@@ -9,4 +9,4 @@ void RegisterHookshotAnywhere() {
     COND_VB_SHOULD(VB_BE_HOOKSHOT_SURFACE, CVAR, { *should = true; });
 }
 
-static RegisterShipInitFunc initFunc(RegisterHookshotAnywhere, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterHookshotAnywhere, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cheats/LongerFlowerGlide.cpp b/mm/2s2h/Enhancements/Cheats/LongerFlowerGlide.cpp
@@ -19,4 +19,4 @@ void RegisterLongerFlowerGlide() {
     }
 }
 
-static RegisterShipInitFunc initFunc(RegisterLongerFlowerGlide, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterLongerFlowerGlide, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cheats/MoonJump.cpp b/mm/2s2h/Enhancements/Cheats/MoonJump.cpp
@@ -19,4 +19,4 @@ void RegisterMoonJump() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterMoonJump, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterMoonJump, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cheats/TimeStop.cpp b/mm/2s2h/Enhancements/Cheats/TimeStop.cpp
@@ -66,4 +66,4 @@ void RegisterTimeStopInTemples() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterTimeStopInTemples, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterTimeStopInTemples, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cheats/UnbreakableRazorSword.cpp b/mm/2s2h/Enhancements/Cheats/UnbreakableRazorSword.cpp
@@ -10,4 +10,4 @@ void RegisterUnbreakableRazorSword() {
     COND_VB_SHOULD(VB_LOWER_RAZOR_SWORD_DURABILITY, CVAR || IS_RANDO, { *should = false; });
 }
 
-static RegisterShipInitFunc initFunc(RegisterUnbreakableRazorSword, { CVAR_NAME, "IS_RANDO" });
+REGISTER_SHIP_INIT_FUNC(RegisterUnbreakableRazorSword, { CVAR_NAME, "IS_RANDO" });
diff --git a/mm/2s2h/Enhancements/Cheats/UnrestrictedItems.cpp b/mm/2s2h/Enhancements/Cheats/UnrestrictedItems.cpp
@@ -9,4 +9,4 @@ void RegisterUnrestrictedItems() {
     COND_VB_SHOULD(VB_ITEM_BE_RESTRICTED, CVAR, { *should = false; });
 }
 
-static RegisterShipInitFunc initFunc(RegisterUnrestrictedItems, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterUnrestrictedItems, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/HideTitleCards.cpp b/mm/2s2h/Enhancements/Cutscenes/HideTitleCards.cpp
@@ -9,4 +9,4 @@ void RegisterHideTitleCards() {
     COND_VB_SHOULD(VB_SHOW_TITLE_CARD, CVAR, { *should = false; });
 }
 
-static RegisterShipInitFunc initFunc(RegisterHideTitleCards, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterHideTitleCards, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipAlienStartAndFail.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipAlienStartAndFail.cpp
@@ -30,4 +30,4 @@ void RegisterSkipAlienStartAndFail() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipAlienStartAndFail, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipAlienStartAndFail, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipAlienWarning.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipAlienWarning.cpp
@@ -20,4 +20,4 @@ void RegisterSkipAlienWarning() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipAlienWarning, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipAlienWarning, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipBankerDialogue.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipBankerDialogue.cpp
@@ -51,4 +51,4 @@ void RegisterSkipBankerDialogue() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipBankerDialogue, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipBankerDialogue, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipBossWarpPrompt.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipBossWarpPrompt.cpp
@@ -14,4 +14,4 @@ void RegisterSkipBossWarpPrompt() {
                  [](Actor* actor, bool* should) { SET_WEEKEVENTREG(WEEKEVENTREG_86_80); });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipBossWarpPrompt, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipBossWarpPrompt, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipBothersomeMonkey.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipBothersomeMonkey.cpp
@@ -35,4 +35,4 @@ void RegisterSkipBothersomeMonkey() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipBothersomeMonkey, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipBothersomeMonkey, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipDekuSalesman.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipDekuSalesman.cpp
@@ -45,4 +45,4 @@ void RegisterSkipDekuSalesman() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipDekuSalesman, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipDekuSalesman, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipDekuTelescope.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipDekuTelescope.cpp
@@ -114,4 +114,4 @@ void RegisterSkipDekuTelescope() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipDekuTelescope, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipDekuTelescope, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipEponaReveal.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipEponaReveal.cpp
@@ -33,4 +33,4 @@ void RegisterSkipEponaReveal() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipEponaReveal, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipEponaReveal, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipEvanSong.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipEvanSong.cpp
@@ -19,4 +19,4 @@ void RegisterSkipEvansSong() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipEvansSong, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipEvansSong, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipFallingMoonsTear.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipFallingMoonsTear.cpp
@@ -48,4 +48,4 @@ void RegisterSkipFallingMoonsTear() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipFallingMoonsTear, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipFallingMoonsTear, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipGateGuards.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipGateGuards.cpp
@@ -13,4 +13,4 @@ void RegisterSkipGateGuards() {
     COND_ID_HOOK(OnActorInit, ACTOR_EN_STOP_HEISHI, CVAR, [](Actor* actor) { SET_WEEKEVENTREG(WEEKEVENTREG_12_20); });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipGateGuards, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipGateGuards, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipGivingBombersNotebook.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipGivingBombersNotebook.cpp
@@ -94,4 +94,4 @@ void RegisterSkipGivingBombersNotebook() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipGivingBombersNotebook, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipGivingBombersNotebook, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipGreatFairyCutscene.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipGreatFairyCutscene.cpp
@@ -155,4 +155,4 @@ void RegisterSkipGreatFairyCutscene() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipGreatFairyCutscene, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipGreatFairyCutscene, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipHungryGoronDialogue.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipHungryGoronDialogue.cpp
@@ -13,4 +13,4 @@ static void RegisterSkipHungryGoronDialogue() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipHungryGoronDialogue, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipHungryGoronDialogue, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipKafeiReveal.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipKafeiReveal.cpp
@@ -49,4 +49,4 @@ void RegisterSkipKafeiReveal() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipKafeiReveal, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipKafeiReveal, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipKamaroTeachDance.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipKamaroTeachDance.cpp
@@ -26,4 +26,4 @@ void RegisterSkipKamaroTeachDance() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipKamaroTeachDance, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipKamaroTeachDance, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipKotakeFlying.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipKotakeFlying.cpp
@@ -29,4 +29,4 @@ void RegisterSkipKotakeFlying() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipKotakeFlying, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipKotakeFlying, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipMayorsOfficeCutscene.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipMayorsOfficeCutscene.cpp
@@ -49,4 +49,4 @@ static void RegisterSkipMayorsOfficeCutscene() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipMayorsOfficeCutscene, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipMayorsOfficeCutscene, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipOwlInteractions.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipOwlInteractions.cpp
@@ -48,4 +48,4 @@ void RegisterSkipOwlInteractions() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipOwlInteractions, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipOwlInteractions, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipPushingMikau.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipPushingMikau.cpp
@@ -23,4 +23,4 @@ void RegisterSkipPushingMikau() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipPushingMikau, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipPushingMikau, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipRosaSistersDance.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipRosaSistersDance.cpp
@@ -61,4 +61,4 @@ void RegisterSkipRosaSistersDance() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipRosaSistersDance, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipRosaSistersDance, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipScarecrowDance.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipScarecrowDance.cpp
@@ -19,4 +19,4 @@ void RegisterSkipScarecrowDance() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipScarecrowDance, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipScarecrowDance, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipTatlInterrupts.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipTatlInterrupts.cpp
@@ -109,4 +109,4 @@ void RegisterSkipTatlInterrupts() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipTatlInterrupts, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipTatlInterrupts, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipTingleTime.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipTingleTime.cpp
@@ -14,4 +14,4 @@ void RegisterSkipTingleTime() {
                  [](Actor* actor, bool* should) { SET_WEEKEVENTREG(WEEKEVENTREG_TALKED_TINGLE); });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipTingleTime, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipTingleTime, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipTurtleGoodbye.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipTurtleGoodbye.cpp
@@ -24,4 +24,4 @@ void RegisterSkipTurtleGoodbye() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipTurtleGoodbye, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipTurtleGoodbye, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/SkipEntranceCutscenes.cpp b/mm/2s2h/Enhancements/Cutscenes/SkipEntranceCutscenes.cpp
@@ -37,4 +37,4 @@ void RegisterSkipEntranceCutscenes() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipEntranceCutscenes, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipEntranceCutscenes, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/SkipIntroSequence.cpp b/mm/2s2h/Enhancements/Cutscenes/SkipIntroSequence.cpp
@@ -65,4 +65,4 @@ void RegisterSkipIntroSequence() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipIntroSequence, { INTRO_CVAR_NAME, FIRST_CYCLE_CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipIntroSequence, { INTRO_CVAR_NAME, FIRST_CYCLE_CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/SkipOnePointCutscenes.cpp b/mm/2s2h/Enhancements/Cutscenes/SkipOnePointCutscenes.cpp
@@ -110,4 +110,4 @@ void RegisterSkipOnePointCutscenes() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipOnePointCutscenes, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipOnePointCutscenes, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/SkipToFileSelect.cpp b/mm/2s2h/Enhancements/Cutscenes/SkipToFileSelect.cpp
@@ -48,4 +48,4 @@ void RegisterSkipToFileSelect() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipToFileSelect, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipToFileSelect, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/HealingMikauAudio.cpp b/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/HealingMikauAudio.cpp
@@ -52,4 +52,4 @@ void RegisterHealingMikauAudioFix() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterHealingMikauAudioFix, {});
+REGISTER_SHIP_INIT_FUNC(RegisterHealingMikauAudioFix, {});
diff --git a/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipBiggoronSnowheadLullaby.cpp b/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipBiggoronSnowheadLullaby.cpp
@@ -38,4 +38,4 @@ void RegisterSkipBiggoronSnowheadLullabyCutscene() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipBiggoronSnowheadLullabyCutscene, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipBiggoronSnowheadLullabyCutscene, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipBombBagTheftCutscene.cpp b/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipBombBagTheftCutscene.cpp
@@ -48,4 +48,4 @@ void RegisterSkipBombBagTheftCutscene() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipBombBagTheftCutscene, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipBombBagTheftCutscene, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipClockTowerOpen.cpp b/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipClockTowerOpen.cpp
@@ -39,4 +39,4 @@ void RegisterSkipClockTowerOpen() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipClockTowerOpen, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipClockTowerOpen, { CVAR_NAME });
diff --git a/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipClockTowerSkullKidEncounter.cpp b/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipClockTowerSkullKidEncounter.cpp
@@ -67,4 +67,4 @@ void RegisterSkipClockTowerSkullKidEncounter() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterSkipClockTowerSkullKidEncounter, { CVAR_NAME });
+REGISTER_SHIP_INIT_FUNC(RegisterSkipClockTowerSkullKidEncounter, { CVAR_NAME });
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,4 +31,4 @@ void RegisterLinksVoicePitchMultiplier() { @@
         });
     }
-    static RegisterShipInitFunc initFunc(RegisterLinksVoicePitchMultiplier, { CVAR_NAME });
+    REGISTER_SHIP_INIT_FUNC(RegisterLinksVoicePitchMultiplier, { CVAR_NAME });