Added support for pokemon swapping to the new system