From 9b8869a8734c9f6c6a0297f82629ad7eb98dbd6f Mon Sep 17 00:00:00 2001 From: aMannus Date: Thu, 29 Jun 2023 12:42:37 +0200 Subject: [PATCH] Fix Market Sneak with masks --- soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c index 9fffe1c7a2f..a119734265a 100644 --- a/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -334,7 +334,12 @@ void func_80A56B40(EnHeishi4* this, PlayState* play) { return; } if (this->type == HEISHI4_AT_MARKET_NIGHT) { - if (CVarGetInteger("gMarketSneak", 0)) { + Player* player = GET_PLAYER(play); + // Only allow sneaking when not wearing a mask as that triggers different dialogue. MM Bunny hood disables + // these interactions, so bunny hood is fine in that case. + if (CVarGetInteger("gMarketSneak", 0) && + (player->currentMask == PLAYER_MASK_NONE || + (player->currentMask == PLAYER_MASK_BUNNY && CVarGetInteger("gMMBunnyHood", 0)))) { this->actionFunc = EnHeishi4_MarketSneak; } else { this->actionFunc = func_80A56614;