--- a/draw_inputs.pde	Wed Jul 04 14:55:46 2018 +0300
+++ b/draw_inputs.pde	Wed Jul 04 17:30:46 2018 +0300
@@ -59,17 +59,19 @@
     //returns the multicolor color on point x1,y1
 
     int ad, looks, mmc, source1, source2;
+    ad = 1024 + x1 + y1 * X;
 
     if (g_multic == 2) {
-        looks = 1024 + x1 + y1 * X;
-        if (mode == 0) return g_map[looks];
-        if (mode == 1) return g_brush[looks];
+        if (mode == 0) return g_map[ad];
+        if (mode == 1) return g_brush[ad];
     }
-    x1 = chop2(x1);
-    ad = 1024 + x1 + y1 * X;
+
     source1 = 0;
     source2 = 0;
+
+    x1 = chop2(x1);
     looks = 65536 + int(x1 / 8) + int(y1 / 8) * MX;
+
     if (mode == 0) {
         source1 = g_map[ad];
         source2 = g_map[ad + 1];
@@ -79,6 +81,7 @@
         source2 = g_brush[ad + 1];
     }
     mmc = source1 + source2 * 2;
+
     //source1=0
     //source2=+1
     //00=zeroc =0

--- a/draw_smart.pde	Wed Jul 04 14:55:46 2018 +0300
+++ b/draw_smart.pde	Wed Jul 04 17:30:46 2018 +0300
@@ -22,31 +22,16 @@
         ymax = 7;
     }
 
-    for (yy = 0; yy < MY; yy++) {
-        for (xx = 0; xx < MX; xx++) {
-            a = getattra(xx * 8, yy * mulu, 0);
-            b = getattra(xx * 8, yy * mulu, 1);
-            if (a == b) {
-                for (y0 = 0; y0 <= ymax; y0++) {
-                    for (x0 = 0; x0 <= 7; x0++) {
-                        ad = 1024 + (xx * 8) + (yy * X * mulu) + x0 + y0 * X;
-                        g_map[ad] = byte(0);
-                    }
-                }
-            }
-            pat = 0;
+    for (yy = 0; yy < MY; yy++)
+    for (xx = 0; xx < MX; xx++)
+    {
+        a = getattra(xx * 8, yy * mulu, 0);
+        b = getattra(xx * 8, yy * mulu, 1);
+        if (a == b) {
             for (y0 = 0; y0 <= ymax; y0++) {
                 for (x0 = 0; x0 <= 7; x0++) {
                     ad = 1024 + (xx * 8) + (yy * X * mulu) + x0 + y0 * X;
-                    pat = pat + int(g_map[ad]);
-                }
-            }
-            if (pat == mat || pat == 0) {
-                for (y0 = 0; y0 <= ymax; y0++) {
-                    fad = 65536 + xx + (yy * mulu + y0) * MX;
-                    bad = fad + (MX * MY * 8);
-                    if (pat == 0) g_map[fad] = g_map[bad];
-                    if (pat == mat) g_map[bad] = g_map[fad];
+                    g_map[ad] = byte(0);
                 }
             }
         }
@@ -156,6 +141,7 @@
 void transchar(int xx, int yy) {
     int fad, bad, ad, pt, x0, y0;
     int aa, bb, pp, ya, yb;
+
     ya = 0;
     yb = 0;
     xx = int(xx / 8);
@@ -170,21 +156,24 @@
         yb = 0;
     } //msx
 
-    for (y0 = ya; y0 <= yb; y0++) {
+    for (y0 = ya; y0 <= yb; y0++)
+    {
         fad = 65536 + xx + (yy + y0) * MX;
         bad = fad + (MX * MY * 8);
+
         aa = int(g_map[fad]);
         bb = int(g_map[bad]);
+
         g_map[fad] = byte(bb);
         g_map[bad] = byte(aa);
     }
-    for (y0 = ya; y0 <= yb; y0++) {
-        for (x0 = 0; x0 <= 7; x0++) {
-            ad = 1024 + (xx * 8) + (yy * X) + x0 + y0 * X;
-            pp = int(g_map[ad]);
-            pp = 1 - pp;
-            g_map[ad] = byte(pp);
-        }
+
+    for (y0 = ya; y0 <= yb; y0++)
+    for (x0 = 0; x0 < 8; x0++)
+    {
+        ad = 1024 + x0 + xx * 8 + (y0 + yy) * X;
+        pp = 1 - int(g_map[ad]);
+        g_map[ad] = byte(pp);
     }
 }
 
@@ -194,41 +183,11 @@
     //changes the char foreg/backg into "favorable" relative to used color
     //needed in floodfill
 
-    int fad, bad, ad, pt, x0, y0;
-    int aa, bb, pp, ya, yb;
-    ya = 0;
-    yb = 0;
-
-    pt = int(g_map[1024 + xx + yy * X]);
-    if (pt == 0 && g_data[int('r')] == 0 && g_data[int('R')] == 0) {
-        //println("trans char "+xx+"."+yy);
-        xx = int(xx / 8);
-        if (g_attrimode == 1) {
-            yy = chop8(yy);
-            ya = 0;
-            yb = 7;
-        } //zx spec etc
-        if (g_attrimode == 0) {
-            ya = 0;
-            yb = 0;
-        } //msx style
-        for (y0 = ya; y0 <= yb; y0++) {
-            fad = 65536 + xx + (yy + y0) * MX;
-            bad = fad + (MX * MY * 8);
-            aa = int(g_map[fad]);
-            bb = int(g_map[bad]);
-            g_map[fad] = byte(bb);
-            g_map[bad] = byte(aa);
-        }
-        for (y0 = ya; y0 <= yb; y0++) {
-            for (x0 = 0; x0 <= 7; x0++) {
-                ad = 1024 + (xx * 8) + (yy * X) + x0 + y0 * X;
-                pp = int(g_map[ad]);
-                pp = 1 - pp;
-                g_map[ad] = byte(pp);
-            }
-        }
-    }
+    // currently seems to be same as transchar except this check,
+    // so we'll just call transchar() .. -- ccr
+    if (int(g_map[1024 + xx + yy * X]) == 0 &&
+        g_data[int('r')] == 0 && g_data[int('R')] == 0)
+        transchar(xx, yy);
 }