No, not this one - the final encounter happens in daylight throughout. And now I'm really trying to remember what film/encounter you might be referring to. I watched License to Kill last night, but it wasn't that one.
It is a Roger Moore one. I remember this distinctly because when my dad first bought the DVDs he kept watching this part over and over since he thought it was hilarious.