updated with type2 for all pokemon that have one

Functions for to use take into account the 2nd type