Fixed case where a Pokemon could get Baton Pass without having anything to pass. Also added check for recoil moves before adding Focus Sash and allowed Choice Band/Choice Specs to be considered if you have Trick or Switcheroo and 3 attacking moves of the same category.
Random Battle Choice Scarf fix
Circle Throw is treated like Dragon Tail
Merge pull request #261 from Jay2645/master

Minor adjustments to random set logic, minor cleanup of code from previous commit