From 4793508d646151c4c5070e492d4833930fb9bfa5 Mon Sep 17 00:00:00 2001
From: Gyorgy Szombathelyi <gyurco@freemail.hu>
Date: Sun, 7 Jul 2019 01:54:44 +0200
Subject: [PATCH] [Gameboy] Fix original GameBoy sprites in GBC mode

---
 cores/gameboy/sprite.v  | 8 ++++----
 cores/gameboy/sprites.v | 4 ++--
 cores/gameboy/video.v   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cores/gameboy/sprite.v b/cores/gameboy/sprite.v
index ebfe74f..fdae29e 100644
--- a/cores/gameboy/sprite.v
+++ b/cores/gameboy/sprite.v
@@ -22,7 +22,7 @@
 module sprite (
 	input clk,
 	input size16,
-	input isGBC,
+	input isGBC_game,
 	input [7:0] sprite_index,
 
 	input [7:0] v_cnt,
@@ -52,15 +52,15 @@ module sprite (
 
 // x position for priority detection. Invisible sprites are far to the right and
 // have minimum priority
-assign x = v_visible?isGBC?sprite_index:x_pos:8'hff;
+assign x = v_visible?isGBC_game?sprite_index:x_pos:8'hff;
 
 // register used to store pixel data for current line
 reg [7:0] data0;
 reg [7:0] data1;
 
 always @(posedge clk) begin
-	if(ds[0]) data0 <= flags[3]?data_1:data;
-	if(ds[1]) data1 <= flags[3]?data_1:data;
+	if(ds[0]) data0 <= flags[3]&&isGBC_game?data_1:data;
+	if(ds[1]) data1 <= flags[3]&&isGBC_game?data_1:data;
 end
 
 wire [7:0] height = size16?8'd16:8'd8;
diff --git a/cores/gameboy/sprites.v b/cores/gameboy/sprites.v
index 9797c2c..a91cbcb 100644
--- a/cores/gameboy/sprites.v
+++ b/cores/gameboy/sprites.v
@@ -23,7 +23,7 @@ module sprites (
 	input clk,
 	input clk_reg,
 	input size16,
-	input isGBC,
+	input isGBC_game,
 
 	// pixel position input which the current pixel is generated for
 	input [7:0] v_cnt,
@@ -99,7 +99,7 @@ for(i=0;i<SPRITES;i=i+1) begin : spr
 	sprite sprite (
 		.clk      ( clk_reg ),
 		.size16   ( size16  ),
-		.isGBC    ( isGBC   ),
+		.isGBC_game    ( isGBC_game  ),
 		
 		.sprite_index ( i   ),
 
diff --git a/cores/gameboy/video.v b/cores/gameboy/video.v
index 22ac40a..cef5d47 100644
--- a/cores/gameboy/video.v
+++ b/cores/gameboy/video.v
@@ -82,7 +82,7 @@ sprites sprites (
 	.clk      ( clk          ),
 	.clk_reg  ( clk_reg      ),
 	.size16   ( lcdc_spr_siz ),
-	.isGBC    ( isGBC&&isGBC_game ),
+	.isGBC_game ( isGBC&&isGBC_game ),
 
 	.v_cnt    ( v_cnt        ),
 	.h_cnt    ( h_cnt-STAGE2 ),     // sprites are added in second stage