--- hatari/src/convert/vdi16.c	2019/04/09 08:47:31	1.1.1.6
+++ hatari/src/convert/vdi16.c	2019/04/09 08:55:58	1.1.1.9
@@ -1,8 +1,8 @@
 /*
   Hatari - vdi16.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, VDI resolution with 16 colors
 */
@@ -11,12 +11,10 @@ static void ConvertVDIRes_16Colour(void)
 {
 	Uint32 *edi, *ebp;
 	Uint32 *esi;
-	Uint32 eax, edx;
+	Uint32 eax, edx;	/* set & used by macros */
 	Uint32 ebx, ecx;
 	int y, x, update;
 
-	edx = eax = 0;
-
 	/* Get screen addresses, 'edi'-ST screen, 'ebp'-Previous ST screen,
 	 * 'esi'-PC screen */
 
@@ -44,13 +42,13 @@ static void ConvertVDIRes_16Colour(void)
 
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
 				/* Plot pixels */
-				LOW_BUILD_PIXELS_0 ;    /* Generate 'ecx' as pixels [4,5,6,7] */
+				LOW_BUILD_PIXELS_0 ;    /* Generate 'ecx' as pixels [12,13,14,15] */
 				PLOT_LOW_320_8BIT(3) ;
-				LOW_BUILD_PIXELS_1 ;    /* Generate 'ecx' as pixels [12,13,14,15] */
+				LOW_BUILD_PIXELS_1 ;    /* Generate 'ecx' as pixels [4,5,6,7] */
 				PLOT_LOW_320_8BIT(1) ;
-				LOW_BUILD_PIXELS_2 ;    /* Generate 'ecx' as pixels [0,1,2,3] */
+				LOW_BUILD_PIXELS_2 ;    /* Generate 'ecx' as pixels [8,9,10,11] */
 				PLOT_LOW_320_8BIT(2) ;
-				LOW_BUILD_PIXELS_3 ;    /* Generate 'ecx' as pixels [8,9,10,11] */
+				LOW_BUILD_PIXELS_3 ;    /* Generate 'ecx' as pixels [0,1,2,3] */
 				PLOT_LOW_320_8BIT(0) ;
 #else
 				/* Plot pixels */