From ef2e41f66743bd67afcfecc2fef0e38cc47c2aa0 Mon Sep 17 00:00:00 2001
From: dinkc64 <12570148+dinkc64@users.noreply.github.com>
Date: Mon, 16 Apr 2018 03:02:15 +0000
Subject: [PATCH] drv/konami/d_combatsc&k007121: fix priority issues

---
 src/burn/drv/konami/d_combatsc.cpp | 14 +++++++-------
 src/burn/drv/konami/k007121.cpp    |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/burn/drv/konami/d_combatsc.cpp b/src/burn/drv/konami/d_combatsc.cpp
index 05e9992ef..3d243b172 100644
--- a/src/burn/drv/konami/d_combatsc.cpp
+++ b/src/burn/drv/konami/d_combatsc.cpp
@@ -636,12 +636,12 @@ static INT32 DrvDraw()
 	INT32 color0 = (k007121_ctrl_read(0, 6) & 0x10) << 1;
 	INT32 color1 = (k007121_ctrl_read(1, 6) & 0x10) << 1;
 
-	if ((nBurnLayer & 3) != 3) BurnTransferClear();
+	BurnTransferClear();
 
 	if (priority_select == 0)
 	{
-		if (nBurnLayer & 2) GenericTilemapDraw(1, pTransDraw, TMAP_FORCEOPAQUE | TMAP_SET_GROUP(0) | 4);
-		if (nBurnLayer & 2) GenericTilemapDraw(1, pTransDraw, TMAP_FORCEOPAQUE | TMAP_SET_GROUP(1) | 8); // OPAQUE??
+		if (nBurnLayer & 2) GenericTilemapDraw(1, pTransDraw, TMAP_SET_GROUP(0) | 4);
+		if (nBurnLayer & 2) GenericTilemapDraw(1, pTransDraw, TMAP_SET_GROUP(1) | 8);
 		if (nBurnLayer & 1) GenericTilemapDraw(0, pTransDraw, TMAP_SET_GROUP(0) | 1);
 		if (nBurnLayer & 1) GenericTilemapDraw(0, pTransDraw, TMAP_SET_GROUP(1) | 2);
 
@@ -650,14 +650,14 @@ static INT32 DrvDraw()
 	}
 	else
 	{
-		if (nBurnLayer & 1) GenericTilemapDraw(0, pTransDraw, TMAP_FORCEOPAQUE | TMAP_SET_GROUP(1) | 1);
-		if (nBurnLayer & 1) GenericTilemapDraw(0, pTransDraw, TMAP_FORCEOPAQUE | TMAP_SET_GROUP(0) | 2); // OPAQUE??
+		if (nBurnLayer & 1) GenericTilemapDraw(0, pTransDraw, TMAP_SET_GROUP(0) | 1);
+		if (nBurnLayer & 1) GenericTilemapDraw(0, pTransDraw, TMAP_SET_GROUP(1) | 2);
 
 		if (nSpriteEnable & 2) k007121_draw(1, pTransDraw, DrvGfxROM1, color_table, DrvSprRAM[1], (0x40 + color1) * 16, 0, 16, 0, 0x0f00);
 		if (nSpriteEnable & 1) k007121_draw(0, pTransDraw, DrvGfxROM0, color_table, DrvSprRAM[0], (0x00 + color0) * 16, 0, 16, 0, 0x4444);
 
-		if (nBurnLayer & 2) GenericTilemapDraw(1, pTransDraw, TMAP_SET_GROUP(0) | 4);
-		if (nBurnLayer & 2) GenericTilemapDraw(1, pTransDraw, TMAP_SET_GROUP(1) | 8);
+		if (nBurnLayer & 2) GenericTilemapDraw(1, pTransDraw, TMAP_SET_GROUP(1) | 4);
+		if (nBurnLayer & 2) GenericTilemapDraw(1, pTransDraw, TMAP_SET_GROUP(0) | 8);
 	}
 
 	{
diff --git a/src/burn/drv/konami/k007121.cpp b/src/burn/drv/konami/k007121.cpp
index 2bf5a00a8..35e43ff78 100644
--- a/src/burn/drv/konami/k007121.cpp
+++ b/src/burn/drv/konami/k007121.cpp
@@ -144,7 +144,7 @@ void k007121_draw(INT32 chip, UINT16 *dest, UINT8 *gfx, UINT8 *ctable, UINT8 *so
 					if (pri_mask != -1)
 					{
 						if (ctable != NULL) {
-							RenderTilePrioTranstab(dest, gfx, code, (color * 16) + base_color, 0, destx, desty, flipx, flipy, 8, 8, ctable, pri_mask);
+							RenderPrioMaskTranstabSprite(dest, gfx, code, (color * 16) + base_color, 0, destx, desty, flipx, flipy, 8, 8, ctable, pri_mask);
 						} else {
 							if (flipy) {
 								if (flipx) {