diff options
| author | Philip Dubé <serprex@users.noreply.github.com> | 2026-03-17 17:41:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-17 17:41:43 +0000 |
| commit | 908ecbb795217ed5f6d287f81c8d6c5294072df9 (patch) | |
| tree | d4ab1e42c5962af99f528e122c6d77d5638e0e8b | |
| parent | 716f6bc042aac7ecdf9b2992fa4bbb099e6214dc (diff) | |
Classify chest CMC for bombchus as lesser, not junk (#6349)
| -rw-r--r-- | soh/src/overlays/actors/ovl_En_Box/z_en_box.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c index 98e1ba601..7e0f762e9 100644 --- a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -582,20 +582,18 @@ void EnBox_UpdateTexture(EnBox* this, PlayState* play) { if (!isVanilla) { getItemCategory = chestItem.getItemCategory; // If they have bombchus, don't consider the bombchu item major - if (INV_CONTENT(ITEM_BOMBCHU) == ITEM_BOMBCHU && - ((chestItem.modIndex == MOD_RANDOMIZER && chestItem.getItemId == RG_PROGRESSIVE_BOMBCHU_BAG) || - (chestItem.modIndex == MOD_NONE && - (chestItem.getItemId == GI_BOMBCHUS_5 || chestItem.getItemId == GI_BOMBCHUS_10 || - chestItem.getItemId == GI_BOMBCHUS_20)))) { - getItemCategory = ITEM_CATEGORY_JUNK; + if ((INV_CONTENT(ITEM_BOMBCHU) == ITEM_BOMBCHU && + ((chestItem.modIndex == MOD_RANDOMIZER && chestItem.getItemId == RG_PROGRESSIVE_BOMBCHU_BAG) || + (chestItem.modIndex == MOD_NONE && + (chestItem.getItemId == GI_BOMBCHUS_5 || chestItem.getItemId == GI_BOMBCHUS_10 || + chestItem.getItemId == GI_BOMBCHUS_20)))) || // If it's a bottle and they already have one, consider the item lesser - } else if ((chestItem.modIndex == MOD_RANDOMIZER && chestItem.getItemId >= RG_BOTTLE_WITH_RED_POTION && - chestItem.getItemId <= RG_BOTTLE_WITH_POE) || - (chestItem.modIndex == MOD_NONE && - (chestItem.getItemId == GI_BOTTLE || chestItem.getItemId == GI_MILK_BOTTLE))) { - if (gSaveContext.inventory.items[SLOT_BOTTLE_1] != ITEM_NONE) { - getItemCategory = ITEM_CATEGORY_LESSER; - } + ((chestItem.modIndex == MOD_RANDOMIZER && chestItem.getItemId >= RG_BOTTLE_WITH_RED_POTION && + chestItem.getItemId <= RG_BOTTLE_WITH_POE) || + (chestItem.modIndex == MOD_NONE && + (chestItem.getItemId == GI_BOTTLE || chestItem.getItemId == GI_MILK_BOTTLE)) && + gSaveContext.inventory.items[SLOT_BOTTLE_1] != ITEM_NONE)) { + getItemCategory = ITEM_CATEGORY_LESSER; } } |