mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-31 10:10:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows

Browse Source
This commit is contained in:
Sarge-117
2022-09-05 21:41:18 -07:00
parent da7dc55317 885d6dc6c2
commit db9f608177
8 changed files with 61 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/code/z_sram.c
+1 -1
View File
@@ -8,7 +8,6 @@
#define NUM_DUNGEONS 8
#define NUM_COWS 10
#define NUM_SCRUBS 35
/**
* Initialize new save.
@@ -521,6 +520,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
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
+5 -1
View File
@@ -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++) {