Skip to content

Toggle Strength Option #3302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 24, 2023
Merged

Toggle Strength Option #3302

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
03ea465
Toggle Strength
inspectredc Oct 18, 2023
c22d1e7
No longer grey out bracelet as adult when toggle option is on and str…
inspectredc Oct 18, 2023
9950c02
Strength name un-greyed out and apply zoom regardless of strength dis…
inspectredc Oct 18, 2023
1b2a31e
Add success sound for toggle and equipping delay
inspectredc Oct 18, 2023
38d70dd
update tooltip to mention glitch use
inspectredc Oct 18, 2023
2cbbaba
draw a button
inspectredc Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add success sound for toggle and equipping delay
  • Loading branch information
@inspectredc
inspectredc committed Oct 18, 2023
commit 1b2a31e34b38aa5babf45a2f678cd7b7d4e1db1f
40 changes: 23 additions & 17 deletions soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,18 +488,6 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
}
}

// Grey Out Strength Upgrade Name when Disabled
// Do not Grey Out Strength Upgrade Name when Enabled
if ((pauseCtx->cursorX[PAUSE_EQUIP] == 0) && (pauseCtx->cursorY[PAUSE_EQUIP] == 2) &&
CVarGetInteger("gToggleStrength", 0)) {
if (CVarGetInteger("gStrengthDisabled", 0)) {
pauseCtx->nameColorSet = 1;
} else {
pauseCtx->nameColorSet = 0;
}
}


if ((pauseCtx->cursorX[PAUSE_EQUIP] == 0) && (pauseCtx->cursorY[PAUSE_EQUIP] == 0)) {
if (LINK_AGE_IN_YEARS != YEARS_CHILD) {
if ((cursorItem >= ITEM_BULLET_BAG_30) && (cursorItem <= ITEM_BULLET_BAG_50)) {
Expand All @@ -514,16 +502,21 @@ void KaleidoScope_DrawEquipment(PlayState* play) {

KaleidoScope_SetCursorVtx(pauseCtx, cursorSlot * 4, pauseCtx->equipVtx);

u16 buttonsToCheck = BTN_A | BTN_CLEFT | BTN_CDOWN | BTN_CRIGHT;
if (CVarGetInteger("gDpadEquips", 0) && (!CVarGetInteger("gDpadPause", 0) || CHECK_BTN_ALL(input->cur.button, BTN_CUP))) {
buttonsToCheck |= BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT;
}

// Allow Toggling of Strength when Pressing A on Strength Upgrade Slot
if ((pauseCtx->cursorSpecialPos == 0) && (pauseCtx->state == 6) &&
(pauseCtx->unk_1E4 == 0) && CHECK_BTN_ALL(input->press.button, BTN_A) &&
(pauseCtx->cursorX[PAUSE_EQUIP] == 0) && (pauseCtx->cursorY[PAUSE_EQUIP] == 2) && CVarGetInteger("gToggleStrength", 0)) {
CVarSetInteger("gStrengthDisabled", !CVarGetInteger("gStrengthDisabled", 0));
// Equip success sound
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
// Wait 10 frames before accepting input again
pauseCtx->unk_1E4 = 7;
sEquipTimer = 10;
}

u16 buttonsToCheck = BTN_A | BTN_CLEFT | BTN_CDOWN | BTN_CRIGHT;
if (CVarGetInteger("gDpadEquips", 0) && (!CVarGetInteger("gDpadPause", 0) || CHECK_BTN_ALL(input->cur.button, BTN_CUP))) {
buttonsToCheck |= BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT;
}

if ((pauseCtx->cursorSpecialPos == 0) && (cursorItem != PAUSE_ITEM_NONE) && (pauseCtx->state == 6) &&
Expand Down Expand Up @@ -657,6 +650,19 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
}
}


// Grey Out Strength Upgrade Name when Disabled
// Do not Grey Out Strength Upgrade Name when Enabled
// This needs to be outside the previous block since otherwise the nameColorSet is cleared to 0 by other menu pages when toggling
if ((pauseCtx->pageIndex == PAUSE_EQUIP) && (pauseCtx->cursorX[PAUSE_EQUIP] == 0) &&
(pauseCtx->cursorY[PAUSE_EQUIP] == 2) && CVarGetInteger("gToggleStrength", 0)) {
if (CVarGetInteger("gStrengthDisabled", 0)) {
pauseCtx->nameColorSet = 1;
} else {
pauseCtx->nameColorSet = 0;
}
}

for (rowStart = 0, i = 0, point = 4; i < 4; i++, rowStart += 4, point += 16) {

for (k = 0, temp = rowStart + 1, bit = rowStart, j = point; k < 3; k++, bit++, j += 4, temp++) {
Expand Down