Fix Castform + Mega Mewtwo

Just mimicking the client repo's changes