Adding more team_pokemon substitute functions