Updated code to use new Pokemon form enums