Updated for Gen 6
Merge pull request #494 from HumanDestroyer/patch-2

Updated for Gen 6