summaryrefslogtreecommitdiff
path: root/soh/src/code
diff options
context:
space:
mode:
authorMalkierian <malkierian@gmail.com>2024-10-17 14:36:53 -0700
committerGitHub <noreply@github.com>2024-10-17 14:36:53 -0700
commitdba74f8805ebcc0bf0daeaf99424c3226f4a00c8 (patch)
tree5145c2b8acee163efbaacf55c209e9b78bcca472 /soh/src/code
parentb5c6545d6f97b7762aa3f0cc308c2b0e6ec9fd84 (diff)
Disable Lens Effect On Unequip (#4432)
* Add logic to turn off lens effect when replacing it on a button with another item, but not swapping. * Swap to real fix for dpad equips bug, c/o Rozelette.
Diffstat (limited to 'soh/src/code')
-rw-r--r--soh/src/code/z_parameter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 10b2953ec..ba1f89bbc 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -3692,7 +3692,7 @@ void Interface_UpdateMagicBar(PlayState* play) {
(msgCtx->msgMode == MSGMODE_NONE) && (play->gameOverCtx.state == GAMEOVER_INACTIVE) &&
(play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF) && !Play_InCsMode(play)) {
bool hasLens = false;
- for (int buttonIndex = 1; buttonIndex < (CVarGetInteger(CVAR_ENHANCEMENT("DpadEquips"), 0) != 0) ? ARRAY_COUNT(gSaveContext.equips.buttonItems) : 4;
+ for (int buttonIndex = 1; buttonIndex < ((CVarGetInteger(CVAR_ENHANCEMENT("DpadEquips"), 0) != 0) ? ARRAY_COUNT(gSaveContext.equips.buttonItems) : 4);
buttonIndex++) {
if (gSaveContext.equips.buttonItems[buttonIndex] == ITEM_LENS) {
hasLens = true;