If the battle ended and the friendly Garuda gave you a Diamond, then you've satisfied his need.
Try giving the Diamond to Yan. If he still won't accept it, then there's got to be someone else you've missed