This really has nothing to do with whether or not the Terra fight in FM+ is canon. "IF" after the battle with MX at Sunset Horizons, there is some relax time, such as a save zone, etc. before another battle, perhaps the final one, do you think they'll add a Sora battle? In FM+, Sora can visit...