Fix pickup combining over the maximum stack size.

Fix #1114
Just make `CombineCount` a `short` and the compiler will do all the rest for you.