Oops! Switch Dark to Fighting, then. xD
Couldn't you get Goldeen and Poliwag with an Old Rod in GSC?
I think some few early encounters in Kanto will have some new gen Pokémon as well after the National Dex is recieved most likely. Though, for Johto the early flying types will probabaly remain the same with Pidgey and Hoothoot.