Rinen is half correct. It was the Conformer and Heaven's Cloud.
okay, i have had a request for harder questions. i'll try.

next:
what is the HP of Diamond Weapon when you come to fight him on the coast near Midgar?