Improve implementation of Shaymin forme change