Gen 6 effects
Merge pull request #706 from WriggleNightbug/patch-1

Gen 6 effects