github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 04:50:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ability to assign equipment you don't own

Browse source
This commit is contained in:
rozlette 2022-06-23 22:12:41 -05:00 • committed by Kenix3
commit 8535568f53
1 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

55
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
View file

@ -535,32 +535,37 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) {
} else if (CVar_GetS32("gAssignableTunicsAndBoots", 0) != 0) { } else if (CVar_GetS32("gAssignableTunicsAndBoots", 0) != 0) {
// Only allow assigning tunic and boots to c-buttons // Only allow assigning tunic and boots to c-buttons
if (pauseCtx->cursorY[PAUSE_EQUIP] > 1) { if (pauseCtx->cursorY[PAUSE_EQUIP] > 1) {
u16 slot = 0; if (CHECK_OWNED_EQUIP(pauseCtx->cursorY[PAUSE_EQUIP], pauseCtx->cursorX[PAUSE_EQUIP] - 1)) {
switch (cursorItem) { u16 slot = 0;
case ITEM_TUNIC_KOKIRI: switch (cursorItem) {
slot = SLOT_TUNIC_KOKIRI; case ITEM_TUNIC_KOKIRI:
break; slot = SLOT_TUNIC_KOKIRI;
case ITEM_TUNIC_GORON: break;
slot = SLOT_TUNIC_GORON; case ITEM_TUNIC_GORON:
break; slot = SLOT_TUNIC_GORON;
case ITEM_TUNIC_ZORA: break;
slot = SLOT_TUNIC_ZORA; case ITEM_TUNIC_ZORA:
break; slot = SLOT_TUNIC_ZORA;
case ITEM_BOOTS_KOKIRI: break;
slot = SLOT_BOOTS_KOKIRI; case ITEM_BOOTS_KOKIRI:
break; slot = SLOT_BOOTS_KOKIRI;
case ITEM_BOOTS_IRON: break;
slot = SLOT_BOOTS_IRON; case ITEM_BOOTS_IRON:
break; slot = SLOT_BOOTS_IRON;
case ITEM_BOOTS_HOVER: break;
slot = SLOT_BOOTS_HOVER; case ITEM_BOOTS_HOVER:
break; slot = SLOT_BOOTS_HOVER;
default: break;
break; default:
break;
}
KaleidoScope_SetupItemEquip(globalCtx, cursorItem, slot,
pauseCtx->equipVtx[cursorSlot * 4].v.ob[0] * 10,
pauseCtx->equipVtx[cursorSlot * 4].v.ob[1] * 10);
} else {
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
} }
KaleidoScope_SetupItemEquip(globalCtx, cursorItem, slot,
pauseCtx->equipVtx[cursorSlot * 4].v.ob[0] * 10,
pauseCtx->equipVtx[cursorSlot * 4].v.ob[1] * 10);
} }
} }
} else { } else {