Fixing total EVs having no limit

EVs should never go above a total of 510.
Merge pull request #1037 from Rhonim/patch-1

Fixing total EVs having no limit