--- hatari/src/convert/high640x8.c	2019/04/01 07:13:53	1.1.1.5
+++ hatari/src/convert/high640x8.c	2019/04/09 08:53:32	1.1.1.9
@@ -1,8 +1,8 @@
 /*
   Hatari - high640x8.c
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 
   Screen Conversion, High Res to 640x8Bit
 */
@@ -33,17 +33,17 @@ static void ConvertHighRes_640x8Bit(void
 
 			if (update || ebx != *ebp)  /* Does differ? */
 			{
-				bScreenContentsChanged = TRUE;
+				bScreenContentsChanged = true;
 
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
 				/* Plot in 'right-order' on big endian systems */
-				HIGH_BUILD_PIXELS_0 ;               /* Generate pixels [4,5,6,7] */
+				HIGH_BUILD_PIXELS_0 ;               /* Generate pixels [12,13,14,15] */
 				PLOT_HIGH_640_8BIT(3) ;
-				HIGH_BUILD_PIXELS_1 ;               /* Generate pixels [0,1,2,3] */
+				HIGH_BUILD_PIXELS_1 ;               /* Generate pixels [8,9,10,11] */
 				PLOT_HIGH_640_8BIT(2) ;
-				HIGH_BUILD_PIXELS_2 ;               /* Generate pixels [12,13,14,15] */
+				HIGH_BUILD_PIXELS_2 ;               /* Generate pixels [4,5,6,7] */
 				PLOT_HIGH_640_8BIT(1) ;
-				HIGH_BUILD_PIXELS_3 ;               /* Generate pixels [8,9,10,11] */
+				HIGH_BUILD_PIXELS_3 ;               /* Generate pixels [0,1,2,3] */
 				PLOT_HIGH_640_8BIT(0) ;
 #else
 				/* Plot in 'wrong-order', as ebx is 68000 endian */
@@ -63,6 +63,6 @@ static void ConvertHighRes_640x8Bit(void
 			ebp += 1;                               /* Next ST copy pixels */
 		}
 
-		/*??  esi = esi -40*8 +PCScreenBytesPerLine/2;*/   /* Back to start of line + Offset to next line */
+		esi += PCScreenBytesPerLine/4 - 40*4;           /* advance to start of next line */
 	}
 }