Yeah, Rapunzel and Flynn split up from SDG after the Nobody fight, then SDG talk to Gothel, and then when SDG meet up with Rapunzel again she's talking to the horse.
This implies that the Snugly Duckling scene, the escape into the cave where Rapunzel reveals her powers to Flynn, him telling her...