From 1811ea1e0622dee4bb1400925bc7c048fcacfebd Mon Sep 17 00:00:00 2001
From: retro-wertz <retro-wertz@users.noreply.github.com>
Date: Fri, 15 Jun 2018 10:59:25 +0800
Subject: [PATCH] Remove incomplete Use NTSC core option

Use NTSC colors option is incomplete due to missing int,hue adjustments. This can be added but there is no smooth way using core options or hotkey to selec ranges 1-256 for fine tuning

Using shaders instead can work better at this with more adjustments possible
---
 src/drivers/libretro/libretro.c | 20 +++-----------------
 src/palette.c                   |  2 +-
 src/palette.h                   |  1 -
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index c8d4d1b..1a0e45a 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -218,10 +218,8 @@ FILE *FCEUD_UTF8fopen(const char *n, const char *m)
 
 /*palette for FCEU*/
 #define MAXPAL 17 /* raw palette # */
-static int use_ntsc = 0;
 static int external_palette_exist = 0;
 extern int ipalette;
-extern int ntsccol;
 
 struct st_palettes {
 	char name[32];
@@ -584,7 +582,6 @@ void retro_set_environment(retro_environment_t cb)
       { "fceumm_aspect", "Preferred aspect ratio; 8:7 PAR|4:3" },
       { "fceumm_palette", "Color Palette; default|asqrealc|nintendo-vc|rgb|yuv-v3|unsaturated-final|sony-cxa2025as-us|pal|bmf-final2|bmf-final3|smooth-fbx|composite-direct-fbx|pvm-style-d93-fbx|ntsc-hardware-fbx|nes-classic-fbx-fs|nescap|wavebeam|raw|custom" },
       { "fceumm_up_down_allowed", "Allow Opposing Directions; disabled|enabled" },
-      { "fceumm_use_ntsc", "Use NTSC Palette; disabled|enabled" },
 #ifdef PSP
       { "fceumm_overscan", "Crop Overscan; enabled|disabled" },
 #else
@@ -691,21 +688,18 @@ static void retro_set_custom_palette(void)
    uint8_t i,r,g,b;
 
    ipalette = 0;
-   ntsccol = 0;
    use_raw_palette = false;
 
-   if (current_palette == 0 || current_palette > MAXPAL
-   || (GameInfo->type == GIT_VSUNI))
+   if (!current_palette || current_palette > MAXPAL || (GameInfo->type == GIT_VSUNI))
    {
       if (current_palette > MAXPAL && GameInfo->type != GIT_VSUNI)
       {
          if (external_palette_exist)
+         {
             ipalette = 1;
+         }
       }
 
-      if (current_palette == 0)
-         ntsccol = use_ntsc;
-
       FCEU_ResetPalette(); /* Do palette reset. Priority will be:
                             * -ipalette   : sets external palette
                             * -ntsccol    : sets ntsc to default palette.
@@ -946,14 +940,6 @@ static void check_variables(bool startup)
    else
       up_down_allowed = false;
 
-   var.key = "fceumm_use_ntsc";
-
-   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
-   {
-      use_ntsc = (!strcmp(var.value, "enabled")) ? 1 : 0;
-      retro_set_custom_palette();
-   }
-
    var.key = "fceumm_nospritelimit";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
diff --git a/src/palette.c b/src/palette.c
index 169f4b1..adcef0c 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -34,7 +34,7 @@
 #define M_PI 3.14159265358979323846
 #endif
 
-int ntsccol = 0;
+static int ntsccol = 0;
 static int ntsctint = 46 + 10;
 static int ntschue = 72;
 
diff --git a/src/palette.h b/src/palette.h
index 9940568..3ca03b5 100644
--- a/src/palette.h
+++ b/src/palette.h
@@ -6,7 +6,6 @@ typedef struct {
 } pal;
 
 extern pal *palo;
-extern int ntsccol;
 extern int ipalette;
 void FCEU_ResetPalette(void);