stef1208 wrote:
It's "him." If you chopped off the other object ("and his diving partner") the sentence still makes sense. That's how I usually decide.
That's what I do as well.