summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarrett Cox <garrettjcox@gmail.com>2026-07-16 07:10:38 -0500
committerGitHub <noreply@github.com>2026-07-16 08:10:38 -0400
commitb41f365aa1629b8517ec74d3b8af99d66c97c580 (patch)
treefd9252664286ec7e51e75c668884871a3c3232a0
parent3465b31439eeef8c86566b55d54bf7d8da64b9f0 (diff)
Make swamp archery bonus speedup apply with misc interactions (#1792)
-rw-r--r--mm/2s2h/Enhancements/Minigames/Archery.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/2s2h/Enhancements/Minigames/Archery.cpp b/mm/2s2h/Enhancements/Minigames/Archery.cpp
index d7822fc6b..5e8eda2b3 100644
--- a/mm/2s2h/Enhancements/Minigames/Archery.cpp
+++ b/mm/2s2h/Enhancements/Minigames/Archery.cpp
@@ -20,6 +20,8 @@ void EnSyatekiMan_Town_RunGame(EnSyatekiMan* enSyatekiMan, PlayState* play);
#define BOAT_HEALTH_CVAR CVarGetInteger(BOAT_HEALTH_CVAR_NAME, 10)
#define BOAT_NO_DAMAGE_CVAR_NAME "gEnhancements.Minigames.BoatArcheryInvincible"
#define BOAT_NO_DAMAGE_CVAR CVarGetInteger(BOAT_NO_DAMAGE_CVAR_NAME, 0)
+#define SKIP_MISC_CVAR_NAME "gEnhancements.Cutscenes.SkipMiscInteractions"
+#define SKIP_MISC_CVAR CVarGetInteger(SKIP_MISC_CVAR_NAME, 0)
static constexpr u16 TEXT_BOAT_ARCHERY_FAIL = 0x877;
@@ -40,7 +42,7 @@ static void RegisterSwampArchery() {
}
});
- COND_VB_SHOULD(VB_ARCHERY_ADD_BONUS_POINTS, SWAMP_CVAR != 2180, {
+ COND_VB_SHOULD(VB_ARCHERY_ADD_BONUS_POINTS, SKIP_MISC_CVAR, {
Actor* actor = va_arg(args, Actor*);
s32* sBonusTimer = va_arg(args, s32*);