diff options
| author | briaguya <70942617+briaguya-ai@users.noreply.github.com> | 2022-10-20 09:47:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-20 09:47:07 -0400 |
| commit | a920aea8de3f0cd3b6280c087d4ee63ff448dc25 (patch) | |
| tree | 5c56ae3ab0112fa8ff7419eec02985c86eeb0519 /soh/src/code/z_parameter.c | |
| parent | 81b27d5b85337d70cad86c62cfc2aae3335b93dd (diff) | |
| parent | 36b42635d623918d1e1d4aa9f5a7e813f6bd623a (diff) | |
Merge pull request #1807 from HarbourMasters/develop-zhora
zhora -> dev
Diffstat (limited to 'soh/src/code/z_parameter.c')
| -rw-r--r-- | soh/src/code/z_parameter.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 8299c2f12..cd57e97b4 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -949,15 +949,7 @@ void func_80083108(GlobalContext* globalCtx) { gSaveContext.buttonStatus[0] = BTN_DISABLED; for (i = 1; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) { - 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[BUTTON_STATUS_INDEX(i)] == BTN_DISABLED) { - sp28 = 1; - } - - gSaveContext.buttonStatus[BUTTON_STATUS_INDEX(i)] = BTN_ENABLED; - } else if (func_8008F2F8(globalCtx) == 2) { + if (func_8008F2F8(globalCtx) == 2) { if ((gSaveContext.equips.buttonItems[i] != ITEM_HOOKSHOT) && (gSaveContext.equips.buttonItems[i] != ITEM_LONGSHOT)) { if (gSaveContext.buttonStatus[BUTTON_STATUS_INDEX(i)] == BTN_ENABLED) { @@ -1100,6 +1092,18 @@ void func_80083108(GlobalContext* globalCtx) { } } + for (i = 1; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) { + 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[BUTTON_STATUS_INDEX(i)] == BTN_DISABLED) { + sp28 = 1; + } + + gSaveContext.buttonStatus[BUTTON_STATUS_INDEX(i)] = BTN_ENABLED; + } + } + if (interfaceCtx->restrictions.bottles != 0) { for (i = 1; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) { if ((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) && @@ -1253,6 +1257,8 @@ void func_80083108(GlobalContext* globalCtx) { (gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_TIME) && !((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) && (gSaveContext.equips.buttonItems[i] <= ITEM_POE)) && + !((gSaveContext.equips.buttonItems[i] >= ITEM_SHIELD_DEKU) && // Never disable equipment + (gSaveContext.equips.buttonItems[i] <= ITEM_BOOTS_HOVER)) && // (tunics/boots) on C-buttons !((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) && (gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) { if ((globalCtx->sceneNum != SCENE_TAKARAYA) || |