Slowly started changing pokedex object layout and function names