Updated effectiveness functions so that they accept the target pokemon