From 983ab139d5a088c022ee4571c224e74d15237dff Mon Sep 17 00:00:00 2001 From: aMannus Date: Mon, 5 Sep 2022 00:35:56 +0200 Subject: [PATCH 1/2] Add another flag to skip mask shop --- soh/src/code/z_sram.c | 1 + 1 file changed, 1 insertion(+) diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c index 9a9407277..524fe353f 100644 --- a/soh/src/code/z_sram.c +++ b/soh/src/code/z_sram.c @@ -521,6 +521,7 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) { // complete mask quest if (Randomizer_GetSettingValue(RSK_COMPLETE_MASK_QUEST)) { + gSaveContext.infTable[7] |= 0x80; // Soldier Wears Keaton Mask gSaveContext.itemGetInf[3] |= 0x100; // Sold Keaton Mask gSaveContext.itemGetInf[3] |= 0x200; // Sold Skull Mask gSaveContext.itemGetInf[3] |= 0x400; // Sold Spooky Mask From 39852c927879484269070dc8a7929b73fd848d04 Mon Sep 17 00:00:00 2001 From: aMannus Date: Mon, 5 Sep 2022 11:46:50 +0200 Subject: [PATCH 2/2] Fix Sold Out bug --- soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c index 2fc3e3e15..8e776e407 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c @@ -381,7 +381,11 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) { --INV_CONTENT(ITEM_TRADE_CHILD); } else if ((pauseCtx->stickRelX < -30 || pauseCtx->stickRelX > 30 || pauseCtx->stickRelY < -30 || pauseCtx->stickRelY > 30) || dpad && CHECK_BTN_ANY(input->press.button, BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT)) { - INV_CONTENT(ITEM_TRADE_CHILD) ^= ITEM_MASK_KEATON ^ ITEM_MASK_TRUTH; + if (INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_LETTER_ZELDA) { + INV_CONTENT(ITEM_TRADE_CHILD) = ITEM_MASK_KEATON; + } else { + INV_CONTENT(ITEM_TRADE_CHILD) ^= ITEM_MASK_KEATON ^ ITEM_MASK_TRUTH; + } Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } for (uint16_t cSlotIndex = 0; cSlotIndex < ARRAY_COUNT(gSaveContext.equips.cButtonSlots); cSlotIndex++) {