From b41f365aa1629b8517ec74d3b8af99d66c97c580 Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Thu, 16 Jul 2026 07:10:38 -0500 Subject: Make swamp archery bonus speedup apply with misc interactions (#1792) --- mm/2s2h/Enhancements/Minigames/Archery.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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*); -- cgit v1.2.3