Map XML is officially halfway done!

The XML data has been entered into resources/MainMap.xml up to hex
number 2111.
Resolving a merge....
Revert "Resolving a merge...."

This reverts commit 159856d2e06d0304d8a7c7ee8aee1e9b253f8cdf.