diff options
| author | MelonSpeedruns <melonspeedruns@outlook.com> | 2022-05-18 11:21:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-18 11:21:22 -0400 |
| commit | 72bacabf4556ea6c3bc49fdd333d84e49e54b8b3 (patch) | |
| tree | 6e77841e86d73b7cb2df2ac6ba3a138d2cecf268 /soh/src/code/z_parameter.c | |
| parent | a3a65a1722e73e88ee7c2fe377b5ab3d39d684d6 (diff) | |
| parent | 076887e71f52d4258aa8fc77d3efeafe09d234d8 (diff) | |
Merge branch 'HarbourMasters:develop' into develop
Diffstat (limited to 'soh/src/code/z_parameter.c')
| -rw-r--r-- | soh/src/code/z_parameter.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index edc4348b9..8cfcccbf5 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -753,7 +753,15 @@ void func_80083108(GlobalContext* globalCtx) { gSaveContext.buttonStatus[0] = BTN_DISABLED; for (i = 1; i < 4; i++) { - if (func_8008F2F8(globalCtx) == 2) { + if ((gSaveContext.equips.buttonItems[i] >= ITEM_SHIELD_DEKU) && + (gSaveContext.equips.buttonItems[i] <= ITEM_BOOTS_HOVER)) { + // Equipment on c-buttons is always enabled + if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { + sp28 = 1; + } + + gSaveContext.buttonStatus[i] = BTN_ENABLED; + } else if (func_8008F2F8(globalCtx) == 2) { if ((gSaveContext.equips.buttonItems[i] != ITEM_HOOKSHOT) && (gSaveContext.equips.buttonItems[i] != ITEM_LONGSHOT)) { if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { |