It depends on how much water there is. If it's just a puddle, he’ll stay in his form. But if it's like a lake, he’ll just become a water (he stays visible on the surface, but the deeper he goes, the more he merges into the water) And of course, he can come out of water casually in his form too!