Game-Decompilation/2ship2harkinian
1
0
Fork 0
mirror of https://github.com/HarbourMasters/2ship2harkinian.git synced 2024-11-23 05:59:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix more incorrect dpad handling for hud updates (#764)

Browse Source
This commit is contained in:
Archez 2024-09-08 18:54:11 -04:00 committed by GitHub
parent 6ff3be97de
commit bbfa903a99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mm/src/code/z_parameter.c
View File

@ -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;
}