Changed up the Pokemon class and stuff
Won't work until pokemon are properly created (still partly default/testing version)