mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-25 17:48:50 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1153 from briaguya-ai/mask-select-check-for-open-shop

Browse Source 
add check for mask shop being open to mask select
This commit is contained in:
briaguya 2022-08-11 02:30:44 -04:00 committed by GitHub
commit 0017168aa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
View File

@ -354,8 +354,16 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) {
KaleidoScope_SetCursorVtx(pauseCtx, index, pauseCtx->itemVtx); KaleidoScope_SetCursorVtx(pauseCtx, index, pauseCtx->itemVtx);
if ((pauseCtx->debugState == 0) && (pauseCtx->state == 6) && (pauseCtx->unk_1E4 == 0)) { if ((pauseCtx->debugState == 0) && (pauseCtx->state == 6) && (pauseCtx->unk_1E4 == 0)) {
if (CVar_GetS32("gMaskSelect", 0) && (gSaveContext.eventChkInf[8] & 0x8000) && // only allow mask select when:
cursorSlot == SLOT_TRADE_CHILD && CHECK_BTN_ALL(input->press.button, BTN_A)) { // the shop is open:
// * zelda's letter check: gSaveContext.eventChkInf[4] & 1
// * kak gate check: gSaveContext.infTable[7] & 0x40
// and the mask quest is complete: gSaveContext.eventChkInf[8] & 0x8000
if (CVar_GetS32("gMaskSelect", 0) &&
(gSaveContext.eventChkInf[8] & 0x8000) &&
cursorSlot == SLOT_TRADE_CHILD && CHECK_BTN_ALL(input->press.button, BTN_A) &&
(gSaveContext.eventChkInf[4] & 1) &&
(gSaveContext.infTable[7] & 0x40)) {
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
gSelectingMask = !gSelectingMask; gSelectingMask = !gSelectingMask;
} }