Auto re-arrangement of invalid pokemon order, update to 1.7