Yes, and he originally was gonna make it obvious but he had to fight tooth and nail with Disney to even get the scene at the end where they look longingly into each other's face while talking about love (iirc) and then shoot a cannon together (which is meant to represent that they are indeed a "canon" couple).