Even after the battle is over, Oda still gives Yamato development by having her fast and wait for Luffy to wake up before she can eat.
And Luffy acknowledges Yamato's kindness and Jinbe commends her too
Meanwhile Carrot exists in one tiny panel, where you can't even properly see her face, much less fan service lmfao
Yamato says to Momo:
"i'm sure you'll be the number one in the country someday". She uses future tense, like she's leaving him and will be no longer there to see him become the number one in Wano
Yamato and Nami have also already bonded