diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c
index 542ab13e0..d7a122cb4 100644
--- a/src/video/vid_svga.c
+++ b/src/video/vid_svga.c
@@ -460,7 +460,7 @@ svga_recalctimings(svga_t *svga)
 
     svga->hdisp_time = svga->hdisp;
     svga->render = svga_render_blank;
-    if (!svga->scrblank && svga->attr_palette_enable) {
+    if (!svga->scrblank && (svga->crtc[0x17] & 0x80) && svga->attr_palette_enable) {
 	if (!(svga->gdcreg[6] & 1) && !(svga->attrregs[0x10] & 1)) { /*Text mode*/
 		if (svga->seqregs[1] & 8) /*40 column*/ {
 			svga->render = svga_render_text_40;
@@ -658,6 +658,7 @@ svga_poll(void *p)
     uint32_t x, blink_delay;
     int wx, wy;
     int ret, old_ma;
+    int old_vc;
 
     if (!vga_on && ibm8514_enabled && ibm8514_on) {
         ibm8514_poll(&svga->dev8514, svga);
@@ -786,6 +787,7 @@ svga_poll(void *p)
 	        return;
 
 	svga->vc++;
+	old_vc = svga->vc;
 	svga->vc &= 2047;
 
 	if (svga->vc == svga->split) {
diff --git a/src/video/vid_svga_render.c b/src/video/vid_svga_render.c
index ca9c3b3f1..c4b817fd4 100644
--- a/src/video/vid_svga_render.c
+++ b/src/video/vid_svga_render.c
@@ -136,16 +136,13 @@ svga_render_text_40(svga_t *svga)
 
 		drawcursor = ((svga->ma == svga->ca) && svga->con && svga->cursoron);
 
-		if (svga->crtc[0x17] & 0x80) {
-			if (svga->force_old_addr) {
-				chr  = svga->vram[(svga->ma << 1) & svga->vram_display_mask];
-				attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
-			} else {
-				chr  = svga->vram[addr];
-				attr = svga->vram[addr+1];
-			}
-		} else
-			chr = attr = 0;
+		if (svga->force_old_addr) {
+			chr  = svga->vram[(svga->ma << 1) & svga->vram_display_mask];
+			attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
+		} else {
+			chr  = svga->vram[addr];
+			attr = svga->vram[addr+1];
+		}
 
 		if (attr & 8)	charaddr = svga->charsetb + (chr * 128);
 		else		charaddr = svga->charseta + (chr * 128);
@@ -212,16 +209,13 @@ svga_render_text_80(svga_t *svga)
 
 		drawcursor = ((svga->ma == svga->ca) && svga->con && svga->cursoron);
 
-		if (svga->crtc[0x17] & 0x80) {
-			if (svga->force_old_addr) {
-				chr  = svga->vram[(svga->ma << 1) & svga->vram_display_mask];
-				attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
-			} else {
-				chr  = svga->vram[addr];
-				attr = svga->vram[addr+1];
-			}
-		} else
-			chr = attr = 0;
+		if (svga->force_old_addr) {
+			chr  = svga->vram[(svga->ma << 1) & svga->vram_display_mask];
+			attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
+		} else {
+			chr  = svga->vram[addr];
+			attr = svga->vram[addr+1];
+		}
 
 		if (attr & 8)	charaddr = svga->charsetb + (chr * 128);
 		else		charaddr = svga->charseta + (chr * 128);
@@ -286,10 +280,7 @@ svga_render_text_80_ksc5601(svga_t *svga)
 		drawcursor = ((svga->ma == svga->ca) && svga->con && svga->cursoron);
 		chr  = svga->vram[addr];
 		nextchr = svga->vram[addr + 8];
-		if (svga->crtc[0x17] & 0x80)
-			attr = svga->vram[addr + 1];
-		else
-			attr = 0;
+		attr = svga->vram[addr + 1];
 
 		if (drawcursor) {
 			bg = svga->pallook[svga->egapal[attr & 15]];
@@ -433,17 +424,14 @@ svga_render_2bpp_lowres(svga_t *svga)
 			else
 				svga->ma += 4;
 			svga->ma &= svga->vram_mask;
-			if (svga->crtc[0x17] & 0x80) {
-				p[0]  = p[1]  = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
-				p[2]  = p[3]  = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
-				p[4]  = p[5]  = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
-				p[6]  = p[7]  = svga->pallook[svga->egapal[dat[0] & 3]];
-				p[8]  = p[9]  = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
-				p[10] = p[11] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
-				p[12] = p[13] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
-				p[14] = p[15] = svga->pallook[svga->egapal[dat[1] & 3]];
-			} else
-				memset(p, 0x00, 16 * sizeof(uint32_t));
+			p[0]  = p[1]  = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
+			p[2]  = p[3]  = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
+			p[4]  = p[5]  = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
+			p[6]  = p[7]  = svga->pallook[svga->egapal[dat[0] & 3]];
+			p[8]  = p[9]  = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
+			p[10] = p[11] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
+			p[12] = p[13] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
+			p[14] = p[15] = svga->pallook[svga->egapal[dat[1] & 3]];
 			p += 16;
 		}
 	}
@@ -469,17 +457,14 @@ svga_render_2bpp_lowres(svga_t *svga)
 
 			svga->ma &= svga->vram_mask;
 
-			if (svga->crtc[0x17] & 0x80) {
-				p[0]  = p[1]  = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
-				p[2]  = p[3]  = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
-				p[4]  = p[5]  = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
-				p[6]  = p[7]  = svga->pallook[svga->egapal[dat[0] & 3]];
-				p[8]  = p[9]  = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
-				p[10] = p[11] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
-				p[12] = p[13] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
-				p[14] = p[15] = svga->pallook[svga->egapal[dat[1] & 3]];
-			} else
-				memset(p, 0x00, 16 * sizeof(uint32_t));
+			p[0]  = p[1]  = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
+			p[2]  = p[3]  = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
+			p[4]  = p[5]  = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
+			p[6]  = p[7]  = svga->pallook[svga->egapal[dat[0] & 3]];
+			p[8]  = p[9]  = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
+			p[10] = p[11] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
+			p[12] = p[13] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
+			p[14] = p[15] = svga->pallook[svga->egapal[dat[1] & 3]];
 
 			p += 16;
 		}
@@ -537,17 +522,14 @@ svga_render_2bpp_highres(svga_t *svga)
 			else
 				svga->ma += 4;
 			svga->ma &= svga->vram_mask;
-			if (svga->crtc[0x17] & 0x80) {
-				p[0] = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
-				p[1] = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
-				p[2] = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
-				p[3] = svga->pallook[svga->egapal[dat[0] & 3]];
-				p[4] = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
-				p[5] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
-				p[6] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
-				p[7] = svga->pallook[svga->egapal[dat[1] & 3]];
-			} else
-				memset(p, 0x00, 8 * sizeof(uint32_t));
+			p[0] = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
+			p[1] = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
+			p[2] = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
+			p[3] = svga->pallook[svga->egapal[dat[0] & 3]];
+			p[4] = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
+			p[5] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
+			p[6] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
+			p[7] = svga->pallook[svga->egapal[dat[1] & 3]];
 			p += 8;
 		}
 		}
@@ -573,17 +555,14 @@ svga_render_2bpp_highres(svga_t *svga)
 
 			svga->ma &= svga->vram_mask;
 
-			if (svga->crtc[0x17] & 0x80) {
-				p[0] = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
-				p[1] = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
-				p[2] = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
-				p[3] = svga->pallook[svga->egapal[dat[0] & 3]];
-				p[4] = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
-				p[5] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
-				p[6] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
-				p[7] = svga->pallook[svga->egapal[dat[1] & 3]];
-			} else
-				memset(p, 0x00, 8 * sizeof(uint32_t));
+			p[0] = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
+			p[1] = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
+			p[2] = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
+			p[3] = svga->pallook[svga->egapal[dat[0] & 3]];
+			p[4] = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
+			p[5] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
+			p[6] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
+			p[7] = svga->pallook[svga->egapal[dat[1] & 3]];
 
 			p += 8;
 		}
@@ -629,21 +608,18 @@ svga_render_2bpp_headland_highres(svga_t *svga)
 		svga->ma += 4;
 		svga->ma &= svga->vram_mask;
 
-		if (svga->crtc[0x17] & 0x80) {
-			dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
-			p[0] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-			p[1] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-			dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
-			p[2] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-			p[3] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-			dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
-			p[4] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-			p[5] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-			dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
-			p[6] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-			p[7] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-		} else
-			memset(p, 0x00, 8 * sizeof(uint32_t));
+		dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
+		p[0] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+		p[1] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+		dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
+		p[2] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+		p[3] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+		dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
+		p[4] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+		p[5] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+		dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
+		p[6] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+		p[7] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
 
 		p += 8;
 	}
@@ -704,21 +680,18 @@ svga_render_4bpp_lowres(svga_t *svga)
 			}
 			svga->ma &= svga->vram_mask;
 
-			if (svga->crtc[0x17] & 0x80) {
-				dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
-				p[0]  = p[1]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-				p[2]  = p[3]  = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-				dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
-				p[4]  = p[5]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-				p[6]  = p[7]  = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-				dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
-				p[8]  = p[9]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-				p[10] = p[11] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-				dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
-				p[12] = p[13] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-				p[14] = p[15] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-			} else
-				memset(p, 0x00, 16 * sizeof(uint32_t));
+			dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
+			p[0]  = p[1]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[2]  = p[3]  = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
+			p[4]  = p[5]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[6]  = p[7]  = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
+			p[8]  = p[9]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[10] = p[11] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
+			p[12] = p[13] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[14] = p[15] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
 
 			p += 16;
 		}
@@ -749,21 +722,18 @@ svga_render_4bpp_lowres(svga_t *svga)
 			}
 			svga->ma &= svga->vram_mask;
 
-			if (svga->crtc[0x17] & 0x80) {
-				dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
-				p[0]  = p[1]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-				p[2]  = p[3]  = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-				dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
-				p[4]  = p[5]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-				p[6]  = p[7]  = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-				dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
-				p[8]  = p[9]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-				p[10] = p[11] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-				dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
-				p[12] = p[13] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-				p[14] = p[15] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-			} else
-				memset(p, 0x00, 16 * sizeof(uint32_t));
+			dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
+			p[0]  = p[1]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[2]  = p[3]  = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
+			p[4]  = p[5]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[6]  = p[7]  = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
+			p[8]  = p[9]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[10] = p[11] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
+			p[12] = p[13] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[14] = p[15] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
 
 			p += 16;
 		}
@@ -829,21 +799,18 @@ svga_render_4bpp_highres(svga_t *svga)
 			}
 			svga->ma &= svga->vram_mask;
 
-			if (svga->crtc[0x17] & 0x80) {
-				dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
-				p[0] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-				p[1] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-				dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
-				p[2] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-				p[3] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-				dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
-				p[4] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-				p[5] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-				dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
-				p[6] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-				p[7] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-			} else
-				memset(p, 0x00, 8 * sizeof(uint32_t));
+			dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
+			p[0] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[1] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
+			p[2] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[3] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
+			p[4] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[5] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
+			p[6] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[7] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
 
 			p += 8;
 		}
@@ -874,21 +841,18 @@ svga_render_4bpp_highres(svga_t *svga)
 			}
 			svga->ma &= svga->vram_mask;
 
-			if (svga->crtc[0x17] & 0x80) {
-				dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
-				p[0] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-				p[1] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-				dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
-				p[2] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-				p[3] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-				dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
-				p[4] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-				p[5] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-				dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
-				p[6] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-				p[7] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-			} else
-				memset(p, 0x00, 8 * sizeof(uint32_t));
+			dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
+			p[0] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[1] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
+			p[2] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[3] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
+			p[4] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[5] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
+			p[6] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[7] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
 
 			p += 8;
 		}
@@ -1071,25 +1035,22 @@ svga_render_8bpp_tseng_lowres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-		if (svga->crtc[0x17] & 0x80) {
-			dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
-			if (svga->attrregs[0x10] & 0x80)
-				dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-			p[0] = p[1] = svga->map8[dat & 0xff];
-			dat >>= 8;
-			if (svga->attrregs[0x10] & 0x80)
-				dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-			p[2] = p[3] = svga->map8[dat & 0xff];
-			dat >>= 8;
-			if (svga->attrregs[0x10] & 0x80)
-				dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-			p[4] = p[5] = svga->map8[dat & 0xff];
-			dat >>= 8;
-			if (svga->attrregs[0x10] & 0x80)
-				dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-			p[6] = p[7] = svga->map8[dat & 0xff];
-		} else
-			memset(p, 0x00, 8 * sizeof(uint32_t));
+		dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
+		if (svga->attrregs[0x10] & 0x80)
+			dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
+		p[0] = p[1] = svga->map8[dat & 0xff];
+		dat >>= 8;
+		if (svga->attrregs[0x10] & 0x80)
+			dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
+		p[2] = p[3] = svga->map8[dat & 0xff];
+		dat >>= 8;
+		if (svga->attrregs[0x10] & 0x80)
+			dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
+		p[4] = p[5] = svga->map8[dat & 0xff];
+		dat >>= 8;
+		if (svga->attrregs[0x10] & 0x80)
+			dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
+		p[6] = p[7] = svga->map8[dat & 0xff];
 
 		svga->ma += 4;
 		p += 8;
@@ -1117,42 +1078,39 @@ svga_render_8bpp_tseng_highres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp/* + svga->scrollcache*/); x += 8) {
-		if (svga->crtc[0x17] & 0x80) {
-			dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
-			if (svga->attrregs[0x10] & 0x80)
-				dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-			p[0] = svga->map8[dat & 0xff];
-			dat >>= 8;
-			if (svga->attrregs[0x10] & 0x80)
-				dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-			p[1] = svga->map8[dat & 0xff];
-			dat >>= 8;
-			if (svga->attrregs[0x10] & 0x80)
-				dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-			p[2] = svga->map8[dat & 0xff];
-			dat >>= 8;
-			if (svga->attrregs[0x10] & 0x80)
-				dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-			p[3] = svga->map8[dat & 0xff];
+		dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
+		if (svga->attrregs[0x10] & 0x80)
+			dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
+		p[0] = svga->map8[dat & 0xff];
+		dat >>= 8;
+		if (svga->attrregs[0x10] & 0x80)
+			dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
+		p[1] = svga->map8[dat & 0xff];
+		dat >>= 8;
+		if (svga->attrregs[0x10] & 0x80)
+			dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
+		p[2] = svga->map8[dat & 0xff];
+		dat >>= 8;
+		if (svga->attrregs[0x10] & 0x80)
+			dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
+		p[3] = svga->map8[dat & 0xff];
 
-			dat = *(uint32_t *)(&svga->vram[(svga->ma + 4) & svga->vram_display_mask]);
-			if (svga->attrregs[0x10] & 0x80)
-				dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-			p[4] = svga->map8[dat & 0xff];
-			dat >>= 8;
-			if (svga->attrregs[0x10] & 0x80)
-				dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-			p[5] = svga->map8[dat & 0xff];
-			dat >>= 8;
-			if (svga->attrregs[0x10] & 0x80)
-				dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-			p[6] = svga->map8[dat & 0xff];
-			dat >>= 8;
-			if (svga->attrregs[0x10] & 0x80)
-				dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-			p[7] = svga->map8[dat & 0xff];
-		} else
-			memset(p, 0x00, 8 * sizeof(uint32_t));
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + 4) & svga->vram_display_mask]);
+		if (svga->attrregs[0x10] & 0x80)
+			dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
+		p[4] = svga->map8[dat & 0xff];
+		dat >>= 8;
+		if (svga->attrregs[0x10] & 0x80)
+			dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
+		p[5] = svga->map8[dat & 0xff];
+		dat >>= 8;
+		if (svga->attrregs[0x10] & 0x80)
+			dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
+		p[6] = svga->map8[dat & 0xff];
+		dat >>= 8;
+		if (svga->attrregs[0x10] & 0x80)
+			dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
+		p[7] = svga->map8[dat & 0xff];
 
 		svga->ma += 8;
 		p += 8;
@@ -1181,19 +1139,16 @@ svga_render_15bpp_lowres(svga_t *svga)
 			svga->firstline_draw = svga->displine;
 		svga->lastline_draw = svga->displine;
 
-		for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-			if (svga->crtc[0x17] & 0x80) {
-				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+		if (svga->crtc[0x17] & 0x80) {
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
 
-				p[(x << 1)]     = p[(x << 1) + 1] = video_15to32[dat & 0xffff];
-				p[(x << 1) + 2] = p[(x << 1) + 3] = video_15to32[dat >> 16];
+			p[(x << 1)]     = p[(x << 1) + 1] = video_15to32[dat & 0xffff];
+			p[(x << 1) + 2] = p[(x << 1) + 3] = video_15to32[dat >> 16];
 
-				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
 
-				p[(x << 1) + 4] = p[(x << 1) + 5] = video_15to32[dat & 0xffff];
-				p[(x << 1) + 6] = p[(x << 1) + 7] = video_15to32[dat >> 16];
-			} else
-				memset(&(p[(x << 1)]), 0x00, 8 * sizeof(uint32_t));
+			p[(x << 1) + 4] = p[(x << 1) + 5] = video_15to32[dat & 0xffff];
+			p[(x << 1) + 6] = p[(x << 1) + 7] = video_15to32[dat >> 16];
 		}
 		svga->ma += x << 1;
 		svga->ma &= svga->vram_display_mask;
@@ -1210,30 +1165,24 @@ svga_render_15bpp_lowres(svga_t *svga)
 
 		if (!svga->remap_required) {
 			for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-				if (svga->crtc[0x17] & 0x80) {
-					dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
 
-					*p++ = video_15to32[dat & 0xffff];
-					*p++ = video_15to32[dat >> 16];
+				*p++ = video_15to32[dat & 0xffff];
+				*p++ = video_15to32[dat >> 16];
 
-					dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
 
-					*p++ = video_15to32[dat & 0xffff];
-					*p++ = video_15to32[dat >> 16];
-				} else
-					memset(&(p[(x << 1)]), 0x00, 8 * sizeof(uint32_t));
+				*p++ = video_15to32[dat & 0xffff];
+				*p++ = video_15to32[dat >> 16];
 			}
 			svga->ma += x << 1;
 		} else {
 			for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 2) {
-				if (svga->crtc[0x17] & 0x80) {
-					addr = svga->remap_func(svga, svga->ma);
-					dat = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
+				addr = svga->remap_func(svga, svga->ma);
+				dat = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
 
-					*p++ = video_15to32[dat & 0xffff];
-					*p++ = video_15to32[dat >> 16];
-				} else
-					memset(&(p[x]), 0x00, 2 * sizeof(uint32_t));
+				*p++ = video_15to32[dat & 0xffff];
+				*p++ = video_15to32[dat >> 16];
 				svga->ma += 4;
 			}
 		}
@@ -1263,24 +1212,21 @@ svga_render_15bpp_highres(svga_t *svga)
 		svga->lastline_draw = svga->displine;
 
 		for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-			if (svga->crtc[0x17] & 0x80) {
-				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
-				p[x]     = video_15to32[dat & 0xffff];
-				p[x + 1] = video_15to32[dat >> 16];
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+			p[x]     = video_15to32[dat & 0xffff];
+			p[x + 1] = video_15to32[dat >> 16];
 
-				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-				p[x + 2] = video_15to32[dat & 0xffff];
-				p[x + 3] = video_15to32[dat >> 16];
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+			p[x + 2] = video_15to32[dat & 0xffff];
+			p[x + 3] = video_15to32[dat >> 16];
 
-				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
-				p[x + 4] = video_15to32[dat & 0xffff];
-				p[x + 5] = video_15to32[dat >> 16];
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
+			p[x + 4] = video_15to32[dat & 0xffff];
+			p[x + 5] = video_15to32[dat >> 16];
 
-				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
-				p[x + 6] = video_15to32[dat & 0xffff];
-				p[x + 7] = video_15to32[dat >> 16];
-			} else
-				memset(&(p[x]), 0x00, 8 * sizeof(uint32_t));
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
+			p[x + 6] = video_15to32[dat & 0xffff];
+			p[x + 7] = video_15to32[dat >> 16];
 		}
 		svga->ma += x << 1;
 		svga->ma &= svga->vram_display_mask;
@@ -1297,36 +1243,30 @@ svga_render_15bpp_highres(svga_t *svga)
 
 		if (!svga->remap_required) {
 			for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-				if (svga->crtc[0x17] & 0x80) {
-					dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
-					*p++ = video_15to32[dat & 0xffff];
-					*p++ = video_15to32[dat >> 16];
+				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+				*p++ = video_15to32[dat & 0xffff];
+				*p++ = video_15to32[dat >> 16];
 
-					dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-					*p++ = video_15to32[dat & 0xffff];
-					*p++ = video_15to32[dat >> 16];
+				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+				*p++ = video_15to32[dat & 0xffff];
+				*p++ = video_15to32[dat >> 16];
 
-					dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
-					*p++ = video_15to32[dat & 0xffff];
-					*p++ = video_15to32[dat >> 16];
+				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
+				*p++ = video_15to32[dat & 0xffff];
+				*p++ = video_15to32[dat >> 16];
 
-					dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
-					*p++ = video_15to32[dat & 0xffff];
-					*p++ = video_15to32[dat >> 16];
-				} else
-					memset(&(p[x]), 0x00, 8 * sizeof(uint32_t));
+				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
+				*p++ = video_15to32[dat & 0xffff];
+				*p++ = video_15to32[dat >> 16];
 			}
 			svga->ma += x << 1;
 		} else {
 			for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 2) {
-				if (svga->crtc[0x17] & 0x80) {
-					addr = svga->remap_func(svga, svga->ma);
-					dat = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
+				addr = svga->remap_func(svga, svga->ma);
+				dat = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
 
-					*p++ = video_15to32[dat & 0xffff];
-					*p++ = video_15to32[dat >> 16];
-				} else
-					memset(&(p[x]), 0x00, 2 * sizeof(uint32_t));
+				*p++ = video_15to32[dat & 0xffff];
+				*p++ = video_15to32[dat >> 16];
 				svga->ma += 4;
 			}
 		}
@@ -1354,20 +1294,17 @@ svga_render_15bpp_mix_lowres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-		if (svga->crtc[0x17] & 0x80) {
-			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
-			p[(x << 1)]     = p[(x << 1) + 1] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+		p[(x << 1)]     = p[(x << 1) + 1] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
 
-			dat >>= 16;
-			p[(x << 1) + 2] = p[(x << 1) + 3] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+		dat >>= 16;
+		p[(x << 1) + 2] = p[(x << 1) + 3] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
 
-			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-			p[(x << 1) + 4] = p[(x << 1) + 5] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+		p[(x << 1) + 4] = p[(x << 1) + 5] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
 
-			dat >>= 16;
-			p[(x << 1) + 6] = p[(x << 1) + 7] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
-		} else
-			memset(&(p[(x << 1)]), 0x00, 8 * sizeof(uint32_t));
+		dat >>= 16;
+		p[(x << 1) + 6] = p[(x << 1) + 7] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
 	}
 	svga->ma += x << 1;
 	svga->ma &= svga->vram_display_mask;
@@ -1393,28 +1330,25 @@ svga_render_15bpp_mix_highres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-		if (svga->crtc[0x17] & 0x80) {
-			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
-			p[x]     = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
-			dat >>= 16;
-			p[x + 1] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+		p[x]     = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+		dat >>= 16;
+		p[x + 1] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
 
-			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-			p[x + 2] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
-			dat >>= 16;
-			p[x + 3] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+		p[x + 2] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+		dat >>= 16;
+		p[x + 3] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
 
-			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
-			p[x + 4] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
-			dat >>= 16;
-			p[x + 5] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
+		p[x + 4] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+		dat >>= 16;
+		p[x + 5] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
 
-			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
-			p[x + 6] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
-			dat >>= 16;
-			p[x + 7] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
-		} else
-			memset(&(p[x]), 0x00, 8 * sizeof(uint32_t));
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
+		p[x + 6] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+		dat >>= 16;
+		p[x + 7] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
 	}
 	svga->ma += x << 1;
 	svga->ma &= svga->vram_display_mask;
@@ -1442,16 +1376,13 @@ svga_render_16bpp_lowres(svga_t *svga)
 		svga->lastline_draw = svga->displine;
 
 		for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-			if (svga->crtc[0x17] & 0x80) {
-				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
-				p[(x << 1)]     = p[(x << 1) + 1] = video_16to32[dat & 0xffff];
-				p[(x << 1) + 2] = p[(x << 1) + 3] = video_16to32[dat >> 16];
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+			p[(x << 1)]     = p[(x << 1) + 1] = video_16to32[dat & 0xffff];
+			p[(x << 1) + 2] = p[(x << 1) + 3] = video_16to32[dat >> 16];
 
-				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-				p[(x << 1) + 4] = p[(x << 1) + 5] = video_16to32[dat & 0xffff];
-				p[(x << 1) + 6] = p[(x << 1) + 7] = video_16to32[dat >> 16];
-			} else
-				memset(&(p[(x << 1)]), 0x00, 8 * sizeof(uint32_t));
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+			p[(x << 1) + 4] = p[(x << 1) + 5] = video_16to32[dat & 0xffff];
+			p[(x << 1) + 6] = p[(x << 1) + 7] = video_16to32[dat >> 16];
 		}
 		svga->ma += x << 1;
 		svga->ma &= svga->vram_display_mask;
@@ -1468,30 +1399,24 @@ svga_render_16bpp_lowres(svga_t *svga)
 
 		if (!svga->remap_required) {
 			for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-				if (svga->crtc[0x17] & 0x80) {
-					dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
 
-					*p++ = video_16to32[dat & 0xffff];
-					*p++ = video_16to32[dat >> 16];
+				*p++ = video_16to32[dat & 0xffff];
+				*p++ = video_16to32[dat >> 16];
 
-					dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
 
-					*p++ = video_16to32[dat & 0xffff];
-					*p++ = video_16to32[dat >> 16];
-				} else
-					memset(&(p[(x << 1)]), 0x00, 8 * sizeof(uint32_t));
+				*p++ = video_16to32[dat & 0xffff];
+				*p++ = video_16to32[dat >> 16];
 			}
 			svga->ma += x << 1;
 		} else {
 			for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 2) {
-				if (svga->crtc[0x17] & 0x80) {
 				addr = svga->remap_func(svga, svga->ma);
 				dat = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
 
 				*p++ = video_16to32[dat & 0xffff];
 				*p++ = video_16to32[dat >> 16];
-				} else
-					memset(&(p[x]), 0x00, 2 * sizeof(uint32_t));
 			}
 			svga->ma += 4;
 		}
@@ -1521,24 +1446,21 @@ svga_render_16bpp_highres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-		if (svga->crtc[0x17] & 0x80) {
-			uint32_t dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
-			p[x]     = video_16to32[dat & 0xffff];
-			p[x + 1] = video_16to32[dat >> 16];
+		uint32_t dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+		p[x]     = video_16to32[dat & 0xffff];
+		p[x + 1] = video_16to32[dat >> 16];
 
-			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-			p[x + 2] = video_16to32[dat & 0xffff];
-			p[x + 3] = video_16to32[dat >> 16];
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+		p[x + 2] = video_16to32[dat & 0xffff];
+		p[x + 3] = video_16to32[dat >> 16];
 
-			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
-			p[x + 4] = video_16to32[dat & 0xffff];
-			p[x + 5] = video_16to32[dat >> 16];
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
+		p[x + 4] = video_16to32[dat & 0xffff];
+		p[x + 5] = video_16to32[dat >> 16];
 
-			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
-			p[x + 6] = video_16to32[dat & 0xffff];
-			p[x + 7] = video_16to32[dat >> 16];
-		} else
-			memset(&(p[x]), 0x00, 8 * sizeof(uint32_t));
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
+		p[x + 6] = video_16to32[dat & 0xffff];
+		p[x + 7] = video_16to32[dat >> 16];
 	}
 	svga->ma += x << 1;
 	svga->ma &= svga->vram_display_mask;
@@ -1555,36 +1477,30 @@ svga_render_16bpp_highres(svga_t *svga)
 
 		if (!svga->remap_required) {
 			for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-				if (svga->crtc[0x17] & 0x80) {
-					dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
-					*p++ = video_16to32[dat & 0xffff];
-					*p++ = video_16to32[dat >> 16];
+				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+				*p++ = video_16to32[dat & 0xffff];
+				*p++ = video_16to32[dat >> 16];
 
-					dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-					*p++ = video_16to32[dat & 0xffff];
-					*p++ = video_16to32[dat >> 16];
+				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+				*p++ = video_16to32[dat & 0xffff];
+				*p++ = video_16to32[dat >> 16];
 
-					dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
-					*p++ = video_16to32[dat & 0xffff];
-					*p++ = video_16to32[dat >> 16];
+				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
+				*p++ = video_16to32[dat & 0xffff];
+				*p++ = video_16to32[dat >> 16];
 
-					dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
-					*p++ = video_16to32[dat & 0xffff];
-					*p++ = video_16to32[dat >> 16];
-				} else
-					memset(&(p[x]), 0x00, 8 * sizeof(uint32_t));
+				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
+				*p++ = video_16to32[dat & 0xffff];
+				*p++ = video_16to32[dat >> 16];
 			}
 			svga->ma += x << 1;
 		} else {
 			for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 2) {
-				if (svga->crtc[0x17] & 0x80) {
-					addr = svga->remap_func(svga, svga->ma);
-					dat = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
+				addr = svga->remap_func(svga, svga->ma);
+				dat = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
 
-					*p++ = video_16to32[dat & 0xffff];
-					*p++ = video_16to32[dat >> 16];
-				} else
-					memset(&(p[x]), 0x00, 2 * sizeof(uint32_t));
+				*p++ = video_16to32[dat & 0xffff];
+				*p++ = video_16to32[dat >> 16];
 
 				svga->ma += 4;
 			}
@@ -1617,10 +1533,7 @@ svga_render_24bpp_lowres(svga_t *svga)
 		svga->lastline_draw = svga->displine;
 
 		for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-			if (svga->crtc[0x17] & 0x80)
-				fg = svga->vram[svga->ma] | (svga->vram[svga->ma + 1] << 8) | (svga->vram[svga->ma + 2] << 16);
-			else
-				fg = 0x00000000;
+			fg = svga->vram[svga->ma] | (svga->vram[svga->ma + 1] << 8) | (svga->vram[svga->ma + 2] << 16);
 			svga->ma += 3;
 			svga->ma &= svga->vram_display_mask;
 			buffer32->line[svga->displine + svga->y_add][(x << 1) + svga->x_add] =
@@ -1639,12 +1552,9 @@ svga_render_24bpp_lowres(svga_t *svga)
 
 		if (!svga->remap_required) {
 			for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-				if (svga->crtc[0x17] & 0x80) {
-					dat0 = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
-					dat1 = *(uint32_t *)(&svga->vram[(svga->ma + 4) & svga->vram_display_mask]);
-					dat2 = *(uint32_t *)(&svga->vram[(svga->ma + 8) & svga->vram_display_mask]);
-				} else
-					dat0 = dat1 = dat2 = 0x00000000;
+				dat0 = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
+				dat1 = *(uint32_t *)(&svga->vram[(svga->ma + 4) & svga->vram_display_mask]);
+				dat2 = *(uint32_t *)(&svga->vram[(svga->ma + 8) & svga->vram_display_mask]);
 
 				p[0] = p[1] = dat0 & 0xffffff;
 				p[2] = p[3] = (dat0 >> 24) | ((dat1 & 0xffff) << 8);
@@ -1655,15 +1565,12 @@ svga_render_24bpp_lowres(svga_t *svga)
 			}
 		} else {
 			for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-				if (svga->crtc[0x17] & 0x80) {
-					addr = svga->remap_func(svga, svga->ma);
-					dat0 = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
-					addr = svga->remap_func(svga, svga->ma + 4);
-					dat1 = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
-					addr = svga->remap_func(svga, svga->ma + 8);
-					dat2 = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
-				} else
-					dat0 = dat1 = dat2 = 0x00000000;
+				addr = svga->remap_func(svga, svga->ma);
+				dat0 = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
+				addr = svga->remap_func(svga, svga->ma + 4);
+				dat1 = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
+				addr = svga->remap_func(svga, svga->ma + 8);
+				dat2 = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
 
 				p[0] = p[1] = dat0 & 0xffffff;
 				p[2] = p[3] = (dat0 >> 24) | ((dat1 & 0xffff) << 8);
@@ -1700,20 +1607,17 @@ svga_render_24bpp_highres(svga_t *svga)
 		svga->lastline_draw = svga->displine;
 
 		for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-			if (svga->crtc[0x17] & 0x80) {
-				dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
-				p[x] = dat & 0xffffff;
+			dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
+			p[x] = dat & 0xffffff;
 
-				dat = *(uint32_t *)(&svga->vram[(svga->ma + 3) & svga->vram_display_mask]);
-				p[x + 1] = dat & 0xffffff;
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + 3) & svga->vram_display_mask]);
+			p[x + 1] = dat & 0xffffff;
 
-				dat = *(uint32_t *)(&svga->vram[(svga->ma + 6) & svga->vram_display_mask]);
-				p[x + 2] = dat & 0xffffff;
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + 6) & svga->vram_display_mask]);
+			p[x + 2] = dat & 0xffffff;
 
-				dat = *(uint32_t *)(&svga->vram[(svga->ma + 9) & svga->vram_display_mask]);
-				p[x + 3] = dat & 0xffffff;
-			} else
-				memset(&(p[x]), 0x0, 4 * sizeof(uint32_t));
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + 9) & svga->vram_display_mask]);
+			p[x + 3] = dat & 0xffffff;
 
 			svga->ma += 12;
 		}
@@ -1731,36 +1635,30 @@ svga_render_24bpp_highres(svga_t *svga)
 
 		if (!svga->remap_required) {
 			for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-				if (svga->crtc[0x17] & 0x80) {
-					dat0 = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
-					dat1 = *(uint32_t *)(&svga->vram[(svga->ma + 4) & svga->vram_display_mask]);
-					dat2 = *(uint32_t *)(&svga->vram[(svga->ma + 8) & svga->vram_display_mask]);
+				dat0 = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
+				dat1 = *(uint32_t *)(&svga->vram[(svga->ma + 4) & svga->vram_display_mask]);
+				dat2 = *(uint32_t *)(&svga->vram[(svga->ma + 8) & svga->vram_display_mask]);
 
-					*p++ = dat0 & 0xffffff;
-					*p++ = (dat0 >> 24) | ((dat1 & 0xffff) << 8);
-					*p++ = (dat1 >> 16) | ((dat2 & 0xff) << 16);
-					*p++ = dat2 >> 8;
-				} else
-					memset(&(p[x]), 0x0, 4 * sizeof(uint32_t));
+				*p++ = dat0 & 0xffffff;
+				*p++ = (dat0 >> 24) | ((dat1 & 0xffff) << 8);
+				*p++ = (dat1 >> 16) | ((dat2 & 0xff) << 16);
+				*p++ = dat2 >> 8;
 
 				svga->ma += 12;
 			}
 		} else {
 			for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-				if (svga->crtc[0x17] & 0x80) {
-					addr = svga->remap_func(svga, svga->ma);
-					dat0 = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
-					addr = svga->remap_func(svga, svga->ma + 4);
-					dat1 = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
-					addr = svga->remap_func(svga, svga->ma + 8);
-					dat2 = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
+				addr = svga->remap_func(svga, svga->ma);
+				dat0 = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
+				addr = svga->remap_func(svga, svga->ma + 4);
+				dat1 = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
+				addr = svga->remap_func(svga, svga->ma + 8);
+				dat2 = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
 
-					*p++ = dat0 & 0xffffff;
-					*p++ = (dat0 >> 24) | ((dat1 & 0xffff) << 8);
-					*p++ = (dat1 >> 16) | ((dat2 & 0xff) << 16);
-					*p++ = dat2 >> 8;
-				} else
-					memset(&(p[x]), 0x0, 4 * sizeof(uint32_t));
+				*p++ = dat0 & 0xffffff;
+				*p++ = (dat0 >> 24) | ((dat1 & 0xffff) << 8);
+				*p++ = (dat1 >> 16) | ((dat2 & 0xff) << 16);
+				*p++ = dat2 >> 8;
 
 				svga->ma += 12;
 			}
@@ -1789,10 +1687,7 @@ svga_render_32bpp_lowres(svga_t *svga)
 		svga->lastline_draw = svga->displine;
 
 		for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-			if (svga->crtc[0x17] & 0x80)
-				dat = svga->vram[svga->ma] | (svga->vram[svga->ma + 1] << 8) | (svga->vram[svga->ma + 2] << 16);
-			else
-				dat = 0x00000000;
+			dat = svga->vram[svga->ma] | (svga->vram[svga->ma + 1] << 8) | (svga->vram[svga->ma + 2] << 16);
 			svga->ma += 4;
 			svga->ma &= svga->vram_display_mask;
 			buffer32->line[svga->displine + svga->y_add][(x << 1) + svga->x_add] =
@@ -1811,21 +1706,15 @@ svga_render_32bpp_lowres(svga_t *svga)
 
 		if (!svga->remap_required) {
 			for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-				if (svga->crtc[0x17] & 0x80)
-					dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
-				else
-					dat = 0x00000000;
+				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
 				*p++ = dat & 0xffffff;
 				*p++ = dat & 0xffffff;
 			}
 			svga->ma += (x * 4);
 		} else {
 			for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-				if (svga->crtc[0x17] & 0x80) {
-					addr = svga->remap_func(svga, svga->ma);
-					dat = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
-				} else
-					dat = 0x00000000;
+				addr = svga->remap_func(svga, svga->ma);
+				dat = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
 				*p++ = dat & 0xffffff;
 				*p++ = dat & 0xffffff;
 				svga->ma += 4;
@@ -1857,10 +1746,7 @@ svga_render_32bpp_highres(svga_t *svga)
 		svga->lastline_draw = svga->displine;
 
 		for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-			if (svga->crtc[0x17] & 0x80)
-				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
-			else
-				dat = 0x00000000;
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
 			p[x] = dat & 0xffffff;
 		}
 		svga->ma += 4;
@@ -1878,21 +1764,15 @@ svga_render_32bpp_highres(svga_t *svga)
 
 		if (!svga->remap_required) {
 			for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-				if (svga->crtc[0x17] & 0x80) {
-					dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
-					*p++ = dat & 0xffffff;
-				} else
-					memset(&(p[x]), 0x0, 1 * sizeof(uint32_t));
+				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
+				*p++ = dat & 0xffffff;
 			}
 			svga->ma += (x * 4);
 		} else {
 			for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-				if (svga->crtc[0x17] & 0x80) {
-					addr = svga->remap_func(svga, svga->ma);
-					dat = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
-					*p++ = dat & 0xffffff;
-				} else
-					memset(&(p[x]), 0x0, 1 * sizeof(uint32_t));
+				addr = svga->remap_func(svga, svga->ma);
+				dat = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
+				*p++ = dat & 0xffffff;
 
 				svga->ma += 4;
 			}
@@ -1925,21 +1805,15 @@ svga_render_ABGR8888_highres(svga_t *svga)
 
 	if (!svga->remap_required) {
 		for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-			if (svga->crtc[0x17] & 0x80) {
-				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
-				*p++ = ((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16);
-			} else
-				memset(&(p[x]), 0x0, 1 * sizeof(uint32_t));
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
+			*p++ = ((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16);
 		}
 		svga->ma += x*4;
 	} else {
 		for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-			if (svga->crtc[0x17] & 0x80) {
-				addr = svga->remap_func(svga, svga->ma);
-				dat = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
-				*p++ = ((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16);
-			} else
-				memset(&(p[x]), 0x0, 1 * sizeof(uint32_t));
+			addr = svga->remap_func(svga, svga->ma);
+			dat = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
+			*p++ = ((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16);
 
 			svga->ma += 4;
 		}
@@ -1971,21 +1845,15 @@ svga_render_RGBA8888_highres(svga_t *svga)
 
 	if (!svga->remap_required) {
 		for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-			if (svga->crtc[0x17] & 0x80) {
-				dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
-				*p++ = dat >> 8;
-			} else
-				memset(&(p[x]), 0x0, 1 * sizeof(uint32_t));
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
+			*p++ = dat >> 8;
 		}
 		svga->ma += (x * 4);
 	} else {
 		for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-			if (svga->crtc[0x17] & 0x80) {
-				addr = svga->remap_func(svga, svga->ma);
-				dat = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
-				*p++ = dat >> 8;
-			} else
-				memset(&(p[x]), 0x0, 1 * sizeof(uint32_t));
+			addr = svga->remap_func(svga, svga->ma);
+			dat = *(uint32_t *)(&svga->vram[addr & svga->vram_display_mask]);
+			*p++ = dat >> 8;
 
 			svga->ma += 4;
 		}