made pokemon switching part of pokemon class