Refactored to PokemonRainbow part 2

Refactored to PokemonRainbow part 2