Sometimes they did for convenience of plot, sometimes not, also for convenience of plot.

I do know one thing, depending on how many badges you have, the gym leader's team will change. If you watched the Origins OVA, Brock clearly asked for amount of badges, and then chose one of the Pokeball sets he had.