otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

NES + chip -> Famicom + chip

Browse source
This commit is contained in:
tildearrow 2022-07-09 15:55:27 -05:00
parent c2f1385703
commit c85b67b1da
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/engine/sysDef.cpp
View file

@ -165,25 +165,25 @@ String DivEngine::getSongSystemName(bool isMultiSystemAcceptable) {
} }
if (song.system[0]==DIV_SYSTEM_NES && song.system[1]==DIV_SYSTEM_VRC6) { 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) { 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) { 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) { if (song.system[0]==DIV_SYSTEM_NES && song.system[1]==DIV_SYSTEM_FDS) {
return "Famicom Disk System"; return "Famicom Disk System";
} }
if (song.system[0]==DIV_SYSTEM_NES && song.system[1]==DIV_SYSTEM_N163) { 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) { 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) { 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) { if (song.system[0]==DIV_SYSTEM_AY8910 && song.system[1]==DIV_SYSTEM_AY8910) {

16
src/gui/presets.cpp
View file

@ -589,49 +589,49 @@ void FurnaceGUI::initSystemPresets() {
} }
)); ));
cat.systems.push_back(FurnaceGUISysDef( cat.systems.push_back(FurnaceGUISysDef(
"NES with Konami VRC6", { "Famicom with Konami VRC6", {
DIV_SYSTEM_NES, 64, 0, 0, DIV_SYSTEM_NES, 64, 0, 0,
DIV_SYSTEM_VRC6, 64, 0, 0, DIV_SYSTEM_VRC6, 64, 0, 0,
0 0
} }
)); ));
cat.systems.push_back(FurnaceGUISysDef( cat.systems.push_back(FurnaceGUISysDef(
"NES with Konami VRC7", { "Famicom with Konami VRC7", {
DIV_SYSTEM_NES, 64, 0, 0, DIV_SYSTEM_NES, 64, 0, 0,
DIV_SYSTEM_VRC7, 64, 0, 0, DIV_SYSTEM_VRC7, 64, 0, 0,
0 0
} }
)); ));
cat.systems.push_back(FurnaceGUISysDef( cat.systems.push_back(FurnaceGUISysDef(
"NES with MMC5", { "Famicom with MMC5", {
DIV_SYSTEM_NES, 64, 0, 0, DIV_SYSTEM_NES, 64, 0, 0,
DIV_SYSTEM_MMC5, 64, 0, 0, DIV_SYSTEM_MMC5, 64, 0, 0,
0 0
} }
)); ));
cat.systems.push_back(FurnaceGUISysDef( cat.systems.push_back(FurnaceGUISysDef(
"NES with Sunsoft 5B", { "Famicom with Sunsoft 5B", {
DIV_SYSTEM_NES, 64, 0, 0, DIV_SYSTEM_NES, 64, 0, 0,
DIV_SYSTEM_AY8910, 64, 0, 32, DIV_SYSTEM_AY8910, 64, 0, 32,
0 0
} }
)); ));
cat.systems.push_back(FurnaceGUISysDef( cat.systems.push_back(FurnaceGUISysDef(
"NES with Namco C163", { "Famicom with Namco C163", {
DIV_SYSTEM_NES, 64, 0, 0, DIV_SYSTEM_NES, 64, 0, 0,
DIV_SYSTEM_N163, 64, 0, 112, DIV_SYSTEM_N163, 64, 0, 112,
0 0
} }
)); ));
cat.systems.push_back(FurnaceGUISysDef( cat.systems.push_back(FurnaceGUISysDef(
"NES with Family Noraebang", { "Comboy with Family Noraebang", {
DIV_SYSTEM_NES, 64, 0, 0, DIV_SYSTEM_NES, 64, 0, 0,
DIV_SYSTEM_OPLL, 64, 0, 0, DIV_SYSTEM_OPLL, 64, 0, 0,
0 0
} }
)); ));
cat.systems.push_back(FurnaceGUISysDef( 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_NES, 64, 0, 0,
DIV_SYSTEM_OPLL_DRUMS, 64, 0, 0, DIV_SYSTEM_OPLL_DRUMS, 64, 0, 0,
0 0
@ -2094,7 +2094,7 @@ void FurnaceGUI::initSystemPresets() {
} }
)); ));
cat.systems.push_back(FurnaceGUISysDef( cat.systems.push_back(FurnaceGUISysDef(
"NES with Konami VRC7", { "Famicom with Konami VRC7", {
DIV_SYSTEM_NES, 64, 0, 0, DIV_SYSTEM_NES, 64, 0, 0,
DIV_SYSTEM_VRC7, 64, 0, 0, DIV_SYSTEM_VRC7, 64, 0, 0,
0 0