Improve implementation of Shaymin forme change

It now uses the same style of change as Mega evolution, since both are permanent.  (Also forgot to account for dragIn)