Skip to content

Commit

Permalink
[Feature Fix] Tunics stolen by like likes now removed from the item b…
Browse files Browse the repository at this point in the history
…uttons (HarbourMasters#3375)

* Extends `Assignable Boots and Tunics` functionality to check for and remove Goron and Zora tunics from item buttons when like likes steal them.

* Comment documentation.
  • Loading branch information
Malkierian authored Nov 14, 2023
1 parent fe9c0fa commit 304016d
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions soh/src/code/code_80097A00.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,17 @@ u8 Inventory_DeleteEquipment(PlayState* play, s16 equipment) {

if (equipment == EQUIP_TYPE_TUNIC) {
gSaveContext.equips.equipment |= EQUIP_VALUE_TUNIC_KOKIRI << (EQUIP_TYPE_TUNIC * 4);
// non-vanilla: remove goron and zora tunics from item buttons if assignable tunics is on
if (CVarGetInteger("gAssignableTunicsAndBoots", 0) && equipValue != EQUIP_VALUE_TUNIC_KOKIRI) {
ItemID item = (equipValue == EQUIP_VALUE_TUNIC_GORON ? ITEM_TUNIC_GORON : ITEM_TUNIC_ZORA);
for (int i = 1; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) {
if (gSaveContext.equips.buttonItems[i] == item) {
gSaveContext.equips.buttonItems[i] = ITEM_NONE;
gSaveContext.equips.cButtonSlots[i - 1] = SLOT_NONE;
}
}
}
// end non-vanilla
}

if (equipment == EQUIP_TYPE_SWORD) {
Expand Down

0 comments on commit 304016d

Please sign in to comment.