Water Warrior, on the other hand, you get KipKip the Oshawott, who thinks he is a Mudkip, so Kip can only learn moves that Mudkip can learn in 5th gen. Kip must solo 50 water type pokemon to realize that he is not a Mudkip, but is an Oshawott, and decides to embrace that Oshawott thing. His best buddy was a Mudkip when he was little, so he still wants to keep 1 move of less than 80 BP that Mudkip can learn, to honor his friend. He must solo Burgh OR Lenora at no higher than the level of Elesa's Zebstrika(level 27), or Burgh's Leavanny(Level 23) to evolve, using his friend's move to solo at least 1 pokemon from the gym leader.
When KipKip evolves, rename him KipOtt. Ott hates to solo things, because he did it way too much when he was an Oshawott, and was forced to lose his cuteness. So, every time Ott solo's a pokemon, he cannot be used against the next pokemon, unless at the end of a battle. Ott still need EXP so he can become his coolest form, Samurott. So, to evolve Ott must solo 2 pokemon, the first and the last, from each of the 5th-7th gyms. Also, Ott wants to learn a support move to help his teammates and not just himself before he evolves.
When KipOtt evolves, rename him SAMUkip, SAMU wants to be SUPER SAMU!! the superhero, and such must know 2 support moves and any move over 100 BP, to go with the move from his cherished friend. He must use these SUPER SAMU moves to solo 1 member of the E4, and land the final blow on the last pokemon of each N and Ghestis, finishing off the evil in the land, meaning his job as SUPER SAMU!! is done, and he can return home to his parents, his old friend the Mudkip/Swampert, and his friends, including you, who he made on this journey.