Updated for tileset of 16x16 tiles