Updated to follow updates of map format, musicID and WATER tiles