Merged with TMW, moved magic NPC's.
Used "make maps"