From 743febba8cd7f3eab6bdcf1cc5c61fc910509c15 Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Sat, 11 May 2024 03:28:40 +0100 Subject: [PATCH] fierce deity anywhere for dpad (#358) --- mm/src/code/z_parameter.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mm/src/code/z_parameter.c b/mm/src/code/z_parameter.c index 5fe645d16..0bfb1e465 100644 --- a/mm/src/code/z_parameter.c +++ b/mm/src/code/z_parameter.c @@ -2830,9 +2830,13 @@ void Interface_UpdateButtonsPart2(PlayState* play) { } } else if (DPAD_GET_CUR_FORM_BTN_ITEM(j) == ITEM_MASK_FIERCE_DEITY) { // Fierce Deity's Mask is equipped - if ((play->sceneId != SCENE_MITURIN_BS) && (play->sceneId != SCENE_HAKUGIN_BS) && - (play->sceneId != SCENE_SEA_BS) && (play->sceneId != SCENE_INISIE_BS) && - (play->sceneId != SCENE_LAST_BS)) { + u8 vanillaSceneConditionResult = + (play->sceneId != SCENE_MITURIN_BS) && + (play->sceneId != SCENE_HAKUGIN_BS) && + (play->sceneId != SCENE_SEA_BS) && + (play->sceneId != SCENE_INISIE_BS) && + (play->sceneId != SCENE_LAST_BS); + if (GameInteractor_Should(GI_VB_DISABLE_FD_MASK, vanillaSceneConditionResult, NULL)) { if (gSaveContext.shipSaveContext.dpad.status[j] != BTN_DISABLED) { gSaveContext.shipSaveContext.dpad.status[j] = BTN_DISABLED; restoreHudVisibility = true;