Doesn't Wishiwashi stay in School form when in Battle until it's Hp is Below 25%? How you worded it it sounded like it'll stay in the Schooling form until you put it in the PC kinda how like Sky Shaymin and Hoopa Unbound revert into their Original forms when you put them in the PC.