diff options
| author | Malkierian <malkierian@gmail.com> | 2025-11-14 12:29:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-14 12:29:38 -0700 |
| commit | 623a7e4f7b6973a0b6e8cf45aca8fb26717e299d (patch) | |
| tree | 1327ceb62a00ccf40dcd8fbbcc9a4f778ecc1eef /soh/src/code | |
| parent | 060878fb2e75c5c2dbbea325169671cf3f9f122f (diff) | |
| parent | 6ccdfc6051274fbe160f5bc08e1ab1b0359ada3b (diff) | |
Merge pull request #5961 from Malkierian/develop-copper
Copper -> Develop 11/14
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_inventory.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/soh/src/code/z_inventory.c b/soh/src/code/z_inventory.c index 8a51c6263..f2b329ed5 100644 --- a/soh/src/code/z_inventory.c +++ b/soh/src/code/z_inventory.c @@ -1,4 +1,5 @@ #include "global.h" +#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" #include "textures/icon_item_static/icon_item_static.h" #include "textures/icon_item_24_static/icon_item_24_static.h" #include "textures/parameter_static/parameter_static.h" @@ -204,20 +205,10 @@ 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(CVAR_ENHANCEMENT("AssignableTunicsAndBoots"), 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 } + GameInteractor_ExecuteOnEquipmentDelete(equipment, equipValue); + if (equipment == EQUIP_TYPE_SWORD) { gSaveContext.equips.buttonItems[0] = ITEM_NONE; gSaveContext.infTable[29] = 1; |