But Nadal was better in Grand Slam clashes (9-6), especially on his favourite clay court (6-1).
The world No.53, who is also in the doubles semifinals along with Nicole Melichar, had lost just 23 games in her six matches prior to the final showdown.
"What I learned at Bayern and what I can stress is the need to train hard. It's something I've always done. But, now, if I have to work three or four times harder than normal, I'll do it. I've been working on my physical fitness and I'm feeling really good. The intensity of the training is something that Bayern take very seriously and you can see that the players benefit from that."
The 28-year-old, who endured a difficult 18 months at Barcelona before being farmed out to the Bundesliga club in July 2019, has rediscovered his confidence since returning to the Camp Nou last month, shining in a central attacking midfield role behind Lionel Messi.
They have met in eight Grand Slam finals, with each winning four times. This will only be the pair's second clash in the final of Roland Garros since 2014. They last battled for a major title was at the 2019 Australian Open, where Djokovic won in straight sets.
Images of the 36-year-old visiting the Brazilian Serie A club's Rei Pele training complex circulated on social media on Saturday amid reports that negotiations were at an advanced stage.
Starting from pole position in a race he needed to win to eat into Hamilton's championship lead, Bottas held off the Briton in the opening stages but lost the lead after locking a wheel on lap 13, before pulling off six laps later for his first retirement of the season.
A whopping 7 goals ended in the goal of the champions of the three previous seasons who are having a very bad start into the new one, losing their third in a row and sitting humiliated on the bottom of the rankings in 12th place.
Despite going into Tuesday's match as firm favorites, Brazil cannot afford to take their opponents lightly, Firmino warned.
Xi'an, home to the Terra-Cotta Warriors and Horses, attracted 30,000 runners from 30 countries and regions to participate in its third marathon edition in 2019.
"I gained some weight after quitting swimming. Then I turned to basketball just for fun, but I found my passion for it," she recalled.