Moves the enhancement to Modes

mm/2s2h/BenGui/BenMenuBar.cpp

@@ -534,9 +534,6 @@ void DrawEnhancementsMenu() {
                 { .tooltip = "Disables Black Bar Letterboxes during cutscenes and Z-targeting\nNote: there may be "
                              "minor visual glitches that were covered up by the black bars\nPlease disable this "
                              "setting before reporting a bug" });
-            UIWidgets::CVarCheckbox("Hyrule Warriors Young Link", "gEnhancements.Graphics.HWStyledLink",
-                { .tooltip = "When acquired, places the Keaton and Fierce Deity masks on Link "
-                             "similarly to how he wears them in Hyrule Warriors" });
 
             ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(255, 255, 0, 255));
             ImGui::SeparatorText("Unstable");
@@ -597,6 +594,9 @@ void DrawEnhancementsMenu() {
         if (UIWidgets::BeginMenu("Modes")) {
             UIWidgets::CVarCheckbox("Play As Kafei", "gModes.PlayAsKafei",
                                     { .tooltip = "Requires scene reload to take effect." });
+            UIWidgets::CVarCheckbox("Hyrule Warriors Young Link", "gModes.HWStyledLink",
+                { .tooltip = "When acquired, places the Keaton and Fierce Deity masks on Link "
+                "similarly to how he wears them in Hyrule Warriors" });
             if (UIWidgets::CVarCheckbox("Time Moves When You Move", "gModes.TimeMovesWhenYouMove")) {
                 RegisterTimeMovesWhenYouMove();
             }

mm/2s2h/Enhancements/Graphics/HWStyledLink.cpp

@@ -21,26 +21,25 @@ void ResourceMgr_UnpatchGfxByName(const char* path, const char* patchName);
 void UpdateHWStyledLink() {
     GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnPlayerPostLimbDraw>(
     PLAYER_LIMB_HEAD, [](Player* player, s32 limbIndex) {
-        if (CVarGetInteger("gEnhancements.Graphics.HWStyledLink", 0)){
-            if (player->currentMask == PLAYER_MASK_NONE &&
-            player->transformation == PLAYER_FORM_HUMAN &&
-            INV_CONTENT(ITEM_MASK_KEATON) == ITEM_MASK_KEATON) {
-                OPEN_DISPS(gPlayState->state.gfxCtx);
-                Matrix_Push();
-                Matrix_RotateYS(14563, MTXMODE_APPLY);
-                Matrix_RotateZS(-4854, MTXMODE_APPLY);
-                Matrix_Translate(300.0f, -250.0f, 77.7f, MTXMODE_APPLY);
-                Matrix_Scale(0.648f, 0.648f, 0.648f, MTXMODE_APPLY);
-                gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gPlayState->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-                gSPDisplayList(POLY_OPA_DISP++, (Gfx*)D_801C0B20[PLAYER_MASK_KEATON - 1]);
-                Matrix_Pop();
-                CLOSE_DISPS(gPlayState->state.gfxCtx);
-            }
+        if (CVarGetInteger("gModes.HWStyledLink", 0) &&
+        player->currentMask == PLAYER_MASK_NONE &&
+        player->transformation == PLAYER_FORM_HUMAN &&
+        INV_CONTENT(ITEM_MASK_KEATON) == ITEM_MASK_KEATON){
+            OPEN_DISPS(gPlayState->state.gfxCtx);
+            Matrix_Push();
+            Matrix_RotateYS(14563, MTXMODE_APPLY);
+            Matrix_RotateZS(-4854, MTXMODE_APPLY);
+            Matrix_Translate(300.0f, -250.0f, 77.7f, MTXMODE_APPLY);
+            Matrix_Scale(0.648f, 0.648f, 0.648f, MTXMODE_APPLY);
+            gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gPlayState->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPDisplayList(POLY_OPA_DISP++, (Gfx*)D_801C0B20[PLAYER_MASK_KEATON - 1]);
+            Matrix_Pop();
+            CLOSE_DISPS(gPlayState->state.gfxCtx);
         }
     });
     GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnPlayerPostLimbDraw>(
     PLAYER_LIMB_WAIST, [](Player* player, s32 limbIndex) {
-        if (CVarGetInteger("gEnhancements.Graphics.HWStyledLink", 0) && 
+        if (CVarGetInteger("gModes.HWStyledLink", 0) && 
             player->transformation == PLAYER_FORM_HUMAN &&
             player->itemAction != PLAYER_IA_MASK_FIERCE_DEITY &&
             INV_CONTENT(ITEM_MASK_FIERCE_DEITY) == ITEM_MASK_FIERCE_DEITY) {
@@ -55,7 +54,7 @@ void UpdateHWStyledLink() {
                 gSPDisplayList(POLY_OPA_DISP++, (Gfx*)D_801C0B20[PLAYER_MASK_FIERCE_DEITY - 1]);
                 Matrix_Pop();
                 CLOSE_DISPS(gPlayState->state.gfxCtx);
-            }
+        }
     });
 }