From c9faaf7fa68451131f4f7cb04bf35662666dea24 Mon Sep 17 00:00:00 2001
From: rdanbrook <1869094+rdanbrook@users.noreply.github.com>
Date: Sat, 22 Mar 2025 15:05:23 -0600
Subject: [PATCH] win32: Add new internal palettes to the settings dialog

---
 source/win32/NstDialogVideoDecoder.cpp | 10 +++++++---
 source/win32/language/language.rc      | 12 +++++++-----
 source/win32/language/resource.h       |  2 ++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/source/win32/NstDialogVideoDecoder.cpp b/source/win32/NstDialogVideoDecoder.cpp
index ff49d03..13697d5 100644
--- a/source/win32/NstDialogVideoDecoder.cpp
+++ b/source/win32/NstDialogVideoDecoder.cpp
@@ -70,6 +70,8 @@ namespace Nestopia
 			{ IDC_VIDEO_DECODER_CANONICAL ,   &VideoDecoder::OnCmdPreset      },
 			{ IDC_VIDEO_DECODER_CONSUMER,     &VideoDecoder::OnCmdPreset      },
 			{ IDC_VIDEO_DECODER_ALTERNATIVE,  &VideoDecoder::OnCmdPreset      },
+			{ IDC_VIDEO_DECODER_CXA2025AS_JP, &VideoDecoder::OnCmdPreset      },
+			{ IDC_VIDEO_DECODER_CXA2025AS_US, &VideoDecoder::OnCmdPreset      },
 			{ IDOK,                           &VideoDecoder::OnCmdOk          }
 		};
 
@@ -216,9 +218,11 @@ namespace Nestopia
 
 				switch (param.Button().GetId())
 				{
-					case IDC_VIDEO_DECODER_CONSUMER:    preset = Nes::Video::DECODER_CONSUMER;    break;
-					case IDC_VIDEO_DECODER_ALTERNATIVE: preset = Nes::Video::DECODER_ALTERNATIVE; break;
-					default:                            preset = Nes::Video::DECODER_CANONICAL;   break;
+					case IDC_VIDEO_DECODER_CONSUMER:     preset = Nes::Video::DECODER_CONSUMER;     break;
+					case IDC_VIDEO_DECODER_ALTERNATIVE:  preset = Nes::Video::DECODER_ALTERNATIVE;  break;
+					case IDC_VIDEO_DECODER_CXA2025AS_JP: preset = Nes::Video::DECODER_CXA2025AS_JP; break;
+					case IDC_VIDEO_DECODER_CXA2025AS_US: preset = Nes::Video::DECODER_CXA2025AS_US; break;
+					default:                             preset = Nes::Video::DECODER_CANONICAL;    break;
 				}
 
 				nes.SetDecoder( preset );
diff --git a/source/win32/language/language.rc b/source/win32/language/language.rc
index c4bd8bc..98fd0f6 100644
--- a/source/win32/language/language.rc
+++ b/source/win32/language/language.rc
@@ -1260,14 +1260,16 @@ FONT 8, "MS Shell Dlg", 0, 0, 0
 
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-IDD_VIDEO_DECODER DIALOGEX 0, 0, 217, 138
+IDD_VIDEO_DECODER DIALOGEX 0, 0, 217, 154
 STYLE DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_POPUP | WS_SYSMENU
 CAPTION "Color Decoder"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 {
-    DEFPUSHBUTTON   "OK", IDOK, 101, 117, 50, 14, WS_GROUP, WS_EX_LEFT
-    PUSHBUTTON      "Cancel", IDCANCEL, 160, 117, 50, 14, 0, WS_EX_LEFT
-    GROUPBOX        "", IDC_STATIC, 7, 7, 203, 100, 0, WS_EX_LEFT
+    PUSHBUTTON      "CXA2025AS (US)", IDC_VIDEO_DECODER_CXA2025AS_US, 110, 105, 60, 13, WS_GROUP, WS_EX_LEFT
+    PUSHBUTTON      "CXA2025AS (JP)", IDC_VIDEO_DECODER_CXA2025AS_JP, 46, 105, 58, 13, WS_GROUP, WS_EX_LEFT
+    DEFPUSHBUTTON   "OK", IDOK, 101, 131, 50, 14, WS_GROUP, WS_EX_LEFT
+    PUSHBUTTON      "Cancel", IDCANCEL, 160, 131, 50, 14, 0, WS_EX_LEFT
+    GROUPBOX        "", IDC_STATIC, 7, 7, 203, 116, 0, WS_EX_LEFT
     LTEXT           "R-Y", IDC_STATIC, 14, 16, 15, 10, SS_LEFT, WS_EX_LEFT
     CONTROL         "", IDC_VIDEO_DECODER_RY_VALUE, TRACKBAR_CLASS, WS_GROUP | WS_TABSTOP | TBS_BOTH | TBS_NOTICKS, 31, 14, 88, 14, WS_EX_CLIENTEDGE
     CTEXT           "0", IDC_VIDEO_DECODER_RY_NUM, 123, 14, 19, 14, NOT WS_GROUP | SS_CENTER | SS_SUNKEN, WS_EX_LEFT
@@ -1286,7 +1288,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1
     PUSHBUTTON      "15° Canonical", IDC_VIDEO_DECODER_CANONICAL, 14, 88, 61, 13, WS_GROUP, WS_EX_LEFT
     PUSHBUTTON      "Consumer", IDC_VIDEO_DECODER_CONSUMER, 78, 88, 61, 13, 0, WS_EX_LEFT
     PUSHBUTTON      "Alternative", IDC_VIDEO_DECODER_ALTERNATIVE, 142, 88, 61, 13, 0, WS_EX_LEFT
-    AUTOCHECKBOX    "Boost yellow", IDC_VIDEO_DECODER_BOOST_YELLOW, 14, 115, 51, 9, WS_GROUP, WS_EX_LEFT
+    AUTOCHECKBOX    "Boost yellow", IDC_VIDEO_DECODER_BOOST_YELLOW, 14, 133, 51, 9, WS_GROUP, WS_EX_LEFT
 }
 
 
diff --git a/source/win32/language/resource.h b/source/win32/language/resource.h
index d60a93e..d5f526e 100644
--- a/source/win32/language/resource.h
+++ b/source/win32/language/resource.h
@@ -684,8 +684,10 @@
 #define IDC_IMAGEDATABASE_EXTERNAL              4625
 #define IDC_CHOOSE_LIST                         4630
 #define IDC_DIPSWITCHES_DONTSHOWAGAIN           5244
+#define IDC_VIDEO_DECODER_CXA2025AS_US          40000
 #define IDS_TITLE_NESTOPIA                      40000
 #define IDS_TITLE_ERROR                         40001
+#define IDC_VIDEO_DECODER_CXA2025AS_JP          40002
 #define IDS_TITLE_WARNING                       40002
 #define IDS_TITLE_EXIT                          40003
 #define IDS_ARE_YOU_SURE                        40004