From c85b67b1da57a282cef3191de38a61ef6c51ccd0 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 9 Jul 2022 15:55:27 -0500
Subject: [PATCH] NES + chip -> Famicom + chip

---
 src/engine/sysDef.cpp | 12 ++++++------
 src/gui/presets.cpp   | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/engine/sysDef.cpp b/src/engine/sysDef.cpp
index 04815866d..a5b689b2b 100644
--- a/src/engine/sysDef.cpp
+++ b/src/engine/sysDef.cpp
@@ -165,25 +165,25 @@ String DivEngine::getSongSystemName(bool isMultiSystemAcceptable) {
       }
 
       if (song.system[0]==DIV_SYSTEM_NES && song.system[1]==DIV_SYSTEM_VRC6) {
-        return "NES + Konami VRC6";
+        return "Famicom + Konami VRC6";
       }
       if (song.system[0]==DIV_SYSTEM_NES && song.system[1]==DIV_SYSTEM_VRC7) {
-        return "NES + Konami VRC7";
+        return "Famicom + Konami VRC7";
       }
       if (song.system[0]==DIV_SYSTEM_NES && song.system[1]==DIV_SYSTEM_OPLL) {
-        return "NES + Yamaha OPLL";
+        return "Family Noraebang";
       }
       if (song.system[0]==DIV_SYSTEM_NES && song.system[1]==DIV_SYSTEM_FDS) {
         return "Famicom Disk System";
       }
       if (song.system[0]==DIV_SYSTEM_NES && song.system[1]==DIV_SYSTEM_N163) {
-        return "NES + Namco C163";
+        return "Famicom + Namco C163";
       }
       if (song.system[0]==DIV_SYSTEM_NES && song.system[1]==DIV_SYSTEM_MMC5) {
-        return "NES + MMC5";
+        return "Famicom + MMC5";
       }
       if (song.system[0]==DIV_SYSTEM_NES && song.system[1]==DIV_SYSTEM_AY8910) {
-        return "NES + Sunsoft 5B";
+        return "Famicom + Sunsoft 5B";
       }
 
       if (song.system[0]==DIV_SYSTEM_AY8910 && song.system[1]==DIV_SYSTEM_AY8910) {
diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp
index a3a494963..3774f232c 100644
--- a/src/gui/presets.cpp
+++ b/src/gui/presets.cpp
@@ -589,49 +589,49 @@ void FurnaceGUI::initSystemPresets() {
     }
   ));
   cat.systems.push_back(FurnaceGUISysDef(
-    "NES with Konami VRC6", {
+    "Famicom with Konami VRC6", {
       DIV_SYSTEM_NES, 64, 0, 0,
       DIV_SYSTEM_VRC6, 64, 0, 0,
       0
     }
   ));
   cat.systems.push_back(FurnaceGUISysDef(
-    "NES with Konami VRC7", {
+    "Famicom with Konami VRC7", {
       DIV_SYSTEM_NES, 64, 0, 0,
       DIV_SYSTEM_VRC7, 64, 0, 0,
       0
     }
   ));
   cat.systems.push_back(FurnaceGUISysDef(
-    "NES with MMC5", {
+    "Famicom with MMC5", {
       DIV_SYSTEM_NES, 64, 0, 0,
       DIV_SYSTEM_MMC5, 64, 0, 0,
       0
     }
   ));
   cat.systems.push_back(FurnaceGUISysDef(
-    "NES with Sunsoft 5B", {
+    "Famicom with Sunsoft 5B", {
       DIV_SYSTEM_NES, 64, 0, 0,
       DIV_SYSTEM_AY8910, 64, 0, 32,
       0
     }
   ));
   cat.systems.push_back(FurnaceGUISysDef(
-    "NES with Namco C163", {
+    "Famicom with Namco C163", {
       DIV_SYSTEM_NES, 64, 0, 0,
       DIV_SYSTEM_N163, 64, 0, 112,
       0
     }
   ));
   cat.systems.push_back(FurnaceGUISysDef(
-    "NES with Family Noraebang", {
+    "Comboy with Family Noraebang", {
       DIV_SYSTEM_NES, 64, 0, 0,
       DIV_SYSTEM_OPLL, 64, 0, 0,
       0
     }
   ));
   cat.systems.push_back(FurnaceGUISysDef(
-    "NES with Family Noraebang (drums mode)", {
+    "Comboy with Family Noraebang (drums mode)", {
       DIV_SYSTEM_NES, 64, 0, 0,
       DIV_SYSTEM_OPLL_DRUMS, 64, 0, 0,
       0
@@ -2094,7 +2094,7 @@ void FurnaceGUI::initSystemPresets() {
     }
   ));
   cat.systems.push_back(FurnaceGUISysDef(
-    "NES with Konami VRC7", {
+    "Famicom with Konami VRC7", {
       DIV_SYSTEM_NES, 64, 0, 0,
       DIV_SYSTEM_VRC7, 64, 0, 0,
       0