Skip ballad of windfish (#180)

* skip ballad of windfish * simplify * convert to should * convert to new menu?
garrettjoecox · Jan 29, 2025 · 4bc13b4 · 4bc13b4
1 parent 6ec5a9a
commit 4bc13b4
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 0 deletions.
diff --git a/mm/2s2h/BenGui/BenMenu.cpp b/mm/2s2h/BenGui/BenMenu.cpp
@@ -863,6 +863,10 @@ void BenMenu::AddEnhancements() {
     AddWidget(path, "Skip Gorman Horse Race", WIDGET_CVAR_CHECKBOX)
         .CVar("gEnhancements.Minigames.SkipHorseRace")
         .Options(CheckboxOptions().Tooltip("Instantly win the Gorman Horse Race"));
+    AddWidget(path, "Skip Ballad of Windfish", WIDGET_CVAR_CHECKBOX)
+        .CVar("gEnhancements.Minigames.SkipBalladOfWindfish")
+        .Options(CheckboxOptions().Tooltip(
+            "Play the complete Ballad after playing in one form if you have all three transformation masks."));
 
     path.column = 3;
     AddWidget(path, "Saving", WIDGET_SEPARATOR_TEXT);

diff --git a/mm/2s2h/Enhancements/Minigames/SkipBalladOfWindfish.cpp b/mm/2s2h/Enhancements/Minigames/SkipBalladOfWindfish.cpp
@@ -0,0 +1,28 @@
+#include <libultraship/bridge.h>
+#include "2s2h/GameInteractor/GameInteractor.h"
+#include "2s2h/Enhancements/Enhancements.h"
+#include "2s2h/ShipInit.hpp"
+
+extern "C" {
+#include "functions.h"
+}
+
+#define CVAR_NAME "gEnhancements.Minigames.SkipBalladOfWindfish"
+#define CVAR CVarGetInteger(CVAR_NAME, 0)
+
+void RegisterSkipBalladOfWindfish() {
+
+    COND_VB_SHOULD(VB_BALLAD_PLAYED_FORM, CVAR, {
+        if (INV_CONTENT(ITEM_MASK_DEKU) != ITEM_MASK_DEKU || INV_CONTENT(ITEM_MASK_GORON) != ITEM_MASK_GORON ||
+            INV_CONTENT(ITEM_MASK_ZORA) != ITEM_MASK_ZORA) {
+            return;
+        }
+
+        SET_WEEKEVENTREG(WEEKEVENTREG_56_10); // Played Ballad as Human
+        SET_WEEKEVENTREG(WEEKEVENTREG_56_20); // Played Ballad as Deku
+        SET_WEEKEVENTREG(WEEKEVENTREG_56_40); // Played Ballad as Zora
+        SET_WEEKEVENTREG(WEEKEVENTREG_56_80); // Played Ballad as Goron
+    });
+}
+
+static RegisterShipInitFunc initFunc(RegisterSkipBalladOfWindfish, { CVAR_NAME });
diff --git a/mm/2s2h/GameInteractor/GameInteractor.h b/mm/2s2h/GameInteractor/GameInteractor.h
@@ -204,6 +204,7 @@ typedef enum {
     VB_GORON_ROLL_INCREASE_SPIKE_LEVEL,
     VB_GORON_ROLL_DISABLE_SPIKE_MODE,
     VB_DEKU_LINK_SPIN_ON_LAST_HOP,
+    VB_BALLAD_PLAYED_FORM,
     VB_CONTINUE_BANKER_DIALOGUE,
     VB_FISH2_SPAWN_HEART_PIECE,
     VB_PLAY_DEFEAT_CAPTAIN_SEQUENCE,

diff --git a/mm/src/overlays/actors/ovl_En_Toto/z_en_toto.c b/mm/src/overlays/actors/ovl_En_Toto/z_en_toto.c
@@ -6,6 +6,7 @@
 
 #include "z_en_toto.h"
 #include "objects/object_zm/object_zm.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY)
 
@@ -523,6 +524,7 @@ s32 func_80BA46D8(EnToto* this, PlayState* play) {
 
 s32 func_80BA4740(EnToto* this, PlayState* play) {
     if (play->msgCtx.ocarinaMode == OCARINA_MODE_END) {
+        GameInteractor_Should(VB_BALLAD_PLAYED_FORM, true);
         if (GET_PLAYER_FORM == PLAYER_FORM_HUMAN) {
             SET_WEEKEVENTREG(WEEKEVENTREG_56_10);
         }