We don't know if it's still set in stone since sora and matt did break up in the beginning of tri.