Moved pokemon to objects, added stats and rival message