Can't fight Second Sentinel nor Shakra

I already gave their heart back, and found them in two places. And for Shakra i bought everything from her + all the maps. Their wishes are not showing up for some reason? I think i did everything like in my past save, in wich i fought them at this point. Unless i skipped something? No idea what i did wrong, please help i'll go insane if i don't fight them soon