diff options
| author | Archez <Archez@users.noreply.github.com> | 2024-09-08 18:54:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-08 18:54:11 -0400 |
| commit | bbfa903a99260ecfb0100da536b815842df2b1f4 (patch) | |
| tree | 1b6ce3f5fac7192eb1603ac05168278f99e61d18 /mm/src/code | |
| parent | 6ff3be97de804ea2fd190f91650fb4acbeb2a74e (diff) | |
fix more incorrect dpad handling for hud updates (#764)
Diffstat (limited to 'mm/src/code')
| -rw-r--r-- | mm/src/code/z_parameter.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/mm/src/code/z_parameter.c b/mm/src/code/z_parameter.c index de76c5641..464d0e2ed 100644 --- a/mm/src/code/z_parameter.c +++ b/mm/src/code/z_parameter.c @@ -2376,6 +2376,14 @@ void Interface_UpdateButtonsPart2(PlayState* play) { } } + // #region 2S2H [Dpad] + for (s16 j = EQUIP_SLOT_D_RIGHT; j <= EQUIP_SLOT_D_UP; j++) { + if (gSaveContext.shipSaveContext.dpad.status[j] == BTN_ENABLED) { + gSaveContext.shipSaveContext.dpad.status[j] = BTN_DISABLED; + } + } + // #endregion + Interface_SetHudVisibility(HUD_VISIBILITY_B); } else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_82_08)) { // Swordsman's log minigame @@ -2385,6 +2393,14 @@ void Interface_UpdateButtonsPart2(PlayState* play) { } } + // #region 2S2H [Dpad] + for (s16 j = EQUIP_SLOT_D_RIGHT; j <= EQUIP_SLOT_D_UP; j++) { + if (gSaveContext.shipSaveContext.dpad.status[j] == BTN_ENABLED) { + gSaveContext.shipSaveContext.dpad.status[j] = BTN_DISABLED; + } + } + // #endregion + Interface_SetHudVisibility(HUD_VISIBILITY_A_B_HEARTS_MAGIC_MINIMAP); } else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_84_20)) { // Related to moon child @@ -2460,7 +2476,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) { gSaveContext.buttonStatus[i] = BTN_DISABLED; } // #region 2S2H [Dpad] - for (s16 j = EQUIP_SLOT_C_LEFT; j <= EQUIP_SLOT_C_RIGHT; j++) { + for (s16 j = EQUIP_SLOT_D_RIGHT; j <= EQUIP_SLOT_D_UP; j++) { if (gSaveContext.shipSaveContext.dpad.status[j] == BTN_ENABLED) { restoreHudVisibility = true; } |