X-Git-Url: http://git.joshuawise.com/fpgaboy.git/blobdiff_plain/f356a7356f41bc0681ac3e3013d8cf335c9e8423..2854e3991ab66f6fb954aba96caf7875d049431e:/LCDC.v

diff --git a/LCDC.v b/LCDC.v
index 1f29d4a..a198c45 100644
--- a/LCDC.v
+++ b/LCDC.v
@@ -27,7 +27,7 @@ module LCDC(
 	/***** Internal clock that is stable and does not depend on CPU in single/double clock mode *****/
 	reg clk4 = 0;
 	always @(posedge clk)
-		clk4 = ~clk4;
+		clk4 <= ~clk4;
 	
 	/***** LCD control registers *****/
 	reg [7:0] rLCDC = 8'h00;
@@ -145,7 +145,8 @@ module LCDC(
 	reg [7:0] tileno;
 	wire [10:0] tileaddr = {tileno, vypos[2:0]};
 	reg [7:0] tilehigh, tilelow;
-	assign pixdata = {tilehigh[7-vxpos[2:0]], tilelow[7-vxpos[2:0]]};
+	wire [1:0] prepal = {tilehigh[7-vxpos[2:0]], tilelow[7-vxpos[2:0]]};
+	assign pixdata = {rBGP[{prepal,1'b1}],rBGP[{prepal,1'b0}]};
 	
 	wire decode_tiledata = (addr >= 16'h8000) && (addr <= 16'h97FF);
 	wire decode_bgmap1 = (addr >= 16'h9800) && (addr <= 16'h9BFF);
@@ -153,14 +154,13 @@ module LCDC(
 	wire [9:0] bgmapaddr_in = vraminuse ? bgmapaddr : addr[9:0];
 	wire [11:0] tileaddr_in = vraminuse ? tileaddr : addr[12:1];
 	
-	always @(negedge clk)
+	always @(posedge clk)
+	begin
 		if ((vraminuse && ((posx == 2) || (vxpos[2:0] == 3'b111))) || decode_bgmap1) begin
 			tileno <= bgmap1[bgmapaddr_in];
 			if (wr && decode_bgmap1 && ~vraminuse)
 				bgmap1[bgmapaddr_in] <= data;
 		end
-	
-	always @(negedge clk)
 		if ((vraminuse && ((posx == 3) || (vxpos[2:0] == 3'b000))) || decode_tiledata) begin
 			tilehigh <= tiledatahigh[tileaddr_in];
 			tilelow <= tiledatalow[tileaddr_in];
@@ -169,6 +169,7 @@ module LCDC(
 			if (wr && ~addr[0] && decode_tiledata && ~vraminuse)
 				tiledatalow[tileaddr_in] <= data;
 		end
+	end
   
 	/***** Bus interface *****/
 	assign data = rd ?
@@ -189,7 +190,7 @@ module LCDC(
 			 8'bzzzzzzzz) :
 		8'bzzzzzzzz;
   
-	always @(negedge clk)
+	always @(posedge clk)
 	begin
 		if (wr)
 			case (addr)