Prep for Collision Detection Stuff

Added category bitmasks, and enum typing for pickups.