But it could, it's where he is, makes no sense for it to occur in some other spot.
Yamato fits the lower quarters pretty well from a plot perspective, so she should probably fight an opponent there.
After that happens, she may join the rooftop or the fight may be moved either way, and she could have her brief confrontation with her father which is not mandatory anyway. But this does not imply any fight.