From 908ecbb795217ed5f6d287f81c8d6c5294072df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= Date: Tue, 17 Mar 2026 17:41:43 +0000 Subject: [PATCH] Classify chest CMC for bombchus as lesser, not junk (#6349) --- soh/src/overlays/actors/ovl_En_Box/z_en_box.c | 24 +++++++++---------- 1 file 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; } }