Updates for different Stick and Nut amounts

Caladius · Caladius · commit d28ca391534d · 2025-10-13T10:31:46.000-04:00
diff --git a/soh/soh/Enhancements/timesplits/TimeSplitsActions.cpp b/soh/soh/Enhancements/timesplits/TimeSplitsActions.cpp
@@ -429,12 +429,15 @@ void RegisterTimesplits() {
                 itemEntry.itemId = SPLIT_DOUBLE_DEFENSE;
             }
         } else {
-            if (itemEntry.itemId == ITEM_HEART_PIECE_2) {
-                itemEntry.itemId = ITEM_HEART_PIECE;
-            }
-            if (itemEntry.itemId >= ITEM_BOMBCHUS_20 && itemEntry.itemId <= ITEM_BOMBCHUS_5) {
+            if (itemEntry.itemId == ITEM_BOMBCHUS_20 || itemEntry.itemId == ITEM_BOMBCHUS_5) {
                 itemEntry.itemId = ITEM_BOMBCHU;
             }
+            if (itemEntry.itemId == ITEM_STICKS_5 || itemEntry.itemId == ITEM_STICKS_10) {
+                itemEntry.itemId == ITEM_STICK;
+            }
+            if (itemEntry.itemId == ITEM_NUTS_5 || itemEntry.itemId == ITEM_NUTS_10) {
+                itemEntry.itemId == ITEM_NUT;
+            }
         }
 
         UpdateSplitStatusById((uint32_t)itemEntry.itemId);

Original file line number	Diff line number	Diff line change
`@@ -429,12 +429,15 @@ void RegisterTimesplits() {`
`429`	`429`	`itemEntry.itemId = SPLIT_DOUBLE_DEFENSE;`
`430`	`430`	`}`
`431`	`431`	`} else {`
`432`		`- if (itemEntry.itemId == ITEM_HEART_PIECE_2) {`
`433`		`- itemEntry.itemId = ITEM_HEART_PIECE;`
`434`		`- }`
`435`		`- if (itemEntry.itemId >= ITEM_BOMBCHUS_20 && itemEntry.itemId <= ITEM_BOMBCHUS_5) {`
	`432`	`+ if (itemEntry.itemId == ITEM_BOMBCHUS_20 \|\| itemEntry.itemId == ITEM_BOMBCHUS_5) {`
`436`	`433`	`itemEntry.itemId = ITEM_BOMBCHU;`
`437`	`434`	`}`
	`435`	`+ if (itemEntry.itemId == ITEM_STICKS_5 \|\| itemEntry.itemId == ITEM_STICKS_10) {`
	`436`	`+ itemEntry.itemId == ITEM_STICK;`
	`437`	`+ }`
	`438`	`+ if (itemEntry.itemId == ITEM_NUTS_5 \|\| itemEntry.itemId == ITEM_NUTS_10) {`
	`439`	`+ itemEntry.itemId == ITEM_NUT;`
	`440`	`+ }`
`438`	`441`	`}`
`439`	`442`
`440`	`443`	`UpdateSplitStatusById((uint32_t)itemEntry.itemId);`