# HG changeset patch
# User Mike Pavone <pavone@retrodev.com>
# Date 1355025572 28800
# Node ID 9477d12895952f032983c2fc3934dc45fbf7ecae
# Parent  037963b4c92dd4dd092a7bccba29f8e6e110bbed
Fix horizontal scroll offset

diff -r 037963b4c92d -r 9477d1289595 vdp.c
--- a/vdp.c	Sat Dec 08 19:42:07 2012 -0800
+++ b/vdp.c	Sat Dec 08 19:59:32 2012 -0800
@@ -178,20 +178,11 @@
 		v_mul = 256;
 		break;
 	}
-	/*
-	uint16_t hscroll = (hscroll_val + (column-2) * 8) & hscroll_mask;
-	uint16_t offset = address + ((vscroll * v_mul + hscroll/4) & 0x1FFF);
-	//printf("%s | line: %d, col: %d, x: %d, hs_mask %X, v_mul: %d, scr reg: %X, tbl addr: %X\n", (vsram_off ? "B" : "A"), line, column, hscroll, hscroll_mask, v_mul, context->regs[REG_SCROLL], offset);
-	context->col_1 = (context->vdpmem[offset] << 8) | context->vdpmem[offset+1];
-	hscroll = (hscroll_val + (column-1) * 8) & hscroll_mask;
-	offset = address + ((vscroll * v_mul + hscroll/4) & 0x1FFF);
-	context->col_2 = (context->vdpmem[offset] << 8) | context->vdpmem[offset+1];
-	*/
 	uint16_t hscroll, offset;
 	for (int i = 0; i < 2; i++) {
-		hscroll = (hscroll_val + (column-(2-i)) * 8) & hscroll_mask;
+		hscroll = (hscroll_val + (column-(0-i)) * 8) & hscroll_mask;
 		offset = address + ((vscroll * v_mul + hscroll/4) & 0x1FFF);
-		//printf("%s | line: %d, col: %d, x: %d, hs_mask %X, v_mul: %d, scr reg: %X, tbl addr: %X\n", (vsram_off ? "B" : "A"), line, column, hscroll, hscroll_mask, v_mul, context->regs[REG_SCROLL], offset);
+		printf("%s | line: %d, col: %d, x: %d, hs_mask %X, v_mul: %d, scr reg: %X, tbl addr: %X\n", (vsram_off ? "B" : "A"), line, (column-(2-i)), hscroll, hscroll_mask, v_mul, context->regs[REG_SCROLL], offset);
 		uint16_t col_val = (context->vdpmem[offset] << 8) | context->vdpmem[offset+1];
 		if (i) {
 			context->col_2 = col_val;
@@ -272,6 +263,7 @@
 		} else {*/
 			end = dst + 16;
 		//}
+		printf("A | tmp_buf offset: %d\n", 8 - (context->hscroll_a & 0x7));
 		for (; dst < end; ++plane_a, ++plane_b, ++sprite_buf, ++dst) {
 			uint8_t pixel;
 			if (*sprite_buf & BUF_BIT_PRIORITY && *sprite_buf & 0xF) {