You do need to do the fights again, but fortunately it's just six this time - districts have been removed in favour of locations and each girl only needs to be defeated once to conquer the area :)
