The move Froakie use could've also been Close Combat. After all, that move gets in your face and smacks you around a lot, so it's possible. It would tie in further to a possible Water/Fighting-type, but let's not go there. But I think it was either Acrobatics or Close Combat. Either would work, really.