mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-12-25 09:39:00 -05:00
Merge pull request #1153 from briaguya-ai/mask-select-check-for-open-shop
add check for mask shop being open to mask select
This commit is contained in:
commit
0017168aa4
@ -354,8 +354,16 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) {
|
||||
KaleidoScope_SetCursorVtx(pauseCtx, index, pauseCtx->itemVtx);
|
||||
|
||||
if ((pauseCtx->debugState == 0) && (pauseCtx->state == 6) && (pauseCtx->unk_1E4 == 0)) {
|
||||
if (CVar_GetS32("gMaskSelect", 0) && (gSaveContext.eventChkInf[8] & 0x8000) &&
|
||||
cursorSlot == SLOT_TRADE_CHILD && CHECK_BTN_ALL(input->press.button, BTN_A)) {
|
||||
// only allow mask select when:
|
||||
// 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);
|
||||
gSelectingMask = !gSelectingMask;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user