I recently got Yellow for free off my friend, and i've just beaten Lt. Surge. My question is, are there any other Water Types here other than Squirtle/Magikarp? If not, when will the next ones be along?

P.S. My first post in RBY forums!