Work on incorporating enum changes into base_pokemon_modernimpl