--- a/tools/gfxconv.c	Sun Jun 24 03:37:00 2018 +0300
+++ b/tools/gfxconv.c	Sun Jun 24 05:35:23 2018 +0300
@@ -800,7 +800,7 @@
 
 void dmDumpCharASCII(FILE *outFile, const Uint8 *buf, const size_t offs, const int fmt, const BOOL multicolor)
 {
-    for (size_t yc = 0; yc < C64_CHR_HEIGHT; yc++)
+    for (size_t yc = 0; yc < C64_CHR_HEIGHT_UT; yc++)
     {
         fprintf(outFile, "%04" DM_PRIx_SIZE_T " : ", offs + yc);
         dmPrintByte(outFile, buf[yc], fmt, multicolor);
@@ -813,10 +813,10 @@
 {
     size_t bufOffs, xc, yc;
 
-    for (bufOffs = yc = 0; yc < C64_SPR_HEIGHT; yc++)
+    for (bufOffs = yc = 0; yc < C64_SPR_HEIGHT_UT; yc++)
     {
         fprintf(outFile, "%04" DM_PRIx_SIZE_T " ", offs + bufOffs);
-        for (xc = 0; xc < C64_SPR_WIDTH; xc++)
+        for (xc = 0; xc < C64_SPR_WIDTH_UT; xc++)
         {
             dmPrintByte(outFile, buf[bufOffs], fmt, multicolor);
             fprintf(outFile, " ");
@@ -1331,10 +1331,10 @@
 
     if (xoffs < 0 || yoffs < 0 ||
         xoffs + C64_CHR_WIDTH_PX > image->width ||
-        yoffs + C64_CHR_HEIGHT > image->height)
+        yoffs + C64_CHR_HEIGHT_PX > image->height)
         return FALSE;
 
-    for (yc = 0; yc < C64_CHR_HEIGHT; yc++)
+    for (yc = 0; yc < C64_CHR_HEIGHT_UT; yc++)
     {
         const Uint8 *sp = image->data + ((yc + yoffs) * image->pitch) + xoffs;
         buf[yc] = dmConvertByte(sp, multicolor);
@@ -1351,15 +1351,15 @@
 
     if (xoffs < 0 || yoffs < 0 ||
         xoffs + C64_SPR_WIDTH_PX > image->width ||
-        yoffs + C64_SPR_HEIGHT > image->height)
+        yoffs + C64_SPR_HEIGHT_PX > image->height)
         return FALSE;
 
-    for (yc = 0; yc < C64_SPR_HEIGHT; yc++)
+    for (yc = 0; yc < C64_SPR_HEIGHT_UT; yc++)
     {
-        for (xc = 0; xc < C64_SPR_WIDTH_PX / C64_SPR_WIDTH; xc++)
+        for (xc = 0; xc < C64_SPR_WIDTH_PX / C64_SPR_WIDTH_UT; xc++)
         {
             const Uint8 *sp = image->data + ((yc + yoffs) * image->pitch) + (xc * 8) + xoffs;
-            buf[(yc * C64_SPR_WIDTH) + xc] = dmConvertByte(sp, multicolor);
+            buf[(yc * C64_SPR_WIDTH_UT) + xc] = dmConvertByte(sp, multicolor);
         }
     }
 
@@ -1381,14 +1381,14 @@
         case FFMT_CHAR:
             outBufSize = C64_CHR_SIZE;
             outBlockW = image->width / C64_CHR_WIDTH_PX;
-            outBlockH = image->height / C64_CHR_HEIGHT;
+            outBlockH = image->height / C64_CHR_HEIGHT_PX;
             outType = "char";
             break;
 
         case FFMT_SPRITE:
             outBufSize = C64_SPR_SIZE;
             outBlockW = image->width / C64_SPR_WIDTH_PX;
-            outBlockH = image->height / C64_SPR_HEIGHT;
+            outBlockH = image->height / C64_SPR_HEIGHT_PX;
             outType = "sprite";
             break;
 
@@ -1431,7 +1431,7 @@
         {
             case FFMT_CHAR:
                 if (!dmConvertImage2Char(buf, image,
-                    bx * C64_CHR_WIDTH_PX, by * C64_CHR_HEIGHT,
+                    bx * C64_CHR_WIDTH_PX, by * C64_CHR_HEIGHT_PX,
                     multicolor))
                 {
                     ret = DMERR_DATA_ERROR;
@@ -1441,7 +1441,7 @@
 
             case FFMT_SPRITE:
                 if (!dmConvertImage2Sprite(buf, image,
-                    bx * C64_SPR_WIDTH_PX, by * C64_SPR_HEIGHT,
+                    bx * C64_SPR_WIDTH_PX, by * C64_SPR_HEIGHT_PX,
                     multicolor))
                 {
                     ret = DMERR_DATA_ERROR;
@@ -1480,16 +1480,16 @@
     {
         case FFMT_CHAR:
             outSize    = C64_CHR_SIZE;
-            outWidth   = C64_CHR_WIDTH;
+            outWidth   = C64_CHR_WIDTH_UT;
             outWidthPX = C64_CHR_WIDTH_PX;
-            outHeight  = C64_CHR_HEIGHT;
+            outHeight  = C64_CHR_HEIGHT_UT;
             break;
 
         case FFMT_SPRITE:
             outSize    = C64_SPR_SIZE;
-            outWidth   = C64_SPR_WIDTH;
+            outWidth   = C64_SPR_WIDTH_UT;
             outWidthPX = C64_SPR_WIDTH_PX;
-            outHeight  = C64_SPR_HEIGHT;
+            outHeight  = C64_SPR_HEIGHT_UT;
             break;
 
         default: