Switch Bodies of water not coded separately

[miralovescats]

I've noticed since 1.6 that separate bodies of water that are on the same area of the map aren't coded separately anymore. So the forest pond gives the same fish as the forest river (including no smallmouth bass like it should have), and the pond and river on Ginger Island West give ocean fish instead of freshwater.