Gen 6 fix
Merge pull request #1312 from VeteranPadgett/moveset

Gen 6 fix