From a81cd5fcb5967a808c941ac952a92958c67dff37 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Wed, 6 May 2020 05:13:47 +0800
Subject: [PATCH 001/295] Fix build when compiling without NTSC filter support

- broke on last commit
- fixed 3ds build
---
 src/drivers/libretro/libretro.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 52d2c93..73d1eff 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -970,7 +970,11 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
 #endif
    info->geometry.base_width = width;
    info->geometry.base_height = height;
+#ifdef HAVE_NTSC_FILTER
    info->geometry.max_width = (use_ntsc ? NTSC_WIDTH : NES_WIDTH);
+#else
+   info->geometry.max_width = NES_WIDTH;
+#endif
    info->geometry.max_height = NES_HEIGHT;
    info->geometry.aspect_ratio = (float)(use_par ? NES_8_7_PAR : NES_4_3);
    info->timing.sample_rate = (float)sndsamplerate;

From 542b8e64cbaae9114ed04c93f899025a2622457b Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Wed, 6 May 2020 05:45:24 +0800
Subject: [PATCH 002/295] Use proper geometry when switching ntsc filter on or
 off

- Width changes previously was not respected when using ntsc filter. With full use of overscan, nes width
is 602 px when ntsc filter is used and 256 px on normal
---
 src/drivers/libretro/libretro.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 73d1eff..ab6e46f 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -968,13 +968,14 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
    unsigned width  = NES_WIDTH - (overscan_h ? 16 : 0);
    unsigned height = NES_HEIGHT - (overscan_v ? 16 : 0);
 #endif
-   info->geometry.base_width = width;
-   info->geometry.base_height = height;
 #ifdef HAVE_NTSC_FILTER
+   info->geometry.base_width = (use_ntsc ? NES_NTSC_OUT_WIDTH(width) : width);
    info->geometry.max_width = (use_ntsc ? NTSC_WIDTH : NES_WIDTH);
 #else
+   info->geometry.base_width = width;
    info->geometry.max_width = NES_WIDTH;
 #endif
+   info->geometry.base_height = height;
    info->geometry.max_height = NES_HEIGHT;
    info->geometry.aspect_ratio = (float)(use_par ? NES_8_7_PAR : NES_4_3);
    info->timing.sample_rate = (float)sndsamplerate;

From 6b9899848c6cd6f4c91ad735087871c9c553b7b9 Mon Sep 17 00:00:00 2001
From: Autechre <libretro@gmail.com>
Date: Wed, 6 May 2020 01:05:16 +0200
Subject: [PATCH 003/295] Update Makefile.libretro

---
 Makefile.libretro | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index 42f51bc..b23ced1 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -726,7 +726,7 @@ ifneq (,$(findstring msvc,$(platform)))
 COREDEFINES += -DINLINE=_inline
 endif
 
-CFLAGS += -DWANT_GRIFFIN -Werror=implicit-function-declaration
+CFLAGS += -DWANT_GRIFFIN
 
 OBJECTS := $(SOURCES_C:.c=.o)
 OBJECTS += $(RETROARCH_OBJECTS)
@@ -743,7 +743,7 @@ else ifneq (,$(findstring msvc,$(platform)))
 WARNING_DEFINES =
 LIBM :=
 else
-WARNING_DEFINES = -Wno-write-strings
+WARNING_DEFINES = -Wno-write-strings -Werror=implicit-function-declaration
 endif
 
 CFLAGS += $(fpic) $(WARNING_DEFINES) $(DEFINES) $(ENDIANNESS_DEFINES) 

From d023887b85e645659ef6a0632dbe5a2015b29232 Mon Sep 17 00:00:00 2001
From: negativeExponent <54053706+negativeExponent@users.noreply.github.com>
Date: Wed, 6 May 2020 14:21:33 +0800
Subject: [PATCH 004/295] Update Makefile.libretro

---
 Makefile.libretro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index b23ced1..b71d0a4 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -743,7 +743,7 @@ else ifneq (,$(findstring msvc,$(platform)))
 WARNING_DEFINES =
 LIBM :=
 else
-WARNING_DEFINES = -Wno-write-strings -Werror=implicit-function-declaration
+WARNING_DEFINES = -Wno-write-strings
 endif
 
 CFLAGS += $(fpic) $(WARNING_DEFINES) $(DEFINES) $(ENDIANNESS_DEFINES) 

From 83457362e70f92d6c89974afc5aac80f59bbfe38 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Tue, 12 May 2020 09:44:31 +0800
Subject: [PATCH 005/295] ines-correct.h: Fix MMC1 overrides

MMC1 overrides are treated as ines 2.0, so its needs at least default values for prgRam and chrRam columns.

Fixes FF1 pink screen due to unmapped chrram.
---
 src/ines-correct.h | 61 +++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/ines-correct.h b/src/ines-correct.h
index ea9f9f3..7410d1a 100644
--- a/src/ines-correct.h
+++ b/src/ines-correct.h
@@ -5,21 +5,22 @@
 	don't have battery-backed RAM is not that big of a problem, so I'll
 	treat this differently by only listing games that should have battery-backed RAM.
 	*/
-	{ 0xb17574f3,    1, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* AD&D Heroes of the Lance */
-	{ 0x5de61639,    1, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* AD&D Hillsfar */
-	{ 0x2545214c,    1, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* DW */
-	{ 0x3b3f88f0,    1, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* DW */
-	{ 0x8c5a784e,    1, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* DW 2 */
-	{ 0x506e259d,    1, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* DW 4*/
-	{ 0xa86a5318,    1, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dw 3 */
-	{ 0x45f03d2e,    1, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Faria */
-	{ 0xb8b88130,    1, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Final Fantasy (FFE Hack) */
-	{ 0xcebd2a31,    1, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Final Fantasy */
-	{ 0xd29db3c7,    1, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Final Fantasy 2 */
-	{ 0x466efdc2,    1, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Final Fantasy J */
-	{ 0xeaf7ed72,    1, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Legend of Zelda */
-	{ 0x3fe272fb,    1, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Legend of Zelda */
-	{ 0xba322865,    1, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Zelda 2 */
+	/* CRC32, mapperNum, SubMapper, Mirroring, hasBattery, prgRam, chrRam, region, extra flags */
+	{ 0xb17574f3,    1, DEFAULT, DEFAULT, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* AD&D Heroes of the Lance */
+	{ 0x5de61639,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* AD&D Hillsfar */
+	{ 0x2545214c,    1, DEFAULT, DEFAULT, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* DW */
+	{ 0x3b3f88f0,    1, DEFAULT, DEFAULT, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* DW */
+	{ 0x8c5a784e,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* DW 2 */
+	{ 0x506e259d,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* DW 4*/
+	{ 0xa86a5318,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Dw 3 */
+	{ 0x45f03d2e,    1, DEFAULT, DEFAULT, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Faria */
+	{ 0xb8b88130,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Final Fantasy (FFE Hack) */
+	{ 0xcebd2a31,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Final Fantasy */
+	{ 0xd29db3c7,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Final Fantasy 2 */
+	{ 0x466efdc2,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Final Fantasy J */
+	{ 0xeaf7ed72,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Legend of Zelda */
+	{ 0x3fe272fb,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Legend of Zelda */
+	{ 0xba322865,    1, DEFAULT, DEFAULT, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Zelda 2 */
 	{ 0x25952141,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* AD&D Pool of Radiance */
 	{ 0x1335cb05,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Crystalis */
 	{ 0x57e220d0,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Final Fantasy 3 */
@@ -58,31 +59,31 @@
 	{ 0x5b837e8d,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Alien Syndrome (Japan).nes */
 	{ 0x37ba3261,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Back to the Future Part II & III (USA).nes */
 	{ 0x5b6ca654,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Barbie (USA).nes */
-	{ 0x61a852ea,    1, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Battle Stadium - Senbatsu Pro Yakyuu (Japan).nes */
+	{ 0x61a852ea,    1, DEFAULT, DFAULT8, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Battle Stadium - Senbatsu Pro Yakyuu (Japan).nes */
 	{ 0xf6fa4453,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bigfoot (U) [b4].nes */
-	{ 0x391aa1b8,    1, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bloody Warriors - Shan-Go no Gyakushuu (Japan).nes */
+	{ 0x391aa1b8,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Bloody Warriors - Shan-Go no Gyakushuu (Japan).nes */
 	{ 0xa5e8d2cd,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* BreakThru (USA).nes */
-	{ 0x3f56a392,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Captain ED (Japan).nes */
-	{ 0x078ced30,    1, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Choujin - Ultra Baseball (Japan).nes */
-	{ 0xfe364be5,    1, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Deep Dungeon IV - Kuro no Youjutsushi (Japan).nes */
+	{ 0x3f56a392,    1, DEFAULT, DFAULT8, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* Captain ED (Japan).nes */
+	{ 0x078ced30,    1, DEFAULT, DFAULT8, 1,    0x07, DEFAULT, DEFAULT, NOEXTRA }, /* Choujin - Ultra Baseball (Japan).nes */
+	{ 0xfe364be5,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Deep Dungeon IV - Kuro no Youjutsushi (Japan).nes */
 	{ 0x57c12280,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Demon Sword (U) [b1].nes */
 	{ 0xd09b74dc,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Great Tank (Japan).nes */
-	{ 0xe8baa782,    1, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Gunhed - Aratanaru Tatakai (Japan).nes */
-	{ 0x970bd9c2,    1, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Hanjuku Eiyuu (J) [b1].nes */
-	{ 0xcd7a2fd7,    1, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Hanjuku Hero (Japan).nes */
-	{ 0x63469396,    1, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Hokuto no Ken 4 - Shichisei Haken Den - Hokuto Shinken no Kanata e (Japan).nes */
-	{ 0xe94d5181,    1, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Future Wars - Mirai Senshi Lios (Japan).nes */
-	{ 0x7156cb4d,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Muppet Adventure - Chaos at the Carnival (USA).nes */
-	{ 0x70f67ab7,    1, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Musashi no Bouken (Japan).nes */
+	{ 0xe8baa782,    1, DEFAULT, DFAULT8, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Gunhed - Aratanaru Tatakai (Japan).nes */
+	{ 0x970bd9c2,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Hanjuku Eiyuu (J) [b1].nes */
+	{ 0xcd7a2fd7,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Hanjuku Hero (Japan).nes */
+	{ 0x63469396,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Hokuto no Ken 4 - Shichisei Haken Den - Hokuto Shinken no Kanata e (Japan).nes */
+	{ 0xe94d5181,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Future Wars - Mirai Senshi Lios (Japan).nes */
+	{ 0x7156cb4d,    1, DEFAULT, DFAULT8, 0,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Muppet Adventure - Chaos at the Carnival (USA).nes */
+	{ 0x70f67ab7,    1, DEFAULT, DFAULT8, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Musashi no Bouken (Japan).nes */
 	{ 0x958e4bae,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Orb-3D (USA).nes */
-	{ 0x291bcd7d,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pachio-kun 2 (Japan).nes */
-	{ 0xa9a4ea4c,    1, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Satomi Hakkenden (J) [b2].nes */
+	{ 0x291bcd7d,    1, DEFAULT, DFAULT8, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* Pachio-kun 2 (Japan).nes */
+	{ 0xa9a4ea4c,    1, DEFAULT, DFAULT8, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Satomi Hakkenden (J) [b2].nes */
 	{ 0xcc3544b0,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Triathron, The (Japan).nes */
 	{ 0x52ab2d17,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Toukyou Pachi-Slot Adventure (Japan).nes */
 	{ 0x934db14a,    1, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* All-Pro Basketball (USA).nes */
 	{ 0xf74dfc91,    1, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Win, Lose or Draw (USA).nes */
 	{ 0xcfe02ada,    1, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Darkman (Europe).nes */
-	{ 0x1a71fd06,    1, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Kujaku Ou.nes */
+	{ 0x1a71fd06,    1, DEFAULT,    MI_H, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* Kujaku Ou.nes */
 
 	/* MMC1 games with more than 8K wram */
 	{ 0x2225c20f,    1, DEFAULT, DEFAULT, 1,    0x77,    0x07, DEFAULT, NOEXTRA }, /* Genghis Khan */

From ed784833dd3539ec30479e62537e482c9670181a Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 17 May 2020 23:09:23 +0200
Subject: [PATCH 006/295] Buildfix

---
 src/input/zapper.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/input/zapper.c b/src/input/zapper.c
index 7729e5b..a0a7dd2 100644
--- a/src/input/zapper.c
+++ b/src/input/zapper.c
@@ -163,10 +163,12 @@ static uint32 InefficientSqrt(uint32 z) {
 }
 #endif
 
-void FCEU_ZapperSetTolerance(int t) {
+void FCEU_ZapperSetTolerance(int t)
+{
 #ifdef ROUNDED_TARGET
+	uint32_t y;
 	tolerance = t <= MAX_TOLERANCE ? t : MAX_TOLERANCE;
-	for (uint32 y = 0 ; y <= tolerance ; y++)
+	for (y = 0; y <= tolerance; y++)
 		targetExpansion[y] = InefficientSqrt(tolerance*tolerance-y*y);
 #else
 	tolerance = t;

From 9604a33f7a4b90c8c4236d36b509c1ba98089cc0 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 17 May 2020 23:30:06 +0200
Subject: [PATCH 007/295] MSVC2010 buildfix

---
 Makefile.libretro  | 2 +-
 src/input/zapper.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index b71d0a4..6f17bc9 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -84,7 +84,7 @@ else ifeq ($(platform), osx)
 	fpic := -fPIC
 	SHARED := -dynamiclib
 	ifeq ($(arch),ppc)
-		ENDIANNESS_DEFINES += -DMSB_FIRST
+		ENDIANNESS_DEFINES += -DMSB_FIRST -DHAVE_NO_LANGEXTRA
 	endif
 	OSXVER = `sw_vers -productVersion | cut -d. -f 2`
 	OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
diff --git a/src/input/zapper.c b/src/input/zapper.c
index a0a7dd2..776f51a 100644
--- a/src/input/zapper.c
+++ b/src/input/zapper.c
@@ -58,10 +58,11 @@ static void FP_FASTAPASS(3) ZapperFrapper(int w, uint8 * bg, uint8 * spr, uint32
 
 	if (scanline >= (zy - tolerance) && scanline <= (zy + tolerance)) {
 #ifdef ROUNDED_TARGET
+		int spread;
 		int dy = scanline - zy;
 		if (dy < 0)
 			dy = -dy;
-		int spread = targetExpansion[dy];
+		spread = targetExpansion[dy];
 #else
 		int spread = tolerance;
 #endif

From c68bfd4c7f42f587837c462fd32ae53564f14129 Mon Sep 17 00:00:00 2001
From: Francisco Javier Trujillo Mata <fjtrujy@gmail.com>
Date: Tue, 19 May 2020 21:03:22 +0200
Subject: [PATCH 008/295] Adapt ps2 port to latest SDK Status

---
 Makefile.libretro                             |   7 +-
 ps2/SMS_Utils.s                               | 202 ------------------
 ps2/inttypes.h                                |   8 -
 ps2/stdint.h                                  |  33 ---
 .../include/libretro_gskit_ps2.h              |   6 +-
 src/drivers/libretro/libretro.c               |   7 -
 6 files changed, 4 insertions(+), 259 deletions(-)
 delete mode 100644 ps2/SMS_Utils.s
 delete mode 100644 ps2/inttypes.h
 delete mode 100644 ps2/stdint.h

diff --git a/Makefile.libretro b/Makefile.libretro
index 6f17bc9..509515e 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -174,15 +174,12 @@ else ifeq ($(platform), ps2)
 	AR = ee-ar$(EXE_EXT)
 	FCEU_DEFINES := -DPATH_MAX=1024 -DINLINE=inline -DPSS_STYLE=1 -DFCEU_VERSION_NUMERIC=9813 -DHAVE_ASPRINTF
 	ENDIANNESS_DEFINES := -DLSB_FIRST -DLOCAL_LE=1
-	PLATFORM_DEFINES := -DPS2 -G0 -DFRONTEND_SUPPORTS_ABGR1555 -DRENDER_GSKIT_PS2
-	PLATFORM_DEFINES += -Dmemcpy=mips_memcpy -Dmemset=mips_memset
-	PLATFORM_DEFINES += -I$(PS2SDK)/ee/include -I$(PS2SDK)/common/include -Ips2/ -I$(PS2DEV)/gsKit/include
+	PLATFORM_DEFINES := -DPS2 -D_EE -G0 -DFRONTEND_SUPPORTS_ABGR1555 -DRENDER_GSKIT_PS2
+	PLATFORM_DEFINES += -I$(PS2SDK)/ee/include -I$(PS2SDK)/common/include -I$(PS2DEV)/gsKit/include
 	STATIC_LINKING=1
 	EXTERNAL_ZLIB=1
 
-	RETROARCH_OBJECTS +=  ps2/SMS_Utils.o
 	HAVE_NTSC = 0
-
 # PSP
 else ifeq ($(platform), psp1)
 	TARGET := $(TARGET_NAME)_libretro_$(platform).a
diff --git a/ps2/SMS_Utils.s b/ps2/SMS_Utils.s
deleted file mode 100644
index e437356..0000000
--- a/ps2/SMS_Utils.s
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-#     ___  _ _      ___
-#    |    | | |    |
-# ___|    |   | ___|    PS2DEV Open Source Project.
-#----------------------------------------------------------
-# MUL64 is pulled from some binary library (I don't remember which one).
-# mips_memcpy routine is pulled from 'sde' library from MIPS.
-#
-*/
-.set noat
-.set noreorder
-.set nomacro
-
-.globl MUL64
-.globl mips_memcpy
-.globl mips_memset
-
-.text
-
-MUL64:
-    pmultuw	$v0, $a0, $a1
-    dsra32	$a2, $a0, 0
-    dsra32  $v1, $a1, 0
-    mult    $v1, $a0, $v1
-    mult1   $a2, $a2, $a1
-    addu    $v1, $v1, $a2
-    dsll32  $v1, $v1, 0
-    jr      $ra
-    daddu   $v0, $v0, $v1
-
-mips_memcpy:
-    addu    $v0, $a0, $zero
-    beqz    $a2, 1f
-    sltiu   $t2, $a2, 12
-    bnez    $t2, 2f
-    xor     $v1, $a1, $a0
-    andi    $v1, $v1, 7
-    negu    $a3, $a0
-    beqz    $v1, 3f
-    andi    $a3, $a3, 7
-    beqz    $a3, 4f
-    subu    $a2, $a2, $a3
-    ldr     $v1, 0($a1)
-    ldl     $v1, 7($a1)
-    addu    $a1, $a1, $a3
-    sdr     $v1, 0($a0)
-    addu    $a0, $a0, $a3
-4:
-    andi    $v1, $a2, 31
-    subu    $a3, $a2, $v1
-    beqz    $a3, 5f
-    addu    $a2, $v1, $zero
-    addu    $a3, $a3, $a1
-6:
-    ldr     $v1,  0($a1)
-    ldl     $v1,  7($a1)
-    ldr     $t0,  8($a1)
-    ldl     $t0, 15($a1)
-    ldr     $t1, 16($a1)
-    ldl     $t1, 23($a1)
-    ldr     $t2, 24($a1)
-    ldl     $t2, 31($a1)
-    sd      $v1,  0($a0)
-    sd      $t0,  8($a0)
-    sd      $t1, 16($a0)
-    addiu   $a1, $a1, 32
-    addiu   $a0, $a0, 32
-    bne     $a1, $a3, 6b
-    sd      $t2, -8($a0)
-5:
-    andi    $v1, $a2, 7
-    subu    $a3, $a2, $v1
-    beqz    $a3, 2f
-    addu    $a2, $v1, $zero
-    addu    $a3, $a3, $a1
-7:
-    ldr     $v1, 0($a1)
-    ldl     $v1, 7($a1)
-    addiu   $a1, $a1, 8
-    addiu   $a0, $a0, 8
-    nop
-    bne     $a1, $a3, 7b
-    sd      $v1, -8($a0)
-    beq     $zero, $zero, 2f
-    nop
-3:
-    beqz    $a3, 8f
-    subu    $a2, $a2, $a3
-    ldr     $v1, 0($a1)
-    addu    $a1, $a1, $a3
-    sdr     $v1, 0($a0)
-    addu    $a0, $a0, $a3
-8:
-    andi    $v1, $a2, 31
-    subu    $a3, $a2, $v1
-    beqz    $a3, 9f
-    addu    $a2, $v1, $zero
-    addu    $a3, $a3, $a1
-10:
-    ld      $v1,  0($a1)
-    ld      $t0,  8($a1)
-    ld      $t1, 16($a1)
-    ld      $t2, 24($a1)
-    sd      $v1,  0($a0)
-    sd      $t0,  8($a0)
-    sd      $t1, 16($a0)
-    addiu   $a1, $a1, 32
-    addiu   $a0, $a0, 32
-    bne     $a1, $a3, 10b
-    sd      $t2, -8($a0)
-9:
-    andi    $v1, $a2, 7
-    subu    $a3, $a2, $v1
-    beqz    $a3, 2f
-    addu    $a2, $v1, $zero
-    addu    $a3, $a3, $a1
-11:
-    ld      $v1, 0($a1)
-    addiu   $a1, $a1, 8
-    addiu   $a0, $a0, 8
-    nop
-    nop
-    bne     $a1, $a3, 11b
-    sd      $v1, -8($a0)
-2:
-    beqz    $a2, 1f
-    addu    $a3, $a2, $a1
-12:
-    lbu     $v1, 0($a1)
-    addiu   $a1, $a1, 1
-    addiu   $a0, $a0, 1
-    nop
-    nop
-    bne     $a1, $a3, 12b
-    sb      $v1, -1($a0)
-1:
-    jr      $ra
-    nop
-
-mips_memset:
-    beqz    $a2, 1f
-    sltiu   $at, $a2, 16
-    bnez    $at, 2f
-    andi    $a1, $a1, 0xFF
-    dsll    $at, $a1, 0x8
-    or      $a1, $a1, $at
-    dsll    $at, $a1, 0x10
-    or      $a1, $a1, $at
-    dsll32  $at, $a1, 0x0
-    or      $a1, $a1, $at
-    andi    $v1, $a0, 0x7
-    beqz    $v1, 3f
-    li      $a3, 8
-    subu    $a3, $a3, $v1
-    subu    $a2, $a2, $a3
-    sdr     $a1, 0($a0)
-    addu    $a0, $a0, $a3
-3:
-    andi    $v1, $a2, 0x1f
-    subu    $a3, $a2, $v1
-    beqz    $a3, 4f
-    move    $a2, $v1
-    addu    $a3, $a3, $a0
-5:
-    sd      $a1,  0($a0)
-    sd      $a1,  8($a0)
-    sd      $a1, 16($a0)
-    addiu   $a0, $a0, 32
-    sd      $a1, -8($a0)
-    bne     $a0, $a3, 5b
-4:
-    andi    $v1, $a2, 0x7
-    subu    $a3, $a2, $v1
-    beqz    $a3, 2f
-    move    $a2, $v1
-    addu    $a3, $a3, $a0
-6:
-    addiu   $a0, $a0, 8
-    beq     $a0, $a3, 2f
-    sd      $a1, -8($a0)
-    addiu   $a0, $a0, 8
-    beq     $a0, $a3, 2f
-    sd      $a1, -8($a0)
-    addiu   $a0, $a0, 8
-    bne     $a0, $a3, 6b
-    sd      $a1, -8($a0)
-2:
-    beqz    $a2, 1f
-    addu    $a3, $a2, $a0
-7:
-    addiu   $a0, $a0, 1
-    beq     $a0, $a3, 1f
-    sb      $a1, -1($a0)
-    addiu   $a0, $a0, 1
-    beq     $a0, $a3, 1f
-    sb      $a1, -1($a0)
-    addiu   $a0, $a0, 1
-    bne     $a0, $a3, 7b
-    sb      $a1, -1($a0)
-1:
-    jr  $ra
-    nop
diff --git a/ps2/inttypes.h b/ps2/inttypes.h
deleted file mode 100644
index 3049fbd..0000000
--- a/ps2/inttypes.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef INTTYPES_H
-#define INTTYPES_H
-
-#define PRId64 "ld"
-#define PRIu64 "lu"
-#define PRIuPTR "lu"
-
-#endif //INTTYPES_H
diff --git a/ps2/stdint.h b/ps2/stdint.h
deleted file mode 100644
index ae9a75b..0000000
--- a/ps2/stdint.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef STDINT_H
-#define STDINT_H
-
-typedef unsigned long     uintptr_t;
-typedef signed long       intptr_t;
-
-typedef signed char       int8_t;
-typedef signed short      int16_t;
-typedef signed int        int32_t;
-typedef signed long       int64_t;
-typedef unsigned char     uint8_t;
-typedef unsigned short    uint16_t;
-typedef unsigned int      uint32_t;
-typedef unsigned long     uint64_t;
-
-typedef unsigned long uint_least32_t;
-typedef unsigned short uint_least16_t;
-
-#define	 STDIN_FILENO	0	/* standard input file descriptor */
-#define	STDOUT_FILENO	1	/* standard output file descriptor */
-#define	STDERR_FILENO	2	/* standard error file descriptor */
-
-#define INT8_C(val)  val##c
-#define INT16_C(val) val##h
-#define INT32_C(val) val##i
-#define INT64_C(val) val##l
-
-#define UINT8_C(val)  val##uc
-#define UINT16_C(val) val##uh
-#define UINT32_C(val) val##ui
-#define UINT64_C(val) val##ul
-
-#endif //STDINT_H
diff --git a/src/drivers/libretro/libretro-common/include/libretro_gskit_ps2.h b/src/drivers/libretro/libretro-common/include/libretro_gskit_ps2.h
index f7b61dc..033bb1f 100644
--- a/src/drivers/libretro/libretro-common/include/libretro_gskit_ps2.h
+++ b/src/drivers/libretro/libretro-common/include/libretro_gskit_ps2.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010-2018 The RetroArch team
+/* Copyright (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------------
  * The following license statement only applies to this libretro API header (libretro_d3d.h)
@@ -33,7 +33,7 @@
 
 #include <gsKit.h>
 
-#define RETRO_HW_RENDER_INTERFACE_GSKIT_PS2_VERSION 1
+#define RETRO_HW_RENDER_INTERFACE_GSKIT_PS2_VERSION 2
 
 struct retro_hw_ps2_insets
 {
@@ -57,8 +57,6 @@ struct retro_hw_render_interface_gskit_ps2
    * in this interface.
    */
    GSTEXTURE *coreTexture;
-   bool clearTexture;
-   bool updatedPalette;
    struct retro_hw_ps2_insets padding;
 };
 typedef struct retro_hw_render_interface_gskit_ps2 RETRO_HW_RENDER_INTEFACE_GSKIT_PS2;
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 127b95f..1a7e286 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -1063,12 +1063,6 @@ static void retro_set_custom_palette(void)
       }
       FCEUI_SetPaletteArray( base_palette );
    }
-
-#if defined(RENDER_GSKIT_PS2)
-   if (ps2) {
-      ps2->updatedPalette = true;
-   }
-#endif
 }
 
 /* Set variables for NTSC(1) / PAL(2) / Dendy(3)
@@ -1840,7 +1834,6 @@ static void retro_run_blit(uint8_t *gfx)
                                                    overscan_h ? 8.0f : 0.0f};
    }
 
-   ps2->updatedPalette = true;
    ps2->coreTexture->Clut = (u32*)retro_palette;
    ps2->coreTexture->Mem = (u32*)gfx;
 

From 86c29c0a5c314c9df78de0d6587fcf8224ada4d0 Mon Sep 17 00:00:00 2001
From: Francisco Javier Trujillo Mata <fjtrujy@gmail.com>
Date: Tue, 19 May 2020 22:14:04 +0200
Subject: [PATCH 009/295] Add CICD for ps2-platform

---
 .github/workflows/compilation.yml | 33 +++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .github/workflows/compilation.yml

diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml
new file mode 100644
index 0000000..02f4cef
--- /dev/null
+++ b/.github/workflows/compilation.yml
@@ -0,0 +1,33 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  repository_dispatch:
+    types: [run_build]
+
+jobs:
+  build-ps2:
+    runs-on: ubuntu-latest
+    container: ps2dev/ps2dev:latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install dependencies
+      run: |
+        apk add build-base git bash
+
+    - name: Compile project
+      run: |
+        make -f Makefile.libretro platform=ps2 clean all
+
+    - name: Get short SHA
+      id: slug
+      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
+
+    - name: Upload artifacts
+      if: ${{ success() }}
+      uses: actions/upload-artifact@v2
+      with:
+        name: fceumm_libretro_ps2-${{ steps.slug.outputs.sha8 }}
+        path: fceumm_libretro_ps2.a

From 48b80d3230f12158d46d3dd97b37d90f27506343 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Thu, 4 Jun 2020 13:26:02 +0800
Subject: [PATCH 010/295] Fix input not working on big-endian systems
 (regression fix)

Fix https://github.com/libretro/libretro-fceumm/issues/372
---
 src/drivers/libretro/libretro.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 1a7e286..d63b05f 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -123,7 +123,7 @@ typedef struct {
    uint32_t type[MAX_PLAYERS + 1];     /* 4-players + famicom expansion */
 
    /* input data */
-   uint8_t JSReturn[MAX_PLAYERS];      /* 1-4 player data */
+   uint32_t JSReturn;                  /* player input data, 1 byte per player (1-4) */
    uint32_t MouseData[MAX_PORTS][3];   /* nes mouse data */
    uint32_t FamicomData;               /* Famicom expansion port data */
 } NES_INPUT_T;
@@ -751,7 +751,7 @@ static void update_nes_controllers(unsigned port, unsigned device)
       case RETRO_DEVICE_GAMEPAD:
       default:
          nes_input.type[port] = RETRO_DEVICE_GAMEPAD;
-         FCEUI_SetInput(port, SI_GAMEPAD, (uint32_t*)nes_input.JSReturn, 0);
+         FCEUI_SetInput(port, SI_GAMEPAD, &nes_input.JSReturn, 0);
          FCEU_printf(" Player %u: Gamepad\n", port + 1);
          break;
       }
@@ -774,7 +774,7 @@ static void update_nes_controllers(unsigned port, unsigned device)
          FCEU_printf(" Famicom Expansion: Oeka Kids Tablet\n");
          break;
       case RETRO_DEVICE_FC_4PLAYERS:
-         FCEUI_SetInputFC(SIFC_4PLAYER, (uint32_t*)nes_input.JSReturn, 0);
+         FCEUI_SetInputFC(SIFC_4PLAYER, &nes_input.JSReturn, 0);
          FCEU_printf(" Famicom Expansion: Famicom 4-Player Adapter\n");
          break;
       case RETRO_DEVICE_NONE:
@@ -1636,6 +1636,9 @@ static void FCEUD_UpdateInput(void)
 
    poll_cb();
 
+   /* Reset input states */
+   nes_input.JSReturn = 0;
+
    /* nes gamepad */
    for (player = 0; player < MAX_PLAYERS; player++)
    {
@@ -1715,7 +1718,7 @@ static void FCEUD_UpdateInput(void)
                input_buf &= ~((JOY_LEFT ) | (JOY_RIGHT));
       }
 
-      nes_input.JSReturn[player] = input_buf;
+      nes_input.JSReturn |= (input_buf & 0xff) << (player << 3);
    }
 
    /* other inputs*/
@@ -2372,7 +2375,7 @@ bool retro_load_game(const struct retro_game_info *game)
    }
 
    for (i = 0; i < MAX_PORTS; i++) {
-      FCEUI_SetInput(i, SI_GAMEPAD, (uint32_t*)nes_input.JSReturn, 0);
+      FCEUI_SetInput(i, SI_GAMEPAD, &nes_input.JSReturn, 0);
       nes_input.type[i] = RETRO_DEVICE_JOYPAD;
    }
 
@@ -2408,7 +2411,7 @@ bool retro_load_game(const struct retro_game_info *game)
       if (famicom_4p_db_list[i].crc == iNESCart.CRC32)
       {
          GameInfo->inputfc = SIFC_4PLAYER;
-         FCEUI_SetInputFC(SIFC_4PLAYER, (uint32_t*)nes_input.JSReturn, 0);
+         FCEUI_SetInputFC(SIFC_4PLAYER, &nes_input.JSReturn, 0);
          nes_input.enable_4player = true;
          break;
       }

From aeaae261364959dd87349d4f63047f53baa36855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= <jean.andre.santoni@gmail.com>
Date: Sun, 12 Jul 2020 21:04:09 +0700
Subject: [PATCH 011/295] Add Micro Mages to fourscore_db_list

---
 src/drivers/libretro/libretro.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index d63b05f..ff11195 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -2059,6 +2059,10 @@ static const struct cartridge_db fourscore_db_list[] =
       "M.U.L.E. (USA)",
       0x0939852f
    },
+   {
+      "Micro Mages",
+      0x4e6b9078
+   },
    {
       "Monster Truck Rally (USA)",
       0x2f698c4d

From a20dc87b435cb173cc6e979a0dd9a33f34c173ca Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sat, 25 Jul 2020 14:17:26 +0800
Subject: [PATCH 012/295] Fix SIGSEGV error when using Famicom expansion
 devices (port 5)

---
 src/drivers/libretro/libretro.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index ff11195..154824b 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -125,7 +125,7 @@ typedef struct {
    /* input data */
    uint32_t JSReturn;                  /* player input data, 1 byte per player (1-4) */
    uint32_t MouseData[MAX_PORTS][3];   /* nes mouse data */
-   uint32_t FamicomData;               /* Famicom expansion port data */
+   uint32_t FamicomData[3];            /* Famicom expansion port data */
 } NES_INPUT_T;
 
 static NES_INPUT_T nes_input = { 0 };

From 3e50be9cb925ca18ddd553edc16d93c2b29de669 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 31 Aug 2020 10:37:59 +0800
Subject: [PATCH 013/295] Cheat: Add raw format and multiline cheat support

- Add handling raw cheat formats
Fix https://github.com/libretro/libretro-fceumm/issues/378

- Add multiline cheat support
---
 src/drivers/libretro/libretro.c | 46 +++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 154824b..2bef7bb 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -1966,25 +1966,45 @@ void retro_cheat_reset(void)
 void retro_cheat_set(unsigned index, bool enabled, const char *code)
 {
    char name[256];
+   char temp[256];
+   char *codepart;
    uint16 a;
    uint8  v;
    int    c;
    int    type = 1;
+   int    ret = 0;
+
+   if (code == NULL)
+      return;
+
    sprintf(name, "N/A");
+   strcpy(temp, code);
+   codepart = strtok(temp, "+,;._ ");
 
-   if (FCEUI_DecodeGG(code, &a, &v, &c))
-      goto input_cheat;
-
-   /* Not a Game Genie code. */
-
-   if (FCEUI_DecodePAR(code, &a, &v, &c, &type))
-      goto input_cheat;
-
-   /* Not a Pro Action Replay code. */
-
-   return;
-input_cheat:
-   FCEUI_AddCheat(name, a, v, c, type);
+   while (codepart)
+   {
+      if ((strlen(codepart) == 7) && (codepart[4]==':'))
+      {
+         /* raw code format */
+         c = -1;
+         codepart[4] = '\0';
+         a = strtoul(codepart, NULL, 16);
+         v = strtoul(codepart + 5, NULL, 16);
+         FCEUI_AddCheat(name, a, v, c, type);
+         log_cb.log(RETRO_LOG_DEBUG, "Cheat code added: '%s' (Raw)\n", codepart);
+      }
+      else if (FCEUI_DecodeGG(codepart, &a, &v, &c))
+      {
+         FCEUI_AddCheat(name, a, v, c, type);
+         log_cb.log(RETRO_LOG_DEBUG, "Cheat code added: '%s' (GG)\n", codepart);
+      }
+      else if (FCEUI_DecodePAR(codepart, &a, &v, &c, &type))
+      {
+         FCEUI_AddCheat(name, a, v, c, type);
+         log_cb.log(RETRO_LOG_DEBUG, "Cheat code added: '%s' (PAR)\n", codepart);
+      }
+      codepart = strtok(NULL,"+,;._ ");
+   }
 }
 
 typedef struct cartridge_db

From 0b362afcc03cbcca5b34eddcdb26445d29dcb87e Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 31 Aug 2020 12:49:42 +0800
Subject: [PATCH 014/295] Cheats: Fix pro action replay cheat format

Two issues are causiong PAR cheats to not work.
1. GG decoder should only accept specific characters. When it fails,
   assume PAR code.
2. The corrent code that makes PAR decoding work was not set.

Both fixed on this PR with some added notes.
---
 src/cheat.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/cheat.c b/src/cheat.c
index f92e8d4..2602bf5 100644
--- a/src/cheat.c
+++ b/src/cheat.c
@@ -332,27 +332,33 @@ int FCEUI_DecodeGG(const char *str, uint16 *a, uint8 *v, int *c) {
 	if (s != 6 && s != 8) return(0);
 
 	t = GGtobin(*str++);
+	if (!t) return (0);
 	V |= (t & 0x07);
 	V |= (t & 0x08) << 4;
 
 	t = GGtobin(*str++);
+	if (!t) return (0);
 	V |= (t & 0x07) << 4;
 	A |= (t & 0x08) << 4;
 
 	t = GGtobin(*str++);
+	if (!t) return (0);
 	A |= (t & 0x07) << 4;
 	/* if(t&0x08) return(0); */  /* 8-character code?! */
 
 	t = GGtobin(*str++);
+	if (!t) return (0);
 	A |= (t & 0x07) << 12;
 	A |= (t & 0x08);
 
 	t = GGtobin(*str++);
+	if (!t) return (0);
 	A |= (t & 0x07);
 	A |= (t & 0x08) << 8;
 
 	if (s == 6) {
 		t = GGtobin(*str++);
+		if (!t) return (0);
 		A |= (t & 0x07) << 8;
 		V |= (t & 0x08);
 
@@ -362,14 +368,17 @@ int FCEUI_DecodeGG(const char *str, uint16 *a, uint8 *v, int *c) {
 		return(1);
 	} else {
 		t = GGtobin(*str++);
+		if (!t) return (0);
 		A |= (t & 0x07) << 8;
 		C |= (t & 0x08);
 
 		t = GGtobin(*str++);
+		if (!t) return (0);
 		C |= (t & 0x07);
 		C |= (t & 0x08) << 4;
 
 		t = GGtobin(*str++);
+		if (!t) return (0);
 		C |= (t & 0x07) << 4;
 		V |= (t & 0x08);
 		*a = A;
@@ -388,13 +397,21 @@ int FCEUI_DecodePAR(const char *str, uint16 *a, uint8 *v, int *c, int *type) {
 
 	*c = -1;
 
-	if (1) {
+	/* 2020-08-31 - negativeExponent
+	 * Why is the top code set as default on non-debug runtime when
+	 * bottom code is what works for PAR?
+	 */
+	/* if (1) {
 		*a = (boo[3] << 8) | (boo[2] + 0x7F);
 		*v = 0;
 	} else {
 		*v = boo[3];
 		*a = boo[2] | (boo[1] << 8);
-	}
+	} */
+
+	*v = boo[3];
+	*a = boo[2] | (boo[1] << 8);
+
 	/* Zero-page addressing modes don't go through the normal read/write handlers in FCEU, so
 		we must do the old hacky method of RAM cheats.
 	*/

From 0ca1e69a9d87a91e9aa376564d25793d9ed0be04 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 31 Aug 2020 13:09:40 +0800
Subject: [PATCH 015/295] Cheat: Add raw codes support in xxxx?yy:zz format

---
 src/drivers/libretro/libretro.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 2bef7bb..11137e3 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -1985,11 +1985,22 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code)
    {
       if ((strlen(codepart) == 7) && (codepart[4]==':'))
       {
-         /* raw code format */
-         c = -1;
+         /* raw code in xxxx:xx format */
          codepart[4] = '\0';
          a = strtoul(codepart, NULL, 16);
          v = strtoul(codepart + 5, NULL, 16);
+         c = -1;
+         FCEUI_AddCheat(name, a, v, c, type);
+         log_cb.log(RETRO_LOG_DEBUG, "Cheat code added: '%s' (Raw)\n", codepart);
+      }
+      else if ((strlen(codepart) == 10) && (codepart[4] == '?') && (codepart[7] == ':'))
+      {
+         /* raw code in xxxx?xx:xx */
+         codepart[4] = '\0';
+         codepart[7] = '\0';
+         a = strtoul(codepart, NULL, 16);
+         v = strtoul(codepart + 8, NULL, 16);
+         c = strtoul(codepart + 5, NULL, 16);
          FCEUI_AddCheat(name, a, v, c, type);
          log_cb.log(RETRO_LOG_DEBUG, "Cheat code added: '%s' (Raw)\n", codepart);
       }

From 771822a2e0d93b51d57f9f45ec21f3cdea5471dd Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 31 Aug 2020 13:38:58 +0800
Subject: [PATCH 016/295] Fix logs

---
 src/drivers/libretro/libretro.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 11137e3..153e746 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -1986,23 +1986,23 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code)
       if ((strlen(codepart) == 7) && (codepart[4]==':'))
       {
          /* raw code in xxxx:xx format */
+         log_cb.log(RETRO_LOG_DEBUG, "Cheat code added: '%s' (Raw)\n", codepart);
          codepart[4] = '\0';
          a = strtoul(codepart, NULL, 16);
          v = strtoul(codepart + 5, NULL, 16);
          c = -1;
          FCEUI_AddCheat(name, a, v, c, type);
-         log_cb.log(RETRO_LOG_DEBUG, "Cheat code added: '%s' (Raw)\n", codepart);
       }
       else if ((strlen(codepart) == 10) && (codepart[4] == '?') && (codepart[7] == ':'))
       {
          /* raw code in xxxx?xx:xx */
+         log_cb.log(RETRO_LOG_DEBUG, "Cheat code added: '%s' (Raw)\n", codepart);
          codepart[4] = '\0';
          codepart[7] = '\0';
          a = strtoul(codepart, NULL, 16);
          v = strtoul(codepart + 8, NULL, 16);
          c = strtoul(codepart + 5, NULL, 16);
          FCEUI_AddCheat(name, a, v, c, type);
-         log_cb.log(RETRO_LOG_DEBUG, "Cheat code added: '%s' (Raw)\n", codepart);
       }
       else if (FCEUI_DecodeGG(codepart, &a, &v, &c))
       {

From 11ebeed2acffb8c618bb6e6b56765d199e4815c9 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Tue, 1 Sep 2020 23:00:14 +0800
Subject: [PATCH 017/295] Cheats: Fix RAW cheats that use zero-page address

---
 src/drivers/libretro/libretro.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 153e746..25209c3 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -1991,6 +1991,9 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code)
          a = strtoul(codepart, NULL, 16);
          v = strtoul(codepart + 5, NULL, 16);
          c = -1;
+         /* Zero-page addressing modes don't go through the normal read/write handlers in FCEU, so
+          * we must do the old hacky method of RAM cheats. */
+         if (a < 0x0100) type = 0;
          FCEUI_AddCheat(name, a, v, c, type);
       }
       else if ((strlen(codepart) == 10) && (codepart[4] == '?') && (codepart[7] == ':'))
@@ -2002,6 +2005,9 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code)
          a = strtoul(codepart, NULL, 16);
          v = strtoul(codepart + 8, NULL, 16);
          c = strtoul(codepart + 5, NULL, 16);
+         /* Zero-page addressing modes don't go through the normal read/write handlers in FCEU, so
+          * we must do the old hacky method of RAM cheats. */
+         if (a < 0x0100) type = 0;
          FCEUI_AddCheat(name, a, v, c, type);
       }
       else if (FCEUI_DecodeGG(codepart, &a, &v, &c))

From f4ef50722287f4fa43fc339b28041deb4d6125fa Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Wed, 9 Sep 2020 11:33:36 +0800
Subject: [PATCH 018/295] Cheats: Add check for valid game genie code format

- Partially reverts changes in https://github.com/libretro/libretro-fceumm/commit/0b362afcc03cbcca5b34eddcdb26445d29dcb87e
- Checks the codestring if its a valid game genie code before attempting
  to decode it. If code fails, then assume it to be a pro action replay
cheat.

Issue: Cheats where failing because a value of 0 in the decoder does not
mean an error.

Fix https://github.com/libretro/libretro-fceumm/issues/384
---
 src/cheat.c                     |  9 ---------
 src/drivers/libretro/libretro.c | 29 ++++++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/cheat.c b/src/cheat.c
index 2602bf5..cdf0aaf 100644
--- a/src/cheat.c
+++ b/src/cheat.c
@@ -332,33 +332,27 @@ int FCEUI_DecodeGG(const char *str, uint16 *a, uint8 *v, int *c) {
 	if (s != 6 && s != 8) return(0);
 
 	t = GGtobin(*str++);
-	if (!t) return (0);
 	V |= (t & 0x07);
 	V |= (t & 0x08) << 4;
 
 	t = GGtobin(*str++);
-	if (!t) return (0);
 	V |= (t & 0x07) << 4;
 	A |= (t & 0x08) << 4;
 
 	t = GGtobin(*str++);
-	if (!t) return (0);
 	A |= (t & 0x07) << 4;
 	/* if(t&0x08) return(0); */  /* 8-character code?! */
 
 	t = GGtobin(*str++);
-	if (!t) return (0);
 	A |= (t & 0x07) << 12;
 	A |= (t & 0x08);
 
 	t = GGtobin(*str++);
-	if (!t) return (0);
 	A |= (t & 0x07);
 	A |= (t & 0x08) << 8;
 
 	if (s == 6) {
 		t = GGtobin(*str++);
-		if (!t) return (0);
 		A |= (t & 0x07) << 8;
 		V |= (t & 0x08);
 
@@ -368,17 +362,14 @@ int FCEUI_DecodeGG(const char *str, uint16 *a, uint8 *v, int *c) {
 		return(1);
 	} else {
 		t = GGtobin(*str++);
-		if (!t) return (0);
 		A |= (t & 0x07) << 8;
 		C |= (t & 0x08);
 
 		t = GGtobin(*str++);
-		if (!t) return (0);
 		C |= (t & 0x07);
 		C |= (t & 0x08) << 4;
 
 		t = GGtobin(*str++);
-		if (!t) return (0);
 		C |= (t & 0x07) << 4;
 		V |= (t & 0x08);
 		*a = A;
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 25209c3..02dc738 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -1958,6 +1958,31 @@ bool retro_unserialize(const void * data, size_t size)
    return true;
 }
 
+static int checkGG(char c)
+{
+   static const char lets[16] = { 'A', 'P', 'Z', 'L', 'G', 'I', 'T', 'Y', 'E', 'O', 'X', 'U', 'K', 'S', 'V', 'N' };
+   int x;
+
+   for (x = 0; x < 16; x++)
+      if (lets[x] == toupper(c))
+         return 1;
+   return 0;
+}
+
+static int GGisvalid(const char *code)
+{
+   size_t len = strlen(code);
+   int i;
+   
+   if (len != 6 && len != 8)
+      return 0;
+
+   for (i = 0; i < len; i++)
+      if (!checkGG(code[i]))
+         return 0;
+   return 1;
+}
+
 void retro_cheat_reset(void)
 {
    FCEU_ResetCheats();
@@ -2010,7 +2035,7 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code)
          if (a < 0x0100) type = 0;
          FCEUI_AddCheat(name, a, v, c, type);
       }
-      else if (FCEUI_DecodeGG(codepart, &a, &v, &c))
+      else if (GGisvalid(codepart) && FCEUI_DecodeGG(codepart, &a, &v, &c))
       {
          FCEUI_AddCheat(name, a, v, c, type);
          log_cb.log(RETRO_LOG_DEBUG, "Cheat code added: '%s' (GG)\n", codepart);
@@ -2020,6 +2045,8 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code)
          FCEUI_AddCheat(name, a, v, c, type);
          log_cb.log(RETRO_LOG_DEBUG, "Cheat code added: '%s' (PAR)\n", codepart);
       }
+      else
+         log_cb.log(RETRO_LOG_DEBUG, "Invalid or unknown code: '%s'\n", codepart);
       codepart = strtok(NULL,"+,;._ ");
    }
 }

From e566538c9972307d702cbb9e8c9dbdb9131c791b Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Wed, 9 Sep 2020 11:51:04 +0800
Subject: [PATCH 019/295] Fix warning

---
 src/drivers/libretro/libretro.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 02dc738..5aa8526 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include <ctype.h>
 
 #include <libretro.h>
 #include <streams/memory_stream.h>

From 47f84dea99b36b9365331ca577e6aee83ed17f7f Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Fri, 2 Oct 2020 19:17:55 +0800
Subject: [PATCH 020/295] ntsc: Remove magic numbers and cleanup

---
 src/drivers/libretro/libretro.c | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 5aa8526..55088fe 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -633,7 +633,7 @@ struct st_palettes palettes[] = {
 #define NTSC_RGB        3
 #define NTSC_MONOCHROME 4
 
-#define NTSC_WIDTH      602
+#define NES_NTSC_WIDTH  (((NES_NTSC_OUT_WIDTH(256) + 3) >> 2) << 2)
 
 static unsigned use_ntsc = 0;
 static unsigned burst_phase;
@@ -652,7 +652,7 @@ static void NTSCFilter_Init(void)
 {
    memset(&nes_ntsc, 0, sizeof(nes_ntsc));
    memset(&ntsc_setup, 0, sizeof(ntsc_setup));
-   ntsc_video_out = (uint16_t *)malloc(NTSC_WIDTH * NES_HEIGHT * sizeof(uint16_t));
+   ntsc_video_out = (uint16_t *)malloc(NES_NTSC_WIDTH * NES_HEIGHT * sizeof(uint16_t));
 }
 
 static void NTSCFilter_Setup(void)
@@ -973,7 +973,7 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
 #endif
 #ifdef HAVE_NTSC_FILTER
    info->geometry.base_width = (use_ntsc ? NES_NTSC_OUT_WIDTH(width) : width);
-   info->geometry.max_width = (use_ntsc ? NTSC_WIDTH : NES_WIDTH);
+   info->geometry.max_width = (use_ntsc ? NES_NTSC_WIDTH : NES_WIDTH);
 #else
    info->geometry.base_width = width;
    info->geometry.max_width = NES_WIDTH;
@@ -1846,34 +1846,33 @@ static void retro_run_blit(uint8_t *gfx)
 #ifdef HAVE_NTSC_FILTER
    if (use_ntsc)
    {
-      int h_offset, v_offset;
-
       burst_phase ^= 1;
       if (ntsc_setup.merge_fields)
          burst_phase = 0;
 
       nes_ntsc_blit(&nes_ntsc, (NES_NTSC_IN_T const*)gfx, (NES_NTSC_IN_T *)XDBuf,
           NES_WIDTH, burst_phase, NES_WIDTH, NES_HEIGHT,
-          ntsc_video_out, NTSC_WIDTH * sizeof(uint16));
+          ntsc_video_out, NES_NTSC_WIDTH * sizeof(uint16));
 
-      h_offset = overscan_h ?  NES_NTSC_OUT_WIDTH(8) : 0;
-      v_offset = overscan_v ? 8 : 0;
-      width    = overscan_h ? 560 : 602;
-      height   = overscan_v ? 224 : 240;
+      width    = NES_WIDTH - (overscan_h ? 16 : 0);
+      width    = NES_NTSC_OUT_WIDTH(width);
+      height   = NES_HEIGHT - (overscan_v ? 16 : 0);
       pitch    = width * sizeof(uint16_t);
 
       {
-         const uint16_t *in = ntsc_video_out + h_offset + NTSC_WIDTH * v_offset;
-         uint16_t *out = fceu_video_out;
-         int y;
+         int32_t h_offset   = overscan_h ?  NES_NTSC_OUT_WIDTH(8) : 0;
+         int32_t v_offset   = overscan_v ? 8 : 0;
+         const uint16_t *in = ntsc_video_out + h_offset + NES_NTSC_WIDTH * v_offset;
+         uint16_t *out      = fceu_video_out;
 
          for (y = 0; y < height; y++)
          {
-            memcpy(out, in, width * sizeof(uint16_t));
-            in += NTSC_WIDTH;
+            memcpy(out, in, pitch);
+            in += NES_NTSC_WIDTH;
             out += width;
          }
       }
+      video_cb(fceu_video_out, width, height, pitch);
    }
    else
 #endif /* HAVE_NTSC_FILTER */
@@ -1897,8 +1896,8 @@ static void retro_run_blit(uint8_t *gfx)
             for (x = 0; x < width; x++, gfx++)
                fceu_video_out[y * width + x] = retro_palette[*gfx];
       }
+      video_cb(fceu_video_out, width, height, pitch);
    }
-   video_cb(fceu_video_out, width, height, pitch);
 #endif
 }
 
@@ -2406,7 +2405,7 @@ bool retro_load_game(const struct retro_game_info *game)
    fceu_video_out = (uint16_t*)linearMemAlign(256 * 240 * sizeof(uint16_t), 128);
 #elif !defined(PSP)
 #ifdef HAVE_NTSC_FILTER
-#define FB_WIDTH NTSC_WIDTH
+#define FB_WIDTH NES_NTSC_WIDTH
 #define FB_HEIGHT NES_HEIGHT
 #else /* !HAVE_NTSC_FILTER */
 #define FB_WIDTH NES_WIDTH

From 6e1d87384677480098e4c054cca5b41692b46c01 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Fri, 2 Oct 2020 19:24:00 +0800
Subject: [PATCH 021/295] Rename overscan-related variables

- Rename overscan options to something more readable
- Fixes PSP overscan option logic where some places where the option is reversed
---
 src/drivers/libretro/libretro.c | 68 ++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 55088fe..a88a9cf 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -69,10 +69,10 @@ static retro_input_state_t input_cb = NULL;
 static retro_audio_sample_batch_t audio_batch_cb = NULL;
 retro_environment_t environ_cb = NULL;
 #ifdef PSP
-static bool use_overscan;
+static bool crop_overscan;
 #else
-static bool overscan_h;
-static bool overscan_v;
+static bool crop_overscan_h;
+static bool crop_overscan_v;
 #endif
 
 static bool use_raw_palette;
@@ -965,11 +965,11 @@ void retro_get_system_info(struct retro_system_info *info)
 void retro_get_system_av_info(struct retro_system_av_info *info)
 {
 #ifdef PSP
-   unsigned width  = NES_WIDTH - (use_overscan ? 16 : 0);
-   unsigned height = NES_HEIGHT - (use_overscan ? 16 : 0);
+   unsigned width  = NES_WIDTH  - (crop_overscan ? 16 : 0);
+   unsigned height = NES_HEIGHT - (crop_overscan ? 16 : 0);
 #else
-   unsigned width  = NES_WIDTH - (overscan_h ? 16 : 0);
-   unsigned height = NES_HEIGHT - (overscan_v ? 16 : 0);
+   unsigned width  = NES_WIDTH  - (crop_overscan_h ? 16 : 0);
+   unsigned height = NES_HEIGHT - (crop_overscan_v ? 16 : 0);
 #endif
 #ifdef HAVE_NTSC_FILTER
    info->geometry.base_width = (use_ntsc ? NES_NTSC_OUT_WIDTH(width) : width);
@@ -1325,10 +1325,10 @@ static void check_variables(bool startup)
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
-      bool newval = (!strcmp(var.value, "disabled"));
-      if (newval != use_overscan)
+      bool newval = (!strcmp(var.value, "enabled"));
+      if (newval != crop_overscan)
       {
-         use_overscan = newval;
+         crop_overscan = newval;
          audio_video_updated = 1;
       }
    }
@@ -1339,9 +1339,9 @@ static void check_variables(bool startup)
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
       bool newval = (!strcmp(var.value, "enabled"));
-      if (newval != overscan_h)
+      if (newval != crop_overscan_h)
       {
-         overscan_h = newval;
+         crop_overscan_h = newval;
          audio_video_updated = 1;
       }
    }
@@ -1351,9 +1351,9 @@ static void check_variables(bool startup)
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
       bool newval = (!strcmp(var.value, "enabled"));
-      if (newval != overscan_v)
+      if (newval != crop_overscan_v)
       {
-         overscan_v = newval;
+         crop_overscan_v = newval;
          audio_video_updated = 1;
       }
    }
@@ -1544,10 +1544,10 @@ void get_mouse_input(unsigned port, uint32_t *zapdata)
    int min_width, min_height, max_width, max_height;
 
 #ifdef PSP
-   adjx = adjy = use_overscan ? 1 : 0;
+   adjx = adjy = crop_overscan ? 1 : 0;
 #else
-   adjx        = overscan_h ? 1 : 0;
-   adjy        = overscan_v ? 1 : 0;
+   adjx        = crop_overscan_h ? 1 : 0;
+   adjy        = crop_overscan_v ? 1 : 0;
 #endif
    max_width   = 256;
    max_height  = 240;
@@ -1780,7 +1780,7 @@ static void retro_run_blit(uint8_t *gfx)
    unsigned pitch  = 512;
 
 #ifdef PSP
-   if (!use_overscan)
+   if (crop_overscan)
    {
       width  -= 16;
       height -= 16;
@@ -1796,10 +1796,10 @@ static void retro_run_blit(uint8_t *gfx)
     * so we use GU_PSM_4444 ( 2 Bytes per pixel ) instead
     * with half the values for pitch / width / x offset
     */
-   if (use_overscan)
-      sceGuCopyImage(GU_PSM_4444, 0, 0, 128, 240, 128, XBuf, 0, 0, 128, texture_vram_p);
-   else
+   if (crop_overscan)
       sceGuCopyImage(GU_PSM_4444, 4, 4, 120, 224, 128, XBuf, 0, 0, 128, texture_vram_p);
+   else
+      sceGuCopyImage(GU_PSM_4444, 0, 0, 128, 240, 128, XBuf, 0, 0, 128, texture_vram_p);
 
    sceGuTexSync();
    sceGuTexImage(0, 256, 256, 256, texture_vram_p);
@@ -1832,10 +1832,10 @@ static void retro_run_blit(uint8_t *gfx)
       ps2->coreTexture->PSM = GS_PSM_T8;
       ps2->coreTexture->ClutPSM = GS_PSM_CT16;
       ps2->coreTexture->Filter = GS_FILTER_LINEAR;
-      ps2->padding = (struct retro_hw_ps2_insets){ overscan_v ? 8.0f : 0.0f,
-                                                   overscan_h ? 8.0f : 0.0f,
-                                                   overscan_v ? 8.0f : 0.0f,
-                                                   overscan_h ? 8.0f : 0.0f};
+      ps2->padding = (struct retro_hw_ps2_insets){ crop_overscan_v ? 8.0f : 0.0f,
+                                                   crop_overscan_h ? 8.0f : 0.0f,
+                                                   crop_overscan_v ? 8.0f : 0.0f,
+                                                   crop_overscan_h ? 8.0f : 0.0f};
    }
 
    ps2->coreTexture->Clut = (u32*)retro_palette;
@@ -1854,14 +1854,14 @@ static void retro_run_blit(uint8_t *gfx)
           NES_WIDTH, burst_phase, NES_WIDTH, NES_HEIGHT,
           ntsc_video_out, NES_NTSC_WIDTH * sizeof(uint16));
 
-      width    = NES_WIDTH - (overscan_h ? 16 : 0);
+      width    = NES_WIDTH - (crop_overscan_h ? 16 : 0);
       width    = NES_NTSC_OUT_WIDTH(width);
-      height   = NES_HEIGHT - (overscan_v ? 16 : 0);
+      height   = NES_HEIGHT - (crop_overscan_v ? 16 : 0);
       pitch    = width * sizeof(uint16_t);
 
       {
-         int32_t h_offset   = overscan_h ?  NES_NTSC_OUT_WIDTH(8) : 0;
-         int32_t v_offset   = overscan_v ? 8 : 0;
+         int32_t h_offset   = crop_overscan_h ?  NES_NTSC_OUT_WIDTH(8) : 0;
+         int32_t v_offset   = crop_overscan_v ? 8 : 0;
          const uint16_t *in = ntsc_video_out + h_offset + NES_NTSC_WIDTH * v_offset;
          uint16_t *out      = fceu_video_out;
 
@@ -1877,11 +1877,11 @@ static void retro_run_blit(uint8_t *gfx)
    else
 #endif /* HAVE_NTSC_FILTER */
    {
-      incr   += (overscan_h ? 16 : 0);
-      width  -= (overscan_h ? 16 : 0);
-      height -= (overscan_v ? 16 : 0);
-      pitch  -= (overscan_h ? 32 : 0);
-      gfx    += (overscan_v ? ((overscan_h ? 8 : 0) + 256 * 8) : (overscan_h ? 8 : 0));
+      incr   += (crop_overscan_h ? 16 : 0);
+      width  -= (crop_overscan_h ? 16 : 0);
+      height -= (crop_overscan_v ? 16 : 0);
+      pitch  -= (crop_overscan_h ? 32 : 0);
+      gfx    += (crop_overscan_v ? ((crop_overscan_h ? 8 : 0) + 256 * 8) : (crop_overscan_h ? 8 : 0));
 
       if (use_raw_palette)
       {

From 085efc98a7b5200e51f44240110a6ce4c89b2ba4 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 5 Oct 2020 10:38:44 +0800
Subject: [PATCH 022/295] input: Fix warnings [-Wincompatible-pointer-types]

---
 src/drivers/libretro/libretro.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index a88a9cf..3f41833 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -763,15 +763,15 @@ static void update_nes_controllers(unsigned port, unsigned device)
       switch (device)
       {
       case RETRO_DEVICE_FC_ARKANOID:
-         FCEUI_SetInputFC(SIFC_ARKANOID, &nes_input.FamicomData, 0);
+         FCEUI_SetInputFC(SIFC_ARKANOID, nes_input.FamicomData, 0);
          FCEU_printf(" Famicom Expansion: Arkanoid\n");
          break;
       case RETRO_DEVICE_FC_SHADOW:
-         FCEUI_SetInputFC(SIFC_SHADOW, &nes_input.FamicomData, 1);
+         FCEUI_SetInputFC(SIFC_SHADOW, nes_input.FamicomData, 1);
          FCEU_printf(" Famicom Expansion: (Bandai) Hyper Shot\n");
          break;
       case RETRO_DEVICE_FC_OEKAKIDS:
-         FCEUI_SetInputFC(SIFC_OEKAKIDS, &nes_input.FamicomData, 1);
+         FCEUI_SetInputFC(SIFC_OEKAKIDS, nes_input.FamicomData, 1);
          FCEU_printf(" Famicom Expansion: Oeka Kids Tablet\n");
          break;
       case RETRO_DEVICE_FC_4PLAYERS:
@@ -1740,7 +1740,7 @@ static void FCEUD_UpdateInput(void)
       case RETRO_DEVICE_FC_ARKANOID:
       case RETRO_DEVICE_FC_OEKAKIDS:
       case RETRO_DEVICE_FC_SHADOW:
-         get_mouse_input(0, &nes_input.FamicomData);
+         get_mouse_input(0, nes_input.FamicomData);
          break;
    }
 

From 0a40774e8628e64457aa57f48736f335f8652dbe Mon Sep 17 00:00:00 2001
From: Autechre <libretro@gmail.com>
Date: Tue, 6 Oct 2020 18:58:56 +0200
Subject: [PATCH 023/295] Create .gitlab-ci.yml

---
 .gitlab-ci.yml | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..b24ca82
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,65 @@
+.core-defs:
+  variables:
+    JNI_PATH: .
+    CORENAME: fceumm
+
+include:
+  - template: Jobs/Code-Quality.gitlab-ci.yml
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/libnx-static.yml'
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/linux-x64.yml'
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-x64-mingw.yml'
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/android-jni.yml'
+
+stages:
+  - build-prepare
+  - build-shared
+  - build-static
+  - test
+
+#Desktop
+libretro-build-linux-x64:
+  extends:
+    - .core-defs
+    - .libretro-linux-x64-make-default
+  variables:
+    MAKEFILE: Makefile.libretro
+
+libretro-build-windows-x64:
+  extends:
+    - .core-defs
+    - .libretro-windows-x64-mingw-make-default
+  variables:
+    MAKEFILE: Makefile.libretro
+    
+# Android
+android-armeabi-v7a:
+  extends:
+    - .core-defs
+    - .libretro-android-jni-armeabi-v7a
+
+android-arm64-v8a:
+  extends:
+    - .core-defs
+    - .libretro-android-jni-arm64-v8a
+
+android-x86_64:
+  extends:
+    - .core-defs
+    - .libretro-android-jni-x86_64
+    
+android-x86:
+  extends:
+    - .core-defs
+    - .libretro-android-jni-x86
+
+# Static
+libretro-build-libnx-aarch64:
+  extends:
+    - .core-defs
+    - .libretro-libnx-static-retroarch-master
+  variables:
+    MAKEFILE: Makefile.libretro

From da770d9ac8ba7a0ac2da4824a4abeea53d453984 Mon Sep 17 00:00:00 2001
From: Autechre <libretro@gmail.com>
Date: Tue, 6 Oct 2020 20:33:47 +0200
Subject: [PATCH 024/295] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b24ca82..90273dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,6 +40,11 @@ android-armeabi-v7a:
   extends:
     - .core-defs
     - .libretro-android-jni-armeabi-v7a
+    
+android-armeabi:
+  extends:
+    - .core-defs
+    - .libretro-android-jni-armeabi
 
 android-arm64-v8a:
   extends:
@@ -55,6 +60,16 @@ android-x86:
   extends:
     - .core-defs
     - .libretro-android-jni-x86
+    
+android-mips:
+  extends:
+    - .core-defs
+    - .libretro-android-jni-mips
+    
+android-mips64:
+  extends:
+    - .core-defs
+    - .libretro-android-jni-mips64
 
 # Static
 libretro-build-libnx-aarch64:

From 5218acf52cf0b0a711703bc3eee8f06c0d62cb70 Mon Sep 17 00:00:00 2001
From: Autechre <libretro@gmail.com>
Date: Tue, 6 Oct 2020 20:37:48 +0200
Subject: [PATCH 025/295] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90273dc..b24ca82 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,11 +40,6 @@ android-armeabi-v7a:
   extends:
     - .core-defs
     - .libretro-android-jni-armeabi-v7a
-    
-android-armeabi:
-  extends:
-    - .core-defs
-    - .libretro-android-jni-armeabi
 
 android-arm64-v8a:
   extends:
@@ -60,16 +55,6 @@ android-x86:
   extends:
     - .core-defs
     - .libretro-android-jni-x86
-    
-android-mips:
-  extends:
-    - .core-defs
-    - .libretro-android-jni-mips
-    
-android-mips64:
-  extends:
-    - .core-defs
-    - .libretro-android-jni-mips64
 
 # Static
 libretro-build-libnx-aarch64:

From 451a040d26475bba57a364e743ca2858dd13cf78 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 7 Oct 2020 00:07:12 +0200
Subject: [PATCH 026/295] (gitlab) Add vita

---
 .gitlab-ci.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b24ca82..ced340e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,8 @@ include:
   - template: Jobs/Code-Quality.gitlab-ci.yml
   - project: 'libretro-infrastructure/ci-templates'
     file: '/libnx-static.yml'
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/vita-static.yml'
   - project: 'libretro-infrastructure/ci-templates'
     file: '/linux-x64.yml'
   - project: 'libretro-infrastructure/ci-templates'
@@ -63,3 +65,10 @@ libretro-build-libnx-aarch64:
     - .libretro-libnx-static-retroarch-master
   variables:
     MAKEFILE: Makefile.libretro
+
+libretro-build-vita:
+  extends:
+    - .core-defs
+    - .libretro-vita-static-retroarch-master
+  variables:
+    MAKEFILE: Makefile.libretro

From e03f7adc85012062dc92152a64aa5801d52bb6dd Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 7 Oct 2020 00:09:44 +0200
Subject: [PATCH 027/295] Fix warnings

---
 src/fds_apu.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/fds_apu.c b/src/fds_apu.c
index 8d67d36..8115c03 100644
--- a/src/fds_apu.c
+++ b/src/fds_apu.c
@@ -19,11 +19,12 @@
  */
 
 /* Begin FDS sound */
-
+#include <string.h>
 #include "fceu-types.h"
 #include "x6502.h"
 #include "fceu.h"
 #include "sound.h"
+#include "state.h"
 
 #define FDSClock (1789772.7272727272727272 / 2)
 
@@ -295,4 +296,4 @@ DECLFW(FDSSoundWrite) {
 void FDSSoundPower(void) {
 	FDSSoundReset();
 	FDSSoundStateAdd();
-}
\ No newline at end of file
+}

From 5657cb9a1cc24ce9509a09118824a784a492cbb9 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sun, 11 Oct 2020 20:25:44 +0800
Subject: [PATCH 028/295] Add mapper 554

---
 src/boards/554.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  1 +
 src/ines.h       |  1 +
 3 files changed, 79 insertions(+)
 create mode 100644 src/boards/554.c

diff --git a/src/boards/554.c b/src/boards/554.c
new file mode 100644
index 0000000..bbb4796
--- /dev/null
+++ b/src/boards/554.c
@@ -0,0 +1,77 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2020 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* Mapper 554 - Kaiser KS-7010
+ * used for one of several cartridge conversions of the FDS version of
+ * 悪魔城 Dracula, the Japanese version of Castlevania
+ */
+
+#include "mapinc.h"
+
+static uint8 reg;
+
+static SFORMAT StateRegs[] =
+{
+	{ &reg, 1, "REG" },
+	{ 0 }
+};
+
+static void Sync(void) {
+	setprg8(0x6000, reg);
+    setprg8(0x8000, 10);
+    setprg8(0xA000, 11);
+    setprg8(0xC000, 6);
+    setprg8(0xE000, 7);
+    setchr8(reg);
+}
+
+static DECLFR(M554Read) {
+    if ((A >= 0xCAB6) && (A < 0xCAD7))
+    {
+        reg = (A >> 2) & 0x0F;
+        Sync();
+    }
+    else if ((A == 0xEBE2) || (A == 0xEE32))
+    {
+        reg = (A >> 2) & 0x0F;
+        Sync();
+    }
+    else if (A == 0xFFFC)
+    {
+        reg = (A >> 2) & 0x0F;
+        Sync();
+    }
+    return CartBR(A);
+}
+
+static void M554Power(void) {
+	Sync();
+    SetReadHandler(0x6000, 0xFFFF, M554Read);
+}
+
+static void StateRestore(int version) {
+	Sync();
+}
+
+void Mapper554_Init(CartInfo *info) {
+	info->Power = M554Power;
+	GameStateRestore = StateRestore;
+	AddExState(&StateRegs, ~0, 0, 0);
+}
diff --git a/src/ines.c b/src/ines.c
index 6d811a0..b974723 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -706,6 +706,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "82112C",                   540, Mapper540_Init         )
 	INES_BOARD( "LittleCom 160-in-1",       541, Mapper541_Init         )
 	INES_BOARD( "5-in-1 (CH-501)",          543, Mapper543_Init         )
+	INES_BOARD( "KS-7010",                  554, Mapper554_Init         )
 	INES_BOARD( "",                         550, Mapper550_Init         )
 
 	/* UNIF to NES 2.0 BOARDS */
diff --git a/src/ines.h b/src/ines.h
index 24e0abb..347eeeb 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -274,5 +274,6 @@ void Mapper540_Init(CartInfo *);
 void Mapper541_Init(CartInfo *);
 void Mapper543_Init(CartInfo *);
 void Mapper550_Init(CartInfo *);
+void Mapper554_Init(CartInfo *);
 
 #endif

From 8073cfba7e2d21bc69290d86e0ad01b31162103f Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sun, 11 Oct 2020 22:47:48 +0800
Subject: [PATCH 029/295] Add mapper 411

---
 src/boards/411.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  1 +
 src/ines.h       |  1 +
 3 files changed, 87 insertions(+)
 create mode 100644 src/boards/411.c

diff --git a/src/boards/411.c b/src/boards/411.c
new file mode 100644
index 0000000..eafa3cc
--- /dev/null
+++ b/src/boards/411.c
@@ -0,0 +1,85 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2020 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+/* Mapper 411 - A88S-1
+ * 1997 Super 7-in-1 (JY-201)
+ * 1997 Super 6-in-1 (JY-202)
+ * 1997 Super 7-in-1 (JY-203)
+ * 1997 龍珠武鬥會 7-in-1 (JY-204)
+ * 1997 Super 7-in-1 (JY-205)
+ * 1997 Super 7-in-1 (JY-206)
+ */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static void M411CW(uint32 A, uint8 V) {
+	uint32 mask = (EXPREGS[1] & 2) ? 0xFF : 0x7F;
+	V &= mask;
+	setchr1(A, V | ((EXPREGS[1] << 5) & 0x80) | ((EXPREGS[0] << 4) & 0x100));
+}
+
+static void M411PW(uint32 A, uint8 V) {
+	/* NROM Mode */
+	if (EXPREGS[0] & 0x40)
+	{
+		uint32 bank = (EXPREGS[0] & 1) | ((EXPREGS[0] >> 2) & 2) | (EXPREGS[0] & 4) | (EXPREGS[1] & 8) | ((EXPREGS[1] >> 2) & 0x10);
+
+		/* NROM-256 */
+		if (EXPREGS[0] & 0x02) {
+			setprg32(0x8000, bank >> 1);
+
+		/* NROM-128 */
+		} else {
+			setprg16(0x8000, bank);
+			setprg16(0xC000, bank);
+		}
+	}
+
+	/* MMC3 Mode */
+	else
+	{
+		uint32 mask = (EXPREGS[1] & 2) ? 0x1F : 0x0F;
+		V &= mask;
+		setprg8(A, V | ((EXPREGS[1] << 1) & 0x10) | ((EXPREGS[1] >> 1) & 0x20));
+	}
+}
+
+static DECLFW(M411Write5000) {
+	EXPREGS[A & 1] = V;
+	FixMMC3PRG(MMC3_cmd);
+	FixMMC3CHR(MMC3_cmd);
+}
+
+static void M411Power(void) {
+	EXPREGS[0] = 0x80;
+	EXPREGS[1] = 0x82;
+	GenMMC3Power();
+	SetWriteHandler(0x5000, 0x5FFF, M411Write5000);
+}
+
+void Mapper411_Init(CartInfo *info) {
+	GenMMC3_Init(info, 256, 256, 0, 0);
+	pwrap = M411PW;
+	cwrap = M411CW;
+	info->Power = M411Power;
+	AddExState(EXPREGS, 2, 0, "EXPR");
+}
diff --git a/src/ines.c b/src/ines.c
index 6d811a0..8897dab 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -698,6 +698,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "830928C",                  382, Mapper382_Init         )
 	INES_BOARD( "Caltron 9-in-1",           389, Mapper389_Init         )
 	INES_BOARD( "Realtec 8031",             390, Mapper390_Init         )
+	INES_BOARD( "A88S-1",                   411, Mapper411_Init         )
 	INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init        )
 	INES_BOARD( "Sachen 3014",              533, Mapper533_Init         )
 	INES_BOARD( "NJ064",                    534, Mapper534_Init         )
diff --git a/src/ines.h b/src/ines.h
index 24e0abb..3f40b06 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -265,6 +265,7 @@ void Mapper381_Init(CartInfo *);
 void Mapper382_Init(CartInfo *);
 void Mapper389_Init(CartInfo *);
 void Mapper390_Init(CartInfo *);
+void Mapper411_Init(CartInfo *);
 void Mapper516_Init(CartInfo *);
 void Mapper533_Init(CartInfo *);
 void Mapper534_Init(CartInfo *);

From 658370fa9030896a436ef5c6b2b0fd471a69aace Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 12 Oct 2020 11:12:07 +0800
Subject: [PATCH 030/295] m176: Always enable wram for ines-headered roms

---
 src/boards/fk23c.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c
index acb781a..f4c46ac 100644
--- a/src/boards/fk23c.c
+++ b/src/boards/fk23c.c
@@ -521,6 +521,9 @@ void BMCFK23C_Init(CartInfo *info) {
        * size when battery is set */
       if (info->battery)
          WRAMSIZE = 32 * 1024;
+      else
+         /* Always enable WRAM for ines-headered roms, lets see who complains */
+         WRAMSIZE = 8 * 1024;
    }
 
    GenBMCFK23C_Init(info);

From 7b1cb3e22449134112e371413d7171440456721c Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Tue, 13 Oct 2020 04:27:33 +0800
Subject: [PATCH 031/295] Enable default 8K wram to unif fk32ca

---
 src/boards/fk23c.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c
index f4c46ac..dece010 100644
--- a/src/boards/fk23c.c
+++ b/src/boards/fk23c.c
@@ -517,8 +517,7 @@ void BMCFK23C_Init(CartInfo *info) {
             CHRRAMSIZE = 8 * 1024;
       }
 
-      /* Only waixing boards has battery backed wram, so only declare
-       * size when battery is set */
+      /* Waixing boards has 32K battery backed wram */
       if (info->battery)
          WRAMSIZE = 32 * 1024;
       else
@@ -537,6 +536,8 @@ void BMCFK23CA_Init(CartInfo *info)
    if (!UNIFchrrama)
       CHRRAMSIZE = 8 * 1024;
 
+   WRAMSIZE = 8 * 1024;
+
    GenBMCFK23C_Init(info);
    is_bmcfk23ca = 1;
 }

From b42551e23280550934337d9ee2090865d9e5bfae Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 16 Oct 2020 00:56:39 +0200
Subject: [PATCH 032/295] Add ps2 target

---
 .gitlab-ci.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ced340e..c581253 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,8 @@ include:
     file: '/libnx-static.yml'
   - project: 'libretro-infrastructure/ci-templates'
     file: '/vita-static.yml'
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ps2-static.yml'
   - project: 'libretro-infrastructure/ci-templates'
     file: '/linux-x64.yml'
   - project: 'libretro-infrastructure/ci-templates'
@@ -72,3 +74,10 @@ libretro-build-vita:
     - .libretro-vita-static-retroarch-master
   variables:
     MAKEFILE: Makefile.libretro
+
+libretro-build-ps2:
+  extends:
+    - .core-defs
+    - .libretro-ps2-static-retroarch-master
+  variables:
+    MAKEFILE: Makefile.libretro

From abe6e3d232b51b65a08df5a4c18109fcca0f495c Mon Sep 17 00:00:00 2001
From: Autechre <libretro@gmail.com>
Date: Sun, 18 Oct 2020 19:20:16 +0200
Subject: [PATCH 033/295] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c581253..014629e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,8 @@ include:
     file: '/libnx-static.yml'
   - project: 'libretro-infrastructure/ci-templates'
     file: '/vita-static.yml'
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/psp-static.yml'
   - project: 'libretro-infrastructure/ci-templates'
     file: '/ps2-static.yml'
   - project: 'libretro-infrastructure/ci-templates'
@@ -75,6 +77,13 @@ libretro-build-vita:
   variables:
     MAKEFILE: Makefile.libretro
 
+libretro-build-psp:
+  extends:
+    - .core-defs
+    - .libretro-psp-static-retroarch-master
+  variables:
+    MAKEFILE: Makefile.libretro
+
 libretro-build-ps2:
   extends:
     - .core-defs

From 412e40698de037075842cb34bdaf09878e52c971 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 19 Oct 2020 08:18:23 +0800
Subject: [PATCH 034/295] Fix overrides incorrectly setting flags

---
 src/ines.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ines.c b/src/ines.c
index 8ca2d3e..8b8c621 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -328,13 +328,15 @@ static void CheckHInfo(void) {
 				case   1:
 				case   5:
 				case 176:
-					tofix |= 32;
-					iNESCart.iNES2 = 1;
 					if (moo[x].prgram >= 0) {
+						tofix |= 32;
+						iNESCart.iNES2 = 1;
 						iNESCart.PRGRamSize = (moo[x].prgram & 0x0F) ? (64 << ((moo[x].prgram >> 0) & 0xF)) : 0;
 						iNESCart.PRGRamSaveSize = (moo[x].prgram & 0xF0) ? (64 << ((moo[x].prgram >> 4) & 0xF)) : 0;
 					}
 					if (moo[x].chrram >= 0) {
+						tofix |= 32;
+						iNESCart.iNES2 = 1;
 						iNESCart.CHRRamSize = (moo[x].chrram & 0x0F) ? (64 << ((moo[x].chrram >> 0) & 0xF)) : 0;
 						iNESCart.CHRRamSaveSize = (moo[x].chrram & 0xF0) ? (64 << ((moo[x].chrram >> 4) & 0xF)) : 0;
 					}

From 023d2a397b2ee41035a240712a396fe253a3db0c Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 19 Oct 2020 09:17:45 +0800
Subject: [PATCH 035/295] m176: Updates

- Fix incorrect chr-bank mask (let's see which games complain again)

- Enables the 7-stage dipswitch support through reset switch.
  E.g switches multicart type on supported carts. like 10-in-1 to
  20-in-1 etc.
---
 src/boards/fk23c.c | 97 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 86 insertions(+), 11 deletions(-)

diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c
index dece010..8aed560 100644
--- a/src/boards/fk23c.c
+++ b/src/boards/fk23c.c
@@ -32,6 +32,76 @@
  * Subtype 2, 8192 or more KiB PRG-ROM, no CHR-ROM: Like Subtype 0, but MMC3 registers $46 and $47 swapped.
  */
 
+/*
+Mode Register ($5xx0)
+7654 3210
+---- ----
+PCTm PMMM
+|||| ||||
+|||| |+++- Select PRG Banking Mode (ignored in Extended MMC3 Mode)
+|||| |      0: MMC3 PRG Mode, 512 KiB Outer PRG Bank Size
+|||| |      1: MMC3 PRG Mode, 256 KiB Outer PRG Bank Size
+|||| |      2: MMC3 PRG Mode, 128 KiB Outer PRG Bank Size
+|||| |      3: NROM-128 PRG Mode, 16 KiB PRG at $8000-$BFFF mirrored at $C000-$FFFF
+|||| |      4: NROM-256 PRG Mode, 32 KiB PRG at $8000-$FFFF
+|||| |      5-7: Never used
+|||| +---- PRG Base A21
+|||+------ Select Outer CHR Bank Size
+|||         0: In MMC3 CHR Mode: 256 KiB
+|||            In CNROM CHR Mode: 32 KiB
+|||         1: In MMC3 CHR Mode: 128 KiB
+|||            In CNROM CHR Mode: 16 KiB
+||+------- Select CHR Memory Type
+||          0: CHR-ROM
+||          1: CHR-RAM
+|+-------- CHR Mode
+|           0: MMC3 CHR Mode
+|           1: NROM/CNROM CHR Mode
++--------- PRG Base A22
+
+Power-on value: $00
+
+PRG Base Register ($5xx1)
+Mask: $5xx3, x determined by solder pad setting
+
+7654 3210
+---- ----
+.PPP PPPP
+ ||| ||||
+ +++-++++- PRG Base A20..A14
+
+Power-on value: $00
+CHR Base Register ($5xx2)
+Mask: $5xx3, x determined by solder pad setting
+
+7654 3210
+---- ----
+ccdC CCCC
+|||| ||||
+++++-++++- CHR Base A20..A13
+||+------- PRG Base A25
+++-------- PRG Base A24..A23
+
+Power-on value: $00
+Writing to the CHR Base Register also resets the CNROM latch.
+
+Extended Mode Register ($5xx3)
+Mask: $5xx3, x determined by solder pad setting
+
+7654 3210
+---- ----
+.C.. .CE.
+ |    || 
+ |    |+- Extended MMC3 Mode
+ |    |    0: disable
+ |    |    1: enable
+ +----+-- Select NROM/CNROM CHR Mode
+           0: NROM
+           1: CNROM
+
+Power-on value: $02 (Submapper 1), $00 (otherwise)
+*/
+
 /* 2020-3-14 - Refactoring based on latest sources */
 /* TODO: Add database for ines 1.0 headers */
 
@@ -55,7 +125,11 @@ static uint8 irq_reload       = 0;
 static uint8 cnrom_chr        = 0;
 static uint8 dipswitch        = 0;
 static uint8 subType          = 0;
-static uint8 is_bmcfk23ca     = 0;
+
+/* enable dipswitch settings for fk23/fk23ca,
+ * switchable on reset. Can enable different multicart-modes
+ * depending on address */
+static uint8 dipsw_enable    = 0;
 
 static SFORMAT StateRegs[] = {
    { fk23_regs,               4, "EXPR" },
@@ -138,12 +212,12 @@ static void SyncCHR(void)
       {
          uint16 cbase         = INVERT_CHR ? 0x1000 : 0;
          uint8 mask           = CHR_OUTER_BANK_SIZE ? 0x7F : 0xFF;
-         uint16 outer         = (fk23_regs[2] << 3) & ~mask;
+         uint16 outer         = (fk23_regs[2] << 3);
 
-         cwrap(cbase ^ 0x0000, ((mmc3_regs[0] & 0xFE) & mask) | outer);
-         cwrap(cbase ^ 0x0400, ((mmc3_regs[0] | 0x01) & mask) | outer);
-         cwrap(cbase ^ 0x0800, ((mmc3_regs[1] & 0xFE) & mask) | outer);
-         cwrap(cbase ^ 0x0C00, ((mmc3_regs[1] | 0x01) & mask) | outer);
+         cwrap(cbase ^ 0x0000, ((mmc3_regs[0] & mask) & 0xFE) | outer);
+         cwrap(cbase ^ 0x0400, ((mmc3_regs[0] & mask) | 0x01) | outer);
+         cwrap(cbase ^ 0x0800, ((mmc3_regs[1] & mask) & 0xFE) | outer);
+         cwrap(cbase ^ 0x0C00, ((mmc3_regs[1] & mask) | 0x01) | outer);
 
          cwrap(cbase ^ 0x1000, (mmc3_regs[2] & mask) | outer);
          cwrap(cbase ^ 0x1400, (mmc3_regs[3] & mask) | outer);
@@ -383,10 +457,10 @@ static void IRQHook(void)
 static void Reset(void)
 {
    /* this little hack makes sure that we try all the dip switch settings eventually, if we reset enough */
-   /*if (is_bmcfk23ca) {
+   if (dipsw_enable) {
       dipswitch = (dipswitch + 1) & 7;
-      printf("BMCFK23C dipswitch set to $%04x\n",0x5000|0x10 << dipswitch);
-   }*/
+      FCEU_printf("BMCFK23C dipswitch set to $%04x\n",0x5000|0x10 << dipswitch);
+   }
 
    fk23_regs[0]   = fk23_regs[1] = fk23_regs[2] = fk23_regs[3] = 0;
    mmc3_regs[0]   = 0;
@@ -463,7 +537,7 @@ static void StateRestore(int version)
 
 void GenBMCFK23C_Init(CartInfo *info)
 {
-   is_bmcfk23ca = 0;
+   dipsw_enable      = 0;
 
    info->Power       = Power;
    info->Reset       = Reset;
@@ -526,6 +600,7 @@ void BMCFK23C_Init(CartInfo *info) {
    }
 
    GenBMCFK23C_Init(info);
+   dipsw_enable = 1;
 }
 
 /* UNIF Boards, declares so we can for chr mixed mode size and wram if any */
@@ -539,7 +614,7 @@ void BMCFK23CA_Init(CartInfo *info)
    WRAMSIZE = 8 * 1024;
 
    GenBMCFK23C_Init(info);
-   is_bmcfk23ca = 1;
+   dipsw_enable = 1;
 }
 
 /* BMC-Super24in1SC03 */

From 7d232046a1452e88f3e2a8817a5044613581451f Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 19 Oct 2020 09:31:16 +0800
Subject: [PATCH 036/295] Remove unused functions

---
 src/driver.h                    |  9 ---------
 src/drivers/libretro/libretro.c | 17 -----------------
 src/ppu.c                       |  2 +-
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/src/driver.h b/src/driver.h
index b3f029b..9ce4796 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -35,7 +35,6 @@ void FCEU_printf(char *format, ...);
 
 /* Video interface */
 void FCEUD_SetPalette(uint8 index, uint8 r, uint8 g, uint8 b);
-void FCEUD_GetPalette(uint8 i, uint8 *r, uint8 *g, uint8 *b);
 
 /* Displays an error.  Can block or not. */
 void FCEUD_PrintError(char *s);
@@ -51,14 +50,6 @@ int FCEUI_NetplayStart(int nlocal, int divisor);
 /* Call when network play needs to stop. */
 void FCEUI_NetplayStop(void);
 
-/* Note:  YOU MUST NOT CALL ANY FCEUI_* FUNCTIONS WHILE IN FCEUD_SendData() or
-   FCEUD_RecvData().
-*/
-
-/* Return 0 on failure, 1 on success. */
-int FCEUD_SendData(void *data, uint32 len);
-int FCEUD_RecvData(void *data, uint32 len);
-
 /* Display text received over the network. */
 void FCEUD_NetplayText(uint8 *text);
 
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 3f41833..56b2bb2 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -202,11 +202,6 @@ const char * GetKeyboard(void)
    return "";
 }
 
-int FCEUD_SendData(void *data, uint32 len)
-{
-   return 1;
-}
-
 #define BUILD_PIXEL_RGB565(R,G,B) (((int) ((R)&0x1f) << RED_SHIFT) | ((int) ((G)&0x3f) << GREEN_SHIFT) | ((int) ((B)&0x1f) << BLUE_SHIFT))
 
 #if defined (PSP)
@@ -266,15 +261,6 @@ void FCEUD_SetPalette(uint8_t index, uint8_t r, uint8_t g, uint8_t b)
 #endif
 }
 
-void FCEUD_GetPalette(unsigned char i, unsigned char *r, unsigned char *g, unsigned char *b)
-{
-}
-
-bool FCEUD_ShouldDrawInputAids (void)
-{
-   return 1;
-}
-
 static struct retro_log_callback log_cb;
 
 static void default_logger(enum retro_log_level level, const char *fmt, ...) {}
@@ -304,9 +290,6 @@ void FCEUD_SoundToggle (void)
    FCEUI_SetSoundVolume(sndvolume);
 }
 
-void FCEUD_VideoChanged (void)
-{ }
-
 FILE *FCEUD_UTF8fopen(const char *n, const char *m)
 {
    if (n)
diff --git a/src/ppu.c b/src/ppu.c
index e9aec63..0d8ee53 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -1241,7 +1241,7 @@ int FCEUPPU_Loop(int skip) {
 
 			for (scanline = 0; scanline < totalscanlines; ) {	/* scanline is incremented in  DoLine.  Evil. :/ */
 				deempcnt[deemp]++;
-				if ((PPUViewer) && (scanline == PPUViewScanline)) UpdatePPUView(1);
+				/* if ((PPUViewer) && (scanline == PPUViewScanline)) UpdatePPUView(1); */
 				DoLine();
 				if (scanline < normal_scanlines || scanline == totalscanlines)
 					overclocked = 0;

From 8b3c191f68f0ed668a368b40ce1ba0968f6a61dd Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 19 Oct 2020 09:32:37 +0800
Subject: [PATCH 037/295] Remove NETWORK branch

This was part of netplay.c that do not exist anymore. Its empty and not
relevant to current codebase.
---
 src/driver.h | 22 ----------------------
 src/input.c  |  3 ---
 2 files changed, 25 deletions(-)

diff --git a/src/driver.h b/src/driver.h
index 9ce4796..196c733 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -41,28 +41,6 @@ void FCEUD_PrintError(char *s);
 void FCEUD_Message(char *s);
 void FCEUD_DispMessage(char *m);
 
-#ifdef NETWORK
-/* Network interface */
-
-/* Call only when a game is loaded. */
-int FCEUI_NetplayStart(int nlocal, int divisor);
-
-/* Call when network play needs to stop. */
-void FCEUI_NetplayStop(void);
-
-/* Display text received over the network. */
-void FCEUD_NetplayText(uint8 *text);
-
-/* Encode and send text over the network. */
-void FCEUI_NetplayText(uint8 *text);
-
-/* Called when a fatal error occurred and network play can't continue.  This function
-   should call FCEUI_NetplayStop() after it has deinitialized the network on the driver
-   side.
-*/
-void FCEUD_NetworkClose(void);
-#endif
-
 int FCEUI_BeginWaveRecord(char *fn);
 int FCEUI_EndWaveRecord(void);
 
diff --git a/src/input.c b/src/input.c
index ff01bd5..318d68a 100644
--- a/src/input.c
+++ b/src/input.c
@@ -195,9 +195,6 @@ static void FP_FASTAPASS(3) UpdateGP(int w, void *data, int arg) {
 		joy[1] = *(uint32*)ptr >> 8;
 		joy[3] = *(uint32*)ptr >> 24;
 	}
-#ifdef NETWORK
-	if (FCEUnetplay) NetplayUpdate(joy);
-#endif
 	FCEUMOV_AddJoy(joy);
 }
 

From 2c97c53c8b50326eec4d1a06c6aa52d7d85ef973 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Tue, 20 Oct 2020 21:12:32 +0800
Subject: [PATCH 038/295] m176: Fix address mask causing incorrect register
 writes

---
 src/boards/fk23c.c | 139 ++++++++++++++++++---------------------------
 1 file changed, 54 insertions(+), 85 deletions(-)

diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c
index 8aed560..b022389 100644
--- a/src/boards/fk23c.c
+++ b/src/boards/fk23c.c
@@ -156,7 +156,7 @@ static SFORMAT StateRegs[] = {
 #define CHR_CNROM_MODE        (fk23_regs[0] & 0x40)
 #define CHR_OUTER_BANK_SIZE   (fk23_regs[0] & 0x10)
 
-static void cwrap(uint16 A, uint16 V)
+static void cwrap(uint32 A, uint32 V)
 {
    int bank = 0;
 
@@ -178,10 +178,10 @@ static void SyncCHR(void)
 {
    if (CHR_CNROM_MODE)
    {
-      uint8 mask              = (fk23_regs[3] & 0x46) ? (CHR_OUTER_BANK_SIZE ? 0x01 : 0x03) : 0;
-      uint16 bank             = (fk23_regs[2] | (cnrom_chr & mask)) << 3;
+      uint32 mask             = (fk23_regs[3] & 0x46) ? (CHR_OUTER_BANK_SIZE ? 0x01 : 0x03) : 0;
+      uint32 bank             = (fk23_regs[2] | (cnrom_chr & mask)) << 3;
 
-      cwrap(0x0000, bank);
+      cwrap(0x0000, bank + 0);
       cwrap(0x0400, bank + 1);
       cwrap(0x0800, bank + 2);
       cwrap(0x0C00, bank + 3);
@@ -193,11 +193,12 @@ static void SyncCHR(void)
    }
    else
    {
+      uint32 cbase            = (INVERT_CHR ? 0x1000 : 0);
+      uint32 outer            = (fk23_regs[2] << 3);
+      uint32 cmask            = (CHR_OUTER_BANK_SIZE ? 0x7F : 0xFF);
+
       if (MMC3_EXTENDED)
       {
-         uint16 cbase         = INVERT_CHR ? 0x1000 : 0;
-         uint16 outer         = fk23_regs[2] << 3;
-
          cwrap(cbase ^ 0x0000, mmc3_regs[0]  | outer);
          cwrap(cbase ^ 0x0400, mmc3_regs[10] | outer);
          cwrap(cbase ^ 0x0800, mmc3_regs[1]  | outer);
@@ -210,34 +211,30 @@ static void SyncCHR(void)
       }
       else
       {
-         uint16 cbase         = INVERT_CHR ? 0x1000 : 0;
-         uint8 mask           = CHR_OUTER_BANK_SIZE ? 0x7F : 0xFF;
-         uint16 outer         = (fk23_regs[2] << 3);
+         cwrap(cbase ^ 0x0000, ((mmc3_regs[0] & cmask) & 0xFE) | outer);
+         cwrap(cbase ^ 0x0400, ((mmc3_regs[0] & cmask) | 0x01) | outer);
+         cwrap(cbase ^ 0x0800, ((mmc3_regs[1] & cmask) & 0xFE) | outer);
+         cwrap(cbase ^ 0x0C00, ((mmc3_regs[1] & cmask) | 0x01) | outer);
 
-         cwrap(cbase ^ 0x0000, ((mmc3_regs[0] & mask) & 0xFE) | outer);
-         cwrap(cbase ^ 0x0400, ((mmc3_regs[0] & mask) | 0x01) | outer);
-         cwrap(cbase ^ 0x0800, ((mmc3_regs[1] & mask) & 0xFE) | outer);
-         cwrap(cbase ^ 0x0C00, ((mmc3_regs[1] & mask) | 0x01) | outer);
-
-         cwrap(cbase ^ 0x1000, (mmc3_regs[2] & mask) | outer);
-         cwrap(cbase ^ 0x1400, (mmc3_regs[3] & mask) | outer);
-         cwrap(cbase ^ 0x1800, (mmc3_regs[4] & mask) | outer);
-         cwrap(cbase ^ 0x1c00, (mmc3_regs[5] & mask) | outer);
+         cwrap(cbase ^ 0x1000, (mmc3_regs[2] & cmask) | outer);
+         cwrap(cbase ^ 0x1400, (mmc3_regs[3] & cmask) | outer);
+         cwrap(cbase ^ 0x1800, (mmc3_regs[4] & cmask) | outer);
+         cwrap(cbase ^ 0x1c00, (mmc3_regs[5] & cmask) | outer);
       }
    }
 }
 
 static void SyncPRG(void)
 {
-   uint8 prg_mode             = fk23_regs[0] & 7;
-   uint16 prg_base            = (fk23_regs[1] & 0x07F) | ((fk23_regs[0] << 4) & 0x080) |
+   uint32 prg_mode            = (fk23_regs[0] & 7);
+   uint32 prg_base            = (fk23_regs[1] & 0x07F) | ((fk23_regs[0] << 4) & 0x080) |
          ((fk23_regs[0] << 1) & 0x100) | ((fk23_regs[2] << 3) & 0x600) |
          ((fk23_regs[2] << 6) & 0x800);
 
    switch (prg_mode)
    {
    case 4:
-      setprg32(0x8000, prg_base >> 1);
+      setprg32(0x8000, (prg_base >> 1));
       break;
    case 3:
       setprg16(0x8000, prg_base);
@@ -246,29 +243,29 @@ static void SyncPRG(void)
    case 0:
    case 1:
    case 2:
+   {
+      uint32 cbase            = (INVERT_PRG ? 0x4000 : 0);
+      uint32 mask             = (0x3F >> prg_mode);
+
+      prg_base <<= 1;
+
       if (MMC3_EXTENDED)
       {
-         uint16 cbase         = INVERT_PRG ? 0x4000 : 0;
-         uint16 outer         = prg_base << 1;
-
-         setprg8(0x8000 ^ cbase, mmc3_regs[6] | outer);
-         setprg8(0xA000,         mmc3_regs[7] | outer);
-         setprg8(0xC000 ^ cbase, mmc3_regs[8] | outer);
-         setprg8(0xE000,         mmc3_regs[9] | outer);
+         setprg8(0x8000 ^ cbase, mmc3_regs[6] | prg_base);
+         setprg8(0xA000,         mmc3_regs[7] | prg_base);
+         setprg8(0xC000 ^ cbase, mmc3_regs[8] | prg_base);
+         setprg8(0xE000,         mmc3_regs[9] | prg_base);
       }
       else
       {
-         uint16 cbase         = INVERT_PRG ? 0x4000 : 0;
-         uint8 mask           = 0x3F >> prg_mode;
-         uint16 outer         = (prg_base << 1) & ~mask;
-
-         setprg8(0x8000 ^ cbase, (mmc3_regs[6] & mask) | outer);
-         setprg8(0xA000,         (mmc3_regs[7] & mask) | outer);
-         setprg8(0xC000 ^ cbase, (0xFE & mask) | outer);
-         setprg8(0xE000,         (0xFF & mask) | outer);
+         setprg8(0x8000 ^ cbase, (mmc3_regs[6] & mask) | (prg_base & ~mask));
+         setprg8(0xA000,         (mmc3_regs[7] & mask) | (prg_base & ~mask));
+         setprg8(0xC000 ^ cbase, (0xFE & mask) | (prg_base & ~mask));
+         setprg8(0xE000,         (0xFF & mask) | (prg_base & ~mask));
       }
       break;
    }
+   }
 }
 
 static void SyncWRAM(void)
@@ -306,54 +303,24 @@ static void Sync(void)
    SyncMIR();
 }
 
-static DECLFW(WriteLo)
+static DECLFW(Write5000)
 {
    if (((WRAM_EXTENDED == 0) || FK23_ENABLED) && (A & (0x10 << dipswitch)))
    {
-      switch (A & 3)
-      {
-      case 0:
-         if (fk23_regs[0] != V)
-         {
-            fk23_regs[0] = V;
-            SyncPRG();
-            SyncCHR();
-         }
-         break;
-      case 1:
-         if (fk23_regs[1] != V)
-         {
-            fk23_regs[1] = V;
-            SyncPRG();
-         }
-         break;
-      case 2:
+      fk23_regs[A & 3] = V;
+      if ((A & 3) == 2)
          cnrom_chr = 0;
-         if (fk23_regs[2] != V)
-         {
-            fk23_regs[2] = V;
-            SyncPRG();
-            SyncCHR();
-         }
-         break;
-      case 3:
-         if (fk23_regs[3] != V)
-         {
-            fk23_regs[3] = V;
-            SyncPRG();
-            SyncCHR();
-         }
-         break;
-      }
+      SyncPRG();
+      SyncCHR();
    }
    else
       /* FK23C Registers disabled, $5000-$5FFF maps to the second 4 KiB of the 8 KiB WRAM bank 2 */
       CartBW(A, V);
 }
 
-static DECLFW(WriteHi)
+static DECLFW(Write8000)
 {
-   switch (A & 0xE000)
+   switch (A & 0xF000)
    {
    case 0x8000:
    case 0x9000:
@@ -361,19 +328,19 @@ static DECLFW(WriteHi)
    case 0xD000:
    case 0xE000:
    case 0xF000:
-      if (CHR_CNROM_MODE)
-      {
-         cnrom_chr = V & 0x03;
+      if (!CHR_CNROM_MODE)
+         break;
+      cnrom_chr = V & 0x03;
+      if ((fk23_regs[0] & 0x07) == 0x03)
+         cnrom_chr = 0;
 
-         if ((fk23_regs[0] & 0x07) == 0x03)
-            cnrom_chr = 0;
-
-         SyncCHR();
-      }
+      SyncCHR();
+      break;
+   default:
       break;
    }
 
-   switch (A & 0xE001)
+   switch (A & 0xF001)
    {
    case 0x8000:
    {
@@ -438,6 +405,8 @@ static DECLFW(WriteHi)
    case 0xE001:
       irq_enabled = 1;
       break;
+   default:
+      break;
    }
 }
 
@@ -508,8 +477,8 @@ static void Power(void)
    Sync();
 
    SetReadHandler(0x8000, 0xFFFF, CartBR);
-   SetWriteHandler(0x5000, 0x5fff, WriteLo);
-   SetWriteHandler(0x8000, 0xFFFF, WriteHi);
+   SetWriteHandler(0x5000, 0x5fff, Write5000);
+   SetWriteHandler(0x8000, 0xFFFF, Write8000);
 
    if (WRAMSIZE)
    {

From 99c0d8351fe0ff81e430263991481b03364b8cca Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Wed, 21 Oct 2020 20:35:05 +0800
Subject: [PATCH 039/295] Fix warnings [-Wmissing-field-initializers]

---
 src/drivers/libretro/libretro_dipswitch.c |  2 +-
 src/input.c                               |  2 +-
 src/sound.c                               |  2 +-
 src/unif.c                                |  6 +--
 src/vsuni.c                               | 60 +++++++++++------------
 5 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/drivers/libretro/libretro_dipswitch.c b/src/drivers/libretro/libretro_dipswitch.c
index 1126fa9..e31116c 100644
--- a/src/drivers/libretro/libretro_dipswitch.c
+++ b/src/drivers/libretro/libretro_dipswitch.c
@@ -1258,7 +1258,7 @@ static struct retro_core_option_definition dipswitch_nwc[] = {
          { "8",  "7:30" },
          { "9",  "7:49" },
          { "10", "8:08" },
-         { "11"  "8:27" },
+         { "11", "8:27" },
          { "12", "8:45" },
          { "13", "9:04" },
          { "14", "9:23" },
diff --git a/src/input.c b/src/input.c
index 318d68a..03defa6 100644
--- a/src/input.c
+++ b/src/input.c
@@ -68,7 +68,7 @@ static int JPAttribFC = 0;
 static int JPTypeFC = 0;
 static void *InputDataPtrFC;
 
-static INPUTC DummyJPort = { 0, 0, 0, 0, 0 };
+static INPUTC DummyJPort = { 0, 0, 0, 0, 0, 0 };
 static INPUTC *JPorts[2] = { &DummyJPort, &DummyJPort };
 static INPUTCFC *FCExp = 0;
 
diff --git a/src/sound.c b/src/sound.c
index 7ba8d84..40973c2 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -38,7 +38,7 @@ int32 Wave[2048 + 512];
 int32 WaveHi[40000];
 int32 WaveFinal[2048 + 512];
 
-EXPSOUND GameExpSound = { 0, 0, 0 };
+EXPSOUND GameExpSound = { 0, 0, 0, 0, 0, 0 };
 
 static uint8 TriCount = 0;
 static uint8 TriMode = 0;
diff --git a/src/unif.c b/src/unif.c
index ff5a477..736dcb3 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -359,9 +359,9 @@ struct _unif_db {
 };
 
 static struct _unif_db unif_db[] = {
-	{ 0x8ebad077d08e6c78ULL, "A65AS",          1,   -1 }, /* 3-in-1 (N080) [p1][U][!], not a real submapper */
-	{ 0x616851e56946893bULL, "RESETNROM-XIN1", 0, MI_V }, /* Sheng Tian 2-in-1(Unl,ResetBase)[p1].unf */
-	{ 0x4cd729b5ae23a3cfULL, "RESETNROM-XIN1", 0, MI_H }, /* Sheng Tian 2-in-1(Unl,ResetBase)[p2].unf */
+	{ 0x8ebad077d08e6c78ULL, "A65AS",          1,   -1, -1 }, /* 3-in-1 (N080) [p1][U][!], not a real submapper */
+	{ 0x616851e56946893bULL, "RESETNROM-XIN1", 0, MI_V, -1 }, /* Sheng Tian 2-in-1(Unl,ResetBase)[p1].unf */
+	{ 0x4cd729b5ae23a3cfULL, "RESETNROM-XIN1", 0, MI_H, -1 }, /* Sheng Tian 2-in-1(Unl,ResetBase)[p2].unf */
 
 	{ 0, NULL, -1, -1, -1 } /* end of the line */
 };
diff --git a/src/vsuni.c b/src/vsuni.c
index 2771043..2afb379 100644
--- a/src/vsuni.c
+++ b/src/vsuni.c
@@ -246,43 +246,43 @@ RC2C05-04:
 
 VSUNIENTRY VSUniGames[] =
 {
-	{ "Baseball", VS_BASEBALL, 0x691d4200ea42be45LL, 99, 2, RP2C04_0001, 0 },
-	{ "Battle City", VS_BATTLECITY, 0x8540949d74c4d0ebLL, 99, 2, RP2C04_0001, 0 },
-	{ "Battle City(Bootleg)", VS_BATTLECITY, 0x8093cbe7137ac031LL, 99, 2, RP2C04_0001, 0 },
-	{ "Clu Clu Land", VS_CLUCLULAND, 0x1b8123218f62b1eeLL, 99, 2, RP2C04_0004, IOPTION_SWAPDIRAB },
-	{ "Dr Mario", VS_DRMARIO, 0xe1af09c477dc0081LL, 1, 0, RP2C04_0003, IOPTION_SWAPDIRAB },
-	{ "Duck Hunt", VS_DUCKHUNT, 0x47735d1e5f1205bbLL, 99, 2, RCP2C03B, IOPTION_GUN },
-	{ "Excitebike", VS_EXITEBIKE, 0x3dcd1401bcafde77LL, 99, 2, RP2C04_0003, 0 },
-	{ "Excitebike (J)", VS_EXITEBIKE, 0x7ea51c9d007375f0LL, 99, 2, RP2C04_0004, 0 },
-	{ "Freedom Force", VS_FREEDOMFORCE, 0xed96436bd1b5e688LL, 4, 0, RP2C04_0001, IOPTION_GUN },	/* Wrong color in game select screen? */
+	{ "Baseball", VS_BASEBALL, 0x691d4200ea42be45LL, 99, 2, RP2C04_0001, 0, 0 },
+	{ "Battle City", VS_BATTLECITY, 0x8540949d74c4d0ebLL, 99, 2, RP2C04_0001, 0, 0 },
+	{ "Battle City(Bootleg)", VS_BATTLECITY, 0x8093cbe7137ac031LL, 99, 2, RP2C04_0001, 0, 0 },
+	{ "Clu Clu Land", VS_CLUCLULAND, 0x1b8123218f62b1eeLL, 99, 2, RP2C04_0004, IOPTION_SWAPDIRAB, 0 },
+	{ "Dr Mario", VS_DRMARIO, 0xe1af09c477dc0081LL, 1, 0, RP2C04_0003, IOPTION_SWAPDIRAB, 0 },
+	{ "Duck Hunt", VS_DUCKHUNT, 0x47735d1e5f1205bbLL, 99, 2, RCP2C03B, IOPTION_GUN, 0 },
+	{ "Excitebike", VS_EXITEBIKE, 0x3dcd1401bcafde77LL, 99, 2, RP2C04_0003, 0, 0 },
+	{ "Excitebike (J)", VS_EXITEBIKE, 0x7ea51c9d007375f0LL, 99, 2, RP2C04_0004, 0, 0 },
+	{ "Freedom Force", VS_FREEDOMFORCE, 0xed96436bd1b5e688LL, 4, 0, RP2C04_0001, IOPTION_GUN, 0 },	/* Wrong color in game select screen? */
 	{ "Stroke and Match Golf", VS_STROKEANDMATCHGOLF, 0x612325606e82bc66LL, 99, 2, RP2C04_0002, IOPTION_SWAPDIRAB | IOPTION_PREDIP, 0x01 },
-	{ "Goonies",  VS_GOONIES, 0xb4032d694e1d2733LL, 151, 1, RP2C04_0003, 0 },
-	{ "Gradius", VS_GRADIUS, 0x50687ae63bdad976LL, 151, 1, RP2C04_0001, IOPTION_SWAPDIRAB },
-	{ "Gumshoe", VS_GUMSHOE, 0x87161f8ee37758d3LL, 99, 2, RC2C05_03, IOPTION_GUN },
-	{ "Gumshoe", VS_GUMSHOE, 0xb8500780bf69ce29LL, 99, 2, RC2C05_03, IOPTION_GUN },
-	{ "Gumshoe", VS_GUMSHOE, 0xa6bf132ba11d0a8cLL, 99, 2, RC2C05_03, IOPTION_GUN }, /* Gumshoe (VS).nes added: 2017-9-5*/
-	{ "Hogan's Alley", VS_HOGANSALLEY, 0xd78b7f0bb621fb45LL, 99, 2, RP2C04_0001, IOPTION_GUN },
-	{ "Ice Climber", VS_ICECLIMBER, 0xd21e999513435e2aLL, 99, 2, RP2C04_0004, IOPTION_SWAPDIRAB },
+	{ "Goonies",  VS_GOONIES, 0xb4032d694e1d2733LL, 151, 1, RP2C04_0003, 0, 0 },
+	{ "Gradius", VS_GRADIUS, 0x50687ae63bdad976LL, 151, 1, RP2C04_0001, IOPTION_SWAPDIRAB, 0 },
+	{ "Gumshoe", VS_GUMSHOE, 0x87161f8ee37758d3LL, 99, 2, RC2C05_03, IOPTION_GUN, 0 },
+	{ "Gumshoe", VS_GUMSHOE, 0xb8500780bf69ce29LL, 99, 2, RC2C05_03, IOPTION_GUN, 0 },
+	{ "Gumshoe", VS_GUMSHOE, 0xa6bf132ba11d0a8cLL, 99, 2, RC2C05_03, IOPTION_GUN, 0 }, /* Gumshoe (VS).nes added: 2017-9-5*/
+	{ "Hogan's Alley", VS_HOGANSALLEY, 0xd78b7f0bb621fb45LL, 99, 2, RP2C04_0001, IOPTION_GUN, 0 },
+	{ "Ice Climber", VS_ICECLIMBER, 0xd21e999513435e2aLL, 99, 2, RP2C04_0004, IOPTION_SWAPDIRAB, 0 },
 	{ "Ladies Golf", VS_LADIESGOLF, 0x781b24be57ef6785LL, 99, 2, RP2C04_0002, IOPTION_SWAPDIRAB | IOPTION_PREDIP, 0x1 },
-	{ "Mach Rider", VS_MACHRIDER, 0x015672618af06441LL, 99, 2, RP2C04_0002, 0 },
-	{ "Mach Rider (J)", VS_MACHRIDER, 0xa625afb399811a8aLL, 99, 2, RP2C04_0001, 0 },
-	{ "Mighty Bomb Jack", VS_MIGHTYBOMBJACK, 0xe6a89f4873fac37bLL, 0, 2, RC2C05_02, 0 },
-	{ "Ninja Jajamaru Kun", VS_JAJAMARU, 0xb26a2c31474099c0LL, 99, 2, RC2C05_01, IOPTION_SWAPDIRAB },
+	{ "Mach Rider", VS_MACHRIDER, 0x015672618af06441LL, 99, 2, RP2C04_0002, 0, 0 },
+	{ "Mach Rider (J)", VS_MACHRIDER, 0xa625afb399811a8aLL, 99, 2, RP2C04_0001, 0, 0 },
+	{ "Mighty Bomb Jack", VS_MIGHTYBOMBJACK, 0xe6a89f4873fac37bLL, 0, 2, RC2C05_02, 0, 0 },
+	{ "Ninja Jajamaru Kun", VS_JAJAMARU, 0xb26a2c31474099c0LL, 99, 2, RC2C05_01, IOPTION_SWAPDIRAB, 0 },
 	{ "Pinball", VS_PINBALL, 0xc5f49d3de7f2e9b8LL, 99, 2, RP2C04_0001, IOPTION_PREDIP, 0x01 },
 	{ "Pinball (J)", VS_PINBALL, 0x66ab1a3828cc901cLL, 99, 2, RCP2C03B, IOPTION_PREDIP, 0x1 },
-	{ "Platoon", VS_PLATOON, 0x160f237351c19f1fLL, 68, 1, RP2C04_0001, 0 },
-	{ "RBI Baseball", VS_RBIBASEBALL, 0x6a02d345812938afLL, 4, 1, RP2C04_0001, IOPTION_SWAPDIRAB },
-	{ "Soccer", VS_SOCCER, 0xd4e7a9058780eda3LL, 99, 2, RP2C04_0003, IOPTION_SWAPDIRAB },
-	{ "Star Luster",  VS_STARLUSTER, 0x8360e134b316d94cLL, 99, 2, RCP2C03B, 0 },
+	{ "Platoon", VS_PLATOON, 0x160f237351c19f1fLL, 68, 1, RP2C04_0001, 0, 0 },
+	{ "RBI Baseball", VS_RBIBASEBALL, 0x6a02d345812938afLL, 4, 1, RP2C04_0001, IOPTION_SWAPDIRAB, 0 },
+	{ "Soccer", VS_SOCCER, 0xd4e7a9058780eda3LL, 99, 2, RP2C04_0003, IOPTION_SWAPDIRAB, 0 },
+	{ "Star Luster",  VS_STARLUSTER, 0x8360e134b316d94cLL, 99, 2, RCP2C03B, 0, 0 },
 	{ "Stroke and Match Golf (J)", VS_STROKEANDMATCHGOLF, 0x869bb83e02509747LL, 99, 2, RCP2C03B, IOPTION_SWAPDIRAB | IOPTION_PREDIP, 0x1 },
 	{ "Super Sky Kid", VS_SUPERSKYKID, 0x78d04c1dd4ec0101LL, 4, 1, RCP2C03B, IOPTION_SWAPDIRAB | IOPTION_PREDIP, 0x20 },
-	{ "Super Xevious", VS_SUPERXEVIOUS, 0x2d396247cf58f9faLL, 206, 0, RP2C04_0001, 0 },
+	{ "Super Xevious", VS_SUPERXEVIOUS, 0x2d396247cf58f9faLL, 206, 0, RP2C04_0001, 0, 0 },
 	{ "Tetris", VS_TETRIS, 0x531a5e8eea4ce157LL, 99, 2, RCP2C03B, IOPTION_PREDIP, 0x20 },
-	{ "Top Gun", VS_TOPGUN, 0xf1dea36e6a7b531dLL, 2, 0, RC2C05_04, 0 },
-	{ "VS Castlevania", VS_CASTLEVANIA, 0x92fd6909c81305b9LL, 2, 1, RP2C04_0002, 0 },
-	{ "VS Slalom", VS_SLALOM, 0x4889b5a50a623215LL, 0, 1, RP2C04_0002, 0 },
-	{ "VS Super Mario Bros", VS_SMB, 0x39d8cfa788e20b6cLL, 99, 2, RP2C04_0004, 0 },
-	{ "VS Super Mario Bros [a1]", VS_SMB, 0xfc182e5aefbce14dLL, 99, 2, RP2C04_0004, 0 },
+	{ "Top Gun", VS_TOPGUN, 0xf1dea36e6a7b531dLL, 2, 0, RC2C05_04, 0, 0 },
+	{ "VS Castlevania", VS_CASTLEVANIA, 0x92fd6909c81305b9LL, 2, 1, RP2C04_0002, 0, 0 },
+	{ "VS Slalom", VS_SLALOM, 0x4889b5a50a623215LL, 0, 1, RP2C04_0002, 0, 0 },
+	{ "VS Super Mario Bros", VS_SMB, 0x39d8cfa788e20b6cLL, 99, 2, RP2C04_0004, 0, 0 },
+	{ "VS Super Mario Bros [a1]", VS_SMB, 0xfc182e5aefbce14dLL, 99, 2, RP2C04_0004, 0, 0 },
 	{ "VS TKO Boxing", VS_TKOBOXING,      0x6e1ee06171d8ce3aLL, 206, 1, RP2C04_0003, IOPTION_PREDIP, 0x00 },
 	{ "VS TKO Boxing [a1]", VS_TKOBOXING, 0xa1c694ce147bc1edLL, 206, 1, RP2C04_0003, IOPTION_PREDIP, 0x00 },
 	{ 0 }

From e0cb4d2814ae0ef1cb9e1ae126a193e23d05431d Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Wed, 21 Oct 2020 20:55:08 +0800
Subject: [PATCH 040/295] Fix warnings [-Wimplicit-fallthrough=]

---
 src/boards/116.c           | 6 +++---
 src/boards/bmc13in1jy110.c | 2 ++
 src/boards/yoko.c          | 2 +-
 src/fds.c                  | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/boards/116.c b/src/boards/116.c
index 88f5f00..cb7d40f 100644
--- a/src/boards/116.c
+++ b/src/boards/116.c
@@ -250,10 +250,10 @@ static DECLFW(UNLSL12Write) {
 				mmc1_regs[n] = mmc1_buffer;
 				mmc1_buffer = mmc1_shift = 0;
 				switch (n) {
-				case 0: SyncMIR();
-				case 2: SyncCHR();
+				case 0: SyncMIR(); break;
+				case 2: SyncCHR(); break;
 				case 3:
-				case 1: SyncPRG();
+				case 1: SyncPRG(); break;
 				}
 			}
 		}
diff --git a/src/boards/bmc13in1jy110.c b/src/boards/bmc13in1jy110.c
index c7bd349..0f70257 100644
--- a/src/boards/bmc13in1jy110.c
+++ b/src/boards/bmc13in1jy110.c
@@ -41,11 +41,13 @@ static void Sync(void) {
 	case 1:
 		setprg16(0x8000, ((8 + (bank_value & 7)) >> 1) + prgb[1]);
 		setprg16(0xC000, (bank_value & 7) >> 1);
+		break;
 	case 4:
 		setprg32(0x8000, 8 + (bank_value & 7)); break;
 	case 5:
 		setprg16(0x8000, ((8 + (bank_value & 7)) >> 1) + prgb[1]);
 		setprg16(0xC000, ((8 + (bank_value & 7)) >> 1) + prgb[3]);
+		break;
 	case 2:
 		setprg8(0x8000, prgb[0] >> 2);
 		setprg8(0xa000, prgb[1]);
diff --git a/src/boards/yoko.c b/src/boards/yoko.c
index e91974a..f27ab6f 100644
--- a/src/boards/yoko.c
+++ b/src/boards/yoko.c
@@ -117,7 +117,7 @@ static DECLFW(UNLYOKOWrite) {
 
 static DECLFW(M83Write) {
 	switch (A) {
-	case 0x8000: is2kbank = 1;
+	case 0x8000: is2kbank = 1; M83Sync(); break;
 	case 0xB000:												/* Dragon Ball Z Party [p1] BMC */
 	case 0xB0FF:												/* Dragon Ball Z Party [p1] BMC */
 	case 0xB1FF: bank = V; mode |= 0x40; M83Sync(); break;		/* Dragon Ball Z Party [p1] BMC */
diff --git a/src/fds.c b/src/fds.c
index 3501915..302fdae 100644
--- a/src/fds.c
+++ b/src/fds.c
@@ -346,6 +346,7 @@ static DECLFW(FDSWrite) {
 			X6502_IRQEnd(FCEU_IQEXT);
 			X6502_IRQEnd(FCEU_IQEXT2);
 		}
+		break;
 	case 0x4024:
 #ifndef USE_DINK
 		if ((InDisk != 255) && !(FDSRegs[5] & 0x4) && (FDSRegs[3] & 0x1)) {

From c2594418a98f4a9f1fcd9eb0c0e545cd620a3086 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Wed, 21 Oct 2020 21:03:36 +0800
Subject: [PATCH 041/295] m176: Fix battery save size, silence parenthesis
 warning

---
 src/boards/235.c   | 2 +-
 src/boards/fk23c.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/boards/235.c b/src/boards/235.c
index e065a88..b823666 100644
--- a/src/boards/235.c
+++ b/src/boards/235.c
@@ -40,7 +40,7 @@ static SFORMAT StateRegs[] =
 
 static void Sync(void) {
 	if (type && unrom) {
-		setprg16(0x8000, 0x80 | reg & 7);
+		setprg16(0x8000, 0x80 | (reg & 7));
 		setprg16(0xC000, 0x80 | 7);
 		setchr8(0);
 		setmirror(MI_V);
diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c
index b022389..3ed31ed 100644
--- a/src/boards/fk23c.c
+++ b/src/boards/fk23c.c
@@ -531,7 +531,10 @@ void GenBMCFK23C_Init(CartInfo *info)
       if (info->battery)
       {
          info->SaveGame[0] = WRAM;
-         info->SaveGameLen[0] = info->PRGRamSaveSize ? info->PRGRamSaveSize : WRAMSIZE;
+         if (info->iNES2 && info->PRGRamSaveSize)
+            info->SaveGameLen[0] = info->PRGRamSaveSize
+         else
+            info->SaveGameLen[0] = WRAMSIZE;
       }
    }
 

From fc99e34a2c1fd6b76910587793254ee9434ebd28 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Wed, 21 Oct 2020 21:07:13 +0800
Subject: [PATCH 042/295] Typo

---
 src/boards/fk23c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c
index 3ed31ed..9f39bee 100644
--- a/src/boards/fk23c.c
+++ b/src/boards/fk23c.c
@@ -532,7 +532,7 @@ void GenBMCFK23C_Init(CartInfo *info)
       {
          info->SaveGame[0] = WRAM;
          if (info->iNES2 && info->PRGRamSaveSize)
-            info->SaveGameLen[0] = info->PRGRamSaveSize
+            info->SaveGameLen[0] = info->PRGRamSaveSize;
          else
             info->SaveGameLen[0] = WRAMSIZE;
       }

From 5538bbedd9455380bf04c56223775c6bc6f414d1 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Thu, 22 Oct 2020 05:32:16 +0800
Subject: [PATCH 043/295] Update mapper 059/060

Excerpt from nesdev:

NESten's Mapper DLL v1.0 contained an incorrect implementation of T3H53 as iNES mapper 059 and UNIF mapper BMC-T3H53. The UNIF implementation was improved in NESten's Mapper DLL v1.2 while the iNES implementation was not, causing confusion about what kind of cartridge the unimproved mapper 59 was supposed to be. As Nintendulator's mapper DLL is based on NESten's mapper DLL, this was carried over to Nintendulator. Presumably as a result of this confusion, FCEUX and others put the correct implementation of T3H53 at INES Mapper 060, displacing the "Reset-based NROM-128 4-in-1" in the process.

With that said above, im following nesdev's notes and change the
following:

- Reassign Mapper 60 as Mapper 59.
- Add BMC-T3H53, a UNIF cart using the same UNIF-board D1038 which is
  assigned as iNES Mapper 59
- Add the Reset-Based NRON-128 mapper, Mapper 60
---
 src/boards/60.c        | 56 ++++++++++++++++++++++++++++++++++++++++++
 src/boards/addrlatch.c |  5 ++--
 src/ines.c             |  5 ++--
 src/ines.h             |  1 +
 src/unif.c             |  1 +
 5 files changed, 64 insertions(+), 4 deletions(-)
 create mode 100644 src/boards/60.c

diff --git a/src/boards/60.c b/src/boards/60.c
new file mode 100644
index 0000000..01e4ccf
--- /dev/null
+++ b/src/boards/60.c
@@ -0,0 +1,56 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ * Copyright (C) 2020 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include "mapinc.h"
+
+static uint8 game = 0;
+
+static void Sync(void)
+{
+    setchr8(game);
+	setprg16(0x8000, game);
+	setprg16(0xC000, game);
+}
+
+static void M60Reset(void)
+{
+    game = (game + 1) & 3;
+    Sync();
+}
+
+static void M60Power(void)
+{
+    game = 0;
+    Sync();
+    SetReadHandler(0x8000, 0xFFFF, CartBR);
+    SetWriteHandler(0x8000, 0xFFFF, CartBW);
+}
+
+static void StateRestore(int version) {
+	Sync();
+}
+
+void Mapper60_Init(CartInfo *info)
+{
+    info->Power = M60Power;
+    info->Reset = M60Reset;
+    GameStateRestore = StateRestore;
+	AddExState(&game, 1, 0, "GAME");
+}
\ No newline at end of file
diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c
index b2e193a..415d574 100644
--- a/src/boards/addrlatch.c
+++ b/src/boards/addrlatch.c
@@ -166,7 +166,8 @@ void BMCGK192_Init(CartInfo *info) {
 
 /*------------------ Map 059 ---------------------------*/
 /* One more forgotten mapper */
-static void M59Sync(void) {
+/* Formerly, an incorrect implementation of BMC-T3H53 */
+/*static void M59Sync(void) {
 	setprg32(0x8000, (latche >> 4) & 7);
 	setchr8(latche & 0x7);
 	setmirror((latche >> 3) & 1);
@@ -181,7 +182,7 @@ static DECLFR(M59Read) {
 
 void Mapper59_Init(CartInfo *info) {
 	Latch_Init(info, M59Sync, M59Read, 0x0000, 0x8000, 0xFFFF, 0);
-}
+}*/
 
 /*------------------ Map 061 ---------------------------*/
 static void M61Sync(void) {
diff --git a/src/ines.c b/src/ines.c
index 8b8c621..ab839b7 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -479,8 +479,9 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "UNLKS202",                  56, UNLKS202_Init          )
 	INES_BOARD( "SIMBPLE BMC PIRATE A",      57, Mapper57_Init          )
 	INES_BOARD( "SIMBPLE BMC PIRATE B",      58, BMCGK192_Init          )
-	INES_BOARD( "",                          59, Mapper59_Init          ) /* Check this out */
-	INES_BOARD( "SIMBPLE BMC PIRATE C",      60, BMCD1038_Init          )
+/*	INES_BOARD( "",                          59, Mapper59_Init         ) */ /* Check this out, update 2020-10-21 - formerly an incorrect implementation of T3H53 */
+	INES_BOARD( "BMC T3H53/D1038",           59, BMCD1038_Init          )
+	INES_BOARD( "Reset-based NROM-128 ",     60, Mapper60_Init          )
 	INES_BOARD( "20-in-1 KAISER Rev. A",     61, Mapper61_Init          )
 	INES_BOARD( "700-in-1",                  62, Mapper62_Init          )
 	INES_BOARD( "",                          63, Mapper63_Init          )
diff --git a/src/ines.h b/src/ines.h
index 3ad9898..bc119f2 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -94,6 +94,7 @@ void Mapper51_Init(CartInfo *);
 void Mapper52_Init(CartInfo *);
 void Mapper57_Init(CartInfo *);
 void Mapper59_Init(CartInfo *);
+void Mapper60_Init(CartInfo *);
 void Mapper61_Init(CartInfo *);
 void Mapper62_Init(CartInfo *);
 void Mapper63_Init(CartInfo *);
diff --git a/src/unif.c b/src/unif.c
index 736dcb3..cc81a11 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -446,6 +446,7 @@ static BMAPPING bmap[] = {
 	{ "CNROM",                        3, CNROM_Init,            0 },
 	{ "CPROM",                       13, CPROM_Init,            BMCFLAG_16KCHRR },
 	{ "D1038",                       59, BMCD1038_Init,         0 },
+	{ "T3H53",                       59, BMCD1038_Init,         0 },
 	{ "DANCE",                      256, UNLOneBus_Init,        0 },
 	{ "DANCE2000",                  518, UNLD2000_Init,         0 },
 	{ "DREAMTECH01",                521, DreamTech01_Init,      0 },

From 75165981fb8e0f09160368ef53b041d3c1c890eb Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Thu, 22 Oct 2020 19:59:23 +0800
Subject: [PATCH 044/295] Change c++ to c comments

---
 src/ppu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ppu.c b/src/ppu.c
index 0d8ee53..45ccc7f 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -719,7 +719,7 @@ static void DoLine(void)
 		GameHBIRQHook();
 		X6502_Run(85 - 16 - 10);
 	} else {
-		X6502_Run(6);	// Tried 65, caused problems with Slalom(maybe others)
+		X6502_Run(6);	/* Tried 65, caused problems with Slalom(maybe others) */
 		Fixit2();
 		X6502_Run(85 - 6 - 16);
 

From c5422046519ce269009075b5b59b5d3640e48de6 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Fri, 23 Oct 2020 09:51:17 +0800
Subject: [PATCH 045/295] UNIF: Fix incorrect ines-mapper log and cleanup

---
 src/unif.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/unif.c b/src/unif.c
index cc81a11..7ee60ae 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -692,7 +692,7 @@ static int InitializeBoard(void) {
 				mirrortodo = 4;
 			MooMirroring();
 
-			UNIFCart.submapper = bmap[x].ines_mapper;
+			UNIFCart.mapper    = bmap[x].ines_mapper;
 			UNIFCart.submapper = submapper;
 			GameInfo->cspecial = cspecial;
 
@@ -701,7 +701,8 @@ static int InitializeBoard(void) {
 		}
 		x++;
 	}
-	FCEU_PrintError("Board type not supported, '%s'.", boardname);
+	FCEU_printf("\n");
+	FCEU_PrintError(" Board type not supported, '%s'.\n", boardname);
 	return(0);
 }
 
@@ -798,17 +799,17 @@ int UNIFLoad(const char *name, FCEUFILE *fp) {
 	if (UNIF_CHRROMSize)
 		SetupCartCHRMapping(0, VROM, UNIF_CHRROMSize, 0);
 
+	FCEU_printf(" PRG-ROM CRC32: 0x%08X\n", UNIFCart.PRGCRC32);
+	FCEU_printf(" PRG+CHR CRC32: 0x%08X\n", UNIFCart.CRC32);
+	FCEU_printf(" PRG+CHR MD5  : 0x%s\n", md5_asciistr(UNIFCart.MD5));
+
 	if (!InitializeBoard())
 		goto aborto;
 
-	FCEU_printf(" PRG-ROM CRC32:   0x%08X\n", UNIFCart.PRGCRC32);
-	FCEU_printf(" PRG+CHR CRC32:   0x%08X\n", UNIFCart.CRC32);
-	FCEU_printf(" PRG+CHR MD5  :   0x%s\n", md5_asciistr(UNIFCart.MD5));
-	if (UNIFCart.mapper)
-		FCEU_printf(" [Unif] Mapper:    %d\n", UNIFCart.mapper);
-	FCEU_printf(" [Unif] SubMapper: %d\n", UNIFCart.submapper);
-	FCEU_printf(" [Unif] PRG ROM:   %u KiB\n", UNIFCart.PRGRomSize / 1024);
-	FCEU_printf(" [Unif] CHR ROM:   %u KiB\n", UNIFCart.CHRRomSize / 1024);
+	FCEU_printf(" [UNIF] PRG ROM: %u KiB\n", UNIFCart.PRGRomSize / 1024);
+	FCEU_printf(" [UNIF] CHR ROM: %u KiB\n", UNIFCart.CHRRomSize / 1024);
+	FCEU_printf(" [UNIF] iNES Mapper: %d\n", UNIFCart.mapper);
+	FCEU_printf(" [UNIF] SubMapper: %d\n", UNIFCart.submapper);
 
 	GameInterface = UNIFGI;
 

From 71daae412ee467d2151dde403e89c60fbba19056 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Fri, 23 Oct 2020 10:17:38 +0800
Subject: [PATCH 046/295] UNIF: Ensure that used memory are freed on errors

- removes "goto" jumps
- frees ROM and VROM if necessary
---
 src/unif.c | 102 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 60 insertions(+), 42 deletions(-)

diff --git a/src/unif.c b/src/unif.c
index 7ee60ae..88d2595 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -138,6 +138,11 @@ static void ResetUNIF(void) {
 	VROM_size = 0;
 }
 
+static void Cleanup(void) {
+	FreeUNIF();
+	ResetUNIF();
+}
+
 static uint8 exntar[2048];
 
 static void MooMirroring(void) {
@@ -727,8 +732,8 @@ static void UNIFGI(int h) {
 
 int UNIFLoad(const char *name, FCEUFILE *fp) {
 	struct md5_context md5;
-	uint32 x = 0;
-	uint64 PRGptr = 0, CHRptr = 0;
+	uint64 prg_size_bytes = 0, chr_size_bytes = 0;
+	int x = 0;
 
 	FCEU_fseek(fp, 0, SEEK_SET);
 	FCEU_fread(&unhead, 1, 4, fp);
@@ -739,12 +744,18 @@ int UNIFLoad(const char *name, FCEUFILE *fp) {
 
 	ResetExState(0, 0);
 	ResetUNIF();
-	if (!FCEU_read32le(&unhead.info, fp))
-		goto aborto;
-	if (FCEU_fseek(fp, 0x20, SEEK_SET) < 0)
-		goto aborto;
-	if (!LoadUNIFChunks(fp))
-		goto aborto;
+	if (!FCEU_read32le(&unhead.info, fp)) {
+		Cleanup();
+		return 0;
+	}
+	if (FCEU_fseek(fp, 0x20, SEEK_SET) < 0) {
+		Cleanup();
+		return 0;
+	}
+	if (!LoadUNIFChunks(fp)) {
+		Cleanup();
+		return 0;
+	}
 
 	ROM_size = (UNIF_PRGROMSize / 0x1000) + ((UNIF_PRGROMSize % 0x1000) ? 1 : 0);
 	ROM_size = (ROM_size >> 2) + ((ROM_size & 3) ? 1: 0);
@@ -753,48 +764,63 @@ int UNIFLoad(const char *name, FCEUFILE *fp) {
 		VROM_size = (VROM_size >> 3) + ((VROM_size & 7) ? 1: 0);
 	}
 
-	UNIFCart.PRGRomSize = UNIF_PRGROMSize;
-	UNIFCart.CHRRomSize = UNIF_CHRROMSize;
-
 	UNIF_PRGROMSize = FixRomSize(UNIF_PRGROMSize, 2048);
 	if (UNIF_CHRROMSize)
 		UNIF_CHRROMSize = FixRomSize(UNIF_CHRROMSize, 8192);
 
-	ROM = (uint8*)malloc(UNIF_PRGROMSize);
-	if (UNIF_CHRROMSize)
-		VROM = (uint8*)malloc(UNIF_CHRROMSize);
+	/* Note: Use rounded size for memory allocations and board mapping */
+
+	if (!(ROM = (uint8*)malloc(UNIF_PRGROMSize))) {
+		Cleanup();
+		return 0;
+	}
+	if (UNIF_CHRROMSize) {
+		if (!(VROM = (uint8*)malloc(UNIF_CHRROMSize))) {
+			Cleanup();
+			return 0;
+		}
+	}
+
+	/* combine multiple prg/chr blocks into single blocks and free memory used. */
 
 	for (x = 0; x < 16; x++) {
-		unsigned p = prg_idx[x];
-		unsigned c = 16 + chr_idx[x];
+		int p = prg_idx[x];
+		int c = 16 + chr_idx[x];
 		if (malloced[p]) {
-			memcpy(ROM + PRGptr, malloced[p], mallocedsizes[p]);
-			PRGptr += mallocedsizes[p];
+			memcpy(ROM + prg_size_bytes, malloced[p], mallocedsizes[p]);
+			prg_size_bytes += mallocedsizes[p];
 			free(malloced[p]);
 			malloced[p] = 0;
 		}
 
 		if (malloced[c]) {
-			memcpy(VROM + CHRptr, malloced[c], mallocedsizes[c]);
-			CHRptr += mallocedsizes[c];
+			memcpy(VROM + chr_size_bytes, malloced[c], mallocedsizes[c]);
+			chr_size_bytes += mallocedsizes[c];
 			free(malloced[c]);
 			malloced[c] = 0;
 		}
 	}
 
-	UNIFCart.PRGCRC32 = CalcCRC32(0, ROM, PRGptr);
-	UNIFCart.CHRCRC32 = CalcCRC32(0, VROM, CHRptr);
-	UNIFCart.CRC32    = CalcCRC32(UNIFCart.PRGCRC32, VROM, CHRptr);
+	/* Note: Use raw size in bytes for checksums */
+
+	UNIFCart.PRGRomSize = prg_size_bytes;
+	UNIFCart.CHRRomSize = chr_size_bytes;
+
+	UNIFCart.PRGCRC32   = CalcCRC32(0, ROM, prg_size_bytes);
+	UNIFCart.CHRCRC32   = CalcCRC32(0, VROM, chr_size_bytes);
+	UNIFCart.CRC32      = CalcCRC32(UNIFCart.PRGCRC32, VROM, chr_size_bytes);
 
 	md5_starts(&md5);
-	md5_update(&md5, ROM, PRGptr);
-	if (UNIF_CHRROMSize)
-		md5_update(&md5, VROM, CHRptr);
+	md5_update(&md5, ROM, prg_size_bytes);
+	if (chr_size_bytes)
+		md5_update(&md5, VROM, chr_size_bytes);
 	md5_finish(&md5, UNIFCart.MD5);
 	memcpy(GameInfo->MD5, UNIFCart.MD5, sizeof(UNIFCart.MD5));
 
 	CheckHashInfo();
 
+	/* Note: Use rounded size for board mappings */
+
 	SetupCartPRGMapping(0, ROM, UNIF_PRGROMSize, 0);
 	if (UNIF_CHRROMSize)
 		SetupCartCHRMapping(0, VROM, UNIF_CHRROMSize, 0);
@@ -803,8 +829,10 @@ int UNIFLoad(const char *name, FCEUFILE *fp) {
 	FCEU_printf(" PRG+CHR CRC32: 0x%08X\n", UNIFCart.CRC32);
 	FCEU_printf(" PRG+CHR MD5  : 0x%s\n", md5_asciistr(UNIFCart.MD5));
 
-	if (!InitializeBoard())
-		goto aborto;
+	if (!InitializeBoard()) {
+		Cleanup();
+		return 0;
+	}
 
 	FCEU_printf(" [UNIF] PRG ROM: %u KiB\n", UNIFCart.PRGRomSize / 1024);
 	FCEU_printf(" [UNIF] CHR ROM: %u KiB\n", UNIFCart.CHRRomSize / 1024);
@@ -814,12 +842,6 @@ int UNIFLoad(const char *name, FCEUFILE *fp) {
 	GameInterface = UNIFGI;
 
 	return 1;
-
- aborto:
-
-	FreeUNIF();
-	ResetUNIF();
-	return 0;
 }
 
 int CopyFamiLoad() {
@@ -827,15 +849,11 @@ int CopyFamiLoad() {
 	ResetExState(0, 0);
 
 	sboardname = (uint8_t*)"COPYFAMI";
-	if (!InitializeBoard())
-		goto aborto;
+	if (!InitializeBoard()) {
+		Cleanup();
+		return 0;
+	}
 
 	GameInterface = UNIFGI;
 	return 1;
-
- aborto:
-
-	FreeUNIF();
-	ResetUNIF();
-	return 0;
 }

From 565f60c0f2fa9777167b2d040cab155bab6954cf Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sun, 25 Oct 2020 08:31:41 +0800
Subject: [PATCH 047/295] Fix some warnings

---
 src/boards/269.c                |  2 +-
 src/boards/KS7030.c             |  2 +-
 src/cheat.c                     |  2 +-
 src/drivers/libretro/libretro.c |  7 ++-----
 src/general.c                   | 10 +++++-----
 src/input/zapper.c              |  4 ++--
 src/state.c                     |  6 +++---
 7 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/boards/269.c b/src/boards/269.c
index 0acef24..358ccce 100644
--- a/src/boards/269.c
+++ b/src/boards/269.c
@@ -80,7 +80,7 @@ static uint8 unscrambleCHR(uint8 data) {
 }
 
 void Mapper269_Init(CartInfo *info) {
-	int i;
+	uint8 i;
 	GenMMC3_Init(info, 512, 0, 8, 0);
 	cwrap = M269CW;
 	pwrap = M269PW;
diff --git a/src/boards/KS7030.c b/src/boards/KS7030.c
index c6de258..fb61a7e 100644
--- a/src/boards/KS7030.c
+++ b/src/boards/KS7030.c
@@ -26,7 +26,7 @@
  */
 
 /* 2020-3-6 - update mirroring (negativeExponent)
-/* PRG-ROM Bank Select #1/Mirroring Select ($8000-$8FFF, write)
+ * PRG-ROM Bank Select #1/Mirroring Select ($8000-$8FFF, write)
  * A~FEDC BA98 7654 3210
  * -------------------
  *  1000 .... .... MBBB
diff --git a/src/cheat.c b/src/cheat.c
index cdf0aaf..0e82364 100644
--- a/src/cheat.c
+++ b/src/cheat.c
@@ -570,7 +570,7 @@ void FCEUI_CheatSearchBegin(void) {
 }
 
 
-static int INLINE CAbs(int x) {
+static INLINE int CAbs(int x) {
 	if (x < 0)
 		return(0 - x);
 	return x;
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 56b2bb2..90e1790 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -1123,7 +1123,6 @@ static void set_apu_channels(int chan)
 static void check_variables(bool startup)
 {
    struct retro_variable var = {0};
-   bool palette_updated = false;
    char key[256];
    int i, enable_apu;
 
@@ -1886,9 +1885,8 @@ static void retro_run_blit(uint8_t *gfx)
 
 void retro_run(void)
 {
-   unsigned i;
    uint8_t *gfx;
-   int32_t ssize = 0;
+   int32_t i, ssize = 0;
    bool updated = false;
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated)
@@ -1955,7 +1953,7 @@ static int checkGG(char c)
 static int GGisvalid(const char *code)
 {
    size_t len = strlen(code);
-   int i;
+   uint32 i;
    
    if (len != 6 && len != 8)
       return 0;
@@ -1980,7 +1978,6 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code)
    uint8  v;
    int    c;
    int    type = 1;
-   int    ret = 0;
 
    if (code == NULL)
       return;
diff --git a/src/general.c b/src/general.c
index 70321ab..33af07f 100644
--- a/src/general.c
+++ b/src/general.c
@@ -69,22 +69,22 @@ void FCEUI_SetDirOverride(int which, char *n)
 
 char *FCEU_MakeFName(int type, int id1, char *cd1)
 {
-   char tmp[2048] = {0};
+   char tmp[4096 + 512] = {0}; /* +512 for no reason :D */
    char *ret      = 0;
 
    switch (type)
    {
       case FCEUMKF_GGROM:
-         sprintf(tmp, "%s"PSS "gg.rom", BaseDirectory);
+         sprintf(tmp, "%s%c%s", BaseDirectory, PS, "gg.rom");
          break;
       case FCEUMKF_FDSROM:
-         sprintf(tmp, "%s"PSS "disksys.rom", BaseDirectory);
+         sprintf(tmp, "%s%c%s", BaseDirectory, PS, "disksys.rom");
          break;
       case FCEUMKF_PALETTE:
-         sprintf(tmp, "%s"PSS "nes.pal", BaseDirectory);
+         sprintf(tmp, "%s%c%s", BaseDirectory, PS, "nes.pal");
          break;
       case FCEUMKF_FDS:
-         sprintf(tmp, "%s"PSS "%s.sav", SaveDirectory, FileBase);
+         sprintf(tmp, "%s%c%s%s", SaveDirectory, PS, FileBase, ".sav");
          break;
       default:
          break;
diff --git a/src/input/zapper.c b/src/input/zapper.c
index 776f51a..40a182a 100644
--- a/src/input/zapper.c
+++ b/src/input/zapper.c
@@ -28,7 +28,7 @@
 #define MAX_TOLERANCE 20
 static uint32 targetExpansion[MAX_TOLERANCE+1];
 #endif
-static int tolerance;
+static uint32 tolerance;
 
 typedef struct {
 	uint32 mzx, mzy, mzb;
@@ -167,7 +167,7 @@ static uint32 InefficientSqrt(uint32 z) {
 void FCEU_ZapperSetTolerance(int t)
 {
 #ifdef ROUNDED_TARGET
-	uint32_t y;
+	uint32 y;
 	tolerance = t <= MAX_TOLERANCE ? t : MAX_TOLERANCE;
 	for (y = 0; y <= tolerance; y++)
 		targetExpansion[y] = InefficientSqrt(tolerance*tolerance-y*y);
diff --git a/src/state.c b/src/state.c
index baeab1c..1c14a8d 100644
--- a/src/state.c
+++ b/src/state.c
@@ -85,7 +85,7 @@ static int SubWrite(memstream_t *mem, SFORMAT *sf)
 
    while(sf->v)
    {
-      if(sf->s == ~0) /* Link to another struct. */
+      if(sf->s == (~(uint32)0)) /* Link to another struct. */
       {
          uint32 tmp;
 
@@ -140,7 +140,7 @@ static SFORMAT *CheckS(SFORMAT *sf, uint32 tsize, char *desc)
 {
    while (sf->v)
    {
-      if (sf->s == ~0)
+      if (sf->s == (~(uint32)0))
       { /* Link to another SFORMAT structure. */
          SFORMAT *tmp;
          if ((tmp = CheckS((SFORMAT*)sf->v, tsize, desc)))
@@ -162,7 +162,7 @@ static SFORMAT *CheckS(SFORMAT *sf, uint32 tsize, char *desc)
 static int ReadStateChunk(memstream_t *mem, SFORMAT *sf, int size)
 {
    SFORMAT *tmp;
-   int temp;
+   uint64 temp;
    temp = memstream_pos(mem);
 
    while(memstream_pos(mem) < (temp + size))

From 6eccb4401f86a138d0c597860dce936c2a428283 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sun, 25 Oct 2020 12:01:27 +0800
Subject: [PATCH 048/295] Update libretro-common

---
 .../libretro-common/compat/compat_snprintf.c  |  30 ++-
 .../libretro-common/compat/compat_strl.c      |   2 +-
 .../libretro-common/encodings/encoding_utf.c  | 146 ++++++------
 .../libretro-common/include/boolean.h         |   2 +-
 .../libretro-common/include/compat/msvc.h     |  21 +-
 .../libretro-common/include/compat/strl.h     |   2 +-
 .../libretro-common/include/encodings/crc32.h |   2 +-
 .../libretro-common/include/encodings/utf.h   |   4 +-
 .../libretro-common/include/encodings/win32.h |   2 +-
 .../libretro-common/include/libretro.h        | 219 +++++++++++++++++-
 .../libretro-common/include/retro_common.h    |   2 +-
 .../include/retro_common_api.h                |   2 +-
 .../libretro-common/include/retro_inline.h    |   2 +-
 .../include/streams/memory_stream.h           |   2 +-
 .../include/string/stdstring.h                |  95 ++++++--
 .../libretro-common/streams/memory_stream.c   |  64 +++--
 .../libretro-common/string/stdstring.c        |  57 ++++-
 17 files changed, 467 insertions(+), 187 deletions(-)

diff --git a/src/drivers/libretro/libretro-common/compat/compat_snprintf.c b/src/drivers/libretro/libretro-common/compat/compat_snprintf.c
index b69ad04..d7320cc 100644
--- a/src/drivers/libretro/libretro-common/compat/compat_snprintf.c
+++ b/src/drivers/libretro/libretro-common/compat/compat_snprintf.c
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
+/* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (compat_snprintf.c).
@@ -33,12 +33,12 @@
 #if _MSC_VER < 1300
 #define _vscprintf c89_vscprintf_retro__
 
-static int c89_vscprintf_retro__(const char *format, va_list pargs)
+static int c89_vscprintf_retro__(const char *fmt, va_list pargs)
 {
    int retval;
    va_list argcopy;
    va_copy(argcopy, pargs);
-   retval = vsnprintf(NULL, 0, format, argcopy);
+   retval = vsnprintf(NULL, 0, fmt, argcopy);
    va_end(argcopy);
    return retval;
 }
@@ -46,38 +46,36 @@ static int c89_vscprintf_retro__(const char *format, va_list pargs)
 
 /* http://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010 */
 
-int c99_vsnprintf_retro__(char *outBuf, size_t size, const char *format, va_list ap)
+int c99_vsnprintf_retro__(char *s, size_t len, const char *fmt, va_list ap)
 {
    int count = -1;
 
-   if (size != 0)
+   if (len != 0)
    {
 #if (_MSC_VER <= 1310)
-      count = _vsnprintf(outBuf, size - 1, format, ap);
+      count = _vsnprintf(s, len - 1, fmt, ap);
 #else
-      count = _vsnprintf_s(outBuf, size, size - 1, format, ap);
+      count = _vsnprintf_s(s, len, len - 1, fmt, ap);
 #endif
    }
 
    if (count == -1)
-       count = _vscprintf(format, ap);
+       count = _vscprintf(fmt, ap);
 
-   if (count == size)
-   {
-      /* there was no room for a NULL, so truncate the last character */
-      outBuf[size - 1] = '\0';
-   }
+   /* there was no room for a NULL, so truncate the last character */
+   if (count == len && len)
+      s[len - 1] = '\0';
 
    return count;
 }
 
-int c99_snprintf_retro__(char *outBuf, size_t size, const char *format, ...)
+int c99_snprintf_retro__(char *s, size_t len, const char *fmt, ...)
 {
    int count;
    va_list ap;
 
-   va_start(ap, format);
-   count = c99_vsnprintf_retro__(outBuf, size, format, ap);
+   va_start(ap, fmt);
+   count = c99_vsnprintf_retro__(s, len, fmt, ap);
    va_end(ap);
 
    return count;
diff --git a/src/drivers/libretro/libretro-common/compat/compat_strl.c b/src/drivers/libretro/libretro-common/compat/compat_strl.c
index 94cb39b..3172310 100644
--- a/src/drivers/libretro/libretro-common/compat/compat_strl.c
+++ b/src/drivers/libretro/libretro-common/compat/compat_strl.c
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
+/* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (compat_strl.c).
diff --git a/src/drivers/libretro/libretro-common/encodings/encoding_utf.c b/src/drivers/libretro/libretro-common/encodings/encoding_utf.c
index b6ad2f9..2760824 100644
--- a/src/drivers/libretro/libretro-common/encodings/encoding_utf.c
+++ b/src/drivers/libretro/libretro-common/encodings/encoding_utf.c
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
+/* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (encoding_utf.c).
@@ -37,6 +37,8 @@
 #include <xtl.h>
 #endif
 
+#define UTF8_WALKBYTE(string) (*((*(string))++))
+
 static unsigned leading_ones(uint8_t c)
 {
    unsigned ones = 0;
@@ -89,13 +91,14 @@ size_t utf8_conv_utf32(uint32_t *out, size_t out_chars,
 bool utf16_conv_utf8(uint8_t *out, size_t *out_chars,
      const uint16_t *in, size_t in_size)
 {
-   static uint8_t kUtf8Limits[5] = { 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-   size_t out_pos = 0;
-   size_t in_pos  = 0;
+   size_t out_pos            = 0;
+   size_t in_pos             = 0;
+   static const 
+      uint8_t utf8_limits[5] = { 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
 
    for (;;)
    {
-      unsigned numAdds;
+      unsigned num_adds;
       uint32_t value;
 
       if (in_pos == in_size)
@@ -124,21 +127,21 @@ bool utf16_conv_utf8(uint8_t *out, size_t *out_chars,
          value = (((value - 0xD800) << 10) | (c2 - 0xDC00)) + 0x10000;
       }
 
-      for (numAdds = 1; numAdds < 5; numAdds++)
-         if (value < (((uint32_t)1) << (numAdds * 5 + 6)))
+      for (num_adds = 1; num_adds < 5; num_adds++)
+         if (value < (((uint32_t)1) << (num_adds * 5 + 6)))
             break;
       if (out)
-         out[out_pos] = (char)(kUtf8Limits[numAdds - 1]
-               + (value >> (6 * numAdds)));
+         out[out_pos] = (char)(utf8_limits[num_adds - 1]
+               + (value >> (6 * num_adds)));
       out_pos++;
       do
       {
-         numAdds--;
+         num_adds--;
          if (out)
             out[out_pos] = (char)(0x80
-                  + ((value >> (6 * numAdds)) & 0x3F));
+                  + ((value >> (6 * num_adds)) & 0x3F));
          out_pos++;
-      }while (numAdds != 0);
+      }while (num_adds != 0);
    }
 
    *out_chars = out_pos;
@@ -166,13 +169,15 @@ size_t utf8cpy(char *d, size_t d_len, const char *s, size_t chars)
    while (*sb && chars-- > 0)
    {
       sb++;
-      while ((*sb & 0xC0) == 0x80) sb++;
+      while ((*sb & 0xC0) == 0x80)
+         sb++;
    }
 
    if ((size_t)(sb - sb_org) > d_len-1 /* NUL */)
    {
       sb = sb_org + d_len-1;
-      while ((*sb & 0xC0) == 0x80) sb--;
+      while ((*sb & 0xC0) == 0x80)
+         sb--;
    }
 
    memcpy(d, sb_org, sb-sb_org);
@@ -184,14 +189,18 @@ size_t utf8cpy(char *d, size_t d_len, const char *s, size_t chars)
 const char *utf8skip(const char *str, size_t chars)
 {
    const uint8_t *strb = (const uint8_t*)str;
+
    if (!chars)
       return str;
+
    do
    {
       strb++;
-      while ((*strb & 0xC0)==0x80) strb++;
+      while ((*strb & 0xC0)==0x80)
+         strb++;
       chars--;
-   } while(chars);
+   }while (chars);
+
    return (const char*)strb;
 }
 
@@ -211,24 +220,22 @@ size_t utf8len(const char *string)
    return ret;
 }
 
-#define utf8_walkbyte(string) (*((*(string))++))
-
 /* Does not validate the input, returns garbage if it's not UTF-8. */
 uint32_t utf8_walk(const char **string)
 {
-   uint8_t first = utf8_walkbyte(string);
+   uint8_t first = UTF8_WALKBYTE(string);
    uint32_t ret  = 0;
 
    if (first < 128)
       return first;
 
-   ret    = (ret << 6) | (utf8_walkbyte(string) & 0x3F);
+   ret    = (ret << 6) | (UTF8_WALKBYTE(string) & 0x3F);
    if (first >= 0xE0)
    {
-      ret = (ret << 6) | (utf8_walkbyte(string) & 0x3F);
+      ret = (ret << 6) | (UTF8_WALKBYTE(string) & 0x3F);
       if (first >= 0xF0)
       {
-         ret = (ret << 6) | (utf8_walkbyte(string) & 0x3F);
+         ret = (ret << 6) | (UTF8_WALKBYTE(string) & 0x3F);
          return ret | (first & 7) << 18;
       }
       return ret | (first & 15) << 12;
@@ -277,9 +284,7 @@ bool utf16_to_char_string(const uint16_t *in, char *s, size_t len)
 static char *mb_to_mb_string_alloc(const char *str,
       enum CodePage cp_in, enum CodePage cp_out)
 {
-   char *path_buf         = NULL;
    wchar_t *path_buf_wide = NULL;
-   int path_buf_len       = 0;
    int path_buf_wide_len  = MultiByteToWideChar(cp_in, 0, str, -1, NULL, 0);
 
    /* Windows 95 will return 0 from these functions with 
@@ -292,54 +297,51 @@ static char *mb_to_mb_string_alloc(const char *str,
     *   MultiByteToWideChar also supports CP_UTF7 and CP_UTF8.
     */
 
-   if (path_buf_wide_len)
-   {
-      path_buf_wide = (wchar_t*)
-         calloc(path_buf_wide_len + sizeof(wchar_t), sizeof(wchar_t));
-
-      if (path_buf_wide)
-      {
-         MultiByteToWideChar(cp_in, 0,
-               str, -1, path_buf_wide, path_buf_wide_len);
-
-         if (*path_buf_wide)
-         {
-            path_buf_len = WideCharToMultiByte(cp_out, 0,
-                  path_buf_wide, -1, NULL, 0, NULL, NULL);
-
-            if (path_buf_len)
-            {
-               path_buf = (char*)
-                  calloc(path_buf_len + sizeof(char), sizeof(char));
-
-               if (path_buf)
-               {
-                  WideCharToMultiByte(cp_out, 0,
-                        path_buf_wide, -1, path_buf,
-                        path_buf_len, NULL, NULL);
-
-                  free(path_buf_wide);
-
-                  if (*path_buf)
-                     return path_buf;
-
-                  free(path_buf);
-                  return NULL;
-               }
-            }
-            else
-            {
-               free(path_buf_wide);
-               return strdup(str);
-            }
-         }
-      }
-   }
-   else
+   if (!path_buf_wide_len)
       return strdup(str);
 
+   path_buf_wide = (wchar_t*)
+      calloc(path_buf_wide_len + sizeof(wchar_t), sizeof(wchar_t));
+
    if (path_buf_wide)
+   {
+      MultiByteToWideChar(cp_in, 0,
+            str, -1, path_buf_wide, path_buf_wide_len);
+
+      if (*path_buf_wide)
+      {
+         int path_buf_len = WideCharToMultiByte(cp_out, 0,
+               path_buf_wide, -1, NULL, 0, NULL, NULL);
+
+         if (path_buf_len)
+         {
+            char *path_buf = (char*)
+               calloc(path_buf_len + sizeof(char), sizeof(char));
+
+            if (path_buf)
+            {
+               WideCharToMultiByte(cp_out, 0,
+                     path_buf_wide, -1, path_buf,
+                     path_buf_len, NULL, NULL);
+
+               free(path_buf_wide);
+
+               if (*path_buf)
+                  return path_buf;
+
+               free(path_buf);
+               return NULL;
+            }
+         }
+         else
+         {
+            free(path_buf_wide);
+            return strdup(str);
+         }
+      }
+
       free(path_buf_wide);
+   }
 
    return NULL;
 }
@@ -379,13 +381,13 @@ char* local_to_utf8_string_alloc(const char *str)
 wchar_t* utf8_to_utf16_string_alloc(const char *str)
 {
 #ifdef _WIN32
-   int len = 0;
-   int out_len = 0;
+   int len        = 0;
+   int out_len    = 0;
 #else
-   size_t len = 0;
+   size_t len     = 0;
    size_t out_len = 0;
 #endif
-   wchar_t *buf = NULL;
+   wchar_t *buf   = NULL;
 
    if (!str || !*str)
       return NULL;
diff --git a/src/drivers/libretro/libretro-common/include/boolean.h b/src/drivers/libretro/libretro-common/include/boolean.h
index f06ac5a..9d0d7c1 100644
--- a/src/drivers/libretro/libretro-common/include/boolean.h
+++ b/src/drivers/libretro/libretro-common/include/boolean.h
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
+/* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (boolean.h).
diff --git a/src/drivers/libretro/libretro-common/include/compat/msvc.h b/src/drivers/libretro/libretro-common/include/compat/msvc.h
index 1c24263..a4c93a5 100644
--- a/src/drivers/libretro/libretro-common/include/compat/msvc.h
+++ b/src/drivers/libretro/libretro-common/include/compat/msvc.h
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
+/* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (msvc.h).
@@ -29,22 +29,17 @@
 extern "C"  {
 #endif
 
-/* Pre-MSVC 2015 compilers don't implement snprintf in a cross-platform manner. */
+/* Pre-MSVC 2015 compilers don't implement snprintf, vsnprintf in a cross-platform manner. */
 #if _MSC_VER < 1900
-   #include <stdio.h>
-   #include <stdlib.h>
-   #ifndef snprintf
-      #define snprintf c99_snprintf_retro__
-   #endif
-
-   int c99_snprintf_retro__(char *outBuf, size_t size, const char *format, ...);
-#endif
-
-/* Pre-MSVC 2008 compilers don't implement vsnprintf in a cross-platform manner? Not sure about this one. */
-#if _MSC_VER < 1500
    #include <stdio.h>
    #include <stdarg.h>
    #include <stdlib.h>
+
+   #ifndef snprintf
+      #define snprintf c99_snprintf_retro__
+   #endif
+   int c99_snprintf_retro__(char *outBuf, size_t size, const char *format, ...);
+
    #ifndef vsnprintf
       #define vsnprintf c99_vsnprintf_retro__
    #endif
diff --git a/src/drivers/libretro/libretro-common/include/compat/strl.h b/src/drivers/libretro/libretro-common/include/compat/strl.h
index c70f119..5e7a892 100644
--- a/src/drivers/libretro/libretro-common/include/compat/strl.h
+++ b/src/drivers/libretro/libretro-common/include/compat/strl.h
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
+/* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (strl.h).
diff --git a/src/drivers/libretro/libretro-common/include/encodings/crc32.h b/src/drivers/libretro/libretro-common/include/encodings/crc32.h
index 25e9262..5236c91 100644
--- a/src/drivers/libretro/libretro-common/include/encodings/crc32.h
+++ b/src/drivers/libretro/libretro-common/include/encodings/crc32.h
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
+/* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (crc32.h).
diff --git a/src/drivers/libretro/libretro-common/include/encodings/utf.h b/src/drivers/libretro/libretro-common/include/encodings/utf.h
index b513f28..bea4e14 100644
--- a/src/drivers/libretro/libretro-common/include/encodings/utf.h
+++ b/src/drivers/libretro/libretro-common/include/encodings/utf.h
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
+/* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (utf.h).
@@ -35,7 +35,7 @@ RETRO_BEGIN_DECLS
 enum CodePage
 {
    CODEPAGE_LOCAL = 0, /* CP_ACP */
-   CODEPAGE_UTF8 = 65001 /* CP_UTF8 */
+   CODEPAGE_UTF8  = 65001 /* CP_UTF8 */
 };
 
 size_t utf8_conv_utf32(uint32_t *out, size_t out_chars,
diff --git a/src/drivers/libretro/libretro-common/include/encodings/win32.h b/src/drivers/libretro/libretro-common/include/encodings/win32.h
index d4221bd..8104af0 100644
--- a/src/drivers/libretro/libretro-common/include/encodings/win32.h
+++ b/src/drivers/libretro/libretro-common/include/encodings/win32.h
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
+/* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (utf.h).
diff --git a/src/drivers/libretro/libretro-common/include/libretro.h b/src/drivers/libretro/libretro-common/include/libretro.h
index 4ddb6e8..59bd513 100644
--- a/src/drivers/libretro/libretro-common/include/libretro.h
+++ b/src/drivers/libretro/libretro-common/include/libretro.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010-2018 The RetroArch team
+/* Copyright (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this libretro API header (libretro.h).
@@ -278,6 +278,10 @@ enum retro_language
    RETRO_LANGUAGE_ARABIC              = 16,
    RETRO_LANGUAGE_GREEK               = 17,
    RETRO_LANGUAGE_TURKISH             = 18,
+   RETRO_LANGUAGE_SLOVAK              = 19,
+   RETRO_LANGUAGE_PERSIAN             = 20,
+   RETRO_LANGUAGE_HEBREW              = 21,
+   RETRO_LANGUAGE_ASTURIAN            = 22,
    RETRO_LANGUAGE_LAST,
 
    /* Ensure sizeof(enum) == sizeof(int) */
@@ -1087,10 +1091,10 @@ enum retro_mod
 
 #define RETRO_ENVIRONMENT_GET_TARGET_REFRESH_RATE (50 | RETRO_ENVIRONMENT_EXPERIMENTAL)
                                             /* float * --
-                                            * Float value that lets us know what target refresh rate 
+                                            * Float value that lets us know what target refresh rate
                                             * is curently in use by the frontend.
                                             *
-                                            * The core can use the returned value to set an ideal 
+                                            * The core can use the returned value to set an ideal
                                             * refresh rate/framerate.
                                             */
 
@@ -1098,7 +1102,7 @@ enum retro_mod
                                             /* bool * --
                                             * Boolean value that indicates whether or not the frontend supports
                                             * input bitmasks being returned by retro_input_state_t. The advantage
-                                            * of this is that retro_input_state_t has to be only called once to 
+                                            * of this is that retro_input_state_t has to be only called once to
                                             * grab all button states instead of multiple times.
                                             *
                                             * If it returns true, you can pass RETRO_DEVICE_ID_JOYPAD_MASK as 'id'
@@ -1287,6 +1291,89 @@ enum retro_mod
                                             * based systems).
                                             */
 
+#define RETRO_ENVIRONMENT_GET_MESSAGE_INTERFACE_VERSION 59
+                                           /* unsigned * --
+                                            * Unsigned value is the API version number of the message
+                                            * interface supported by the frontend. If callback returns
+                                            * false, API version is assumed to be 0.
+                                            *
+                                            * In legacy code, messages may be displayed in an
+                                            * implementation-specific manner by passing a struct
+                                            * of type retro_message to RETRO_ENVIRONMENT_SET_MESSAGE.
+                                            * This may be still be done regardless of the message
+                                            * interface version.
+                                            *
+                                            * If version is >= 1 however, messages may instead be
+                                            * displayed by passing a struct of type retro_message_ext
+                                            * to RETRO_ENVIRONMENT_SET_MESSAGE_EXT. This allows the
+                                            * core to specify message logging level, priority and
+                                            * destination (OSD, logging interface or both).
+                                            */
+
+#define RETRO_ENVIRONMENT_SET_MESSAGE_EXT 60
+                                           /* const struct retro_message_ext * --
+                                            * Sets a message to be displayed in an implementation-specific
+                                            * manner for a certain amount of 'frames'. Additionally allows
+                                            * the core to specify message logging level, priority and
+                                            * destination (OSD, logging interface or both).
+                                            * Should not be used for trivial messages, which should simply be
+                                            * logged via RETRO_ENVIRONMENT_GET_LOG_INTERFACE (or as a
+                                            * fallback, stderr).
+                                            */
+
+#define RETRO_ENVIRONMENT_GET_INPUT_MAX_USERS 61
+                                           /* unsigned * --
+                                            * Unsigned value is the number of active input devices
+                                            * provided by the frontend. This may change between
+                                            * frames, but will remain constant for the duration
+                                            * of each frame.
+                                            * If callback returns true, a core need not poll any
+                                            * input device with an index greater than or equal to
+                                            * the number of active devices.
+                                            * If callback returns false, the number of active input
+                                            * devices is unknown. In this case, all input devices
+                                            * should be considered active.
+                                            */
+
+#define RETRO_ENVIRONMENT_SET_AUDIO_BUFFER_STATUS_CALLBACK 62
+                                           /* const struct retro_audio_buffer_status_callback * --
+                                            * Lets the core know the occupancy level of the frontend
+                                            * audio buffer. Can be used by a core to attempt frame
+                                            * skipping in order to avoid buffer under-runs.
+                                            * A core may pass NULL to disable buffer status reporting
+                                            * in the frontend.
+                                            */
+
+#define RETRO_ENVIRONMENT_SET_MINIMUM_AUDIO_LATENCY 63
+                                           /* const unsigned * --
+                                            * Sets minimum frontend audio latency in milliseconds.
+                                            * Resultant audio latency may be larger than set value,
+                                            * or smaller if a hardware limit is encountered. A frontend
+                                            * is expected to honour requests up to 512 ms.
+                                            *
+                                            * - If value is less than current frontend
+                                            *   audio latency, callback has no effect
+                                            * - If value is zero, default frontend audio
+                                            *   latency is set
+                                            *
+                                            * May be used by a core to increase audio latency and
+                                            * therefore decrease the probability of buffer under-runs
+                                            * (crackling) when performing 'intensive' operations.
+                                            * A core utilising RETRO_ENVIRONMENT_SET_AUDIO_BUFFER_STATUS_CALLBACK
+                                            * to implement audio-buffer-based frame skipping may achieve
+                                            * optimal results by setting the audio latency to a 'high'
+                                            * (typically 6x or 8x) integer multiple of the expected
+                                            * frame time.
+                                            *
+                                            * WARNING: This can only be called from within retro_run().
+                                            * Calling this can require a full reinitialization of audio
+                                            * drivers in the frontend, so it is important to call it very
+                                            * sparingly, and usually only with the users explicit consent.
+                                            * An eventual driver reinitialize will happen so that audio
+                                            * callbacks happening after this call within the same retro_run()
+                                            * call will target the newly initialized driver.
+                                            */
+
 /* VFS functionality */
 
 /* File paths:
@@ -2176,6 +2263,30 @@ struct retro_frame_time_callback
    retro_usec_t reference;
 };
 
+/* Notifies a libretro core of the current occupancy
+ * level of the frontend audio buffer.
+ *
+ * - active: 'true' if audio buffer is currently
+ *           in use. Will be 'false' if audio is
+ *           disabled in the frontend
+ *
+ * - occupancy: Given as a value in the range [0,100],
+ *              corresponding to the occupancy percentage
+ *              of the audio buffer
+ *
+ * - underrun_likely: 'true' if the frontend expects an
+ *                    audio buffer underrun during the
+ *                    next frame (indicates that a core
+ *                    should attempt frame skipping)
+ *
+ * It will be called right before retro_run() every frame. */
+typedef void (RETRO_CALLCONV *retro_audio_buffer_status_callback_t)(
+      bool active, unsigned occupancy, bool underrun_likely);
+struct retro_audio_buffer_status_callback
+{
+   retro_audio_buffer_status_callback_t callback;
+};
+
 /* Pass this to retro_video_refresh_t if rendering to hardware.
  * Passing NULL to retro_video_refresh_t is still a frame dupe as normal.
  * */
@@ -2506,6 +2617,104 @@ struct retro_message
    unsigned    frames;     /* Duration in frames of message. */
 };
 
+enum retro_message_target
+{
+   RETRO_MESSAGE_TARGET_ALL = 0,
+   RETRO_MESSAGE_TARGET_OSD,
+   RETRO_MESSAGE_TARGET_LOG
+};
+
+enum retro_message_type
+{
+   RETRO_MESSAGE_TYPE_NOTIFICATION = 0,
+   RETRO_MESSAGE_TYPE_NOTIFICATION_ALT,
+   RETRO_MESSAGE_TYPE_STATUS,
+   RETRO_MESSAGE_TYPE_PROGRESS
+};
+
+struct retro_message_ext
+{
+   /* Message string to be displayed/logged */
+   const char *msg;
+   /* Duration (in ms) of message when targeting the OSD */
+   unsigned duration;
+   /* Message priority when targeting the OSD
+    * > When multiple concurrent messages are sent to
+    *   the frontend and the frontend does not have the
+    *   capacity to display them all, messages with the
+    *   *highest* priority value should be shown
+    * > There is no upper limit to a message priority
+    *   value (within the bounds of the unsigned data type)
+    * > In the reference frontend (RetroArch), the same
+    *   priority values are used for frontend-generated
+    *   notifications, which are typically assigned values
+    *   between 0 and 3 depending upon importance */
+   unsigned priority;
+   /* Message logging level (info, warn, error, etc.) */
+   enum retro_log_level level;
+   /* Message destination: OSD, logging interface or both */
+   enum retro_message_target target;
+   /* Message 'type' when targeting the OSD
+    * > RETRO_MESSAGE_TYPE_NOTIFICATION: Specifies that a
+    *   message should be handled in identical fashion to
+    *   a standard frontend-generated notification
+    * > RETRO_MESSAGE_TYPE_NOTIFICATION_ALT: Specifies that
+    *   message is a notification that requires user attention
+    *   or action, but that it should be displayed in a manner
+    *   that differs from standard frontend-generated notifications.
+    *   This would typically correspond to messages that should be
+    *   displayed immediately (independently from any internal
+    *   frontend message queue), and/or which should be visually
+    *   distinguishable from frontend-generated notifications.
+    *   For example, a core may wish to inform the user of
+    *   information related to a disk-change event. It is
+    *   expected that the frontend itself may provide a
+    *   notification in this case; if the core sends a
+    *   message of type RETRO_MESSAGE_TYPE_NOTIFICATION, an
+    *   uncomfortable 'double-notification' may occur. A message
+    *   of RETRO_MESSAGE_TYPE_NOTIFICATION_ALT should therefore
+    *   be presented such that visual conflict with regular
+    *   notifications does not occur
+    * > RETRO_MESSAGE_TYPE_STATUS: Indicates that message
+    *   is not a standard notification. This typically
+    *   corresponds to 'status' indicators, such as a core's
+    *   internal FPS, which are intended to be displayed
+    *   either permanently while a core is running, or in
+    *   a manner that does not suggest user attention or action
+    *   is required. 'Status' type messages should therefore be
+    *   displayed in a different on-screen location and in a manner
+    *   easily distinguishable from both standard frontend-generated
+    *   notifications and messages of type RETRO_MESSAGE_TYPE_NOTIFICATION_ALT
+    * > RETRO_MESSAGE_TYPE_PROGRESS: Indicates that message reports
+    *   the progress of an internal core task. For example, in cases
+    *   where a core itself handles the loading of content from a file,
+    *   this may correspond to the percentage of the file that has been
+    *   read. Alternatively, an audio/video playback core may use a
+    *   message of type RETRO_MESSAGE_TYPE_PROGRESS to display the current
+    *   playback position as a percentage of the runtime. 'Progress' type
+    *   messages should therefore be displayed as a literal progress bar,
+    *   where:
+    *   - 'retro_message_ext.msg' is the progress bar title/label
+    *   - 'retro_message_ext.progress' determines the length of
+    *     the progress bar
+    * NOTE: Message type is a *hint*, and may be ignored
+    * by the frontend. If a frontend lacks support for
+    * displaying messages via alternate means than standard
+    * frontend-generated notifications, it will treat *all*
+    * messages as having the type RETRO_MESSAGE_TYPE_NOTIFICATION */
+   enum retro_message_type type;
+   /* Task progress when targeting the OSD and message is
+    * of type RETRO_MESSAGE_TYPE_PROGRESS
+    * > -1:    Unmetered/indeterminate
+    * > 0-100: Current progress percentage
+    * NOTE: Since message type is a hint, a frontend may ignore
+    * progress values. Where relevant, a core should therefore
+    * include progress percentage within the message string,
+    * such that the message intent remains clear when displayed
+    * as a standard frontend-generated notification */
+   int8_t progress;
+};
+
 /* Describes how the libretro implementation maps a libretro input bind
  * to its internal input system through a human readable string.
  * This string can be used to better let a user configure input. */
@@ -2526,7 +2735,7 @@ struct retro_input_descriptor
 struct retro_system_info
 {
    /* All pointers are owned by libretro implementation, and pointers must
-    * remain valid until retro_deinit() is called. */
+    * remain valid until it is unloaded. */
 
    const char *library_name;      /* Descriptive name of library. Should not
                                    * contain any version numbers, etc. */
diff --git a/src/drivers/libretro/libretro-common/include/retro_common.h b/src/drivers/libretro/libretro-common/include/retro_common.h
index 9a1fd5f..a715a28 100644
--- a/src/drivers/libretro/libretro-common/include/retro_common.h
+++ b/src/drivers/libretro/libretro-common/include/retro_common.h
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
+/* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (retro_common.h).
diff --git a/src/drivers/libretro/libretro-common/include/retro_common_api.h b/src/drivers/libretro/libretro-common/include/retro_common_api.h
index d784842..0f68b7d 100644
--- a/src/drivers/libretro/libretro-common/include/retro_common_api.h
+++ b/src/drivers/libretro/libretro-common/include/retro_common_api.h
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
+/* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (retro_common_api.h).
diff --git a/src/drivers/libretro/libretro-common/include/retro_inline.h b/src/drivers/libretro/libretro-common/include/retro_inline.h
index e4a21f6..b27d6dd 100644
--- a/src/drivers/libretro/libretro-common/include/retro_inline.h
+++ b/src/drivers/libretro/libretro-common/include/retro_inline.h
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
+/* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (retro_inline.h).
diff --git a/src/drivers/libretro/libretro-common/include/streams/memory_stream.h b/src/drivers/libretro/libretro-common/include/streams/memory_stream.h
index f9e641b..2c6f3fc 100644
--- a/src/drivers/libretro/libretro-common/include/streams/memory_stream.h
+++ b/src/drivers/libretro/libretro-common/include/streams/memory_stream.h
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
+/* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (memory_stream.h).
diff --git a/src/drivers/libretro/libretro-common/include/string/stdstring.h b/src/drivers/libretro/libretro-common/include/string/stdstring.h
index d57256a..5d8c31b 100644
--- a/src/drivers/libretro/libretro-common/include/string/stdstring.h
+++ b/src/drivers/libretro/libretro-common/include/string/stdstring.h
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2019 The RetroArch team
+/* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (stdstring.h).
@@ -35,6 +35,33 @@
 
 RETRO_BEGIN_DECLS
 
+#define STRLEN_CONST(x)                   ((sizeof((x))-1))
+
+#define strcpy_literal(a, b)              strcpy(a, b)
+
+#define string_is_not_equal(a, b)         !string_is_equal((a), (b))
+
+#define string_is_not_equal_fast(a, b, size) (memcmp(a, b, size) != 0)
+#define string_is_equal_fast(a, b, size)     (memcmp(a, b, size) == 0)
+
+#define TOLOWER(c)   (c |  (lr_char_props[c] & 0x20))
+#define TOUPPER(c)   (c & ~(lr_char_props[c] & 0x20))
+
+/* C standard says \f \v are space, but this one disagrees */
+#define ISSPACE(c)   (lr_char_props[c]  & 0x80) 
+
+#define ISDIGIT(c)   (lr_char_props[c]  & 0x40)
+#define ISALPHA(c)   (lr_char_props[c]  & 0x20)
+#define ISLOWER(c)   (lr_char_props[c]  & 0x04)
+#define ISUPPER(c)   (lr_char_props[c]  & 0x02)
+#define ISALNUM(c)   (lr_char_props[c]  & 0x60)
+#define ISUALPHA(c)  (lr_char_props[c]  & 0x28)
+#define ISUALNUM(c)  (lr_char_props[c]  & 0x68)
+#define IS_XDIGIT(c) (lr_char_props[c]  & 0x01)
+
+/* Deprecated alias, all callers should use string_is_equal_case_insensitive instead */
+#define string_is_equal_noncase string_is_equal_case_insensitive
+
 static INLINE bool string_is_empty(const char *data)
 {
    return !data || (*data == '\0');
@@ -45,12 +72,44 @@ static INLINE bool string_is_equal(const char *a, const char *b)
    return (a && b) ? !strcmp(a, b) : false;
 }
 
-#define STRLEN_CONST(x)                   ((sizeof((x))-1))
+static INLINE bool string_starts_with_size(const char *str, const char *prefix,
+      size_t size)
+{
+   return (str && prefix) ? !strncmp(prefix, str, size) : false;
+}
 
-#define string_is_not_equal(a, b)         !string_is_equal((a), (b))
+static INLINE bool string_starts_with(const char *str, const char *prefix)
+{
+   return (str && prefix) ? !strncmp(prefix, str, strlen(prefix)) : false;
+}
+
+static INLINE bool string_ends_with_size(const char *str, const char *suffix,
+      size_t str_len, size_t suffix_len)
+{
+   return (str_len < suffix_len) ? false :
+         !memcmp(suffix, str + (str_len - suffix_len), suffix_len);
+}
+
+static INLINE bool string_ends_with(const char *str, const char *suffix)
+{
+   if (!str || !suffix)
+      return false;
+   return string_ends_with_size(str, suffix, strlen(str), strlen(suffix));
+}
+
+/* Returns the length of 'str' (c.f. strlen()), but only
+ * checks the first 'size' characters
+ * - If 'str' is NULL, returns 0
+ * - If 'str' is not NULL and no '\0' character is found
+ *   in the first 'size' characters, returns 'size' */
+static INLINE size_t strlen_size(const char *str, size_t size)
+{
+   size_t i = 0;
+   if (str)
+      while (i < size && str[i]) i++;
+   return i;
+}
 
-#define string_is_not_equal_fast(a, b, size) (memcmp(a, b, size) != 0)
-#define string_is_equal_fast(a, b, size)     (memcmp(a, b, size) == 0)
 
 static INLINE bool string_is_equal_case_insensitive(const char *a,
       const char *b)
@@ -71,24 +130,6 @@ static INLINE bool string_is_equal_case_insensitive(const char *a,
    return (result == 0);
 }
 
-static INLINE bool string_is_equal_noncase(const char *a, const char *b)
-{
-   int result              = 0;
-   const unsigned char *p1 = (const unsigned char*)a;
-   const unsigned char *p2 = (const unsigned char*)b;
-
-   if (!a || !b)
-      return false;
-   if (p1 == p2)
-      return false;
-
-   while ((result = tolower (*p1) - tolower (*p2++)) == 0)
-      if (*p1++ == '\0')
-         break;
-
-   return (result == 0);
-}
-
 char *string_to_upper(char *s);
 
 char *string_to_lower(char *s);
@@ -121,7 +162,7 @@ char *word_wrap(char *buffer, const char *string,
  *    char *str      = "1,2,3,4,5,6,7,,,10,";
  *    char **str_ptr = &str;
  *    char *token    = NULL;
- *    while((token = string_tokenize(str_ptr, ",")))
+ *    while ((token = string_tokenize(str_ptr, ",")))
  *    {
  *        printf("%s\n", token);
  *        free(token);
@@ -146,6 +187,12 @@ unsigned string_to_unsigned(const char *str);
  * Returns 0 if string is invalid  */
 unsigned string_hex_to_unsigned(const char *str);
 
+char *string_init(const char *src);
+
+void string_set(char **string, const char *src);
+
+extern const unsigned char lr_char_props[256];
+
 RETRO_END_DECLS
 
 #endif
diff --git a/src/drivers/libretro/libretro-common/streams/memory_stream.c b/src/drivers/libretro/libretro-common/streams/memory_stream.c
index 829ef03..2aa1c80 100644
--- a/src/drivers/libretro/libretro-common/streams/memory_stream.c
+++ b/src/drivers/libretro/libretro-common/streams/memory_stream.c
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
+/* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (memory_stream.c).
@@ -26,29 +26,24 @@
 
 #include <streams/memory_stream.h>
 
+/* TODO/FIXME - static globals */
 static uint8_t* g_buffer      = NULL;
 static uint64_t g_size         = 0;
 static uint64_t last_file_size = 0;
 
 struct memstream
 {
-   uint8_t *buf;
    uint64_t size;
    uint64_t ptr;
    uint64_t max_ptr;
+   uint8_t *buf;
    unsigned writing;
 };
 
-static void memstream_update_pos(memstream_t *stream)
-{
-   if (stream && stream->ptr > stream->max_ptr)
-      stream->max_ptr = stream->ptr;
-}
-
 void memstream_set_buffer(uint8_t *buffer, uint64_t size)
 {
    g_buffer = buffer;
-   g_size = size;
+   g_size   = size;
 }
 
 uint64_t memstream_get_last_size(void)
@@ -56,30 +51,26 @@ uint64_t memstream_get_last_size(void)
    return last_file_size;
 }
 
-static void memstream_init(memstream_t *stream,
-      uint8_t *buffer, uint64_t max_size, unsigned writing)
-{
-   if (!stream)
-      return;
-
-   stream->buf     = buffer;
-   stream->size    = max_size;
-   stream->ptr     = 0;
-   stream->max_ptr = 0;
-   stream->writing = writing;
-}
-
 memstream_t *memstream_open(unsigned writing)
 {
    memstream_t *stream;
    if (!g_buffer || !g_size)
       return NULL;
 
-   stream = (memstream_t*)calloc(1, sizeof(*stream));
-   memstream_init(stream, g_buffer, g_size, writing);
+   stream = (memstream_t*)malloc(sizeof(*stream));
+
+   if (!stream)
+      return NULL;
+
+   stream->buf       = g_buffer;
+   stream->size      = g_size;
+   stream->ptr       = 0;
+   stream->max_ptr   = 0;
+   stream->writing   = writing;
+
+   g_buffer          = NULL;
+   g_size            = 0;
 
-   g_buffer = NULL;
-   g_size = 0;
    return stream;
 }
 
@@ -104,17 +95,19 @@ uint64_t memstream_read(memstream_t *stream, void *data, uint64_t bytes)
    if (!stream)
       return 0;
 
-   avail = stream->size - stream->ptr;
+   avail               = stream->size - stream->ptr;
    if (bytes > avail)
-      bytes = avail;
+      bytes            = avail;
 
    memcpy(data, stream->buf + stream->ptr, (size_t)bytes);
-   stream->ptr += bytes;
-   memstream_update_pos(stream);
+   stream->ptr        += bytes;
+   if (stream->ptr > stream->max_ptr)
+      stream->max_ptr  = stream->ptr;
    return bytes;
 }
 
-uint64_t memstream_write(memstream_t *stream, const void *data, uint64_t bytes)
+uint64_t memstream_write(memstream_t *stream,
+      const void *data, uint64_t bytes)
 {
    uint64_t avail = 0;
 
@@ -127,7 +120,8 @@ uint64_t memstream_write(memstream_t *stream, const void *data, uint64_t bytes)
 
    memcpy(stream->buf + stream->ptr, data, (size_t)bytes);
    stream->ptr += bytes;
-   memstream_update_pos(stream);
+   if (stream->ptr > stream->max_ptr)
+      stream->max_ptr = stream->ptr;
    return bytes;
 }
 
@@ -181,7 +175,8 @@ int memstream_getc(memstream_t *stream)
       return EOF;
    ret = stream->buf[stream->ptr++];
 
-   memstream_update_pos(stream);
+   if (stream->ptr > stream->max_ptr)
+      stream->max_ptr = stream->ptr;
 
    return ret;
 }
@@ -191,5 +186,6 @@ void memstream_putc(memstream_t *stream, int c)
    if (stream->ptr < stream->size)
       stream->buf[stream->ptr++] = c;
 
-   memstream_update_pos(stream);
+   if (stream->ptr > stream->max_ptr)
+      stream->max_ptr = stream->ptr;
 }
diff --git a/src/drivers/libretro/libretro-common/string/stdstring.c b/src/drivers/libretro/libretro-common/string/stdstring.c
index e2afef1..67ee7fc 100644
--- a/src/drivers/libretro/libretro-common/string/stdstring.c
+++ b/src/drivers/libretro/libretro-common/string/stdstring.c
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
+/* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (stdstring.c).
@@ -22,10 +22,43 @@
 
 #include <stdint.h>
 #include <ctype.h>
+#include <string.h>
 
 #include <string/stdstring.h>
 #include <encodings/utf.h>
 
+const uint8_t lr_char_props[256] = {
+	/*x0   x1   x2   x3   x4   x5   x6   x7   x8   x9   xA   xB   xC   xD   xE   xF */
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x80,0x00,0x00,0x80,0x00,0x00, /* 0x                  */
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 1x                  */
+	0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 2x  !"#$%&'()*+,-./ */
+	0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x00,0x00,0x00,0x00,0x00,0x00, /* 3x 0123456789:;<=>? */
+	0x00,0x23,0x23,0x23,0x23,0x23,0x23,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22, /* 4x @ABCDEFGHIJKLMNO */
+	0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x00,0x00,0x00,0x00,0x08, /* 5x PQRSTUVWXYZ[\]^_ */
+	0x00,0x25,0x25,0x25,0x25,0x25,0x25,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24, /* 6x `abcdefghijklmno */
+	0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x00,0x00,0x00,0x00,0x00, /* 7x pqrstuvwxyz{|}~  */
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 8x                  */
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 9x                  */
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* Ax                  */
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* Bx                  */
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* Cx                  */
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* Dx                  */
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* Ex                  */
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* Fx                  */
+};
+
+char *string_init(const char *src)
+{
+   return src ? strdup(src) : NULL;
+}
+
+void string_set(char **string, const char *src)
+{
+   free(*string);
+   *string = string_init(src);
+}
+
+
 char *string_to_upper(char *s)
 {
    char *cs = (char *)s;
@@ -107,18 +140,18 @@ char *string_replace_substring(const char *in,
 /* Remove leading whitespaces */
 char *string_trim_whitespace_left(char *const s)
 {
-   if(s && *s)
+   if (s && *s)
    {
       size_t len     = strlen(s);
       char *current  = s;
 
-      while(*current && isspace((unsigned char)*current))
+      while (*current && ISSPACE((unsigned char)*current))
       {
          ++current;
          --len;
       }
 
-      if(s != current)
+      if (s != current)
          memmove(s, current, len + 1);
    }
 
@@ -128,18 +161,18 @@ char *string_trim_whitespace_left(char *const s)
 /* Remove trailing whitespaces */
 char *string_trim_whitespace_right(char *const s)
 {
-   if(s && *s)
+   if (s && *s)
    {
       size_t len     = strlen(s);
       char  *current = s + len - 1;
 
-      while(current != s && isspace((unsigned char)*current))
+      while (current != s && ISSPACE((unsigned char)*current))
       {
          --current;
          --len;
       }
 
-      current[isspace((unsigned char)*current) ? 0 : 1] = '\0';
+      current[ISSPACE((unsigned char)*current) ? 0 : 1] = '\0';
    }
 
    return s;
@@ -190,7 +223,7 @@ char *word_wrap(char* buffer, const char *string, int line_width, bool unicode,
             buffer[i] = string[i];
             char_len--;
             i++;
-         } while(char_len);
+         } while (char_len);
 
          /* check for newlines embedded in the original input
           * and reset the index */
@@ -248,7 +281,7 @@ char *word_wrap(char* buffer, const char *string, int line_width, bool unicode,
  *    char *str      = "1,2,3,4,5,6,7,,,10,";
  *    char **str_ptr = &str;
  *    char *token    = NULL;
- *    while((token = string_tokenize(str_ptr, ",")))
+ *    while ((token = string_tokenize(str_ptr, ",")))
  *    {
  *        printf("%s\n", token);
  *        free(token);
@@ -328,7 +361,7 @@ void string_replace_all_chars(char *str, char find, char replace)
    if (string_is_empty(str))
       return;
 
-   while((str_ptr = strchr(str_ptr, find)) != NULL)
+   while ((str_ptr = strchr(str_ptr, find)))
       *str_ptr++ = replace;
 }
 
@@ -343,7 +376,7 @@ unsigned string_to_unsigned(const char *str)
 
    for (ptr = str; *ptr != '\0'; ptr++)
    {
-      if (!isdigit(*ptr))
+      if (!ISDIGIT((unsigned char)*ptr))
          return 0;
    }
 
@@ -376,7 +409,7 @@ unsigned string_hex_to_unsigned(const char *str)
    /* Check for valid characters */
    for (ptr = hex_str; *ptr != '\0'; ptr++)
    {
-      if (!isxdigit(*ptr))
+      if (!isxdigit((unsigned char)*ptr))
          return 0;
    }
 

From 2ae14b75de84c27736aec633d12c0d31f0d78e6b Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sun, 25 Oct 2020 13:58:06 +0800
Subject: [PATCH 049/295] APU: Move duty cycle swapping during apu writes

---
 src/sound.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/sound.c b/src/sound.c
index 40973c2..a3f331b 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -195,6 +195,8 @@ static DECLFW(Write_PSG) {
 		DoSQ1();
 		EnvUnits[0].Mode = (V & 0x30) >> 4;
 		EnvUnits[0].Speed = (V & 0xF);
+		if (swapDuty)
+			V = (V & 0x3F) | ((V & 0x80) >> 1) | ((V & 0x40) << 1);
 		break;
 	case 0x1:
 		DoSQ1();
@@ -214,6 +216,8 @@ static DECLFW(Write_PSG) {
 		DoSQ2();
 		EnvUnits[1].Mode = (V & 0x30) >> 4;
 		EnvUnits[1].Speed = (V & 0xF);
+		if (swapDuty)
+			V = (V & 0x3F) | ((V & 0x80) >> 1) | ((V & 0x40) << 1);
 		break;
 	case 0x5:
 		DoSQ2();
@@ -561,8 +565,6 @@ static INLINE void RDoSQ(int x) {
 
 		amp <<= 24;
 		dutyCycle = (PSG[(x << 2)] & 0xC0) >> 6;
-		if (swapDuty)
-			dutyCycle = ((dutyCycle & 2) >> 1) | ((dutyCycle & 1) << 1);
 		rthresh = RectDuties[dutyCycle];
 		currdc = RectDutyCount[x];
 		D = &WaveHi[ChannelBC[x]];
@@ -640,8 +642,6 @@ static void RDoSQLQ(void) {
 		if (!inie[x]) amp[x] = 0;	/* Correct? Buzzing in MM2, others otherwise... */
 
 		dutyCycle = (PSG[(x << 2)] & 0xC0) >> 6;
-		if (swapDuty)
-			dutyCycle = ((dutyCycle & 2) >> 1) | ((dutyCycle & 1) << 1);
 		rthresh[x] = RectDuties[dutyCycle];
 
 		for (y = 0; y < 8; y++) {

From 4e2c5468e4f4ac72ef318ee2756db4eb9cc2037f Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sun, 25 Oct 2020 19:13:45 +0800
Subject: [PATCH 050/295] Overclock: Remove this for region change

These variables, normal_scanlines and totalscanlines will get updated if
FCUI_SetVidSystem(), so no need to set it here.
---
 src/drivers/libretro/libretro.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 90e1790..b29fdec 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -1053,7 +1053,7 @@ static void retro_set_custom_palette(void)
  * Dendy has PAL framerate and resolution, but ~NTSC timings,
  * and has 50 dummy scanlines to force 50 fps.
  */
-void FCEUD_RegionOverride(unsigned region)
+static void FCEUD_RegionOverride(unsigned region)
 {
    unsigned pal = 0;
    unsigned d = 0;
@@ -1078,8 +1078,6 @@ void FCEUD_RegionOverride(unsigned region)
    }
 
    dendy = d;
-   normal_scanlines = dendy ? 290 : 240;
-   totalscanlines = normal_scanlines + (overclock_enabled ? extrascanlines : 0);
    FCEUI_SetVidSystem(pal);
    ResetPalette();
 }

From 9f465177922f95c561e1204a793b045d9d8bf702 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 26 Oct 2020 06:51:20 +0800
Subject: [PATCH 051/295] Fix some warnings reported from LGTM

---
 src/boards/269.c   |  2 +-
 src/input/shadow.c |  2 +-
 src/input/zapper.c |  2 +-
 src/sound.c        | 10 ++++++----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/boards/269.c b/src/boards/269.c
index 358ccce..b62f50f 100644
--- a/src/boards/269.c
+++ b/src/boards/269.c
@@ -80,7 +80,7 @@ static uint8 unscrambleCHR(uint8 data) {
 }
 
 void Mapper269_Init(CartInfo *info) {
-	uint8 i;
+	uint32 i;
 	GenMMC3_Init(info, 512, 0, 8, 0);
 	cwrap = M269CW;
 	pwrap = M269PW;
diff --git a/src/input/shadow.c b/src/input/shadow.c
index 8f9d767..e8b0aa9 100644
--- a/src/input/shadow.c
+++ b/src/input/shadow.c
@@ -66,7 +66,7 @@ static void FP_FASTAPASS(3) ZapperFrapper(uint8 * bg, uint8 * spr, uint32 linets
 
 				sum = palo[a1].r + palo[a1].g + palo[a1].b;
 				if (sum >= 100 * 3) {
-					ZD.zaphit = ((uint64)linets + (xs + 16) * (PAL ? 15 : 16)) / 48 + timestampbase;
+					ZD.zaphit = ((uint64)linets + (uint64)(xs + 16) * (PAL ? 15 : 16)) / 48 + timestampbase;
 					goto endo;
 				}
 			}
diff --git a/src/input/zapper.c b/src/input/zapper.c
index 40a182a..3d891f4 100644
--- a/src/input/zapper.c
+++ b/src/input/zapper.c
@@ -82,7 +82,7 @@ static void FP_FASTAPASS(3) ZapperFrapper(int w, uint8 * bg, uint8 * spr, uint32
 
 				sum = palo[a1].r + palo[a1].g + palo[a1].b;
 				if (sum >= 100 * 3) {
-					ZD[w].zaphit = ((uint64)linets + (xs + 16) * (PAL ? 15 : 16)) / 48 + timestampbase;
+					ZD[w].zaphit = ((uint64)linets + (uint64)(xs + 16) * (PAL ? 15 : 16)) / 48 + timestampbase;
 					goto endo;
 				}
 			}
diff --git a/src/sound.c b/src/sound.c
index a3f331b..2fd2ca2 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1254,7 +1254,7 @@ void FCEUSND_LoadState(int version) {
 	/* minimal validation */
 	for (i = 0; i < 5; i++)
 	{
-		int BC_max = 15;
+		uint32 BC_max = 15;
 
 		if (FSettings.soundq == 2)
 		{
@@ -1264,7 +1264,7 @@ void FCEUSND_LoadState(int version) {
 		{
 			BC_max = 485;
 		}
-		if (ChannelBC[i] < 0 || ChannelBC[i] > BC_max)
+		if (/* ChannelBC[i] < 0 || */ ChannelBC[i] > BC_max)
 		{
 			ChannelBC[i] = 0;
 		}
@@ -1283,14 +1283,16 @@ void FCEUSND_LoadState(int version) {
 			RectDutyCount[i] = 7;
 		}
 	}
-	if (sound_timestamp < 0)
+
+	/* Comparison is always false because access to array >= 0. */
+	/* if (sound_timestamp < 0)
 	{
 		sound_timestamp = 0;
 	}
 	if (soundtsoffs < 0)
 	{
 		soundtsoffs = 0;
-	}
+	} */
 	if (soundtsoffs + sound_timestamp >= soundtsinc)
 	{
 		soundtsoffs = 0;

From 1258eb759fbfe9a53ec2262da0c6626a3e003045 Mon Sep 17 00:00:00 2001
From: Alcaro <floating@muncher.se>
Date: Tue, 27 Oct 2020 04:00:53 +0100
Subject: [PATCH 052/295] Don't set pixel_format in retro_init

libretro.h says "This function should be called inside retro_load_game() or retro_get_system_av_info().", let's do as it says.
---
 src/drivers/libretro/libretro.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 56b2bb2..7e5b6fb 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -981,18 +981,11 @@ static void check_system_specs(void)
 void retro_init(void)
 {
    bool achievements = true;
-   enum retro_pixel_format rgb565;
    log_cb.log=default_logger;
    environ_cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &log_cb);
 
    environ_cb(RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS, &achievements);
 
-#ifdef FRONTEND_SUPPORTS_RGB565
-   rgb565 = RETRO_PIXEL_FORMAT_RGB565;
-   if(environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &rgb565))
-      log_cb.log(RETRO_LOG_INFO, "Frontend supports RGB565 - will use that instead of XRGB1555.\n");
-#endif
-
    if (environ_cb(RETRO_ENVIRONMENT_GET_INPUT_BITMASKS, NULL))
       libretro_supports_bitmasks = true;
 }
@@ -2309,6 +2302,7 @@ bool retro_load_game(const struct retro_game_info *game)
    char* sav_dir=NULL;
    size_t fourscore_len = sizeof(fourscore_db_list)   / sizeof(fourscore_db_list[0]);
    size_t famicom_4p_len = sizeof(famicom_4p_db_list) / sizeof(famicom_4p_db_list[0]);
+   enum retro_pixel_format rgb565;
 
    struct retro_input_descriptor desc[] = {
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,  "D-Pad Left" },
@@ -2367,6 +2361,12 @@ bool retro_load_game(const struct retro_game_info *game)
    if (!game)
       return false;
 
+#ifdef FRONTEND_SUPPORTS_RGB565
+   rgb565 = RETRO_PIXEL_FORMAT_RGB565;
+   if(environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &rgb565))
+      log_cb.log(RETRO_LOG_INFO, "Frontend supports RGB565 - will use that instead of XRGB1555.\n");
+#endif
+
    /* initialize some of the default variables */
 #ifdef GEKKO
    sndsamplerate = 32000;

From 344c12301fc661e1fdb752788a589497e7fc334e Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 26 Oct 2020 09:22:11 +0800
Subject: [PATCH 053/295] Add mapper 370 and 395, update mapper 221

Add support for mapper 395
Add support for mapper 370
Update mapper 221 for 2MB bank support
---
 src/boards/370.c     | 96 ++++++++++++++++++++++++++++++++++++++++++++
 src/boards/395.c     | 67 +++++++++++++++++++++++++++++++
 src/boards/n625092.c | 20 ++++-----
 src/ines.c           |  2 +
 src/ines.h           |  2 +
 5 files changed, 177 insertions(+), 10 deletions(-)
 create mode 100644 src/boards/370.c
 create mode 100644 src/boards/395.c

diff --git a/src/boards/370.c b/src/boards/370.c
new file mode 100644
index 0000000..25f5887
--- /dev/null
+++ b/src/boards/370.c
@@ -0,0 +1,96 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2020 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* Mapper 370 - F600
+ * Golden Mario Party II - Around the World (6-in-1 multicart)
+ */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static uint8 PPUCHRBus;
+static uint8 mirr[8];
+
+static void FP_FASTAPASS(1) M370PPU(uint32 A) {
+	if ((EXPREGS[0] & 7) == 1) {
+		A &= 0x1FFF;
+		A >>= 10;
+		PPUCHRBus = A;
+		setmirror(MI_0 + mirr[A]);
+	}
+}
+
+static void M370CW(uint32 A, uint8 V) {
+	uint8 mask = (EXPREGS[0] & 4) ? 0x7F : 0xFF;
+	/* FIXME: Mario VII, mask is reversed? */
+	if ((EXPREGS[0] & 7) == 6 && V & 0x80)
+		mask = 0xFF;
+	mirr[A >> 10] = V >> 7;
+	setchr1(A, (V & mask) | ((EXPREGS[0] & 7) << 7));
+	if (((EXPREGS[0] & 7) == 1) && (PPUCHRBus == (A >> 10)))
+		setmirror(MI_0 + (V >> 7));
+}
+
+static void M370PW(uint32 A, uint8 V) {
+	uint8 mask = EXPREGS[0] & 0x20 ? 0x0F : 0x1F;
+	setprg8(A, (V & mask) | ((EXPREGS[0] & 0x38) << 1));
+}
+
+static void M370MW(uint8 V) {
+	A000B = V;
+	if ((EXPREGS[0] & 7) != 1)
+		setmirror((V & 1) ^ 1);
+}
+
+static DECLFR(M370Read) {;
+	return (EXPREGS[1] << 7);
+}
+
+static DECLFW(M370Write) {
+	EXPREGS[0] = (A & 0xFF);
+	FixMMC3PRG(MMC3_cmd);
+	FixMMC3CHR(MMC3_cmd);
+}
+
+static void M370Reset(void) {
+	EXPREGS[0] = 0;
+	EXPREGS[1] ^= 1;
+	FCEU_printf("solderpad=%02x\n", EXPREGS[1]);
+	MMC3RegReset();
+}
+
+static void M370Power(void) {
+	EXPREGS[0] = 0;
+	EXPREGS[1] = 1; /* start off with the 6-in-1 menu */
+	GenMMC3Power();
+	SetReadHandler(0x5000, 0x5FFF, M370Read);
+	SetWriteHandler(0x5000, 0x5FFF, M370Write);
+}
+
+void Mapper370_Init(CartInfo *info) {
+	GenMMC3_Init(info, 256, 256, 8, 0);
+	cwrap = M370CW;
+	pwrap = M370PW;
+	mwrap = M370MW;
+	PPU_hook = M370PPU;
+	info->Power = M370Power;
+	info->Reset = M370Reset;
+	AddExState(EXPREGS, 2, 0, "EXPR");
+}
diff --git a/src/boards/395.c b/src/boards/395.c
new file mode 100644
index 0000000..6508850
--- /dev/null
+++ b/src/boards/395.c
@@ -0,0 +1,67 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2020 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* Mapper 395 - Realtec 8210
+ * Super Card 12-in-1 (SPC002)
+ * Super Card 13-in-1 (SPC003)
+ * Super Card 14-in-1 (King006)
+ * Super Card 14-in-1 (King007)
+ */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static void M395CW(uint32 A, uint8 V) {
+	uint8 mask = EXPREGS[1] & 0x40 ? 0x7F : 0xFF;
+	setchr1(A, (V & mask) | ((EXPREGS[1] & 0x10) << 3) | ((EXPREGS[0] & 0x30) << 4) | ((EXPREGS[1] & 0x20) << 5));
+}
+
+static void M395PW(uint32 A, uint8 V) {
+	uint8 mask = EXPREGS[1] & 8 ? 0x0F : 0x1F;
+	setprg8(A, (V & mask) | ((EXPREGS[0] & 0x30) << 1) | ((EXPREGS[0] & 8) << 4) | ((EXPREGS[1] & 1) << 4));
+}
+
+static DECLFW(M395Write) {
+	if (!(EXPREGS[1] & 0x80)) {
+		EXPREGS[(A >> 4) & 1] = V;
+		FixMMC3PRG(MMC3_cmd);
+		FixMMC3CHR(MMC3_cmd);
+	}
+}
+
+static void M395Reset(void) {
+	EXPREGS[0] = EXPREGS[1] = 0;
+	MMC3RegReset();
+}
+
+static void M395Power(void) {
+	EXPREGS[0] = EXPREGS[1] = 0;
+	GenMMC3Power();
+	SetWriteHandler(0x6000, 0x7FFF, M395Write);
+}
+
+void Mapper395_Init(CartInfo *info) {
+	GenMMC3_Init(info, 256, 256, 0, 0);
+	cwrap = M395CW;
+	pwrap = M395PW;
+	info->Power = M395Power;
+	info->Reset = M395Reset;
+	AddExState(EXPREGS, 2, 0, "EXPR");
+}
diff --git a/src/boards/n625092.c b/src/boards/n625092.c
index 1f134c0..800d986 100644
--- a/src/boards/n625092.c
+++ b/src/boards/n625092.c
@@ -18,18 +18,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * 700in1 and 400in1 carts
- *
+ * 1000-in-1
  */
 
-
 #include "mapinc.h"
 
 static uint16 cmd, bank;
 
 static SFORMAT StateRegs[] =
 {
-	{ &cmd, 2, "CMD" },
-	{ &bank, 2, "BANK" },
+	{ &cmd, 2 | FCEUSTATE_RLSB, "CMD" },
+	{ &bank, 2 | FCEUSTATE_RLSB, "BANK" },
 	{ 0 }
 };
 
@@ -38,15 +37,15 @@ static void Sync(void) {
 	setchr8(0);
 	if (cmd & 2) {
 		if (cmd & 0x100) {
-			setprg16(0x8000, ((cmd & 0xfc) >> 2) | bank);
-			setprg16(0xC000, ((cmd & 0xfc) >> 2) | 7);
+			setprg16(0x8000, ((cmd & 0x200) >> 3) | ((cmd & 0xfc) >> 2) | bank);
+			setprg16(0xC000, ((cmd & 0x200) >> 3) | ((cmd & 0xfc) >> 2) | 7);
 		} else {
-			setprg16(0x8000, ((cmd & 0xfc) >> 2) | (bank & 6));
-			setprg16(0xC000, ((cmd & 0xfc) >> 2) | ((bank & 6) | 1));
+			setprg16(0x8000, ((cmd & 0x200) >> 3) | ((cmd & 0xfc) >> 2) | (bank & 6));
+			setprg16(0xC000, ((cmd & 0x200) >> 3) | ((cmd & 0xfc) >> 2) | ((bank & 6) | 1));
 		}
 	} else {
-		setprg16(0x8000, ((cmd & 0xfc) >> 2) | bank);
-		setprg16(0xC000, ((cmd & 0xfc) >> 2) | bank);
+		setprg16(0x8000, ((cmd & 0x200) >> 3) | ((cmd & 0xfc) >> 2) | bank);
+		setprg16(0xC000, ((cmd & 0x200) >> 3) | ((cmd & 0xfc) >> 2) | bank);
 	}
 }
 
@@ -81,6 +80,7 @@ static void UNLN625092Reset(void) {
 	bank = 0;
 	ass++;
 	FCEU_printf("%04x\n", ass);
+	Sync();
 }
 
 static void StateRestore(int version) {
diff --git a/src/ines.c b/src/ines.c
index ab839b7..93c3761 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -694,6 +694,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "Bitcorp 31-in-1",          360, Mapper360_Init         )
 	INES_BOARD( "OK-411",                   361, GN45_Init              ) /* OK-411 is emulated together with GN-45 */
 	INES_BOARD( "GN-45",                    366, GN45_Init              )
+	INES_BOARD( "Golden Mario Party II - Around the World 6-in-1",       370, Mapper370_Init         )
 	INES_BOARD( "MMC3 PIRATE SFC-12",       372, Mapper372_Init         )
 	INES_BOARD( "95/96 Super HiK 4-in-1",   374, Mapper374_Init         )
 	INES_BOARD( "42 to 80,000 (970630C)",   380, Mapper380_Init         )
@@ -701,6 +702,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "830928C",                  382, Mapper382_Init         )
 	INES_BOARD( "Caltron 9-in-1",           389, Mapper389_Init         )
 	INES_BOARD( "Realtec 8031",             390, Mapper390_Init         )
+	INES_BOARD( "Realtec 8210",             395, Mapper395_Init         )
 	INES_BOARD( "A88S-1",                   411, Mapper411_Init         )
 	INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init        )
 	INES_BOARD( "Sachen 3014",              533, Mapper533_Init         )
diff --git a/src/ines.h b/src/ines.h
index bc119f2..43085e4 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -259,6 +259,7 @@ void Mapper357_Init(CartInfo *);
 void Mapper359_Init(CartInfo *);
 void Mapper360_Init(CartInfo *);
 void Mapper369_Init(CartInfo *);
+void Mapper370_Init(CartInfo *);
 void Mapper372_Init(CartInfo *);
 void Mapper374_Init(CartInfo *);
 void Mapper380_Init(CartInfo *);
@@ -266,6 +267,7 @@ void Mapper381_Init(CartInfo *);
 void Mapper382_Init(CartInfo *);
 void Mapper389_Init(CartInfo *);
 void Mapper390_Init(CartInfo *);
+void Mapper395_Init(CartInfo *);
 void Mapper411_Init(CartInfo *);
 void Mapper516_Init(CartInfo *);
 void Mapper533_Init(CartInfo *);

From 66dc404582ee99d1ca1a1cf5866256f17dbcd13a Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Tue, 27 Oct 2020 10:03:59 +0800
Subject: [PATCH 054/295] Fix #398

---
 src/boards/AbG1l.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/boards/AbG1l.c b/src/boards/AbG1l.c
index 7305336..7fde82b 100644
--- a/src/boards/AbG1l.c
+++ b/src/boards/AbG1l.c
@@ -44,14 +44,25 @@ static void SyncAbG1l(void) {
 		setprg16(0xC000, (regs[1] & 0xE0) >> 5);
 	}
 
-	setchr8(regs[1]);
-	setmirror((regs[1] & 0x8) ? 0 : 1);
+	/* FIXME: 2020-10-26  */
+	switch (regs[2] & 0xC0) {
+	case 0xC0: /* Pipe Dream */
+		setchr8((regs[0] & 0x03) | (regs[1] & ~0x03));
+		break;
+	case 0x40: /* Goonies */
+		setchr8((regs[0] & 0x01) | (regs[1] & 0x07));
+		break;
+	default:
+		setchr8(regs[1]);
+		break;
+	}
 
+	setmirror((regs[1] & 0x8) ? 0 : 1);
 }
 
 static DECLFW(AbG1lWriteHi) {
 	regs[0] = V;
-	setchr8(((regs[2] & 0xC0) >> 7) << 2 | (regs[0] & 0x03));
+	/* setchr8(((regs[2] & 0xC0) >> 7) << 2 | (regs[0] & 0x03)); */
 	Sync();
 }
 

From ed01e34323490f0f8987e3db9a0d0291dc8cf063 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Wed, 21 Oct 2020 05:41:51 +0800
Subject: [PATCH 055/295] Add unif multicarts

- Add unif board BS400R
- Add unif board BS4040R
---
 src/boards/bs4xxxr.c | 156 +++++++++++++++++++++++++++++++++++++++++++
 src/unif.c           |   3 +
 src/unif.h           |   3 +
 3 files changed, 162 insertions(+)
 create mode 100644 src/boards/bs4xxxr.c

diff --git a/src/boards/bs4xxxr.c b/src/boards/bs4xxxr.c
new file mode 100644
index 0000000..f10ef08
--- /dev/null
+++ b/src/boards/bs4xxxr.c
@@ -0,0 +1,156 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2020
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* originally submitted by dragon2snow
+ * Known carts:
+ * UNIF BMC-BS-400R  : 700000-in-1 (BS-400R)(Unl), PRG 1024K CHR 1024K CRC 0x5DBDFAA0
+ * UNIF BMC-BS-4040R : Double Dragon 310000-in-1 (4040R) PRG 512 CHR 512 CRC 0x3A642F31
+ *
+ * FIXME: Future Kids notes
+ * Either something is wrong or missing because chr banks for the game is $E8 - EB
+ * but game uses $EC-EF here. These are chr banks for the next game and does not masked properly
+ * by mapper code.
+ *                                                                                      ~ c@2020
+ */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static uint8 pointer;
+static uint8 offset;
+
+static int getPRGBankBS4XXXR(int bank)
+{
+	if (((~bank) & 1) && (pointer & 0x40)) bank ^= 2;
+	return ((bank & 2) ? 0xFE | (bank & 1) : DRegBuf[6 | (bank & 1)]);
+}
+
+static void BS4XXXRPW(uint32 A, uint8 V)
+{
+	if ((EXPREGS[3] >> 4) & 1) {
+		uint8 prgAND = ((EXPREGS[0] >> 1) & 1) ? 0x0F : 0x0F;
+		uint8 prgOR = (EXPREGS[0] & 7) << 4;
+		uint8 bank0 = getPRGBankBS4XXXR(0);
+		uint8 bank1 = getPRGBankBS4XXXR(1);
+		/* 16K Mode */
+		if (!((EXPREGS[3] >>1 )& 0x1)) {
+			setprg8(0x8000, (bank0 & prgAND) | prgOR);
+			setprg8(0xA000, (bank1 & prgAND) | prgOR);
+			setprg8(0xC000, (bank0 & prgAND) | prgOR);
+			setprg8(0xE000, (bank1 & prgAND) | prgOR);
+		}
+		/* 32K Mode */
+		else {
+			setprg8(0x8000, (bank0 & prgAND) | prgOR);
+			setprg8(0xA000, (bank1 & prgAND) | prgOR);
+			setprg8(0xC000, ((bank0 | 2) & prgAND) | prgOR);
+			setprg8(0xE000, ((bank1 | 2) & prgAND) | prgOR);
+		}
+	}
+	/* Mmc3 Mode */
+	else {
+		uint8 prgAND = ((EXPREGS[0] >> offset) & 1) ? 0x0F : 0x1F; /* 4040R 6,400R 1 */
+		uint8 prgOR = (EXPREGS[0] & 7) << 4;
+		setprg8(A, (V & prgAND) | prgOR);
+	}
+}
+
+static void BS4XXXRCW(uint32 A, uint8 V) {
+	if ((EXPREGS[3] >> 4) & 1) {
+		uint8 chrAND = ((EXPREGS[0] >> 1) & 1) ? 0x0F : 0x0F;
+		uint8 chrOR = ((EXPREGS[0] >> 3) & 7) << 4;
+		/* FIXME: Ugly hack for Future Kids */
+		if (EXPREGS[4]) {
+			chrAND = 0x03;
+			chrOR |= 8;
+		}
+		setchr8((EXPREGS[2] & chrAND) | chrOR);
+	} else {
+		uint8 chrAND = ((EXPREGS[0] >> 1) & 1) ? 0xFF : 0xFF;
+		uint16 chrOR = ((EXPREGS[0] >> 3) & 7) << 7;
+		setchr1(A, (V & chrAND) | chrOR);
+	}
+}
+
+static DECLFW(BS4XXXRHiWrite) {
+	/* FCEU_printf("Wr8B: A:%04x V:%02x\n", A, V); */
+	if (A == 0x8000)
+		pointer = MMC3_cmd ^ V;
+	MMC3_CMDWrite(A, V);
+}
+
+static DECLFW(BS4XXXRLoWrite) {
+	/* FCEU_printf("WrLo: A:%04x V:%02x\n", A, V); */
+	if (A & 0x800) {
+		/* Future Kids hack */
+		if (!EXPREGS[4]) {
+			if ((((A & 3) == 2) && (V == 0xE8)))
+				EXPREGS[4] = 1;
+		}
+		if (!(EXPREGS[3] & 0x80)) {
+			EXPREGS[A & 0x03] = V;
+			FixMMC3PRG(MMC3_cmd);
+			FixMMC3CHR(MMC3_cmd);
+		}
+		else if (EXPREGS[3] & 0x10) {
+			EXPREGS[A & 0x03] = V;
+			FixMMC3PRG(MMC3_cmd);
+			FixMMC3CHR(MMC3_cmd);
+		}
+	}
+}
+
+static void BS4XXXRReset(void) {
+	EXPREGS[4] = 0;
+	EXPREGS[0] = EXPREGS[1] = EXPREGS[2] = EXPREGS[3] = 0;
+	MMC3RegReset();
+}
+
+static void BS4XXXRPower(void) {
+	EXPREGS[4] = 0;
+	EXPREGS[0] = EXPREGS[1] = EXPREGS[2] = EXPREGS[3] = 0;
+	GenMMC3Power();
+	SetReadHandler(0x6000, 0x7FFF, CartBR);
+	SetWriteHandler(0x6000, 0x7FFF, BS4XXXRLoWrite);
+	SetWriteHandler(0x8000, 0xBFFF, BS4XXXRHiWrite);
+}
+
+void BS4XXXR_Init(CartInfo *info) {
+	GenMMC3_Init(info, 512, 256, 8, 0);
+	cwrap = BS4XXXRCW;
+	pwrap = BS4XXXRPW;
+
+	info->Power = BS4XXXRPower;
+	info->Reset = BS4XXXRReset;
+
+	AddExState(EXPREGS, 4, 0, "EXPR");
+	AddExState(&pointer, 1, 0, "PNTR");
+	AddExState(&offset, 1, 0, "OFFS");
+}
+
+void BS400R_Init(CartInfo *info) {
+	offset = 1;
+	BS4XXXR_Init(info);
+}
+
+void BS4040R_Init(CartInfo *info) {
+	offset = 6;
+	BS4XXXR_Init(info);
+}
diff --git a/src/unif.c b/src/unif.c
index 88d2595..fd7a642 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -616,6 +616,9 @@ static BMAPPING bmap[] = {
 	{ "82112C",                     540, Mapper540_Init,        0 },
 	{ "N49C-300",                   369, Mapper369_Init,        0 },
 
+	{ "BS-400R",                NO_INES, BS400R_Init,           0 },
+	{ "BS-4040R",               NO_INES, BS4040R_Init,          0 },
+
 #ifdef COPYFAMI
 	{ "COPYFAMI_MMC3",          NO_INES, MapperCopyFamiMMC3_Init, 0 },
 	{ "COPYFAMI",               NO_INES, MapperCopyFami_Init,   0 },
diff --git a/src/unif.h b/src/unif.h
index 07caff8..3b2cbe3 100644
--- a/src/unif.h
+++ b/src/unif.h
@@ -196,6 +196,9 @@ void AbG1l_Init(CartInfo *info);
 void KG256_Init(CartInfo *info);
 void WAIXINGFS005_Init(CartInfo *info);
 
+void BS4040R_Init(CartInfo *info);
+void BS400R_Init(CartInfo *info);
+
 #ifdef COPYFAMI
 void MapperCopyFamiMMC3_Init(CartInfo *info);
 void MapperCopyFami_Init(CartInfo *info);

From 066899eaff345aa582f8d00bafcf15ec3b46904e Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sat, 7 Nov 2020 13:06:56 -0800
Subject: [PATCH 056/295] Remove extraneous semicolons at top-level

These are unnecessary and not strictly allowed in ISO C.
---
 src/boards/txcchip.c | 2 +-
 src/sound.c          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/boards/txcchip.c b/src/boards/txcchip.c
index a361cc8..294cd39 100644
--- a/src/boards/txcchip.c
+++ b/src/boards/txcchip.c
@@ -65,7 +65,7 @@ typedef struct {
 
 static TXC txc;
 
-static void Dummyfunc(void) { };
+static void Dummyfunc(void) { }
 static void (*WSync)(void) = Dummyfunc;
 
 static SFORMAT StateRegs[] =
diff --git a/src/sound.c b/src/sound.c
index 2fd2ca2..a483d16 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -145,7 +145,7 @@ static char DMCHaveDMA = 0;
 static uint8 DMCDMABuf = 0;
 static char DMCHaveSample = 0;
 
-static void Dummyfunc(void) { };
+static void Dummyfunc(void) { }
 static void (*DoNoise)(void) = Dummyfunc;
 static void (*DoTriangle)(void) = Dummyfunc;
 static void (*DoPCM)(void) = Dummyfunc;

From d8132fa88d520f4f249acaa718c4f62d5b5374ea Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Thu, 12 Nov 2020 02:44:58 +0800
Subject: [PATCH 057/295] Update bs4xxxr

---
 src/boards/bs4xxxr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/boards/bs4xxxr.c b/src/boards/bs4xxxr.c
index f10ef08..a844007 100644
--- a/src/boards/bs4xxxr.c
+++ b/src/boards/bs4xxxr.c
@@ -115,6 +115,7 @@ static DECLFW(BS4XXXRLoWrite) {
 			FixMMC3CHR(MMC3_cmd);
 		}
 	}
+	CartBW(A, V);
 }
 
 static void BS4XXXRReset(void) {
@@ -127,7 +128,6 @@ static void BS4XXXRPower(void) {
 	EXPREGS[4] = 0;
 	EXPREGS[0] = EXPREGS[1] = EXPREGS[2] = EXPREGS[3] = 0;
 	GenMMC3Power();
-	SetReadHandler(0x6000, 0x7FFF, CartBR);
 	SetWriteHandler(0x6000, 0x7FFF, BS4XXXRLoWrite);
 	SetWriteHandler(0x8000, 0xBFFF, BS4XXXRHiWrite);
 }

From 14b689cde6dad0a2bff9a9668139b3796112e71f Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 16 Nov 2020 18:13:51 +0800
Subject: [PATCH 058/295] Add mapper 293

---
 src/boards/293.c   | 86 ++++++++++++++++++++++++++++++++++++++++++++++
 src/ines-correct.h |  3 ++
 src/ines.c         |  2 ++
 src/ines.h         |  1 +
 4 files changed, 92 insertions(+)
 create mode 100644 src/boards/293.c

diff --git a/src/boards/293.c b/src/boards/293.c
new file mode 100644
index 0000000..7496388
--- /dev/null
+++ b/src/boards/293.c
@@ -0,0 +1,86 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2020 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * NewStar 12-in-1 and 76-in-1
+ */
+
+#include "mapinc.h"
+
+static uint8 regs[2];
+static SFORMAT StateRegs[] =
+{
+	{ regs, 2, "REGS" },
+	{ 0 }
+};
+
+static void Sync(void) {
+	uint8 mode  = ((regs[0] >> 2) & 2) | ((regs[1] >> 6) & 1);
+	uint8 bank  = ((regs[1] << 5) & 0x20) | ((regs[1] >> 1) & 0x18);
+	uint8 block = (regs[0] & 7);
+	switch (mode) {
+    case 0: /* UNROM */
+        setprg16(0x8000, bank | block);
+	    setprg16(0xC000, bank | 7);
+		break;
+	case 1:
+		setprg16(0x8000, bank | block & 0xFE);
+		setprg16(0xC000, bank | 7);
+		break;
+    case 2: /* NROM-128 */
+		setprg16(0x8000, bank | block);
+	    setprg16(0xC000, bank | block);
+		break;
+    case 3: /* NROM-256 */
+		setprg32(0x8000, (bank | block) >> 1);
+	    break;
+    }
+    setchr8(0);
+    setmirror(((regs[1] >> 7) & 1) ^ 1);
+}
+
+static DECLFW(M293Write1) {
+	if (A < 0xA000) regs[0] = V;
+	regs[1] = V;
+    Sync();
+}
+
+static DECLFW(M293Write2) {
+    if (A < 0xA000) regs[1] = V;
+	regs[0] = V;
+    Sync();
+}
+
+static void M293Power(void) {
+	regs[0] = regs[1] = 0;
+	Sync();
+	SetReadHandler(0x8000, 0xFFFF, CartBR);
+	SetWriteHandler(0x8000, 0xBFFF, M293Write1);
+    SetWriteHandler(0xC000, 0xDFFF, M293Write2);
+}
+
+static void StateRestore(int version) {
+	Sync();
+}
+
+/* BMC 12-in-1/76-in-1 (NewStar) (Unl) */
+void Mapper293_Init(CartInfo *info) {
+	info->Power = M293Power;
+	GameStateRestore = StateRestore;
+	AddExState(&StateRegs, ~0, 0, 0);
+}
diff --git a/src/ines-correct.h b/src/ines-correct.h
index 7410d1a..870b2b8 100644
--- a/src/ines-correct.h
+++ b/src/ines-correct.h
@@ -657,7 +657,10 @@
 
 	/* ines mappers that uses iNes 2.0 numbers */
 
+	/* CRC32, mapperNum, SubMapper, Mirroring, hasBattery, prgRam, chrRam, region, extra flags */
 	{ 0xf6bd8e31,  281, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 1997 Super HIK 4-in-1 (JY-052) [p1][!].nes */
+	/* dumps are assigned 281, but its 293 on nesdev */
+	{ 0x06256C80,  293, DEFAULT, DEFAULT, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* Super 12-in-1 NewStar (UNL) */
 	{ 0x5aa23a15,  361, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (OK-411)[p1][!].nes */
 	{ 0xf6b9d088,  366, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (K-3131GS, GN-45) [p1][!].nes */
 	{ 0x503566b2,  366, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (K-3131SS, GN-45) [p1][!].nes */
diff --git a/src/ines.c b/src/ines.c
index 93c3761..b81fafc 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -328,6 +328,7 @@ static void CheckHInfo(void) {
 				case   1:
 				case   5:
 				case 176:
+				case 293:
 					if (moo[x].prgram >= 0) {
 						tofix |= 32;
 						iNESCart.iNES2 = 1;
@@ -702,6 +703,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "830928C",                  382, Mapper382_Init         )
 	INES_BOARD( "Caltron 9-in-1",           389, Mapper389_Init         )
 	INES_BOARD( "Realtec 8031",             390, Mapper390_Init         )
+	INES_BOARD( "NewStar 12-in-1/7-in-1",   293, Mapper293_Init         )
 	INES_BOARD( "Realtec 8210",             395, Mapper395_Init         )
 	INES_BOARD( "A88S-1",                   411, Mapper411_Init         )
 	INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init        )
diff --git a/src/ines.h b/src/ines.h
index 43085e4..4b2e6e5 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -252,6 +252,7 @@ void J2282_Init(CartInfo *);
 void Mapper267_Init(CartInfo *);
 void Mapper269_Init(CartInfo *);
 void Mapper288_Init(CartInfo *);
+void Mapper293_Init(CartInfo *);
 void Mapper297_Init(CartInfo *);
 void Mapper353_Init(CartInfo *);
 void Mapper356_Init(CartInfo *);

From 0cc55ba1f16a160188e5c5869fae36ce7ccb37e6 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Tue, 17 Nov 2020 00:18:31 +0800
Subject: [PATCH 059/295] m293: Fix alignment and update

---
 src/boards/293.c | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/boards/293.c b/src/boards/293.c
index 7496388..f70d504 100644
--- a/src/boards/293.c
+++ b/src/boards/293.c
@@ -34,44 +34,49 @@ static void Sync(void) {
 	uint8 bank  = ((regs[1] << 5) & 0x20) | ((regs[1] >> 1) & 0x18);
 	uint8 block = (regs[0] & 7);
 	switch (mode) {
-    case 0: /* UNROM */
-        setprg16(0x8000, bank | block);
-	    setprg16(0xC000, bank | 7);
+	case 0: /* UNROM */
+		setprg16(0x8000, bank | block);
+		setprg16(0xC000, bank | 7);
 		break;
 	case 1:
 		setprg16(0x8000, bank | block & 0xFE);
 		setprg16(0xC000, bank | 7);
 		break;
-    case 2: /* NROM-128 */
+	case 2: /* NROM-128 */
 		setprg16(0x8000, bank | block);
-	    setprg16(0xC000, bank | block);
+		setprg16(0xC000, bank | block);
 		break;
-    case 3: /* NROM-256 */
+	case 3: /* NROM-256 */
 		setprg32(0x8000, (bank | block) >> 1);
-	    break;
-    }
-    setchr8(0);
-    setmirror(((regs[1] >> 7) & 1) ^ 1);
+		break;
+	}
+	setchr8(0);
+	setmirror(((regs[1] >> 7) & 1) ^ 1);
 }
 
 static DECLFW(M293Write1) {
-	if (A < 0xA000) regs[0] = V;
+	regs[0] = V;
 	regs[1] = V;
-    Sync();
+	Sync();
 }
 
 static DECLFW(M293Write2) {
-    if (A < 0xA000) regs[1] = V;
+	regs[1] = V;
+	Sync();
+}
+
+static DECLFW(M293Write3) {
 	regs[0] = V;
-    Sync();
+	Sync();
 }
 
 static void M293Power(void) {
 	regs[0] = regs[1] = 0;
 	Sync();
 	SetReadHandler(0x8000, 0xFFFF, CartBR);
-	SetWriteHandler(0x8000, 0xBFFF, M293Write1);
-    SetWriteHandler(0xC000, 0xDFFF, M293Write2);
+	SetWriteHandler(0x8000, 0x9FFF, M293Write1);
+	SetWriteHandler(0xA000, 0xBFFF, M293Write2);
+	SetWriteHandler(0xC000, 0xDFFF, M293Write3);
 }
 
 static void StateRestore(int version) {

From faa58abe0f384712b305ed05ca93420d5d73e482 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Tue, 17 Nov 2020 03:29:24 +0800
Subject: [PATCH 060/295] Add mapper 401

---
 src/boards/401.c   | 96 ++++++++++++++++++++++++++++++++++++++++++++++
 src/ines-correct.h |  1 +
 src/ines.c         |  1 +
 src/ines.h         |  1 +
 4 files changed, 99 insertions(+)
 create mode 100644 src/boards/401.c

diff --git a/src/boards/401.c b/src/boards/401.c
new file mode 100644
index 0000000..98c459b
--- /dev/null
+++ b/src/boards/401.c
@@ -0,0 +1,96 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2020 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * NES 2.0 - Mapper 401 (reference from NewRisingSun)
+ * Super 19-in-1 (VIP19) (crc 0x2F497313)
+ *
+ */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static uint8 dipswitch = 0;
+
+static void M401CW(uint32 A, uint8 V) {
+	uint32 mask = (0xFF >> (~EXPREGS[2] &0xF));
+	uint32 bank  = (EXPREGS[0] | ((EXPREGS[2] << 4) &0xF00));
+	setchr1(A, (V & mask) | bank);
+}
+
+static void M401PW(uint32 A, uint8 V) {
+	if ((dipswitch & 1) && (EXPREGS[1] &0x80)) {
+		/* openbus */
+	} else {
+		uint32 mask = (~EXPREGS[3] & 0x1F);
+		uint32 bank  = (EXPREGS[1] & 0x1F) | (EXPREGS[2] & 0x80) |
+			((dipswitch & 2) ? (EXPREGS[2] & 0x20) : ((EXPREGS[1] >> 1) & 0x20)) |
+			((dipswitch & 4) ? (EXPREGS[2] & 0x40) : ((EXPREGS[1] << 1) & 0x40));
+		setprg8(A, (V & mask) | bank);
+	}
+}
+
+static DECLFR(M401Read) {
+	if ((dipswitch & 1) && (EXPREGS[1] & 0x80))
+		return X.DB;
+	return CartBR(A);
+}
+
+static DECLFW(M401Write) {
+	/* FCEU_printf("Wr A:%04x V:%02x index:%d\n", A, V, EXPREGS[4]); */
+	if (!(EXPREGS[3] & 0x40)) {
+		EXPREGS[EXPREGS[4]] = V;
+		EXPREGS[4] = (EXPREGS[4] + 1) & 3;
+		FixMMC3PRG(MMC3_cmd);
+		FixMMC3CHR(MMC3_cmd);
+	}
+	CartBW(A, V);
+}
+
+static void M401Reset(void) {
+	dipswitch = (dipswitch + 1) & 7;
+	FCEU_printf("dipswitch = %d\n", dipswitch);
+	EXPREGS[0] = 0x00;
+	EXPREGS[1] = 0x00;
+	EXPREGS[2] = 0x0F;
+	EXPREGS[3] = 0x00;
+	EXPREGS[4] = 0x00;
+	MMC3RegReset();
+}
+
+static void M401Power(void) {
+	dipswitch = 7;
+	EXPREGS[0] = 0x00;
+	EXPREGS[1] = 0x00;
+	EXPREGS[2] = 0x0F;
+	EXPREGS[3] = 0x00;
+	EXPREGS[4] = 0x00;
+	GenMMC3Power();
+	SetReadHandler(0x8000, 0xFFFF, M401Read);
+	SetWriteHandler(0x6000, 0x7FFF, M401Write);
+}
+
+void Mapper401_Init(CartInfo *info) {
+	GenMMC3_Init(info, 256, 256, 8, 0);
+	cwrap = M401CW;
+	pwrap = M401PW;
+	info->Power = M401Power;
+	info->Reset = M401Reset;
+	AddExState(EXPREGS, 5, 0, "EXPR");
+	AddExState(dipswitch, 1, 0, "DPSW");
+}
diff --git a/src/ines-correct.h b/src/ines-correct.h
index 870b2b8..4c4185d 100644
--- a/src/ines-correct.h
+++ b/src/ines-correct.h
@@ -667,6 +667,7 @@
 	{ 0xdb2d2d88,  369, DEFAULT, DEFAULT, 0,    0x07, DEFAULT, DEFAULT, NOEXTRA }, /* Super Mario Bros. Party.nes */
 	{ 0x87f83ea2,  380, DEFAULT, DEFAULT, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* 42 to 80,000 */
 	{ 0xc4b94bd5,  389, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Caltron - 9 in 1 (USA) (Proto) (Unl).nes */
+	{ 0x2F497313,  401, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super 19-in-1 (VIP19) */
 
 	/* ines mappers that uses unif boards */
 
diff --git a/src/ines.c b/src/ines.c
index b81fafc..892aea6 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -705,6 +705,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "Realtec 8031",             390, Mapper390_Init         )
 	INES_BOARD( "NewStar 12-in-1/7-in-1",   293, Mapper293_Init         )
 	INES_BOARD( "Realtec 8210",             395, Mapper395_Init         )
+	INES_BOARD( "BMC Super 19-in-1 (VIP19)",    401, Mapper401_Init         )
 	INES_BOARD( "A88S-1",                   411, Mapper411_Init         )
 	INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init        )
 	INES_BOARD( "Sachen 3014",              533, Mapper533_Init         )
diff --git a/src/ines.h b/src/ines.h
index 4b2e6e5..b1ce41c 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -269,6 +269,7 @@ void Mapper382_Init(CartInfo *);
 void Mapper389_Init(CartInfo *);
 void Mapper390_Init(CartInfo *);
 void Mapper395_Init(CartInfo *);
+void Mapper401_Init(CartInfo *);
 void Mapper411_Init(CartInfo *);
 void Mapper516_Init(CartInfo *);
 void Mapper533_Init(CartInfo *);

From d98245e49cde64b4d5193527da9f595864725777 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Tue, 17 Nov 2020 06:40:10 +0800
Subject: [PATCH 061/295] Misc update

---
 src/boards/401.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/boards/401.c b/src/boards/401.c
index 98c459b..067849b 100644
--- a/src/boards/401.c
+++ b/src/boards/401.c
@@ -28,13 +28,13 @@
 static uint8 dipswitch = 0;
 
 static void M401CW(uint32 A, uint8 V) {
-	uint32 mask = (0xFF >> (~EXPREGS[2] &0xF));
-	uint32 bank  = (EXPREGS[0] | ((EXPREGS[2] << 4) &0xF00));
+	uint32 mask = (0xFF >> (~EXPREGS[2] & 0xF));
+	uint32 bank  = (EXPREGS[0] | ((EXPREGS[2] << 4) & 0xF00));
 	setchr1(A, (V & mask) | bank);
 }
 
 static void M401PW(uint32 A, uint8 V) {
-	if ((dipswitch & 1) && (EXPREGS[1] &0x80)) {
+	if ((dipswitch & 1) && (EXPREGS[1] & 0x80)) {
 		/* openbus */
 	} else {
 		uint32 mask = (~EXPREGS[3] & 0x1F);

From 565391c2133ed795ffb8a595db70b33b13f195b9 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Tue, 17 Nov 2020 06:46:41 +0800
Subject: [PATCH 062/295] Directly apply NES 2.0 overrides when available

---
 src/ines.c | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/ines.c b/src/ines.c
index 892aea6..e946c91 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -323,28 +323,21 @@ static void CheckHInfo(void) {
 					iNESCart.region = moo[x].region;
 				}
 			}
-			switch (moo[x].mapper) {
-				/* TODO: Eventually, all items from overrides should be considered as ines 2.0 compatible */
-				case   1:
-				case   5:
-				case 176:
-				case 293:
-					if (moo[x].prgram >= 0) {
-						tofix |= 32;
-						iNESCart.iNES2 = 1;
-						iNESCart.PRGRamSize = (moo[x].prgram & 0x0F) ? (64 << ((moo[x].prgram >> 0) & 0xF)) : 0;
-						iNESCart.PRGRamSaveSize = (moo[x].prgram & 0xF0) ? (64 << ((moo[x].prgram >> 4) & 0xF)) : 0;
-					}
-					if (moo[x].chrram >= 0) {
-						tofix |= 32;
-						iNESCart.iNES2 = 1;
-						iNESCart.CHRRamSize = (moo[x].chrram & 0x0F) ? (64 << ((moo[x].chrram >> 0) & 0xF)) : 0;
-						iNESCart.CHRRamSaveSize = (moo[x].chrram & 0xF0) ? (64 << ((moo[x].chrram >> 4) & 0xF)) : 0;
-					}
-					break;
-				default:
-					break;
+
+			if (moo[x].prgram >= 0) {
+				tofix |= 32;
+				iNESCart.iNES2 = 1;
+				iNESCart.PRGRamSize = (moo[x].prgram & 0x0F) ? (64 << ((moo[x].prgram >> 0) & 0xF)) : 0;
+				iNESCart.PRGRamSaveSize = (moo[x].prgram & 0xF0) ? (64 << ((moo[x].prgram >> 4) & 0xF)) : 0;
 			}
+
+			if (moo[x].chrram >= 0) {
+				tofix |= 32;
+				iNESCart.iNES2 = 1;
+				iNESCart.CHRRamSize = (moo[x].chrram & 0x0F) ? (64 << ((moo[x].chrram >> 0) & 0xF)) : 0;
+				iNESCart.CHRRamSaveSize = (moo[x].chrram & 0xF0) ? (64 << ((moo[x].chrram >> 4) & 0xF)) : 0;
+			}
+
 			break;
 		}
 		x++;

From 8deefc3beffb9395438850ec3d9a262229201def Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Tue, 17 Nov 2020 06:47:45 +0800
Subject: [PATCH 063/295] Fix warning

---
 src/boards/401.c | 2 +-
 src/ines.c       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/boards/401.c b/src/boards/401.c
index 067849b..75cb508 100644
--- a/src/boards/401.c
+++ b/src/boards/401.c
@@ -92,5 +92,5 @@ void Mapper401_Init(CartInfo *info) {
 	info->Power = M401Power;
 	info->Reset = M401Reset;
 	AddExState(EXPREGS, 5, 0, "EXPR");
-	AddExState(dipswitch, 1, 0, "DPSW");
+	AddExState(&dipswitch, 1, 0, "DPSW");
 }
diff --git a/src/ines.c b/src/ines.c
index e946c91..9c23c7e 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -386,7 +386,6 @@ static void CheckHInfo(void) {
 			}
 		}
 		strcat(gigastr, "\n");
-		FCEU_printf("\n", gigastr);
 		FCEU_printf("%s\n", gigastr);
 	}
 

From 70952034f89aec52e9b29d441842e730c73dc1e2 Mon Sep 17 00:00:00 2001
From: jdgleaver <james@leaver.myzen.co.uk>
Date: Fri, 27 Nov 2020 10:41:45 +0000
Subject: [PATCH 064/295] Add OpenDingux target to .gitlab-ci.yml

---
 .gitlab-ci.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 014629e..7ddc8f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,8 @@ include:
     file: '/linux-x64.yml'
   - project: 'libretro-infrastructure/ci-templates'
     file: '/windows-x64-mingw.yml'
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/dingux-i386.yml'
   - project: 'libretro-infrastructure/ci-templates'
     file: '/android-jni.yml'
 
@@ -40,7 +42,14 @@ libretro-build-windows-x64:
     - .libretro-windows-x64-mingw-make-default
   variables:
     MAKEFILE: Makefile.libretro
-    
+
+libretro-build-dingux-i386:
+  extends:
+    - .core-defs
+    - .libretro-dingux-i386-make-default
+  variables:
+    MAKEFILE: Makefile.libretro
+
 # Android
 android-armeabi-v7a:
   extends:

From f4cf5dbfc92486884d71072d43c3708690ca9c75 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 6 Dec 2020 19:40:54 +0100
Subject: [PATCH 065/295] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 177 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 122 insertions(+), 55 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ddc8f1..7cda1fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,101 +1,168 @@
+# DESCRIPTION: GitLab CI/CD for libRetro (NOT FOR GitLab-proper)
+
+##############################################################################
+################################# BOILERPLATE ################################
+##############################################################################
+
+# Core definitions
 .core-defs:
   variables:
     JNI_PATH: .
     CORENAME: fceumm
+    MAKEFILE: Makefile.libretro
 
+# Inclusion templates, required for the build to work
 include:
-  - template: Jobs/Code-Quality.gitlab-ci.yml
-  - project: 'libretro-infrastructure/ci-templates'
-    file: '/libnx-static.yml'
-  - project: 'libretro-infrastructure/ci-templates'
-    file: '/vita-static.yml'
-  - project: 'libretro-infrastructure/ci-templates'
-    file: '/psp-static.yml'
-  - project: 'libretro-infrastructure/ci-templates'
-    file: '/ps2-static.yml'
-  - project: 'libretro-infrastructure/ci-templates'
-    file: '/linux-x64.yml'
+  ################################## DESKTOPS ################################
+  # Windows 64-bit
   - project: 'libretro-infrastructure/ci-templates'
     file: '/windows-x64-mingw.yml'
+
+  # Linux 64-bit
   - project: 'libretro-infrastructure/ci-templates'
-    file: '/dingux-i386.yml'
+    file: '/linux-x64.yml'
+
+  # MacOS 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/osx-x64.yml'
+
+  ################################## CELLULAR ################################
+  # Android
   - project: 'libretro-infrastructure/ci-templates'
     file: '/android-jni.yml'
 
+  ################################## CONSOLES ################################
+  # PlayStation Portable
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/psp-static.yml'
+
+  # PlayStation Vita
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/vita-static.yml'
+
+  # PlayStation2
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ps2-static.yml'
+
+  # Nintendo 3DS
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ctr-static.yml'
+
+  # Nintendo GameCube
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ngc-static.yml'
+
+  # Nintendo Wii
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/wii-static.yml'
+
+  # Nintendo Switch
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/libnx-static.yml'
+
+  # OpenDingux
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/dingux-mips32.yml'
+
+# Stages for building
 stages:
   - build-prepare
   - build-shared
   - build-static
-  - test
-
-#Desktop
-libretro-build-linux-x64:
-  extends:
-    - .core-defs
-    - .libretro-linux-x64-make-default
-  variables:
-    MAKEFILE: Makefile.libretro
 
+##############################################################################
+#################################### STAGES ##################################
+##############################################################################
+#
+################################### DESKTOPS #################################
+# Windows 64-bit
 libretro-build-windows-x64:
   extends:
-    - .core-defs
     - .libretro-windows-x64-mingw-make-default
-  variables:
-    MAKEFILE: Makefile.libretro
-
-libretro-build-dingux-i386:
-  extends:
     - .core-defs
-    - .libretro-dingux-i386-make-default
-  variables:
-    MAKEFILE: Makefile.libretro
 
-# Android
+# Linux 64-bit
+libretro-build-linux-x64:
+  extends:
+    - .libretro-linux-x64-make-default
+    - .core-defs
+
+# MacOS 64-bit
+libretro-build-osx-x64:
+  extends:
+    - .libretro-osx-x64-make-default
+    - .core-defs
+
+################################### CELLULAR #################################
+# Android ARMv7a
 android-armeabi-v7a:
   extends:
-    - .core-defs
     - .libretro-android-jni-armeabi-v7a
+    - .core-defs
 
+# Android ARMv8a
 android-arm64-v8a:
   extends:
-    - .core-defs
     - .libretro-android-jni-arm64-v8a
+    - .core-defs
 
+# Android 64-bit x86
 android-x86_64:
   extends:
-    - .core-defs
     - .libretro-android-jni-x86_64
+    - .core-defs
     
+# Android 32-bit x86
 android-x86:
   extends:
-    - .core-defs
     - .libretro-android-jni-x86
-
-# Static
-libretro-build-libnx-aarch64:
-  extends:
     - .core-defs
-    - .libretro-libnx-static-retroarch-master
-  variables:
-    MAKEFILE: Makefile.libretro
-
-libretro-build-vita:
-  extends:
-    - .core-defs
-    - .libretro-vita-static-retroarch-master
-  variables:
-    MAKEFILE: Makefile.libretro
 
+################################### CONSOLES #################################
+# PlayStation Portable
 libretro-build-psp:
   extends:
-    - .core-defs
     - .libretro-psp-static-retroarch-master
-  variables:
-    MAKEFILE: Makefile.libretro
+    - .core-defs
 
+# PlayStation Vita
+libretro-build-vita:
+  extends:
+    - .libretro-vita-static-retroarch-master
+    - .core-defs
+
+# PlayStation2
 libretro-build-ps2:
   extends:
-    - .core-defs
     - .libretro-ps2-static-retroarch-master
-  variables:
-    MAKEFILE: Makefile.libretro
+    - .core-defs
+
+# Nintendo 3DS
+libretro-build-ctr:
+  extends:
+    - .libretro-ctr-static-retroarch-master
+    - .core-defs
+
+# Nintendo GameCube
+libretro-build-ngc:
+  extends:
+    - .libretro-ngc-static-retroarch-master
+    - .core-defs
+
+# Nintendo Wii
+libretro-build-wii:
+  extends:
+    - .libretro-wii-static-retroarch-master
+    - .core-defs
+
+# Nintendo Switch
+libretro-build-libnx-aarch64:
+  extends:
+    - .libretro-libnx-static-retroarch-master
+    - .core-defs
+
+# OpenDingux
+libretro-build-dingux-mips32:
+  extends:
+    - .libretro-dingux-mips32-make-default
+    - .core-defs

From 1a0eec1b17d66aeb973a8b6d456f9046ed3008e2 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 20 Dec 2020 03:46:42 +0100
Subject: [PATCH 066/295] Update

---
 Makefile.libretro                             | 22 +------------------
 .../libretro-common/include/libretro.h        |  2 +-
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index 509515e..3ecbbd3 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -147,26 +147,6 @@ else ifeq ($(platform), qnx)
 	AR = qcc -Vgcc_ntoarmv7le
 	PLATFORM_DEFINES := -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp
 
-# PS3
-else ifeq ($(platform), ps3)
-	TARGET := $(TARGET_NAME)_libretro_$(platform).a
-	CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
-	AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
-	PLATFORM_DEFINES := -D__CELLOS_LV2
-	ENDIANNESS_DEFINES += -DMSB_FIRST
-	STATIC_LINKING=1
-	EXTERNAL_ZLIB=1
-
-# sncps3
-else ifeq ($(platform), sncps3)
-	TARGET := $(TARGET_NAME)_libretro_ps3.a
-	CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
-	AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
-	PLATFORM_DEFINES := -D__CELLOS_LV2
-	ENDIANNESS_DEFINES += -DMSB_FIRST
-	STATIC_LINKING=1
-	EXTERNAL_ZLIB=1
-
 # PS2
 else ifeq ($(platform), ps2)
 	TARGET := $(TARGET_NAME)_libretro_$(platform).a
@@ -247,7 +227,7 @@ else ifeq ($(platform), psl1ght)
 	TARGET := $(TARGET_NAME)_libretro_$(platform).a
 	CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
 	AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
-	PLATFORM_DEFINES := -D__CELLOS_LV2
+	PLATFORM_DEFINES := -D__PSL1GHT__
 	ENDIANNESS_DEFINES += -DMSB_FIRST
 	STATIC_LINKING=1
 	EXTERNAL_ZLIB=1
diff --git a/src/drivers/libretro/libretro-common/include/libretro.h b/src/drivers/libretro/libretro-common/include/libretro.h
index 59bd513..d843114 100644
--- a/src/drivers/libretro/libretro-common/include/libretro.h
+++ b/src/drivers/libretro/libretro-common/include/libretro.h
@@ -69,7 +69,7 @@ extern "C" {
 #      endif
 #    endif
 #  else
-#      if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__CELLOS_LV2__)
+#      if defined(__GNUC__) && __GNUC__ >= 4
 #        define RETRO_API RETRO_CALLCONV __attribute__((__visibility__("default")))
 #      else
 #        define RETRO_API RETRO_CALLCONV

From 2e408ab958551014c615ec0d64445fbe20626778 Mon Sep 17 00:00:00 2001
From: Autechre <libretro@gmail.com>
Date: Mon, 28 Dec 2020 23:22:20 +0100
Subject: [PATCH 067/295] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7cda1fc..422a21e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,6 +56,10 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/wii-static.yml'
 
+  # Nintendo WiiU
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/wiiu-static.yml'
+
   # Nintendo Switch
   - project: 'libretro-infrastructure/ci-templates'
     file: '/libnx-static.yml'
@@ -155,6 +159,12 @@ libretro-build-wii:
     - .libretro-wii-static-retroarch-master
     - .core-defs
 
+# Nintendo WiiU
+libretro-build-wiiu:
+  extends:
+    - .libretro-wiiu-static-retroarch-master
+    - .core-defs
+
 # Nintendo Switch
 libretro-build-libnx-aarch64:
   extends:

From 5fc31e82be9ab565c33571b1155a9ce3c222eb63 Mon Sep 17 00:00:00 2001
From: Dwedit <danweiss@gmail.com>
Date: Wed, 30 Dec 2020 15:33:27 -0500
Subject: [PATCH 068/295] Fixed a bug that caused extended save state
 information to be truncated early.

---
 src/fceu-types.h | 2 +-
 src/ines.c       | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/fceu-types.h b/src/fceu-types.h
index dda3a8e..cc8f7c5 100644
--- a/src/fceu-types.h
+++ b/src/fceu-types.h
@@ -39,7 +39,7 @@ typedef uint32_t uint32;
 typedef unsigned long long uint64;
 typedef long long int64;
 	#define GINLINE inline
-#elif MSVC
+#elif MSVC | _MSC_VER
 typedef __int64 int64;
 typedef unsigned __int64 uint64;
 	#define GINLINE		/* Can't declare a function INLINE
diff --git a/src/ines.c b/src/ines.c
index 9bb3ef7..715d808 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -844,7 +844,12 @@ static int iNES_Init(int num) {
 				AddExState(VROM, CHRRAMSize, 0, "CHRR");
 			}
 			if (head.ROM_type & 8)
-				AddExState(ExtraNTARAM, 2048, 0, "EXNR");
+			{
+				if (ExtraNTARAM != NULL)
+				{
+					AddExState(ExtraNTARAM, 2048, 0, "EXNR");
+				}
+			}
 			tmp->init(&iNESCart);
 			return 1;
 		}

From d87f7e5b341d284fbe2ad623b0766dc357d7574a Mon Sep 17 00:00:00 2001
From: Dwedit <danweiss@gmail.com>
Date: Wed, 30 Dec 2020 15:50:22 -0500
Subject: [PATCH 069/295] Prevent adding NULL terminator to save state extra
 list

---
 src/state.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/state.c b/src/state.c
index 35f7d6a..9c452ae 100644
--- a/src/state.c
+++ b/src/state.c
@@ -324,6 +324,8 @@ void ResetExState(void (*PreSave)(void), void (*PostSave)(void))
 
 void AddExState(void *v, uint32 s, int type, char *desc)
 {
+   /* prevent adding a terminator to the list if a NULL pointer was provided */
+   if (v == NULL) return;
    memset(SFMDATA[SFEXINDEX].desc, 0, sizeof(SFMDATA[SFEXINDEX].desc));
    if (desc)
       strncpy(SFMDATA[SFEXINDEX].desc, desc, sizeof(SFMDATA[SFEXINDEX].desc));

From d3543238b79568ec8f00bde724bd4f1cee208522 Mon Sep 17 00:00:00 2001
From: Autechre <libretro@gmail.com>
Date: Sat, 2 Jan 2021 00:11:04 +0100
Subject: [PATCH 070/295] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 422a21e..3264c16 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,10 @@ include:
   # Windows 64-bit
   - project: 'libretro-infrastructure/ci-templates'
     file: '/windows-x64-mingw.yml'
+    
+  # Windows 32-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-i686-mingw.yml'
 
   # Linux 64-bit
   - project: 'libretro-infrastructure/ci-templates'
@@ -84,6 +88,12 @@ libretro-build-windows-x64:
   extends:
     - .libretro-windows-x64-mingw-make-default
     - .core-defs
+    
+# Windows 32-bit
+libretro-build-windows-i686:
+  extends:
+    - .libretro-windows-i686-mingw-make-default
+    - .core-defs
 
 # Linux 64-bit
 libretro-build-linux-x64:

From 7649a24ca28bb22e732594402680877657c09246 Mon Sep 17 00:00:00 2001
From: Autechre <libretro@gmail.com>
Date: Thu, 7 Jan 2021 22:50:28 +0100
Subject: [PATCH 071/295] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3264c16..0f99378 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,6 +26,10 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/linux-x64.yml'
 
+  # Linux 32-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/linux-i686.yml'
+
   # MacOS 64-bit
   - project: 'libretro-infrastructure/ci-templates'
     file: '/osx-x64.yml'
@@ -35,6 +39,10 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/android-jni.yml'
 
+  # iOS 9
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ios9.yml'
+
   ################################## CONSOLES ################################
   # PlayStation Portable
   - project: 'libretro-infrastructure/ci-templates'
@@ -72,6 +80,11 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/dingux-mips32.yml'
 
+  #################################### MISC ##################################
+  # Emscripten
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/emscripten-static.yml'
+
 # Stages for building
 stages:
   - build-prepare
@@ -101,6 +114,12 @@ libretro-build-linux-x64:
     - .libretro-linux-x64-make-default
     - .core-defs
 
+# Linux 32-bit
+libretro-build-linux-i686:
+  extends:
+    - .libretro-linux-i686-make-default
+    - .core-defs
+
 # MacOS 64-bit
 libretro-build-osx-x64:
   extends:
@@ -132,6 +151,12 @@ android-x86:
     - .libretro-android-jni-x86
     - .core-defs
 
+# iOS 9
+libretro-build-ios-9:
+  extends:
+    - .libretro-ios9-make-default
+    - .core-defs
+
 ################################### CONSOLES #################################
 # PlayStation Portable
 libretro-build-psp:
@@ -186,3 +211,10 @@ libretro-build-dingux-mips32:
   extends:
     - .libretro-dingux-mips32-make-default
     - .core-defs
+
+#################################### MISC ##################################
+# Emscripten
+libretro-build-emscripten:
+  extends:
+    - .libretro-emscripten-static-retroarch-master
+    - .core-defs

From 6501adf6ed2781b31374cc88a08e632199c7617c Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 13 Jan 2021 16:33:56 +0100
Subject: [PATCH 072/295] Add RPI3 + RPI4 and fix aarch64

---
 Makefile.libretro | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index 3ecbbd3..2ec6b79 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -221,6 +221,23 @@ else ifeq ($(platform), rpi2)
 	CFLAGS += -DARM
 	CFLAGS += -marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -funsafe-math-optimizations
 	CFLAGS += -fomit-frame-pointer -fstrict-aliasing -ffast-math
+	
+# Raspberry Pi 3
+else ifeq ($(platform), rpi3)
+	TARGET := $(TARGET_NAME)_libretro.so
+	fpic := -fPIC
+	SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
+	CFLAGS += -DARM
+	CFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard -funsafe-math-optimizations
+	CFLAGS += -fomit-frame-pointer -fstrict-aliasing -ffast-math
+
+# Raspberry Pi 4 (64-bit)
+else ifeq ($(platform), rpi4)
+	TARGET := $(TARGET_NAME)_libretro.so
+	fpic := -fPIC
+	SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
+	CFLAGS += -mcpu=cortex-a72 -mtune=cortex-a72 -funsafe-math-optimizations
+	CFLAGS += -fomit-frame-pointer -fstrict-aliasing -ffast-math
 
 # Lightweight PS3 Homebrew SDK
 else ifeq ($(platform), psl1ght)
@@ -357,8 +374,8 @@ else ifeq ($(platform), classic_armv8_a35)
 	ARCH = arm
 	BUILTIN_GPU = neon
 	USE_DYNAREC = 1
-	CFLAGS += -march=armv8-a
-	LDFLAGS += -static-libgcc -static-libstdc++
+	LDFLAGS += -lrt
+	LDFLAGS += -marm -mcpu=cortex-a35 -mfpu=neon-fp-armv8 -mfloat-abi=hard -Ofast -flto -fuse-linker-plugin
 #######################################
 
 # ARM

From 8b55ffc5339b5c042c74915bf195996e9580d953 Mon Sep 17 00:00:00 2001
From: Francisco Javier Trujillo Mata <fran.t.es@sync.money>
Date: Sun, 12 Apr 2020 17:43:09 +0200
Subject: [PATCH 073/295] make it to compile

---
 Makefile.libretro | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index 2ec6b79..d653c60 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -150,8 +150,8 @@ else ifeq ($(platform), qnx)
 # PS2
 else ifeq ($(platform), ps2)
 	TARGET := $(TARGET_NAME)_libretro_$(platform).a
-	CC = ee-gcc$(EXE_EXT)
-	AR = ee-ar$(EXE_EXT)
+	CC = mips64r5900el-ps2-elf-gcc$(EXE_EXT)
+	AR = mips64r5900el-ps2-elf-ar$(EXE_EXT)
 	FCEU_DEFINES := -DPATH_MAX=1024 -DINLINE=inline -DPSS_STYLE=1 -DFCEU_VERSION_NUMERIC=9813 -DHAVE_ASPRINTF
 	ENDIANNESS_DEFINES := -DLSB_FIRST -DLOCAL_LE=1
 	PLATFORM_DEFINES := -DPS2 -D_EE -G0 -DFRONTEND_SUPPORTS_ABGR1555 -DRENDER_GSKIT_PS2
@@ -790,10 +790,10 @@ endif
 %.o: %.c
 	$(CC) -c $(OBJOUT)$@ $< $(CFLAGS) $(INCFLAGS)
 
-ifeq ($(platform), ps2)
-%.o: %.s
-	ee-as -G0 $< -o $@
-endif
+# ifeq ($(platform), ps2)
+# %.o: %.s
+# 	mips64r5900el-ps2-elf-as -G0 $< -o $@
+# endif
 
 clean-objs:
 	rm -f $(OBJECTS)

From c85ab0580054abe211029e95e4272a2233b510b8 Mon Sep 17 00:00:00 2001
From: Francisco Javier Trujillo Mata <fran.t.es@sync.money>
Date: Mon, 21 Dec 2020 21:58:23 +0100
Subject: [PATCH 074/295] Fix wrong aligment in the buffer

---
 Makefile.libretro               | 5 -----
 src/drivers/libretro/libretro.c | 8 ++++++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index d653c60..db37a02 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -790,11 +790,6 @@ endif
 %.o: %.c
 	$(CC) -c $(OBJOUT)$@ $< $(CFLAGS) $(INCFLAGS)
 
-# ifeq ($(platform), ps2)
-# %.o: %.s
-# 	mips64r5900el-ps2-elf-as -G0 $< -o $@
-# endif
-
 clean-objs:
 	rm -f $(OBJECTS)
 
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 43536b6..3bac67f 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -28,6 +28,10 @@
 #include "../../vsuni.h"
 #include "../../video.h"
 
+#ifdef PSP
+#include "pspgu.h"
+#endif
+
 #if defined(RENDER_GSKIT_PS2)
 #include "libretro-common/include/libretro_gskit_ps2.h"
 #endif
@@ -159,8 +163,8 @@ static unsigned opt_showAdvSoundOptions = 0;
 static unsigned opt_showAdvSystemOptions = 0;
 
 int FCEUnetplay;
-#ifdef PSP
-#include "pspgu.h"
+
+#if defined(PSP) || defined(PS2)
 static __attribute__((aligned(16))) uint16_t retro_palette[256];
 #else
 static uint16_t retro_palette[256];

From d14e4155f920254cf9bf94315aadf7b6c1d83660 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 15 Jan 2021 19:17:25 +0100
Subject: [PATCH 075/295] Add Apple ARM64 rules

---
 .gitlab-ci.yml    | 11 +++++++++++
 Makefile.libretro | 15 +++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f99378..d1f3f80 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,6 +34,11 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/osx-x64.yml'
 
+  # MacOS ARM 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    ref:  'macosx-arm64'
+    file: '/osx-arm64.yml'
+
   ################################## CELLULAR ################################
   # Android
   - project: 'libretro-infrastructure/ci-templates'
@@ -126,6 +131,12 @@ libretro-build-osx-x64:
     - .libretro-osx-x64-make-default
     - .core-defs
 
+# MacOS ARM 64-bit
+libretro-build-osx-arm64:
+  extends:
+    - .libretro-osx-arm64-make-default
+    - .core-defs
+
 ################################### CELLULAR #################################
 # Android ARMv7a
 android-armeabi-v7a:
diff --git a/Makefile.libretro b/Makefile.libretro
index db37a02..9d9d6f7 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -41,10 +41,15 @@ ifeq ($(shell uname -a),)
 	system_platform = win
 else ifneq ($(findstring Darwin,$(shell uname -a)),)
 	system_platform = osx
-	arch = intel
-	ifeq ($(shell uname -p),powerpc)
-		arch = ppc
+ifeq ($(shell uname -p),powerpc)
+	arch = ppc
+else
+	ifeq ($(shell uname -p),arm)
+		arch = arm
+	else
+		arch = intel
 	endif
+endif
 else ifneq ($(findstring MINGW,$(shell uname -a)),)
 	system_platform = win
 endif
@@ -86,9 +91,11 @@ else ifeq ($(platform), osx)
 	ifeq ($(arch),ppc)
 		ENDIANNESS_DEFINES += -DMSB_FIRST -DHAVE_NO_LANGEXTRA
 	endif
+   ifneq ($(arch),arm)
+	   fpic += -mmacosx-version-min=10.1
+	endif
 	OSXVER = `sw_vers -productVersion | cut -d. -f 2`
 	OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
-	fpic += -mmacosx-version-min=10.1
 	ifndef ($(NOUNIVERSAL))
 		CFLAGS += $(ARCHFLAGS)
 		LDFLAGS += $(ARCHFLAGS)

From ce8ae5d34ce3460850adcf2a79a6424e9669c3a8 Mon Sep 17 00:00:00 2001
From: Autechre <libretro@gmail.com>
Date: Fri, 15 Jan 2021 19:18:22 +0100
Subject: [PATCH 076/295] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1f3f80..0be1470 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,6 @@ include:
 
   # MacOS ARM 64-bit
   - project: 'libretro-infrastructure/ci-templates'
-    ref:  'macosx-arm64'
     file: '/osx-arm64.yml'
 
   ################################## CELLULAR ################################

From 0401c3983d6b7e86e0c3a9a2adc561f6f853b6a4 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 15 Jan 2021 22:50:28 +0100
Subject: [PATCH 077/295] Cleanup

---
 Makefile.libretro | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index 9d9d6f7..508d236 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -25,10 +25,6 @@ ifeq ($(platform),)
 		platform = win
 	else ifneq ($(findstring Darwin,$(shell uname -s)),)
 		platform = osx
-		arch = intel
-		ifeq ($(shell uname -p),powerpc)
-			arch = ppc
-		endif
 	else ifneq ($(findstring win,$(shell uname -s)),)
 		platform = win
 	endif

From 4bcd398acf49847f742fa4e10465b5127f787989 Mon Sep 17 00:00:00 2001
From: Autechre <libretro@gmail.com>
Date: Fri, 15 Jan 2021 22:56:23 +0100
Subject: [PATCH 078/295] Update Makefile.libretro

---
 Makefile.libretro | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index 508d236..50f4768 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -87,7 +87,10 @@ else ifeq ($(platform), osx)
 	ifeq ($(arch),ppc)
 		ENDIANNESS_DEFINES += -DMSB_FIRST -DHAVE_NO_LANGEXTRA
 	endif
-   ifneq ($(arch),arm)
+        ifeq ($(arch),arm)
+	        TARGET_RULE = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
+		CFLAGS   += $(TARGET_RULE)
+	else
 	   fpic += -mmacosx-version-min=10.1
 	endif
 	OSXVER = `sw_vers -productVersion | cut -d. -f 2`

From b5f6221abcad1e8611f28a2c7bf5eaabcf82acbf Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 20 Jan 2021 07:59:45 +0100
Subject: [PATCH 079/295] Fix MSVC 2003 build

---
 src/ntsc/nes_ntsc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ntsc/nes_ntsc.c b/src/ntsc/nes_ntsc.c
index df57cb0..3d5d88d 100644
--- a/src/ntsc/nes_ntsc.c
+++ b/src/ntsc/nes_ntsc.c
@@ -243,7 +243,7 @@ void nes_ntsc_blit( nes_ntsc_t const* ntsc, NES_NTSC_IN_T const* input, NES_NTSC
 		NES_NTSC_IN_T const* line_inD = inputD;
 		NES_NTSC_BEGIN_ROW( ntsc, burst_phase,
 				nes_ntsc_black, nes_ntsc_black, NES_NTSC_ADJ_IN( *line_in, *line_inD ) );
-		nes_ntsc_out_t* restrict line_out = (nes_ntsc_out_t*) rgb_out;
+		nes_ntsc_out_t* line_out = (nes_ntsc_out_t*) rgb_out;
 		int n;
 		++line_in;
 		

From 1ef25ff1c6cb75018471afd03ccb4eaac3aab9b0 Mon Sep 17 00:00:00 2001
From: Autechre <libretro@gmail.com>
Date: Tue, 26 Jan 2021 19:34:59 +0100
Subject: [PATCH 080/295] Update Makefile.libretro

---
 Makefile.libretro | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index 50f4768..c511e58 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -41,7 +41,7 @@ ifeq ($(shell uname -p),powerpc)
 	arch = ppc
 else
 	ifeq ($(shell uname -p),arm)
-		arch = arm
+		arch = arm64
 	else
 		arch = intel
 	endif
@@ -87,12 +87,13 @@ else ifeq ($(platform), osx)
 	ifeq ($(arch),ppc)
 		ENDIANNESS_DEFINES += -DMSB_FIRST -DHAVE_NO_LANGEXTRA
 	endif
-        ifeq ($(arch),arm)
-	        TARGET_RULE = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
+        ifeq ($(arch),arm64)
+	        TARGET_RULE = -arch arm64
 		CFLAGS   += $(TARGET_RULE)
 	else
 	   fpic += -mmacosx-version-min=10.1
 	endif
+	
 	OSXVER = `sw_vers -productVersion | cut -d. -f 2`
 	OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
 	ifndef ($(NOUNIVERSAL))

From c17439b4f4a1a900b40a0c402aa52767fc04e5fb Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 28 Jan 2021 04:49:28 +0100
Subject: [PATCH 081/295] (OSX) Add cross compile rules for arm64

---
 Makefile.libretro | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index c511e58..48f2826 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -87,15 +87,17 @@ else ifeq ($(platform), osx)
 	ifeq ($(arch),ppc)
 		ENDIANNESS_DEFINES += -DMSB_FIRST -DHAVE_NO_LANGEXTRA
 	endif
-        ifeq ($(arch),arm64)
-	        TARGET_RULE = -arch arm64
+   ifeq ($(CROSS_COMPILE),1)
+		TARGET_RULE   = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
 		CFLAGS   += $(TARGET_RULE)
-	else
-	   fpic += -mmacosx-version-min=10.1
-	endif
+		LDFLAGS  += $(TARGET_RULE)
+   endif
 	
 	OSXVER = `sw_vers -productVersion | cut -d. -f 2`
 	OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
+	ifeq ($(OSX_LT_MAVERICKS),YES)
+	   fpic += -mmacosx-version-min=10.1
+	endif
 	ifndef ($(NOUNIVERSAL))
 		CFLAGS += $(ARCHFLAGS)
 		LDFLAGS += $(ARCHFLAGS)

From 82ce944aa356eb9f03cd789f0af748e93899931f Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sun, 31 Jan 2021 15:51:09 +0100
Subject: [PATCH 082/295] Combine the very similar mappers
 126/422/534/BS400/BS4040 into one common source code file. Rewrite for
 accuracy and compatibility with all known game dumps. Replace FUTURE KIDS
 hack with correct CNROM masking.

---
 src/boards/126-422-534.c | 136 ++++++++++++++++++++++++++++++++++
 src/boards/126.c         | 105 --------------------------
 src/boards/534.c         |  89 ----------------------
 src/boards/bs4xxxr.c     | 156 ---------------------------------------
 src/ines.c               |   1 +
 src/ines.h               |   1 +
 src/unif.c               |   4 +-
 src/unif.h               |   3 +-
 8 files changed, 141 insertions(+), 354 deletions(-)
 create mode 100644 src/boards/126-422-534.c
 delete mode 100644 src/boards/126.c
 delete mode 100644 src/boards/534.c
 delete mode 100644 src/boards/bs4xxxr.c

diff --git a/src/boards/126-422-534.c b/src/boards/126-422-534.c
new file mode 100644
index 0000000..e8d6610
--- /dev/null
+++ b/src/boards/126-422-534.c
@@ -0,0 +1,136 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2020 NewRisingSun
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* Mapper 422: "Normal" version of the mapper. Represents UNIF boards BS-400R and BS-4040R.
+   Mapper 126: Power Joy version of the mapper, connecting CHR A18 and A19 in reverse order.
+   Mapper 534: Waixing version of the mapper, inverting the reload value of the MMC3 scanline counter.
+*/
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static uint8 reverseCHR_A18_A19;
+static uint8 invertC000;
+static uint8 dipSwitch;
+
+static void wrapPRG(uint32 A, uint8 V) {
+	int prgAND = EXPREGS[0] &0x40? 0x0F: 0x1F; // 128 KiB or 256 KiB inner PRG bank selection
+	int prgOR  =(EXPREGS[0] <<4 &0x70 | EXPREGS[0] <<3 &0x180) &~prgAND; // outer PRG bank
+	switch(EXPREGS[3] &3) {
+		case 0: // MMC3 PRG mode
+			break;
+		case 1:
+		case 2: // NROM-128 mode: MMC3 register 6 applies throughout $8000-$FFFF, MMC3 A13 replaced with CPU A13.
+			V =DRegBuf[6] &~1 | A >>13 &1;
+			setprg8(A ^0x4000,  V     &prgAND | prgOR); // wrapPRG is only called with A containing the switchable banks, so we need to manually switch the normally fixed banks in this mode as well.
+			break;
+		case 3:	// NROM-256 mode: MMC3 register 6 applies throughout $8000-$FFFF, MMC3 A13-14 replaced with CPU A13-14.
+			V =DRegBuf[6] &~3 | A >>13 &3;
+			setprg8(A ^0x4000, (V ^2) &prgAND | prgOR); // wrapPRG is only called with A containing the switchable banks, so we need to manually switch the normally fixed banks in this mode as well.
+			break;
+	}
+	setprg8(A, V &prgAND | prgOR);	
+}
+
+static void wrapCHR(uint32 A, uint8 V) {
+	int chrAND = EXPREGS[0] &0x80? 0x7F: 0xFF; // 128 KiB or 256 KiB innter CHR bank selection
+	int chrOR; // outer CHR bank
+	if (reverseCHR_A18_A19) // Mapper 126 swaps CHR A18 and A19
+		chrOR =(EXPREGS[0] <<4 &0x080 | EXPREGS[0] <<3 &0x100 | EXPREGS[0] <<5 &0x200) &~chrAND;
+	else
+		chrOR =EXPREGS[0] <<4 &0x380 &~chrAND;
+	
+	if (EXPREGS[3] &0x10) // CNROM mode: 8 KiB inner CHR bank comes from outer bank register #2
+		setchr8(EXPREGS[2] &(chrAND >>3) | chrOR >>3);
+	else // MMC3 CHR mode
+		setchr1(A, (V & chrAND) | chrOR);
+}
+
+static DECLFW(writeWRAM) {
+	if (~EXPREGS[3] &0x80) {
+		// Lock bit clear: Update any outer bank register
+		EXPREGS[A &3] =V;
+		FixMMC3PRG(MMC3_cmd);
+		FixMMC3CHR(MMC3_cmd);
+	} else
+	if ((A &3) ==2) {
+		// Lock bit set: Only update the bottom one or two bits of the CNROM bank
+		int latchMask =EXPREGS[2] &0x10? 1: 3; // 16 or 32 KiB inner CHR bank selection
+		EXPREGS[2] &=~latchMask;
+		EXPREGS[2] |= V &latchMask;
+		FixMMC3CHR(MMC3_cmd);
+	}
+	CartBW(A, V);
+}
+
+static DECLFR(readDIP) {
+	uint8 result =CartBR(A);
+	if (EXPREGS[1] &1) result =result &~3 | dipSwitch &3; // Replace bottom two bits with solder pad or DIP switch setting if so selected
+	return result;
+}
+
+static DECLFW(writeIRQ) {
+	MMC3_IRQWrite(A, V ^0xFF);
+}
+
+static void reset(void) {
+	dipSwitch++; // Soft-resetting cycles through solder pad or DIP switch settings
+	EXPREGS[0] = EXPREGS[1] = EXPREGS[2] = EXPREGS[3] = 0;
+	MMC3RegReset();
+}
+
+static void power(void) {
+	dipSwitch =0;
+	EXPREGS[0] = EXPREGS[1] = EXPREGS[2] = EXPREGS[3] = 0;
+	GenMMC3Power();
+	SetWriteHandler(0x6000, 0x7FFF, writeWRAM);
+	SetReadHandler(0x8000, 0xFFFF, readDIP);
+	if (invertC000) SetWriteHandler(0xC000, 0xDFFF, writeIRQ); // Mapper 534 inverts the MMC3 scanline counter reload value
+}
+
+static void init(CartInfo *info) {
+	GenMMC3_Init(info, 512, 256, 8, info->battery);
+	cwrap = wrapCHR;
+	pwrap = wrapPRG;
+
+	info->Power = power;
+	info->Reset = reset;
+
+	AddExState(EXPREGS, 4, 0, "EXPR");
+	AddExState(&dipSwitch, 1, 0, "DPSW");
+}
+
+void Mapper126_Init(CartInfo *info) {
+	reverseCHR_A18_A19 = 1;
+	invertC000 = 0;
+	init(info);
+}
+
+void Mapper422_Init(CartInfo *info) {
+	reverseCHR_A18_A19 = 0;
+	invertC000 = 0;
+	init(info);
+}
+
+void Mapper534_Init(CartInfo *info) {
+	reverseCHR_A18_A19 = 0;
+	invertC000 = 1;
+	init(info);
+}
diff --git a/src/boards/126.c b/src/boards/126.c
deleted file mode 100644
index 0a93910..0000000
--- a/src/boards/126.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* FCEUmm - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2019 Libretro Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/* Mapper 126, PowerJoy 84-in-1 Multicart (PJ-008*/
-/* reference from nestopia since not available in nesdev */
-
-#include "mapinc.h"
-#include "mmc3.h"
-
-static uint16 GetExChrExBank() {
-	uint16 bank = (uint16)EXPREGS[0];
-	return ((~bank << 0 & 0x080 & ((uint16)EXPREGS[2])) | (bank << 4 & 0x080 & bank) |
-			(bank << 3 & 0x100) | (bank << 5 & 0x200));
-}
-
-static void UpdateChrBank(void) {
-	uint16 bank = (uint16)EXPREGS[2] & 0x0F;
-	bank |= GetExChrExBank() >> 3;
-	setchr8(bank);
-}
-
-static void M126CW(uint32 A, uint8 V) {
-	if (!(EXPREGS[3] & 0x10)) {
-		uint16 bank = (uint16)V & (((uint16)EXPREGS[0] & 0x80) - 1);
-		bank |= GetExChrExBank();
-		setchr1(A, bank);
-	}
-}
-
-static void M126PW(uint32 A, uint8 V) {
-	uint16 bank = (uint16)V;
-	uint16 preg = (uint16)EXPREGS[0];
-	bank &= ((~preg >> 2) & 0x10) | 0x0F;
-	bank |= ((preg & (0x06 | (preg & 0x40) >> 6)) << 4) | ((preg & 0x10) << 3);
-	if (!(EXPREGS[3] & 0x03))
-		setprg8(A, bank);
-	else if ((A - 0x8000) == ((MMC3_cmd << 8) & 0x4000)) { /* TODO: Clean this */
-		if ((EXPREGS[3] & 0x3) == 0x3)
-			setprg32(0x8000, (bank >> 2));
-		else {
-			setprg16(0x8000, (bank >> 1));
-			setprg16(0xc000, (bank >> 1));
-		}
-	}
-}
-
-static DECLFW(M126Write) {
-	A &= 0x03;
-	if(A == 0x01 || A == 0x02 || ((A == 0x00 || A == 0x03) && !(EXPREGS[3] & 0x80))) {
-		if (EXPREGS[A] != V) {
-			EXPREGS[A] = V;
-			if (EXPREGS[3] & 0x10)
-				UpdateChrBank();
-			else
-				FixMMC3CHR(MMC3_cmd);
-			FixMMC3PRG(MMC3_cmd);
-		}
-	}
-}
-
-void M126StateRestore(int v) {
-	FixMMC3CHR(MMC3_cmd);
-	FixMMC3PRG(MMC3_cmd);
-
-	if (EXPREGS[3] & 0x10)
-		UpdateChrBank();
-}
-
-static void M126Reset(void) {
-	EXPREGS[0] = EXPREGS[1] = EXPREGS[2] = EXPREGS[3] = 0;
-	MMC3RegReset();
-}
-
-static void M126Power(void) {
-	EXPREGS[0] = EXPREGS[1] = EXPREGS[2] = EXPREGS[3] = 0;
-	GenMMC3Power();
-	SetWriteHandler(0x6000, 0x7FFF, M126Write);
-}
-
-void Mapper126_Init(CartInfo *info) {
-	GenMMC3_Init(info, 2048, 1023, 0, 0);
-	cwrap = M126CW;
-	pwrap = M126PW;
-	info->Power = M126Power;
-	info->Reset = M126Reset;
-	GameStateRestore = M126StateRestore;
-	AddExState(EXPREGS, 4, 0, "EXPR");
-}
diff --git a/src/boards/534.c b/src/boards/534.c
deleted file mode 100644
index 8c8bb9d..0000000
--- a/src/boards/534.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* FCEUmm - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/* NES 2.0 Mapper 534 - 2-in-1 数独/五子棋 (Sudoku/Gomoku, NJ064) */
-
-#include "mapinc.h"
-#include "mmc3.h"
-
-static uint32 GetPRGBank(uint32 bank)
-{
-	if (~bank & 1 && (MMC3_cmd & 0x40)) bank ^= 2;
-	return (bank & 2) ? (0xFE | (bank & 1)) : DRegBuf[6 | (bank & 1)];
-}
-
-void SyncPRG_GNROM(int A14, int AND, int OR) {
-	setprg8(0x8000, ((GetPRGBank(0) & ~A14) & AND) | OR);
-	setprg8(0xA000, ((GetPRGBank(1) & ~A14) & AND) | OR);
-	setprg8(0xC000, ((GetPRGBank(0) |  A14) & AND) | OR);
-	setprg8(0xE000, ((GetPRGBank(1) |  A14) & AND) | OR);
-}
-
-static void M534PW(uint32 A, uint8 V) {
-	if (EXPREGS[0] & 0x40)
-		SyncPRG_GNROM(EXPREGS[3] & 0x02, 0x0F, ((EXPREGS[0] & 3) << 4));
-	else
-		setprg8(A, (V & 0x1F) | ((EXPREGS[0] & 0x2) << 4));
-}
-
-static void M534CW(uint32 A, uint8 V) {
-	setchr1(A, (V & 0xFF) | ((EXPREGS[2] & 0x0F) << 3) | ((EXPREGS[0] & 0x18) << 4));
-}
-
-static DECLFW(M534IRQWrite) {
-	MMC3_IRQWrite(0xC000 | (A & 1), V ^ 0xFF);
-}
-
-static DECLFW(M534WriteLo) {
-	if ((A & 0x800) && (!(EXPREGS[3] & 0x80) || (A & 3) == 2)) {
-		EXPREGS[A & 3] = V;
-		FixMMC3CHR(MMC3_cmd);
-		FixMMC3PRG(MMC3_cmd);
-	}
-}
-
-static void M534Power(void) {
-	EXPREGS[0] = 0x00;
-	EXPREGS[1] = 0x00;
-	EXPREGS[2] = 0x00;
-	EXPREGS[3] = 0x00;
-	GenMMC3Power();
-	SetWriteHandler(0x6000, 0x6FFF, M534WriteLo);
-	SetWriteHandler(0xC000, 0xDFFF, M534IRQWrite);
-}
-
-static void M534Reset(void) {
-	EXPREGS[0] = 0x00;
-	EXPREGS[1] = 0x00;
-	EXPREGS[2] = 0x00;
-	EXPREGS[3] = 0x00;
-	EXPREGS[4] = (EXPREGS[4] + 1) & 7;
-	FCEU_printf("dipswitch = %d\n", EXPREGS[4]);
-	MMC3RegReset();
-}
-
-void Mapper534_Init(CartInfo *info) {
-	GenMMC3_Init(info, 512, 512, 0, 0);
-	pwrap = M534PW;
-	cwrap = M534CW;
-	info->Power = M534Power;
-	info->Reset = M534Reset;
-	AddExState(EXPREGS, 5, 0, "EXPR");
-}
diff --git a/src/boards/bs4xxxr.c b/src/boards/bs4xxxr.c
deleted file mode 100644
index a844007..0000000
--- a/src/boards/bs4xxxr.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2020
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/* originally submitted by dragon2snow
- * Known carts:
- * UNIF BMC-BS-400R  : 700000-in-1 (BS-400R)(Unl), PRG 1024K CHR 1024K CRC 0x5DBDFAA0
- * UNIF BMC-BS-4040R : Double Dragon 310000-in-1 (4040R) PRG 512 CHR 512 CRC 0x3A642F31
- *
- * FIXME: Future Kids notes
- * Either something is wrong or missing because chr banks for the game is $E8 - EB
- * but game uses $EC-EF here. These are chr banks for the next game and does not masked properly
- * by mapper code.
- *                                                                                      ~ c@2020
- */
-
-#include "mapinc.h"
-#include "mmc3.h"
-
-static uint8 pointer;
-static uint8 offset;
-
-static int getPRGBankBS4XXXR(int bank)
-{
-	if (((~bank) & 1) && (pointer & 0x40)) bank ^= 2;
-	return ((bank & 2) ? 0xFE | (bank & 1) : DRegBuf[6 | (bank & 1)]);
-}
-
-static void BS4XXXRPW(uint32 A, uint8 V)
-{
-	if ((EXPREGS[3] >> 4) & 1) {
-		uint8 prgAND = ((EXPREGS[0] >> 1) & 1) ? 0x0F : 0x0F;
-		uint8 prgOR = (EXPREGS[0] & 7) << 4;
-		uint8 bank0 = getPRGBankBS4XXXR(0);
-		uint8 bank1 = getPRGBankBS4XXXR(1);
-		/* 16K Mode */
-		if (!((EXPREGS[3] >>1 )& 0x1)) {
-			setprg8(0x8000, (bank0 & prgAND) | prgOR);
-			setprg8(0xA000, (bank1 & prgAND) | prgOR);
-			setprg8(0xC000, (bank0 & prgAND) | prgOR);
-			setprg8(0xE000, (bank1 & prgAND) | prgOR);
-		}
-		/* 32K Mode */
-		else {
-			setprg8(0x8000, (bank0 & prgAND) | prgOR);
-			setprg8(0xA000, (bank1 & prgAND) | prgOR);
-			setprg8(0xC000, ((bank0 | 2) & prgAND) | prgOR);
-			setprg8(0xE000, ((bank1 | 2) & prgAND) | prgOR);
-		}
-	}
-	/* Mmc3 Mode */
-	else {
-		uint8 prgAND = ((EXPREGS[0] >> offset) & 1) ? 0x0F : 0x1F; /* 4040R 6,400R 1 */
-		uint8 prgOR = (EXPREGS[0] & 7) << 4;
-		setprg8(A, (V & prgAND) | prgOR);
-	}
-}
-
-static void BS4XXXRCW(uint32 A, uint8 V) {
-	if ((EXPREGS[3] >> 4) & 1) {
-		uint8 chrAND = ((EXPREGS[0] >> 1) & 1) ? 0x0F : 0x0F;
-		uint8 chrOR = ((EXPREGS[0] >> 3) & 7) << 4;
-		/* FIXME: Ugly hack for Future Kids */
-		if (EXPREGS[4]) {
-			chrAND = 0x03;
-			chrOR |= 8;
-		}
-		setchr8((EXPREGS[2] & chrAND) | chrOR);
-	} else {
-		uint8 chrAND = ((EXPREGS[0] >> 1) & 1) ? 0xFF : 0xFF;
-		uint16 chrOR = ((EXPREGS[0] >> 3) & 7) << 7;
-		setchr1(A, (V & chrAND) | chrOR);
-	}
-}
-
-static DECLFW(BS4XXXRHiWrite) {
-	/* FCEU_printf("Wr8B: A:%04x V:%02x\n", A, V); */
-	if (A == 0x8000)
-		pointer = MMC3_cmd ^ V;
-	MMC3_CMDWrite(A, V);
-}
-
-static DECLFW(BS4XXXRLoWrite) {
-	/* FCEU_printf("WrLo: A:%04x V:%02x\n", A, V); */
-	if (A & 0x800) {
-		/* Future Kids hack */
-		if (!EXPREGS[4]) {
-			if ((((A & 3) == 2) && (V == 0xE8)))
-				EXPREGS[4] = 1;
-		}
-		if (!(EXPREGS[3] & 0x80)) {
-			EXPREGS[A & 0x03] = V;
-			FixMMC3PRG(MMC3_cmd);
-			FixMMC3CHR(MMC3_cmd);
-		}
-		else if (EXPREGS[3] & 0x10) {
-			EXPREGS[A & 0x03] = V;
-			FixMMC3PRG(MMC3_cmd);
-			FixMMC3CHR(MMC3_cmd);
-		}
-	}
-	CartBW(A, V);
-}
-
-static void BS4XXXRReset(void) {
-	EXPREGS[4] = 0;
-	EXPREGS[0] = EXPREGS[1] = EXPREGS[2] = EXPREGS[3] = 0;
-	MMC3RegReset();
-}
-
-static void BS4XXXRPower(void) {
-	EXPREGS[4] = 0;
-	EXPREGS[0] = EXPREGS[1] = EXPREGS[2] = EXPREGS[3] = 0;
-	GenMMC3Power();
-	SetWriteHandler(0x6000, 0x7FFF, BS4XXXRLoWrite);
-	SetWriteHandler(0x8000, 0xBFFF, BS4XXXRHiWrite);
-}
-
-void BS4XXXR_Init(CartInfo *info) {
-	GenMMC3_Init(info, 512, 256, 8, 0);
-	cwrap = BS4XXXRCW;
-	pwrap = BS4XXXRPW;
-
-	info->Power = BS4XXXRPower;
-	info->Reset = BS4XXXRReset;
-
-	AddExState(EXPREGS, 4, 0, "EXPR");
-	AddExState(&pointer, 1, 0, "PNTR");
-	AddExState(&offset, 1, 0, "OFFS");
-}
-
-void BS400R_Init(CartInfo *info) {
-	offset = 1;
-	BS4XXXR_Init(info);
-}
-
-void BS4040R_Init(CartInfo *info) {
-	offset = 6;
-	BS4XXXR_Init(info);
-}
diff --git a/src/ines.c b/src/ines.c
index 69dabaf..231b846 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -699,6 +699,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "Realtec 8210",             395, Mapper395_Init         )
 	INES_BOARD( "BMC Super 19-in-1 (VIP19)",    401, Mapper401_Init         )
 	INES_BOARD( "A88S-1",                   411, Mapper411_Init         )
+	INES_BOARD( "BS-400R/BS-4040",          422, Mapper422_Init         )
 	INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init        )
 	INES_BOARD( "Sachen 3014",              533, Mapper533_Init         )
 	INES_BOARD( "NJ064",                    534, Mapper534_Init         )
diff --git a/src/ines.h b/src/ines.h
index b1ce41c..99e4756 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -271,6 +271,7 @@ void Mapper390_Init(CartInfo *);
 void Mapper395_Init(CartInfo *);
 void Mapper401_Init(CartInfo *);
 void Mapper411_Init(CartInfo *);
+void Mapper422_Init(CartInfo *);
 void Mapper516_Init(CartInfo *);
 void Mapper533_Init(CartInfo *);
 void Mapper534_Init(CartInfo *);
diff --git a/src/unif.c b/src/unif.c
index fd7a642..2d1bfe4 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -616,8 +616,8 @@ static BMAPPING bmap[] = {
 	{ "82112C",                     540, Mapper540_Init,        0 },
 	{ "N49C-300",                   369, Mapper369_Init,        0 },
 
-	{ "BS-400R",                NO_INES, BS400R_Init,           0 },
-	{ "BS-4040R",               NO_INES, BS4040R_Init,          0 },
+	{ "BS-400R",                    422, Mapper422_Init,        0 },
+	{ "BS-4040R",                   422, Mapper422_Init,        0 },
 
 #ifdef COPYFAMI
 	{ "COPYFAMI_MMC3",          NO_INES, MapperCopyFamiMMC3_Init, 0 },
diff --git a/src/unif.h b/src/unif.h
index 3b2cbe3..0dbd4ab 100644
--- a/src/unif.h
+++ b/src/unif.h
@@ -196,8 +196,7 @@ void AbG1l_Init(CartInfo *info);
 void KG256_Init(CartInfo *info);
 void WAIXINGFS005_Init(CartInfo *info);
 
-void BS4040R_Init(CartInfo *info);
-void BS400R_Init(CartInfo *info);
+void Mapper422_Init(CartInfo *info);
 
 #ifdef COPYFAMI
 void MapperCopyFamiMMC3_Init(CartInfo *info);

From f282bbdc2910e290a864f88de2f2a30d5c585b6c Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 9 Feb 2021 00:33:37 +0100
Subject: [PATCH 083/295] (MSVC 2005/2010) Add core

---
 .gitlab-ci.yml    | 30 ++++++++++++++++++++++++++++
 Makefile.common   |  2 --
 Makefile.libretro | 51 ++++++++++++++++++++++++++++-------------------
 3 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0be1470..0664811 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,18 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/windows-i686-mingw.yml'
 
+  # Windows msvc10 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-x64-msvc10-msys2.yml'
+
+  # Windows msvc10 32-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-i686-msvc10-msys2.yml'
+
+  # Windows msvc05 32-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-i686-msvc05-msys2.yml'
+
   # Linux 64-bit
   - project: 'libretro-infrastructure/ci-templates'
     file: '/linux-x64.yml'
@@ -112,6 +124,24 @@ libretro-build-windows-i686:
     - .libretro-windows-i686-mingw-make-default
     - .core-defs
 
+# Windows msvc10 64-bit
+libretro-build-windows-msvc10-x64:
+  extends:
+    - .libretro-windows-x64-msvc10-msys2-make-default
+    - .core-defs
+
+# Windows msvc10 32-bit
+libretro-build-windows-msvc10-i686:
+  extends:
+    - .libretro-windows-i686-msvc10-msys2-make-default
+    - .core-defs
+
+# Windows msvc05 32-bit
+libretro-build-windows-msvc05-i686:
+  extends:
+    - .libretro-windows-i686-msvc05-msys2-make-default
+    - .core-defs
+
 # Linux 64-bit
 libretro-build-linux-x64:
   extends:
diff --git a/Makefile.common b/Makefile.common
index fe710f6..8c75113 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,6 +1,4 @@
-ifeq ($(LIBRETRO_COMM_DIR),)
 LIBRETRO_COMM_DIR := $(CORE_DIR)/drivers/libretro/libretro-common
-endif
 INCFLAGS      := -I$(CORE_DIR)/drivers/libretro -I$(LIBRETRO_COMM_DIR)/include -I$(CORE_DIR) -I$(CORE_DIR)/input -I$(CORE_DIR)/boards
 COREDEFINES    = -D__LIBRETRO__ -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DFCEU_VERSION_NUMERIC=9813 -DFRONTEND_SUPPORTS_RGB565
 
diff --git a/Makefile.libretro b/Makefile.libretro
index 48f2826..b8be704 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -524,18 +524,19 @@ else ifeq ($(platform), windows_msvc2010_x64)
 
 PATH := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/bin/amd64"):$(PATH)
 PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE")
-INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include")
 LIB := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/lib/amd64")
-BIN := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/bin")
+INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include")
 
-WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib/x64
-WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib/x64
-WindowsSdkDirInc := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')Include
-WindowsSdkDirInc ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')Include
+WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
+WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
 
-INCFLAGS_PLATFORM = -I"$(WindowsSdkDirInc)"
-export INCLUDE := $(INCLUDE)
-export LIB := $(LIB);$(WindowsSdkDir)
+WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include")
+WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl")
+WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib\x64")
+
+INCFLAGS_PLATFORM = -I"$(WindowsSDKIncludeDir)"
+export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKGlIncludeDir)
+export LIB := $(LIB);$(WindowsSDKLibDir)
 TARGET := $(TARGET_NAME)_libretro.dll
 PSS_STYLE :=2
 LDFLAGS += -DLL
@@ -547,18 +548,19 @@ else ifeq ($(platform), windows_msvc2010_x86)
 
 PATH := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/bin"):$(PATH)
 PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE")
-INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include")
 LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS100COMNTOOLS)../../VC/lib")
-BIN := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/bin")
+INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include")
 
-WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib
-WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib
-WindowsSdkDirInc := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')Include
-WindowsSdkDirInc ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')Include
+WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
+WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
 
-INCFLAGS_PLATFORM = -I"$(WindowsSdkDirInc)"
-export INCLUDE := $(INCLUDE)
-export LIB := $(LIB);$(WindowsSdkDir)
+WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include")
+WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl")
+WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib")
+
+INCFLAGS_PLATFORM = -I"$(WindowsSDKIncludeDir)"
+export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKGlIncludeDir)
+export LIB := $(LIB);$(WindowsSDKLibDir)
 TARGET := $(TARGET_NAME)_libretro.dll
 PSS_STYLE :=2
 LDFLAGS += -DLL
@@ -627,10 +629,17 @@ INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/include")
 LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/lib")
 BIN := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin")
 
-WindowsSdkDir := $(INETSDK)
+WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\MicrosoftSDK\InstalledSDKs\8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3" -v "Install Dir" | grep -o '[A-Z]:\\.*')
 
-export INCLUDE := $(INCLUDE);$(INETSDK)/Include
-export LIB := $(LIB);$(WindowsSdkDir);$(INETSDK)/Lib
+WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include")
+WindowsSDKAtlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\atl")
+WindowsSDKCrtIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\crt")
+WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl")
+WindowsSDKMfcIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\mfc")
+WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib")
+
+export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKAtlIncludeDir);$(WindowsSDKCrtIncludeDir);$(WindowsSDKGlIncludeDir);$(WindowsSDKMfcIncludeDir);libretro-common/include/compat/msvc
+export LIB := $(LIB);$(WindowsSDKLibDir)
 TARGET := $(TARGET_NAME)_libretro.dll
 PSS_STYLE :=2
 LDFLAGS += -DLL

From 91ccd3b9e0247db66b07c68532805b8a1a94f8f0 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 14 Feb 2021 17:46:31 +0100
Subject: [PATCH 084/295] (MSVC) Embed MSVCR runtime

---
 Makefile.libretro | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index b8be704..fda55d5 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -675,36 +675,23 @@ endif
 
 ifeq ($(DEBUG), 1)
 	ifneq (,$(findstring msvc,$(platform)))
-		ifeq ($(STATIC_LINKING),1)
-			CFLAGS += -MTd
-			CXXFLAGS += -MTd
-		else
-			CFLAGS += -MDd
-			CXXFLAGS += -MDd
-		endif
-
-		CFLAGS += -Od -Zi -DDEBUG -D_DEBUG
-		CXXFLAGS += -Od -Zi -DDEBUG -D_DEBUG
+      CFLAGS   += -MTd
+      CXXFLAGS += -MTd
+      CFLAGS   += -Od -Zi -D_DEBUG
+      CXXFLAGS += -Od -Zi -D_DEBUG
 	else
-		CFLAGS += -O0 -g -DDEBUG
-		CXXFLAGS += -O0 -g -DDEBUG
+      CFLAGS   += -O0 -g
+      CXXFLAGS += -O0 -g
 	endif
+      CFLAGS   += -DDEBUG
+      CXXFLAGS += -DDEBUG
 else
 	ifneq (,$(findstring msvc,$(platform)))
-		ifeq ($(STATIC_LINKING),1)
-			CFLAGS += -MT
-			CXXFLAGS += -MT
-		else
-			CFLAGS += -MD
-			CXXFLAGS += -MD
-		endif
-
-		CFLAGS += -O2 -DNDEBUG
-		CXXFLAGS += -O2 -DNDEBUG
-	else
-		CFLAGS += -O2 -DNDEBUG
-		CXXFLAGS += -O2 -DNDEBUG
+      CFLAGS     += -MT
+      CXXFLAGS   += -MT
 	endif
+      CFLAGS     += -O2 -DNDEBUG
+      CXXFLAGS   += -O2 -DNDEBUG
 endif
 
 ifneq ($(SANITIZER),)

From 8fa62114d86fa55eaafc0330b4fd285f7f55d3e8 Mon Sep 17 00:00:00 2001
From: negativeExponent <54053706+negativeExponent@users.noreply.github.com>
Date: Mon, 1 Mar 2021 06:33:17 +0800
Subject: [PATCH 085/295] Apply region overrides when loading new rom (Fix#430)

---
 src/drivers/libretro/libretro.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 3bac67f..94ec2c2 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -2376,6 +2376,7 @@ bool retro_load_game(const struct retro_game_info *game)
    sndvolume = 150;
    swapDuty = 0;
    dendy = 0;
+   opt_region = 0;
 
    /* Wii: initialize this or else last variable is passed through
     * when loading another rom causing save state size change. */

From 4194145d3a62a61fa236d182fa14a5d0672d23d7 Mon Sep 17 00:00:00 2001
From: Yoshi Sugawara <yoshi.sugawara@gmail.com>
Date: Sun, 7 Mar 2021 16:34:55 -1000
Subject: [PATCH 086/295] Support iOS and tvOS in gitlab ci

---
 .gitlab-ci.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0664811..2e111a8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,9 +55,9 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/android-jni.yml'
 
-  # iOS 9
+  # iOS
   - project: 'libretro-infrastructure/ci-templates'
-    file: '/ios9.yml'
+    file: '/ios-arm64.yml'
 
   ################################## CONSOLES ################################
   # PlayStation Portable
@@ -96,6 +96,10 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/dingux-mips32.yml'
 
+  # tvOS (AppleTV)
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/tvos-arm64.yml'
+
   #################################### MISC ##################################
   # Emscripten
   - project: 'libretro-infrastructure/ci-templates'
@@ -191,10 +195,10 @@ android-x86:
     - .libretro-android-jni-x86
     - .core-defs
 
-# iOS 9
-libretro-build-ios-9:
+# iOS
+libretro-build-ios-arm64:
   extends:
-    - .libretro-ios9-make-default
+    - .libretro-ios-arm64-make-default
     - .core-defs
 
 ################################### CONSOLES #################################

From 8b7e8d463441018247eba735b2e596f679ff83dd Mon Sep 17 00:00:00 2001
From: Yoshi Sugawara <yoshi.sugawara@gmail.com>
Date: Sun, 7 Mar 2021 17:06:36 -1000
Subject: [PATCH 087/295] add back ios9 target

---
 .gitlab-ci.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e111a8..3967fdb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,6 +59,10 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/ios-arm64.yml'
 
+  # iOS (armv7)
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ios9.yml'
+
   ################################## CONSOLES ################################
   # PlayStation Portable
   - project: 'libretro-infrastructure/ci-templates'
@@ -201,6 +205,12 @@ libretro-build-ios-arm64:
     - .libretro-ios-arm64-make-default
     - .core-defs
 
+# iOS (armv7)
+libretro-build-ios9:
+  extends:
+    - .libretro-ios9-make-default
+    - .core-defs
+
 ################################### CONSOLES #################################
 # PlayStation Portable
 libretro-build-psp:

From eb87c5e09f06e394d5160350d3cfc20673d7f863 Mon Sep 17 00:00:00 2001
From: Autechre <libretro@gmail.com>
Date: Mon, 8 Mar 2021 04:26:34 +0100
Subject: [PATCH 088/295] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3967fdb..031eee5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -205,11 +205,17 @@ libretro-build-ios-arm64:
     - .libretro-ios-arm64-make-default
     - .core-defs
 
-# iOS (armv7)
+# iOS (armv7) [iOS 9 and up]
 libretro-build-ios9:
   extends:
     - .libretro-ios9-make-default
     - .core-defs
+    
+# tvOS
+libretro-build-tvos-arm64:
+  extends:
+    - .libretro-tvos-arm64-make-default
+    - .core-defs
 
 ################################### CONSOLES #################################
 # PlayStation Portable

From 66760e1a17342070ab876ec028aee273e9cb8236 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 25 Mar 2021 21:18:05 +0100
Subject: [PATCH 089/295] Add od-beta

---
 .gitlab-ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 031eee5..6771abe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -272,6 +272,12 @@ libretro-build-dingux-mips32:
     - .libretro-dingux-mips32-make-default
     - .core-defs
 
+# OpenDingux Beta
+libretro-build-dingux-odbeta-mips32:
+  extends:
+    - .libretro-dingux-odbeta-mips32-make-default
+    - .core-defs
+
 #################################### MISC ##################################
 # Emscripten
 libretro-build-emscripten:

From f4a5c2a420ef60eaf5662f7b50599dba4c1c6c53 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 7 Apr 2021 18:45:37 +0200
Subject: [PATCH 090/295] Mapper 332: Add CNROM mode, support larger multicarts

---
 src/boards/super40in1.c | 49 ++++++++++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/boards/super40in1.c b/src/boards/super40in1.c
index ef5a5e1..3de6804 100644
--- a/src/boards/super40in1.c
+++ b/src/boards/super40in1.c
@@ -23,43 +23,72 @@
 
 #include "mapinc.h"
 
-static uint8 preg, creg;
+static uint8 preg, creg, latch, dipSwitch;
 
 static SFORMAT StateRegs[] =
 {
 	{ &preg, 1, "PREG" },
 	{ &creg, 1, "CREG" },
+	{ &latch, 1, "LATC" },
+	{ &dipSwitch, 1, "DPSW" },
 	{ 0 }
 };
 
 static void Sync(void) {
+	int prg = (preg & 7) | ((preg >> 3) & 0x08); // There is a high bit 3 of the PRG register that applies both to PRG and CHR
 	if (preg & 8) {
-		setprg16(0x8000, preg & 7);
-		setprg16(0xc000, preg & 7);
+		setprg16(0x8000, prg);
+		setprg16(0xc000, prg);
 	}
 	else
-		setprg32(0x8000, (preg & 6) >> 1);
-	setchr8(creg);
+		setprg32(0x8000, prg >> 1);
+
+	int chr = (creg & 7) | ((preg >> 3) & 0x08);    	// There is a high bit 3 of the PRG register that applies both to PRG and CHR
+	int mask = (creg & 0x10)? 0: (creg & 0x20)? 1: 3;	// There is an CNROM mode that takes either two or four inner CHR banks from a CNROM-like latch register at $8000-$FFFF.
+	setchr8((chr &~mask) | (latch &mask));          	// This "inner CHR bank" substitutes the respective bit(s) of the creg register.
+	
 	setmirror(((preg >> 4) & 1) ^ 1);
 }
 
+static DECLFR(BMCWSRead) {
+	if ((creg >> 6) & (dipSwitch &3))
+		return X.DB;
+	else
+		return CartBR(A);
+}
+
 static DECLFW(BMCWSWrite) {
 	if (preg & 0x20)
 		return;
 
 	switch (A & 1) {
-	case 0: preg = V; Sync(); break;
-	case 1: creg = V; Sync(); break;
+		case 0: preg = V; Sync(); break;
+		case 1: creg = V; Sync(); break;
 	}
 }
 
-static void MBMCWSPower(void) {
+static DECLFW(LatchWrite) {
+	latch =V;
 	Sync();
-	SetReadHandler(0x8000, 0xFFFF, CartBR);
-	SetWriteHandler(0x6000, 0x6001, BMCWSWrite);
+}
+
+static void MBMCWSPower(void) {
+	dipSwitch =0;
+	Sync();
+	SetReadHandler(0x8000, 0xFFFF, BMCWSRead);
+	SetWriteHandler(0x6000, 0x7FFF, BMCWSWrite);
+	SetWriteHandler(0x8000, 0xFFFF, LatchWrite);
 }
 
 static void BMCWSReset(void) {
+	dipSwitch++; // Soft-resetting cycles through solder pad or DIP switch settings
+	if (dipSwitch == 3) dipSwitch = 0; // Only 00b, 01b and 10b settings are valid
+	
+	// Always reset to menu
+	preg =0;
+	creg =0;
+	latch =0;
+	Sync();
 }
 
 static void StateRestore(int version) {

From c06e25ed30a81410c241ba4302ab8ede037edcd8 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Thu, 8 Apr 2021 17:06:17 +0200
Subject: [PATCH 091/295] Rewrite and unify J.Y. ASIC emulation. Add multicart
 mappers.

---
 src/boards/90.c            | 505 -------------------------------------
 src/boards/bmc13in1jy110.c |  99 --------
 src/boards/jyasic.c        | 483 +++++++++++++++++++++++++++++++++++
 src/boards/sc-127.c        | 123 ---------
 src/ines.c                 |  13 +-
 src/ines.h                 |   9 +
 src/unif.c                 |   4 +-
 src/unif.h                 |   2 -
 8 files changed, 504 insertions(+), 734 deletions(-)
 delete mode 100644 src/boards/90.c
 delete mode 100644 src/boards/bmc13in1jy110.c
 create mode 100644 src/boards/jyasic.c
 delete mode 100644 src/boards/sc-127.c

diff --git a/src/boards/90.c b/src/boards/90.c
deleted file mode 100644
index ff2b0b4..0000000
--- a/src/boards/90.c
+++ /dev/null
@@ -1,505 +0,0 @@
-/* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2002 Xodnizel
- *  Copyright (C) 2005 CaH4e3
- *  Copyright (C) 2019 Libretro Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "mapinc.h"
-/* #define DEBUG90 */
-
-/* Mapper 090 is simpliest mapper hardware and have not extended nametable control and latched chr banks in 4k mode
- * Mapper 209 much compicated hardware with decribed above features disabled by default and switchable by command
- * Mapper 211 the same mapper 209 but with forced nametable control
- * Mapper 281 PRG ($8000-$8FFF) and CHR ($9000-$AFFF) bank select register bits that select 256 KiB banks are masked off.
- */
-
-static int is209;
-static int is211;
-static int is281;
-
-static uint8 IRQMode;		/*  from $c001 */
-static uint8 IRQPre;		/*  from $c004 */
-static uint8 IRQPreSize;	/*  from $c007 */
-static uint8 IRQCount;		/*  from $c005 */
-static uint8 IRQXOR;		/*  Loaded from $C006 */
-static uint8 IRQa;			/*  $c002, $c003, and $c000 */
-
-static uint8 mul[2];
-static uint8 regie;
-
-static uint8 tkcom[4];
-static uint8 prgb[4];
-static uint8 chrlow[8];
-static uint8 chrhigh[8];
-
-static uint8 chr[2];
-
-static uint16 names[4];
-static uint8 tekker;
-
-static SFORMAT Tek_StateRegs[] = {
-	{ &IRQMode, 1, "IRQM" },
-	{ &IRQPre, 1, "IRQP" },
-	{ &IRQPreSize, 1, "IRQR" },
-	{ &IRQCount, 1, "IRQC" },
-	{ &IRQXOR, 1, "IRQX" },
-	{ &IRQa, 1, "IRQA" },
-	{ mul, 2, "MUL" },
-	{ &regie, 1, "REGI" },
-	{ tkcom, 4, "TKCO" },
-	{ prgb, 4, "PRGB" },
-	{ chr, 2, "CLTC" },
-	{ chrlow, 4, "CHRL" },
-	{ chrhigh, 8, "CHRH" },
-	{ &names[0], 2 | FCEUSTATE_RLSB, "NMS0" },
-	{ &names[1], 2 | FCEUSTATE_RLSB, "NMS1" },
-	{ &names[2], 2 | FCEUSTATE_RLSB, "NMS2" },
-	{ &names[3], 2 | FCEUSTATE_RLSB, "NMS3" },
-	{ &tekker, 1, "TEKR" },
-	{ 0 }
-};
-
-static void mira(void) {
-	if (((tkcom[0] & 0x20) && is209) || is211 || ((tkcom[1] & 0x08) && is281)) {
-		int x;
-		if (tkcom[0] & 0x40) {		/* Name tables are ROM-only */
-			for (x = 0; x < 4; x++)
-				setntamem(CHRptr[0] + (((names[x]) & CHRmask1[0]) << 10), 0, x);
-		} else {					/* Name tables can be RAM or ROM. */
-			for (x = 0; x < 4; x++) {
-				if ((tkcom[1] & 0x80) == (names[x] & 0x80))	/* RAM selected. */
-					setntamem(NTARAM + ((names[x] & 0x1) << 10), 1, x);
-				else
-					setntamem(CHRptr[0] + (((names[x]) & CHRmask1[0]) << 10), 0, x);
-			}
-		}
-	} else {
-		switch (tkcom[1] & 3) {
-		case 0: setmirror(MI_V); break;
-		case 1: setmirror(MI_H); break;
-		case 2: setmirror(MI_0); break;
-		case 3: setmirror(MI_1); break;
-		}
-	}
-}
-
-static uint8 invertprg(uint8 bank, uint8 reverse) {
-	if (reverse)
-		return ((bank & 0x01) << 6 | (bank & 0x02) << 4 | (bank & 0x04) << 2 |
-				(bank & 0x10) >> 2 | (bank & 0x20) >> 4 | (bank & 0x40) >> 6);
-	else
-		return bank;
-}
-
-static void tekprom(void) {
-	uint8 prgshift = 0, prgmask = 0x3F, outb_sel = 0x06, last_bank = 0x3F;
-	uint8 prgmode = tkcom[0] & 0x03;
-	uint8 invert = (tkcom[0] & 0x03) == 0x03 ? 1 : 0;
-	uint32 bankmode = 0;
-
-	switch (tkcom[0] & 0x03) {
-	case 0x00: prgshift = 3; prgmask = 0x0F; break;
-	case 0x01: prgshift = 4; prgmask = 0x1F; break;
-	default: prgshift = 5; prgmask = 0x3F; break;
-	}
-
-	if (is281) {
-		prgmask >>= 1;
-		outb_sel = 0x01;
-	}
-
-	bankmode = ((tkcom[3] & outb_sel) << prgshift);
-	last_bank = (tkcom[0] & 0x04) ? prgb[3] : prgmask;
-	switch (prgmode) {
-		case 0x00:
-			if (tkcom[0] & 0x80)
-				setprg8(0x6000, (((prgb[3] << 2) + 3) & 0x3F) | bankmode);
-			setprg32(0x8000, (last_bank & prgmask) | bankmode);
-			break;
-		case 0x01:
-			if (tkcom[0] & 0x80)
-				setprg8(0x6000, (((prgb[3] << 1) + 1) & 0x3F) | bankmode);
-			setprg16(0x8000, (prgb[1] & prgmask) | bankmode);
-			setprg16(0xC000, (last_bank & prgmask) | bankmode);
-			break;
-		case 0x02:
-		case 0x03:
-			if (tkcom[0] & 0x80)
-				setprg8(0x6000, (invertprg(prgb[3], invert) & 0x3F) | bankmode);
-			setprg8(0x8000, (invertprg(prgb[0], invert) & prgmask) | bankmode);
-			setprg8(0xa000, (invertprg(prgb[1], invert) & prgmask) | bankmode);
-			setprg8(0xc000, (invertprg(prgb[2], invert) & prgmask) | bankmode);
-			setprg8(0xe000, (invertprg(last_bank, invert) & prgmask) | bankmode);
-			break;
-	}
-}
-
-static void tekvrom(void) {
-	int x, bank = 0, mask = 0xFFFF;
-	if (!(tkcom[3] & 0x20) || is281) {
-		if (is281)
-			bank = tkcom[3] & 1;
-		else
-			bank = (tkcom[3] & 1) | ((tkcom[3] & 0x18) >> 2);
-		switch (tkcom[0] & 0x18) {
-		case 0x00: bank <<= 5; mask = 0x1F; break;
-		case 0x08: bank <<= 6; mask = 0x3F; break;
-		case 0x10: bank <<= 7; mask = 0x7F; break;
-		case 0x18: bank <<= 8; mask = 0xFF; break;
-		}
-	}
-	switch (tkcom[0] & 0x18) {
-	case 0x00:		/* 8KB */
-		setchr8(((chrlow[0] | (chrhigh[0] << 8)) & mask) | bank);
-		break;
-	case 0x08:		/* 4KB */
-#if 0
-			for(x=0;x<8;x+=4)
-				setchr4(x<<10,((chrlow[x]|(chrhigh[x]<<8))&mask)|bank);
-#endif
-		setchr4(0x0000, ((chrlow[chr[0]] | (chrhigh[chr[0]] << 8)) & mask) | bank);
-		setchr4(0x1000, ((chrlow[chr[1]] | (chrhigh[chr[1]] << 8)) & mask) | bank);
-		break;
-	case 0x10:		/* 2KB */
-		for (x = 0; x < 8; x += 2)
-			setchr2(x << 10, ((chrlow[x] | (chrhigh[x] << 8)) & mask) | bank);
-		break;
-	case 0x18:		/* 1KB */
-		for (x = 0; x < 8; x++)
-			setchr1(x << 10, ((chrlow[x] | (chrhigh[x] << 8)) & mask) | bank);
-		break;
-	}
-}
-
-static DECLFW(M90TekWrite) {
-	switch (A & 0x5C03) {
-	case 0x5800: mul[0] = V; break;
-	case 0x5801: mul[1] = V; break;
-	case 0x5803: regie = V; break;
-	}
-}
-
-static DECLFR(M90TekRead) {
-	switch (A & 0x5C03) {
-	case 0x5800: return(mul[0] * mul[1]);
-	case 0x5801: return((mul[0] * mul[1]) >> 8);
-	case 0x5803: return(regie);
-	default: return tekker;
-	}
-	return(0xff);
-}
-
-static DECLFW(M90PRGWrite) {
-/*	FCEU_printf("bs %04x %02x\n",A,V); */
-	prgb[A & 3] = V;
-	tekprom();
-}
-
-static DECLFW(M90CHRlowWrite) {
-/*	FCEU_printf("bs %04x %02x\n",A,V); */
-	chrlow[A & 7] = V;
-	tekvrom();
-}
-
-static DECLFW(M90CHRhiWrite) {
-/*	FCEU_printf("bs %04x %02x\n",A,V); */
-	chrhigh[A & 7] = V;
-	tekvrom();
-}
-
-static DECLFW(M90NTWrite) {
-/*	FCEU_printf("bs %04x %02x\n",A,V); */
-	if (A & 4) {
-		names[A & 3] &= 0x00FF;
-		names[A & 3] |= V << 8;
-	} else {
-		names[A & 3] &= 0xFF00;
-		names[A & 3] |= V;
-	}
-	mira();
-}
-
-static DECLFW(M90IRQWrite) {
-/*	FCEU_printf("bs %04x %02x\n",A,V); */
-	switch (A & 7) {
-	case 00:
-/*			FCEU_printf("%s IRQ (C000)\n",V&1?"Enable":"Disable"); */
-		IRQa = V & 1;
-		if (!(V & 1))
-			X6502_IRQEnd(FCEU_IQEXT);
-		break;
-	case 02:
-/*			FCEU_printf("Disable IRQ (C002) scanline=%d\n", scanline); */
-		IRQa = 0; X6502_IRQEnd(FCEU_IQEXT);
-		break;
-	case 03:
-/*			FCEU_printf("Enable IRQ (C003) scanline=%d\n", scanline); */
-		IRQa = 1;
-		break;
-	case 01:
-		IRQMode = V;
-#if 0
-		FCEU_printf("IRQ Count method: ");
-		switch (IRQMode&3)
-		{
-			case 00: FCEU_printf("M2 cycles\n");break;
-			case 01: FCEU_printf("PPU A12 toggles\n");break;
-			case 02: FCEU_printf("PPU reads\n");break;
-			case 03: FCEU_printf("Writes to CPU space\n");break;
-		}
-		FCEU_printf("Counter prescaler size: %s\n",(IRQMode&4)?"3 bits":"8 bits");
-		FCEU_printf("Counter prescaler size adjust: %s\n",(IRQMode&8)?"Used C007":"Normal Operation");
-		if((IRQMode>>6)==2) FCEU_printf("Counter Down\n");
-		else if((IRQMode>>6)==1) FCEU_printf("Counter Up\n");
-		else FCEU_printf("Counter Stopped\n");
-#endif
-		break;
-	case 04:
-/*			FCEU_printf("Pre Counter Loaded and Xored wiht C006: %d\n",V^IRQXOR); */
-		IRQPre = V ^ IRQXOR;
-		break;
-	case 05:
-/*			FCEU_printf("Main Counter Loaded and Xored wiht C006: %d\n",V^IRQXOR); */
-		IRQCount = V ^ IRQXOR;
-		break;
-	case 06:
-/*			FCEU_printf("Xor Value: %d\n",V); */
-		IRQXOR = V;
-		break;
-	case 07:
-#if 0
-			if(!(IRQMode&8)) FCEU_printf("C001 is clear, no effect applied\n");
-			else if(V==0xFF) FCEU_printf("Prescaler is changed for 12bits\n");
-			else FCEU_printf("Counter Stopped\n");
-#endif
-		IRQPreSize = V;
-		break;
-	}
-}
-
-static DECLFW(M90ModeWrite) {
-/*	FCEU_printf("bs %04x %02x\n",A,V); */
-	tkcom[A & 3] = V;
-	tekprom();
-	tekvrom();
-	mira();
-
-#ifdef DEBUG90
-	switch (A & 3) {
-	case 00:
-		FCEU_printf("Main Control Register:\n");
-		FCEU_printf("  PGR Banking mode: %d\n", V & 7);
-		FCEU_printf("  CHR Banking mode: %d\n", (V >> 3) & 3);
-		FCEU_printf("  6000-7FFF addresses mapping: %s\n", (V & 0x80) ? "Yes" : "No");
-		FCEU_printf("  Nametable control: %s\n", (V & 0x20) ? "Enabled" : "Disabled");
-		if (V & 0x20)
-			FCEU_printf("  Nametable can be: %s\n", (V & 0x40) ? "ROM Only" : "RAM or ROM");
-		break;
-	case 01:
-		FCEU_printf("Mirroring mode: ");
-		switch (V & 3) {
-		case 0: FCEU_printf("Vertical\n"); break;
-		case 1: FCEU_printf("Horizontal\n"); break;
-		case 2: FCEU_printf("Nametable 0 only\n"); break;
-		case 3: FCEU_printf("Nametable 1 only\n"); break;
-		}
-		FCEU_printf("Mirroring flag: %s\n", (V & 0x80) ? "On" : "Off");
-		break;
-	case 02:
-		if ((((tkcom[0]) >> 5) & 3) == 1)
-			FCEU_printf("Nametable ROM/RAM select mode: %d\n", V >> 7);
-		break;
-	case 03:
-		FCEU_printf("CHR Banking mode: %s\n", (V & 0x20) ? "Entire CHR ROM" : "256Kb Switching mode");
-		if (!(V & 0x20)) FCEU_printf("256K CHR bank number: %02x\n", (V & 1) | ((V & 0x18) >> 2));
-		FCEU_printf("512K PRG bank number: %d\n", (V & 6) >> 1);
-		FCEU_printf("CHR Bank mirroring: %s\n", (V & 0x80) ? "Swapped" : "Normal operate");
-	}
-#endif
-}
-
-static DECLFW(M90DummyWrite) {
-/*	FCEU_printf("bs %04x %02x\n",A,V); */
-}
-
-static void CCL(void) {
-	if ((IRQMode >> 6) == 1) {	/* Count Up */
-		IRQCount++;
-		if ((IRQCount == 0) && IRQa) {
-			X6502_IRQBegin(FCEU_IQEXT);
-		}
-	} else if ((IRQMode >> 6) == 2) {	/* Count down */
-		IRQCount--;
-		if ((IRQCount == 0xFF) && IRQa) {
-			X6502_IRQBegin(FCEU_IQEXT);
-		}
-	}
-}
-
-static void ClockCounter(void) {
-	uint8 premask;
-
-	if (IRQMode & 0x4)
-		premask = 0x7;
-	else
-		premask = 0xFF;
-	if ((IRQMode >> 6) == 1) {	/* Count up */
-		IRQPre++;
-		if ((IRQPre & premask) == 0) CCL();
-	} else if ((IRQMode >> 6) == 2) {	/* Count down */
-		IRQPre--;
-		if ((IRQPre & premask) == premask) CCL();
-	}
-}
-
-void FP_FASTAPASS(1) CPUWrap(int a) {
-	int x;
-	if ((IRQMode & 3) == 0) for (x = 0; x < a; x++) ClockCounter();
-}
-
-static void SLWrap(void) {
-	int x;
-	if ((IRQMode & 3) == 1) for (x = 0; x < 8; x++) ClockCounter();
-}
-
-static uint32 lastread;
-static void FP_FASTAPASS(1) M90PPU(uint32 A) {
-	if ((IRQMode & 3) == 2) {
-		if (lastread != A) {
-			ClockCounter();
-			ClockCounter();
-		}
-		lastread = A;
-	}
-
-	if (is209) {
-		uint8 l, h;
-		h = A >> 8;
-		if (h < 0x20 && ((h & 0x0F) == 0xF)) {
-			l = A & 0xF0;
-			if (l == 0xD0) {
-				chr[(h & 0x10) >> 4] = ((h & 0x10) >> 2);
-				tekvrom();
-			} else if (l == 0xE0) {
-				chr[(h & 0x10) >> 4] = ((h & 0x10) >> 2) | 2;
-				tekvrom();
-			}
-		}
-	} else {
-		chr[0] = 0;
-		chr[1] = 4;
-	}
-}
-
-static void togglie(void) {
-	tekker += 0x40;
-	tekker &= 0xC0;
-	FCEU_printf("tekker=%02x\n", tekker);
-	memset(tkcom, 0x00, sizeof(tkcom));
-	memset(prgb, 0xff, sizeof(prgb));
-	tekprom();
-	tekvrom();
-}
-
-static void M90Restore(int version) {
-	tekprom();
-	tekvrom();
-	mira();
-}
-
-static void M90Power(void) {
-	SetWriteHandler(0x5000, 0x5fff, M90TekWrite);
-	SetWriteHandler(0x8000, 0x8ff0, M90PRGWrite);
-	SetWriteHandler(0x9000, 0x9fff, M90CHRlowWrite);
-	SetWriteHandler(0xA000, 0xAfff, M90CHRhiWrite);
-	SetWriteHandler(0xB000, 0xBfff, M90NTWrite);
-	SetWriteHandler(0xC000, 0xCfff, M90IRQWrite);
-	SetWriteHandler(0xD000, 0xD5ff, M90ModeWrite);
-	SetWriteHandler(0xE000, 0xFfff, M90DummyWrite);
-
-	SetReadHandler(0x5000, 0x5fff, M90TekRead);
-	SetReadHandler(0x6000, 0xffff, CartBR);
-
-	mul[0] = mul[1] = regie = 0xFF;
-
-	memset(tkcom, 0x00, sizeof(tkcom));
-	memset(prgb, 0xff, sizeof(prgb));
-	memset(chrlow, 0xff, sizeof(chrlow));
-	memset(chrhigh, 0xff, sizeof(chrhigh));
-	memset(names, 0x00, sizeof(names));
-
-	if (is211)
-		tekker = 0xC0;
-	else
-		tekker = 0x00;
-
-	tekprom();
-	tekvrom();
-}
-
-void Mapper90_Init(CartInfo *info) {
-	is211 = 0;
-	is209 = 0;
-	is281 = 0;
-	info->Reset = togglie;
-	info->Power = M90Power;
-	PPU_hook = M90PPU;
-	MapIRQHook = CPUWrap;
-	GameHBIRQHook2 = SLWrap;
-	GameStateRestore = M90Restore;
-	AddExState(Tek_StateRegs, ~0, 0, 0);
-}
-
-void Mapper209_Init(CartInfo *info) {
-	is211 = 0;
-	is209 = 1;
-	is281 = 0;
-	info->Reset = togglie;
-	info->Power = M90Power;
-	PPU_hook = M90PPU;
-	MapIRQHook = CPUWrap;
-	GameHBIRQHook2 = SLWrap;
-	GameStateRestore = M90Restore;
-	AddExState(Tek_StateRegs, ~0, 0, 0);
-}
-
-void Mapper211_Init(CartInfo *info) {
-	is211 = 1;
-	is281 = 0;
-	info->Reset = togglie;
-	info->Power = M90Power;
-	PPU_hook = M90PPU;
-	MapIRQHook = CPUWrap;
-	GameHBIRQHook2 = SLWrap;
-	GameStateRestore = M90Restore;
-	AddExState(Tek_StateRegs, ~0, 0, 0);
-}
-
-void Mapper281_Init(CartInfo *info) {
-	is211 = 0;
-	is209 = 0;
-	is281 = 1;
-	info->Reset = togglie;
-	info->Power = M90Power;
-	PPU_hook = M90PPU;
-	MapIRQHook = CPUWrap;
-	GameHBIRQHook2 = SLWrap;
-	GameStateRestore = M90Restore;
-	AddExState(Tek_StateRegs, ~0, 0, 0);
-}
diff --git a/src/boards/bmc13in1jy110.c b/src/boards/bmc13in1jy110.c
deleted file mode 100644
index 0f70257..0000000
--- a/src/boards/bmc13in1jy110.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2005 CaH4e3
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * BMC 42-in-1 "reset switch" type
- */
-
-#include "mapinc.h"
-
-static uint8 bank_mode;
-static uint8 bank_value;
-static uint8 prgb[4];
-static SFORMAT StateRegs[] =
-{
-	{ &bank_mode, 1, "BNM" },
-	{ &bank_value, 1, "BMV" },
-	{ prgb, 4, "PRGB" },
-	{ 0 }
-};
-
-static void Sync(void) {
-/*	FCEU_printf("%02x: %02x %02x\n", bank_mode, bank_value, prgb[0]); */
-	switch (bank_mode & 7) {
-	case 0:
-		setprg32(0x8000, bank_value & 7); break;
-	case 1:
-		setprg16(0x8000, ((8 + (bank_value & 7)) >> 1) + prgb[1]);
-		setprg16(0xC000, (bank_value & 7) >> 1);
-		break;
-	case 4:
-		setprg32(0x8000, 8 + (bank_value & 7)); break;
-	case 5:
-		setprg16(0x8000, ((8 + (bank_value & 7)) >> 1) + prgb[1]);
-		setprg16(0xC000, ((8 + (bank_value & 7)) >> 1) + prgb[3]);
-		break;
-	case 2:
-		setprg8(0x8000, prgb[0] >> 2);
-		setprg8(0xa000, prgb[1]);
-		setprg8(0xc000, prgb[2]);
-		setprg8(0xe000, ~0);
-		break;
-	case 3:
-		setprg8(0x8000, prgb[0]);
-		setprg8(0xa000, prgb[1]);
-		setprg8(0xc000, prgb[2]);
-		setprg8(0xe000, prgb[3]);
-		break;
-	}
-}
-
-static DECLFW(BMC13in1JY110Write) {
-/*	FCEU_printf("%04x:%04x\n",A,V); */
-	switch (A) {
-	case 0x8000:
-	case 0x8001:
-	case 0x8002:
-	case 0x8003: prgb[A & 3] = V; break;
-	case 0xD000: bank_mode = V; break;
-	case 0xD001: setmirror(V & 3);
-	case 0xD002: break;
-	case 0xD003: bank_value = V; break;
-	}
-	Sync();
-}
-
-static void BMC13in1JY110Power(void) {
-	prgb[0] = prgb[1] = prgb[2] = prgb[3] = 0;
-	bank_mode = 0;
-	bank_value = 0;
-	setprg32(0x8000, 0);
-	setchr8(0);
-	SetWriteHandler(0x8000, 0xFFFF, BMC13in1JY110Write);
-	SetReadHandler(0x8000, 0xFFFF, CartBR);
-}
-
-static void StateRestore(int version) {
-	Sync();
-}
-
-void BMC13in1JY110_Init(CartInfo *info) {
-	info->Power = BMC13in1JY110Power;
-	AddExState(&StateRegs, ~0, 0, 0);
-	GameStateRestore = StateRestore;
-}
diff --git a/src/boards/jyasic.c b/src/boards/jyasic.c
new file mode 100644
index 0000000..174bcc4
--- /dev/null
+++ b/src/boards/jyasic.c
@@ -0,0 +1,483 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2002 Xodnizel
+ *  Copyright (C) 2005 CaH4e3
+ *  Copyright (C) 2019 Libretro Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "mapinc.h"
+
+void 	(*sync)(void);
+static uint8	allowExtendedMirroring;
+
+static uint8	mode[4];
+static uint8*	WRAM = NULL;
+static uint32	WRAMSIZE;
+
+static uint8	irqControl;
+static uint8	irqEnabled;
+static uint8	irqPrescaler;
+static uint8	irqCounter;
+static uint8	irqXor;
+static uint32	lastPPUAddress;
+
+static uint8	prg[4];
+static uint16	chr[8];
+static uint16	nt[4];
+static uint8	latch[2];
+static uint8	mul[2];
+static uint8	adder;
+static uint8	test;
+static uint8    dipSwitch;
+
+static writefunc cpuWriteHandlers[0x10000]; // Actual write handlers for CPU write trapping as a method fo IRQ clocking
+
+static SFORMAT JYASIC_stateRegs[] = {
+	{ &irqControl,   1,                  "IRQM" },
+	{ &irqPrescaler, 1,                  "IRQP" },
+	{ &irqCounter,   1,                  "IRQC" },
+	{ &irqXor,       1,                  "IRQX" },
+	{ &irqEnabled,   1,                  "IRQA" },
+	{ mul,           2,                  "MUL"  },
+	{ &test,         1,                  "REGI" },
+	{ mode ,         4,                  "TKCO" },
+	{ prg,           4,                  "PRGB" },
+	{ latch,         2,                  "CLTC" },
+	{ chr,           8*2,                "CHRB" },
+	{ &nt[0],        2 | FCEUSTATE_RLSB, "NMS0" },
+	{ &nt[1],        2 | FCEUSTATE_RLSB, "NMS1" },
+	{ &nt[2],        2 | FCEUSTATE_RLSB, "NMS2" },
+	{ &nt[3],        2 | FCEUSTATE_RLSB, "NMS3" },
+	{ &dipSwitch,    1,                  "TEKR" },
+	{ &adder,        1,                  "ADDE" },
+	{ 0 }
+};
+
+static uint8 rev (uint8_t val) {
+	return ((val <<6) &0x40) | ((val <<4) &0x20) | ((val <<2) &0x10) | (val &0x08) | ((val >>2) &0x04) | ((val >>4) &0x02) | ((val >>6) &0x01);
+}
+
+static void syncPRG (int AND, int OR) {
+	uint8_t prgLast =mode[0] &0x04? prg[3]: 0xFF;
+	uint8_t prg6000 =0;
+	switch (mode[0] &0x03) {
+		case 0:	setprg32(0x8000, prgLast &AND >>2 |OR >>2);
+			prg6000 =prg[3] <<2 |3;
+			break;
+		case 1: setprg16(0x8000, prg[1]  &AND >>1 |OR >>1);
+			setprg16(0xC000, prgLast &AND >>1 |OR >>1);
+			prg6000 =prg[3] <<1 |1;
+			break;
+		case 2: setprg8(0x8000, prg[0] &AND |OR);
+			setprg8(0xA000, prg[1] &AND |OR);
+			setprg8(0xC000, prg[2] &AND |OR);
+			setprg8(0xE000, prgLast   &AND |OR);
+			prg6000 =prg[3];
+			break;
+		case 3: setprg8(0x8000, rev(prg[0]) &AND |OR);
+			setprg8(0xA000, rev(prg[1]) &AND |OR);
+			setprg8(0xC000, rev(prg[2]) &AND |OR);
+			setprg8(0xE000, rev(  prgLast) &AND |OR);
+			prg6000 =rev(prg[3]);
+			break;
+	}
+	if (mode[0] &0x80) // Map ROM
+		setprg8 (0x6000, prg6000 &AND |OR);
+	else
+	if (WRAMSIZE)   // Otherwise map WRAM if it exists
+		setprg8r(0x10, 0x6000, 0);
+}
+
+static void syncCHR (int AND, int OR) {
+	if (mode[3] &0x80 && (mode[0] &0x18) ==0x08) // MMC4 mode[0] with 4 KiB CHR mode[0]
+		for (int chrBank =0; chrBank <8; chrBank +=4) setchr4(0x400 *chrBank, chr[latch[chrBank /4]&2 | chrBank] &AND >>2 | OR >>2);
+	else
+	switch(mode[0] &0x18) {
+		case 0x00: // 8 KiB CHR mode[0]
+			setchr8(chr[0] &AND >>3 | OR >>3);
+			break;
+		case 0x08: // 4 KiB CHR mode[0]
+			for (int chrBank =0; chrBank <8; chrBank +=4) setchr4(0x400 *chrBank, chr[chrBank] &AND >>2 | OR >>2);
+			break;
+		case 0x10:
+			for (int chrBank =0; chrBank <8; chrBank +=2) setchr2(0x400 *chrBank, chr[chrBank] &AND >>1 | OR >>1);
+			break;
+		case 0x18:
+			for (int chrBank =0; chrBank <8; chrBank +=1) setchr1(0x400 *chrBank, chr[chrBank] &AND     | OR    );
+			break;
+	}
+	PPUCHRRAM =mode[2] &0x40? 0xFF: 0x00; // Write-protect or write-enable CHR-RAM
+}
+
+static void syncNT (int AND, int OR) {
+	if (mode[0] &0x20 || mode[1] &0x08) { // ROM nametables or extended mirroring
+		// First, set normal CIRAM pages using extended registers ...
+		setmirrorw(nt[0] &1, nt[1] &1, nt[2] &1, nt[3] &1);
+		
+		if (mode[0] &0x20) for (int ntBank =0; ntBank <4; ntBank++) { // Then replace with ROM nametables if such are generally enabled
+			int vromHere =(nt[ntBank] &0x80) ^(mode[2] &0x80) |(mode[0] &0x40); // ROM nametables are used either when globally enabled via D000.6 or per-bank via B00x.7 vs. D002.7
+			if (vromHere) setntamem(CHRptr[0] +0x400*((nt[ntBank] &AND | OR) & CHRmask1[0]), 0, ntBank);
+		}
+	} else
+	switch (mode[1] &0x03) { // Regularly mirrored CIRAM
+		case 0:	setmirror(MI_V); break;
+		case 1:	setmirror(MI_H); break;
+		case 2:	setmirror(MI_0); break;
+		case 3:	setmirror(MI_1); break;
+	}
+}
+
+static void clockIRQ (void) {
+	uint8_t mask =irqControl &0x04? 0x07: 0xFF;
+	if (irqEnabled) switch (irqControl &0xC0) {
+		case 0x40:
+			irqPrescaler =(irqPrescaler &~mask) | (++irqPrescaler &mask);
+			if ((irqPrescaler &mask) ==0x00 && (irqControl &0x08? irqCounter: ++irqCounter) ==0x00) X6502_IRQBegin(FCEU_IQEXT);
+			break;
+		case 0x80:
+			irqPrescaler =(irqPrescaler &~mask) | (--irqPrescaler &mask);
+			if ((irqPrescaler &mask) ==mask && (irqControl &0x08? irqCounter: --irqCounter) ==0xFF) X6502_IRQBegin(FCEU_IQEXT);
+			break;
+	}
+}
+
+static DECLFW(trapCPUWrite) {
+	if ((irqControl &0x03) ==0x03) clockIRQ(); // Clock IRQ counter on CPU writes
+	cpuWriteHandlers[A](A, V);
+}
+
+static void FP_FASTAPASS(1) trapPPUAddressChange (uint32 A) {
+	if ((irqControl &0x03) ==0x02 && lastPPUAddress !=A) for (int i =0; i <2; i++) clockIRQ(); // Clock IRQ counter on PPU "reads"
+	if (mode[3] &0x80 && (mode[0] &0x18) ==0x08 && ((A &0x2FF0) ==0xFD0 || (A &0x2FF0) ==0xFE0)) { // If MMC4 mode[0] is enabled, and CHR mode[0] is 4 KiB, and tile FD or FE is being fetched ...
+		latch[A >>12 &1] =(A >>10 &4) | (A >>4 &2); // ... switch the left or right pattern table's latch to 0 (FD) or 2 (FE), being used as an offset for the CHR register index.
+		sync();
+	}
+	lastPPUAddress =A;
+}
+
+static void ppuScanline(void) {
+	if ((irqControl &0x03) ==0x01) for (int i =0; i <8; i++) clockIRQ(); // Clock IRQ counter on A12 rises (eight per scanline). This should be done in trapPPUAddressChange, but would require more accurate PPU emulation for that.
+}
+
+void FP_FASTAPASS(1) cpuCycle(int a) {
+	if ((irqControl &0x03) ==0x00) while (a--) clockIRQ(); // Clock IRQ counter on M2 cycles
+}
+
+static DECLFR(readALU_DIP) {
+	if ((A &0x3FF) ==0 && A !=0x5800) // 5000, 5400, 5C00: read solder pad setting
+		return dipSwitch | X.DB &0x3F;
+	else
+	if (A &0x800) switch (A &3) { // 5800-5FFF: read ALU
+		case 0:	return (mul[0] *mul[1]) &0xFF;
+		case 1: return (mul[0] *mul[1]) >>8;
+		case 2:	return adder;
+		case 3:	return test;
+	} else // all others
+		return X.DB;
+}
+
+static DECLFW(writeALU) {
+	switch (A &3) {
+		case 0:	mul[0] =V; break;
+		case 1:	mul[1] =V; break;
+		case 2:	adder +=V; break;
+		case 3:	test =V;
+			adder =0;
+			break;
+	}
+}
+
+static DECLFW(writePRG) {
+	prg[A &3] = V;
+	sync();	
+}
+
+static DECLFW(writeCHRLow) {
+	chr[A &7] =chr[A &7] &0xFF00 | V;
+	sync();
+}
+
+static DECLFW(writeCHRHigh) {
+	chr[A &7] =chr[A &7] &0x00FF | V <<8;
+	sync();
+}
+
+static DECLFW(writeNT) {
+	if (~A &4)
+		nt[A &3] =nt[A &3] &0xFF00 | V;
+	else
+		nt[A &3] =nt[A &3] &0x00FF | V <<8;
+	sync();
+}
+
+static DECLFW(writeIRQ) {
+	switch (A &7) {
+		case 0:	irqEnabled =!!(V &1);
+			if (!irqEnabled) {
+				irqPrescaler =0;
+				X6502_IRQEnd(FCEU_IQEXT);
+			}
+			break;
+		case 1: irqControl =V;
+			break;
+		case 2:	irqEnabled =0;
+			irqPrescaler =0;
+			X6502_IRQEnd(FCEU_IQEXT);
+			break;
+		case 3:	irqEnabled =1;
+			break;
+		case 4:	irqPrescaler =V ^irqXor;
+			break;
+		case 5:	irqCounter =V ^irqXor;
+			break;
+		case 6:	irqXor =V;
+			break;
+	}
+}
+
+static DECLFW(writeMode) {
+	switch (A &3) {
+		case 0:	mode[0] =V;
+			if (!allowExtendedMirroring) mode[0] &=~0x20;
+			break;
+		case 1:	mode[1] =V;
+			if (!allowExtendedMirroring) mode[1] &=~0x08;
+			break;
+		case 2: mode[2] =V;
+			break;
+		case 3:	mode[3] =V;
+			break;
+	}
+	sync();
+}
+
+static void JYASIC_power(void) {
+	SetWriteHandler(0x5000, 0x5FFF, writeALU);
+	SetWriteHandler(0x6000, 0x7fff, CartBW);
+	SetWriteHandler(0x8000, 0x87FF, writePRG);     // 8800-8FFF ignored
+	SetWriteHandler(0x9000, 0x97FF, writeCHRLow);  // 9800-9FFF ignored
+	SetWriteHandler(0xA000, 0xA7FF, writeCHRHigh); // A800-AFFF ignored
+	SetWriteHandler(0xB000, 0xB7FF, writeNT);      // B800-BFFF ignored
+	SetWriteHandler(0xC000, 0xCFFF, writeIRQ);
+	SetWriteHandler(0xD000, 0xD7FF, writeMode);    // D800-DFFF ignored
+	
+	for (unsigned int i =0; i <0x10000; i++) cpuWriteHandlers[i] =GetWriteHandler(i);
+	SetWriteHandler(0x0000, 0xFFFF, trapCPUWrite); // Trap all CPU writes for IRQ clocking purposes
+
+	SetReadHandler(0x5000, 0x5FFF, readALU_DIP);
+	SetReadHandler(0x6000, 0xFFFF, CartBR);
+
+	mul[0] = mul[1] = adder = test = dipSwitch = 0;
+	mode[0] = mode[1] = mode[2] = mode[3] =0;
+	irqControl =irqEnabled = irqPrescaler =irqCounter = irqXor = lastPPUAddress = 0;
+	memset(prg, 0, sizeof(prg));
+	memset(chr, 0, sizeof(chr));
+	memset(nt, 0, sizeof(nt));
+	latch[0] =0;
+	latch[1] =4;
+	
+	sync();
+}
+
+static void JYASIC_reset (void) {
+	dipSwitch = (dipSwitch +0x40) &0xC0;
+}
+
+static void JYASIC_restore (int version) {
+	sync();
+}
+
+void JYASIC_init (CartInfo *info) {
+	info->Reset = JYASIC_reset;
+	info->Power = JYASIC_power;
+	PPU_hook = trapPPUAddressChange;
+	MapIRQHook = cpuCycle;
+	GameHBIRQHook2 = ppuScanline;
+	AddExState(JYASIC_stateRegs, ~0, 0, 0);
+	GameStateRestore = JYASIC_restore;
+
+	// WRAM is present only in iNES mapper 35, or in mappers with numbers above 255 that require NES 2.0, which explicitly denotes WRAM size
+	if (info->iNES2)
+		WRAMSIZE =info->PRGRamSize + info->PRGRamSaveSize;
+	else
+		WRAMSIZE =info->mapper ==35? 8192: 0;
+
+	if (WRAMSIZE) {
+		WRAM = (uint8*)FCEU_gmalloc(WRAMSIZE);
+		SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
+		FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
+	}
+}
+
+static void syncSingleCart (void) {
+	syncPRG(0x3F, mode[3] <<5 &~0x3F);
+	if (mode[3] &0x20) {
+		syncCHR(0x1FF,                        mode[3] <<6 &0x600);
+		syncNT (0x1FF,                        mode[3] <<6 &0x600);
+	} else {
+		syncCHR(0x0FF, mode[3] <<8 &0x100 | mode[3] <<6 &0x600);
+		syncNT (0x0FF, mode[3] <<8 &0x100 | mode[3] <<6 &0x600);
+	}
+}
+void Mapper35_Init(CartInfo *info) { // Basically mapper 90/209/211 with WRAM
+	allowExtendedMirroring =1;
+	sync =syncSingleCart;
+	JYASIC_init(info);
+}
+void Mapper90_Init(CartInfo *info) { // Single cart, extended mirroring and ROM nametables disabled
+	allowExtendedMirroring =0;
+	sync =syncSingleCart;
+	JYASIC_init(info);
+}
+void Mapper209_Init(CartInfo *info) { // Single cart, extended mirroring and ROM nametables enabled
+	allowExtendedMirroring =1;
+	sync =syncSingleCart;
+	JYASIC_init(info);
+}
+void Mapper211_Init(CartInfo *info) { // Duplicate of mapper 209
+	allowExtendedMirroring =1;
+	sync =syncSingleCart;
+	JYASIC_init(info);
+}
+
+static void sync281 (void) {
+	syncPRG(0x1F, mode[3] <<5);
+	syncCHR(0xFF, mode[3] <<8);
+	syncNT (0xFF, mode[3] <<8);
+}
+void Mapper281_Init(CartInfo *info) { // Multicart
+	allowExtendedMirroring =1;
+	sync =sync281;
+	JYASIC_init(info);
+}
+
+static void sync282 (void) {
+	syncPRG(0x1F, mode[3] <<4 &~0x1F);
+	if (mode[3] &0x20) {
+		syncCHR(0x1FF,                            mode[3] <<6 &0x600);
+		syncNT (0x1FF,                            mode[3] <<6 &0x600);
+	} else {
+		syncCHR(0x0FF, mode[3] <<8 &0x100 | mode[3] <<6 &0x600);
+		syncNT (0x0FF, mode[3] <<8 &0x100 | mode[3] <<6 &0x600);
+	}
+}
+void Mapper282_Init(CartInfo *info) { // Multicart
+	allowExtendedMirroring =1;
+	sync =sync282;
+	JYASIC_init(info);
+}
+
+void sync295 (void) {
+	syncPRG(0x0F, mode[3] <<4);
+	syncCHR(0x7F, mode[3] <<7);
+	syncNT (0x7F, mode[3] <<7);
+}
+void Mapper295_Init(CartInfo *info) { // Multicart
+	allowExtendedMirroring =1;
+	sync =sync295;
+	JYASIC_init(info);
+}
+
+void sync358 (void) {
+	syncPRG(0x1F, mode[3] <<4 &~0x1F);
+	if (mode[3] &0x20) {
+		syncCHR(0x1FF,                            mode[3] <<7 &0x600);
+		syncNT (0x1FF,                            mode[3] <<7 &0x600);
+	} else {
+		syncCHR(0x0FF, mode[3] <<8 &0x100 | mode[3] <<7 &0x600);
+		syncNT (0x0FF, mode[3] <<8 &0x100 | mode[3] <<7 &0x600);
+	}
+}
+void Mapper358_Init(CartInfo *info) { // Multicart
+	allowExtendedMirroring =1;
+	sync =sync358;
+	JYASIC_init(info);
+}
+
+void sync386 (void) {
+	syncPRG(0x1F, mode[3] <<4 &0x20 | mode[3] <<3 &0x40);
+	if (mode[3] &0x20) {
+		syncCHR(0x1FF,                            mode[3] <<7 &0x600);
+		syncNT (0x1FF,                            mode[3] <<7 &0x600);
+	} else {
+		syncCHR(0x0FF, mode[3] <<8 &0x100 | mode[3] <<7 &0x600);
+		syncNT (0x0FF, mode[3] <<8 &0x100 | mode[3] <<7 &0x600);
+	}
+}
+void Mapper386_Init(CartInfo *info) { // Multicart
+	allowExtendedMirroring =1;
+	sync =sync386;
+	JYASIC_init(info);
+}
+	
+void sync387 (void) {
+	syncPRG(0x0F, mode[3] <<3 &0x10 | mode[3] <<2 &0x20);
+	if (mode[3] &0x20) {
+		syncCHR(0x1FF,                            mode[3] <<7 &0x600);
+		syncNT (0x1FF,                            mode[3] <<7 &0x600);
+	} else {
+		syncCHR(0x0FF, mode[3] <<8 &0x100 | mode[3] <<7 &0x600);
+		syncNT (0x0FF, mode[3] <<8 &0x100 | mode[3] <<7 &0x600);
+	}
+}
+void Mapper387_Init(CartInfo *info) { // Multicart
+	allowExtendedMirroring =1;
+	sync =sync387;
+	JYASIC_init(info);
+}
+
+void sync388 (void) {
+	syncPRG(0x1F, mode[3] <<3 &0x60);
+	if (mode[3] &0x20) {
+		syncCHR(0x1FF,                            mode[3] <<8 &0x200);
+		syncNT (0x1FF,                            mode[3] <<8 &0x200);
+	} else {
+		syncCHR(0x0FF, mode[3] <<8 &0x100 | mode[3] <<8 &0x200);
+		syncNT (0x0FF, mode[3] <<8 &0x100 | mode[3] <<8 &0x200);
+	}
+}
+void Mapper388_Init(CartInfo *info) { // Multicart
+	allowExtendedMirroring =0;
+	sync =sync388;
+	JYASIC_init(info);
+}
+
+void sync397 (void) {
+	syncPRG(0x1F, mode[3] <<4 &~0x1F);
+	syncCHR(0x7F, mode[3] <<7);
+	syncNT (0x7F, mode[3] <<7);
+}
+void Mapper397_Init(CartInfo *info) { // Multicart
+	allowExtendedMirroring =1;
+	sync =sync397;
+	JYASIC_init(info);
+}
+
+void sync421 (void) {
+	if (mode[3] &0x04)
+		syncPRG(0x3F, mode[3] <<4 &~0x3F);
+	else
+		syncPRG(0x1F, mode[3] <<4 &~0x1F);
+	syncCHR(0x1FF, mode[3] <<8 &0x300);
+	syncNT (0x1FF, mode[3] <<8 &0x300);
+}
+void Mapper421_Init(CartInfo *info) { // Multicart
+	allowExtendedMirroring =1;
+	sync =sync421;
+	JYASIC_init(info);
+}
diff --git a/src/boards/sc-127.c b/src/boards/sc-127.c
deleted file mode 100644
index 127fcb8..0000000
--- a/src/boards/sc-127.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2009 CaH4e3
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Wario Land II (Kirby hack)
- */
-
-#include "mapinc.h"
-
-static uint8 reg[8], chr[8];
-static uint8 *WRAM = NULL;
-static uint32 WRAMSIZE;
-static uint16 IRQCount, IRQa;
-
-static SFORMAT StateRegs[] =
-{
-	{ reg, 8, "REGS" },
-	{ chr, 8, "CHRS" },
-	{ &IRQCount, 2, "IRQc" },
-	{ &IRQa, 2, "IRQa" },
-	{ 0 }
-};
-
-static void Sync(void) {
-	int i;
-	setprg8r(0x10, 0x6000, 0);
-	setprg8(0x8000, reg[0]);
-	setprg8(0xA000, reg[1]);
-	setprg8(0xC000, reg[2]);
-	setprg8(0xE000, ~0);
-	for (i = 0; i < 8; i++)
-		setchr1(i << 10, chr[i]);
-	setmirror(reg[3] ^ 1);
-}
-
-static DECLFW(UNLSC127Write) {
-	switch (A) {
-	case 0x8000: reg[0] = V; break;
-	case 0x8001: reg[1] = V; break;
-	case 0x8002: reg[2] = V; break;
-	case 0x9000: chr[0] = V; break;
-	case 0x9001: chr[1] = V; break;
-	case 0x9002: chr[2] = V; break;
-	case 0x9003: chr[3] = V; break;
-	case 0x9004: chr[4] = V; break;
-	case 0x9005: chr[5] = V; break;
-	case 0x9006: chr[6] = V; break;
-	case 0x9007: chr[7] = V; break;
-	case 0xC002: IRQa = 0; X6502_IRQEnd(FCEU_IQEXT); break;
-	case 0xC005: IRQCount = V; break;
-	case 0xC003: IRQa = 1; break;
-	case 0xD001: reg[3] = V; break;
-	}
-	Sync();
-}
-
-static DECLFR(UNLSC127ProtRead) {
-	return 0x20;
-}
-
-static void UNLSC127Power(void) {
-	IRQCount = IRQa = 0;
-	Sync();
-	SetReadHandler(0x5800, 0x5800, UNLSC127ProtRead);
-	SetReadHandler(0x6000, 0x7fff, CartBR);
-	SetWriteHandler(0x6000, 0x7fff, CartBW);
-	SetReadHandler(0x8000, 0xFFFF, CartBR);
-	SetWriteHandler(0x8000, 0xFFFF, UNLSC127Write);
-	FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
-}
-
-static void UNLSC127IRQ(void) {
-	if (IRQa) {
-		if(IRQCount > 0)
-			IRQCount--;
-		if (!IRQCount) {
-			X6502_IRQBegin(FCEU_IQEXT);
-			IRQa = 0;
-		}
-	}
-}
-
-static void UNLSC127Reset(void) {
-	IRQCount = IRQa = 0;
-}
-
-static void UNLSC127Close(void) {
-	if (WRAM)
-		FCEU_gfree(WRAM);
-	WRAM = NULL;
-}
-
-static void StateRestore(int version) {
-	Sync();
-}
-
-void UNLSC127_Init(CartInfo *info) {
-	info->Reset = UNLSC127Reset;
-	info->Power = UNLSC127Power;
-	info->Close = UNLSC127Close;
-	GameHBIRQHook = UNLSC127IRQ;
-	GameStateRestore = StateRestore;
-	WRAMSIZE = 8192;
-	WRAM = (uint8*)FCEU_gmalloc(WRAMSIZE);
-	SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
-	AddExState(WRAM, WRAMSIZE, 0, "WRAM");
-	AddExState(&StateRegs, ~0, 0, 0);
-}
diff --git a/src/ines.c b/src/ines.c
index 231b846..316fa5d 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -448,7 +448,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "IREM G-101",                32, Mapper32_Init          )
 	INES_BOARD( "TC0190FMC/TC0350FMR",       33, Mapper33_Init          )
 	INES_BOARD( "IREM I-IM/BNROM",           34, Mapper34_Init          )
-	INES_BOARD( "Wario Land 2",              35, UNLSC127_Init          )
+	INES_BOARD( "EL870914C",                 35, Mapper35_Init          )
 	INES_BOARD( "TXC Policeman",             36, Mapper36_Init          )
 	INES_BOARD( "PAL-ZZ SMB/TETRIS/NWC",     37, Mapper37_Init          )
 	INES_BOARD( "Bit Corp.",                 38, Mapper38_Init          ) /* Crime Busters */
@@ -676,7 +676,8 @@ INES_BOARD_BEGIN()
 
 	INES_BOARD( "8-in-1 JY-119",            267, Mapper267_Init         )
 	INES_BOARD( "Games Xplosion 121-in-1",  269, Mapper269_Init         )
-	INES_BOARD( "HUMMER/JY-052",            281, Mapper281_Init         )
+	INES_BOARD( "YY860417C",                281, Mapper281_Init         )
+	INES_BOARD( "860224C",                  282, Mapper282_Init         )
 	INES_BOARD( "GKCX1",                    288, Mapper288_Init         )
 	INES_BOARD( "MMC3 BMC PIRATE",          294, Bs5652_Init ) /* nesdev redirects this as mapper 134 */
 	INES_BOARD( "TXC 01-22110-000",         297, Mapper297_Init         )
@@ -735,7 +736,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "60311C",                   289, BMC60311C_Init         )
 	INES_BOARD( "NTD-03",                   290, BMCNTD03_Init          )
 	INES_BOARD( "DRAGONFIGHTER",            292, UNLBMW8544_Init        )
-	INES_BOARD( "13in1JY110",               295, BMC13in1JY110_Init     )
+	INES_BOARD( "YY860216C",                295, Mapper295_Init         )
 	INES_BOARD( "TF1201",                   298, UNLTF1201_Init         )
 	INES_BOARD( "11160",                    299, BMC11160_Init          )
 	INES_BOARD( "190in1",                   300, BMC190in1_Init         )
@@ -779,9 +780,15 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "G-146",                    349, BMCG146_Init           )
 	INES_BOARD( "891227",                   350, BMC891227_Init         )
 	INES_BOARD( "3D-BLOCK",                 355, UNL3DBlock_Init        )
+	INES_BOARD( "YY860606C",                358, Mapper358_Init         )
 	INES_BOARD( "N49C-300",                 369, Mapper369_Init         )
+	INES_BOARD( "YY860729C",                386, Mapper386_Init         )
+	INES_BOARD( "YY850735C",                387, Mapper387_Init         )
+	INES_BOARD( "YY850835C",                388, Mapper388_Init         )
 	INES_BOARD( "NC7000M",                  391, NC7000M_Init           )
+	INES_BOARD( "YY850439C",                397, Mapper397_Init         )
 	INES_BOARD( "831019C J-2282",           402, J2282_Init             )
+	INES_BOARD( "SC871115C",                421, Mapper421_Init         )
 	INES_BOARD( "SA-9602B",                 513, SA9602B_Init           )
 	INES_BOARD( "DANCE2000",                518, UNLD2000_Init          )
 	INES_BOARD( "EH8813A",                  519, UNLEH8813A_Init        )
diff --git a/src/ines.h b/src/ines.h
index 99e4756..574a0de 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -76,6 +76,7 @@ void Mapper31_Init(CartInfo *);
 void Mapper32_Init(CartInfo *);
 void Mapper33_Init(CartInfo *);
 void Mapper34_Init(CartInfo *);
+void Mapper35_Init(CartInfo *);
 void Mapper36_Init(CartInfo *);
 void Mapper37_Init(CartInfo *);
 void Mapper38_Init(CartInfo *);
@@ -244,6 +245,8 @@ void Mapper255_Init(CartInfo *);
 
 void GN45_Init(CartInfo *info); /* m361, m366 */
 void Mapper281_Init(CartInfo *);
+void Mapper282_Init(CartInfo *);
+void Mapper295_Init(CartInfo *);
 
 void Bs5652_Init(CartInfo *);
 void NC7000M_Init(CartInfo *);
@@ -257,6 +260,7 @@ void Mapper297_Init(CartInfo *);
 void Mapper353_Init(CartInfo *);
 void Mapper356_Init(CartInfo *);
 void Mapper357_Init(CartInfo *);
+void Mapper358_Init(CartInfo *);
 void Mapper359_Init(CartInfo *);
 void Mapper360_Init(CartInfo *);
 void Mapper369_Init(CartInfo *);
@@ -266,11 +270,16 @@ void Mapper374_Init(CartInfo *);
 void Mapper380_Init(CartInfo *);
 void Mapper381_Init(CartInfo *);
 void Mapper382_Init(CartInfo *);
+void Mapper386_Init(CartInfo *);
+void Mapper387_Init(CartInfo *);
+void Mapper388_Init(CartInfo *);
 void Mapper389_Init(CartInfo *);
 void Mapper390_Init(CartInfo *);
 void Mapper395_Init(CartInfo *);
+void Mapper397_Init(CartInfo *);
 void Mapper401_Init(CartInfo *);
 void Mapper411_Init(CartInfo *);
+void Mapper421_Init(CartInfo *);
 void Mapper422_Init(CartInfo *);
 void Mapper516_Init(CartInfo *);
 void Mapper533_Init(CartInfo *);
diff --git a/src/unif.c b/src/unif.c
index 2d1bfe4..14c3f60 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -421,7 +421,7 @@ static void CheckHashInfo(void) {
 static BMAPPING bmap[] = {
 	{ "11160",                      299, BMC11160_Init,         0 },
 	{ "12-IN-1",                    331, BMC12IN1_Init,         0 },
-	{ "13in1JY110",                 295, BMC13in1JY110_Init,    0 },
+	{ "13in1JY110",                 295, Mapper295_Init,        0 },
 	{ "190in1",                     300, BMC190in1_Init,        0 },
 	{ "22211",                      132, Mapper132_Init,        0 },
 	{ "3D-BLOCK",                   355, UNL3DBlock_Init,       0 },
@@ -510,7 +510,7 @@ static BMAPPING bmap[] = {
 	{ "SA-NROM",                    143, TCA01_Init,            0 },
 	{ "SAROM",                        1, SAROM_Init,            0 },
 	{ "SBROM",                        1, SBROM_Init,            0 },
-	{ "SC-127",                      35, UNLSC127_Init,         0 },
+	{ "SC-127",                      35, Mapper35_Init,         0 },
 	{ "SCROM",                        1, SCROM_Init,            0 },
 	{ "SEROM",                        1, SEROM_Init,            0 },
 	{ "SGROM",                        1, SGROM_Init,            0 },
diff --git a/src/unif.h b/src/unif.h
index 0dbd4ab..4f5517e 100644
--- a/src/unif.h
+++ b/src/unif.h
@@ -25,7 +25,6 @@ void AC08_Init(CartInfo *info);
 void ANROM_Init(CartInfo *info);
 void BMC11160_Init(CartInfo *info);
 void BMC12IN1_Init(CartInfo *info);
-void BMC13in1JY110_Init(CartInfo *info);
 void BMC190in1_Init(CartInfo *info);
 void BMC411120C_Init(CartInfo *info);
 void BMC64in1nr_Init(CartInfo *info);
@@ -135,7 +134,6 @@ void UNLN625092_Init(CartInfo *info);
 void UNLMaliSB_Init(CartInfo *info);
 void UNLOneBus_Init(CartInfo *info);
 void UNLPEC586Init(CartInfo *info);
-void UNLSC127_Init(CartInfo *info);
 void UNLSHeroes_Init(CartInfo *info);
 void UNLSL12_Init(CartInfo *info);
 void UNLSL1632_Init(CartInfo *info);

From d14623a9662378e65a70d5f518c9b4f4ec014817 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Thu, 8 Apr 2021 17:27:41 +0200
Subject: [PATCH 092/295] readALU_DIP already returned a value in every case,
 but LGTM apparently did not get it.

---
 src/boards/jyasic.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/boards/jyasic.c b/src/boards/jyasic.c
index 174bcc4..eb88070 100644
--- a/src/boards/jyasic.c
+++ b/src/boards/jyasic.c
@@ -187,8 +187,9 @@ static DECLFR(readALU_DIP) {
 		case 1: return (mul[0] *mul[1]) >>8;
 		case 2:	return adder;
 		case 3:	return test;
-	} else // all others
-		return X.DB;
+	}
+	// all others
+	return X.DB;
 }
 
 static DECLFW(writeALU) {

From 960528aa153ce4a67a35c58de92a622b13e57ef4 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 8 Apr 2021 17:46:51 +0200
Subject: [PATCH 093/295] Style nits, C89 build fixes

---
 src/boards/jyasic.c | 616 +++++++++++++++++++++++++++-----------------
 1 file changed, 381 insertions(+), 235 deletions(-)

diff --git a/src/boards/jyasic.c b/src/boards/jyasic.c
index eb88070..239d084 100644
--- a/src/boards/jyasic.c
+++ b/src/boards/jyasic.c
@@ -45,7 +45,7 @@ static uint8	adder;
 static uint8	test;
 static uint8    dipSwitch;
 
-static writefunc cpuWriteHandlers[0x10000]; // Actual write handlers for CPU write trapping as a method fo IRQ clocking
+static writefunc cpuWriteHandlers[0x10000]; /* Actual write handlers for CPU write trapping as a method fo IRQ clocking */
 
 static SFORMAT JYASIC_stateRegs[] = {
 	{ &irqControl,   1,                  "IRQM" },
@@ -96,50 +96,69 @@ static void syncPRG (int AND, int OR) {
 			prg6000 =rev(prg[3]);
 			break;
 	}
-	if (mode[0] &0x80) // Map ROM
+	if (mode[0] &0x80) /* Map ROM */
 		setprg8 (0x6000, prg6000 &AND |OR);
 	else
-	if (WRAMSIZE)   // Otherwise map WRAM if it exists
+	if (WRAMSIZE)   /* Otherwise map WRAM if it exists */
 		setprg8r(0x10, 0x6000, 0);
 }
 
-static void syncCHR (int AND, int OR) {
-	if (mode[3] &0x80 && (mode[0] &0x18) ==0x08) // MMC4 mode[0] with 4 KiB CHR mode[0]
-		for (int chrBank =0; chrBank <8; chrBank +=4) setchr4(0x400 *chrBank, chr[latch[chrBank /4]&2 | chrBank] &AND >>2 | OR >>2);
-	else
-	switch(mode[0] &0x18) {
-		case 0x00: // 8 KiB CHR mode[0]
-			setchr8(chr[0] &AND >>3 | OR >>3);
-			break;
-		case 0x08: // 4 KiB CHR mode[0]
-			for (int chrBank =0; chrBank <8; chrBank +=4) setchr4(0x400 *chrBank, chr[chrBank] &AND >>2 | OR >>2);
-			break;
-		case 0x10:
-			for (int chrBank =0; chrBank <8; chrBank +=2) setchr2(0x400 *chrBank, chr[chrBank] &AND >>1 | OR >>1);
-			break;
-		case 0x18:
-			for (int chrBank =0; chrBank <8; chrBank +=1) setchr1(0x400 *chrBank, chr[chrBank] &AND     | OR    );
-			break;
-	}
-	PPUCHRRAM =mode[2] &0x40? 0xFF: 0x00; // Write-protect or write-enable CHR-RAM
+static void syncCHR (int AND, int OR)
+{
+   if (mode[3] &0x80 && (mode[0] &0x18) ==0x08) /* MMC4 mode[0] with 4 KiB CHR mode[0] */
+      for (int chrBank =0; chrBank <8; chrBank +=4) setchr4(0x400 *chrBank, chr[latch[chrBank /4]&2 | chrBank] &AND >>2 | OR >>2);
+   else
+      switch(mode[0] &0x18) {
+         case 0x00: /* 8 KiB CHR mode[0] */
+            setchr8(chr[0] &AND >>3 | OR >>3);
+            break;
+         case 0x08: /* 4 KiB CHR mode[0] */
+            for (int chrBank =0; chrBank <8; chrBank +=4) setchr4(0x400 *chrBank, chr[chrBank] &AND >>2 | OR >>2);
+            break;
+         case 0x10:
+            for (int chrBank =0; chrBank <8; chrBank +=2) setchr2(0x400 *chrBank, chr[chrBank] &AND >>1 | OR >>1);
+            break;
+         case 0x18:
+            for (int chrBank =0; chrBank <8; chrBank +=1) setchr1(0x400 *chrBank, chr[chrBank] &AND     | OR    );
+            break;
+      }
+   PPUCHRRAM =mode[2] &0x40? 0xFF: 0x00; /* Write-protect or write-enable CHR-RAM */
 }
 
-static void syncNT (int AND, int OR) {
-	if (mode[0] &0x20 || mode[1] &0x08) { // ROM nametables or extended mirroring
-		// First, set normal CIRAM pages using extended registers ...
-		setmirrorw(nt[0] &1, nt[1] &1, nt[2] &1, nt[3] &1);
-		
-		if (mode[0] &0x20) for (int ntBank =0; ntBank <4; ntBank++) { // Then replace with ROM nametables if such are generally enabled
-			int vromHere =(nt[ntBank] &0x80) ^(mode[2] &0x80) |(mode[0] &0x40); // ROM nametables are used either when globally enabled via D000.6 or per-bank via B00x.7 vs. D002.7
-			if (vromHere) setntamem(CHRptr[0] +0x400*((nt[ntBank] &AND | OR) & CHRmask1[0]), 0, ntBank);
-		}
-	} else
-	switch (mode[1] &0x03) { // Regularly mirrored CIRAM
-		case 0:	setmirror(MI_V); break;
-		case 1:	setmirror(MI_H); break;
-		case 2:	setmirror(MI_0); break;
-		case 3:	setmirror(MI_1); break;
-	}
+static void syncNT (int AND, int OR)
+{
+	if (mode[0] &0x20 || mode[1] &0x08)
+   {
+      /* ROM nametables or extended mirroring */
+      /* First, set normal CIRAM pages using extended registers ... */
+      setmirrorw(nt[0] &1, nt[1] &1, nt[2] &1, nt[3] &1);
+
+      if (mode[0] &0x20) for (int ntBank =0; ntBank <4; ntBank++)
+      {
+         /* Then replace with ROM nametables if such are generally enabled */
+         int vromHere =(nt[ntBank] &0x80) ^(mode[2] &0x80) |(mode[0] &0x40);
+         /* ROM nametables are used either when globally enabled via D000.6 or per-bank via B00x.7 vs. D002.7 */
+         if (vromHere)
+            setntamem(CHRptr[0] +0x400*((nt[ntBank] &AND | OR) & CHRmask1[0]), 0, ntBank);
+      }
+   }
+   else
+      switch (mode[1] &0x03)
+      {
+         /* Regularly mirrored CIRAM */
+         case 0:
+            setmirror(MI_V);
+            break;
+         case 1:
+            setmirror(MI_H);
+            break;
+         case 2:
+            setmirror(MI_0);
+            break;
+         case 3:
+            setmirror(MI_1);
+            break;
+      }
 }
 
 static void clockIRQ (void) {
@@ -156,51 +175,87 @@ static void clockIRQ (void) {
 	}
 }
 
-static DECLFW(trapCPUWrite) {
-	if ((irqControl &0x03) ==0x03) clockIRQ(); // Clock IRQ counter on CPU writes
+static DECLFW(trapCPUWrite)
+{
+	if ((irqControl &0x03) ==0x03)
+      clockIRQ(); /* Clock IRQ counter on CPU writes */
 	cpuWriteHandlers[A](A, V);
 }
 
-static void FP_FASTAPASS(1) trapPPUAddressChange (uint32 A) {
-	if ((irqControl &0x03) ==0x02 && lastPPUAddress !=A) for (int i =0; i <2; i++) clockIRQ(); // Clock IRQ counter on PPU "reads"
-	if (mode[3] &0x80 && (mode[0] &0x18) ==0x08 && ((A &0x2FF0) ==0xFD0 || (A &0x2FF0) ==0xFE0)) { // If MMC4 mode[0] is enabled, and CHR mode[0] is 4 KiB, and tile FD or FE is being fetched ...
-		latch[A >>12 &1] =(A >>10 &4) | (A >>4 &2); // ... switch the left or right pattern table's latch to 0 (FD) or 2 (FE), being used as an offset for the CHR register index.
-		sync();
-	}
-	lastPPUAddress =A;
+static void FP_FASTAPASS(1) trapPPUAddressChange (uint32 A)
+{
+   if ((irqControl &0x03) ==0x02 && lastPPUAddress !=A)
+   {
+      int i;
+      for (i =0; i <2; i++)
+         clockIRQ(); /* Clock IRQ counter on PPU "reads" */
+   }
+   if (mode[3] &0x80 && (mode[0] &0x18) ==0x08 && ((A &0x2FF0) ==0xFD0 || (A &0x2FF0) ==0xFE0))
+   {
+      /* If MMC4 mode[0] is enabled, and CHR mode[0] is 4 KiB, and tile FD or FE is being fetched ... */
+      latch[A >>12 &1] =(A >>10 &4) | (A >>4 &2); /* ... switch the left or right pattern table's latch to 0 (FD) or 2 (FE), being used as an offset for the CHR register index. */
+      sync();
+   }
+   lastPPUAddress =A;
 }
 
-static void ppuScanline(void) {
-	if ((irqControl &0x03) ==0x01) for (int i =0; i <8; i++) clockIRQ(); // Clock IRQ counter on A12 rises (eight per scanline). This should be done in trapPPUAddressChange, but would require more accurate PPU emulation for that.
+static void ppuScanline(void)
+{
+	if ((irqControl &0x03) ==0x01)
+   {
+      int i;
+      for (i =0; i <8; i++)
+         clockIRQ(); /* Clock IRQ counter on A12 rises (eight per scanline). This should be done in trapPPUAddressChange, but would require more accurate PPU emulation for that. */
+   }
 }
 
-void FP_FASTAPASS(1) cpuCycle(int a) {
-	if ((irqControl &0x03) ==0x00) while (a--) clockIRQ(); // Clock IRQ counter on M2 cycles
+void FP_FASTAPASS(1) cpuCycle(int a)
+{
+   if ((irqControl &0x03) ==0x00)
+      while (a--)
+         clockIRQ(); /* Clock IRQ counter on M2 cycles */
 }
 
-static DECLFR(readALU_DIP) {
-	if ((A &0x3FF) ==0 && A !=0x5800) // 5000, 5400, 5C00: read solder pad setting
-		return dipSwitch | X.DB &0x3F;
-	else
-	if (A &0x800) switch (A &3) { // 5800-5FFF: read ALU
-		case 0:	return (mul[0] *mul[1]) &0xFF;
-		case 1: return (mul[0] *mul[1]) >>8;
-		case 2:	return adder;
-		case 3:	return test;
-	}
-	// all others
-	return X.DB;
+static DECLFR(readALU_DIP)
+{
+   if ((A &0x3FF) ==0 && A !=0x5800) /* 5000, 5400, 5C00: read solder pad setting */
+      return dipSwitch | X.DB &0x3F;
+
+   if (A &0x800)
+      switch (A &3)
+      {
+         /* 5800-5FFF: read ALU */
+         case 0:
+            return (mul[0] *mul[1]) &0xFF;
+         case 1:
+            return (mul[0] *mul[1]) >>8;
+         case 2:
+            return adder;
+         case 3:
+            return test;
+      }
+   /* all others */
+   return X.DB;
 }
 
-static DECLFW(writeALU) {
-	switch (A &3) {
-		case 0:	mul[0] =V; break;
-		case 1:	mul[1] =V; break;
-		case 2:	adder +=V; break;
-		case 3:	test =V;
-			adder =0;
-			break;
-	}
+static DECLFW(writeALU)
+{
+	switch (A &3)
+   {
+      case 0:
+         mul[0] =V;
+         break;
+      case 1:
+         mul[1] =V;
+         break;
+      case 2:
+         adder +=V;
+         break;
+      case 3:
+         test  = V;
+         adder = 0;
+         break;
+   }
 }
 
 static DECLFW(writePRG) {
@@ -226,258 +281,349 @@ static DECLFW(writeNT) {
 	sync();
 }
 
-static DECLFW(writeIRQ) {
-	switch (A &7) {
-		case 0:	irqEnabled =!!(V &1);
-			if (!irqEnabled) {
-				irqPrescaler =0;
-				X6502_IRQEnd(FCEU_IQEXT);
-			}
-			break;
-		case 1: irqControl =V;
-			break;
-		case 2:	irqEnabled =0;
-			irqPrescaler =0;
-			X6502_IRQEnd(FCEU_IQEXT);
-			break;
-		case 3:	irqEnabled =1;
-			break;
-		case 4:	irqPrescaler =V ^irqXor;
-			break;
-		case 5:	irqCounter =V ^irqXor;
-			break;
-		case 6:	irqXor =V;
-			break;
-	}
+static DECLFW(writeIRQ)
+{
+	switch (A &7)
+   {
+      case 0:
+         irqEnabled =!!(V &1);
+         if (!irqEnabled)
+         {
+            irqPrescaler =0;
+            X6502_IRQEnd(FCEU_IQEXT);
+         }
+         break;
+      case 1:
+         irqControl =V;
+         break;
+      case 2:
+         irqEnabled =0;
+         irqPrescaler =0;
+         X6502_IRQEnd(FCEU_IQEXT);
+         break;
+      case 3:
+         irqEnabled =1;
+         break;
+      case 4:
+         irqPrescaler =V ^irqXor;
+         break;
+      case 5:
+         irqCounter =V ^irqXor;
+         break;
+      case 6:
+         irqXor =V;
+         break;
+   }
 }
 
-static DECLFW(writeMode) {
-	switch (A &3) {
-		case 0:	mode[0] =V;
-			if (!allowExtendedMirroring) mode[0] &=~0x20;
-			break;
-		case 1:	mode[1] =V;
-			if (!allowExtendedMirroring) mode[1] &=~0x08;
-			break;
-		case 2: mode[2] =V;
-			break;
-		case 3:	mode[3] =V;
-			break;
-	}
+static DECLFW(writeMode)
+{
+	switch (A &3)
+   {
+      case 0:
+         mode[0] =V;
+         if (!allowExtendedMirroring)
+            mode[0] &=~0x20;
+         break;
+      case 1:
+         mode[1] =V;
+         if (!allowExtendedMirroring)
+            mode[1] &=~0x08;
+         break;
+      case 2:
+         mode[2] =V;
+         break;
+      case 3:
+         mode[3] =V;
+         break;
+   }
 	sync();
 }
 
-static void JYASIC_power(void) {
-	SetWriteHandler(0x5000, 0x5FFF, writeALU);
-	SetWriteHandler(0x6000, 0x7fff, CartBW);
-	SetWriteHandler(0x8000, 0x87FF, writePRG);     // 8800-8FFF ignored
-	SetWriteHandler(0x9000, 0x97FF, writeCHRLow);  // 9800-9FFF ignored
-	SetWriteHandler(0xA000, 0xA7FF, writeCHRHigh); // A800-AFFF ignored
-	SetWriteHandler(0xB000, 0xB7FF, writeNT);      // B800-BFFF ignored
-	SetWriteHandler(0xC000, 0xCFFF, writeIRQ);
-	SetWriteHandler(0xD000, 0xD7FF, writeMode);    // D800-DFFF ignored
-	
-	for (unsigned int i =0; i <0x10000; i++) cpuWriteHandlers[i] =GetWriteHandler(i);
-	SetWriteHandler(0x0000, 0xFFFF, trapCPUWrite); // Trap all CPU writes for IRQ clocking purposes
+static void JYASIC_power(void)
+{
+   unsigned int i;
 
-	SetReadHandler(0x5000, 0x5FFF, readALU_DIP);
-	SetReadHandler(0x6000, 0xFFFF, CartBR);
+   SetWriteHandler(0x5000, 0x5FFF, writeALU);
+   SetWriteHandler(0x6000, 0x7fff, CartBW);
+   SetWriteHandler(0x8000, 0x87FF, writePRG);     /* 8800-8FFF ignored */
+   SetWriteHandler(0x9000, 0x97FF, writeCHRLow);  /* 9800-9FFF ignored */
+   SetWriteHandler(0xA000, 0xA7FF, writeCHRHigh); /* A800-AFFF ignored */
+   SetWriteHandler(0xB000, 0xB7FF, writeNT);      /* B800-BFFF ignored */
+   SetWriteHandler(0xC000, 0xCFFF, writeIRQ);
+   SetWriteHandler(0xD000, 0xD7FF, writeMode);    /* D800-DFFF ignored */
 
-	mul[0] = mul[1] = adder = test = dipSwitch = 0;
-	mode[0] = mode[1] = mode[2] = mode[3] =0;
-	irqControl =irqEnabled = irqPrescaler =irqCounter = irqXor = lastPPUAddress = 0;
-	memset(prg, 0, sizeof(prg));
-	memset(chr, 0, sizeof(chr));
-	memset(nt, 0, sizeof(nt));
-	latch[0] =0;
-	latch[1] =4;
-	
-	sync();
+   for (i =0; i <0x10000; i++) cpuWriteHandlers[i] =GetWriteHandler(i);
+   SetWriteHandler(0x0000, 0xFFFF, trapCPUWrite); /* Trap all CPU writes for IRQ clocking purposes */
+
+   SetReadHandler(0x5000, 0x5FFF, readALU_DIP);
+   SetReadHandler(0x6000, 0xFFFF, CartBR);
+
+   mul[0]     = mul[1]    = adder   = test    = dipSwitch = 0;
+   mode[0]    = mode[1]   = mode[2] = mode[3] = 0;
+   irqControl =irqEnabled = irqPrescaler =irqCounter = irqXor = lastPPUAddress = 0;
+   memset(prg, 0, sizeof(prg));
+   memset(chr, 0, sizeof(chr));
+   memset(nt, 0, sizeof(nt));
+   latch[0] =0;
+   latch[1] =4;
+
+   sync();
 }
 
-static void JYASIC_reset (void) {
+static void JYASIC_reset (void)
+{
 	dipSwitch = (dipSwitch +0x40) &0xC0;
 }
 
-static void JYASIC_restore (int version) {
+static void JYASIC_restore (int version)
+{
 	sync();
 }
 
-void JYASIC_init (CartInfo *info) {
-	info->Reset = JYASIC_reset;
-	info->Power = JYASIC_power;
-	PPU_hook = trapPPUAddressChange;
-	MapIRQHook = cpuCycle;
-	GameHBIRQHook2 = ppuScanline;
-	AddExState(JYASIC_stateRegs, ~0, 0, 0);
-	GameStateRestore = JYASIC_restore;
+void JYASIC_init (CartInfo *info)
+{
+   info->Reset = JYASIC_reset;
+   info->Power = JYASIC_power;
+   PPU_hook = trapPPUAddressChange;
+   MapIRQHook = cpuCycle;
+   GameHBIRQHook2 = ppuScanline;
+   AddExState(JYASIC_stateRegs, ~0, 0, 0);
+   GameStateRestore = JYASIC_restore;
 
-	// WRAM is present only in iNES mapper 35, or in mappers with numbers above 255 that require NES 2.0, which explicitly denotes WRAM size
-	if (info->iNES2)
-		WRAMSIZE =info->PRGRamSize + info->PRGRamSaveSize;
-	else
-		WRAMSIZE =info->mapper ==35? 8192: 0;
+   /* WRAM is present only in iNES mapper 35, or in mappers with numbers above 255 that require NES 2.0, which explicitly denotes WRAM size */
+   if (info->iNES2)
+      WRAMSIZE =info->PRGRamSize + info->PRGRamSaveSize;
+   else
+      WRAMSIZE =info->mapper ==35? 8192: 0;
 
-	if (WRAMSIZE) {
-		WRAM = (uint8*)FCEU_gmalloc(WRAMSIZE);
-		SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
-		FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
-	}
+   if (WRAMSIZE)
+   {
+      WRAM = (uint8*)FCEU_gmalloc(WRAMSIZE);
+      SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
+      FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
+   }
 }
 
-static void syncSingleCart (void) {
-	syncPRG(0x3F, mode[3] <<5 &~0x3F);
-	if (mode[3] &0x20) {
-		syncCHR(0x1FF,                        mode[3] <<6 &0x600);
-		syncNT (0x1FF,                        mode[3] <<6 &0x600);
-	} else {
-		syncCHR(0x0FF, mode[3] <<8 &0x100 | mode[3] <<6 &0x600);
-		syncNT (0x0FF, mode[3] <<8 &0x100 | mode[3] <<6 &0x600);
-	}
+static void syncSingleCart (void)
+{
+   syncPRG(0x3F, mode[3] <<5 &~0x3F);
+   if (mode[3] &0x20)
+   {
+      syncCHR(0x1FF,                        mode[3] <<6 &0x600);
+      syncNT (0x1FF,                        mode[3] <<6 &0x600);
+   }
+   else
+   {
+      syncCHR(0x0FF, mode[3] <<8 &0x100 | mode[3] <<6 &0x600);
+      syncNT (0x0FF, mode[3] <<8 &0x100 | mode[3] <<6 &0x600);
+   }
 }
-void Mapper35_Init(CartInfo *info) { // Basically mapper 90/209/211 with WRAM
+void Mapper35_Init(CartInfo *info)
+{
+   /* Basically mapper 90/209/211 with WRAM */
 	allowExtendedMirroring =1;
 	sync =syncSingleCart;
 	JYASIC_init(info);
 }
-void Mapper90_Init(CartInfo *info) { // Single cart, extended mirroring and ROM nametables disabled
+void Mapper90_Init(CartInfo *info)
+{
+   /* Single cart, extended mirroring and ROM nametables disabled */
 	allowExtendedMirroring =0;
 	sync =syncSingleCart;
 	JYASIC_init(info);
 }
-void Mapper209_Init(CartInfo *info) { // Single cart, extended mirroring and ROM nametables enabled
-	allowExtendedMirroring =1;
-	sync =syncSingleCart;
-	JYASIC_init(info);
-}
-void Mapper211_Init(CartInfo *info) { // Duplicate of mapper 209
+
+void Mapper209_Init(CartInfo *info)
+{
+   /* Single cart, extended mirroring and ROM nametables enabled */
 	allowExtendedMirroring =1;
 	sync =syncSingleCart;
 	JYASIC_init(info);
 }
 
-static void sync281 (void) {
-	syncPRG(0x1F, mode[3] <<5);
-	syncCHR(0xFF, mode[3] <<8);
-	syncNT (0xFF, mode[3] <<8);
+void Mapper211_Init(CartInfo *info)
+{
+   /* Duplicate of mapper 209 */
+	allowExtendedMirroring =1;
+	sync =syncSingleCart;
+	JYASIC_init(info);
 }
-void Mapper281_Init(CartInfo *info) { // Multicart
+
+static void sync281 (void)
+{
+   syncPRG(0x1F, mode[3] <<5);
+   syncCHR(0xFF, mode[3] <<8);
+   syncNT (0xFF, mode[3] <<8);
+}
+
+void Mapper281_Init(CartInfo *info)
+{
+   /* Multicart */
 	allowExtendedMirroring =1;
 	sync =sync281;
 	JYASIC_init(info);
 }
 
-static void sync282 (void) {
+static void sync282 (void)
+{
 	syncPRG(0x1F, mode[3] <<4 &~0x1F);
-	if (mode[3] &0x20) {
+	if (mode[3] &0x20)
+   {
 		syncCHR(0x1FF,                            mode[3] <<6 &0x600);
 		syncNT (0x1FF,                            mode[3] <<6 &0x600);
-	} else {
+	}
+   else
+   {
 		syncCHR(0x0FF, mode[3] <<8 &0x100 | mode[3] <<6 &0x600);
 		syncNT (0x0FF, mode[3] <<8 &0x100 | mode[3] <<6 &0x600);
 	}
 }
-void Mapper282_Init(CartInfo *info) { // Multicart
+
+void Mapper282_Init(CartInfo *info)
+{
+   /* Multicart */
 	allowExtendedMirroring =1;
 	sync =sync282;
 	JYASIC_init(info);
 }
 
-void sync295 (void) {
-	syncPRG(0x0F, mode[3] <<4);
-	syncCHR(0x7F, mode[3] <<7);
-	syncNT (0x7F, mode[3] <<7);
+void sync295 (void)
+{
+   syncPRG(0x0F, mode[3] <<4);
+   syncCHR(0x7F, mode[3] <<7);
+   syncNT (0x7F, mode[3] <<7);
 }
-void Mapper295_Init(CartInfo *info) { // Multicart
+
+void Mapper295_Init(CartInfo *info)
+{
+   /* Multicart */
 	allowExtendedMirroring =1;
 	sync =sync295;
 	JYASIC_init(info);
 }
 
-void sync358 (void) {
-	syncPRG(0x1F, mode[3] <<4 &~0x1F);
-	if (mode[3] &0x20) {
-		syncCHR(0x1FF,                            mode[3] <<7 &0x600);
-		syncNT (0x1FF,                            mode[3] <<7 &0x600);
-	} else {
-		syncCHR(0x0FF, mode[3] <<8 &0x100 | mode[3] <<7 &0x600);
-		syncNT (0x0FF, mode[3] <<8 &0x100 | mode[3] <<7 &0x600);
-	}
+void sync358 (void)
+{
+   syncPRG(0x1F, mode[3] <<4 &~0x1F);
+   if (mode[3] &0x20)
+   {
+      syncCHR(0x1FF, mode[3] <<7 &0x600);
+      syncNT (0x1FF, mode[3] <<7 &0x600);
+   }
+   else
+   {
+      syncCHR(0x0FF, mode[3] <<8 &0x100 | mode[3] <<7 &0x600);
+      syncNT (0x0FF, mode[3] <<8 &0x100 | mode[3] <<7 &0x600);
+   }
 }
-void Mapper358_Init(CartInfo *info) { // Multicart
+
+void Mapper358_Init(CartInfo *info)
+{
+   /* Multicart */
 	allowExtendedMirroring =1;
 	sync =sync358;
 	JYASIC_init(info);
 }
 
-void sync386 (void) {
-	syncPRG(0x1F, mode[3] <<4 &0x20 | mode[3] <<3 &0x40);
-	if (mode[3] &0x20) {
-		syncCHR(0x1FF,                            mode[3] <<7 &0x600);
-		syncNT (0x1FF,                            mode[3] <<7 &0x600);
-	} else {
-		syncCHR(0x0FF, mode[3] <<8 &0x100 | mode[3] <<7 &0x600);
-		syncNT (0x0FF, mode[3] <<8 &0x100 | mode[3] <<7 &0x600);
-	}
+void sync386 (void)
+{
+   syncPRG(0x1F, mode[3] <<4 &0x20 | mode[3] <<3 &0x40);
+   if (mode[3] &0x20)
+   {
+      syncCHR(0x1FF, mode[3] <<7 &0x600);
+      syncNT (0x1FF, mode[3] <<7 &0x600);
+   }
+   else
+   {
+      syncCHR(0x0FF, mode[3] <<8 &0x100 | mode[3] <<7 &0x600);
+      syncNT (0x0FF, mode[3] <<8 &0x100 | mode[3] <<7 &0x600);
+   }
 }
-void Mapper386_Init(CartInfo *info) { // Multicart
+
+void Mapper386_Init(CartInfo *info)
+{
+   /* Multicart */
 	allowExtendedMirroring =1;
 	sync =sync386;
 	JYASIC_init(info);
 }
 	
-void sync387 (void) {
+void sync387(void)
+{
 	syncPRG(0x0F, mode[3] <<3 &0x10 | mode[3] <<2 &0x20);
-	if (mode[3] &0x20) {
-		syncCHR(0x1FF,                            mode[3] <<7 &0x600);
-		syncNT (0x1FF,                            mode[3] <<7 &0x600);
-	} else {
+	if (mode[3] &0x20)
+   {
+		syncCHR(0x1FF, mode[3] <<7 &0x600);
+		syncNT (0x1FF, mode[3] <<7 &0x600);
+	}
+   else
+   {
 		syncCHR(0x0FF, mode[3] <<8 &0x100 | mode[3] <<7 &0x600);
 		syncNT (0x0FF, mode[3] <<8 &0x100 | mode[3] <<7 &0x600);
 	}
 }
-void Mapper387_Init(CartInfo *info) { // Multicart
-	allowExtendedMirroring =1;
-	sync =sync387;
-	JYASIC_init(info);
+
+void Mapper387_Init(CartInfo *info)
+{
+   /* Multicart */
+   allowExtendedMirroring =1;
+   sync =sync387;
+   JYASIC_init(info);
 }
 
-void sync388 (void) {
-	syncPRG(0x1F, mode[3] <<3 &0x60);
-	if (mode[3] &0x20) {
-		syncCHR(0x1FF,                            mode[3] <<8 &0x200);
-		syncNT (0x1FF,                            mode[3] <<8 &0x200);
-	} else {
-		syncCHR(0x0FF, mode[3] <<8 &0x100 | mode[3] <<8 &0x200);
-		syncNT (0x0FF, mode[3] <<8 &0x100 | mode[3] <<8 &0x200);
-	}
+void sync388 (void)
+{
+   syncPRG(0x1F, mode[3] <<3 &0x60);
+
+   if (mode[3] &0x20)
+   {
+      syncCHR(0x1FF, mode[3] <<8 &0x200);
+      syncNT (0x1FF, mode[3] <<8 &0x200);
+   }
+   else
+   {
+      syncCHR(0x0FF, mode[3] <<8 &0x100 | mode[3] <<8 &0x200);
+      syncNT (0x0FF, mode[3] <<8 &0x100 | mode[3] <<8 &0x200);
+   }
 }
-void Mapper388_Init(CartInfo *info) { // Multicart
+
+void Mapper388_Init(CartInfo *info)
+{
+   /* Multicart */
 	allowExtendedMirroring =0;
 	sync =sync388;
 	JYASIC_init(info);
 }
 
-void sync397 (void) {
+void sync397 (void)
+{
 	syncPRG(0x1F, mode[3] <<4 &~0x1F);
 	syncCHR(0x7F, mode[3] <<7);
 	syncNT (0x7F, mode[3] <<7);
 }
-void Mapper397_Init(CartInfo *info) { // Multicart
-	allowExtendedMirroring =1;
-	sync =sync397;
-	JYASIC_init(info);
+
+void Mapper397_Init(CartInfo *info)
+{
+   /* Multicart */
+   allowExtendedMirroring =1;
+   sync =sync397;
+   JYASIC_init(info);
 }
 
-void sync421 (void) {
-	if (mode[3] &0x04)
-		syncPRG(0x3F, mode[3] <<4 &~0x3F);
-	else
-		syncPRG(0x1F, mode[3] <<4 &~0x1F);
-	syncCHR(0x1FF, mode[3] <<8 &0x300);
-	syncNT (0x1FF, mode[3] <<8 &0x300);
+void sync421 (void)
+{
+   if (mode[3] &0x04)
+      syncPRG(0x3F, mode[3] <<4 &~0x3F);
+   else
+      syncPRG(0x1F, mode[3] <<4 &~0x1F);
+   syncCHR(0x1FF, mode[3] <<8 &0x300);
+   syncNT (0x1FF, mode[3] <<8 &0x300);
 }
-void Mapper421_Init(CartInfo *info) { // Multicart
+
+void Mapper421_Init(CartInfo *info)
+{
+   /* Multicart */
 	allowExtendedMirroring =1;
 	sync =sync421;
 	JYASIC_init(info);

From cb9ea8f94ebf6c662152f6c1ea110612d3530da8 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 8 Apr 2021 17:50:56 +0200
Subject: [PATCH 094/295] More C89 build fixes - for loop initial declarations

---
 src/boards/jyasic.c | 139 +++++++++++++++++++++++++++-----------------
 1 file changed, 86 insertions(+), 53 deletions(-)

diff --git a/src/boards/jyasic.c b/src/boards/jyasic.c
index 239d084..353b54c 100644
--- a/src/boards/jyasic.c
+++ b/src/boards/jyasic.c
@@ -68,61 +68,81 @@ static SFORMAT JYASIC_stateRegs[] = {
 	{ 0 }
 };
 
-static uint8 rev (uint8_t val) {
+static uint8 rev (uint8_t val)
+{
 	return ((val <<6) &0x40) | ((val <<4) &0x20) | ((val <<2) &0x10) | (val &0x08) | ((val >>2) &0x04) | ((val >>4) &0x02) | ((val >>6) &0x01);
 }
 
-static void syncPRG (int AND, int OR) {
+static void syncPRG (int AND, int OR)
+{
 	uint8_t prgLast =mode[0] &0x04? prg[3]: 0xFF;
 	uint8_t prg6000 =0;
-	switch (mode[0] &0x03) {
-		case 0:	setprg32(0x8000, prgLast &AND >>2 |OR >>2);
-			prg6000 =prg[3] <<2 |3;
-			break;
-		case 1: setprg16(0x8000, prg[1]  &AND >>1 |OR >>1);
-			setprg16(0xC000, prgLast &AND >>1 |OR >>1);
-			prg6000 =prg[3] <<1 |1;
-			break;
-		case 2: setprg8(0x8000, prg[0] &AND |OR);
-			setprg8(0xA000, prg[1] &AND |OR);
-			setprg8(0xC000, prg[2] &AND |OR);
-			setprg8(0xE000, prgLast   &AND |OR);
-			prg6000 =prg[3];
-			break;
-		case 3: setprg8(0x8000, rev(prg[0]) &AND |OR);
-			setprg8(0xA000, rev(prg[1]) &AND |OR);
-			setprg8(0xC000, rev(prg[2]) &AND |OR);
-			setprg8(0xE000, rev(  prgLast) &AND |OR);
-			prg6000 =rev(prg[3]);
-			break;
-	}
+	switch (mode[0] &0x03)
+   {
+      case 0:
+         setprg32(0x8000, prgLast &AND >>2 |OR >>2);
+         prg6000 =prg[3] <<2 |3;
+         break;
+      case 1:
+         setprg16(0x8000, prg[1]  &AND >>1 |OR >>1);
+         setprg16(0xC000, prgLast &AND >>1 |OR >>1);
+         prg6000 =prg[3] <<1 |1;
+         break;
+      case 2:
+         setprg8(0x8000, prg[0] &AND |OR);
+         setprg8(0xA000, prg[1] &AND |OR);
+         setprg8(0xC000, prg[2] &AND |OR);
+         setprg8(0xE000, prgLast   &AND |OR);
+         prg6000 =prg[3];
+         break;
+      case 3:
+         setprg8(0x8000, rev(prg[0]) &AND |OR);
+         setprg8(0xA000, rev(prg[1]) &AND |OR);
+         setprg8(0xC000, rev(prg[2]) &AND |OR);
+         setprg8(0xE000, rev(  prgLast) &AND |OR);
+         prg6000 =rev(prg[3]);
+         break;
+   }
 	if (mode[0] &0x80) /* Map ROM */
 		setprg8 (0x6000, prg6000 &AND |OR);
 	else
-	if (WRAMSIZE)   /* Otherwise map WRAM if it exists */
-		setprg8r(0x10, 0x6000, 0);
+      if (WRAMSIZE)   /* Otherwise map WRAM if it exists */
+         setprg8r(0x10, 0x6000, 0);
 }
 
 static void syncCHR (int AND, int OR)
 {
-   if (mode[3] &0x80 && (mode[0] &0x18) ==0x08) /* MMC4 mode[0] with 4 KiB CHR mode[0] */
-      for (int chrBank =0; chrBank <8; chrBank +=4) setchr4(0x400 *chrBank, chr[latch[chrBank /4]&2 | chrBank] &AND >>2 | OR >>2);
+   /* MMC4 mode[0] with 4 KiB CHR mode[0] */
+   if (mode[3] &0x80 && (mode[0] &0x18) ==0x08)
+   {
+      int chrBank;
+      for (chrBank =0; chrBank <8; chrBank +=4)
+         setchr4(0x400 *chrBank, chr[latch[chrBank /4]&2 | chrBank] &AND >>2 | OR >>2);
+   }
    else
-      switch(mode[0] &0x18) {
+   {
+      int chrBank;
+      switch(mode[0] &0x18)
+      {
          case 0x00: /* 8 KiB CHR mode[0] */
             setchr8(chr[0] &AND >>3 | OR >>3);
             break;
          case 0x08: /* 4 KiB CHR mode[0] */
-            for (int chrBank =0; chrBank <8; chrBank +=4) setchr4(0x400 *chrBank, chr[chrBank] &AND >>2 | OR >>2);
+            for (chrBank =0; chrBank <8; chrBank +=4)
+               setchr4(0x400 *chrBank, chr[chrBank] &AND >>2 | OR >>2);
             break;
          case 0x10:
-            for (int chrBank =0; chrBank <8; chrBank +=2) setchr2(0x400 *chrBank, chr[chrBank] &AND >>1 | OR >>1);
+            for (chrBank =0; chrBank <8; chrBank +=2)
+               setchr2(0x400 *chrBank, chr[chrBank] &AND >>1 | OR >>1);
             break;
          case 0x18:
-            for (int chrBank =0; chrBank <8; chrBank +=1) setchr1(0x400 *chrBank, chr[chrBank] &AND     | OR    );
+            for (chrBank =0; chrBank <8; chrBank +=1)
+               setchr1(0x400 *chrBank, chr[chrBank] &AND     | OR    );
             break;
       }
-   PPUCHRRAM =mode[2] &0x40? 0xFF: 0x00; /* Write-protect or write-enable CHR-RAM */
+   }
+
+   PPUCHRRAM = (mode[2] & 0x40) ? 0xFF: 0x00; /* Write-protect or write-enable CHR-RAM */
 }
 
 static void syncNT (int AND, int OR)
@@ -133,13 +153,17 @@ static void syncNT (int AND, int OR)
       /* First, set normal CIRAM pages using extended registers ... */
       setmirrorw(nt[0] &1, nt[1] &1, nt[2] &1, nt[3] &1);
 
-      if (mode[0] &0x20) for (int ntBank =0; ntBank <4; ntBank++)
+      if (mode[0] &0x20)
       {
-         /* Then replace with ROM nametables if such are generally enabled */
-         int vromHere =(nt[ntBank] &0x80) ^(mode[2] &0x80) |(mode[0] &0x40);
-         /* ROM nametables are used either when globally enabled via D000.6 or per-bank via B00x.7 vs. D002.7 */
-         if (vromHere)
-            setntamem(CHRptr[0] +0x400*((nt[ntBank] &AND | OR) & CHRmask1[0]), 0, ntBank);
+         int ntBank;
+         for (ntBank =0; ntBank <4; ntBank++)
+         {
+            /* Then replace with ROM nametables if such are generally enabled */
+            int vromHere =(nt[ntBank] &0x80) ^(mode[2] &0x80) |(mode[0] &0x40);
+            /* ROM nametables are used either when globally enabled via D000.6 or per-bank via B00x.7 vs. D002.7 */
+            if (vromHere)
+               setntamem(CHRptr[0] +0x400*((nt[ntBank] &AND | OR) & CHRmask1[0]), 0, ntBank);
+         }
       }
    }
    else
@@ -161,18 +185,23 @@ static void syncNT (int AND, int OR)
       }
 }
 
-static void clockIRQ (void) {
+static void clockIRQ (void)
+{
 	uint8_t mask =irqControl &0x04? 0x07: 0xFF;
-	if (irqEnabled) switch (irqControl &0xC0) {
-		case 0x40:
-			irqPrescaler =(irqPrescaler &~mask) | (++irqPrescaler &mask);
-			if ((irqPrescaler &mask) ==0x00 && (irqControl &0x08? irqCounter: ++irqCounter) ==0x00) X6502_IRQBegin(FCEU_IQEXT);
-			break;
-		case 0x80:
-			irqPrescaler =(irqPrescaler &~mask) | (--irqPrescaler &mask);
-			if ((irqPrescaler &mask) ==mask && (irqControl &0x08? irqCounter: --irqCounter) ==0xFF) X6502_IRQBegin(FCEU_IQEXT);
-			break;
-	}
+	if (irqEnabled)
+      switch (irqControl &0xC0)
+      {
+         case 0x40:
+            irqPrescaler =(irqPrescaler &~mask) | (++irqPrescaler &mask);
+            if ((irqPrescaler &mask) ==0x00 && (irqControl &0x08? irqCounter: ++irqCounter) ==0x00)
+               X6502_IRQBegin(FCEU_IQEXT);
+            break;
+         case 0x80:
+            irqPrescaler =(irqPrescaler &~mask) | (--irqPrescaler &mask);
+            if ((irqPrescaler &mask) ==mask && (irqControl &0x08? irqCounter: --irqCounter) ==0xFF)
+               X6502_IRQBegin(FCEU_IQEXT);
+            break;
+      }
 }
 
 static DECLFW(trapCPUWrite)
@@ -258,22 +287,26 @@ static DECLFW(writeALU)
    }
 }
 
-static DECLFW(writePRG) {
+static DECLFW(writePRG)
+{
 	prg[A &3] = V;
 	sync();	
 }
 
-static DECLFW(writeCHRLow) {
+static DECLFW(writeCHRLow)
+{
 	chr[A &7] =chr[A &7] &0xFF00 | V;
 	sync();
 }
 
-static DECLFW(writeCHRHigh) {
+static DECLFW(writeCHRHigh)
+{
 	chr[A &7] =chr[A &7] &0x00FF | V <<8;
 	sync();
 }
 
-static DECLFW(writeNT) {
+static DECLFW(writeNT)
+{
 	if (~A &4)
 		nt[A &3] =nt[A &3] &0xFF00 | V;
 	else

From 336cac1a4408cd045bcdf845fb77de59bd7cda91 Mon Sep 17 00:00:00 2001
From: crystalct <nippurct@gmail.com>
Date: Fri, 9 Apr 2021 13:57:06 +0200
Subject: [PATCH 095/295] Update PSL1GHT platform (#437)

* Add PSL1GHT platform

* Update PS1GHT platform
---
 Makefile.libretro | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index fda55d5..22df238 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -249,14 +249,21 @@ else ifeq ($(platform), rpi4)
 	CFLAGS += -fomit-frame-pointer -fstrict-aliasing -ffast-math
 
 # Lightweight PS3 Homebrew SDK
-else ifeq ($(platform), psl1ght)
-	TARGET := $(TARGET_NAME)_libretro_$(platform).a
-	CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
-	AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
-	PLATFORM_DEFINES := -D__PSL1GHT__
-	ENDIANNESS_DEFINES += -DMSB_FIRST
-	STATIC_LINKING=1
-	EXTERNAL_ZLIB=1
+else ifneq (,$(filter $(platform), ps3 psl1ght))
+    ENDIANNESS_DEFINES =  -DWORDS_BIGENDIAN
+    EXTERNAL_ZLIB = 1
+    STATIC_LINKING = 1
+
+    ifneq ($(platdef),)
+        PLATFORM_DEFINES += -D$(platdef)
+    else
+        PLATFORM_DEFINES += -D__PSL1GHT__
+    endif
+
+    TARGET := $(TARGET_NAME)_libretro_$(platform).a
+    CC = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)gcc$(EXE_EXT)
+    CXX = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)g++$(EXE_EXT)
+    AR = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)ar$(EXE_EXT)
 
 # Xbox 360
 else ifeq ($(platform), xenon)

From 491975cf97631218b19ceabb5d156bbdf4edf974 Mon Sep 17 00:00:00 2001
From: negativeExponent <54053706+negativeExponent@users.noreply.github.com>
Date: Fri, 9 Apr 2021 20:28:15 +0800
Subject: [PATCH 096/295] C89 fixes

---
 src/boards/super40in1.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/boards/super40in1.c b/src/boards/super40in1.c
index 3de6804..7d954be 100644
--- a/src/boards/super40in1.c
+++ b/src/boards/super40in1.c
@@ -35,17 +35,18 @@ static SFORMAT StateRegs[] =
 };
 
 static void Sync(void) {
-	int prg = (preg & 7) | ((preg >> 3) & 0x08); // There is a high bit 3 of the PRG register that applies both to PRG and CHR
+	int prg = (preg & 7) | ((preg >> 3) & 0x08);		/* There is a high bit 3 of the PRG register that applies both to PRG and CHR */
+	int chr = (creg & 7) | ((preg >> 3) & 0x08);    	/* There is a high bit 3 of the PRG register that applies both to PRG and CHR */
+	int mask = (creg & 0x10)? 0: (creg & 0x20)? 1: 3;	/* There is an CNROM mode that takes either two or four inner CHR banks from a CNROM-like latch register at $8000-$FFFF. */
+
 	if (preg & 8) {
 		setprg16(0x8000, prg);
 		setprg16(0xc000, prg);
 	}
 	else
 		setprg32(0x8000, prg >> 1);
-
-	int chr = (creg & 7) | ((preg >> 3) & 0x08);    	// There is a high bit 3 of the PRG register that applies both to PRG and CHR
-	int mask = (creg & 0x10)? 0: (creg & 0x20)? 1: 3;	// There is an CNROM mode that takes either two or four inner CHR banks from a CNROM-like latch register at $8000-$FFFF.
-	setchr8((chr &~mask) | (latch &mask));          	// This "inner CHR bank" substitutes the respective bit(s) of the creg register.
+	
+	setchr8((chr &~mask) | (latch &mask));          	/* This "inner CHR bank" substitutes the respective bit(s) of the creg register. */
 	
 	setmirror(((preg >> 4) & 1) ^ 1);
 }
@@ -53,8 +54,7 @@ static void Sync(void) {
 static DECLFR(BMCWSRead) {
 	if ((creg >> 6) & (dipSwitch &3))
 		return X.DB;
-	else
-		return CartBR(A);
+	return CartBR(A);
 }
 
 static DECLFW(BMCWSWrite) {
@@ -81,10 +81,11 @@ static void MBMCWSPower(void) {
 }
 
 static void BMCWSReset(void) {
-	dipSwitch++; // Soft-resetting cycles through solder pad or DIP switch settings
-	if (dipSwitch == 3) dipSwitch = 0; // Only 00b, 01b and 10b settings are valid
+	dipSwitch++;		/* Soft-resetting cycles through solder pad or DIP switch settings */
+	if (dipSwitch == 3)
+		dipSwitch = 0; 	/* Only 00b, 01b and 10b settings are valid */
 	
-	// Always reset to menu
+	/* Always reset to menu */
 	preg =0;
 	creg =0;
 	latch =0;

From 50b90240808f731de8881a7cee6bfea01a61a9bc Mon Sep 17 00:00:00 2001
From: negativeExponent <54053706+negativeExponent@users.noreply.github.com>
Date: Sat, 10 Apr 2021 02:21:29 +0800
Subject: [PATCH 097/295] more C89 fixes

---
 src/boards/126-422-534.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/boards/126-422-534.c b/src/boards/126-422-534.c
index e8d6610..1b81963 100644
--- a/src/boards/126-422-534.c
+++ b/src/boards/126-422-534.c
@@ -31,48 +31,48 @@ static uint8 invertC000;
 static uint8 dipSwitch;
 
 static void wrapPRG(uint32 A, uint8 V) {
-	int prgAND = EXPREGS[0] &0x40? 0x0F: 0x1F; // 128 KiB or 256 KiB inner PRG bank selection
-	int prgOR  =(EXPREGS[0] <<4 &0x70 | EXPREGS[0] <<3 &0x180) &~prgAND; // outer PRG bank
+	int prgAND = EXPREGS[0] &0x40? 0x0F: 0x1F; /* 128 KiB or 256 KiB inner PRG bank selection */
+	int prgOR  =(EXPREGS[0] <<4 &0x70 | EXPREGS[0] <<3 &0x180) &~prgAND; /* outer PRG bank */
 	switch(EXPREGS[3] &3) {
-		case 0: // MMC3 PRG mode
+		case 0: /* MMC3 PRG mode */
 			break;
 		case 1:
-		case 2: // NROM-128 mode: MMC3 register 6 applies throughout $8000-$FFFF, MMC3 A13 replaced with CPU A13.
+		case 2: /* NROM-128 mode: MMC3 register 6 applies throughout $8000-$FFFF, MMC3 A13 replaced with CPU A13. */
 			V =DRegBuf[6] &~1 | A >>13 &1;
-			setprg8(A ^0x4000,  V     &prgAND | prgOR); // wrapPRG is only called with A containing the switchable banks, so we need to manually switch the normally fixed banks in this mode as well.
+			setprg8(A ^0x4000,  V     &prgAND | prgOR); /* wrapPRG is only called with A containing the switchable banks, so we need to manually switch the normally fixed banks in this mode as well. */
 			break;
-		case 3:	// NROM-256 mode: MMC3 register 6 applies throughout $8000-$FFFF, MMC3 A13-14 replaced with CPU A13-14.
+		case 3:	/* NROM-256 mode: MMC3 register 6 applies throughout $8000-$FFFF, MMC3 A13-14 replaced with CPU A13-14. */
 			V =DRegBuf[6] &~3 | A >>13 &3;
-			setprg8(A ^0x4000, (V ^2) &prgAND | prgOR); // wrapPRG is only called with A containing the switchable banks, so we need to manually switch the normally fixed banks in this mode as well.
+			setprg8(A ^0x4000, (V ^2) &prgAND | prgOR); /* wrapPRG is only called with A containing the switchable banks, so we need to manually switch the normally fixed banks in this mode as well. */
 			break;
 	}
 	setprg8(A, V &prgAND | prgOR);	
 }
 
 static void wrapCHR(uint32 A, uint8 V) {
-	int chrAND = EXPREGS[0] &0x80? 0x7F: 0xFF; // 128 KiB or 256 KiB innter CHR bank selection
-	int chrOR; // outer CHR bank
-	if (reverseCHR_A18_A19) // Mapper 126 swaps CHR A18 and A19
+	int chrAND = EXPREGS[0] &0x80? 0x7F: 0xFF; /* 128 KiB or 256 KiB innter CHR bank selection */
+	int chrOR; /* outer CHR bank */
+	if (reverseCHR_A18_A19) /* Mapper 126 swaps CHR A18 and A19 */
 		chrOR =(EXPREGS[0] <<4 &0x080 | EXPREGS[0] <<3 &0x100 | EXPREGS[0] <<5 &0x200) &~chrAND;
 	else
 		chrOR =EXPREGS[0] <<4 &0x380 &~chrAND;
 	
-	if (EXPREGS[3] &0x10) // CNROM mode: 8 KiB inner CHR bank comes from outer bank register #2
+	if (EXPREGS[3] &0x10) /* CNROM mode: 8 KiB inner CHR bank comes from outer bank register #2 */
 		setchr8(EXPREGS[2] &(chrAND >>3) | chrOR >>3);
-	else // MMC3 CHR mode
+	else /* MMC3 CHR mode */
 		setchr1(A, (V & chrAND) | chrOR);
 }
 
 static DECLFW(writeWRAM) {
 	if (~EXPREGS[3] &0x80) {
-		// Lock bit clear: Update any outer bank register
+		/* Lock bit clear: Update any outer bank register */
 		EXPREGS[A &3] =V;
 		FixMMC3PRG(MMC3_cmd);
 		FixMMC3CHR(MMC3_cmd);
 	} else
 	if ((A &3) ==2) {
-		// Lock bit set: Only update the bottom one or two bits of the CNROM bank
-		int latchMask =EXPREGS[2] &0x10? 1: 3; // 16 or 32 KiB inner CHR bank selection
+		/* Lock bit set: Only update the bottom one or two bits of the CNROM bank */
+		int latchMask =EXPREGS[2] &0x10? 1: 3; /* 16 or 32 KiB inner CHR bank selection */
 		EXPREGS[2] &=~latchMask;
 		EXPREGS[2] |= V &latchMask;
 		FixMMC3CHR(MMC3_cmd);
@@ -82,7 +82,7 @@ static DECLFW(writeWRAM) {
 
 static DECLFR(readDIP) {
 	uint8 result =CartBR(A);
-	if (EXPREGS[1] &1) result =result &~3 | dipSwitch &3; // Replace bottom two bits with solder pad or DIP switch setting if so selected
+	if (EXPREGS[1] &1) result =result &~3 | dipSwitch &3; /* Replace bottom two bits with solder pad or DIP switch setting if so selected */
 	return result;
 }
 
@@ -91,7 +91,7 @@ static DECLFW(writeIRQ) {
 }
 
 static void reset(void) {
-	dipSwitch++; // Soft-resetting cycles through solder pad or DIP switch settings
+	dipSwitch++; /* Soft-resetting cycles through solder pad or DIP switch settings */
 	EXPREGS[0] = EXPREGS[1] = EXPREGS[2] = EXPREGS[3] = 0;
 	MMC3RegReset();
 }
@@ -102,7 +102,7 @@ static void power(void) {
 	GenMMC3Power();
 	SetWriteHandler(0x6000, 0x7FFF, writeWRAM);
 	SetReadHandler(0x8000, 0xFFFF, readDIP);
-	if (invertC000) SetWriteHandler(0xC000, 0xDFFF, writeIRQ); // Mapper 534 inverts the MMC3 scanline counter reload value
+	if (invertC000) SetWriteHandler(0xC000, 0xDFFF, writeIRQ); /* Mapper 534 inverts the MMC3 scanline counter reload value */
 }
 
 static void init(CartInfo *info) {

From 61c2d95dacf409ce5153d47cde14e293074816eb Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sat, 10 Apr 2021 15:20:50 +0800
Subject: [PATCH 098/295] Add support for Konami Hyper Shot

This is just a quick hook-up of the konami hyper shot controller.

-The Konami Hyper Shot is used (and required for gameplay) in the following games:

* Hyper Olympic (J) Konami (1985)
* Hyper Sports (J) Konami (1985)

Fix #439
---
 src/drivers/libretro/libretro.c | 39 +++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 94ec2c2..792f89c 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -49,6 +49,7 @@
 #define RETRO_DEVICE_FC_OEKAKIDS RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_MOUSE,  3)
 #define RETRO_DEVICE_FC_SHADOW   RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_MOUSE,  4)
 #define RETRO_DEVICE_FC_4PLAYERS RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 2)
+#define RETRO_DEVICE_FC_HYPERSHOT RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 3)
 #define RETRO_DEVICE_FC_AUTO     RETRO_DEVICE_JOYPAD
 
 #define NES_WIDTH   256
@@ -765,6 +766,10 @@ static void update_nes_controllers(unsigned port, unsigned device)
          FCEUI_SetInputFC(SIFC_4PLAYER, &nes_input.JSReturn, 0);
          FCEU_printf(" Famicom Expansion: Famicom 4-Player Adapter\n");
          break;
+      case RETRO_DEVICE_FC_HYPERSHOT:
+         FCEUI_SetInputFC(SIFC_HYPERSHOT, nes_input.FamicomData, 0);
+         FCEU_printf(" Famicom Expansion: Konami Hyper Shot\n");
+         break;
       case RETRO_DEVICE_NONE:
       default:
          FCEUI_SetInputFC(SIFC_NONE, &Dummy, 0);
@@ -807,6 +812,8 @@ static unsigned fc_to_libretro(int d)
       return RETRO_DEVICE_FC_OEKAKIDS;
    case SIFC_4PLAYER:
       return RETRO_DEVICE_FC_4PLAYERS;
+   case SIFC_HYPERSHOT:
+      return RETRO_DEVICE_FC_HYPERSHOT;
    }
 
    return (RETRO_DEVICE_NONE);
@@ -918,6 +925,7 @@ void retro_set_environment(retro_environment_t cb)
       { "Auto",                  RETRO_DEVICE_FC_AUTO },
       { "Arkanoid",              RETRO_DEVICE_FC_ARKANOID },
       { "(Bandai) Hyper Shot",   RETRO_DEVICE_FC_SHADOW },
+      { "(Konami) Hyper Shot",   RETRO_DEVICE_FC_HYPERSHOT },
       { "Oeka Kids Tablet",      RETRO_DEVICE_FC_OEKAKIDS },
       { "4-Player Adapter",      RETRO_DEVICE_FC_4PLAYERS },
       { 0, 0 },
@@ -1719,6 +1727,37 @@ static void FCEUD_UpdateInput(void)
       case RETRO_DEVICE_FC_SHADOW:
          get_mouse_input(0, nes_input.FamicomData);
          break;
+      case RETRO_DEVICE_FC_HYPERSHOT:
+      {
+         static int toggle;
+         int i;
+
+         nes_input.FamicomData[0] = 0;
+         toggle ^= 1;
+         for (i = 0; i < 2; i++)
+         {
+            
+            if (input_cb(i, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B))
+               nes_input.FamicomData[0] |= 0x02 << (i * 2);
+            else if (input_cb(i, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y))
+            {
+               if (toggle)
+                  nes_input.FamicomData[0] |= 0x02 << (i * 2);
+               else
+                  nes_input.FamicomData[0] &= ~(0x02 << (i * 2));
+            }
+            if (input_cb(i, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A))
+               nes_input.FamicomData[0] |= 0x04 << (i * 2);
+            else if (input_cb(i, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X))
+            {
+               if (toggle)
+                  nes_input.FamicomData[0] |= 0x04 << (i * 2);
+               else
+                  nes_input.FamicomData[0] &= ~(0x04 << (i * 2));
+            }
+         }
+         break;
+      }
    }
 
    if (input_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2))

From 18dd7585db94828f4ab5452a904f14ca9edb71da Mon Sep 17 00:00:00 2001
From: crystalct <nippurct@gmail.com>
Date: Sat, 10 Apr 2021 12:08:06 +0200
Subject: [PATCH 099/295] Wrong Big Endian define for PSL1GHT system

---
 Makefile.libretro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index 22df238..86563b0 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -250,7 +250,7 @@ else ifeq ($(platform), rpi4)
 
 # Lightweight PS3 Homebrew SDK
 else ifneq (,$(filter $(platform), ps3 psl1ght))
-    ENDIANNESS_DEFINES =  -DWORDS_BIGENDIAN
+    ENDIANNESS_DEFINES =  -DMSB_FIRST
     EXTERNAL_ZLIB = 1
     STATIC_LINKING = 1
 

From 0657d2136631e48030e994bfed4632d862bc0370 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sat, 10 Apr 2021 14:38:49 +0200
Subject: [PATCH 100/295] MINDKIDS accessible as NES 2.0 m268.1; mapper 224 is
 MINDKIDS; remove KT-008 remnants from mmc3.c

---
 src/boards/224.c     | 50 --------------------------------------------
 src/boards/coolboy.c |  9 ++++++++
 src/boards/mmc3.c    | 21 +------------------
 src/ines-correct.h   | 38 ++++++++++++++++++++++++++++++---
 src/ines.c           |  5 ++---
 src/ines.h           |  1 +
 6 files changed, 48 insertions(+), 76 deletions(-)
 delete mode 100644 src/boards/224.c

diff --git a/src/boards/224.c b/src/boards/224.c
deleted file mode 100644
index 7c885b7..0000000
--- a/src/boards/224.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* FCEUmm - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2019 Libretro Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/* 2019-05-29 - Mapper 224, KT-008
- * iNES Mapper 224 is used for the 晶科泰 (Jncota) KT-008 PCB.
- * It's an MMC3 clone that supports 1024 KiB of PRG-ROM through an additional
- * outer bank register at $5000.
- * http://wiki.nesdev.com/w/index.php/INES_Mapper_224 */
-
-#include "mapinc.h"
-#include "mmc3.h"
-
-static void M224PW(uint32 A, uint8 V) {
-	setprg8(A, (V & 0x3f) | ((EXPREGS[0] << 4) & 0x40));
-}
-
-static DECLFW(Mapper224Write) {
-	EXPREGS[0] = V;
-	FixMMC3PRG(MMC3_cmd);
-}
-
-static void M224Power(void) {
-	EXPREGS[0] = 0;
-	GenMMC3Power();
-	SetWriteHandler(0x5000, 0x5000, Mapper224Write);
-}
-
-void Mapper224_Init(CartInfo *info) {
-	GenMMC3_Init(info, 1024, 0, 8, 0);
-	pwrap = M224PW;
-	info->Power = M224Power;
-	AddExState(EXPREGS, 1, 0, "EXPR");
-}
diff --git a/src/boards/coolboy.c b/src/boards/coolboy.c
index 5482550..357cd2a 100644
--- a/src/boards/coolboy.c
+++ b/src/boards/coolboy.c
@@ -174,3 +174,12 @@ void MINDKIDS_Init(CartInfo *info) {
 	info->Reset = COOLBOYReset;
 	AddExState(EXPREGS, 4, 0, "EXPR");
 }
+
+void Mapper268_Init(CartInfo *info) {
+	/* Technically, the distinction between COOLBOY ($6000-$7FFF) and MINDKIDS ($5000-$5FFF) is based on a solder pad setting. */
+	/* In NES 2.0, the submapper field is used to distinguish between the two settings. */
+	if (info->submapper == 1)
+		MINDKIDS_Init(info);
+	else
+		COOLBOY_Init(info);
+}
diff --git a/src/boards/mmc3.c b/src/boards/mmc3.c
index 1618bea..0698d85 100644
--- a/src/boards/mmc3.c
+++ b/src/boards/mmc3.c
@@ -184,17 +184,6 @@ DECLFW(MMC3_IRQWrite) {
 	}
 }
 
-/* KT-008 boards hack 2-in-1, TODO assign to new ines mapper, most dump of KT-boards on the net are mapper 4, so need database or goodnes fix support */
-DECLFW(KT008HackWrite) {
-/*	FCEU_printf("%04x:%04x\n",A,V); */
-	switch (A & 3) {
-   case 0: kt_extra = V; FixMMC3PRG(MMC3_cmd); break;
-	case 1: break;	/* unk */
-	case 2: break;	/* unk */
-	case 3: break;	/* unk */
-	}
-}
-
 static void ClockMMC3Counter(void) {
 	int count = IRQCount;
 	if (!count || IRQReload) {
@@ -236,9 +225,7 @@ static void GENPWRAP(uint32 A, uint8 V) {
    /* [NJ102] Mo Dao Jie (C) has 1024Mb MMC3 BOARD, maybe something other will be broken
     * also HengGe BBC-2x boards enables this mode as default board mode at boot up
     */
-   setprg8(A, (V & 0x7F)/* | ((kt_extra & 4) << 4)*/);
-   /* KT-008 boards hack 2-in-1, TODO assign to new ines mapper, most dump of KT-boards on the net are mapper 4, so need database or goodnes fix support */
-   /* KT-008 boards should be assigned to mapper 224 */
+   setprg8(A, (V & 0x7F));
 }
 
 static void GENMWRAP(uint8 V) {
@@ -265,9 +252,6 @@ void GenMMC3Power(void) {
 	SetWriteHandler(0xC000, 0xFFFF, MMC3_IRQWrite);
 	SetReadHandler(0x8000, 0xFFFF, CartBR);
 
-   /* KT-008 boards hack 2-in-1, TODO assign to new ines mapper, most dump of KT-boards on the net are mapper 4, so need database or goodnes fix support */
-   /* SetWriteHandler(0x5000,0x5FFF, KT008HackWrite); */   /* KT-008 boards should be assigned to mapper 224 */
-
 	A001B = A000B = 0;
 	setmirror(1);
 	if (mmc3opts & 1) {
@@ -321,9 +305,6 @@ void GenMMC3_Init(CartInfo *info, int prg, int chr, int wram, int battery) {
 		info->SaveGameLen[0] = WRAMSIZE;
 	}
 
-   /* KT-008 boards hack 2-in-1, TODO assign to new ines mapper, most dump of KT-boards on the net are mapper 4, so need database or goodnes fix support */
-   /* KT-008 boards should be assigned to mapper 224 */
-   AddExState(&kt_extra, 1, 0, "KTEX");
 	AddExState(MMC3_StateRegs, ~0, 0, 0);
 
 	info->Power = GenMMC3Power;
diff --git a/src/ines-correct.h b/src/ines-correct.h
index 4c4185d..5096d75 100644
--- a/src/ines-correct.h
+++ b/src/ines-correct.h
@@ -619,10 +619,42 @@
 	{ 0x345ee51a,  245, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Yong Zhe Dou E Long - Dragon Quest VII (Ch).nes */
 	{ 0x57514c6c,  245, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Yong Zhe Dou E Long - Dragon Quest VI (Ch).nes */
 	{ 0xdb9d71b7,  114, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Donkey Kong (Unl) [o1].nes */
+	
+	/* KT-008 PCB. These require mapper 224 for having an outer bank register at $5xxx, but are usually found set to mapper 4. */
 	{ 0x61fc4d20,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* (KT-1062) 口袋怪兽꞉ 水晶版.nes */
-	{ 0x4d735cb1,  224, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pokemon Platinum (KT-008 PCB)(Ch)[!].nes */
-	{ 0x4f427110,  224, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pokemon Platinum Alt title 1 (KT-008 PCB)(Ch)[!].nes */
-	{ 0xe001de16,  224, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pokemon Platinum Alt title 2 (KT-008 PCB)(Ch)[!].nes */
+	{ 0xaa666c19,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Ys Origin: Hugo.nes */
+	{ 0xb0d011d3,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Ys Origin: Yunica.nes */
+	{ 0x16143319,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Ys VI: 纳比斯汀的方舟.nes */
+	{ 0xe05fc21f,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Ys: 菲尔盖纳之誓约.nes */
+	{ 0xf8b58b59,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 三国志 - 蜀魏争霸.nes */
+	{ 0xcb1bab3d,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 三国志꞉ 蜀汉风云.nes */
+	{ 0xddc122ed,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 亡灵崛起.nes */
+	{ 0x4d2811c7,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 伏魔英雄传.nes */
+	{ 0x24750e5d,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 傲视天地.nes */
+	{ 0xc658b6a8,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 刀剑英雄传.nes */
+	{ 0xea831217,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 剑侠情缘.nes */
+	{ 0x92ebad5b,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 勇者斗恶龙 III꞉ 罪恶渊源.nes */
+	{ 0x48210324,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 勇者斗恶龙꞉ 勇者的试炼.nes */
+	{ 0x3439d140,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 勇者斗恶龙꞉ 天空的新娘.nes */
+	{ 0x9a0a531a,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 勇者斗恶龙꞉ 天空篇.nes */
+	{ 0xb5fdb3cb,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 勇者黑暗世界 - 混沌世界.nes */
+	{ 0x4f427110,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋怪兽꞉ 珍珠版.nes */
+	{ 0xa46d6f4c,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋怪兽꞉ 琥珀版.nes */
+	{ 0xe001de16,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋怪兽꞉ 白金版.nes */
+	{ 0x5464d7f8,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋怪兽꞉ 翡翠版.nes */
+	{ 0x4d735cb1,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋怪兽꞉ 钻石版.nes */
+	{ 0x5d04547c,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 失落的神器.nes */
+	{ 0xcb524b42,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 征战天下.nes */
+	{ 0x5f362198,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 战神世界.nes */
+	{ 0x36de88e7,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 新魔界.nes */
+	{ 0xf8e9c9cf,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 无双乱舞.nes */
+	{ 0xa4c39535,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 神魔大陆.nes */
+	{ 0x76bbe916,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 落日征战.nes */
+	{ 0x9b518d54,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 轩辕剑꞉ 云的彼端.nes */
+	{ 0x91396b3f,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 轩辕剑꞉ 天之痕.nes */
+	{ 0xaa621fa0,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 轩辕剑꞉ 枫之舞.nes */
+	{ 0x48d1f54a,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 轩辕剑꞉ 王者归来.nes */
+	
 	{ 0xbdbe3c96,  238, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Contra Fighter (Unl).nes */
 	{ 0xcb53c523,   11, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* King Neptune's Adventure (USA) (Unl).nes */
 	{ 0x6e149729,  189, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Master Fighter II (Unl) [a1].nes */
diff --git a/src/ines.c b/src/ines.c
index 316fa5d..33cbed2 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -639,7 +639,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "UNLN625092",               221, UNLN625092_Init        )
 	INES_BOARD( "",                         222, Mapper222_Init         )
 /*    INES_BOARD( "",                            223, Mapper223_Init ) */
-	INES_BOARD( "KT-008",                   224, Mapper224_Init         )
+	INES_BOARD( "KT-008",                   224, MINDKIDS_Init          ) /* The KT-008 board contains the MINDKIDS chipset */
 	INES_BOARD( "",                         225, Mapper225_Init         )
 	INES_BOARD( "BMC 22+20-in-1",           226, Mapper226_Init         )
 	INES_BOARD( "",                         227, Mapper227_Init         )
@@ -724,8 +724,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "YOKO",                     264, UNLYOKO_Init           )
 	INES_BOARD( "T-262",                    265, BMCT262_Init           )
 	INES_BOARD( "CITYFIGHT",                266, UNLCITYFIGHT_Init      )
-	INES_BOARD( "COOLBOY",                  268, COOLBOY_Init           )
-/*    INES_BOARD( "MINDKIDS",                    268, MINDKIDS_Init ) */
+	INES_BOARD( "COOLBOY/MINDKIDS",         268, Mapper268_Init         ) /* Submapper distinguishes between COOLBOY and MINDKIDS */
 	INES_BOARD( "80013-B",                  274, BMC80013B_Init         )
 	INES_BOARD( "GS-2004",                  283, BMCGS2004_Init         )
 /*    INES_BOARD( "GS-2013",                    283, BMCGS2013_Init ) */
diff --git a/src/ines.h b/src/ines.h
index 574a0de..cbeaf42 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -253,6 +253,7 @@ void NC7000M_Init(CartInfo *);
 void J2282_Init(CartInfo *);
 
 void Mapper267_Init(CartInfo *);
+void Mapper268_Init(CartInfo *);
 void Mapper269_Init(CartInfo *);
 void Mapper288_Init(CartInfo *);
 void Mapper293_Init(CartInfo *);

From f3bdbd658197c0b8a8fef1411af266191d1a4aae Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sat, 10 Apr 2021 21:40:01 +0200
Subject: [PATCH 101/295] Forgot one KT-008 hack remnant.

---
 src/boards/mmc3.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/boards/mmc3.c b/src/boards/mmc3.c
index 0698d85..3fbfd22 100644
--- a/src/boards/mmc3.c
+++ b/src/boards/mmc3.c
@@ -28,7 +28,6 @@
 #include "mmc3.h"
 
 uint8 MMC3_cmd;
-uint8 kt_extra;
 uint8 *WRAM;
 uint32 WRAMSIZE;
 uint8 *CHRRAM;

From 86356c24c2b08960d2d00d0f56738f6a260a73d8 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 14 Apr 2021 19:09:02 +0200
Subject: [PATCH 102/295] Make mapper 59 always reset to menu. Add mapper 59
 multicarts that had previously been set to 60, colliding with 'Reset-based
 4-in-1', to CRC-based correction table.

---
 src/boards/addrlatch.c |  4 ++++
 src/ines-correct.h     | 14 ++++++++++++++
 src/ines.c             |  1 -
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c
index 415d574..1cd7a26 100644
--- a/src/boards/addrlatch.c
+++ b/src/boards/addrlatch.c
@@ -111,6 +111,10 @@ static DECLFR(BMCD1038Read) {
 static void BMCD1038Reset(void) {
 	dipswitch++;
 	dipswitch &= 3;
+	
+	/* Always reset to menu */
+	latche = 0;
+	BMCD1038Sync();
 }
 
 void BMCD1038_Init(CartInfo *info) {
diff --git a/src/ines-correct.h b/src/ines-correct.h
index 5096d75..990395b 100644
--- a/src/ines-correct.h
+++ b/src/ines-correct.h
@@ -242,6 +242,20 @@
 	{ 0x1500e835,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Jetsons, The - Cogswell's Caper (Japan).nes */
 	{ 0xe2c94bc2,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Bros 8 (Unl) [!].nes */
 	{ 0xa912b064,   51, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT,   0x800 }, /* 11-in-1 Ball Games [p1][o1].nes (has CHR ROM when it shouldn't) */
+	{ 0x2e72a5d9,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 11-in-1 (66-in-1, 86-in-1, 63-in-1).nes */
+	{ 0x39f514fd,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 18 in 1 (118-in-1, 138-in-1, 198-in-1)VTxxxx.nes */
+	{ 0xd8b1f465,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 26-in-1 (36-in-1, 46-in-1,56-in-1) VT 335.nes */
+	{ 0xcf82fae9,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 28 in 1 (38-in-1, 48-in-1, 58-in1)VTxxxx.nes */
+	{ 0xa7a98698,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 28-in-1 (46-in-1, 63-in-1, 118-in-1)VT-5116.nes */
+	{ 0x21fd7143,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 41-in-1 (5-in-1,71-in-1)  VT345.nes */
+	{ 0x49ec88d6,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 42-in-1 NT-234 Bad Game Road Fighter.nes */
+	{ 0x60306f19,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 42-in-1 PCB 3840.nes */
+	{ 0x450cd86e,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 48-in-1 (62-in-1,73-in-1,88-in-1) VTxxx.nes */
+	{ 0xd774e041,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 50-in-1 (60-in-1,70-in-1,80-in-1) NT-113.nes */
+	{ 0x3c4e94f6,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 51-in-1 (61-in-1, 71-in-1, 81-in-1) VT5310.nes */
+	{ 0x0422ed44,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 7-in-1 (32-in-1,66-in-1,119-in-1) VT15004.nes */
+	{ 0x7efc0d2c,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 7-in-1 (5000-in-1, 999999999-in-1, 10000000-in-1)NC-07N.nes */
+	{ 0x6d92dff1,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* TN 95-in-1 (6-in-1) [p1].nes */
 	{ 0x39ab0fc7,   64, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Hard Drivin' (USA) (Proto) (Unl).nes */
 	{ 0xb19a55dd,   64, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Road Runner (USA) (Unl).nes */
 	{ 0xf92be3ec,   64, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Rolling Thunder (USA) (Unl).nes */
diff --git a/src/ines.c b/src/ines.c
index 33cbed2..a4c5eb8 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -472,7 +472,6 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "UNLKS202",                  56, UNLKS202_Init          )
 	INES_BOARD( "SIMBPLE BMC PIRATE A",      57, Mapper57_Init          )
 	INES_BOARD( "SIMBPLE BMC PIRATE B",      58, BMCGK192_Init          )
-/*	INES_BOARD( "",                          59, Mapper59_Init         ) */ /* Check this out, update 2020-10-21 - formerly an incorrect implementation of T3H53 */
 	INES_BOARD( "BMC T3H53/D1038",           59, BMCD1038_Init          )
 	INES_BOARD( "Reset-based NROM-128 ",     60, Mapper60_Init          )
 	INES_BOARD( "20-in-1 KAISER Rev. A",     61, Mapper61_Init          )

From cf476194ce26ead165cd9b7c002cea4d30e245f8 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 14 Apr 2021 19:16:57 +0200
Subject: [PATCH 103/295] Combine UNIF AB-G1L, WELL-NO-DG450 and TF2740 into
 NES 2.0 Mapper 428.

---
 src/boards/{AbG1l.c => 428.c} | 94 ++++++-----------------------------
 src/ines.c                    |  1 +
 src/ines.h                    |  1 +
 src/unif.c                    |  4 +-
 src/unif.h                    |  2 -
 5 files changed, 20 insertions(+), 82 deletions(-)
 rename src/boards/{AbG1l.c => 428.c} (50%)

diff --git a/src/boards/AbG1l.c b/src/boards/428.c
similarity index 50%
rename from src/boards/AbG1l.c
rename to src/boards/428.c
index 7fde82b..3c06a39 100644
--- a/src/boards/AbG1l.c
+++ b/src/boards/428.c
@@ -25,7 +25,6 @@
 
 static uint8 regs[4];
 static uint8 hrd_flag;
-static void(*Sync)(void);
 
 static SFORMAT StateRegs[] =
 {
@@ -34,7 +33,8 @@ static SFORMAT StateRegs[] =
 	{ 0 }
 };
 
-static void SyncAbG1l(void) {
+static void Sync(void) {
+	int mask = reg[2] >> 6; /* There is an CNROM mode that takes either two or four inner CHR banks from a CNROM-like latch register at $8000-$FFFF. */
 
 	if (regs[1] & 0x10)
 		setprg32(0x8000,(regs[1] & 0xC0) >> 6);
@@ -44,48 +44,36 @@ static void SyncAbG1l(void) {
 		setprg16(0xC000, (regs[1] & 0xE0) >> 5);
 	}
 
-	/* FIXME: 2020-10-26  */
-	switch (regs[2] & 0xC0) {
-	case 0xC0: /* Pipe Dream */
-		setchr8((regs[0] & 0x03) | (regs[1] & ~0x03));
-		break;
-	case 0x40: /* Goonies */
-		setchr8((regs[0] & 0x01) | (regs[1] & 0x07));
-		break;
-	default:
-		setchr8(regs[1]);
-		break;
-	}
-
+	setchr8((regs[1] & 0x07) & ~mask) | reg[0] & mask);
+	
 	setmirror((regs[1] & 0x8) ? 0 : 1);
 }
 
-static DECLFW(AbG1lWriteHi) {
+static DECLFW(WriteHi) {
 	regs[0] = V;
-	/* setchr8(((regs[2] & 0xC0) >> 7) << 2 | (regs[0] & 0x03)); */
 	Sync();
 }
 
-static DECLFW(AbG1lWriteLo) {
+static DECLFW(WriteLo) {
 	regs[A & 0x03] = V;
 	Sync();
 }
 
-static DECLFR(AbG1lReadLo) {
+static DECLFR(ReadLo) {
 	return hrd_flag;
 }
 
-static void AbG1lPower(void) {
-	hrd_flag = 0;
+static void Power(void) {
+	hrd_flag = 0; /* Solder pad, selecting different menus */
 
 	regs[0] = 0;
 	regs[1] = 0;
 	regs[2] = 0;
 
 	Sync();
-	SetWriteHandler(0x8000, 0xFFFF, AbG1lWriteHi);
-	SetWriteHandler(0x6001, 0x6002, AbG1lWriteLo);
-	SetReadHandler(0x6000, 0x7FFF, AbG1lReadLo);
+	SetWriteHandler(0x8000, 0xFFFF, WriteHi);
+	SetWriteHandler(0x6001, 0x6002, WriteLo);
+	SetReadHandler(0x6000, 0x7FFF, ReadLo);
 	SetReadHandler(0x8000, 0xFFFF, CartBR);
 }
 
@@ -93,7 +81,7 @@ static void StateRestore(int version) {
 	Sync();
 }
 
-static void AbG1lReset(void) {
+static void Reset(void) {
 	hrd_flag++;
 	hrd_flag &= 3;
 	
@@ -104,64 +92,14 @@ static void AbG1lReset(void) {
 	Sync();
 }
 
-void AbG1l_Init(CartInfo *info) {
-
-	Sync = SyncAbG1l;
-
+void Mapper428_Init(CartInfo *info) {
 	hrd_flag = 0;
 
 	Sync();
 
-	info->Power = AbG1lPower;
-	info->Reset = AbG1lReset;
+	info->Power = Power;
+	info->Reset = Reset;
 	AddExState(&StateRegs, ~0, 0, 0);
 	GameStateRestore = StateRestore;
 }
 
-
-static void SyncWellNoDG450(void) {
-
-	if (regs[1] & 0x10)
-		setprg32(0x8000, (regs[1]) >> 6);
-	else
-	{
-		setprg16(0x8000, (regs[1]) >> 5);
-		setprg16(0xC000, (regs[1]) >> 5);
-	}
-
-	setchr8(regs[1] & 0x0F);
-	setmirror((regs[1] & 0x8) ? 0 : 1);
-}
-
-static void WellNoDG450Power(void) {
-	hrd_flag = 0;
-
-	regs[0] = 0;
-	regs[1] = 0;
-	regs[2] = 0;
-
-	Sync();
-
-	SetWriteHandler(0x6001, 0x6002, AbG1lWriteLo);
-	SetReadHandler(0x6000, 0x7FFF, AbG1lReadLo);
-	SetReadHandler(0x8000, 0xFFFF, CartBR);
-}
-
-static void WellNoDG450Reset(void) {
-	hrd_flag++;
-	hrd_flag &= 3;
-
-	regs[0] = 0;
-	regs[1] = 0;
-	regs[2] = 0;
-
-	Sync();
-}
-
-void WellNoDG450_Init(CartInfo *info) {
-	Sync = SyncWellNoDG450;
-	info->Power = WellNoDG450Power;
-	info->Reset = WellNoDG450Reset;
-	AddExState(&StateRegs, ~0, 0, 0);
-	GameStateRestore = StateRestore;
-}
diff --git a/src/ines.c b/src/ines.c
index 33cbed2..372a966 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -788,6 +788,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "YY850439C",                397, Mapper397_Init         )
 	INES_BOARD( "831019C J-2282",           402, J2282_Init             )
 	INES_BOARD( "SC871115C",                421, Mapper421_Init         )
+	INES_BOARD( "AB-G1L/WELL-NO-DG450",     428, Mapper422_Init         )
 	INES_BOARD( "SA-9602B",                 513, SA9602B_Init           )
 	INES_BOARD( "DANCE2000",                518, UNLD2000_Init          )
 	INES_BOARD( "EH8813A",                  519, UNLEH8813A_Init        )
diff --git a/src/ines.h b/src/ines.h
index cbeaf42..ad0556e 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -282,6 +282,7 @@ void Mapper401_Init(CartInfo *);
 void Mapper411_Init(CartInfo *);
 void Mapper421_Init(CartInfo *);
 void Mapper422_Init(CartInfo *);
+void Mapper428_Init(CartInfo *);
 void Mapper516_Init(CartInfo *);
 void Mapper533_Init(CartInfo *);
 void Mapper534_Init(CartInfo *);
diff --git a/src/unif.c b/src/unif.c
index 14c3f60..e7a93aa 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -438,7 +438,7 @@ static BMAPPING bmap[] = {
 	{ "8237A",                      215, UNL8237A_Init,         0 },
 	{ "830118C",                    348, BMC830118C_Init,       0 },
 	{ "A65AS",                      285, BMCA65AS_Init,         0 },
-	{ "AB-G1L",                 NO_INES, AbG1l_Init,            0 },
+	{ "AB-G1L",                     428, Mapper428_Init,        0 },
 	{ "AC08",                        42, AC08_Init,             0 },
 	{ "ANROM",                        7, ANROM_Init,            0 },
 	{ "AX5705",                     530, UNLAX5705_Init,        0 },
@@ -559,7 +559,7 @@ static BMAPPING bmap[] = {
 	{ "UNROM-512-32",                30, UNROM512_Init,         BMCFLAG_32KCHRR },
 	{ "UOROM",                        2, UNROM_Init,            0 },
 	{ "VRC7",                        85, UNLVRC7_Init,          0 },
-	{ "WELL-NO-DG450",          NO_INES, WellNoDG450_Init,      0 },
+	{ "WELL-NO-DG450",              428, Mapper428_Init,        0 },
 	{ "YOKO",                       264, UNLYOKO_Init,          0 },
 	{ "COOLBOY",                    268, COOLBOY_Init,          BMCFLAG_256KCHRR },
 	{ "158B",                       258, UNL158B_Init,          0 },
diff --git a/src/unif.h b/src/unif.h
index 4f5517e..c53a3e8 100644
--- a/src/unif.h
+++ b/src/unif.h
@@ -189,8 +189,6 @@ void BMC830134C_Init(CartInfo *info);		/* m315 */
 void BMCGN26_Init(CartInfo *info);			/* m344 */
 
 void BS110_Init(CartInfo *info);
-void WellNoDG450_Init(CartInfo *info);
-void AbG1l_Init(CartInfo *info);
 void KG256_Init(CartInfo *info);
 void WAIXINGFS005_Init(CartInfo *info);
 

From 5fc30e3d20a8b1cab99f611b5b466d6bae79f067 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 14 Apr 2021 19:17:53 +0200
Subject: [PATCH 104/295] Add TF2740 to unif.c

---
 src/unif.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/unif.c b/src/unif.c
index e7a93aa..e69a75a 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -560,6 +560,7 @@ static BMAPPING bmap[] = {
 	{ "UOROM",                        2, UNROM_Init,            0 },
 	{ "VRC7",                        85, UNLVRC7_Init,          0 },
 	{ "WELL-NO-DG450",              428, Mapper428_Init,        0 },
+	{ "TF2740",                     428, Mapper428_Init,        0 },	
 	{ "YOKO",                       264, UNLYOKO_Init,          0 },
 	{ "COOLBOY",                    268, COOLBOY_Init,          BMCFLAG_256KCHRR },
 	{ "158B",                       258, UNL158B_Init,          0 },

From 9cfea5b7d1aba8b8187aeeb7e3767bf0b6bbb332 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 14 Apr 2021 19:29:08 +0200
Subject: [PATCH 105/295] Typos in 428.c

---
 src/boards/428.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/boards/428.c b/src/boards/428.c
index 3c06a39..06f18f7 100644
--- a/src/boards/428.c
+++ b/src/boards/428.c
@@ -34,7 +34,7 @@ static SFORMAT StateRegs[] =
 };
 
 static void Sync(void) {
-	int mask = reg[2] >> 6; /* There is an CNROM mode that takes either two or four inner CHR banks from a CNROM-like latch register at $8000-$FFFF. */
+	int mask = regs[2] >> 6; /* There is an CNROM mode that takes either two or four inner CHR banks from a CNROM-like latch register at $8000-$FFFF. */
 
 	if (regs[1] & 0x10)
 		setprg32(0x8000,(regs[1] & 0xC0) >> 6);
@@ -44,7 +44,7 @@ static void Sync(void) {
 		setprg16(0xC000, (regs[1] & 0xE0) >> 5);
 	}
 
-	setchr8((regs[1] & 0x07) & ~mask) | reg[0] & mask);
+	setchr8(((regs[1] & 0x07) & ~mask) | regs[0] & mask);
 	
 	setmirror((regs[1] & 0x8) ? 0 : 1);
 }

From 89bd38c33be46d43da4f36999ca4465618bae000 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 14 Apr 2021 19:30:47 +0200
Subject: [PATCH 106/295] Typo in ines.c

---
 src/ines.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ines.c b/src/ines.c
index 372a966..ce9e8b3 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -788,7 +788,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "YY850439C",                397, Mapper397_Init         )
 	INES_BOARD( "831019C J-2282",           402, J2282_Init             )
 	INES_BOARD( "SC871115C",                421, Mapper421_Init         )
-	INES_BOARD( "AB-G1L/WELL-NO-DG450",     428, Mapper422_Init         )
+	INES_BOARD( "AB-G1L/WELL-NO-DG450",     428, Mapper428_Init         )
 	INES_BOARD( "SA-9602B",                 513, SA9602B_Init           )
 	INES_BOARD( "DANCE2000",                518, UNLD2000_Init          )
 	INES_BOARD( "EH8813A",                  519, UNLEH8813A_Init        )

From 825cdb8788391b7afc8bb92845314f6c0d73ff12 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 14 Apr 2021 21:03:59 +0200
Subject: [PATCH 107/295] Add lock bit, necessary for NT-234's Road Fighter

---
 src/boards/addrlatch.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c
index 1cd7a26..e46b9ee 100644
--- a/src/boards/addrlatch.c
+++ b/src/boards/addrlatch.c
@@ -108,6 +108,12 @@ static DECLFR(BMCD1038Read) {
 		return CartBR(A);
 }
 
+static DECLFW(BMCD1038Write) {
+	/* Only recognize the latch write if the lock bit has not been set. Needed for NT-234 "Road Fighter" */
+	if (~latche & 0x200)
+		LatchWrite(A, V);
+}
+
 static void BMCD1038Reset(void) {
 	dipswitch++;
 	dipswitch &= 3;
@@ -117,9 +123,17 @@ static void BMCD1038Reset(void) {
 	BMCD1038Sync();
 }
 
+static void BMCD1038Power(void) {
+	LatchPower();
+	
+	/* Trap latch writes to enforce the "Lock" bit */
+	SetWriteHandler(0x8000, 0xFFFF, BMCD1038Write);
+}
+
 void BMCD1038_Init(CartInfo *info) {
 	Latch_Init(info, BMCD1038Sync, BMCD1038Read, 0x0000, 0x8000, 0xFFFF, 0);
 	info->Reset = BMCD1038Reset;
+	info->Power = BMCD1038Power;
 	AddExState(&dipswitch, 1, 0, "DIPSW");
 }
 

From d6c854abd8ad70de15fe25170a7d5a532d8f1502 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Tue, 20 Apr 2021 16:18:54 +0800
Subject: [PATCH 108/295] Use fopen_utf8 instead of fopen

---
 Makefile.common                               |  3 +-
 src/drivers/libretro/griffin.c                |  1 +
 .../libretro-common/compat/fopen_utf8.c       | 63 +++++++++++++++++++
 .../include/compat/fopen_utf8.h               | 34 ++++++++++
 .../libretro-common/include/libretro.h        |  4 ++
 .../include/string/stdstring.h                | 22 +++----
 src/file.c                                    |  4 +-
 7 files changed, 118 insertions(+), 13 deletions(-)
 create mode 100644 src/drivers/libretro/libretro-common/compat/fopen_utf8.c
 create mode 100644 src/drivers/libretro/libretro-common/include/compat/fopen_utf8.h

diff --git a/Makefile.common b/Makefile.common
index 8c75113..9876d85 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -53,7 +53,8 @@ SOURCES_C += $(CORE_DIR)/drivers/libretro/libretro-common/streams/memory_stream.
 				$(CORE_DIR)/drivers/libretro/libretro-common/compat/compat_snprintf.c \
 				$(CORE_DIR)/drivers/libretro/libretro-common/string/stdstring.c \
 				$(CORE_DIR)/drivers/libretro/libretro-common/encodings/encoding_utf.c \
-				$(CORE_DIR)/drivers/libretro/libretro-common/compat/compat_strl.c
+				$(CORE_DIR)/drivers/libretro/libretro-common/compat/compat_strl.c \
+				$(CORE_DIR)/drivers/libretro/libretro-common/compat/fopen_utf8.c
 endif
 
 ifeq ($(DEBUG),1)
diff --git a/src/drivers/libretro/griffin.c b/src/drivers/libretro/griffin.c
index 3158363..9a215eb 100644
--- a/src/drivers/libretro/griffin.c
+++ b/src/drivers/libretro/griffin.c
@@ -7,6 +7,7 @@
 #include "drivers/libretro/libretro-common/string/stdstring.c"
 #include "drivers/libretro/libretro-common/encodings/encoding_utf.c"
 #include "drivers/libretro/libretro-common/compat/compat_strl.c"
+#include "drivers/libretro/libretro-common/compat/fopen_utf8.c"
 #endif
 
 #include "cart.c"
diff --git a/src/drivers/libretro/libretro-common/compat/fopen_utf8.c b/src/drivers/libretro/libretro-common/compat/fopen_utf8.c
new file mode 100644
index 0000000..85abb59
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/compat/fopen_utf8.c
@@ -0,0 +1,63 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (fopen_utf8.c).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <compat/fopen_utf8.h>
+#include <encodings/utf.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500 || defined(_XBOX)
+#ifndef LEGACY_WIN32
+#define LEGACY_WIN32
+#endif
+#endif
+
+#ifdef _WIN32
+#undef fopen
+
+void *fopen_utf8(const char * filename, const char * mode)
+{
+#if defined(LEGACY_WIN32)
+   FILE             *ret = NULL;
+   char * filename_local = utf8_to_local_string_alloc(filename);
+
+   if (!filename_local)
+      return NULL;
+   ret = fopen(filename_local, mode);
+   if (filename_local)
+      free(filename_local);
+   return ret;
+#else
+   wchar_t * filename_w = utf8_to_utf16_string_alloc(filename);
+   wchar_t * mode_w = utf8_to_utf16_string_alloc(mode);
+   FILE* ret = NULL;
+
+   if (filename_w && mode_w)
+      ret = _wfopen(filename_w, mode_w);
+   if (filename_w)
+      free(filename_w);
+   if (mode_w)
+      free(mode_w);
+   return ret;
+#endif
+}
+#endif
diff --git a/src/drivers/libretro/libretro-common/include/compat/fopen_utf8.h b/src/drivers/libretro/libretro-common/include/compat/fopen_utf8.h
new file mode 100644
index 0000000..97d4404
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/include/compat/fopen_utf8.h
@@ -0,0 +1,34 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (fopen_utf8.h).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __LIBRETRO_SDK_COMPAT_FOPEN_UTF8_H
+#define __LIBRETRO_SDK_COMPAT_FOPEN_UTF8_H
+
+#ifdef _WIN32
+/* Defined to error rather than fopen_utf8, to make it clear to everyone reading the code that not worrying about utf16 is fine */
+/* TODO: enable */
+/* #define fopen (use fopen_utf8 instead) */
+void *fopen_utf8(const char * filename, const char * mode);
+#else
+#define fopen_utf8 fopen
+#endif
+#endif
diff --git a/src/drivers/libretro/libretro-common/include/libretro.h b/src/drivers/libretro/libretro-common/include/libretro.h
index d843114..8a5da86 100644
--- a/src/drivers/libretro/libretro-common/include/libretro.h
+++ b/src/drivers/libretro/libretro-common/include/libretro.h
@@ -282,6 +282,7 @@ enum retro_language
    RETRO_LANGUAGE_PERSIAN             = 20,
    RETRO_LANGUAGE_HEBREW              = 21,
    RETRO_LANGUAGE_ASTURIAN            = 22,
+   RETRO_LANGUAGE_FINNISH             = 23,
    RETRO_LANGUAGE_LAST,
 
    /* Ensure sizeof(enum) == sizeof(int) */
@@ -712,6 +713,9 @@ enum retro_mod
                                             * state of rumble motors in controllers.
                                             * A strong and weak motor is supported, and they can be
                                             * controlled indepedently.
+                                            * Should be called from either retro_init() or retro_load_game().
+                                            * Should not be called from retro_set_environment().
+                                            * Returns false if rumble functionality is unavailable.
                                             */
 #define RETRO_ENVIRONMENT_GET_INPUT_DEVICE_CAPABILITIES 24
                                            /* uint64_t * --
diff --git a/src/drivers/libretro/libretro-common/include/string/stdstring.h b/src/drivers/libretro/libretro-common/include/string/stdstring.h
index 5d8c31b..82e038b 100644
--- a/src/drivers/libretro/libretro-common/include/string/stdstring.h
+++ b/src/drivers/libretro/libretro-common/include/string/stdstring.h
@@ -44,20 +44,20 @@ RETRO_BEGIN_DECLS
 #define string_is_not_equal_fast(a, b, size) (memcmp(a, b, size) != 0)
 #define string_is_equal_fast(a, b, size)     (memcmp(a, b, size) == 0)
 
-#define TOLOWER(c)   (c |  (lr_char_props[c] & 0x20))
-#define TOUPPER(c)   (c & ~(lr_char_props[c] & 0x20))
+#define TOLOWER(c)   ((c) |  (lr_char_props[(unsigned char)(c)] & 0x20))
+#define TOUPPER(c)   ((c) & ~(lr_char_props[(unsigned char)(c)] & 0x20))
 
 /* C standard says \f \v are space, but this one disagrees */
-#define ISSPACE(c)   (lr_char_props[c]  & 0x80) 
+#define ISSPACE(c)   (lr_char_props[(unsigned char)(c)] & 0x80) 
 
-#define ISDIGIT(c)   (lr_char_props[c]  & 0x40)
-#define ISALPHA(c)   (lr_char_props[c]  & 0x20)
-#define ISLOWER(c)   (lr_char_props[c]  & 0x04)
-#define ISUPPER(c)   (lr_char_props[c]  & 0x02)
-#define ISALNUM(c)   (lr_char_props[c]  & 0x60)
-#define ISUALPHA(c)  (lr_char_props[c]  & 0x28)
-#define ISUALNUM(c)  (lr_char_props[c]  & 0x68)
-#define IS_XDIGIT(c) (lr_char_props[c]  & 0x01)
+#define ISDIGIT(c)   (lr_char_props[(unsigned char)(c)] & 0x40)
+#define ISALPHA(c)   (lr_char_props[(unsigned char)(c)] & 0x20)
+#define ISLOWER(c)   (lr_char_props[(unsigned char)(c)] & 0x04)
+#define ISUPPER(c)   (lr_char_props[(unsigned char)(c)] & 0x02)
+#define ISALNUM(c)   (lr_char_props[(unsigned char)(c)] & 0x60)
+#define ISUALPHA(c)  (lr_char_props[(unsigned char)(c)] & 0x28)
+#define ISUALNUM(c)  (lr_char_props[(unsigned char)(c)] & 0x68)
+#define IS_XDIGIT(c) (lr_char_props[(unsigned char)(c)] & 0x01)
 
 /* Deprecated alias, all callers should use string_is_equal_case_insensitive instead */
 #define string_is_equal_noncase string_is_equal_case_insensitive
diff --git a/src/file.c b/src/file.c
index 2ceb96f..07da9f8 100644
--- a/src/file.c
+++ b/src/file.c
@@ -34,6 +34,8 @@
 #include "driver.h"
 #include "general.h"
 
+#include "compat/fopen_utf8.h"
+
 #ifndef __GNUC__
  #define strcasecmp strcmp
 #endif
@@ -85,7 +87,7 @@ FCEUFILE * FCEU_fopen(const char *path, const char *ipsfn,
       fceufp->fp = MakeMemWrapBuffer(path, 0, buffer, bufsize);
    else
    {
-      void *t = fopen(path, mode);
+      void *t = fopen_utf8(path, mode);
 
       if (!t)
       {

From e14c20b02afca53bfe6dfd051afe6532523eb948 Mon Sep 17 00:00:00 2001
From: tim942 <75698946+tim942@users.noreply.github.com>
Date: Wed, 28 Apr 2021 18:15:10 -0500
Subject: [PATCH 109/295] Update Aspect Ratio

Updated aspect ratio selection from a boolean to a float with a Pixel Perfect option
---
 src/drivers/libretro/libretro.c | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 792f89c..39263fc 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -56,6 +56,7 @@
 #define NES_HEIGHT  240
 #define NES_8_7_PAR  ((width * (8.0 / 7.0)) / height)
 #define NES_4_3      ((width / (height * (256.0 / 240.0))) * 4.0 / 3.0)
+#define NES_PP       ((width / (height * (256.0 / 240.0))) * 16.0 / 15.0)
 
 #if defined(_3DS)
 void* linearMemAlign(size_t size, size_t alignment);
@@ -81,7 +82,7 @@ static bool crop_overscan_v;
 #endif
 
 static bool use_raw_palette;
-static bool use_par;
+static int aspect_ratio_par;
 
 /*
  * Flags to keep track of whether turbo
@@ -957,6 +958,16 @@ void retro_get_system_info(struct retro_system_info *info)
    info->block_extract    = false;
 }
 
+static float get_aspect_ratio(unsigned width, unsigned height)
+{
+  if (aspect_ratio_par == 2)
+    return NES_4_3;
+  else if (aspect_ratio_par == 3)
+    return NES_PP;
+  else
+    return NES_8_7_PAR;
+}
+
 void retro_get_system_av_info(struct retro_system_av_info *info)
 {
 #ifdef PSP
@@ -975,7 +986,7 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
 #endif
    info->geometry.base_height = height;
    info->geometry.max_height = NES_HEIGHT;
-   info->geometry.aspect_ratio = (float)(use_par ? NES_8_7_PAR : NES_4_3);
+   info->geometry.aspect_ratio = get_aspect_ratio(width, height);
    info->timing.sample_rate = (float)sndsamplerate;
    if (FSettings.PAL || dendy)
       info->timing.fps = 838977920.0/16777215.0;
@@ -1347,12 +1358,16 @@ static void check_variables(bool startup)
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
-      bool newval = (!strcmp(var.value, "8:7 PAR"));
-      if (newval != use_par)
-      {
-         use_par = newval;
-         audio_video_updated = 1;
+      unsigned oldval = aspect_ratio_par;
+      if (!strcmp(var.value, "8:7 PAR")) {
+        aspect_ratio_par = 1;
+      } else if (!strcmp(var.value, "4:3")) {
+        aspect_ratio_par = 2;
+      } else if (!strcmp(var.value, "PP")) {
+        aspect_ratio_par = 3;
       }
+     if (aspect_ratio_par != oldval)
+       audio_video_updated = 1;
    }
 
    var.key = "fceumm_turbo_enable";

From 39bce271945817b3aef10e33b6356fce64b1277d Mon Sep 17 00:00:00 2001
From: tim942 <75698946+tim942@users.noreply.github.com>
Date: Wed, 28 Apr 2021 18:20:30 -0500
Subject: [PATCH 110/295] Update libretro_core_options.h

Adding Pixel Perfect option
---
 src/drivers/libretro/libretro_core_options.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/drivers/libretro/libretro_core_options.h b/src/drivers/libretro/libretro_core_options.h
index f0b89c4..fe35d72 100644
--- a/src/drivers/libretro/libretro_core_options.h
+++ b/src/drivers/libretro/libretro_core_options.h
@@ -128,6 +128,7 @@ struct retro_core_option_definition option_defs_common[] = {
       {
          { "8:7 PAR", NULL },
          { "4:3",     NULL },
+         { "PP", NULL },
          { NULL, NULL},
       },
       "8:7 PAR",

From 3cc9c323066546a095e99855445b1bea1af9fd84 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 26 May 2021 20:19:25 +0200
Subject: [PATCH 111/295] Use submappers and apply latest hardware findings.
 Use a heuristic to determine whether to change the DIP switch on every reset.

---
 src/boards/fk23c.c | 480 ++++++++++++++++++++-------------------------
 1 file changed, 212 insertions(+), 268 deletions(-)

diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c
index 9f39bee..cda8cf8 100644
--- a/src/boards/fk23c.c
+++ b/src/boards/fk23c.c
@@ -19,92 +19,32 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-/* BMC-FK23C (no WRAM, no DIP switch)
- * BMC-FK23CA (no WRAM, with DIP switch)
- * BMC-Super24in1SC03 (functional duplicate of BMC-FK23C)
- * WAIXING-FS005 (alternative name: Bensheng BS-001) (32 KiB battery-backed WRAM, 8 KiB of CHR-RAM, no DIP switch)
- * WAIXING-FS006 (optional 8 KiB battery-backed WRAM, optional 8 KiB of CHR-RAM, no DIP switch)
+/*	Mappers:
+	176 - Standard
+	523 - Jncota KT-xxx (1 KiB->2 KiB, 2 KiB->4 KiB CHR, hard-wired nametable mirroring)	
 
- * Three incompatible subtypes exist that do not correspond to these UNIF board names. No submappers have been proposed, as the subtypes can be easily discerned heuristically by looking at ROM sizes:
-
- * Subtype 0, ROM size other than specified below: boot with Extended MMC3 mode disabled (boots in first 512 KiB of PRG-ROM regardless of ROM size)
- * Subtype 1, 1024 KiB PRG-ROM, 1024 KiB CHR-ROM: boot with Extended MMC3 mode enabled (boots in last 512 KiB of the first 2 MiB of PRG-ROM)
- * Subtype 2, 8192 or more KiB PRG-ROM, no CHR-ROM: Like Subtype 0, but MMC3 registers $46 and $47 swapped.
- */
-
-/*
-Mode Register ($5xx0)
-7654 3210
----- ----
-PCTm PMMM
-|||| ||||
-|||| |+++- Select PRG Banking Mode (ignored in Extended MMC3 Mode)
-|||| |      0: MMC3 PRG Mode, 512 KiB Outer PRG Bank Size
-|||| |      1: MMC3 PRG Mode, 256 KiB Outer PRG Bank Size
-|||| |      2: MMC3 PRG Mode, 128 KiB Outer PRG Bank Size
-|||| |      3: NROM-128 PRG Mode, 16 KiB PRG at $8000-$BFFF mirrored at $C000-$FFFF
-|||| |      4: NROM-256 PRG Mode, 32 KiB PRG at $8000-$FFFF
-|||| |      5-7: Never used
-|||| +---- PRG Base A21
-|||+------ Select Outer CHR Bank Size
-|||         0: In MMC3 CHR Mode: 256 KiB
-|||            In CNROM CHR Mode: 32 KiB
-|||         1: In MMC3 CHR Mode: 128 KiB
-|||            In CNROM CHR Mode: 16 KiB
-||+------- Select CHR Memory Type
-||          0: CHR-ROM
-||          1: CHR-RAM
-|+-------- CHR Mode
-|           0: MMC3 CHR Mode
-|           1: NROM/CNROM CHR Mode
-+--------- PRG Base A22
-
-Power-on value: $00
-
-PRG Base Register ($5xx1)
-Mask: $5xx3, x determined by solder pad setting
-
-7654 3210
----- ----
-.PPP PPPP
- ||| ||||
- +++-++++- PRG Base A20..A14
-
-Power-on value: $00
-CHR Base Register ($5xx2)
-Mask: $5xx3, x determined by solder pad setting
-
-7654 3210
----- ----
-ccdC CCCC
-|||| ||||
-++++-++++- CHR Base A20..A13
-||+------- PRG Base A25
-++-------- PRG Base A24..A23
-
-Power-on value: $00
-Writing to the CHR Base Register also resets the CNROM latch.
-
-Extended Mode Register ($5xx3)
-Mask: $5xx3, x determined by solder pad setting
-
-7654 3210
----- ----
-.C.. .CE.
- |    || 
- |    |+- Extended MMC3 Mode
- |    |    0: disable
- |    |    1: enable
- +----+-- Select NROM/CNROM CHR Mode
-           0: NROM
-           1: CNROM
-
-Power-on value: $02 (Submapper 1), $00 (otherwise)
+	Submappers:	
+	0 - Standard
+	1 - FK-xxx
+	2 - 外星 FS005/FS006
+	3 - JX9003B
+	4 - GameStar Smart Genius Deluxe
+	
+	Verified on real hardware:
+	"Legend of Kage" sets CNROM latch 1 and switches between CHR bank 0 and 1 using 5FF2, causing the wrong bank (1 instead of 0) during gameplay.
+	
+	Heuristics for NES 1.0:
+	- 1 MiB PRG+1 MiB CHR     => Submapper 1
+	- 256 KiB PRG+128 KiB CHR => Submapper 1
+	- 128 KiB PRG+64 KiB CHR  => Submapper 1
+	- A001.5 ever set         => Submapper 2
+	- 5FF5/5FF6 written-to    => Submapper 3
+	
+	Heuristic for detecting whether the DIP switch should be changed on every soft reset:
+	The first write to the $5xxx range is to $501x           => ROM always addresses $501x; changing the DIP switch on reset would break the emulation after reset, so don't do it.
+	The first write to the $5xxx range is to $5020 or higher => ROM either uses a DIP switch or writes to $5FFx for safety; changing the DIP switch on reset is possible.
 */
 
-/* 2020-3-14 - Refactoring based on latest sources */
-/* TODO: Add database for ines 1.0 headers */
-
 #include "mapinc.h"
 #include "../ines.h"
 
@@ -113,7 +53,7 @@ static uint8 *CHRRAM          = NULL;
 static uint32 WRAMSIZE        = 0;
 static uint32 CHRRAMSIZE      = 0;
 
-static uint8 fk23_regs[4]     = { 0 };
+static uint8 fk23_regs[8]     = { 0 }; /* JX9003B has eight registers, all others have four */
 static uint8 mmc3_regs[12]    = { 0 };
 static uint8 mmc3_ctrl        = 0;
 static uint8 mmc3_mirr        = 0;
@@ -122,19 +62,17 @@ static uint8 irq_count        = 0;
 static uint8 irq_latch        = 0;
 static uint8 irq_enabled      = 0;
 static uint8 irq_reload       = 0;
-static uint8 cnrom_chr        = 0;
+static uint8 latch            = 0;
 static uint8 dipswitch        = 0;
-static uint8 subType          = 0;
-
-/* enable dipswitch settings for fk23/fk23ca,
- * switchable on reset. Can enable different multicart-modes
- * depending on address */
-static uint8 dipsw_enable    = 0;
+static uint8 subType          = 0; /* NES 2.0 Submapper, denoting PCB variants */
+static uint8 jncota523        = 0; /* Jncota board with unusual wiring that turns 1 KiB CHR banks into 2 KiB banks, and has hard-wired nametable mirroring. */
+static uint8 dipsw_enable     = 0; /* Change the address mask on every reset? */
+static uint8 after_power      = 0; /* Used for detecting whether a DIP switch is used or not (see above) */
 
 static SFORMAT StateRegs[] = {
-   { fk23_regs,               4, "EXPR" },
+   { fk23_regs,               8, "EXPR" },
    { mmc3_regs,              12, "M3RG" },
-   { &cnrom_chr,              1, "CCHR" },
+   { &latch,                  1, "LATC" },
    { &dipswitch,              1, "DPSW" },
    { &mmc3_ctrl,              1, "M3CT" },
    { &mmc3_mirr,              1, "M3MR" },
@@ -147,14 +85,17 @@ static SFORMAT StateRegs[] = {
    { 0 }
 };
 
-#define INVERT_PRG            (mmc3_ctrl & 0x40)
-#define INVERT_CHR            (mmc3_ctrl & 0x80)
-#define WRAM_ENABLED          (mmc3_wram & 0x80)
-#define WRAM_EXTENDED         (mmc3_wram & 0x20)
-#define FK23_ENABLED          (mmc3_wram & 0x40)
-#define MMC3_EXTENDED         (fk23_regs[3] & 0x02)
-#define CHR_CNROM_MODE        (fk23_regs[0] & 0x40)
-#define CHR_OUTER_BANK_SIZE   (fk23_regs[0] & 0x10)
+#define INVERT_PRG          !!(mmc3_ctrl & 0x40)
+#define INVERT_CHR          !!(mmc3_ctrl & 0x80)
+#define WRAM_ENABLED        !!(mmc3_wram & 0x80)
+#define WRAM_EXTENDED      (!!(mmc3_wram & 0x20) && subType == 2)    /* Extended A001 register. Only available on FS005 PCB. */
+#define FK23_ENABLED       (!!(mmc3_wram & 0x40) || !WRAM_EXTENDED)  /* Enable or disable registers in the $5xxx range. Only available on FS005 PCB. */
+#define PRG_MODE              ( fk23_regs[0] & 0x07)
+#define MMC3_EXTENDED       !!( fk23_regs[3] & 0x02)                 /* Extended MMC3 mode, adding extra registers for switching the normally-fixed PRG banks C and E and for eight independent 1 KiB CHR banks. Only available on FK- and FS005 PCBs. */
+#define CHR_8K_MODE         !!( fk23_regs[0] & 0x40)                 /* MMC3 CHR registers are ignored, apply outer bank only, and CNROM latch if it exists */
+#define CHR_CNROM_MODE        (~fk23_regs[0] & 0x20 && subType == 1) /* Only subtype 1 has a CNROM latch, which can be disabled */
+#define CHR_OUTER_BANK_SIZE !!( fk23_regs[0] & 0x10)                 /* Switch between 256 and 128 KiB CHR, or 32 and 16 KiB CHR in CNROM mode */
+#define CHR_MIXED           !!(WRAM_EXTENDED && mmc3_wram &0x04)     /* First 8 KiB of CHR address space are RAM, then ROM */
 
 static void cwrap(uint32 A, uint32 V)
 {
@@ -166,20 +107,18 @@ static void cwrap(uint32 A, uint32 V)
    else if (CHRRAMSIZE && fk23_regs[0] & 0x20)
       bank = 0x10;
 
-   if (WRAM_EXTENDED) {
-      if ((mmc3_wram & 0x04) && V < 8) bank = 0x10; /* first 8K of chr bank is ram */
-      else bank = 0;
-   }
+   if (CHR_MIXED && V < 8) bank = 0x10; /* first 8K of chr bank is RAM */
 
    setchr1r(bank, A, V);
 }
 
 static void SyncCHR(void)
 {
-   if (CHR_CNROM_MODE)
+   uint32 outer = fk23_regs[2] | (subType == 3? (fk23_regs[6] << 8): 0);    /* Outer 8 KiB CHR bank. Subtype 3 has an MSB register providing more bits. */
+   if (CHR_8K_MODE)
    {
-      uint32 mask             = (fk23_regs[3] & 0x46) ? (CHR_OUTER_BANK_SIZE ? 0x01 : 0x03) : 0;
-      uint32 bank             = (fk23_regs[2] | (cnrom_chr & mask)) << 3;
+      uint32 mask = (CHR_CNROM_MODE? (CHR_OUTER_BANK_SIZE? 0x01: 0x03): 0x00);
+      uint32 bank = ((outer & ~mask) | (latch & mask)) << 3; /* Address bits are never OR'd; they either come from the outer bank or from the CNROM latch. */
 
       cwrap(0x0000, bank + 0);
       cwrap(0x0400, bank + 1);
@@ -193,78 +132,95 @@ static void SyncCHR(void)
    }
    else
    {
-      uint32 cbase            = (INVERT_CHR ? 0x1000 : 0);
-      uint32 outer            = (fk23_regs[2] << 3);
-      uint32 cmask            = (CHR_OUTER_BANK_SIZE ? 0x7F : 0xFF);
+      uint32 cbase = (INVERT_CHR? 0x1000: 0);
+      uint32 mask  = (CHR_OUTER_BANK_SIZE? 0x7F: 0xFF);
+             outer = (outer << 3) & ~mask; /* From 8 KiB to 1 KiB banks. Address bits are never OR'd; they either come from the outer bank or from the MMC3. */
 
       if (MMC3_EXTENDED)
       {
-         cwrap(cbase ^ 0x0000, mmc3_regs[0]  | outer);
-         cwrap(cbase ^ 0x0400, mmc3_regs[10] | outer);
-         cwrap(cbase ^ 0x0800, mmc3_regs[1]  | outer);
-         cwrap(cbase ^ 0x0c00, mmc3_regs[11] | outer);
+         cwrap(cbase ^ 0x0000, mmc3_regs[0]  &mask | outer);
+         cwrap(cbase ^ 0x0400, mmc3_regs[10] &mask | outer);
+         cwrap(cbase ^ 0x0800, mmc3_regs[1]  &mask | outer);
+         cwrap(cbase ^ 0x0c00, mmc3_regs[11] &mask | outer);
 
-         cwrap(cbase ^ 0x1000, mmc3_regs[2] | outer);
-         cwrap(cbase ^ 0x1400, mmc3_regs[3] | outer);
-         cwrap(cbase ^ 0x1800, mmc3_regs[4] | outer);
-         cwrap(cbase ^ 0x1c00, mmc3_regs[5] | outer);
+         cwrap(cbase ^ 0x1000, mmc3_regs[2]  &mask | outer);
+         cwrap(cbase ^ 0x1400, mmc3_regs[3]  &mask | outer);
+         cwrap(cbase ^ 0x1800, mmc3_regs[4]  &mask | outer);
+         cwrap(cbase ^ 0x1c00, mmc3_regs[5]  &mask | outer);
       }
       else
       {
-         cwrap(cbase ^ 0x0000, ((mmc3_regs[0] & cmask) & 0xFE) | outer);
-         cwrap(cbase ^ 0x0400, ((mmc3_regs[0] & cmask) | 0x01) | outer);
-         cwrap(cbase ^ 0x0800, ((mmc3_regs[1] & cmask) & 0xFE) | outer);
-         cwrap(cbase ^ 0x0C00, ((mmc3_regs[1] & cmask) | 0x01) | outer);
+         cwrap(cbase ^ 0x0000,(mmc3_regs[0] & 0xFE) & mask | outer);
+         cwrap(cbase ^ 0x0400,(mmc3_regs[0] | 0x01) & mask | outer);
+         cwrap(cbase ^ 0x0800,(mmc3_regs[1] & 0xFE) & mask | outer);
+         cwrap(cbase ^ 0x0C00,(mmc3_regs[1] | 0x01) & mask | outer);
 
-         cwrap(cbase ^ 0x1000, (mmc3_regs[2] & cmask) | outer);
-         cwrap(cbase ^ 0x1400, (mmc3_regs[3] & cmask) | outer);
-         cwrap(cbase ^ 0x1800, (mmc3_regs[4] & cmask) | outer);
-         cwrap(cbase ^ 0x1c00, (mmc3_regs[5] & cmask) | outer);
+         cwrap(cbase ^ 0x1000, mmc3_regs[2]         & mask | outer);
+         cwrap(cbase ^ 0x1400, mmc3_regs[3]         & mask | outer);
+         cwrap(cbase ^ 0x1800, mmc3_regs[4]         & mask | outer);
+         cwrap(cbase ^ 0x1c00, mmc3_regs[5]         & mask | outer);
       }
    }
 }
 
 static void SyncPRG(void)
 {
-   uint32 prg_mode            = (fk23_regs[0] & 7);
-   uint32 prg_base            = (fk23_regs[1] & 0x07F) | ((fk23_regs[0] << 4) & 0x080) |
-         ((fk23_regs[0] << 1) & 0x100) | ((fk23_regs[2] << 3) & 0x600) |
-         ((fk23_regs[2] << 6) & 0x800);
-
-   switch (prg_mode)
+   uint32 mask = 0x3F >> PRG_MODE;        /* For PRG modes 0-2, the mode# decides how many bits of the inner 8 KiB bank are used. This is greatly relevant to map the correct bank that contains the reset vectors. */
+   uint32 prg_base = fk23_regs[1] & 0x7F; /* The bits for the first 2 MiB are the same between all the variants. */
+   switch (subType)
    {
-   case 4:
-      setprg32(0x8000, (prg_base >> 1));
-      break;
-   case 3:
-      setprg16(0x8000, prg_base);
-      setprg16(0xC000, prg_base);
-      break;
-   case 0:
-   case 1:
-   case 2:
-   {
-      uint32 cbase            = (INVERT_PRG ? 0x4000 : 0);
-      uint32 mask             = (0x3F >> prg_mode);
-
-      prg_base <<= 1;
-
-      if (MMC3_EXTENDED)
-      {
-         setprg8(0x8000 ^ cbase, mmc3_regs[6] | prg_base);
-         setprg8(0xA000,         mmc3_regs[7] | prg_base);
-         setprg8(0xC000 ^ cbase, mmc3_regs[8] | prg_base);
-         setprg8(0xE000,         mmc3_regs[9] | prg_base);
-      }
-      else
-      {
-         setprg8(0x8000 ^ cbase, (mmc3_regs[6] & mask) | (prg_base & ~mask));
-         setprg8(0xA000,         (mmc3_regs[7] & mask) | (prg_base & ~mask));
-         setprg8(0xC000 ^ cbase, (0xFE & mask) | (prg_base & ~mask));
-         setprg8(0xE000,         (0xFF & mask) | (prg_base & ~mask));
-      }
-      break;
+      case 1: /* FK-xxx */
+         if (PRG_MODE == 0) mask = 0xFF;  /* Mode 0 allows the MMC3 to address 2 MiB rather than the usual 512 KiB. */
+	 break;
+      case 2: /* FS005 */
+         prg_base |= fk23_regs[0] << 4 & 0x080 | fk23_regs[0] << 1 & 0x100 | fk23_regs[2] << 3 & 0x600 | fk23_regs[2] << 6 & 0x800;   
+	 break;
+      case 3: /* JX9003B */
+         if (PRG_MODE == 0) mask = 0xFF;  /* Mode 0 allows the MMC3 to address 2 MiB rather than the usual 512 KiB. */
+         prg_base |= fk23_regs[5] << 7;
+	 break;
+      case 4: /* GameStar Smart Genius Deluxe */
+         prg_base |= fk23_regs[2] & 0x80;
+	 break;
    }
+
+   switch (PRG_MODE)
+   {
+      case 0: /* MMC3 with 512 KiB or 2 MiB addressable */
+      case 1: /* MMC3 with 256 KiB addressable */
+      case 2: /* MMC3 with 128 KiB addressable */
+      {
+         uint32 cbase = (INVERT_PRG ? 0x4000 : 0);
+      
+         prg_base =(prg_base << 1) & ~mask; /* from 16 to 8 KiB. Address bits are never OR'd; they either come from the outer bank or from the MMC3.  */
+      
+         if (MMC3_EXTENDED)
+         {
+            setprg8(0x8000 ^ cbase, mmc3_regs[6] & mask | prg_base);
+            setprg8(0xA000,         mmc3_regs[7] & mask | prg_base);
+            setprg8(0xC000 ^ cbase, mmc3_regs[8] & mask | prg_base);
+            setprg8(0xE000,         mmc3_regs[9] & mask | prg_base);
+         }
+         else
+         {
+            setprg8(0x8000 ^ cbase, (mmc3_regs[6] & mask) | prg_base);
+            setprg8(0xA000,         (mmc3_regs[7] & mask) | prg_base);
+            setprg8(0xC000 ^ cbase, (0xFE         & mask) | prg_base);
+            setprg8(0xE000,         (0xFF         & mask) | prg_base);
+         }
+         break;
+      }
+      case 3: /* NROM-128 */
+         setprg16(0x8000, prg_base);
+         setprg16(0xC000, prg_base);
+         break;
+      case 4: /* NROM-256 */
+         setprg32(0x8000, (prg_base >> 1));
+         break;
+      case 5: /* UNROM */
+         setprg16(0x8000, latch & 0x07 | prg_base &~0x07);
+	 setprg16(0xC000,         0x07 | prg_base       );
+	 break;
    }
 }
 
@@ -275,7 +231,6 @@ static void SyncWRAM(void)
    {
       if (WRAM_EXTENDED)
       {
-         /* FIXME:this does not look normal, but it works, $5000-$5fff */
          setprg8r(0x10, 0x4000, (mmc3_wram & 0x03) + 1);
          setprg8r(0x10, 0x6000, mmc3_wram & 0x03);
       }
@@ -286,7 +241,7 @@ static void SyncWRAM(void)
 
 static void SyncMIR(void)
 {
-   switch (mmc3_mirr & (WRAM_EXTENDED ? 0x03 : 0x01))
+   switch (mmc3_mirr & (subType == 2? 0x03 : 0x01))
    {
    case 0: setmirror(MI_V); break;
    case 1: setmirror(MI_H); break;
@@ -305,11 +260,14 @@ static void Sync(void)
 
 static DECLFW(Write5000)
 {
-   if (((WRAM_EXTENDED == 0) || FK23_ENABLED) && (A & (0x10 << dipswitch)))
+   if (after_power && A > 0x5010 && A != 0x5FF3) /* Ignore writes from $5000-$500F, in particular to $5008, but not $5FF3 */
+   { 
+      after_power = 0;
+      dipsw_enable = A >= 0x5020;   /* The DIP switch change on soft-reset is enabled if the first write after power-on is not to $501x */
+   }
+   if (FK23_ENABLED && (A & (0x10 << dipswitch)))
    {
-      fk23_regs[A & 3] = V;
-      if ((A & 3) == 2)
-         cnrom_chr = 0;
+      fk23_regs[A & (subType == 3? 7: 3)] = V;
       SyncPRG();
       SyncCHR();
    }
@@ -320,93 +278,79 @@ static DECLFW(Write5000)
 
 static DECLFW(Write8000)
 {
-   switch (A & 0xF000)
+   latch = V;
+   if (CHR_8K_MODE && CHR_CNROM_MODE) SyncCHR(); /* CNROM latch updated */
+   if (PRG_MODE == 5) SyncPRG(); /* UNROM latch has been updated */
+   
+   switch (A & 0xE001)
    {
-   case 0x8000:
-   case 0x9000:
-   case 0xC000:
-   case 0xD000:
-   case 0xE000:
-   case 0xF000:
-      if (!CHR_CNROM_MODE)
-         break;
-      cnrom_chr = V & 0x03;
-      if ((fk23_regs[0] & 0x07) == 0x03)
-         cnrom_chr = 0;
-
-      SyncCHR();
-      break;
-   default:
-      break;
-   }
-
-   switch (A & 0xF001)
-   {
-   case 0x8000:
-   {
-      uint8 old_ctrl = mmc3_ctrl;
-
-      /* Subtype 2, 8192 or more KiB PRG-ROM, no CHR-ROM: Like Subtype 0,
-       * but MMC3 registers $46 and $47 swapped. */
-      if (subType == 2)
+      case 0x8000:
       {
-         if (V == 0x46)
-            V = 0x47;
-         else if (V == 0x47)
-            V = 0x46;
-      }
-
-      mmc3_ctrl = V;
-
-      if (INVERT_PRG != (old_ctrl & 0x40))
-         SyncPRG();
-
-      if (INVERT_CHR != (old_ctrl & 0x80))
-         SyncCHR();
-
-      break;
-   }
-   case 0x8001:
-   {
-      uint8 ctrl_mask = MMC3_EXTENDED ? 0x0F : 0x07;
-
-      if ((mmc3_ctrl & ctrl_mask) < 12)
-      {
-         mmc3_regs[mmc3_ctrl & ctrl_mask] = V;
-
-         if (((mmc3_ctrl & ctrl_mask) < 6) || ((mmc3_ctrl & ctrl_mask) >= 10))
-            SyncCHR();
-         else
+         if (A & 2) return; /* Confirmed on real hardware: writes to 8002 and 8003, or 9FFE and 9FFF, are ignored. Needed for Dr. Mario on some of the "bouncing ball" multis. */
+         uint8 old_ctrl = mmc3_ctrl;
+      
+         /* Subtype 2, 8192 or more KiB PRG-ROM, no CHR-ROM: Like Subtype 0,
+          * but MMC3 registers $46 and $47 swapped. */
+         if (subType == 2)
+         {
+            if (V == 0x46)
+               V = 0x47;
+            else if (V == 0x47)
+               V = 0x46;
+         }
+      
+         mmc3_ctrl = V;
+      
+         if (INVERT_PRG != (old_ctrl & 0x40))
             SyncPRG();
+      
+         if (INVERT_CHR != (old_ctrl & 0x80))
+            SyncCHR();
+      
+         break;
       }
-      break;
-   }
-   case 0xA000:
-      mmc3_mirr = V;
-      SyncMIR();
-      break;
-   case 0xA001:
-      /* ignore bits when ram config register is disabled */
-      if ((V & 0x20) == 0)
-         V &= 0xC0;
-      mmc3_wram = V;
-      Sync();
-      break;
-   case 0xC000:
-      irq_latch = V;
-      break;
-   case 0xC001:
-      irq_reload = 1;
-      break;
-   case 0xE000:
-      X6502_IRQEnd(FCEU_IQEXT);
-      irq_enabled = 0;
-      break;
-   case 0xE001:
-      irq_enabled = 1;
-      break;
-   default:
-      break;
+      case 0x8001:
+      {
+         if (A & 2) return; /* Confirmed on real hardware: writes to 8002 and 8003, or 9FFE and 9FFF, are ignored. Needed for Dr. Mario on some of the "bouncing ball" multis. */
+         uint8 ctrl_mask = MMC3_EXTENDED ? 0x0F : 0x07;
+      
+         if ((mmc3_ctrl & ctrl_mask) < 12)
+         {
+            mmc3_regs[mmc3_ctrl & ctrl_mask] = V;
+      
+            if (((mmc3_ctrl & ctrl_mask) < 6) || ((mmc3_ctrl & ctrl_mask) >= 10))
+               SyncCHR();
+            else
+               SyncPRG();
+         }
+         break;
+      }
+      case 0xA000:
+         mmc3_mirr = V;
+         SyncMIR();
+         break;
+      case 0xA001:
+         /* ignore bits when ram config register is disabled */
+         if ((V & 0x20) == 0)
+            V &= 0xC0;
+         mmc3_wram = V;
+         Sync();
+         break;
+      case 0xC000:
+         irq_latch = V;
+         break;
+      case 0xC001:
+         irq_reload = 1;
+         break;
+      case 0xE000:
+         X6502_IRQEnd(FCEU_IQEXT);
+         irq_enabled = 0;
+         break;
+      case 0xE001:
+         irq_enabled = 1;
+         break;
+      default:
+         break;
    }
 }
 
@@ -447,14 +391,13 @@ static void Reset(void)
    mmc3_wram      = 0x80;
    mmc3_ctrl      = mmc3_mirr = irq_count = irq_latch = irq_enabled = 0;
 
-   if (subType == 1)
-      fk23_regs[1] = 0x20;
-
    Sync();
 }
 
 static void Power(void)
 {
+   dipsw_enable   = 0; /* Initially zero. Will be set to 1 according to the described heuristic, causing the DIP switch to be increased on the next soft reset .*/
+   after_power    = 1;
    fk23_regs[0]   = fk23_regs[1] = fk23_regs[2] = fk23_regs[3] = 0;
    mmc3_regs[0]   = 0;
    mmc3_regs[1]   = 2;
@@ -471,13 +414,10 @@ static void Power(void)
    mmc3_wram      = 0x80;
    mmc3_ctrl      = mmc3_mirr = irq_count = irq_latch = irq_enabled = 0;
 
-   if (subType == 1)
-      fk23_regs[1] = 0x20;
-
    Sync();
 
    SetReadHandler(0x8000, 0xFFFF, CartBR);
-   SetWriteHandler(0x5000, 0x5fff, Write5000);
+   SetWriteHandler(0x5000, 0x5FFF, Write5000);
    SetWriteHandler(0x8000, 0xFFFF, Write8000);
 
    if (WRAMSIZE)
@@ -506,7 +446,6 @@ static void StateRestore(int version)
 
 void GenBMCFK23C_Init(CartInfo *info)
 {
-   dipsw_enable      = 0;
 
    info->Power       = Power;
    info->Reset       = Reset;
@@ -538,11 +477,18 @@ void GenBMCFK23C_Init(CartInfo *info)
       }
    }
 
-   subType = 0;
-   if (((ROM_size * 16) == 1024) && ((VROM_size * 8) == 1024))
-      subType = 1;
-   else if (UNIFchrrama && ((ROM_size << 4) >= 8192))
-      subType = 2;
+   if (info->iNES2)
+   {
+      subType = info->submapper;
+   }
+   else
+   {
+      subType = 0;
+      if (((ROM_size * 16) == 1024) && ((VROM_size * 8) == 1024))
+         subType = 1;
+      else if (UNIFchrrama && ((ROM_size << 4) >= 8192))
+         subType = 2;
+   }
 }
 
 /* generic entry point for mapper 176 / bmcfk23c carts */
@@ -572,7 +518,6 @@ void BMCFK23C_Init(CartInfo *info) {
    }
 
    GenBMCFK23C_Init(info);
-   dipsw_enable = 1;
 }
 
 /* UNIF Boards, declares so we can for chr mixed mode size and wram if any */
@@ -586,7 +531,6 @@ void BMCFK23CA_Init(CartInfo *info)
    WRAMSIZE = 8 * 1024;
 
    GenBMCFK23C_Init(info);
-   dipsw_enable = 1;
 }
 
 /* BMC-Super24in1SC03 */

From b02fa46cb131a95a56b8a3940d15b012f68d1dda Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 26 May 2021 20:36:06 +0200
Subject: [PATCH 112/295] Add support for Jncota variant, mapper 523

---
 src/boards/fk23c.c | 49 +++++++++++++++++++++++++++++++++-------------
 src/ines.c         |  1 +
 src/ines.h         |  1 +
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c
index cda8cf8..2a4e8f2 100644
--- a/src/boards/fk23c.c
+++ b/src/boards/fk23c.c
@@ -21,7 +21,7 @@
 
 /*	Mappers:
 	176 - Standard
-	523 - Jncota KT-xxx (1 KiB->2 KiB, 2 KiB->4 KiB CHR, hard-wired nametable mirroring)	
+	523 - Jncota KT-xxx, re-release of 封神榜꞉ 伏魔三太子: 1 KiB->2 KiB, 2 KiB->4 KiB CHR, hard-wired nametable mirroring)
 
 	Submappers:	
 	0 - Standard
@@ -101,15 +101,22 @@ static void cwrap(uint32 A, uint32 V)
 {
    int bank = 0;
 
-   /* some workaround for chr rom / ram access */
-   if (!VROM_size)
-      bank = 0;
-   else if (CHRRAMSIZE && fk23_regs[0] & 0x20)
-      bank = 0x10;
-
-   if (CHR_MIXED && V < 8) bank = 0x10; /* first 8K of chr bank is RAM */
-
-   setchr1r(bank, A, V);
+   if (jncota523)
+   {
+      if (~A &0x0400) setchr2r(bank, A, V);
+   }
+   else
+   {
+      /* some workaround for chr rom / ram access */
+      if (!VROM_size)
+         bank = 0;
+      else if (CHRRAMSIZE && fk23_regs[0] & 0x20)
+         bank = 0x10;
+      
+      if (CHR_MIXED && V < 8) bank = 0x10; /* first 8K of chr bank is RAM */
+      
+      setchr1r(bank, A, V);
+   }
 }
 
 static void SyncCHR(void)
@@ -241,12 +248,15 @@ static void SyncWRAM(void)
 
 static void SyncMIR(void)
 {
+   if (jncota523) /* Jncota board has hard-wired mirroring */
+      return;
+   else
    switch (mmc3_mirr & (subType == 2? 0x03 : 0x01))
    {
-   case 0: setmirror(MI_V); break;
-   case 1: setmirror(MI_H); break;
-   case 2: setmirror(MI_0); break;
-   case 3: setmirror(MI_1); break;
+      case 0: setmirror(MI_V); break;
+      case 1: setmirror(MI_H); break;
+      case 2: setmirror(MI_0); break;
+      case 3: setmirror(MI_1); break;
    }
 }
 
@@ -517,6 +527,7 @@ void BMCFK23C_Init(CartInfo *info) {
          WRAMSIZE = 8 * 1024;
    }
 
+   jncota523 = 0;
    GenBMCFK23C_Init(info);
 }
 
@@ -530,6 +541,7 @@ void BMCFK23CA_Init(CartInfo *info)
 
    WRAMSIZE = 8 * 1024;
 
+   jncota523 = 0;
    GenBMCFK23C_Init(info);
 }
 
@@ -539,6 +551,7 @@ void Super24_Init(CartInfo *info) {
    if (!UNIFchrrama)
       CHRRAMSIZE = 8 * 1024;
 
+   jncota523 = 0;
    GenBMCFK23C_Init(info);
 }
 
@@ -551,5 +564,13 @@ void WAIXINGFS005_Init(CartInfo *info)
 
    WRAMSIZE = 32 * 1024;
 
+   jncota523 = 0;
+   GenBMCFK23C_Init(info);
+}
+
+void Mapper523_Init(CartInfo *info)
+{
+   jncota523 = 1;
+   WRAMSIZE = 8 * 1024;
    GenBMCFK23C_Init(info);
 }
diff --git a/src/ines.c b/src/ines.c
index 449cc2d..8f299c1 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -793,6 +793,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "EH8813A",                  519, UNLEH8813A_Init        )
 	INES_BOARD( "DREAMTECH01",              521, DreamTech01_Init       )
 	INES_BOARD( "LH10",                     522, LH10_Init              )
+	INES_BOARD( "Jncota KT-???",            523, Mapper523_Init         )
 	INES_BOARD( "900218",                   524, BTL900218_Init         )
 	INES_BOARD( "KS7021A",                  525, UNLKS7021A_Init        )
 	INES_BOARD( "BJ-56",                    526, UNLBJ56_Init           )
diff --git a/src/ines.h b/src/ines.h
index ad0556e..94912ea 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -284,6 +284,7 @@ void Mapper421_Init(CartInfo *);
 void Mapper422_Init(CartInfo *);
 void Mapper428_Init(CartInfo *);
 void Mapper516_Init(CartInfo *);
+void Mapper523_Init(CartInfo *);
 void Mapper533_Init(CartInfo *);
 void Mapper534_Init(CartInfo *);
 void Mapper538_Init(CartInfo *);

From ce2d55c3e83710cecad661ff48b7011225f3d435 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Fri, 28 May 2021 21:22:18 +0200
Subject: [PATCH 113/295] Update the database for mapper 176 games. Set the
 iNES2 flag when the submapper field is used.

---
 src/boards/fk23c.c |  151 +++--
 src/ines-correct.h | 1569 +++++++++++++++++++++++---------------------
 src/ines.c         |    3 +-
 src/ines.h         |    1 +
 4 files changed, 931 insertions(+), 793 deletions(-)

diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c
index 2a4e8f2..7f75d46 100644
--- a/src/boards/fk23c.c
+++ b/src/boards/fk23c.c
@@ -406,8 +406,6 @@ static void Reset(void)
 
 static void Power(void)
 {
-   dipsw_enable   = 0; /* Initially zero. Will be set to 1 according to the described heuristic, causing the DIP switch to be increased on the next soft reset .*/
-   after_power    = 1;
    fk23_regs[0]   = fk23_regs[1] = fk23_regs[2] = fk23_regs[3] = 0;
    mmc3_regs[0]   = 0;
    mmc3_regs[1]   = 2;
@@ -454,9 +452,9 @@ static void StateRestore(int version)
    Sync();
 }
 
-void GenBMCFK23C_Init(CartInfo *info)
+void Init(CartInfo *info)
 {
-
+   /* Initialization for iNES and UNIF. subType and dipsw_enable must have been set. */
    info->Power       = Power;
    info->Reset       = Reset;
    info->Close       = Close;
@@ -487,90 +485,121 @@ void GenBMCFK23C_Init(CartInfo *info)
       }
    }
 
+}
+
+void Mapper176_Init(CartInfo *info) { /* .NES file */
+   dipsw_enable = 0;
+   jncota523 = 0;
    if (info->iNES2)
    {
       subType = info->submapper;
-   }
-   else
-   {
-      subType = 0;
-      if (((ROM_size * 16) == 1024) && ((VROM_size * 8) == 1024))
-         subType = 1;
-      else if (UNIFchrrama && ((ROM_size << 4) >= 8192))
-         subType = 2;
-   }
-}
-
-/* generic entry point for mapper 176 / bmcfk23c carts */
-void BMCFK23C_Init(CartInfo *info) {
-   /* prepare ROM params before loading... */
-   if (info->iNES2)
-   {
-      if (!UNIFchrrama)
-         CHRRAMSIZE = info->CHRRamSize + info->CHRRamSaveSize;
+      after_power = subType != 2;  /* FS005 never has DIP switches, the others may have one, so use the heuristic. */
+      CHRRAMSIZE = info->CHRRamSize + info->CHRRamSaveSize;
       WRAMSIZE = info->PRGRamSize + info->PRGRamSaveSize;
    }
    else
    {
-      if (!UNIFchrrama)
-      {
-         /*  Rockman I - VI uses mixed chr rom/ram */
-         if ((ROM_size * 16) == 2048 && (VROM_size * 8) == 512)
-            CHRRAMSIZE = 8 * 1024;
-      }
-
-      /* Waixing boards has 32K battery backed wram */
+      /* Waixing boards have 32K battery backed wram */
       if (info->battery)
+      {
+         subType = 2;
+         after_power = 0;
          WRAMSIZE = 32 * 1024;
+      }
       else
-         /* Always enable WRAM for ines-headered roms, lets see who complains */
+      {
+         /* Always enable WRAM for iNES-headered files */
          WRAMSIZE = 8 * 1024;
+	 
+	 /* Distinguishing subType 1 from subType 0 is important for the correct reset vector location.
+	    It is safe to assume subType 1 except for 1024+512 KiB ROMs. */
+         subType = (ROM_size ==128 && VROM_size ==256 ||  /* 2048+2048 */
+                    ROM_size ==128 && VROM_size ==128 ||  /* 2048+1024 */
+                    ROM_size ==128 && VROM_size ==64  ||  /* 2048+512 */
+                    ROM_size ==128 && VROM_size ==0   ||  /* 2048+0 */
+                    ROM_size ==64  && VROM_size ==64)?    /* 1024+512 */
+                    0: 1;
+		    
+         /* Detect heuristically whether the address mask should be changed on every soft reset */
+         after_power = 1;
+      }
    }
-
-   jncota523 = 0;
-   GenBMCFK23C_Init(info);
+   Init(info);
 }
 
-/* UNIF Boards, declares so we can for chr mixed mode size and wram if any */
-
-void BMCFK23CA_Init(CartInfo *info)
+void BMCFK23C_Init(CartInfo *info)	/* UNIF FK23C */
 {
-   /* can use mixed chr rom/ram */
    if (!UNIFchrrama)
-      CHRRAMSIZE = 8 * 1024;
-
+   {
+      /* Rockman I-VI uses mixed chr rom/ram */
+      if ((ROM_size * 16) == 2048 && (VROM_size * 8) == 512)
+         CHRRAMSIZE = 8 * 1024;
+   }
    WRAMSIZE = 8 * 1024;
 
+   /* UNIF FK23C differs from UNIF FK23CA explicitly by the absence of a DIP switch */
+   dipsw_enable = 0;
+   after_power = 0;
    jncota523 = 0;
-   GenBMCFK23C_Init(info);
+
+   /* The UNIF MAPR tells us nothing about whether it is subtype 0 or 1 */
+   subType = (ROM_size ==128 && VROM_size ==256 ||  /* 2048+2048 */
+              ROM_size ==128 && VROM_size ==128 ||  /* 2048+1024 */
+              ROM_size ==128 && VROM_size ==64  ||  /* 2048+512 */
+              ROM_size ==128 && VROM_size ==0   ||  /* 2048+0 */
+              ROM_size ==64  && VROM_size ==64)?    /* 1024+512 */
+              0: 1;
+   
+   Init(info);
 }
 
-/* BMC-Super24in1SC03 */
-void Super24_Init(CartInfo *info) {
-   /* can use mixed chr rom/ram */
-   if (!UNIFchrrama)
-      CHRRAMSIZE = 8 * 1024;
-
-   jncota523 = 0;
-   GenBMCFK23C_Init(info);
-}
-
-void WAIXINGFS005_Init(CartInfo *info)
+void BMCFK23CA_Init(CartInfo *info)	/* UNIF FK23CA */
 {
-   /* can have 8 or 32 KB battery-backed prg ram
-    * plus 8 KB chr for these boards */
-   if (!UNIFchrrama)
-      CHRRAMSIZE = 8 * 1024;
+   WRAMSIZE = 8 * 1024;
 
+   /* UNIF FK23CA differs from UNIF FK23C explicitly by the presence of a DIP switch */
+   dipsw_enable = 1;
+   after_power = 0;
+   jncota523 = 0;
+   
+   /* The UNIF MAPR tells us nothing about whether it is subtype 0 or 1 */
+   subType = (ROM_size ==128 && VROM_size ==256 ||  /* 2048+2048 */
+              ROM_size ==128 && VROM_size ==128 ||  /* 2048+1024 */
+              ROM_size ==128 && VROM_size ==64  ||  /* 2048+512 */
+              ROM_size ==128 && VROM_size ==0   ||  /* 2048+0 */
+              ROM_size ==64  && VROM_size ==64)?    /* 1024+512 */
+              0: 1;
+   
+   Init(info);
+}
+
+void Super24_Init(CartInfo *info)	/* UNIF BMC-Super24in1SC03 */
+{
+   CHRRAMSIZE = 8 * 1024;
+   dipsw_enable = 0;
+   after_power = 0;
+   jncota523 = 0;
+   subType = 0;
+   Init(info);
+}
+
+void WAIXINGFS005_Init(CartInfo *info)	/* UNIF WAIXING-FS005 */
+{
+   CHRRAMSIZE = 8 * 1024;
    WRAMSIZE = 32 * 1024;
-
+   dipsw_enable = 0;
+   after_power = 0;
    jncota523 = 0;
-   GenBMCFK23C_Init(info);
+   subType = 2;
+   Init(info);
 }
 
-void Mapper523_Init(CartInfo *info)
+void Mapper523_Init(CartInfo *info)	/* Jncota Fengshengban */
 {
-   jncota523 = 1;
    WRAMSIZE = 8 * 1024;
-   GenBMCFK23C_Init(info);
+   dipsw_enable = 0;
+   after_power = 0;
+   jncota523 = 1;
+   subType = 1;
+   Init(info);
 }
diff --git a/src/ines-correct.h b/src/ines-correct.h
index 990395b..159e9a6 100644
--- a/src/ines-correct.h
+++ b/src/ines-correct.h
@@ -1,731 +1,838 @@
-#ifndef _FCEU_INES_CORRECT_H
-#define _FCEU_INES_CORRECT_H
-
-	/* ROM images that have the battery-backed bit set in the header that really
-	don't have battery-backed RAM is not that big of a problem, so I'll
-	treat this differently by only listing games that should have battery-backed RAM.
-	*/
-	/* CRC32, mapperNum, SubMapper, Mirroring, hasBattery, prgRam, chrRam, region, extra flags */
-	{ 0xb17574f3,    1, DEFAULT, DEFAULT, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* AD&D Heroes of the Lance */
-	{ 0x5de61639,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* AD&D Hillsfar */
-	{ 0x2545214c,    1, DEFAULT, DEFAULT, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* DW */
-	{ 0x3b3f88f0,    1, DEFAULT, DEFAULT, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* DW */
-	{ 0x8c5a784e,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* DW 2 */
-	{ 0x506e259d,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* DW 4*/
-	{ 0xa86a5318,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Dw 3 */
-	{ 0x45f03d2e,    1, DEFAULT, DEFAULT, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Faria */
-	{ 0xb8b88130,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Final Fantasy (FFE Hack) */
-	{ 0xcebd2a31,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Final Fantasy */
-	{ 0xd29db3c7,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Final Fantasy 2 */
-	{ 0x466efdc2,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Final Fantasy J */
-	{ 0xeaf7ed72,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Legend of Zelda */
-	{ 0x3fe272fb,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Legend of Zelda */
-	{ 0xba322865,    1, DEFAULT, DEFAULT, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Zelda 2 */
-	{ 0x25952141,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* AD&D Pool of Radiance */
-	{ 0x1335cb05,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Crystalis */
-	{ 0x57e220d0,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Final Fantasy 3 */
-	{ 0x889129cb,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Startropics */
-	{ 0xd054ffb0,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Startropics 2*/
-	{ 0xb5ff71ab,   19, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Battle Fleet */
-	{ 0x0c1792da,   19, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Famista '90 */
-	{ 0x47c2020b,   19, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Hydlide 3*/
-	{ 0xbc11e61a,   19, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Kaijuu Monogatari */
-	{ 0xace56f39,   19, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mindseeker */
-	{ 0xe1383deb,   26, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mouryou Senki Madara */
-	{ 0xde9c9c64,   80, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Kyonshiizu 2 */
-	{ 0x0e1683c5,   80, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mirai Shinwa Jarvas */
-
-	{ 0xaf5d7aa2,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Clu Clu Land (W) [o3].nes */
-	{ 0xcfb224e6,  222, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ninja (J) (PRG0) [p1][!].nes */
-	{ 0x82f204ae,  163, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Liang Shan Ying Xiong (NJ023) (Ch) [!].nes */
-	{ 0xad9c63e2,   70, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Space Shadow (Japan).nes */
-	{ 0xe1526228,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ki no Bouken - The Quest of Ki (Japan).nes */
-	{ 0xaf5d7aa2,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Clu Clu Land (W) [o3].nes */
-	{ 0xcfb224e6,  222, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ninja (J) (PRG0) [p1][!].nes */
-	{ 0xfcdaca80,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Elevator Action (Japan).nes */
-	{ 0xc05a365b,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Chou Fuyuu Yousai Exed Exes (Japan).nes */
-	{ 0xc4c3949a,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mario Bros. (World).nes */
-	{ 0x32fa246f,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Tag Team Pro-Wrestling (Japan).nes */
-	{ 0x43d30c2f,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ms. Pac-Man (USA) (Tengen) (Unl).nes */
-	{ 0xb3c30bea,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Xevious (Japan) (En).nes */
-	{ 0xe492d45a,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Zippy Race (Japan).nes */
-	{ 0x24598791,    0, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Duck Hunt (World).nes */
-	{ 0x49aeb3a6,    0, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Excitebike (Japan, USA).nes */
-	{ 0xb8535ca3,    0, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mahjong (Japan).nes */
-	{ 0x330de468,    0, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Obake no Q Tarou - Wanwan Panic (Japan).nes */
-	{ 0xe28f2596,    0, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pac-Land (J) [b2].nes */
-	{ 0x5112dc21,    0, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Wild Gunman (World) (Rev 1).nes */
-	{ 0xd8ee7669,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Adventures of Rad Gravity, The (USA).nes */
-	{ 0x5b837e8d,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Alien Syndrome (Japan).nes */
-	{ 0x37ba3261,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Back to the Future Part II & III (USA).nes */
-	{ 0x5b6ca654,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Barbie (USA).nes */
-	{ 0x61a852ea,    1, DEFAULT, DFAULT8, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Battle Stadium - Senbatsu Pro Yakyuu (Japan).nes */
-	{ 0xf6fa4453,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bigfoot (U) [b4].nes */
-	{ 0x391aa1b8,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Bloody Warriors - Shan-Go no Gyakushuu (Japan).nes */
-	{ 0xa5e8d2cd,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* BreakThru (USA).nes */
-	{ 0x3f56a392,    1, DEFAULT, DFAULT8, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* Captain ED (Japan).nes */
-	{ 0x078ced30,    1, DEFAULT, DFAULT8, 1,    0x07, DEFAULT, DEFAULT, NOEXTRA }, /* Choujin - Ultra Baseball (Japan).nes */
-	{ 0xfe364be5,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Deep Dungeon IV - Kuro no Youjutsushi (Japan).nes */
-	{ 0x57c12280,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Demon Sword (U) [b1].nes */
-	{ 0xd09b74dc,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Great Tank (Japan).nes */
-	{ 0xe8baa782,    1, DEFAULT, DFAULT8, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Gunhed - Aratanaru Tatakai (Japan).nes */
-	{ 0x970bd9c2,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Hanjuku Eiyuu (J) [b1].nes */
-	{ 0xcd7a2fd7,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Hanjuku Hero (Japan).nes */
-	{ 0x63469396,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Hokuto no Ken 4 - Shichisei Haken Den - Hokuto Shinken no Kanata e (Japan).nes */
-	{ 0xe94d5181,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Future Wars - Mirai Senshi Lios (Japan).nes */
-	{ 0x7156cb4d,    1, DEFAULT, DFAULT8, 0,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Muppet Adventure - Chaos at the Carnival (USA).nes */
-	{ 0x70f67ab7,    1, DEFAULT, DFAULT8, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Musashi no Bouken (Japan).nes */
-	{ 0x958e4bae,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Orb-3D (USA).nes */
-	{ 0x291bcd7d,    1, DEFAULT, DFAULT8, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* Pachio-kun 2 (Japan).nes */
-	{ 0xa9a4ea4c,    1, DEFAULT, DFAULT8, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Satomi Hakkenden (J) [b2].nes */
-	{ 0xcc3544b0,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Triathron, The (Japan).nes */
-	{ 0x52ab2d17,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Toukyou Pachi-Slot Adventure (Japan).nes */
-	{ 0x934db14a,    1, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* All-Pro Basketball (USA).nes */
-	{ 0xf74dfc91,    1, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Win, Lose or Draw (USA).nes */
-	{ 0xcfe02ada,    1, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Darkman (Europe).nes */
-	{ 0x1a71fd06,    1, DEFAULT,    MI_H, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* Kujaku Ou.nes */
-
-	/* MMC1 games with more than 8K wram */
-	{ 0x2225c20f,    1, DEFAULT, DEFAULT, 1,    0x77,    0x07, DEFAULT, NOEXTRA }, /* Genghis Khan */
-	{ 0xfb69743a,    1, DEFAULT, DEFAULT, 1,    0x77,    0x07, DEFAULT, NOEXTRA }, /* ""        "" (J) */
-	{ 0x4642dda6,    1, DEFAULT, DEFAULT, 1,    0x77,    0x07, DEFAULT, NOEXTRA }, /* Nobunaga's Ambition */
-	{ 0x3f7ad415,    1, DEFAULT, DEFAULT, 1,    0x77,    0x07, DEFAULT, NOEXTRA }, /* ""        "" (J) (PRG0) */
-	{ 0x2b11e0b0,    1, DEFAULT, DEFAULT, 1,    0x77,    0x07, DEFAULT, NOEXTRA }, /* ""        "" (J) (PRG1) */
-	{ 0xc6182024,    1, DEFAULT, DEFAULT, 1,    0x77,    0x07, DEFAULT, NOEXTRA }, /* Romance of the 3 Kingdoms */
-	{ 0xabbf7217,    1, DEFAULT, DEFAULT, 1,    0x77,    0x07, DEFAULT, NOEXTRA }, /* ""        "" (J) (PRG0) or Sangokushi  */
-	{ 0xccf35c02,    1, DEFAULT, DEFAULT, 1,    0x77,    0x07, DEFAULT, NOEXTRA }, /* ""        "" (J) (PRG1) */
-	{ 0xb8747abf,    1, DEFAULT, DEFAULT, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Best Play Pro Yakyuu Special (J) (PRG0) */
-	{ 0xc3de7c69,    1, DEFAULT, DEFAULT, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* ""        "" (J) (PRG1) */
-	{ 0xc9556b36,    1, DEFAULT, DEFAULT, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Final Fantasy 1+2 */
-
-	{ 0xe6a477b2,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 3-D WorldRunner (USA).nes */
-	{ 0x9ea1dc76,    2, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Rainbow Islands (USA).nes */
-	{ 0x6d65cac6,    2, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Terra Cresta (Japan).nes */
-	{ 0xe1b260da,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Argos no Senshi - Hachamecha Daishingeki (Japan).nes */
-	{ 0x1d0f4d6b,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Black Bass, The (USA).nes */
-	{ 0x266ce198,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* City Adventure Touch - Mystery of Triangle (J) [b1].nes */
-	{ 0x804f898a,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Unit (Japan).nes */
-	{ 0x55773880,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Adventures of Gilligan's Island, The (USA).nes */
-	{ 0x6e0eb43e,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Puss 'n Boots - Pero's Great Adventure (USA).nes */
-	{ 0x2bb6a0f8,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sherlock Holmes - Hakushaku Reijou Yuukai Jiken (Japan).nes */
-	{ 0x28c11d24,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sukeban Deka 3 (J) [b1].nes */
-	{ 0x02863604,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sukeban Deka III (Japan).nes */
-	{ 0x419461d0,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Cars (USA).nes */
-
-	/* CNROM by default has bus conflicts enabled, these requires no bus conflict to play correctly */	
-	{ 0x2915faf0,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Incantation (Asia) (Ja) (Unl).nes */
-	{ 0x8f154a0d,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pu Ke Jing Ling (Asia) (Unl).nes */
-	{ 0xb0c871c5,    3,       1,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Wei Lai Xiao Zi (Joy Van).nes */
-	{ 0xb3be2f71,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Yanshan Chess (Unl).nes */
-	{ 0xd04a40e6,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bingo 75 (Asia) (Ja) (Unl).nes */
-	{ 0xe41b440f,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sidewinder (Joy Van).nes */
-	{ 0xebd0644d,    3,       1,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Master Chu & The Drunkard Hu (Joy Van).nes */
-	{ 0xf283cf58,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Colorful Dragon (Sachen).nes */
-	{ 0x2deb12b8,    3,       1,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Venice Beach Volleyball (Asia) (Ja) (Super Mega) (Unl).nes */
-
-	{ 0xdbf90772,    3, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Alpha Mission (USA).nes */
-	{ 0xd858033d,    3, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ASO - Armored Scrum Object (J).nes */
-	{ 0xd858033d,    3, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ASO - Armored Scrum Object (J).nes */
-	{ 0x637ba508,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Adan y Eva (Spain) (Gluk Video) (Unl).nes */
-	{ 0x9bde3267,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Adventures of Dino Riki (USA).nes */
-	{ 0xd8eff0df,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Gradius (Japan).nes */
-	{ 0x1d41cc8c,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Gyruss (USA).nes */
-	{ 0xcf322bb3,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* John Elway's Quarterback (USA).nes */
-	{ 0xb5d28ea2,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mystery Quest (USA).nes */
-	{ 0x02cc3973,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ninja Kid (USA).nes */
-	{ 0xbc065fc3,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pipe Dream (U) [b1].nes */
-	{ 0xc9ee15a7,    3, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Aladdin III (1995) (Unl) [hM03].nes */
-	{ 0x8dedea07,    3, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Shui Guo Li (Ch) [a1].nes */
-	{ 0x684afccd,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Space Hunter (Japan).nes */
-
-	{ 0x97b6cb19,    4, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Aladdin (SuperGame) (Mapper 4) [!].nes */
-	{ 0xd97c31b0,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Lasalle Ishii no Child's Quest (Japan).nes */
-	{ 0x404b2e8b,    4, DEFAULT,    MI_4, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Rad Racer II (USA).nes */
-	{ 0x15141401,    4, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Asmik-kun Land (Japan).nes */
-	{ 0x4cccd878,    4, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Kyatto Ninden Teyandee (J) [b1].nes */
-	{ 0x59280bec,    4, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Jackie Chan (Japan).nes */
-	{ 0x7474ac92,    4, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Kabuki - Quantum Fighter (USA).nes */
-	{ 0xf2594374,    4, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Matendouji (Japan).nes */
-	{ 0x5337f73c,    4, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Niji no Silk Road (Japan).nes */
-	{ 0x9eefb4b4,    4, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pachi-Slot Adventure 2 - Sorotta-kun no Pachi-Slot Tanteidan (Japan).nes */
-	{ 0xafe03802,    4, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pachio-kun 3 (Japan) (Rev A).nes */
-	{ 0x21a653c7,    4, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Sky Kid (VS).nes */
-	{ 0xdb7f07be,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Toki (USA) (Beta).nes */
-
-	/* MMC5 */
-	{ 0x671f23a8,    5, DEFAULT, DEFAULT, 0,       0,        0,     PAL, NOEXTRA }, /* Castlevania III - Dracula's Curse (E) */
-	{ 0xcd4e7430,    5, DEFAULT, DEFAULT, 0,       0,        0, DEFAULT, NOEXTRA }, /* Castlevania III - Dracula's Curse (KC) */
-	{ 0xed2465be,    5, DEFAULT, DEFAULT, 0,       0,        0, DEFAULT, NOEXTRA }, /* Castlevania III - Dracula's Curse (U) */
-	{ 0x0afb395e,    5, DEFAULT, DEFAULT, 0,       0,        0, DEFAULT, NOEXTRA }, /* Gun Sight */
-	{ 0xb0480ae9,    5, DEFAULT, DEFAULT, 0,       0,        0, DEFAULT, NOEXTRA }, /* Laser Invasion */
-	{ 0xb4735fac,    5, DEFAULT, DEFAULT, 0,       0,        0, DEFAULT, NOEXTRA }, /* Metal Slader Glory */
-	{ 0xbb7f829a,    5, DEFAULT, DEFAULT, 0,       0,        0, DEFAULT, NOEXTRA }, /* Uchuu Keibitai SDF */
-	{ 0x0ec6c023,    5, DEFAULT, DEFAULT, 1,    0x70,        0, DEFAULT, NOEXTRA }, /* Gemfire */
-	{ 0x9cbadc25,    5, DEFAULT, DEFAULT, 1,    0x70,        0, DEFAULT, NOEXTRA }, /* Just Breed */
-	{ 0xbc80fb52,    5, DEFAULT, DEFAULT, 1,    0x70,        0, DEFAULT, NOEXTRA }, /* Royal Blood */
-	{ 0xd532e98f,    5, DEFAULT, DEFAULT, 1,    0x70,        0, DEFAULT, NOEXTRA }, /* Shin 4 Nin Uchi Mahjong - Yakuman Tengoku */
-	{ 0x15fe6d0f,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* Bandit Kings of Ancient China */
-	{ 0xfe3488d1,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* Daikoukai Jidai */
-	{ 0x1ced086f,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* Ishin no Arashi */
-	{ 0x6396b988,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* L'Empereur (J) */
-	{ 0x9c18762b,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* L'Empereur (U) */
-	{ 0xeee9a682,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* Nobunaga no Yabou - Sengoku Gunyuu Den (J) (PRG0) */
-	{ 0xf9b4240f,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* Nobunaga no Yabou - Sengoku Gunyuu Den (J) (PRG1) */
-	{ 0x8ce478db,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* Nobunaga's Ambition 2 */
-	{ 0x39f2ce4b,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* Suikoden - Tenmei no Chikai */
-	{ 0xaca15643,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* Uncharted Waters */
-	{ 0x6f4e4312,    5, DEFAULT, DEFAULT, 1,    0x90,        0, DEFAULT, NOEXTRA }, /* Aoki Ookami to Shiroki Mejika - Genchou Hishi */
-	{ 0xf540677b,    5, DEFAULT, DEFAULT, 1,    0x90,        0, DEFAULT, NOEXTRA }, /* Nobunaga no Yabou - Bushou Fuuun Roku */
-	{ 0xf011e490,    5, DEFAULT, DEFAULT, 1,    0x90,        0, DEFAULT, NOEXTRA }, /* Romance of The Three Kingdoms II */
-	{ 0x184c2124,    5, DEFAULT, DEFAULT, 1,    0x90,        0, DEFAULT, NOEXTRA }, /* Sangokushi II (J) (PRG0) */
-	{ 0xee8e6553,    5, DEFAULT, DEFAULT, 1,    0x90,        0, DEFAULT, NOEXTRA }, /* Sangokushi II (J) (PRG1) */
-
-	{ 0xf518dd58,    7, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Captain Skyhawk (USA).nes */
-	{ 0x6c4a9735,    7, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* WWF Wrestlemania (Europe).nes */
-	{ 0x84382231,    9, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Punch-Out!! (Japan) (Gold Edition).nes */
-	{ 0xbe939fce,    9, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Punch-Out!! (U) [b1].nes */
-	{ 0x7b837fde,    9, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mike Tyson's Punch-Out!! (PC10) [b1].nes */
-	{ 0x345d3a1a,   11, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Castle of Deceit (USA) (Unl).nes */
-	{ 0xb79f2651,   11, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Chiller (USA) (Unl).nes */
-	{ 0x5e66eaea,   13, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Videomation (USA).nes */
-	{ 0xcd373baa,   14, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 武士魂 (8 characters).nes */
-	{ 0xbfc7a2e9,   16, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ball 3 - Gokuu Den (Japan) (Rev 1).nes */
-	{ 0x6e68e31a,   16, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ball 3 - Gokuu Den (Japan).nes */
-	{ 0x33b899c9,   16, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ball - Daimaou Fukkatsu (Japan).nes */
-	{ 0xa262a81f,   16, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Rokudenashi Blues (Japan).nes */
-	{ 0x286fcd20,   21, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ganbare Goemon Gaiden 2 - Tenka no Zaihou (Japan).nes */
-	{ 0x335e6339,   23, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* kung fu legend (unl)[!].nes */
-	{ 0x1a8d767b,   23, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* kung fu legend (unl)[!p].nes */
-	{ 0x0e263d47,   23, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* World Hero (Unl) (TV System Select) [!].nes */
-	{ 0xe4a291ce,   23, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* World Hero (Unl) [!].nes */
-	{ 0x51e9cd33,   23, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* World Hero (Unl) [b1].nes */
-	{ 0x105dd586,   27, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mi Hun Che (Ch)(full copyrights)[!].nes */
-	{ 0xbc9bb6c1,   27, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Car (Ch)(full copyrights)[!].nes */
-	{ 0x43753886,   27, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mi Hun Che (Ch)(replaced copyrights)[p1][!].nes */
-	{ 0x5b3de3d1,   27, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* -- */
-	{ 0x511e73f8,   27, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mi Hun Che (Ch) [p1][b2].nes */
-	{ 0x5555fca3,   32, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ai Sensei no Oshiete - Watashi no Hoshi (J) [b1].nes */
-	{ 0x283ad224,   32, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ai Sensei no Oshiete - Watashi no Hoshi (Japan).nes */
-	{ 0x243a8735,   32, DEFAULT,  0x10|4, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Major League (Japan).nes */
-	{ 0x8a7d0abe,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Akira (Japan).nes */
-	{ 0x376138d8,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Akira (J) [a1].nes */
-	{ 0xadf606f6,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bakushou!! Jinsei Gekijou (Japan).nes */
-	{ 0xbc7b1d0f,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bakushou!! Jinsei Gekijou 2 (Japan).nes */
-	{ 0x7a497ae3,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Don Doko Don (Japan).nes */
-	{ 0xbaca10a9,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Golfkko Open (Japan).nes */
-	{ 0xf80bdc50,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Insector X (Japan).nes */
-	{ 0x2a6559a1,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Operation Wolf (Japan).nes */
-	{ 0xaeb7fce9,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Power Blazer (Japan).nes */
-	{ 0xd920f9df,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Takeshi no Sengoku Fuuunji (Japan).nes */
-	{ 0x3cd4b420,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Takeshi no Sengoku Fuuunji (Japan) (Beta).nes */
-	{ 0x4c7c1af3,   34, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Caesars Palace (U) [b1].nes */
-	{ 0x932ff06e,   34, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Classic Concentration (U) [b1].nes */
-	{ 0xf46ef39a,   37, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Super Mario Bros. + Tetris + Nintendo World Cup (Europe) (Rev 1).nes */
-	{ 0x4686c5dd,   41, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Caltron - 6 in 1 (USA) (Unl).nes */
-	{ 0x090c0c17,   42, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ai Senshi Nicol (FDS Conversion) [p1][!].nes */
-	{ 0x4df84825,   42, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ai Senshi Nicol (FDS Conversion) [p2][!].nes */
-	{ 0x579e5bc5,   42, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ai Senshi Nicol (FDS Conversion) [p3].nes */
-	{ 0xc744f205,   42, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ai Senshi Nicol (FDS Conversion) [p3][t1].nes */
-	{ 0x71699765,   42, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Love Warrior Nicol.nes */
-	{ 0x6bf3f6a3,   42, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bio Miracle Bokutte Upa (J) (Mario Baby - FDS Conversion).nes */
-	{ 0x5ba1c5cf,   42, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Green Beret (FDS Conversion) (Unl).nes */
-	{ 0x50ab1ab2,   42, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ?? Green Beret (FDS Conversion, LH09) (Unl) [U][!][t1] (160K PRG */
-	{ 0x7ccb12a3,   43, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ?? SMB2j */
-	{ 0x6c71feae,   45, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Kunio 8-in-1 [p1].nes */
-	{ 0x40c0ad47,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Flintstones, The - The Rescue of Dino & Hoppy (Japan).nes */
-	{ 0xaebd6549,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bakushou!! Jinsei Gekijou 3 (Japan).nes */
-	{ 0x6cdc0cd9,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bubble Bobble 2 (Japan).nes */
-	{ 0x99c395f9,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Captain Saver (Japan).nes */
-	{ 0xa7b0536c,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Don Doko Don 2 (Japan).nes */
-	{ 0xb17c828a,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Don Doko Don 2 (J) [a1].nes */
-	{ 0x40c0ad47,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Flintstones, The - The Rescue of Dino & Hoppy (J).nes */
-	{ 0x1500e835,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Jetsons, The - Cogswell's Caper (Japan).nes */
-	{ 0xe2c94bc2,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Bros 8 (Unl) [!].nes */
-	{ 0xa912b064,   51, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT,   0x800 }, /* 11-in-1 Ball Games [p1][o1].nes (has CHR ROM when it shouldn't) */
-	{ 0x2e72a5d9,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 11-in-1 (66-in-1, 86-in-1, 63-in-1).nes */
-	{ 0x39f514fd,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 18 in 1 (118-in-1, 138-in-1, 198-in-1)VTxxxx.nes */
-	{ 0xd8b1f465,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 26-in-1 (36-in-1, 46-in-1,56-in-1) VT 335.nes */
-	{ 0xcf82fae9,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 28 in 1 (38-in-1, 48-in-1, 58-in1)VTxxxx.nes */
-	{ 0xa7a98698,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 28-in-1 (46-in-1, 63-in-1, 118-in-1)VT-5116.nes */
-	{ 0x21fd7143,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 41-in-1 (5-in-1,71-in-1)  VT345.nes */
-	{ 0x49ec88d6,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 42-in-1 NT-234 Bad Game Road Fighter.nes */
-	{ 0x60306f19,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 42-in-1 PCB 3840.nes */
-	{ 0x450cd86e,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 48-in-1 (62-in-1,73-in-1,88-in-1) VTxxx.nes */
-	{ 0xd774e041,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 50-in-1 (60-in-1,70-in-1,80-in-1) NT-113.nes */
-	{ 0x3c4e94f6,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 51-in-1 (61-in-1, 71-in-1, 81-in-1) VT5310.nes */
-	{ 0x0422ed44,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 7-in-1 (32-in-1,66-in-1,119-in-1) VT15004.nes */
-	{ 0x7efc0d2c,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 7-in-1 (5000-in-1, 999999999-in-1, 10000000-in-1)NC-07N.nes */
-	{ 0x6d92dff1,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* TN 95-in-1 (6-in-1) [p1].nes */
-	{ 0x39ab0fc7,   64, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Hard Drivin' (USA) (Proto) (Unl).nes */
-	{ 0xb19a55dd,   64, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Road Runner (USA) (Unl).nes */
-	{ 0xf92be3ec,   64, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Rolling Thunder (USA) (Unl).nes */
-	{ 0xd114f544,   66, DEFAULT,    MI_H, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* AV Super Real Pachinko (Japan) (Unl).nes */
-	{ 0xe84274c5,   66, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mississippi Satsujin Jiken (J) [h2].nes */
-	{ 0xbde3ae9b,   66, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Doraemon (Japan).nes */
-	{ 0x9552e8df,   66, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ball - Shen Long no Nazo (Japan).nes */
-	{ 0x811f06d9,   66, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Power (USA).nes */
-	{ 0xd26efd78,   66, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Mario Bros. + Duck Hunt (USA).nes */
-	{ 0xdd8ed0f7,   70, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Kamen Rider Club (Japan).nes */
-	{ 0xbba58be5,   70, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Family Trainer 6 - Manhattan Police (Japan).nes */
-	{ 0x370ceb65,   70, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Family Trainer 5 - Meiro Daisakusen (Japan).nes */
-	{ 0x86be4746,    2, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dooly Bravo Land (Korea) (Unl).nes */
-	{ 0xe62e3382,   71, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* MiG 29 - Soviet Fighter (USA) (Unl).nes */
-	{ 0xac7b0742,   71, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Golden KTV (Ch) [!].nes */
-	{ 0x054bd3e9,   74, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Di 4 Ci - Ji Qi Ren Dai Zhan (Ch).nes */
-	{ 0x496ac8f7,   74, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ji Jia Zhan Shi (Ch) [b3].nes */
-	{ 0xae854cef,   74, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Jia A Fung Yun (Ch).nes */
-	{ 0xba51ac6f,   78, DEFAULT,    MI_4, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Holy Diver (Japan).nes */
-	{ 0x3d1c3137,   78, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Uchuusen Cosmo Carrier (Japan).nes */
-	{ 0xa4fbb438,   79, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* F-15 City War (AVE) (REV1.x) [b1].nes */
-	{ 0xd4a76b07,   79, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* F-15 City War (AVE) (REV1.x) [b2].nes */
-	{ 0x8eab381c,   79, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Deathbots (USA) (Rev 1) (Unl).nes */
-	{ 0x1eb4a920,   79, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Double Strike - Aerial Attack Force (USA) (v1.1) (Unl).nes */
-	{ 0x3e1271d5,   79, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Tiles of Fate (USA) (Unl).nes */
-	{ 0xd2699893,   88, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Spirit - Aratanaru Densetsu (Japan).nes */
-	{ 0xbb7c5f7a,   89, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Tenka no Goikenban - Mito Koumon (J) [f1].nes */
-	{ 0x082778e6,   91,       1,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Fighter III.nes */
-	{ 0x10119e6b,   93, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Fantasy Zone (Japan) (Sunsoft).nes */
-	{ 0x2b750bf9,  101, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Urusei Yatsura - Lum no Wedding Bell (Japan) (Beta).nes */
-	{ 0x0da5e32e,  101, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Urusei Yatsura - Lum no Wedding Bell (Japan).nes */
-	{ 0x6096f84e,  104, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pegasus 5-in-1 (Golden Five) (Unl).nes */
-	{ 0x3d3ff543,  113, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Kazama Jun to Asama Yuuko no AV Dragon Mahjong (Japan) (Unl).nes */
-	{ 0x68379fdb,  113, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Pipemania (Australia) (HES) (Unl).nes */
-	{ 0x6a03d3f3,  114, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Lion King, The (Unl) (Mapper 114).nes */
-	{ 0x0d98db53,  114, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pocahontas (Unl).nes */
-	{ 0xf5676f0b,  114, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Donkey Kong (Unl) [b1].nes */
-	{ 0xc5e5c5b2,  115, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bao Qing Tian (Ch).nes */
-	{ 0xe40dfb7e,  116, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Somari (SOMARI-P) (NT-616) (Unl) [!].nes */
-	{ 0xc9371ebb,  116, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Somari (SOMARI-W) (Unl) [!].nes */
-	{ 0x78b657ac,  118, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Armadillo (Japan).nes */
-	{ 0x90c773c1,  118, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Goal! Two (USA).nes */
-	{ 0xb9b4d9e0,  118, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* NES Play Action Football (USA).nes */
-	{ 0x07d92c31,  118, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* RPG Jinsei Game (Japan).nes */
-	{ 0x37b62d04,  118, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ys III - Wanderers from Ys (Japan).nes */
-	{ 0x318e5502,  121, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sonic 3D Blast 6 (Unl).nes */
-	{ 0xddcfb058,  121, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Street Fighter Zero 2 '97 (Unl) [!].nes */
-	{ 0xd2674b0a,  132, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Qi Wang - Chinese Chess (Asia) (Ja) (Unl).nes */
-	{ 0x5aefbc94,  133, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Jovial Race (Asia) (Ja) (PAL) (Unl).nes */
-	{ 0xB550B627,  136, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Incantation (Dip Bin) (Joy Van).nes */
-	{ 0xc2df0a00,  140, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bio Senshi Dan - Increaser Tono Tatakai (J) [hM66][b3].nes */
-	{ 0xe46b1c5d,  140, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mississippi Satsujin Jiken (Japan).nes */
-	{ 0x3293afea,  140, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mississippi Satsujin Jiken (Japan) (Rev A).nes */
-	{ 0x6bc65d7e,  140, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Youkai Club (Japan).nes */
-	{ 0x5caa3e61,  144, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Death Race (USA) (Unl).nes */
-	{ 0x48239b42,  146, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mahjang Companion (Asia) (Ja) (Hacker) (Unl).nes */
-	{ 0xb6a727fa,  146, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Papillon Gals (Japan) (Unl).nes */
-	{ 0xa62b79e1,  146, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sidewinder (HES) [o1].nes */
-	{ 0xcc868d4e,  149, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Taiwan Mahjong 16 (Sachen) [a1][!].nes */
-	{ 0x29582ca1,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mei Nu Quan (Honey Peach) (Sachen) [!].nes */
-	{ 0x40dbf7a2,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Olympic IQ (Asia) (Ja) (PAL) (Unl).nes */
-	{ 0x73fb55ac,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Lightgun Game 2 in 1 - Cosmocop + Cyber Monster (Asia) (Ja) (Unl).nes */
-	{ 0xddcbda16,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Lightgun Game 2 in 1 - Tough Cop + Super Tough Cop (Asia) (Ja) (Unl).nes */
-	{ 0x47918d84,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Auto-Upturn (Asia) (Ja) (PAL) (Unl).nes */
-	{ 0x471173e7,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Chinese Checkers (Asia) (Ja) (PAL) (Unl).nes */
-	{ 0x2394ae1c,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Happy Pairs (Asia) (Ja) (PAL) (Unl).nes */
-	{ 0xcab40a6c,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Magic Cube (Asia) (Ja) (PAL) (Unl).nes */
-	{ 0xbe17e27b,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Poker III (Asia) (Ja) (Alt 2) (Unl).nes */
-	{ 0x34ddf806,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Strategist (Asia) (Ja) (NTSC) (Unl).nes */
-	{ 0xc06facfc,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Strategist (Asia) (Ja) (PAL) (Unl).nes */
-	{ 0xa95a915a,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Tasac (Asia) (Ja) (Unl).nes */
-	{ 0x0f141525,  152, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Arkanoid II (Japan).nes */
-	{ 0xbda8f8e4,  152, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Gegege no Kitarou 2 - Youkai Gundan no Chousen (Japan).nes */
-	{ 0xb1a94b82,  152, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pocket Zaurus - Juu Ouken no Nazo (Japan).nes */
-	{ 0x026c5fca,  152, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Saint Seiya - Ougon Densetsu (Japan).nes */
-	{ 0x3f15d20d,  153, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Famicom Jump II - Saikyou no 7 Nin (Japan).nes */
-	{ 0xd1691028,  154, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Devil Man (Japan).nes */
-	{ 0xcfd4a281,  155, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Money Game, The (Japan).nes */
-	{ 0x2f27cdef,  155, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Tatakae!! Rahmen Man - Sakuretsu Choujin 102 Gei (J) [b1].nes */
-	{ 0xc1719664,  155, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Tatakae!! Rahmen Man - Sakuretsu Choujin 102 Gei (Japan).nes */
-	{ 0xccc03440,  156, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Buzz & Waldog (USA) (Proto) (Unl).nes */
-	{ 0x983d8175,  157, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Datach - Battle Rush - Build Up Robot Tournament (Japan).nes */
-	{ 0x894efdbc,  157, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Datach - Crayon Shin-chan - Ora to Poi Poi (Japan).nes */
-	{ 0x19e81461,  157, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Datach - Dragon Ball Z - Gekitou Tenkaichi Budoukai (Japan).nes */
-	{ 0xbe06853f,  157, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Datach - J.League Super Top Players (Japan).nes */
-	{ 0x0be0a328,  157, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Datach - SD Gundam - Gundam Wars (Japan).nes */
-	{ 0x5b457641,  157, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Datach - Ultraman Club - Supokon Fight! (Japan).nes */
-	{ 0xf51a7f46,  157, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Datach - Yu Yu Hakusho - Bakutou Ankoku Bujutsukai (Japan).nes */
-	{ 0xcbf4366f,  158, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Alien Syndrome (USA) (Unl).nes */
-	{ 0xe170404c,  159, DEFAULT, DEFAULT, 1,    0x10, DEFAULT, DEFAULT, NOEXTRA }, /* SD Gundam Gaiden - Knight Gundam Monogatari (Japan).nes */
-	{ 0x276ac722,  159, DEFAULT, DEFAULT, 1,    0x10, DEFAULT, DEFAULT, NOEXTRA }, /* SD Gundam Gaiden - Knight Gundam Monogatari (Japan) (Rev 1).nes */
-	{ 0x0cf42e69,  159, DEFAULT, DEFAULT, 1,    0x10, DEFAULT, DEFAULT, NOEXTRA }, /* Magical Taruruuto-kun - Fantastic World!! (Japan).nes */
-	{ 0xdcb972ce,  159, DEFAULT, DEFAULT, 1,    0x10, DEFAULT, DEFAULT, NOEXTRA }, /* Magical Taruruuto-kun - Fantastic World!! (Japan) (Rev 1).nes */
-	{ 0xb7f28915,  159, DEFAULT, DEFAULT, 1,    0x10, DEFAULT, DEFAULT, NOEXTRA }, /* Magical Taruruuto-kun 2 - Mahou Daibouken (Japan).nes */
-	{ 0x183859d2,  159, DEFAULT, DEFAULT, 1,    0x10, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ball Z - Kyoushuu! Saiya Jin (Japan).nes */
-	{ 0x58152b42,  160, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pipe V (Asia) (Ja) (Unl).nes */
-	{ 0x1c098942,  162, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Xi You Ji Hou Zhuan (Ch).nes */
-	{ 0x081caaff,  163, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Commandos (Ch).nes */
-
-	/* Mapper 176 */
-
-	{ 0x761cf0c0,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 15-in-1 (FK008-15in1-210in1).nes */
-	{ 0xc51fa465,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 15-in-1 (KD-6032 180-in-1).nes */
-	{ 0x7642f6b6,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 18-in-1 (FK003-160in1).nes */
-	{ 0xb12ccb95,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 18-in-1 (FK028-180-in-1).nes */
-	{ 0xe650ec91,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 18-in-1 (FK032-52in1)).nes */
-	{ 0xa22de99d,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 20-in-1 (KD-6026 210in1).nes */
-	{ 0xe8bd5ac3,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 28-in-1 (FK-017).nes */
-	{ 0x4f2ccd03,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (BS-8004) (BS-0210A) (AA) (Unl) [p1].nes */
-	{ 0x24762ce8,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-022) 178-in-1.nes */
-	{ 0x8c48bdba,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super 4-in-1 (AA) (BS-0306M) (Unl) [p1].nes */
-	{ 0x37478f0c,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super 4-in-1 (BS-8009) (BS-0306M) (Unl) [p1].nes */
-	{ 0x98c59170,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super 4-in-1 (BS-8014) (Unl) [p1].nes */
-	{ 0x7ca43c89,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (BS-8117) (Unl) [p1].nes */
-	{ 0xeebee0c8,  176, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 哥伦布传 - 黄金中文版 (re-release).nes */
-	{ 0x548d72ff,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 哥伦布 冒险记 - 黄金中文版.nes */
-	{ 0x3c9df646,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 圣斗士.nes */
-	{ 0x629fbeec,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 125-in-1 [p1][!].nes */
-	{ 0x9bdf2424,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 12-in-1 Console TV Game Cartridge (Unl) [!].nes */
-	{ 0x9206b787,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 160-in-1.nes */
-	{ 0x6343e6a6,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 16 in 1 (KD-1512).nes */
-	{ 0xdc904f4c,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 3in1 (ES-Q800C)(FSS).nes */
-	{ 0x104d84df,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 3-in-1 (ES-Q800C PCB) [p1].nes */
-	{ 0xcf7c6ae0,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 3in1 (ES-Q800C)(TRS).nes */
-	{ 0x2b882971,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (15-in-1, 188-in-1, 999999-in-1) (YH478) (KY1501) (Unl) [p1].nes */
-	{ 0x576d9589,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4in1 (BS-0210A)(MMMM).nes */
-	{ 0x36c27ae8,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4in1 (BS-0306M)(TPST).nes */
-	{ 0x409601a5,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (BS-8088) [p1][!].nes */
-	{ 0xc4d1d2f8,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4in1 (ES-Q800C)(TCCC).nes */
-	{ 0x44f46bbc,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4in1 (ES-Q800C)(TPFS).nes */
-	{ 0x6ab68f4f,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 Fighter (ES-Q800C1 PCB) [p1].nes */
-	{ 0xa391549d,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (FK23C8021) [p1][!].nes */
-	{ 0x06d13d9e,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (FK23C8026) [p1][!].nes */
-	{ 0x2ebd5fd6,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (FK23C8033) [p1][!].nes */
-	{ 0x23e4906a,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (FK23C8043) [p1][!].nes */
-	{ 0x10155a92,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (FK23C8045) [p1][!].nes */
-	{ 0x8baeedc0,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (FK23C8052) [p1][!].nes */
-	{ 0x39307391,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (FK23C8056) [p1][!].nes */
-	{ 0x72ceab1e,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (FK23C8078) (Ch) [p1].nes */
-	{ 0x07d3f6cb,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (FK23C8079) [p1][!].nes */
-	{ 0xc6d97331,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (FK23Cxxxx, S-0210A PCB) [p1][!].nes */
-	{ 0x9367d1f4,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (FK23Cxxxx, S-0210A PCB)[p1][!](Rus).nes */
-	{ 0x3907578b,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (FK-8008) [p1][!].nes */
-	{ 0xf66944ee,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (FK-8050) [p1][!].nes */
-	{ 0x8f6cc85a,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (KT-220B) [p1].nes */
-	{ 0x0163ca53,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (KT-3445AB) [p1].nes */
-	{ 0xc18a7bcb,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (KT-443B) [p1].nes */
-	{ 0xbbfbecbc,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1(SB-04,Unl).nes */
-	{ 0xd7d2123c,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (VT087) [p1][!].nes */
-	{ 0x8cb6d32c,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (VT089) [p1][!].nes */
-	{ 0x23994975,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (VT089)[p1][!] (Rus).nes */
-	{ 0x93196e95,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (VTxxx, 0208 PCB) [p1][!].nes */
-	{ 0x5f96184b,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (YH-4102) [p1].nes */
-	{ 0xfa1cb05c,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (YH4237) [p1].nes */
-	{ 0x1ef30cc8,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (YH-4253) (Unl) [p1] .nes */
-	{ 0x5d2129ac,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 YH-481 (20-in-1 KY2001, 228-in-1, 999999-in-1)(Unl)[!].nes */
-	{ 0x17d43af9,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 5-in-1 (K5003) [p1][!].nes */
-	{ 0xb3277b6c,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 6-in-1 (FK-3004) [p1][!].nes */
-	{ 0x97b82f53,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Bao Xiao San Guo (Ch) [a4].nes */
-	{ 0xd5f7aaef,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Double Moon Densetsu (Japan) [CHS](0806)_.nes */
-	{ 0x027fd794,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* Jian Wuzhe - Sword Dancer.nes */
-	{ 0x09fc02c7,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Kou Dai Jing Ling - Fei Cui (Ch) [a2].nes */
-	{ 0x416c07a1,  176, DEFAULT,    MI_V, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Meng Huan Zhi Xing IV (ES-1006) (Ch).nes */
-	{ 0xab09c88b,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* New 4-in-1 Game Fighter (KT-8405) (Unl).nes */
-	{ 0x85dd49b6,  176, DEFAULT,    MI_H, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pocket Monsters Red (Ch) (Decrypted) [b1].nes */
-	{ 0x977d22c3,  176, DEFAULT,    MI_H, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Po Fu Chen Zhou (ES-1092) (Ch) (Decrypted).nes */
-	{ 0xf011afd6,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Rockman 4 MI (Hack).nes */
-	{ 0xb511c04b,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* San Xia Wu Yi - Yu Mao Chuan Qi (Ch) (ES-1071) [a2].nes */
-	{ 0x1923a8c5,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Shui Hu Shen Shou (ES-1087) (Ch) (Decrypted).nes */
-	{ 0xc043a8df,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Shu Qi Yu - Shu Xue Xiao Zhuan Yuan (Ch).nes */
-	{ 0x2cf5db05,  176, DEFAULT,    MI_H, 0, DEFAULT,       0, DEFAULT, NOEXTRA }, /* Shu Qi Yu - Zhi Li Xiao Zhuan Yuan (Ch).nes */
-	{ 0x3df39ce4,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super 3-in-1 (KT-4403) [p1].nes */
-	{ 0xc447b9fe,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super 4-in-1 (BRC-4) [p1].nes */
-	{ 0xb5d25a20,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super 4-in-1 (BS-0306M)(Unl).nes */
-	{ 0xaa05c592,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super 6-in-1 (KY-6011)[p1][!].nes */
-	{ 0x940933dc,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* super game 3-in-1 (yh-363) (unl).nes */
-	{ 0x0b2cf73f,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 3-in-1 (YH-8013) (Unl).nes */
-	{ 0xb55103ad,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 3-in-1 (YH-8019) (MK042) (Unl) Fix.nes */
-	{ 0xd2f5f51d,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (10-in-1, 168-in-1, 999999-in-1) (YH477) (KY1008) (Unl).nes */
-	{ 0x719cce0a,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (KT-8394) (Unl).nes */
-	{ 0xa2e2031c,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (KT-8406) (Unl).nes */
-	{ 0x25d7cb92,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (MK038) (YH-8016) (Unl).nes */
-	{ 0x18dd93bc,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 New (YH437) (Unl) Fix.nes */
-	{ 0x4d18054c,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 New (YH437) (Unl).nes */
-	{ 0x6d580074,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-4118) (Unl).nes */
-	{ 0xfa5b1d26,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-4122) (Unl).nes */
-	{ 0xc3166e11,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH4146) (Unl).nes */
-	{ 0x4d25a3a6,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-415) (Unl) Fix.nes */
-	{ 0xf019bfef,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-415) (Unl).nes */
-	{ 0x60ac647f,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH4222) (Unl).nes */
-	{ 0x63d43f22,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-451) (Unl).nes */
-	{ 0xa39c9a6b,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-467) (Unl).nes */
-	{ 0x80f1e11e,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH701) (Unl) Fix.nes */
-	{ 0x0f05c0e6,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH701) (Unl).nes */
-	{ 0x8858d3f7,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-8011) (Unl) Fix.nes */
-	{ 0xc5c30efa,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-8011) (Unl).nes */
-	{ 0xcd55a865,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-8023) (003) (Unl).nes */
-	{ 0x18beb276,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-8024) (Unl).nes */
-	{ 0xe3a0b9e5,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-8027) (Unl).nes */
-	{ 0x92b52357,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-8028) (009) (Unl).nes */
-	{ 0xde94b7fd,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-8029) (Unl).nes */
-	{ 0x5a0e3e69,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-8033) (Unl).nes */
-	{ 0x21d4484a,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-8042) (Unl).nes */
-	{ 0xbeeb0b07,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-8043) (MK064) (Unl) Fix.nes */
-	{ 0xe83e5726,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-8043) (MK064) (Unl).nes */
-	{ 0xd56f27ae,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-8046) (009) (Unl).nes */
-	{ 0x0e8766dc,  176, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 4-in-1 (YH-8049) (002) (Unl).nes */
-	{ 0xd2a4a9c6,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 6-in-1 (YH 602) (Font Hack) Fix.nes */
-	{ 0x35974f2c,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 6-in-1 (YH 602) (Font Hack).nes */
-	{ 0x0881169e,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 8-in-1 (YH 801) (Font Hack).nes */
-	{ 0x31cadef3,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 9-in-1 (YH904) (Font Hack).nes */
-	{ 0x05e43745,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game 9-in-1 (YH904) (Unl).nes */
-	{ 0x5d061e04,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game YH 602 (Unl).nes */
-	{ 0x5b17fb27,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Game YH 801 (Unl).nes */
-	{ 0xf9863adf,  176, DEFAULT,    MI_V, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Xi Chu Ba Wang (C) [ES-1066].nes */
-	{ 0xf1d803f3,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Xi Chu Ba Wang (ES-1066) (Ch) (Decrypted).nes */
-	{ 0x94782fbd,  176, DEFAULT,    MI_V, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Xiong Ba Tian Xia (Ch).nes */
-	{ 0xffde0de5,  176, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 梦幻之星4[简体](修正)一战一级.nes */
-	{ 0x88e0c48c,  176, DEFAULT,    MI_H, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* Rockman 6-in-1 (rev1).nes */
-	{ 0xe6d869ed,  176, DEFAULT,    MI_H, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* 6-in-1 Rockman (Unl) [U][!] */
-	{ 0x8caaff73,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Bao Xiao San Guo (Ch) (Wxn).nes */
-	{ 0x852ce16b,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* Chu Han Zheng Ba - The War Between Chu & Han (Ch) (Wxn).nes */
-	{ 0xe0dd8d77,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* Chu Liu Xiang (Ch) (Wxn).nes */
-	{ 0x2e4f3051,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* Chu Liu Xiang (Ch) (Wxn) [f1].nes */
-	{ 0x351dd533,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* Di Guo Feng Bao - Napoleon's War (Ch) (Wxn).nes */
-	{ 0x5ee2ef97,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Di Guo Shi Dai (Age of Empires) (Ch) (Wxn).nes */
-	{ 0xd6ea31c0,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* Dong Zhou Lie Guo Zhi (Ch) (Wxn).nes */
-	{ 0xc04d330d,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* Duo Bao Xiao Ying Hao - Guang Ming yu An Hei Chuan Shuo (Ch) (Wxn).nes */
-	{ 0xfd883527,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Feng Yun (Ch) (Wxn).nes */
-	{ 0xf354d847,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Grandia (Ch) (Wxn).nes */
-	{ 0x52a5f554,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT, DEFAULT, NOEXTRA }, /* Ji Du Shan En Chou Ji - Le Comte de Monte-Cristo (Ch) (Wxn).nes */
-	{ 0x95569a86,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 甲A - China Soccer League for Division A (re-release).nes */
-	{ 0xda7d586d,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT, DEFAULT, NOEXTRA }, /* Jue Dai Ying Xiong - Peerless Hero (Ch) (Wxn).nes */
-	{ 0x2c3d4ef0,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Kou Dai Jing Ling - Fei Cui (Ch) (Wxn).nes */
-	{ 0x49f22159,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Mei Guo Fu Hao (Ch) (Wxn).nes */
-	{ 0xb16d4268,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* M&M Heroes (Ch) (Wxn).nes */
-	{ 0x3532a114,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* Mo Shen Fa Shi (Ch) (Wxn).nes */
- 	{ 0x7d9c7206,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* Mo Yu Ying Xiong Chuan - Wai Xing Ke Ji (Ch) (Wxn).nes */
- 	{ 0xa2dc64ff,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Po Fu Chen Zhou (Ch) (Wxn).nes */
- 	{ 0x377fdb36,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Pocket Monsters Gold (Ch) (Wxn).nes */
- 	{ 0x8f6ab5ac,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* San Guo Zhong Lie Zhuan (Ch) (Wxn).nes */
- 	{ 0xc768098b,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* San Xia Wu Yi - Yu Mao Chuan Qi (Ch) (Wxn).nes */
- 	{ 0xf29c8186,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Shanghai Tycoon (Ch) (Wxn).nes */
- 	{ 0x8947ab85,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Shao Nian You Xia (Ch) (Wxn).nes */
- 	{ 0x5a88b5b0,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Shu Ma Bao Bei (Digimon Crystal) (Ch) (Wxn).nes */
- 	{ 0x6b4cac80,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Shui Hu Shen Shou (Ch) (Wxn).nes */
- 	{ 0x34ac5ae9,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* Shui Hu Zhuan (Ch) (Wxn).nes */
- 	{ 0x38effd3e,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* Sui Tang Yan Yi (Ch) (Wxn).nes */
- 	{ 0x7dce29cb,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT, DEFAULT, NOEXTRA }, /* Super Daisenryaku (Ch) (Wxn).nes */
- 	{ 0x3ff36623,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Xi Chu Ba Wang (Ch) (Wxn).nes */
- 	{ 0x8264ea52,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* Xia Ke Qing - Jing He Ci Qin Wang (Ch) (Wxn).nes */
- 	{ 0x99051cb5,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Xiong Ba Tian Xia (Ch) (Wxn).nes */
- 	{ 0xa46353d1,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* Yang Jia Jiang - Yang's Troops (Ch) (Wxn).nes */
- 	{ 0x50d5f94b,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Ying Lie Qun Xia Zhuan (Ch) (Wxn).nes */
- 	{ 0xba29435a,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* Zhan Guo Qun Xiong Chuan (Ch) (Wxn).nes */
- 	{ 0x33443508,  176, DEFAULT,    MI_H, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* Zheng Ba Shi Ji (Ch) (Wxn).nes */
- 	{ 0xeba09ada,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 龙域天下 [外星科技汉化].nes */
- 	{ 0x095d8678,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Bimonthly pass - alien technology.nes */
- 	{ 0x7696573a,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* ya te lu zhan ji (c) [es-0122].nes */
- 	{ 0x69a3ca5c,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* duo la a meng - chao shi kong li xian (c).nes */
- 	{ 0xee49f509,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Thief Wu You Emon world's treasures - Speaking of alien technology.nes */
- 	{ 0x848f2d69,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Otaku no Seiza - An Adventure in the Otaku Galaxy (Japan) [CHS](0815)_.nes */
- 	{ 0xeabbb630,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Monster Maker - 7 Tsu no Hihou - Part 1 (Ch).nes */
- 	{ 0xf1d40f5b,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Monster Maker - 7 Tsu no Hihou - Part 2 (Ch).nes */
- 	{ 0x5077cac1,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Ba Bao Qi Zhu - Li Jian Ba Quan Zhuan (EverQuest) (ES-1067) (Ch).nes */
- 	{ 0xbf6e95f5,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Dream King - alien technology.nes */
- 	{ 0xbff7c60c,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Ji Dou Sheng Zhan Shi (ES-1117) (Ch).nes */
- 	{ 0x0dbff515,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Silva Saga (J) [T+ChS].nes */
- 	{ 0xb8fcd425,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* 高达骑士物语 - 外星科技汉化.nes */
- 	{ 0x3a1cfe21,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* 上古神殿 - 外星科技汉化.nes */
- 	{ 0xbc4ac7fe,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* 高达骑士物语2 - 光之骑士 - 外星科技汉化.nes */
- 	{ 0x4bcdb970,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Gui Mei Zhan Ji (C).nes */
-	{ 0xf17e49d5,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Gui Mei Zhan Ji (C).nes */
- 	{ 0x62dde924,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Long Zhu Z3 Ren Zao Ren Lie Zhuan (ES-1130) (Ch) [f1].nes */
- 	{ 0xc35e9aa8,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Dragon Ball Z II - Gekishin Freeza!! (Ch) [a1].nes */
- 	{ 0xf2398802,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Dragon Ball Z II - Gekishin Freeza!! (Ch) [a2].nes */
- 	{ 0xc9d968af,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Hun Dun Shi Jie (C) [ES-1115].nes */
- 	{ 0x7f3dbf1b,  176, DEFAULT,    MI_H, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Chaos World (Ch).nes */
- 	{ 0xb616885c,  176, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Chaos World (Ch) [a1].nes */
- 	{ 0x02c41438,  176, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Xing He Zhan Shi (Asia) (Unl).nes */
- 	{ 0xe8eafbc1,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Long Zhi Gu (ES-1137) (Ch) [f1].nes */
- 	{ 0x6c979bac,  176, DEFAULT,    MI_H, 0, DEFAULT,    0x0b, DEFAULT, NOEXTRA }, /* 10-in-1 Omake Game (FC Mobile) [b1].nes */
- 	{ 0x622e9e35,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT,   MULTI, NOEXTRA }, /* 126-in-1 (5-in-1, 16-in-1, 22-in-1, 42-in-1, 56-in-1, 62-in-1) [p1][b1].nes */
- 	{ 0xe6617bf1,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT,   MULTI, NOEXTRA }, /* 18-in-1 (FK-027 180in1).nes */
- 	{ 0x04398a9f,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 2-in-1 - Sonic 5 + Earth Worm Jim 3 (Unl) [b1].nes */
- 	{ 0x95aca7a7,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT,   MULTI, NOEXTRA }, /* 20-in-1 (15-in-1, 80-in-1, 160-in-1) [p1][b1].nes */
- 	{ 0x8e994bcd,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT,   MULTI, NOEXTRA }, /* 3-in-1 - Lion King 5, The (Unl) [b1].nes */
- 	{ 0x05a1f101,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (FK23C8078) (Ch) [p1][b1].nes */
- 	{ 0x4e5f123a,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 Digital Adventure (Unl) [b1].nes */
- 	{ 0x9ad9a8e9,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 6-in-1 (KY-6006) [p1][b1].nes */
- 	{ 0x521af87b,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 6-in-1 (KY-6009) [p1][b1].nes */
- 	{ 0x205cf073,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 8-in-1 Supergame (KY8002) [p1][b1].nes */
- 	{ 0xd408f0bc,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 9-in-1 (KY-9005) [p1][b1].nes */
- 	{ 0x20379331,  176, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mortal Kombat 30 Peoples (DH1043) (Ch).nes */
-
-	/* Mapper 199 roms are mapper 176 using extended mmc3 mode */
- 	{ 0xed481b7c,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Dragon Ball Z Gaiden - Saiya Jin Zetsumetsu Keikaku (Ch).nes */
- 	{ 0xd871d3e6,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Dragon Ball Z II - Gekishin Freeza!! (Ch).nes */
-	{ 0x44c20420,  176, DEFAULT,    MI_H, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* San Guo Zhi 2 (Ch).nes */
-
-	{ 0x558c0dc3,  178, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super 2-in-1 (Soccer Game & Crazy Dance) (Unl) [!].nes */
-	{ 0xc68363f6,  180, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Crazy Climber (Japan).nes */
-	{ 0x0f05ff0a,  181, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Seicross (Japan) (Rev 1).nes */
-	{ 0x96ce586e,  189, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Street Fighter II - The World Warrior (Unl) [!].nes */
-	{ 0x0e76e4c1,  190, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Magic Kid Googoo (Korea) (Unl).nes */
-	{ 0x555a555e,  191, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sugoro Quest - Dice no Senshitachi (Ch).nes */
-	{ 0x2cc381f6,  191, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sugoro Quest - Dice no Senshitachi (Ch) [o1].nes */
-	{ 0xa145fae6,  192, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Young Chivalry (Ch) [b3].nes */
-	{ 0xa9115bc1,  192, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Young Chivalry (Ch) [!].nes */
-	{ 0x4c7bbb0e,  192, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Young Chivalry (Ch) [b2].nes */
-	{ 0x98c1cd4b,  192, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ying Lie Qun Xia Zhuan (Asia) (Unl).nes */
-	{ 0xee810d55,  192, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* You Ling Xing Dong (Asia) (Unl).nes */
-	{ 0x442f1a29,  192, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Young Chivalry (Ch) [b1].nes */
-	{ 0x637134e8,  193, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Fighting Hero (Asia) (Ja) (Unl).nes */
-	{ 0xa925226c,  194, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dai-2-Ji - Super Robot Taisen (Ch) [b1].nes */
-	{ 0x33c5df92,  195, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Captain Tsubasa Vol. II - Super Striker (Ch) [a1].nes */
-	{ 0x1bc0be6c,  195, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Captain Tsubasa Vol. II - Super Striker (Ch) [a3].nes */
-	{ 0xd5224fde,  195, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* God Slayer - Haruka Tenkuu no Sonata (Ch).nes */
-	{ 0xfdec419f,  196, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Street Fighter VI 16 Peoples (Unl) [!].nes */
-	{ 0x700705f4,  198, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ---- */
-	{ 0x9a2cf02c,  198, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ---- */
-	{ 0xd8b401a7,  198, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ---- */
-	{ 0x28192599,  198, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ---- */
-	{ 0x19b9e732,  198, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Tenchi wo Kurau II - Shokatsu Koumei Den (J) (PRG0) [T-Chi][b6].nes */
-	{ 0xdd431ba7,  198, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Tenchi wo kurau 2 (c) */
-	{ 0x05658ded,  201,      15, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 21-in-1 (CF-043) (2006-V) (Unl) [p1].nes */
-	{ 0x276237b3,  206, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Karnov (Japan) (Rev 1).nes */
-	{ 0xa5e6baf9,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Slayer IV - Drasle Family (Japan).nes */
-	{ 0x4f2f1846,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Famista '89 - Kaimaku Ban!! (Japan).nes */
-	{ 0x22d6d5bd,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Jikuu Yuuden - Debias (Japan).nes */
-	{ 0x9d21fe96,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Lupin Sansei - Pandora no Isan (Japan).nes */
-	{ 0xae321339,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pro Yakyuu - Family Stadium '88 (Japan).nes */
-	{ 0x96dfc776,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* R.B.I. Baseball 2 (USA) (Unl).nes */
-	{ 0xfd63e7ac,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* R.B.I. Baseball 3 (USA) (Unl).nes */
-	{ 0x2a01f9d1,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Wagyan Land (Japan).nes */
-	{ 0x7678f1d5,  207, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Fudou Myouou Den (Japan).nes */
-	{ 0x07eb2c12,  208, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* FC25-台湾格斗游戏+快打传说.nes */
-	{ 0xdd8ced31,  209, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Power Rangers III (Unl) [!].nes */
-	{ 0x063b1151,  209, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Power Rangers IV (Unl) [!].nes */
-	{ 0xdd4d9a62,  209, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Shin Samurai Spirits 2 - Haoumaru Jigoku Hen (Ch).nes */
-	{ 0x0c47946d,  210,       1,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Chibi Maruko-chan - Uki Uki Shopping (Japan).nes */
-	{ 0xc247cc80,  210,       1,    MI_V, 1,    0x50, DEFAULT, DEFAULT, NOEXTRA }, /* Family Circuit '91 (Japan) (En).nes */
-	{ 0x808606f0,  210,       1,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Famista '91 (Japan).nes */
-	{ 0x6ec51de5,  210,       2,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Famista '92 (Japan).nes */
-	{ 0xadffd64f,  210,       2,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Famista '93 (Japan).nes */
-	{ 0x429103c9,  210,       2,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Famista '94 (Japan).nes */
-	{ 0x81b7f1a8,  210,       1,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Heisei Tensai Bakabon (Japan).nes */
-	{ 0x2447e03b,  210,       2,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Top Striker (Japan).nes */
-	{ 0x1dc0f740,  210,       2,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Wagyan Land 2 (Japan).nes */
-	{ 0xd323b806,  210,       2,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Wagyan Land 3 (Japan).nes */
-	{ 0xbd523011,  210,       2,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Namco Prism Zone - Dream Master (Japan).nes */
-	{ 0x5daae69a,  211, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Aladdin - Return of Jaffar, The (Unl) [!].nes */
-	{ 0x1ec1dfeb,  217, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 255-in-1 (Mapper 204) [p1].nes */
-	{ 0x046d70cc,  217, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ?? 500-in-1 (Anim Splash, Alt Mapper)[p1][!] */
-	{ 0x12f86a4d,  217, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 500-in-1.nes */
-	{ 0xd09f778d,  217, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ?? 9999999-in-1 (Static Splash, Alt Mapper)[p1][!] */
-	{ 0x62ef6c79,  232, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Quattro Sports (Camerica) (Aladdin) [b1].nes */
-	{ 0x2705eaeb,  234, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Maxi 15 (USA) (Unl).nes */
-	{ 0x80cbcacb,  235, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 100-in-1 (Unl).nes */
-	{ 0x6175b9a0,  235, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 150_in_1_199x-ASp.nes */
-	{ 0x745a6791,  235,       2, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 210-in-1 and Contra 4-in-1 (212-in-1,212 Hong Kong,Reset Based)(Unl).nes */
-	{ 0xdf81364d,  235, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 260-in-1 [p1][!].nes */
-	{ 0xa38f2f1d,  235, DEFAULT, DEFAULT, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* 1500-in-1.nes */
-	{ 0x6f12afc5,  235, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ?? Golden Game 150-in-1 */
-	{ 0x2537b3e6,  241, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dance Xtreme - Prima (Unl).nes */
-	{ 0x11611e89,  241, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Darkseed (Unl) [p1][b1].nes */
-	{ 0x81a37827,  241, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Darkseed (Unl) [p1].nes */
-	{ 0xfb2b6b10,  241, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Fan Kong Jing Ying (Asia) (Unl).nes */
-	{ 0xb5e83c9a,  241, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Xing Ji Zheng Ba (Asia) (Unl).nes */
-	{ 0x368c19a8,  241, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* LIKO Study Cartridge 3-in-1 (Unl) [!].nes */
-	{ 0x54d98b79,  241, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Titanic 1912 (Unl).nes */
-	{ 0xc2730c30,   34, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Deadly Towers (USA).nes */
-	{ 0xa21e675c,   34, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mashou (Japan).nes */
-	{ 0x6bea1235,  245, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Yong Zhe Dou E Long - Dragon Quest VI (Ch) [a1].nes */
-	{ 0x345ee51a,  245, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Yong Zhe Dou E Long - Dragon Quest VII (Ch).nes */
-	{ 0x57514c6c,  245, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Yong Zhe Dou E Long - Dragon Quest VI (Ch).nes */
-	{ 0xdb9d71b7,  114, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Donkey Kong (Unl) [o1].nes */
-	
-	/* KT-008 PCB. These require mapper 224 for having an outer bank register at $5xxx, but are usually found set to mapper 4. */
-	{ 0x61fc4d20,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* (KT-1062) 口袋怪兽꞉ 水晶版.nes */
-	{ 0xaa666c19,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Ys Origin: Hugo.nes */
-	{ 0xb0d011d3,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Ys Origin: Yunica.nes */
-	{ 0x16143319,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Ys VI: 纳比斯汀的方舟.nes */
-	{ 0xe05fc21f,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Ys: 菲尔盖纳之誓约.nes */
-	{ 0xf8b58b59,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 三国志 - 蜀魏争霸.nes */
-	{ 0xcb1bab3d,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 三国志꞉ 蜀汉风云.nes */
-	{ 0xddc122ed,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 亡灵崛起.nes */
-	{ 0x4d2811c7,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 伏魔英雄传.nes */
-	{ 0x24750e5d,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 傲视天地.nes */
-	{ 0xc658b6a8,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 刀剑英雄传.nes */
-	{ 0xea831217,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 剑侠情缘.nes */
-	{ 0x92ebad5b,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 勇者斗恶龙 III꞉ 罪恶渊源.nes */
-	{ 0x48210324,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 勇者斗恶龙꞉ 勇者的试炼.nes */
-	{ 0x3439d140,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 勇者斗恶龙꞉ 天空的新娘.nes */
-	{ 0x9a0a531a,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 勇者斗恶龙꞉ 天空篇.nes */
-	{ 0xb5fdb3cb,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 勇者黑暗世界 - 混沌世界.nes */
-	{ 0x4f427110,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋怪兽꞉ 珍珠版.nes */
-	{ 0xa46d6f4c,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋怪兽꞉ 琥珀版.nes */
-	{ 0xe001de16,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋怪兽꞉ 白金版.nes */
-	{ 0x5464d7f8,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋怪兽꞉ 翡翠版.nes */
-	{ 0x4d735cb1,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋怪兽꞉ 钻石版.nes */
-	{ 0x5d04547c,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 失落的神器.nes */
-	{ 0xcb524b42,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 征战天下.nes */
-	{ 0x5f362198,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 战神世界.nes */
-	{ 0x36de88e7,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 新魔界.nes */
-	{ 0xf8e9c9cf,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 无双乱舞.nes */
-	{ 0xa4c39535,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 神魔大陆.nes */
-	{ 0x76bbe916,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 落日征战.nes */
-	{ 0x9b518d54,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 轩辕剑꞉ 云的彼端.nes */
-	{ 0x91396b3f,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 轩辕剑꞉ 天之痕.nes */
-	{ 0xaa621fa0,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 轩辕剑꞉ 枫之舞.nes */
-	{ 0x48d1f54a,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 轩辕剑꞉ 王者归来.nes */
-	
-	{ 0xbdbe3c96,  238, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Contra Fighter (Unl).nes */
-	{ 0xcb53c523,   11, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* King Neptune's Adventure (USA) (Unl).nes */
-	{ 0x6e149729,  189, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Master Fighter II (Unl) [a1].nes */
-	{ 0x60bfeb0c,   90, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mortal Kombat 2 (Unl) [!].nes */
-	{ 0x247cc73d,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Poker II (Asia) (Ja) (Unl).nes */
-	{ 0x1f1326d4,  121, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Sonic 5 (1997) (Unl) [!].nes */
-	{ 0x99748230,  215, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* EarthWorm Jim 2 (SuperGame).nes */
-	{ 0x37876ac7,  215, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Golden Card 6-in-1 (Unl) [!].nes */
-	{ 0x1a3320a3,  215, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mortal Kombat 3 (SuperGame).nes */
-	{ 0x80eb1839,  114, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Boogerman (Sugar Softec) (Unl) [!].nes */
-	{ 0x071e4ee8,  114, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ?? m114,submapper 1 test rom */
-	{ 0xfe3e03a1,  197, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mortal Kombat III Special (YY-030) (Ch) [!].nes */
-	{ 0x9151d311,  197, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mortal Kombat III 28 Peoples (NT-328) (Ch) [!].nes */
-	{ 0x272709b9,  237, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Teletubbies Y2K (420-in-1).nes */
-	{ 0x2e27e0af,  227, DEFAULT, DEFAULT, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Bio Hazard.nes */
-	{ 0x0e7e9309,  189, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Street Fighter II - The World Warrior (Unl) [a1].nes */
-	{ 0xa3ac0095,  189, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Street Fighter II - The World Warrior (Unl) [a2].nes */
-	{ 0xeced5899,  121, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ultimate Mortal Kombat 4 (Unl) [!].nes */
-	{ 0x19c1ed51,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Poker III (Asia) (Ja) (Unl).nes */
-	{ 0x282745c5,  141, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Q Boy (Asia) (Ja) (Unl).nes */
-	{ 0x4b9ecfb2,   21, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Wai Wai World 2 - SOS!! Paseri Jou (Japan) (Virtual Console).nes */
-	{ 0x33751782,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Zoda's Revenge - StarTropics II (USA, Europe) (Virtual Console).nes */
-	{ 0x9bbf3e5d,   15, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 168-in-1 [p1][!].nes */
-
-	/* TXC / Sachen / JoyVan */
-
-	/* This cart does not work anymore with latest mapper implementation.
-	 * This will be run using alternate mapper using override in m132 */
-	{ 0x2a5f4c5a,  132, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Zhan Guo Si Chuan Sheng (C&E) (Unl).nes */
-
-	{ 0x0acfc3cd,  132, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mahjong Block (MGC-008) (Unl) [!].nes */
-
-	/* ines mappers that uses iNes 2.0 numbers */
-
-	/* CRC32, mapperNum, SubMapper, Mirroring, hasBattery, prgRam, chrRam, region, extra flags */
-	{ 0xf6bd8e31,  281, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 1997 Super HIK 4-in-1 (JY-052) [p1][!].nes */
-	/* dumps are assigned 281, but its 293 on nesdev */
-	{ 0x06256C80,  293, DEFAULT, DEFAULT, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* Super 12-in-1 NewStar (UNL) */
-	{ 0x5aa23a15,  361, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (OK-411)[p1][!].nes */
-	{ 0xf6b9d088,  366, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (K-3131GS, GN-45) [p1][!].nes */
-	{ 0x503566b2,  366, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (K-3131SS, GN-45) [p1][!].nes */
-	{ 0xdb2d2d88,  369, DEFAULT, DEFAULT, 0,    0x07, DEFAULT, DEFAULT, NOEXTRA }, /* Super Mario Bros. Party.nes */
-	{ 0x87f83ea2,  380, DEFAULT, DEFAULT, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* 42 to 80,000 */
-	{ 0xc4b94bd5,  389, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Caltron - 9 in 1 (USA) (Proto) (Unl).nes */
-	{ 0x2F497313,  401, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super 19-in-1 (VIP19) */
-
-	/* ines mappers that uses unif boards */
-
-	{ 0x0073dbd8,  260, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 2-in-1 - Mortal Kombat V Turbo 30 + Super Aladdin (Unl) [p1][!].nes */
-	{ 0x4dc6107d,  260, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 2-in-1 - Boogerman + Flintstones, The (Unl) [p1][!].nes */
-	{ 0xb72b2cf4,  260, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 2-in-1 - Aladdin + Lion King, The (Unl) [p1][!].nes */
-	{ 0x5638ba59,  260, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mortal Kombat Trilogy - 8 People (M1274) (Ch) [!].nes */
-	{ 0xa1dc16c0,  262, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Street Heroes (Asia) (Ja) (Unl).nes */
-	{ 0x1df10182,  263, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Boogerman II (Rex-Soft) [!].nes */
-	{ 0xf956fcea,  521, DEFAULT, DEFAULT, 0, DEFAULT,    0x70, DEFAULT, NOEXTRA }, /* Korean Igo (Korea) (Unl).nes */
-	{ 0x2eed2e34,  289, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 76-in-1 [p1][a1].nes 2048 PRG, 0 CHR */
-
-	{ 0x00000000, DEFAULT, DEFAULT, DEFAULT, DEFAULT, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }
-
-#endif
+#ifndef _FCEU_INES_CORRECT_H
+#define _FCEU_INES_CORRECT_H
+
+	/* ROM images that have the battery-backed bit set in the header that really
+	don't have battery-backed RAM is not that big of a problem, so I'll
+	treat this differently by only listing games that should have battery-backed RAM.
+	*/
+	/* CRC32, mapperNum, SubMapper, Mirroring, hasBattery, prgRam, chrRam, region, extra flags */
+	{ 0xb17574f3,    1, DEFAULT, DEFAULT, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* AD&D Heroes of the Lance */
+	{ 0x5de61639,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* AD&D Hillsfar */
+	{ 0x2545214c,    1, DEFAULT, DEFAULT, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* DW */
+	{ 0x3b3f88f0,    1, DEFAULT, DEFAULT, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* DW */
+	{ 0x8c5a784e,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* DW 2 */
+	{ 0x506e259d,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* DW 4*/
+	{ 0xa86a5318,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Dw 3 */
+	{ 0x45f03d2e,    1, DEFAULT, DEFAULT, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Faria */
+	{ 0xb8b88130,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Final Fantasy (FFE Hack) */
+	{ 0xcebd2a31,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Final Fantasy */
+	{ 0xd29db3c7,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Final Fantasy 2 */
+	{ 0x466efdc2,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Final Fantasy J */
+	{ 0xeaf7ed72,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Legend of Zelda */
+	{ 0x3fe272fb,    1, DEFAULT, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Legend of Zelda */
+	{ 0xba322865,    1, DEFAULT, DEFAULT, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Zelda 2 */
+	{ 0x25952141,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* AD&D Pool of Radiance */
+	{ 0x1335cb05,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Crystalis */
+	{ 0x57e220d0,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Final Fantasy 3 */
+	{ 0x889129cb,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Startropics */
+	{ 0xd054ffb0,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Startropics 2*/
+	{ 0xb5ff71ab,   19, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Battle Fleet */
+	{ 0x0c1792da,   19, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Famista '90 */
+	{ 0x47c2020b,   19, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Hydlide 3*/
+	{ 0xbc11e61a,   19, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Kaijuu Monogatari */
+	{ 0xace56f39,   19, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mindseeker */
+	{ 0xe1383deb,   26, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mouryou Senki Madara */
+	{ 0xde9c9c64,   80, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Kyonshiizu 2 */
+	{ 0x0e1683c5,   80, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mirai Shinwa Jarvas */
+
+	{ 0xaf5d7aa2,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Clu Clu Land (W) [o3].nes */
+	{ 0xcfb224e6,  222, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ninja (J) (PRG0) [p1][!].nes */
+	{ 0x82f204ae,  163, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Liang Shan Ying Xiong (NJ023) (Ch) [!].nes */
+	{ 0xad9c63e2,   70, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Space Shadow (Japan).nes */
+	{ 0xe1526228,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ki no Bouken - The Quest of Ki (Japan).nes */
+	{ 0xaf5d7aa2,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Clu Clu Land (W) [o3].nes */
+	{ 0xcfb224e6,  222, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ninja (J) (PRG0) [p1][!].nes */
+	{ 0xfcdaca80,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Elevator Action (Japan).nes */
+	{ 0xc05a365b,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Chou Fuyuu Yousai Exed Exes (Japan).nes */
+	{ 0xc4c3949a,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mario Bros. (World).nes */
+	{ 0x32fa246f,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Tag Team Pro-Wrestling (Japan).nes */
+	{ 0x43d30c2f,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ms. Pac-Man (USA) (Tengen) (Unl).nes */
+	{ 0xb3c30bea,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Xevious (Japan) (En).nes */
+	{ 0xe492d45a,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Zippy Race (Japan).nes */
+	{ 0x24598791,    0, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Duck Hunt (World).nes */
+	{ 0x49aeb3a6,    0, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Excitebike (Japan, USA).nes */
+	{ 0xb8535ca3,    0, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mahjong (Japan).nes */
+	{ 0x330de468,    0, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Obake no Q Tarou - Wanwan Panic (Japan).nes */
+	{ 0xe28f2596,    0, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pac-Land (J) [b2].nes */
+	{ 0x5112dc21,    0, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Wild Gunman (World) (Rev 1).nes */
+	{ 0xd8ee7669,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Adventures of Rad Gravity, The (USA).nes */
+	{ 0x5b837e8d,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Alien Syndrome (Japan).nes */
+	{ 0x37ba3261,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Back to the Future Part II & III (USA).nes */
+	{ 0x5b6ca654,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Barbie (USA).nes */
+	{ 0x61a852ea,    1, DEFAULT, DFAULT8, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Battle Stadium - Senbatsu Pro Yakyuu (Japan).nes */
+	{ 0xf6fa4453,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bigfoot (U) [b4].nes */
+	{ 0x391aa1b8,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Bloody Warriors - Shan-Go no Gyakushuu (Japan).nes */
+	{ 0xa5e8d2cd,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* BreakThru (USA).nes */
+	{ 0x3f56a392,    1, DEFAULT, DFAULT8, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* Captain ED (Japan).nes */
+	{ 0x078ced30,    1, DEFAULT, DFAULT8, 1,    0x07, DEFAULT, DEFAULT, NOEXTRA }, /* Choujin - Ultra Baseball (Japan).nes */
+	{ 0xfe364be5,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Deep Dungeon IV - Kuro no Youjutsushi (Japan).nes */
+	{ 0x57c12280,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Demon Sword (U) [b1].nes */
+	{ 0xd09b74dc,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Great Tank (Japan).nes */
+	{ 0xe8baa782,    1, DEFAULT, DFAULT8, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Gunhed - Aratanaru Tatakai (Japan).nes */
+	{ 0x970bd9c2,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Hanjuku Eiyuu (J) [b1].nes */
+	{ 0xcd7a2fd7,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Hanjuku Hero (Japan).nes */
+	{ 0x63469396,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Hokuto no Ken 4 - Shichisei Haken Den - Hokuto Shinken no Kanata e (Japan).nes */
+	{ 0xe94d5181,    1, DEFAULT, DFAULT8, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Future Wars - Mirai Senshi Lios (Japan).nes */
+	{ 0x7156cb4d,    1, DEFAULT, DFAULT8, 0,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Muppet Adventure - Chaos at the Carnival (USA).nes */
+	{ 0x70f67ab7,    1, DEFAULT, DFAULT8, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Musashi no Bouken (Japan).nes */
+	{ 0x958e4bae,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Orb-3D (USA).nes */
+	{ 0x291bcd7d,    1, DEFAULT, DFAULT8, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* Pachio-kun 2 (Japan).nes */
+	{ 0xa9a4ea4c,    1, DEFAULT, DFAULT8, 1,    0x70, DEFAULT, DEFAULT, NOEXTRA }, /* Satomi Hakkenden (J) [b2].nes */
+	{ 0xcc3544b0,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Triathron, The (Japan).nes */
+	{ 0x52ab2d17,    1, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Toukyou Pachi-Slot Adventure (Japan).nes */
+	{ 0x934db14a,    1, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* All-Pro Basketball (USA).nes */
+	{ 0xf74dfc91,    1, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Win, Lose or Draw (USA).nes */
+	{ 0xcfe02ada,    1, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Darkman (Europe).nes */
+	{ 0x1a71fd06,    1, DEFAULT,    MI_H, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* Kujaku Ou.nes */
+
+	/* MMC1 games with more than 8K wram */
+	{ 0x2225c20f,    1, DEFAULT, DEFAULT, 1,    0x77,    0x07, DEFAULT, NOEXTRA }, /* Genghis Khan */
+	{ 0xfb69743a,    1, DEFAULT, DEFAULT, 1,    0x77,    0x07, DEFAULT, NOEXTRA }, /* ""        "" (J) */
+	{ 0x4642dda6,    1, DEFAULT, DEFAULT, 1,    0x77,    0x07, DEFAULT, NOEXTRA }, /* Nobunaga's Ambition */
+	{ 0x3f7ad415,    1, DEFAULT, DEFAULT, 1,    0x77,    0x07, DEFAULT, NOEXTRA }, /* ""        "" (J) (PRG0) */
+	{ 0x2b11e0b0,    1, DEFAULT, DEFAULT, 1,    0x77,    0x07, DEFAULT, NOEXTRA }, /* ""        "" (J) (PRG1) */
+	{ 0xc6182024,    1, DEFAULT, DEFAULT, 1,    0x77,    0x07, DEFAULT, NOEXTRA }, /* Romance of the 3 Kingdoms */
+	{ 0xabbf7217,    1, DEFAULT, DEFAULT, 1,    0x77,    0x07, DEFAULT, NOEXTRA }, /* ""        "" (J) (PRG0) or Sangokushi  */
+	{ 0xccf35c02,    1, DEFAULT, DEFAULT, 1,    0x77,    0x07, DEFAULT, NOEXTRA }, /* ""        "" (J) (PRG1) */
+	{ 0xb8747abf,    1, DEFAULT, DEFAULT, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Best Play Pro Yakyuu Special (J) (PRG0) */
+	{ 0xc3de7c69,    1, DEFAULT, DEFAULT, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* ""        "" (J) (PRG1) */
+	{ 0xc9556b36,    1, DEFAULT, DEFAULT, 1,    0x90,    0x07, DEFAULT, NOEXTRA }, /* Final Fantasy 1+2 */
+
+	{ 0xe6a477b2,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 3-D WorldRunner (USA).nes */
+	{ 0x9ea1dc76,    2, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Rainbow Islands (USA).nes */
+	{ 0x6d65cac6,    2, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Terra Cresta (Japan).nes */
+	{ 0xe1b260da,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Argos no Senshi - Hachamecha Daishingeki (Japan).nes */
+	{ 0x1d0f4d6b,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Black Bass, The (USA).nes */
+	{ 0x266ce198,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* City Adventure Touch - Mystery of Triangle (J) [b1].nes */
+	{ 0x804f898a,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Unit (Japan).nes */
+	{ 0x55773880,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Adventures of Gilligan's Island, The (USA).nes */
+	{ 0x6e0eb43e,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Puss 'n Boots - Pero's Great Adventure (USA).nes */
+	{ 0x2bb6a0f8,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sherlock Holmes - Hakushaku Reijou Yuukai Jiken (Japan).nes */
+	{ 0x28c11d24,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sukeban Deka 3 (J) [b1].nes */
+	{ 0x02863604,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sukeban Deka III (Japan).nes */
+	{ 0x419461d0,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Cars (USA).nes */
+
+	/* CNROM by default has bus conflicts enabled, these requires no bus conflict to play correctly */	
+	{ 0x2915faf0,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Incantation (Asia) (Ja) (Unl).nes */
+	{ 0x8f154a0d,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pu Ke Jing Ling (Asia) (Unl).nes */
+	{ 0xb0c871c5,    3,       1,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Wei Lai Xiao Zi (Joy Van).nes */
+	{ 0xb3be2f71,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Yanshan Chess (Unl).nes */
+	{ 0xd04a40e6,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bingo 75 (Asia) (Ja) (Unl).nes */
+	{ 0xe41b440f,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sidewinder (Joy Van).nes */
+	{ 0xebd0644d,    3,       1,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Master Chu & The Drunkard Hu (Joy Van).nes */
+	{ 0xf283cf58,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Colorful Dragon (Sachen).nes */
+	{ 0x2deb12b8,    3,       1,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Venice Beach Volleyball (Asia) (Ja) (Super Mega) (Unl).nes */
+
+	{ 0xdbf90772,    3, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Alpha Mission (USA).nes */
+	{ 0xd858033d,    3, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ASO - Armored Scrum Object (J).nes */
+	{ 0xd858033d,    3, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ASO - Armored Scrum Object (J).nes */
+	{ 0x637ba508,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Adan y Eva (Spain) (Gluk Video) (Unl).nes */
+	{ 0x9bde3267,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Adventures of Dino Riki (USA).nes */
+	{ 0xd8eff0df,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Gradius (Japan).nes */
+	{ 0x1d41cc8c,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Gyruss (USA).nes */
+	{ 0xcf322bb3,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* John Elway's Quarterback (USA).nes */
+	{ 0xb5d28ea2,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mystery Quest (USA).nes */
+	{ 0x02cc3973,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ninja Kid (USA).nes */
+	{ 0xbc065fc3,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pipe Dream (U) [b1].nes */
+	{ 0xc9ee15a7,    3, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Aladdin III (1995) (Unl) [hM03].nes */
+	{ 0x8dedea07,    3, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Shui Guo Li (Ch) [a1].nes */
+	{ 0x684afccd,    3, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Space Hunter (Japan).nes */
+
+	{ 0x97b6cb19,    4, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Aladdin (SuperGame) (Mapper 4) [!].nes */
+	{ 0xd97c31b0,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Lasalle Ishii no Child's Quest (Japan).nes */
+	{ 0x404b2e8b,    4, DEFAULT,    MI_4, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Rad Racer II (USA).nes */
+	{ 0x15141401,    4, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Asmik-kun Land (Japan).nes */
+	{ 0x4cccd878,    4, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Kyatto Ninden Teyandee (J) [b1].nes */
+	{ 0x59280bec,    4, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Jackie Chan (Japan).nes */
+	{ 0x7474ac92,    4, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Kabuki - Quantum Fighter (USA).nes */
+	{ 0xf2594374,    4, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Matendouji (Japan).nes */
+	{ 0x5337f73c,    4, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Niji no Silk Road (Japan).nes */
+	{ 0x9eefb4b4,    4, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pachi-Slot Adventure 2 - Sorotta-kun no Pachi-Slot Tanteidan (Japan).nes */
+	{ 0xafe03802,    4, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pachio-kun 3 (Japan) (Rev A).nes */
+	{ 0x21a653c7,    4, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Sky Kid (VS).nes */
+	{ 0xdb7f07be,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Toki (USA) (Beta).nes */
+	{ 0x8F6CC85A,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KT-220B) Totally Rad 4-in-1.nes [overdump] */
+	{ 0xAB9DE91F,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KT-220B) Totally Rad 4-in-1.nes, Commonly set to mapper 176 */
+
+	/* MMC5 */
+	{ 0x671f23a8,    5, DEFAULT, DEFAULT, 0,       0,        0,     PAL, NOEXTRA }, /* Castlevania III - Dracula's Curse (E) */
+	{ 0xcd4e7430,    5, DEFAULT, DEFAULT, 0,       0,        0, DEFAULT, NOEXTRA }, /* Castlevania III - Dracula's Curse (KC) */
+	{ 0xed2465be,    5, DEFAULT, DEFAULT, 0,       0,        0, DEFAULT, NOEXTRA }, /* Castlevania III - Dracula's Curse (U) */
+	{ 0x0afb395e,    5, DEFAULT, DEFAULT, 0,       0,        0, DEFAULT, NOEXTRA }, /* Gun Sight */
+	{ 0xb0480ae9,    5, DEFAULT, DEFAULT, 0,       0,        0, DEFAULT, NOEXTRA }, /* Laser Invasion */
+	{ 0xb4735fac,    5, DEFAULT, DEFAULT, 0,       0,        0, DEFAULT, NOEXTRA }, /* Metal Slader Glory */
+	{ 0xbb7f829a,    5, DEFAULT, DEFAULT, 0,       0,        0, DEFAULT, NOEXTRA }, /* Uchuu Keibitai SDF */
+	{ 0x0ec6c023,    5, DEFAULT, DEFAULT, 1,    0x70,        0, DEFAULT, NOEXTRA }, /* Gemfire */
+	{ 0x9cbadc25,    5, DEFAULT, DEFAULT, 1,    0x70,        0, DEFAULT, NOEXTRA }, /* Just Breed */
+	{ 0xbc80fb52,    5, DEFAULT, DEFAULT, 1,    0x70,        0, DEFAULT, NOEXTRA }, /* Royal Blood */
+	{ 0xd532e98f,    5, DEFAULT, DEFAULT, 1,    0x70,        0, DEFAULT, NOEXTRA }, /* Shin 4 Nin Uchi Mahjong - Yakuman Tengoku */
+	{ 0x15fe6d0f,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* Bandit Kings of Ancient China */
+	{ 0xfe3488d1,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* Daikoukai Jidai */
+	{ 0x1ced086f,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* Ishin no Arashi */
+	{ 0x6396b988,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* L'Empereur (J) */
+	{ 0x9c18762b,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* L'Empereur (U) */
+	{ 0xeee9a682,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* Nobunaga no Yabou - Sengoku Gunyuu Den (J) (PRG0) */
+	{ 0xf9b4240f,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* Nobunaga no Yabou - Sengoku Gunyuu Den (J) (PRG1) */
+	{ 0x8ce478db,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* Nobunaga's Ambition 2 */
+	{ 0x39f2ce4b,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* Suikoden - Tenmei no Chikai */
+	{ 0xaca15643,    5, DEFAULT, DEFAULT, 1,    0x77,        0, DEFAULT, NOEXTRA }, /* Uncharted Waters */
+	{ 0x6f4e4312,    5, DEFAULT, DEFAULT, 1,    0x90,        0, DEFAULT, NOEXTRA }, /* Aoki Ookami to Shiroki Mejika - Genchou Hishi */
+	{ 0xf540677b,    5, DEFAULT, DEFAULT, 1,    0x90,        0, DEFAULT, NOEXTRA }, /* Nobunaga no Yabou - Bushou Fuuun Roku */
+	{ 0xf011e490,    5, DEFAULT, DEFAULT, 1,    0x90,        0, DEFAULT, NOEXTRA }, /* Romance of The Three Kingdoms II */
+	{ 0x184c2124,    5, DEFAULT, DEFAULT, 1,    0x90,        0, DEFAULT, NOEXTRA }, /* Sangokushi II (J) (PRG0) */
+	{ 0xee8e6553,    5, DEFAULT, DEFAULT, 1,    0x90,        0, DEFAULT, NOEXTRA }, /* Sangokushi II (J) (PRG1) */
+
+	{ 0xf518dd58,    7, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Captain Skyhawk (USA).nes */
+	{ 0x6c4a9735,    7, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* WWF Wrestlemania (Europe).nes */
+	{ 0x84382231,    9, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Punch-Out!! (Japan) (Gold Edition).nes */
+	{ 0xbe939fce,    9, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Punch-Out!! (U) [b1].nes */
+	{ 0x7b837fde,    9, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mike Tyson's Punch-Out!! (PC10) [b1].nes */
+	{ 0x345d3a1a,   11, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Castle of Deceit (USA) (Unl).nes */
+	{ 0xb79f2651,   11, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Chiller (USA) (Unl).nes */
+	{ 0x5e66eaea,   13, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Videomation (USA).nes */
+	{ 0xcd373baa,   14, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 武士魂 (8 characters).nes */
+	{ 0xbfc7a2e9,   16, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ball 3 - Gokuu Den (Japan) (Rev 1).nes */
+	{ 0x6e68e31a,   16, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ball 3 - Gokuu Den (Japan).nes */
+	{ 0x33b899c9,   16, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ball - Daimaou Fukkatsu (Japan).nes */
+	{ 0xa262a81f,   16, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Rokudenashi Blues (Japan).nes */
+	{ 0x286fcd20,   21, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ganbare Goemon Gaiden 2 - Tenka no Zaihou (Japan).nes */
+	{ 0x335e6339,   23, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* kung fu legend (unl)[!].nes */
+	{ 0x1a8d767b,   23, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* kung fu legend (unl)[!p].nes */
+	{ 0x0e263d47,   23, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* World Hero (Unl) (TV System Select) [!].nes */
+	{ 0xe4a291ce,   23, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* World Hero (Unl) [!].nes */
+	{ 0x51e9cd33,   23, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* World Hero (Unl) [b1].nes */
+	{ 0x105dd586,   27, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mi Hun Che (Ch)(full copyrights)[!].nes */
+	{ 0xbc9bb6c1,   27, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Car (Ch)(full copyrights)[!].nes */
+	{ 0x43753886,   27, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mi Hun Che (Ch)(replaced copyrights)[p1][!].nes */
+	{ 0x5b3de3d1,   27, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* -- */
+	{ 0x511e73f8,   27, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mi Hun Che (Ch) [p1][b2].nes */
+	{ 0x5555fca3,   32, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ai Sensei no Oshiete - Watashi no Hoshi (J) [b1].nes */
+	{ 0x283ad224,   32, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ai Sensei no Oshiete - Watashi no Hoshi (Japan).nes */
+	{ 0x243a8735,   32, DEFAULT,  0x10|4, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Major League (Japan).nes */
+	{ 0x8a7d0abe,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Akira (Japan).nes */
+	{ 0x376138d8,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Akira (J) [a1].nes */
+	{ 0xadf606f6,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bakushou!! Jinsei Gekijou (Japan).nes */
+	{ 0xbc7b1d0f,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bakushou!! Jinsei Gekijou 2 (Japan).nes */
+	{ 0x7a497ae3,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Don Doko Don (Japan).nes */
+	{ 0xbaca10a9,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Golfkko Open (Japan).nes */
+	{ 0xf80bdc50,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Insector X (Japan).nes */
+	{ 0x2a6559a1,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Operation Wolf (Japan).nes */
+	{ 0xaeb7fce9,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Power Blazer (Japan).nes */
+	{ 0xd920f9df,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Takeshi no Sengoku Fuuunji (Japan).nes */
+	{ 0x3cd4b420,   33, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Takeshi no Sengoku Fuuunji (Japan) (Beta).nes */
+	{ 0x4c7c1af3,   34, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Caesars Palace (U) [b1].nes */
+	{ 0x932ff06e,   34, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Classic Concentration (U) [b1].nes */
+	{ 0xf46ef39a,   37, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Super Mario Bros. + Tetris + Nintendo World Cup (Europe) (Rev 1).nes */
+	{ 0x4686c5dd,   41, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Caltron - 6 in 1 (USA) (Unl).nes */
+	{ 0x090c0c17,   42, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ai Senshi Nicol (FDS Conversion) [p1][!].nes */
+	{ 0x4df84825,   42, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ai Senshi Nicol (FDS Conversion) [p2][!].nes */
+	{ 0x579e5bc5,   42, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ai Senshi Nicol (FDS Conversion) [p3].nes */
+	{ 0xc744f205,   42, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ai Senshi Nicol (FDS Conversion) [p3][t1].nes */
+	{ 0x71699765,   42, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Love Warrior Nicol.nes */
+	{ 0x6bf3f6a3,   42, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bio Miracle Bokutte Upa (J) (Mario Baby - FDS Conversion).nes */
+	{ 0x5ba1c5cf,   42, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Green Beret (FDS Conversion) (Unl).nes */
+	{ 0x50ab1ab2,   42, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ?? Green Beret (FDS Conversion, LH09) (Unl) [U][!][t1] (160K PRG */
+	{ 0x7ccb12a3,   43, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ?? SMB2j */
+	{ 0x6c71feae,   45, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Kunio 8-in-1 [p1].nes */
+	{ 0x40c0ad47,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Flintstones, The - The Rescue of Dino & Hoppy (Japan).nes */
+	{ 0xaebd6549,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bakushou!! Jinsei Gekijou 3 (Japan).nes */
+	{ 0x6cdc0cd9,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bubble Bobble 2 (Japan).nes */
+	{ 0x99c395f9,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Captain Saver (Japan).nes */
+	{ 0xa7b0536c,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Don Doko Don 2 (Japan).nes */
+	{ 0xb17c828a,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Don Doko Don 2 (J) [a1].nes */
+	{ 0x40c0ad47,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Flintstones, The - The Rescue of Dino & Hoppy (J).nes */
+	{ 0x1500e835,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Jetsons, The - Cogswell's Caper (Japan).nes */
+	{ 0xe2c94bc2,   48, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Bros 8 (Unl) [!].nes */
+	{ 0xa912b064,   51, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT,   0x800 }, /* 11-in-1 Ball Games [p1][o1].nes (has CHR ROM when it shouldn't) */
+	{ 0x2e72a5d9,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 11-in-1 (66-in-1, 86-in-1, 63-in-1).nes */
+	{ 0x39f514fd,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 18 in 1 (118-in-1, 138-in-1, 198-in-1)VTxxxx.nes */
+	{ 0xd8b1f465,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 26-in-1 (36-in-1, 46-in-1,56-in-1) VT 335.nes */
+	{ 0xcf82fae9,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 28 in 1 (38-in-1, 48-in-1, 58-in1)VTxxxx.nes */
+	{ 0xa7a98698,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 28-in-1 (46-in-1, 63-in-1, 118-in-1)VT-5116.nes */
+	{ 0x21fd7143,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 41-in-1 (5-in-1,71-in-1)  VT345.nes */
+	{ 0x49ec88d6,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 42-in-1 NT-234 Bad Game Road Fighter.nes */
+	{ 0x60306f19,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 42-in-1 PCB 3840.nes */
+	{ 0x450cd86e,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 48-in-1 (62-in-1,73-in-1,88-in-1) VTxxx.nes */
+	{ 0xd774e041,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 50-in-1 (60-in-1,70-in-1,80-in-1) NT-113.nes */
+	{ 0x3c4e94f6,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 51-in-1 (61-in-1, 71-in-1, 81-in-1) VT5310.nes */
+	{ 0x0422ed44,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 7-in-1 (32-in-1,66-in-1,119-in-1) VT15004.nes */
+	{ 0x7efc0d2c,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 7-in-1 (5000-in-1, 999999999-in-1, 10000000-in-1)NC-07N.nes */
+	{ 0x6d92dff1,   59, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* TN 95-in-1 (6-in-1) [p1].nes */
+	{ 0x39ab0fc7,   64, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Hard Drivin' (USA) (Proto) (Unl).nes */
+	{ 0xb19a55dd,   64, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Road Runner (USA) (Unl).nes */
+	{ 0xf92be3ec,   64, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Rolling Thunder (USA) (Unl).nes */
+	{ 0xd114f544,   66, DEFAULT,    MI_H, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* AV Super Real Pachinko (Japan) (Unl).nes */
+	{ 0xe84274c5,   66, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mississippi Satsujin Jiken (J) [h2].nes */
+	{ 0xbde3ae9b,   66, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Doraemon (Japan).nes */
+	{ 0x9552e8df,   66, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ball - Shen Long no Nazo (Japan).nes */
+	{ 0x811f06d9,   66, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Power (USA).nes */
+	{ 0xd26efd78,   66, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Mario Bros. + Duck Hunt (USA).nes */
+	{ 0xdd8ed0f7,   70, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Kamen Rider Club (Japan).nes */
+	{ 0xbba58be5,   70, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Family Trainer 6 - Manhattan Police (Japan).nes */
+	{ 0x370ceb65,   70, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Family Trainer 5 - Meiro Daisakusen (Japan).nes */
+	{ 0x86be4746,    2, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dooly Bravo Land (Korea) (Unl).nes */
+	{ 0xe62e3382,   71, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* MiG 29 - Soviet Fighter (USA) (Unl).nes */
+	{ 0xac7b0742,   71, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Golden KTV (Ch) [!].nes */
+	{ 0x054bd3e9,   74, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Di 4 Ci - Ji Qi Ren Dai Zhan (Ch).nes */
+	{ 0x496ac8f7,   74, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ji Jia Zhan Shi (Ch) [b3].nes */
+	{ 0xae854cef,   74, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Jia A Fung Yun (Ch).nes */
+	{ 0xba51ac6f,   78, DEFAULT,    MI_4, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Holy Diver (Japan).nes */
+	{ 0x3d1c3137,   78, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Uchuusen Cosmo Carrier (Japan).nes */
+	{ 0xa4fbb438,   79, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* F-15 City War (AVE) (REV1.x) [b1].nes */
+	{ 0xd4a76b07,   79, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* F-15 City War (AVE) (REV1.x) [b2].nes */
+	{ 0x8eab381c,   79, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Deathbots (USA) (Rev 1) (Unl).nes */
+	{ 0x1eb4a920,   79, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Double Strike - Aerial Attack Force (USA) (v1.1) (Unl).nes */
+	{ 0x3e1271d5,   79, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Tiles of Fate (USA) (Unl).nes */
+	{ 0xd2699893,   88, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Spirit - Aratanaru Densetsu (Japan).nes */
+	{ 0xbb7c5f7a,   89, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Tenka no Goikenban - Mito Koumon (J) [f1].nes */
+	{ 0x082778e6,   91,       1,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Fighter III.nes */
+	{ 0x10119e6b,   93, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Fantasy Zone (Japan) (Sunsoft).nes */
+	{ 0x2b750bf9,  101, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Urusei Yatsura - Lum no Wedding Bell (Japan) (Beta).nes */
+	{ 0x0da5e32e,  101, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Urusei Yatsura - Lum no Wedding Bell (Japan).nes */
+	{ 0x6096f84e,  104, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pegasus 5-in-1 (Golden Five) (Unl).nes */
+	{ 0x3d3ff543,  113, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Kazama Jun to Asama Yuuko no AV Dragon Mahjong (Japan) (Unl).nes */
+	{ 0x68379fdb,  113, DEFAULT,    MI_V, 1, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Pipemania (Australia) (HES) (Unl).nes */
+	{ 0x6a03d3f3,  114, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Lion King, The (Unl) (Mapper 114).nes */
+	{ 0x0d98db53,  114, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pocahontas (Unl).nes */
+	{ 0xf5676f0b,  114, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Donkey Kong (Unl) [b1].nes */
+	{ 0xc5e5c5b2,  115, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bao Qing Tian (Ch).nes */
+	{ 0xe40dfb7e,  116, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Somari (SOMARI-P) (NT-616) (Unl) [!].nes */
+	{ 0xc9371ebb,  116, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Somari (SOMARI-W) (Unl) [!].nes */
+	{ 0x78b657ac,  118, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Armadillo (Japan).nes */
+	{ 0x90c773c1,  118, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Goal! Two (USA).nes */
+	{ 0xb9b4d9e0,  118, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* NES Play Action Football (USA).nes */
+	{ 0x07d92c31,  118, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* RPG Jinsei Game (Japan).nes */
+	{ 0x37b62d04,  118, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ys III - Wanderers from Ys (Japan).nes */
+	{ 0x318e5502,  121, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sonic 3D Blast 6 (Unl).nes */
+	{ 0xddcfb058,  121, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Street Fighter Zero 2 '97 (Unl) [!].nes */
+	{ 0xd2674b0a,  132, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Qi Wang - Chinese Chess (Asia) (Ja) (Unl).nes */
+	{ 0x5aefbc94,  133, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Jovial Race (Asia) (Ja) (PAL) (Unl).nes */
+	{ 0xB550B627,  136, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Incantation (Dip Bin) (Joy Van).nes */
+	{ 0xc2df0a00,  140, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bio Senshi Dan - Increaser Tono Tatakai (J) [hM66][b3].nes */
+	{ 0xe46b1c5d,  140, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mississippi Satsujin Jiken (Japan).nes */
+	{ 0x3293afea,  140, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mississippi Satsujin Jiken (Japan) (Rev A).nes */
+	{ 0x6bc65d7e,  140, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Youkai Club (Japan).nes */
+	{ 0x5caa3e61,  144, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Death Race (USA) (Unl).nes */
+	{ 0x48239b42,  146, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mahjang Companion (Asia) (Ja) (Hacker) (Unl).nes */
+	{ 0xb6a727fa,  146, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Papillon Gals (Japan) (Unl).nes */
+	{ 0xa62b79e1,  146, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sidewinder (HES) [o1].nes */
+	{ 0xcc868d4e,  149, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Taiwan Mahjong 16 (Sachen) [a1][!].nes */
+	{ 0x29582ca1,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mei Nu Quan (Honey Peach) (Sachen) [!].nes */
+	{ 0x40dbf7a2,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Olympic IQ (Asia) (Ja) (PAL) (Unl).nes */
+	{ 0x73fb55ac,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Lightgun Game 2 in 1 - Cosmocop + Cyber Monster (Asia) (Ja) (Unl).nes */
+	{ 0xddcbda16,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Lightgun Game 2 in 1 - Tough Cop + Super Tough Cop (Asia) (Ja) (Unl).nes */
+	{ 0x47918d84,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Auto-Upturn (Asia) (Ja) (PAL) (Unl).nes */
+	{ 0x471173e7,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Chinese Checkers (Asia) (Ja) (PAL) (Unl).nes */
+	{ 0x2394ae1c,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Happy Pairs (Asia) (Ja) (PAL) (Unl).nes */
+	{ 0xcab40a6c,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Magic Cube (Asia) (Ja) (PAL) (Unl).nes */
+	{ 0xbe17e27b,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Poker III (Asia) (Ja) (Alt 2) (Unl).nes */
+	{ 0x34ddf806,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Strategist (Asia) (Ja) (NTSC) (Unl).nes */
+	{ 0xc06facfc,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT,     PAL, NOEXTRA }, /* Strategist (Asia) (Ja) (PAL) (Unl).nes */
+	{ 0xa95a915a,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Tasac (Asia) (Ja) (Unl).nes */
+	{ 0x0f141525,  152, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Arkanoid II (Japan).nes */
+	{ 0xbda8f8e4,  152, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Gegege no Kitarou 2 - Youkai Gundan no Chousen (Japan).nes */
+	{ 0xb1a94b82,  152, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pocket Zaurus - Juu Ouken no Nazo (Japan).nes */
+	{ 0x026c5fca,  152, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Saint Seiya - Ougon Densetsu (Japan).nes */
+	{ 0x3f15d20d,  153, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Famicom Jump II - Saikyou no 7 Nin (Japan).nes */
+	{ 0xd1691028,  154, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Devil Man (Japan).nes */
+	{ 0xcfd4a281,  155, DEFAULT, DFAULT8, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Money Game, The (Japan).nes */
+	{ 0x2f27cdef,  155, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Tatakae!! Rahmen Man - Sakuretsu Choujin 102 Gei (J) [b1].nes */
+	{ 0xc1719664,  155, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Tatakae!! Rahmen Man - Sakuretsu Choujin 102 Gei (Japan).nes */
+	{ 0xccc03440,  156, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Buzz & Waldog (USA) (Proto) (Unl).nes */
+	{ 0x983d8175,  157, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Datach - Battle Rush - Build Up Robot Tournament (Japan).nes */
+	{ 0x894efdbc,  157, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Datach - Crayon Shin-chan - Ora to Poi Poi (Japan).nes */
+	{ 0x19e81461,  157, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Datach - Dragon Ball Z - Gekitou Tenkaichi Budoukai (Japan).nes */
+	{ 0xbe06853f,  157, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Datach - J.League Super Top Players (Japan).nes */
+	{ 0x0be0a328,  157, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Datach - SD Gundam - Gundam Wars (Japan).nes */
+	{ 0x5b457641,  157, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Datach - Ultraman Club - Supokon Fight! (Japan).nes */
+	{ 0xf51a7f46,  157, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Datach - Yu Yu Hakusho - Bakutou Ankoku Bujutsukai (Japan).nes */
+	{ 0xcbf4366f,  158, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Alien Syndrome (USA) (Unl).nes */
+	{ 0xe170404c,  159, DEFAULT, DEFAULT, 1,    0x10, DEFAULT, DEFAULT, NOEXTRA }, /* SD Gundam Gaiden - Knight Gundam Monogatari (Japan).nes */
+	{ 0x276ac722,  159, DEFAULT, DEFAULT, 1,    0x10, DEFAULT, DEFAULT, NOEXTRA }, /* SD Gundam Gaiden - Knight Gundam Monogatari (Japan) (Rev 1).nes */
+	{ 0x0cf42e69,  159, DEFAULT, DEFAULT, 1,    0x10, DEFAULT, DEFAULT, NOEXTRA }, /* Magical Taruruuto-kun - Fantastic World!! (Japan).nes */
+	{ 0xdcb972ce,  159, DEFAULT, DEFAULT, 1,    0x10, DEFAULT, DEFAULT, NOEXTRA }, /* Magical Taruruuto-kun - Fantastic World!! (Japan) (Rev 1).nes */
+	{ 0xb7f28915,  159, DEFAULT, DEFAULT, 1,    0x10, DEFAULT, DEFAULT, NOEXTRA }, /* Magical Taruruuto-kun 2 - Mahou Daibouken (Japan).nes */
+	{ 0x183859d2,  159, DEFAULT, DEFAULT, 1,    0x10, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ball Z - Kyoushuu! Saiya Jin (Japan).nes */
+	{ 0x58152b42,  160, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pipe V (Asia) (Ja) (Unl).nes */
+	{ 0x1c098942,  162, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Xi You Ji Hou Zhuan (Ch).nes */
+	{ 0x081caaff,  163, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Commandos (Ch).nes */
+
+	/* Mapper 176 */
+	{ 0xffde0de5,  176, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 梦幻之星4[简体](修正)一战一级.nes */
+	{ 0xE0ED68B1,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (AA-6109) 4-in-1.nes */
+	{ 0xC447B9FE,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BRC-4) Super 4-in-1.nes */
+	{ 0x922D16FD,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-9087) Super Game 3-in-1.nes */
+	{ 0xC18A7BCB,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KT-443B) 4-in-1.nes */
+	{ 0x43BDB0FF,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KT-8095) Super Game 4-in-1.nes */
+	{ 0x719CCE0A,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KT-8394) 4-in-1.nes */
+	{ 0x12DDA422,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KT-8404) Super Game 4-in-1.nes */
+	{ 0xAB09C88B,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KT-8405) 4-in-1.nes */
+	{ 0xA2E2031C,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KT-8406) 4-in-1.nes */
+	{ 0x6063F4D5,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KT-A) Super Game.nes */
+	{ 0xD2F5F51D,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KY-1008) 10-in-1.nes */
+	{ 0xBF31508D,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KY-1102) Super 11-in-1.nes */
+	{ 0x2B882971,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KY-1501) 999999-in-1.nes */
+	{ 0x981AE6BB,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KY-1901) 19-in-1.nes */
+	{ 0x5D2129AC,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KY-2001) 20-in-1.nes */
+	{ 0x9AD9A8E9,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KY-6006) 6-, 4-in-1.nes */
+	{ 0x521AF87B,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KY-6009) 6-in-1 (FK23C).nes */
+	{ 0xAA05C592,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KY-6011) Super 6-in-1.nes */
+	{ 0x205CF073,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KY-8002) 8-in-1 Supergame.nes */
+	{ 0xD408F0BC,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KY-9005) 9-in-1 (FK23C).nes */
+	{ 0x205D476E,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KY-9006) 9-in-1 Super Game.nes */
+	{ 0x0B2CF73F,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (MK-035) 3-in-1.nes */
+	{ 0x2D1C667A,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (MK-036) 3-in-1.nes */
+	{ 0x25D7CB92,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (MK-038) 4-in-1.nes */
+	{ 0x8EFF9139,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (MK-042) Super Game 3-in-1.nes */
+	{ 0xB55103AD,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (MK-042) Super Game 3-in-1 [game name correction] */
+	{ 0xE83E5726,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (MK-064) Super Game 4-in-1.nes */
+	{ 0xBEEB0B07,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (MK-064) Super Game 4-in-1 [game name correction].nes */
+	{ 0xBBFBECBC,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (SB-04) 4-in-1.nes */
+	{ 0x2A1D5933,  176,       0, DEFAULT, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* (SC-03) Super 24-in-1.nes */
+	{ 0x07564AC6,  176,       0, DEFAULT, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* (SD-01) 絡克家族大集合 - Rockman 16-in-1.nes */
+	{ 0xD7D2123C,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (VT-087) 4-in-1.nes */
+	{ 0x8CB6D32C,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (VT-089) 4-in-1.nes */
+	{ 0x23994975,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (VT-089) 4-in-1 [Russian].nes */
+	{ 0x93196E95,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (VT-208) 4-in-1.nes */
+	{ 0xECFE604A,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-2001) 2-in-1 Mortal-Kombat.nes */
+	{ 0xA232AA4E,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-3128) Super Game 3-in-1.nes */
+	{ 0xF565C023,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-3132) Super Game 3-in-1.nes */
+	{ 0x01131224,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-3133) Super Game 3-in-1.nes */
+	{ 0x7A76F2B9,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-3135) Super Game 3-in-1.nes */
+	{ 0xFCACB02A,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-346) 3-in-1.nes */
+	{ 0x5ADDD942,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-360) Super Game 3-in-1.nes */
+	{ 0x940933DC,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-363) 3-in-1.nes */
+	{ 0xC06C9AF7,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-370) Super Game 3-in-1.nes */
+	{ 0x728CA4AF,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-401) 4-in-1.nes */
+	{ 0xF019BFEF,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-415) Super Game 4-in-1 */
+	{ 0x4D25A3A6,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-415) Super Game 4-in-1 [game name correction] */
+	{ 0x5F96184B,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-4102) 4-in-1.nes [bad CHR] */
+	{ 0xC4D1D2F8,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-4102) 4-in-1.nes */
+	{ 0x6D580074,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-4118) 4-in-1.nes */
+	{ 0xFA5B1D26,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-4122) 4-in-1 [b].nes */
+	{ 0x4410BD8D,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-4126) Super Game 4-in-1.nes */
+	{ 0xC3166E11,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-4146) 4-in-1.nes */
+	{ 0xBE05120A,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-417) Super Game 4-in-1.nes */
+	{ 0x43BDB0FF,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-4219) Super Game 4-in-1.nes */
+	{ 0xF371BCF2,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-4228) Super Game 4-in-1.nes */
+	{ 0xFA1CB05C,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-4237) 4-in-1.nes */
+	{ 0x44F46BBC,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-4239) New 4-in-1 Supergame.nes */
+	{ 0x0A486DD7,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-4242) Super Game 4-in-1.nes */
+	{ 0x634036DB,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-4246) Super Game 4-in-1.nes */
+	{ 0xD7A8AFCA,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-4247) Super Game 4-in-1.nes */
+	{ 0x6AB68F4F,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-4248) Super Game 4-in-1.nes */
+	{ 0x1EF30CC8,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-4253) 4-in-1.nes */
+	{ 0x4D18054C,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-437) Super Game 4-in-1.nes */
+	{ 0x18DD93BC,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-437) Super Game 4-in-1 [game name correction].nes */
+	{ 0x63D43F22,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-451) 4-in-1.nes */
+	{ 0xBF31508D,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-469) Super 4-in-1.nes */
+	{ 0x981AE6BB,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-480) 4-in-1.nes */
+	{ 0x5D2129AC,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-481) 4-in-1.nes */
+	{ 0x5D061E04,  176,       0, DEFAULT, 0,    0x07, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-602) 6-in-1.nes */
+	{ 0xD2A4A9C6,  176,       0, DEFAULT, 0,    0x07, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-602) Super Game 6-in-1 [game name correction, font change].nes */
+	{ 0x35974F2C,  176,       0, DEFAULT, 0,    0x07, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-602) Super Game 6-in-1 [font change].nes */
+	{ 0x5B17FB27,  176,       0, DEFAULT, 0,    0x07, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-801) Super Game 8-in-1.nes */
+	{ 0x0881169E,  176,       0, DEFAULT, 0,    0x07, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-801) Super Game 8-in-1 [font change].nes */
+	{ 0xCD55A865,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-8023) 4-in-1.nes */
+	{ 0x92B52357,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-8028) 4-in-1.nes */
+	{ 0xDE94B7FD,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-8029) 4-in-1.nes */	
+	{ 0xD56F27AE,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-8046) 4-in-1.nes */
+	{ 0x0E8766DC,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-8049) 4-in-1.nes */
+	{ 0x05E43745,  176,       0, DEFAULT, 0,    0x07, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-904) Super Game 9-in-1.nes */
+	{ 0x31CADEF3,  176,       0, DEFAULT, 0,    0x07, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-904) Super Game 9-in-1 [font change].nes */
+	{ 0x04398A9F,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (卡聖 NT-945) 2-in-1.nes */
+	{ 0x9BDF2424,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 12-in-1 Console TV Game Cartridge.nes */
+	{ 0x629FBEEC,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 125-in-1.nes */
+	{ 0x6EDED153,  176,       0, DEFAULT, 0,    0x07, DEFAULT, DEFAULT, NOEXTRA }, /* 16-in-1 Battle Hymn of the Republic.nes */
+	{ 0x68EDFDEA,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 3-in-1 (Mortal Kombat MK5).nes */
+	{ 0x8E994BCD,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 3-in-1 (The Lion King 5).nes */
+	{ 0x104D84DF,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 3in1 (ES-Q800C) (Unl).nes */
+	{ 0xDC904F4C,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 3in1 (ES-Q800C)(FSS).nes */
+	{ 0xCF7C6AE0,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 3in1 (ES-Q800C)(TRS).nes */
+	{ 0x4E5F123A,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (Digital Adventure).nes */
+	{ 0x7DB2D1F5,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 6-in-1 (Spiderman 2, Aladdin).nes */
+	{ 0x75DFF1A4,  176,       0, DEFAULT, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* 6-in-1 (Super Rockman).nes */
+	{ 0xACCC9036,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 9-in-1 (Pokemon Yellow).nes */
+	{ 0x674D6CDE,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Intellivision X2 15-in-1 [missing CHR data].nes */
+	{ 0x0F907E7F,  176,       0, DEFAULT, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* Rockman 6-in-1 (rev0).nes */
+	{ 0xE6D869ED,  176,       0, DEFAULT, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* Rockman 6-in-1 (rev0)[missing CHR data].nes */
+	{ 0x88E0C48C,  176,       0, DEFAULT, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* Rockman 6-in-1 (rev1).nes */
+	{ 0xEECF01BF,  176,       0, DEFAULT, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* Rockman 6-in-1 (rev3).nes */
+	{ 0xC043A8DF,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 小博士教育软件系列꞉ 数学 小狀元.nes */
+	{ 0x2CF5DB05,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 小博士教育软件系列꞉ 智力 小狀元.nes */
+	{ 0x02C41438,  176,       0, DEFAULT, 1,    0x70,    0x07, DEFAULT, NOEXTRA }, /* 星河战士.nes */
+	{ 0xA39C9A6B,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KY-1203) Super Game 12-in-1/(YH-467) Super Game 4-in-1 */
+	{ 0x0F05C0E6,  176,       0, DEFAULT, 0,    0x07, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-701) Super Game 4-in-1 */
+	{ 0x80F1E11E,  176,       0, DEFAULT, 0,    0x07, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-701) Super Game 4-in-1 [game name correction, font change] */
+	{ 0xC5C30EFA,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-8011) Super Game 4-in-1 */
+	{ 0x8858D3F7,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-8011) Super Game 4-in-1 [game name correction] */
+	{ 0x18BEB276,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-8024) Super Game 4-in-1 */
+	{ 0xE3A0B9E5,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-8027) Super Game 4-in-1 */
+	{ 0x5A0E3E69,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-8033) Super Game 4-in-1 */
+	{ 0x21D4484A,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-8042) Super Game 4-in-1 */
+	{ 0xF011AFD6,    4,       0, DEFAULT, 0,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Rockman 4- Minus Infinity [Infinite Life]. Basically oversize MMC3 that fails to enable WRAM before accessing it. */
+	{ 0x576D9589,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-0210A PCB) Super Mario 4-in-1.nes */
+	{ 0x01B3EDD2,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-6002) Super Game 16-in-1.nes */
+	{ 0x291F5318,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-6008) 210-in-1.nes */
+	{ 0xB12CCB95,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-6028) 180-in-1.nes */
+	{ 0xD5281CF3,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-8002) New 4-in-1.nes */
+	{ 0x1F6AC22E,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-8005) Super Game 3-in-1.nes */
+	{ 0xB48D6F26,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-8008) Super Game 4-in-1.nes */
+	{ 0xBDDA85CE,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-8013) Super Game 4-in-1.nes */
+	{ 0x85C2CC88,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-8029) Super Game 4-in-1.nes */
+	{ 0x4F2CCD03,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-8029) Super Game 4-in-1 [overdump] */
+	{ 0x40182FF6,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-8045) Super Game 4-in-1.nes */
+	{ 0xF4CE452C,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-8062) Super Game 4-in-1.nes */
+	{ 0x409601A5,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-8088) 4-in-1.nes */
+	{ 0xC8AB31FD,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-8103) Super Game 4-in-1.nes */
+	{ 0x87308F9D,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-8105) Super Game 4-in-1.nes */
+	{ 0x95ACA7A7,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-012) 80-in-1.nes */
+	{ 0xE650EC91,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-014) 128-in-1.nes */
+	{ 0x7642F6B6,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-021) 180-in-1.nes */
+	{ 0x24762CE8,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-022) 178-in-1.nes */
+	{ 0x761CF0C0,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-026) 210-in-1.nes */
+	{ 0x165102DB,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-033) 52-in-1.nes */
+	{ 0x6614D4C0,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-037) Super Game 16-in-1.nes */
+	{ 0xB3277B6C,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-3004) 6-in-1.nes */
+	{ 0x3907578B,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-8008) 4-in-1.nes */
+	{ 0xA391549D,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-8021) 4-in-1.nes */
+	{ 0x36C27AE8,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-8021) 4-in-1.nes [PRG banks missing] */
+	{ 0x06D13D9E,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-8026) 4-in-1.nes */
+	{ 0x2EBD5FD6,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-8033) 4-in-1.nes */
+	{ 0x23E4906A,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-8043) 4-in-1.nes */
+	{ 0x10155A92,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-8045) 4-in-1.nes */
+	{ 0xF66944EE,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-8050) 4-in-1.nes */
+	{ 0x8BAEEDC0,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-8052) 4-in-1.nes */
+	{ 0x39307391,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-8056) 4-in-1.nes */
+	{ 0x72CEAB1E,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-8078) 4-in-1.nes */
+	{ 0x05A1F101,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-8078) 4-in-1 [bad CHR].nes */
+	{ 0x07D3F6CB,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-8079) 4-in-1.nes */
+	{ 0x4E34CC0A,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-8161) Super Game 12-in-1.nes */
+	{ 0x20379331,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-8244) 7-in-1.nes */
+	{ 0x622E9E35,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-xxx) 126-in-1.nes */
+	{ 0x666E736D,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-xxx) Super 15-in-1.nes */
+	{ 0x19195C7F,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-xxx) Super 35-in-1.nes */
+	{ 0x6F775C1A,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (FK-xxx) Super 8-in-1.nes */
+	{ 0x17D43AF9,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (K-5003) 5-in-1.nes */
+	{ 0xFE384E4B,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KB-0306N PCB) Super Game 4-in-1 #1.nes */
+	{ 0x425F5325,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KB-0306N PCB) Super Game 4-in-1 #2.nes */
+	{ 0xD206A6DF,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KB-4004) Super 4-in-1.nes */
+	{ 0xF350556E,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KB-4009) Super 4-in-1.nes */
+	{ 0x14BD2D1C,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KB-4016) Super 4-in-1 [fix Legend of Kage].nes */
+	{ 0xBB9258BE,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KB-4016) Super 4-in-1.nes */
+	{ 0x6343E6A6,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KD-1512 PCB) 128-in-1.nes */
+	{ 0x91A8CD7E,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KD-1512 PCB) Super 20-in-1.nes */
+	{ 0xE31220BE,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KD-6020) Super Game 131-in-1.nes */
+	{ 0xB623C3D0,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KD-6024) Super Game 168-in-1.nes */
+	{ 0x30FFB076,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KD-6033) 7-in-1.nes */
+	{ 0xF0C581B3,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KG-6009) Super Game 58-in-1.nes */
+	{ 0x576EC760,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KT-3445) Super 4-in-1.nes */
+	{ 0xBF015F20,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KT-3445A-1) Super 4-in-1.nes */
+	{ 0x0163CA53,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KT-3445A-B) 4-in-1.nes */
+	{ 0x3DF39CE4,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KT-4403) Super 3-in-1.nes */
+	{ 0xB8FED144,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KT-8017) Super Game 4-in-1.nes */
+	{ 0x10E7B6ED,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KT-8040) Super Game 4-in-1.nes */
+	{ 0x38E63310,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KT-8109) Super Game 4-in-1.nes */
+	{ 0xC6D97331,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-0210A PCB) 4-in-1.nes */
+	{ 0x9367D1F4,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-0210A PCB) 4-in-1 [Russian].nes */
+	{ 0xE6617BF1,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (SJ-0027) 180-in-1.nes */
+	{ 0x9206B787,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YE-C011) 60-in-1.nes */
+	{ 0x32CDAD83,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (晶太 JY-222) 1998 97格鬥天王 激鬥篇 6-in-1.nes */
+	{ 0x3C894AD1,  176,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (晶太 JY-224) 1998 97格鬥天王 激鬥篇 7-in-1.nes */
+	{ 0x78CE996D,  176,       1, DEFAULT, 0,    0x07, DEFAULT, DEFAULT, NOEXTRA }, /* (晶太 JY-225) 1998 97格鬥天王 激戰篇 6-in-1.nes */
+	{ 0xB5D25A20,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-0306M PCB) Super 4-in-1.nes */
+	{ 0x8C48BDBA,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-0306M PCB) Super 4-in-1 #2.nes */
+	{ 0xC51FA465,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KD-6032) 180-in-1.nes */
+	{ 0xA22DE99D,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (KD-6026) Super Game 210-in-1 */
+	{ 0xE8BD5AC3,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-6017) Super Game 28-in-1 */
+	{ 0x37478F0C,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-8009) Super 4-in-1 */
+	{ 0x98C59170,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-8014) Super 4-in-1 */
+	{ 0x7CA43C89,  176,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (BS-8117) Super Game 4-in-1 */
+	{ 0x678DE5AA,  176,       2, DEFAULT, 0, DEFAULT,    0x0C,   DENDY, NOEXTRA }, /* (外星) 120-in-1.nes */
+	{ 0x6C979BAC,  176,       2, DEFAULT, 0, DEFAULT,    0x0B,   DENDY, NOEXTRA }, /* (奔升) 10-in-1 Omake Game.nes */
+	{ 0xE79F157E,  176,       2, DEFAULT, 0, DEFAULT,    0x0B,   DENDY, NOEXTRA }, /* (福州 Coolboy) 245-in-1 Real Game.nes */
+	{ 0x3AE35EC1,  176,       2, DEFAULT, 0, DEFAULT,    0x0B,   DENDY, NOEXTRA }, /* (福州 Coolboy) 400-in-1 Real Game.nes */
+	{ 0xD14617D7,  176,       2, DEFAULT, 0, DEFAULT,    0x0B,   DENDY, NOEXTRA }, /* (福州 Coolboy) 合金装备 150-in-1 Real Game.nes */
+	{ 0x37290B20,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Age of Empires - 帝国时代 (970493) [protection removed].nes */
+	{ 0x5EE2EF97,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Age of Empires - 帝国时代 (970493).nes */
+	{ 0x5077CAC1,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* EverQuest - 八宝奇珠.nes */
+	{ 0xF354D847,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Grandia - 格蘭蒂亞傳說 (2006SR04308).nes */
+	{ 0xD51DD22C,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* SD 高达外传 - 骑士高达故事 3꞉ 传说之骑士团.nes */
+	{ 0xF29C8186,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* Shanghai Tycoon - 上海大亨 (960313).nes */
+	{ 0xF2398802,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 七龙珠 2꞉ 激战弗利萨!!.nes */
+	{ 0x53B62838,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 七龙珠 2꞉ 电光石火.nes */
+	{ 0xED481B7C,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 七龙珠 Z 外传꞉ 赛亚人灭绝计划 (rev1).nes */
+	{ 0xC768098B,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 三侠五义꞉ 御猫傳奇 (2006SR04307).nes */
+	{ 0xB511C04B,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 三侠五义꞉ 御猫傳奇 (2006SR04307)[protection removed].nes */
+	{ 0x44C20420,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 三国志 II - 中文加强版.nes */
+	{ 0x8FFC1864,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 三国志 II꞉ 覇王の大陸.nes */
+	{ 0x8F6AB5AC,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 三国忠烈传 - The Story of Three Kingdoms (FS005).nes */
+	{ 0x94782FBD,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 三國志꞉ 雄霸天下 (980100026).nes */
+	{ 0x99051CB5,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 三國志꞉ 雄霸天下 (980337).nes */
+	{ 0x3A1CFE21,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 上古神殿.nes */
+	{ 0xD6EA31C0,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 东周列国志 (2006SR04301).nes */
+	{ 0x03346083,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 东周列国志 (2006SR04301)[protection removed].nes */
+	{ 0x33443508,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 争霸世纪 (960268).nes */
+	{ 0x7696573A,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 亚特鲁战记.nes */
+	{ 0xFE383376,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 仙剑神曲 - Space General [protection removed].nes */
+	{ 0x97F3D7C1,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 仙剑神曲 - Space General.nes */
+	{ 0x8264EA52,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 侠客情꞉ 荆轲刺秦王 (FS005).nes */
+	{ 0x027FD794,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 剑舞者 - Sword Dancer.nes */
+	{ 0x095D8678,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 双月传.nes */
+	{ 0xD5F7AAEF,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 神风剑.nes */
+	{ 0x377FDB36,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 口袋精靈꞉ 金.nes */
+	{ 0x85DD49B6,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 口袋精靈꞉ 金 [protection removed].nes */
+	{ 0x3F6124C3,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 哆啦A梦 - 超时空历险 [a].nes */
+	{ 0x69A3CA5C,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 哆啦A梦 - 超时空历险.nes */
+	{ 0x548D72FF,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 哥伦布 冒险记 - 黄金中文版.nes */
+	{ 0xEEBEE0C8,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 哥伦布传 - 黄金中文版 (FS006).nes */
+	{ 0x3C9DF646,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 圣斗士.nes */
+	{ 0x52A5F554,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 基督山恩仇记 - Le Comte de Monte Cristo (970260).nes */
+	{ 0x35F8BD75,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 基督山恩仇记 - Le Comte de Monte Cristo (970260)[protection removed].nes */
+	{ 0xEE49F509,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 大盗伍佑卫门之天下宝藏.nes */
+	{ 0xC04D330D,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 夺宝小英豪꞉ 光明與黑暗傳説 (960270).nes */
+	{ 0x848F2D69,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 女神的救赎.nes */
+	{ 0x2C3D4EF0,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 宠物꞉ 翡翠 (2004SR05368).nes */
+	{ 0x09FC02C7,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 宠物꞉ 翡翠 (2004SR05368)[protection removed].nes */
+	{ 0x913B95F7,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 富甲三国 [protection removed].nes */
+	{ 0x0F73D488,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 富甲三国.nes */
+	{ 0x8947AB85,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 少年游侠꞉ 光明之神 - Young Chivalry (FS005).nes */
+	{ 0xEE66C5E8,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 帝国风暴 - Napoleon's War (980340) [protection removed].nes */
+	{ 0x351DD533,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 帝国风暴 - Napoleon's War (980340).nes */
+	{ 0xEABBB630,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 怪物制造者 1.nes */
+	{ 0xF1D40F5B,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 怪物制造者 2.nes */
+	{ 0x2661109F,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 戰國無雙 [protection removed].nes */
+	{ 0xCC6E548C,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 戰國無雙.nes */
+	{ 0xBA29435A,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 戰國群雄傳 (970498).nes */
+	{ 0x5A88B5B0,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 数码暴龙 4꞉ 水晶版 (2004SR01259).nes */
+	{ 0xA46353D1,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 杨家将 - Yang's Troops (980186).nes */
+	{ 0xC155128F,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 梁山英雄传 [protection removed].nes */
+	{ 0xAD223177,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 梁山英雄传.nes */
+	{ 0xBF6E95F5,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 梦境之王 - Dream Master.nes */
+	{ 0x416C07A1,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 梦幻之星 IV.nes */
+	{ 0x852CE16B,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 楚漢爭霸 - The War Between Chu & Han (980005).nes */
+	{ 0xE0DD8D77,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 楚留香꞉ 香帥傳奇之血海飘零 (FS005).nes */
+	{ 0x2E4F3051,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 楚留香꞉ 香帥傳奇之血海飘零 (FS005)[protection removed].nes */
+	{ 0x34AC5AE9,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 水滸傳 - Marsh Outlaws (960415).nes */
+	{ 0x1923A8C5,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 水滸神獸 [protection removed].nes */
+	{ 0x6B4CAC80,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 水滸神獸.nes */
+	{ 0xC9D968AF,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 混沌世界.nes */
+	{ 0x7F3DBF1B,  176,       2, DEFAULT, 1,    0x90,    0x07,     PAL, NOEXTRA }, /* 混沌世界 [VirtuaNES PAL].nes */
+	{ 0xB616885C,  176,       2, DEFAULT, 1,    0x90,    0x07,     PAL, NOEXTRA }, /* 混沌世界 [VirtuaNES PAL, SRAM bank switch removed].nes */
+	{ 0xF031E7CD,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 激战弗利萨之孙悟饭.nes */
+	{ 0xD871D3E6,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 激战弗利萨之孙悟饭 [bad CHR].nes */
+	{ 0xC35E9AA8,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 激战弗利萨之孙悟饭 [Traditional Chinese].nes */
+	{ 0xBFF7C60C,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 激斗圣战士.nes */
+	{ 0x8CAAFF73,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 爆笑三國 - Jacks in Tri-Empire (970261)(FS005).nes */
+	{ 0x97B82F53,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 爆笑三國 - Jacks in Tri-Empire (970261)(FS005)[protection removed].nes */
+	{ 0x95569A86,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 甲A - China Soccer League for Division A (980333).nes */
+	{ 0x977D22C3,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 破釜沉舟 [protection removed].nes */
+	{ 0xA2DC64FF,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 破釜沉舟.nes */
+	{ 0x356A16E9,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 絶代英雄 - Unrivalled Hero [protection removed].nes */
+	{ 0xDA7D586D,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 絶代英雄 - Unrivalled Hero.nes */
+	{ 0x50D5F94B,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 英烈群侠传 (980332).nes */
+	{ 0xF5C16B14,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 荣耀之骑士团 [protection removed].nes */
+	{ 0xFB2563D1,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 荣耀之骑士团.nes */
+	{ 0xF9863ADF,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 西楚霸王 (980100461)(FS005).nes */
+	{ 0x3FF36623,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 西楚霸王 (990031).nes */
+	{ 0xF1D803F3,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 西楚霸王 (990031)[protection].nes */
+	{ 0x49F22159,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 超级 大富翁 - Super Rich (FS005).nes */
+	{ 0x2DDA2835,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 超级 大战略 [protection removed].nes */
+	{ 0x7DCE29CB,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 超级 大战略.nes */
+	{ 0x0DBFF515,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 银白色沙加.nes */
+	{ 0x38EFFD3E,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 隋唐演义 (980185).nes */
+	{ 0xCC56BCFE,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 風雲 - Traitor Legend (970100684)(FS005).nes */
+	{ 0xFD883527,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 風雲 - Traitor Legend (980334).nes */
+	{ 0xBC4AC7FE,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 高达骑士物语 2꞉ 光之骑士.nes */
+	{ 0xB8FCD425,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 高达骑士物语.nes */
+	{ 0xF17E49D5,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 鬼魅战记.nes */
+	{ 0x4BCDB970,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 鬼魅战记.nes */
+	{ 0x7D9C7206,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 魔域英雄传 - Hero on Devil Lands (FS005).nes */
+	{ 0xB16D4268,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 魔法门之英雄无敌 (980584).nes */
+	{ 0x71DAF1A6,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 魔法门之英雄无敌 (980584)[protection removed].nes */
+	{ 0x3532A114,  176,       2, DEFAULT, 1,    0x90, DEFAULT,   DENDY, NOEXTRA }, /* 魔神法师 - Demogorgon Monk (FS005).nes */
+	{ 0xE8EAFBC1,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 龙之谷 [protection removed].nes */
+	{ 0x27DBC407,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 龙之谷.nes */
+	{ 0xEBA09ADA,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 龙域天下.nes */
+	{ 0x62DDE924,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 龙珠Z3꞉ 人造人列传.nes */
+	{ 0x42161530,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 龙魂 [protection removed].nes */
+	{ 0x8F8FC9A7,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 龙魂.nes */
+	{ 0xB6984DAD,  176,       3, DEFAULT, 1,    0x07,    0x0B, DEFAULT, NOEXTRA }, /* Super Mario 160-in-1 Funny Time.nes */
+	{ 0xB6984DAD,  176,       4, DEFAULT, 1,    0x07,    0x07, DEFAULT, NOEXTRA }, /* GameStar Smart Genius Deluxe.nes */
+
+	/* Non-Mapper 176 files that are sometimes found erroneously set to mapper 176 */
+	{ 0x60AC647F,  260,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-4222) Super Game 4-in-1.nes */
+
+	{ 0x558c0dc3,  178, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super 2-in-1 (Soccer Game & Crazy Dance) (Unl) [!].nes */
+	{ 0xc68363f6,  180, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Crazy Climber (Japan).nes */
+	{ 0x0f05ff0a,  181, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Seicross (Japan) (Rev 1).nes */
+	{ 0x96ce586e,  189, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Street Fighter II - The World Warrior (Unl) [!].nes */
+	{ 0x0e76e4c1,  190, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Magic Kid Googoo (Korea) (Unl).nes */
+	{ 0x555a555e,  191, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sugoro Quest - Dice no Senshitachi (Ch).nes */
+	{ 0x2cc381f6,  191, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sugoro Quest - Dice no Senshitachi (Ch) [o1].nes */
+	{ 0xa145fae6,  192, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Young Chivalry (Ch) [b3].nes */
+	{ 0xa9115bc1,  192, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Young Chivalry (Ch) [!].nes */
+	{ 0x4c7bbb0e,  192, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Young Chivalry (Ch) [b2].nes */
+	{ 0x98c1cd4b,  192, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ying Lie Qun Xia Zhuan (Asia) (Unl).nes */
+	{ 0xee810d55,  192, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* You Ling Xing Dong (Asia) (Unl).nes */
+	{ 0x442f1a29,  192, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Young Chivalry (Ch) [b1].nes */
+	{ 0x637134e8,  193, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Fighting Hero (Asia) (Ja) (Unl).nes */
+	{ 0xa925226c,  194, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dai-2-Ji - Super Robot Taisen (Ch) [b1].nes */
+	{ 0x33c5df92,  195, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Captain Tsubasa Vol. II - Super Striker (Ch) [a1].nes */
+	{ 0x1bc0be6c,  195, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Captain Tsubasa Vol. II - Super Striker (Ch) [a3].nes */
+	{ 0xd5224fde,  195, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* God Slayer - Haruka Tenkuu no Sonata (Ch).nes */
+	{ 0xfdec419f,  196, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Street Fighter VI 16 Peoples (Unl) [!].nes */
+	{ 0x700705f4,  198, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ---- */
+	{ 0x9a2cf02c,  198, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ---- */
+	{ 0xd8b401a7,  198, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ---- */
+	{ 0x28192599,  198, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ---- */
+	{ 0x19b9e732,  198, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Tenchi wo Kurau II - Shokatsu Koumei Den (J) (PRG0) [T-Chi][b6].nes */
+	{ 0xdd431ba7,  198, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Tenchi wo kurau 2 (c) */
+	{ 0x05658ded,  201,      15, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 21-in-1 (CF-043) (2006-V) (Unl) [p1].nes */
+	{ 0x276237b3,  206, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Karnov (Japan) (Rev 1).nes */
+	{ 0xa5e6baf9,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Slayer IV - Drasle Family (Japan).nes */
+	{ 0x4f2f1846,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Famista '89 - Kaimaku Ban!! (Japan).nes */
+	{ 0x22d6d5bd,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Jikuu Yuuden - Debias (Japan).nes */
+	{ 0x9d21fe96,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Lupin Sansei - Pandora no Isan (Japan).nes */
+	{ 0xae321339,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pro Yakyuu - Family Stadium '88 (Japan).nes */
+	{ 0x96dfc776,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* R.B.I. Baseball 2 (USA) (Unl).nes */
+	{ 0xfd63e7ac,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* R.B.I. Baseball 3 (USA) (Unl).nes */
+	{ 0x2a01f9d1,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Wagyan Land (Japan).nes */
+	{ 0x7678f1d5,  207, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Fudou Myouou Den (Japan).nes */
+	{ 0x07eb2c12,  208, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* FC25-台湾格斗游戏+快打传说.nes */
+	{ 0xdd8ced31,  209, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Power Rangers III (Unl) [!].nes */
+	{ 0x063b1151,  209, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Power Rangers IV (Unl) [!].nes */
+	{ 0xdd4d9a62,  209, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Shin Samurai Spirits 2 - Haoumaru Jigoku Hen (Ch).nes */
+	{ 0x0c47946d,  210,       1,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Chibi Maruko-chan - Uki Uki Shopping (Japan).nes */
+	{ 0xc247cc80,  210,       1,    MI_V, 1,    0x50, DEFAULT, DEFAULT, NOEXTRA }, /* Family Circuit '91 (Japan) (En).nes */
+	{ 0x808606f0,  210,       1,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Famista '91 (Japan).nes */
+	{ 0x6ec51de5,  210,       2,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Famista '92 (Japan).nes */
+	{ 0xadffd64f,  210,       2,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Famista '93 (Japan).nes */
+	{ 0x429103c9,  210,       2,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Famista '94 (Japan).nes */
+	{ 0x81b7f1a8,  210,       1,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Heisei Tensai Bakabon (Japan).nes */
+	{ 0x2447e03b,  210,       2,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Top Striker (Japan).nes */
+	{ 0x1dc0f740,  210,       2,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Wagyan Land 2 (Japan).nes */
+	{ 0xd323b806,  210,       2,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Wagyan Land 3 (Japan).nes */
+	{ 0xbd523011,  210,       2,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Namco Prism Zone - Dream Master (Japan).nes */
+	{ 0x5daae69a,  211, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Aladdin - Return of Jaffar, The (Unl) [!].nes */
+	{ 0x1ec1dfeb,  217, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 255-in-1 (Mapper 204) [p1].nes */
+	{ 0x046d70cc,  217, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ?? 500-in-1 (Anim Splash, Alt Mapper)[p1][!] */
+	{ 0x12f86a4d,  217, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 500-in-1.nes */
+	{ 0xd09f778d,  217, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ?? 9999999-in-1 (Static Splash, Alt Mapper)[p1][!] */
+	{ 0x62ef6c79,  232, DEFAULT, DFAULT8, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Quattro Sports (Camerica) (Aladdin) [b1].nes */
+	{ 0x2705eaeb,  234, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Maxi 15 (USA) (Unl).nes */
+	{ 0x80cbcacb,  235, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 100-in-1 (Unl).nes */
+	{ 0x6175b9a0,  235, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 150_in_1_199x-ASp.nes */
+	{ 0x745a6791,  235,       2, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 210-in-1 and Contra 4-in-1 (212-in-1,212 Hong Kong,Reset Based)(Unl).nes */
+	{ 0xdf81364d,  235, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 260-in-1 [p1][!].nes */
+	{ 0xa38f2f1d,  235, DEFAULT, DEFAULT, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* 1500-in-1.nes */
+	{ 0x6f12afc5,  235, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ?? Golden Game 150-in-1 */
+	{ 0x2537b3e6,  241, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dance Xtreme - Prima (Unl).nes */
+	{ 0x11611e89,  241, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Darkseed (Unl) [p1][b1].nes */
+	{ 0x81a37827,  241, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Darkseed (Unl) [p1].nes */
+	{ 0xfb2b6b10,  241, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Fan Kong Jing Ying (Asia) (Unl).nes */
+	{ 0xb5e83c9a,  241, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Xing Ji Zheng Ba (Asia) (Unl).nes */
+	{ 0x368c19a8,  241, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* LIKO Study Cartridge 3-in-1 (Unl) [!].nes */
+	{ 0x54d98b79,  241, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Titanic 1912 (Unl).nes */
+	{ 0xc2730c30,   34, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Deadly Towers (USA).nes */
+	{ 0xa21e675c,   34, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mashou (Japan).nes */
+	{ 0x6bea1235,  245, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Yong Zhe Dou E Long - Dragon Quest VI (Ch) [a1].nes */
+	{ 0x345ee51a,  245, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Yong Zhe Dou E Long - Dragon Quest VII (Ch).nes */
+	{ 0x57514c6c,  245, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Yong Zhe Dou E Long - Dragon Quest VI (Ch).nes */
+	{ 0xdb9d71b7,  114, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Donkey Kong (Unl) [o1].nes */
+	
+	/* KT-008 PCB. These require mapper 224 for having an outer bank register at $5xxx, but are usually found set to mapper 4. */
+	{ 0x61fc4d20,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* (KT-1062) 口袋怪兽꞉ 水晶版.nes */
+	{ 0xaa666c19,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Ys Origin: Hugo.nes */
+	{ 0xb0d011d3,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Ys Origin: Yunica.nes */
+	{ 0x16143319,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Ys VI: 纳比斯汀的方舟.nes */
+	{ 0xe05fc21f,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Ys: 菲尔盖纳之誓约.nes */
+	{ 0xf8b58b59,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 三国志 - 蜀魏争霸.nes */
+	{ 0xcb1bab3d,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 三国志꞉ 蜀汉风云.nes */
+	{ 0xddc122ed,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 亡灵崛起.nes */
+	{ 0x4d2811c7,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 伏魔英雄传.nes */
+	{ 0x24750e5d,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 傲视天地.nes */
+	{ 0xc658b6a8,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 刀剑英雄传.nes */
+	{ 0xea831217,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 剑侠情缘.nes */
+	{ 0x92ebad5b,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 勇者斗恶龙 III꞉ 罪恶渊源.nes */
+	{ 0x48210324,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 勇者斗恶龙꞉ 勇者的试炼.nes */
+	{ 0x3439d140,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 勇者斗恶龙꞉ 天空的新娘.nes */
+	{ 0x9a0a531a,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 勇者斗恶龙꞉ 天空篇.nes */
+	{ 0xb5fdb3cb,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 勇者黑暗世界 - 混沌世界.nes */
+	{ 0x4f427110,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋怪兽꞉ 珍珠版.nes */
+	{ 0xa46d6f4c,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋怪兽꞉ 琥珀版.nes */
+	{ 0xe001de16,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋怪兽꞉ 白金版.nes */
+	{ 0x5464d7f8,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋怪兽꞉ 翡翠版.nes */
+	{ 0x4d735cb1,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋怪兽꞉ 钻石版.nes */
+	{ 0x5d04547c,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 失落的神器.nes */
+	{ 0xcb524b42,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 征战天下.nes */
+	{ 0x5f362198,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 战神世界.nes */
+	{ 0x36de88e7,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 新魔界.nes */
+	{ 0xf8e9c9cf,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 无双乱舞.nes */
+	{ 0xa4c39535,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 神魔大陆.nes */
+	{ 0x76bbe916,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 落日征战.nes */
+	{ 0x9b518d54,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 轩辕剑꞉ 云的彼端.nes */
+	{ 0x91396b3f,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 轩辕剑꞉ 天之痕.nes */
+	{ 0xaa621fa0,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 轩辕剑꞉ 枫之舞.nes */
+	{ 0x48d1f54a,  224, DEFAULT,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 轩辕剑꞉ 王者归来.nes */
+	
+	{ 0xbdbe3c96,  238, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Contra Fighter (Unl).nes */
+	{ 0xcb53c523,   11, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* King Neptune's Adventure (USA) (Unl).nes */
+	{ 0x6e149729,  189, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Master Fighter II (Unl) [a1].nes */
+	{ 0x60bfeb0c,   90, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mortal Kombat 2 (Unl) [!].nes */
+	{ 0x247cc73d,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Poker II (Asia) (Ja) (Unl).nes */
+	{ 0x1f1326d4,  121, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Sonic 5 (1997) (Unl) [!].nes */
+	{ 0x99748230,  215, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* EarthWorm Jim 2 (SuperGame).nes */
+	{ 0x37876ac7,  215, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Golden Card 6-in-1 (Unl) [!].nes */
+	{ 0x1a3320a3,  215, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mortal Kombat 3 (SuperGame).nes */
+	{ 0x80eb1839,  114, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Boogerman (Sugar Softec) (Unl) [!].nes */
+	{ 0x071e4ee8,  114, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ?? m114,submapper 1 test rom */
+	{ 0xfe3e03a1,  197, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mortal Kombat III Special (YY-030) (Ch) [!].nes */
+	{ 0x9151d311,  197, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mortal Kombat III 28 Peoples (NT-328) (Ch) [!].nes */
+	{ 0x272709b9,  237, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Teletubbies Y2K (420-in-1).nes */
+	{ 0x2e27e0af,  227, DEFAULT, DEFAULT, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Bio Hazard.nes */
+	{ 0x0e7e9309,  189, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Street Fighter II - The World Warrior (Unl) [a1].nes */
+	{ 0xa3ac0095,  189, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Street Fighter II - The World Warrior (Unl) [a2].nes */
+	{ 0xeced5899,  121, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ultimate Mortal Kombat 4 (Unl) [!].nes */
+	{ 0x19c1ed51,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Poker III (Asia) (Ja) (Unl).nes */
+	{ 0x282745c5,  141, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Q Boy (Asia) (Ja) (Unl).nes */
+	{ 0x4b9ecfb2,   21, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Wai Wai World 2 - SOS!! Paseri Jou (Japan) (Virtual Console).nes */
+	{ 0x33751782,    4, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Zoda's Revenge - StarTropics II (USA, Europe) (Virtual Console).nes */
+	{ 0x9bbf3e5d,   15, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 168-in-1 [p1][!].nes */
+
+	/* TXC / Sachen / JoyVan */
+
+	/* This cart does not work anymore with latest mapper implementation.
+	 * This will be run using alternate mapper using override in m132 */
+	{ 0x2a5f4c5a,  132, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Zhan Guo Si Chuan Sheng (C&E) (Unl).nes */
+
+	{ 0x0acfc3cd,  132, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mahjong Block (MGC-008) (Unl) [!].nes */
+
+	/* ines mappers that uses iNes 2.0 numbers */
+
+	/* CRC32, mapperNum, SubMapper, Mirroring, hasBattery, prgRam, chrRam, region, extra flags */
+	{ 0xf6bd8e31,  281, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 1997 Super HIK 4-in-1 (JY-052) [p1][!].nes */
+	/* dumps are assigned 281, but its 293 on nesdev */
+	{ 0x06256C80,  293, DEFAULT, DEFAULT, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* Super 12-in-1 NewStar (UNL) */
+	{ 0x5aa23a15,  361, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (OK-411)[p1][!].nes */
+	{ 0xf6b9d088,  366, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (K-3131GS, GN-45) [p1][!].nes */
+	{ 0x503566b2,  366, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 4-in-1 (K-3131SS, GN-45) [p1][!].nes */
+	{ 0xdb2d2d88,  369, DEFAULT, DEFAULT, 0,    0x07, DEFAULT, DEFAULT, NOEXTRA }, /* Super Mario Bros. Party.nes */
+	{ 0x87f83ea2,  380, DEFAULT, DEFAULT, 0, DEFAULT,    0x07, DEFAULT, NOEXTRA }, /* 42 to 80,000 */
+	{ 0xc4b94bd5,  389, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Caltron - 9 in 1 (USA) (Proto) (Unl).nes */
+	{ 0x2F497313,  401, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super 19-in-1 (VIP19) */
+
+	/* ines mappers that uses unif boards */
+
+	{ 0x0073dbd8,  260, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 2-in-1 - Mortal Kombat V Turbo 30 + Super Aladdin (Unl) [p1][!].nes */
+	{ 0x4dc6107d,  260, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 2-in-1 - Boogerman + Flintstones, The (Unl) [p1][!].nes */
+	{ 0xb72b2cf4,  260, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 2-in-1 - Aladdin + Lion King, The (Unl) [p1][!].nes */
+	{ 0x5638ba59,  260, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mortal Kombat Trilogy - 8 People (M1274) (Ch) [!].nes */
+	{ 0xa1dc16c0,  262, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Street Heroes (Asia) (Ja) (Unl).nes */
+	{ 0x1df10182,  263, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Boogerman II (Rex-Soft) [!].nes */
+	{ 0xf956fcea,  521, DEFAULT, DEFAULT, 0, DEFAULT,    0x70, DEFAULT, NOEXTRA }, /* Korean Igo (Korea) (Unl).nes */
+	{ 0x2eed2e34,  289, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 76-in-1 [p1][a1].nes 2048 PRG, 0 CHR */
+
+	{ 0x00000000, DEFAULT, DEFAULT, DEFAULT, DEFAULT, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }
+
+#endif
\ No newline at end of file
diff --git a/src/ines.c b/src/ines.c
index 8f299c1..7f807d3 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -290,6 +290,7 @@ static void CheckHInfo(void) {
 				}
 			}
 			if (moo[x].submapper >= 0) {
+				iNESCart.iNES2 = 1;
 				if (moo[x].submapper != iNESCart.submapper) {
 					iNESCart.submapper = moo[x].submapper;
 				}
@@ -590,7 +591,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "Idea-Tek ET.xx",           173, Mapper173_Init         )
 /*    INES_BOARD( "",                            174, Mapper174_Init ) */
 	INES_BOARD( "",                         175, Mapper175_Init         )
-	INES_BOARD( "BMCFK23C",                 176, BMCFK23C_Init          ) /* zero 26-may-2012 - well, i have some WXN junk games that use 176 for instance ????. i dont know what game uses this BMCFK23C as mapper 176. we'll have to make a note when we find it. */
+	INES_BOARD( "BMCFK23C",                 176, Mapper176_Init         )
 	INES_BOARD( "",                         177, Mapper177_Init         )
 	INES_BOARD( "",                         178, Mapper178_Init         )
 /*    INES_BOARD( "",                            179, Mapper179_Init ) */
diff --git a/src/ines.h b/src/ines.h
index 94912ea..330c0a5 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -176,6 +176,7 @@ void Mapper171_Init(CartInfo *);
 void Mapper172_Init(CartInfo *);
 void Mapper173_Init(CartInfo *);
 void Mapper175_Init(CartInfo *);
+void Mapper176_Init(CartInfo *);
 void Mapper177_Init(CartInfo *);
 void Mapper178_Init(CartInfo *);
 void Mapper180_Init(CartInfo *);

From e1f4133bb2636ee06fcc22935dd8de411332f41a Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Fri, 28 May 2021 21:46:55 +0200
Subject: [PATCH 114/295] Improve the UNIF to subType heuristics, since UNIF
 ROMs do not use the database in ines-correct.h.

---
 src/boards/fk23c.c | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c
index 7f75d46..da692e8 100644
--- a/src/boards/fk23c.c
+++ b/src/boards/fk23c.c
@@ -527,7 +527,7 @@ void Mapper176_Init(CartInfo *info) { /* .NES file */
    Init(info);
 }
 
-void BMCFK23C_Init(CartInfo *info)	/* UNIF FK23C */
+void BMCFK23C_Init(CartInfo *info)	/* UNIF FK23C. Also includes mislabelled WAIXING-FS005, recognizable by their PRG-ROM size. */
 {
    if (!UNIFchrrama)
    {
@@ -537,38 +537,26 @@ void BMCFK23C_Init(CartInfo *info)	/* UNIF FK23C */
    }
    WRAMSIZE = 8 * 1024;
 
-   /* UNIF FK23C differs from UNIF FK23CA explicitly by the absence of a DIP switch */
    dipsw_enable = 0;
-   after_power = 0;
+   after_power = 1;
    jncota523 = 0;
-
-   /* The UNIF MAPR tells us nothing about whether it is subtype 0 or 1 */
-   subType = (ROM_size ==128 && VROM_size ==256 ||  /* 2048+2048 */
-              ROM_size ==128 && VROM_size ==128 ||  /* 2048+1024 */
-              ROM_size ==128 && VROM_size ==64  ||  /* 2048+512 */
-              ROM_size ==128 && VROM_size ==0   ||  /* 2048+0 */
-              ROM_size ==64  && VROM_size ==64)?    /* 1024+512 */
-              0: 1;
+   subType =ROM_size *16 >=4096? 2: ROM_size == 64 && VROM_size == 128? 1: 0;
+   if (subType == 2) 
+      CHRRAMSIZE = 256 * 1024;
    
    Init(info);
 }
 
-void BMCFK23CA_Init(CartInfo *info)	/* UNIF FK23CA */
+void BMCFK23CA_Init(CartInfo *info)	/* UNIF FK23CA. Also includes mislabelled WAIXING-FS005, recognizable by their PRG-ROM size. */
 {
    WRAMSIZE = 8 * 1024;
 
-   /* UNIF FK23CA differs from UNIF FK23C explicitly by the presence of a DIP switch */
-   dipsw_enable = 1;
-   after_power = 0;
+   dipsw_enable = 0;
+   after_power = 1;
    jncota523 = 0;
-   
-   /* The UNIF MAPR tells us nothing about whether it is subtype 0 or 1 */
-   subType = (ROM_size ==128 && VROM_size ==256 ||  /* 2048+2048 */
-              ROM_size ==128 && VROM_size ==128 ||  /* 2048+1024 */
-              ROM_size ==128 && VROM_size ==64  ||  /* 2048+512 */
-              ROM_size ==128 && VROM_size ==0   ||  /* 2048+0 */
-              ROM_size ==64  && VROM_size ==64)?    /* 1024+512 */
-              0: 1;
+   subType =ROM_size *16 >=2048? 2: 1;
+   if (subType == 2) 
+      CHRRAMSIZE = 256 * 1024;
    
    Init(info);
 }

From 16bec051bf87cdb3bdbb8d00f7f1ed5819ecba8a Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Fri, 28 May 2021 22:03:19 +0200
Subject: [PATCH 115/295] Make sure the comments reflect what the code actually
 does.

---
 src/boards/fk23c.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c
index da692e8..bbbb23b 100644
--- a/src/boards/fk23c.c
+++ b/src/boards/fk23c.c
@@ -33,16 +33,10 @@
 	Verified on real hardware:
 	"Legend of Kage" sets CNROM latch 1 and switches between CHR bank 0 and 1 using 5FF2, causing the wrong bank (1 instead of 0) during gameplay.
 	
-	Heuristics for NES 1.0:
-	- 1 MiB PRG+1 MiB CHR     => Submapper 1
-	- 256 KiB PRG+128 KiB CHR => Submapper 1
-	- 128 KiB PRG+64 KiB CHR  => Submapper 1
-	- A001.5 ever set         => Submapper 2
-	- 5FF5/5FF6 written-to    => Submapper 3
-	
 	Heuristic for detecting whether the DIP switch should be changed on every soft reset:
 	The first write to the $5xxx range is to $501x           => ROM always addresses $501x; changing the DIP switch on reset would break the emulation after reset, so don't do it.
 	The first write to the $5xxx range is to $5020 or higher => ROM either uses a DIP switch or writes to $5FFx for safety; changing the DIP switch on reset is possible.
+	Exclude the $5FF3 address as well as $5000-$500F from this heuristic.
 */
 
 #include "mapinc.h"
@@ -512,7 +506,7 @@ void Mapper176_Init(CartInfo *info) { /* .NES file */
          WRAMSIZE = 8 * 1024;
 	 
 	 /* Distinguishing subType 1 from subType 0 is important for the correct reset vector location.
-	    It is safe to assume subType 1 except for 1024+512 KiB ROMs. */
+	    It is safe to assume subType 1 except for the following-sized ROMs. */
          subType = (ROM_size ==128 && VROM_size ==256 ||  /* 2048+2048 */
                     ROM_size ==128 && VROM_size ==128 ||  /* 2048+1024 */
                     ROM_size ==128 && VROM_size ==64  ||  /* 2048+512 */

From 97ffbc5f833bce48e01e18471bba13562be7056e Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sun, 30 May 2021 01:08:41 +0200
Subject: [PATCH 116/295] Rewrite mappers 162,163,164; add mapper 558. Add
 EEPROM support to 164.

---
 src/boards/162.c          | 101 ++++++++++++++
 src/boards/163.c          | 106 +++++++++++++++
 src/boards/164.c          | 278 ++++++++++++--------------------------
 src/boards/eeprom_93C66.c | 135 ++++++++++++++++++
 src/boards/eeprom_93C66.h |  10 ++
 src/ines-correct.h        |   4 +-
 src/ines.c                |   3 +-
 src/ines.h                |   2 +
 src/unif.c                |   2 +-
 src/unif.h                |   1 -
 10 files changed, 442 insertions(+), 200 deletions(-)
 create mode 100644 src/boards/162.c
 create mode 100644 src/boards/163.c
 create mode 100644 src/boards/eeprom_93C66.c
 create mode 100644 src/boards/eeprom_93C66.h

diff --git a/src/boards/162.c b/src/boards/162.c
new file mode 100644
index 0000000..973f94b
--- /dev/null
+++ b/src/boards/162.c
@@ -0,0 +1,101 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2002 Xodnizel
+ *  Copyright (C) 2005 CaH4e3
+ *  Copyright (C) 2019 Libretro Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* Waixing FS304 PCB */
+
+#include "mapinc.h"
+#include "../ines.h"
+
+static uint8 reg[4];
+static SFORMAT StateRegs[] =
+{
+        { reg, 4, "REGS" },
+        { 0 }
+};
+
+static void sync()
+{
+   setprg32(0x8000, reg[2] <<4 | reg[0] &0x0C                                        /* PRG A17-A20 always normal from $5000 and $5200 */
+                  | ( reg[3] &0x04                ?         0x00 : 0x02)             /* PRG A16 is 1       if $5300.2=0                */
+		  | ( reg[3] &0x04                ?(reg[0] &0x02): 0x00)             /* PRG A16 is $5000.1 if %5300.2=1                */
+		  | (                 reg[3] &0x01?         0x00 : reg[1] >>1 &0x01) /* PRG A15 is $5100.1 if               $5300.0=0  */
+		  | (~reg[3] &0x04 && reg[3] &0x01?         0x01 : 0x00)             /* PRG A15 is 1       if $5300.2=0 and $5300.0=1  */
+		  | ( reg[3] &0x04 && reg[3] &0x01?(reg[0] &0x01): 0x00)             /* PRG A15 is $5000.0 if $5300.2=1 and $5300.0=1  */
+   );
+   setprg8r(0x10, 0x6000, 0);
+   if (~reg[0] &0x80)
+      setchr8(0);
+}
+
+static void hblank(void) {
+   if (reg[0] &0x80 && scanline <239)
+   {  /* Actual hardware cannot look at the current scanline number, but instead latches PA09 on PA13 rises. This does not seem possible with the current PPU emulation however. */
+      setchr4(0x0000, scanline>=127? 1: 0);
+      setchr4(0x1000, scanline>=127? 1: 0);
+   }
+   else
+      setchr8(0);
+}
+
+static DECLFR(readReg)
+{
+   return 0x00;
+}
+
+static DECLFW(writeReg)
+{
+   reg[A >>8 &3] = V;
+   sync();
+}
+
+static void power(void)
+{
+   memset(reg, 0, sizeof(reg));
+   sync();
+   SetReadHandler (0x5000, 0x57FF, readReg);
+   SetWriteHandler(0x5000, 0x57FF, writeReg);
+   SetReadHandler (0x6000, 0xFFFF, CartBR);
+   SetWriteHandler(0x6000, 0x7FFF, CartBW);
+}
+
+static void reset()
+{
+   memset(reg, 0, sizeof(reg));
+   sync();
+}
+
+void Mapper162_Init (CartInfo *info)
+{
+   uint32 WRAMSIZE = info->iNES2? (info->PRGRamSize + info->PRGRamSaveSize): 8192;
+   info->Power   = power;
+   info->Reset   = reset;
+   GameHBIRQHook = hblank;
+   AddExState(StateRegs, ~0, 0, 0);
+
+   uint8* WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
+   SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
+   FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
+   if (info->battery) {
+      info->SaveGame[0] = WRAM;
+      info->SaveGameLen[0] = WRAMSIZE;
+   }
+}
diff --git a/src/boards/163.c b/src/boards/163.c
new file mode 100644
index 0000000..4671e0d
--- /dev/null
+++ b/src/boards/163.c
@@ -0,0 +1,106 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2002 Xodnizel
+ *  Copyright (C) 2005 CaH4e3
+ *  Copyright (C) 2019 Libretro Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* Nanjing FC-001 PCB */
+
+#include "mapinc.h"
+#include "../ines.h"
+
+static uint8 reg[4];
+static SFORMAT StateRegs[] =
+{
+        { reg, 4, "REGS" },
+        { 0 }
+};
+
+static void sync()
+{
+   setprg32(0x8000, reg[2] <<4 | reg[0] &0xF | (reg[3] &0x04? 0x00: 0x03));
+   setprg8r(0x10, 0x6000, 0);
+   if (~reg[0] &0x80)
+      setchr8(0);
+}
+
+static void hblank(void) {
+   if (reg[0] &0x80 && scanline <239)
+   {  /* Actual hardware cannot look at the current scanline number, but instead latches PA09 on PA13 rises. This does not seem possible with the current PPU emulation however. */
+      setchr4(0x0000, scanline>=127? 1: 0);
+      setchr4(0x1000, scanline>=127? 1: 0);
+   }
+   else
+      setchr8(0);
+}
+
+static DECLFR(readReg)
+{
+   return ~reg[1] &0x04;
+}
+
+static DECLFW(writeReg)
+{
+   uint8 index = A >>8 &3;
+   
+   /* Swap bits of registers 0-2 again if the "swap bits" bit is set. Exclude register 2 on when PRG-ROM is 1 MiB. */
+   if (reg[3] &0x01 && index <= (ROM_size == 64? 1: 2))
+      V = V &~3 | V >>1 &1 | V <<1 &2;
+   
+   if (A &1)
+   {
+      if (reg[1] &0x01 && ~V &0x01) reg[1] ^=0x04;  // If A0=1, flip feedback bit on falling edges of D0
+   }                                                // If A0=0, write to register
+   else
+      reg[index] = V;
+   sync();
+}
+
+static void power(void)
+{
+   memset(reg, 0, sizeof(reg));
+   sync();
+   SetReadHandler (0x5000, 0x57FF, readReg);
+   SetWriteHandler(0x5000, 0x57FF, writeReg);
+   SetReadHandler (0x6000, 0xFFFF, CartBR);
+   SetWriteHandler(0x6000, 0x7FFF, CartBW);
+}
+
+static void reset()
+{
+   memset(reg, 0, sizeof(reg));
+   sync();
+}
+
+void Mapper163_Init (CartInfo *info)
+{
+   uint32 WRAMSIZE = info->iNES2? (info->PRGRamSize + info->PRGRamSaveSize): 8192;
+   info->Power   = power;
+   info->Reset   = reset;
+   GameHBIRQHook = hblank;
+   AddExState(StateRegs, ~0, 0, 0);
+
+   uint8* WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
+   SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
+   FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
+   if (info->battery) {
+      info->SaveGame[0] = WRAM;
+      info->SaveGameLen[0] = WRAMSIZE;
+   }
+}
diff --git a/src/boards/164.c b/src/boards/164.c
index 7516945..2e0f23c 100644
--- a/src/boards/164.c
+++ b/src/boards/164.c
@@ -1,7 +1,9 @@
 /* FCE Ultra - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2002 Xodnizel 2006 CaH4e3
+ *  Copyright (C) 2002 Xodnizel
+ *  Copyright (C) 2005 CaH4e3
+ *  Copyright (C) 2019 Libretro Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,217 +18,103 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * It seems that 162/163/164 mappers are the same mapper with just different
- * mapper modes enabled or disabled in software or hardware, need more nanjing
- * carts
  */
 
+/* Dongda PEC-9588 educational computer. Provides the same 1bpp all-points-addressable graphics mode.
+   Its chipset was later used for the Yancheng cy2000-3 PCB, used on most of the games that display "Union Bond" at the start.
+   Some of them also use the 1bpp mode for a few screens!
+*/
+
 #include "mapinc.h"
+#include "eeprom_93C66.h"
 
-static uint8 laststrobe, trigger;
 static uint8 reg[8];
-static uint8 *WRAM = NULL;
-static uint32 WRAMSIZE;
-
-static writefunc pcmwrite;
-
-static void (*WSync)(void);
-
+static uint8 eeprom_data[512];
 static SFORMAT StateRegs[] =
 {
-	{ &laststrobe, 1, "STB" },
-	{ &trigger, 1, "TRG" },
-	{ reg, 8, "REGS" },
-	{ 0 }
+        { reg,           8, "REGS" },
+        { eeprom_data, 512, "EEPR" },
+        { 0 }
 };
 
-static void Sync(void) {
-	setprg8r(0x10, 0x6000, 0);
-	setprg32(0x8000, (reg[0] << 4) | (reg[1] & 0xF));
-	setchr8(0);
+static void sync()
+{
+   uint8 prgLow  = reg[0] &0x0F | reg[0] >>1 &0x10;
+   uint8 prgHigh = reg[1] <<5;
+   switch (reg[0] >>5 &2 | reg[0] >>4 &1)
+   {
+      case 0: /* UNROM-512 */
+         setprg16(0x8000, prgHigh | prgLow);
+         setprg16(0xC000, prgHigh |   0x1F);
+         break;
+      case 1: /* Open Bus on Yancheng cy2000-3 PCB, expansion cartridge on the Dongda PEC-9588 */
+         break;
+      case 2: /* UNROM-448+64. Very strange mode, used for the LOGO program on the Dongda PEC-9588 */
+         setprg16(0x8000, prgHigh | prgLow);
+         setprg16(0xC000, prgHigh |(prgLow >=0x1C? 0x1C: 0x1E));
+         break;
+      case 3: /* UNROM-128 or BNROM */
+         if (prgLow &0x10)
+         {
+            setprg16(0x8000, prgHigh | prgLow <<1 &0x10 | prgLow &0x0F);
+            setprg16(0xC000, prgHigh | prgLow <<1 &0x10 |         0x0F);
+         }
+         else
+            setprg32(0x8000, prgHigh >>1 | prgLow);
+         break;
+   }
+   setprg8r(0x10, 0x6000, 0);
+
+   setchr8(0);
+   PEC586Hack = !!(reg[0] &0x80);
+
+   setmirror(reg[0] &0x10 && ~reg[3] &0x80? MI_H: MI_V);
+
+   eeprom_93C66_write(reg[2] &0x10, reg[2] &0x04, reg[2] &0x01);
 }
 
-static void StateRestore(int version) {
-	WSync();
+static DECLFR(readReg)
+{
+   return eeprom_93C66_read()? 0x00: 0x04;
 }
 
-static DECLFR(ReadLow) {
-	switch (A & 0x7700) {
-	case 0x5100: return reg[2] | reg[0] | reg[1] | (reg[3] ^ 0xff); break;
-	case 0x5500:
-		if (trigger)
-			return reg[2] | reg[1];   /* Lei Dian Huang Bi Ka Qiu Chuan Shuo (NJ046) may broke other games */
-		else
-			return 0;
-	}
-	return 4;
+static DECLFW(writeReg)
+{
+   reg[A >>8 &7] = V;
+   sync();
 }
 
-static void M163HB(void) {
-	if (reg[1] & 0x80) {
-		if (scanline == 239) {
-			setchr4(0x0000, 0);
-			setchr4(0x1000, 0);
-		} else if (scanline == 127) {
-			setchr4(0x0000, 1);
-			setchr4(0x1000, 1);
-		}
-#if 0
-			if(scanline>=127)     /* Hu Lu Jin Gang (NJ039) (Ch) [!] don't like it */
-			{
-				setchr4(0x0000,1);
-				setchr4(0x1000,1);
-			}
-			else
-			{
-				setchr4(0x0000,0);
-				setchr4(0x1000,0);
-			}
-#endif
-	}
+static void power(void)
+{
+   memset(reg, 0, sizeof(reg));
+   eeprom_93C66_init();
+   sync();
+   SetReadHandler (0x5400, 0x57FF, readReg);
+   SetWriteHandler(0x5000, 0x57FF, writeReg);
+   SetReadHandler (0x6000, 0xFFFF, CartBR);
+   SetWriteHandler(0x6000, 0x7FFF, CartBW);
 }
 
-static DECLFW(Write) {
-	switch (A & 0x7300) {
-	case 0x5100: reg[0] = V; WSync(); break;
-	case 0x5000: reg[1] = V; WSync(); break;
-	case 0x5300: reg[2] = V; break;
-	case 0x5200: reg[3] = V; WSync(); break;
-	}
+static void reset()
+{
+   memset(reg, 0, sizeof(reg));
+   sync();
 }
 
-static void Power(void) {
-	memset(reg, 0, 8);
-	reg[1] = 0xFF;
-	SetWriteHandler(0x5000, 0x5FFF, Write);
-	SetReadHandler(0x6000, 0xFFFF, CartBR);
-	SetWriteHandler(0x6000, 0x7FFF, CartBW);
-	FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
-	WSync();
-}
-
-static void Close(void) {
-	if (WRAM)
-		FCEU_gfree(WRAM);
-	WRAM = NULL;
-}
-
-void Mapper164_Init(CartInfo *info) {
-	info->Power = Power;
-	info->Close = Close;
-	WSync = Sync;
-
-	WRAMSIZE = 8192;
-	WRAM = (uint8*)FCEU_gmalloc(WRAMSIZE);
-	SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
-	AddExState(WRAM, WRAMSIZE, 0, "WRAM");
-
-	if (info->battery) {
-		info->SaveGame[0] = WRAM;
-		info->SaveGameLen[0] = WRAMSIZE;
-	}
-
-	GameStateRestore = StateRestore;
-	AddExState(&StateRegs, ~0, 0, 0);
-}
-
-static DECLFW(Write2) {
-	if (A == 0x5101) {
-		if (laststrobe && !V) {
-			trigger ^= 1;
-		}
-		laststrobe = V;
-	} else if (A == 0x5100 && V == 6) /* damn those protected games */
-		setprg32(0x8000, 3);
-	else
-		switch (A & 0x7300) {
-		case 0x5200: reg[0] = V; WSync(); break;
-		case 0x5000: reg[1] = V; WSync(); if (!(reg[1] & 0x80) && (scanline < 128)) setchr8(0); /* setchr8(0); */ break;
-		case 0x5300: reg[2] = V; break;
-		case 0x5100: reg[3] = V; WSync(); break;
-		}
-}
-
-static void Power2(void) {
-	memset(reg, 0, 8);
-	laststrobe = 1;
-	pcmwrite = GetWriteHandler(0x4011);
-	SetReadHandler(0x5000, 0x5FFF, ReadLow);
-	SetWriteHandler(0x5000, 0x5FFF, Write2);
-	SetReadHandler(0x6000, 0xFFFF, CartBR);
-	SetWriteHandler(0x6000, 0x7FFF, CartBW);
-	FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
-	WSync();
-}
-
-void Mapper163_Init(CartInfo *info) {
-	info->Power = Power2;
-	info->Close = Close;
-	WSync = Sync;
-	GameHBIRQHook = M163HB;
-
-	WRAMSIZE = 8192;
-	WRAM = (uint8*)FCEU_gmalloc(WRAMSIZE);
-	SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
-	AddExState(WRAM, WRAMSIZE, 0, "WRAM");
-
-	if (info->battery) {
-		info->SaveGame[0] = WRAM;
-		info->SaveGameLen[0] = WRAMSIZE;
-	}
-	GameStateRestore = StateRestore;
-	AddExState(&StateRegs, ~0, 0, 0);
-}
-
-static void Sync3(void) {
-	setchr8(0);
-	setprg8r(0x10, 0x6000, 0);
-	switch (reg[3] & 7) {
-	case 0:
-	case 2: setprg32(0x8000, (reg[0] & 0xc) | (reg[1] & 2) | ((reg[2] & 0xf) << 4)); break;
-	case 1:
-	case 3: setprg32(0x8000, (reg[0] & 0xc) | (reg[2] & 0xf) << 4); break;
-	case 4:
-	case 6: setprg32(0x8000, (reg[0] & 0xe) | ((reg[1] >> 1) & 1) | ((reg[2] & 0xf) << 4)); break;
-	case 5:
-	case 7: setprg32(0x8000, (reg[0] & 0xf) | ((reg[2] & 0xf) << 4)); break;
-	}
-}
-
-static DECLFW(Write3) {
-/*	FCEU_printf("bs %04x %02x\n",A,V); */
-	reg[(A >> 8) & 3] = V;
-	WSync();
-}
-
-static void Power3(void) {
-	reg[0] = 3;
-	reg[1] = 0;
-	reg[2] = 0;
-	reg[3] = 7;
-	SetWriteHandler(0x5000, 0x5FFF, Write3);
-	SetReadHandler(0x6000, 0xFFFF, CartBR);
-	SetWriteHandler(0x6000, 0x7FFF, CartBW);
-	FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
-	WSync();
-}
-
-void UNLFS304_Init(CartInfo *info) {
-	info->Power = Power3;
-	info->Close = Close;
-	WSync = Sync3;
-
-	WRAMSIZE = 8192;
-	WRAM = (uint8*)FCEU_gmalloc(WRAMSIZE);
-	SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
-	AddExState(WRAM, WRAMSIZE, 0, "WRAM");
-
-	if (info->battery) {
-		info->SaveGame[0] = WRAM;
-		info->SaveGameLen[0] = WRAMSIZE;
-	}
-
-	GameStateRestore = StateRestore;
-	AddExState(&StateRegs, ~0, 0, 0);
+void Mapper164_Init (CartInfo *info)
+{
+   uint32 WRAMSIZE = info->iNES2? (info->PRGRamSize + info->PRGRamSaveSize): 8192;
+   WRAMSIZE &=~0x7FF; /* Do not include EEPROM in the WRAM size */
+   info->Power = power;
+   info->Reset = reset;
+   AddExState(StateRegs, ~0, 0, 0);
+
+   uint8* WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
+   SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
+   FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
+
+   eeprom_93C66_storage = eeprom_data;
+   info->battery = 1;
+   info->SaveGame[0] = eeprom_data;
+   info->SaveGameLen[0] = 512;
 }
diff --git a/src/boards/eeprom_93C66.c b/src/boards/eeprom_93C66.c
new file mode 100644
index 0000000..c52e602
--- /dev/null
+++ b/src/boards/eeprom_93C66.c
@@ -0,0 +1,135 @@
+#include "eeprom_93C66.h"
+
+uint8* eeprom_93C66_storage;
+uint8  eeprom_93C66_opcode;
+uint8  eeprom_93C66_data;
+uint16 eeprom_93C66_address;
+uint8  eeprom_93C66_state;
+uint8  eeprom_93C66_lastCLK;
+uint8  eeprom_93C66_writeEnabled;
+uint8  eeprom_93C66_output;
+
+#define OPCODE_MISC         0
+#define OPCODE_WRITE        1
+#define OPCODE_READ         2
+#define OPCODE_ERASE        3
+#define OPCODE_WRITEDISABLE 10
+#define OPCODE_WRITEALL     11
+#define OPCODE_ERASEALL     12
+#define OPCODE_WRITEENABLE  13
+
+#define STATE_STANDBY   0
+#define STATE_STARTBIT  1
+#define STATE_OPCODE    3
+#define STATE_ADDRESS   12
+#define STATE_DATA      20
+#define STATE_FINISHED  99
+
+void eeprom_93C66_init ()
+{
+   eeprom_93C66_address      =0;
+   eeprom_93C66_state        =STATE_STANDBY;
+   eeprom_93C66_lastCLK      =0;
+   eeprom_93C66_writeEnabled =0;
+}
+
+uint8 eeprom_93C66_read ()
+{
+   return eeprom_93C66_output;
+}
+
+void eeprom_93C66_write (uint8 CS, uint8 CLK, uint8 DAT)
+{
+   if (!CS && eeprom_93C66_state <= STATE_ADDRESS)
+      eeprom_93C66_state =STATE_STANDBY;
+   else
+   if (eeprom_93C66_state ==STATE_STANDBY && CS  && CLK)
+   {
+      eeprom_93C66_state =STATE_STARTBIT;
+      eeprom_93C66_opcode  =0;
+      eeprom_93C66_address =0;
+      eeprom_93C66_output  =1;
+   }
+   else
+   if (CLK && !eeprom_93C66_lastCLK)
+   {
+      if (eeprom_93C66_state >=STATE_STARTBIT && eeprom_93C66_state <STATE_OPCODE) 
+         eeprom_93C66_opcode  =(eeprom_93C66_opcode  <<1) | (DAT? 1: 0);
+      else
+      if (eeprom_93C66_state >=STATE_OPCODE   && eeprom_93C66_state <STATE_ADDRESS)
+         eeprom_93C66_address =(eeprom_93C66_address <<1) | (DAT? 1: 0);
+      else
+      if (eeprom_93C66_state >=STATE_ADDRESS  && eeprom_93C66_state <STATE_DATA)
+      {
+         if (eeprom_93C66_opcode ==OPCODE_WRITE || eeprom_93C66_opcode ==OPCODE_WRITEALL)
+            eeprom_93C66_data =(eeprom_93C66_data    <<1) | (DAT? 1: 0);
+         else
+         if (eeprom_93C66_opcode ==OPCODE_READ)
+         {
+            eeprom_93C66_output =!!(eeprom_93C66_data &0x80);
+            eeprom_93C66_data   =   eeprom_93C66_data <<1;
+         }
+      }
+      eeprom_93C66_state++;
+      if (eeprom_93C66_state ==STATE_ADDRESS) {
+         switch (eeprom_93C66_opcode)
+         {
+            case OPCODE_MISC:
+               eeprom_93C66_opcode =(eeprom_93C66_address >>7) + 10;
+               switch (eeprom_93C66_opcode)
+               {
+                  case OPCODE_WRITEDISABLE:
+                     eeprom_93C66_writeEnabled = 0;
+                     eeprom_93C66_state = STATE_FINISHED;
+                     break;
+                  case OPCODE_WRITEENABLE: 
+                     eeprom_93C66_writeEnabled = 1;
+                     eeprom_93C66_state = STATE_FINISHED;
+                     break;
+                  case OPCODE_ERASEALL:
+                     if (eeprom_93C66_writeEnabled) for (int i =0; i <512; i++) eeprom_93C66_storage[i] = 0xFF;
+                     eeprom_93C66_state = STATE_FINISHED;
+                     break;
+                  case OPCODE_WRITEALL:
+                     eeprom_93C66_address = 0;
+                     break;
+               }
+               break;
+            case OPCODE_ERASE:
+               if (eeprom_93C66_writeEnabled) eeprom_93C66_storage[eeprom_93C66_address] = 0xFF;
+               eeprom_93C66_state = STATE_FINISHED;
+               break;
+            case OPCODE_READ:
+               eeprom_93C66_data = eeprom_93C66_storage[eeprom_93C66_address++];
+               break;
+         }
+      }
+      else
+      if (eeprom_93C66_state ==STATE_DATA)
+      {
+         if (eeprom_93C66_opcode ==OPCODE_WRITE)
+	 {
+            eeprom_93C66_storage[eeprom_93C66_address++] = eeprom_93C66_data;
+            eeprom_93C66_state = STATE_FINISHED;
+         }
+	 else
+         if (eeprom_93C66_opcode ==OPCODE_WRITEALL)
+	 {
+            eeprom_93C66_storage[eeprom_93C66_address++] = eeprom_93C66_data;
+            eeprom_93C66_state = CS && eeprom_93C66_address <512? STATE_ADDRESS: STATE_FINISHED;
+         }
+	 else
+         if (eeprom_93C66_opcode ==OPCODE_READ)
+	 {
+            if (eeprom_93C66_address <512) eeprom_93C66_data = eeprom_93C66_storage[eeprom_93C66_address];
+            eeprom_93C66_state = CS && ++eeprom_93C66_address <=512? STATE_ADDRESS: STATE_FINISHED;
+         }
+      }
+      if (eeprom_93C66_state == STATE_FINISHED)
+      {
+         eeprom_93C66_output = 0;
+         eeprom_93C66_state = STATE_STANDBY;
+      }
+   }
+   eeprom_93C66_lastCLK = CLK;
+}
diff --git a/src/boards/eeprom_93C66.h b/src/boards/eeprom_93C66.h
new file mode 100644
index 0000000..458f02e
--- /dev/null
+++ b/src/boards/eeprom_93C66.h
@@ -0,0 +1,10 @@
+#ifndef _EEPROM_93C66_H
+#define _EEPROM_93C66_H
+#include "mapinc.h"
+
+extern uint8* eeprom_93C66_storage;
+
+void  eeprom_93C66_init  ();
+uint8 eeprom_93C66_read  ();
+void  eeprom_93C66_write (uint8 CS, uint8 CLK, uint8 DAT);
+#endif
diff --git a/src/ines-correct.h b/src/ines-correct.h
index 159e9a6..14cae2d 100644
--- a/src/ines-correct.h
+++ b/src/ines-correct.h
@@ -37,7 +37,8 @@
 
 	{ 0xaf5d7aa2,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Clu Clu Land (W) [o3].nes */
 	{ 0xcfb224e6,  222, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ninja (J) (PRG0) [p1][!].nes */
-	{ 0x82f204ae,  163, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Liang Shan Ying Xiong (NJ023) (Ch) [!].nes */
+	{ 0x82f204ae,  162, DEFAULT,    MI_H, 0,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Liang Shan Ying Xiong (NJ023) (Ch) [!].nes */
+	{ 0x8589652D,  162, DEFAULT,    MI_H, 0,    0x70,    0x07, DEFAULT, NOEXTRA }, /* 农场小精灵.nes */
 	{ 0xad9c63e2,   70, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Space Shadow (Japan).nes */
 	{ 0xe1526228,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ki no Bouken - The Quest of Ki (Japan).nes */
 	{ 0xaf5d7aa2,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Clu Clu Land (W) [o3].nes */
@@ -355,7 +356,6 @@
 	{ 0x183859d2,  159, DEFAULT, DEFAULT, 1,    0x10, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ball Z - Kyoushuu! Saiya Jin (Japan).nes */
 	{ 0x58152b42,  160, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pipe V (Asia) (Ja) (Unl).nes */
 	{ 0x1c098942,  162, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Xi You Ji Hou Zhuan (Ch).nes */
-	{ 0x081caaff,  163, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Commandos (Ch).nes */
 
 	/* Mapper 176 */
 	{ 0xffde0de5,  176, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 梦幻之星4[简体](修正)一战一级.nes */
diff --git a/src/ines.c b/src/ines.c
index 7f807d3..d3392a9 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -577,7 +577,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "BANDAI 24C01",             159, Mapper159_Init         ) /* Different type of EEPROM on the  bandai board */
 	INES_BOARD( "SA009",                    160, SA009_Init             )
 /*    INES_BOARD( "",                            161, Mapper161_Init ) */
-	INES_BOARD( "",                         162, UNLFS304_Init          )
+	INES_BOARD( "",                         162, Mapper162_Init         )
 	INES_BOARD( "",                         163, Mapper163_Init         )
 	INES_BOARD( "",                         164, Mapper164_Init         )
 	INES_BOARD( "",                         165, Mapper165_Init         )
@@ -802,6 +802,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "T-230",                    529, UNLT230_Init           )
 	INES_BOARD( "AX5705",                   530, UNLAX5705_Init         )
 	INES_BOARD( "LH53",                     535, LH53_Init              )
+	INES_BOARD( "YC-03-09",                 558, Mapper558_Init         )
 INES_BOARD_END()
 
 static uint32 get_ines_version(void) {
diff --git a/src/ines.h b/src/ines.h
index 330c0a5..acdd82a 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -165,6 +165,7 @@ void Mapper156_Init(CartInfo *);
 void Mapper157_Init(CartInfo *);
 void Mapper158_Init(CartInfo *);
 void Mapper159_Init(CartInfo *);
+void Mapper162_Init(CartInfo *);
 void Mapper163_Init(CartInfo *);
 void Mapper164_Init(CartInfo *);
 void Mapper165_Init(CartInfo *);
@@ -295,5 +296,6 @@ void Mapper541_Init(CartInfo *);
 void Mapper543_Init(CartInfo *);
 void Mapper550_Init(CartInfo *);
 void Mapper554_Init(CartInfo *);
+void Mapper558_Init(CartInfo *);
 
 #endif
diff --git a/src/unif.c b/src/unif.c
index e69a75a..a019f17 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -462,7 +462,7 @@ static BMAPPING bmap[] = {
 	{ "EWROM",                        5, EWROM_Init,            0 },
 	{ "FK23C",                      176, BMCFK23C_Init,         BMCFLAG_256KCHRR },
 	{ "FK23CA",                     176, BMCFK23CA_Init,        BMCFLAG_256KCHRR },
-	{ "FS304",                      162, UNLFS304_Init,         0 },
+	{ "FS304",                      162, Mapper162_Init,        0 },
 	{ "G-146",                      349, BMCG146_Init,          0 },
 	{ "GK-192",                 NO_INES, BMCGK192_Init,         0 }, /* mapper 58? */
 	{ "GS-2004",                    283, BMCGS2004_Init,        0 },
diff --git a/src/unif.h b/src/unif.h
index c53a3e8..7738608 100644
--- a/src/unif.h
+++ b/src/unif.h
@@ -118,7 +118,6 @@ void UNLCC21_Init(CartInfo *info);
 void UNLCITYFIGHT_Init(CartInfo *info);
 void UNLD2000_Init(CartInfo *info);
 void UNLEDU2000_Init(CartInfo *info);
-void UNLFS304_Init(CartInfo *info);
 void UNLH2288_Init(CartInfo *info);
 void UNLKOF97_Init(CartInfo *info);
 void UNLKS7012_Init(CartInfo *info);

From d4c0d6e85218c7ba93d69d3e45abae598fa93ea3 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sun, 30 May 2021 10:05:10 +0200
Subject: [PATCH 117/295] Update database for mappers 162-164/558

---
 src/boards/162.c   |   6 +--
 src/boards/163.c   |   6 +--
 src/boards/164.c   |   3 +-
 src/boards/558.c   | 125 +++++++++++++++++++++++++++++++++++++++++++
 src/ines-correct.h | 128 +++++++++++++++++++++++++++++++++++++++++++--
 5 files changed, 257 insertions(+), 11 deletions(-)
 create mode 100644 src/boards/558.c

diff --git a/src/boards/162.c b/src/boards/162.c
index 973f94b..6a57890 100644
--- a/src/boards/162.c
+++ b/src/boards/162.c
@@ -49,8 +49,8 @@ static void sync()
 static void hblank(void) {
    if (reg[0] &0x80 && scanline <239)
    {  /* Actual hardware cannot look at the current scanline number, but instead latches PA09 on PA13 rises. This does not seem possible with the current PPU emulation however. */
-      setchr4(0x0000, scanline>=127? 1: 0);
-      setchr4(0x1000, scanline>=127? 1: 0);
+      setchr4(0x0000, scanline >=127? 1: 0);
+      setchr4(0x1000, scanline >=127? 1: 0);
    }
    else
       setchr8(0);
@@ -96,6 +96,6 @@ void Mapper162_Init (CartInfo *info)
    FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
    if (info->battery) {
       info->SaveGame[0] = WRAM;
-      info->SaveGameLen[0] = WRAMSIZE;
+      info->SaveGameLen[0] = info->PRGRamSaveSize;
    }
 }
diff --git a/src/boards/163.c b/src/boards/163.c
index 4671e0d..393817b 100644
--- a/src/boards/163.c
+++ b/src/boards/163.c
@@ -43,8 +43,8 @@ static void sync()
 static void hblank(void) {
    if (reg[0] &0x80 && scanline <239)
    {  /* Actual hardware cannot look at the current scanline number, but instead latches PA09 on PA13 rises. This does not seem possible with the current PPU emulation however. */
-      setchr4(0x0000, scanline>=127? 1: 0);
-      setchr4(0x1000, scanline>=127? 1: 0);
+      setchr4(0x0000, scanline >=127? 1: 0);
+      setchr4(0x1000, scanline >=127? 1: 0);
    }
    else
       setchr8(0);
@@ -101,6 +101,6 @@ void Mapper163_Init (CartInfo *info)
    FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
    if (info->battery) {
       info->SaveGame[0] = WRAM;
-      info->SaveGameLen[0] = WRAMSIZE;
+      info->SaveGameLen[0] = info->PRGRamSaveSize;
    }
 }
diff --git a/src/boards/164.c b/src/boards/164.c
index 2e0f23c..a9d7c9e 100644
--- a/src/boards/164.c
+++ b/src/boards/164.c
@@ -103,8 +103,7 @@ static void reset()
 
 void Mapper164_Init (CartInfo *info)
 {
-   uint32 WRAMSIZE = info->iNES2? (info->PRGRamSize + info->PRGRamSaveSize): 8192;
-   WRAMSIZE &=~0x7FF; /* Do not include EEPROM in the WRAM size */
+   uint32 WRAMSIZE = info->iNES2? (info->PRGRamSize + (info->PRGRamSaveSize &~0x7FF)): 8192;
    info->Power = power;
    info->Reset = reset;
    AddExState(StateRegs, ~0, 0, 0);
diff --git a/src/boards/558.c b/src/boards/558.c
new file mode 100644
index 0000000..b622a61
--- /dev/null
+++ b/src/boards/558.c
@@ -0,0 +1,125 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2002 Xodnizel
+ *  Copyright (C) 2005 CaH4e3
+ *  Copyright (C) 2019 Libretro Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* Yancheng YC-03-09/Waixing FS??? PCB */
+
+#include "mapinc.h"
+#include "eeprom_93C66.h"
+#include "../ines.h"
+
+static uint8 reg[4];
+static uint8 haveEEPROM;
+static uint8 eeprom_data[512];
+static SFORMAT StateRegs[] =
+{
+        { reg, 4, "REGS" },
+        { 0 }
+};
+
+static void sync()
+{
+   setprg32(0x8000, reg[1] <<4 | reg[0] &0xF | (reg[3] &0x04? 0x00: 0x03));
+   setprg8r(0x10, 0x6000, 0);
+   if (~reg[0] &0x80)
+      setchr8(0);
+
+   if (haveEEPROM)
+      eeprom_93C66_write(reg[2] &0x04, reg[2] &0x02, reg[2] &0x01);
+}
+
+static void hblank(void) {
+   if (reg[0] &0x80 && scanline <239)
+   {  /* Actual hardware cannot look at the current scanline number, but instead latches PA09 on PA13 rises. This does not seem possible with the current PPU emulation however. */
+      setchr4(0x0000, scanline >=127? 1: 0);
+      setchr4(0x1000, scanline >=127? 1: 0);
+   }
+   else
+      setchr8(0);
+}
+
+static DECLFR(readReg)
+{
+   if (haveEEPROM)
+      return eeprom_93C66_read()? 0x04: 0x00;
+   else
+      return reg[2] &0x04;
+}
+
+static DECLFW(writeReg)
+{
+   uint8 index = A >>8 &3;
+   
+   /* D0 and D1 are connected to the ASIC in reverse order, so swap once */
+   V = V &~3 | V >>1 &1 | V <<1 &2;
+   
+   /* Swap bits of registers 0-2 again if the "swap bits" bit is set. Exclude register 2 on when PRG-ROM is 1 MiB. */
+   if (reg[3] &0x02 && index <= (ROM_size == 64? 1: 2))
+      V = V &~3 | V >>1 &1 | V <<1 &2;
+   
+   reg[index] = V;
+   sync();
+}
+
+static void power(void)
+{
+   memset(reg, 0, sizeof(reg));
+   if (haveEEPROM)
+      eeprom_93C66_init();
+   sync();
+   SetReadHandler (0x5000, 0x57FF, readReg);
+   SetWriteHandler(0x5000, 0x57FF, writeReg);
+   SetReadHandler (0x6000, 0xFFFF, CartBR);
+   SetWriteHandler(0x6000, 0x7FFF, CartBW);
+}
+
+static void reset()
+{
+   memset(reg, 0, sizeof(reg));
+   sync();
+}
+
+void Mapper558_Init (CartInfo *info)
+{
+   uint32 WRAMSIZE = info->PRGRamSize + (info->PRGRamSaveSize &~0x7FF);
+   info->Power   = power;
+   info->Reset   = reset;
+   GameHBIRQHook = hblank;
+   AddExState(StateRegs, ~0, 0, 0);
+
+   uint8* WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
+   SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
+   FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
+   haveEEPROM =!!(info->PRGRamSaveSize &0x200);
+   if (haveEEPROM)
+   {
+      eeprom_93C66_storage = eeprom_data;
+      info->battery = 1;
+      info->SaveGame[0] = eeprom_data;
+      info->SaveGameLen[0] = 512;
+   }
+   else
+   if (info->battery)
+   {
+      info->SaveGame[0] = WRAM;
+      info->SaveGameLen[0] = (info->PRGRamSaveSize &~0x7FF);
+   }
+}
diff --git a/src/ines-correct.h b/src/ines-correct.h
index 14cae2d..0f86a4e 100644
--- a/src/ines-correct.h
+++ b/src/ines-correct.h
@@ -37,8 +37,6 @@
 
 	{ 0xaf5d7aa2,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Clu Clu Land (W) [o3].nes */
 	{ 0xcfb224e6,  222, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ninja (J) (PRG0) [p1][!].nes */
-	{ 0x82f204ae,  162, DEFAULT,    MI_H, 0,    0x70,    0x07, DEFAULT, NOEXTRA }, /* Liang Shan Ying Xiong (NJ023) (Ch) [!].nes */
-	{ 0x8589652D,  162, DEFAULT,    MI_H, 0,    0x70,    0x07, DEFAULT, NOEXTRA }, /* 农场小精灵.nes */
 	{ 0xad9c63e2,   70, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Space Shadow (Japan).nes */
 	{ 0xe1526228,  206, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Ki no Bouken - The Quest of Ki (Japan).nes */
 	{ 0xaf5d7aa2,    0, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Clu Clu Land (W) [o3].nes */
@@ -355,7 +353,131 @@
 	{ 0xb7f28915,  159, DEFAULT, DEFAULT, 1,    0x10, DEFAULT, DEFAULT, NOEXTRA }, /* Magical Taruruuto-kun 2 - Mahou Daibouken (Japan).nes */
 	{ 0x183859d2,  159, DEFAULT, DEFAULT, 1,    0x10, DEFAULT, DEFAULT, NOEXTRA }, /* Dragon Ball Z - Kyoushuu! Saiya Jin (Japan).nes */
 	{ 0x58152b42,  160, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pipe V (Asia) (Ja) (Unl).nes */
-	{ 0x1c098942,  162, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Xi You Ji Hou Zhuan (Ch).nes */
+
+	/* Mapper 162: Waixing FS304 */
+	{ 0x08FBF3F0,  162,       0,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Mummy - 神鬼传奇 */
+	{ 0xF5D34C8E,  162,       0,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Zelda 传说: 三神之力 */
+	{ 0xEE3A1CA8,  162,       0,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 法老王 - Pharaoh */
+	{ 0xCF4ADAAD,  162,       0,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 火焰纹章 - 圣战的系谱 */
+	{ 0xB2045E9C,  162,       0,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 聖火徽章 III */
+	{ 0x1C098942,  162,       0,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 西游记后传 */
+	/* Mapper 162: Nanjing games that use an FS304 feature as a protection check */
+	{ 0x8589652D,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 农场小精灵 */
+	{ 0x82F204AE,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 梁山英雄 */
+	
+	/* Mapper 163: Nanjing, running with $5300=$04 */
+	{ 0xC9ABA7F0,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Chrono Trigger - 时空之轮 */
+	{ 0x143B4D30,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Final Fantasy VII - 最终幻想 7 */
+	{ 0x3CC55A44,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* The Legend of Zelda - 塞尔达传说: 神奇的帽子 */
+	{ 0x4752BD5E,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 七國大戰 */
+	{ 0x1121C0D1,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 三国志 之 傲视天地 */
+	{ 0x8E4294A9,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 三国志: 曹操传 */
+	{ 0xF52468E7,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 三国无双: 猛将传 */
+	{ 0xEF7BA485,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 仙剑奇侠 */
+	{ 0x20E1CF44,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 仙界精灵 */
+	{ 0x9688AEEA,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 倚天传说 */
+	{ 0x04DFE0D4,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 倚天剑传奇 */
+	{ 0x6CB6D619,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋宝石 - 银 */
+	{ 0x8C73A47B,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 哪吒传奇 */
+	{ 0xE40DA18F,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 圣剑传说 */
+	{ 0xC07CD2CE,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 圣斗士星矢: 天马之幻想 */
+	{ 0x9237C200,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 大话西游 */
+	{ 0x4FB02A43,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 天龙八部 */
+	{ 0x52D7FE18,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 太空幻想 */
+	{ 0xA01CA587,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 幻世录 */
+	{ 0x89F4ACD1,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 幻想传说 */
+	{ 0x65C63CC3,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 数码战队 2 */
+	{ 0x2C01DE06,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 数码暴龙 */
+	{ 0xB614AAA2,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 暗黑破坏神 - Diablo */
+	{ 0x80A18CDC,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 机器人大战 */
+	{ 0x33DB45BA,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 核心危机 */
+	{ 0x1B74A022,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 梦幻沙漏 */
+	{ 0x695A7A70,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 楚汉风云 */
+	{ 0xD0807FD2,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 水浒 III */
+	{ 0x524AF6E8,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 水浒神兽 (南晶) */
+	{ 0x2802E40F,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 汉刘邦 */
+	{ 0xAC491507,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 游戏王 */
+	{ 0x31C1BF98,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 牧场物语 */
+	{ 0x191F7D5E,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 真 Samurai Spirits - 武士道列传: 侍魂 */
+	{ 0x1FE67BB3,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 真 Samurai Spirits - 魂之利刃 */
+	{ 0x4973B16B,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 石器时代 */
+	{ 0x09C7AED3,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 葫芦金刚 */
+	{ 0x4E3EDF88,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 超级机器人大战 A */
+	{ 0x74C1EDC7,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 轩辕剑外传 之 天之痕 */
+	{ 0x723C6345,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 金庸群侠传: 书剑江山 */
+	{ 0xDA47B05A,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 隋唐英雄 */
+	{ 0x056F2B8E,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 雷电皇: Pikachu传说 */
+	{ 0x04166E96,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 魔幻世界 */
+	{ 0x85FA53E1,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 魔界塔士 */
+	{ 0x2121DAB2,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 魔界霸主 */
+	{ 0xE3EF9739,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 黄金太阳 */	
+	/* Mapper 163: Nanjing, running with $5300=$07 */
+	{ 0x6F94C5E5,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Final Fantasy IV - 最终幻想 4: 光与暗 水晶纷争 */
+	{ 0xD6CBB05D,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Naruto RPG - 火影忍者 */
+	{ 0xD7A4CBA5,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 七龙珠大冒险 - Dragon Ball */
+	{ 0xDF27B96C,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 三国大乱斗: 战国 - Orochi */
+	{ 0x8C60CECF,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 三国志: 吕布传 */
+	{ 0x44AC9C8E,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 三国群侠传 */
+	{ 0xA3193C51,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 倚天屠龙记 */
+	{ 0x98266D3A,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 傲视三国志 */
+	{ 0xA026AE52,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋宝石 - 红 */
+	{ 0xB6F72A18,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋宝石 - 蓝 */
+	{ 0x5108AB7F,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋宝石 - 金 */
+	{ 0x8EB1B4CF,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋水晶 */
+	{ 0xA66756AD,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋钻石 */
+	{ 0x3A613060,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 吞食天地 VI: 刘备传 */
+	{ 0xB35BE92F,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 圣斗士星矢: 北欧突击篇 */
+	{ 0x15E50ECD,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 宠物高达战记 */
+	{ 0xBBAB3A61,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 拳皇R-1: 最强格斗王 */
+	{ 0x2DA3A49C,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 时空斗士 - Pegasus Senya */
+	{ 0x222A136A,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 武侠天地 */
+	{ 0xEBC6E2E2,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 毁灭之神 */
+	{ 0xE08AB52E,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 魔兽世界: 恶魔猎人 */
+	/* Mapper 162: Nanjing, running with $5300=$07, but dumped without taking the D0/D1 bit swap into account.
+	               Such dumps need not be invalidated however, as they can run as mapper 162 when properly emulated. */
+	{ 0x9D8AA034,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Final Fantasy IV - 最终幻想4: 光与暗 水晶纷争 */
+	{ 0x5E66E6C4,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Naruto RPG - 火影忍者 */
+	{ 0x9DE10A91,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 七龙珠大冒险 - Dragon Ball */
+	{ 0xFC209609,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 三国大乱斗: 战国 - Orochi */
+	{ 0x696D98E3,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 三国志: 吕布传 */
+	{ 0x9F197F2B,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 三国群侠传 */
+	{ 0x975F64E2,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 倚天屠龙记 */
+	{ 0x915C5179,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 傲视三国志 */
+	{ 0x852BDB36,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋宝石 - 红 */
+	{ 0xB41CF445,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋宝石 - 蓝 */
+	{ 0x7829C3A9,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋宝石 - 金 */
+	{ 0xBC383C09,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋水晶 */
+	{ 0xA9C4712A,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋钻石 */
+	{ 0xC2B02B71,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 吞食天地 VI: 刘备传 */
+	{ 0x054444A0,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 圣斗士星矢: 北欧突击篇 */
+	{ 0x9BA518BA,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 宠物高达战记 */
+	{ 0x4CE082F8,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 拳皇R-1: 最强格斗王 */
+	{ 0x99FE9AB5,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 时空斗士 - Pegasus Senya */
+	{ 0x57414FB6,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 武侠天地 */
+	{ 0x979239DE,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 毁灭之神 */
+	{ 0xEFF96E8A,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 魔兽世界: 恶魔猎人 */
+	
+	/* Mapper 164: Dongda PEC-9588 and Yancheng cy2000-3 PCB */
+	{ 0xFE31765B,  164,       0,    MI_V, 0,    0x07,    0x07,   DENDY, NOEXTRA }, /* Pyramid 金字塔 PEC-9588 家庭电脑 */
+	{ 0x0878A7EE,  164,       0,    MI_H, 1,    0x35,    0x07,   DENDY, NOEXTRA }, /* Dark Seed - 黑暗之蛊 */
+	{ 0x56A0D271,  164,       0,    MI_H, 1,    0x35,    0x07,   DENDY, NOEXTRA }, /* Final Fantasy 太空戰士 V (rev0) */
+	{ 0xCB1EF911,  164,       0,    MI_H, 1,    0x35,    0x07,   DENDY, NOEXTRA }, /* Final Fantasy 太空戰士 V (rev1) */
+	{ 0x8209BA79,  164,       0,    MI_H, 1,    0x35,    0x07,   DENDY, NOEXTRA }, /* 櫻桃小丸子 */
+	{ 0xBC7562A6,  164,       0,    MI_H, 1,    0x35,    0x07,   DENDY, NOEXTRA }, /* 口袋精靈: 金 */
+	{ 0x65F1DB91,  164,       0,    MI_H, 1,    0x35,    0x07,   DENDY, NOEXTRA }, /* 大話西游 [restored, no good dump known] */
+	{ 0x0A244228,  164,       0,    MI_H, 1,    0x35,    0x07,   DENDY, NOEXTRA }, /* 岳飛傳 [restored, no good dump known] */
+
+	/* Mapper 558: Waixing FS??? and Yancheng YC-03-09 PCB */
+	{ 0xE65A8C08,  558,       0,    MI_H, 1,    0x30,    0x07,   DENDY, NOEXTRA }, /* 大話三國 */
+	{ 0x228559A7,  558,       0,    MI_H, 1,    0x30,    0x07,   DENDY, NOEXTRA }, /* 口袋精靈: 水晶 */
+	{ 0x8B41D49C,  558,       0,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Pet Evolve - 宠物进化史 */
+	{ 0x5622EC51,  558,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 三国志 II 代 */
+	{ 0xE7AEB114,  558,       0,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋妖怪: 鑽石版 */
+	{ 0x8EB4BB51,  558,       0,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 口袋精靈: 紅 */
+	{ 0x48244391,  558,       0,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 宠物: 红 */
+	{ 0x01A24301,  558,       0,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 数码宝贝 */
+	{ 0x88CB68A7,  558,       0,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 数码暴龙 4: 水晶版 */
+	{ 0x081CAAFF,  558,       0,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 盟军敢死队 - Commandos */
 
 	/* Mapper 176 */
 	{ 0xffde0de5,  176, DEFAULT, DEFAULT, 1, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 梦幻之星4[简体](修正)一战一级.nes */

From 403f682eb7951cba41a45c4dc618819665bfdca0 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 31 May 2021 16:55:09 +0800
Subject: [PATCH 118/295] Cleanup: Remove a few extern

---
 Makefile.libretro               |  4 ++--
 src/cart.h                      |  3 +++
 src/drivers/libretro/libretro.c | 22 ++--------------------
 src/fceu.h                      |  3 +++
 src/input.h                     |  2 ++
 src/ppu.h                       |  2 ++
 6 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index 86563b0..2387bed 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -752,8 +752,8 @@ else
 WARNING_DEFINES = -Wno-write-strings
 endif
 
-CFLAGS += $(fpic) $(WARNING_DEFINES) $(DEFINES) $(ENDIANNESS_DEFINES) 
-LDFLAGS += $(LIBM)
+CFLAGS += $(fpic) $(WARNING_DEFINES) $(DEFINES) $(ENDIANNESS_DEFINES) -Werror=implicit-function-declaration
+LDFLAGS += $(LIBM) -Werror=implicit-function-declaration
 
 ifeq ($(platform), psp1)
 	INCFLAGS += -I$(shell psp-config --pspsdk-path)/include
diff --git a/src/cart.h b/src/cart.h
index 4573403..cd05d4b 100644
--- a/src/cart.h
+++ b/src/cart.h
@@ -104,4 +104,7 @@ void FCEU_OpenGenie(void);
 void FCEU_CloseGenie(void);
 void FCEU_KillGenie(void);
 
+extern CartInfo iNESCart;
+extern CartInfo UNIFCart;
+
 #endif
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 39263fc..b191dcd 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -67,8 +67,6 @@ void linearFree(void* mem);
 RETRO_HW_RENDER_INTEFACE_GSKIT_PS2 *ps2 = NULL;
 #endif
 
-extern void FCEU_ZapperSetTolerance(int t);
-
 static retro_video_refresh_t video_cb = NULL;
 static retro_input_poll_t poll_cb = NULL;
 static retro_input_state_t input_cb = NULL;
@@ -95,7 +93,7 @@ static int aspect_ratio_par;
 
 #define MAX_BUTTONS 8
 #define TURBO_BUTTONS 2
-unsigned char turbo_button_toggle[MAX_PLAYERS][TURBO_BUTTONS] = { {0} };
+unsigned turbo_button_toggle[MAX_PLAYERS][TURBO_BUTTONS] = { {0} };
 
 typedef struct
 {
@@ -145,8 +143,6 @@ static bool libretro_supports_bitmasks = false;
 
 const size_t PPU_BIT = 1ULL << 31ULL;
 
-extern uint8 NTARAM[0x800], PALRAM[0x20], SPRAM[0x100], PPU[4];
-
 /* overclock the console by adding dummy scanlines to PPU loop
  * disables DMC DMA and WaveHi filling for these dummies
  * doesn't work with new PPU */
@@ -158,14 +154,13 @@ unsigned normal_scanlines = 240;
 unsigned extrascanlines = 0;
 unsigned vblankscanlines = 0;
 unsigned dendy = 0;
+unsigned swapDuty;
 
 static unsigned systemRegion = 0;
 static unsigned opt_region = 0;
 static unsigned opt_showAdvSoundOptions = 0;
 static unsigned opt_showAdvSystemOptions = 0;
 
-int FCEUnetplay;
-
 #if defined(PSP) || defined(PS2)
 static __attribute__((aligned(16))) uint16_t retro_palette[256];
 #else
@@ -181,24 +176,12 @@ static uint16_t* fceu_video_out;
 static unsigned sndsamplerate;
 static unsigned sndquality;
 static unsigned sndvolume;
-unsigned swapDuty;
 
 static int32_t *sound = 0;
 static uint32_t Dummy = 0;
 static uint32_t current_palette = 0;
 static unsigned serialize_size;
 
-int PPUViewScanline=0;
-int PPUViewer=0;
-
-/* extern forward decls.*/
-extern FCEUGI *GameInfo;
-extern uint8 *XBuf;
-extern CartInfo iNESCart;
-extern CartInfo UNIFCart;
-extern int show_crosshair;
-extern int option_ramstate;
-
 /* emulator-specific callback functions */
 
 void UpdatePPUView(int refreshchr) { }
@@ -311,7 +294,6 @@ FILE *FCEUD_UTF8fopen(const char *n, const char *m)
 #define PAL_CUSTOM  (PAL_TOTAL + 3)
 
 static int external_palette_exist = 0;
-extern int ipalette;
 
 /* table for currently loaded palette */
 static uint8_t base_palette[192];
diff --git a/src/fceu.h b/src/fceu.h
index f97b425..d3ec9a6 100644
--- a/src/fceu.h
+++ b/src/fceu.h
@@ -23,6 +23,9 @@ extern unsigned swapDuty; /* Swap bits 6 & 7 of $4000/$4004 to mimic bug
                            * found on some famiclones/Dendy models.
                            */
 
+extern int show_crosshair;
+extern int option_ramstate;
+
 void ResetGameLoaded(void);
 
 #define DECLFR(x) uint8 FP_FASTAPASS(1) x(uint32 A)
diff --git a/src/input.h b/src/input.h
index 82061bc..1ab1e39 100644
--- a/src/input.h
+++ b/src/input.h
@@ -29,4 +29,6 @@ extern void (*InputScanlineHook)(uint8 *bg, uint8 *spr, uint32 linets, int final
 
 void FCEU_DoSimpleCommand(int cmd);
 
+void FCEU_ZapperSetTolerance(int t);
+
 #endif
diff --git a/src/ppu.h b/src/ppu.h
index 96338a1..d9cfcec 100644
--- a/src/ppu.h
+++ b/src/ppu.h
@@ -16,6 +16,8 @@ extern void FP_FASTAPASS(1) (*PPU_hook)(uint32 A);
 extern uint8 NTARAM[0x800], *vnapage[4];
 extern uint8 PPUNTARAM;
 extern uint8 PPUCHRRAM;
+extern uint8 PALRAM[0x20];
+extern uint8 SPRAM[0x100];
 
 void FCEUPPU_SaveState(void);
 void FCEUPPU_LoadState(int version);

From 46ca02a2066c058597abfadaa13401154475c58a Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Wed, 2 Jun 2021 04:18:49 +0800
Subject: [PATCH 119/295] Move settings-related vars to FSettings struct

- Just some more cleanups
---
 src/drivers/libretro/libretro.c | 67 +++++++++++++--------------------
 src/fceu.c                      | 26 ++++++++-----
 src/fceu.h                      | 39 +++++++++----------
 src/ines.c                      |  3 +-
 src/ppu.c                       | 32 ++++++++--------
 src/sound.c                     |  6 +--
 src/sound.h                     |  1 +
 src/video.c                     | 11 +++---
 src/video.h                     |  1 -
 src/x6502.c                     |  7 ++--
 src/x6502.h                     |  3 +-
 11 files changed, 94 insertions(+), 102 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index b191dcd..43a4d33 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -143,19 +143,6 @@ static bool libretro_supports_bitmasks = false;
 
 const size_t PPU_BIT = 1ULL << 31ULL;
 
-/* overclock the console by adding dummy scanlines to PPU loop
- * disables DMC DMA and WaveHi filling for these dummies
- * doesn't work with new PPU */
-unsigned overclock_enabled = -1;
-unsigned overclocked = 0;
-unsigned skip_7bit_overclocking = 1; /* 7-bit samples have priority over overclocking */
-unsigned totalscanlines = 0;
-unsigned normal_scanlines = 240;
-unsigned extrascanlines = 0;
-unsigned vblankscanlines = 0;
-unsigned dendy = 0;
-unsigned swapDuty;
-
 static unsigned systemRegion = 0;
 static unsigned opt_region = 0;
 static unsigned opt_showAdvSoundOptions = 0;
@@ -970,7 +957,7 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
    info->geometry.max_height = NES_HEIGHT;
    info->geometry.aspect_ratio = get_aspect_ratio(width, height);
    info->timing.sample_rate = (float)sndsamplerate;
-   if (FSettings.PAL || dendy)
+   if (FSettings.PAL || FSettings.dendy)
       info->timing.fps = 838977920.0/16777215.0;
    else
       info->timing.fps = 1008307711.0/16777215.0;
@@ -1075,7 +1062,7 @@ static void FCEUD_RegionOverride(unsigned region)
          break;
    }
 
-   dendy = d;
+   FSettings.dendy = d;
    FCEUI_SetVidSystem(pal);
    ResetPalette();
 }
@@ -1131,11 +1118,11 @@ static void check_variables(bool startup)
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
       if (!strcmp(var.value, "random"))
-         option_ramstate = 2;
+         FSettings.ramstate = 2;
       else if (!strcmp(var.value, "fill $00"))
-         option_ramstate = 1;
+         FSettings.ramstate = 1;
       else
-         option_ramstate = 0;
+         FSettings.ramstate = 0;
    }
 
 #ifdef HAVE_NTSC_FILTER
@@ -1236,33 +1223,33 @@ static void check_variables(bool startup)
       bool do_reinit = false;
 
       if (!strcmp(var.value, "disabled")
-            && overclock_enabled != 0)
+            && FSettings.overclock_enabled != 0)
       {
-         skip_7bit_overclocking = 1;
-         extrascanlines         = 0;
-         vblankscanlines        = 0;
-         overclock_enabled      = 0;
+         FSettings.skip_7bit_overclocking = 1;
+         FSettings.extrascanlines         = 0;
+         FSettings.vblankscanlines        = 0;
+         FSettings.overclock_enabled      = 0;
          do_reinit              = true;
       }
       else if (!strcmp(var.value, "2x-Postrender"))
       {
-         skip_7bit_overclocking = 1;
-         extrascanlines         = 266;
-         vblankscanlines        = 0;
-         overclock_enabled      = 1;
+         FSettings.skip_7bit_overclocking = 1;
+         FSettings.extrascanlines         = 266;
+         FSettings.vblankscanlines        = 0;
+         FSettings.overclock_enabled      = 1;
          do_reinit              = true;
       }
       else if (!strcmp(var.value, "2x-VBlank"))
       {
-         skip_7bit_overclocking = 1;
-         extrascanlines         = 0;
-         vblankscanlines        = 266;
-         overclock_enabled      = 1;
+         FSettings.skip_7bit_overclocking = 1;
+         FSettings.extrascanlines         = 0;
+         FSettings.vblankscanlines        = 266;
+         FSettings.overclock_enabled      = 1;
          do_reinit              = true;
       }
 
-      normal_scanlines = dendy ? 290 : 240;
-      totalscanlines = normal_scanlines + (overclock_enabled ? extrascanlines : 0);
+      FSettings.normal_scanlines = FSettings.dendy ? SCANLINES_DENDY : SCANLINES_NORMAL;
+      FSettings.totalscanlines = FSettings.normal_scanlines + (FSettings.overclock_enabled ? FSettings.extrascanlines : 0);
 
       if (do_reinit && startup)
       {
@@ -1294,8 +1281,10 @@ static void check_variables(bool startup)
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
-      if (!strcmp(var.value, "enabled")) show_crosshair = 1;
-      else if (!strcmp(var.value, "disabled")) show_crosshair = 0;
+      if (!strcmp(var.value, "enabled"))
+         FSettings.show_crosshair = 1;
+      else if (!strcmp(var.value, "disabled"))
+         FSettings.show_crosshair = 0;
    }
 
 #ifdef PSP
@@ -1433,8 +1422,8 @@ static void check_variables(bool startup)
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
       bool newval = (!strcmp(var.value, "enabled"));
-      if (newval != swapDuty)
-         swapDuty = newval;
+      if (newval != FSettings.swapDuty)
+         FSettings.swapDuty = newval;
    }
 
    var.key = key;
@@ -2410,8 +2399,6 @@ bool retro_load_game(const struct retro_game_info *game)
 #endif
    sndquality = 0;
    sndvolume = 150;
-   swapDuty = 0;
-   dendy = 0;
    opt_region = 0;
 
    /* Wii: initialize this or else last variable is passed through
@@ -2471,7 +2458,7 @@ bool retro_load_game(const struct retro_game_info *game)
       FCEU_printf(" Loading custom palette: %s%cnes.pal\n", dir, slash);
 
    /* Save region and dendy mode for region-auto detect */
-   systemRegion = (dendy << 1) | (retro_get_region() & 1);
+   systemRegion = (FSettings.dendy << 1) | (retro_get_region() & 1);
 
    current_palette = 0;
 
diff --git a/src/fceu.c b/src/fceu.c
index de3f21b..748e7f7 100644
--- a/src/fceu.c
+++ b/src/fceu.c
@@ -341,6 +341,14 @@ int FCEUI_Initialize(void) {
 	FSettings.UsrLastSLine[0] = 231;
 	FSettings.UsrLastSLine[1] = 239;
 	FSettings.SoundVolume = 100;
+	FSettings.overclock_enabled = 0;
+	FSettings.skip_7bit_overclocking = 1;
+	FSettings.totalscanlines = 0;
+	FSettings.normal_scanlines = SCANLINES_NORMAL;
+	FSettings.extrascanlines = 0;
+	FSettings.vblankscanlines = 0;
+	FSettings.dendy = 0;
+	FSettings.swapDuty = 0;
 	FCEUPPU_Init();
 	X6502_Init();
 	return 1;
@@ -381,8 +389,6 @@ void ResetNES(void)
 	X6502_Reset();
 }
 
-int option_ramstate = 0;
-
 void FCEU_MemoryRand(uint8 *ptr, uint32 size)
 {
 	int x = 0;
@@ -397,7 +403,7 @@ void FCEU_MemoryRand(uint8 *ptr, uint32 size)
 										/* 1942 SCORE/HISCORE is screwed... */
 #endif
 		uint8_t v = 0;
-		switch (option_ramstate)
+		switch (FSettings.ramstate)
 		{
 		case 0: v = 0xff; break;
 		case 1: v = 0x00; break;
@@ -466,7 +472,7 @@ void FCEU_ResetVidSys(void)
 	else if (GameInfo->vidsys == GIV_PAL)
    {
       w = 1;
-      dendy = 0;
+      FSettings.dendy = 0;
    }
 	else
 		w = FSettings.PAL;
@@ -474,12 +480,12 @@ void FCEU_ResetVidSys(void)
 	PAL = w ? 1 : 0;
 
    if (PAL)
-      dendy = 0;
+      FSettings.dendy = 0;
 
-   normal_scanlines = dendy ? 290 : 240;
-   totalscanlines = normal_scanlines + (overclock_enabled ? extrascanlines : 0);
+   FSettings.normal_scanlines = FSettings.dendy ? SCANLINES_DENDY : SCANLINES_NORMAL;
+   FSettings.totalscanlines = FSettings.normal_scanlines + (FSettings.overclock_enabled ? FSettings.extrascanlines : 0);
 
-	FCEUPPU_SetVideoSystem(w || dendy);
+	FCEUPPU_SetVideoSystem(w || FSettings.dendy);
 	SetSoundVariables();
 }
 
@@ -517,7 +523,7 @@ void FCEUI_SetRenderedLines(int ntscf, int ntscl, int palf, int pall)
 	FSettings.UsrLastSLine[0] = ntscl;
 	FSettings.UsrFirstSLine[1] = palf;
 	FSettings.UsrLastSLine[1] = pall;
-	if (PAL || dendy)
+	if (PAL || FSettings.dendy)
    {
 		FSettings.FirstSLine = FSettings.UsrFirstSLine[1];
 		FSettings.LastSLine = FSettings.UsrLastSLine[1];
@@ -561,7 +567,7 @@ void FCEUI_SetSnapName(int a)
 
 int32 FCEUI_GetDesiredFPS(void)
 {
-	if (PAL || dendy)
+	if (PAL || FSettings.dendy)
 		return(838977920);	/* ~50.007 */
 	else
 		return(1008307711);	/* ~60.1 */
diff --git a/src/fceu.h b/src/fceu.h
index d3ec9a6..27be7a2 100644
--- a/src/fceu.h
+++ b/src/fceu.h
@@ -5,27 +5,6 @@
 
 extern int fceuindbg;
 
-/* Overclocking-related */
-extern unsigned overclock_enabled;
-extern unsigned overclocked;
-extern unsigned skip_7bit_overclocking;
-extern unsigned DMC_7bit;
-extern unsigned totalscanlines;
-extern unsigned normal_scanlines;
-extern unsigned extrascanlines;
-extern unsigned vblankscanlines;
-
-/* Region selection */
-extern unsigned dendy;
-
-/* Audio mods*/
-extern unsigned swapDuty; /* Swap bits 6 & 7 of $4000/$4004 to mimic bug
-                           * found on some famiclones/Dendy models.
-                           */
-
-extern int show_crosshair;
-extern int option_ramstate;
-
 void ResetGameLoaded(void);
 
 #define DECLFR(x) uint8 FP_FASTAPASS(1) x(uint32 A)
@@ -82,6 +61,9 @@ extern uint8 PAL;
 
 #include "driver.h"
 
+#define	SCANLINES_NORMAL 240
+#define SCANLINES_DENDY  290
+
 typedef struct {
 	int PAL;
 	int NetworkPlay;
@@ -105,6 +87,21 @@ typedef struct {
 	uint32 SndRate;
 	int soundq;
 	int lowpass;
+
+	/* PPU Overclocking */
+	int overclock_enabled;		/* 1 : enable, 0 : disable duh! */
+	int skip_7bit_overclocking;	/* 7-bit samples have priority over overclocking */
+	int extrascanlines;
+	int vblankscanlines;
+	int normal_scanlines;		/* 240 : normal, 290 : dendy */
+	int totalscanlines;
+
+	int show_crosshair;
+	int ramstate;
+	int dendy;
+	int swapDuty; /* Swap bits 6 & 7 of $4000/$4004 to mimic bug
+                           * found on some famiclones/Dendy models.
+                           */
 } FCEUS;
 
 extern FCEUS FSettings;
diff --git a/src/ines.c b/src/ines.c
index 7f807d3..ba524f3 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -1062,7 +1062,8 @@ int iNESLoad(const char *name, FCEUFILE *fp) {
 	 * 1: RP2C07 ("Licensed PAL NES")
 	 * 2: Multiple-region
 	 * 3: UMC 6527P ("Dendy") */
-	if (iNESCart.region == 3) dendy = 1;
+	if (iNESCart.region == 3)
+		FSettings.dendy = 1;
 	FCEUI_SetVidSystem((iNESCart.region == 1) ? 1 : 0);
 
 	return 1;
diff --git a/src/ppu.c b/src/ppu.c
index 45ccc7f..fdf7675 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -660,7 +660,7 @@ static void DoLine(void)
 	uint8 *target = NULL;
 	uint8 *dtarget = NULL;
 
-	if (scanline >= 240 && scanline != totalscanlines)
+	if (scanline >= 240 && scanline != FSettings.totalscanlines)
 	{
 		X6502_Run(256 + 69);
 		scanline++;
@@ -1066,7 +1066,7 @@ static void CopySprites(uint8 *target) {
 
 void FCEUPPU_SetVideoSystem(int w) {
 	if (w) {
-		scanlines_per_frame = dendy ? 262 : 312;
+		scanlines_per_frame = FSettings.dendy ? 262 : 312;
 		FSettings.FirstSLine = FSettings.UsrFirstSLine[1];
 		FSettings.LastSLine = FSettings.UsrLastSLine[1];
 	} else {
@@ -1166,11 +1166,11 @@ int FCEUPPU_Loop(int skip) {
 				TriggerNMI();
 		}
 		X6502_Run((scanlines_per_frame - 242) * (256 + 85) - 12);
-		if (overclock_enabled && vblankscanlines) {
-			if (!DMC_7bit || !skip_7bit_overclocking) {
-				overclocked = 1;
-				X6502_Run(vblankscanlines * (256 + 85) - 12);
-				overclocked = 0;
+		if (FSettings.overclock_enabled && FSettings.vblankscanlines) {
+			if (!DMC_7bit || !FSettings.skip_7bit_overclocking) {
+				overclocking = 1;
+				X6502_Run(FSettings.vblankscanlines * (256 + 85) - 12);
+				overclocking = 0;
 			}
 		}
 		PPU_status &= 0x1f;
@@ -1203,7 +1203,7 @@ int FCEUPPU_Loop(int skip) {
 			kook ^= 1;
 		}
 		if (GameInfo->type == GIT_NSF)
-			X6502_Run((256 + 85) * normal_scanlines);
+			X6502_Run((256 + 85) * FSettings.normal_scanlines);
 		#ifdef FRAMESKIP
 		else if (skip) {
 			int y;
@@ -1234,21 +1234,21 @@ int FCEUPPU_Loop(int skip) {
 			deemp = PPU[1] >> 5;
 
          /* manual samples can't play correctly with overclocking */
-			if (DMC_7bit && skip_7bit_overclocking)
-				totalscanlines = normal_scanlines;
+			if (DMC_7bit && FSettings.skip_7bit_overclocking)
+				FSettings.totalscanlines = FSettings.normal_scanlines;
 			else
-				totalscanlines = normal_scanlines + (overclock_enabled ? extrascanlines : 0);
+				FSettings.totalscanlines = FSettings.normal_scanlines + (FSettings.overclock_enabled ? FSettings.extrascanlines : 0);
 
-			for (scanline = 0; scanline < totalscanlines; ) {	/* scanline is incremented in  DoLine.  Evil. :/ */
+			for (scanline = 0; scanline < FSettings.totalscanlines; ) {	/* scanline is incremented in  DoLine.  Evil. :/ */
 				deempcnt[deemp]++;
 				/* if ((PPUViewer) && (scanline == PPUViewScanline)) UpdatePPUView(1); */
 				DoLine();
-				if (scanline < normal_scanlines || scanline == totalscanlines)
-					overclocked = 0;
+				if (scanline < FSettings.normal_scanlines || scanline == FSettings.totalscanlines)
+					overclocking = 0;
 				else {
-					if (DMC_7bit && skip_7bit_overclocking) /* 7bit sample started after 240th line */
+					if (DMC_7bit && FSettings.skip_7bit_overclocking) /* 7bit sample started after 240th line */
 						break;
-					overclocked = 1;
+					overclocking = 1;
 				}
 			}
 
diff --git a/src/sound.c b/src/sound.c
index a483d16..a72f93a 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -61,7 +61,7 @@ typedef struct {
 	int reloaddec;
 } ENVUNIT;
 
-unsigned DMC_7bit = 0; /* used to skip overclocking */
+uint32 DMC_7bit = 0; /* used to skip overclocking */
 static ENVUNIT EnvUnits[3];
 
 static const int RectDuties[4] = { 1, 2, 4, 6 };
@@ -195,7 +195,7 @@ static DECLFW(Write_PSG) {
 		DoSQ1();
 		EnvUnits[0].Mode = (V & 0x30) >> 4;
 		EnvUnits[0].Speed = (V & 0xF);
-		if (swapDuty)
+		if (FSettings.swapDuty)
 			V = (V & 0x3F) | ((V & 0x80) >> 1) | ((V & 0x40) << 1);
 		break;
 	case 0x1:
@@ -216,7 +216,7 @@ static DECLFW(Write_PSG) {
 		DoSQ2();
 		EnvUnits[1].Mode = (V & 0x30) >> 4;
 		EnvUnits[1].Speed = (V & 0xF);
-		if (swapDuty)
+		if (FSettings.swapDuty)
 			V = (V & 0x3F) | ((V & 0x80) >> 1) | ((V & 0x40) << 1);
 		break;
 	case 0x5:
diff --git a/src/sound.h b/src/sound.h
index c4413cc..d10a56a 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -50,6 +50,7 @@ extern int32 Wave[2048 + 512];
 extern int32 WaveFinal[2048 + 512];
 extern int32 WaveHi[];
 extern uint32 soundtsinc;
+extern uint32 DMC_7bit;
 
 extern uint32 soundtsoffs;
 #define SOUNDTS (sound_timestamp + soundtsoffs)
diff --git a/src/video.c b/src/video.c
index 0017fc1..d54be19 100644
--- a/src/video.c
+++ b/src/video.c
@@ -37,7 +37,6 @@
 
 uint8 *XBuf = NULL;
 uint8 *XDBuf = NULL;
-int show_crosshair = 0;
 
 void FCEU_KillVirtualVideo(void)
 {
@@ -53,15 +52,15 @@ int FCEU_InitVirtualVideo(void)
 {
    /* 256 bytes per scanline, * 240 scanline maximum, +8 for alignment, */
    if (!XBuf)
-      XBuf = (uint8*)(FCEU_malloc(256 * (256 + extrascanlines + 8)));
+      XBuf = (uint8*)(FCEU_malloc(256 * (256 + FSettings.extrascanlines + 8)));
    if (!XDBuf)
-      XDBuf = (uint8*)(FCEU_malloc(256 * (256 + extrascanlines + 8)));
+      XDBuf = (uint8*)(FCEU_malloc(256 * (256 + FSettings.extrascanlines + 8)));
 
    if (!XBuf || !XDBuf)
       return 0;
 
-   memset(XBuf, 128, 256 * (256 + extrascanlines + 8));
-   memset(XDBuf, 128, 256 * (256 + extrascanlines + 8));
+   memset(XBuf, 128, 256 * (256 + FSettings.extrascanlines + 8));
+   memset(XDBuf, 128, 256 * (256 + FSettings.extrascanlines + 8));
    return 1;
 }
 
@@ -82,7 +81,7 @@ void FCEU_PutImage(void)
 			FCEU_VSUniDraw(XBuf);
 	}
 	if (howlong) howlong--;
-	if (show_crosshair)
+	if (FSettings.show_crosshair)
 		FCEU_DrawInput(XBuf);
 }
 
diff --git a/src/video.h b/src/video.h
index 9eef95b..b98a419 100644
--- a/src/video.h
+++ b/src/video.h
@@ -6,7 +6,6 @@ void FCEU_KillVirtualVideo(void);
 int SaveSnapshot(void);
 extern uint8 *XBuf;
 extern uint8 *XDBuf;
-extern int show_crosshair;
 void FCEU_DrawNumberRow(uint8 *XBuf, int *nstatus, int cur);
 
 #endif
diff --git a/src/x6502.c b/src/x6502.c
index b8bf2d9..0d00377 100644
--- a/src/x6502.c
+++ b/src/x6502.c
@@ -34,6 +34,7 @@ void (*X6502_Run)(int32 cycles);
 
 uint32 timestamp;
 uint32 sound_timestamp;
+uint32 overclocking = 0;
 void FP_FASTAPASS(1) (*MapIRQHook)(int a);
 
 #define _PC        X.PC
@@ -54,7 +55,7 @@ void FP_FASTAPASS(1) (*MapIRQHook)(int a);
 	_tcount += __x;									\
 	_count -= __x * 48;								\
 	timestamp += __x;  \
-	if (!overclocked) sound_timestamp +=  __x; \
+	if (!overclocking) sound_timestamp +=  __x; \
 }
 
 static INLINE uint8 RdMemNorm(uint32 A) {
@@ -516,7 +517,7 @@ static void X6502_RunDebug(int32 cycles) {
 		_tcount = 0;
 		if (MapIRQHook) MapIRQHook(temp);
 
-      if (!overclocked)
+      if (!overclocking)
          FCEU_SoundCPUHook(temp);
 
 		_PC++;
@@ -613,7 +614,7 @@ void X6502_Run(int32 cycles)
 		temp = _tcount;
 		_tcount = 0;
 		if (MapIRQHook) MapIRQHook(temp);
-		if (!overclocked)
+		if (!overclocking)
 			FCEU_SoundCPUHook(temp);
 		X.PC = pbackus;
 		_PC++;
diff --git a/src/x6502.h b/src/x6502.h
index f480544..d9d8b65 100644
--- a/src/x6502.h
+++ b/src/x6502.h
@@ -35,6 +35,7 @@ void X6502_Run(int32 cycles);
 
 extern uint32 timestamp;
 extern uint32 sound_timestamp;
+extern uint32 overclocking;
 extern X6502 X;
 
 #define N_FLAG  0x80
@@ -48,7 +49,7 @@ extern X6502 X;
 
 extern void FP_FASTAPASS(1) (*MapIRQHook)(int a);
 
-#define NTSC_CPU (dendy ? 1773447.467 : 1789772.7272727272727272)
+#define NTSC_CPU (FSettings.dendy ? 1773447.467 : 1789772.7272727272727272)
 #define PAL_CPU  1662607.125
 
 #define FCEU_IQEXT      0x001

From f6cc87a8fa0f01a13376de13659a9ee2225d81e1 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Thu, 3 Jun 2021 10:50:22 +0800
Subject: [PATCH 120/295] Move overclock-related variables to ppu instead

Just makes more sense since overclocking is ppu-based.
---
 src/drivers/libretro/libretro.c | 30 +++++++++++++++---------------
 src/fceu.c                      | 16 ++++++++--------
 src/fceu.h                      |  8 --------
 src/ppu.c                       | 24 +++++++++++++-----------
 src/ppu.h                       | 12 ++++++++++++
 src/video.c                     |  8 ++++----
 6 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 43a4d33..a83f842 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -1223,33 +1223,33 @@ static void check_variables(bool startup)
       bool do_reinit = false;
 
       if (!strcmp(var.value, "disabled")
-            && FSettings.overclock_enabled != 0)
+            && ppu.overclock_enabled != 0)
       {
-         FSettings.skip_7bit_overclocking = 1;
-         FSettings.extrascanlines         = 0;
-         FSettings.vblankscanlines        = 0;
-         FSettings.overclock_enabled      = 0;
+         ppu.skip_7bit_overclocking = 1;
+         ppu.extrascanlines         = 0;
+         ppu.vblankscanlines        = 0;
+         ppu.overclock_enabled      = 0;
          do_reinit              = true;
       }
       else if (!strcmp(var.value, "2x-Postrender"))
       {
-         FSettings.skip_7bit_overclocking = 1;
-         FSettings.extrascanlines         = 266;
-         FSettings.vblankscanlines        = 0;
-         FSettings.overclock_enabled      = 1;
+         ppu.skip_7bit_overclocking = 1;
+         ppu.extrascanlines         = 266;
+         ppu.vblankscanlines        = 0;
+         ppu.overclock_enabled      = 1;
          do_reinit              = true;
       }
       else if (!strcmp(var.value, "2x-VBlank"))
       {
-         FSettings.skip_7bit_overclocking = 1;
-         FSettings.extrascanlines         = 0;
-         FSettings.vblankscanlines        = 266;
-         FSettings.overclock_enabled      = 1;
+         ppu.skip_7bit_overclocking = 1;
+         ppu.extrascanlines         = 0;
+         ppu.vblankscanlines        = 266;
+         ppu.overclock_enabled      = 1;
          do_reinit              = true;
       }
 
-      FSettings.normal_scanlines = FSettings.dendy ? SCANLINES_DENDY : SCANLINES_NORMAL;
-      FSettings.totalscanlines = FSettings.normal_scanlines + (FSettings.overclock_enabled ? FSettings.extrascanlines : 0);
+      ppu.normal_scanlines = FSettings.dendy ? SCANLINES_DENDY : SCANLINES_NORMAL;
+      ppu.totalscanlines = ppu.normal_scanlines + (ppu.overclock_enabled ? ppu.extrascanlines : 0);
 
       if (do_reinit && startup)
       {
diff --git a/src/fceu.c b/src/fceu.c
index 748e7f7..7977e5c 100644
--- a/src/fceu.c
+++ b/src/fceu.c
@@ -341,14 +341,14 @@ int FCEUI_Initialize(void) {
 	FSettings.UsrLastSLine[0] = 231;
 	FSettings.UsrLastSLine[1] = 239;
 	FSettings.SoundVolume = 100;
-	FSettings.overclock_enabled = 0;
-	FSettings.skip_7bit_overclocking = 1;
-	FSettings.totalscanlines = 0;
-	FSettings.normal_scanlines = SCANLINES_NORMAL;
-	FSettings.extrascanlines = 0;
-	FSettings.vblankscanlines = 0;
 	FSettings.dendy = 0;
 	FSettings.swapDuty = 0;
+	ppu.overclock_enabled = 0;
+	ppu.skip_7bit_overclocking = 1;
+	ppu.totalscanlines = 0;
+	ppu.normal_scanlines = SCANLINES_NORMAL;
+	ppu.extrascanlines = 0;
+	ppu.vblankscanlines = 0;
 	FCEUPPU_Init();
 	X6502_Init();
 	return 1;
@@ -482,8 +482,8 @@ void FCEU_ResetVidSys(void)
    if (PAL)
       FSettings.dendy = 0;
 
-   FSettings.normal_scanlines = FSettings.dendy ? SCANLINES_DENDY : SCANLINES_NORMAL;
-   FSettings.totalscanlines = FSettings.normal_scanlines + (FSettings.overclock_enabled ? FSettings.extrascanlines : 0);
+   ppu.normal_scanlines = FSettings.dendy ? SCANLINES_DENDY : SCANLINES_NORMAL;
+   ppu.totalscanlines = ppu.normal_scanlines + (ppu.overclock_enabled ? ppu.extrascanlines : 0);
 
 	FCEUPPU_SetVideoSystem(w || FSettings.dendy);
 	SetSoundVariables();
diff --git a/src/fceu.h b/src/fceu.h
index 27be7a2..4756bda 100644
--- a/src/fceu.h
+++ b/src/fceu.h
@@ -88,14 +88,6 @@ typedef struct {
 	int soundq;
 	int lowpass;
 
-	/* PPU Overclocking */
-	int overclock_enabled;		/* 1 : enable, 0 : disable duh! */
-	int skip_7bit_overclocking;	/* 7-bit samples have priority over overclocking */
-	int extrascanlines;
-	int vblankscanlines;
-	int normal_scanlines;		/* 240 : normal, 290 : dendy */
-	int totalscanlines;
-
 	int show_crosshair;
 	int ramstate;
 	int dendy;
diff --git a/src/ppu.c b/src/ppu.c
index fdf7675..ca4ea73 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -64,6 +64,8 @@ static uint32 ppulut1[256];
 static uint32 ppulut2[256];
 static uint32 ppulut3[128];
 
+FCEU_PPU ppu;
+
 static void makeppulut(void) {
 	int x;
 	int y;
@@ -660,7 +662,7 @@ static void DoLine(void)
 	uint8 *target = NULL;
 	uint8 *dtarget = NULL;
 
-	if (scanline >= 240 && scanline != FSettings.totalscanlines)
+	if (scanline >= 240 && scanline != ppu.totalscanlines)
 	{
 		X6502_Run(256 + 69);
 		scanline++;
@@ -1166,10 +1168,10 @@ int FCEUPPU_Loop(int skip) {
 				TriggerNMI();
 		}
 		X6502_Run((scanlines_per_frame - 242) * (256 + 85) - 12);
-		if (FSettings.overclock_enabled && FSettings.vblankscanlines) {
-			if (!DMC_7bit || !FSettings.skip_7bit_overclocking) {
+		if (ppu.overclock_enabled && ppu.vblankscanlines) {
+			if (!DMC_7bit || !ppu.skip_7bit_overclocking) {
 				overclocking = 1;
-				X6502_Run(FSettings.vblankscanlines * (256 + 85) - 12);
+				X6502_Run(ppu.vblankscanlines * (256 + 85) - 12);
 				overclocking = 0;
 			}
 		}
@@ -1203,7 +1205,7 @@ int FCEUPPU_Loop(int skip) {
 			kook ^= 1;
 		}
 		if (GameInfo->type == GIT_NSF)
-			X6502_Run((256 + 85) * FSettings.normal_scanlines);
+			X6502_Run((256 + 85) * ppu.normal_scanlines);
 		#ifdef FRAMESKIP
 		else if (skip) {
 			int y;
@@ -1234,19 +1236,19 @@ int FCEUPPU_Loop(int skip) {
 			deemp = PPU[1] >> 5;
 
          /* manual samples can't play correctly with overclocking */
-			if (DMC_7bit && FSettings.skip_7bit_overclocking)
-				FSettings.totalscanlines = FSettings.normal_scanlines;
+			if (DMC_7bit && ppu.skip_7bit_overclocking)
+				ppu.totalscanlines = ppu.normal_scanlines;
 			else
-				FSettings.totalscanlines = FSettings.normal_scanlines + (FSettings.overclock_enabled ? FSettings.extrascanlines : 0);
+				ppu.totalscanlines = ppu.normal_scanlines + (ppu.overclock_enabled ? ppu.extrascanlines : 0);
 
-			for (scanline = 0; scanline < FSettings.totalscanlines; ) {	/* scanline is incremented in  DoLine.  Evil. :/ */
+			for (scanline = 0; scanline < ppu.totalscanlines; ) {	/* scanline is incremented in  DoLine.  Evil. :/ */
 				deempcnt[deemp]++;
 				/* if ((PPUViewer) && (scanline == PPUViewScanline)) UpdatePPUView(1); */
 				DoLine();
-				if (scanline < FSettings.normal_scanlines || scanline == FSettings.totalscanlines)
+				if (scanline < ppu.normal_scanlines || scanline == ppu.totalscanlines)
 					overclocking = 0;
 				else {
-					if (DMC_7bit && FSettings.skip_7bit_overclocking) /* 7bit sample started after 240th line */
+					if (DMC_7bit && ppu.skip_7bit_overclocking) /* 7bit sample started after 240th line */
 						break;
 					overclocking = 1;
 				}
diff --git a/src/ppu.h b/src/ppu.h
index d9cfcec..829de71 100644
--- a/src/ppu.h
+++ b/src/ppu.h
@@ -1,6 +1,18 @@
 #ifndef _FCEU_PPU_H
 #define _FCEU_PPU_H
 
+typedef struct {
+    /* PPU Overclocking */
+	int overclock_enabled;		/* 1 : enable, 0 : disable duh! */
+	int skip_7bit_overclocking;	/* 7-bit samples have priority over overclocking */
+	int extrascanlines;
+	int vblankscanlines;
+	int normal_scanlines;		/* 240 : normal, 290 : dendy */
+	int totalscanlines;
+} FCEU_PPU;
+
+extern FCEU_PPU ppu;
+
 void FCEUPPU_Init(void);
 void FCEUPPU_Reset(void);
 void FCEUPPU_Power(void);
diff --git a/src/video.c b/src/video.c
index d54be19..80da854 100644
--- a/src/video.c
+++ b/src/video.c
@@ -52,15 +52,15 @@ int FCEU_InitVirtualVideo(void)
 {
    /* 256 bytes per scanline, * 240 scanline maximum, +8 for alignment, */
    if (!XBuf)
-      XBuf = (uint8*)(FCEU_malloc(256 * (256 + FSettings.extrascanlines + 8)));
+      XBuf = (uint8*)(FCEU_malloc(256 * (256 + ppu.extrascanlines + 8)));
    if (!XDBuf)
-      XDBuf = (uint8*)(FCEU_malloc(256 * (256 + FSettings.extrascanlines + 8)));
+      XDBuf = (uint8*)(FCEU_malloc(256 * (256 + ppu.extrascanlines + 8)));
 
    if (!XBuf || !XDBuf)
       return 0;
 
-   memset(XBuf, 128, 256 * (256 + FSettings.extrascanlines + 8));
-   memset(XDBuf, 128, 256 * (256 + FSettings.extrascanlines + 8));
+   memset(XBuf, 128, 256 * (256 + ppu.extrascanlines + 8));
+   memset(XDBuf, 128, 256 * (256 + ppu.extrascanlines + 8));
    return 1;
 }
 

From e75d6be00be76ace1d91012157d4a30741942ee7 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Thu, 3 Jun 2021 13:30:16 +0800
Subject: [PATCH 121/295] Remove ununsed, commented code

---
 src/drivers/libretro/libretro.c | 2 --
 src/ppu.c                       | 1 -
 src/ppuview.h                   | 2 --
 3 files changed, 5 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index a83f842..d14facc 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -171,8 +171,6 @@ static unsigned serialize_size;
 
 /* emulator-specific callback functions */
 
-void UpdatePPUView(int refreshchr) { }
-
 const char * GetKeyboard(void)
 {
    return "";
diff --git a/src/ppu.c b/src/ppu.c
index ca4ea73..abb24c3 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -1243,7 +1243,6 @@ int FCEUPPU_Loop(int skip) {
 
 			for (scanline = 0; scanline < ppu.totalscanlines; ) {	/* scanline is incremented in  DoLine.  Evil. :/ */
 				deempcnt[deemp]++;
-				/* if ((PPUViewer) && (scanline == PPUViewScanline)) UpdatePPUView(1); */
 				DoLine();
 				if (scanline < ppu.normal_scanlines || scanline == ppu.totalscanlines)
 					overclocking = 0;
diff --git a/src/ppuview.h b/src/ppuview.h
index 740a183..7a3633c 100644
--- a/src/ppuview.h
+++ b/src/ppuview.h
@@ -1,8 +1,6 @@
 #ifndef _FCEU_PPUVIEW_H
 #define _FCEU_PPUVIEW_H
 
-extern int PPUViewScanline;
-extern int PPUViewer;
 extern int scanline;
 
 void PPUViewDoBlit();

From 85d5c87d3d18a728281087bdf407c78f3f0763cd Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 4 Jun 2021 21:01:19 +0200
Subject: [PATCH 122/295] - Simplify MakeMemWrapBuffer - FCEUI_LoadGame -
 UNIFLoad and FDSLoad never use 'name' so pass NULL here

---
 src/fceu.c |  6 ++----
 src/file.c | 10 +++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/fceu.c b/src/fceu.c
index de3f21b..0d471b9 100644
--- a/src/fceu.c
+++ b/src/fceu.c
@@ -244,8 +244,6 @@ FCEUGI *FCEUI_LoadGame(const char *name, uint8_t *databuf, size_t databufsize)
    GameInfo->inputfc = -1;
    GameInfo->cspecial = 0;
 
-   FCEU_printf("Loading %s...\n\n", name);
-
    GetFileBase(name);
 
    fp = FCEU_fopen(name, NULL, "rb", 0, databuf, databufsize);
@@ -259,9 +257,9 @@ FCEUGI *FCEUI_LoadGame(const char *name, uint8_t *databuf, size_t databufsize)
       goto endlseq;
    if (NSFLoad(fp))
       goto endlseq;
-   if (UNIFLoad(name, fp))
+   if (UNIFLoad(NULL, fp))
       goto endlseq;
-   if (FDSLoad(name, fp))
+   if (FDSLoad(NULL, fp))
       goto endlseq;
 
    FCEU_PrintError("An error occurred while loading the file.\n");
diff --git a/src/file.c b/src/file.c
index 07da9f8..fc05ea1 100644
--- a/src/file.c
+++ b/src/file.c
@@ -63,7 +63,7 @@ doret:
    return tmp;
 }
 
-static MEMWRAP *MakeMemWrapBuffer(const char *tz, int type, uint8 *buffer, size_t bufsize)
+static MEMWRAP *MakeMemWrapBuffer(uint8 *buffer, size_t bufsize)
 {
    MEMWRAP *tmp = (MEMWRAP*)FCEU_malloc(sizeof(MEMWRAP));
 
@@ -71,8 +71,8 @@ static MEMWRAP *MakeMemWrapBuffer(const char *tz, int type, uint8 *buffer, size_
       return NULL;
 
    tmp->location = 0;
-   tmp->size = bufsize;
-   tmp->data = buffer;
+   tmp->size     = bufsize;
+   tmp->data     = buffer;
 
    return tmp;
 }
@@ -82,9 +82,9 @@ FCEUFILE * FCEU_fopen(const char *path, const char *ipsfn,
 {
    FCEUFILE *fceufp = (FCEUFILE*)malloc(sizeof(FCEUFILE));
 
-   fceufp->type = 0;
+   fceufp->type  = 0;
    if (buffer)
-      fceufp->fp = MakeMemWrapBuffer(path, 0, buffer, bufsize);
+      fceufp->fp = MakeMemWrapBuffer(buffer, bufsize);
    else
    {
       void *t = fopen_utf8(path, mode);

From 6f8be4ceddc6ad3c139a780b451000cdf2435572 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sat, 5 Jun 2021 08:26:37 +0800
Subject: [PATCH 123/295] Simplify palette core options

Fetch names from palette struct instead.
---
 src/drivers/libretro/libretro.c | 54 +++++++++++----------------------
 1 file changed, 17 insertions(+), 37 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index d14facc..7ff7dcb 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -273,11 +273,6 @@ FILE *FCEUD_UTF8fopen(const char *n, const char *m)
 }
 
 /*palette for FCEU*/
-#define PAL_TOTAL   16 /* total no. of palettes in palettes[] */
-#define PAL_DEFAULT (PAL_TOTAL + 1)
-#define PAL_RAW     (PAL_TOTAL + 2)
-#define PAL_CUSTOM  (PAL_TOTAL + 3)
-
 static int external_palette_exist = 0;
 
 /* table for currently loaded palette */
@@ -580,6 +575,11 @@ struct st_palettes palettes[] = {
    }
 };
 
+#define PAL_TOTAL   (sizeof(palettes) / sizeof(palettes[0])) /* total palettes in table */
+#define PAL_DEFAULT (PAL_TOTAL + 1)
+#define PAL_RAW     (PAL_TOTAL + 2)
+#define PAL_CUSTOM  (PAL_TOTAL + 3)
+
 #ifdef HAVE_NTSC_FILTER
 /* ntsc */
 #include "nes_ntsc.h"
@@ -1159,38 +1159,18 @@ static void check_variables(bool startup)
          current_palette = PAL_RAW;
       else if (!strcmp(var.value, "custom"))
          current_palette = PAL_CUSTOM;
-      else if (!strcmp(var.value, "asqrealc"))
-         current_palette = 0;
-      else if (!strcmp(var.value, "nintendo-vc"))
-         current_palette = 1;
-      else if (!strcmp(var.value, "rgb"))
-         current_palette = 2;
-      else if (!strcmp(var.value, "yuv-v3"))
-         current_palette = 3;
-      else if (!strcmp(var.value, "unsaturated-final"))
-         current_palette = 4;
-      else if (!strcmp(var.value, "sony-cxa2025as-us"))
-         current_palette = 5;
-      else if (!strcmp(var.value, "pal"))
-         current_palette = 6;
-      else if (!strcmp(var.value, "bmf-final2"))
-         current_palette = 7;
-      else if (!strcmp(var.value, "bmf-final3"))
-         current_palette = 8;
-      else if (!strcmp(var.value, "smooth-fbx"))
-         current_palette = 9;
-      else if (!strcmp(var.value, "composite-direct-fbx"))
-         current_palette = 10;
-      else if (!strcmp(var.value, "pvm-style-d93-fbx"))
-         current_palette = 11;
-      else if (!strcmp(var.value, "ntsc-hardware-fbx"))
-         current_palette = 12;
-      else if (!strcmp(var.value, "nes-classic-fbx-fs"))
-         current_palette = 13;
-      else if (!strcmp(var.value, "nescap"))
-         current_palette = 14;
-      else if (!strcmp(var.value, "wavebeam"))
-         current_palette = 15;
+      else
+      {
+         unsigned i;
+         for (i = 0; i < PAL_TOTAL; i++)
+         {
+            if (!strcmp(var.value, palettes[i].name))
+            {
+               current_palette = i;
+               break;
+            }
+         }
+      }
 
       if (current_palette != orig_value)
       {

From 001e3a24284484af96cd11451197dace7b295806 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sat, 5 Jun 2021 08:39:47 +0800
Subject: [PATCH 124/295] Remove this (remnants of ppuview)

---
 src/ppu.c     |  1 -
 src/ppuview.h | 11 -----------
 2 files changed, 12 deletions(-)
 delete mode 100644 src/ppuview.h

diff --git a/src/ppu.c b/src/ppu.c
index abb24c3..b6ae1c5 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -32,7 +32,6 @@
 #include        "general.h"
 #include        "fceu-endian.h"
 #include        "fceu-memory.h"
-#include        "ppuview.h"
 
 #include        "cart.h"
 #include        "palette.h"
diff --git a/src/ppuview.h b/src/ppuview.h
deleted file mode 100644
index 7a3633c..0000000
--- a/src/ppuview.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _FCEU_PPUVIEW_H
-#define _FCEU_PPUVIEW_H
-
-extern int scanline;
-
-void PPUViewDoBlit();
-void DoPPUView();
-void UpdatePPUView(int refreshchr);
-
-
-#endif

From cbc17a077bc84cb302475c843ba546b59ceb3a35 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 5 Jun 2021 14:55:17 +0200
Subject: [PATCH 125/295] iNESLoad - some code is not used except for printing
 some information, stub it out with DEBUG ifdefs

---
 src/ines.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/ines.c b/src/ines.c
index ba524f3..0c92e30 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -854,10 +854,12 @@ static void rom_load_ines2(void) {
 int iNESLoad(const char *name, FCEUFILE *fp) {
 	const char *tv_region[] = { "NTSC", "PAL", "Multi-region", "Dendy" };
 	struct md5_context md5;
+#ifdef DEBUG
 	char* mappername        = NULL;
+	uint32 mappertest       = 0;
+#endif
 	uint64 filesize         = FCEU_fgetsize(fp);
 	uint64 romSize          = 0;
-	uint32 mappertest       = 0;
 	/* used for malloc and cart mapping */
 	uint32 rom_size_pow2    = 0;
 	uint32 vrom_size_pow2   = 0;
@@ -949,6 +951,7 @@ int iNESLoad(const char *name, FCEUFILE *fp) {
 
 	memcpy(&GameInfo->MD5, &iNESCart.MD5, sizeof(iNESCart.MD5));
 
+#ifdef DEBUG
 	mappername = "Not Listed";
 
 	for (mappertest = 0; mappertest < (sizeof bmap / sizeof bmap[0]) - 1; mappertest++) {
@@ -957,6 +960,7 @@ int iNESLoad(const char *name, FCEUFILE *fp) {
 			break;
 		}
 	}
+#endif
 
 	if (iNESCart.iNES2 == 0) {
 		if (strstr(name, "(E)") || strstr(name, "(e)") ||
@@ -974,6 +978,7 @@ int iNESLoad(const char *name, FCEUFILE *fp) {
 		}
 	}
 
+#ifdef DEBUG
 	FCEU_printf(" PRG-ROM CRC32:  0x%08X\n", iNESCart.PRGCRC32);
 	FCEU_printf(" PRG+CHR CRC32:  0x%08X\n", iNESCart.CRC32);
 	FCEU_printf(" PRG+CHR MD5:    0x%s\n", md5_asciistr(iNESCart.MD5));
@@ -985,6 +990,7 @@ int iNESLoad(const char *name, FCEUFILE *fp) {
 	FCEU_printf(" Battery: %s\n", (head.ROM_type & 2) ? "Yes" : "No");
 	FCEU_printf(" System: %s\n", tv_region[iNESCart.region]);
 	FCEU_printf(" Trained: %s\n", (head.ROM_type & 4) ? "Yes" : "No");
+#endif
 
 	if (iNESCart.iNES2) {
 		unsigned PRGRAM = iNESCart.PRGRamSize + iNESCart.PRGRamSaveSize;
@@ -1017,9 +1023,8 @@ int iNESLoad(const char *name, FCEUFILE *fp) {
 		int mapper    = iNESCart.mapper;
 		int mirroring = iNESCart.mirror;
 
-		for (x = 0; x < 8; x++) {
+		for (x = 0; x < 8; x++)
 			partialmd5 |= (uint64)iNESCart.MD5[7 - x] << (x * 8);
-		}
 
 		FCEU_VSUniCheck(partialmd5, &mapper, &mirroring);
 

From aa4615c41714b43dfe71831760494e1ce51d8597 Mon Sep 17 00:00:00 2001
From: Autechre <libretro@gmail.com>
Date: Sat, 5 Jun 2021 15:05:07 +0200
Subject: [PATCH 126/295] Revert "some cleanups"

---
 Makefile.libretro               |   4 +-
 src/cart.h                      |   3 -
 src/drivers/libretro/libretro.c | 143 ++++++++++++++++++++++----------
 src/fceu.c                      |  26 +++---
 src/fceu.h                      |  28 ++++---
 src/ines.c                      |   3 +-
 src/input.h                     |   2 -
 src/ppu.c                       |  36 ++++----
 src/ppu.h                       |  14 ----
 src/ppuview.h                   |  13 +++
 src/sound.c                     |   6 +-
 src/sound.h                     |   1 -
 src/video.c                     |  11 +--
 src/video.h                     |   1 +
 src/x6502.c                     |   7 +-
 src/x6502.h                     |   3 +-
 16 files changed, 174 insertions(+), 127 deletions(-)
 create mode 100644 src/ppuview.h

diff --git a/Makefile.libretro b/Makefile.libretro
index 2387bed..86563b0 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -752,8 +752,8 @@ else
 WARNING_DEFINES = -Wno-write-strings
 endif
 
-CFLAGS += $(fpic) $(WARNING_DEFINES) $(DEFINES) $(ENDIANNESS_DEFINES) -Werror=implicit-function-declaration
-LDFLAGS += $(LIBM) -Werror=implicit-function-declaration
+CFLAGS += $(fpic) $(WARNING_DEFINES) $(DEFINES) $(ENDIANNESS_DEFINES) 
+LDFLAGS += $(LIBM)
 
 ifeq ($(platform), psp1)
 	INCFLAGS += -I$(shell psp-config --pspsdk-path)/include
diff --git a/src/cart.h b/src/cart.h
index cd05d4b..4573403 100644
--- a/src/cart.h
+++ b/src/cart.h
@@ -104,7 +104,4 @@ void FCEU_OpenGenie(void);
 void FCEU_CloseGenie(void);
 void FCEU_KillGenie(void);
 
-extern CartInfo iNESCart;
-extern CartInfo UNIFCart;
-
 #endif
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 7ff7dcb..39263fc 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -67,6 +67,8 @@ void linearFree(void* mem);
 RETRO_HW_RENDER_INTEFACE_GSKIT_PS2 *ps2 = NULL;
 #endif
 
+extern void FCEU_ZapperSetTolerance(int t);
+
 static retro_video_refresh_t video_cb = NULL;
 static retro_input_poll_t poll_cb = NULL;
 static retro_input_state_t input_cb = NULL;
@@ -93,7 +95,7 @@ static int aspect_ratio_par;
 
 #define MAX_BUTTONS 8
 #define TURBO_BUTTONS 2
-unsigned turbo_button_toggle[MAX_PLAYERS][TURBO_BUTTONS] = { {0} };
+unsigned char turbo_button_toggle[MAX_PLAYERS][TURBO_BUTTONS] = { {0} };
 
 typedef struct
 {
@@ -143,11 +145,27 @@ static bool libretro_supports_bitmasks = false;
 
 const size_t PPU_BIT = 1ULL << 31ULL;
 
+extern uint8 NTARAM[0x800], PALRAM[0x20], SPRAM[0x100], PPU[4];
+
+/* overclock the console by adding dummy scanlines to PPU loop
+ * disables DMC DMA and WaveHi filling for these dummies
+ * doesn't work with new PPU */
+unsigned overclock_enabled = -1;
+unsigned overclocked = 0;
+unsigned skip_7bit_overclocking = 1; /* 7-bit samples have priority over overclocking */
+unsigned totalscanlines = 0;
+unsigned normal_scanlines = 240;
+unsigned extrascanlines = 0;
+unsigned vblankscanlines = 0;
+unsigned dendy = 0;
+
 static unsigned systemRegion = 0;
 static unsigned opt_region = 0;
 static unsigned opt_showAdvSoundOptions = 0;
 static unsigned opt_showAdvSystemOptions = 0;
 
+int FCEUnetplay;
+
 #if defined(PSP) || defined(PS2)
 static __attribute__((aligned(16))) uint16_t retro_palette[256];
 #else
@@ -163,14 +181,28 @@ static uint16_t* fceu_video_out;
 static unsigned sndsamplerate;
 static unsigned sndquality;
 static unsigned sndvolume;
+unsigned swapDuty;
 
 static int32_t *sound = 0;
 static uint32_t Dummy = 0;
 static uint32_t current_palette = 0;
 static unsigned serialize_size;
 
+int PPUViewScanline=0;
+int PPUViewer=0;
+
+/* extern forward decls.*/
+extern FCEUGI *GameInfo;
+extern uint8 *XBuf;
+extern CartInfo iNESCart;
+extern CartInfo UNIFCart;
+extern int show_crosshair;
+extern int option_ramstate;
+
 /* emulator-specific callback functions */
 
+void UpdatePPUView(int refreshchr) { }
+
 const char * GetKeyboard(void)
 {
    return "";
@@ -273,7 +305,13 @@ FILE *FCEUD_UTF8fopen(const char *n, const char *m)
 }
 
 /*palette for FCEU*/
+#define PAL_TOTAL   16 /* total no. of palettes in palettes[] */
+#define PAL_DEFAULT (PAL_TOTAL + 1)
+#define PAL_RAW     (PAL_TOTAL + 2)
+#define PAL_CUSTOM  (PAL_TOTAL + 3)
+
 static int external_palette_exist = 0;
+extern int ipalette;
 
 /* table for currently loaded palette */
 static uint8_t base_palette[192];
@@ -575,11 +613,6 @@ struct st_palettes palettes[] = {
    }
 };
 
-#define PAL_TOTAL   (sizeof(palettes) / sizeof(palettes[0])) /* total palettes in table */
-#define PAL_DEFAULT (PAL_TOTAL + 1)
-#define PAL_RAW     (PAL_TOTAL + 2)
-#define PAL_CUSTOM  (PAL_TOTAL + 3)
-
 #ifdef HAVE_NTSC_FILTER
 /* ntsc */
 #include "nes_ntsc.h"
@@ -955,7 +988,7 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
    info->geometry.max_height = NES_HEIGHT;
    info->geometry.aspect_ratio = get_aspect_ratio(width, height);
    info->timing.sample_rate = (float)sndsamplerate;
-   if (FSettings.PAL || FSettings.dendy)
+   if (FSettings.PAL || dendy)
       info->timing.fps = 838977920.0/16777215.0;
    else
       info->timing.fps = 1008307711.0/16777215.0;
@@ -1060,7 +1093,7 @@ static void FCEUD_RegionOverride(unsigned region)
          break;
    }
 
-   FSettings.dendy = d;
+   dendy = d;
    FCEUI_SetVidSystem(pal);
    ResetPalette();
 }
@@ -1116,11 +1149,11 @@ static void check_variables(bool startup)
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
       if (!strcmp(var.value, "random"))
-         FSettings.ramstate = 2;
+         option_ramstate = 2;
       else if (!strcmp(var.value, "fill $00"))
-         FSettings.ramstate = 1;
+         option_ramstate = 1;
       else
-         FSettings.ramstate = 0;
+         option_ramstate = 0;
    }
 
 #ifdef HAVE_NTSC_FILTER
@@ -1159,18 +1192,38 @@ static void check_variables(bool startup)
          current_palette = PAL_RAW;
       else if (!strcmp(var.value, "custom"))
          current_palette = PAL_CUSTOM;
-      else
-      {
-         unsigned i;
-         for (i = 0; i < PAL_TOTAL; i++)
-         {
-            if (!strcmp(var.value, palettes[i].name))
-            {
-               current_palette = i;
-               break;
-            }
-         }
-      }
+      else if (!strcmp(var.value, "asqrealc"))
+         current_palette = 0;
+      else if (!strcmp(var.value, "nintendo-vc"))
+         current_palette = 1;
+      else if (!strcmp(var.value, "rgb"))
+         current_palette = 2;
+      else if (!strcmp(var.value, "yuv-v3"))
+         current_palette = 3;
+      else if (!strcmp(var.value, "unsaturated-final"))
+         current_palette = 4;
+      else if (!strcmp(var.value, "sony-cxa2025as-us"))
+         current_palette = 5;
+      else if (!strcmp(var.value, "pal"))
+         current_palette = 6;
+      else if (!strcmp(var.value, "bmf-final2"))
+         current_palette = 7;
+      else if (!strcmp(var.value, "bmf-final3"))
+         current_palette = 8;
+      else if (!strcmp(var.value, "smooth-fbx"))
+         current_palette = 9;
+      else if (!strcmp(var.value, "composite-direct-fbx"))
+         current_palette = 10;
+      else if (!strcmp(var.value, "pvm-style-d93-fbx"))
+         current_palette = 11;
+      else if (!strcmp(var.value, "ntsc-hardware-fbx"))
+         current_palette = 12;
+      else if (!strcmp(var.value, "nes-classic-fbx-fs"))
+         current_palette = 13;
+      else if (!strcmp(var.value, "nescap"))
+         current_palette = 14;
+      else if (!strcmp(var.value, "wavebeam"))
+         current_palette = 15;
 
       if (current_palette != orig_value)
       {
@@ -1201,33 +1254,33 @@ static void check_variables(bool startup)
       bool do_reinit = false;
 
       if (!strcmp(var.value, "disabled")
-            && ppu.overclock_enabled != 0)
+            && overclock_enabled != 0)
       {
-         ppu.skip_7bit_overclocking = 1;
-         ppu.extrascanlines         = 0;
-         ppu.vblankscanlines        = 0;
-         ppu.overclock_enabled      = 0;
+         skip_7bit_overclocking = 1;
+         extrascanlines         = 0;
+         vblankscanlines        = 0;
+         overclock_enabled      = 0;
          do_reinit              = true;
       }
       else if (!strcmp(var.value, "2x-Postrender"))
       {
-         ppu.skip_7bit_overclocking = 1;
-         ppu.extrascanlines         = 266;
-         ppu.vblankscanlines        = 0;
-         ppu.overclock_enabled      = 1;
+         skip_7bit_overclocking = 1;
+         extrascanlines         = 266;
+         vblankscanlines        = 0;
+         overclock_enabled      = 1;
          do_reinit              = true;
       }
       else if (!strcmp(var.value, "2x-VBlank"))
       {
-         ppu.skip_7bit_overclocking = 1;
-         ppu.extrascanlines         = 0;
-         ppu.vblankscanlines        = 266;
-         ppu.overclock_enabled      = 1;
+         skip_7bit_overclocking = 1;
+         extrascanlines         = 0;
+         vblankscanlines        = 266;
+         overclock_enabled      = 1;
          do_reinit              = true;
       }
 
-      ppu.normal_scanlines = FSettings.dendy ? SCANLINES_DENDY : SCANLINES_NORMAL;
-      ppu.totalscanlines = ppu.normal_scanlines + (ppu.overclock_enabled ? ppu.extrascanlines : 0);
+      normal_scanlines = dendy ? 290 : 240;
+      totalscanlines = normal_scanlines + (overclock_enabled ? extrascanlines : 0);
 
       if (do_reinit && startup)
       {
@@ -1259,10 +1312,8 @@ static void check_variables(bool startup)
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
-      if (!strcmp(var.value, "enabled"))
-         FSettings.show_crosshair = 1;
-      else if (!strcmp(var.value, "disabled"))
-         FSettings.show_crosshair = 0;
+      if (!strcmp(var.value, "enabled")) show_crosshair = 1;
+      else if (!strcmp(var.value, "disabled")) show_crosshair = 0;
    }
 
 #ifdef PSP
@@ -1400,8 +1451,8 @@ static void check_variables(bool startup)
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
       bool newval = (!strcmp(var.value, "enabled"));
-      if (newval != FSettings.swapDuty)
-         FSettings.swapDuty = newval;
+      if (newval != swapDuty)
+         swapDuty = newval;
    }
 
    var.key = key;
@@ -2377,6 +2428,8 @@ bool retro_load_game(const struct retro_game_info *game)
 #endif
    sndquality = 0;
    sndvolume = 150;
+   swapDuty = 0;
+   dendy = 0;
    opt_region = 0;
 
    /* Wii: initialize this or else last variable is passed through
@@ -2436,7 +2489,7 @@ bool retro_load_game(const struct retro_game_info *game)
       FCEU_printf(" Loading custom palette: %s%cnes.pal\n", dir, slash);
 
    /* Save region and dendy mode for region-auto detect */
-   systemRegion = (FSettings.dendy << 1) | (retro_get_region() & 1);
+   systemRegion = (dendy << 1) | (retro_get_region() & 1);
 
    current_palette = 0;
 
diff --git a/src/fceu.c b/src/fceu.c
index 564b67f..0d471b9 100644
--- a/src/fceu.c
+++ b/src/fceu.c
@@ -339,14 +339,6 @@ int FCEUI_Initialize(void) {
 	FSettings.UsrLastSLine[0] = 231;
 	FSettings.UsrLastSLine[1] = 239;
 	FSettings.SoundVolume = 100;
-	FSettings.dendy = 0;
-	FSettings.swapDuty = 0;
-	ppu.overclock_enabled = 0;
-	ppu.skip_7bit_overclocking = 1;
-	ppu.totalscanlines = 0;
-	ppu.normal_scanlines = SCANLINES_NORMAL;
-	ppu.extrascanlines = 0;
-	ppu.vblankscanlines = 0;
 	FCEUPPU_Init();
 	X6502_Init();
 	return 1;
@@ -387,6 +379,8 @@ void ResetNES(void)
 	X6502_Reset();
 }
 
+int option_ramstate = 0;
+
 void FCEU_MemoryRand(uint8 *ptr, uint32 size)
 {
 	int x = 0;
@@ -401,7 +395,7 @@ void FCEU_MemoryRand(uint8 *ptr, uint32 size)
 										/* 1942 SCORE/HISCORE is screwed... */
 #endif
 		uint8_t v = 0;
-		switch (FSettings.ramstate)
+		switch (option_ramstate)
 		{
 		case 0: v = 0xff; break;
 		case 1: v = 0x00; break;
@@ -470,7 +464,7 @@ void FCEU_ResetVidSys(void)
 	else if (GameInfo->vidsys == GIV_PAL)
    {
       w = 1;
-      FSettings.dendy = 0;
+      dendy = 0;
    }
 	else
 		w = FSettings.PAL;
@@ -478,12 +472,12 @@ void FCEU_ResetVidSys(void)
 	PAL = w ? 1 : 0;
 
    if (PAL)
-      FSettings.dendy = 0;
+      dendy = 0;
 
-   ppu.normal_scanlines = FSettings.dendy ? SCANLINES_DENDY : SCANLINES_NORMAL;
-   ppu.totalscanlines = ppu.normal_scanlines + (ppu.overclock_enabled ? ppu.extrascanlines : 0);
+   normal_scanlines = dendy ? 290 : 240;
+   totalscanlines = normal_scanlines + (overclock_enabled ? extrascanlines : 0);
 
-	FCEUPPU_SetVideoSystem(w || FSettings.dendy);
+	FCEUPPU_SetVideoSystem(w || dendy);
 	SetSoundVariables();
 }
 
@@ -521,7 +515,7 @@ void FCEUI_SetRenderedLines(int ntscf, int ntscl, int palf, int pall)
 	FSettings.UsrLastSLine[0] = ntscl;
 	FSettings.UsrFirstSLine[1] = palf;
 	FSettings.UsrLastSLine[1] = pall;
-	if (PAL || FSettings.dendy)
+	if (PAL || dendy)
    {
 		FSettings.FirstSLine = FSettings.UsrFirstSLine[1];
 		FSettings.LastSLine = FSettings.UsrLastSLine[1];
@@ -565,7 +559,7 @@ void FCEUI_SetSnapName(int a)
 
 int32 FCEUI_GetDesiredFPS(void)
 {
-	if (PAL || FSettings.dendy)
+	if (PAL || dendy)
 		return(838977920);	/* ~50.007 */
 	else
 		return(1008307711);	/* ~60.1 */
diff --git a/src/fceu.h b/src/fceu.h
index 4756bda..f97b425 100644
--- a/src/fceu.h
+++ b/src/fceu.h
@@ -5,6 +5,24 @@
 
 extern int fceuindbg;
 
+/* Overclocking-related */
+extern unsigned overclock_enabled;
+extern unsigned overclocked;
+extern unsigned skip_7bit_overclocking;
+extern unsigned DMC_7bit;
+extern unsigned totalscanlines;
+extern unsigned normal_scanlines;
+extern unsigned extrascanlines;
+extern unsigned vblankscanlines;
+
+/* Region selection */
+extern unsigned dendy;
+
+/* Audio mods*/
+extern unsigned swapDuty; /* Swap bits 6 & 7 of $4000/$4004 to mimic bug
+                           * found on some famiclones/Dendy models.
+                           */
+
 void ResetGameLoaded(void);
 
 #define DECLFR(x) uint8 FP_FASTAPASS(1) x(uint32 A)
@@ -61,9 +79,6 @@ extern uint8 PAL;
 
 #include "driver.h"
 
-#define	SCANLINES_NORMAL 240
-#define SCANLINES_DENDY  290
-
 typedef struct {
 	int PAL;
 	int NetworkPlay;
@@ -87,13 +102,6 @@ typedef struct {
 	uint32 SndRate;
 	int soundq;
 	int lowpass;
-
-	int show_crosshair;
-	int ramstate;
-	int dendy;
-	int swapDuty; /* Swap bits 6 & 7 of $4000/$4004 to mimic bug
-                           * found on some famiclones/Dendy models.
-                           */
 } FCEUS;
 
 extern FCEUS FSettings;
diff --git a/src/ines.c b/src/ines.c
index 0c92e30..ca7f2bc 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -1067,8 +1067,7 @@ int iNESLoad(const char *name, FCEUFILE *fp) {
 	 * 1: RP2C07 ("Licensed PAL NES")
 	 * 2: Multiple-region
 	 * 3: UMC 6527P ("Dendy") */
-	if (iNESCart.region == 3)
-		FSettings.dendy = 1;
+	if (iNESCart.region == 3) dendy = 1;
 	FCEUI_SetVidSystem((iNESCart.region == 1) ? 1 : 0);
 
 	return 1;
diff --git a/src/input.h b/src/input.h
index 1ab1e39..82061bc 100644
--- a/src/input.h
+++ b/src/input.h
@@ -29,6 +29,4 @@ extern void (*InputScanlineHook)(uint8 *bg, uint8 *spr, uint32 linets, int final
 
 void FCEU_DoSimpleCommand(int cmd);
 
-void FCEU_ZapperSetTolerance(int t);
-
 #endif
diff --git a/src/ppu.c b/src/ppu.c
index b6ae1c5..45ccc7f 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -32,6 +32,7 @@
 #include        "general.h"
 #include        "fceu-endian.h"
 #include        "fceu-memory.h"
+#include        "ppuview.h"
 
 #include        "cart.h"
 #include        "palette.h"
@@ -63,8 +64,6 @@ static uint32 ppulut1[256];
 static uint32 ppulut2[256];
 static uint32 ppulut3[128];
 
-FCEU_PPU ppu;
-
 static void makeppulut(void) {
 	int x;
 	int y;
@@ -661,7 +660,7 @@ static void DoLine(void)
 	uint8 *target = NULL;
 	uint8 *dtarget = NULL;
 
-	if (scanline >= 240 && scanline != ppu.totalscanlines)
+	if (scanline >= 240 && scanline != totalscanlines)
 	{
 		X6502_Run(256 + 69);
 		scanline++;
@@ -1067,7 +1066,7 @@ static void CopySprites(uint8 *target) {
 
 void FCEUPPU_SetVideoSystem(int w) {
 	if (w) {
-		scanlines_per_frame = FSettings.dendy ? 262 : 312;
+		scanlines_per_frame = dendy ? 262 : 312;
 		FSettings.FirstSLine = FSettings.UsrFirstSLine[1];
 		FSettings.LastSLine = FSettings.UsrLastSLine[1];
 	} else {
@@ -1167,11 +1166,11 @@ int FCEUPPU_Loop(int skip) {
 				TriggerNMI();
 		}
 		X6502_Run((scanlines_per_frame - 242) * (256 + 85) - 12);
-		if (ppu.overclock_enabled && ppu.vblankscanlines) {
-			if (!DMC_7bit || !ppu.skip_7bit_overclocking) {
-				overclocking = 1;
-				X6502_Run(ppu.vblankscanlines * (256 + 85) - 12);
-				overclocking = 0;
+		if (overclock_enabled && vblankscanlines) {
+			if (!DMC_7bit || !skip_7bit_overclocking) {
+				overclocked = 1;
+				X6502_Run(vblankscanlines * (256 + 85) - 12);
+				overclocked = 0;
 			}
 		}
 		PPU_status &= 0x1f;
@@ -1204,7 +1203,7 @@ int FCEUPPU_Loop(int skip) {
 			kook ^= 1;
 		}
 		if (GameInfo->type == GIT_NSF)
-			X6502_Run((256 + 85) * ppu.normal_scanlines);
+			X6502_Run((256 + 85) * normal_scanlines);
 		#ifdef FRAMESKIP
 		else if (skip) {
 			int y;
@@ -1235,20 +1234,21 @@ int FCEUPPU_Loop(int skip) {
 			deemp = PPU[1] >> 5;
 
          /* manual samples can't play correctly with overclocking */
-			if (DMC_7bit && ppu.skip_7bit_overclocking)
-				ppu.totalscanlines = ppu.normal_scanlines;
+			if (DMC_7bit && skip_7bit_overclocking)
+				totalscanlines = normal_scanlines;
 			else
-				ppu.totalscanlines = ppu.normal_scanlines + (ppu.overclock_enabled ? ppu.extrascanlines : 0);
+				totalscanlines = normal_scanlines + (overclock_enabled ? extrascanlines : 0);
 
-			for (scanline = 0; scanline < ppu.totalscanlines; ) {	/* scanline is incremented in  DoLine.  Evil. :/ */
+			for (scanline = 0; scanline < totalscanlines; ) {	/* scanline is incremented in  DoLine.  Evil. :/ */
 				deempcnt[deemp]++;
+				/* if ((PPUViewer) && (scanline == PPUViewScanline)) UpdatePPUView(1); */
 				DoLine();
-				if (scanline < ppu.normal_scanlines || scanline == ppu.totalscanlines)
-					overclocking = 0;
+				if (scanline < normal_scanlines || scanline == totalscanlines)
+					overclocked = 0;
 				else {
-					if (DMC_7bit && ppu.skip_7bit_overclocking) /* 7bit sample started after 240th line */
+					if (DMC_7bit && skip_7bit_overclocking) /* 7bit sample started after 240th line */
 						break;
-					overclocking = 1;
+					overclocked = 1;
 				}
 			}
 
diff --git a/src/ppu.h b/src/ppu.h
index 829de71..96338a1 100644
--- a/src/ppu.h
+++ b/src/ppu.h
@@ -1,18 +1,6 @@
 #ifndef _FCEU_PPU_H
 #define _FCEU_PPU_H
 
-typedef struct {
-    /* PPU Overclocking */
-	int overclock_enabled;		/* 1 : enable, 0 : disable duh! */
-	int skip_7bit_overclocking;	/* 7-bit samples have priority over overclocking */
-	int extrascanlines;
-	int vblankscanlines;
-	int normal_scanlines;		/* 240 : normal, 290 : dendy */
-	int totalscanlines;
-} FCEU_PPU;
-
-extern FCEU_PPU ppu;
-
 void FCEUPPU_Init(void);
 void FCEUPPU_Reset(void);
 void FCEUPPU_Power(void);
@@ -28,8 +16,6 @@ extern void FP_FASTAPASS(1) (*PPU_hook)(uint32 A);
 extern uint8 NTARAM[0x800], *vnapage[4];
 extern uint8 PPUNTARAM;
 extern uint8 PPUCHRRAM;
-extern uint8 PALRAM[0x20];
-extern uint8 SPRAM[0x100];
 
 void FCEUPPU_SaveState(void);
 void FCEUPPU_LoadState(int version);
diff --git a/src/ppuview.h b/src/ppuview.h
new file mode 100644
index 0000000..740a183
--- /dev/null
+++ b/src/ppuview.h
@@ -0,0 +1,13 @@
+#ifndef _FCEU_PPUVIEW_H
+#define _FCEU_PPUVIEW_H
+
+extern int PPUViewScanline;
+extern int PPUViewer;
+extern int scanline;
+
+void PPUViewDoBlit();
+void DoPPUView();
+void UpdatePPUView(int refreshchr);
+
+
+#endif
diff --git a/src/sound.c b/src/sound.c
index a72f93a..a483d16 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -61,7 +61,7 @@ typedef struct {
 	int reloaddec;
 } ENVUNIT;
 
-uint32 DMC_7bit = 0; /* used to skip overclocking */
+unsigned DMC_7bit = 0; /* used to skip overclocking */
 static ENVUNIT EnvUnits[3];
 
 static const int RectDuties[4] = { 1, 2, 4, 6 };
@@ -195,7 +195,7 @@ static DECLFW(Write_PSG) {
 		DoSQ1();
 		EnvUnits[0].Mode = (V & 0x30) >> 4;
 		EnvUnits[0].Speed = (V & 0xF);
-		if (FSettings.swapDuty)
+		if (swapDuty)
 			V = (V & 0x3F) | ((V & 0x80) >> 1) | ((V & 0x40) << 1);
 		break;
 	case 0x1:
@@ -216,7 +216,7 @@ static DECLFW(Write_PSG) {
 		DoSQ2();
 		EnvUnits[1].Mode = (V & 0x30) >> 4;
 		EnvUnits[1].Speed = (V & 0xF);
-		if (FSettings.swapDuty)
+		if (swapDuty)
 			V = (V & 0x3F) | ((V & 0x80) >> 1) | ((V & 0x40) << 1);
 		break;
 	case 0x5:
diff --git a/src/sound.h b/src/sound.h
index d10a56a..c4413cc 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -50,7 +50,6 @@ extern int32 Wave[2048 + 512];
 extern int32 WaveFinal[2048 + 512];
 extern int32 WaveHi[];
 extern uint32 soundtsinc;
-extern uint32 DMC_7bit;
 
 extern uint32 soundtsoffs;
 #define SOUNDTS (sound_timestamp + soundtsoffs)
diff --git a/src/video.c b/src/video.c
index 80da854..0017fc1 100644
--- a/src/video.c
+++ b/src/video.c
@@ -37,6 +37,7 @@
 
 uint8 *XBuf = NULL;
 uint8 *XDBuf = NULL;
+int show_crosshair = 0;
 
 void FCEU_KillVirtualVideo(void)
 {
@@ -52,15 +53,15 @@ int FCEU_InitVirtualVideo(void)
 {
    /* 256 bytes per scanline, * 240 scanline maximum, +8 for alignment, */
    if (!XBuf)
-      XBuf = (uint8*)(FCEU_malloc(256 * (256 + ppu.extrascanlines + 8)));
+      XBuf = (uint8*)(FCEU_malloc(256 * (256 + extrascanlines + 8)));
    if (!XDBuf)
-      XDBuf = (uint8*)(FCEU_malloc(256 * (256 + ppu.extrascanlines + 8)));
+      XDBuf = (uint8*)(FCEU_malloc(256 * (256 + extrascanlines + 8)));
 
    if (!XBuf || !XDBuf)
       return 0;
 
-   memset(XBuf, 128, 256 * (256 + ppu.extrascanlines + 8));
-   memset(XDBuf, 128, 256 * (256 + ppu.extrascanlines + 8));
+   memset(XBuf, 128, 256 * (256 + extrascanlines + 8));
+   memset(XDBuf, 128, 256 * (256 + extrascanlines + 8));
    return 1;
 }
 
@@ -81,7 +82,7 @@ void FCEU_PutImage(void)
 			FCEU_VSUniDraw(XBuf);
 	}
 	if (howlong) howlong--;
-	if (FSettings.show_crosshair)
+	if (show_crosshair)
 		FCEU_DrawInput(XBuf);
 }
 
diff --git a/src/video.h b/src/video.h
index b98a419..9eef95b 100644
--- a/src/video.h
+++ b/src/video.h
@@ -6,6 +6,7 @@ void FCEU_KillVirtualVideo(void);
 int SaveSnapshot(void);
 extern uint8 *XBuf;
 extern uint8 *XDBuf;
+extern int show_crosshair;
 void FCEU_DrawNumberRow(uint8 *XBuf, int *nstatus, int cur);
 
 #endif
diff --git a/src/x6502.c b/src/x6502.c
index 0d00377..b8bf2d9 100644
--- a/src/x6502.c
+++ b/src/x6502.c
@@ -34,7 +34,6 @@ void (*X6502_Run)(int32 cycles);
 
 uint32 timestamp;
 uint32 sound_timestamp;
-uint32 overclocking = 0;
 void FP_FASTAPASS(1) (*MapIRQHook)(int a);
 
 #define _PC        X.PC
@@ -55,7 +54,7 @@ void FP_FASTAPASS(1) (*MapIRQHook)(int a);
 	_tcount += __x;									\
 	_count -= __x * 48;								\
 	timestamp += __x;  \
-	if (!overclocking) sound_timestamp +=  __x; \
+	if (!overclocked) sound_timestamp +=  __x; \
 }
 
 static INLINE uint8 RdMemNorm(uint32 A) {
@@ -517,7 +516,7 @@ static void X6502_RunDebug(int32 cycles) {
 		_tcount = 0;
 		if (MapIRQHook) MapIRQHook(temp);
 
-      if (!overclocking)
+      if (!overclocked)
          FCEU_SoundCPUHook(temp);
 
 		_PC++;
@@ -614,7 +613,7 @@ void X6502_Run(int32 cycles)
 		temp = _tcount;
 		_tcount = 0;
 		if (MapIRQHook) MapIRQHook(temp);
-		if (!overclocking)
+		if (!overclocked)
 			FCEU_SoundCPUHook(temp);
 		X.PC = pbackus;
 		_PC++;
diff --git a/src/x6502.h b/src/x6502.h
index d9d8b65..f480544 100644
--- a/src/x6502.h
+++ b/src/x6502.h
@@ -35,7 +35,6 @@ void X6502_Run(int32 cycles);
 
 extern uint32 timestamp;
 extern uint32 sound_timestamp;
-extern uint32 overclocking;
 extern X6502 X;
 
 #define N_FLAG  0x80
@@ -49,7 +48,7 @@ extern X6502 X;
 
 extern void FP_FASTAPASS(1) (*MapIRQHook)(int a);
 
-#define NTSC_CPU (FSettings.dendy ? 1773447.467 : 1789772.7272727272727272)
+#define NTSC_CPU (dendy ? 1773447.467 : 1789772.7272727272727272)
 #define PAL_CPU  1662607.125
 
 #define FCEU_IQEXT      0x001

From e154706586d523dbd33f8793872d4c7a013bfaf0 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 5 Jun 2021 20:56:49 +0200
Subject: [PATCH 127/295] Some cleanups + we don't need a non-libretro codepath

---
 src/driver.h                    |  7 -------
 src/drivers/libretro/libretro.c | 11 +----------
 src/fceu-types.h                |  4 ----
 src/fceu.h                      |  1 -
 src/file.h                      | 10 ----------
 src/ppu.c                       |  2 --
 src/ppuview.h                   | 13 -------------
 7 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 src/ppuview.h

diff --git a/src/driver.h b/src/driver.h
index 196c733..6c83d97 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -101,12 +101,7 @@ void FCEUI_DisableSpriteLimitation(int a);
 /* -1 = no change, 0 = show, 1 = hide, 2 = internal toggle */
 void FCEUI_SetRenderDisable(int sprites, int bg);
 
-#ifdef __LIBRETRO__
 FCEUGI *FCEUI_LoadGame(const char *name, uint8_t *buf, size_t bufsize);
-#else
-/* name=path and file to load.  returns 0 on failure, 1 on success */
-FCEUGI *FCEUI_LoadGame(const char *name);
-#endif
 
 #ifdef COPYFAMI
 /* Fake UNIF board to start new CFHI instance */
@@ -149,9 +144,7 @@ void FCEUI_SetRenderedLines(int ntscf, int ntscl, int palf, int pall);
    below this directory. */
 void FCEUI_SetBaseDirectory(char *dir);
 
-#ifdef __LIBRETRO__
 void FCEUI_SetSaveDirectory(char *sav_dir);
-#endif
 
 
 /* Tells FCE Ultra to copy the palette data pointed to by pal and use it.
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 39263fc..8c606fd 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -188,9 +188,6 @@ static uint32_t Dummy = 0;
 static uint32_t current_palette = 0;
 static unsigned serialize_size;
 
-int PPUViewScanline=0;
-int PPUViewer=0;
-
 /* extern forward decls.*/
 extern FCEUGI *GameInfo;
 extern uint8 *XBuf;
@@ -201,8 +198,6 @@ extern int option_ramstate;
 
 /* emulator-specific callback functions */
 
-void UpdatePPUView(int refreshchr) { }
-
 const char * GetKeyboard(void)
 {
    return "";
@@ -288,9 +283,6 @@ void FCEUD_DispMessage(char *m)
    environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, &msg);
 }
 
-void FCEUD_NetworkClose(void)
-{ }
-
 void FCEUD_SoundToggle (void)
 {
    FCEUI_SetSoundVolume(sndvolume);
@@ -300,8 +292,7 @@ FILE *FCEUD_UTF8fopen(const char *n, const char *m)
 {
    if (n)
       return fopen(n, m);
-   else
-      return NULL;
+   return NULL;
 }
 
 /*palette for FCEU*/
diff --git a/src/fceu-types.h b/src/fceu-types.h
index 86def23..9327c9b 100644
--- a/src/fceu-types.h
+++ b/src/fceu-types.h
@@ -22,11 +22,7 @@
 #ifndef __FCEU_TYPES_H
 #define __FCEU_TYPES_H
 
-#ifdef __LIBRETRO__
 #include <stdint.h>
-#else
-#include <inttypes.h>
-#endif
 typedef int8_t int8;
 typedef int16_t int16;
 typedef int32_t int32;
diff --git a/src/fceu.h b/src/fceu.h
index f97b425..2831997 100644
--- a/src/fceu.h
+++ b/src/fceu.h
@@ -81,7 +81,6 @@ extern uint8 PAL;
 
 typedef struct {
 	int PAL;
-	int NetworkPlay;
 	int SoundVolume;
 	int TriangleVolume;
 	int SquareVolume[2];
diff --git a/src/file.h b/src/file.h
index a992a66..7035e8f 100644
--- a/src/file.h
+++ b/src/file.h
@@ -1,28 +1,18 @@
 #ifndef _FCEU_FILE_H
 #define _FCEU_FILE_H
 
-#ifdef __LIBRETRO__
 typedef struct {
 	uint8 *data;
 	uint32 size;
 	uint32 location;
 } MEMWRAP;
-#endif
 
 typedef struct {
-#ifdef __LIBRETRO__
    MEMWRAP *fp;
-#else
-	void *fp;		/* FILE* or ptr to ZIPWRAP */
-#endif
 	uint32 type;	/* 0=normal file, 1=gzip, 2=zip */
 } FCEUFILE;
 
-#ifdef __LIBRETRO__
 FCEUFILE *FCEU_fopen(const char *path, const char *ipsfn, char *mode, char *ext, uint8 *buffer, size_t bufsize);
-#else
-FCEUFILE *FCEU_fopen(const char *path, const char *ipsfn, char *mode, char *ext);
-#endif
 int FCEU_fclose(FCEUFILE*);
 uint64 FCEU_fread(void *ptr, size_t size, size_t nmemb, FCEUFILE*);
 uint64 FCEU_fwrite(void *ptr, size_t size, size_t nmemb, FCEUFILE*);
diff --git a/src/ppu.c b/src/ppu.c
index 45ccc7f..f3ea2a1 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -32,7 +32,6 @@
 #include        "general.h"
 #include        "fceu-endian.h"
 #include        "fceu-memory.h"
-#include        "ppuview.h"
 
 #include        "cart.h"
 #include        "palette.h"
@@ -1241,7 +1240,6 @@ int FCEUPPU_Loop(int skip) {
 
 			for (scanline = 0; scanline < totalscanlines; ) {	/* scanline is incremented in  DoLine.  Evil. :/ */
 				deempcnt[deemp]++;
-				/* if ((PPUViewer) && (scanline == PPUViewScanline)) UpdatePPUView(1); */
 				DoLine();
 				if (scanline < normal_scanlines || scanline == totalscanlines)
 					overclocked = 0;
diff --git a/src/ppuview.h b/src/ppuview.h
deleted file mode 100644
index 740a183..0000000
--- a/src/ppuview.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _FCEU_PPUVIEW_H
-#define _FCEU_PPUVIEW_H
-
-extern int PPUViewScanline;
-extern int PPUViewer;
-extern int scanline;
-
-void PPUViewDoBlit();
-void DoPPUView();
-void UpdatePPUView(int refreshchr);
-
-
-#endif

From 3dbf430262a1f2606ba79eff489fddf6d1775e96 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 5 Jun 2021 21:07:55 +0200
Subject: [PATCH 128/295] Wrap all fopen access - go through FCEUD_UTF8fopen
 isntead

---
 src/boards/copyfami_hwi.c       | 4 ++--
 src/drivers/libretro/libretro.c | 3 ++-
 src/file.c                      | 8 +-------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/boards/copyfami_hwi.c b/src/boards/copyfami_hwi.c
index 72a05af..7660c61 100644
--- a/src/boards/copyfami_hwi.c
+++ b/src/boards/copyfami_hwi.c
@@ -173,7 +173,7 @@ static int32 FetchNewCHRBank(int32 slot) {
 	CHR1KGetCmd[1] = slot << 2;
 	SENDGET(CHR1KGetCmd, chr_data.buf[bank * 1024], 1024);
 	sprintf(name, "%04x.chr", bank);
-	ofile = fopen(name, "wb");
+	ofile = FCEUD_UTF8fopen(name, "wb");
 	fwrite((void*)&chr_data.buf[bank * 1024], 1, 1024, ofile);
 	fclose(ofile);
 	return bank;
@@ -186,7 +186,7 @@ static int32 FetchNewPRGBank(int32 slot) {
 	PRG8KGetCmd[1] = 0x80 + (slot << 5);
 	SENDGET(PRG8KGetCmd, prg_data.buf[bank * 8192], 8192);
 	sprintf(name, "%04x.prg", bank);
-	ofile = fopen(name, "wb");
+	ofile = FCEUD_UTF8fopen(name, "wb");
 	fwrite((void*)&prg_data.buf[bank * 8192], 1, 8192, ofile);
 	fclose(ofile);
 	return bank;
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 8c606fd..ebc86b4 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -6,6 +6,7 @@
 #include <ctype.h>
 
 #include <libretro.h>
+#include <compat/fopen_utf8.h>
 #include <streams/memory_stream.h>
 #include <libretro_dipswitch.h>
 #include <libretro_core_options.h>
@@ -291,7 +292,7 @@ void FCEUD_SoundToggle (void)
 FILE *FCEUD_UTF8fopen(const char *n, const char *m)
 {
    if (n)
-      return fopen(n, m);
+      return fopen_utf8(n, m);
    return NULL;
 }
 
diff --git a/src/file.c b/src/file.c
index fc05ea1..b210e18 100644
--- a/src/file.c
+++ b/src/file.c
@@ -34,12 +34,6 @@
 #include "driver.h"
 #include "general.h"
 
-#include "compat/fopen_utf8.h"
-
-#ifndef __GNUC__
- #define strcasecmp strcmp
-#endif
-
 static MEMWRAP *MakeMemWrap(void *tz, int type)
 {
    MEMWRAP *tmp;
@@ -87,7 +81,7 @@ FCEUFILE * FCEU_fopen(const char *path, const char *ipsfn,
       fceufp->fp = MakeMemWrapBuffer(buffer, bufsize);
    else
    {
-      void *t = fopen_utf8(path, mode);
+      void *t = FCEUD_UTF8fopen(path, mode);
 
       if (!t)
       {

From 2b187732ea6122cd370392e313f1a8a4b48ae68a Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 5 Jun 2021 21:11:41 +0200
Subject: [PATCH 129/295] Get rid of obsolete variable

---
 src/drivers/libretro/libretro.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index ebc86b4..cf226c7 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -165,8 +165,6 @@ static unsigned opt_region = 0;
 static unsigned opt_showAdvSoundOptions = 0;
 static unsigned opt_showAdvSystemOptions = 0;
 
-int FCEUnetplay;
-
 #if defined(PSP) || defined(PS2)
 static __attribute__((aligned(16))) uint16_t retro_palette[256];
 #else

From 6e1dd7cde1062eef219b528156a6d25694fc898a Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 5 Jun 2021 21:13:51 +0200
Subject: [PATCH 130/295] Cleanup

---
 src/video.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/video.c b/src/video.c
index 0017fc1..a7896cc 100644
--- a/src/video.c
+++ b/src/video.c
@@ -65,9 +65,6 @@ int FCEU_InitVirtualVideo(void)
    return 1;
 }
 
-static int howlong;
-static char errmsg[65];
-
 #include "drawing.h"
 
 void FCEUI_SaveSnapshot(void) { }
@@ -81,7 +78,6 @@ void FCEU_PutImage(void)
 		if (GameInfo->type == GIT_VSUNI)
 			FCEU_VSUniDraw(XBuf);
 	}
-	if (howlong) howlong--;
 	if (show_crosshair)
 		FCEU_DrawInput(XBuf);
 }
@@ -93,18 +89,17 @@ void FCEU_PutImageDummy(void)
 void FCEU_DispMessage(char *format, ...)
 {
    va_list ap;
+   static char errmsg[65];
 
    va_start(ap, format);
    vsprintf(errmsg, format, ap);
    va_end(ap);
 
-   howlong = 180;
    FCEUD_DispMessage(errmsg);
 }
 
 void FCEU_ResetMessages(void)
 {
-	howlong = 180;
 }
 
 int SaveSnapshot(void)

From 36e38000eff608c29a22756f7dac02ade6caf2cd Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 5 Jun 2021 21:15:36 +0200
Subject: [PATCH 131/295] Remove unused functions

---
 src/drawing.h | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/src/drawing.h b/src/drawing.h
index 6a8a4f4..110dd48 100644
--- a/src/drawing.h
+++ b/src/drawing.h
@@ -1,32 +1,6 @@
 #ifndef _FCEU_DRAWING_H
 #define _FCEU_DRAWING_H
 
-void DrawTextLineBG(uint8 *dest) {
-	int x, y;
-	static int otable[7] = { 81, 49, 30, 17, 8, 3, 0 };
-	for (y = 0; y < 14; y++) {
-		int offs;
-
-		if (y >= 7) offs = otable[13 - y];
-		else offs = otable[y];
-
-		for (x = offs; x < (256 - offs); x++)
-			dest[y * 256 + x] = (dest[y * 256 + x] & 0x0f) | 0xC0;
-	}
-}
-
-static void DrawMessage(void) {
-	if (howlong) {
-		uint8 *t;
-		howlong--;
-		t = XBuf + (FSettings.LastSLine - 16) * 256;
-		if (t >= XBuf) {
-			DrawTextLineBG(t);
-			DrawTextTrans(t + 256 * 3 + (128 - strlen(errmsg) * 4), 256, (uint8*)errmsg, 4);
-		}
-	}
-}
-
 uint8 fontdata2[2048] =
 {
 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x81,0xa5,0x81,0xbd,0x99,0x81,0x7e,0x7e,0xff,0xdb,0xff,0xc3,0xe7,0xff,0x7e,0x36,0x7f,0x7f,0x7f,0x3e,0x1c,0x08,0x00,

From 84bb7c4e9d12d0392c6d4f63160721d97f9a7d08 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 6 Jun 2021 01:53:33 +0200
Subject: [PATCH 132/295] Cleanup

---
 src/ines.c | 367 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 193 insertions(+), 174 deletions(-)

diff --git a/src/ines.c b/src/ines.c
index ca7f2bc..f903018 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -851,226 +851,245 @@ static void rom_load_ines2(void) {
 	if (head.CHRRAM_size & 0xF0) iNESCart.CHRRamSaveSize = 64 << ((head.CHRRAM_size >> 4) & 0x0F);
 }
 
-int iNESLoad(const char *name, FCEUFILE *fp) {
-	const char *tv_region[] = { "NTSC", "PAL", "Multi-region", "Dendy" };
-	struct md5_context md5;
+int iNESLoad(const char *name, FCEUFILE *fp)
+{
+   const char *tv_region[] = { "NTSC", "PAL", "Multi-region", "Dendy" };
+   struct md5_context md5;
 #ifdef DEBUG
-	char* mappername        = NULL;
-	uint32 mappertest       = 0;
+   char* mappername        = NULL;
+   uint32 mappertest       = 0;
 #endif
-	uint64 filesize         = FCEU_fgetsize(fp);
-	uint64 romSize          = 0;
-	/* used for malloc and cart mapping */
-	uint32 rom_size_pow2    = 0;
-	uint32 vrom_size_pow2   = 0;
+   uint64 filesize         = FCEU_fgetsize(fp);
+   uint64 romSize          = 0;
+   /* used for malloc and cart mapping */
+   uint32 rom_size_pow2    = 0;
+   uint32 vrom_size_pow2   = 0;
 
-	if (FCEU_fread(&head, 1, 16, fp) != 16)
-		return 0;
+   if (FCEU_fread(&head, 1, 16, fp) != 16)
+      return 0;
 
-	filesize -= 16; /* remove header size from total size */
+   filesize -= 16; /* remove header size from total size */
 
-	if (memcmp(&head, "NES\x1a", 4)) {
-		FCEU_PrintError("Not an iNES file!\n");
- 		return 0;
-	}
+   if (memcmp(&head, "NES\x1a", 4))
+   {
+      FCEU_PrintError("Not an iNES file!\n");
+      return 0;
+   }
 
-	memset(&iNESCart, 0, sizeof(iNESCart));
+   memset(&iNESCart, 0, sizeof(iNESCart));
 
-	if (!memcmp((char*)(&head) + 0x7, "DiskDude", 8)) {
-		memset((char*)(&head) + 0x7, 0, 0x9);
-	}
+   if (!memcmp((char*)(&head) + 0x7, "DiskDude", 8))
+      memset((char*)(&head) + 0x7, 0, 0x9);
 
-	if (!memcmp((char*)(&head) + 0x7, "demiforce", 9)) {
-		memset((char*)(&head) + 0x7, 0, 0x9);
-	}
+   if (!memcmp((char*)(&head) + 0x7, "demiforce", 9))
+      memset((char*)(&head) + 0x7, 0, 0x9);
 
-	if (!memcmp((char*)(&head) + 0xA, "Ni03", 4)) {
-		if (!memcmp((char*)(&head) + 0x7, "Dis", 3))
-			memset((char*)(&head) + 0x7, 0, 0x9);
-		else
-			memset((char*)(&head) + 0xA, 0, 0x6);
-	}
+   if (!memcmp((char*)(&head) + 0xA, "Ni03", 4))
+   {
+      if (!memcmp((char*)(&head) + 0x7, "Dis", 3))
+         memset((char*)(&head) + 0x7, 0, 0x9);
+      else
+         memset((char*)(&head) + 0xA, 0, 0x6);
+   }
 
-	iNESCart.iNES2 = get_ines_version();
+   if ((iNESCart.iNES2 = get_ines_version()))
+      rom_load_ines2();
+   else
+      rom_load_ines();
 
-	if (!iNESCart.iNES2)
-		rom_load_ines();
-	else
-		rom_load_ines2();
+   if (!ROM_size)
+      ROM_size = 256;
 
-	if (!ROM_size)
-		ROM_size = 256;
+   /* Trainer */
+   if (head.ROM_type & 4)
+   {
+      trainerpoo = (uint8*)FCEU_gmalloc(512);
+      FCEU_fread(trainerpoo, 512, 1, fp);
+      filesize -= 512;
+   }
 
-	/* Trainer */
-	if (head.ROM_type & 4) {
-		trainerpoo = (uint8*)FCEU_gmalloc(512);
-		FCEU_fread(trainerpoo, 512, 1, fp);
-		filesize -= 512;
-	}
+   romSize = (ROM_size * 0x4000) + (VROM_size * 0x2000);
 
-	romSize = (ROM_size * 0x4000) + (VROM_size * 0x2000);
+   if (romSize > filesize)
+   {
+      FCEU_PrintError(" File length is too short to contain all data reported from header by %llu\n", romSize -  filesize);
+   }
+   else if (romSize < filesize)
+      FCEU_PrintError(" File contains %llu bytes of unused data\n", filesize - romSize);
 
-	if (romSize > filesize) {
-		FCEU_PrintError(" File length is too short to contain all data reported from header by %llu\n", romSize -  filesize);
-	} else if (romSize < filesize)
-		FCEU_PrintError(" File contains %llu bytes of unused data\n", filesize - romSize);
+   rom_size_pow2 =  uppow2(ROM_size) * 0x4000;
 
-	rom_size_pow2 =  uppow2(ROM_size) * 0x4000;
+   if ((ROM = (uint8*)FCEU_malloc(rom_size_pow2)) == NULL)
+      return 0;
 
-	if ((ROM = (uint8*)FCEU_malloc(rom_size_pow2)) == NULL)
-		return 0;
+   memset(ROM, 0xFF, rom_size_pow2);
+   FCEU_fread(ROM, 0x4000, ROM_size, fp);
 
-	memset(ROM, 0xFF, rom_size_pow2);
-	FCEU_fread(ROM, 0x4000, ROM_size, fp);
+   if (VROM_size)
+   {
+      vrom_size_pow2 = uppow2(VROM_size) * 0x2000;
 
-	if (VROM_size) {
-		vrom_size_pow2 = uppow2(VROM_size) * 0x2000;
+      if ((VROM = (uint8*)FCEU_malloc(vrom_size_pow2)) == NULL)
+      {
+         free(ROM);
+         ROM = NULL;
+         return 0;
+      }
 
-		if ((VROM = (uint8*)FCEU_malloc(vrom_size_pow2)) == NULL) {
-			free(ROM);
-			ROM = NULL;
-			return 0;
-		}
+      memset(VROM, 0xFF, vrom_size_pow2);
+      FCEU_fread(VROM, 0x2000, VROM_size, fp);
+   }
 
-		memset(VROM, 0xFF, vrom_size_pow2);
-		FCEU_fread(VROM, 0x2000, VROM_size, fp);
-	}
+   iNESCart.PRGRomSize = ROM_size * 0x4000;
+   iNESCart.CHRRomSize = VROM_size * 0x2000;
 
-	iNESCart.PRGRomSize = ROM_size * 0x4000;
-	iNESCart.CHRRomSize = VROM_size * 0x2000;
+   iNESCart.PRGCRC32   = CalcCRC32(0, ROM, ROM_size * 0x4000);
+   iNESCart.CHRCRC32   = CalcCRC32(0, VROM, VROM_size * 0x2000);
+   iNESCart.CRC32      = CalcCRC32(iNESCart.PRGCRC32, VROM, VROM_size * 0x2000);
 
-	iNESCart.PRGCRC32   = CalcCRC32(0, ROM, ROM_size * 0x4000);
-	iNESCart.CHRCRC32   = CalcCRC32(0, VROM, VROM_size * 0x2000);
-	iNESCart.CRC32      = CalcCRC32(iNESCart.PRGCRC32, VROM, VROM_size * 0x2000);
+   md5_starts(&md5);
+   md5_update(&md5, ROM, ROM_size * 0x4000);
+   if (VROM_size)
+      md5_update(&md5, VROM, VROM_size * 0x2000);
+   md5_finish(&md5, iNESCart.MD5);
 
-	md5_starts(&md5);
-	md5_update(&md5, ROM, ROM_size * 0x4000);
-	if (VROM_size)
-		md5_update(&md5, VROM, VROM_size * 0x2000);
-	md5_finish(&md5, iNESCart.MD5);
-
-	memcpy(&GameInfo->MD5, &iNESCart.MD5, sizeof(iNESCart.MD5));
+   memcpy(&GameInfo->MD5, &iNESCart.MD5, sizeof(iNESCart.MD5));
 
 #ifdef DEBUG
-	mappername = "Not Listed";
+   mappername = "Not Listed";
 
-	for (mappertest = 0; mappertest < (sizeof bmap / sizeof bmap[0]) - 1; mappertest++) {
-		if (bmap[mappertest].number == iNESCart.mapper) {
-			mappername = (char*)bmap[mappertest].name;
-			break;
-		}
-	}
+   for (mappertest = 0; mappertest < (sizeof bmap / sizeof bmap[0]) - 1; mappertest++)
+   {
+      if (bmap[mappertest].number == iNESCart.mapper)
+      {
+         mappername = (char*)bmap[mappertest].name;
+         break;
+      }
+   }
 #endif
 
-	if (iNESCart.iNES2 == 0) {
-		if (strstr(name, "(E)") || strstr(name, "(e)") ||
-			strstr(name, "(Europe)") || strstr(name, "(PAL)") ||
-			strstr(name, "(F)") || strstr(name, "(f)") ||
-			strstr(name, "(G)") || strstr(name, "(g)") ||
-			strstr(name, "(I)") || strstr(name, "(i)") ||
-			strstr(name, "(S)") || strstr(name, "(s)") ||
-			strstr(name, "(France)") || strstr(name, "(Germany)") ||
-			strstr(name, "(Italy)") || strstr(name, "(Spain)") ||
-			strstr(name, "(Sweden)") || strstr(name, "(Sw)") ||
-			strstr(name, "(Australia)") || strstr(name, "(A)") ||
-			strstr(name, "(a)")) {
-				iNESCart.region = 1;
-		}
-	}
+   if (iNESCart.iNES2 == 0) {
+      if (strstr(name, "(E)") || strstr(name, "(e)") ||
+            strstr(name, "(Europe)") || strstr(name, "(PAL)") ||
+            strstr(name, "(F)") || strstr(name, "(f)") ||
+            strstr(name, "(G)") || strstr(name, "(g)") ||
+            strstr(name, "(I)") || strstr(name, "(i)") ||
+            strstr(name, "(S)") || strstr(name, "(s)") ||
+            strstr(name, "(France)") || strstr(name, "(Germany)") ||
+            strstr(name, "(Italy)") || strstr(name, "(Spain)") ||
+            strstr(name, "(Sweden)") || strstr(name, "(Sw)") ||
+            strstr(name, "(Australia)") || strstr(name, "(A)") ||
+            strstr(name, "(a)")) {
+         iNESCart.region = 1;
+      }
+   }
 
 #ifdef DEBUG
-	FCEU_printf(" PRG-ROM CRC32:  0x%08X\n", iNESCart.PRGCRC32);
-	FCEU_printf(" PRG+CHR CRC32:  0x%08X\n", iNESCart.CRC32);
-	FCEU_printf(" PRG+CHR MD5:    0x%s\n", md5_asciistr(iNESCart.MD5));
-	FCEU_printf(" PRG-ROM:  %3d x 16KiB\n", ROM_size);
-	FCEU_printf(" CHR-ROM:  %3d x  8KiB\n", VROM_size);
-	FCEU_printf(" Mapper #: %3d\n", iNESCart.mapper);
-	FCEU_printf(" Mapper name: %s\n", mappername);
-	FCEU_printf(" Mirroring: %s\n", iNESCart.mirror == 2 ? "None (Four-screen)" : iNESCart.mirror ? "Vertical" : "Horizontal");
-	FCEU_printf(" Battery: %s\n", (head.ROM_type & 2) ? "Yes" : "No");
-	FCEU_printf(" System: %s\n", tv_region[iNESCart.region]);
-	FCEU_printf(" Trained: %s\n", (head.ROM_type & 4) ? "Yes" : "No");
+   FCEU_printf(" PRG-ROM CRC32:  0x%08X\n", iNESCart.PRGCRC32);
+   FCEU_printf(" PRG+CHR CRC32:  0x%08X\n", iNESCart.CRC32);
+   FCEU_printf(" PRG+CHR MD5:    0x%s\n", md5_asciistr(iNESCart.MD5));
+   FCEU_printf(" PRG-ROM:  %3d x 16KiB\n", ROM_size);
+   FCEU_printf(" CHR-ROM:  %3d x  8KiB\n", VROM_size);
+   FCEU_printf(" Mapper #: %3d\n", iNESCart.mapper);
+   FCEU_printf(" Mapper name: %s\n", mappername);
+   FCEU_printf(" Mirroring: %s\n", iNESCart.mirror == 2 ? "None (Four-screen)" : iNESCart.mirror ? "Vertical" : "Horizontal");
+   FCEU_printf(" Battery: %s\n", (head.ROM_type & 2) ? "Yes" : "No");
+   FCEU_printf(" System: %s\n", tv_region[iNESCart.region]);
+   FCEU_printf(" Trained: %s\n", (head.ROM_type & 4) ? "Yes" : "No");
+
+   if (iNESCart.iNES2)
+   {
+      unsigned PRGRAM = iNESCart.PRGRamSize + iNESCart.PRGRamSaveSize;
+      unsigned CHRRAM = iNESCart.CHRRamSize + iNESCart.CHRRamSaveSize;
+
+      FCEU_printf(" NES 2.0 extended iNES.\n");
+      FCEU_printf(" Sub Mapper #: %3d\n", iNESCart.submapper);
+      if (PRGRAM || CHRRAM)
+      {
+         if (head.ROM_type & 0x02)
+         {
+            FCEU_printf(" PRG RAM: %d KB (%d KB battery-backed)\n", PRGRAM / 1024, iNESCart.PRGRamSaveSize / 1024);
+            FCEU_printf(" CHR RAM: %d KB (%d KB battery-backed)\n", CHRRAM / 1024, iNESCart.CHRRamSaveSize / 1024);
+         }
+         else
+         {
+            FCEU_printf(" PRG RAM: %d KB\n", PRGRAM / 1024);
+            FCEU_printf(" CHR RAM: %d KB\n", CHRRAM / 1024);
+         }
+      }		
+   }
 #endif
 
-	if (iNESCart.iNES2) {
-		unsigned PRGRAM = iNESCart.PRGRamSize + iNESCart.PRGRamSaveSize;
-		unsigned CHRRAM = iNESCart.CHRRamSize + iNESCart.CHRRamSaveSize;
+   ResetCartMapping();
+   ResetExState(0, 0);
 
-		FCEU_printf(" NES 2.0 extended iNES.\n");
-		FCEU_printf(" Sub Mapper #: %3d\n", iNESCart.submapper);
-		if (PRGRAM || CHRRAM) {
-			if (head.ROM_type & 0x02) {
-				FCEU_printf(" PRG RAM: %d KB (%d KB battery-backed)\n", PRGRAM / 1024, iNESCart.PRGRamSaveSize / 1024);
-				FCEU_printf(" CHR RAM: %d KB (%d KB battery-backed)\n", CHRRAM / 1024, iNESCart.CHRRamSaveSize / 1024);
-			} else {
-				FCEU_printf(" PRG RAM: %d KB\n", PRGRAM / 1024);
-				FCEU_printf(" CHR RAM: %d KB\n", CHRRAM / 1024);
-			}
-		}		
-	}
+   SetupCartPRGMapping(0, ROM, rom_size_pow2, 0);
 
-	ResetCartMapping();
-	ResetExState(0, 0);
+   SetInput();
+   CheckHInfo();
 
-	SetupCartPRGMapping(0, ROM, rom_size_pow2, 0);
+   {
+      int x;
+      uint64 partialmd5 = 0;
+      int mapper    = iNESCart.mapper;
+      int mirroring = iNESCart.mirror;
 
-	SetInput();
-	CheckHInfo();
+      for (x = 0; x < 8; x++)
+         partialmd5 |= (uint64)iNESCart.MD5[7 - x] << (x * 8);
 
-	{
-		int x;
-		uint64 partialmd5 = 0;
-		int mapper    = iNESCart.mapper;
-		int mirroring = iNESCart.mirror;
+      FCEU_VSUniCheck(partialmd5, &mapper, &mirroring);
 
-		for (x = 0; x < 8; x++)
-			partialmd5 |= (uint64)iNESCart.MD5[7 - x] << (x * 8);
+      if ((mapper != iNESCart.mapper) || (mirroring != iNESCart.mirror))
+      {
+         FCEU_PrintError("\n");
+         FCEU_PrintError(" Incorrect VS-Unisystem header information!\n");
+         if (mapper != iNESCart.mapper)
+            FCEU_PrintError(" Mapper:    %d\n", mapper);
+         if (mirroring != iNESCart.mirror)
+            FCEU_PrintError(" Mirroring: %s\n",
+                  (mirroring == 2) ? "None (Four-screen)" : mirroring ? "Vertical" : "Horizontal");
+         iNESCart.mapper = mapper;
+         iNESCart.mirror = mirroring;
+      }
+   }
 
-		FCEU_VSUniCheck(partialmd5, &mapper, &mirroring);
+   /* Must remain here because above functions might change value of
+    * VROM_size and free(VROM).
+    */
+   if (VROM_size)
+      SetupCartCHRMapping(0, VROM, vrom_size_pow2, 0);
 
-		if ((mapper != iNESCart.mapper) || (mirroring != iNESCart.mirror)) {
-			FCEU_PrintError("\n");
-			FCEU_PrintError(" Incorrect VS-Unisystem header information!\n");
-			if (mapper != iNESCart.mapper)    FCEU_PrintError(" Mapper:    %d\n", mapper);
-			if (mirroring != iNESCart.mirror) FCEU_PrintError(" Mirroring: %s\n",
-					(mirroring == 2) ? "None (Four-screen)" : mirroring ? "Vertical" : "Horizontal");
-			iNESCart.mapper = mapper;
-			iNESCart.mirror = mirroring;
-		}
-	}
+   if (iNESCart.mirror == 2)
+   {
+      ExtraNTARAM = (uint8*)FCEU_gmalloc(2048);
+      SetupCartMirroring(4, 1, ExtraNTARAM);
+   }
+   else if (iNESCart.mirror >= 0x10)
+      SetupCartMirroring(2 + (iNESCart.mirror & 1), 1, 0);
+   else
+      SetupCartMirroring(iNESCart.mirror & 1, (iNESCart.mirror & 4) >> 2, 0);
 
-	/* Must remain here because above functions might change value of
-	 * VROM_size and free(VROM).
-	*/
-	if (VROM_size)
-		SetupCartCHRMapping(0, VROM, vrom_size_pow2, 0);
+   iNESCart.battery = (head.ROM_type & 2) ? 1 : 0;
 
-	if (iNESCart.mirror == 2) {
-		ExtraNTARAM = (uint8*)FCEU_gmalloc(2048);
-		SetupCartMirroring(4, 1, ExtraNTARAM);
-	} else if (iNESCart.mirror >= 0x10)
-		SetupCartMirroring(2 + (iNESCart.mirror & 1), 1, 0);
-	else
-		SetupCartMirroring(iNESCart.mirror & 1, (iNESCart.mirror & 4) >> 2, 0);
+   if (!iNES_Init(iNESCart.mapper))
+   {
+      FCEU_printf("\n");
+      FCEU_PrintError(" iNES mapper #%d is not supported at all.\n",
+            iNESCart.mapper);
+      return 0;
+   }
 
-	iNESCart.battery = (head.ROM_type & 2) ? 1 : 0;
+   GameInterface = iNESGI;
 
-	if (!iNES_Init(iNESCart.mapper)) {
-		FCEU_printf("\n");
-		FCEU_PrintError(" iNES mapper #%d is not supported at all.\n", iNESCart.mapper);
-		return 0;
-	}
+   /* 0: RP2C02 ("NTSC NES")
+    * 1: RP2C07 ("Licensed PAL NES")
+    * 2: Multiple-region
+    * 3: UMC 6527P ("Dendy") */
+   if (iNESCart.region == 3)
+      dendy = 1;
+   FCEUI_SetVidSystem((iNESCart.region == 1) ? 1 : 0);
 
-	GameInterface = iNESGI;
-
-	/* 0: RP2C02 ("NTSC NES")
-	 * 1: RP2C07 ("Licensed PAL NES")
-	 * 2: Multiple-region
-	 * 3: UMC 6527P ("Dendy") */
-	if (iNESCart.region == 3) dendy = 1;
-	FCEUI_SetVidSystem((iNESCart.region == 1) ? 1 : 0);
-
-	return 1;
+   return 1;
 }
 
 static int iNES_Init(int num) {

From 8331b3c425b2ac45c32a6314d788595caa2dba60 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 6 Jun 2021 01:57:41 +0200
Subject: [PATCH 133/295] Cleanups

---
 src/fceu-memory.c | 6 ++----
 src/ppu.h         | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/fceu-memory.c b/src/fceu-memory.c
index 6dfecfe..2b99dfb 100644
--- a/src/fceu-memory.c
+++ b/src/fceu-memory.c
@@ -28,8 +28,7 @@
 
 void *FCEU_gmalloc(uint32 size)
 {
-   void *ret;
-   ret = malloc(size);
+   void *ret = malloc(size);
    if (!ret)
    {
       FCEU_PrintError("Error allocating memory!  Doing a hard exit.");
@@ -41,8 +40,7 @@ void *FCEU_gmalloc(uint32 size)
 
 void *FCEU_malloc(uint32 size)
 {
-   void *ret;
-   ret = (void*)malloc(size);
+   void *ret = (void*)malloc(size);
 
    if (!ret)
    {
diff --git a/src/ppu.h b/src/ppu.h
index 96338a1..e3f6cfd 100644
--- a/src/ppu.h
+++ b/src/ppu.h
@@ -6,7 +6,7 @@ void FCEUPPU_Reset(void);
 void FCEUPPU_Power(void);
 int FCEUPPU_Loop(int skip);
 
-void FCEUPPU_LineUpdate();
+void FCEUPPU_LineUpdate(void);
 void FCEUPPU_SetVideoSystem(int w);
 
 extern void (*GameHBIRQHook)(void), (*GameHBIRQHook2)(void);

From 658ef18d2e00a1123860f7c9d3546b5ce913f216 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 6 Jun 2021 02:02:46 +0200
Subject: [PATCH 134/295] Cleanups; turn some functions static

---
 src/ines.c | 270 +++++++++++++++++++++++++++--------------------------
 1 file changed, 138 insertions(+), 132 deletions(-)

diff --git a/src/ines.c b/src/ines.c
index f903018..72d8bdf 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -224,13 +224,16 @@ static struct BADINF BadROMImages[] =
 	#include "ines-bad.h"
 };
 
-void CheckBad(uint64 md5partial) {
+static void CheckBad(uint64 md5partial)
+{
 	int32 x = 0;
-	while (BadROMImages[x].name) {
-		if (BadROMImages[x].md5partial == md5partial) {
-			FCEU_PrintError("The copy game you have loaded, \"%s\", is bad, and will not work properly in FCE Ultra.", BadROMImages[x].name);
-			return;
-		}
+	while (BadROMImages[x].name)
+   {
+		if (BadROMImages[x].md5partial == md5partial)
+      {
+         FCEU_PrintError("The copy game you have loaded, \"%s\", is bad, and will not work properly in FCE Ultra.", BadROMImages[x].name);
+         return;
+      }
 		x++;
 	}
 }
@@ -247,148 +250,149 @@ struct CHINF {
 	int32 extra;
 };
 
-static void CheckHInfo(void) {
+static void CheckHInfo(void)
+{
 #define DEFAULT (-1)
 #define NOEXTRA (-1)
 
-/* used for mirroring special overrides */
+   /* used for mirroring special overrides */
 #define MI_4      2 /* forced 4-screen mirroring */
 #define DFAULT8   8 /* anything but hard-wired (4-screen) mirroring, mapper-controlled */
 
-/* tv system/region */
+   /* tv system/region */
 #define PAL       1
 #define MULTI     2
 #define DENDY     3
 
-	static struct CHINF moo[] =
-	{
-		#include "ines-correct.h"
-	};
-	int32 tofix = 0, x;
-	uint64 partialmd5 = 0;
-	int32 current_mapper = 0;
-	int32 cur_mirr = 0;
+   static struct CHINF moo[] =
+   {
+#include "ines-correct.h"
+   };
+   int32 tofix = 0, x;
+   uint64 partialmd5 = 0;
+   int32 current_mapper = 0;
+   int32 cur_mirr = 0;
 
-	for (x = 0; x < 8; x++)
-		partialmd5 |= (uint64)iNESCart.MD5[15 - x] << (x * 8);
-	CheckBad(partialmd5);
+   for (x = 0; x < 8; x++)
+      partialmd5 |= (uint64)iNESCart.MD5[15 - x] << (x * 8);
+   CheckBad(partialmd5);
 
-	x = 0;
-	do {
-		if (moo[x].crc32 == iNESCart.CRC32) {
-			if (moo[x].mapper >= 0) {
-				if (moo[x].extra >= 0 && moo[x].extra == 0x800 && VROM_size) {
-					VROM_size = 0;
-					free(VROM);
-					VROM = NULL;
-					tofix |= 8;
-				}
-				if (iNESCart.mapper != (moo[x].mapper & 0xFFF)) {
-					tofix |= 1;
-					current_mapper = iNESCart.mapper;
-					iNESCart.mapper = moo[x].mapper & 0xFFF;
-				}
-			}
-			if (moo[x].submapper >= 0) {
-				iNESCart.iNES2 = 1;
-				if (moo[x].submapper != iNESCart.submapper) {
-					iNESCart.submapper = moo[x].submapper;
-				}
-			}
-			if (moo[x].mirror >= 0) {
-				cur_mirr = iNESCart.mirror;
-				if (moo[x].mirror == 8) {
-					if (iNESCart.mirror == 2) {	/* Anything but hard-wired(four screen). */
-						tofix |= 2;
-						iNESCart.mirror = 0;
-					}
-				} else if (iNESCart.mirror != moo[x].mirror) {
-					if (iNESCart.mirror != (moo[x].mirror & ~4))
-						if ((moo[x].mirror & ~4) <= 2)	/* Don't complain if one-screen mirroring
-														needs to be set(the iNES header can't
-														hold this information).
-														*/
-							tofix |= 2;
-					iNESCart.mirror = moo[x].mirror;
-				}
-			}
-			if (moo[x].battery >= 0) {
-				if (!(head.ROM_type & 2) && (moo[x].battery != 0)) {
-					tofix |= 4;
-					head.ROM_type |= 2;
-				}
-			}
-			if (moo[x].region >= 0) {
-				if (iNESCart.region != moo[x].region) {
-					tofix |= 16;
-					iNESCart.region = moo[x].region;
-				}
-			}
+   x = 0;
+   do {
+      if (moo[x].crc32 == iNESCart.CRC32) {
+         if (moo[x].mapper >= 0) {
+            if (moo[x].extra >= 0 && moo[x].extra == 0x800 && VROM_size) {
+               VROM_size = 0;
+               free(VROM);
+               VROM = NULL;
+               tofix |= 8;
+            }
+            if (iNESCart.mapper != (moo[x].mapper & 0xFFF)) {
+               tofix |= 1;
+               current_mapper = iNESCart.mapper;
+               iNESCart.mapper = moo[x].mapper & 0xFFF;
+            }
+         }
+         if (moo[x].submapper >= 0) {
+            iNESCart.iNES2 = 1;
+            if (moo[x].submapper != iNESCart.submapper) {
+               iNESCart.submapper = moo[x].submapper;
+            }
+         }
+         if (moo[x].mirror >= 0) {
+            cur_mirr = iNESCart.mirror;
+            if (moo[x].mirror == 8) {
+               if (iNESCart.mirror == 2) {	/* Anything but hard-wired(four screen). */
+                  tofix |= 2;
+                  iNESCart.mirror = 0;
+               }
+            } else if (iNESCart.mirror != moo[x].mirror) {
+               if (iNESCart.mirror != (moo[x].mirror & ~4))
+                  if ((moo[x].mirror & ~4) <= 2)	/* Don't complain if one-screen mirroring
+                                                      needs to be set(the iNES header can't
+                                                      hold this information).
+                                                      */
+                     tofix |= 2;
+               iNESCart.mirror = moo[x].mirror;
+            }
+         }
+         if (moo[x].battery >= 0) {
+            if (!(head.ROM_type & 2) && (moo[x].battery != 0)) {
+               tofix |= 4;
+               head.ROM_type |= 2;
+            }
+         }
+         if (moo[x].region >= 0) {
+            if (iNESCart.region != moo[x].region) {
+               tofix |= 16;
+               iNESCart.region = moo[x].region;
+            }
+         }
 
-			if (moo[x].prgram >= 0) {
-				tofix |= 32;
-				iNESCart.iNES2 = 1;
-				iNESCart.PRGRamSize = (moo[x].prgram & 0x0F) ? (64 << ((moo[x].prgram >> 0) & 0xF)) : 0;
-				iNESCart.PRGRamSaveSize = (moo[x].prgram & 0xF0) ? (64 << ((moo[x].prgram >> 4) & 0xF)) : 0;
-			}
+         if (moo[x].prgram >= 0) {
+            tofix |= 32;
+            iNESCart.iNES2 = 1;
+            iNESCart.PRGRamSize = (moo[x].prgram & 0x0F) ? (64 << ((moo[x].prgram >> 0) & 0xF)) : 0;
+            iNESCart.PRGRamSaveSize = (moo[x].prgram & 0xF0) ? (64 << ((moo[x].prgram >> 4) & 0xF)) : 0;
+         }
 
-			if (moo[x].chrram >= 0) {
-				tofix |= 32;
-				iNESCart.iNES2 = 1;
-				iNESCart.CHRRamSize = (moo[x].chrram & 0x0F) ? (64 << ((moo[x].chrram >> 0) & 0xF)) : 0;
-				iNESCart.CHRRamSaveSize = (moo[x].chrram & 0xF0) ? (64 << ((moo[x].chrram >> 4) & 0xF)) : 0;
-			}
+         if (moo[x].chrram >= 0) {
+            tofix |= 32;
+            iNESCart.iNES2 = 1;
+            iNESCart.CHRRamSize = (moo[x].chrram & 0x0F) ? (64 << ((moo[x].chrram >> 0) & 0xF)) : 0;
+            iNESCart.CHRRamSaveSize = (moo[x].chrram & 0xF0) ? (64 << ((moo[x].chrram >> 4) & 0xF)) : 0;
+         }
 
-			break;
-		}
-		x++;
-	} while (moo[x].mirror >= 0 || moo[x].mapper >= 0);
+         break;
+      }
+      x++;
+   } while (moo[x].mirror >= 0 || moo[x].mapper >= 0);
 
-	/* Games that use these iNES mappers tend to have the four-screen bit set
-	when it should not be.
-	*/
-	if ((iNESCart.mapper == 118 || iNESCart.mapper == 24 || iNESCart.mapper == 26) && (iNESCart.mirror == 2)) {
-		iNESCart.mirror = 0;
-		tofix |= 2;
-	}
+   /* Games that use these iNES mappers tend to have the four-screen bit set
+      when it should not be.
+      */
+   if ((iNESCart.mapper == 118 || iNESCart.mapper == 24 || iNESCart.mapper == 26) && (iNESCart.mirror == 2)) {
+      iNESCart.mirror = 0;
+      tofix |= 2;
+   }
 
-	/* Four-screen mirroring implicitly set. */
-	if (iNESCart.mapper == 99)
-		iNESCart.mirror = 2;
+   /* Four-screen mirroring implicitly set. */
+   if (iNESCart.mapper == 99)
+      iNESCart.mirror = 2;
 
-	if (tofix) {
-		char gigastr[768];
-		strcpy(gigastr, " The iNES header contains incorrect information.  For now, the information will be corrected in RAM. ");
-		if (tofix & 1)
-			sprintf(gigastr + strlen(gigastr), "Current mapper # is %d. The mapper number should be set to %d. ", current_mapper, iNESCart.mapper);
-		if (tofix & 2) {
-			uint8 *mstr[3] = { (uint8_t*)"Horizontal", (uint8_t*)"Vertical", (uint8_t*)"Four-screen" };
-			sprintf(gigastr + strlen(gigastr), "Current mirroring is %s. Mirroring should be set to \"%s\". ", mstr[cur_mirr & 3], mstr[iNESCart.mirror & 3]);
-		}
-		if (tofix & 4)
-			strcat(gigastr, "The battery-backed bit should be set.  ");
-		if (tofix & 8)
-			strcat(gigastr, "This game should not have any CHR ROM.  ");
-		if (tofix & 16) {
-			uint8 *rstr[4] = { (uint8*)"NTSC", (uint8*)"PAL", (uint8*)"Multi", (uint8*)"Dendy" };
-			sprintf(gigastr + strlen(gigastr), "This game should run with \"%s\" timings.", rstr[iNESCart.region]);
-		}
-		if (tofix & 32) {
-			unsigned PRGRAM = iNESCart.PRGRamSize + iNESCart.PRGRamSaveSize;
-			unsigned CHRRAM = iNESCart.CHRRamSize + iNESCart.CHRRamSaveSize;
-			if (PRGRAM || CHRRAM) {
-				if (iNESCart.PRGRamSaveSize == 0)
-					sprintf(gigastr + strlen(gigastr), "workram: %d KB, ", PRGRAM / 1024);
-				else if (iNESCart.PRGRamSize == 0)
-					sprintf(gigastr + strlen(gigastr), "saveram: %d KB, ", PRGRAM / 1024);
-				else
-					sprintf(gigastr + strlen(gigastr), "workram: %d KB (%dKB battery-backed), ", PRGRAM / 1024, iNESCart.PRGRamSaveSize / 1024);
-				sprintf(gigastr + strlen(gigastr), "chrram: %d KB.", (CHRRAM + iNESCart.CHRRamSaveSize) / 1024);
-			}
-		}
-		strcat(gigastr, "\n");
-		FCEU_printf("%s\n", gigastr);
-	}
+   if (tofix) {
+      char gigastr[768];
+      strcpy(gigastr, " The iNES header contains incorrect information.  For now, the information will be corrected in RAM. ");
+      if (tofix & 1)
+         sprintf(gigastr + strlen(gigastr), "Current mapper # is %d. The mapper number should be set to %d. ", current_mapper, iNESCart.mapper);
+      if (tofix & 2) {
+         uint8 *mstr[3] = { (uint8_t*)"Horizontal", (uint8_t*)"Vertical", (uint8_t*)"Four-screen" };
+         sprintf(gigastr + strlen(gigastr), "Current mirroring is %s. Mirroring should be set to \"%s\". ", mstr[cur_mirr & 3], mstr[iNESCart.mirror & 3]);
+      }
+      if (tofix & 4)
+         strcat(gigastr, "The battery-backed bit should be set.  ");
+      if (tofix & 8)
+         strcat(gigastr, "This game should not have any CHR ROM.  ");
+      if (tofix & 16) {
+         uint8 *rstr[4] = { (uint8*)"NTSC", (uint8*)"PAL", (uint8*)"Multi", (uint8*)"Dendy" };
+         sprintf(gigastr + strlen(gigastr), "This game should run with \"%s\" timings.", rstr[iNESCart.region]);
+      }
+      if (tofix & 32) {
+         unsigned PRGRAM = iNESCart.PRGRamSize + iNESCart.PRGRamSaveSize;
+         unsigned CHRRAM = iNESCart.CHRRamSize + iNESCart.CHRRamSaveSize;
+         if (PRGRAM || CHRRAM) {
+            if (iNESCart.PRGRamSaveSize == 0)
+               sprintf(gigastr + strlen(gigastr), "workram: %d KB, ", PRGRAM / 1024);
+            else if (iNESCart.PRGRamSize == 0)
+               sprintf(gigastr + strlen(gigastr), "saveram: %d KB, ", PRGRAM / 1024);
+            else
+               sprintf(gigastr + strlen(gigastr), "workram: %d KB (%dKB battery-backed), ", PRGRAM / 1024, iNESCart.PRGRamSaveSize / 1024);
+            sprintf(gigastr + strlen(gigastr), "chrram: %d KB.", (CHRRAM + iNESCart.CHRRamSaveSize) / 1024);
+         }
+      }
+      strcat(gigastr, "\n");
+      FCEU_printf("%s\n", gigastr);
+   }
 
 #undef DEFAULT
 #undef NOEXTRA
@@ -804,13 +808,15 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "LH53",                     535, LH53_Init              )
 INES_BOARD_END()
 
-static uint32 get_ines_version(void) {
+static uint32 get_ines_version(void)
+{
 	if ((head.ROM_type2 & 0x0C) == 0x08)
 		return 1;
 	return 0;
 }
 
-static uint32 get_ines_mapper_id(void) {
+static uint32 get_ines_mapper_id(void)
+{
 	/* If byte 7 AND $0C = $08, and the size taking into account byte 9 does not exceed the actual size of the ROM image, then NES 2.0.
 	 * If byte 7 AND $0C = $00, and bytes 12-15 are all 0, then iNES.
 	 * Otherwise, archaic iNES. - nesdev*/

From 19bba93928b480043a0e3be92c23428128fc0f50 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Mon, 7 Jun 2021 18:55:32 +0200
Subject: [PATCH 135/295] Add FF7 translation to ines-correct.h

---
 src/ines-correct.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ines-correct.h b/src/ines-correct.h
index 0f86a4e..9634bbb 100644
--- a/src/ines-correct.h
+++ b/src/ines-correct.h
@@ -368,6 +368,7 @@
 	/* Mapper 163: Nanjing, running with $5300=$04 */
 	{ 0xC9ABA7F0,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Chrono Trigger - 时空之轮 */
 	{ 0x143B4D30,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Final Fantasy VII - 最终幻想 7 */
+	{ 0x609458B6,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* Final Fantasy VII - 最终幻想 7, English translation */
 	{ 0x3CC55A44,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* The Legend of Zelda - 塞尔达传说: 神奇的帽子 */
 	{ 0x4752BD5E,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 七國大戰 */
 	{ 0x1121C0D1,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 三国志 之 傲视天地 */

From 9e7f924a6759e82a31884336be61f154cc7fde9a Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Mon, 7 Jun 2021 19:09:37 +0200
Subject: [PATCH 136/295] Add a few misheadered ROMs from a Nanjing ROM pack to
 ines-correct.h

---
 src/ines-correct.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/ines-correct.h b/src/ines-correct.h
index 9634bbb..5881b6b 100644
--- a/src/ines-correct.h
+++ b/src/ines-correct.h
@@ -783,6 +783,13 @@
 	{ 0xB6984DAD,  176,       3, DEFAULT, 1,    0x07,    0x0B, DEFAULT, NOEXTRA }, /* Super Mario 160-in-1 Funny Time.nes */
 	{ 0xB6984DAD,  176,       4, DEFAULT, 1,    0x07,    0x07, DEFAULT, NOEXTRA }, /* GameStar Smart Genius Deluxe.nes */
 
+	/* Nanjing games that are sometimes found erroneously set to mapper 163 even though they use other mappers */
+	{ 0x3CD15707,  178,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* [NJ027] Fang Shi Yu (C) */
+	{ 0x2779BB41,  534,       0,    MI_V, 0, DEFAULT,    0x07,   DENDY, NOEXTRA }, /* [NJ064] Shu Du (Sudoku) (C) */
+	{ 0x1DE558A1,  178,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* [NJ085] Shan Shan De Hong Xing (C) */
+	{ 0xF814EC57,  178,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* [NJ090] Yong Zhe Chuan Shuo (C) */
+	{ 0x53A1F436,  178,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* [NJ091] Xian Jian Wen Qing (C) */
+
 	/* Non-Mapper 176 files that are sometimes found erroneously set to mapper 176 */
 	{ 0x60AC647F,  260,       0, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* (YH-4222) Super Game 4-in-1.nes */
 

From 07236cdd44689cb8f35b06b8e05d5991d9e40d00 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Mon, 7 Jun 2021 19:15:13 +0200
Subject: [PATCH 137/295] Comment style

---
 src/boards/163.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/boards/163.c b/src/boards/163.c
index 393817b..a285fff 100644
--- a/src/boards/163.c
+++ b/src/boards/163.c
@@ -65,8 +65,8 @@ static DECLFW(writeReg)
    
    if (A &1)
    {
-      if (reg[1] &0x01 && ~V &0x01) reg[1] ^=0x04;  // If A0=1, flip feedback bit on falling edges of D0
-   }                                                // If A0=0, write to register
+      if (reg[1] &0x01 && ~V &0x01) reg[1] ^=0x04;  /* If A0=1, flip feedback bit on falling edges of D0 */
+   }                                                /* If A0=0, write to register */
    else
       reg[index] = V;
    sync();

From 3a85082268fdec52d9da450ba069e57735725cf9 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Mon, 7 Jun 2021 19:23:09 +0200
Subject: [PATCH 138/295] Found a database mistake

---
 src/ines-correct.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ines-correct.h b/src/ines-correct.h
index 5881b6b..b5d9458 100644
--- a/src/ines-correct.h
+++ b/src/ines-correct.h
@@ -781,7 +781,7 @@
 	{ 0x42161530,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 龙魂 [protection removed].nes */
 	{ 0x8F8FC9A7,  176,       2, DEFAULT, 1,    0x90,    0x07,   DENDY, NOEXTRA }, /* 龙魂.nes */
 	{ 0xB6984DAD,  176,       3, DEFAULT, 1,    0x07,    0x0B, DEFAULT, NOEXTRA }, /* Super Mario 160-in-1 Funny Time.nes */
-	{ 0xB6984DAD,  176,       4, DEFAULT, 1,    0x07,    0x07, DEFAULT, NOEXTRA }, /* GameStar Smart Genius Deluxe.nes */
+	{ 0xAD82BBEA,  176,       4, DEFAULT, 1,    0x07,    0x07, DEFAULT, NOEXTRA }, /* GameStar Smart Genius Deluxe.nes */
 
 	/* Nanjing games that are sometimes found erroneously set to mapper 163 even though they use other mappers */
 	{ 0x3CD15707,  178,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* [NJ027] Fang Shi Yu (C) */

From 152198515cb52ca9f92f4c792cd4ec9caff85b8f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 14 Jun 2021 15:26:43 +0200
Subject: [PATCH 139/295] Buildfix

---
 src/boards/eeprom_93C66.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/boards/eeprom_93C66.c b/src/boards/eeprom_93C66.c
index c52e602..9f793ec 100644
--- a/src/boards/eeprom_93C66.c
+++ b/src/boards/eeprom_93C66.c
@@ -87,7 +87,12 @@ void eeprom_93C66_write (uint8 CS, uint8 CLK, uint8 DAT)
                      eeprom_93C66_state = STATE_FINISHED;
                      break;
                   case OPCODE_ERASEALL:
-                     if (eeprom_93C66_writeEnabled) for (int i =0; i <512; i++) eeprom_93C66_storage[i] = 0xFF;
+                     if (eeprom_93C66_writeEnabled)
+                     {
+                        int i;
+                        for (i =0; i <512; i++)
+                           eeprom_93C66_storage[i] = 0xFF;
+                     }
                      eeprom_93C66_state = STATE_FINISHED;
                      break;
                   case OPCODE_WRITEALL:

From 4b9f65e27be74c17fa98924119e47013051e326d Mon Sep 17 00:00:00 2001
From: negativeExponent <54053706+negativeExponent@users.noreply.github.com>
Date: Sun, 4 Jul 2021 22:10:50 +0800
Subject: [PATCH 140/295] Fix controller info index

---
 src/drivers/libretro/libretro.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index cf226c7..2c2501b 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -927,7 +927,7 @@ void retro_set_environment(retro_environment_t cb)
       { pads2, 4 },
       { pads3, 2 },
       { pads4, 2 },
-      { pads5, 5 },
+      { pads5, 6 },
       { 0, 0 },
    };
 

From 82b5a135a015161f587977f1fbfcc62c18dfcbce Mon Sep 17 00:00:00 2001
From: Poligraf <>
Date: Tue, 27 Jul 2021 19:55:09 +1200
Subject: [PATCH 141/295] Add retrofw target

---
 Makefile.libretro | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index 86563b0..ba9568b 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -433,7 +433,18 @@ else ifeq ($(platform), gcw0)
 	SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
 	PLATFORM_DEFINES += -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float -fomit-frame-pointer
 	EXTERNAL_ZLIB = 1
-
+	
+# RETROFW
+else ifeq ($(platform), retrofw)
+	TARGET := $(TARGET_NAME)_libretro.so
+	CC = /opt/retrofw-toolchain/usr/bin/mipsel-linux-gcc
+	CXX = /opt/gcw0-toolchain/usr/bin/mipsel-linux-g++
+	AR = /opt/retrofw-toolchain/usr/bin/mipsel-linux-ar
+	fpic := -fPIC
+	SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
+	PLATFORM_DEFINES += -ffast-math -march=mips32 -mtune=mips32 -mhard-float -fomit-frame-pointer
+	EXTERNAL_ZLIB = 1
+		
 # Windows MSVC 2017 all architectures
 else ifneq (,$(findstring windows_msvc2017,$(platform)))
 	CC  = cl.exe

From 19e7181d780206c0b04ae40ee51a06af60281607 Mon Sep 17 00:00:00 2001
From: jdgleaver <james@leaver.myzen.co.uk>
Date: Thu, 29 Jul 2021 13:39:30 +0100
Subject: [PATCH 142/295] (.gitlab-ci.yml) Add RetroFW target

---
 .gitlab-ci.yml    | 6 ++++++
 Makefile.libretro | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6771abe..f794a11 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -278,6 +278,12 @@ libretro-build-dingux-odbeta-mips32:
     - .libretro-dingux-odbeta-mips32-make-default
     - .core-defs
 
+# RetroFW
+libretro-build-retrofw-mips32:
+  extends:
+    - .libretro-retrofw-mips32-make-default
+    - .core-defs
+
 #################################### MISC ##################################
 # Emscripten
 libretro-build-emscripten:
diff --git a/Makefile.libretro b/Makefile.libretro
index ba9568b..2f2bb5a 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -433,18 +433,18 @@ else ifeq ($(platform), gcw0)
 	SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
 	PLATFORM_DEFINES += -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float -fomit-frame-pointer
 	EXTERNAL_ZLIB = 1
-	
+
 # RETROFW
 else ifeq ($(platform), retrofw)
 	TARGET := $(TARGET_NAME)_libretro.so
 	CC = /opt/retrofw-toolchain/usr/bin/mipsel-linux-gcc
-	CXX = /opt/gcw0-toolchain/usr/bin/mipsel-linux-g++
+	CXX = /opt/retrofw-toolchain/usr/bin/mipsel-linux-g++
 	AR = /opt/retrofw-toolchain/usr/bin/mipsel-linux-ar
 	fpic := -fPIC
 	SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
 	PLATFORM_DEFINES += -ffast-math -march=mips32 -mtune=mips32 -mhard-float -fomit-frame-pointer
 	EXTERNAL_ZLIB = 1
-		
+
 # Windows MSVC 2017 all architectures
 else ifneq (,$(findstring windows_msvc2017,$(platform)))
 	CC  = cl.exe

From 0ce638d8c93da839f1b1d543aee65540652561bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juliano=20Dorig=C3=A3o?= <jdorigao@gmail.com>
Date: Sat, 11 Sep 2021 16:17:05 -0400
Subject: [PATCH 143/295] Added rpi3_64 to makefile

---
 Makefile.libretro | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Makefile.libretro b/Makefile.libretro
index 2f2bb5a..d4e86bf 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -240,6 +240,14 @@ else ifeq ($(platform), rpi3)
 	CFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard -funsafe-math-optimizations
 	CFLAGS += -fomit-frame-pointer -fstrict-aliasing -ffast-math
 
+# Raspberry Pi 3 (64 bit)
+else ifeq ($(platform), rpi3_64)
+	TARGET := $(TARGET_NAME)_libretro.so
+	fpic := -fPIC
+	SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
+	CFLAGS += -mcpu=cortex-a53 -mtune=cortex-a53 -funsafe-math-optimizations
+	CFLAGS += -fomit-frame-pointer -fstrict-aliasing -ffast-math
+
 # Raspberry Pi 4 (64-bit)
 else ifeq ($(platform), rpi4)
 	TARGET := $(TARGET_NAME)_libretro.so

From 21c829ba435e683655cc01ad34a617ebd993517d Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 21 Sep 2021 22:21:44 +0200
Subject: [PATCH 144/295] Add mapper 236

---
 src/boards/236.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  2 +-
 2 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 src/boards/236.c

diff --git a/src/boards/236.c b/src/boards/236.c
new file mode 100644
index 0000000..f4af1c9
--- /dev/null
+++ b/src/boards/236.c
@@ -0,0 +1,99 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2012 CaH4e3
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "mapinc.h"
+
+static uint8 reg[2];
+static uint8 dip;
+static SFORMAT StateRegs[] =
+{
+	{ reg,  2, "REG " },
+	{ &dip, 1, "DIP " },
+	{ 0 }
+};
+
+static void Sync(void)
+{
+	int prg = reg[1] &7 | reg[0] <<3;
+	switch (reg[1] >>4 &3)
+	{
+		case 0:
+		case 1:
+			setprg16(0x8000, prg);
+			setprg16(0xC000, prg |7);
+			break;
+		case 2:
+			setprg32(0x8000, prg >>1);
+			break;
+		case 3:
+			setprg16(0x8000, prg);
+			setprg16(0xC000, prg);
+			break;
+	}
+	setchr8(reg[0] &7);
+	setmirror((reg[0] >>5 &1) ^1);
+}
+
+
+static DECLFR(M236Read)
+{
+	if ((reg[1] >>4 &3) ==1)
+		return CartBR(A &~0xF | dip);
+	else
+		return CartBR(A);
+}
+
+static DECLFW(M236WriteReg)
+{
+	reg[A >>14 &1] =A &0xFF;
+	Sync();
+}
+
+static void M236Power(void)
+{
+	dip = 0;
+	reg[0] = 0;
+	reg[1] = 0;
+	Sync();
+	SetWriteHandler(0x8000, 0xFFFF, M236WriteReg);
+	SetReadHandler(0x8000, 0xFFFF, M236Read);
+}
+
+static void M236Reset(void)
+{
+	++dip;
+	/* Soft-reset returns to menu */
+	reg[0] = 0;
+	reg[1] = 0;
+	Sync();
+}
+
+static void StateRestore(int version)
+{
+	Sync();
+}
+
+void Mapper236_Init(CartInfo *info)
+{
+	info->Power = M236Power;
+	info->Reset = M236Reset;
+	AddExState(&StateRegs, ~0, 0, 0);
+	GameStateRestore = StateRestore;
+}
diff --git a/src/ines.c b/src/ines.c
index 973d875..1e7f7f0 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -655,7 +655,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "BMC 22+20-in-1 RST",       233, Mapper233_Init         )
 	INES_BOARD( "BMC MAXI",                 234, Mapper234_Init         )
 	INES_BOARD( "Golden Game",              235, Mapper235_Init         )
-/*    INES_BOARD( "",                            236, Mapper236_Init ) */
+	INES_BOARD( "Realtec 8155",             236, Mapper236_Init         )
 	INES_BOARD( "Teletubbies / Y2K",        237, Mapper237_Init         )
 	INES_BOARD( "UNL6035052",               238, UNL6035052_Init        )
 /*    INES_BOARD( "",                            239, Mapper239_Init ) */

From cb3a22daf0bf6da9c14c4158864c703318c2d70e Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 21 Sep 2021 23:36:44 +0200
Subject: [PATCH 145/295] Mapper 134: Add PRG/CHR A19 outer bank bits

---
 src/boards/Bs5652.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/boards/Bs5652.c b/src/boards/Bs5652.c
index a9f8ad3..237571f 100644
--- a/src/boards/Bs5652.c
+++ b/src/boards/Bs5652.c
@@ -62,8 +62,8 @@ void Bs5652AnalyzeReg()
 	readDIP = exRegs[0] & 0x40;
 	prgAND = exRegs[1] & 0x04 ? 0x0F : 0x1F;
 	chrAND = exRegs[1] & 0x40 ? 0x7F : 0xFF;
-	prgOR = (exRegs[1] & 0x03) << 4;
-	chrOR = (exRegs[1] & 0x30) << 3 ;
+	prgOR = (exRegs[1] & 0x03) << 4 | (exRegs[0] & 0x10) << 2;
+	chrOR = (exRegs[1] & 0x30) << 3 | (exRegs[0] & 0x20) << 4;
 	nrom = exRegs[0] & 0x08;
 	nrom128 = exRegs[1] & 0x08;
 }

From 6881c1fd2a2e268c50ceac8c1605eaa6f12528f9 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 25 Sep 2021 03:41:39 +0200
Subject: [PATCH 146/295] Some MSVC / C89 buildfixes

---
 src/boards/162.c   | 5 +++--
 src/boards/163.c   | 5 +++--
 src/boards/164.c   | 5 +++--
 src/boards/558.c   | 5 +++--
 src/boards/fk23c.c | 6 ++++--
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/boards/162.c b/src/boards/162.c
index 6a57890..4dd12bf 100644
--- a/src/boards/162.c
+++ b/src/boards/162.c
@@ -77,7 +77,7 @@ static void power(void)
    SetWriteHandler(0x6000, 0x7FFF, CartBW);
 }
 
-static void reset()
+static void reset(void)
 {
    memset(reg, 0, sizeof(reg));
    sync();
@@ -85,13 +85,14 @@ static void reset()
 
 void Mapper162_Init (CartInfo *info)
 {
+   uint8 *WRAM;
    uint32 WRAMSIZE = info->iNES2? (info->PRGRamSize + info->PRGRamSaveSize): 8192;
    info->Power   = power;
    info->Reset   = reset;
    GameHBIRQHook = hblank;
    AddExState(StateRegs, ~0, 0, 0);
 
-   uint8* WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
+   WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
    SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
    FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
    if (info->battery) {
diff --git a/src/boards/163.c b/src/boards/163.c
index a285fff..94ff9d3 100644
--- a/src/boards/163.c
+++ b/src/boards/163.c
@@ -82,7 +82,7 @@ static void power(void)
    SetWriteHandler(0x6000, 0x7FFF, CartBW);
 }
 
-static void reset()
+static void reset(void)
 {
    memset(reg, 0, sizeof(reg));
    sync();
@@ -90,13 +90,14 @@ static void reset()
 
 void Mapper163_Init (CartInfo *info)
 {
+   uint8 *WRAM;
    uint32 WRAMSIZE = info->iNES2? (info->PRGRamSize + info->PRGRamSaveSize): 8192;
    info->Power   = power;
    info->Reset   = reset;
    GameHBIRQHook = hblank;
    AddExState(StateRegs, ~0, 0, 0);
 
-   uint8* WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
+   WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
    SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
    FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
    if (info->battery) {
diff --git a/src/boards/164.c b/src/boards/164.c
index a9d7c9e..06c7b39 100644
--- a/src/boards/164.c
+++ b/src/boards/164.c
@@ -95,7 +95,7 @@ static void power(void)
    SetWriteHandler(0x6000, 0x7FFF, CartBW);
 }
 
-static void reset()
+static void reset(void)
 {
    memset(reg, 0, sizeof(reg));
    sync();
@@ -103,12 +103,13 @@ static void reset()
 
 void Mapper164_Init (CartInfo *info)
 {
+   uint8 *WRAM;
    uint32 WRAMSIZE = info->iNES2? (info->PRGRamSize + (info->PRGRamSaveSize &~0x7FF)): 8192;
    info->Power = power;
    info->Reset = reset;
    AddExState(StateRegs, ~0, 0, 0);
 
-   uint8* WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
+   WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
    SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
    FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
 
diff --git a/src/boards/558.c b/src/boards/558.c
index b622a61..a6664c0 100644
--- a/src/boards/558.c
+++ b/src/boards/558.c
@@ -91,7 +91,7 @@ static void power(void)
    SetWriteHandler(0x6000, 0x7FFF, CartBW);
 }
 
-static void reset()
+static void reset(void)
 {
    memset(reg, 0, sizeof(reg));
    sync();
@@ -99,13 +99,14 @@ static void reset()
 
 void Mapper558_Init (CartInfo *info)
 {
+   uint8 *WRAM;
    uint32 WRAMSIZE = info->PRGRamSize + (info->PRGRamSaveSize &~0x7FF);
    info->Power   = power;
    info->Reset   = reset;
    GameHBIRQHook = hblank;
    AddExState(StateRegs, ~0, 0, 0);
 
-   uint8* WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
+   WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
    SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
    FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
    haveEEPROM =!!(info->PRGRamSaveSize &0x200);
diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c
index bbbb23b..b5c13f5 100644
--- a/src/boards/fk23c.c
+++ b/src/boards/fk23c.c
@@ -290,8 +290,9 @@ static DECLFW(Write8000)
    {
       case 0x8000:
       {
+         uint8 old_ctrl;
          if (A & 2) return; /* Confirmed on real hardware: writes to 8002 and 8003, or 9FFE and 9FFF, are ignored. Needed for Dr. Mario on some of the "bouncing ball" multis. */
-         uint8 old_ctrl = mmc3_ctrl;
+         old_ctrl = mmc3_ctrl;
       
          /* Subtype 2, 8192 or more KiB PRG-ROM, no CHR-ROM: Like Subtype 0,
           * but MMC3 registers $46 and $47 swapped. */
@@ -315,8 +316,9 @@ static DECLFW(Write8000)
       }
       case 0x8001:
       {
+         uint8 ctrl_mask;
          if (A & 2) return; /* Confirmed on real hardware: writes to 8002 and 8003, or 9FFE and 9FFF, are ignored. Needed for Dr. Mario on some of the "bouncing ball" multis. */
-         uint8 ctrl_mask = MMC3_EXTENDED ? 0x0F : 0x07;
+         ctrl_mask = MMC3_EXTENDED ? 0x0F : 0x07;
       
          if ((mmc3_ctrl & ctrl_mask) < 12)
          {

From 1502ca02d4297a58ab18c59e330935d34b1a7c07 Mon Sep 17 00:00:00 2001
From: jdgleaver <james@leaver.myzen.co.uk>
Date: Fri, 8 Oct 2021 12:39:52 +0100
Subject: [PATCH 147/295] Fix core options version detection

---
 src/drivers/libretro/libretro_core_options.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/drivers/libretro/libretro_core_options.h b/src/drivers/libretro/libretro_core_options.h
index fe35d72..e3deb8e 100644
--- a/src/drivers/libretro/libretro_core_options.h
+++ b/src/drivers/libretro/libretro_core_options.h
@@ -477,7 +477,7 @@ static INLINE void libretro_set_core_options(retro_environment_t environ_cb)
    if (!environ_cb)
       return;
 
-   if (environ_cb(RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION, &version) && (version == 1))
+   if (environ_cb(RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION, &version) && (version >= 1))
    {
       struct retro_core_options_intl core_options_intl;
       unsigned language = 0;

From 0c82e4c73e0771433f25648edb82608919c5a903 Mon Sep 17 00:00:00 2001
From: jdgleaver <james@leaver.myzen.co.uk>
Date: Tue, 19 Oct 2021 17:33:56 +0100
Subject: [PATCH 148/295] Update core options to v2 format (add category
 support)

---
 .../libretro-common/include/libretro.h        | 799 ++++++++++++++++-
 src/drivers/libretro/libretro.c               | 229 +++--
 src/drivers/libretro/libretro_core_options.h  | 806 +++++++++++-------
 .../libretro/libretro_core_options_intl.h     |  91 ++
 src/drivers/libretro/libretro_dipswitch.c     |  44 +-
 src/drivers/libretro/libretro_dipswitch.h     |   2 +-
 src/ntsc/nes_ntsc_config.h                    |   2 +-
 7 files changed, 1570 insertions(+), 403 deletions(-)
 create mode 100644 src/drivers/libretro/libretro_core_options_intl.h

diff --git a/src/drivers/libretro/libretro-common/include/libretro.h b/src/drivers/libretro/libretro-common/include/libretro.h
index 8a5da86..2f17483 100644
--- a/src/drivers/libretro/libretro-common/include/libretro.h
+++ b/src/drivers/libretro/libretro-common/include/libretro.h
@@ -1131,6 +1131,13 @@ enum retro_mod
                                             * retro_core_option_definition structs to RETRO_ENVIRONMENT_SET_CORE_OPTIONS_INTL.
                                             * This allows the core to additionally set option sublabel information
                                             * and/or provide localisation support.
+                                            *
+                                            * If version is >= 2, core options may instead be set by passing
+                                            * a retro_core_options_v2 struct to RETRO_ENVIRONMENT_SET_CORE_OPTIONS_V2,
+                                            * or an array of retro_core_options_v2 structs to
+                                            * RETRO_ENVIRONMENT_SET_CORE_OPTIONS_V2_INTL. This allows the core
+                                            * to additionally set optional core option category information
+                                            * for frontends with core option category support.
                                             */
 
 #define RETRO_ENVIRONMENT_SET_CORE_OPTIONS 53
@@ -1172,7 +1179,7 @@ enum retro_mod
                                             * default value is NULL, the first entry in the
                                             * retro_core_option_definition::values array is treated as the default.
                                             *
-                                            * The number of possible options should be very limited,
+                                            * The number of possible option values should be very limited,
                                             * and must be less than RETRO_NUM_CORE_OPTION_VALUES_MAX.
                                             * i.e. it should be feasible to cycle through options
                                             * without a keyboard.
@@ -1205,6 +1212,7 @@ enum retro_mod
                                             * This should only be called if RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION
                                             * returns an API version of >= 1.
                                             * This should be called instead of RETRO_ENVIRONMENT_SET_VARIABLES.
+                                            * This should be called instead of RETRO_ENVIRONMENT_SET_CORE_OPTIONS.
                                             * This should be called the first time as early as
                                             * possible (ideally in retro_set_environment).
                                             * Afterwards it may be called again for the core to communicate
@@ -1378,6 +1386,373 @@ enum retro_mod
                                             * call will target the newly initialized driver.
                                             */
 
+#define RETRO_ENVIRONMENT_SET_FASTFORWARDING_OVERRIDE 64
+                                           /* const struct retro_fastforwarding_override * --
+                                            * Used by a libretro core to override the current
+                                            * fastforwarding mode of the frontend.
+                                            * If NULL is passed to this function, the frontend
+                                            * will return true if fastforwarding override
+                                            * functionality is supported (no change in
+                                            * fastforwarding state will occur in this case).
+                                            */
+
+#define RETRO_ENVIRONMENT_SET_CONTENT_INFO_OVERRIDE 65
+                                           /* const struct retro_system_content_info_override * --
+                                            * Allows an implementation to override 'global' content
+                                            * info parameters reported by retro_get_system_info().
+                                            * Overrides also affect subsystem content info parameters
+                                            * set via RETRO_ENVIRONMENT_SET_SUBSYSTEM_INFO.
+                                            * This function must be called inside retro_set_environment().
+                                            * If callback returns false, content info overrides
+                                            * are unsupported by the frontend, and will be ignored.
+                                            * If callback returns true, extended game info may be
+                                            * retrieved by calling RETRO_ENVIRONMENT_GET_GAME_INFO_EXT
+                                            * in retro_load_game() or retro_load_game_special().
+                                            *
+                                            * 'data' points to an array of retro_system_content_info_override
+                                            * structs terminated by a { NULL, false, false } element.
+                                            * If 'data' is NULL, no changes will be made to the frontend;
+                                            * a core may therefore pass NULL in order to test whether
+                                            * the RETRO_ENVIRONMENT_SET_CONTENT_INFO_OVERRIDE and
+                                            * RETRO_ENVIRONMENT_GET_GAME_INFO_EXT callbacks are supported
+                                            * by the frontend.
+                                            *
+                                            * For struct member descriptions, see the definition of
+                                            * struct retro_system_content_info_override.
+                                            *
+                                            * Example:
+                                            *
+                                            * - struct retro_system_info:
+                                            * {
+                                            *    "My Core",                      // library_name
+                                            *    "v1.0",                         // library_version
+                                            *    "m3u|md|cue|iso|chd|sms|gg|sg", // valid_extensions
+                                            *    true,                           // need_fullpath
+                                            *    false                           // block_extract
+                                            * }
+                                            *
+                                            * - Array of struct retro_system_content_info_override:
+                                            * {
+                                            *    {
+                                            *       "md|sms|gg", // extensions
+                                            *       false,       // need_fullpath
+                                            *       true         // persistent_data
+                                            *    },
+                                            *    {
+                                            *       "sg",        // extensions
+                                            *       false,       // need_fullpath
+                                            *       false        // persistent_data
+                                            *    },
+                                            *    { NULL, false, false }
+                                            * }
+                                            *
+                                            * Result:
+                                            * - Files of type m3u, cue, iso, chd will not be
+                                            *   loaded by the frontend. Frontend will pass a
+                                            *   valid path to the core, and core will handle
+                                            *   loading internally
+                                            * - Files of type md, sms, gg will be loaded by
+                                            *   the frontend. A valid memory buffer will be
+                                            *   passed to the core. This memory buffer will
+                                            *   remain valid until retro_deinit() returns
+                                            * - Files of type sg will be loaded by the frontend.
+                                            *   A valid memory buffer will be passed to the core.
+                                            *   This memory buffer will remain valid until
+                                            *   retro_load_game() (or retro_load_game_special())
+                                            *   returns
+                                            *
+                                            * NOTE: If an extension is listed multiple times in
+                                            * an array of retro_system_content_info_override
+                                            * structs, only the first instance will be registered
+                                            */
+
+#define RETRO_ENVIRONMENT_GET_GAME_INFO_EXT 66
+                                           /* const struct retro_game_info_ext ** --
+                                            * Allows an implementation to fetch extended game
+                                            * information, providing additional content path
+                                            * and memory buffer status details.
+                                            * This function may only be called inside
+                                            * retro_load_game() or retro_load_game_special().
+                                            * If callback returns false, extended game information
+                                            * is unsupported by the frontend. In this case, only
+                                            * regular retro_game_info will be available.
+                                            * RETRO_ENVIRONMENT_GET_GAME_INFO_EXT is guaranteed
+                                            * to return true if RETRO_ENVIRONMENT_SET_CONTENT_INFO_OVERRIDE
+                                            * returns true.
+                                            *
+                                            * 'data' points to an array of retro_game_info_ext structs.
+                                            *
+                                            * For struct member descriptions, see the definition of
+                                            * struct retro_game_info_ext.
+                                            *
+                                            * - If function is called inside retro_load_game(),
+                                            *   the retro_game_info_ext array is guaranteed to
+                                            *   have a size of 1 - i.e. the returned pointer may
+                                            *   be used to access directly the members of the
+                                            *   first retro_game_info_ext struct, for example:
+                                            *
+                                            *      struct retro_game_info_ext *game_info_ext;
+                                            *      if (environ_cb(RETRO_ENVIRONMENT_GET_GAME_INFO_EXT, &game_info_ext))
+                                            *         printf("Content Directory: %s\n", game_info_ext->dir);
+                                            *
+                                            * - If the function is called inside retro_load_game_special(),
+                                            *   the retro_game_info_ext array is guaranteed to have a
+                                            *   size equal to the num_info argument passed to
+                                            *   retro_load_game_special()
+                                            */
+
+#define RETRO_ENVIRONMENT_SET_CORE_OPTIONS_V2 67
+                                           /* const struct retro_core_options_v2 * --
+                                            * Allows an implementation to signal the environment
+                                            * which variables it might want to check for later using
+                                            * GET_VARIABLE.
+                                            * This allows the frontend to present these variables to
+                                            * a user dynamically.
+                                            * This should only be called if RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION
+                                            * returns an API version of >= 2.
+                                            * This should be called instead of RETRO_ENVIRONMENT_SET_VARIABLES.
+                                            * This should be called instead of RETRO_ENVIRONMENT_SET_CORE_OPTIONS.
+                                            * This should be called the first time as early as
+                                            * possible (ideally in retro_set_environment).
+                                            * Afterwards it may be called again for the core to communicate
+                                            * updated options to the frontend, but the number of core
+                                            * options must not change from the number in the initial call.
+                                            * If RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION returns an API
+                                            * version of >= 2, this callback is guaranteed to succeed
+                                            * (i.e. callback return value does not indicate success)
+                                            * If callback returns true, frontend has core option category
+                                            * support.
+                                            * If callback returns false, frontend does not have core option
+                                            * category support.
+                                            *
+                                            * 'data' points to a retro_core_options_v2 struct, containing
+                                            * of two pointers:
+                                            * - retro_core_options_v2::categories is an array of
+                                            *   retro_core_option_v2_category structs terminated by a
+                                            *   { NULL, NULL, NULL } element. If retro_core_options_v2::categories
+                                            *   is NULL, all core options will have no category and will be shown
+                                            *   at the top level of the frontend core option interface. If frontend
+                                            *   does not have core option category support, categories array will
+                                            *   be ignored.
+                                            * - retro_core_options_v2::definitions is an array of
+                                            *   retro_core_option_v2_definition structs terminated by a
+                                            *   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL }
+                                            *   element.
+                                            *
+                                            * >> retro_core_option_v2_category notes:
+                                            *
+                                            * - retro_core_option_v2_category::key should contain string
+                                            *   that uniquely identifies the core option category. Valid
+                                            *   key characters are [a-z, A-Z, 0-9, _, -]
+                                            *   Namespace collisions with other implementations' category
+                                            *   keys are permitted.
+                                            * - retro_core_option_v2_category::desc should contain a human
+                                            *   readable description of the category key.
+                                            * - retro_core_option_v2_category::info should contain any
+                                            *   additional human readable information text that a typical
+                                            *   user may need to understand the nature of the core option
+                                            *   category.
+                                            *
+                                            * Example entry:
+                                            * {
+                                            *     "advanced_settings",
+                                            *     "Advanced",
+                                            *     "Options affecting low-level emulation performance and accuracy."
+                                            * }
+                                            *
+                                            * >> retro_core_option_v2_definition notes:
+                                            *
+                                            * - retro_core_option_v2_definition::key should be namespaced to not
+                                            *   collide with other implementations' keys. e.g. A core called
+                                            *   'foo' should use keys named as 'foo_option'. Valid key characters
+                                            *   are [a-z, A-Z, 0-9, _, -].
+                                            * - retro_core_option_v2_definition::desc should contain a human readable
+                                            *   description of the key. Will be used when the frontend does not
+                                            *   have core option category support. Examples: "Aspect Ratio" or
+                                            *   "Video > Aspect Ratio".
+                                            * - retro_core_option_v2_definition::desc_categorized should contain a
+                                            *   human readable description of the key, which will be used when
+                                            *   frontend has core option category support. Example: "Aspect Ratio",
+                                            *   where associated retro_core_option_v2_category::desc is "Video".
+                                            *   If empty or NULL, the string specified by
+                                            *   retro_core_option_v2_definition::desc will be used instead.
+                                            *   retro_core_option_v2_definition::desc_categorized will be ignored
+                                            *   if retro_core_option_v2_definition::category_key is empty or NULL.
+                                            * - retro_core_option_v2_definition::info should contain any additional
+                                            *   human readable information text that a typical user may need to
+                                            *   understand the functionality of the option.
+                                            * - retro_core_option_v2_definition::info_categorized should contain
+                                            *   any additional human readable information text that a typical user
+                                            *   may need to understand the functionality of the option, and will be
+                                            *   used when frontend has core option category support. This is provided
+                                            *   to accommodate the case where info text references an option by
+                                            *   name/desc, and the desc/desc_categorized text for that option differ.
+                                            *   If empty or NULL, the string specified by
+                                            *   retro_core_option_v2_definition::info will be used instead.
+                                            *   retro_core_option_v2_definition::info_categorized will be ignored
+                                            *   if retro_core_option_v2_definition::category_key is empty or NULL.
+                                            * - retro_core_option_v2_definition::category_key should contain a
+                                            *   category identifier (e.g. "video" or "audio") that will be
+                                            *   assigned to the core option if frontend has core option category
+                                            *   support. A categorized option will be shown in a subsection/
+                                            *   submenu of the frontend core option interface. If key is empty
+                                            *   or NULL, or if key does not match one of the
+                                            *   retro_core_option_v2_category::key values in the associated
+                                            *   retro_core_option_v2_category array, option will have no category
+                                            *   and will be shown at the top level of the frontend core option
+                                            *   interface.
+                                            * - retro_core_option_v2_definition::values is an array of
+                                            *   retro_core_option_value structs terminated by a { NULL, NULL }
+                                            *   element.
+                                            * --> retro_core_option_v2_definition::values[index].value is an
+                                            *     expected option value.
+                                            * --> retro_core_option_v2_definition::values[index].label is a
+                                            *     human readable label used when displaying the value on screen.
+                                            *     If NULL, the value itself is used.
+                                            * - retro_core_option_v2_definition::default_value is the default
+                                            *   core option setting. It must match one of the expected option
+                                            *   values in the retro_core_option_v2_definition::values array. If
+                                            *   it does not, or the default value is NULL, the first entry in the
+                                            *   retro_core_option_v2_definition::values array is treated as the
+                                            *   default.
+                                            *
+                                            * The number of possible option values should be very limited,
+                                            * and must be less than RETRO_NUM_CORE_OPTION_VALUES_MAX.
+                                            * i.e. it should be feasible to cycle through options
+                                            * without a keyboard.
+                                            *
+                                            * Example entries:
+                                            *
+                                            * - Uncategorized:
+                                            *
+                                            * {
+                                            *     "foo_option",
+                                            *     "Speed hack coprocessor X",
+                                            *     NULL,
+                                            *     "Provides increased performance at the expense of reduced accuracy.",
+                                            *     NULL,
+                                            *     NULL,
+                                            * 	  {
+                                            *         { "false",    NULL },
+                                            *         { "true",     NULL },
+                                            *         { "unstable", "Turbo (Unstable)" },
+                                            *         { NULL, NULL },
+                                            *     },
+                                            *     "false"
+                                            * }
+                                            *
+                                            * - Categorized:
+                                            *
+                                            * {
+                                            *     "foo_option",
+                                            *     "Advanced > Speed hack coprocessor X",
+                                            *     "Speed hack coprocessor X",
+                                            *     "Setting 'Advanced > Speed hack coprocessor X' to 'true' or 'Turbo' provides increased performance at the expense of reduced accuracy",
+                                            *     "Setting 'Speed hack coprocessor X' to 'true' or 'Turbo' provides increased performance at the expense of reduced accuracy",
+                                            *     "advanced_settings",
+                                            * 	  {
+                                            *         { "false",    NULL },
+                                            *         { "true",     NULL },
+                                            *         { "unstable", "Turbo (Unstable)" },
+                                            *         { NULL, NULL },
+                                            *     },
+                                            *     "false"
+                                            * }
+                                            *
+                                            * Only strings are operated on. The possible values will
+                                            * generally be displayed and stored as-is by the frontend.
+                                            */
+
+#define RETRO_ENVIRONMENT_SET_CORE_OPTIONS_V2_INTL 68
+                                           /* const struct retro_core_options_v2_intl * --
+                                            * Allows an implementation to signal the environment
+                                            * which variables it might want to check for later using
+                                            * GET_VARIABLE.
+                                            * This allows the frontend to present these variables to
+                                            * a user dynamically.
+                                            * This should only be called if RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION
+                                            * returns an API version of >= 2.
+                                            * This should be called instead of RETRO_ENVIRONMENT_SET_VARIABLES.
+                                            * This should be called instead of RETRO_ENVIRONMENT_SET_CORE_OPTIONS.
+                                            * This should be called instead of RETRO_ENVIRONMENT_SET_CORE_OPTIONS_INTL.
+                                            * This should be called instead of RETRO_ENVIRONMENT_SET_CORE_OPTIONS_V2.
+                                            * This should be called the first time as early as
+                                            * possible (ideally in retro_set_environment).
+                                            * Afterwards it may be called again for the core to communicate
+                                            * updated options to the frontend, but the number of core
+                                            * options must not change from the number in the initial call.
+                                            * If RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION returns an API
+                                            * version of >= 2, this callback is guaranteed to succeed
+                                            * (i.e. callback return value does not indicate success)
+                                            * If callback returns true, frontend has core option category
+                                            * support.
+                                            * If callback returns false, frontend does not have core option
+                                            * category support.
+                                            *
+                                            * This is fundamentally the same as RETRO_ENVIRONMENT_SET_CORE_OPTIONS_V2,
+                                            * with the addition of localisation support. The description of the
+                                            * RETRO_ENVIRONMENT_SET_CORE_OPTIONS_V2 callback should be consulted
+                                            * for further details.
+                                            *
+                                            * 'data' points to a retro_core_options_v2_intl struct.
+                                            *
+                                            * - retro_core_options_v2_intl::us is a pointer to a
+                                            *   retro_core_options_v2 struct defining the US English
+                                            *   core options implementation. It must point to a valid struct.
+                                            *
+                                            * - retro_core_options_v2_intl::local is a pointer to a
+                                            *   retro_core_options_v2 struct defining core options for
+                                            *   the current frontend language. It may be NULL (in which case
+                                            *   retro_core_options_v2_intl::us is used by the frontend). Any items
+                                            *   missing from this struct will be read from
+                                            *   retro_core_options_v2_intl::us instead.
+                                            *
+                                            * NOTE: Default core option values are always taken from the
+                                            * retro_core_options_v2_intl::us struct. Any default values in
+                                            * the retro_core_options_v2_intl::local struct will be ignored.
+                                            */
+
+#define RETRO_ENVIRONMENT_SET_CORE_OPTIONS_UPDATE_DISPLAY_CALLBACK 69
+                                           /* const struct retro_core_options_update_display_callback * --
+                                            * Allows a frontend to signal that a core must update
+                                            * the visibility of any dynamically hidden core options,
+                                            * and enables the frontend to detect visibility changes.
+                                            * Used by the frontend to update the menu display status
+                                            * of core options without requiring a call of retro_run().
+                                            * Must be called in retro_set_environment().
+                                            */
+
+#define RETRO_ENVIRONMENT_SET_VARIABLE 70
+                                           /* const struct retro_variable * --
+                                            * Allows an implementation to notify the frontend
+                                            * that a core option value has changed.
+                                            *
+                                            * retro_variable::key and retro_variable::value
+                                            * must match strings that have been set previously
+                                            * via one of the following:
+                                            *
+                                            * - RETRO_ENVIRONMENT_SET_VARIABLES
+                                            * - RETRO_ENVIRONMENT_SET_CORE_OPTIONS
+                                            * - RETRO_ENVIRONMENT_SET_CORE_OPTIONS_INTL
+                                            * - RETRO_ENVIRONMENT_SET_CORE_OPTIONS_V2
+                                            * - RETRO_ENVIRONMENT_SET_CORE_OPTIONS_V2_INTL
+                                            *
+                                            * After changing a core option value via this
+                                            * callback, RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE
+                                            * will return true.
+                                            *
+                                            * If data is NULL, no changes will be registered
+                                            * and the callback will return true; an
+                                            * implementation may therefore pass NULL in order
+                                            * to test whether the callback is supported.
+                                            */
+
+#define RETRO_ENVIRONMENT_GET_THROTTLE_STATE (71 | RETRO_ENVIRONMENT_EXPERIMENTAL)
+                                           /* struct retro_throttle_state * --
+                                            * Allows an implementation to get details on the actual rate
+                                            * the frontend is attempting to call retro_run().
+                                            */
+
 /* VFS functionality */
 
 /* File paths:
@@ -2781,6 +3156,213 @@ struct retro_system_info
    bool        block_extract;
 };
 
+/* Defines overrides which modify frontend handling of
+ * specific content file types.
+ * An array of retro_system_content_info_override is
+ * passed to RETRO_ENVIRONMENT_SET_CONTENT_INFO_OVERRIDE
+ * NOTE: In the following descriptions, references to
+ *       retro_load_game() may be replaced with
+ *       retro_load_game_special() */
+struct retro_system_content_info_override
+{
+   /* A list of file extensions for which the override
+    * should apply, delimited by a 'pipe' character
+    * (e.g. "md|sms|gg")
+    * Permitted file extensions are limited to those
+    * included in retro_system_info::valid_extensions
+    * and/or retro_subsystem_rom_info::valid_extensions */
+   const char *extensions;
+
+   /* Overrides the need_fullpath value set in
+    * retro_system_info and/or retro_subsystem_rom_info.
+    * To reiterate:
+    *
+    * If need_fullpath is true and retro_load_game() is called:
+    *    - retro_game_info::path is guaranteed to contain a valid
+    *      path to an existent file
+    *    - retro_game_info::data and retro_game_info::size are invalid
+    *
+    * If need_fullpath is false and retro_load_game() is called:
+    *    - retro_game_info::path may be NULL
+    *    - retro_game_info::data and retro_game_info::size are guaranteed
+    *      to be valid
+    *
+    * In addition:
+    *
+    * If need_fullpath is true and retro_load_game() is called:
+    *    - retro_game_info_ext::full_path is guaranteed to contain a valid
+    *      path to an existent file
+    *    - retro_game_info_ext::archive_path may be NULL
+    *    - retro_game_info_ext::archive_file may be NULL
+    *    - retro_game_info_ext::dir is guaranteed to contain a valid path
+    *      to the directory in which the content file exists
+    *    - retro_game_info_ext::name is guaranteed to contain the
+    *      basename of the content file, without extension
+    *    - retro_game_info_ext::ext is guaranteed to contain the
+    *      extension of the content file in lower case format
+    *    - retro_game_info_ext::data and retro_game_info_ext::size
+    *      are invalid
+    *
+    * If need_fullpath is false and retro_load_game() is called:
+    *    - If retro_game_info_ext::file_in_archive is false:
+    *       - retro_game_info_ext::full_path is guaranteed to contain
+    *         a valid path to an existent file
+    *       - retro_game_info_ext::archive_path may be NULL
+    *       - retro_game_info_ext::archive_file may be NULL
+    *       - retro_game_info_ext::dir is guaranteed to contain a
+    *         valid path to the directory in which the content file exists
+    *       - retro_game_info_ext::name is guaranteed to contain the
+    *         basename of the content file, without extension
+    *       - retro_game_info_ext::ext is guaranteed to contain the
+    *         extension of the content file in lower case format
+    *    - If retro_game_info_ext::file_in_archive is true:
+    *       - retro_game_info_ext::full_path may be NULL
+    *       - retro_game_info_ext::archive_path is guaranteed to
+    *         contain a valid path to an existent compressed file
+    *         inside which the content file is located
+    *       - retro_game_info_ext::archive_file is guaranteed to
+    *         contain a valid path to an existent content file
+    *         inside the compressed file referred to by
+    *         retro_game_info_ext::archive_path
+    *            e.g. for a compressed file '/path/to/foo.zip'
+    *            containing 'bar.sfc'
+    *             > retro_game_info_ext::archive_path will be '/path/to/foo.zip'
+    *             > retro_game_info_ext::archive_file will be 'bar.sfc'
+    *       - retro_game_info_ext::dir is guaranteed to contain a
+    *         valid path to the directory in which the compressed file
+    *         (containing the content file) exists
+    *       - retro_game_info_ext::name is guaranteed to contain
+    *         EITHER
+    *         1) the basename of the compressed file (containing
+    *            the content file), without extension
+    *         OR
+    *         2) the basename of the content file inside the
+    *            compressed file, without extension
+    *         In either case, a core should consider 'name' to
+    *         be the canonical name/ID of the the content file
+    *       - retro_game_info_ext::ext is guaranteed to contain the
+    *         extension of the content file inside the compressed file,
+    *         in lower case format
+    *    - retro_game_info_ext::data and retro_game_info_ext::size are
+    *      guaranteed to be valid */
+   bool need_fullpath;
+
+   /* If need_fullpath is false, specifies whether the content
+    * data buffer available in retro_load_game() is 'persistent'
+    *
+    * If persistent_data is false and retro_load_game() is called:
+    *    - retro_game_info::data and retro_game_info::size
+    *      are valid only until retro_load_game() returns
+    *    - retro_game_info_ext::data and retro_game_info_ext::size
+    *      are valid only until retro_load_game() returns
+    *
+    * If persistent_data is true and retro_load_game() is called:
+    *    - retro_game_info::data and retro_game_info::size
+    *      are valid until retro_deinit() returns
+    *    - retro_game_info_ext::data and retro_game_info_ext::size
+    *      are valid until retro_deinit() returns */
+   bool persistent_data;
+};
+
+/* Similar to retro_game_info, but provides extended
+ * information about the source content file and
+ * game memory buffer status.
+ * And array of retro_game_info_ext is returned by
+ * RETRO_ENVIRONMENT_GET_GAME_INFO_EXT
+ * NOTE: In the following descriptions, references to
+ *       retro_load_game() may be replaced with
+ *       retro_load_game_special() */
+struct retro_game_info_ext
+{
+   /* - If file_in_archive is false, contains a valid
+    *   path to an existent content file (UTF-8 encoded)
+    * - If file_in_archive is true, may be NULL */
+   const char *full_path;
+
+   /* - If file_in_archive is false, may be NULL
+    * - If file_in_archive is true, contains a valid path
+    *   to an existent compressed file inside which the
+    *   content file is located (UTF-8 encoded) */
+   const char *archive_path;
+
+   /* - If file_in_archive is false, may be NULL
+    * - If file_in_archive is true, contain a valid path
+    *   to an existent content file inside the compressed
+    *   file referred to by archive_path (UTF-8 encoded)
+    *      e.g. for a compressed file '/path/to/foo.zip'
+    *      containing 'bar.sfc'
+    *      > archive_path will be '/path/to/foo.zip'
+    *      > archive_file will be 'bar.sfc' */
+   const char *archive_file;
+
+   /* - If file_in_archive is false, contains a valid path
+    *   to the directory in which the content file exists
+    *   (UTF-8 encoded)
+    * - If file_in_archive is true, contains a valid path
+    *   to the directory in which the compressed file
+    *   (containing the content file) exists (UTF-8 encoded) */
+   const char *dir;
+
+   /* Contains the canonical name/ID of the content file
+    * (UTF-8 encoded). Intended for use when identifying
+    * 'complementary' content named after the loaded file -
+    * i.e. companion data of a different format (a CD image
+    * required by a ROM), texture packs, internally handled
+    * save files, etc.
+    * - If file_in_archive is false, contains the basename
+    *   of the content file, without extension
+    * - If file_in_archive is true, then string is
+    *   implementation specific. A frontend may choose to
+    *   set a name value of:
+    *   EITHER
+    *   1) the basename of the compressed file (containing
+    *      the content file), without extension
+    *   OR
+    *   2) the basename of the content file inside the
+    *      compressed file, without extension
+    *   RetroArch sets the 'name' value according to (1).
+    *   A frontend that supports routine loading of
+    *   content from archives containing multiple unrelated
+    *   content files may set the 'name' value according
+    *   to (2). */
+   const char *name;
+
+   /* - If file_in_archive is false, contains the extension
+    *   of the content file in lower case format
+    * - If file_in_archive is true, contains the extension
+    *   of the content file inside the compressed file,
+    *   in lower case format */
+   const char *ext;
+
+   /* String of implementation specific meta-data. */
+   const char *meta;
+
+   /* Memory buffer of loaded game content. Will be NULL:
+    * IF
+    * - retro_system_info::need_fullpath is true and
+    *   retro_system_content_info_override::need_fullpath
+    *   is unset
+    * OR
+    * - retro_system_content_info_override::need_fullpath
+    *   is true */
+   const void *data;
+
+   /* Size of game content memory buffer, in bytes */
+   size_t size;
+
+   /* True if loaded content file is inside a compressed
+    * archive */
+   bool file_in_archive;
+
+   /* - If data is NULL, value is unset/ignored
+    * - If data is non-NULL:
+    *   - If persistent_data is false, data and size are
+    *     valid only until retro_load_game() returns
+    *   - If persistent_data is true, data and size are
+    *     are valid until retro_deinit() returns */
+   bool persistent_data;
+};
+
 struct retro_game_geometry
 {
    unsigned base_width;    /* Nominal video width of game. */
@@ -2892,6 +3474,143 @@ struct retro_core_options_intl
    struct retro_core_option_definition *local;
 };
 
+struct retro_core_option_v2_category
+{
+   /* Variable uniquely identifying the
+    * option category. Valid key characters
+    * are [a-z, A-Z, 0-9, _, -] */
+   const char *key;
+
+   /* Human-readable category description
+    * > Used as category menu label when
+    *   frontend has core option category
+    *   support */
+   const char *desc;
+
+   /* Human-readable category information
+    * > Used as category menu sublabel when
+    *   frontend has core option category
+    *   support
+    * > Optional (may be NULL or an empty
+    *   string) */
+   const char *info;
+};
+
+struct retro_core_option_v2_definition
+{
+   /* Variable to query in RETRO_ENVIRONMENT_GET_VARIABLE.
+    * Valid key characters are [a-z, A-Z, 0-9, _, -] */
+   const char *key;
+
+   /* Human-readable core option description
+    * > Used as menu label when frontend does
+    *   not have core option category support
+    *   e.g. "Video > Aspect Ratio" */
+   const char *desc;
+
+   /* Human-readable core option description
+    * > Used as menu label when frontend has
+    *   core option category support
+    *   e.g. "Aspect Ratio", where associated
+    *   retro_core_option_v2_category::desc
+    *   is "Video"
+    * > If empty or NULL, the string specified by
+    *   desc will be used as the menu label
+    * > Will be ignored (and may be set to NULL)
+    *   if category_key is empty or NULL */
+   const char *desc_categorized;
+
+   /* Human-readable core option information
+    * > Used as menu sublabel */
+   const char *info;
+
+   /* Human-readable core option information
+    * > Used as menu sublabel when frontend
+    *   has core option category support
+    *   (e.g. may be required when info text
+    *   references an option by name/desc,
+    *   and the desc/desc_categorized text
+    *   for that option differ)
+    * > If empty or NULL, the string specified by
+    *   info will be used as the menu sublabel
+    * > Will be ignored (and may be set to NULL)
+    *   if category_key is empty or NULL */
+   const char *info_categorized;
+
+   /* Variable specifying category (e.g. "video",
+    * "audio") that will be assigned to the option
+    * if frontend has core option category support.
+    * > Categorized options will be displayed in a
+    *   subsection/submenu of the frontend core
+    *   option interface
+    * > Specified string must match one of the
+    *   retro_core_option_v2_category::key values
+    *   in the associated retro_core_option_v2_category
+    *   array; If no match is not found, specified
+    *   string will be considered as NULL
+    * > If specified string is empty or NULL, option will
+    *   have no category and will be shown at the top
+    *   level of the frontend core option interface */
+   const char *category_key;
+
+   /* Array of retro_core_option_value structs, terminated by NULL */
+   struct retro_core_option_value values[RETRO_NUM_CORE_OPTION_VALUES_MAX];
+
+   /* Default core option value. Must match one of the values
+    * in the retro_core_option_value array, otherwise will be
+    * ignored */
+   const char *default_value;
+};
+
+struct retro_core_options_v2
+{
+   /* Array of retro_core_option_v2_category structs,
+    * terminated by NULL
+    * > If NULL, all entries in definitions array
+    *   will have no category and will be shown at
+    *   the top level of the frontend core option
+    *   interface
+    * > Will be ignored if frontend does not have
+    *   core option category support */
+   struct retro_core_option_v2_category *categories;
+
+   /* Array of retro_core_option_v2_definition structs,
+    * terminated by NULL */
+   struct retro_core_option_v2_definition *definitions;
+};
+
+struct retro_core_options_v2_intl
+{
+   /* Pointer to a retro_core_options_v2 struct
+    * > US English implementation
+    * > Must point to a valid struct */
+   struct retro_core_options_v2 *us;
+
+   /* Pointer to a retro_core_options_v2 struct
+    * - Implementation for current frontend language
+    * - May be NULL */
+   struct retro_core_options_v2 *local;
+};
+
+/* Used by the frontend to monitor changes in core option
+ * visibility. May be called each time any core option
+ * value is set via the frontend.
+ * - On each invocation, the core must update the visibility
+ *   of any dynamically hidden options using the
+ *   RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY environment
+ *   callback.
+ * - On the first invocation, returns 'true' if the visibility
+ *   of any core option has changed since the last call of
+ *   retro_load_game() or retro_load_game_special().
+ * - On each subsequent invocation, returns 'true' if the
+ *   visibility of any core option has changed since the last
+ *   time the function was called. */
+typedef bool (RETRO_CALLCONV *retro_core_options_update_display_callback_t)(void);
+struct retro_core_options_update_display_callback
+{
+   retro_core_options_update_display_callback_t callback;
+};
+
 struct retro_game_info
 {
    const char *path;       /* Path to game, UTF-8 encoded.
@@ -2938,6 +3657,84 @@ struct retro_framebuffer
                                        Set by frontend in GET_CURRENT_SOFTWARE_FRAMEBUFFER. */
 };
 
+/* Used by a libretro core to override the current
+ * fastforwarding mode of the frontend */
+struct retro_fastforwarding_override
+{
+   /* Specifies the runtime speed multiplier that
+    * will be applied when 'fastforward' is true.
+    * For example, a value of 5.0 when running 60 FPS
+    * content will cap the fast-forward rate at 300 FPS.
+    * Note that the target multiplier may not be achieved
+    * if the host hardware has insufficient processing
+    * power.
+    * Setting a value of 0.0 (or greater than 0.0 but
+    * less than 1.0) will result in an uncapped
+    * fast-forward rate (limited only by hardware
+    * capacity).
+    * If the value is negative, it will be ignored
+    * (i.e. the frontend will use a runtime speed
+    * multiplier of its own choosing) */
+   float ratio;
+
+   /* If true, fastforwarding mode will be enabled.
+    * If false, fastforwarding mode will be disabled. */
+   bool fastforward;
+
+   /* If true, and if supported by the frontend, an
+    * on-screen notification will be displayed while
+    * 'fastforward' is true.
+    * If false, and if supported by the frontend, any
+    * on-screen fast-forward notifications will be
+    * suppressed */
+   bool notification;
+
+   /* If true, the core will have sole control over
+    * when fastforwarding mode is enabled/disabled;
+    * the frontend will not be able to change the
+    * state set by 'fastforward' until either
+    * 'inhibit_toggle' is set to false, or the core
+    * is unloaded */
+   bool inhibit_toggle;
+};
+
+/* During normal operation. Rate will be equal to the core's internal FPS. */
+#define RETRO_THROTTLE_NONE              0
+
+/* While paused or stepping single frames. Rate will be 0. */
+#define RETRO_THROTTLE_FRAME_STEPPING    1
+
+/* During fast forwarding.
+ * Rate will be 0 if not specifically limited to a maximum speed. */
+#define RETRO_THROTTLE_FAST_FORWARD      2
+
+/* During slow motion. Rate will be less than the core's internal FPS. */
+#define RETRO_THROTTLE_SLOW_MOTION       3
+
+/* While rewinding recorded save states. Rate can vary depending on the rewind
+ * speed or be 0 if the frontend is not aiming for a specific rate. */
+#define RETRO_THROTTLE_REWINDING         4
+
+/* While vsync is active in the video driver and the target refresh rate is
+ * lower than the core's internal FPS. Rate is the target refresh rate. */
+#define RETRO_THROTTLE_VSYNC             5
+
+/* When the frontend does not throttle in any way. Rate will be 0.
+ * An example could be if no vsync or audio output is active. */
+#define RETRO_THROTTLE_UNBLOCKED         6
+
+struct retro_throttle_state
+{
+   /* The current throttling mode. Should be one of the values above. */
+   unsigned mode;
+
+   /* How many times per second the frontend aims to call retro_run.
+    * Depending on the mode, it can be 0 if there is no known fixed rate.
+    * This won't be accurate if the total processing time of the core and
+    * the frontend is longer than what is available for one frame. */
+   float rate;
+};
+
 /* Callbacks */
 
 /* Environment callback. Gives implementations a way of performing
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 2c2501b..2041d3c 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -141,6 +141,7 @@ enum RetroZapperInputModes{RetroLightgun, RetroMouse, RetroPointer};
 static enum RetroZapperInputModes zappermode = RetroLightgun;
 
 static bool libretro_supports_bitmasks = false;
+static bool libretro_supports_option_categories = false;
 
 /* emulator-specific variables */
 
@@ -162,8 +163,8 @@ unsigned dendy = 0;
 
 static unsigned systemRegion = 0;
 static unsigned opt_region = 0;
-static unsigned opt_showAdvSoundOptions = 0;
-static unsigned opt_showAdvSystemOptions = 0;
+static bool opt_showAdvSoundOptions = true;
+static bool opt_showAdvSystemOptions = true;
 
 #if defined(PSP) || defined(PS2)
 static __attribute__((aligned(16))) uint16_t retro_palette[256];
@@ -615,7 +616,7 @@ struct st_palettes palettes[] = {
 #define NES_NTSC_WIDTH  (((NES_NTSC_OUT_WIDTH(256) + 3) >> 2) << 2)
 
 static unsigned use_ntsc = 0;
-static unsigned burst_phase;
+static unsigned burst_phase = 0;
 static nes_ntsc_t nes_ntsc;
 static nes_ntsc_setup_t ntsc_setup;
 static uint16_t *ntsc_video_out = NULL; /* for ntsc blit buffer */
@@ -625,6 +626,9 @@ static void NTSCFilter_Cleanup(void)
    if (ntsc_video_out)
       free(ntsc_video_out);
    ntsc_video_out = NULL;
+
+   use_ntsc = 0;
+   burst_phase = 0;
 }
 
 static void NTSCFilter_Init(void)
@@ -862,25 +866,163 @@ void retro_set_controller_port_device(unsigned port, unsigned device)
    }
 }
 
+/* Core options 'update display' callback */
+static bool update_option_visibility(void)
+{
+   struct retro_variable var = {0};
+   bool updated              = false;
+   size_t i, size;
+
+   /* If frontend supports core option categories,
+    * then fceumm_show_adv_system_options and
+    * fceumm_show_adv_sound_options are ignored
+    * and no options should be hidden */
+   if (libretro_supports_option_categories)
+      return false;
+
+   var.key = "fceumm_show_adv_system_options";
+   var.value = NULL;
+
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+   {
+      bool opt_showAdvSystemOptions_prev = opt_showAdvSystemOptions;
+
+      opt_showAdvSystemOptions = true;
+      if (strcmp(var.value, "disabled") == 0)
+         opt_showAdvSystemOptions = false;
+
+      if (opt_showAdvSystemOptions != opt_showAdvSystemOptions_prev)
+      {
+         struct retro_core_option_display option_display;
+         unsigned i;
+         unsigned size;
+         char options_list[][25] = {
+            "fceumm_overclocking",
+            "fceumm_ramstate",
+            "fceumm_nospritelimit",
+            "fceumm_up_down_allowed",
+            "fceumm_show_crosshair"
+         };
+
+         option_display.visible = opt_showAdvSystemOptions;
+         size = sizeof(options_list) / sizeof(options_list[0]);
+         for (i = 0; i < size; i++)
+         {
+            option_display.key = options_list[i];
+            environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY,
+                  &option_display);
+         }
+
+         updated = true;
+      }
+   }
+
+   var.key = "fceumm_show_adv_sound_options";
+   var.value = NULL;
+
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+   {
+      bool opt_showAdvSoundOptions_prev = opt_showAdvSoundOptions;
+
+      opt_showAdvSoundOptions = true;
+      if (strcmp(var.value, "disabled") == 0)
+         opt_showAdvSoundOptions = false;
+
+      if (opt_showAdvSoundOptions != opt_showAdvSoundOptions_prev)
+      {
+         struct retro_core_option_display option_display;
+         unsigned i;
+         unsigned size;
+         char options_list[][25] = {
+            "fceumm_sndvolume",
+            "fceumm_sndquality",
+            "fceumm_swapduty",
+            "fceumm_apu_1",
+            "fceumm_apu_2",
+            "fceumm_apu_3",
+            "fceumm_apu_4",
+            "fceumm_apu_5"
+         };
+
+         option_display.visible  = opt_showAdvSoundOptions;
+         size = sizeof(options_list) / sizeof(options_list[0]);
+         for (i = 0; i < size; i++)
+         {
+            option_display.key = options_list[i];
+            environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY,
+                  &option_display);
+         }
+
+         updated = true;
+      }
+   }
+
+   return updated;
+}
+
 static void set_variables(void)
 {
+   struct retro_core_option_display option_display;
    unsigned i = 0, index = 0;
 
+   option_display.visible = false;
+
    /* Initialize main core option struct */
-   for (i = 0; i < MAX_CORE_OPTIONS; i++)
-      option_defs_us[i] = option_defs_empty;
+   memset(&option_defs_us, 0, sizeof(option_defs_us));
 
    /* Write common core options to main struct */
-   while (option_defs_common[index].key) {
-      option_defs_us[index] = option_defs_common[index];
+   while (option_defs_us_common[index].key) {
+      memcpy(&option_defs_us[index], &option_defs_us_common[index],
+            sizeof(struct retro_core_option_v2_definition));
       index++;
    }
 
    /* Append dipswitch settings to core options if available */
-   index += set_dipswitch_variables(index, option_defs_us);
-   option_defs_us[index] = option_defs_empty;
+   set_dipswitch_variables(index, option_defs_us);
 
-   libretro_set_core_options(environ_cb);
+   libretro_supports_option_categories = false;
+   libretro_set_core_options(environ_cb,
+         &libretro_supports_option_categories);
+
+   /* If frontend supports core option categories,
+    * fceumm_show_adv_system_options and
+    * fceumm_show_adv_sound_options are unused
+    * and should be hidden */
+   if (libretro_supports_option_categories)
+   {
+      option_display.key = "fceumm_show_adv_system_options";
+
+      environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY,
+            &option_display);
+
+      option_display.key = "fceumm_show_adv_sound_options";
+
+      environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY,
+            &option_display);
+   }
+   /* If frontend does not support core option
+    * categories, core options may be shown/hidden
+    * at runtime. In this case, register 'update
+    * display' callback, so frontend can update
+    * core options menu without calling retro_run() */
+   else
+   {
+      struct retro_core_options_update_display_callback update_display_cb;
+      update_display_cb.callback = update_option_visibility;
+
+      environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_UPDATE_DISPLAY_CALLBACK,
+            &update_display_cb);
+   }
+
+   /* VS UNISystem games use internal palette regardless
+    * of user setting, so hide fceumm_palette option */
+   if (GameInfo && (GameInfo->type == GIT_VSUNI))
+   {
+      option_display.key = "fceumm_palette";
+
+      environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY,
+            &option_display);
+   }
 }
 
 void retro_set_environment(retro_environment_t cb)
@@ -1461,68 +1603,7 @@ static void check_variables(bool startup)
 
    update_dipswitch();
 
-   var.key = "fceumm_show_adv_system_options";
-   var.value = NULL;
-
-   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
-   {
-      unsigned newval = (!strcmp(var.value, "enabled")) ? 1 : 0;
-      if ((opt_showAdvSystemOptions != newval) || startup)
-      {
-         struct retro_core_option_display option_display;
-         unsigned i;
-         unsigned size;
-         char options_list[][25] = {
-            "fceumm_overclocking",
-            "fceumm_ramstate",
-            "fceumm_nospritelimit",
-            "fceumm_up_down_allowed",
-            "fceumm_show_crosshair"
-         };
-
-         opt_showAdvSystemOptions = newval;
-         option_display.visible = opt_showAdvSystemOptions;
-         size = sizeof(options_list) / sizeof(options_list[0]);
-         for (i = 0; i < size; i++)
-         {
-            option_display.key = options_list[i];
-            environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, &option_display);
-         }
-      }
-   }
-
-   var.key = "fceumm_show_adv_sound_options";
-   var.value = NULL;
-
-   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
-   {
-      unsigned newval = (!strcmp(var.value, "enabled")) ? 1 : 0;
-      if ((opt_showAdvSoundOptions != newval) || startup)
-      {
-         struct retro_core_option_display option_display;
-         unsigned i;
-         unsigned size;
-         char options_list[][25] = {
-            "fceumm_sndvolume",
-            "fceumm_sndquality",
-            "fceumm_swapduty",
-            "fceumm_apu_1",
-            "fceumm_apu_2",
-            "fceumm_apu_3",
-            "fceumm_apu_4",
-            "fceumm_apu_5"
-         };
-
-         opt_showAdvSoundOptions = newval;
-         option_display.visible  = opt_showAdvSoundOptions;
-         size = sizeof(options_list) / sizeof(options_list[0]);
-         for (i = 0; i < size; i++)
-         {
-            option_display.key = options_list[i];
-            environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, &option_display);
-         }
-      }
-   }
+   update_option_visibility();
 }
 
 static int mzx = 0, mzy = 0;
@@ -1838,12 +1919,12 @@ static void retro_run_blit(uint8_t *gfx)
 
    if (!ps2) {
       if (!environ_cb(RETRO_ENVIRONMENT_GET_HW_RENDER_INTERFACE, (void **)&ps2) || !ps2) {
-         printf("Failed to get HW rendering interface!\n");
+         FCEU_printf(" Failed to get HW rendering interface!\n");
          return;
       }
 
       if (ps2->interface_version != RETRO_HW_RENDER_INTERFACE_GSKIT_PS2_VERSION) {
-         printf("HW render interface mismatch, expected %u, got %u!\n",
+         FCEU_printf(" HW render interface mismatch, expected %u, got %u!\n",
                   RETRO_HW_RENDER_INTERFACE_GSKIT_PS2_VERSION, ps2->interface_version);
          return;
       }
diff --git a/src/drivers/libretro/libretro_core_options.h b/src/drivers/libretro/libretro_core_options.h
index e3deb8e..0df0a88 100644
--- a/src/drivers/libretro/libretro_core_options.h
+++ b/src/drivers/libretro/libretro_core_options.h
@@ -17,6 +17,8 @@ extern "C" {
  ********************************
 */
 
+#define MAX_CORE_OPTIONS 34
+
 /* RETRO_LANGUAGE_ENGLISH */
 
 /* Default language:
@@ -26,13 +28,47 @@ extern "C" {
  * - Will be used as a fallback for any missing entries in
  *   frontend language definition */
 
-#define MAX_CORE_OPTIONS 32
+struct retro_core_option_v2_category option_cats_us[] = {
+   {
+      "video",
+      "Video",
+#ifdef HAVE_NTSC_FILTER
+      "Configure aspect ratio / display cropping / color palette / video filter options."
+#else
+      "Configure aspect ratio / display cropping / color palette options."
+#endif
+   },
+   {
+      "audio",
+      "Audio",
+      "Configure sound quality / volume / channel enable settings."
+   },
+   {
+      "input",
+      "Input",
+      "Configure turbo / light gun parameters."
+   },
+   {
+      "hacks",
+      "Emulation Hacks",
+      "Configure processor overclocking and emulation accuracy parameters affecting low-level performance and compatibility."
+   },
+   {
+      "dip_switch",
+      "DIP Switches",
+      "Configure arcade game settings."
+   },
+   { NULL, NULL, NULL },
+};
 
-struct retro_core_option_definition option_defs_common[] = {
+struct retro_core_option_v2_definition option_defs_us_common[] = {
    {
       "fceumm_region",
       "Region",
+      NULL,
       "Force core to use NTSC, PAL or Dendy region timings.",
+      NULL,
+      NULL,
       {
          { "Auto",  NULL },
          { "NTSC",  NULL },
@@ -43,101 +79,56 @@ struct retro_core_option_definition option_defs_common[] = {
       "Auto",
    },
    {
-      "fceumm_overclocking",
-      "Overclock",
-      "Enables or disables overclocking which can reduce slowdowns in some games. Postrender method is more compatible with every game with Vblank more effective for games like Contra Force.",
-      {
-         { "disabled",      NULL },
-         { "2x-Postrender", NULL },
-         { "2x-VBlank",     NULL },
-         { NULL, NULL},
-      },
-      "disabled",
-   },
-   {
-      "fceumm_ramstate",
-      "RAM Power-On Fill (Needs Restart)",
-      "Choose RAM startup during power up. Some games rely on initial ram values for random generator as an example.",
-      {
-         { "fill $ff", "$FF" },
-         { "fill $00", "$00" },
-         { "random",   "random" },
-         { NULL, NULL},
-      },
-      "fill $ff",
-   },
-   {
-      "fceumm_nospritelimit",
-      "No Sprite Limit",
-      "Removes the 8-per-scanline hardware limit. This reduces sprite flickering but can cause some games to glitch since some use this for effects.",
+      "fceumm_show_adv_system_options",
+      "Show Advanced System Options",
+      NULL,
+      "Show advanced system options and tweaks.",
+      NULL,
+      NULL,
       {
          { "disabled", NULL },
          { "enabled",  NULL },
-         { NULL, NULL},
-      },
-      "disabled",
-   },
-#ifdef HAVE_NTSC_FILTER
-   {
-      "fceumm_ntsc_filter",
-      "NTSC Filter",
-      "Enable blargg NTSC filters.",
-      {
-         { "disabled",   NULL },
-         { "composite",  NULL },
-         { "svideo",     NULL },
-         { "rgb",        NULL },
-         { "monochrome", NULL },
          { NULL, NULL },
       },
       "disabled"
    },
-#endif
    {
-      "fceumm_palette",
-      "Color Palette",
-      "Choose from pre-generated palettes, a custom 64x3 palette from file or raw format (needs to use a nes-decoder shader).",
+      "fceumm_show_adv_sound_options",
+      "Show Advanced Sound Options",
+      NULL,
+      "Show advanced sound options and tweaks.",
+      NULL,
+      NULL,
       {
-         { "default",              NULL },
-         { "asqrealc",             NULL },
-         { "nintendo-vc",          NULL },
-         { "rgb",                  NULL },
-         { "yuv-v3",               NULL },
-         { "unsaturated-final",    NULL },
-         { "sony-cxa2025as-us",    NULL },
-         { "pal",                  NULL },
-         { "bmf-final2",           NULL },
-         { "bmf-final3",           NULL },
-         { "smooth-fbx",           NULL },
-         { "composite-direct-fbx", NULL },
-         { "pvm-style-d93-fbx",    NULL },
-         { "ntsc-hardware-fbx",    NULL },
-         { "nes-classic-fbx-fs",   NULL },
-         { "nescap",               NULL },
-         { "wavebeam",             NULL },
-         { "raw",                  NULL },
-         { "custom",               NULL },
-         { NULL, NULL},
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
       },
-      "default",
+      "disabled"
    },
    {
       "fceumm_aspect",
       "Aspect Ratio",
+      NULL,
       "Choose preferred aspect ratio.",
+      NULL,
+      "video",
       {
          { "8:7 PAR", NULL },
          { "4:3",     NULL },
-         { "PP", NULL },
+         { "PP",      "Pixel Perfect" },
          { NULL, NULL},
       },
       "8:7 PAR",
    },
-#ifdef PSP
+#ifdef PSP /* overscan options */
    {
       "fceumm_overscan",
       "Crop Overscan",
-      "Removes 8 pixel overscan from all sides",
+      NULL,
+      "Removes 8 pixel overscan from all sides of the screen.",
+      NULL,
+      "video",
       {
          { "enabled",  NULL },
          { "disabled", NULL },
@@ -149,7 +140,10 @@ struct retro_core_option_definition option_defs_common[] = {
    {
       "fceumm_overscan_h",
       "Crop Horizontal Overscan",
-      "Removes 8 pixel from left and right side of the screen to simulate overscan seen on standard CRT television.",
+      NULL,
+      "Removes 8 pixels from left and right sides of the screen to simulate overscan seen on standard CRT televisions.",
+      NULL,
+      "video",
       {
          { "disabled", NULL },
          { "enabled",  NULL },
@@ -157,10 +151,13 @@ struct retro_core_option_definition option_defs_common[] = {
       },
       "disabled",
    },
-      {
+   {
       "fceumm_overscan_v",
       "Crop Vertical Overscan",
-      "Removes 8 pixel from the top and bottom of the screen to simulate overscan seen on standard CRT television.",
+      NULL,
+      "Removes 8 pixels from the top and bottom of the screen to simulate overscan seen on standard CRT televisions.",
+      NULL,
+      "video",
       {
          { "disabled", NULL },
          { "enabled",  NULL },
@@ -170,9 +167,77 @@ struct retro_core_option_definition option_defs_common[] = {
    },
 #endif /* overscan options */
    {
-      "fceumm_up_down_allowed",
-      "Allow Opposing Directions",
-      "Allows simultaneous UP+DOWN or LEFT+RIGHT button combinations which can create different effects in some games.",
+      "fceumm_palette",
+      "Color Palette",
+      NULL,
+      "Choose from pre-generated palettes, a custom 64x3 palette from file or raw format (needs to use a nes-decoder shader).",
+      NULL,
+      "video",
+      {
+         { "default",              "Default" },
+         { "asqrealc",             "AspiringSquire's Real" },
+         { "nintendo-vc",          "Nintendo Virtual Console" },
+         { "rgb",                  "Nintendo RGB PPU" },
+         { "yuv-v3",               "FBX's YUV-V3" },
+         { "unsaturated-final",    "FBX's Unsaturated-Final" },
+         { "sony-cxa2025as-us",    "Sony CXA2025AS US" },
+         { "pal",                  "PAL" },
+         { "bmf-final2",           "BMF's Final 2" },
+         { "bmf-final3",           "BMF's Final 3" },
+         { "smooth-fbx",           "FBX's Smooth" },
+         { "composite-direct-fbx", "FBX's Composite Direct" },
+         { "pvm-style-d93-fbx",    "FBX's PVM Style D93" },
+         { "ntsc-hardware-fbx",    "FBX's NTSC Hardware" },
+         { "nes-classic-fbx-fs",   "FBX's NES-Classic FS" },
+         { "nescap",               "RGBSource's NESCAP" },
+         { "wavebeam",             "nakedarthur's Wavebeam" },
+         { "raw",                  "Raw" },
+         { "custom",               "Custom" },
+         { NULL, NULL},
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      "NTSC Filter",
+      NULL,
+      "Enable blargg NTSC filters.",
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  "Composite" },
+         { "svideo",     "S-Video" },
+         { "rgb",        "RGB" },
+         { "monochrome", "Monochrome" },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      "Sound Quality",
+      NULL,
+      "Enable higher quality sound. Increases performance requirements.",
+      NULL,
+      "audio",
+      {
+         { "Low",       NULL },
+         { "High",      NULL },
+         { "Very High", NULL },
+         { NULL, NULL},
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      "Swap Audio Duty Cycles",
+      "Swap Duty Cycles",
+      "Simulates the sound from famiclones that have the pulse wave channels duty cycle bits reversed.",
+      NULL,
+      "audio",
       {
          { "disabled", NULL },
          { "enabled",  NULL },
@@ -180,10 +245,106 @@ struct retro_core_option_definition option_defs_common[] = {
       },
       "disabled",
    },
+   {
+      "fceumm_sndvolume",
+      "Master Volume",
+      NULL,
+      "Change master volume level.",
+      NULL,
+      "audio",
+      {
+         { "0",  "0%" },
+         { "1",  "10%" },
+         { "2",  "20%" },
+         { "3",  "30%" },
+         { "4",  "40%" },
+         { "5",  "50%" },
+         { "6",  "60%" },
+         { "7",  "70%" },
+         { "8",  "80%" },
+         { "9",  "90%" },
+         { "10", "100%" },
+         { NULL, NULL},
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      "Audio Channel 1 (Square 1)",
+      "Channel 1 (Square 1)",
+      "Enables or disables pulse wave generator audio output 1.",
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL},
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      "Audio Channel 2 (Square 2)",
+      "Channel 2 (Square 2)",
+      "Enables or disables pulse wave generator audio output 2.",
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL},
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      "Audio Channel 3 (Triangle)",
+      "Channel 3 (Triangle)",
+      "Enables or disables triangle wave generator audio output.",
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL},
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      "Audio Channel 4 (Noise)",
+      "Channel 4 (Noise)",
+      "Enables or disables noise generator audio output.",
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL},
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      "Audio Channel 5 (PCM)",
+      "Channel 5 (PCM)",
+      "Enables or disables delta modulation channel audio output.",
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL},
+      },
+      "enabled",
+   },
    {
       "fceumm_turbo_enable",
       "Turbo Enable",
+      NULL,
       "Enables or disables turbo buttons.",
+      NULL,
+      "input",
       {
          { "None",     NULL },
          { "Player 1", NULL },
@@ -196,7 +357,10 @@ struct retro_core_option_definition option_defs_common[] = {
    {
       "fceumm_turbo_delay",
       "Turbo Delay (in frames)",
+      NULL,
       "Repeat rate of turbo buttons in frames.",
+      NULL,
+      "input",
       {
          { "1",  NULL },
          { "2",  NULL },
@@ -213,19 +377,25 @@ struct retro_core_option_definition option_defs_common[] = {
    {
       "fceumm_zapper_mode",
       "Zapper Mode",
+      NULL,
       "Selects device to use for zapper games.",
+      NULL,
+      "input",
       {
-         { "lightgun",    NULL },
-         { "touchscreen", NULL },
-         { "mouse",       NULL },
+         { "lightgun",    "Lightgun" },
+         { "touchscreen", "Touchscreen" },
+         { "mouse",       "Mouse" },
          { NULL, NULL},
       },
       "lightgun",
    },
    {
       "fceumm_show_crosshair",
-      "Show Crosshair",
+      "Show Zapper Crosshair",
+      NULL,
       "Shows or hides on-screen crosshairs when using a zapper.",
+      NULL,
+      "input",
       {
          { "enabled",  NULL },
          { "disabled", NULL },
@@ -236,7 +406,10 @@ struct retro_core_option_definition option_defs_common[] = {
    {
       "fceumm_zapper_tolerance",
       "Zapper Tolerance",
+      NULL,
       "Sets how many pixels from target area is on target.",
+      NULL,
+      "input",
       {
          { "0",  NULL },
          { "1",  NULL },
@@ -264,21 +437,12 @@ struct retro_core_option_definition option_defs_common[] = {
       "6",
    },
    {
-      "fceumm_sndquality",
-      "Sound Quality",
-      "Enable higher quality sounds in exchange for more processing power required",
-      {
-         { "Low",       NULL },
-         { "High",      NULL },
-         { "Very High", NULL },
-         { NULL, NULL},
-      },
-      "Low",
-   },
-   {
-      "fceumm_swapduty",
-      "Swap Duty Cycles",
-      "Simulates the sound from famiclones has the pulse wave channels duty cycle bits reversed.",
+      "fceumm_up_down_allowed",
+      "Allow Opposing Directions",
+      NULL,
+      "Allows simultaneous UP+DOWN or LEFT+RIGHT button combinations which can create different effects in some games.",
+      NULL,
+      "input",
       {
          { "disabled", NULL },
          { "enabled",  NULL },
@@ -287,156 +451,68 @@ struct retro_core_option_definition option_defs_common[] = {
       "disabled",
    },
    {
-      "fceumm_sndvolume",
-      "Master Volume",
-      "Change master volume level",
+      "fceumm_nospritelimit",
+      "No Sprite Limit",
+      NULL,
+      "Removes the 8-per-scanline hardware limit. This reduces sprite flickering but can cause some games to glitch since some use this for effects.",
+      NULL,
+      "hacks",
       {
-         { "0",  NULL },
-         { "1",  NULL },
-         { "2",  NULL },
-         { "3",  NULL },
-         { "4",  NULL },
-         { "5",  NULL },
-         { "6",  NULL },
-         { "7",  NULL },
-         { "8",  NULL },
-         { "9",  NULL },
-         { "10", NULL },
+         { "disabled", NULL },
+         { "enabled",  NULL },
          { NULL, NULL},
       },
-      "7",
+      "disabled",
    },
    {
-      "fceumm_apu_1",
-      "Channel 1 (Square 1)",
-      "Enables or disables pulse wave generator audio output 1.",
+      "fceumm_overclocking",
+      "Overclock",
+      NULL,
+      "Enables or disables overclocking which can reduce slowdowns in some games. Postrender method is more compatible with every game with Vblank more effective for games like Contra Force.",
+      NULL,
+      "hacks",
       {
-         { "enabled",  NULL },
-         { "disabled", NULL },
+         { "disabled",      NULL },
+         { "2x-Postrender", NULL },
+         { "2x-VBlank",     NULL },
          { NULL, NULL},
       },
-      "enabled",
+      "disabled",
    },
    {
-      "fceumm_apu_2",
-      "Channel 2 (Square 2)",
-      "Enables or disables pulse wave generator audio output 2.",
+      "fceumm_ramstate",
+      "RAM Power-On Fill (Restart)",
+      NULL,
+      "Choose RAM startup during power up. Some games rely on initial ram values for random generator as an example.",
+      NULL,
+      "hacks",
       {
-         { "enabled",  NULL },
-         { "disabled", NULL },
+         { "fill $ff", "$FF" },
+         { "fill $00", "$00" },
+         { "random",   "Random" },
          { NULL, NULL},
       },
-      "enabled",
+      "fill $ff",
    },
-   {
-      "fceumm_apu_3",
-      "Channel 3 (Triangle)",
-      "Enables or disables triangle wave generator audio output.",
-      {
-         { "enabled",  NULL },
-         { "disabled", NULL },
-         { NULL, NULL},
-      },
-      "enabled",
-   },
-   {
-      "fceumm_apu_4",
-      "Channel 4 (Noise)",
-      "Enables or disables noise generator audio output.",
-      {
-         { "enabled",  NULL },
-         { "disabled", NULL },
-         { NULL, NULL},
-      },
-      "enabled",
-   },
-   {
-      "fceumm_apu_5",
-      "Channel 5 (PCM)",
-      "Enables or disables delta modulation channel audio output.",
-      {
-         { "enabled",  NULL },
-         { "disabled", NULL },
-         { NULL, NULL},
-      },
-      "enabled",
-   },
-   {
-      "fceumm_show_adv_system_options",
-      "Show Advanced System Options",
-      "Show advanced system options and tweaks.",
-      {
-         { "disabled", NULL },
-         { "enabled",  NULL },
-         { NULL, NULL },
-      },
-      "disabled"
-   },
-   {
-      "fceumm_show_adv_sound_options",
-      "Show Advanced Sound Options",
-      "Show advanced sound options and tweaks.",
-      {
-         { "disabled", NULL },
-         { "enabled",  NULL },
-         { NULL, NULL },
-      },
-      "disabled"
-   },
-
-   { NULL, NULL, NULL, { {0} }, NULL },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
 };
 
-struct retro_core_option_definition option_defs_empty = {
-   NULL, NULL, NULL, { {0} }, NULL
+struct retro_core_option_v2_definition option_defs_us[MAX_CORE_OPTIONS];
+
+struct retro_core_options_v2 options_us = {
+   option_cats_us,
+   option_defs_us
 };
 
-struct retro_core_option_definition option_defs_us[MAX_CORE_OPTIONS];
-
-/* RETRO_LANGUAGE_JAPANESE */
-
-/* RETRO_LANGUAGE_FRENCH */
-
-/* RETRO_LANGUAGE_SPANISH */
-
-/* RETRO_LANGUAGE_GERMAN */
-
-/* RETRO_LANGUAGE_ITALIAN */
-
-/* RETRO_LANGUAGE_DUTCH */
-
-/* RETRO_LANGUAGE_PORTUGUESE_BRAZIL */
-
-/* RETRO_LANGUAGE_PORTUGUESE_PORTUGAL */
-
-/* RETRO_LANGUAGE_RUSSIAN */
-
-/* RETRO_LANGUAGE_KOREAN */
-
-/* RETRO_LANGUAGE_CHINESE_TRADITIONAL */
-
-/* RETRO_LANGUAGE_CHINESE_SIMPLIFIED */
-
-/* RETRO_LANGUAGE_ESPERANTO */
-
-/* RETRO_LANGUAGE_POLISH */
-
-/* RETRO_LANGUAGE_VIETNAMESE */
-
-/* RETRO_LANGUAGE_ARABIC */
-
-/* RETRO_LANGUAGE_GREEK */
-
-/* RETRO_LANGUAGE_TURKISH */
-
 /*
  ********************************
  * Language Mapping
  ********************************
 */
 
-struct retro_core_option_definition *option_defs_intl[RETRO_LANGUAGE_LAST] = {
-   option_defs_us, /* RETRO_LANGUAGE_ENGLISH */
+#ifndef HAVE_NO_LANGEXTRA
+struct retro_core_options_v2 *options_intl[RETRO_LANGUAGE_LAST] = {
+   &options_us,    /* RETRO_LANGUAGE_ENGLISH */
    NULL,           /* RETRO_LANGUAGE_JAPANESE */
    NULL,           /* RETRO_LANGUAGE_FRENCH */
    NULL,           /* RETRO_LANGUAGE_SPANISH */
@@ -456,6 +532,7 @@ struct retro_core_option_definition *option_defs_intl[RETRO_LANGUAGE_LAST] = {
    NULL,           /* RETRO_LANGUAGE_GREEK */
    NULL,           /* RETRO_LANGUAGE_TURKISH */
 };
+#endif
 
 /*
  ********************************
@@ -470,41 +547,61 @@ struct retro_core_option_definition *option_defs_intl[RETRO_LANGUAGE_LAST] = {
  *   be as painless as possible for core devs)
  */
 
-static INLINE void libretro_set_core_options(retro_environment_t environ_cb)
+static INLINE void libretro_set_core_options(retro_environment_t environ_cb,
+      bool *categories_supported)
 {
-   unsigned version = 0;
+   unsigned version  = 0;
+#ifndef HAVE_NO_LANGEXTRA
+   unsigned language = 0;
+#endif
 
-   if (!environ_cb)
+   if (!environ_cb || !categories_supported)
       return;
 
-   if (environ_cb(RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION, &version) && (version >= 1))
-   {
-      struct retro_core_options_intl core_options_intl;
-      unsigned language = 0;
+   *categories_supported = false;
 
-      core_options_intl.us    = option_defs_us;
+   if (!environ_cb(RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION, &version))
+      version = 0;
+
+   if (version >= 2)
+   {
+#ifndef HAVE_NO_LANGEXTRA
+      struct retro_core_options_v2_intl core_options_intl;
+
+      core_options_intl.us    = &options_us;
       core_options_intl.local = NULL;
 
       if (environ_cb(RETRO_ENVIRONMENT_GET_LANGUAGE, &language) &&
           (language < RETRO_LANGUAGE_LAST) && (language != RETRO_LANGUAGE_ENGLISH))
-         core_options_intl.local = option_defs_intl[language];
+         core_options_intl.local = options_intl[language];
 
-      environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_INTL, &core_options_intl);
+      *categories_supported = environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_V2_INTL,
+            &core_options_intl);
+#else
+      *categories_supported = environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_V2,
+            &options_us);
+#endif
    }
    else
    {
-      size_t i;
+      size_t i, j;
       size_t option_index              = 0;
       size_t num_options               = 0;
+      struct retro_core_option_definition
+            *option_v1_defs_us         = NULL;
+#ifndef HAVE_NO_LANGEXTRA
+      size_t num_options_intl          = 0;
+      struct retro_core_option_v2_definition
+            *option_defs_intl          = NULL;
+      struct retro_core_option_definition
+            *option_v1_defs_intl       = NULL;
+      struct retro_core_options_intl
+            core_options_v1_intl;
+#endif
       struct retro_variable *variables = NULL;
       char **values_buf                = NULL;
 
-      /* Determine number of options
-       * > Note: We are going to skip a number of irrelevant
-       *   core options when building the retro_variable array,
-       *   but we'll allocate space for all of them. The difference
-       *   in resource usage is negligible, and this allows us to
-       *   keep the code 'cleaner' */
+      /* Determine total number of options */
       while (true)
       {
          if (option_defs_us[num_options].key)
@@ -513,92 +610,193 @@ static INLINE void libretro_set_core_options(retro_environment_t environ_cb)
             break;
       }
 
-      /* Allocate arrays */
-      variables  = (struct retro_variable *)calloc(num_options + 1, sizeof(struct retro_variable));
-      values_buf = (char **)calloc(num_options, sizeof(char *));
-
-      if (!variables || !values_buf)
-         goto error;
-
-      /* Copy parameters from option_defs_us array */
-      for (i = 0; i < num_options; i++)
+      if (version >= 1)
       {
-         const char *key                        = option_defs_us[i].key;
-         const char *desc                       = option_defs_us[i].desc;
-         const char *default_value              = option_defs_us[i].default_value;
-         struct retro_core_option_value *values = option_defs_us[i].values;
-         size_t buf_len                         = 3;
-         size_t default_index                   = 0;
+         /* Allocate US array */
+         option_v1_defs_us = (struct retro_core_option_definition *)
+               calloc(num_options + 1, sizeof(struct retro_core_option_definition));
 
-         values_buf[i] = NULL;
-
-         /* Skip options that are irrelevant when using the
-          * old style core options interface */
-         if ((strcmp(key, "fceumm_advance_sound_options") == 0))
-            continue;
-
-         if (desc)
+         /* Copy parameters from option_defs_us array */
+         for (i = 0; i < num_options; i++)
          {
-            size_t num_values = 0;
+            struct retro_core_option_v2_definition *option_def_us = &option_defs_us[i];
+            struct retro_core_option_value *option_values         = option_def_us->values;
+            struct retro_core_option_definition *option_v1_def_us = &option_v1_defs_us[i];
+            struct retro_core_option_value *option_v1_values      = option_v1_def_us->values;
 
-            /* Determine number of values */
+            option_v1_def_us->key           = option_def_us->key;
+            option_v1_def_us->desc          = option_def_us->desc;
+            option_v1_def_us->info          = option_def_us->info;
+            option_v1_def_us->default_value = option_def_us->default_value;
+
+            /* Values must be copied individually... */
+            while (option_values->value)
+            {
+               option_v1_values->value = option_values->value;
+               option_v1_values->label = option_values->label;
+
+               option_values++;
+               option_v1_values++;
+            }
+         }
+
+#ifndef HAVE_NO_LANGEXTRA
+         if (environ_cb(RETRO_ENVIRONMENT_GET_LANGUAGE, &language) &&
+             (language < RETRO_LANGUAGE_LAST) && (language != RETRO_LANGUAGE_ENGLISH) &&
+             options_intl[language])
+            option_defs_intl = options_intl[language]->definitions;
+
+         if (option_defs_intl)
+         {
+            /* Determine number of intl options */
             while (true)
             {
-               if (values[num_values].value)
-               {
-                  /* Check if this is the default value */
-                  if (default_value)
-                     if (strcmp(values[num_values].value, default_value) == 0)
-                        default_index = num_values;
-
-                  buf_len += strlen(values[num_values].value);
-                  num_values++;
-               }
+               if (option_defs_intl[num_options_intl].key)
+                  num_options_intl++;
                else
                   break;
             }
 
-            /* Build values string */
-            if (num_values > 1)
+            /* Allocate intl array */
+            option_v1_defs_intl = (struct retro_core_option_definition *)
+                  calloc(num_options_intl + 1, sizeof(struct retro_core_option_definition));
+
+            /* Copy parameters from option_defs_intl array */
+            for (i = 0; i < num_options_intl; i++)
             {
-               size_t j;
+               struct retro_core_option_v2_definition *option_def_intl = &option_defs_intl[i];
+               struct retro_core_option_value *option_values           = option_def_intl->values;
+               struct retro_core_option_definition *option_v1_def_intl = &option_v1_defs_intl[i];
+               struct retro_core_option_value *option_v1_values        = option_v1_def_intl->values;
 
-               buf_len += num_values - 1;
-               buf_len += strlen(desc);
+               option_v1_def_intl->key           = option_def_intl->key;
+               option_v1_def_intl->desc          = option_def_intl->desc;
+               option_v1_def_intl->info          = option_def_intl->info;
+               option_v1_def_intl->default_value = option_def_intl->default_value;
 
-               values_buf[i] = (char *)calloc(buf_len, sizeof(char));
-               if (!values_buf[i])
-                  goto error;
-
-               strcpy(values_buf[i], desc);
-               strcat(values_buf[i], "; ");
-
-               /* Default value goes first */
-               strcat(values_buf[i], values[default_index].value);
-
-               /* Add remaining values */
-               for (j = 0; j < num_values; j++)
+               /* Values must be copied individually... */
+               while (option_values->value)
                {
-                  if (j != default_index)
-                  {
-                     strcat(values_buf[i], "|");
-                     strcat(values_buf[i], values[j].value);
-                  }
+                  option_v1_values->value = option_values->value;
+                  option_v1_values->label = option_values->label;
+
+                  option_values++;
+                  option_v1_values++;
                }
             }
          }
 
-         variables[option_index].key   = key;
-         variables[option_index].value = values_buf[i];
-         option_index++;
+         core_options_v1_intl.us    = option_v1_defs_us;
+         core_options_v1_intl.local = option_v1_defs_intl;
+
+         environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_INTL, &core_options_v1_intl);
+#else
+         environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS, option_v1_defs_us);
+#endif
+      }
+      else
+      {
+         /* Allocate arrays */
+         variables  = (struct retro_variable *)calloc(num_options + 1,
+               sizeof(struct retro_variable));
+         values_buf = (char **)calloc(num_options, sizeof(char *));
+
+         if (!variables || !values_buf)
+            goto error;
+
+         /* Copy parameters from option_defs_us array */
+         for (i = 0; i < num_options; i++)
+         {
+            const char *key                        = option_defs_us[i].key;
+            const char *desc                       = option_defs_us[i].desc;
+            const char *default_value              = option_defs_us[i].default_value;
+            struct retro_core_option_value *values = option_defs_us[i].values;
+            size_t buf_len                         = 3;
+            size_t default_index                   = 0;
+
+            values_buf[i] = NULL;
+
+            /* Skip options that are irrelevant when using the
+             * old style core options interface */
+            if ((strcmp(key, "fceumm_show_adv_system_options") == 0) ||
+                (strcmp(key, "fceumm_advance_sound_options") == 0))
+               continue;
+
+            if (desc)
+            {
+               size_t num_values = 0;
+
+               /* Determine number of values */
+               while (true)
+               {
+                  if (values[num_values].value)
+                  {
+                     /* Check if this is the default value */
+                     if (default_value)
+                        if (strcmp(values[num_values].value, default_value) == 0)
+                           default_index = num_values;
+
+                     buf_len += strlen(values[num_values].value);
+                     num_values++;
+                  }
+                  else
+                     break;
+               }
+
+               /* Build values string */
+               if (num_values > 0)
+               {
+                  buf_len += num_values - 1;
+                  buf_len += strlen(desc);
+
+                  values_buf[i] = (char *)calloc(buf_len, sizeof(char));
+                  if (!values_buf[i])
+                     goto error;
+
+                  strcpy(values_buf[i], desc);
+                  strcat(values_buf[i], "; ");
+
+                  /* Default value goes first */
+                  strcat(values_buf[i], values[default_index].value);
+
+                  /* Add remaining values */
+                  for (j = 0; j < num_values; j++)
+                  {
+                     if (j != default_index)
+                     {
+                        strcat(values_buf[i], "|");
+                        strcat(values_buf[i], values[j].value);
+                     }
+                  }
+               }
+            }
+
+            variables[option_index].key   = key;
+            variables[option_index].value = values_buf[i];
+            option_index++;
+         }
+
+         /* Set variables */
+         environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, variables);
       }
 
-      /* Set variables */
-      environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, variables);
-
 error:
-
       /* Clean up */
+
+      if (option_v1_defs_us)
+      {
+         free(option_v1_defs_us);
+         option_v1_defs_us = NULL;
+      }
+
+#ifndef HAVE_NO_LANGEXTRA
+      if (option_v1_defs_intl)
+      {
+         free(option_v1_defs_intl);
+         option_v1_defs_intl = NULL;
+      }
+#endif
+
       if (values_buf)
       {
          for (i = 0; i < num_options; i++)
diff --git a/src/drivers/libretro/libretro_core_options_intl.h b/src/drivers/libretro/libretro_core_options_intl.h
new file mode 100644
index 0000000..038553a
--- /dev/null
+++ b/src/drivers/libretro/libretro_core_options_intl.h
@@ -0,0 +1,91 @@
+#ifndef LIBRETRO_CORE_OPTIONS_INTL_H__
+#define LIBRETRO_CORE_OPTIONS_INTL_H__
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
+/* https://support.microsoft.com/en-us/kb/980263 */
+#pragma execution_character_set("utf-8")
+#pragma warning(disable:4566)
+#endif
+
+#include <libretro.h>
+
+/*
+ ********************************
+ * VERSION: 2.0
+ ********************************
+ *
+ * - 2.0: Add support for core options v2 interface
+ * - 1.3: Move translations to libretro_core_options_intl.h
+ *        - libretro_core_options_intl.h includes BOM and utf-8
+ *          fix for MSVC 2010-2013
+ *        - Added HAVE_NO_LANGEXTRA flag to disable translations
+ *          on platforms/compilers without BOM support
+ * - 1.2: Use core options v1 interface when
+ *        RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION is >= 1
+ *        (previously required RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION == 1)
+ * - 1.1: Support generation of core options v0 retro_core_option_value
+ *        arrays containing options with a single value
+ * - 1.0: First commit
+*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ ********************************
+ * Core Option Definitions
+ ********************************
+*/
+
+/* RETRO_LANGUAGE_JAPANESE */
+
+/* RETRO_LANGUAGE_FRENCH */
+
+/* RETRO_LANGUAGE_SPANISH */
+
+/* RETRO_LANGUAGE_GERMAN */
+
+/* RETRO_LANGUAGE_ITALIAN */
+
+/* RETRO_LANGUAGE_DUTCH */
+
+/* RETRO_LANGUAGE_PORTUGUESE_BRAZIL */
+
+/* RETRO_LANGUAGE_PORTUGUESE_PORTUGAL */
+
+/* RETRO_LANGUAGE_RUSSIAN */
+
+/* RETRO_LANGUAGE_KOREAN */
+
+/* RETRO_LANGUAGE_CHINESE_TRADITIONAL */
+
+/* RETRO_LANGUAGE_CHINESE_SIMPLIFIED */
+
+/* RETRO_LANGUAGE_ESPERANTO */
+
+/* RETRO_LANGUAGE_POLISH */
+
+/* RETRO_LANGUAGE_VIETNAMESE */
+
+/* RETRO_LANGUAGE_ARABIC */
+
+/* RETRO_LANGUAGE_GREEK */
+
+/* RETRO_LANGUAGE_TURKISH */
+
+/* RETRO_LANGUAGE_SLOVAK */
+
+/* RETRO_LANGUAGE_PERSIAN */
+
+/* RETRO_LANGUAGE_HEBREW */
+
+/* RETRO_LANGUAGE_ASTURIAN */
+
+/* RETRO_LANGUAGE_FINNISH */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/drivers/libretro/libretro_dipswitch.c b/src/drivers/libretro/libretro_dipswitch.c
index e31116c..accdb96 100644
--- a/src/drivers/libretro/libretro_dipswitch.c
+++ b/src/drivers/libretro/libretro_dipswitch.c
@@ -1069,11 +1069,7 @@ enum {
    DPSW_NWC,
 };
 
-static struct retro_core_option_definition option_defs_empty = {
-   NULL, NULL, NULL, { {0} }, NULL
-};
-
-static struct retro_core_option_definition vscoreopt[MAX_CORE_OPTIONS];
+static struct retro_core_option_v2_definition vscoreopt[MAX_CORE_OPTIONS];
 static VSUNIGAME *vsgame = NULL;
 
 static char *core_key[MAX_CORE_OPTIONS];
@@ -1098,7 +1094,7 @@ static const char *str_to_corekey(char *s)
    return str;
 }
 
-static void make_core_options(struct retro_core_option_definition *vs_core_options)
+static void make_core_options(struct retro_core_option_v2_definition *vs_core_options)
 {
    unsigned i, j;
 
@@ -1109,6 +1105,9 @@ static void make_core_options(struct retro_core_option_definition *vs_core_optio
       const char *option_name = vsgame->core_options[i].option_name;
       char key[100] = {0};
 
+      memset(&vs_core_options[i], 0,
+            sizeof(struct retro_core_option_v2_definition));
+
       /* Set core key and sanitize string */
       sprintf(key, "fceumm_dipswitch_%s-%s", game_name, option_name);
       core_key[i] = calloc(strlen(key) + 1, sizeof(char));
@@ -1118,8 +1117,8 @@ static void make_core_options(struct retro_core_option_definition *vs_core_optio
       /* Set desc */
       vs_core_options[i].desc = option_name;
 
-      /* Set info */
-      vs_core_options[i].info = NULL;
+      /* Set category_key */
+      vs_core_options[i].category_key = "dip_switch";
 
       /* Set core values */
       for (j = 0; j < numValues[i]; j++) {
@@ -1127,8 +1126,6 @@ static void make_core_options(struct retro_core_option_definition *vs_core_optio
          vs_core_options[i].values[j].value = var_value;
       }
 
-      vs_core_options[i].values[j] = vars_empty;
-
       /* Set default value. Top entry used as default */
       vs_core_options[i].default_value = vsgame->core_options[i].settings[0].name;
    }
@@ -1241,11 +1238,14 @@ static void update_dipswitch_vsuni(void)
 }
 
 /* Nintendo World Championships 1990 */
-static struct retro_core_option_definition dipswitch_nwc[] = {
+static struct retro_core_option_v2_definition dipswitch_nwc[] = {
    {
       "fceumm_dipswitch_nwc",
       "Gameplay Duration in minutes (Restart)",
+      NULL,
       "Sets the game timer in minutes.",
+      NULL,
+      "dip_switch",
       {
          { "0",  "5:00" },
          { "1",  "5:19" },
@@ -1263,12 +1263,11 @@ static struct retro_core_option_definition dipswitch_nwc[] = {
          { "13", "9:04" },
          { "14", "9:23" },
          { "15", "9:42" },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "4",
    },
-
-   { NULL, NULL, NULL, { {0} }, NULL },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
 };
 
 static void update_dipswitch_nwc(void)
@@ -1292,7 +1291,7 @@ static void update_dipswitch_nwc(void)
    }
 }
 
-size_t set_dipswitch_variables(unsigned current_index, struct retro_core_option_definition *vars)
+void set_dipswitch_variables(unsigned current_index, struct retro_core_option_v2_definition *vars)
 {
    unsigned index = current_index;
    int dipsw_size = 0;
@@ -1310,8 +1309,7 @@ size_t set_dipswitch_variables(unsigned current_index, struct retro_core_option_
          dipswitch_type = DPSW_VSUNI;
 
          /* Initialize dipswitch struct with empty values */
-         for (i = 0; i < MAX_CORE_OPTIONS; i++)
-            vscoreopt[i] = option_defs_empty;
+         memset(&vscoreopt, 0, sizeof(vscoreopt));
 
          /* Count number of core options and the number of values for each */
          for (i = 0; i < MAX_CORE_OPTIONS; i++) {
@@ -1328,12 +1326,13 @@ size_t set_dipswitch_variables(unsigned current_index, struct retro_core_option_
 
          /* Append dipswitch struct to main core options struct */
          while (vscoreopt[dipsw_size].key) {
-            vars[index] = vscoreopt[dipsw_size];
+            memcpy(&vars[index], &vscoreopt[dipsw_size],
+                  sizeof(struct retro_core_option_v2_definition));
             index++;
             dipsw_size++;
          }
       }
-      return (dipsw_size);
+      return;
    }
 
    /* Nintendo World Championship cart (Mapper 105)*/
@@ -1342,15 +1341,16 @@ size_t set_dipswitch_variables(unsigned current_index, struct retro_core_option_
       dipswitch_type = DPSW_NWC;
 
       while (dipswitch_nwc[dipsw_size].key) {
-         vars[index] = dipswitch_nwc[dipsw_size];
+         memcpy(&vars[index], &dipswitch_nwc[dipsw_size],
+               sizeof(struct retro_core_option_v2_definition));
          index++;
          dipsw_size++;
       }
-      return (dipsw_size);
+      return;
    }
 
    dipswitch_type = DPSW_NONE;
-   return (0);
+   return;
 }
 
 void update_dipswitch(void)
diff --git a/src/drivers/libretro/libretro_dipswitch.h b/src/drivers/libretro/libretro_dipswitch.h
index bf6ace7..a0ef579 100644
--- a/src/drivers/libretro/libretro_dipswitch.h
+++ b/src/drivers/libretro/libretro_dipswitch.h
@@ -3,7 +3,7 @@
 
 #include <libretro.h>
 
-size_t set_dipswitch_variables(unsigned current_index, struct retro_core_option_definition *vars);
+void set_dipswitch_variables(unsigned current_index, struct retro_core_option_v2_definition *vars);
 void update_dipswitch(void);
 void DPSW_Cleanup(void);
 
diff --git a/src/ntsc/nes_ntsc_config.h b/src/ntsc/nes_ntsc_config.h
index 1a89293..56876d6 100644
--- a/src/ntsc/nes_ntsc_config.h
+++ b/src/ntsc/nes_ntsc_config.h
@@ -19,7 +19,7 @@ if you enable emphasis above. */
 
 /* Each raw pixel input value is passed through this. You might want to mask
 the pixel index if you use the high bits as flags, etc. */
-#define NES_NTSC_ADJ_IN( in, deemp ) ( in & 0x3F ) | ( deemp << 6 )
+#define NES_NTSC_ADJ_IN( in, deemp ) (( in & 0x3F ) | ((deemp & 0x7) << 6))
 
 /* For each pixel, this is the basic operation:
 output_color = color_palette [NES_NTSC_ADJ_IN( NES_NTSC_IN_T )] */

From 499f1c04de45bfaa044e307a20d97a0c18a3371b Mon Sep 17 00:00:00 2001
From: jdgleaver <james@leaver.myzen.co.uk>
Date: Wed, 20 Oct 2021 16:31:45 +0100
Subject: [PATCH 149/295] Replace direct file access with VFS routines

---
 Makefile.common                               |  127 +-
 Makefile.libretro                             |   15 +-
 src/boards/copyfami_hwi.c                     |   22 +-
 src/cart.c                                    |   26 +-
 src/cheat.c                                   |    4 +-
 src/cheat.h                                   |    4 +-
 src/debug.c                                   |   28 +-
 src/driver.h                                  |   13 +-
 src/drivers/libretro/griffin.c                |   43 -
 .../compat/compat_posix_string.c              |  104 ++
 .../compat/compat_strcasestr.c                |   58 +
 .../libretro/libretro-common/file/file_path.c | 1381 +++++++++++++++++
 .../libretro-common/file/file_path_io.c       |  151 ++
 .../win32.h => compat/posix_string.h}         |   57 +-
 .../include/compat/strcasestr.h               |   48 +
 .../include/encodings/base64.h                |   48 -
 .../libretro-common/include/file/file_path.h  |  538 +++++++
 .../{encodings/crc32.h => retro_assert.h}     |   23 +-
 .../include/retro_environment.h               |  114 ++
 .../include/retro_miscellaneous.h             |  203 +++
 .../include/streams/file_stream.h             |  117 ++
 .../include/streams/file_stream_transforms.h  |  101 ++
 .../include/string/stdstring.h                |   58 +-
 .../libretro-common/include/time/rtime.h      |   48 +
 .../libretro-common/include/vfs/vfs.h         |  111 ++
 .../include/vfs/vfs_implementation.h          |   76 +
 .../libretro-common/streams/file_stream.c     |  678 ++++++++
 .../streams/file_stream_transforms.c          |  159 ++
 .../libretro-common/string/stdstring.c        |  247 ++-
 .../libretro/libretro-common/time/rtime.c     |   81 +
 .../libretro-common/vfs/vfs_implementation.c  | 1335 ++++++++++++++++
 src/drivers/libretro/libretro.c               |   98 +-
 src/fceu-endian.c                             |   45 +-
 src/fceu-endian.h                             |    7 +-
 src/fceu-memory.h                             |   17 -
 src/fceu-types.h                              |   26 -
 src/fceu.c                                    |   12 +-
 src/fds.c                                     |   35 +-
 src/file.c                                    |   56 +-
 src/file.h                                    |   14 +-
 src/general.c                                 |   69 +-
 src/general.h                                 |    8 +-
 src/palette.c                                 |   18 +-
 src/state.h                                   |    5 -
 44 files changed, 5853 insertions(+), 575 deletions(-)
 delete mode 100644 src/drivers/libretro/griffin.c
 create mode 100644 src/drivers/libretro/libretro-common/compat/compat_posix_string.c
 create mode 100644 src/drivers/libretro/libretro-common/compat/compat_strcasestr.c
 create mode 100644 src/drivers/libretro/libretro-common/file/file_path.c
 create mode 100644 src/drivers/libretro/libretro-common/file/file_path_io.c
 rename src/drivers/libretro/libretro-common/include/{encodings/win32.h => compat/posix_string.h} (57%)
 create mode 100644 src/drivers/libretro/libretro-common/include/compat/strcasestr.h
 delete mode 100644 src/drivers/libretro/libretro-common/include/encodings/base64.h
 create mode 100644 src/drivers/libretro/libretro-common/include/file/file_path.h
 rename src/drivers/libretro/libretro-common/include/{encodings/crc32.h => retro_assert.h} (77%)
 create mode 100644 src/drivers/libretro/libretro-common/include/retro_environment.h
 create mode 100644 src/drivers/libretro/libretro-common/include/retro_miscellaneous.h
 create mode 100644 src/drivers/libretro/libretro-common/include/streams/file_stream.h
 create mode 100644 src/drivers/libretro/libretro-common/include/streams/file_stream_transforms.h
 create mode 100644 src/drivers/libretro/libretro-common/include/time/rtime.h
 create mode 100644 src/drivers/libretro/libretro-common/include/vfs/vfs.h
 create mode 100644 src/drivers/libretro/libretro-common/include/vfs/vfs_implementation.h
 create mode 100644 src/drivers/libretro/libretro-common/streams/file_stream.c
 create mode 100644 src/drivers/libretro/libretro-common/streams/file_stream_transforms.c
 create mode 100644 src/drivers/libretro/libretro-common/time/rtime.c
 create mode 100644 src/drivers/libretro/libretro-common/vfs/vfs_implementation.c

diff --git a/Makefile.common b/Makefile.common
index 9876d85..1aa3df5 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,68 +1,77 @@
 LIBRETRO_COMM_DIR := $(CORE_DIR)/drivers/libretro/libretro-common
-INCFLAGS      := -I$(CORE_DIR)/drivers/libretro -I$(LIBRETRO_COMM_DIR)/include -I$(CORE_DIR) -I$(CORE_DIR)/input -I$(CORE_DIR)/boards
-COREDEFINES    = -D__LIBRETRO__ -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DFCEU_VERSION_NUMERIC=9813 -DFRONTEND_SUPPORTS_RGB565
 
-ifeq ($(PSS_STYLE),2)
-COREDEFINES += -DPSS_STYLE=2
-else
-COREDEFINES += -DPSS_STYLE=1
+INCFLAGS := \
+	-I$(CORE_DIR)/drivers/libretro \
+	-I$(LIBRETRO_COMM_DIR)/include \
+	-I$(CORE_DIR) \
+	-I$(CORE_DIR)/input \
+	-I$(CORE_DIR)/boards
+
+ifneq (,$(findstring msvc2003,$(platform)))
+	INCFLAGS += -I$(LIBRETRO_COMM_DIR)/include/compat/msvc
 endif
 
-ifeq ($(TUP_CWD),)
-FCEU_SRC_DIRS := $(CORE_DIR)/boards $(CORE_DIR)/input $(CORE_DIR)/mappers
-SOURCES_C     := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c))
-else
-SOURCES_C = $(CORE_DIR)/boards/*.c $(CORE_DIR)/input/*.c
-endif
+COREDEFINES = \
+	-D__LIBRETRO__ \
+	-DPATH_MAX=1024 \
+	-DFCEU_VERSION_NUMERIC=9813 \
+	-DFRONTEND_SUPPORTS_RGB565
+
+FCEU_SRC_DIRS := \
+	$(CORE_DIR)/boards \
+	$(CORE_DIR)/input
+
+SOURCES_C := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c))
 
 ifeq ($(HAVE_NTSC),1)
-COREDEFINES += -DHAVE_NTSC_FILTER -I$(CORE_DIR)/ntsc
-SOURCES_C   += $(CORE_DIR)/ntsc/nes_ntsc.c
-endif
-
-ifeq ($(HAVE_GRIFFIN),1)
-SOURCES_C += $(CORE_DIR)/drivers/libretro/griffin.c
-else
-SOURCES_C += \
-				 $(CORE_DIR)/drivers/libretro/libretro.c \
-				 $(CORE_DIR)/cart.c \
-				 $(CORE_DIR)/cheat.c \
-				 $(CORE_DIR)/crc32.c \
-				 $(CORE_DIR)/fceu-endian.c \
-				 $(CORE_DIR)/fceu-memory.c \
-				 $(CORE_DIR)/misc.c \
-				 $(CORE_DIR)/fceu.c \
-				 $(CORE_DIR)/fds.c \
-				 $(CORE_DIR)/fds_apu.c \
-				 $(CORE_DIR)/file.c \
-				 $(CORE_DIR)/filter.c \
-				 $(CORE_DIR)/general.c \
-				 $(CORE_DIR)/input.c \
-				 $(CORE_DIR)/md5.c \
-				 $(CORE_DIR)/nsf.c \
-				 $(CORE_DIR)/palette.c \
-				 $(CORE_DIR)/ppu.c \
-				 $(CORE_DIR)/sound.c \
-				 $(CORE_DIR)/state.c \
-				 $(CORE_DIR)/video.c \
-				 $(CORE_DIR)/vsuni.c
-
-ifeq ($(STATIC_LINKING),1)
-else
-SOURCES_C += $(CORE_DIR)/drivers/libretro/libretro-common/streams/memory_stream.c \
-				$(CORE_DIR)/drivers/libretro/libretro-common/compat/compat_snprintf.c \
-				$(CORE_DIR)/drivers/libretro/libretro-common/string/stdstring.c \
-				$(CORE_DIR)/drivers/libretro/libretro-common/encodings/encoding_utf.c \
-				$(CORE_DIR)/drivers/libretro/libretro-common/compat/compat_strl.c \
-				$(CORE_DIR)/drivers/libretro/libretro-common/compat/fopen_utf8.c
-endif
-
-ifeq ($(DEBUG),1)
-SOURCES_C += $(CORE_DIR)/debug.c
-endif
+	COREDEFINES += \
+		-DHAVE_NTSC_FILTER \
+		-I$(CORE_DIR)/ntsc
+	SOURCES_C += $(CORE_DIR)/ntsc/nes_ntsc.c
 endif
 
 SOURCES_C += \
-				 $(CORE_DIR)/ines.c \
-				 $(CORE_DIR)/unif.c $(CORE_DIR)/x6502.c \
-				 $(CORE_DIR)/drivers/libretro/libretro_dipswitch.c
+	$(CORE_DIR)/drivers/libretro/libretro.c \
+	$(CORE_DIR)/drivers/libretro/libretro_dipswitch.c \
+	$(CORE_DIR)/cart.c \
+	$(CORE_DIR)/cheat.c \
+	$(CORE_DIR)/crc32.c \
+	$(CORE_DIR)/fceu-endian.c \
+	$(CORE_DIR)/fceu-memory.c \
+	$(CORE_DIR)/misc.c \
+	$(CORE_DIR)/fceu.c \
+	$(CORE_DIR)/fds.c \
+	$(CORE_DIR)/fds_apu.c \
+	$(CORE_DIR)/file.c \
+	$(CORE_DIR)/filter.c \
+	$(CORE_DIR)/general.c \
+	$(CORE_DIR)/input.c \
+	$(CORE_DIR)/md5.c \
+	$(CORE_DIR)/nsf.c \
+	$(CORE_DIR)/palette.c \
+	$(CORE_DIR)/ppu.c \
+	$(CORE_DIR)/sound.c \
+	$(CORE_DIR)/state.c \
+	$(CORE_DIR)/video.c \
+	$(CORE_DIR)/vsuni.c \
+	$(CORE_DIR)/ines.c \
+	$(CORE_DIR)/unif.c \
+	$(CORE_DIR)/x6502.c
+
+ifneq ($(STATIC_LINKING), 1)
+	SOURCES_C += \
+		$(LIBRETRO_COMM_DIR)/compat/compat_posix_string.c \
+		$(LIBRETRO_COMM_DIR)/compat/compat_snprintf.c \
+		$(LIBRETRO_COMM_DIR)/compat/compat_strcasestr.c \
+		$(LIBRETRO_COMM_DIR)/compat/compat_strl.c \
+		$(LIBRETRO_COMM_DIR)/compat/fopen_utf8.c \
+		$(LIBRETRO_COMM_DIR)/encodings/encoding_utf.c \
+		$(LIBRETRO_COMM_DIR)/file/file_path.c \
+		$(LIBRETRO_COMM_DIR)/file/file_path_io.c \
+		$(LIBRETRO_COMM_DIR)/streams/file_stream.c \
+		$(LIBRETRO_COMM_DIR)/streams/file_stream_transforms.c \
+		$(LIBRETRO_COMM_DIR)/streams/memory_stream.c \
+		$(LIBRETRO_COMM_DIR)/string/stdstring.c \
+		$(LIBRETRO_COMM_DIR)/time/rtime.c \
+		$(LIBRETRO_COMM_DIR)/vfs/vfs_implementation.c
+endif
diff --git a/Makefile.libretro b/Makefile.libretro
index d4e86bf..ce0b618 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -1,7 +1,5 @@
 DEBUG=0
-PSS_STYLE=1
 EXTERNAL_ZLIB=0
-HAVE_GRIFFIN=1
 STATIC_LINKING=0
 ENDIANNESS_DEFINES=
 SIGNED_CHAR=0
@@ -161,7 +159,7 @@ else ifeq ($(platform), ps2)
 	TARGET := $(TARGET_NAME)_libretro_$(platform).a
 	CC = mips64r5900el-ps2-elf-gcc$(EXE_EXT)
 	AR = mips64r5900el-ps2-elf-ar$(EXE_EXT)
-	FCEU_DEFINES := -DPATH_MAX=1024 -DINLINE=inline -DPSS_STYLE=1 -DFCEU_VERSION_NUMERIC=9813 -DHAVE_ASPRINTF
+	FCEU_DEFINES := -DPATH_MAX=1024 -DINLINE=inline -DFCEU_VERSION_NUMERIC=9813 -DHAVE_ASPRINTF
 	ENDIANNESS_DEFINES := -DLSB_FIRST -DLOCAL_LE=1
 	PLATFORM_DEFINES := -DPS2 -D_EE -G0 -DFRONTEND_SUPPORTS_ABGR1555 -DRENDER_GSKIT_PS2
 	PLATFORM_DEFINES += -I$(PS2SDK)/ee/include -I$(PS2SDK)/common/include -I$(PS2DEV)/gsKit/include
@@ -540,7 +538,6 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
 	export INCLUDE := $(INCLUDE);$(WindowsSDKSharedIncludeDir);$(WindowsSDKUCRTIncludeDir);$(WindowsSDKUMIncludeDir)
 	export LIB := $(LIB);$(WindowsSDKUCRTLibDir);$(WindowsSDKUMLibDir)
 	TARGET := $(TARGET_NAME)_libretro.dll
-	PSS_STYLE :=2
 	LDFLAGS += -DLL
 
 # Windows MSVC 2010 x64
@@ -564,7 +561,6 @@ INCFLAGS_PLATFORM = -I"$(WindowsSDKIncludeDir)"
 export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKGlIncludeDir)
 export LIB := $(LIB);$(WindowsSDKLibDir)
 TARGET := $(TARGET_NAME)_libretro.dll
-PSS_STYLE :=2
 LDFLAGS += -DLL
 
 # Windows MSVC 2010 x86
@@ -588,7 +584,6 @@ INCFLAGS_PLATFORM = -I"$(WindowsSDKIncludeDir)"
 export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKGlIncludeDir)
 export LIB := $(LIB);$(WindowsSDKLibDir)
 TARGET := $(TARGET_NAME)_libretro.dll
-PSS_STYLE :=2
 LDFLAGS += -DLL
 
 # Windows MSVC 2003 Xbox 1
@@ -602,7 +597,6 @@ export INCLUDE := $(XDK)\xbox\include
 export LIB := $(XDK)\xbox\lib
 PATH := $(call unixcygpath,$(XDK)/xbox/bin/vc71):$(PATH)
 
-PSS_STYLE :=2
 CFLAGS   += -D_XBOX -D_XBOX1
 CXXFLAGS += -D_XBOX -D_XBOX1
 STATIC_LINKING=1
@@ -618,7 +612,6 @@ export INCLUDE := $(XEDK)/include/xbox
 export LIB := $(XEDK)/lib/xbox
 PATH := $(call unixcygpath,$(XEDK)/bin/win32):$(PATH)
 
-PSS_STYLE :=2
 CFLAGS   += -D_XBOX -D_XBOX360
 CXXFLAGS += -D_XBOX -D_XBOX360
 ENDIANNESS_DEFINES += -DMSB_FIRST
@@ -640,7 +633,6 @@ WindowsSdkDir := $(INETSDK)
 export INCLUDE := $(INCLUDE);$(INETSDK)/Include
 export LIB := $(LIB);$(WindowsSdkDir);$(INETSDK)/Lib
 TARGET := $(TARGET_NAME)_libretro.dll
-PSS_STYLE :=2
 LDFLAGS += -DLL
 CFLAGS += -D_CRT_SECURE_NO_DEPRECATE
 
@@ -667,7 +659,6 @@ WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib")
 export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKAtlIncludeDir);$(WindowsSDKCrtIncludeDir);$(WindowsSDKGlIncludeDir);$(WindowsSDKMfcIncludeDir);libretro-common/include/compat/msvc
 export LIB := $(LIB);$(WindowsSDKLibDir)
 TARGET := $(TARGET_NAME)_libretro.dll
-PSS_STYLE :=2
 LDFLAGS += -DLL
 CFLAGS += -D_CRT_SECURE_NO_DEPRECATE
 
@@ -687,7 +678,6 @@ WindowsSdkDir := $(INETSDK)
 export INCLUDE := $(INCLUDE);$(INETSDK)/Include
 export LIB := $(LIB);$(WindowsSdkDir);$(INETSDK)/Lib
 TARGET := $(TARGET_NAME)_libretro.dll
-PSS_STYLE :=2
 LDFLAGS += -DLL
 CFLAGS += -D_CRT_SECURE_NO_DEPRECATE
 
@@ -696,7 +686,6 @@ else
 	TARGET := $(TARGET_NAME)_libretro.dll
 	CC ?= gcc
 	SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=src/drivers/libretro/link.T
-   PSS_STYLE :=2
 endif
 
 ifeq ($(DEBUG), 1)
@@ -751,8 +740,6 @@ ifneq (,$(findstring msvc,$(platform)))
 COREDEFINES += -DINLINE=_inline
 endif
 
-CFLAGS += -DWANT_GRIFFIN
-
 OBJECTS := $(SOURCES_C:.c=.o)
 OBJECTS += $(RETROARCH_OBJECTS)
 
diff --git a/src/boards/copyfami_hwi.c b/src/boards/copyfami_hwi.c
index 7660c61..fde8fa4 100644
--- a/src/boards/copyfami_hwi.c
+++ b/src/boards/copyfami_hwi.c
@@ -26,6 +26,8 @@
 #define NO_CACHE
 #define NO_RAM
 
+#include <streams/file_stream.h>
+
 #include "__serial.h"
 #include "mapinc.h"
 
@@ -167,28 +169,32 @@ static void GetStatus(SYNC_STATE *state) {
 }
 
 static int32 FetchNewCHRBank(int32 slot) {
-	FILE *ofile;
+	RFILE *ofile;
 	char name[256];
 	int32 bank = chr_data.count++;
 	CHR1KGetCmd[1] = slot << 2;
 	SENDGET(CHR1KGetCmd, chr_data.buf[bank * 1024], 1024);
 	sprintf(name, "%04x.chr", bank);
-	ofile = FCEUD_UTF8fopen(name, "wb");
-	fwrite((void*)&chr_data.buf[bank * 1024], 1, 1024, ofile);
-	fclose(ofile);
+	ofile = filestream_open(name,
+			RETRO_VFS_FILE_ACCESS_WRITE,
+			RETRO_VFS_FILE_ACCESS_HINT_NONE);
+	filestream_write(ofile, (void*)&chr_data.buf[bank * 1024], 1024);
+	filestream_close(ofile);
 	return bank;
 }
 
 static int32 FetchNewPRGBank(int32 slot) {
-	FILE *ofile;
+	RFILE *ofile;
 	char name[256];
 	int32 bank = prg_data.count++;
 	PRG8KGetCmd[1] = 0x80 + (slot << 5);
 	SENDGET(PRG8KGetCmd, prg_data.buf[bank * 8192], 8192);
 	sprintf(name, "%04x.prg", bank);
-	ofile = FCEUD_UTF8fopen(name, "wb");
-	fwrite((void*)&prg_data.buf[bank * 8192], 1, 8192, ofile);
-	fclose(ofile);
+	ofile = filestream_open(name,
+			RETRO_VFS_FILE_ACCESS_WRITE,
+			RETRO_VFS_FILE_ACCESS_HINT_NONE);
+	filestream_write(ofile, (void*)&prg_data.buf[bank * 8192], 8192);
+	filestream_close(ofile);
 	return bank;
 }
 
diff --git a/src/cart.c b/src/cart.c
index 911cb0c..345c419 100644
--- a/src/cart.c
+++ b/src/cart.c
@@ -22,6 +22,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include <string/stdstring.h>
+#include <streams/file_stream.h>
+
 #include "fceu-types.h"
 #include "fceu.h"
 #include "ppu.h"
@@ -340,7 +343,7 @@ void FixGenieMap(void);
 
 /* Called when a game(file) is opened successfully. */
 void FCEU_OpenGenie(void) {
-	FILE *fp;
+	RFILE *fp = NULL;
 	int x;
 
 	if (!GENIEROM) {
@@ -349,33 +352,38 @@ void FCEU_OpenGenie(void) {
 		if (!(GENIEROM = (uint8*)FCEU_malloc(4096 + 1024))) return;
 
 		fn = FCEU_MakeFName(FCEUMKF_GGROM, 0, 0);
-		fp = FCEUD_UTF8fopen(fn, "rb");
+
+		if (!string_is_empty(fn))
+			fp = filestream_open(fn,
+					RETRO_VFS_FILE_ACCESS_READ,
+					RETRO_VFS_FILE_ACCESS_HINT_NONE);
+
 		if (!fp) {
 			FCEU_PrintError("Error opening Game Genie ROM image!");
 			free(GENIEROM);
 			GENIEROM = 0;
 			return;
 		}
-		if (fread(GENIEROM, 1, 16, fp) != 16) {
+		if (filestream_read(fp, GENIEROM, 16) != 16) {
  grerr:
 			FCEU_PrintError("Error reading from Game Genie ROM image!");
 			free(GENIEROM);
 			GENIEROM = 0;
-			fclose(fp);
+			filestream_close(fp);
 			return;
 		}
 		if (GENIEROM[0] == 0x4E) {	/* iNES ROM image */
-			if (fread(GENIEROM, 1, 4096, fp) != 4096)
+			if (filestream_read(fp, GENIEROM, 4096) != 4096)
 				goto grerr;
-			if (fseek(fp, 16384 - 4096, SEEK_CUR))
+			if (filestream_seek(fp, 16384 - 4096, RETRO_VFS_SEEK_POSITION_CURRENT))
 				goto grerr;
-			if (fread(GENIEROM + 4096, 1, 256, fp) != 256)
+			if (filestream_read(fp, GENIEROM + 4096, 256) != 256)
 				goto grerr;
 		} else {
-			if (fread(GENIEROM + 16, 1, 4352 - 16, fp) != (4352 - 16))
+			if (filestream_read(fp, GENIEROM + 16, 4352 - 16) != (4352 - 16))
 				goto grerr;
 		}
-		fclose(fp);
+		filestream_close(fp);
 
 		/* Workaround for the FCE Ultra CHR page size only being 1KB */
 		for (x = 0; x < 4; x++)
diff --git a/src/cheat.c b/src/cheat.c
index 0e82364..66af7b6 100644
--- a/src/cheat.c
+++ b/src/cheat.c
@@ -162,13 +162,13 @@ static int AddCheatEntry(char *name, uint32 addr, uint8 val, int compare, int st
 	return(1);
 }
 
-void FCEU_LoadGameCheats(FILE *override)
+void FCEU_LoadGameCheats(void)
 {
    numsubcheats = savecheats = 0;
    RebuildSubCheats();
 }
 
-void FCEU_FlushGameCheats(FILE *override, int nosave) {
+void FCEU_FlushGameCheats(void) {
 	if (CheatComp)
    {
 		free(CheatComp);
diff --git a/src/cheat.h b/src/cheat.h
index 9081c96..3052f54 100644
--- a/src/cheat.h
+++ b/src/cheat.h
@@ -6,8 +6,8 @@ extern uint8 *MMapPtrs[64];
 void FCEU_CheatResetRAM(void);
 void FCEU_CheatAddRAM(int s, uint32 A, uint8 *p);
 
-void FCEU_LoadGameCheats(FILE *override);
-void FCEU_FlushGameCheats(FILE *override, int nosave);
+void FCEU_LoadGameCheats(void);
+void FCEU_FlushGameCheats(void);
 void FCEU_ApplyPeriodicCheats(void);
 void FCEU_PowerCheats(void);
 
diff --git a/src/debug.c b/src/debug.c
index 53449d6..bc48739 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -22,38 +22,44 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include <streams/file_stream.h>
+
 #include "fceu-types.h"
 #include "x6502.h"
 #include "fceu.h"
 #include "debug.h"
 #include "cart.h"
 
-
 void FCEUI_DumpVid(const char *fname, uint32 start, uint32 end) {
-	FILE *fp = FCEUD_UTF8fopen(fname, "wb");
+	RFILE *fp = filestream_open(fname,
+			RETRO_VFS_FILE_ACCESS_WRITE,
+			RETRO_VFS_FILE_ACCESS_HINT_NONE);
 	fceuindbg = 1;
 	start &= 0x3FFF;
 	end &= 0x3FFF;
 	for (; start <= end; start++)
-		fputc(VPage[start >> 10][start], fp);
-	fclose(fp);
+		filestream_putc(fp, VPage[start >> 10][start]);
+	filestream_close(fp);
 	fceuindbg = 0;
 }
 
 void FCEUI_DumpMem(const char *fname, uint32 start, uint32 end) {
-	FILE *fp = FCEUD_UTF8fopen(fname, "wb");
+	RFILE *fp = filestream_open(fname,
+			RETRO_VFS_FILE_ACCESS_WRITE,
+			RETRO_VFS_FILE_ACCESS_HINT_NONE);
 	fceuindbg = 1;
 	for (; start <= end; start++)
-		fputc(ARead[start](start), fp);
-	fclose(fp);
+		filestream_putc(fp, ARead[start](start));
+	filestream_close(fp);
 	fceuindbg = 0;
 }
 
 void FCEUI_LoadMem(const char *fname, uint32 start, int hl) {
 	int t;
-
-	FILE *fp = FCEUD_UTF8fopen(fname, "rb");
-	while ((t = fgetc(fp)) >= 0) {
+	RFILE *fp = filestream_open(fname,
+			RETRO_VFS_FILE_ACCESS_READ,
+			RETRO_VFS_FILE_ACCESS_HINT_NONE);
+	while ((t = filestream_getc(fp)) >= 0) {
 		if (start > 0xFFFF) break;
 		if (hl) {
 			extern uint8 *Page[32];
@@ -63,7 +69,7 @@ void FCEUI_LoadMem(const char *fname, uint32 start, int hl) {
 			BWrite[start](start, t);
 		start++;
 	}
-	fclose(fp);
+	filestream_close(fp);
 }
 
 #ifdef FCEUDEF_DEBUGGER
diff --git a/src/driver.h b/src/driver.h
index 6c83d97..e16476e 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -27,8 +27,6 @@ extern "C" {
 #define FCEUNPCMD_LOADCHEATS  0x82
 #define FCEUNPCMD_TEXT        0x90
 
-FILE *FCEUD_UTF8fopen(const char *fn, const char *mode);
-
 /* This makes me feel dirty for some reason. */
 void FCEU_printf(char *format, ...);
 #define FCEUI_printf FCEU_printf
@@ -101,7 +99,7 @@ void FCEUI_DisableSpriteLimitation(int a);
 /* -1 = no change, 0 = show, 1 = hide, 2 = internal toggle */
 void FCEUI_SetRenderDisable(int sprites, int bg);
 
-FCEUGI *FCEUI_LoadGame(const char *name, uint8_t *buf, size_t bufsize);
+FCEUGI *FCEUI_LoadGame(const char *name, const uint8_t *buf, size_t bufsize);
 
 #ifdef COPYFAMI
 /* Fake UNIF board to start new CFHI instance */
@@ -140,12 +138,9 @@ void FCEUI_FrameSkip(int x);
 /* First and last scanlines to render, for ntsc and pal emulation. */
 void FCEUI_SetRenderedLines(int ntscf, int ntscl, int palf, int pall);
 
-/* Sets the base directory(save states, snapshots, etc. are saved in directories
-   below this directory. */
-void FCEUI_SetBaseDirectory(char *dir);
-
-void FCEUI_SetSaveDirectory(char *sav_dir);
-
+/* Sets the base directory (bios and palette files are saved
+   in this directory. */
+void FCEUI_SetBaseDirectory(const char *dir);
 
 /* Tells FCE Ultra to copy the palette data pointed to by pal and use it.
    Data pointed to by pal needs to be 64*3 bytes in length.
diff --git a/src/drivers/libretro/griffin.c b/src/drivers/libretro/griffin.c
deleted file mode 100644
index 9a215eb..0000000
--- a/src/drivers/libretro/griffin.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifdef WANT_GRIFFIN
-
-#include "drivers/libretro/libretro.c"
-
-#ifndef STATIC_LINKING
-#include "drivers/libretro/libretro-common/streams/memory_stream.c"
-#include "drivers/libretro/libretro-common/string/stdstring.c"
-#include "drivers/libretro/libretro-common/encodings/encoding_utf.c"
-#include "drivers/libretro/libretro-common/compat/compat_strl.c"
-#include "drivers/libretro/libretro-common/compat/fopen_utf8.c"
-#endif
-
-#include "cart.c"
-#include "cheat.c"
-#include "crc32.c"
-
-#ifdef DEBUG
-#include "debug.c"
-#endif
-#include "fceu-endian.c"
-#include "fceu-memory.c"
-#include "misc.c"
-#include "fceu.c"
-#include "fds.c"
-#include "fds_apu.c"
-#include "file.c"
-#include "filter.c"
-#include "general.c"
-#include "input.c"
-#include "md5.c"
-#include "nsf.c"
-#include "palette.c"
-#include "ppu.c"
-#include "sound.c"
-#include "state.c"
-#include "video.c"
-#include "vsuni.c"
-
-/* #include "x6502.c" */
-/* #include "ines.c" */
-/* #include "unif.c" */
-
-#endif
diff --git a/src/drivers/libretro/libretro-common/compat/compat_posix_string.c b/src/drivers/libretro/libretro-common/compat/compat_posix_string.c
new file mode 100644
index 0000000..6a2f07e
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/compat/compat_posix_string.c
@@ -0,0 +1,104 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (compat_posix_string.c).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <ctype.h>
+
+#include <compat/posix_string.h>
+
+#ifdef _WIN32
+
+#undef strcasecmp
+#undef strdup
+#undef isblank
+#undef strtok_r
+#include <ctype.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <compat/strl.h>
+
+#include <string.h>
+
+int retro_strcasecmp__(const char *a, const char *b)
+{
+   while (*a && *b)
+   {
+      int a_ = tolower(*a);
+      int b_ = tolower(*b);
+
+      if (a_ != b_)
+         return a_ - b_;
+
+      a++;
+      b++;
+   }
+
+   return tolower(*a) - tolower(*b);
+}
+
+char *retro_strdup__(const char *orig)
+{
+   size_t len = strlen(orig) + 1;
+   char *ret  = (char*)malloc(len);
+   if (!ret)
+      return NULL;
+
+   strlcpy(ret, orig, len);
+   return ret;
+}
+
+int retro_isblank__(int c)
+{
+   return (c == ' ') || (c == '\t');
+}
+
+char *retro_strtok_r__(char *str, const char *delim, char **saveptr)
+{
+   char *first = NULL;
+   if (!saveptr || !delim)
+      return NULL;
+
+   if (str)
+      *saveptr = str;
+
+   do
+   {
+      char *ptr = NULL;
+      first = *saveptr;
+      while (*first && strchr(delim, *first))
+         *first++ = '\0';
+
+      if (*first == '\0')
+         return NULL;
+
+      ptr = first + 1;
+
+      while (*ptr && !strchr(delim, *ptr))
+         ptr++;
+
+      *saveptr = ptr + (*ptr ? 1 : 0);
+      *ptr     = '\0';
+   } while (strlen(first) == 0);
+
+   return first;
+}
+
+#endif
diff --git a/src/drivers/libretro/libretro-common/compat/compat_strcasestr.c b/src/drivers/libretro/libretro-common/compat/compat_strcasestr.c
new file mode 100644
index 0000000..4129dab
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/compat/compat_strcasestr.c
@@ -0,0 +1,58 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (compat_strcasestr.c).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <ctype.h>
+
+#include <compat/strcasestr.h>
+
+/* Pretty much strncasecmp. */
+static int casencmp(const char *a, const char *b, size_t n)
+{
+   size_t i;
+
+   for (i = 0; i < n; i++)
+   {
+      int a_lower = tolower(a[i]);
+      int b_lower = tolower(b[i]);
+      if (a_lower != b_lower)
+         return a_lower - b_lower;
+   }
+
+   return 0;
+}
+
+char *strcasestr_retro__(const char *haystack, const char *needle)
+{
+   size_t i, search_off;
+   size_t hay_len    = strlen(haystack);
+   size_t needle_len = strlen(needle);
+
+   if (needle_len > hay_len)
+      return NULL;
+
+   search_off = hay_len - needle_len;
+   for (i = 0; i <= search_off; i++)
+      if (!casencmp(haystack + i, needle, needle_len))
+         return (char*)haystack + i;
+
+   return NULL;
+}
diff --git a/src/drivers/libretro/libretro-common/file/file_path.c b/src/drivers/libretro/libretro-common/file/file_path.c
new file mode 100644
index 0000000..fc11270
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/file/file_path.c
@@ -0,0 +1,1381 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (file_path.c).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+
+#include <sys/stat.h>
+
+#include <boolean.h>
+#include <file/file_path.h>
+#include <retro_assert.h>
+#include <string/stdstring.h>
+#include <time/rtime.h>
+
+/* TODO: There are probably some unnecessary things on this huge include list now but I'm too afraid to touch it */
+#ifdef __APPLE__
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+#ifdef __HAIKU__
+#include <kernel/image.h>
+#endif
+#ifndef __MACH__
+#include <compat/strl.h>
+#include <compat/posix_string.h>
+#endif
+#include <retro_miscellaneous.h>
+#include <encodings/utf.h>
+
+#ifdef _WIN32
+#include <direct.h>
+#else
+#include <unistd.h> /* stat() is defined here */
+#endif
+
+#if !defined(RARCH_CONSOLE) && defined(RARCH_INTERNAL)
+#ifdef __WINRT__
+#include <uwp/uwp_func.h>
+#endif
+#endif
+
+/* Assume W-functions do not work below Win2K and Xbox platforms */
+#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500 || defined(_XBOX)
+
+#ifndef LEGACY_WIN32
+#define LEGACY_WIN32
+#endif
+
+#endif
+
+/**
+ * path_get_archive_delim:
+ * @path               : path
+ *
+ * Find delimiter of an archive file. Only the first '#'
+ * after a compression extension is considered.
+ *
+ * Returns: pointer to the delimiter in the path if it contains
+ * a path inside a compressed file, otherwise NULL.
+ */
+const char *path_get_archive_delim(const char *path)
+{
+   const char *last_slash = find_last_slash(path);
+   const char *delim      = NULL;
+   char buf[5];
+
+   buf[0] = '\0';
+
+   /* We search for delimiters after the last slash
+    * in the file path to avoid capturing delimiter
+    * characters in any parent directory names.
+    * If there are no slashes in the file name, then
+    * the path is just the file basename - in this
+    * case we search the path in its entirety */
+   if (!last_slash)
+      last_slash = path;
+
+   /* Find delimiter position
+    * > Since filenames may contain '#' characters,
+    *   must loop until we find the first '#' that
+    *   is directly *after* a compression extension */
+   delim = strchr(last_slash, '#');
+
+   while (delim)
+   {
+      /* Check whether this is a known archive type
+       * > Note: The code duplication here is
+       *   deliberate, to maximise performance */
+      if (delim - last_slash > 4)
+      {
+         strlcpy(buf, delim - 4, sizeof(buf));
+         buf[4] = '\0';
+
+         string_to_lower(buf);
+
+         /* Check if this is a '.zip', '.apk' or '.7z' file */
+         if (string_is_equal(buf,     ".zip") ||
+             string_is_equal(buf,     ".apk") ||
+             string_is_equal(buf + 1, ".7z"))
+            return delim;
+      }
+      else if (delim - last_slash > 3)
+      {
+         strlcpy(buf, delim - 3, sizeof(buf));
+         buf[3] = '\0';
+
+         string_to_lower(buf);
+
+         /* Check if this is a '.7z' file */
+         if (string_is_equal(buf, ".7z"))
+            return delim;
+      }
+
+      delim++;
+      delim = strchr(delim, '#');
+   }
+
+   return NULL;
+}
+
+/**
+ * path_get_extension:
+ * @path               : path
+ *
+ * Gets extension of file. Only '.'s
+ * after the last slash are considered.
+ *
+ * Returns: extension part from the path.
+ */
+const char *path_get_extension(const char *path)
+{
+   const char *ext;
+   if (!string_is_empty(path) && ((ext = strrchr(path_basename(path), '.'))))
+      return ext + 1;
+   return "";
+}
+
+/**
+ * path_remove_extension:
+ * @path               : path
+ *
+ * Mutates path by removing its extension. Removes all
+ * text after and including the last '.'.
+ * Only '.'s after the last slash are considered.
+ *
+ * Returns:
+ * 1) If path has an extension, returns path with the
+ *    extension removed.
+ * 2) If there is no extension, returns NULL.
+ * 3) If path is empty or NULL, returns NULL
+ */
+char *path_remove_extension(char *path)
+{
+   char *last = !string_is_empty(path)
+      ? (char*)strrchr(path_basename(path), '.') : NULL;
+   if (!last)
+      return NULL;
+   if (*last)
+      *last = '\0';
+   return path;
+}
+
+/**
+ * path_is_compressed_file:
+ * @path               : path
+ *
+ * Checks if path is a compressed file.
+ *
+ * Returns: true (1) if path is a compressed file, otherwise false (0).
+ **/
+bool path_is_compressed_file(const char* path)
+{
+   const char *ext = path_get_extension(path);
+   if (!string_is_empty(ext))
+      if (  string_is_equal_noncase(ext, "zip") ||
+            string_is_equal_noncase(ext, "apk") ||
+            string_is_equal_noncase(ext, "7z"))
+         return true;
+   return false;
+}
+
+/**
+ * fill_pathname:
+ * @out_path           : output path
+ * @in_path            : input  path
+ * @replace            : what to replace
+ * @size               : buffer size of output path
+ *
+ * FIXME: Verify
+ *
+ * Replaces filename extension with 'replace' and outputs result to out_path.
+ * The extension here is considered to be the string from the last '.'
+ * to the end.
+ *
+ * Only '.'s after the last slash are considered as extensions.
+ * If no '.' is present, in_path and replace will simply be concatenated.
+ * 'size' is buffer size of 'out_path'.
+ * E.g.: in_path = "/foo/bar/baz/boo.c", replace = ".asm" =>
+ * out_path = "/foo/bar/baz/boo.asm"
+ * E.g.: in_path = "/foo/bar/baz/boo.c", replace = ""     =>
+ * out_path = "/foo/bar/baz/boo"
+ */
+void fill_pathname(char *out_path, const char *in_path,
+      const char *replace, size_t size)
+{
+   char tmp_path[PATH_MAX_LENGTH];
+   char *tok                      = NULL;
+
+   tmp_path[0] = '\0';
+
+   strlcpy(tmp_path, in_path, sizeof(tmp_path));
+   if ((tok = (char*)strrchr(path_basename(tmp_path), '.')))
+      *tok = '\0';
+
+   fill_pathname_noext(out_path, tmp_path, replace, size);
+}
+
+/**
+ * fill_pathname_noext:
+ * @out_path           : output path
+ * @in_path            : input  path
+ * @replace            : what to replace
+ * @size               : buffer size of output path
+ *
+ * Appends a filename extension 'replace' to 'in_path', and outputs
+ * result in 'out_path'.
+ *
+ * Assumes in_path has no extension. If an extension is still
+ * present in 'in_path', it will be ignored.
+ *
+ */
+size_t fill_pathname_noext(char *out_path, const char *in_path,
+      const char *replace, size_t size)
+{
+   strlcpy(out_path, in_path, size);
+   return strlcat(out_path, replace, size);
+}
+
+char *find_last_slash(const char *str)
+{
+   const char *slash     = strrchr(str, '/');
+#ifdef _WIN32
+   const char *backslash = strrchr(str, '\\');
+
+   if (!slash || (backslash > slash))
+      return (char*)backslash;
+#endif
+   return (char*)slash;
+}
+
+/**
+ * fill_pathname_slash:
+ * @path               : path
+ * @size               : size of path
+ *
+ * Assumes path is a directory. Appends a slash
+ * if not already there.
+ **/
+void fill_pathname_slash(char *path, size_t size)
+{
+   size_t path_len;
+   const char *last_slash = find_last_slash(path);
+
+   if (!last_slash)
+   {
+      strlcat(path, PATH_DEFAULT_SLASH(), size);
+      return;
+   }
+
+   path_len               = strlen(path);
+   /* Try to preserve slash type. */
+   if (last_slash != (path + path_len - 1))
+   {
+      path[path_len]   = last_slash[0];
+      path[path_len+1] = '\0';
+   }
+}
+
+/**
+ * fill_pathname_dir:
+ * @in_dir             : input directory path
+ * @in_basename        : input basename to be appended to @in_dir
+ * @replace            : replacement to be appended to @in_basename
+ * @size               : size of buffer
+ *
+ * Appends basename of 'in_basename', to 'in_dir', along with 'replace'.
+ * Basename of in_basename is the string after the last '/' or '\\',
+ * i.e the filename without directories.
+ *
+ * If in_basename has no '/' or '\\', the whole 'in_basename' will be used.
+ * 'size' is buffer size of 'in_dir'.
+ *
+ * E.g..: in_dir = "/tmp/some_dir", in_basename = "/some_content/foo.c",
+ * replace = ".asm" => in_dir = "/tmp/some_dir/foo.c.asm"
+ **/
+size_t fill_pathname_dir(char *in_dir, const char *in_basename,
+      const char *replace, size_t size)
+{
+   const char *base = NULL;
+
+   fill_pathname_slash(in_dir, size);
+   base = path_basename(in_basename);
+   strlcat(in_dir, base, size);
+   return strlcat(in_dir, replace, size);
+}
+
+/**
+ * fill_pathname_base:
+ * @out                : output path
+ * @in_path            : input path
+ * @size               : size of output path
+ *
+ * Copies basename of @in_path into @out_path.
+ **/
+size_t fill_pathname_base(char *out, const char *in_path, size_t size)
+{
+   const char     *ptr = path_basename(in_path);
+
+   if (!ptr)
+      ptr = in_path;
+
+   return strlcpy(out, ptr, size);
+}
+
+void fill_pathname_base_noext(char *out,
+      const char *in_path, size_t size)
+{
+   fill_pathname_base(out, in_path, size);
+   path_remove_extension(out);
+}
+
+size_t fill_pathname_base_ext(char *out,
+      const char *in_path, const char *ext,
+      size_t size)
+{
+   fill_pathname_base_noext(out, in_path, size);
+   return strlcat(out, ext, size);
+}
+
+/**
+ * fill_pathname_basedir:
+ * @out_dir            : output directory
+ * @in_path            : input path
+ * @size               : size of output directory
+ *
+ * Copies base directory of @in_path into @out_path.
+ * If in_path is a path without any slashes (relative current directory),
+ * @out_path will get path "./".
+ **/
+void fill_pathname_basedir(char *out_dir,
+      const char *in_path, size_t size)
+{
+   if (out_dir != in_path)
+      strlcpy(out_dir, in_path, size);
+   path_basedir(out_dir);
+}
+
+void fill_pathname_basedir_noext(char *out_dir,
+      const char *in_path, size_t size)
+{
+   fill_pathname_basedir(out_dir, in_path, size);
+   path_remove_extension(out_dir);
+}
+
+/**
+ * fill_pathname_parent_dir_name:
+ * @out_dir            : output directory
+ * @in_dir             : input directory
+ * @size               : size of output directory
+ *
+ * Copies only the parent directory name of @in_dir into @out_dir.
+ * The two buffers must not overlap. Removes trailing '/'.
+ * Returns true on success, false if a slash was not found in the path.
+ **/
+bool fill_pathname_parent_dir_name(char *out_dir,
+      const char *in_dir, size_t size)
+{
+   bool success = false;
+   char *temp   = strdup(in_dir);
+   char *last   = find_last_slash(temp);
+
+   if (last && last[1] == 0)
+   {
+      *last     = '\0';
+      last      = find_last_slash(temp);
+   }
+
+   if (last)
+      *last     = '\0';
+
+   in_dir       = find_last_slash(temp);
+
+   success      = in_dir && in_dir[1];
+
+   if (success)
+      strlcpy(out_dir, in_dir + 1, size);
+
+   free(temp);
+   return success;
+}
+
+/**
+ * fill_pathname_parent_dir:
+ * @out_dir            : output directory
+ * @in_dir             : input directory
+ * @size               : size of output directory
+ *
+ * Copies parent directory of @in_dir into @out_dir.
+ * Assumes @in_dir is a directory. Keeps trailing '/'.
+ * If the path was already at the root directory, @out_dir will be an empty string.
+ **/
+void fill_pathname_parent_dir(char *out_dir,
+      const char *in_dir, size_t size)
+{
+   if (out_dir != in_dir)
+      strlcpy(out_dir, in_dir, size);
+   path_parent_dir(out_dir);
+}
+
+/**
+ * fill_dated_filename:
+ * @out_filename       : output filename
+ * @ext                : extension of output filename
+ * @size               : buffer size of output filename
+ *
+ * Creates a 'dated' filename prefixed by 'RetroArch', and
+ * concatenates extension (@ext) to it.
+ *
+ * E.g.:
+ * out_filename = "RetroArch-{month}{day}-{Hours}{Minutes}.{@ext}"
+ **/
+size_t fill_dated_filename(char *out_filename,
+      const char *ext, size_t size)
+{
+   time_t cur_time = time(NULL);
+   struct tm tm_;
+
+   rtime_localtime(&cur_time, &tm_);
+
+   strftime(out_filename, size,
+         "RetroArch-%m%d-%H%M%S", &tm_);
+   return strlcat(out_filename, ext, size);
+}
+
+/**
+ * fill_str_dated_filename:
+ * @out_filename       : output filename
+ * @in_str             : input string
+ * @ext                : extension of output filename
+ * @size               : buffer size of output filename
+ *
+ * Creates a 'dated' filename prefixed by the string @in_str, and
+ * concatenates extension (@ext) to it.
+ *
+ * E.g.:
+ * out_filename = "RetroArch-{year}{month}{day}-{Hour}{Minute}{Second}.{@ext}"
+ **/
+void fill_str_dated_filename(char *out_filename,
+      const char *in_str, const char *ext, size_t size)
+{
+   char format[256];
+   struct tm tm_;
+   time_t cur_time = time(NULL);
+
+   format[0]       = '\0';
+
+   rtime_localtime(&cur_time, &tm_);
+
+   if (string_is_empty(ext))
+   {
+      strftime(format, sizeof(format), "-%y%m%d-%H%M%S", &tm_);
+      fill_pathname_noext(out_filename, in_str, format, size);
+   }
+   else
+   {
+      strftime(format, sizeof(format), "-%y%m%d-%H%M%S.", &tm_);
+
+      fill_pathname_join_concat_noext(out_filename,
+            in_str, format, ext,
+            size);
+   }
+}
+
+/**
+ * path_basedir:
+ * @path               : path
+ *
+ * Extracts base directory by mutating path.
+ * Keeps trailing '/'.
+ **/
+void path_basedir(char *path)
+{
+   char *last = NULL;
+
+   if (strlen(path) < 2)
+      return;
+
+   last = find_last_slash(path);
+
+   if (last)
+      last[1] = '\0';
+   else
+      strlcpy(path, "." PATH_DEFAULT_SLASH(), 3);
+}
+
+/**
+ * path_parent_dir:
+ * @path               : path
+ *
+ * Extracts parent directory by mutating path.
+ * Assumes that path is a directory. Keeps trailing '/'.
+ * If the path was already at the root directory, returns empty string
+ **/
+void path_parent_dir(char *path)
+{
+   size_t len = 0;
+
+   if (!path)
+      return;
+   
+   len = strlen(path);
+
+   if (len && PATH_CHAR_IS_SLASH(path[len - 1]))
+   {
+      bool path_was_absolute = path_is_absolute(path);
+
+      path[len - 1] = '\0';
+
+      if (path_was_absolute && !find_last_slash(path))
+      {
+         /* We removed the only slash from what used to be an absolute path.
+          * On Linux, this goes from "/" to an empty string and everything works fine,
+          * but on Windows, we went from C:\ to C:, which is not a valid path and that later
+          * gets errornously treated as a relative one by path_basedir and returns "./".
+          * What we really wanted is an empty string. */
+         path[0] = '\0';
+         return;
+      }
+   }
+   path_basedir(path);
+}
+
+/**
+ * path_basename:
+ * @path               : path
+ *
+ * Get basename from @path.
+ *
+ * Returns: basename from path.
+ **/
+const char *path_basename(const char *path)
+{
+   /* We cut at the first compression-related hash */
+   const char *delim = path_get_archive_delim(path);
+   if (delim)
+      return delim + 1;
+
+   {
+      /* We cut at the last slash */
+      const char *last  = find_last_slash(path);
+      if (last)
+         return last + 1;
+   }
+
+   return path;
+}
+
+/* Specialized version */
+const char *path_basename_nocompression(const char *path)
+{
+   /* We cut at the last slash */
+   const char *last  = find_last_slash(path);
+   if (last)
+      return last + 1;
+   return path;
+}
+
+/**
+ * path_is_absolute:
+ * @path               : path
+ *
+ * Checks if @path is an absolute path or a relative path.
+ *
+ * Returns: true if path is absolute, false if path is relative.
+ **/
+bool path_is_absolute(const char *path)
+{
+   if (string_is_empty(path))
+      return false;
+
+   if (path[0] == '/')
+      return true;
+
+#if defined(_WIN32)
+   /* Many roads lead to Rome...
+    * Note: Drive letter can only be 1 character long */
+   if (string_starts_with_size(path,     "\\\\", STRLEN_CONST("\\\\")) ||
+       string_starts_with_size(path + 1, ":/",   STRLEN_CONST(":/"))   ||
+       string_starts_with_size(path + 1, ":\\",  STRLEN_CONST(":\\")))
+      return true;
+#elif defined(__wiiu__) || defined(VITA)
+   {
+      const char *seperator = strchr(path, ':');
+      if (seperator && (seperator[1] == '/'))
+         return true;
+   }
+#endif
+
+   return false;
+}
+
+/**
+ * path_resolve_realpath:
+ * @buf                : input and output buffer for path
+ * @size               : size of buffer
+ * @resolve_symlinks   : whether to resolve symlinks or not
+ *
+ * Resolves use of ".", "..", multiple slashes etc in absolute paths.
+ *
+ * Relative paths are rebased on the current working dir.
+ *
+ * Returns: @buf if successful, NULL otherwise.
+ * Note: Not implemented on consoles
+ * Note: Symlinks are only resolved on Unix-likes
+ * Note: The current working dir might not be what you expect,
+ *       e.g. on Android it is "/"
+ *       Use of fill_pathname_resolve_relative() should be prefered
+ **/
+char *path_resolve_realpath(char *buf, size_t size, bool resolve_symlinks)
+{
+#if !defined(RARCH_CONSOLE) && defined(RARCH_INTERNAL)
+#ifdef _WIN32
+   char *ret = NULL;
+   wchar_t abs_path[PATH_MAX_LENGTH];
+   wchar_t *rel_path = utf8_to_utf16_string_alloc(buf);
+
+   if (rel_path)
+   {
+      if (_wfullpath(abs_path, rel_path, PATH_MAX_LENGTH))
+      {
+         char *tmp = utf16_to_utf8_string_alloc(abs_path);
+
+         if (tmp)
+         {
+            strlcpy(buf, tmp, size);
+            free(tmp);
+            ret = buf;
+         }
+      }
+
+      free(rel_path);
+   }
+
+   return ret;
+#else
+   char tmp[PATH_MAX_LENGTH];
+   size_t t;
+   char *p;
+   const char *next;
+   const char *buf_end;
+
+   if (resolve_symlinks)
+   {
+      strlcpy(tmp, buf, sizeof(tmp));
+
+      /* NOTE: realpath() expects at least PATH_MAX_LENGTH bytes in buf.
+       * Technically, PATH_MAX_LENGTH needn't be defined, but we rely on it anyways.
+       * POSIX 2008 can automatically allocate for you,
+       * but don't rely on that. */
+      if (!realpath(tmp, buf))
+      {
+         strlcpy(buf, tmp, size);
+         return NULL;
+      }
+
+      return buf;
+   }
+
+   t = 0; /* length of output */
+   buf_end = buf + strlen(buf);
+
+   if (!path_is_absolute(buf))
+   {
+      size_t len;
+      /* rebase on working directory */
+      if (!getcwd(tmp, PATH_MAX_LENGTH-1))
+         return NULL;
+
+      len = strlen(tmp);
+      t += len;
+
+      if (tmp[len-1] != '/')
+         tmp[t++] = '/';
+
+      if (string_is_empty(buf))
+         goto end;
+
+      p = buf;
+   }
+   else
+   {
+      /* UNIX paths can start with multiple '/', copy those */
+      for (p = buf; *p == '/'; p++)
+         tmp[t++] = '/';
+   }
+
+   /* p points to just after a slash while 'next' points to the next slash
+    * if there are no slashes, they point relative to where one would be */
+   do
+   {
+      next = strchr(p, '/');
+      if (!next)
+         next = buf_end;
+
+      if ((next - p == 2 && p[0] == '.' && p[1] == '.'))
+      {
+         p += 3;
+
+         /* fail for illegal /.., //.. etc */
+         if (t == 1 || tmp[t-2] == '/')
+            return NULL;
+
+         /* delete previous segment in tmp by adjusting size t
+          * tmp[t-1] == '/', find '/' before that */
+         t = t-2;
+         while (tmp[t] != '/')
+            t--;
+         t++;
+      }
+      else if (next - p == 1 && p[0] == '.')
+         p += 2;
+      else if (next - p == 0)
+         p += 1;
+      else
+      {
+         /* fail when truncating */
+         if (t + next-p+1 > PATH_MAX_LENGTH-1)
+            return NULL;
+
+         while (p <= next)
+            tmp[t++] = *p++;
+      }
+
+   }
+   while (next < buf_end);
+
+end:
+   tmp[t] = '\0';
+   strlcpy(buf, tmp, size);
+   return buf;
+#endif
+#endif
+   return NULL;
+}
+
+/**
+ * path_relative_to:
+ * @out                : buffer to write the relative path to
+ * @path               : path to be expressed relatively
+ * @base               : base directory to start out on
+ * @size               : size of output buffer
+ *
+ * Turns @path into a path relative to @base and writes it to @out.
+ *
+ * @base is assumed to be a base directory, i.e. a path ending with '/' or '\'.
+ * Both @path and @base are assumed to be absolute paths without "." or "..".
+ *
+ * E.g. path /a/b/e/f.cg with base /a/b/c/d/ turns into ../../e/f.cg
+ **/
+size_t path_relative_to(char *out,
+      const char *path, const char *base, size_t size)
+{
+   size_t i, j;
+   const char *trimmed_path, *trimmed_base;
+
+#ifdef _WIN32
+   /* For different drives, return absolute path */
+   if (strlen(path) >= 2 && strlen(base) >= 2
+         && path[1] == ':' && base[1] == ':'
+         && path[0] != base[0])
+      return strlcpy(out, path, size);
+#endif
+
+   /* Trim common beginning */
+   for (i = 0, j = 0; path[i] && base[i] && path[i] == base[i]; i++)
+      if (path[i] == PATH_DEFAULT_SLASH_C())
+         j = i + 1;
+
+   trimmed_path = path+j;
+   trimmed_base = base+i;
+
+   /* Each segment of base turns into ".." */
+   out[0] = '\0';
+   for (i = 0; trimmed_base[i]; i++)
+      if (trimmed_base[i] == PATH_DEFAULT_SLASH_C())
+         strlcat(out, ".." PATH_DEFAULT_SLASH(), size);
+
+   return strlcat(out, trimmed_path, size);
+}
+
+/**
+ * fill_pathname_resolve_relative:
+ * @out_path           : output path
+ * @in_refpath         : input reference path
+ * @in_path            : input path
+ * @size               : size of @out_path
+ *
+ * Joins basedir of @in_refpath together with @in_path.
+ * If @in_path is an absolute path, out_path = in_path.
+ * E.g.: in_refpath = "/foo/bar/baz.a", in_path = "foobar.cg",
+ * out_path = "/foo/bar/foobar.cg".
+ **/
+void fill_pathname_resolve_relative(char *out_path,
+      const char *in_refpath, const char *in_path, size_t size)
+{
+   if (path_is_absolute(in_path))
+   {
+      strlcpy(out_path, in_path, size);
+      return;
+   }
+
+   fill_pathname_basedir(out_path, in_refpath, size);
+   strlcat(out_path, in_path, size);
+   path_resolve_realpath(out_path, size, false);
+}
+
+/**
+ * fill_pathname_join:
+ * @out_path           : output path
+ * @dir                : directory
+ * @path               : path
+ * @size               : size of output path
+ *
+ * Joins a directory (@dir) and path (@path) together.
+ * Makes sure not to get  two consecutive slashes
+ * between directory and path.
+ **/
+size_t fill_pathname_join(char *out_path,
+      const char *dir, const char *path, size_t size)
+{
+   if (out_path != dir)
+      strlcpy(out_path, dir, size);
+
+   if (*out_path)
+      fill_pathname_slash(out_path, size);
+
+   return strlcat(out_path, path, size);
+}
+
+size_t fill_pathname_join_special_ext(char *out_path,
+      const char *dir,  const char *path,
+      const char *last, const char *ext,
+      size_t size)
+{
+   fill_pathname_join(out_path, dir, path, size);
+   if (*out_path)
+      fill_pathname_slash(out_path, size);
+
+   strlcat(out_path, last, size);
+   return strlcat(out_path, ext, size);
+}
+
+size_t fill_pathname_join_concat_noext(char *out_path,
+      const char *dir, const char *path,
+      const char *concat,
+      size_t size)
+{
+   fill_pathname_noext(out_path, dir, path, size);
+   return strlcat(out_path, concat, size);
+}
+
+size_t fill_pathname_join_concat(char *out_path,
+      const char *dir, const char *path,
+      const char *concat,
+      size_t size)
+{
+   fill_pathname_join(out_path, dir, path, size);
+   return strlcat(out_path, concat, size);
+}
+
+void fill_pathname_join_noext(char *out_path,
+      const char *dir, const char *path, size_t size)
+{
+   fill_pathname_join(out_path, dir, path, size);
+   path_remove_extension(out_path);
+}
+
+/**
+ * fill_pathname_join_delim:
+ * @out_path           : output path
+ * @dir                : directory
+ * @path               : path
+ * @delim              : delimiter
+ * @size               : size of output path
+ *
+ * Joins a directory (@dir) and path (@path) together
+ * using the given delimiter (@delim).
+ **/
+size_t fill_pathname_join_delim(char *out_path, const char *dir,
+      const char *path, const char delim, size_t size)
+{
+   size_t copied;
+   /* behavior of strlcpy is undefined if dst and src overlap */
+   if (out_path == dir)
+      copied = strlen(dir);
+   else
+      copied = strlcpy(out_path, dir, size);
+
+   out_path[copied]   = delim;
+   out_path[copied+1] = '\0';
+
+   if (path)
+      copied = strlcat(out_path, path, size);
+   return copied;
+}
+
+size_t fill_pathname_join_delim_concat(char *out_path, const char *dir,
+      const char *path, const char delim, const char *concat,
+      size_t size)
+{
+   fill_pathname_join_delim(out_path, dir, path, delim, size);
+   return strlcat(out_path, concat, size);
+}
+
+/**
+ * fill_short_pathname_representation:
+ * @out_rep            : output representation
+ * @in_path            : input path
+ * @size               : size of output representation
+ *
+ * Generates a short representation of path. It should only
+ * be used for displaying the result; the output representation is not
+ * binding in any meaningful way (for a normal path, this is the same as basename)
+ * In case of more complex URLs, this should cut everything except for
+ * the main image file.
+ *
+ * E.g.: "/path/to/game.img" -> game.img
+ *       "/path/to/myarchive.7z#folder/to/game.img" -> game.img
+ */
+size_t fill_short_pathname_representation(char* out_rep,
+      const char *in_path, size_t size)
+{
+   char path_short[PATH_MAX_LENGTH];
+
+   path_short[0] = '\0';
+
+   fill_pathname(path_short, path_basename(in_path), "",
+            sizeof(path_short));
+
+   return strlcpy(out_rep, path_short, size);
+}
+
+void fill_short_pathname_representation_noext(char* out_rep,
+      const char *in_path, size_t size)
+{
+   fill_short_pathname_representation(out_rep, in_path, size);
+   path_remove_extension(out_rep);
+}
+
+void fill_pathname_expand_special(char *out_path,
+      const char *in_path, size_t size)
+{
+#if !defined(RARCH_CONSOLE) && defined(RARCH_INTERNAL)
+   if (in_path[0] == '~')
+   {
+      char *home_dir = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+
+      home_dir[0] = '\0';
+
+      fill_pathname_home_dir(home_dir,
+         PATH_MAX_LENGTH * sizeof(char));
+
+      if (*home_dir)
+      {
+         size_t src_size = strlcpy(out_path, home_dir, size);
+         retro_assert(src_size < size);
+
+         out_path  += src_size;
+         size      -= src_size;
+
+         if (!PATH_CHAR_IS_SLASH(out_path[-1]))
+         {
+            src_size = strlcpy(out_path, PATH_DEFAULT_SLASH(), size);
+            retro_assert(src_size < size);
+
+            out_path += src_size;
+            size     -= src_size;
+         }
+
+         in_path += 2;
+      }
+
+      free(home_dir);
+   }
+   else if (in_path[0] == ':')
+   {
+      char *application_dir = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+
+      application_dir[0]    = '\0';
+
+      fill_pathname_application_dir(application_dir,
+            PATH_MAX_LENGTH * sizeof(char));
+
+      if (*application_dir)
+      {
+         size_t src_size   = strlcpy(out_path, application_dir, size);
+         retro_assert(src_size < size);
+
+         out_path  += src_size;
+         size      -= src_size;
+
+         if (!PATH_CHAR_IS_SLASH(out_path[-1]))
+         {
+            src_size = strlcpy(out_path, PATH_DEFAULT_SLASH(), size);
+            retro_assert(src_size < size);
+
+            out_path += src_size;
+            size     -= src_size;
+         }
+
+         in_path += 2;
+      }
+
+      free(application_dir);
+   }
+#endif
+
+   retro_assert(strlcpy(out_path, in_path, size) < size);
+}
+
+void fill_pathname_abbreviate_special(char *out_path,
+      const char *in_path, size_t size)
+{
+#if !defined(RARCH_CONSOLE) && defined(RARCH_INTERNAL)
+   unsigned i;
+   const char *candidates[3];
+   const char *notations[3];
+   char application_dir[PATH_MAX_LENGTH];
+   char home_dir[PATH_MAX_LENGTH];
+
+   application_dir[0] = '\0';
+   home_dir[0]        = '\0';
+
+   /* application_dir could be zero-string. Safeguard against this.
+    *
+    * Keep application dir in front of home, moving app dir to a
+    * new location inside home would break otherwise. */
+
+   /* ugly hack - use application_dir pointer
+    * before filling it in. C89 reasons */
+   candidates[0] = application_dir;
+   candidates[1] = home_dir;
+   candidates[2] = NULL;
+
+   notations [0] = ":";
+   notations [1] = "~";
+   notations [2] = NULL;
+
+   fill_pathname_application_dir(application_dir, sizeof(application_dir));
+   fill_pathname_home_dir(home_dir, sizeof(home_dir));
+
+   for (i = 0; candidates[i]; i++)
+   {
+      if (!string_is_empty(candidates[i]) &&
+          string_starts_with(in_path, candidates[i]))
+      {
+         size_t src_size  = strlcpy(out_path, notations[i], size);
+
+         retro_assert(src_size < size);
+
+         out_path        += src_size;
+         size            -= src_size;
+         in_path         += strlen(candidates[i]);
+
+         if (!PATH_CHAR_IS_SLASH(*in_path))
+         {
+            strcpy_literal(out_path, PATH_DEFAULT_SLASH());
+            out_path++;
+            size--;
+         }
+
+         break; /* Don't allow more abbrevs to take place. */
+      }
+   }
+
+#endif
+
+   retro_assert(strlcpy(out_path, in_path, size) < size);
+}
+
+/* Changes the slashes to the correct kind for the os 
+ * So forward slash on linux and backslash on Windows */
+void pathname_conform_slashes_to_os(char *path)
+{
+   /* Conform slashes to os standard so we get proper matching */
+   char* p;
+   for (p = path; *p; p++)
+      if (*p == '/' || *p == '\\')
+         *p = PATH_DEFAULT_SLASH_C();
+}
+
+/* Change all shashes to forward so they are more portable between windows and linux */
+void pathname_make_slashes_portable(char *path)
+{
+   /* Conform slashes to os standard so we get proper matching */
+   char* p;
+   for (p = path; *p; p++)
+      if (*p == '/' || *p == '\\')
+         *p = '/';
+}
+
+/* Get the number of slashes in a path, returns an integer */
+int get_pathname_num_slashes(const char *in_path)
+{
+   int num_slashes = 0;
+   int i = 0;
+
+   for (i = 0; i < PATH_MAX_LENGTH; i++)
+   {
+      if (PATH_CHAR_IS_SLASH(in_path[i]))
+         num_slashes++;
+      if (in_path[i] == '\0')
+         break;
+   }
+
+   return num_slashes;
+}
+
+/* Fills the supplied path with either the abbreviated path or the relative path, which ever
+ * one is has less depth / number of slashes
+ * If lengths of abbreviated and relative paths are the same the relative path will be used
+ * in_path can be an absolute, relative or abbreviated path */
+void fill_pathname_abbreviated_or_relative(char *out_path, const char *in_refpath, const char *in_path, size_t size)
+{
+   char in_path_conformed[PATH_MAX_LENGTH];
+   char in_refpath_conformed[PATH_MAX_LENGTH];
+   char expanded_path[PATH_MAX_LENGTH];
+   char absolute_path[PATH_MAX_LENGTH];
+   char relative_path[PATH_MAX_LENGTH];
+   char abbreviated_path[PATH_MAX_LENGTH];
+   
+   in_path_conformed[0]    = '\0';
+   in_refpath_conformed[0] = '\0';
+   expanded_path[0]        = '\0';
+   absolute_path[0]        = '\0';
+   relative_path[0]        = '\0';
+   abbreviated_path[0]     = '\0';
+
+   strcpy_literal(in_path_conformed, in_path);
+   strcpy_literal(in_refpath_conformed, in_refpath);
+
+   pathname_conform_slashes_to_os(in_path_conformed);
+   pathname_conform_slashes_to_os(in_refpath_conformed);
+
+   /* Expand paths which start with :\ to an absolute path */
+   fill_pathname_expand_special(expanded_path,
+         in_path_conformed, sizeof(expanded_path));
+
+   /* Get the absolute path if it is not already */
+   if (path_is_absolute(expanded_path))
+      strlcpy(absolute_path, expanded_path, PATH_MAX_LENGTH);
+   else
+      fill_pathname_resolve_relative(absolute_path,
+            in_refpath_conformed, in_path_conformed, PATH_MAX_LENGTH);
+
+   pathname_conform_slashes_to_os(absolute_path);
+
+   /* Get the relative path and see how many directories long it is */
+   path_relative_to(relative_path, absolute_path,
+         in_refpath_conformed, sizeof(relative_path));
+
+   /* Get the abbreviated path and see how many directories long it is */
+   fill_pathname_abbreviate_special(abbreviated_path,
+         absolute_path, sizeof(abbreviated_path));
+
+   /* Use the shortest path, preferring the relative path*/
+   if (  get_pathname_num_slashes(relative_path) <= 
+         get_pathname_num_slashes(abbreviated_path))
+      retro_assert(strlcpy(out_path, relative_path, size) < size);
+   else
+      retro_assert(strlcpy(out_path, abbreviated_path, size) < size);
+}
+
+/**
+ * path_basedir:
+ * @path               : path
+ *
+ * Extracts base directory by mutating path.
+ * Keeps trailing '/'.
+ **/
+void path_basedir_wrapper(char *path)
+{
+   char *last = NULL;
+   if (strlen(path) < 2)
+      return;
+
+#ifdef HAVE_COMPRESSION
+   /* We want to find the directory with the archive in basedir. */
+   last = (char*)path_get_archive_delim(path);
+   if (last)
+      *last = '\0';
+#endif
+
+   last = find_last_slash(path);
+
+   if (last)
+      last[1] = '\0';
+   else
+      strlcpy(path, "." PATH_DEFAULT_SLASH(), 3);
+}
+
+#if !defined(RARCH_CONSOLE) && defined(RARCH_INTERNAL)
+void fill_pathname_application_path(char *s, size_t len)
+{
+   size_t i;
+#ifdef __APPLE__
+  CFBundleRef bundle = CFBundleGetMainBundle();
+#endif
+#ifdef _WIN32
+   DWORD ret = 0;
+   wchar_t wstr[PATH_MAX_LENGTH] = {0};
+#endif
+#ifdef __HAIKU__
+   image_info info;
+   int32_t cookie = 0;
+#endif
+   (void)i;
+
+   if (!len)
+      return;
+
+#if defined(_WIN32)
+#ifdef LEGACY_WIN32
+   ret    = GetModuleFileNameA(NULL, s, len);
+#else
+   ret    = GetModuleFileNameW(NULL, wstr, ARRAY_SIZE(wstr));
+
+   if (*wstr)
+   {
+      char *str = utf16_to_utf8_string_alloc(wstr);
+
+      if (str)
+      {
+         strlcpy(s, str, len);
+         free(str);
+      }
+   }
+#endif
+   s[ret] = '\0';
+#elif defined(__APPLE__)
+   if (bundle)
+   {
+      CFURLRef bundle_url     = CFBundleCopyBundleURL(bundle);
+      CFStringRef bundle_path = CFURLCopyPath(bundle_url);
+      CFStringGetCString(bundle_path, s, len, kCFStringEncodingUTF8);
+#ifdef HAVE_COCOATOUCH
+      {
+         /* This needs to be done so that the path becomes 
+          * /private/var/... and this
+          * is used consistently throughout for the iOS bundle path */
+         char resolved_bundle_dir_buf[PATH_MAX_LENGTH] = {0};
+         if (realpath(s, resolved_bundle_dir_buf))
+         {
+            strlcpy(s, resolved_bundle_dir_buf, len - 1);
+            strlcat(s, "/", len);
+         }
+      }
+#endif
+
+      CFRelease(bundle_path);
+      CFRelease(bundle_url);
+#ifndef HAVE_COCOATOUCH
+      /* Not sure what this does but it breaks 
+       * stuff for iOS, so skipping */
+      retro_assert(strlcat(s, "nobin", len) < len);
+#endif
+      return;
+   }
+#elif defined(__HAIKU__)
+   while (get_next_image_info(0, &cookie, &info) == B_OK)
+   {
+      if (info.type == B_APP_IMAGE)
+      {
+         strlcpy(s, info.name, len);
+         return;
+      }
+   }
+#elif defined(__QNX__)
+   char *buff = malloc(len);
+
+   if (_cmdname(buff))
+      strlcpy(s, buff, len);
+
+   free(buff);
+#else
+   {
+      pid_t pid;
+      static const char *exts[] = { "exe", "file", "path/a.out" };
+      char link_path[255];
+
+      link_path[0] = *s = '\0';
+      pid       = getpid();
+
+      /* Linux, BSD and Solaris paths. Not standardized. */
+      for (i = 0; i < ARRAY_SIZE(exts); i++)
+      {
+         ssize_t ret;
+
+         snprintf(link_path, sizeof(link_path), "/proc/%u/%s",
+               (unsigned)pid, exts[i]);
+         ret = readlink(link_path, s, len - 1);
+
+         if (ret >= 0)
+         {
+            s[ret] = '\0';
+            return;
+         }
+      }
+   }
+#endif
+}
+
+void fill_pathname_application_dir(char *s, size_t len)
+{
+#ifdef __WINRT__
+   strlcpy(s, uwp_dir_install, len);
+#else
+   fill_pathname_application_path(s, len);
+   path_basedir_wrapper(s);
+#endif
+}
+
+void fill_pathname_home_dir(char *s, size_t len)
+{
+#ifdef __WINRT__
+   const char *home = uwp_dir_data;
+#else
+   const char *home = getenv("HOME");
+#endif
+   if (home)
+      strlcpy(s, home, len);
+   else
+      *s = 0;
+}
+#endif
+
+bool is_path_accessible_using_standard_io(const char *path)
+{
+#ifdef __WINRT__
+   char relative_path_abbrev[PATH_MAX_LENGTH];
+   fill_pathname_abbreviate_special(relative_path_abbrev,
+         path, sizeof(relative_path_abbrev));
+   return (strlen(relative_path_abbrev) >= 2 )
+      &&  (    relative_path_abbrev[0] == ':'
+            || relative_path_abbrev[0] == '~')
+      && PATH_CHAR_IS_SLASH(relative_path_abbrev[1]);
+#else
+   return true;
+#endif
+}
diff --git a/src/drivers/libretro/libretro-common/file/file_path_io.c b/src/drivers/libretro/libretro-common/file/file_path_io.c
new file mode 100644
index 0000000..63587e3
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/file/file_path_io.c
@@ -0,0 +1,151 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (file_path_io.c).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+
+#include <sys/stat.h>
+
+#include <boolean.h>
+#include <file/file_path.h>
+#include <retro_assert.h>
+#include <compat/strl.h>
+#include <compat/posix_string.h>
+#include <retro_miscellaneous.h>
+#include <string/stdstring.h>
+#define VFS_FRONTEND
+#include <vfs/vfs_implementation.h>
+
+#ifdef _WIN32
+#include <direct.h>
+#else
+#include <unistd.h> /* stat() is defined here */
+#endif
+
+/* TODO/FIXME - globals */
+static retro_vfs_stat_t path_stat_cb   = retro_vfs_stat_impl;
+static retro_vfs_mkdir_t path_mkdir_cb = retro_vfs_mkdir_impl;
+
+void path_vfs_init(const struct retro_vfs_interface_info* vfs_info)
+{
+   const struct retro_vfs_interface* 
+      vfs_iface           = vfs_info->iface;
+
+   path_stat_cb           = retro_vfs_stat_impl;
+   path_mkdir_cb          = retro_vfs_mkdir_impl;
+
+   if (vfs_info->required_interface_version < PATH_REQUIRED_VFS_VERSION || !vfs_iface)
+      return;
+
+   path_stat_cb           = vfs_iface->stat;
+   path_mkdir_cb          = vfs_iface->mkdir;
+}
+
+int path_stat(const char *path)
+{
+   return path_stat_cb(path, NULL);
+}
+
+/**
+ * path_is_directory:
+ * @path               : path
+ *
+ * Checks if path is a directory.
+ *
+ * Returns: true (1) if path is a directory, otherwise false (0).
+ */
+bool path_is_directory(const char *path)
+{
+   return (path_stat_cb(path, NULL) & RETRO_VFS_STAT_IS_DIRECTORY) != 0;
+}
+
+bool path_is_character_special(const char *path)
+{
+   return (path_stat_cb(path, NULL) & RETRO_VFS_STAT_IS_CHARACTER_SPECIAL) != 0;
+}
+
+bool path_is_valid(const char *path)
+{
+   return (path_stat_cb(path, NULL) & RETRO_VFS_STAT_IS_VALID) != 0;
+}
+
+int32_t path_get_size(const char *path)
+{
+   int32_t filesize = 0;
+   if (path_stat_cb(path, &filesize) != 0)
+      return filesize;
+
+   return -1;
+}
+
+/**
+ * path_mkdir:
+ * @dir                : directory
+ *
+ * Create directory on filesystem.
+ *
+ * Returns: true (1) if directory could be created, otherwise false (0).
+ **/
+bool path_mkdir(const char *dir)
+{
+   bool norecurse     = false;
+   char     *basedir  = NULL;
+
+   if (!(dir && *dir))
+      return false;
+
+   /* Use heap. Real chance of stack 
+    * overflow if we recurse too hard. */
+   basedir            = strdup(dir);
+
+   if (!basedir)
+	   return false;
+
+   path_parent_dir(basedir);
+
+   if (!*basedir || !strcmp(basedir, dir))
+   {
+      free(basedir);
+      return false;
+   }
+
+   if (     path_is_directory(basedir)
+         || path_mkdir(basedir))
+      norecurse = true;
+
+   free(basedir);
+
+   if (norecurse)
+   {
+      int ret = path_mkdir_cb(dir);
+
+      /* Don't treat this as an error. */
+      if (ret == -2 && path_is_directory(dir))
+         return true;
+      else if (ret == 0)
+         return true;
+   }
+   return false;
+}
diff --git a/src/drivers/libretro/libretro-common/include/encodings/win32.h b/src/drivers/libretro/libretro-common/include/compat/posix_string.h
similarity index 57%
rename from src/drivers/libretro/libretro-common/include/encodings/win32.h
rename to src/drivers/libretro/libretro-common/include/compat/posix_string.h
index 8104af0..47964b2 100644
--- a/src/drivers/libretro/libretro-common/include/encodings/win32.h
+++ b/src/drivers/libretro/libretro-common/include/compat/posix_string.h
@@ -1,7 +1,7 @@
 /* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (utf.h).
+ * The following license statement only applies to this file (posix_string.h).
  * ---------------------------------------------------------------------------------------
  *
  * Permission is hereby granted, free of charge,
@@ -20,44 +20,41 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef _LIBRETRO_ENCODINGS_WIN32_H
-#define _LIBRETRO_ENCODINGS_WIN32_H
+#ifndef __LIBRETRO_SDK_COMPAT_POSIX_STRING_H
+#define __LIBRETRO_SDK_COMPAT_POSIX_STRING_H
+
+#include <retro_common_api.h>
+
+#ifdef _MSC_VER
+#include <compat/msvc.h>
+#endif
+
+RETRO_BEGIN_DECLS
 
-#ifndef _XBOX
 #ifdef _WIN32
-/*#define UNICODE
-#include <tchar.h>
-#include <wchar.h>*/
+#undef strtok_r
+#define strtok_r(str, delim, saveptr) retro_strtok_r__(str, delim, saveptr)
 
-#ifdef __cplusplus
-extern "C" {
+char *strtok_r(char *str, const char *delim, char **saveptr);
 #endif
 
-#include <encodings/utf.h>
+#ifdef _MSC_VER
+#undef strcasecmp
+#undef strdup
+#define strcasecmp(a, b) retro_strcasecmp__(a, b)
+#define strdup(orig)     retro_strdup__(orig)
+int strcasecmp(const char *a, const char *b);
+char *strdup(const char *orig);
 
-#ifdef __cplusplus
-}
+/* isblank is available since MSVC 2013 */
+#if _MSC_VER < 1800
+#undef isblank
+#define isblank(c)       retro_isblank__(c)
+int isblank(int c);
 #endif
 
-#endif
 #endif
 
-#ifdef UNICODE
-#define CHAR_TO_WCHAR_ALLOC(s, ws) \
-   size_t ws##_size = (NULL != s && s[0] ? strlen(s) : 0) + 1; \
-   wchar_t *ws = (wchar_t*)calloc(ws##_size, 2); \
-   if (NULL != s && s[0]) \
-      MultiByteToWideChar(CP_UTF8, 0, s, -1, ws, ws##_size / sizeof(wchar_t));
-
-#define WCHAR_TO_CHAR_ALLOC(ws, s) \
-   size_t s##_size = ((NULL != ws && ws[0] ? wcslen((const wchar_t*)ws) : 0) / 2) + 1; \
-   char *s = (char*)calloc(s##_size, 1); \
-   if (NULL != ws && ws[0]) \
-      utf16_to_char_string((const uint16_t*)ws, s, s##_size);
-
-#else
-#define CHAR_TO_WCHAR_ALLOC(s, ws) char *ws = (NULL != s && s[0] ? strdup(s) : NULL);
-#define WCHAR_TO_CHAR_ALLOC(ws, s) char *s = (NULL != ws && ws[0] ? strdup(ws) : NULL);
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/src/drivers/libretro/libretro-common/include/compat/strcasestr.h b/src/drivers/libretro/libretro-common/include/compat/strcasestr.h
new file mode 100644
index 0000000..227e253
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/include/compat/strcasestr.h
@@ -0,0 +1,48 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (strcasestr.h).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __LIBRETRO_SDK_COMPAT_STRCASESTR_H
+#define __LIBRETRO_SDK_COMPAT_STRCASESTR_H
+
+#include <string.h>
+
+#if defined(RARCH_INTERNAL) && defined(HAVE_CONFIG_H)
+#include "../../../config.h"
+#endif
+
+#ifndef HAVE_STRCASESTR
+
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+/* Avoid possible naming collisions during link
+ * since we prefer to use the actual name. */
+#define strcasestr(haystack, needle) strcasestr_retro__(haystack, needle)
+
+char *strcasestr(const char *haystack, const char *needle);
+
+RETRO_END_DECLS
+
+#endif
+
+#endif
diff --git a/src/drivers/libretro/libretro-common/include/encodings/base64.h b/src/drivers/libretro/libretro-common/include/encodings/base64.h
deleted file mode 100644
index 11658d7..0000000
--- a/src/drivers/libretro/libretro-common/include/encodings/base64.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef _LIBRETRO_ENCODINGS_BASE64_H
-#define _LIBRETRO_ENCODINGS_BASE64_H
-
-#include <stdint.h>
-#include <stddef.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-const static char* b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-/* maps A=>0,B=>1.. */
-const static unsigned char unb64[]={
-  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,  62,   0,   0,   0,  63,  52,  53,
- 54,  55,  56,  57,  58,  59,  60,  61,   0,   0,
-  0,   0,   0,   0,   0,   0,   1,   2,   3,   4,
-  5,   6,   7,   8,   9,  10,  11,  12,  13,  14,
- 15,  16,  17,  18,  19,  20,  21,  22,  23,  24,
- 25,   0,   0,   0,   0,   0,   0,  26,  27,  28,
- 29,  30,  31,  32,  33,  34,  35,  36,  37,  38,
- 39,  40,  41,  42,  43,  44,  45,  46,  47,  48,
- 49,  50,  51,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,
-}; /* This array has 256 elements */
-
-char* base64(const void* binaryData, int len, int *flen);
-unsigned char* unbase64(const char* ascii, int len, int *flen);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/src/drivers/libretro/libretro-common/include/file/file_path.h b/src/drivers/libretro/libretro-common/include/file/file_path.h
new file mode 100644
index 0000000..452763f
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/include/file/file_path.h
@@ -0,0 +1,538 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (file_path.h).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __LIBRETRO_SDK_FILE_PATH_H
+#define __LIBRETRO_SDK_FILE_PATH_H
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <sys/types.h>
+
+#include <libretro.h>
+#include <retro_common_api.h>
+
+#include <boolean.h>
+
+RETRO_BEGIN_DECLS
+
+#define PATH_REQUIRED_VFS_VERSION 3
+
+void path_vfs_init(const struct retro_vfs_interface_info* vfs_info);
+
+/* Order in this enum is equivalent to negative sort order in filelist
+ *  (i.e. DIRECTORY is on top of PLAIN_FILE) */
+enum
+{
+   RARCH_FILETYPE_UNSET,
+   RARCH_PLAIN_FILE,
+   RARCH_COMPRESSED_FILE_IN_ARCHIVE,
+   RARCH_COMPRESSED_ARCHIVE,
+   RARCH_DIRECTORY,
+   RARCH_FILE_UNSUPPORTED
+};
+
+/**
+ * path_is_compressed_file:
+ * @path               : path
+ *
+ * Checks if path is a compressed file.
+ *
+ * Returns: true (1) if path is a compressed file, otherwise false (0).
+ **/
+bool path_is_compressed_file(const char *path);
+
+/**
+ * path_contains_compressed_file:
+ * @path               : path
+ *
+ * Checks if path contains a compressed file.
+ *
+ * Currently we only check for hash symbol (#) inside the pathname.
+ * If path is ever expanded to a general URI, we should check for that here.
+ *
+ * Example:  Somewhere in the path there might be a compressed file
+ * E.g.: /path/to/file.7z#mygame.img
+ *
+ * Returns: true (1) if path contains compressed file, otherwise false (0).
+ **/
+#define path_contains_compressed_file(path) (path_get_archive_delim((path)) != NULL)
+
+/**
+ * path_get_archive_delim:
+ * @path               : path
+ *
+ * Gets delimiter of an archive file. Only the first '#'
+ * after a compression extension is considered.
+ *
+ * Returns: pointer to the delimiter in the path if it contains
+ * a compressed file, otherwise NULL.
+ */
+const char *path_get_archive_delim(const char *path);
+
+/**
+ * path_get_extension:
+ * @path               : path
+ *
+ * Gets extension of file. Only '.'s
+ * after the last slash are considered.
+ *
+ * Returns: extension part from the path.
+ */
+const char *path_get_extension(const char *path);
+
+/**
+ * path_remove_extension:
+ * @path               : path
+ *
+ * Mutates path by removing its extension. Removes all
+ * text after and including the last '.'.
+ * Only '.'s after the last slash are considered.
+ *
+ * Returns:
+ * 1) If path has an extension, returns path with the
+ *    extension removed.
+ * 2) If there is no extension, returns NULL.
+ * 3) If path is empty or NULL, returns NULL
+ */
+char *path_remove_extension(char *path);
+
+/**
+ * path_basename:
+ * @path               : path
+ *
+ * Get basename from @path.
+ *
+ * Returns: basename from path.
+ **/
+const char *path_basename(const char *path);
+const char *path_basename_nocompression(const char *path);
+
+/**
+ * path_basedir:
+ * @path               : path
+ *
+ * Extracts base directory by mutating path.
+ * Keeps trailing '/'.
+ **/
+void path_basedir(char *path);
+
+/**
+ * path_parent_dir:
+ * @path               : path
+ *
+ * Extracts parent directory by mutating path.
+ * Assumes that path is a directory. Keeps trailing '/'.
+ * If the path was already at the root directory, returns empty string
+ **/
+void path_parent_dir(char *path);
+
+/**
+ * path_resolve_realpath:
+ * @buf                : input and output buffer for path
+ * @size               : size of buffer
+ * @resolve_symlinks   : whether to resolve symlinks or not
+ *
+ * Resolves use of ".", "..", multiple slashes etc in absolute paths.
+ *
+ * Relative paths are rebased on the current working dir.
+ *
+ * Returns: @buf if successful, NULL otherwise.
+ * Note: Not implemented on consoles
+ * Note: Symlinks are only resolved on Unix-likes
+ * Note: The current working dir might not be what you expect,
+ *       e.g. on Android it is "/"
+ *       Use of fill_pathname_resolve_relative() should be prefered
+ **/
+char *path_resolve_realpath(char *buf, size_t size, bool resolve_symlinks);
+
+/**
+ * path_relative_to:
+ * @out                : buffer to write the relative path to
+ * @path               : path to be expressed relatively
+ * @base               : relative to this
+ * @size               : size of output buffer
+ *
+ * Turns @path into a path relative to @base and writes it to @out.
+ *
+ * @base is assumed to be a base directory, i.e. a path ending with '/' or '\'.
+ * Both @path and @base are assumed to be absolute paths without "." or "..".
+ *
+ * E.g. path /a/b/e/f.cgp with base /a/b/c/d/ turns into ../../e/f.cgp
+ **/
+size_t path_relative_to(char *out, const char *path, const char *base, size_t size);
+
+/**
+ * path_is_absolute:
+ * @path               : path
+ *
+ * Checks if @path is an absolute path or a relative path.
+ *
+ * Returns: true if path is absolute, false if path is relative.
+ **/
+bool path_is_absolute(const char *path);
+
+/**
+ * fill_pathname:
+ * @out_path           : output path
+ * @in_path            : input  path
+ * @replace            : what to replace
+ * @size               : buffer size of output path
+ *
+ * FIXME: Verify
+ *
+ * Replaces filename extension with 'replace' and outputs result to out_path.
+ * The extension here is considered to be the string from the last '.'
+ * to the end.
+ *
+ * Only '.'s after the last slash are considered as extensions.
+ * If no '.' is present, in_path and replace will simply be concatenated.
+ * 'size' is buffer size of 'out_path'.
+ * E.g.: in_path = "/foo/bar/baz/boo.c", replace = ".asm" =>
+ * out_path = "/foo/bar/baz/boo.asm"
+ * E.g.: in_path = "/foo/bar/baz/boo.c", replace = ""     =>
+ * out_path = "/foo/bar/baz/boo"
+ */
+void fill_pathname(char *out_path, const char *in_path,
+      const char *replace, size_t size);
+
+/**
+ * fill_dated_filename:
+ * @out_filename       : output filename
+ * @ext                : extension of output filename
+ * @size               : buffer size of output filename
+ *
+ * Creates a 'dated' filename prefixed by 'RetroArch', and
+ * concatenates extension (@ext) to it.
+ *
+ * E.g.:
+ * out_filename = "RetroArch-{month}{day}-{Hours}{Minutes}.{@ext}"
+ **/
+size_t fill_dated_filename(char *out_filename,
+      const char *ext, size_t size);
+
+/**
+ * fill_str_dated_filename:
+ * @out_filename       : output filename
+ * @in_str             : input string
+ * @ext                : extension of output filename
+ * @size               : buffer size of output filename
+ *
+ * Creates a 'dated' filename prefixed by the string @in_str, and
+ * concatenates extension (@ext) to it.
+ *
+ * E.g.:
+ * out_filename = "RetroArch-{year}{month}{day}-{Hour}{Minute}{Second}.{@ext}"
+ **/
+void fill_str_dated_filename(char *out_filename,
+      const char *in_str, const char *ext, size_t size);
+
+/**
+ * fill_pathname_noext:
+ * @out_path           : output path
+ * @in_path            : input  path
+ * @replace            : what to replace
+ * @size               : buffer size of output path
+ *
+ * Appends a filename extension 'replace' to 'in_path', and outputs
+ * result in 'out_path'.
+ *
+ * Assumes in_path has no extension. If an extension is still
+ * present in 'in_path', it will be ignored.
+ *
+ */
+size_t fill_pathname_noext(char *out_path, const char *in_path,
+      const char *replace, size_t size);
+
+/**
+ * find_last_slash:
+ * @str : input path
+ *
+ * Gets a pointer to the last slash in the input path.
+ *
+ * Returns: a pointer to the last slash in the input path.
+ **/
+char *find_last_slash(const char *str);
+
+/**
+ * fill_pathname_dir:
+ * @in_dir             : input directory path
+ * @in_basename        : input basename to be appended to @in_dir
+ * @replace            : replacement to be appended to @in_basename
+ * @size               : size of buffer
+ *
+ * Appends basename of 'in_basename', to 'in_dir', along with 'replace'.
+ * Basename of in_basename is the string after the last '/' or '\\',
+ * i.e the filename without directories.
+ *
+ * If in_basename has no '/' or '\\', the whole 'in_basename' will be used.
+ * 'size' is buffer size of 'in_dir'.
+ *
+ * E.g..: in_dir = "/tmp/some_dir", in_basename = "/some_content/foo.c",
+ * replace = ".asm" => in_dir = "/tmp/some_dir/foo.c.asm"
+ **/
+size_t fill_pathname_dir(char *in_dir, const char *in_basename,
+      const char *replace, size_t size);
+
+/**
+ * fill_pathname_base:
+ * @out                : output path
+ * @in_path            : input path
+ * @size               : size of output path
+ *
+ * Copies basename of @in_path into @out_path.
+ **/
+size_t fill_pathname_base(char *out_path, const char *in_path, size_t size);
+
+void fill_pathname_base_noext(char *out_dir,
+      const char *in_path, size_t size);
+
+size_t fill_pathname_base_ext(char *out,
+      const char *in_path, const char *ext,
+      size_t size);
+
+/**
+ * fill_pathname_basedir:
+ * @out_dir            : output directory
+ * @in_path            : input path
+ * @size               : size of output directory
+ *
+ * Copies base directory of @in_path into @out_path.
+ * If in_path is a path without any slashes (relative current directory),
+ * @out_path will get path "./".
+ **/
+void fill_pathname_basedir(char *out_path, const char *in_path, size_t size);
+
+void fill_pathname_basedir_noext(char *out_dir,
+      const char *in_path, size_t size);
+
+/**
+ * fill_pathname_parent_dir_name:
+ * @out_dir            : output directory
+ * @in_dir             : input directory
+ * @size               : size of output directory
+ *
+ * Copies only the parent directory name of @in_dir into @out_dir.
+ * The two buffers must not overlap. Removes trailing '/'.
+ * Returns true on success, false if a slash was not found in the path.
+ **/
+bool fill_pathname_parent_dir_name(char *out_dir,
+      const char *in_dir, size_t size);
+
+/**
+ * fill_pathname_parent_dir:
+ * @out_dir            : output directory
+ * @in_dir             : input directory
+ * @size               : size of output directory
+ *
+ * Copies parent directory of @in_dir into @out_dir.
+ * Assumes @in_dir is a directory. Keeps trailing '/'.
+ * If the path was already at the root directory, @out_dir will be an empty string.
+ **/
+void fill_pathname_parent_dir(char *out_dir,
+      const char *in_dir, size_t size);
+
+/**
+ * fill_pathname_resolve_relative:
+ * @out_path           : output path
+ * @in_refpath         : input reference path
+ * @in_path            : input path
+ * @size               : size of @out_path
+ *
+ * Joins basedir of @in_refpath together with @in_path.
+ * If @in_path is an absolute path, out_path = in_path.
+ * E.g.: in_refpath = "/foo/bar/baz.a", in_path = "foobar.cg",
+ * out_path = "/foo/bar/foobar.cg".
+ **/
+void fill_pathname_resolve_relative(char *out_path, const char *in_refpath,
+      const char *in_path, size_t size);
+
+/**
+ * fill_pathname_join:
+ * @out_path           : output path
+ * @dir                : directory
+ * @path               : path
+ * @size               : size of output path
+ *
+ * Joins a directory (@dir) and path (@path) together.
+ * Makes sure not to get  two consecutive slashes
+ * between directory and path.
+ **/
+size_t fill_pathname_join(char *out_path, const char *dir,
+      const char *path, size_t size);
+
+size_t fill_pathname_join_special_ext(char *out_path,
+      const char *dir,  const char *path,
+      const char *last, const char *ext,
+      size_t size);
+
+size_t fill_pathname_join_concat_noext(char *out_path,
+      const char *dir, const char *path,
+      const char *concat,
+      size_t size);
+
+size_t fill_pathname_join_concat(char *out_path,
+      const char *dir, const char *path,
+      const char *concat,
+      size_t size);
+
+void fill_pathname_join_noext(char *out_path,
+      const char *dir, const char *path, size_t size);
+
+/**
+ * fill_pathname_join_delim:
+ * @out_path           : output path
+ * @dir                : directory
+ * @path               : path
+ * @delim              : delimiter
+ * @size               : size of output path
+ *
+ * Joins a directory (@dir) and path (@path) together
+ * using the given delimiter (@delim).
+ **/
+size_t fill_pathname_join_delim(char *out_path, const char *dir,
+      const char *path, const char delim, size_t size);
+
+size_t fill_pathname_join_delim_concat(char *out_path, const char *dir,
+      const char *path, const char delim, const char *concat,
+      size_t size);
+
+/**
+ * fill_short_pathname_representation:
+ * @out_rep            : output representation
+ * @in_path            : input path
+ * @size               : size of output representation
+ *
+ * Generates a short representation of path. It should only
+ * be used for displaying the result; the output representation is not
+ * binding in any meaningful way (for a normal path, this is the same as basename)
+ * In case of more complex URLs, this should cut everything except for
+ * the main image file.
+ *
+ * E.g.: "/path/to/game.img" -> game.img
+ *       "/path/to/myarchive.7z#folder/to/game.img" -> game.img
+ */
+size_t fill_short_pathname_representation(char* out_rep,
+      const char *in_path, size_t size);
+
+void fill_short_pathname_representation_noext(char* out_rep,
+      const char *in_path, size_t size);
+
+void fill_pathname_expand_special(char *out_path,
+      const char *in_path, size_t size);
+
+void fill_pathname_abbreviate_special(char *out_path,
+      const char *in_path, size_t size);
+
+void fill_pathname_abbreviated_or_relative(char *out_path, const char *in_refpath, const char *in_path, size_t size);
+
+void pathname_conform_slashes_to_os(char *path);
+
+void pathname_make_slashes_portable(char *path);
+
+/**
+ * path_basedir:
+ * @path               : path
+ *
+ * Extracts base directory by mutating path.
+ * Keeps trailing '/'.
+ **/
+void path_basedir_wrapper(char *path);
+
+/**
+ * path_char_is_slash:
+ * @c                  : character
+ *
+ * Checks if character (@c) is a slash.
+ *
+ * Returns: true (1) if character is a slash, otherwise false (0).
+ */
+#ifdef _WIN32
+#define PATH_CHAR_IS_SLASH(c) (((c) == '/') || ((c) == '\\'))
+#else
+#define PATH_CHAR_IS_SLASH(c) ((c) == '/')
+#endif
+
+/**
+ * path_default_slash and path_default_slash_c:
+ *
+ * Gets the default slash separator.
+ *
+ * Returns: default slash separator.
+ */
+#ifdef _WIN32
+#define PATH_DEFAULT_SLASH() "\\"
+#define PATH_DEFAULT_SLASH_C() '\\'
+#else
+#define PATH_DEFAULT_SLASH() "/"
+#define PATH_DEFAULT_SLASH_C() '/'
+#endif
+
+/**
+ * fill_pathname_slash:
+ * @path               : path
+ * @size               : size of path
+ *
+ * Assumes path is a directory. Appends a slash
+ * if not already there.
+ **/
+void fill_pathname_slash(char *path, size_t size);
+
+#if !defined(RARCH_CONSOLE) && defined(RARCH_INTERNAL)
+void fill_pathname_application_path(char *buf, size_t size);
+void fill_pathname_application_dir(char *buf, size_t size);
+void fill_pathname_home_dir(char *buf, size_t size);
+#endif
+
+/**
+ * path_mkdir:
+ * @dir                : directory
+ *
+ * Create directory on filesystem.
+ *
+ * Returns: true (1) if directory could be created, otherwise false (0).
+ **/
+bool path_mkdir(const char *dir);
+
+/**
+ * path_is_directory:
+ * @path               : path
+ *
+ * Checks if path is a directory.
+ *
+ * Returns: true (1) if path is a directory, otherwise false (0).
+ */
+bool path_is_directory(const char *path);
+
+bool path_is_character_special(const char *path);
+
+int path_stat(const char *path);
+
+bool path_is_valid(const char *path);
+
+int32_t path_get_size(const char *path);
+
+bool is_path_accessible_using_standard_io(const char *path);
+
+RETRO_END_DECLS
+
+#endif
diff --git a/src/drivers/libretro/libretro-common/include/encodings/crc32.h b/src/drivers/libretro/libretro-common/include/retro_assert.h
similarity index 77%
rename from src/drivers/libretro/libretro-common/include/encodings/crc32.h
rename to src/drivers/libretro/libretro-common/include/retro_assert.h
index 5236c91..79dbb32 100644
--- a/src/drivers/libretro/libretro-common/include/encodings/crc32.h
+++ b/src/drivers/libretro/libretro-common/include/retro_assert.h
@@ -1,7 +1,7 @@
 /* Copyright  (C) 2010-2020 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (crc32.h).
+ * The following license statement only applies to this file (retro_assert.h).
  * ---------------------------------------------------------------------------------------
  *
  * Permission is hereby granted, free of charge,
@@ -20,19 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef _LIBRETRO_ENCODINGS_CRC32_H
-#define _LIBRETRO_ENCODINGS_CRC32_H
+#ifndef __RETRO_ASSERT_H
+#define __RETRO_ASSERT_H
 
-#include <stdint.h>
-#include <stddef.h>
+#include <assert.h>
 
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-uint32_t encoding_crc32(uint32_t crc, const uint8_t *buf, size_t len);
-uint32_t file_crc32(uint32_t crc, const char *path);
-
-RETRO_END_DECLS
+#ifdef RARCH_INTERNAL
+#include <stdio.h>
+#define retro_assert(cond) ((void)( (cond) || (printf("Assertion failed at %s:%d.\n", __FILE__, __LINE__), abort(), 0) ))
+#else
+#define retro_assert(cond) assert(cond)
+#endif
 
 #endif
diff --git a/src/drivers/libretro/libretro-common/include/retro_environment.h b/src/drivers/libretro/libretro-common/include/retro_environment.h
new file mode 100644
index 0000000..1389eb5
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/include/retro_environment.h
@@ -0,0 +1,114 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (retro_environment.h).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __LIBRETRO_SDK_ENVIRONMENT_H
+#define __LIBRETRO_SDK_ENVIRONMENT_H
+
+/*
+This file is designed to create a normalized environment for compiling
+libretro-common's private implementations, or any other sources which might
+enjoy use of it's environment (RetroArch for instance).
+This should be an elaborately crafted environment so that sources don't
+need to be full of platform-specific workarounds.
+*/
+
+#if defined (__cplusplus)
+#if 0
+printf("This is C++, version %d.\n", __cplusplus);
+#endif
+/* The expected values would be
+ *   199711L, for ISO/IEC 14882:1998 or 14882:2003
+ */
+
+#elif defined(__STDC__)
+/* This is standard C. */
+
+#if (__STDC__ == 1)
+/* The implementation is ISO-conforming. */
+#define __STDC_ISO__
+#else
+/* The implementation is not ISO-conforming. */
+#endif
+
+#if defined(__STDC_VERSION__)
+#if (__STDC_VERSION__ >= 201112L)
+/* This is C11. */
+#define __STDC_C11__
+#elif (__STDC_VERSION__ >= 199901L)
+/* This is C99. */
+#define __STDC_C99__
+#elif (__STDC_VERSION__ >= 199409L)
+/* This is C89 with amendment 1. */
+#define __STDC_C89__
+#define __STDC_C89_AMENDMENT_1__
+#else
+/* This is C89 without amendment 1. */
+#define __STDC_C89__
+#endif
+#else /* !defined(__STDC_VERSION__) */
+/* This is C89. __STDC_VERSION__ is not defined. */
+#define __STDC_C89__
+#endif
+
+#else   /* !defined(__STDC__) */
+/* This is not standard C. __STDC__ is not defined. */
+#endif
+
+#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
+/* Try to find out if we're compiling for WinRT or non-WinRT */
+#if defined(_MSC_VER) && defined(__has_include)
+#if __has_include(<winapifamily.h>)
+#define HAVE_WINAPIFAMILY_H 1
+#else
+#define HAVE_WINAPIFAMILY_H 0
+#endif
+
+/* If _USING_V110_SDK71_ is defined it means we are using the Windows XP toolset. */
+#elif defined(_MSC_VER) && (_MSC_VER >= 1700 && !_USING_V110_SDK71_)    /* _MSC_VER == 1700 for Visual Studio 2012 */
+#define HAVE_WINAPIFAMILY_H 1
+#else
+#define HAVE_WINAPIFAMILY_H 0
+#endif
+
+#if HAVE_WINAPIFAMILY_H
+#include <winapifamily.h>
+#define WINAPI_FAMILY_WINRT (!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP))
+#else
+#define WINAPI_FAMILY_WINRT 0
+#endif /* HAVE_WINAPIFAMILY_H */
+
+#if WINAPI_FAMILY_WINRT
+#undef __WINRT__
+#define __WINRT__ 1
+#endif
+
+/* MSVC obviously has to have some non-standard constants... */
+#if _M_IX86_FP == 1
+#define __SSE__ 1
+#elif _M_IX86_FP == 2 || (defined(_M_AMD64) || defined(_M_X64))
+#define __SSE__ 1
+#define __SSE2__ 1
+#endif
+
+#endif
+
+#endif
diff --git a/src/drivers/libretro/libretro-common/include/retro_miscellaneous.h b/src/drivers/libretro/libretro-common/include/retro_miscellaneous.h
new file mode 100644
index 0000000..f0dfb5c
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/include/retro_miscellaneous.h
@@ -0,0 +1,203 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (retro_miscellaneous.h).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __RARCH_MISCELLANEOUS_H
+#define __RARCH_MISCELLANEOUS_H
+
+#define RARCH_MAX_SUBSYSTEMS 10
+#define RARCH_MAX_SUBSYSTEM_ROMS 10
+
+#include <stdint.h>
+#include <boolean.h>
+#include <retro_inline.h>
+
+#if defined(_WIN32)
+
+#if defined(_XBOX)
+#include <Xtl.h>
+#else
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#endif
+
+#endif
+
+#include <limits.h>
+
+#ifdef _MSC_VER
+#include <compat/msvc.h>
+#endif
+
+static INLINE void bits_or_bits(uint32_t *a, uint32_t *b, uint32_t count)
+{
+   uint32_t i;
+   for (i = 0; i < count;i++)
+      a[i] |= b[i];
+}
+
+static INLINE void bits_clear_bits(uint32_t *a, uint32_t *b, uint32_t count)
+{
+   uint32_t i;
+   for (i = 0; i < count;i++)
+      a[i] &= ~b[i];
+}
+
+static INLINE bool bits_any_set(uint32_t* ptr, uint32_t count)
+{
+   uint32_t i;
+   for (i = 0; i < count; i++)
+   {
+      if (ptr[i] != 0)
+         return true;
+   }
+   return false;
+}
+
+#ifndef PATH_MAX_LENGTH
+#if defined(_XBOX1) || defined(_3DS) || defined(PSP) || defined(PS2) || defined(GEKKO)|| defined(WIIU) || defined(ORBIS) || defined(__PSL1GHT__) || defined(__PS3__)
+#define PATH_MAX_LENGTH 512
+#else
+#define PATH_MAX_LENGTH 4096
+#endif
+#endif
+
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+#define ARRAY_SIZE(a)              (sizeof(a) / sizeof((a)[0]))
+
+#define BITS_GET_ELEM(a, i)        ((a).data[i])
+#define BITS_GET_ELEM_PTR(a, i)    ((a)->data[i])
+
+#define BIT_SET(a, bit)   ((a)[(bit) >> 3] |=  (1 << ((bit) & 7)))
+#define BIT_CLEAR(a, bit) ((a)[(bit) >> 3] &= ~(1 << ((bit) & 7)))
+#define BIT_GET(a, bit)   (((a)[(bit) >> 3] >> ((bit) & 7)) & 1)
+
+#define BIT16_SET(a, bit)    ((a) |=  (1 << ((bit) & 15)))
+#define BIT16_CLEAR(a, bit)  ((a) &= ~(1 << ((bit) & 15)))
+#define BIT16_GET(a, bit)    (((a) >> ((bit) & 15)) & 1)
+#define BIT16_CLEAR_ALL(a)   ((a) = 0)
+
+#define BIT32_SET(a, bit)    ((a) |=  (UINT32_C(1) << ((bit) & 31)))
+#define BIT32_CLEAR(a, bit)  ((a) &= ~(UINT32_C(1) << ((bit) & 31)))
+#define BIT32_GET(a, bit)    (((a) >> ((bit) & 31)) & 1)
+#define BIT32_CLEAR_ALL(a)   ((a) = 0)
+
+#define BIT64_SET(a, bit)    ((a) |=  (UINT64_C(1) << ((bit) & 63)))
+#define BIT64_CLEAR(a, bit)  ((a) &= ~(UINT64_C(1) << ((bit) & 63)))
+#define BIT64_GET(a, bit)    (((a) >> ((bit) & 63)) & 1)
+#define BIT64_CLEAR_ALL(a)   ((a) = 0)
+
+#define BIT128_SET(a, bit)   ((a).data[(bit) >> 5] |=  (UINT32_C(1) << ((bit) & 31)))
+#define BIT128_CLEAR(a, bit) ((a).data[(bit) >> 5] &= ~(UINT32_C(1) << ((bit) & 31)))
+#define BIT128_GET(a, bit)   (((a).data[(bit) >> 5] >> ((bit) & 31)) & 1)
+#define BIT128_CLEAR_ALL(a)  memset(&(a), 0, sizeof(a))
+
+#define BIT128_SET_PTR(a, bit)   BIT128_SET(*a, bit)
+#define BIT128_CLEAR_PTR(a, bit) BIT128_CLEAR(*a, bit)
+#define BIT128_GET_PTR(a, bit)   BIT128_GET(*a, bit)
+#define BIT128_CLEAR_ALL_PTR(a)  BIT128_CLEAR_ALL(*a)
+
+#define BIT256_SET(a, bit)       BIT128_SET(a, bit)
+#define BIT256_CLEAR(a, bit)     BIT128_CLEAR(a, bit)
+#define BIT256_GET(a, bit)       BIT128_GET(a, bit)
+#define BIT256_CLEAR_ALL(a)      BIT128_CLEAR_ALL(a)
+
+#define BIT256_SET_PTR(a, bit)   BIT256_SET(*a, bit)
+#define BIT256_CLEAR_PTR(a, bit) BIT256_CLEAR(*a, bit)
+#define BIT256_GET_PTR(a, bit)   BIT256_GET(*a, bit)
+#define BIT256_CLEAR_ALL_PTR(a)  BIT256_CLEAR_ALL(*a)
+
+#define BIT512_SET(a, bit)       BIT256_SET(a, bit)
+#define BIT512_CLEAR(a, bit)     BIT256_CLEAR(a, bit)
+#define BIT512_GET(a, bit)       BIT256_GET(a, bit)
+#define BIT512_CLEAR_ALL(a)      BIT256_CLEAR_ALL(a)
+
+#define BIT512_SET_PTR(a, bit)   BIT512_SET(*a, bit)
+#define BIT512_CLEAR_PTR(a, bit) BIT512_CLEAR(*a, bit)
+#define BIT512_GET_PTR(a, bit)   BIT512_GET(*a, bit)
+#define BIT512_CLEAR_ALL_PTR(a)  BIT512_CLEAR_ALL(*a)
+
+#define BITS_COPY16_PTR(a,bits) \
+{ \
+   BIT128_CLEAR_ALL_PTR(a); \
+   BITS_GET_ELEM_PTR(a, 0) = (bits) & 0xffff; \
+}
+
+#define BITS_COPY32_PTR(a,bits) \
+{ \
+   BIT128_CLEAR_ALL_PTR(a); \
+   BITS_GET_ELEM_PTR(a, 0) = (bits); \
+}
+
+#define BITS_COPY64_PTR(a,bits) \
+{ \
+   BIT128_CLEAR_ALL_PTR(a); \
+   BITS_GET_ELEM_PTR(a, 0) = (bits); \
+   BITS_GET_ELEM_PTR(a, 1) = (bits >> 32); \
+}
+
+/* Helper macros and struct to keep track of many booleans. */
+/* This struct has 256 bits. */
+typedef struct
+{
+   uint32_t data[8];
+} retro_bits_t;
+
+/* This struct has 512 bits. */
+typedef struct
+{
+   uint32_t data[16];
+} retro_bits_512_t;
+
+#ifdef _WIN32
+#  ifdef _WIN64
+#    define PRI_SIZET PRIu64
+#  else
+#    if _MSC_VER == 1800
+#      define PRI_SIZET PRIu32
+#    else
+#      define PRI_SIZET "u"
+#    endif
+#  endif
+#elif defined(PS2)
+#  define PRI_SIZET "u"
+#else
+#  if (SIZE_MAX == 0xFFFF)
+#    define PRI_SIZET "hu"
+#  elif (SIZE_MAX == 0xFFFFFFFF)
+#    define PRI_SIZET "u"
+#  elif (SIZE_MAX == 0xFFFFFFFFFFFFFFFF)
+#    define PRI_SIZET "lu"
+#  else
+#    error PRI_SIZET: unknown SIZE_MAX
+#  endif
+#endif
+
+#endif
diff --git a/src/drivers/libretro/libretro-common/include/streams/file_stream.h b/src/drivers/libretro/libretro-common/include/streams/file_stream.h
new file mode 100644
index 0000000..5276f87
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/include/streams/file_stream.h
@@ -0,0 +1,117 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (file_stream.h).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __LIBRETRO_SDK_FILE_STREAM_H
+#define __LIBRETRO_SDK_FILE_STREAM_H
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stddef.h>
+
+#include <sys/types.h>
+
+#include <libretro.h>
+#include <retro_common_api.h>
+#include <retro_inline.h>
+#include <boolean.h>
+
+#include <stdarg.h>
+#include <vfs/vfs_implementation.h>
+
+#define FILESTREAM_REQUIRED_VFS_VERSION 2
+
+RETRO_BEGIN_DECLS
+
+typedef struct RFILE RFILE;
+
+#define FILESTREAM_REQUIRED_VFS_VERSION 2
+
+void filestream_vfs_init(const struct retro_vfs_interface_info* vfs_info);
+
+int64_t filestream_get_size(RFILE *stream);
+
+int64_t filestream_truncate(RFILE *stream, int64_t length);
+
+/**
+ * filestream_open:
+ * @path               : path to file
+ * @mode               : file mode to use when opening (read/write)
+ * @bufsize            : optional buffer size (-1 or 0 to use default)
+ *
+ * Opens a file for reading or writing, depending on the requested mode.
+ * Returns a pointer to an RFILE if opened successfully, otherwise NULL.
+ **/
+RFILE* filestream_open(const char *path, unsigned mode, unsigned hints);
+
+int64_t filestream_seek(RFILE *stream, int64_t offset, int seek_position);
+
+int64_t filestream_read(RFILE *stream, void *data, int64_t len);
+
+int64_t filestream_write(RFILE *stream, const void *data, int64_t len);
+
+int64_t filestream_tell(RFILE *stream);
+
+void filestream_rewind(RFILE *stream);
+
+int filestream_close(RFILE *stream);
+
+int64_t filestream_read_file(const char *path, void **buf, int64_t *len);
+
+char* filestream_gets(RFILE *stream, char *s, size_t len);
+
+int filestream_getc(RFILE *stream);
+
+int filestream_vscanf(RFILE *stream, const char* format, va_list *args);
+
+int filestream_scanf(RFILE *stream, const char* format, ...);
+
+int filestream_eof(RFILE *stream);
+
+bool filestream_write_file(const char *path, const void *data, int64_t size);
+
+int filestream_putc(RFILE *stream, int c);
+
+int filestream_vprintf(RFILE *stream, const char* format, va_list args);
+
+int filestream_printf(RFILE *stream, const char* format, ...);
+
+int filestream_error(RFILE *stream);
+
+int filestream_flush(RFILE *stream);
+
+int filestream_delete(const char *path);
+
+int filestream_rename(const char *old_path, const char *new_path);
+
+const char* filestream_get_path(RFILE *stream);
+
+bool filestream_exists(const char *path);
+
+/* Returned pointer must be freed by the caller. */
+char* filestream_getline(RFILE *stream);
+
+libretro_vfs_implementation_file* filestream_get_vfs_handle(RFILE *stream);
+
+RETRO_END_DECLS
+
+#endif
diff --git a/src/drivers/libretro/libretro-common/include/streams/file_stream_transforms.h b/src/drivers/libretro/libretro-common/include/streams/file_stream_transforms.h
new file mode 100644
index 0000000..327e218
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/include/streams/file_stream_transforms.h
@@ -0,0 +1,101 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+*
+* ---------------------------------------------------------------------------------------
+* The following license statement only applies to this file (file_stream_transforms.h).
+* ---------------------------------------------------------------------------------------
+*
+* Permission is hereby granted, free of charge,
+* to any person obtaining a copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation the rights to
+* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+* and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef __LIBRETRO_SDK_FILE_STREAM_TRANSFORMS_H
+#define __LIBRETRO_SDK_FILE_STREAM_TRANSFORMS_H
+
+#include <stdint.h>
+#include <string.h>
+#include <retro_common_api.h>
+#include <streams/file_stream.h>
+
+RETRO_BEGIN_DECLS
+
+#ifndef SKIP_STDIO_REDEFINES
+
+#define FILE RFILE
+
+#undef fopen
+#undef fclose
+#undef ftell
+#undef fseek
+#undef fread
+#undef fgets
+#undef fgetc
+#undef fwrite
+#undef fputc
+#undef fflush
+#undef fprintf
+#undef ferror
+#undef feof
+#undef fscanf
+
+#define fopen rfopen
+#define fclose rfclose
+#define ftell rftell
+#define fseek rfseek
+#define fread rfread
+#define fgets rfgets
+#define fgetc rfgetc
+#define fwrite rfwrite
+#define fputc rfputc
+#define fflush rfflush
+#define fprintf rfprintf
+#define ferror rferror
+#define feof rfeof
+#define fscanf rfscanf
+
+#endif
+
+RFILE* rfopen(const char *path, const char *mode);
+
+int rfclose(RFILE* stream);
+
+int64_t rftell(RFILE* stream);
+
+int64_t rfseek(RFILE* stream, int64_t offset, int origin);
+
+int64_t rfread(void* buffer,
+   size_t elem_size, size_t elem_count, RFILE* stream);
+
+char *rfgets(char *buffer, int maxCount, RFILE* stream);
+
+int rfgetc(RFILE* stream);
+
+int64_t rfwrite(void const* buffer,
+   size_t elem_size, size_t elem_count, RFILE* stream);
+
+int rfputc(int character, RFILE * stream);
+
+int64_t rfflush(RFILE * stream);
+
+int rfprintf(RFILE * stream, const char * format, ...);
+
+int rferror(RFILE* stream);
+
+int rfeof(RFILE* stream);
+
+int rfscanf(RFILE * stream, const char * format, ...);
+
+RETRO_END_DECLS
+
+#endif
diff --git a/src/drivers/libretro/libretro-common/include/string/stdstring.h b/src/drivers/libretro/libretro-common/include/string/stdstring.h
index 82e038b..e7087d6 100644
--- a/src/drivers/libretro/libretro-common/include/string/stdstring.h
+++ b/src/drivers/libretro/libretro-common/include/string/stdstring.h
@@ -148,9 +148,61 @@ char *string_trim_whitespace_right(char *const s);
 /* Remove leading and trailing whitespaces */
 char *string_trim_whitespace(char *const s);
 
-/* max_lines == 0 means no limit */
-char *word_wrap(char *buffer, const char *string,
-      int line_width, bool unicode, unsigned max_lines);
+/*
+ * Wraps string specified by 'src' to destination buffer
+ * specified by 'dst' and 'dst_size'.
+ * This function assumes that all glyphs in the string
+ * have an on-screen pixel width similar to that of
+ * regular Latin characters - i.e. it will not wrap
+ * correctly any text containing so-called 'wide' Unicode
+ * characters (e.g. CJK languages, emojis, etc.).
+ *
+ * @param dst             pointer to destination buffer.
+ * @param dst_size        size of destination buffer.
+ * @param src             pointer to input string.
+ * @param line_width      max number of characters per line.
+ * @param wideglyph_width not used, but is necessary to keep
+ *                        compatibility with word_wrap_wideglyph().
+ * @param max_lines       max lines of destination string.
+ *                        0 means no limit.
+ */
+void word_wrap(char *dst, size_t dst_size, const char *src,
+      int line_width, int wideglyph_width, unsigned max_lines);
+
+/*
+ * Wraps string specified by 'src' to destination buffer
+ * specified by 'dst' and 'dst_size'.
+ * This function assumes that all glyphs in the string
+ * are:
+ * - EITHER 'non-wide' Unicode glyphs, with an on-screen
+ *   pixel width similar to that of regular Latin characters
+ * - OR 'wide' Unicode glyphs (e.g. CJK languages, emojis, etc.)
+ *   with an on-screen pixel width defined by 'wideglyph_width'
+ * Note that wrapping may occur in inappropriate locations
+ * if 'src' string contains 'wide' Unicode characters whose
+ * on-screen pixel width deviates greatly from the set
+ * 'wideglyph_width' value.
+ *
+ * @param dst             pointer to destination buffer.
+ * @param dst_size        size of destination buffer.
+ * @param src             pointer to input string.
+ * @param line_width      max number of characters per line.
+ * @param wideglyph_width effective width of 'wide' Unicode glyphs.
+ *                        the value here is normalised relative to the
+ *                        typical on-screen pixel width of a regular
+ *                        Latin character:
+ *                        - a regular Latin character is defined to
+ *                          have an effective width of 100
+ *                        - wideglyph_width = 100 * (wide_character_pixel_width / latin_character_pixel_width)
+ *                        - e.g. if 'wide' Unicode characters in 'src'
+ *                          have an on-screen pixel width twice that of
+ *                          regular Latin characters, wideglyph_width
+ *                          would be 200
+ * @param max_lines       max lines of destination string.
+ *                        0 means no limit.
+ */
+void word_wrap_wideglyph(char *dst, size_t dst_size, const char *src,
+      int line_width, int wideglyph_width, unsigned max_lines);
 
 /* Splits string into tokens seperated by 'delim'
  * > Returned token string must be free()'d
diff --git a/src/drivers/libretro/libretro-common/include/time/rtime.h b/src/drivers/libretro/libretro-common/include/time/rtime.h
new file mode 100644
index 0000000..7629c1e
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/include/time/rtime.h
@@ -0,0 +1,48 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (rtime.h).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __LIBRETRO_SDK_RTIME_H__
+#define __LIBRETRO_SDK_RTIME_H__
+
+#include <retro_common_api.h>
+
+#include <stdint.h>
+#include <stddef.h>
+#include <time.h>
+
+RETRO_BEGIN_DECLS
+
+/* TODO/FIXME: Move all generic time handling functions
+ * to this file */
+
+/* Must be called before using rtime_localtime() */
+void rtime_init(void);
+
+/* Must be called upon program termination */
+void rtime_deinit(void);
+
+/* Thread-safe wrapper for localtime() */
+struct tm *rtime_localtime(const time_t *timep, struct tm *result);
+
+RETRO_END_DECLS
+
+#endif
diff --git a/src/drivers/libretro/libretro-common/include/vfs/vfs.h b/src/drivers/libretro/libretro-common/include/vfs/vfs.h
new file mode 100644
index 0000000..5366f33
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/include/vfs/vfs.h
@@ -0,0 +1,111 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+*
+* ---------------------------------------------------------------------------------------
+* The following license statement only applies to this file (vfs_implementation.h).
+* ---------------------------------------------------------------------------------------
+*
+* Permission is hereby granted, free of charge,
+* to any person obtaining a copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation the rights to
+* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+* and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef __LIBRETRO_SDK_VFS_H
+#define __LIBRETRO_SDK_VFS_H
+
+#include <retro_common_api.h>
+#include <boolean.h>
+
+#ifdef RARCH_INTERNAL
+#ifndef VFS_FRONTEND
+#define VFS_FRONTEND
+#endif
+#endif
+
+RETRO_BEGIN_DECLS
+
+#ifdef _WIN32
+typedef void* HANDLE;
+#endif
+
+#ifdef HAVE_CDROM
+typedef struct
+{
+   int64_t byte_pos;
+   char *cue_buf;
+   size_t cue_len;
+   unsigned cur_lba;
+   unsigned last_frame_lba;
+   unsigned char cur_min;
+   unsigned char cur_sec;
+   unsigned char cur_frame;
+   unsigned char cur_track;
+   unsigned char last_frame[2352];
+   char drive;
+   bool last_frame_valid;
+} vfs_cdrom_t;
+#endif
+
+enum vfs_scheme
+{
+   VFS_SCHEME_NONE = 0,
+   VFS_SCHEME_CDROM
+};
+
+#ifndef __WINRT__
+#ifdef VFS_FRONTEND
+struct retro_vfs_file_handle
+#else
+struct libretro_vfs_implementation_file
+#endif
+{
+#ifdef HAVE_CDROM
+   vfs_cdrom_t cdrom; /* int64_t alignment */
+#endif
+   int64_t size;
+   uint64_t mappos;
+   uint64_t mapsize;
+   FILE *fp;
+#ifdef _WIN32
+   HANDLE fh;
+#endif
+   char *buf;
+   char* orig_path;
+   uint8_t *mapped;
+   int fd;
+   unsigned hints;
+   enum vfs_scheme scheme;
+};
+#endif
+
+/* Replace the following symbol with something appropriate
+ * to signify the file is being compiled for a front end instead of a core.
+ * This allows the same code to act as reference implementation
+ * for VFS and as fallbacks for when the front end does not provide VFS functionality.
+ */
+
+#ifdef VFS_FRONTEND
+typedef struct retro_vfs_file_handle libretro_vfs_implementation_file;
+#else
+typedef struct libretro_vfs_implementation_file libretro_vfs_implementation_file;
+#endif
+
+#ifdef VFS_FRONTEND
+typedef struct retro_vfs_dir_handle libretro_vfs_implementation_dir;
+#else
+typedef struct libretro_vfs_implementation_dir libretro_vfs_implementation_dir;
+#endif
+
+RETRO_END_DECLS
+
+#endif
diff --git a/src/drivers/libretro/libretro-common/include/vfs/vfs_implementation.h b/src/drivers/libretro/libretro-common/include/vfs/vfs_implementation.h
new file mode 100644
index 0000000..c7d6bb0
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/include/vfs/vfs_implementation.h
@@ -0,0 +1,76 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+*
+* ---------------------------------------------------------------------------------------
+* The following license statement only applies to this file (vfs_implementation.h).
+* ---------------------------------------------------------------------------------------
+*
+* Permission is hereby granted, free of charge,
+* to any person obtaining a copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation the rights to
+* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+* and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef __LIBRETRO_SDK_VFS_IMPLEMENTATION_H
+#define __LIBRETRO_SDK_VFS_IMPLEMENTATION_H
+
+#include <stdio.h>
+#include <stdint.h>
+#include <libretro.h>
+#include <retro_environment.h>
+#include <vfs/vfs.h>
+
+RETRO_BEGIN_DECLS
+
+libretro_vfs_implementation_file *retro_vfs_file_open_impl(const char *path, unsigned mode, unsigned hints);
+
+int retro_vfs_file_close_impl(libretro_vfs_implementation_file *stream);
+
+int retro_vfs_file_error_impl(libretro_vfs_implementation_file *stream);
+
+int64_t retro_vfs_file_size_impl(libretro_vfs_implementation_file *stream);
+
+int64_t retro_vfs_file_truncate_impl(libretro_vfs_implementation_file *stream, int64_t length);
+
+int64_t retro_vfs_file_tell_impl(libretro_vfs_implementation_file *stream);
+
+int64_t retro_vfs_file_seek_impl(libretro_vfs_implementation_file *stream, int64_t offset, int seek_position);
+
+int64_t retro_vfs_file_read_impl(libretro_vfs_implementation_file *stream, void *s, uint64_t len);
+
+int64_t retro_vfs_file_write_impl(libretro_vfs_implementation_file *stream, const void *s, uint64_t len);
+
+int retro_vfs_file_flush_impl(libretro_vfs_implementation_file *stream);
+
+int retro_vfs_file_remove_impl(const char *path);
+
+int retro_vfs_file_rename_impl(const char *old_path, const char *new_path);
+
+const char *retro_vfs_file_get_path_impl(libretro_vfs_implementation_file *stream);
+
+int retro_vfs_stat_impl(const char *path, int32_t *size);
+
+int retro_vfs_mkdir_impl(const char *dir);
+
+libretro_vfs_implementation_dir *retro_vfs_opendir_impl(const char *dir, bool include_hidden);
+
+bool retro_vfs_readdir_impl(libretro_vfs_implementation_dir *dirstream);
+
+const char *retro_vfs_dirent_get_name_impl(libretro_vfs_implementation_dir *dirstream);
+
+bool retro_vfs_dirent_is_dir_impl(libretro_vfs_implementation_dir *dirstream);
+
+int retro_vfs_closedir_impl(libretro_vfs_implementation_dir *dirstream);
+
+RETRO_END_DECLS
+
+#endif
diff --git a/src/drivers/libretro/libretro-common/streams/file_stream.c b/src/drivers/libretro/libretro-common/streams/file_stream.c
new file mode 100644
index 0000000..3543dcc
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/streams/file_stream.c
@@ -0,0 +1,678 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (file_stream.c).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include <errno.h>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef _MSC_VER
+#include <compat/msvc.h>
+#endif
+
+#include <string/stdstring.h>
+#include <streams/file_stream.h>
+#define VFS_FRONTEND
+#include <vfs/vfs_implementation.h>
+
+#define VFS_ERROR_RETURN_VALUE -1
+
+struct RFILE
+{
+   struct retro_vfs_file_handle *hfile;
+	bool error_flag;
+	bool eof_flag;
+};
+
+static retro_vfs_get_path_t filestream_get_path_cb = NULL;
+static retro_vfs_open_t filestream_open_cb         = NULL;
+static retro_vfs_close_t filestream_close_cb       = NULL;
+static retro_vfs_size_t filestream_size_cb         = NULL;
+static retro_vfs_truncate_t filestream_truncate_cb = NULL;
+static retro_vfs_tell_t filestream_tell_cb         = NULL;
+static retro_vfs_seek_t filestream_seek_cb         = NULL;
+static retro_vfs_read_t filestream_read_cb         = NULL;
+static retro_vfs_write_t filestream_write_cb       = NULL;
+static retro_vfs_flush_t filestream_flush_cb       = NULL;
+static retro_vfs_remove_t filestream_remove_cb     = NULL;
+static retro_vfs_rename_t filestream_rename_cb     = NULL;
+
+/* VFS Initialization */
+
+void filestream_vfs_init(const struct retro_vfs_interface_info* vfs_info)
+{
+   const struct retro_vfs_interface *
+      vfs_iface           = vfs_info->iface;
+
+   filestream_get_path_cb = NULL;
+   filestream_open_cb     = NULL;
+   filestream_close_cb    = NULL;
+   filestream_tell_cb     = NULL;
+   filestream_size_cb     = NULL;
+   filestream_truncate_cb = NULL;
+   filestream_seek_cb     = NULL;
+   filestream_read_cb     = NULL;
+   filestream_write_cb    = NULL;
+   filestream_flush_cb    = NULL;
+   filestream_remove_cb   = NULL;
+   filestream_rename_cb   = NULL;
+
+   if (
+             (vfs_info->required_interface_version < 
+             FILESTREAM_REQUIRED_VFS_VERSION)
+         || !vfs_iface)
+      return;
+
+   filestream_get_path_cb = vfs_iface->get_path;
+   filestream_open_cb     = vfs_iface->open;
+   filestream_close_cb    = vfs_iface->close;
+   filestream_size_cb     = vfs_iface->size;
+   filestream_truncate_cb = vfs_iface->truncate;
+   filestream_tell_cb     = vfs_iface->tell;
+   filestream_seek_cb     = vfs_iface->seek;
+   filestream_read_cb     = vfs_iface->read;
+   filestream_write_cb    = vfs_iface->write;
+   filestream_flush_cb    = vfs_iface->flush;
+   filestream_remove_cb   = vfs_iface->remove;
+   filestream_rename_cb   = vfs_iface->rename;
+}
+
+/* Callback wrappers */
+bool filestream_exists(const char *path)
+{
+   RFILE *dummy           = NULL;
+
+   if (!path || !*path)
+      return false;
+
+   dummy                  = filestream_open(
+         path,
+         RETRO_VFS_FILE_ACCESS_READ,
+         RETRO_VFS_FILE_ACCESS_HINT_NONE);
+
+   if (!dummy)
+      return false;
+
+   if (filestream_close(dummy) != 0)
+      if (dummy)
+         free(dummy);
+
+   dummy = NULL;
+   return true;
+}
+
+int64_t filestream_get_size(RFILE *stream)
+{
+   int64_t output;
+
+   if (filestream_size_cb)
+      output = filestream_size_cb(stream->hfile);
+   else
+      output = retro_vfs_file_size_impl(
+            (libretro_vfs_implementation_file*)stream->hfile);
+
+   if (output == VFS_ERROR_RETURN_VALUE)
+      stream->error_flag = true;
+
+   return output;
+}
+
+int64_t filestream_truncate(RFILE *stream, int64_t length)
+{
+   int64_t output;
+
+   if (filestream_truncate_cb)
+      output = filestream_truncate_cb(stream->hfile, length);
+   else
+      output = retro_vfs_file_truncate_impl(
+            (libretro_vfs_implementation_file*)stream->hfile, length);
+
+   if (output == VFS_ERROR_RETURN_VALUE)
+      stream->error_flag = true;
+
+   return output;
+}
+
+/**
+ * filestream_open:
+ * @path               : path to file
+ * @mode               : file mode to use when opening (read/write)
+ * @hints              :
+ *
+ * Opens a file for reading or writing, depending on the requested mode.
+ * Returns a pointer to an RFILE if opened successfully, otherwise NULL.
+ **/
+RFILE* filestream_open(const char *path, unsigned mode, unsigned hints)
+{
+   struct retro_vfs_file_handle  *fp = NULL;
+   RFILE* output                     = NULL;
+
+   if (filestream_open_cb)
+      fp = (struct retro_vfs_file_handle*)
+         filestream_open_cb(path, mode, hints);
+   else
+      fp = (struct retro_vfs_file_handle*)
+         retro_vfs_file_open_impl(path, mode, hints);
+
+   if (!fp)
+      return NULL;
+
+   output             = (RFILE*)malloc(sizeof(RFILE));
+   output->error_flag = false;
+   output->eof_flag   = false;
+   output->hfile      = fp;
+   return output;
+}
+
+char* filestream_gets(RFILE *stream, char *s, size_t len)
+{
+   int c   = 0;
+   char *p = s;
+   if (!stream)
+      return NULL;
+
+   /* get max bytes or up to a newline */
+
+   for (len--; len > 0; len--)
+   {
+      if ((c = filestream_getc(stream)) == EOF)
+         break;
+      *p++ = c;
+      if (c == '\n')
+         break;
+   }
+   *p = 0;
+
+   if (p == s && c == EOF)
+      return NULL;
+   return (s);
+}
+
+int filestream_getc(RFILE *stream)
+{
+   char c = 0;
+   if (stream && filestream_read(stream, &c, 1) == 1)
+      return (int)(unsigned char)c;
+   return EOF;
+}
+
+int filestream_vscanf(RFILE *stream, const char* format, va_list *args)
+{
+   char buf[4096];
+   char subfmt[64];
+   va_list args_copy;
+   const char * bufiter = buf;
+   int        ret       = 0;
+   int64_t startpos     = filestream_tell(stream);
+   int64_t maxlen       = filestream_read(stream, buf, sizeof(buf)-1);
+
+   if (maxlen <= 0)
+      return EOF;
+
+   buf[maxlen] = '\0';
+
+   /* Have to copy the input va_list here
+    * > Calling va_arg() on 'args' directly would
+    *   cause the va_list to have an indeterminate value
+    *   in the function calling filestream_vscanf(),
+    *   leading to unexpected behaviour */
+   va_copy(args_copy, *args);
+
+   while (*format)
+   {
+      if (*format == '%')
+      {
+         int sublen;
+         char* subfmtiter = subfmt;
+         bool asterisk    = false;
+
+         *subfmtiter++    = *format++; /* '%' */
+
+         /* %[*][width][length]specifier */
+
+         if (*format == '*')
+         {
+            asterisk      = true;
+            *subfmtiter++ = *format++;
+         }
+
+         while (ISDIGIT((unsigned char)*format))
+            *subfmtiter++ = *format++; /* width */
+
+         /* length */
+         if (*format == 'h' || *format == 'l')
+         {
+            if (format[1] == format[0])
+               *subfmtiter++ = *format++;
+            *subfmtiter++    = *format++;
+         }
+         else if (
+               *format == 'j' || 
+               *format == 'z' || 
+               *format == 't' || 
+               *format == 'L')
+         {
+            *subfmtiter++ = *format++;
+         }
+
+         /* specifier - always a single character (except ]) */
+         if (*format == '[')
+         {
+            while (*format != ']')
+               *subfmtiter++ = *format++;
+            *subfmtiter++    = *format++;
+         }
+         else
+            *subfmtiter++    = *format++;
+
+         *subfmtiter++       = '%';
+         *subfmtiter++       = 'n';
+         *subfmtiter++       = '\0';
+
+         if (sizeof(void*) != sizeof(long*))
+            abort(); /* all pointers must have the same size */
+
+         if (asterisk)
+         {
+            int v = sscanf(bufiter, subfmt, &sublen);
+            if (v == EOF)
+               return EOF;
+            if (v != 0)
+               break;
+         }
+         else
+         {
+            int v = sscanf(bufiter, subfmt, va_arg(args_copy, void*), &sublen);
+            if (v == EOF)
+               return EOF;
+            if (v != 1)
+               break;
+         }
+
+         ret++;
+         bufiter += sublen;
+      }
+      else if (isspace((unsigned char)*format))
+      {
+         while (isspace((unsigned char)*bufiter))
+            bufiter++;
+         format++;
+      }
+      else
+      {
+         if (*bufiter != *format)
+            break;
+         bufiter++;
+         format++;
+      }
+   }
+
+   va_end(args_copy);
+   filestream_seek(stream, startpos+(bufiter-buf),
+         RETRO_VFS_SEEK_POSITION_START);
+
+   return ret;
+}
+
+int filestream_scanf(RFILE *stream, const char* format, ...)
+{
+   int result;
+   va_list vl;
+   va_start(vl, format);
+   result = filestream_vscanf(stream, format, &vl);
+   va_end(vl);
+   return result;
+}
+
+int64_t filestream_seek(RFILE *stream, int64_t offset, int seek_position)
+{
+   int64_t output;
+
+   if (filestream_seek_cb)
+      output = filestream_seek_cb(stream->hfile, offset, seek_position);
+   else
+      output = retro_vfs_file_seek_impl(
+            (libretro_vfs_implementation_file*)stream->hfile,
+            offset, seek_position);
+
+   if (output == VFS_ERROR_RETURN_VALUE)
+      stream->error_flag = true;
+
+   stream->eof_flag      = false;
+
+   return output;
+}
+
+int filestream_eof(RFILE *stream)
+{
+   return stream->eof_flag;
+}
+
+int64_t filestream_tell(RFILE *stream)
+{
+   int64_t output;
+
+   if (filestream_size_cb)
+      output = filestream_tell_cb(stream->hfile);
+   else
+      output = retro_vfs_file_tell_impl(
+            (libretro_vfs_implementation_file*)stream->hfile);
+
+   if (output == VFS_ERROR_RETURN_VALUE)
+      stream->error_flag = true;
+
+   return output;
+}
+
+void filestream_rewind(RFILE *stream)
+{
+   if (!stream)
+      return;
+   filestream_seek(stream, 0L, RETRO_VFS_SEEK_POSITION_START);
+   stream->error_flag = false;
+   stream->eof_flag   = false;
+}
+
+int64_t filestream_read(RFILE *stream, void *s, int64_t len)
+{
+   int64_t output;
+
+   if (filestream_read_cb)
+      output = filestream_read_cb(stream->hfile, s, len);
+   else
+      output = retro_vfs_file_read_impl(
+            (libretro_vfs_implementation_file*)stream->hfile, s, len);
+
+   if (output == VFS_ERROR_RETURN_VALUE)
+      stream->error_flag = true;
+   if (output < len)
+      stream->eof_flag   = true;
+
+   return output;
+}
+
+int filestream_flush(RFILE *stream)
+{
+   int output;
+
+   if (filestream_flush_cb)
+      output = filestream_flush_cb(stream->hfile);
+   else
+      output = retro_vfs_file_flush_impl(
+            (libretro_vfs_implementation_file*)stream->hfile);
+
+   if (output == VFS_ERROR_RETURN_VALUE)
+      stream->error_flag = true;
+
+   return output;
+}
+
+int filestream_delete(const char *path)
+{
+   if (filestream_remove_cb)
+      return filestream_remove_cb(path);
+
+   return retro_vfs_file_remove_impl(path);
+}
+
+int filestream_rename(const char *old_path, const char *new_path)
+{
+   if (filestream_rename_cb)
+      return filestream_rename_cb(old_path, new_path);
+
+   return retro_vfs_file_rename_impl(old_path, new_path);
+}
+
+const char* filestream_get_path(RFILE *stream)
+{
+   if (filestream_get_path_cb)
+      return filestream_get_path_cb(stream->hfile);
+
+   return retro_vfs_file_get_path_impl(
+         (libretro_vfs_implementation_file*)stream->hfile);
+}
+
+int64_t filestream_write(RFILE *stream, const void *s, int64_t len)
+{
+   int64_t output;
+
+   if (filestream_write_cb)
+      output = filestream_write_cb(stream->hfile, s, len);
+   else
+      output = retro_vfs_file_write_impl(
+            (libretro_vfs_implementation_file*)stream->hfile, s, len);
+
+   if (output == VFS_ERROR_RETURN_VALUE)
+      stream->error_flag = true;
+
+   return output;
+}
+
+int filestream_putc(RFILE *stream, int c)
+{
+   char c_char = (char)c;
+   if (!stream)
+      return EOF;
+   return filestream_write(stream, &c_char, 1) == 1 
+      ? (int)(unsigned char)c 
+      : EOF;
+}
+
+int filestream_vprintf(RFILE *stream, const char* format, va_list args)
+{
+   static char buffer[8 * 1024];
+   int64_t num_chars = vsnprintf(buffer, sizeof(buffer),
+         format, args);
+
+   if (num_chars < 0)
+      return -1;
+   else if (num_chars == 0)
+      return 0;
+
+   return (int)filestream_write(stream, buffer, num_chars);
+}
+
+int filestream_printf(RFILE *stream, const char* format, ...)
+{
+   va_list vl;
+   int result;
+   va_start(vl, format);
+   result = filestream_vprintf(stream, format, vl);
+   va_end(vl);
+   return result;
+}
+
+int filestream_error(RFILE *stream)
+{
+   if (stream && stream->error_flag)
+      return 1;
+   return 0;
+}
+
+int filestream_close(RFILE *stream)
+{
+   int output;
+   struct retro_vfs_file_handle* fp = stream->hfile;
+
+   if (filestream_close_cb)
+      output = filestream_close_cb(fp);
+   else
+      output = retro_vfs_file_close_impl(
+            (libretro_vfs_implementation_file*)fp);
+
+   if (output == 0)
+      free(stream);
+
+   return output;
+}
+
+/**
+ * filestream_read_file:
+ * @path             : path to file.
+ * @buf              : buffer to allocate and read the contents of the
+ *                     file into. Needs to be freed manually.
+ * @len              : optional output integer containing bytes read.
+ *
+ * Read the contents of a file into @buf.
+ *
+ * Returns: non zero on success.
+ */
+int64_t filestream_read_file(const char *path, void **buf, int64_t *len)
+{
+   int64_t ret              = 0;
+   int64_t content_buf_size = 0;
+   void *content_buf        = NULL;
+   RFILE *file              = filestream_open(path,
+         RETRO_VFS_FILE_ACCESS_READ,
+         RETRO_VFS_FILE_ACCESS_HINT_NONE);
+
+   if (!file)
+   {
+      *buf = NULL;
+      return 0;
+   }
+
+   content_buf_size = filestream_get_size(file);
+
+   if (content_buf_size < 0)
+      goto error;
+
+   content_buf      = malloc((size_t)(content_buf_size + 1));
+
+   if (!content_buf)
+      goto error;
+   if ((int64_t)(uint64_t)(content_buf_size + 1) != (content_buf_size + 1))
+      goto error;
+
+   ret = filestream_read(file, content_buf, (int64_t)content_buf_size);
+   if (ret < 0)
+      goto error;
+
+   if (filestream_close(file) != 0)
+      if (file)
+         free(file);
+
+   *buf    = content_buf;
+
+   /* Allow for easy reading of strings to be safe.
+    * Will only work with sane character formatting (Unix). */
+   ((char*)content_buf)[ret] = '\0';
+
+   if (len)
+      *len = ret;
+
+   return 1;
+
+error:
+   if (file)
+      if (filestream_close(file) != 0)
+         free(file);
+   if (content_buf)
+      free(content_buf);
+   if (len)
+      *len = -1;
+   *buf = NULL;
+   return 0;
+}
+
+/**
+ * filestream_write_file:
+ * @path             : path to file.
+ * @data             : contents to write to the file.
+ * @size             : size of the contents.
+ *
+ * Writes data to a file.
+ *
+ * Returns: true (1) on success, false (0) otherwise.
+ */
+bool filestream_write_file(const char *path, const void *data, int64_t size)
+{
+   int64_t ret   = 0;
+   RFILE *file   = filestream_open(path,
+         RETRO_VFS_FILE_ACCESS_WRITE,
+         RETRO_VFS_FILE_ACCESS_HINT_NONE);
+   if (!file)
+      return false;
+
+   ret = filestream_write(file, data, size);
+   if (filestream_close(file) != 0)
+      if (file)
+         free(file);
+
+   if (ret != size)
+      return false;
+
+   return true;
+}
+
+/* Returned pointer must be freed by the caller. */
+char* filestream_getline(RFILE *stream)
+{
+   char *newline_tmp  = NULL;
+   size_t cur_size    = 8;
+   size_t idx         = 0;
+   int in             = 0;
+   char *newline      = (char*)malloc(9);
+
+   if (!stream || !newline)
+   {
+      if (newline)
+         free(newline);
+      return NULL;
+   }
+
+   in                 = filestream_getc(stream);
+
+   while (in != EOF && in != '\n')
+   {
+      if (idx == cur_size)
+      {
+         cur_size    *= 2;
+         newline_tmp  = (char*)realloc(newline, cur_size + 1);
+
+         if (!newline_tmp)
+         {
+            free(newline);
+            return NULL;
+         }
+
+         newline     = newline_tmp;
+      }
+
+      newline[idx++] = in;
+      in             = filestream_getc(stream);
+   }
+
+   newline[idx]      = '\0';
+   return newline;
+}
+
+libretro_vfs_implementation_file* filestream_get_vfs_handle(RFILE *stream)
+{
+   return (libretro_vfs_implementation_file*)stream->hfile;
+}
diff --git a/src/drivers/libretro/libretro-common/streams/file_stream_transforms.c b/src/drivers/libretro/libretro-common/streams/file_stream_transforms.c
new file mode 100644
index 0000000..cc6965f
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/streams/file_stream_transforms.c
@@ -0,0 +1,159 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+*
+* ---------------------------------------------------------------------------------------
+* The following license statement only applies to this file (file_stream_transforms.c).
+* ---------------------------------------------------------------------------------------
+*
+* Permission is hereby granted, free of charge,
+* to any person obtaining a copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation the rights to
+* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+* and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <string.h>
+#include <stdarg.h>
+
+#include <libretro.h>
+#include <streams/file_stream.h>
+
+RFILE* rfopen(const char *path, const char *mode)
+{
+   RFILE          *output  = NULL;
+   unsigned int retro_mode = RETRO_VFS_FILE_ACCESS_READ;
+   bool position_to_end    = false;
+
+   if (strstr(mode, "r"))
+   {
+      retro_mode = RETRO_VFS_FILE_ACCESS_READ;
+      if (strstr(mode, "+"))
+      {
+         retro_mode = RETRO_VFS_FILE_ACCESS_READ_WRITE |
+            RETRO_VFS_FILE_ACCESS_UPDATE_EXISTING;
+      }
+   }
+   else if (strstr(mode, "w"))
+   {
+      retro_mode = RETRO_VFS_FILE_ACCESS_WRITE;
+      if (strstr(mode, "+"))
+         retro_mode = RETRO_VFS_FILE_ACCESS_READ_WRITE;
+   }
+   else if (strstr(mode, "a"))
+   {
+      retro_mode = RETRO_VFS_FILE_ACCESS_WRITE |
+         RETRO_VFS_FILE_ACCESS_UPDATE_EXISTING;
+      position_to_end = true;
+      if (strstr(mode, "+"))
+      {
+         retro_mode = RETRO_VFS_FILE_ACCESS_READ_WRITE |
+            RETRO_VFS_FILE_ACCESS_UPDATE_EXISTING;
+      }
+   }
+
+   output = filestream_open(path, retro_mode,
+         RETRO_VFS_FILE_ACCESS_HINT_NONE);
+   if (output && position_to_end)
+      filestream_seek(output, 0, RETRO_VFS_SEEK_POSITION_END);
+
+   return output;
+}
+
+int rfclose(RFILE* stream)
+{
+   return filestream_close(stream);
+}
+
+int64_t rftell(RFILE* stream)
+{
+   return filestream_tell(stream);
+}
+
+int64_t rfseek(RFILE* stream, int64_t offset, int origin)
+{
+   int seek_position = -1;
+   switch (origin)
+   {
+      case SEEK_SET:
+         seek_position = RETRO_VFS_SEEK_POSITION_START;
+         break;
+      case SEEK_CUR:
+         seek_position = RETRO_VFS_SEEK_POSITION_CURRENT;
+         break;
+      case SEEK_END:
+         seek_position = RETRO_VFS_SEEK_POSITION_END;
+         break;
+   }
+
+   return filestream_seek(stream, offset, seek_position);
+}
+
+int64_t rfread(void* buffer,
+   size_t elem_size, size_t elem_count, RFILE* stream)
+{
+   return (filestream_read(stream, buffer, elem_size * elem_count) / elem_size);
+}
+
+char *rfgets(char *buffer, int maxCount, RFILE* stream)
+{
+   return filestream_gets(stream, buffer, maxCount);
+}
+
+int rfgetc(RFILE* stream)
+{
+   return filestream_getc(stream);
+}
+
+int64_t rfwrite(void const* buffer,
+   size_t elem_size, size_t elem_count, RFILE* stream)
+{
+   return filestream_write(stream, buffer, elem_size * elem_count);
+}
+
+int rfputc(int character, RFILE * stream)
+{
+    return filestream_putc(stream, character);
+}
+
+int64_t rfflush(RFILE * stream)
+{
+    return filestream_flush(stream);
+}
+
+int rfprintf(RFILE * stream, const char * format, ...)
+{
+   int result;
+   va_list vl;
+   va_start(vl, format);
+   result = filestream_vprintf(stream, format, vl);
+   va_end(vl);
+   return result;
+}
+
+int rferror(RFILE* stream)
+{
+   return filestream_error(stream);
+}
+
+int rfeof(RFILE* stream)
+{
+   return filestream_eof(stream);
+}
+
+int rfscanf(RFILE * stream, const char * format, ...)
+{
+   int result;
+   va_list vl;
+   va_start(vl, format);
+   result = filestream_vscanf(stream, format, &vl);
+   va_end(vl);
+   return result;
+}
diff --git a/src/drivers/libretro/libretro-common/string/stdstring.c b/src/drivers/libretro/libretro-common/string/stdstring.c
index 67ee7fc..d637988 100644
--- a/src/drivers/libretro/libretro-common/string/stdstring.c
+++ b/src/drivers/libretro/libretro-common/string/stdstring.c
@@ -187,88 +187,207 @@ char *string_trim_whitespace(char *const s)
    return s;
 }
 
-char *word_wrap(char* buffer, const char *string, int line_width, bool unicode, unsigned max_lines)
+void word_wrap(char *dst, size_t dst_size, const char *src, int line_width, int wideglyph_width, unsigned max_lines)
 {
-   unsigned i     = 0;
-   unsigned len   = (unsigned)strlen(string);
-   unsigned lines = 1;
+   char *lastspace     = NULL;
+   unsigned counter    = 0;
+   unsigned lines      = 1;
+   size_t src_len      = strlen(src);
+   const char *src_end = src + src_len;
 
-   while (i < len)
+   /* Prevent buffer overflow */
+   if (dst_size < src_len + 1)
+      return;
+
+   /* Early return if src string length is less
+    * than line width */
+   if (src_len < line_width)
    {
-      unsigned counter;
-      int pos = (int)(&buffer[i] - buffer);
+      strcpy(dst, src);
+      return;
+   }
 
-      /* copy string until the end of the line is reached */
-      for (counter = 1; counter <= (unsigned)line_width; counter++)
+   while (*src != '\0')
+   {
+      unsigned char_len;
+
+      char_len = (unsigned)(utf8skip(src, 1) - src);
+      counter++;
+
+      if (*src == ' ')
+         lastspace = dst; /* Remember the location of the whitespace */
+      else if (*src == '\n')
       {
-         const char *character;
-         unsigned char_len;
-         unsigned j = i;
+         /* If newlines embedded in the input,
+          * reset the index */
+         lines++;
+         counter = 0;
 
-         /* check if end of string reached */
-         if (i == len)
+         /* Early return if remaining src string
+          * length is less than line width */
+         if (src_end - src <= line_width)
          {
-            buffer[i] = 0;
-            return buffer;
+            strcpy(dst, src);
+            return;
          }
+     }
 
-         character = utf8skip(&string[i], 1);
-         char_len  = (unsigned)(character - &string[i]);
+      while (char_len--)
+         *dst++ = *src++;
 
-         if (!unicode)
-            counter += char_len - 1;
-
-         do
-         {
-            buffer[i] = string[i];
-            char_len--;
-            i++;
-         } while (char_len);
-
-         /* check for newlines embedded in the original input
-          * and reset the index */
-         if (buffer[j] == '\n')
-         {
-            lines++;
-            counter = 1;
-         }
-      }
-
-      /* check for whitespace */
-      if (string[i] == ' ')
+      if (counter >= (unsigned)line_width)
       {
-         if ((max_lines == 0 || lines < max_lines))
+         counter = 0;
+
+         if (lastspace && (max_lines == 0 || lines < max_lines))
          {
-            buffer[i] = '\n';
-            i++;
+            /* Replace nearest (previous) whitespace
+             * with newline character */
+            *lastspace = '\n';
             lines++;
+
+            src -= dst - lastspace - 1;
+            dst = lastspace + 1;
+            lastspace  = NULL;
+
+            /* Early return if remaining src string
+             * length is less than line width */
+            if (src_end - src < line_width)
+            {
+               strcpy(dst, src);
+               return;
+            }
          }
       }
-      else
-      {
-         int k;
-
-         /* check for nearest whitespace back in string */
-         for (k = i; k > 0; k--)
-         {
-            if (string[k] != ' ' || (max_lines != 0 && lines >= max_lines))
-               continue;
-
-            buffer[k] = '\n';
-            /* set string index back to character after this one */
-            i         = k + 1;
-            lines++;
-            break;
-         }
-
-         if (&buffer[i] - buffer == pos)
-            return buffer;
-      }
    }
 
-   buffer[i] = 0;
+   *dst = '\0';
+}
 
-   return buffer;
+void word_wrap_wideglyph(char *dst, size_t dst_size, const char *src, int line_width, int wideglyph_width, unsigned max_lines)
+{
+   char *lastspace                   = NULL;
+   char *lastwideglyph               = NULL;
+   const char *src_end               = src + strlen(src);
+   unsigned lines                    = 1;
+   /* 'line_width' means max numbers of characters per line,
+    * but this metric is only meaningful when dealing with
+    * 'regular' glyphs that have an on-screen pixel width
+    * similar to that of regular Latin characters.
+    * When handing so-called 'wide' Unicode glyphs, it is
+    * necessary to consider the actual on-screen pixel width
+    * of each character.
+    * In order to do this, we create a distinction between
+    * regular Latin 'non-wide' glyphs and 'wide' glyphs, and
+    * normalise all values relative to the on-screen pixel
+    * width of regular Latin characters:
+    * - Regular 'non-wide' glyphs have a normalised width of 100
+    * - 'line_width' is therefore normalised to 100 * (width_in_characters)
+    * - 'wide' glyphs have a normalised width of
+    *   100 * (wide_character_pixel_width / latin_character_pixel_width)
+    * - When a character is detected, the position in the current
+    *   line is incremented by the regular normalised width of 100
+    * - If that character is then determined to be a 'wide'
+    *   glyph, the position in the current line is further incremented
+    *   by the difference between the normalised 'wide' and 'non-wide'
+    *   width values */
+   unsigned counter_normalized       = 0;
+   int line_width_normalized         = line_width * 100;
+   int additional_counter_normalized = wideglyph_width - 100;
+ 
+   /* Early return if src string length is less
+    * than line width */
+   if (src_end - src < line_width)
+   {
+      strlcpy(dst, src, dst_size);
+      return;
+   }
+
+   while (*src != '\0')
+   {
+      unsigned char_len;
+
+      char_len = (unsigned)(utf8skip(src, 1) - src);
+      counter_normalized += 100;
+
+      /* Prevent buffer overflow */
+      if (char_len >= dst_size)
+         break;
+
+      if (*src == ' ')
+         lastspace = dst; /* Remember the location of the whitespace */
+      else if (*src == '\n')
+      {
+         /* If newlines embedded in the input,
+          * reset the index */
+         lines++;
+         counter_normalized = 0;
+
+         /* Early return if remaining src string
+          * length is less than line width */
+         if (src_end - src <= line_width)
+         {
+            strlcpy(dst, src, dst_size);
+            return;
+         }
+      }
+      else if (char_len >= 3)
+      {
+         /* Remember the location of the first byte
+          * whose length as UTF-8 >= 3*/
+         lastwideglyph = dst;
+         counter_normalized += additional_counter_normalized;
+      }
+
+      dst_size -= char_len;
+      while (char_len--)
+         *dst++ = *src++;
+
+      if (counter_normalized >= (unsigned)line_width_normalized)
+      {
+         counter_normalized = 0;
+
+         if (max_lines != 0 && lines >= max_lines)
+            continue;
+         else if (lastwideglyph && (!lastspace || lastwideglyph > lastspace))
+         {
+            /* Insert newline character */
+            *lastwideglyph = '\n';
+            lines++;
+            src -= dst - lastwideglyph;
+            dst = lastwideglyph + 1;
+            lastwideglyph = NULL;
+
+            /* Early return if remaining src string
+             * length is less than line width */
+            if (src_end - src <= line_width)
+            {
+               strlcpy(dst, src, dst_size);
+               return;
+            }
+         }
+         else if (lastspace)
+         {
+            /* Replace nearest (previous) whitespace
+             * with newline character */
+            *lastspace = '\n';
+            lines++;
+            src -= dst - lastspace - 1;
+            dst = lastspace + 1;
+            lastspace = NULL;
+
+            /* Early return if remaining src string
+             * length is less than line width */
+            if (src_end - src < line_width)
+            {
+               strlcpy(dst, src, dst_size);
+               return;
+            }
+         }
+      }
+   }
+
+   *dst = '\0';
 }
 
 /* Splits string into tokens seperated by 'delim'
diff --git a/src/drivers/libretro/libretro-common/time/rtime.c b/src/drivers/libretro/libretro-common/time/rtime.c
new file mode 100644
index 0000000..d66c228
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/time/rtime.c
@@ -0,0 +1,81 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (rtime.c).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifdef HAVE_THREADS
+#include <rthreads/rthreads.h>
+#include <retro_assert.h>
+#include <stdlib.h>
+#endif
+
+#include <string.h>
+#include <time/rtime.h>
+
+#ifdef HAVE_THREADS
+/* TODO/FIXME - global */
+slock_t *rtime_localtime_lock = NULL;
+#endif
+
+/* Must be called before using rtime_localtime() */
+void rtime_init(void)
+{
+   rtime_deinit();
+#ifdef HAVE_THREADS
+   if (!rtime_localtime_lock)
+      rtime_localtime_lock = slock_new();
+
+   retro_assert(rtime_localtime_lock);
+#endif
+}
+
+/* Must be called upon program termination */
+void rtime_deinit(void)
+{
+#ifdef HAVE_THREADS
+   if (rtime_localtime_lock)
+   {
+      slock_free(rtime_localtime_lock);
+      rtime_localtime_lock = NULL;
+   }
+#endif
+}
+
+/* Thread-safe wrapper for localtime() */
+struct tm *rtime_localtime(const time_t *timep, struct tm *result)
+{
+   struct tm *time_info = NULL;
+
+   /* Lock mutex */
+#ifdef HAVE_THREADS
+   slock_lock(rtime_localtime_lock);
+#endif
+
+   time_info = localtime(timep);
+   if (time_info)
+      memcpy(result, time_info, sizeof(struct tm));
+
+   /* Unlock mutex */
+#ifdef HAVE_THREADS
+   slock_unlock(rtime_localtime_lock);
+#endif
+
+   return result;
+}
diff --git a/src/drivers/libretro/libretro-common/vfs/vfs_implementation.c b/src/drivers/libretro/libretro-common/vfs/vfs_implementation.c
new file mode 100644
index 0000000..7a24a95
--- /dev/null
+++ b/src/drivers/libretro/libretro-common/vfs/vfs_implementation.c
@@ -0,0 +1,1335 @@
+/* Copyright  (C) 2010-2020 The RetroArch team
+*
+* ---------------------------------------------------------------------------------------
+* The following license statement only applies to this file (vfs_implementation.c).
+* ---------------------------------------------------------------------------------------
+*
+* Permission is hereby granted, free of charge,
+* to any person obtaining a copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation the rights to
+* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+* and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/types.h>
+
+#include <string/stdstring.h>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#if defined(_WIN32)
+#  ifdef _MSC_VER
+#    define setmode _setmode
+#  endif
+#include <sys/stat.h>
+#  ifdef _XBOX
+#    include <xtl.h>
+#    define INVALID_FILE_ATTRIBUTES -1
+#  else
+
+#    include <fcntl.h>
+#    include <direct.h>
+#    include <windows.h>
+#  endif
+#    include <io.h>
+#else
+#  if defined(PSP)
+#    include <pspiofilemgr.h>
+#  endif
+#  include <sys/types.h>
+#  include <sys/stat.h>
+#  if !defined(VITA)
+#  include <dirent.h>
+#  endif
+#  include <unistd.h>
+#  if defined(ORBIS)
+#  include <sys/fcntl.h>
+#  include <sys/dirent.h>
+#  include <orbisFile.h>
+#  endif
+#  if defined(WIIU)
+#  include <malloc.h>
+#  endif
+#endif
+
+#include <fcntl.h>
+
+/* TODO: Some things are duplicated but I'm really afraid of breaking other platforms by touching this */
+#if defined(VITA)
+#  include <psp2/io/fcntl.h>
+#  include <psp2/io/dirent.h>
+#  include <psp2/io/stat.h>
+#elif defined(ORBIS)
+#  include <orbisFile.h>
+#  include <ps4link.h>
+#  include <sys/dirent.h>
+#  include <sys/fcntl.h>
+#elif !defined(_WIN32)
+#  if defined(PSP)
+#    include <pspiofilemgr.h>
+#  endif
+#  include <sys/types.h>
+#  include <sys/stat.h>
+#  include <dirent.h>
+#  include <unistd.h>
+#endif
+
+#if defined(__QNX__) || defined(PSP)
+#include <unistd.h> /* stat() is defined here */
+#endif
+
+#ifdef __APPLE__
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+#ifdef __HAIKU__
+#include <kernel/image.h>
+#endif
+#ifndef __MACH__
+#include <compat/strl.h>
+#include <compat/posix_string.h>
+#endif
+#include <compat/strcasestr.h>
+#include <retro_miscellaneous.h>
+#include <encodings/utf.h>
+
+#if defined(_WIN32)
+#ifndef _XBOX
+#if defined(_MSC_VER) && _MSC_VER <= 1200
+#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
+#endif
+#endif
+#elif defined(VITA)
+#define SCE_ERROR_ERRNO_EEXIST 0x80010011
+#include <psp2/io/fcntl.h>
+#include <psp2/io/dirent.h>
+#include <psp2/io/stat.h>
+#else
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#endif
+
+#if defined(ORBIS)
+#include <orbisFile.h>
+#include <sys/fcntl.h>
+#include <sys/dirent.h>
+#endif
+#if defined(PSP)
+#include <pspkernel.h>
+#endif
+
+#if defined(__PS3__) || defined(__PSL1GHT__)
+#include <defines/ps3_defines.h>
+#if defined(__PSL1GHT__)
+#include <lv2/sysfs.h>
+#endif
+#endif
+
+#if defined(VITA)
+#define FIO_S_ISDIR SCE_S_ISDIR
+#endif
+
+#if defined(__QNX__) || defined(PSP)
+#include <unistd.h> /* stat() is defined here */
+#endif
+
+/* Assume W-functions do not work below Win2K and Xbox platforms */
+#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500 || defined(_XBOX)
+
+#ifndef LEGACY_WIN32
+#define LEGACY_WIN32
+#endif
+
+#endif
+
+#if defined(_WIN32)
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+#define ATLEAST_VC2005
+#endif
+#endif
+
+#include <vfs/vfs_implementation.h>
+#include <libretro.h>
+#if defined(HAVE_MMAP)
+#include <memmap.h>
+#endif
+#include <encodings/utf.h>
+#include <compat/fopen_utf8.h>
+#include <file/file_path.h>
+
+#ifdef HAVE_CDROM
+#include <vfs/vfs_implementation_cdrom.h>
+#endif
+
+#if (defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE - 0) >= 200112) || (defined(__POSIX_VISIBLE) && __POSIX_VISIBLE >= 200112) || (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112) || __USE_LARGEFILE || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+#ifndef HAVE_64BIT_OFFSETS
+#define HAVE_64BIT_OFFSETS
+#endif
+#endif
+
+#define RFILE_HINT_UNBUFFERED (1 << 8)
+
+int64_t retro_vfs_file_seek_internal(
+      libretro_vfs_implementation_file *stream,
+      int64_t offset, int whence)
+{
+   if (!stream)
+      return -1;
+
+   if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0)
+   {
+#ifdef HAVE_CDROM
+      if (stream->scheme == VFS_SCHEME_CDROM)
+         return retro_vfs_file_seek_cdrom(stream, offset, whence);
+#endif
+#ifdef ATLEAST_VC2005
+      /* VC2005 and up have a special 64-bit fseek */
+      return _fseeki64(stream->fp, offset, whence);
+#elif defined(ORBIS)
+      {
+         int ret = orbisLseek(stream->fd, offset, whence);
+         if (ret < 0)
+            return -1;
+         return 0;
+      }
+#elif defined(HAVE_64BIT_OFFSETS)
+      return fseeko(stream->fp, (off_t)offset, whence);
+#else
+      return fseek(stream->fp, (long)offset, whence);
+#endif
+   }
+#ifdef HAVE_MMAP
+   /* Need to check stream->mapped because this function is
+    * called in filestream_open() */
+   if (stream->mapped && stream->hints &
+         RETRO_VFS_FILE_ACCESS_HINT_FREQUENT_ACCESS)
+   {
+      /* fseek() returns error on under/overflow but
+       * allows cursor > EOF for
+       read-only file descriptors. */
+      switch (whence)
+      {
+         case SEEK_SET:
+            if (offset < 0)
+               return -1;
+
+            stream->mappos = offset;
+            break;
+
+         case SEEK_CUR:
+            if (  (offset < 0 && stream->mappos + offset > stream->mappos) ||
+                  (offset > 0 && stream->mappos + offset < stream->mappos))
+               return -1;
+
+            stream->mappos += offset;
+            break;
+
+         case SEEK_END:
+            if (stream->mapsize + offset < stream->mapsize)
+               return -1;
+
+            stream->mappos = stream->mapsize + offset;
+            break;
+      }
+      return stream->mappos;
+   }
+#endif
+
+   if (lseek(stream->fd, (off_t)offset, whence) < 0)
+      return -1;
+
+   return 0;
+}
+
+/**
+ * retro_vfs_file_open_impl:
+ * @path               : path to file
+ * @mode               : file mode to use when opening (read/write)
+ * @hints              :
+ *
+ * Opens a file for reading or writing, depending on the requested mode.
+ * Returns a pointer to an RFILE if opened successfully, otherwise NULL.
+ **/
+
+libretro_vfs_implementation_file *retro_vfs_file_open_impl(
+      const char *path, unsigned mode, unsigned hints)
+{
+#if defined(VFS_FRONTEND) || defined(HAVE_CDROM)
+   int                             path_len = (int)strlen(path);
+#endif
+#ifdef VFS_FRONTEND
+   const char                 *dumb_prefix  = "vfsonly://";
+   size_t                   dumb_prefix_siz = STRLEN_CONST("vfsonly://");
+   int                      dumb_prefix_len = (int)dumb_prefix_siz;
+#endif
+#ifdef HAVE_CDROM
+   const char *cdrom_prefix                 = "cdrom://";
+   size_t cdrom_prefix_siz                  = STRLEN_CONST("cdrom://");
+   int cdrom_prefix_len                     = (int)cdrom_prefix_siz;
+#endif
+   int                                flags = 0;
+   const char                     *mode_str = NULL;
+   libretro_vfs_implementation_file *stream = 
+      (libretro_vfs_implementation_file*)
+      malloc(sizeof(*stream));
+
+   if (!stream)
+      return NULL;
+
+   stream->fd                     = 0;
+   stream->hints                  = hints;
+   stream->size                   = 0;
+   stream->buf                    = NULL;
+   stream->fp                     = NULL;
+#ifdef _WIN32
+   stream->fh                     = 0;
+#endif
+   stream->orig_path              = NULL;
+   stream->mappos                 = 0;
+   stream->mapsize                = 0;
+   stream->mapped                 = NULL;
+   stream->scheme                 = VFS_SCHEME_NONE;
+
+#ifdef VFS_FRONTEND
+   if (path_len >= dumb_prefix_len)
+      if (!memcmp(path, dumb_prefix, dumb_prefix_len))
+         path             += dumb_prefix_siz;
+#endif
+
+#ifdef HAVE_CDROM
+   stream->cdrom.cue_buf          = NULL;
+   stream->cdrom.cue_len          = 0;
+   stream->cdrom.byte_pos         = 0;
+   stream->cdrom.drive            = 0;
+   stream->cdrom.cur_min          = 0;
+   stream->cdrom.cur_sec          = 0;
+   stream->cdrom.cur_frame        = 0;
+   stream->cdrom.cur_track        = 0;
+   stream->cdrom.cur_lba          = 0;
+   stream->cdrom.last_frame_lba   = 0;
+   stream->cdrom.last_frame[0]    = '\0';
+   stream->cdrom.last_frame_valid = false;
+
+   if (path_len > cdrom_prefix_len)
+   {
+      if (!memcmp(path, cdrom_prefix, cdrom_prefix_len))
+      {
+         path             += cdrom_prefix_siz;
+         stream->scheme    = VFS_SCHEME_CDROM;
+      }
+   }
+#endif
+
+   stream->orig_path       = strdup(path);
+
+#ifdef HAVE_MMAP
+   if (stream->hints & RETRO_VFS_FILE_ACCESS_HINT_FREQUENT_ACCESS && mode == RETRO_VFS_FILE_ACCESS_READ)
+      stream->hints |= RFILE_HINT_UNBUFFERED;
+   else
+#endif
+      stream->hints &= ~RETRO_VFS_FILE_ACCESS_HINT_FREQUENT_ACCESS;
+
+   switch (mode)
+   {
+      case RETRO_VFS_FILE_ACCESS_READ:
+         mode_str = "rb";
+
+         flags    = O_RDONLY;
+#ifdef _WIN32
+         flags   |= O_BINARY;
+#endif
+         break;
+
+      case RETRO_VFS_FILE_ACCESS_WRITE:
+         mode_str = "wb";
+
+         flags    = O_WRONLY | O_CREAT | O_TRUNC;
+#if !defined(ORBIS)
+#if !defined(_WIN32)
+         flags   |= S_IRUSR | S_IWUSR;
+#else
+         flags   |= O_BINARY;
+#endif
+#endif
+         break;
+
+      case RETRO_VFS_FILE_ACCESS_READ_WRITE:
+         mode_str = "w+b";
+         flags    = O_RDWR | O_CREAT | O_TRUNC;
+#if !defined(ORBIS)
+#if !defined(_WIN32)
+         flags   |= S_IRUSR | S_IWUSR;
+#else
+         flags   |= O_BINARY;
+#endif
+#endif
+         break;
+
+      case RETRO_VFS_FILE_ACCESS_WRITE | RETRO_VFS_FILE_ACCESS_UPDATE_EXISTING:
+      case RETRO_VFS_FILE_ACCESS_READ_WRITE | RETRO_VFS_FILE_ACCESS_UPDATE_EXISTING:
+         mode_str = "r+b";
+
+         flags    = O_RDWR;
+#if !defined(ORBIS)
+#if !defined(_WIN32)
+         flags   |= S_IRUSR | S_IWUSR;
+#else
+         flags   |= O_BINARY;
+#endif
+#endif
+         break;
+
+      default:
+         goto error;
+   }
+
+   if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0)
+   {
+#ifdef ORBIS
+      int fd = orbisOpen(path, flags, 0644);
+      if (fd < 0)
+      {
+         stream->fd = -1;
+         goto error;
+      }
+      stream->fd    = fd;
+#else
+      FILE *fp;
+#ifdef HAVE_CDROM
+      if (stream->scheme == VFS_SCHEME_CDROM)
+      {
+         retro_vfs_file_open_cdrom(stream, path, mode, hints);
+#if defined(_WIN32) && !defined(_XBOX)
+         if (!stream->fh)
+            goto error;
+#else
+         if (!stream->fp)
+            goto error;
+#endif
+      }
+      else
+#endif
+      {
+         fp = (FILE*)fopen_utf8(path, mode_str);
+
+         if (!fp)
+            goto error;
+
+         stream->fp  = fp;
+      }
+      /* Regarding setvbuf:
+       *
+       * https://www.freebsd.org/cgi/man.cgi?query=setvbuf&apropos=0&sektion=0&manpath=FreeBSD+11.1-RELEASE&arch=default&format=html
+       *
+       * If the size argument is not zero but buf is NULL, 
+       * a buffer of the given size will be allocated immediately, and
+       * released on close. This is an extension to ANSI C.
+       *
+       * Since C89 does not support specifying a NULL buffer 
+       * with a non-zero size, we create and track our own buffer for it.
+       */
+      /* TODO: this is only useful for a few platforms, 
+       * find which and add ifdef */
+#if defined(_3DS)
+      if (stream->scheme != VFS_SCHEME_CDROM)
+      {
+         stream->buf = (char*)calloc(1, 0x10000);
+         if (stream->fp)
+            setvbuf(stream->fp, stream->buf, _IOFBF, 0x10000);
+      }
+#elif defined(WIIU)
+      if (stream->scheme != VFS_SCHEME_CDROM)
+      {
+         const int bufsize = 128*1024;
+         stream->buf = (char*)memalign(0x40, bufsize);
+         if (stream->fp)
+            setvbuf(stream->fp, stream->buf, _IOFBF, bufsize);
+      }
+#elif !defined(PSP)
+      if (stream->scheme != VFS_SCHEME_CDROM)
+      {
+         stream->buf = (char*)calloc(1, 0x4000);
+         if (stream->fp)
+            setvbuf(stream->fp, stream->buf, _IOFBF, 0x4000);
+      }
+#endif
+#endif
+   }
+   else
+   {
+#if defined(_WIN32) && !defined(_XBOX)
+#if defined(LEGACY_WIN32)
+      char *path_local    = utf8_to_local_string_alloc(path);
+      stream->fd          = open(path_local, flags, 0);
+      if (path_local)
+         free(path_local);
+#else
+      wchar_t * path_wide = utf8_to_utf16_string_alloc(path);
+      stream->fd          = _wopen(path_wide, flags, 0);
+      if (path_wide)
+         free(path_wide);
+#endif
+#else
+      stream->fd          = open(path, flags, 0);
+#endif
+
+      if (stream->fd == -1)
+         goto error;
+
+#ifdef HAVE_MMAP
+      if (stream->hints & RETRO_VFS_FILE_ACCESS_HINT_FREQUENT_ACCESS)
+      {
+         stream->mappos  = 0;
+         stream->mapped  = NULL;
+         stream->mapsize = retro_vfs_file_seek_internal(stream, 0, SEEK_END);
+
+         if (stream->mapsize == (uint64_t)-1)
+            goto error;
+
+         retro_vfs_file_seek_internal(stream, 0, SEEK_SET);
+
+         stream->mapped = (uint8_t*)mmap((void*)0,
+               stream->mapsize, PROT_READ,  MAP_SHARED, stream->fd, 0);
+
+         if (stream->mapped == MAP_FAILED)
+            stream->hints &= ~RETRO_VFS_FILE_ACCESS_HINT_FREQUENT_ACCESS;
+      }
+#endif
+   }
+#ifdef ORBIS
+   stream->size = orbisLseek(stream->fd, 0, SEEK_END);
+   orbisLseek(stream->fd, 0, SEEK_SET);
+#else
+#ifdef HAVE_CDROM
+   if (stream->scheme == VFS_SCHEME_CDROM)
+   {
+      retro_vfs_file_seek_cdrom(stream, 0, SEEK_SET);
+      retro_vfs_file_seek_cdrom(stream, 0, SEEK_END);
+
+      stream->size = retro_vfs_file_tell_impl(stream);
+
+      retro_vfs_file_seek_cdrom(stream, 0, SEEK_SET);
+   }
+   else
+#endif
+   {
+      retro_vfs_file_seek_internal(stream, 0, SEEK_SET);
+      retro_vfs_file_seek_internal(stream, 0, SEEK_END);
+
+      stream->size = retro_vfs_file_tell_impl(stream);
+
+      retro_vfs_file_seek_internal(stream, 0, SEEK_SET);
+   }
+#endif
+   return stream;
+
+error:
+   retro_vfs_file_close_impl(stream);
+   return NULL;
+}
+
+int retro_vfs_file_close_impl(libretro_vfs_implementation_file *stream)
+{
+   if (!stream)
+      return -1;
+
+#ifdef HAVE_CDROM
+   if (stream->scheme == VFS_SCHEME_CDROM)
+   {
+      retro_vfs_file_close_cdrom(stream);
+      goto end;
+   }
+#endif
+
+   if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0)
+   {
+      if (stream->fp)
+         fclose(stream->fp);
+   }
+   else
+   {
+#ifdef HAVE_MMAP
+      if (stream->hints & RETRO_VFS_FILE_ACCESS_HINT_FREQUENT_ACCESS)
+         munmap(stream->mapped, stream->mapsize);
+#endif
+   }
+
+   if (stream->fd > 0)
+   {
+#ifdef ORBIS
+      orbisClose(stream->fd);
+      stream->fd = -1;
+#else
+      close(stream->fd);
+#endif
+   }
+#ifdef HAVE_CDROM
+end:
+   if (stream->cdrom.cue_buf)
+      free(stream->cdrom.cue_buf);
+#endif
+   if (stream->buf)
+      free(stream->buf);
+
+   if (stream->orig_path)
+      free(stream->orig_path);
+
+   free(stream);
+
+   return 0;
+}
+
+int retro_vfs_file_error_impl(libretro_vfs_implementation_file *stream)
+{
+#ifdef HAVE_CDROM
+   if (stream->scheme == VFS_SCHEME_CDROM)
+      return retro_vfs_file_error_cdrom(stream);
+#endif
+#ifdef ORBIS
+   /* TODO/FIXME - implement this? */
+   return 0;
+#else
+   return ferror(stream->fp);
+#endif
+}
+
+int64_t retro_vfs_file_size_impl(libretro_vfs_implementation_file *stream)
+{
+   if (stream)
+      return stream->size;
+   return 0;
+}
+
+int64_t retro_vfs_file_truncate_impl(libretro_vfs_implementation_file *stream, int64_t length)
+{
+   if (!stream)
+      return -1;
+
+#ifdef _WIN32
+   if (_chsize(_fileno(stream->fp), length) != 0)
+      return -1;
+#elif !defined(VITA) && !defined(PSP) && !defined(PS2) && !defined(ORBIS) && (!defined(SWITCH) || defined(HAVE_LIBNX))
+   if (ftruncate(fileno(stream->fp), (off_t)length) != 0)
+      return -1;
+#endif
+
+   return 0;
+}
+
+int64_t retro_vfs_file_tell_impl(libretro_vfs_implementation_file *stream)
+{
+   if (!stream)
+      return -1;
+
+   if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0)
+   {
+#ifdef HAVE_CDROM
+      if (stream->scheme == VFS_SCHEME_CDROM)
+         return retro_vfs_file_tell_cdrom(stream);
+#endif
+#ifdef ORBIS
+      {
+         int64_t ret = orbisLseek(stream->fd, 0, SEEK_CUR);
+         if (ret < 0)
+            return -1;
+         return ret;
+      }
+#else
+#ifdef ATLEAST_VC2005
+      /* VC2005 and up have a special 64-bit ftell */
+      return _ftelli64(stream->fp);
+#elif defined(HAVE_64BIT_OFFSETS)
+      return ftello(stream->fp);
+#else
+      return ftell(stream->fp);
+#endif
+#endif
+   }
+#ifdef HAVE_MMAP
+   /* Need to check stream->mapped because this function
+    * is called in filestream_open() */
+   if (stream->mapped && stream->hints & 
+         RETRO_VFS_FILE_ACCESS_HINT_FREQUENT_ACCESS)
+      return stream->mappos;
+#endif
+   if (lseek(stream->fd, 0, SEEK_CUR) < 0)
+      return -1;
+
+   return 0;
+}
+
+int64_t retro_vfs_file_seek_impl(libretro_vfs_implementation_file *stream,
+      int64_t offset, int seek_position)
+{
+   int whence = -1;
+   switch (seek_position)
+   {
+      case RETRO_VFS_SEEK_POSITION_START:
+         whence = SEEK_SET;
+         break;
+      case RETRO_VFS_SEEK_POSITION_CURRENT:
+         whence = SEEK_CUR;
+         break;
+      case RETRO_VFS_SEEK_POSITION_END:
+         whence = SEEK_END;
+         break;
+   }
+
+   return retro_vfs_file_seek_internal(stream, offset, whence);
+}
+
+int64_t retro_vfs_file_read_impl(libretro_vfs_implementation_file *stream,
+      void *s, uint64_t len)
+{
+   if (!stream || !s)
+      return -1;
+
+   if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0)
+   {
+#ifdef HAVE_CDROM
+      if (stream->scheme == VFS_SCHEME_CDROM)
+         return retro_vfs_file_read_cdrom(stream, s, len);
+#endif
+#ifdef ORBIS
+      if (orbisRead(stream->fd, s, (size_t)len) < 0)
+         return -1;
+      return 0;
+#else
+      return fread(s, 1, (size_t)len, stream->fp);
+#endif
+   }
+#ifdef HAVE_MMAP
+   if (stream->hints & RETRO_VFS_FILE_ACCESS_HINT_FREQUENT_ACCESS)
+   {
+      if (stream->mappos > stream->mapsize)
+         return -1;
+
+      if (stream->mappos + len > stream->mapsize)
+         len = stream->mapsize - stream->mappos;
+
+      memcpy(s, &stream->mapped[stream->mappos], len);
+      stream->mappos += len;
+
+      return len;
+   }
+#endif
+
+   return read(stream->fd, s, (size_t)len);
+}
+
+int64_t retro_vfs_file_write_impl(libretro_vfs_implementation_file *stream, const void *s, uint64_t len)
+{
+   if (!stream)
+      return -1;
+
+   if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0)
+   {
+#ifdef ORBIS
+      if (orbisWrite(stream->fd, s, (size_t)len) < 0)
+         return -1;
+      return 0;
+#else
+      return fwrite(s, 1, (size_t)len, stream->fp);
+#endif
+   }
+
+#ifdef HAVE_MMAP
+   if (stream->hints & RETRO_VFS_FILE_ACCESS_HINT_FREQUENT_ACCESS)
+      return -1;
+#endif
+   return write(stream->fd, s, (size_t)len);
+}
+
+int retro_vfs_file_flush_impl(libretro_vfs_implementation_file *stream)
+{
+   if (!stream)
+      return -1;
+#ifdef ORBIS
+   return 0;
+#else
+   return fflush(stream->fp) == 0 ? 0 : -1;
+#endif
+}
+
+int retro_vfs_file_remove_impl(const char *path)
+{
+#if defined(_WIN32) && !defined(_XBOX)
+   /* Win32 (no Xbox) */
+
+#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500
+   char *path_local    = NULL;
+#else
+   wchar_t *path_wide  = NULL;
+#endif
+   if (!path || !*path)
+      return -1;
+#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500
+   path_local = utf8_to_local_string_alloc(path);
+
+   if (path_local)
+   {
+      int ret = remove(path_local);
+      free(path_local);
+
+      if (ret == 0)
+         return 0;
+   }
+#else
+   path_wide = utf8_to_utf16_string_alloc(path);
+
+   if (path_wide)
+   {
+      int ret = _wremove(path_wide);
+      free(path_wide);
+
+      if (ret == 0)
+         return 0;
+   }
+#endif
+   return -1;
+#elif defined(ORBIS)
+   /* Orbis
+    * TODO/FIXME - stub for now */
+   return 0;
+#else
+   if (remove(path) == 0)
+      return 0;
+   return -1;
+#endif
+}
+
+int retro_vfs_file_rename_impl(const char *old_path, const char *new_path)
+{
+#if defined(_WIN32) && !defined(_XBOX)
+   /* Win32 (no Xbox) */
+   int ret                 = -1;
+#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500
+   char *old_path_local    = NULL;
+#else
+   wchar_t *old_path_wide  = NULL;
+#endif
+
+   if (!old_path || !*old_path || !new_path || !*new_path)
+      return -1;
+
+#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500
+   old_path_local = utf8_to_local_string_alloc(old_path);
+
+   if (old_path_local)
+   {
+      char *new_path_local = utf8_to_local_string_alloc(new_path);
+
+      if (new_path_local)
+      {
+         if (rename(old_path_local, new_path_local) == 0)
+            ret = 0;
+         free(new_path_local);
+      }
+
+      free(old_path_local);
+   }
+#else
+   old_path_wide = utf8_to_utf16_string_alloc(old_path);
+
+   if (old_path_wide)
+   {
+      wchar_t *new_path_wide = utf8_to_utf16_string_alloc(new_path);
+
+      if (new_path_wide)
+      {
+         if (_wrename(old_path_wide, new_path_wide) == 0)
+            ret = 0;
+         free(new_path_wide);
+      }
+
+      free(old_path_wide);
+   }
+#endif
+   return ret;
+
+#elif defined(ORBIS)
+   /* Orbis */
+   /* TODO/FIXME - Stub for now */
+   if (!old_path || !*old_path || !new_path || !*new_path)
+      return -1;
+   return 0;
+
+#else
+   /* Every other platform */
+   if (!old_path || !*old_path || !new_path || !*new_path)
+      return -1;
+   return rename(old_path, new_path) == 0 ? 0 : -1;
+#endif
+}
+
+const char *retro_vfs_file_get_path_impl(
+      libretro_vfs_implementation_file *stream)
+{
+   /* should never happen, do something noisy so caller can be fixed */
+   if (!stream)
+      abort();
+   return stream->orig_path;
+}
+
+int retro_vfs_stat_impl(const char *path, int32_t *size)
+{
+   bool is_dir               = false;
+   bool is_character_special = false;
+#if defined(VITA) || defined(PSP)
+   /* Vita / PSP */
+   SceIoStat buf;
+   int dir_ret;
+   char *tmp                 = NULL;
+   size_t len                = 0;
+
+   if (!path || !*path)
+      return 0;
+
+   tmp                       = strdup(path);
+   len                       = strlen(tmp);
+   if (tmp[len-1] == '/')
+      tmp[len-1] = '\0';
+
+   dir_ret                   = sceIoGetstat(tmp, &buf);
+   free(tmp);
+   if (dir_ret < 0)
+      return 0;
+
+   if (size)
+      *size                  = (int32_t)buf.st_size;
+
+   is_dir                    = FIO_S_ISDIR(buf.st_mode);
+#elif defined(ORBIS)
+   /* Orbis */
+   int dir_ret               = 0;
+
+   if (!path || !*path)
+      return 0;
+
+   if (size)
+      *size                  = (int32_t)buf.st_size;
+
+   dir_ret                   = orbisDopen(path);
+   is_dir                    = dir_ret > 0;
+   orbisDclose(dir_ret);
+
+   is_character_special      = S_ISCHR(buf.st_mode);
+#elif defined(__PSL1GHT__) || defined(__PS3__)
+   /* Lowlevel Lv2 */
+   sysFSStat buf;
+
+   if (!path || !*path)
+      return 0;
+   if (sysFsStat(path, &buf) < 0)
+      return 0;
+
+   if (size)
+      *size                  = (int32_t)buf.st_size;
+
+   is_dir                    = ((buf.st_mode & S_IFMT) == S_IFDIR);
+#elif defined(_WIN32)
+   /* Windows */
+   DWORD file_info;
+   struct _stat buf;
+#if defined(LEGACY_WIN32)
+   char *path_local          = NULL;
+#else
+   wchar_t *path_wide        = NULL;
+#endif
+
+   if (!path || !*path)
+      return 0;
+
+#if defined(LEGACY_WIN32)
+   path_local                = utf8_to_local_string_alloc(path);
+   file_info                 = GetFileAttributes(path_local);
+
+   if (!string_is_empty(path_local))
+      _stat(path_local, &buf);
+
+   if (path_local)
+      free(path_local);
+#else
+   path_wide                 = utf8_to_utf16_string_alloc(path);
+   file_info                 = GetFileAttributesW(path_wide);
+
+   _wstat(path_wide, &buf);
+
+   if (path_wide)
+      free(path_wide);
+#endif
+
+   if (file_info == INVALID_FILE_ATTRIBUTES)
+      return 0;
+
+   if (size)
+      *size = (int32_t)buf.st_size;
+
+   is_dir = (file_info & FILE_ATTRIBUTE_DIRECTORY);
+
+#elif defined(GEKKO)
+   /* On GEKKO platforms, paths cannot have
+    * trailing slashes - we must therefore
+    * remove them */
+   char *path_buf = NULL;
+   int stat_ret   = -1;
+   struct stat stat_buf;
+   size_t len;
+
+   if (string_is_empty(path))
+      return 0;
+
+   path_buf = strdup(path);
+   if (!path_buf)
+      return 0;
+
+   len = strlen(path_buf);
+   if (len > 0)
+      if (path_buf[len - 1] == '/')
+         path_buf[len - 1] = '\0';
+
+   stat_ret = stat(path_buf, &stat_buf);
+   free(path_buf);
+
+   if (stat_ret < 0)
+      return 0;
+
+   if (size)
+      *size             = (int32_t)stat_buf.st_size;
+
+   is_dir               = S_ISDIR(stat_buf.st_mode);
+   is_character_special = S_ISCHR(stat_buf.st_mode);
+
+#else
+   /* Every other platform */
+   struct stat buf;
+
+   if (!path || !*path)
+      return 0;
+   if (stat(path, &buf) < 0)
+      return 0;
+
+   if (size)
+      *size             = (int32_t)buf.st_size;
+
+   is_dir               = S_ISDIR(buf.st_mode);
+   is_character_special = S_ISCHR(buf.st_mode);
+#endif
+   return RETRO_VFS_STAT_IS_VALID | (is_dir ? RETRO_VFS_STAT_IS_DIRECTORY : 0) | (is_character_special ? RETRO_VFS_STAT_IS_CHARACTER_SPECIAL : 0);
+}
+
+#if defined(VITA)
+#define path_mkdir_error(ret) (((ret) == SCE_ERROR_ERRNO_EEXIST))
+#elif defined(PSP) || defined(PS2) || defined(_3DS) || defined(WIIU) || defined(SWITCH) || defined(ORBIS)
+#define path_mkdir_error(ret) ((ret) == -1)
+#else
+#define path_mkdir_error(ret) ((ret) < 0 && errno == EEXIST)
+#endif
+
+int retro_vfs_mkdir_impl(const char *dir)
+{
+#if defined(_WIN32)
+#ifdef LEGACY_WIN32
+   int ret        = _mkdir(dir);
+#else
+   wchar_t *dir_w = utf8_to_utf16_string_alloc(dir);
+   int       ret  = -1;
+
+   if (dir_w)
+   {
+      ret = _wmkdir(dir_w);
+      free(dir_w);
+   }
+#endif
+#elif defined(IOS)
+   int ret = mkdir(dir, 0755);
+#elif defined(VITA) || defined(PSP)
+   int ret = sceIoMkdir(dir, 0777);
+#elif defined(ORBIS)
+   int ret = orbisMkdir(dir, 0755);
+#elif defined(__QNX__)
+   int ret = mkdir(dir, 0777);
+#elif defined(GEKKO)
+   /* On GEKKO platforms, mkdir() fails if
+    * the path has a trailing slash. We must
+    * therefore remove it. */
+   int ret = -1;
+   if (!string_is_empty(dir))
+   {
+      char *dir_buf = strdup(dir);
+
+      if (dir_buf)
+      {
+         size_t len = strlen(dir_buf);
+
+         if (len > 0)
+            if (dir_buf[len - 1] == '/')
+               dir_buf[len - 1] = '\0';
+
+         ret = mkdir(dir_buf, 0750);
+
+         free(dir_buf);
+      }
+   }
+#else
+   int ret = mkdir(dir, 0750);
+#endif
+
+   if (path_mkdir_error(ret))
+      return -2;
+   return ret < 0 ? -1 : 0;
+}
+
+#ifdef VFS_FRONTEND
+struct retro_vfs_dir_handle
+#else
+struct libretro_vfs_implementation_dir
+#endif
+{
+   char* orig_path;
+#if defined(_WIN32)
+#if defined(LEGACY_WIN32)
+   WIN32_FIND_DATA entry;
+#else
+   WIN32_FIND_DATAW entry;
+#endif
+   HANDLE directory;
+   bool next;
+   char path[PATH_MAX_LENGTH];
+#elif defined(VITA) || defined(PSP)
+   SceUID directory;
+   SceIoDirent entry;
+#elif defined(__PSL1GHT__) || defined(__PS3__)
+   int error;
+   int directory;
+   sysFSDirent entry;
+#elif defined(ORBIS)
+   int directory;
+   struct dirent entry;
+#else
+   DIR *directory;
+   const struct dirent *entry;
+#endif
+};
+
+static bool dirent_check_error(libretro_vfs_implementation_dir *rdir)
+{
+#if defined(_WIN32)
+   return (rdir->directory == INVALID_HANDLE_VALUE);
+#elif defined(VITA) || defined(PSP) || defined(ORBIS)
+   return (rdir->directory < 0);
+#elif defined(__PSL1GHT__) || defined(__PS3__)
+   return (rdir->error != FS_SUCCEEDED);
+#else
+   return !(rdir->directory);
+#endif
+}
+
+libretro_vfs_implementation_dir *retro_vfs_opendir_impl(
+      const char *name, bool include_hidden)
+{
+#if defined(_WIN32)
+   unsigned path_len;
+   char path_buf[1024];
+   size_t copied      = 0;
+#if defined(LEGACY_WIN32)
+   char *path_local   = NULL;
+#else
+   wchar_t *path_wide = NULL;
+#endif
+#endif
+   libretro_vfs_implementation_dir *rdir;
+
+   /*Reject null or empty string paths*/
+   if (!name || (*name == 0))
+      return NULL;
+
+   /*Allocate RDIR struct. Tidied later with retro_closedir*/
+   rdir = (libretro_vfs_implementation_dir*)calloc(1, sizeof(*rdir));
+   if (!rdir)
+      return NULL;
+
+   rdir->orig_path       = strdup(name);
+
+#if defined(_WIN32)
+   path_buf[0]           = '\0';
+   path_len              = strlen(name);
+
+   copied                = strlcpy(path_buf, name, sizeof(path_buf));
+
+   /* Non-NT platforms don't like extra slashes in the path */
+   if (name[path_len - 1] != '\\')
+      path_buf[copied++]   = '\\';
+
+   path_buf[copied]        = '*';
+   path_buf[copied+1]      = '\0';
+
+#if defined(LEGACY_WIN32)
+   path_local              = utf8_to_local_string_alloc(path_buf);
+   rdir->directory         = FindFirstFile(path_local, &rdir->entry);
+
+   if (path_local)
+      free(path_local);
+#else
+   path_wide               = utf8_to_utf16_string_alloc(path_buf);
+   rdir->directory         = FindFirstFileW(path_wide, &rdir->entry);
+
+   if (path_wide)
+      free(path_wide);
+#endif
+
+#elif defined(VITA) || defined(PSP)
+   rdir->directory       = sceIoDopen(name);
+#elif defined(_3DS)
+   rdir->directory       = !string_is_empty(name) ? opendir(name) : NULL;
+   rdir->entry           = NULL;
+#elif defined(__PSL1GHT__) || defined(__PS3__)
+   rdir->error           = sysFsOpendir(name, &rdir->directory);
+#elif defined(ORBIS)
+   rdir->directory       = orbisDopen(name);
+#else
+   rdir->directory       = opendir(name);
+   rdir->entry           = NULL;
+#endif
+
+#ifdef _WIN32
+   if (include_hidden)
+      rdir->entry.dwFileAttributes |= FILE_ATTRIBUTE_HIDDEN;
+   else
+      rdir->entry.dwFileAttributes &= ~FILE_ATTRIBUTE_HIDDEN;
+#endif
+
+   if (rdir->directory && !dirent_check_error(rdir))
+      return rdir;
+
+   retro_vfs_closedir_impl(rdir);
+   return NULL;
+}
+
+bool retro_vfs_readdir_impl(libretro_vfs_implementation_dir *rdir)
+{
+#if defined(_WIN32)
+   if (rdir->next)
+#if defined(LEGACY_WIN32)
+      return (FindNextFile(rdir->directory, &rdir->entry) != 0);
+#else
+      return (FindNextFileW(rdir->directory, &rdir->entry) != 0);
+#endif
+
+   rdir->next = true;
+   return (rdir->directory != INVALID_HANDLE_VALUE);
+#elif defined(VITA) || defined(PSP)
+   return (sceIoDread(rdir->directory, &rdir->entry) > 0);
+#elif defined(__PSL1GHT__) || defined(__PS3__)
+   uint64_t nread;
+   rdir->error = sysFsReaddir(rdir->directory, &rdir->entry, &nread);
+   return (nread != 0);
+#elif defined(ORBIS)
+   return (orbisDread(rdir->directory, &rdir->entry) > 0);
+#else
+   return ((rdir->entry = readdir(rdir->directory)) != NULL);
+#endif
+}
+
+const char *retro_vfs_dirent_get_name_impl(libretro_vfs_implementation_dir *rdir)
+{
+#if defined(_WIN32)
+#if defined(LEGACY_WIN32)
+   char *name       = local_to_utf8_string_alloc(rdir->entry.cFileName);
+#else
+   char *name       = utf16_to_utf8_string_alloc(rdir->entry.cFileName);
+#endif
+   memset(rdir->entry.cFileName, 0, sizeof(rdir->entry.cFileName));
+   strlcpy((char*)rdir->entry.cFileName, name, sizeof(rdir->entry.cFileName));
+   if (name)
+      free(name);
+   return (char*)rdir->entry.cFileName;
+#elif defined(VITA) || defined(PSP) || defined(ORBIS) || defined(__PSL1GHT__) || defined(__PS3__)
+   return rdir->entry.d_name;
+#else
+   if (!rdir || !rdir->entry)
+      return NULL;
+   return rdir->entry->d_name;
+#endif
+}
+
+bool retro_vfs_dirent_is_dir_impl(libretro_vfs_implementation_dir *rdir)
+{
+#if defined(_WIN32)
+   const WIN32_FIND_DATA *entry = (const WIN32_FIND_DATA*)&rdir->entry;
+   return entry->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
+#elif defined(PSP) || defined(VITA)
+   const SceIoDirent *entry     = (const SceIoDirent*)&rdir->entry;
+#if defined(PSP)
+   return (entry->d_stat.st_attr & FIO_SO_IFDIR) == FIO_SO_IFDIR;
+#elif defined(VITA)
+   return SCE_S_ISDIR(entry->d_stat.st_mode);
+#endif
+#elif defined(__PSL1GHT__) || defined(__PS3__)
+   sysFSDirent *entry          = (sysFSDirent*)&rdir->entry;
+   return (entry->d_type == FS_TYPE_DIR);
+#elif defined(ORBIS)
+   const struct dirent *entry   = &rdir->entry;
+   if (entry->d_type == DT_DIR)
+      return true;
+   if (!(entry->d_type == DT_UNKNOWN || entry->d_type == DT_LNK))
+      return false;
+#else
+   struct stat buf;
+   char path[PATH_MAX_LENGTH];
+#if defined(DT_DIR)
+   const struct dirent *entry = (const struct dirent*)rdir->entry;
+   if (entry->d_type == DT_DIR)
+      return true;
+   /* This can happen on certain file systems. */
+   if (!(entry->d_type == DT_UNKNOWN || entry->d_type == DT_LNK))
+      return false;
+#endif
+   /* dirent struct doesn't have d_type, do it the slow way ... */
+   path[0] = '\0';
+   fill_pathname_join(path, rdir->orig_path, retro_vfs_dirent_get_name_impl(rdir), sizeof(path));
+   if (stat(path, &buf) < 0)
+      return false;
+   return S_ISDIR(buf.st_mode);
+#endif
+}
+
+int retro_vfs_closedir_impl(libretro_vfs_implementation_dir *rdir)
+{
+   if (!rdir)
+      return -1;
+
+#if defined(_WIN32)
+   if (rdir->directory != INVALID_HANDLE_VALUE)
+      FindClose(rdir->directory);
+#elif defined(VITA) || defined(PSP)
+   sceIoDclose(rdir->directory);
+#elif defined(__PSL1GHT__) || defined(__PS3__)
+   rdir->error = sysFsClosedir(rdir->directory);
+#elif defined(ORBIS)
+   orbisDclose(rdir->directory);
+#else
+   if (rdir->directory)
+      closedir(rdir->directory);
+#endif
+
+   if (rdir->orig_path)
+      free(rdir->orig_path);
+   free(rdir);
+   return 0;
+}
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 2041d3c..bf85335 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -5,8 +5,14 @@
 #include <stdarg.h>
 #include <ctype.h>
 
+#ifdef _MSC_VER
+#include <compat/msvc.h>
+#endif
+
 #include <libretro.h>
-#include <compat/fopen_utf8.h>
+#include <string/stdstring.h>
+#include <file/file_path.h>
+#include <streams/file_stream.h>
 #include <streams/memory_stream.h>
 #include <libretro_dipswitch.h>
 #include <libretro_core_options.h>
@@ -288,13 +294,6 @@ void FCEUD_SoundToggle (void)
    FCEUI_SetSoundVolume(sndvolume);
 }
 
-FILE *FCEUD_UTF8fopen(const char *n, const char *m)
-{
-   if (n)
-      return fopen_utf8(n, m);
-   return NULL;
-}
-
 /*palette for FCEU*/
 #define PAL_TOTAL   16 /* total no. of palettes in palettes[] */
 #define PAL_DEFAULT (PAL_TOTAL + 1)
@@ -1027,6 +1026,8 @@ static void set_variables(void)
 
 void retro_set_environment(retro_environment_t cb)
 {
+   struct retro_vfs_interface_info vfs_iface_info;
+
    static const struct retro_controller_description pads1[] = {
       { "Auto",    RETRO_DEVICE_AUTO },
       { "Gamepad", RETRO_DEVICE_GAMEPAD },
@@ -1073,13 +1074,31 @@ void retro_set_environment(retro_environment_t cb)
       { 0, 0 },
    };
 
+   static const struct retro_system_content_info_override content_overrides[] = {
+      {
+         "fds|nes|unf|unif", /* extensions */
+         false,              /* need_fullpath */
+         false               /* persistent_data */
+      },
+      { NULL, false, false }
+   };
+
    environ_cb = cb;
+
    environ_cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports);
+
+   vfs_iface_info.required_interface_version = 1;
+   vfs_iface_info.iface                      = NULL;
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VFS_INTERFACE, &vfs_iface_info))
+      filestream_vfs_init(&vfs_iface_info);
+
+   environ_cb(RETRO_ENVIRONMENT_SET_CONTENT_INFO_OVERRIDE,
+         (void*)content_overrides);
 }
 
 void retro_get_system_info(struct retro_system_info *info)
 {
-   info->need_fullpath    = false;
+   info->need_fullpath    = true;
    info->valid_extensions = "fds|nes|unf|unif";
 #ifdef GIT_VERSION
    info->library_version  = "(SVN)" GIT_VERSION;
@@ -2413,17 +2432,10 @@ static const struct cartridge_db famicom_4p_db_list[] =
    }
 };
 
-#ifdef _WIN32
-static char slash = '\\';
-#else
-static char slash = '/';
-#endif
-
-bool retro_load_game(const struct retro_game_info *game)
+bool retro_load_game(const struct retro_game_info *info)
 {
    unsigned i, j;
-   char* dir=NULL;
-   char* sav_dir=NULL;
+   const char *system_dir = NULL;
    size_t fourscore_len = sizeof(fourscore_db_list)   / sizeof(fourscore_db_list[0]);
    size_t famicom_4p_len = sizeof(famicom_4p_db_list) / sizeof(famicom_4p_db_list[0]);
    enum retro_pixel_format rgb565;
@@ -2482,8 +2494,43 @@ bool retro_load_game(const struct retro_game_info *game)
    struct retro_memory_descriptor descs[64 + 4];
    struct retro_memory_map        mmaps;
 
-   if (!game)
-      return false;
+   struct retro_game_info_ext *info_ext = NULL;
+   const uint8_t *content_data          = NULL;
+   size_t content_size                  = 0;
+   char content_path[2048]              = {0};
+
+   /* Attempt to fetch extended game info */
+   if (environ_cb(RETRO_ENVIRONMENT_GET_GAME_INFO_EXT, &info_ext) && info_ext)
+   {
+      content_data = (const uint8_t *)info_ext->data;
+      content_size = info_ext->size;
+
+      if (info_ext->file_in_archive)
+      {
+         /* We don't have a 'physical' file in this
+          * case, but the core still needs a filename
+          * in order to detect the region of iNES v1.0
+          * ROMs. We therefore fake it, using the content
+          * directory, canonical content name, and content
+          * file extension */
+         snprintf(content_path, sizeof(content_path), "%s%c%s.%s",
+               info_ext->dir,
+               PATH_DEFAULT_SLASH_C(),
+               info_ext->name,
+               info_ext->ext);
+      }
+      else
+         strlcpy(content_path, info_ext->full_path,
+               sizeof(content_path));
+   }
+   else
+   {
+      if (!info || string_is_empty(info->path))
+         return false;
+
+      strlcpy(content_path, info->path,
+            sizeof(content_path));
+   }
 
 #ifdef FRONTEND_SUPPORTS_RGB565
    rgb565 = RETRO_PIXEL_FORMAT_RGB565;
@@ -2524,10 +2571,8 @@ bool retro_load_game(const struct retro_game_info *game)
 
    environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc);
 
-   if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir)
-      FCEUI_SetBaseDirectory(dir);
-   if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &sav_dir) && sav_dir)
-      FCEUI_SetSaveDirectory(sav_dir);
+   if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &system_dir) && system_dir)
+      FCEUI_SetBaseDirectory(system_dir);
 
    memset(base_palette, 0, sizeof(base_palette));
 
@@ -2536,7 +2581,7 @@ bool retro_load_game(const struct retro_game_info *game)
    FCEUI_SetSoundVolume(sndvolume);
    FCEUI_Sound(sndsamplerate);
 
-   GameInfo = (FCEUGI*)FCEUI_LoadGame(game->path, (uint8_t*)game->data, game->size);
+   GameInfo = (FCEUGI*)FCEUI_LoadGame(content_path, content_data, content_size);
    if (!GameInfo)
    {
       struct retro_message msg;
@@ -2557,7 +2602,8 @@ bool retro_load_game(const struct retro_game_info *game)
 
    external_palette_exist = ipalette;
    if (external_palette_exist)
-      FCEU_printf(" Loading custom palette: %s%cnes.pal\n", dir, slash);
+      FCEU_printf(" Loading custom palette: %s%cnes.pal\n",
+            system_dir, PATH_DEFAULT_SLASH_C());
 
    /* Save region and dendy mode for region-auto detect */
    systemRegion = (dendy << 1) | (retro_get_region() & 1);
diff --git a/src/fceu-endian.c b/src/fceu-endian.c
index cfe35d9..9b65fae 100644
--- a/src/fceu-endian.c
+++ b/src/fceu-endian.c
@@ -46,37 +46,6 @@ void FlipByteOrder(uint8 *src, uint32 count)
    }
 }
 
-int write16le(uint16 b, FILE *fp)
-{
-   uint8 s[2];
-   s[0] = b;
-   s[1] = b >> 8;
-   return((fwrite(s, 1, 2, fp) < 2) ? 0 : 2);
-}
-
-int write32le(uint32 b, FILE *fp)
-{
-   uint8 s[4];
-   s[0] = b;
-   s[1] = b >> 8;
-   s[2] = b >> 16;
-   s[3] = b >> 24;
-   return((fwrite(s, 1, 4, fp) < 4) ? 0 : 4);
-}
-
-int read32le(uint32 *Bufo, FILE *fp)
-{
-   uint32 buf;
-   if (fread(&buf, 1, 4, fp) < 4)
-      return 0;
-#ifdef MSB_FIRST
-   *(uint32*)Bufo = ((buf & 0xFF) << 24) | ((buf & 0xFF00) << 8) | ((buf & 0xFF0000) >> 8) | ((buf & 0xFF000000) >> 24);
-#else
-   *(uint32*)Bufo = buf;
-#endif
-   return 1;
-}
-
 int write32le_mem(uint32 b, memstream_t *mem)
 {
    uint8 s[4];
@@ -100,18 +69,6 @@ int read32le_mem(uint32 *Bufo, memstream_t *mem)
    return 1;
 }
 
-int read16le(char *d, FILE *fp)
-{
-#ifdef MSB_FIRST
-   int ret;
-   ret = fread(d + 1, 1, 1, fp);
-   ret += fread(d, 1, 1, fp);
-   return ret < 2 ? 0 : 2;
-#else
-   return((fread(d, 1, 2, fp) < 2) ? 0 : 2);
-#endif
-}
-
 void FCEU_en32lsb(uint8 *buf, uint32 morp)
 {
    buf[0] = morp;
@@ -120,7 +77,7 @@ void FCEU_en32lsb(uint8 *buf, uint32 morp)
    buf[3] = morp >> 24;
 }
 
-uint32 FCEU_de32lsb(uint8 *morp)
+uint32 FCEU_de32lsb(const uint8 *morp)
 {
    return(morp[0] | (morp[1] << 8) | (morp[2] << 16) | (morp[3] << 24));
 }
diff --git a/src/fceu-endian.h b/src/fceu-endian.h
index 9c6e1c9..d085a7c 100644
--- a/src/fceu-endian.h
+++ b/src/fceu-endian.h
@@ -2,17 +2,14 @@
 #define _FCEU_ENDIAN_H
 
 #include "fceu-memory.h"
-#include "drivers/libretro/libretro-common/include/streams/memory_stream.h"
+#include <streams/memory_stream.h>
 
 int write32le_mem(uint32 b, memstream_t *mem);
 int read32le_mem(uint32 *Bufo, memstream_t *mem);
 
-int write16le(uint16 b, FILE *fp);
-int write32le(uint32 b, FILE *fp);
-int read32le(uint32 *Bufo, FILE *fp);
 void FlipByteOrder(uint8 *src, uint32 count);
 
 void FCEU_en32lsb(uint8 *, uint32);
-uint32 FCEU_de32lsb(uint8 *);
+uint32 FCEU_de32lsb(const uint8 *);
 
 #endif
diff --git a/src/fceu-memory.h b/src/fceu-memory.h
index 84a0574..437da24 100644
--- a/src/fceu-memory.h
+++ b/src/fceu-memory.h
@@ -29,23 +29,6 @@
 
 #define FCEU_dwmemset(d, c, n) { int _x; for (_x = n - 4; _x >= 0; _x -= 4) *(uint32*)& (d)[_x] = c; }
 
-#if defined(STATE_LIBRETRO) || defined(ENDIAN_LIBRETRO) || defined(GENERAL_LIBRETRO)
-#include "drivers/libretro/libretro-common/include/streams/memstream.h"
-
-#define HAVE_MEMSTREAM
-#define MEM_TYPE memstream_t
-
-#define fwrite(ptr, size, nmemb, stream) memstream_write((stream), (ptr), (nmemb))
-#define fclose(fp) memstream_close((fp))
-#define fgetc(stream) memstream_getc((stream))
-#define fputc(c, stream) memstream_putc((stream), (c))
-#define ftell(a) memstream_pos((a))
-#define fread(ptr, size, nmemb, stream) memstream_read((stream), (ptr), (nmemb))
-#define fseek(stream, offset, whence) memstream_seek((stream), (offset), (whence))
-#else
-#define MEM_TYPE FILE
-#endif
-
 void *FCEU_malloc(uint32 size);
 void *FCEU_gmalloc(uint32 size);
 void FCEU_gfree(void *ptr);
diff --git a/src/fceu-types.h b/src/fceu-types.h
index 9327c9b..0ea2f4b 100644
--- a/src/fceu-types.h
+++ b/src/fceu-types.h
@@ -41,9 +41,6 @@ typedef unsigned __int64 uint64;
 	#define GINLINE		/* Can't declare a function INLINE
 						 * and global in MSVC.  Bummer.
 						 */
-	#define PSS_STYLE 2	/* Does MSVC compile for anything
-						 * other than Windows/DOS targets?
-						 */
 #else
 typedef unsigned long long uint64;
 typedef long long int64;
@@ -62,29 +59,6 @@ typedef long long int64;
 #endif
 #endif
 
-#if PSS_STYLE == 2
-
-#define PSS "\\"
-#define PS '\\'
-
-#elif PSS_STYLE == 1
-
-#define PSS "/"
-#define PS '/'
-
-#elif PSS_STYLE == 3
-
-#define PSS "\\"
-#define PS '\\'
-
-#elif PSS_STYLE == 4
-
-#define PSS ":"
-#define PS ':'
-
-#endif
-
-
 #ifdef __GNUC__
 	#ifdef C80x86
 		#define FASTAPASS(x) __attribute__((regparm(x)))
diff --git a/src/fceu.c b/src/fceu.c
index 0d471b9..c67d1c1 100644
--- a/src/fceu.c
+++ b/src/fceu.c
@@ -193,7 +193,7 @@ void FCEUI_CloseGame(void)
       free(GameInfo->name);
    GameInfo->name = 0;
    if (GameInfo->type != GIT_NSF)
-      FCEU_FlushGameCheats(0, 0);
+      FCEU_FlushGameCheats();
    GameInterface(GI_CLOSE);
    ResetExState(0, 0);
    FCEU_CloseGenie();
@@ -226,7 +226,7 @@ int iNESLoad(const char *name, FCEUFILE *fp);
 int FDSLoad(const char *name, FCEUFILE *fp);
 int NSFLoad(FCEUFILE *fp);
 
-FCEUGI *FCEUI_LoadGame(const char *name, uint8_t *databuf, size_t databufsize)
+FCEUGI *FCEUI_LoadGame(const char *name, const uint8_t *databuf, size_t databufsize)
 {
    FCEUFILE *fp;
 
@@ -244,9 +244,7 @@ FCEUGI *FCEUI_LoadGame(const char *name, uint8_t *databuf, size_t databufsize)
    GameInfo->inputfc = -1;
    GameInfo->cspecial = 0;
 
-   GetFileBase(name);
-
-   fp = FCEU_fopen(name, NULL, "rb", 0, databuf, databufsize);
+   fp = FCEU_fopen(name, databuf, databufsize);
 
    if (!fp) {
       FCEU_PrintError("Error opening \"%s\"!", name);
@@ -278,7 +276,7 @@ endlseq:
 
    if (GameInfo->type != GIT_NSF) {
       FCEU_LoadGamePalette();
-      FCEU_LoadGameCheats(0);
+      FCEU_LoadGameCheats();
    }
 
    FCEU_ResetPalette();
@@ -321,7 +319,7 @@ FCEUGI *FCEUI_CopyFamiStart(void)
 
 	if (GameInfo->type != GIT_NSF) {
 		FCEU_LoadGamePalette();
-		FCEU_LoadGameCheats(0);
+		FCEU_LoadGameCheats();
 	}
 
 	FCEU_ResetPalette();
diff --git a/src/fds.c b/src/fds.c
index 302fdae..15c91b9 100644
--- a/src/fds.c
+++ b/src/fds.c
@@ -708,7 +708,7 @@ int FDSLoad(const char *name, FCEUFILE *fp) {
 
 	char *fn = FCEU_MakeFName(FCEUMKF_FDSROM, 0, 0);
 
-	if (!(zp = FCEU_fopen(fn, 0, "rb", 0, NULL, 0))) {
+	if (!(zp = FCEU_fopen(fn, NULL, 0))) {
 		FCEU_PrintError("FDS BIOS ROM image missing!\n");
 		free(fn);
 		return 0;
@@ -728,13 +728,11 @@ int FDSLoad(const char *name, FCEUFILE *fp) {
 		if (FDSBIOS)
 			free(FDSBIOS);
 		FDSBIOS = NULL;
-		free(zp->fp->data);
 		FCEU_fclose(zp);
 		FCEU_PrintError("Error reading FDS BIOS ROM image.\n");
 		return 0;
 	}
 
-	free(zp->fp->data);
 	FCEU_fclose(zp);
 
 	FCEU_fseek(fp, 0, SEEK_SET);
@@ -753,37 +751,6 @@ int FDSLoad(const char *name, FCEUFILE *fp) {
 	
 	DiskWritten = 1;
 
-#if 0
-	/* auxillary rom loading for save file is now handled
-	 * using retro_get_memory_size/data */
-	{
-		FCEUFILE *tp;
-		char *fn = FCEU_MakeFName(FCEUMKF_FDS, 0, 0);
-
-		int x;
-		for (x = 0; x < TotalSides; x++) {
-			diskdatao[x] = (uint8*)FCEU_malloc(65500);
-			memcpy(diskdatao[x], diskdata[x], 65500);
-		}
-
-		if ((tp = FCEU_fopen(fn, 0, "rb", 0, NULL, 0))) {
-			FCEU_printf("Disk was written. Auxillary FDS file open \"%s\".\n", fn);
-			FreeFDSMemory();
-			if (!SubLoad(tp)) {
-				FCEU_PrintError("Error reading auxillary FDS file.\n");
-				if (FDSBIOS)
-					free(FDSBIOS);
-				FDSBIOS = NULL;
-				free(fn);
-				return(0);
-			}
-			FCEU_fclose(tp);
-			DiskWritten = 1;	/* For save state handling. */
-		}
-		free(fn);
-	}
-#endif
-
 	GameInfo->type = GIT_FDS;
 	GameInterface = FDSGI;
 
diff --git a/src/file.c b/src/file.c
index b210e18..9022973 100644
--- a/src/file.c
+++ b/src/file.c
@@ -27,6 +27,9 @@
 #include <unistd.h>
 #endif
 
+#include <string/stdstring.h>
+#include <streams/file_stream.h>
+
 #include "fceu-types.h"
 #include "file.h"
 #include "fceu-endian.h"
@@ -34,30 +37,33 @@
 #include "driver.h"
 #include "general.h"
 
-static MEMWRAP *MakeMemWrap(void *tz, int type)
+static MEMWRAP *MakeMemWrap(RFILE *tz)
 {
-   MEMWRAP *tmp;
+   MEMWRAP *tmp = NULL;
 
    if (!(tmp = (MEMWRAP*)FCEU_malloc(sizeof(MEMWRAP))))
       goto doret;
    tmp->location = 0;
 
-   fseek((FILE*)tz, 0, SEEK_END);
-   tmp->size = ftell((FILE*)tz);
-   fseek((FILE*)tz, 0, SEEK_SET);
-   if (!(tmp->data = (uint8*)FCEU_malloc(tmp->size)))
+   filestream_seek(tz, 0, RETRO_VFS_SEEK_POSITION_END);
+   tmp->size = filestream_tell(tz);
+   filestream_seek(tz, 0, RETRO_VFS_SEEK_POSITION_START);
+
+   if (!(tmp->data_int = (uint8*)FCEU_malloc(tmp->size)))
    {
       free(tmp);
-      tmp = 0;
+      tmp = NULL;
       goto doret;
    }
-   fread(tmp->data, 1, tmp->size, (FILE*)tz);
+
+   filestream_read(tz, tmp->data_int, tmp->size);
+   tmp->data = tmp->data_int;
 
 doret:
    return tmp;
 }
 
-static MEMWRAP *MakeMemWrapBuffer(uint8 *buffer, size_t bufsize)
+static MEMWRAP *MakeMemWrapBuffer(const uint8 *buffer, size_t bufsize)
 {
    MEMWRAP *tmp = (MEMWRAP*)FCEU_malloc(sizeof(MEMWRAP));
 
@@ -66,43 +72,57 @@ static MEMWRAP *MakeMemWrapBuffer(uint8 *buffer, size_t bufsize)
 
    tmp->location = 0;
    tmp->size     = bufsize;
+   tmp->data_int = NULL;
    tmp->data     = buffer;
 
    return tmp;
 }
 
-FCEUFILE * FCEU_fopen(const char *path, const char *ipsfn,
-      char *mode, char *ext, uint8 *buffer, size_t bufsize)
+FCEUFILE * FCEU_fopen(const char *path, const uint8 *buffer, size_t bufsize)
 {
    FCEUFILE *fceufp = (FCEUFILE*)malloc(sizeof(FCEUFILE));
 
-   fceufp->type  = 0;
    if (buffer)
       fceufp->fp = MakeMemWrapBuffer(buffer, bufsize);
    else
    {
-      void *t = FCEUD_UTF8fopen(path, mode);
+      RFILE *t = NULL;
+
+      if (!string_is_empty(path))
+         t = filestream_open(path,
+               RETRO_VFS_FILE_ACCESS_READ,
+               RETRO_VFS_FILE_ACCESS_HINT_NONE);
 
       if (!t)
       {
          free(fceufp);
-         return 0;
+         return NULL;
       }
 
-      fseek((FILE*)t, 0, SEEK_SET);
-      fceufp->fp = MakeMemWrap(t, 0);
-      fclose((FILE*)t);
+      fceufp->fp = MakeMemWrap(t);
+      filestream_close(t);
    }
    return fceufp;
 }
 
 int FCEU_fclose(FCEUFILE *fp)
 {
+   if (!fp)
+      return 0;
+
    if (fp->fp)
+   {
+      if (fp->fp->data_int)
+         free(fp->fp->data_int);
+      fp->fp->data_int = NULL;
+
       free(fp->fp);
+   }
    fp->fp = NULL;
+
 	free(fp);
-	fp = 0;
+	fp = NULL;
+
 	return 1;
 }
 
diff --git a/src/file.h b/src/file.h
index 7035e8f..09167dd 100644
--- a/src/file.h
+++ b/src/file.h
@@ -2,27 +2,23 @@
 #define _FCEU_FILE_H
 
 typedef struct {
-	uint8 *data;
-	uint32 size;
-	uint32 location;
+   uint8 *data_int;
+   const uint8 *data;
+   uint32 size;
+   uint32 location;
 } MEMWRAP;
 
 typedef struct {
    MEMWRAP *fp;
-	uint32 type;	/* 0=normal file, 1=gzip, 2=zip */
 } FCEUFILE;
 
-FCEUFILE *FCEU_fopen(const char *path, const char *ipsfn, char *mode, char *ext, uint8 *buffer, size_t bufsize);
+FCEUFILE *FCEU_fopen(const char *path, const uint8 *buffer, size_t bufsize);
 int FCEU_fclose(FCEUFILE*);
 uint64 FCEU_fread(void *ptr, size_t size, size_t nmemb, FCEUFILE*);
-uint64 FCEU_fwrite(void *ptr, size_t size, size_t nmemb, FCEUFILE*);
 int FCEU_fseek(FCEUFILE*, long offset, int whence);
 uint64 FCEU_ftell(FCEUFILE*);
-void FCEU_rewind(FCEUFILE*);
 int FCEU_read32le(uint32 *Bufo, FCEUFILE*);
-int FCEU_read16le(uint16 *Bufo, FCEUFILE*);
 int FCEU_fgetc(FCEUFILE*);
 uint64 FCEU_fgetsize(FCEUFILE*);
-int FCEU_fisarchive(FCEUFILE*);
 
 #endif
diff --git a/src/general.c b/src/general.c
index 33af07f..b1b2cef 100644
--- a/src/general.c
+++ b/src/general.c
@@ -31,6 +31,8 @@
 #include <unistd.h>
 #endif
 
+#include <file/file_path.h>
+
 #include "fceu-types.h"
 #include "fceu.h"
 
@@ -41,25 +43,14 @@
 
 #include "md5.h"
 
-static char BaseDirectory[2048];
-static char SaveDirectory[2048];
-static char FileBase[2048];
-static char FileExt[2048];	/* Includes the . character, as in ".nes" */
+static char BaseDirectory[2048] = {0};
 
-static char FileBaseDirectory[2048];
-
-void FCEUI_SetBaseDirectory(char *dir)
+void FCEUI_SetBaseDirectory(const char *dir)
 {
 	strncpy(BaseDirectory, dir, 2047);
 	BaseDirectory[2047] = 0;
 }
 
-void FCEUI_SetSaveDirectory(char *sav_dir)
-{
-	strncpy(SaveDirectory, sav_dir, 2047);
-	SaveDirectory[2047] = 0;
-}
-
 static char *odirs[FCEUIOD__COUNT] = { 0, 0, 0, 0, 0, 0 };		/* odirs, odors. ^_^ */
 
 void FCEUI_SetDirOverride(int which, char *n)
@@ -75,16 +66,16 @@ char *FCEU_MakeFName(int type, int id1, char *cd1)
    switch (type)
    {
       case FCEUMKF_GGROM:
-         sprintf(tmp, "%s%c%s", BaseDirectory, PS, "gg.rom");
+         fill_pathname_join(tmp, BaseDirectory,
+               "gg.rom", sizeof(tmp));
          break;
       case FCEUMKF_FDSROM:
-         sprintf(tmp, "%s%c%s", BaseDirectory, PS, "disksys.rom");
+         fill_pathname_join(tmp, BaseDirectory,
+               "disksys.rom", sizeof(tmp));
          break;
       case FCEUMKF_PALETTE:
-         sprintf(tmp, "%s%c%s", BaseDirectory, PS, "nes.pal");
-         break;
-      case FCEUMKF_FDS:
-         sprintf(tmp, "%s%c%s%s", SaveDirectory, PS, FileBase, ".sav");
+         fill_pathname_join(tmp, BaseDirectory,
+               "nes.pal", sizeof(tmp));
          break;
       default:
          break;
@@ -98,46 +89,6 @@ char *FCEU_MakeFName(int type, int id1, char *cd1)
    return(ret);
 }
 
-void GetFileBase(const char *f)
-{
-   const char *tp1, *tp3;
-
-#if PSS_STYLE == 4
-   tp1 = ((char*)strrchr(f, ':'));
-#elif PSS_STYLE == 1
-   tp1 = ((char*)strrchr(f, '/'));
-#else
-   tp1 = ((char*)strrchr(f, '\\'));
-#if PSS_STYLE != 3
-   tp3 = ((char*)strrchr(f, '/'));
-   if (tp1 < tp3) tp1 = tp3;
-#endif
-#endif
-   if (!tp1)
-   {
-      tp1 = f;
-      strcpy(FileBaseDirectory, ".");
-   }
-   else
-   {
-      memcpy(FileBaseDirectory, f, tp1 - f);
-      FileBaseDirectory[tp1 - f] = 0;
-      tp1++;
-   }
-
-   if (((tp3 = strrchr(f, '.')) != NULL) && (tp3 > tp1))
-   {
-      memcpy(FileBase, tp1, tp3 - tp1);
-      FileBase[tp3 - tp1] = 0;
-      strcpy(FileExt, tp3);
-   }
-   else
-   {
-      strcpy(FileBase, tp1);
-      FileExt[0] = 0;
-   }
-}
-
 uint32 uppow2(uint32 n)
 {
    int x;
diff --git a/src/general.h b/src/general.h
index 0eb2ea5..f7bbd0c 100644
--- a/src/general.h
+++ b/src/general.h
@@ -1,17 +1,15 @@
 #ifndef _FCEU_GENERAL_H
 #define _FCEU_GENERAL_H
 
-void GetFileBase(const char *f);
 extern uint32 uppow2(uint32 n);
 
 char *FCEU_MakeFName(int type, int id1, char *cd1);
 
 enum FILE_TYPES
 {
-    FCEUMKF_FDSROM = 1,
-    FCEUMKF_PALETTE,
-    FCEUMKF_GGROM,
-    FCEUMKF_FDS
+   FCEUMKF_FDSROM = 1,
+   FCEUMKF_PALETTE,
+   FCEUMKF_GGROM
 };
 
 #endif
diff --git a/src/palette.c b/src/palette.c
index adcef0c..f7ab228 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -22,6 +22,9 @@
 #include <stdlib.h>
 #include <math.h>
 
+#include <string/stdstring.h>
+#include <streams/file_stream.h>
+
 #include "fceu-types.h"
 #include "fceu.h"
 #include "general.h"
@@ -187,17 +190,22 @@ int ipalette = 0;
 
 void FCEU_LoadGamePalette(void) {
 	uint8 ptmp[192];
-	FILE *fp;
-	char *fn;
+	RFILE *fp = NULL;
+	char *fn = NULL;
 
 	ipalette = 0;
 
 	fn = FCEU_MakeFName(FCEUMKF_PALETTE, 0, 0);
 
-	if ((fp = FCEUD_UTF8fopen(fn, "rb"))) {
+	if (!string_is_empty(fn))
+		fp = filestream_open(fn,
+				RETRO_VFS_FILE_ACCESS_READ,
+				RETRO_VFS_FILE_ACCESS_HINT_NONE);
+
+	if (fp) {
 		int x;
-		fread(ptmp, 1, 192, fp);
-		fclose(fp);
+		filestream_read(fp, ptmp, 192);
+		filestream_close(fp);
 		for (x = 0; x < 64; x++) {
 			palettei[x].r = ptmp[x + x + x];
 			palettei[x].g = ptmp[x + x + x + 1];
diff --git a/src/state.h b/src/state.h
index 22893dc..c5a1eb3 100644
--- a/src/state.h
+++ b/src/state.h
@@ -23,11 +23,6 @@
 
 #include "fceu-memory.h"
 
-void FCEUSS_Save(char *);
-int FCEUSS_Load(char *);
-int FCEUSS_SaveFP(MEM_TYPE *);
-int FCEUSS_LoadFP(MEM_TYPE *);
-
 void FCEUSS_Load_Mem(void);
 void FCEUSS_Save_Mem(void);
 

From 5a10da375ee780fd19ebf5f17bfd7bd254043f32 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 20 Oct 2021 23:03:19 +0200
Subject: [PATCH 150/295] Simplify mapper 219 emulation; add outer bank
 register.

---
 src/boards/a9746.c | 106 +++++++++++++++++++++++++++++----------------
 1 file changed, 68 insertions(+), 38 deletions(-)

diff --git a/src/boards/a9746.c b/src/boards/a9746.c
index 97e2755..d2b1a05 100644
--- a/src/boards/a9746.c
+++ b/src/boards/a9746.c
@@ -21,55 +21,85 @@
 #include "mapinc.h"
 #include "mmc3.h"
 
-static DECLFW(UNLA9746Write) {
-/*   FCEU_printf("write raw %04x:%02x\n",A,V); */
-	switch (A & 0xE003) {
-	case 0x8000: EXPREGS[1] = V; EXPREGS[0] = 0; break;
-	case 0x8002: EXPREGS[0] = V; EXPREGS[1] = 0; break;
-	case 0x8001:
-	{
-		uint8 bits_rev = ((V & 0x20) >> 5) | ((V & 0x10) >> 3) | ((V & 0x08) >> 1) | ((V & 0x04) << 1);
-		switch (EXPREGS[0]) {
-		case 0x26: setprg8(0x8000, bits_rev); break;
-		case 0x25: setprg8(0xA000, bits_rev); break;
-		case 0x24: setprg8(0xC000, bits_rev); break;
-		case 0x23: setprg8(0xE000, bits_rev); break;
+static void UNLA9746PWrap(uint32 A, uint8 V) {
+	setprg8(A, EXPREGS[1] <<4 | V &0x0F);
+}
+
+static void UNLA9746CWrap(uint32 A, uint8 V) {
+	setchr1(A, EXPREGS[1] <<7 | V &0x7F);
+}
+
+static DECLFW(UNLA9746WriteOuter) {
+	switch(A &1) {
+		case 0: EXPREGS[1] =EXPREGS[1] &~1 | V >>3 &1; break;
+		case 1: EXPREGS[1] =EXPREGS[1] &~2 | V >>4 &2; break;
+	}
+	FixMMC3PRG(MMC3_cmd);
+	FixMMC3CHR(MMC3_cmd);
+}
+
+static DECLFW(UNLA9746WriteASIC) {
+	int index;
+	
+	if (A &1)
+	{ 	/* Register data */
+		if (~EXPREGS[0] &0x20)
+		{	/* Scrambled mode inactive */
+			MMC3_CMDWrite(A, V);
 		}
-		switch (EXPREGS[1]) {
-		case 0x0a:
-		case 0x08: EXPREGS[2] = (V << 4); break;
-		case 0x09: setchr1(0x0000, EXPREGS[2] | (V >> 1)); break;
-		case 0x0b: setchr1(0x0400, EXPREGS[2] | (V >> 1) | 1);  break;
-		case 0x0c:
-		case 0x0e: EXPREGS[2] = (V << 4);  break;
-		case 0x0d: setchr1(0x0800, EXPREGS[2] | (V >> 1));  break;
-		case 0x0f: setchr1(0x0c00, EXPREGS[2] | (V >> 1) | 1);  break;
-		case 0x10:
-		case 0x12: EXPREGS[2] = (V << 4);  break;
-		case 0x11: setchr1(0x1000, EXPREGS[2] | (V >> 1)); break;
-		case 0x14:
-		case 0x16: EXPREGS[2] = (V << 4);  break;
-		case 0x15: setchr1(0x1400, EXPREGS[2] | (V >> 1));  break;
-		case 0x18:
-		case 0x1a: EXPREGS[2] = (V << 4);  break;
-		case 0x19: setchr1(0x1800, EXPREGS[2] | (V >> 1));  break;
-		case 0x1c:
-		case 0x1e: EXPREGS[2] = (V << 4);  break;
-		case 0x1d: setchr1(0x1c00, EXPREGS[2] | (V >> 1));  break;
+		else
+		{	/* Scrambled mode active */
+			if (MMC3_cmd >=0x08 && MMC3_cmd <=0x1F)
+			{	/* Scrambled CHR register */
+				index = (MMC3_cmd -8) >>2;
+				if (MMC3_cmd &1)
+				{	/* LSB nibble */
+					DRegBuf[index] &=~0x0F;
+					DRegBuf[index] |=V >>1 &0x0F;
+				}
+				else
+				{	/* MSB nibble */
+					DRegBuf[index] &=~0xF0;
+					DRegBuf[index] |=V <<4 &0xF0;
+				}
+				FixMMC3CHR(MMC3_cmd);
+			}
+			else
+			if (MMC3_cmd >=0x25 && MMC3_cmd <=0x26)
+			{	/* Scrambled PRG register */
+				DRegBuf[6 | MMC3_cmd &1] =V >>5 &1 | V >>3 &2 | V >>1 &4 | V <<1 &8;
+				FixMMC3PRG(MMC3_cmd);
+			}
 		}
 	}
-	break;
+	else
+	{	/* Register index */
+		MMC3_CMDWrite(A, V);
+		if (A &2) EXPREGS[0] =V;
 	}
 }
 
 static void UNLA9746Power(void) {
 	GenMMC3Power();
-	SetWriteHandler(0x8000, 0xbfff, UNLA9746Write);
+	SetWriteHandler(0x5000, 0x5FFF, UNLA9746WriteOuter);
+	SetWriteHandler(0x8000, 0xBFFF, UNLA9746WriteASIC);
+	EXPREGS[0] = 0;
+	EXPREGS[1] = 3;
+	MMC3RegReset();
+}
+
+static void UNLA9746Reset(void) {
+	EXPREGS[0] = 0;
+	EXPREGS[1] = 3;
+	MMC3RegReset();
 }
 
 void UNLA9746_Init(CartInfo *info) {
-	GenMMC3_Init(info, 128, 256, 0, 0);
+	GenMMC3_Init(info, 128, 128, 0, 0);
+	pwrap = UNLA9746PWrap;
+	cwrap = UNLA9746CWrap;
 	info->Power = UNLA9746Power;
-	AddExState(EXPREGS, 6, 0, "EXPR");
+	info->Reset = UNLA9746Reset;
+	AddExState(EXPREGS, 2, 0, "EXPR");
 }
 

From 1a961ff6be6d3de87c08a1e6d4799247a6df6da6 Mon Sep 17 00:00:00 2001
From: jdgleaver <james@leaver.myzen.co.uk>
Date: Thu, 21 Oct 2021 15:52:40 +0100
Subject: [PATCH 151/295] Add support for emulated Game Genie add-on

---
 src/cart.c                                   |  12 +-
 src/cheat.c                                  |   1 -
 src/driver.h                                 |  16 ++-
 src/drivers/libretro/libretro.c              | 139 +++++++++++++++----
 src/drivers/libretro/libretro_core_options.h |  67 +++++----
 src/fceu.c                                   |  53 +++++--
 src/fceu.h                                   |   1 -
 src/fds.c                                    |  16 ++-
 src/file.c                                   |   3 +-
 src/general.c                                |   2 +-
 src/palette.c                                |   3 +-
 src/video.c                                  |  11 +-
 12 files changed, 240 insertions(+), 84 deletions(-)

diff --git a/src/cart.c b/src/cart.c
index 345c419..74f09d9 100644
--- a/src/cart.c
+++ b/src/cart.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 
 #include <string/stdstring.h>
+#include <file/file_path.h>
 #include <streams/file_stream.h>
 
 #include "fceu-types.h"
@@ -353,20 +354,25 @@ void FCEU_OpenGenie(void) {
 
 		fn = FCEU_MakeFName(FCEUMKF_GGROM, 0, 0);
 
-		if (!string_is_empty(fn))
+		if (!string_is_empty(fn) && path_is_valid(fn))
 			fp = filestream_open(fn,
 					RETRO_VFS_FILE_ACCESS_READ,
 					RETRO_VFS_FILE_ACCESS_HINT_NONE);
 
+		free(fn);
+		fn = NULL;
+
 		if (!fp) {
-			FCEU_PrintError("Error opening Game Genie ROM image!");
+			FCEU_PrintError("Error opening Game Genie ROM image!\n");
+			FCEUD_DispMessage(RETRO_LOG_WARN, 3000, "Game Genie ROM image (gamegenie.nes) missing");
 			free(GENIEROM);
 			GENIEROM = 0;
 			return;
 		}
 		if (filestream_read(fp, GENIEROM, 16) != 16) {
  grerr:
-			FCEU_PrintError("Error reading from Game Genie ROM image!");
+			FCEU_PrintError("Error reading from Game Genie ROM image!\n");
+			FCEUD_DispMessage(RETRO_LOG_WARN, 3000, "Failed to read Game Genie ROM image (gamegenie.nes)");
 			free(GENIEROM);
 			GENIEROM = 0;
 			filestream_close(fp);
diff --git a/src/cheat.c b/src/cheat.c
index 66af7b6..5b6dda8 100644
--- a/src/cheat.c
+++ b/src/cheat.c
@@ -114,7 +114,6 @@ void RebuildSubCheats(void) {
 		if (c->type == 1 && c->status) {
 			if (GetReadHandler(c->addr) == SubCheatsRead) {
 				/* Prevent a catastrophe by this check. */
-				/* FCEU_DispMessage("oops"); */
 			} else {
 				SubCheats[numsubcheats].PrevRead = GetReadHandler(c->addr);
 				SubCheats[numsubcheats].addr = c->addr;
diff --git a/src/driver.h b/src/driver.h
index e16476e..c532236 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -2,6 +2,7 @@
 #define _FCEU_DRIVER_H
 
 #include <stdio.h>
+#include <libretro.h>
 
 #ifdef  __cplusplus
 extern "C" {
@@ -37,7 +38,9 @@ void FCEUD_SetPalette(uint8 index, uint8 r, uint8 g, uint8 b);
 /* Displays an error.  Can block or not. */
 void FCEUD_PrintError(char *s);
 void FCEUD_Message(char *s);
-void FCEUD_DispMessage(char *m);
+
+void FCEUD_DispMessage(enum retro_log_level level, unsigned duration, char *str);
+void FCEU_DispMessage(enum retro_log_level level, unsigned duration, char *format, ...);
 
 int FCEUI_BeginWaveRecord(char *fn);
 int FCEUI_EndWaveRecord(void);
@@ -99,7 +102,14 @@ void FCEUI_DisableSpriteLimitation(int a);
 /* -1 = no change, 0 = show, 1 = hide, 2 = internal toggle */
 void FCEUI_SetRenderDisable(int sprites, int bg);
 
-FCEUGI *FCEUI_LoadGame(const char *name, const uint8_t *buf, size_t bufsize);
+/* frontend_post_load_init_cb() is called immediately
+ * after loading the ROM, allowing any frontend
+ * initialisation that is dependent on ROM type to
+ * be performed before the regular internal post-load
+ * initialisation */
+typedef void (*frontend_post_load_init_cb_t)(void);
+FCEUGI *FCEUI_LoadGame(const char *name, const uint8_t *databuf, size_t databufsize,
+      frontend_post_load_init_cb_t frontend_post_load_init_cb);
 
 #ifdef COPYFAMI
 /* Fake UNIF board to start new CFHI instance */
@@ -168,8 +178,6 @@ void FCEUI_LoadMovie(char *fname);
 
 int32 FCEUI_GetDesiredFPS(void);
 void FCEUI_SaveSnapshot(void);
-void FCEU_DispMessage(char *format, ...);
-#define FCEUI_DispMessage FCEU_DispMessage
 
 int FCEUI_DecodePAR(const char *code, uint16 *a, uint8 *v, int *c, int *type);
 int FCEUI_DecodeGG(const char *str, uint16 *a, uint8 *v, int *c);
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index bf85335..a848854 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -65,6 +65,9 @@
 #define NES_4_3      ((width / (height * (256.0 / 240.0))) * 4.0 / 3.0)
 #define NES_PP       ((width / (height * (256.0 / 240.0))) * 16.0 / 15.0)
 
+#define NES_PAL_FPS  (838977920.0 / 16777215.0)
+#define NES_NTSC_FPS (1008307711.0 / 16777215.0)
+
 #if defined(_3DS)
 void* linearMemAlign(size_t size, size_t alignment);
 void linearFree(void* mem);
@@ -148,6 +151,7 @@ static enum RetroZapperInputModes zappermode = RetroLightgun;
 
 static bool libretro_supports_bitmasks = false;
 static bool libretro_supports_option_categories = false;
+static unsigned libretro_msg_interface_version = 0;
 
 /* emulator-specific variables */
 
@@ -282,11 +286,54 @@ void FCEUD_Message(char *s)
    log_cb.log(RETRO_LOG_INFO, "%s", s);
 }
 
-void FCEUD_DispMessage(char *m)
-{  struct retro_message msg;
-   msg.msg = m;
-   msg.frames = 180;
-   environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, &msg);
+void FCEUD_DispMessage(enum retro_log_level level, unsigned duration, char *str)
+{
+   if (!environ_cb)
+      return;
+
+   if (libretro_msg_interface_version >= 1)
+   {
+      struct retro_message_ext msg;
+      unsigned priority;
+
+      switch (level)
+      {
+         case RETRO_LOG_ERROR:
+            priority = 5;
+            break;
+         case RETRO_LOG_WARN:
+            priority = 4;
+            break;
+         case RETRO_LOG_INFO:
+            priority = 3;
+            break;
+         case RETRO_LOG_DEBUG:
+         default:
+            priority = 1;
+            break;
+      }
+
+      msg.msg      = str;
+      msg.duration = duration;
+      msg.priority = priority;
+      msg.level    = level;
+      msg.target   = RETRO_MESSAGE_TARGET_OSD;
+      msg.type     = RETRO_MESSAGE_TYPE_NOTIFICATION_ALT;
+      msg.progress = -1;
+
+      environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE_EXT, &msg);
+   }
+   else
+   {
+      float fps       = (FSettings.PAL || dendy) ? NES_PAL_FPS : NES_NTSC_FPS;
+      unsigned frames = (unsigned)(((float)duration * fps / 1000.0f) + 0.5f);
+      struct retro_message msg;
+
+      msg.msg    = str;
+      msg.frames = frames;
+
+      environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, &msg);
+   }
 }
 
 void FCEUD_SoundToggle (void)
@@ -1024,6 +1071,40 @@ static void set_variables(void)
    }
 }
 
+/* Game Genie add-on must be enabled before
+ * loading content, so we cannot parse this
+ * option inside check_variables() */
+static void check_game_genie_variable(void)
+{
+   struct retro_variable var = {0};
+   int game_genie_enabled    = 0;
+
+   var.key = "fceumm_game_genie";
+
+   /* Game Genie is only enabled for regular
+    * cartridges (excludes arcade content,
+    * FDS games, etc.) */
+   if ((GameInfo->type == GIT_CART) &&
+       (iNESCart.mapper != 105) && /* Nintendo World Championship cart (Mapper 105)*/
+       environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) &&
+       var.value &&
+       !strcmp(var.value, "enabled"))
+      game_genie_enabled = 1;
+
+   FCEUI_SetGameGenie(game_genie_enabled);
+}
+
+/* Callback passed to FCEUI_LoadGame()
+ * > Required since we must set and check
+ *   core options immediately after ROM
+ *   is loaded, before FCEUI_LoadGame()
+ *   returns */
+static void frontend_post_load_init()
+{
+   set_variables();
+   check_game_genie_variable();
+}
+
 void retro_set_environment(retro_environment_t cb)
 {
    struct retro_vfs_interface_info vfs_iface_info;
@@ -1140,9 +1221,9 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
    info->geometry.aspect_ratio = get_aspect_ratio(width, height);
    info->timing.sample_rate = (float)sndsamplerate;
    if (FSettings.PAL || dendy)
-      info->timing.fps = 838977920.0/16777215.0;
+      info->timing.fps = NES_PAL_FPS;
    else
-      info->timing.fps = 1008307711.0/16777215.0;
+      info->timing.fps = NES_NTSC_FPS;
 }
 
 static void check_system_specs(void)
@@ -1162,6 +1243,9 @@ void retro_init(void)
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_INPUT_BITMASKS, NULL))
       libretro_supports_bitmasks = true;
+
+   environ_cb(RETRO_ENVIRONMENT_GET_MESSAGE_INTERFACE_VERSION,
+         &libretro_msg_interface_version);
 }
 
 static void retro_set_custom_palette(void)
@@ -1232,15 +1316,15 @@ static void FCEUD_RegionOverride(unsigned region)
          pal = systemRegion & 1;
          break;
       case 1: /* ntsc */
-         FCEU_DispMessage("System: NTSC");
+         FCEUD_DispMessage(RETRO_LOG_INFO, 2000, "System: NTSC");
          break;
       case 2: /* pal */
          pal = 1;
-         FCEU_DispMessage("System: PAL");
+         FCEUD_DispMessage(RETRO_LOG_INFO, 2000, "System: PAL");
          break;
       case 3: /* dendy */
          d = 1;
-         FCEU_DispMessage("System: Dendy");
+         FCEUD_DispMessage(RETRO_LOG_INFO, 2000, "System: Dendy");
          break;
    }
 
@@ -1265,6 +1349,7 @@ void retro_deinit (void)
    ps2 = NULL;
 #endif
    libretro_supports_bitmasks = false;
+   libretro_msg_interface_version = 0;
    DPSW_Cleanup();
 #ifdef HAVE_NTSC_FILTER
    NTSCFilter_Cleanup();
@@ -1456,9 +1541,6 @@ static void check_variables(bool startup)
       FCEU_ZapperSetTolerance(atoi(var.value));
    }
 
-   var.key = "fceumm_region";
-   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
-
    var.key = "fceumm_show_crosshair";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@@ -1479,7 +1561,6 @@ static void check_variables(bool startup)
          audio_video_updated = 1;
       }
    }
-
 #else
    var.key = "fceumm_overscan_h";
 
@@ -1505,6 +1586,7 @@ static void check_variables(bool startup)
       }
    }
 #endif
+
    var.key = "fceumm_aspect";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@@ -1545,6 +1627,7 @@ static void check_variables(bool startup)
       nes_input.turbo_delay = atoi(var.value);
 
    var.key = "fceumm_region";
+
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
       unsigned oldval = opt_region;
@@ -2060,6 +2143,11 @@ size_t retro_serialize_size(void)
 
 bool retro_serialize(void *data, size_t size)
 {
+   /* Cannot save state while Game Genie
+    * screen is open */
+   if (geniestage == 1)
+      return false;
+
    if (size != retro_serialize_size())
       return false;
 
@@ -2070,6 +2158,11 @@ bool retro_serialize(void *data, size_t size)
 
 bool retro_unserialize(const void * data, size_t size)
 {
+   /* Cannot load state while Game Genie
+    * screen is open */
+   if (geniestage == 1)
+      return false;
+
    if (size != retro_serialize_size())
       return false;
 
@@ -2581,17 +2674,16 @@ bool retro_load_game(const struct retro_game_info *info)
    FCEUI_SetSoundVolume(sndvolume);
    FCEUI_Sound(sndsamplerate);
 
-   GameInfo = (FCEUGI*)FCEUI_LoadGame(content_path, content_data, content_size);
+   GameInfo = (FCEUGI*)FCEUI_LoadGame(content_path, content_data, content_size,
+         frontend_post_load_init);
+
    if (!GameInfo)
    {
-      struct retro_message msg;
-      char msg_local[256];
-
-      sprintf(msg_local, "ROM loading failed...");
-      msg.msg    = msg_local;
-      msg.frames = 360;
-      if (environ_cb)
-         environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, (void*)&msg);
+#if 0
+      /* An error message here is superfluous - the frontend
+       * will report that content loading has failed */
+      FCEUD_DispMessage(RETRO_LOG_ERROR, 3000, "ROM loading failed...");
+#endif
       return false;
    }
 
@@ -2612,7 +2704,6 @@ bool retro_load_game(const struct retro_game_info *info)
 
    ResetPalette();
    FCEUD_SoundToggle();
-   set_variables();
    check_variables(true);
    PowerNES();
 
diff --git a/src/drivers/libretro/libretro_core_options.h b/src/drivers/libretro/libretro_core_options.h
index 0df0a88..ec07d2e 100644
--- a/src/drivers/libretro/libretro_core_options.h
+++ b/src/drivers/libretro/libretro_core_options.h
@@ -17,7 +17,7 @@ extern "C" {
  ********************************
 */
 
-#define MAX_CORE_OPTIONS 34
+#define MAX_CORE_OPTIONS 35
 
 /* RETRO_LANGUAGE_ENGLISH */
 
@@ -29,6 +29,11 @@ extern "C" {
  *   frontend language definition */
 
 struct retro_core_option_v2_category option_cats_us[] = {
+   {
+      "system",
+      "System",
+      "Configure region / hardware add-on parameters."
+   },
    {
       "video",
       "Video",
@@ -68,16 +73,30 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
       NULL,
       "Force core to use NTSC, PAL or Dendy region timings.",
       NULL,
-      NULL,
+      "system",
       {
          { "Auto",  NULL },
          { "NTSC",  NULL },
          { "PAL",   NULL },
          { "Dendy", NULL },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "Auto",
    },
+   {
+      "fceumm_game_genie",
+      "Game Genie Add-On (Restart)",
+      NULL,
+      "Enable emulation of a Game Genie add-on cartridge, allowing cheat codes to be entered when launching games. The Game Genie ROM file 'gamegenie.nes' must be present in the frontend's system directory. Does not apply to FDS or arcade content.",
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
    {
       "fceumm_show_adv_system_options",
       "Show Advanced System Options",
@@ -117,7 +136,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
          { "8:7 PAR", NULL },
          { "4:3",     NULL },
          { "PP",      "Pixel Perfect" },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "8:7 PAR",
    },
@@ -132,7 +151,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
       {
          { "enabled",  NULL },
          { "disabled", NULL },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "enabled",
    },
@@ -147,7 +166,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
       {
          { "disabled", NULL },
          { "enabled",  NULL },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "disabled",
    },
@@ -161,7 +180,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
       {
          { "disabled", NULL },
          { "enabled",  NULL },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "enabled",
    },
@@ -193,7 +212,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
          { "wavebeam",             "nakedarthur's Wavebeam" },
          { "raw",                  "Raw" },
          { "custom",               "Custom" },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "default",
    },
@@ -227,7 +246,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
          { "Low",       NULL },
          { "High",      NULL },
          { "Very High", NULL },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "Low",
    },
@@ -241,7 +260,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
       {
          { "disabled", NULL },
          { "enabled",  NULL },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "disabled",
    },
@@ -264,7 +283,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
          { "8",  "80%" },
          { "9",  "90%" },
          { "10", "100%" },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "7",
    },
@@ -278,7 +297,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
       {
          { "enabled",  NULL },
          { "disabled", NULL },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "enabled",
    },
@@ -292,7 +311,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
       {
          { "enabled",  NULL },
          { "disabled", NULL },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "enabled",
    },
@@ -306,7 +325,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
       {
          { "enabled",  NULL },
          { "disabled", NULL },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "enabled",
    },
@@ -320,7 +339,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
       {
          { "enabled",  NULL },
          { "disabled", NULL },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "enabled",
    },
@@ -334,7 +353,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
       {
          { "enabled",  NULL },
          { "disabled", NULL },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "enabled",
    },
@@ -350,7 +369,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
          { "Player 1", NULL },
          { "Player 2", NULL },
          { "Both",     NULL },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "None",
    },
@@ -370,7 +389,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
          { "15", NULL },
          { "30", NULL },
          { "60", NULL },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "3",
    },
@@ -385,7 +404,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
          { "lightgun",    "Lightgun" },
          { "touchscreen", "Touchscreen" },
          { "mouse",       "Mouse" },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "lightgun",
    },
@@ -399,7 +418,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
       {
          { "enabled",  NULL },
          { "disabled", NULL },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "enabled",
    },
@@ -446,7 +465,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
       {
          { "disabled", NULL },
          { "enabled",  NULL },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "disabled",
    },
@@ -460,7 +479,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
       {
          { "disabled", NULL },
          { "enabled",  NULL },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "disabled",
    },
@@ -475,7 +494,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
          { "disabled",      NULL },
          { "2x-Postrender", NULL },
          { "2x-VBlank",     NULL },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "disabled",
    },
@@ -490,7 +509,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
          { "fill $ff", "$FF" },
          { "fill $00", "$00" },
          { "random",   "Random" },
-         { NULL, NULL},
+         { NULL, NULL },
       },
       "fill $ff",
    },
diff --git a/src/fceu.c b/src/fceu.c
index c67d1c1..fbedacc 100644
--- a/src/fceu.c
+++ b/src/fceu.c
@@ -56,8 +56,8 @@ void (*GameStateRestore)(int version);
 
 readfunc ARead[0x10000];
 writefunc BWrite[0x10000];
-static readfunc *AReadG;
-static writefunc *BWriteG;
+static readfunc *AReadG = NULL;
+static writefunc *BWriteG = NULL;
 static int RWWrap = 0;
 
 static DECLFW(BNull)
@@ -71,12 +71,24 @@ static DECLFR(ANull)
 
 int AllocGenieRW(void)
 {
-	if (!(AReadG = (readfunc*)FCEU_malloc(0x8000 * sizeof(readfunc))))
-		return 0;
-	if (!(BWriteG = (writefunc*)FCEU_malloc(0x8000 * sizeof(writefunc))))
-		return 0;
-	RWWrap = 1;
-	return 1;
+   if (!AReadG)
+   {
+      if (!(AReadG = (readfunc*)FCEU_malloc(0x8000 * sizeof(readfunc))))
+         return 0;
+   }
+   else
+      memset(AReadG, 0, 0x8000 * sizeof(readfunc));
+
+   if (!BWriteG)
+   {
+      if (!(BWriteG = (writefunc*)FCEU_malloc(0x8000 * sizeof(writefunc))))
+         return 0;
+   }
+   else
+      memset(BWriteG, 0, 0x8000 * sizeof(writefunc));
+
+   RWWrap = 1;
+   return 1;
 }
 
 void FlushGenieRW(void)
@@ -92,8 +104,8 @@ void FlushGenieRW(void)
       }
       free(AReadG);
       free(BWriteG);
-      AReadG = 0;
-      BWriteG = 0;
+      AReadG = NULL;
+      BWriteG = NULL;
    }
    RWWrap = 0;
 }
@@ -226,7 +238,8 @@ int iNESLoad(const char *name, FCEUFILE *fp);
 int FDSLoad(const char *name, FCEUFILE *fp);
 int NSFLoad(FCEUFILE *fp);
 
-FCEUGI *FCEUI_LoadGame(const char *name, const uint8_t *databuf, size_t databufsize)
+FCEUGI *FCEUI_LoadGame(const char *name, const uint8_t *databuf, size_t databufsize,
+      frontend_post_load_init_cb_t frontend_post_load_init_cb)
 {
    FCEUFILE *fp;
 
@@ -248,7 +261,11 @@ FCEUGI *FCEUI_LoadGame(const char *name, const uint8_t *databuf, size_t databufs
 
    if (!fp) {
       FCEU_PrintError("Error opening \"%s\"!", name);
-      return 0;
+
+      free(GameInfo);
+      GameInfo = NULL;
+
+      return NULL;
    }
 
    if (iNESLoad(name, fp))
@@ -262,11 +279,21 @@ FCEUGI *FCEUI_LoadGame(const char *name, const uint8_t *databuf, size_t databufs
 
    FCEU_PrintError("An error occurred while loading the file.\n");
    FCEU_fclose(fp);
-   return 0;
+
+   if (GameInfo->name)
+      free(GameInfo->name);
+   GameInfo->name = NULL;
+   free(GameInfo);
+   GameInfo = NULL;
+
+   return NULL;
 
 endlseq:
    FCEU_fclose(fp);
 
+   if (frontend_post_load_init_cb)
+      (*frontend_post_load_init_cb)();
+
    FCEU_ResetVidSys();
    if (GameInfo->type != GIT_NSF)
       if (FSettings.GameGenie)
diff --git a/src/fceu.h b/src/fceu.h
index 2831997..ad21bce 100644
--- a/src/fceu.h
+++ b/src/fceu.h
@@ -107,7 +107,6 @@ extern FCEUS FSettings;
 
 void FCEU_PrintError(char *format, ...);
 void FCEU_printf(char *format, ...);
-void FCEU_DispMessage(char *format, ...);
 
 void SetNESDeemph(uint8 d, int force);
 void DrawTextTrans(uint8 *dest, uint32 width, uint8 *textmsg, uint8 fgcolor);
diff --git a/src/fds.c b/src/fds.c
index 15c91b9..696d2fa 100644
--- a/src/fds.c
+++ b/src/fds.c
@@ -179,12 +179,12 @@ static void FDSInit(void) {
 
 void FCEU_FDSInsert(int oride) {
 	if (InDisk == 255) {
-		FCEU_DispMessage("Disk %d of %d Side %s Inserted",
-			1 + (SelectDisk >> 1), (TotalSides + 1) >> 1, (SelectDisk & 1) ? "B" : "A");
+		FCEU_DispMessage(RETRO_LOG_INFO, 2000, "Disk %d of %d Side %s Inserted",
+				1 + (SelectDisk >> 1), (TotalSides + 1) >> 1, (SelectDisk & 1) ? "B" : "A");
 		InDisk = SelectDisk;
 	} else {
-		FCEU_DispMessage("Disk %d of %d Side %s Ejected",
-			1 + (SelectDisk >> 1), (TotalSides + 1) >> 1, (SelectDisk & 1) ? "B" : "A");
+		FCEU_DispMessage(RETRO_LOG_INFO, 2000, "Disk %d of %d Side %s Ejected",
+				1 + (SelectDisk >> 1), (TotalSides + 1) >> 1, (SelectDisk & 1) ? "B" : "A");
 		InDisk = 255;
 	}
 }
@@ -195,12 +195,12 @@ void FCEU_FDSEject(void) {
 
 void FCEU_FDSSelect(void) {
 	if (InDisk != 255) {
-		FCEU_DispMessage("Eject disk before selecting.");
+		FCEUD_DispMessage(RETRO_LOG_WARN, 2000, "Eject disk before selecting");
 		return;
 	}
 	SelectDisk = ((SelectDisk + 1) % TotalSides) & 3;
-	FCEU_DispMessage("Disk %d of %d Side %s Selected",
-		1 + (SelectDisk >> 1), (TotalSides + 1) >> 1, (SelectDisk & 1) ? "B" : "A");
+	FCEU_DispMessage(RETRO_LOG_INFO, 2000, "Disk %d of %d Side %s Selected",
+			1 + (SelectDisk >> 1), (TotalSides + 1) >> 1, (SelectDisk & 1) ? "B" : "A");
 }
 
 /* 2018/12/15 - update irq timings */
@@ -710,6 +710,7 @@ int FDSLoad(const char *name, FCEUFILE *fp) {
 
 	if (!(zp = FCEU_fopen(fn, NULL, 0))) {
 		FCEU_PrintError("FDS BIOS ROM image missing!\n");
+		FCEUD_DispMessage(RETRO_LOG_ERROR, 3000, "FDS BIOS image (disksys.rom) missing");
 		free(fn);
 		return 0;
 	}
@@ -730,6 +731,7 @@ int FDSLoad(const char *name, FCEUFILE *fp) {
 		FDSBIOS = NULL;
 		FCEU_fclose(zp);
 		FCEU_PrintError("Error reading FDS BIOS ROM image.\n");
+		FCEUD_DispMessage(RETRO_LOG_ERROR, 3000, "Error reading FDS BIOS image (disksys.rom)");
 		return 0;
 	}
 
diff --git a/src/file.c b/src/file.c
index 9022973..b2c9ec0 100644
--- a/src/file.c
+++ b/src/file.c
@@ -28,6 +28,7 @@
 #endif
 
 #include <string/stdstring.h>
+#include <file/file_path.h>
 #include <streams/file_stream.h>
 
 #include "fceu-types.h"
@@ -88,7 +89,7 @@ FCEUFILE * FCEU_fopen(const char *path, const uint8 *buffer, size_t bufsize)
    {
       RFILE *t = NULL;
 
-      if (!string_is_empty(path))
+      if (!string_is_empty(path) && path_is_valid(path))
          t = filestream_open(path,
                RETRO_VFS_FILE_ACCESS_READ,
                RETRO_VFS_FILE_ACCESS_HINT_NONE);
diff --git a/src/general.c b/src/general.c
index b1b2cef..d2d69e8 100644
--- a/src/general.c
+++ b/src/general.c
@@ -67,7 +67,7 @@ char *FCEU_MakeFName(int type, int id1, char *cd1)
    {
       case FCEUMKF_GGROM:
          fill_pathname_join(tmp, BaseDirectory,
-               "gg.rom", sizeof(tmp));
+               "gamegenie.nes", sizeof(tmp));
          break;
       case FCEUMKF_FDSROM:
          fill_pathname_join(tmp, BaseDirectory,
diff --git a/src/palette.c b/src/palette.c
index f7ab228..4824c20 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -23,6 +23,7 @@
 #include <math.h>
 
 #include <string/stdstring.h>
+#include <file/file_path.h>
 #include <streams/file_stream.h>
 
 #include "fceu-types.h"
@@ -197,7 +198,7 @@ void FCEU_LoadGamePalette(void) {
 
 	fn = FCEU_MakeFName(FCEUMKF_PALETTE, 0, 0);
 
-	if (!string_is_empty(fn))
+	if (!string_is_empty(fn) && path_is_valid(fn))
 		fp = filestream_open(fn,
 				RETRO_VFS_FILE_ACCESS_READ,
 				RETRO_VFS_FILE_ACCESS_HINT_NONE);
diff --git a/src/video.c b/src/video.c
index a7896cc..adfc1f1 100644
--- a/src/video.c
+++ b/src/video.c
@@ -86,16 +86,19 @@ void FCEU_PutImageDummy(void)
 {
 }
 
-void FCEU_DispMessage(char *format, ...)
+void FCEU_DispMessage(enum retro_log_level level, unsigned duration, char *format, ...)
 {
+   static char msg[512] = {0};
    va_list ap;
-   static char errmsg[65];
+
+   if (!format || (*format == '\0'))
+      return;
 
    va_start(ap, format);
-   vsprintf(errmsg, format, ap);
+   vsprintf(msg, format, ap);
    va_end(ap);
 
-   FCEUD_DispMessage(errmsg);
+   FCEUD_DispMessage(level, duration, msg);
 }
 
 void FCEU_ResetMessages(void)

From 3a1dcca47211e482a9e550dac25dc95419cf1c6e Mon Sep 17 00:00:00 2001
From: jdgleaver <james@leaver.myzen.co.uk>
Date: Fri, 22 Oct 2021 13:30:27 +0100
Subject: [PATCH 152/295] Enable switching of colour palettes via RetroPad L2 +
 D-Pad Left/Right

---
 src/driver.h                    |   4 +-
 src/drivers/libretro/libretro.c | 411 +++++++++++++++++++++++++++-----
 src/video.c                     |   2 +-
 3 files changed, 350 insertions(+), 67 deletions(-)

diff --git a/src/driver.h b/src/driver.h
index c532236..90a19e1 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -39,8 +39,8 @@ void FCEUD_SetPalette(uint8 index, uint8 r, uint8 g, uint8 b);
 void FCEUD_PrintError(char *s);
 void FCEUD_Message(char *s);
 
-void FCEUD_DispMessage(enum retro_log_level level, unsigned duration, char *str);
-void FCEU_DispMessage(enum retro_log_level level, unsigned duration, char *format, ...);
+void FCEUD_DispMessage(enum retro_log_level level, unsigned duration, const char *str);
+void FCEU_DispMessage(enum retro_log_level level, unsigned duration, const char *format, ...);
 
 int FCEUI_BeginWaveRecord(char *fn);
 int FCEUI_EndWaveRecord(void);
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index a848854..a9ced62 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -286,7 +286,7 @@ void FCEUD_Message(char *s)
    log_cb.log(RETRO_LOG_INFO, "%s", s);
 }
 
-void FCEUD_DispMessage(enum retro_log_level level, unsigned duration, char *str)
+void FCEUD_DispMessage(enum retro_log_level level, unsigned duration, const char *str)
 {
    if (!environ_cb)
       return;
@@ -342,10 +342,11 @@ void FCEUD_SoundToggle (void)
 }
 
 /*palette for FCEU*/
-#define PAL_TOTAL   16 /* total no. of palettes in palettes[] */
-#define PAL_DEFAULT (PAL_TOTAL + 1)
-#define PAL_RAW     (PAL_TOTAL + 2)
-#define PAL_CUSTOM  (PAL_TOTAL + 3)
+#define PAL_INTERNAL 16 /* Number of palettes in palettes[] */
+#define PAL_DEFAULT  (PAL_INTERNAL + 1)
+#define PAL_RAW      (PAL_INTERNAL + 2)
+#define PAL_CUSTOM   (PAL_INTERNAL + 3)
+#define PAL_TOTAL    PAL_CUSTOM
 
 static int external_palette_exist = 0;
 extern int ipalette;
@@ -650,6 +651,158 @@ struct st_palettes palettes[] = {
    }
 };
 
+/* ========================================
+ * Palette switching START
+ * ======================================== */
+
+/* Period in frames between palette switches
+ * when holding RetroPad L2 + Left/Right */
+#define PALETTE_SWITCH_PERIOD 30
+
+static bool libretro_supports_set_variable         = false;
+static bool palette_switch_enabled                 = false;
+static unsigned palette_switch_counter             = 0;
+struct retro_core_option_value *palette_opt_values = NULL;
+static const char *palette_labels[PAL_TOTAL]       = {0};
+
+static uint32_t palette_switch_get_current_index(void)
+{
+   if (current_palette < PAL_INTERNAL)
+      return current_palette + 1;
+
+   switch (current_palette)
+   {
+      case PAL_DEFAULT:
+         return 0;
+      case PAL_RAW:
+      case PAL_CUSTOM:
+         return current_palette - 1;
+      default:
+         break;
+   }
+
+   /* Cannot happen */
+   return 0;
+}
+
+static void palette_switch_init(void)
+{
+   size_t i;
+   struct retro_core_option_v2_definition *opt_defs      = option_defs_us_common;
+   struct retro_core_option_v2_definition *opt_def       = NULL;
+#ifndef HAVE_NO_LANGEXTRA
+   struct retro_core_option_v2_definition *opt_defs_intl = NULL;
+   struct retro_core_option_v2_definition *opt_def_intl  = NULL;
+   unsigned language                                     = 0;
+#endif
+
+   libretro_supports_set_variable = false;
+   if (environ_cb(RETRO_ENVIRONMENT_SET_VARIABLE, NULL))
+      libretro_supports_set_variable = true;
+
+   palette_switch_enabled = libretro_supports_set_variable;
+   palette_switch_counter = 0;
+
+#ifndef HAVE_NO_LANGEXTRA
+   if (environ_cb(RETRO_ENVIRONMENT_GET_LANGUAGE, &language) &&
+       (language < RETRO_LANGUAGE_LAST) &&
+       (language != RETRO_LANGUAGE_ENGLISH) &&
+       options_intl[language])
+      opt_defs_intl = options_intl[language]->definitions;
+#endif
+
+   /* Find option corresponding to palettes key */
+   for (opt_def = opt_defs; opt_def->key; opt_def++)
+      if (!strcmp(opt_def->key, "fceumm_palette"))
+         break;
+
+   /* Cache option values array for fast access
+    * when setting palette index */
+   palette_opt_values = opt_def->values;
+
+   /* Loop over all palette values and fetch
+    * palette labels for notification purposes */
+   for (i = 0; i < PAL_TOTAL; i++)
+   {
+      const char *value       = opt_def->values[i].value;
+      const char *value_label = NULL;
+
+      /* Check if we have a localised palette label */
+#ifndef HAVE_NO_LANGEXTRA
+      if (opt_defs_intl)
+      {
+         /* Find localised option corresponding to key */
+         for (opt_def_intl = opt_defs_intl;
+              opt_def_intl->key;
+              opt_def_intl++)
+         {
+            if (!strcmp(opt_def_intl->key, "fceumm_palette"))
+            {
+               size_t j = 0;
+
+               /* Search for current option value */
+               for (;;)
+               {
+                  const char *value_intl = opt_def_intl->values[j].value;
+
+                  if (!value_intl)
+                     break;
+
+                  if (!strcmp(value, value_intl))
+                  {
+                     /* We have a match; fetch localised label */
+                     value_label = opt_def_intl->values[j].label;
+                     break;
+                  }
+
+                  j++;
+               }
+
+               break;
+            }
+         }
+      }
+#endif
+      /* If localised palette label is unset,
+       * use label from option_defs_us or fallback
+       * to value itself */
+      if (!value_label)
+         value_label = opt_def->values[i].label;
+      if (!value_label)
+         value_label = value;
+
+      palette_labels[i] = value_label;
+   }
+}
+
+static void palette_switch_deinit(void)
+{
+   libretro_supports_set_variable = false;
+   palette_switch_enabled         = false;
+   palette_switch_counter         = 0;
+   palette_opt_values             = NULL;
+}
+
+static void palette_switch_set_index(uint32_t palette_index)
+{
+   struct retro_variable var = {0};
+
+   if (palette_index >= PAL_TOTAL)
+      palette_index = PAL_TOTAL - 1;
+
+   /* Notify frontend of option value changes */
+   var.key   = "fceumm_palette";
+   var.value = palette_opt_values[palette_index].value;
+   environ_cb(RETRO_ENVIRONMENT_SET_VARIABLE, &var);
+
+   /* Display notification message */
+   FCEUD_DispMessage(RETRO_LOG_INFO, 2000, palette_labels[palette_index]);
+}
+
+/* ========================================
+ * Palette switching END
+ * ======================================== */
+
 #ifdef HAVE_NTSC_FILTER
 /* ntsc */
 #include "nes_ntsc.h"
@@ -1068,6 +1221,10 @@ static void set_variables(void)
 
       environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY,
             &option_display);
+
+      /* Additionally disable gamepad palette
+       * switching */
+      palette_switch_enabled = false;
    }
 }
 
@@ -1246,6 +1403,8 @@ void retro_init(void)
 
    environ_cb(RETRO_ENVIRONMENT_GET_MESSAGE_INTERFACE_VERSION,
          &libretro_msg_interface_version);
+
+   palette_switch_init();
 }
 
 static void retro_set_custom_palette(void)
@@ -1354,6 +1513,7 @@ void retro_deinit (void)
 #ifdef HAVE_NTSC_FILTER
    NTSCFilter_Cleanup();
 #endif
+   palette_switch_deinit();
 }
 
 void retro_reset(void)
@@ -1807,6 +1967,8 @@ void get_mouse_input(unsigned port, uint32_t *zapdata)
 static void FCEUD_UpdateInput(void)
 {
    unsigned player, port;
+   bool palette_prev = false;
+   bool palette_next = false;
 
    poll_cb();
 
@@ -1818,7 +1980,8 @@ static void FCEUD_UpdateInput(void)
    {
       int i              = 0;
       uint8_t input_buf  = 0;
-      int player_enabled = (nes_input.type[player] == RETRO_DEVICE_GAMEPAD) || (nes_input.type[player] == RETRO_DEVICE_JOYPAD);
+      int player_enabled = (nes_input.type[player] == RETRO_DEVICE_GAMEPAD) ||
+            (nes_input.type[player] == RETRO_DEVICE_JOYPAD);
 
       if (player_enabled)
       {
@@ -1826,8 +1989,24 @@ static void FCEUD_UpdateInput(void)
 
          if (libretro_supports_bitmasks)
          {
+            bool dpad_enabled = true;
+
             ret = input_cb(player, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_MASK);
 
+            /* If palette switching is enabled, check if
+             * player 1 has the L2 button held down */
+            if ((player == 0) &&
+                palette_switch_enabled &&
+                (ret & (1 << RETRO_DEVICE_ID_JOYPAD_L2)))
+            {
+               /* D-Pad left/right are used to switch palettes */
+               palette_prev = (bool)(ret & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT));
+               palette_next = (bool)(ret & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT));
+
+               /* Regular D-Pad input is disabled */
+               dpad_enabled = false;
+            }
+
             if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_A))
                input_buf |= JOY_A;
             if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_B))
@@ -1836,20 +2015,38 @@ static void FCEUD_UpdateInput(void)
                input_buf |= JOY_SELECT;
             if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_START))
                input_buf |= JOY_START;
-            if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_UP))
-               input_buf |= JOY_UP;
-            if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN))
-               input_buf |= JOY_DOWN;
-            if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT))
-               input_buf |= JOY_LEFT;
-            if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT))
-               input_buf |= JOY_RIGHT;
+
+            if (dpad_enabled)
+            {
+               if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_UP))
+                  input_buf |= JOY_UP;
+               if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN))
+                  input_buf |= JOY_DOWN;
+               if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT))
+                  input_buf |= JOY_LEFT;
+               if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT))
+                  input_buf |= JOY_RIGHT;
+            }
          }
          else
          {
             for (i = 0; i < MAX_BUTTONS; i++)
                input_buf |= input_cb(player, RETRO_DEVICE_JOYPAD, 0,
                      bindmap[i].retro) ? bindmap[i].nes : 0;
+
+            /* If palette switching is enabled, check if
+             * player 1 has the L2 button held down */
+            if ((player == 0) &&
+                palette_switch_enabled &&
+                input_cb(player, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L2))
+            {
+               /* D-Pad left/right are used to switch palettes */
+               palette_prev = (bool)(input_buf & JOY_LEFT);
+               palette_next = (bool)(input_buf & JOY_RIGHT);
+
+               /* Regular D-Pad input is disabled */
+               input_buf &= ~(JOY_UP | JOY_DOWN | JOY_LEFT | JOY_RIGHT);
+            }
          }
 
          /* Turbo A and Turbo B buttons are
@@ -1884,12 +2081,10 @@ static void FCEUD_UpdateInput(void)
 
       if (!nes_input.up_down_allowed)
       {
-         if (input_buf & (JOY_UP))
-            if (input_buf & (JOY_DOWN))
-               input_buf &= ~((JOY_UP ) | (JOY_DOWN));
-         if (input_buf & (JOY_LEFT))
-            if (input_buf & (JOY_RIGHT))
-               input_buf &= ~((JOY_LEFT ) | (JOY_RIGHT));
+         if ((input_buf & JOY_UP) && (input_buf & JOY_DOWN))
+            input_buf &= ~(JOY_UP | JOY_DOWN);
+         if ((input_buf & JOY_LEFT) && (input_buf & JOY_RIGHT))
+            input_buf &= ~(JOY_LEFT | JOY_RIGHT);
       }
 
       nes_input.JSReturn |= (input_buf & 0xff) << (player << 3);
@@ -1965,6 +2160,38 @@ static void FCEUD_UpdateInput(void)
          FCEU_FDSInsert(-1);        /* Insert or eject the disk */
       prevR = curR;
    }
+
+   /* Handle internal palette switching */
+   if (palette_prev || palette_next)
+   {
+      if (palette_switch_counter == 0)
+      {
+         int new_palette_index = palette_switch_get_current_index();
+
+         if (palette_prev)
+         {
+            if (new_palette_index > 0)
+               new_palette_index--;
+            else
+               new_palette_index = PAL_TOTAL - 1;
+         }
+         else /* palette_next */
+         {
+            if (new_palette_index < PAL_TOTAL - 1)
+               new_palette_index++;
+            else
+               new_palette_index = 0;
+         }
+
+         palette_switch_set_index(new_palette_index);
+      }
+
+      palette_switch_counter++;
+      if (palette_switch_counter >= PALETTE_SWITCH_PERIOD)
+         palette_switch_counter = 0;
+   }
+   else
+      palette_switch_counter = 0;
 }
 
 void FCEUD_Update(uint8 *XBuf, int32 *Buffer, int Count)
@@ -2534,55 +2761,108 @@ bool retro_load_game(const struct retro_game_info *info)
    enum retro_pixel_format rgb565;
 
    struct retro_input_descriptor desc[] = {
-      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,  "D-Pad Left" },
-      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,    "D-Pad Up" },
-      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN,  "D-Pad Down" },
-      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right" },
-      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,     "B" },
-      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,     "A" },
-      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT,   "Select" },
-      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,    "Start" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,   "D-Pad Left" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,     "D-Pad Up" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN,   "D-Pad Down" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT,  "D-Pad Right" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,      "B" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,      "A" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,  "Start" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2,     "(VSSystem) Insert Coin" },
-      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L,     "(FDS) Disk Side Change" },
-      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R,     "(FDS) Insert/Eject Disk" },
-      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,     "Turbo A" },
-      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,     "Turbo B" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L,      "(FDS) Disk Side Change" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R,      "(FDS) Insert/Eject Disk" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,      "Turbo A" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,      "Turbo B" },
 
-      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,  "D-Pad Left" },
-      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,    "D-Pad Up" },
-      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN,  "D-Pad Down" },
-      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right" },
-      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,     "B" },
-      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,     "A" },
-      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT,   "Select" },
-      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,    "Start" },
-      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,     "Turbo A" },
-      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,     "Turbo B" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,   "D-Pad Left" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,     "D-Pad Up" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN,   "D-Pad Down" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT,  "D-Pad Right" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,      "B" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,      "A" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,  "Start" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,      "Turbo A" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,      "Turbo B" },
 
-      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,  "D-Pad Left" },
-      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,    "D-Pad Up" },
-      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN,  "D-Pad Down" },
-      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right" },
-      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,     "B" },
-      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,     "A" },
-      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT,   "Select" },
-      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,    "Start" },
-      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,     "Turbo A" },
-      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,     "Turbo B" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,   "D-Pad Left" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,     "D-Pad Up" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN,   "D-Pad Down" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT,  "D-Pad Right" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,      "B" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,      "A" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,  "Start" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,      "Turbo A" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,      "Turbo B" },
 
-      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,  "D-Pad Left" },
-      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,    "D-Pad Up" },
-      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN,  "D-Pad Down" },
-      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right" },
-      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,     "B" },
-      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,     "A" },
-      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT,   "Select" },
-      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,    "Start" },
-      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,     "Turbo A" },
-      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,     "Turbo B" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,   "D-Pad Left" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,     "D-Pad Up" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN,   "D-Pad Down" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT,  "D-Pad Right" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,      "B" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,      "A" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,  "Start" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,      "Turbo A" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,      "Turbo B" },
 
       { 0 },
    };
+
+   struct retro_input_descriptor desc_ps[] = { /* ps: palette switching */
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,   "D-Pad Left" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,     "D-Pad Up" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN,   "D-Pad Down" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT,  "D-Pad Right" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,      "B" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,      "A" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,  "Start" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L2,     "Switch Palette (+ Left/Right)" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2,     "(VSSystem) Insert Coin" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L,      "(FDS) Disk Side Change" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R,      "(FDS) Insert/Eject Disk" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,      "Turbo A" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,      "Turbo B" },
+
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,   "D-Pad Left" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,     "D-Pad Up" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN,   "D-Pad Down" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT,  "D-Pad Right" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,      "B" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,      "A" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,  "Start" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,      "Turbo A" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,      "Turbo B" },
+
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,   "D-Pad Left" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,     "D-Pad Up" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN,   "D-Pad Down" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT,  "D-Pad Right" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,      "B" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,      "A" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,  "Start" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,      "Turbo A" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,      "Turbo B" },
+
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,   "D-Pad Left" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,     "D-Pad Up" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN,   "D-Pad Down" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT,  "D-Pad Right" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,      "B" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,      "A" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,  "Start" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,      "Turbo A" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,      "Turbo B" },
+
+      { 0 },
+   };
+
    size_t desc_base = 64;
    struct retro_memory_descriptor descs[64 + 4];
    struct retro_memory_map        mmaps;
@@ -2662,8 +2942,6 @@ bool retro_load_game(const struct retro_game_info *info)
    fceu_video_out = (uint16_t*)malloc(FB_WIDTH * FB_HEIGHT * sizeof(uint16_t));
 #endif
 
-   environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc);
-
    if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &system_dir) && system_dir)
       FCEUI_SetBaseDirectory(system_dir);
 
@@ -2687,6 +2965,11 @@ bool retro_load_game(const struct retro_game_info *info)
       return false;
    }
 
+   if (palette_switch_enabled)
+      environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc_ps);
+   else
+      environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc);
+
    for (i = 0; i < MAX_PORTS; i++) {
       FCEUI_SetInput(i, SI_GAMEPAD, &nes_input.JSReturn, 0);
       nes_input.type[i] = RETRO_DEVICE_JOYPAD;
diff --git a/src/video.c b/src/video.c
index adfc1f1..85e85ca 100644
--- a/src/video.c
+++ b/src/video.c
@@ -86,7 +86,7 @@ void FCEU_PutImageDummy(void)
 {
 }
 
-void FCEU_DispMessage(enum retro_log_level level, unsigned duration, char *format, ...)
+void FCEU_DispMessage(enum retro_log_level level, unsigned duration, const char *format, ...)
 {
    static char msg[512] = {0};
    va_list ap;

From aa8108a4e3ae671dfc5422ad978e1d358b0eed1d Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Fri, 22 Oct 2021 22:16:05 +0200
Subject: [PATCH 153/295] Add support for K-42001, make mapper 314 reset to
 menu.

---
 src/boards/bmc64in1nr.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/boards/bmc64in1nr.c b/src/boards/bmc64in1nr.c
index 88c46cf..7013765 100644
--- a/src/boards/bmc64in1nr.c
+++ b/src/boards/bmc64in1nr.c
@@ -31,7 +31,7 @@ static SFORMAT StateRegs[] =
 };
 
 static void Sync(void) {
-	if (regs[0] & 0x80) {
+	if (regs[0] & 0x80) { /* NROM mode */
 		if (regs[1] & 0x80)
 			setprg32(0x8000, regs[1] & 0x1F);
 		else {
@@ -39,9 +39,9 @@ static void Sync(void) {
 			setprg16(0x8000, bank);
 			setprg16(0xC000, bank);
 		}
-	} else {
-		int bank = ((regs[1] & 0x1f) << 1) | ((regs[1] >> 6) & 1);
-		setprg16(0xC000, bank);
+	} else { /* UNROM mode */
+		setprg16(0x8000, regs[1] <<1 | regs[3] &7);
+		setprg16(0xC000, regs[1] <<1 |          7);
 	}
 	if (regs[0] & 0x20)
 		setmirror(MI_H);
@@ -51,6 +51,8 @@ static void Sync(void) {
 }
 
 static DECLFW(BMC64in1nrWriteLo) {
+	A &=3;
+	if (A ==3) A =1; /* K-42001's "Aladdin III" */
 	regs[A & 3] = V;
 	Sync();
 }
@@ -65,17 +67,26 @@ static void BMC64in1nrPower(void) {
 	regs[1] = 0x43;
 	regs[2] = regs[3] = 0;
 	Sync();
-	SetWriteHandler(0x5000, 0x5003, BMC64in1nrWriteLo);
+	SetWriteHandler(0x5000, 0x5FFF, BMC64in1nrWriteLo);
 	SetWriteHandler(0x8000, 0xFFFF, BMC64in1nrWriteHi);
 	SetReadHandler(0x8000, 0xFFFF, CartBR);
 }
 
+static void BMC64in1nrReset(void) {
+	/* Reset returns to menu */
+	regs[0] = 0x80;
+	regs[1] = 0x43;
+	regs[2] = regs[3] = 0;
+	Sync();
+}
+
 static void StateRestore(int version) {
 	Sync();
 }
 
 void BMC64in1nr_Init(CartInfo *info) {
 	info->Power = BMC64in1nrPower;
+	info->Reset = BMC64in1nrReset;
 	AddExState(&StateRegs, ~0, 0, 0);
 	GameStateRestore = StateRestore;
 }

From d99e6e563cfe0570a0980a06ba6395e3bcca5c53 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Fri, 22 Oct 2021 22:29:26 +0200
Subject: [PATCH 154/295] Add support for mapper 376

---
 src/boards/376.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  1 +
 src/ines.h       |  1 +
 3 files changed, 67 insertions(+)
 create mode 100644 src/boards/376.c

diff --git a/src/boards/376.c b/src/boards/376.c
new file mode 100644
index 0000000..b9a1171
--- /dev/null
+++ b/src/boards/376.c
@@ -0,0 +1,65 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2019 Libretro Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static void Mapper376CW(uint32 A, uint8 V) {
+	uint32 base = (EXPREGS[0] &0x40? 0x080: 0x000) | (EXPREGS[1] &0x01? 0x100: 0x000);
+	setchr1(A, base | (V & 0x7F));
+}
+
+static void Mapper376PW(uint32 A, uint8 V) {
+	uint32 base = (EXPREGS[0] &0x07) | (EXPREGS[0] &0x40? 0x08: 0x00) | (EXPREGS[1] &0x01? 0x10: 0x00);
+	if (EXPREGS[0] & 0x80) {
+		if (EXPREGS[0] &0x20) {
+			if (A ==0x8000) setprg32(A, base >>1);
+		} else {
+			if (A ==0x8000 || A ==0xC000) setprg16(A, base);
+		}
+	} else
+		setprg8(A, (base << 1) | (V & 0x0F));
+}
+
+static DECLFW(Mapper376Write) {
+	EXPREGS[A & 1] = V;
+	FixMMC3PRG(MMC3_cmd);
+	FixMMC3CHR(MMC3_cmd);
+}
+
+static void Mapper376Reset(void) {
+	EXPREGS[0] = 0;
+	EXPREGS[1] = 0;
+	MMC3RegReset();
+}
+
+static void Mapper376Power(void) {
+	GenMMC3Power();
+	SetWriteHandler(0x6000, 0x7FFF, Mapper376Write);
+}
+
+void Mapper376_Init(CartInfo *info) {
+	GenMMC3_Init(info, 128, 256, 1, 0);
+	pwrap = Mapper376PW;
+	cwrap = Mapper376CW;
+	info->Power = Mapper376Power;
+	info->Reset = Mapper376Reset;
+	AddExState(EXPREGS, 2, 0, "EXPR");
+}
diff --git a/src/ines.c b/src/ines.c
index 1e7f7f0..f99aea1 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -695,6 +695,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "Golden Mario Party II - Around the World 6-in-1",       370, Mapper370_Init         )
 	INES_BOARD( "MMC3 PIRATE SFC-12",       372, Mapper372_Init         )
 	INES_BOARD( "95/96 Super HiK 4-in-1",   374, Mapper374_Init         )
+	INES_BOARD( "YY841155C",                376, Mapper376_Init         )
 	INES_BOARD( "42 to 80,000 (970630C)",   380, Mapper380_Init         )
 	INES_BOARD( "KN-42",                    381, Mapper381_Init         )
 	INES_BOARD( "830928C",                  382, Mapper382_Init         )
diff --git a/src/ines.h b/src/ines.h
index acdd82a..3cf415f 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -270,6 +270,7 @@ void Mapper369_Init(CartInfo *);
 void Mapper370_Init(CartInfo *);
 void Mapper372_Init(CartInfo *);
 void Mapper374_Init(CartInfo *);
+void Mapper376_Init(CartInfo *);
 void Mapper380_Init(CartInfo *);
 void Mapper381_Init(CartInfo *);
 void Mapper382_Init(CartInfo *);

From a918869c18c9f30b84e04260b78b675b8a3c7be1 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 2 Nov 2021 17:25:04 +0100
Subject: [PATCH 155/295] Cut down on stdio.h includes

---
 src/boards/__serial.c                     |  1 +
 src/boards/__serial.h                     |  2 --
 src/boards/emu2413.h                      |  1 -
 src/cart.c                                |  1 -
 src/cheat.c                               |  2 +-
 src/debug.c                               |  1 -
 src/driver.h                              |  1 -
 src/drivers/libretro/libretro_dipswitch.c |  1 +
 src/fceu-endian.c                         |  1 -
 src/fceu.c                                |  2 +-
 src/file.c                                |  1 -
 src/filter.c                              |  1 -
 src/fir/toh.c                             |  2 +-
 src/general.c                             |  1 -
 src/misc.c                                |  2 --
 src/palette.c                             |  1 -
 src/palettes/conv.c                       | 14 +++++---------
 src/ppu.c                                 |  1 -
 src/sound.c                               |  1 -
 src/video.c                               |  2 +-
 src/vsuni.c                               |  1 -
 21 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/src/boards/__serial.c b/src/boards/__serial.c
index b13c608..db56841 100644
--- a/src/boards/__serial.c
+++ b/src/boards/__serial.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include "__serial.h"
 
 #if defined(_WIN32) && !defined(_XBOX) && !defined(__LIBRETRO__)
diff --git a/src/boards/__serial.h b/src/boards/__serial.h
index c9f9af5..56d35c3 100644
--- a/src/boards/__serial.h
+++ b/src/boards/__serial.h
@@ -1,8 +1,6 @@
 #ifndef __SERIAL_H
 #define __SERIAL_H
 
-#include <stdio.h>
-
 typedef int BOOL;
 
 #ifndef TRUE
diff --git a/src/boards/emu2413.h b/src/boards/emu2413.h
index a0c173c..b14833b 100644
--- a/src/boards/emu2413.h
+++ b/src/boards/emu2413.h
@@ -1,7 +1,6 @@
 #ifndef _EMU2413_H_
 #define _EMU2413_H_
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
diff --git a/src/cart.c b/src/cart.c
index 74f09d9..5bf0704 100644
--- a/src/cart.c
+++ b/src/cart.c
@@ -20,7 +20,6 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <stdio.h>
 
 #include <string/stdstring.h>
 #include <file/file_path.h>
diff --git a/src/cheat.c b/src/cheat.c
index 5b6dda8..0ffb25c 100644
--- a/src/cheat.c
+++ b/src/cheat.c
@@ -18,9 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #include <ctype.h>
 
 #include "fceu-types.h"
diff --git a/src/debug.c b/src/debug.c
index bc48739..1786a89 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/src/driver.h b/src/driver.h
index 90a19e1..7e63d29 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -1,7 +1,6 @@
 #ifndef _FCEU_DRIVER_H
 #define _FCEU_DRIVER_H
 
-#include <stdio.h>
 #include <libretro.h>
 
 #ifdef  __cplusplus
diff --git a/src/drivers/libretro/libretro_dipswitch.c b/src/drivers/libretro/libretro_dipswitch.c
index accdb96..7346309 100644
--- a/src/drivers/libretro/libretro_dipswitch.c
+++ b/src/drivers/libretro/libretro_dipswitch.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/fceu-endian.c b/src/fceu-endian.c
index 9b65fae..32aec45 100644
--- a/src/fceu-endian.c
+++ b/src/fceu-endian.c
@@ -21,7 +21,6 @@
 /*  Contains file I/O functions that write/read data    */
 /*  LSB first.              */
 
-#include <stdio.h>
 #include "fceu-memory.h"
 #include "fceu-types.h"
 #include "fceu-endian.h"
diff --git a/src/fceu.c b/src/fceu.c
index fbedacc..77fdadd 100644
--- a/src/fceu.c
+++ b/src/fceu.c
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include  <string.h>
 #include  <stdio.h>
+#include  <string.h>
 #include  <stdlib.h>
 #include  <stdarg.h>
 
diff --git a/src/file.c b/src/file.c
index b2c9ec0..30a3898 100644
--- a/src/file.c
+++ b/src/file.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #ifdef _WIN32
diff --git a/src/filter.c b/src/filter.c
index 33fa188..a5fc0f5 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -1,5 +1,4 @@
 #include <math.h>
-#include <stdio.h>
 #include "fceu-types.h"
 
 #include "sound.h"
diff --git a/src/fir/toh.c b/src/fir/toh.c
index 409eea3..5ae4f0b 100644
--- a/src/fir/toh.c
+++ b/src/fir/toh.c
@@ -2,7 +2,7 @@
 
 #define MAX        512
 
-main()
+void main(void)
 {
  char buf[256];
  int count=0;
diff --git a/src/general.c b/src/general.c
index d2d69e8..f919283 100644
--- a/src/general.c
+++ b/src/general.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/src/misc.c b/src/misc.c
index d6f06e2..11314b5 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1,5 +1,3 @@
-#include <stdio.h>
-
 #include "fceu-types.h"
 #include "fceu.h"
 
diff --git a/src/palette.c b/src/palette.c
index 4824c20..5b70179 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 
diff --git a/src/palettes/conv.c b/src/palettes/conv.c
index 907148c..f712879 100644
--- a/src/palettes/conv.c
+++ b/src/palettes/conv.c
@@ -60,15 +60,11 @@ static uint8 rp2c05004_colortable[] =
 };
 
 
-main() {
+void main(void)
+{
 	int x;
-	for (x = 0; x < 64; x++) {
-#if 0
-		 if(x <= 0x20)
-  if(rp2c04002_colortable[x] == 0xFF) rp2c04002_colortable[x]= 0x30;
-#endif
+	for (x = 0; x < 64; x++)
 		printf("{0x%02x, 0x%02x, 0x%02x},\n", palette[rp2c04001_colortable[x] & 0x3F].r,
-			   palette[rp2c04001_colortable[x] & 0x3F].g,
-			   palette[rp2c04001_colortable[x] & 0x3F].b);
-	}
+				palette[rp2c04001_colortable[x] & 0x3F].g,
+				palette[rp2c04001_colortable[x] & 0x3F].b);
 }
diff --git a/src/ppu.c b/src/ppu.c
index f3ea2a1..b994b73 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -20,7 +20,6 @@
  */
 
 #include        <string.h>
-#include        <stdio.h>
 #include        <stdlib.h>
 
 #include        "fceu-types.h"
diff --git a/src/sound.c b/src/sound.c
index a483d16..cd54114 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -19,7 +19,6 @@
  */
 
 #include <stdlib.h>
-#include <stdio.h>
 
 #include <string.h>
 
diff --git a/src/video.c b/src/video.c
index 85e85ca..5f78db6 100644
--- a/src/video.c
+++ b/src/video.c
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
 
diff --git a/src/vsuni.c b/src/vsuni.c
index 2afb379..899ba7d 100644
--- a/src/vsuni.c
+++ b/src/vsuni.c
@@ -19,7 +19,6 @@
  */
 
 #include <string.h>
-#include <stdio.h>
 
 #include "fceu-types.h"
 #include "x6502.h"

From b72007fa627cb49d5369cdc6dc8b8c3dffae0200 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sat, 13 Nov 2021 21:26:59 +0100
Subject: [PATCH 156/295] Add Realtec 8099 PCB support to mapper 236

---
 src/boards/236.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/boards/236.c b/src/boards/236.c
index f4af1c9..4915a5d 100644
--- a/src/boards/236.c
+++ b/src/boards/236.c
@@ -22,6 +22,7 @@
 
 static uint8 reg[2];
 static uint8 dip;
+static uint8 chrramvariant;
 static SFORMAT StateRegs[] =
 {
 	{ reg,  2, "REG " },
@@ -31,7 +32,15 @@ static SFORMAT StateRegs[] =
 
 static void Sync(void)
 {
-	int prg = reg[1] &7 | reg[0] <<3;
+	int prg;
+	if (chrramvariant)
+	{
+		prg = reg[1] &7 | reg[0] <<3;
+	}
+	else
+	{
+		prg = reg[1] &15;
+	}
 	switch (reg[1] >>4 &3)
 	{
 		case 0:
@@ -47,7 +56,7 @@ static void Sync(void)
 			setprg16(0xC000, prg);
 			break;
 	}
-	setchr8(reg[0] &7);
+	setchr8(reg[0] &15);
 	setmirror((reg[0] >>5 &1) ^1);
 }
 
@@ -55,7 +64,7 @@ static void Sync(void)
 static DECLFR(M236Read)
 {
 	if ((reg[1] >>4 &3) ==1)
-		return CartBR(A &~0xF | dip);
+		return CartBR(A &~0xF | dip &0xF);
 	else
 		return CartBR(A);
 }
@@ -96,4 +105,5 @@ void Mapper236_Init(CartInfo *info)
 	info->Reset = M236Reset;
 	AddExState(&StateRegs, ~0, 0, 0);
 	GameStateRestore = StateRestore;
+	chrramvariant = info->CHRRomSize == 0;
 }

From a4586e0aee55e70cf9f1d19151e6dd4df0df2cdf Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sat, 13 Nov 2021 23:15:13 +0100
Subject: [PATCH 157/295] Add UNROM modes and two-chip variant to mapper 242

---
 src/boards/addrlatch.c | 55 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c
index e46b9ee..e8fa155 100644
--- a/src/boards/addrlatch.c
+++ b/src/boards/addrlatch.c
@@ -495,15 +495,64 @@ void Mapper231_Init(CartInfo *info) {
 }
 
 /*------------------ Map 242 ---------------------------*/
-
+static uint8 M242TwoChips;
 static void M242Sync(void) {
+	uint32 S = latche & 1;
+	uint32 p = (latche >> 2) & 0x1F;
+	uint32 L = (latche >> 9) & 1;
+	
+	if (M242TwoChips) {
+		if (latche &0x600)
+		{	/* First chip */
+			p &= 0x1F; 
+		}
+		else
+		{	/* Second chip */
+			p &= 0x07;
+			p += 0x20;
+		}
+	}
+
+	if ((latche >> 7) & 1) {
+		if (S) {
+			setprg32(0x8000, p >> 1);
+		} else {
+			setprg16(0x8000, p);
+			setprg16(0xC000, p);
+		}
+	} else {
+		if (S) {
+			if (L) {
+				setprg16(0x8000, p & 0x3E);
+				setprg16(0xC000, p | 7);
+			} else {
+				setprg16(0x8000, p & 0x3E);
+				setprg16(0xC000, p & 0x38);
+			}
+		} else {
+			if (L) {
+				setprg16(0x8000, p);
+				setprg16(0xC000, p | 7);
+			} else {
+				setprg16(0x8000, p);
+				setprg16(0xC000, p & 0x38);
+			}
+		}
+	}
+
+	if (!hasBattery && (latche & 0x80) == 0x80)
+		/* CHR-RAM write protect hack, needed for some multicarts */
+		SetupCartCHRMapping(0, CHRptr[0], 0x2000, 0);
+	else
+		SetupCartCHRMapping(0, CHRptr[0], 0x2000, 1);
+
+	setmirror(((latche >> 1) & 1) ^ 1);
 	setchr8(0);
 	setprg8r(0x10, 0x6000, 0);
-	setprg32(0x8000, (latche >> 3) & 0xf);
-	setmirror(((latche >> 1) & 1) ^ 1);
 }
 
 void Mapper242_Init(CartInfo *info) {
+	M242TwoChips = info->PRGRomSize &0x20000 && info->PRGRomSize >0x20000;
 	Latch_Init(info, M242Sync, NULL, 0x0000, 0x8000, 0xFFFF, 1);
 }
 

From fe6c0c45138fccadd3e31fa9ce5ef664719cede8 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sun, 14 Nov 2021 16:11:24 +0100
Subject: [PATCH 158/295] Added support for mapper 383.

---
 src/boards/383.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |   1 +
 src/ines.h       |   1 +
 3 files changed, 110 insertions(+)
 create mode 100644 src/boards/383.c

diff --git a/src/boards/383.c b/src/boards/383.c
new file mode 100644
index 0000000..ade8b07
--- /dev/null
+++ b/src/boards/383.c
@@ -0,0 +1,108 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02110-1301	USA
+ */
+ 
+/*	晶太 YY840708C PCB
+	Solely used for the "1995 Soccer 6-in-1 足球小将專輯 (JY-014)" multicart.
+	MMC3+PAL16L8 combination, resulting in a bizarre mapper that switches banks in part upon *reads*.
+*/ 
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+#define A15    EXPREGS[0]
+#define A16    EXPREGS[1]
+#define A17A18 EXPREGS[2]
+
+static void M383PRGWrap (uint32 A, uint8 V)
+{
+	switch(A17A18)
+	{
+		case 0x00:
+			/* "Setting 0 provides a round-about means of dividing the first 128 KiB bank into two 32 KiB and one 64 KiB bank." */
+			setprg8(A, V &(A16? 0x07: 0x03) | (A16? 0x00: A15) | A16 | A17A18);
+			break;
+		case 0x30:
+			/* "Setting 3 provides 128 KiB MMC3 banking with the CPU A14 line fed to the MMC3 clone reversed.
+			   This is used for the game Tecmo Cup: Soccer Game (renamed "Tecmo Cup Soccer"),
+			   originally an MMC1 game with the fixed bank at $8000-$BFFF and the switchable bank at $C000-$FFFF,
+			   a configuration that could not be reproduced with an MMC3 alone." */
+			setprg8(A ^0x4000, V &0x0F | A17A18);
+			
+			/* "It is also used for the menu,
+			   which in part executes from PRG-ROM mapped to the CPU $6000-$7FFF address range on the MMC3 clone's fixed banks alone,
+			   as no MMC3 PRG bank register is written to before JMPing to this address range." */
+			if (A ==0xE000) setprg8(A ^0x8000, V &0x0B | A17A18);
+			break;
+		default:
+			/* "Settings 1 and 2 provide normal 128 KiB MMC3 banking." */
+			setprg8(A, V &0x0F | A17A18);
+			break;
+	}
+}
+
+static void M383CHRWrap (uint32 A, uint8 V)
+{
+	setchr1(A, V &0x7F | A17A18 <<3);
+}
+
+static DECLFR(M383Read)
+{
+	if (A17A18 ==0x00)
+	{	/* "PAL PRG A16 is updated with the content of the corresponding MMC3 PRG bank bit by reading from the respective address range,
+		   which in turn will then be applied across the entire ROM address range." */
+		A16 =DRegBuf[0x06 | A >>13 &0x01] &0x08;
+		FixMMC3PRG(MMC3_cmd);
+	}
+	return CartBR(A);
+}
+
+static DECLFW(M383Write)
+{
+	if (A &0x0100)
+	{
+		A15    =A >>11 &0x04;
+		A17A18 =A &0x30;
+		FixMMC3PRG(MMC3_cmd);
+		FixMMC3CHR(MMC3_cmd);		
+	}
+	if (A &0x4000)
+		MMC3_IRQWrite(A, V);
+	else
+		MMC3_CMDWrite(A, V);
+}
+
+static void M383Reset (void) {
+	EXPREGS[0] = 0;
+	EXPREGS[1] = 0;
+	EXPREGS[2] = 0;
+	MMC3RegReset();
+}
+
+static void M383Power (void) {
+	GenMMC3Power();
+	SetReadHandler(0x8000, 0xBFFF, M383Read);
+	SetWriteHandler(0x8000, 0xFFFF, M383Write);
+}
+
+void Mapper383_Init(CartInfo *info) {
+	GenMMC3_Init(info, 128, 128, 8, 0);
+	pwrap = M383PRGWrap;
+	cwrap = M383CHRWrap;
+	info->Power = M383Power;
+	info->Reset = M383Reset;
+	AddExState(EXPREGS, 3, 0, "EXPR");
+}
diff --git a/src/ines.c b/src/ines.c
index f99aea1..4d3b8a7 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -699,6 +699,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "42 to 80,000 (970630C)",   380, Mapper380_Init         )
 	INES_BOARD( "KN-42",                    381, Mapper381_Init         )
 	INES_BOARD( "830928C",                  382, Mapper382_Init         )
+	INES_BOARD( "YY840708C",                383, Mapper383_Init         )
 	INES_BOARD( "Caltron 9-in-1",           389, Mapper389_Init         )
 	INES_BOARD( "Realtec 8031",             390, Mapper390_Init         )
 	INES_BOARD( "NewStar 12-in-1/7-in-1",   293, Mapper293_Init         )
diff --git a/src/ines.h b/src/ines.h
index 3cf415f..1d4278d 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -274,6 +274,7 @@ void Mapper376_Init(CartInfo *);
 void Mapper380_Init(CartInfo *);
 void Mapper381_Init(CartInfo *);
 void Mapper382_Init(CartInfo *);
+void Mapper383_Init(CartInfo *);
 void Mapper386_Init(CartInfo *);
 void Mapper387_Init(CartInfo *);
 void Mapper388_Init(CartInfo *);

From 46a8874fe9765ae8b02a3d081ac021ddc15bbc5d Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sun, 14 Nov 2021 16:20:10 +0100
Subject: [PATCH 159/295] CNROM/UNROM: Only emulate bus conflicts when
 explicitly specified by NES 2.0 header.

---
 src/boards/datalatch.c | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/boards/datalatch.c b/src/boards/datalatch.c
index 9f85609..32592f3 100644
--- a/src/boards/datalatch.c
+++ b/src/boards/datalatch.c
@@ -126,15 +126,6 @@ void NROM_Init(CartInfo *info) {
 /*------------------ Map 2 ---------------------------*/
 
 static void UNROMSync(void) {
-#if 0
-	static uint32 mirror_in_use = 0;
-	if (PRGsize[0] <= 128 * 1024) {
-		setprg16(0x8000, latche & 0x7);
-		if ((latche & 0xF8) == 0x08) mirror_in_use = 1;
-		if (mirror_in_use)
-			setmirror(((latche >> 3) & 1) ^ 1);	/* Higway Star Hacked mapper to be redefined to another mapper */
-	} else
-#endif
 	setprg8r(0x10, 0x6000, 0);
 	setprg16(0x8000, latche);
 	setprg16(0xc000, ~0);
@@ -142,7 +133,8 @@ static void UNROMSync(void) {
 }
 
 void UNROM_Init(CartInfo *info) {
-	Latch_Init(info, UNROMSync, 0, 0x8000, 0xFFFF, 1, 0);
+	/* By default, do not emulate bus conflicts except when explicitly told by a NES 2.0 header to do so. */
+	Latch_Init(info, UNROMSync, 0, 0x8000, 0xFFFF, 1, info->iNES2 && info->submapper == 2);
 }
 
 /*------------------ Map 3 ---------------------------*/
@@ -154,11 +146,8 @@ static void CNROMSync(void) {
 }
 
 void CNROM_Init(CartInfo *info) {
-	uint8 CNROM_busc = 1; /* by default, CNROM is set to emulate bus conflicts to all games. */
-	if (info->submapper && info->submapper == 1) /* no bus conflict */
-		CNROM_busc = 0;
-	FCEU_printf(" Bus Conflict: %s\n", CNROM_busc ? "Yes" : "No");
-	Latch_Init(info, CNROMSync, 0, 0x8000, 0xFFFF, 1, CNROM_busc);
+	/* By default, do not emulate bus conflicts except when explicitly told by a NES 2.0 header to do so. */
+	Latch_Init(info, CNROMSync, 0, 0x8000, 0xFFFF, 1, info->iNES2 && info->submapper == 2);
 }
 
 /*------------------ Map 7 ---------------------------*/

From 7e265427372be8503ee9c5f11f51daab22639a57 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sun, 14 Nov 2021 16:25:40 +0100
Subject: [PATCH 160/295] Mapper 178: Always reset to menu.

---
 src/boards/178.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/boards/178.c b/src/boards/178.c
index 8f2a8d9..ca60dfe 100644
--- a/src/boards/178.c
+++ b/src/boards/178.c
@@ -136,6 +136,11 @@ static void M178Power(void) {
 	FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
 }
 
+static void M178Reset(void) {
+	/* Always reset to menu */
+	reg[0] = reg[1] = reg[2] = reg[3] = 0;
+	Sync();
+}
 static void M178SndClk(int a) {
 	if (pcm_enable) {
 		pcm_latch -= a;
@@ -158,6 +163,7 @@ static void StateRestore(int version) {
 
 void Mapper178_Init(CartInfo *info) {
 	info->Power = M178Power;
+	info->Reset = M178Reset;
 	info->Close = M178Close;
 	GameStateRestore = StateRestore;
 	MapIRQHook = M178SndClk;

From e12a40c2f4b39f0fe324c7901caa3e3b85b5f766 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sun, 14 Nov 2021 16:33:37 +0100
Subject: [PATCH 161/295] Mapper 57: Change default DIP for YH-xxx Olympic
 multicarts, always reset to menu

---
 src/boards/57.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/boards/57.c b/src/boards/57.c
index 278b196..a2a7c8e 100644
--- a/src/boards/57.c
+++ b/src/boards/57.c
@@ -54,8 +54,7 @@ static DECLFW(M57Write) {
 }
 
 static void M57Power(void) {
-	regs[1] = regs[0] = 0;
-	hrd_flag = 0;
+	hrd_flag = 1; /* YH-xxx "Olympic" multicarts disable the menu after one selection */
 	SetReadHandler(0x8000, 0xFFFF, CartBR);
 	SetWriteHandler(0x8000, 0xFFFF, M57Write);
 	SetReadHandler(0x6000, 0x6000, M57Read);
@@ -63,6 +62,7 @@ static void M57Power(void) {
 }
 
 static void M57Reset(void) {
+	regs[1] = regs[0] = 0; /* Always reset to menu */
 	hrd_flag++;
 	hrd_flag &= 3;
 	FCEU_printf("Select Register = %02x\n", hrd_flag);

From ea17977c20e87b9ae058a4d9101c55405b828353 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sun, 14 Nov 2021 17:01:55 +0100
Subject: [PATCH 162/295] Mapper 319: Use hp898f.c only for the old incorrect
 UNIF bank order, and 319.c for all NES 2.0 ROMs. Add CNROM mode and solder
 pad switch to the latter.

---
 src/boards/319.c    | 86 +++++++++++++++++++++++++++++++++++++++++++++
 src/boards/57.c     |  1 +
 src/boards/hp898f.c | 56 +++++++----------------------
 src/ines.c          |  2 +-
 src/ines.h          |  1 +
 5 files changed, 102 insertions(+), 44 deletions(-)
 create mode 100644 src/boards/319.c

diff --git a/src/boards/319.c b/src/boards/319.c
new file mode 100644
index 0000000..d7288b6
--- /dev/null
+++ b/src/boards/319.c
@@ -0,0 +1,86 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2005 CaH4e3
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include "mapinc.h"
+
+static uint8 reg[2];
+static uint8 latch;
+static uint8 pad;
+
+static SFORMAT StateRegs[] =
+{
+	{ reg, 2, "REG" },
+	{ &latch, 1, "LATC" },
+	{ &pad, 1, "PAD" },
+	{ 0 }
+};
+
+static void M319Sync (void) {
+	if (reg[1] &0x40)
+		setprg32(0x8000, reg[1] >>3 &3);
+	else
+	{
+		setprg16(0x8000, reg[1] >>2 &6 | reg[1] >>5 &1);
+		setprg16(0xC000, reg[1] >>2 &6 | reg[1] >>5 &1);
+	}
+	setchr8(reg[0] >>4 &~(reg[0] <<2 &4) | latch <<2 &(reg[0] <<2 &4));
+	setmirror(reg[1] >>7);
+}
+
+static void StateRestore(int version) {
+	M319Sync();
+}
+
+static DECLFR(M319ReadPad) {
+	return pad;
+}
+
+static DECLFW(M319WriteReg) {
+	reg[A >>2 &1] =V;
+	M319Sync();
+}
+
+static DECLFW(M319WriteLatch) {
+	latch =V;
+	M319Sync();
+}
+
+static void M319Reset(void) {
+	reg[0] =reg[1] =latch =0;
+	pad ^=0x40;
+	M319Sync();
+}
+
+static void M319Power(void) {
+	reg[0] =reg[1] =latch =pad =0;
+	M319Sync();
+	SetReadHandler(0x5000, 0x5FFF, M319ReadPad);
+	SetReadHandler(0x6000, 0xFFFF, CartBR);
+	SetWriteHandler(0x6000, 0x7FFF, M319WriteReg);
+	SetWriteHandler(0x8000, 0xFFFF, M319WriteLatch);
+}
+
+void Mapper319_Init(CartInfo *info) {
+	info->Power = M319Power;
+	info->Reset = M319Reset;
+	GameStateRestore = StateRestore;
+	AddExState(&StateRegs, ~0, 0, 0);
+}
diff --git a/src/boards/57.c b/src/boards/57.c
index a2a7c8e..ffd6c8c 100644
--- a/src/boards/57.c
+++ b/src/boards/57.c
@@ -54,6 +54,7 @@ static DECLFW(M57Write) {
 }
 
 static void M57Power(void) {
+	regs[1] = regs[0] = 0; /* Always reset to menu */
 	hrd_flag = 1; /* YH-xxx "Olympic" multicarts disable the menu after one selection */
 	SetReadHandler(0x8000, 0xFFFF, CartBR);
 	SetWriteHandler(0x8000, 0xFFFF, M57Write);
diff --git a/src/boards/hp898f.c b/src/boards/hp898f.c
index a3ace3f..43ba53d 100644
--- a/src/boards/hp898f.c
+++ b/src/boards/hp898f.c
@@ -20,45 +20,25 @@
 
 #include "mapinc.h"
 
+/* This source code file only applies to Sanchez' original UNIF file with the incorrect bank order.
+   The correctly-specified mapper, used for all NES 2.0 ROM files, is implemented in 319.c. */
+
 static uint8 regs[2];
-static uint8 _submapper = 0;
 
 static SFORMAT StateRegs[] =
 {
 	{ regs, 2, "REGS" },
-	{ &_submapper ,1, "SUBM"},
 	{ 0 }
 };
 
-/* submapper 1 The code for the original fceux
- * submapper 0 new HP898F code by dragon2snow,loong2snow from www.nesbbs.com 
- */
-static void Sync(void) {
-	
-	if (_submapper == 1)
-	{
-		uint8 chr = (regs[0] >> 4) & 7;
-		uint8 prg = (regs[1] >> 3) & 7;
-		uint8 dec = (regs[1] >> 4) & 4;
-		setchr8(chr & (~(((regs[0] & 1) << 2) | (regs[0] & 2))));
-		setprg16(0x8000, prg & (~dec));
-		setprg16(0xC000, prg | dec);
-		setmirror(regs[1] >> 7);
-	}
-	else
-	{
-		if (regs[1] & 0x40)
-			setprg32(0x8000, regs[1] >> 1);
-		else {
-			setprg16(0x8000, regs[1]);
-			setprg16(0xC000, regs[1]);
-		}
-		setchr8((regs[0] >> 4) &~(((regs[0] & 1) ? 4 : 0) | (regs[0] & 2)));
-		if (regs[1] & 0x80)
-			setmirror(1);
-		else
-			setmirror(0);
-	}
+static void Sync(void) {	
+	uint8 chr = (regs[0] >> 4) & 7;
+	uint8 prg = (regs[1] >> 3) & 7;
+	uint8 dec = (regs[1] >> 4) & 4;
+	setchr8(chr & (~(((regs[0] & 1) << 2) | (regs[0] & 2))));
+	setprg16(0x8000, prg & (~dec));
+	setprg16(0xC000, prg | dec);
+	setmirror(regs[1] >> 7);
 }
 
 static DECLFW(HP898FWrite) {
@@ -78,17 +58,8 @@ static DECLFW(HP898FWriteEx) {
 static void HP898FPower(void) {
 	regs[0] = regs[1] = 0;
 	Sync();
-	if (_submapper == 1)
-	{
-		SetReadHandler(0x8000, 0xFFFF, CartBR);
-		SetWriteHandler(0x6000, 0xFFFF, HP898FWrite);
-	}
-	else
-	{
-		SetReadHandler(0x8000, 0xFFFF, CartBR);
-		SetWriteHandler(0x6000, 0x7FFF, HP898FWriteEx);
-		SetWriteHandler(0xE000, 0xFFFF, HP898FWriteEx);
-	}
+	SetReadHandler(0x8000, 0xFFFF, CartBR);
+	SetWriteHandler(0x6000, 0xFFFF, HP898FWrite);
 }
 
 static void HP898FReset(void) {
@@ -101,7 +72,6 @@ static void StateRestore(int version) {
 }
 
 void BMCHP898F_Init(CartInfo *info) {
-	_submapper = info->submapper;
 	info->Reset = HP898FReset;
 	info->Power = HP898FPower;
 	GameStateRestore = StateRestore;
diff --git a/src/ines.c b/src/ines.c
index 4d3b8a7..795784f 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -758,7 +758,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "RESET-TXROM",              313, BMCRESETTXROM_Init     )
 	INES_BOARD( "64in1NoRepeat",            314, BMC64in1nr_Init        )
 	INES_BOARD( "830134C",                  315, BMC830134C_Init        )
-	INES_BOARD( "HP898F",                   319, BMCHP898F_Init         )
+	INES_BOARD( "HP898F",                   319, Mapper319_Init         )
 	INES_BOARD( "830425C-4391T",            320, BMC830425C4391T_Init   )
 	INES_BOARD( "K-3033",                   322, BMCK3033_Init          )
 	INES_BOARD( "FARID_SLROM_8-IN-1",       323, FARIDSLROM8IN1_Init    )
diff --git a/src/ines.h b/src/ines.h
index 1d4278d..6f36333 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -260,6 +260,7 @@ void Mapper269_Init(CartInfo *);
 void Mapper288_Init(CartInfo *);
 void Mapper293_Init(CartInfo *);
 void Mapper297_Init(CartInfo *);
+void Mapper319_Init(CartInfo *);
 void Mapper353_Init(CartInfo *);
 void Mapper356_Init(CartInfo *);
 void Mapper357_Init(CartInfo *);

From 8eb4e3b80c23089c5b85c7ea9faf58afc8ff1923 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sun, 14 Nov 2021 17:10:33 +0100
Subject: [PATCH 163/295] Mapper 196: Support IRQ for The Ancient & Modern
 Heroes

---
 src/boards/mmc3.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/boards/mmc3.c b/src/boards/mmc3.c
index 3fbfd22..48885de 100644
--- a/src/boards/mmc3.c
+++ b/src/boards/mmc3.c
@@ -1080,13 +1080,11 @@ static void M196PW(uint32 A, uint8 V) {
 }
 
 static DECLFW(Mapper196Write) {
-	if (A >= 0xC000) {
-		A = (A & 0xFFFE) | ((A >> 2) & 1) | ((A >> 3) & 1);
+	A =A &0xF000 | (!!(A &0xE) ^(A &1));
+	if (A >= 0xC000)
 		MMC3_IRQWrite(A, V);
-	} else {
-		A = (A & 0xFFFE) | ((A >> 2) & 1) | ((A >> 3) & 1) | ((A >> 1) & 1);
+	else
 		MMC3_CMDWrite(A, V);
-	}
 }
 
 static DECLFW(Mapper196WriteLo) {

From cb5481af1fa34831cfba7957b3af72bab4b27d0b Mon Sep 17 00:00:00 2001
From: DisasterMo <michael.burgardt@gmail.com>
Date: Sat, 4 Dec 2021 14:41:07 +0100
Subject: [PATCH 164/295] Add automatic Crowdin synchronization

---
 .github/workflows/crowdin_prep.yml            |    33 +
 .github/workflows/crowdin_translate.yml       |    46 +
 intl/.gitignore                               |     4 +
 intl/activate.py                              |    70 +
 intl/core_option_regex.py                     |    95 +
 intl/core_option_translation.py               |   620 +
 intl/crowdin.yaml                             |    13 +
 intl/crowdin_prep.py                          |    30 +
 intl/crowdin_source_upload.py                 |    93 +
 intl/crowdin_translate.py                     |    39 +
 intl/crowdin_translation_download.py          |    93 +
 intl/download_workflow.py                     |    16 +
 intl/initial_sync.py                          |   125 +
 intl/remove_initial_cycle.py                  |    30 +
 intl/upload_workflow.py                       |    15 +
 intl/v1_to_v2_converter.py                    |   476 +
 src/drivers/libretro/libretro.c               |     6 +-
 src/drivers/libretro/libretro_core_options.h  |    69 +-
 .../libretro/libretro_core_options_intl.h     | 23016 +++++++++++++++-
 19 files changed, 24832 insertions(+), 57 deletions(-)
 create mode 100644 .github/workflows/crowdin_prep.yml
 create mode 100644 .github/workflows/crowdin_translate.yml
 create mode 100644 intl/.gitignore
 create mode 100644 intl/activate.py
 create mode 100644 intl/core_option_regex.py
 create mode 100644 intl/core_option_translation.py
 create mode 100644 intl/crowdin.yaml
 create mode 100644 intl/crowdin_prep.py
 create mode 100644 intl/crowdin_source_upload.py
 create mode 100644 intl/crowdin_translate.py
 create mode 100644 intl/crowdin_translation_download.py
 create mode 100644 intl/download_workflow.py
 create mode 100644 intl/initial_sync.py
 create mode 100644 intl/remove_initial_cycle.py
 create mode 100644 intl/upload_workflow.py
 create mode 100644 intl/v1_to_v2_converter.py

diff --git a/.github/workflows/crowdin_prep.yml b/.github/workflows/crowdin_prep.yml
new file mode 100644
index 0000000..165f24b
--- /dev/null
+++ b/.github/workflows/crowdin_prep.yml
@@ -0,0 +1,33 @@
+# Prepare source texts & upload them to Crowdin
+
+name: Crowdin Source Texts Upload
+
+# on change to the English texts
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'src/drivers/libretro/libretro_core_options.h'
+
+jobs:
+  upload_source_file:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Java JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Setup Python
+        uses: actions/setup-python@v2
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Upload Source
+        shell: bash
+        env:
+          CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
+        run: |
+          python3 intl/upload_workflow.py $CROWDIN_API_KEY "libretro-fceumm" "src/drivers/libretro/libretro_core_options.h"
diff --git a/.github/workflows/crowdin_translate.yml b/.github/workflows/crowdin_translate.yml
new file mode 100644
index 0000000..cb8972e
--- /dev/null
+++ b/.github/workflows/crowdin_translate.yml
@@ -0,0 +1,46 @@
+# Download translations form Crowdin & Recreate libretro_core_options_intl.h
+
+name: Crowdin Translation Integration
+
+on:
+  schedule:
+  # please choose a random time & weekday to avoid all repos synching at the same time
+    - cron: '20 1 * * 5'  # Fridays at 1:20 AM, UTC
+
+jobs:
+  create_intl_file:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Java JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Setup Python
+        uses: actions/setup-python@v2
+
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal access token.
+          fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository.
+
+      - name: Create intl file
+        shell: bash
+        env:
+          CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
+        run: |
+          python3 intl/download_workflow.py $CROWDIN_API_KEY "libretro-fceumm" "src/drivers/libretro/libretro_core_options_intl.h"
+
+      - name: Commit files
+        run: |
+          git config --local user.email "github-actions@github.com"
+          git config --local user.name "github-actions[bot]"
+          git add intl/*_workflow.py "src/drivers/libretro/libretro_core_options_intl.h"
+          git commit -m "Fetch translations & Recreate libretro_core_options_intl.h"
+
+      - name: GitHub Push
+        uses: ad-m/github-push-action@v0.6.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: ${{ github.ref }}
diff --git a/intl/.gitignore b/intl/.gitignore
new file mode 100644
index 0000000..458f3d3
--- /dev/null
+++ b/intl/.gitignore
@@ -0,0 +1,4 @@
+__pycache__
+crowdin-cli.jar
+*.h
+*.json
diff --git a/intl/activate.py b/intl/activate.py
new file mode 100644
index 0000000..0ef70c2
--- /dev/null
+++ b/intl/activate.py
@@ -0,0 +1,70 @@
+#!/usr/bin/env python3
+
+import os
+import glob
+import random as r
+
+# --------------------          MAIN          -------------------- #
+
+if __name__ == '__main__':
+   DIR_PATH = os.path.dirname(os.path.realpath(__file__))
+   if os.path.basename(DIR_PATH) != "intl":
+      raise RuntimeError("Script is not in intl folder!")
+
+   BASE_PATH = os.path.dirname(DIR_PATH)
+   WORKFLOW_PATH = os.path.join(BASE_PATH, ".github", "workflows")
+   PREP_WF = os.path.join(WORKFLOW_PATH, "crowdin_prep.yml")
+   TRANSLATE_WF = os.path.join(WORKFLOW_PATH, "crowdin_translate.yml")
+   CORE_NAME = os.path.basename(BASE_PATH)
+   CORE_OP_FILE = os.path.join(BASE_PATH, "**", "libretro_core_options.h")
+
+   core_options_hits = glob.glob(CORE_OP_FILE, recursive=True)
+
+   if len(core_options_hits) == 0:
+      raise RuntimeError("libretro_core_options.h not found!")
+   elif len(core_options_hits) > 1:
+      print("More than one libretro_core_options.h file found:\n\n")
+      for i, file in enumerate(core_options_hits):
+         print(f"{i} {file}\n")
+
+      while True:
+         user_choice = input("Please choose one ('q' will exit): ")
+         if user_choice == 'q':
+            exit(0)
+         elif user_choice.isdigit():
+            core_op_file = core_options_hits[int(user_choice)]
+            break
+         else:
+            print("Please make a valid choice!\n\n")
+   else:
+      core_op_file = core_options_hits[0]
+
+   core_intl_file = os.path.join(os.path.dirname(core_op_file.replace(BASE_PATH, ''))[1:],
+                                 'libretro_core_options_intl.h')
+   core_op_file   = os.path.join(os.path.dirname(core_op_file.replace(BASE_PATH, ''))[1:],
+                                 'libretro_core_options.h')
+   minutes = r.randrange(0, 59, 5)
+   hour = r.randrange(0, 23)
+
+   with open(PREP_WF, 'r') as wf_file:
+      prep_txt = wf_file.read()
+
+   prep_txt = prep_txt.replace("<CORE_NAME>", CORE_NAME)
+   prep_txt = prep_txt.replace("<PATH/TO>/libretro_core_options.h",
+                               core_op_file)
+   with open(PREP_WF, 'w') as wf_file:
+      wf_file.write(prep_txt)
+
+
+   with open(TRANSLATE_WF, 'r') as wf_file:
+      translate_txt = wf_file.read()
+
+   translate_txt = translate_txt.replace('<0-59>', f"{minutes}")
+   translate_txt = translate_txt.replace('<0-23>', f"{hour}")
+   translate_txt = translate_txt.replace('# Fridays at , UTC',
+                                         f"# Fridays at {hour%12}:{minutes} {'AM' if hour < 12 else 'PM'}, UTC")
+   translate_txt = translate_txt.replace("<CORE_NAME>", CORE_NAME)
+   translate_txt = translate_txt.replace('<PATH/TO>/libretro_core_options_intl.h',
+                                         core_intl_file)
+   with open(TRANSLATE_WF, 'w') as wf_file:
+      wf_file.write(translate_txt)
diff --git a/intl/core_option_regex.py b/intl/core_option_regex.py
new file mode 100644
index 0000000..34a3f20
--- /dev/null
+++ b/intl/core_option_regex.py
@@ -0,0 +1,95 @@
+import re
+
+# 0: full struct; 1: up to & including first []; 2: content between first {}
+p_struct = re.compile(r'(struct\s*[a-zA-Z0-9_\s]+\[])\s*'
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+)\s*)*'
+                      r'=\s*'  # =
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+)\s*)*'
+                      r'{((?:.|[\r\n])*?)\{\s*NULL,\s*NULL,\s*NULL\s*(?:.|[\r\n])*?},?(?:.|[\r\n])*?};')  # captures full struct, it's beginning and it's content
+# 0: type name[]; 1: type; 2: name
+p_type_name = re.compile(r'(retro_core_option_[a-zA-Z0-9_]+)\s*'
+                         r'(option_cats([a-z_]{0,8})|option_defs([a-z_]{0,8}))\s*\[]')
+# 0: full option; 1: key; 2: description; 3: additional info; 4: key/value pairs
+p_option = re.compile(r'{\s*'  # opening braces
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r'(\".*?\"|'  # key start; group 1
+                      r'[a-zA-Z0-9_]+\s*\((?:.|[\r\n])*?\)|'
+                      r'[a-zA-Z0-9_]+\s*\[(?:.|[\r\n])*?]|'
+                      r'[a-zA-Z0-9_]+\s*\".*?\")\s*'  # key end
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r',\s*'  # comma
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r'(\".*?\")\s*'  # description; group 2
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r',\s*'  # comma
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r'((?:'  # group 3
+                      r'(?:NULL|\"(?:.|[\r\n])*?\")\s*'  # description in category, info, info in category, category
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r',?\s*'  # comma
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r')+)'
+                      r'(?:'  # defs only start
+                      r'{\s*'  # opening braces
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r'((?:'  # key/value pairs start; group 4
+                      r'{\s*'  # opening braces
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r'(?:NULL|\".*?\")\s*'  # option key
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r',\s*'  # comma
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r'(?:NULL|\".*?\")\s*'  # option value
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r'}\s*'  # closing braces
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r',?\s*'  # comma
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r')*)'  # key/value pairs end
+                      r'}\s*'  # closing braces
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r',?\s*'  # comma
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r'(?:'  # defaults start
+                      r'(?:NULL|\".*?\")\s*'  # default value
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r',?\s*'  # comma
+                      r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                      r')*'  # defaults end
+                      r')?'  # defs only end
+                      r'},')  # closing braces
+# analyse option group 3
+p_info = re.compile(r'(NULL|\"(?:.|[\r\n])*?\")\s*'  # description in category, info, info in category, category
+                    r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                    r',')
+p_info_cat = re.compile(r'(NULL|\"(?:.|[\r\n])*?\")')
+# analyse option group 4
+p_key_value = re.compile(r'{\s*'  # opening braces
+                         r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                         r'(NULL|\".*?\")\s*'  # option key; 1
+                         r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                         r',\s*'  # comma
+                         r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                         r'(NULL|\".*?\")\s*'  # option value; 2
+                         r'(?:(?:\/\*(?:.|[\r\n])*?\*\/|\/\/.*[\r\n]+|#.*[\r\n]+)\s*)*'
+                         r'}')
+
+p_masked = re.compile(r'([A-Z_][A-Z0-9_]+)\s*(\"(?:"\s*"|\\\s*|.)*\")')
+
+p_intl = re.compile(r'(struct retro_core_option_definition \*option_defs_intl\[RETRO_LANGUAGE_LAST]) = {'
+                    r'((?:.|[\r\n])*?)};')
+p_set = re.compile(r'static INLINE void libretro_set_core_options\(retro_environment_t environ_cb\)'
+                   r'(?:.|[\r\n])*?};?\s*#ifdef __cplusplus\s*}\s*#endif')
+
+p_yaml = re.compile(r'"project_id": "[0-9]+".*\s*'
+                    r'"api_token": "([a-zA-Z0-9]+)".*\s*'
+                    r'"base_path": "\./intl".*\s*'
+                    r'"base_url": "https://api\.crowdin\.com".*\s*'
+                    r'"preserve_hierarchy": true.*\s*'
+                    r'"files": \[\s*'
+                    r'\{\s*'
+                    r'"source": "/_us/\*\.json",.*\s*'
+                    r'"translation": "/_%two_letters_code%/%original_file_name%",.*\s*'
+                    r'"skip_untranslated_strings": true.*\s*'
+                    r'},\s*'
+                    r']')
diff --git a/intl/core_option_translation.py b/intl/core_option_translation.py
new file mode 100644
index 0000000..54a4cf9
--- /dev/null
+++ b/intl/core_option_translation.py
@@ -0,0 +1,620 @@
+#!/usr/bin/env python3
+
+"""Core options text extractor
+
+The purpose of this script is to set up & provide functions for automatic generation of 'libretro_core_options_intl.h'
+from 'libretro_core_options.h' using translations from Crowdin.
+
+Both v1 and v2 structs are supported. It is, however, recommended to convert v1 files to v2 using the included
+'v1_to_v2_converter.py'.
+
+Usage:
+python3 path/to/core_option_translation.py "path/to/where/libretro_core_options.h & libretro_core_options_intl.h/are" "core_name"
+
+This script will:
+1.) create key words for & extract the texts from libretro_core_options.h & save them into intl/_us/core_options.h
+2.) do the same for any present translations in libretro_core_options_intl.h, saving those in their respective folder
+"""
+import core_option_regex as cor
+import re
+import os
+import sys
+import json
+import urllib.request as req
+import shutil
+
+# LANG_CODE_TO_R_LANG = {'_ar': 'RETRO_LANGUAGE_ARABIC',
+#                        '_ast': 'RETRO_LANGUAGE_ASTURIAN',
+#                        '_chs': 'RETRO_LANGUAGE_CHINESE_SIMPLIFIED',
+#                        '_cht': 'RETRO_LANGUAGE_CHINESE_TRADITIONAL',
+#                        '_cs': 'RETRO_LANGUAGE_CZECH',
+#                        '_cy': 'RETRO_LANGUAGE_WELSH',
+#                        '_da': 'RETRO_LANGUAGE_DANISH',
+#                        '_de': 'RETRO_LANGUAGE_GERMAN',
+#                        '_el': 'RETRO_LANGUAGE_GREEK',
+#                        '_eo': 'RETRO_LANGUAGE_ESPERANTO',
+#                        '_es': 'RETRO_LANGUAGE_SPANISH',
+#                        '_fa': 'RETRO_LANGUAGE_PERSIAN',
+#                        '_fi': 'RETRO_LANGUAGE_FINNISH',
+#                        '_fr': 'RETRO_LANGUAGE_FRENCH',
+#                        '_gl': 'RETRO_LANGUAGE_GALICIAN',
+#                        '_he': 'RETRO_LANGUAGE_HEBREW',
+#                        '_hu': 'RETRO_LANGUAGE_HUNGARIAN',
+#                        '_id': 'RETRO_LANGUAGE_INDONESIAN',
+#                        '_it': 'RETRO_LANGUAGE_ITALIAN',
+#                        '_ja': 'RETRO_LANGUAGE_JAPANESE',
+#                        '_ko': 'RETRO_LANGUAGE_KOREAN',
+#                        '_nl': 'RETRO_LANGUAGE_DUTCH',
+#                        '_oc': 'RETRO_LANGUAGE_OCCITAN',
+#                        '_pl': 'RETRO_LANGUAGE_POLISH',
+#                        '_pt_br': 'RETRO_LANGUAGE_PORTUGUESE_BRAZIL',
+#                        '_pt_pt': 'RETRO_LANGUAGE_PORTUGUESE_PORTUGAL',
+#                        '_ru': 'RETRO_LANGUAGE_RUSSIAN',
+#                        '_sk': 'RETRO_LANGUAGE_SLOVAK',
+#                        '_sv': 'RETRO_LANGUAGE_SWEDISH',
+#                        '_tr': 'RETRO_LANGUAGE_TURKISH',
+#                        '_uk': 'RETRO_LANGUAGE_UKRAINIAN',
+#                        '_us': 'RETRO_LANGUAGE_ENGLISH',
+#                        '_vn': 'RETRO_LANGUAGE_VIETNAMESE'}
+
+# these are handled by RetroArch directly - no need to include them in core translations
+ON_OFFS = {'"enabled"', '"disabled"', '"true"', '"false"', '"on"', '"off"'}
+
+
+def remove_special_chars(text: str, char_set=0, allow_non_ascii=False) -> str:
+   """Removes special characters from a text.
+
+   :param text: String to be cleaned.
+   :param char_set: 0 -> remove all ASCII special chars except for '_' & 'space' (default)
+                    1 -> remove invalid chars from file names
+   :param allow_non_ascii: False -> all non-ascii characters will be removed (default)
+                           True -> non-ascii characters will be passed through
+   :return: Clean text.
+   """
+   command_chars = [chr(unicode) for unicode in tuple(range(0, 32)) + (127,)]
+   special_chars = ([chr(unicode) for unicode in tuple(range(33, 48)) + tuple(range(58, 65)) + tuple(range(91, 95))
+                     + (96,) + tuple(range(123, 127))],
+                    ('\\', '/', ':', '*', '?', '"', '<', '>', '|', '#', '%',
+                     '&', '{', '}', '$', '!', '¸', "'", '@', '+', '='))
+   res = text if allow_non_ascii \
+      else text.encode('ascii', errors='ignore').decode('unicode-escape')
+
+   for cm in command_chars:
+      res = res.replace(cm, '_')
+   for sp in special_chars[char_set]:
+      res = res.replace(sp, '_')
+   while res.startswith('_'):
+      res = res[1:]
+   while res.endswith('_'):
+      res = res[:-1]
+   return res
+
+
+def clean_file_name(file_name: str) -> str:
+   """Removes characters which might make file_name inappropriate for files on some OS.
+
+   :param file_name: File name to be cleaned.
+   :return: The clean file name.
+   """
+   file_name = remove_special_chars(file_name, 1)
+   file_name = re.sub(r'__+', '_', file_name.replace(' ', '_'))
+   return file_name
+
+
+def get_struct_type_name(decl: str) -> tuple:
+   """ Returns relevant parts of the struct declaration:
+   type, name of the struct and the language appendix, if present.
+   :param decl: The struct declaration matched by cor.p_type_name.
+   :return: Tuple, e.g.: ('retro_core_option_definition', 'option_defs_us', '_us')
+   """
+   struct_match = cor.p_type_name.search(decl)
+   if struct_match:
+      if struct_match.group(3):
+         struct_type_name = struct_match.group(1, 2, 3)
+         return struct_type_name
+      elif struct_match.group(4):
+         struct_type_name = struct_match.group(1, 2, 4)
+         return struct_type_name
+      else:
+         struct_type_name = struct_match.group(1, 2)
+         return struct_type_name
+   else:
+      raise ValueError(f'No or incomplete struct declaration: {decl}!\n'
+                       'Please make sure all structs are complete, including the type and name declaration.')
+
+
+def is_viable_non_dupe(text: str, comparison) -> bool:
+   """text must be longer than 2 ('""'), not 'NULL' and not in comparison.
+
+   :param text: String to be tested.
+   :param comparison: Dictionary or set to search for text in.
+   :return: bool
+   """
+   return 2 < len(text) and text != 'NULL' and text not in comparison
+
+
+def is_viable_value(text: str) -> bool:
+   """text must be longer than 2 ('""'), not 'NULL' and text.lower() not in
+   {'"enabled"', '"disabled"', '"true"', '"false"', '"on"', '"off"'}.
+
+   :param text: String to be tested.
+   :return: bool
+   """
+   return 2 < len(text) and text != 'NULL' and text.lower() not in ON_OFFS
+
+
+def create_non_dupe(base_name: str, opt_num: int, comparison) -> str:
+   """Makes sure base_name is not in comparison, and if it is it's renamed.
+
+   :param base_name: Name to check/make unique.
+   :param opt_num: Number of the option base_name belongs to, used in making it unique.
+   :param comparison: Dictionary or set to search for base_name in.
+   :return: Unique name.
+   """
+   h = base_name
+   if h in comparison:
+      n = 0
+      h = h + '_O' + str(opt_num)
+      h_end = len(h)
+      while h in comparison:
+         h = h[:h_end] + '_' + str(n)
+         n += 1
+   return h
+
+
+def get_texts(text: str) -> dict:
+   """Extracts the strings, which are to be translated/are the translations,
+   from text and creates macro names for them.
+
+   :param text: The string to be parsed.
+   :return: Dictionary of the form { '_<lang>': { 'macro': 'string', ... }, ... }.
+   """
+   # all structs: group(0) full struct, group(1) beginning, group(2) content
+   structs = cor.p_struct.finditer(text)
+   hash_n_string = {}
+   just_string = {}
+   for struct in structs:
+      struct_declaration = struct.group(1)
+      struct_type_name = get_struct_type_name(struct_declaration)
+      if 3 > len(struct_type_name):
+         lang = '_us'
+      else:
+         lang = struct_type_name[2]
+      if lang not in just_string:
+         hash_n_string[lang] = {}
+         just_string[lang] = set()
+
+      is_v2 = False
+      pre_name = ''
+      p = cor.p_info
+      if 'retro_core_option_v2_definition' == struct_type_name[0]:
+         is_v2 = True
+      elif 'retro_core_option_v2_category' == struct_type_name[0]:
+         pre_name = 'CATEGORY_'
+         p = cor.p_info_cat
+
+      struct_content = struct.group(2)
+      # 0: full option; 1: key; 2: description; 3: additional info; 4: key/value pairs
+      struct_options = cor.p_option.finditer(struct_content)
+      for opt, option in enumerate(struct_options):
+         # group 1: key
+         if option.group(1):
+            opt_name = pre_name + option.group(1)
+            # no special chars allowed in key
+            opt_name = remove_special_chars(opt_name).upper().replace(' ', '_')
+         else:
+            raise ValueError(f'No option name (key) found in struct {struct_type_name[1]} option {opt}!')
+
+         # group 2: description0
+         if option.group(2):
+            desc0 = option.group(2)
+            if is_viable_non_dupe(desc0, just_string[lang]):
+               just_string[lang].add(desc0)
+               m_h = create_non_dupe(re.sub(r'__+', '_', f'{opt_name}_LABEL'), opt, hash_n_string[lang])
+               hash_n_string[lang][m_h] = desc0
+         else:
+            raise ValueError(f'No label found in struct {struct_type_name[1]} option {option.group(1)}!')
+
+         # group 3: desc1, info0, info1, category
+         if option.group(3):
+            infos = option.group(3)
+            option_info = p.finditer(infos)
+            if is_v2:
+               desc1 = next(option_info).group(1)
+               if is_viable_non_dupe(desc1, just_string[lang]):
+                  just_string[lang].add(desc1)
+                  m_h = create_non_dupe(re.sub(r'__+', '_', f'{opt_name}_LABEL_CAT'), opt, hash_n_string[lang])
+                  hash_n_string[lang][m_h] = desc1
+               last = None
+               m_h = None
+               for j, info in enumerate(option_info):
+                  last = info.group(1)
+                  if is_viable_non_dupe(last, just_string[lang]):
+                     just_string[lang].add(last)
+                     m_h = create_non_dupe(re.sub(r'__+', '_', f'{opt_name}_INFO_{j}'), opt,
+                                           hash_n_string[lang])
+                     hash_n_string[lang][m_h] = last
+               if last in just_string[lang]:  # category key should not be translated
+                  hash_n_string[lang].pop(m_h)
+                  just_string[lang].remove(last)
+            else:
+               for j, info in enumerate(option_info):
+                  gr1 = info.group(1)
+                  if is_viable_non_dupe(gr1, just_string[lang]):
+                     just_string[lang].add(gr1)
+                     m_h = create_non_dupe(re.sub(r'__+', '_', f'{opt_name}_INFO_{j}'), opt,
+                                           hash_n_string[lang])
+                     hash_n_string[lang][m_h] = gr1
+         else:
+            raise ValueError(f'Too few arguments in struct {struct_type_name[1]} option {option.group(1)}!')
+
+         # group 4:
+         if option.group(4):
+            for j, kv_set in enumerate(cor.p_key_value.finditer(option.group(4))):
+               set_key, set_value = kv_set.group(1, 2)
+               if not is_viable_value(set_value):
+                  if not is_viable_value(set_key):
+                     continue
+                  set_value = set_key
+               # re.fullmatch(r'(?:[+-][0-9]+)+', value[1:-1])
+               if set_value not in just_string[lang] and not re.sub(r'[+-]', '', set_value[1:-1]).isdigit():
+                  clean_key = set_key[1:-1]
+                  clean_key = remove_special_chars(clean_key).upper().replace(' ', '_')
+                  m_h = create_non_dupe(re.sub(r'__+', '_', f"OPTION_VAL_{clean_key}"), opt, hash_n_string[lang])
+                  hash_n_string[lang][m_h] = set_value
+                  just_string[lang].add(set_value)
+   return hash_n_string
+
+
+def create_msg_hash(intl_dir_path: str, core_name: str, keyword_string_dict: dict) -> dict:
+   """Creates '<core_name>.h' files in 'intl/_<lang>/' containing the macro name & string combinations.
+
+   :param intl_dir_path: Path to the intl directory.
+   :param core_name: Name of the core, used for the files' paths.
+   :param keyword_string_dict: Dictionary of the form { '_<lang>': { 'macro': 'string', ... }, ... }.
+   :return: Dictionary of the form { '_<lang>': 'path/to/file (./intl/_<lang>/<core_name>.h)', ... }.
+   """
+   files = {}
+   for localisation in keyword_string_dict:
+      path = os.path.join(intl_dir_path, core_name)  # intl/<core_name>/
+      files[localisation] = os.path.join(path, localisation + '.h')  # intl/<core_name>/_<lang>.h
+      if not os.path.exists(path):
+         os.makedirs(path)
+      with open(files[localisation], 'w', encoding='utf-8') as crowdin_file:
+         out_text = ''
+         for keyword in keyword_string_dict[localisation]:
+            out_text = f'{out_text}{keyword} {keyword_string_dict[localisation][keyword]}\n'
+         crowdin_file.write(out_text)
+   return files
+
+
+def h2json(file_paths: dict) -> dict:
+   """Converts .h files pointed to by file_paths into .jsons.
+
+   :param file_paths: Dictionary of the form { '_<lang>': 'path/to/file (./intl/_<lang>/<core_name>.h)', ... }.
+   :return: Dictionary of the form { '_<lang>': 'path/to/file (./intl/_<lang>/<core_name>.json)', ... }.
+   """
+   jsons = {}
+   for file_lang in file_paths:
+      if not os.path.isfile(file_paths[file_lang]):
+         continue
+
+      jsons[file_lang] = file_paths[file_lang][:-2] + '.json'
+
+      p = cor.p_masked
+
+      with open(file_paths[file_lang], 'r+', encoding='utf-8') as h_file:
+         text = h_file.read()
+         result = p.finditer(text)
+         messages = {}
+         for msg in result:
+            key, val = msg.group(1, 2)
+            if key not in messages:
+               if key and val:
+                  # unescape & remove "\n"
+                  messages[key] = re.sub(r'"\s*(?:(?:/\*(?:.|[\r\n])*?\*/|//.*[\r\n]+)\s*)*"',
+                                         '\\\n', val[1:-1].replace('\\\"', '"'))
+            else:
+               print(f"DUPLICATE KEY in {file_paths[file_lang]}: {key}")
+         with open(jsons[file_lang], 'w', encoding='utf-8') as json_file:
+            json.dump(messages, json_file, indent=2)
+
+   return jsons
+
+
+def json2h(intl_dir_path: str, file_list) -> None:
+   """Converts .json file in json_file_path into an .h ready to be included in C code.
+
+   :param intl_dir_path: Path to the intl/<core_name> directory.
+   :param file_list: Iterator of os.DirEntry objects. Contains localisation files to convert.
+   :return: None
+   """
+
+   p = cor.p_masked
+
+   def update(s_messages, s_template, s_source_messages, file_name):
+      translation = ''
+      template_messages = p.finditer(s_template)
+      for tp_msg in template_messages:
+         old_key = tp_msg.group(1)
+         if old_key in s_messages and s_messages[old_key] != s_source_messages[old_key]:
+            tl_msg_val = s_messages[old_key]
+            tl_msg_val = tl_msg_val.replace('"', '\\\"').replace('\n', '')  # escape
+            translation = ''.join((translation, '#define ', old_key, file_name.upper(), f' "{tl_msg_val}"\n'))
+
+         else:  # Remove English duplicates and non-translatable strings
+            translation = ''.join((translation, '#define ', old_key, file_name.upper(), ' NULL\n'))
+      return translation
+
+   us_h = os.path.join(intl_dir_path, '_us.h')
+   us_json = os.path.join(intl_dir_path, '_us.json')
+
+   with open(us_h, 'r', encoding='utf-8') as template_file:
+      template = template_file.read()
+   with open(us_json, 'r+', encoding='utf-8') as source_json_file:
+      source_messages = json.load(source_json_file)
+
+   for file in file_list:
+      if file.name.lower().startswith('_us') \
+         or file.name.lower().endswith('.h') \
+         or file.is_dir():
+         continue
+
+      with open(file.path, 'r+', encoding='utf-8') as json_file:
+         messages = json.load(json_file)
+         new_translation = update(messages, template, source_messages, os.path.splitext(file.name)[0])
+      with open(os.path.splitext(file.path)[0] + '.h', 'w', encoding='utf-8') as h_file:
+         h_file.seek(0)
+         h_file.write(new_translation)
+         h_file.truncate()
+   return
+
+
+def get_crowdin_client(dir_path: str) -> str:
+   """Makes sure the Crowdin CLI client is present. If it isn't, it is fetched & extracted.
+
+   :return: The path to 'crowdin-cli.jar'.
+   """
+   jar_name = 'crowdin-cli.jar'
+   jar_path = os.path.join(dir_path, jar_name)
+
+   if not os.path.isfile(jar_path):
+      print('Downloading crowdin-cli.jar')
+      crowdin_cli_file = os.path.join(dir_path, 'crowdin-cli.zip')
+      crowdin_cli_url = 'https://downloads.crowdin.com/cli/v3/crowdin-cli.zip'
+      req.urlretrieve(crowdin_cli_url, crowdin_cli_file)
+      import zipfile
+      with zipfile.ZipFile(crowdin_cli_file, 'r') as zip_ref:
+         jar_dir = zip_ref.namelist()[0]
+         for file in zip_ref.namelist():
+            if file.endswith(jar_name):
+               jar_file = file
+               break
+         zip_ref.extract(jar_file)
+         os.rename(jar_file, jar_path)
+         os.remove(crowdin_cli_file)
+         shutil.rmtree(jar_dir)
+   return jar_path
+
+
+def create_intl_file(localisation_file_path: str, intl_dir_path: str, text: str, file_path: str) -> None:
+   """Creates 'libretro_core_options_intl.h' from Crowdin translations.
+
+   :param localisation_file_path: Path to 'libretro_core_options_intl.h'
+   :param intl_dir_path: Path to the intl/<core_name> directory.
+   :param text: Content of the 'libretro_core_options.h' being translated.
+   :param file_path: Path to the '_us.h' file, containing the original English texts.
+   :return: None
+   """
+   msg_dict = {}
+   lang_up = ''
+
+   def replace_pair(pair_match):
+      """Replaces a key-value-pair of an option with the macros corresponding to the language.
+
+      :param pair_match: The re match object representing the key-value-pair block.
+      :return: Replacement string.
+      """
+      offset = pair_match.start(0)
+      if pair_match.group(1):  # key
+         if pair_match.group(2) in msg_dict:  # value
+            val = msg_dict[pair_match.group(2)] + lang_up
+         elif pair_match.group(1) in msg_dict:  # use key if value not viable (e.g. NULL)
+            val = msg_dict[pair_match.group(1)] + lang_up
+         else:
+            return pair_match.group(0)
+      else:
+         return pair_match.group(0)
+      res = pair_match.group(0)[:pair_match.start(2) - offset] + val \
+            + pair_match.group(0)[pair_match.end(2) - offset:]
+      return res
+
+   def replace_info(info_match):
+      """Replaces the 'additional strings' of an option with the macros corresponding to the language.
+
+      :param info_match: The re match object representing the 'additional strings' block.
+      :return: Replacement string.
+      """
+      offset = info_match.start(0)
+      if info_match.group(1) in msg_dict:
+         res = info_match.group(0)[:info_match.start(1) - offset] + \
+               msg_dict[info_match.group(1)] + lang_up + \
+               info_match.group(0)[info_match.end(1) - offset:]
+         return res
+      else:
+         return info_match.group(0)
+
+   def replace_option(option_match):
+      """Replaces strings within an option
+      '{ "opt_key", "label", "additional strings", ..., { {"key", "value"}, ... }, ... }'
+      within a struct with the macros corresponding to the language:
+      '{ "opt_key", MACRO_LABEL, MACRO_STRINGS, ..., { {"key", MACRO_VALUE}, ... }, ... }'
+
+      :param option_match: The re match object representing the option.
+      :return: Replacement string.
+      """
+      # label
+      offset = option_match.start(0)
+      if option_match.group(2):
+         res = option_match.group(0)[:option_match.start(2) - offset] + msg_dict[option_match.group(2)] + lang_up
+      else:
+         return option_match.group(0)
+      # additional block
+      if option_match.group(3):
+         res = res + option_match.group(0)[option_match.end(2) - offset:option_match.start(3) - offset]
+         new_info = p.sub(replace_info, option_match.group(3))
+         res = res + new_info
+      else:
+         return res + option_match.group(0)[option_match.end(2) - offset:]
+      # key-value-pairs
+      if option_match.group(4):
+         res = res + option_match.group(0)[option_match.end(3) - offset:option_match.start(4) - offset]
+         new_pairs = cor.p_key_value.sub(replace_pair, option_match.group(4))
+         res = res + new_pairs + option_match.group(0)[option_match.end(4) - offset:]
+      else:
+         res = res + option_match.group(0)[option_match.end(3) - offset:]
+
+      return res
+
+   # ------------------------------------------------------------------------------------
+
+   with open(file_path, 'r+', encoding='utf-8') as template:  # intl/<core_name>/_us.h
+      masked_msgs = cor.p_masked.finditer(template.read())
+
+   for msg in masked_msgs:
+      msg_dict[msg.group(2)] = msg.group(1)
+
+   # top of the file - in case there is no file to copy it from
+   out_txt = "#ifndef LIBRETRO_CORE_OPTIONS_INTL_H__\n" \
+             "#define LIBRETRO_CORE_OPTIONS_INTL_H__\n\n" \
+             "#if defined(_MSC_VER) && (_MSC_VER >= 1500 && _MSC_VER < 1900)\n" \
+             "/* https://support.microsoft.com/en-us/kb/980263 */\n" \
+             '#pragma execution_character_set("utf-8")\n' \
+             "#pragma warning(disable:4566)\n" \
+             "#endif\n\n" \
+             "#include <libretro.h>\n\n" \
+             '#ifdef __cplusplus\n' \
+             'extern "C" {\n' \
+             '#endif\n'
+
+   if os.path.isfile(localisation_file_path):
+      # copy top of the file for re-use
+      with open(localisation_file_path, 'r', encoding='utf-8') as intl:  # libretro_core_options_intl.h
+         in_text = intl.read()
+         intl_start = re.search(re.escape('/*\n'
+                                          ' ********************************\n'
+                                          ' * Core Option Definitions\n'
+                                          ' ********************************\n'
+                                          '*/\n'), in_text)
+         if intl_start:
+            out_txt = in_text[:intl_start.end(0)]
+         else:
+            intl_start = re.search(re.escape('#ifdef __cplusplus\n'
+                                             'extern "C" {\n'
+                                             '#endif\n'), in_text)
+            if intl_start:
+               out_txt = in_text[:intl_start.end(0)]
+
+   # only write to file, if there is anything worthwhile to write!
+   overwrite = False
+
+   # iterate through localisation files
+   files = {}
+   for file in os.scandir(intl_dir_path):
+      files[file.name] = {'is_file': file.is_file(), 'path': file.path}
+   for file in sorted(files):  # intl/<core_name>/_*
+      if files[file]['is_file'] \
+         and file.startswith('_') \
+         and file.endswith('.h') \
+         and not file.startswith('_us'):
+         translation_path = files[file]['path']  # <core_name>_<lang>.h
+         # all structs: group(0) full struct, group(1) beginning, group(2) content
+         struct_groups = cor.p_struct.finditer(text)
+         lang_low = os.path.splitext(file)[0].lower()
+         lang_up = lang_low.upper()
+         out_txt = out_txt + f'/* RETRO_LANGUAGE{lang_up} */\n\n'  # /* RETRO_LANGUAGE_NM */
+
+         # copy adjusted translations (makros)
+         with open(translation_path, 'r+', encoding='utf-8') as f_in:  # <core name>.h
+            out_txt = out_txt + f_in.read() + '\n'
+         # replace English texts with makros
+         for construct in struct_groups:
+            declaration = construct.group(1)
+            struct_type_name = get_struct_type_name(declaration)
+            if 3 > len(struct_type_name):  # no language specifier
+               new_decl = re.sub(re.escape(struct_type_name[1]), struct_type_name[1] + lang_low, declaration)
+            else:
+               new_decl = re.sub(re.escape(struct_type_name[2]), lang_low, declaration)
+               if '_us' != struct_type_name[2]:
+                  continue
+
+            p = cor.p_info
+            if 'retro_core_option_v2_category' == struct_type_name[0]:
+               p = cor.p_info_cat
+            offset_construct = construct.start(0)
+            start = construct.end(1) - offset_construct
+            end = construct.start(2) - offset_construct
+            out_txt = out_txt + new_decl + construct.group(0)[start:end]
+
+            content = construct.group(2)
+            new_content = cor.p_option.sub(replace_option, content)
+
+            start = construct.end(2) - offset_construct
+            out_txt = out_txt + new_content + construct.group(0)[start:] + '\n'
+
+            # for v2
+            if 'retro_core_option_v2_definition' == struct_type_name[0]:
+               out_txt = out_txt + f'struct retro_core_options_v2 options{lang_low}' \
+                                   ' = {\n' \
+                                   f'   option_cats{lang_low},\n' \
+                                   f'   option_defs{lang_low}\n' \
+                                   '};\n\n'
+         # if it got this far, we've got something to write
+         overwrite = True
+
+   # only write to file, if there is anything worthwhile to write!
+   if overwrite:
+      with open(localisation_file_path, 'w', encoding='utf-8') as intl:
+         intl.write(out_txt + '\n#ifdef __cplusplus\n'
+                              '}\n#endif\n'
+                              '\n#endif')
+   return
+
+
+# --------------------          MAIN          -------------------- #
+
+if __name__ == '__main__':
+   try:
+      if os.path.isfile(sys.argv[1]):
+         _temp = os.path.dirname(sys.argv[1])
+      else:
+         _temp = sys.argv[1]
+      while _temp.endswith('/') or _temp.endswith('\\'):
+         _temp = _temp[:-1]
+      TARGET_DIR_PATH = _temp
+   except IndexError:
+      TARGET_DIR_PATH = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+      print("No path provided, assuming parent directory:\n" + TARGET_DIR_PATH)
+
+   CORE_NAME = clean_file_name(sys.argv[2])
+
+   DIR_PATH = os.path.dirname(os.path.realpath(__file__))
+   H_FILE_PATH = os.path.join(TARGET_DIR_PATH, 'libretro_core_options.h')
+   INTL_FILE_PATH = os.path.join(TARGET_DIR_PATH, 'libretro_core_options_intl.h')
+
+   print('Getting texts from libretro_core_options.h')
+   with open(H_FILE_PATH, 'r+', encoding='utf-8') as _h_file:
+      _main_text = _h_file.read()
+   _hash_n_str = get_texts(_main_text)
+   _files = create_msg_hash(DIR_PATH, CORE_NAME, _hash_n_str)
+   _source_jsons = h2json(_files)
+
+   print('Getting texts from libretro_core_options_intl.h')
+   if os.path.isfile(INTL_FILE_PATH):
+      with open(INTL_FILE_PATH, 'r+', encoding='utf-8') as _intl_file:
+         _intl_text = _intl_file.read()
+         _hash_n_str_intl = get_texts(_intl_text)
+         _intl_files = create_msg_hash(DIR_PATH, CORE_NAME, _hash_n_str_intl)
+         _intl_jsons = h2json(_intl_files)
+
+   print('\nAll done!')
diff --git a/intl/crowdin.yaml b/intl/crowdin.yaml
new file mode 100644
index 0000000..c81de77
--- /dev/null
+++ b/intl/crowdin.yaml
@@ -0,0 +1,13 @@
+"project_id": "380544"
+"api_token": "_secret_"
+"base_url": "https://api.crowdin.com"
+"preserve_hierarchy": true
+
+"files":
+  [
+    {
+      "source": "/intl/_core_name_/_us.json",
+      "dest": "/_core_name_/_core_name_.json",
+      "translation": "/intl/_core_name_/_%two_letters_code%.json",
+    },
+  ]
diff --git a/intl/crowdin_prep.py b/intl/crowdin_prep.py
new file mode 100644
index 0000000..bfc9aa9
--- /dev/null
+++ b/intl/crowdin_prep.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+
+import core_option_translation as t
+
+if __name__ == '__main__':
+   try:
+      if t.os.path.isfile(t.sys.argv[1]):
+         _temp = t.os.path.dirname(t.sys.argv[1])
+      else:
+         _temp = t.sys.argv[1]
+      while _temp.endswith('/') or _temp.endswith('\\'):
+         _temp = _temp[:-1]
+      TARGET_DIR_PATH = _temp
+   except IndexError:
+      TARGET_DIR_PATH = t.os.path.dirname(t.os.path.dirname(t.os.path.realpath(__file__)))
+      print("No path provided, assuming parent directory:\n" + TARGET_DIR_PATH)
+
+   CORE_NAME = t.clean_file_name(t.sys.argv[2])
+   DIR_PATH = t.os.path.dirname(t.os.path.realpath(__file__))
+   H_FILE_PATH = t.os.path.join(TARGET_DIR_PATH, 'libretro_core_options.h')
+
+   print('Getting texts from libretro_core_options.h')
+   with open(H_FILE_PATH, 'r+', encoding='utf-8') as _h_file:
+      _main_text = _h_file.read()
+   _hash_n_str = t.get_texts(_main_text)
+   _files = t.create_msg_hash(DIR_PATH, CORE_NAME, _hash_n_str)
+
+   _source_jsons = t.h2json(_files)
+
+   print('\nAll done!')
diff --git a/intl/crowdin_source_upload.py b/intl/crowdin_source_upload.py
new file mode 100644
index 0000000..52fb770
--- /dev/null
+++ b/intl/crowdin_source_upload.py
@@ -0,0 +1,93 @@
+#!/usr/bin/env python3
+
+import re
+import os
+import shutil
+import subprocess
+import sys
+import urllib.request
+import zipfile
+import core_option_translation as t
+
+# --------------------          MAIN          -------------------- #
+
+if __name__ == '__main__':
+   # Check Crowdin API Token and core name
+   try:
+      API_KEY = sys.argv[1]
+      CORE_NAME = t.clean_file_name(sys.argv[2])
+   except IndexError as e:
+      print('Please provide Crowdin API Token and core name!')
+      raise e
+
+   DIR_PATH = t.os.path.dirname(t.os.path.realpath(__file__))
+   YAML_PATH = t.os.path.join(DIR_PATH, 'crowdin.yaml')
+
+   # Apply Crowdin API Key
+   with open(YAML_PATH, 'r') as crowdin_config_file:
+      crowdin_config = crowdin_config_file.read()
+   crowdin_config = re.sub(r'"api_token": "_secret_"',
+                           f'"api_token": "{API_KEY}"',
+                           crowdin_config, 1)
+   crowdin_config = re.sub(r'/_core_name_',
+                           f'/{CORE_NAME}'
+                           , crowdin_config)
+   with open(YAML_PATH, 'w') as crowdin_config_file:
+      crowdin_config_file.write(crowdin_config)
+
+   try:
+      # Download Crowdin CLI
+      jar_name = 'crowdin-cli.jar'
+      jar_path = t.os.path.join(DIR_PATH, jar_name)
+      crowdin_cli_file = 'crowdin-cli.zip'
+      crowdin_cli_url = 'https://downloads.crowdin.com/cli/v3/' + crowdin_cli_file
+      crowdin_cli_path = t.os.path.join(DIR_PATH, crowdin_cli_file)
+
+      if not os.path.isfile(t.os.path.join(DIR_PATH, jar_name)):
+         print('download crowdin-cli.jar')
+         urllib.request.urlretrieve(crowdin_cli_url, crowdin_cli_path)
+         with zipfile.ZipFile(crowdin_cli_path, 'r') as zip_ref:
+            jar_dir = t.os.path.join(DIR_PATH, zip_ref.namelist()[0])
+            for file in zip_ref.namelist():
+               if file.endswith(jar_name):
+                  jar_file = file
+                  break
+            zip_ref.extract(jar_file, path=DIR_PATH)
+            os.rename(t.os.path.join(DIR_PATH, jar_file), jar_path)
+            os.remove(crowdin_cli_path)
+            shutil.rmtree(jar_dir)
+
+      print('upload source *.json')
+      subprocess.run(['java', '-jar', jar_path, 'upload', 'sources', '--config', YAML_PATH])
+
+      # Reset Crowdin API Key
+      with open(YAML_PATH, 'r') as crowdin_config_file:
+         crowdin_config = crowdin_config_file.read()
+      crowdin_config = re.sub(r'"api_token": ".*?"',
+                              '"api_token": "_secret_"',
+                              crowdin_config, 1)
+
+      # TODO this is NOT safe!
+      crowdin_config = re.sub(re.escape(f'/{CORE_NAME}'),
+                              '/_core_name_',
+                              crowdin_config)
+
+      with open(YAML_PATH, 'w') as crowdin_config_file:
+         crowdin_config_file.write(crowdin_config)
+
+   except Exception as e:
+      # Try really hard to reset Crowdin API Key
+      with open(YAML_PATH, 'r') as crowdin_config_file:
+         crowdin_config = crowdin_config_file.read()
+      crowdin_config = re.sub(r'"api_token": ".*?"',
+                              '"api_token": "_secret_"',
+                              crowdin_config, 1)
+
+      # TODO this is NOT safe!
+      crowdin_config = re.sub(re.escape(f'/{CORE_NAME}'),
+                              '/_core_name_',
+                              crowdin_config)
+
+      with open(YAML_PATH, 'w') as crowdin_config_file:
+         crowdin_config_file.write(crowdin_config)
+      raise e
diff --git a/intl/crowdin_translate.py b/intl/crowdin_translate.py
new file mode 100644
index 0000000..8a66602
--- /dev/null
+++ b/intl/crowdin_translate.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python3
+
+import core_option_translation as t
+
+if __name__ == '__main__':
+   try:
+      if t.os.path.isfile(t.sys.argv[1]):
+         _temp = t.os.path.dirname(t.sys.argv[1])
+      else:
+         _temp = t.sys.argv[1]
+      while _temp.endswith('/') or _temp.endswith('\\'):
+         _temp = _temp[:-1]
+      TARGET_DIR_PATH = _temp
+   except IndexError:
+      TARGET_DIR_PATH = t.os.path.dirname(t.os.path.dirname(t.os.path.realpath(__file__)))
+      print("No path provided, assuming parent directory:\n" + TARGET_DIR_PATH)
+
+   CORE_NAME = t.clean_file_name(t.sys.argv[2])
+   DIR_PATH = t.os.path.dirname(t.os.path.realpath(__file__))
+   LOCALISATIONS_PATH = t.os.path.join(DIR_PATH, CORE_NAME)
+   US_FILE_PATH = t.os.path.join(LOCALISATIONS_PATH, '_us.h')
+   H_FILE_PATH = t.os.path.join(TARGET_DIR_PATH, 'libretro_core_options.h')
+   INTL_FILE_PATH = t.os.path.join(TARGET_DIR_PATH, 'libretro_core_options_intl.h')
+
+   print('Getting texts from libretro_core_options.h')
+   with open(H_FILE_PATH, 'r+', encoding='utf-8') as _h_file:
+      _main_text = _h_file.read()
+   _hash_n_str = t.get_texts(_main_text)
+   _files = t.create_msg_hash(DIR_PATH, CORE_NAME, _hash_n_str)
+   _source_jsons = t.h2json(_files)
+
+   print('Converting translations *.json to *.h:')
+   localisation_files = t.os.scandir(LOCALISATIONS_PATH)
+   t.json2h(LOCALISATIONS_PATH, localisation_files)
+
+   print('Constructing libretro_core_options_intl.h')
+   t.create_intl_file(INTL_FILE_PATH, LOCALISATIONS_PATH, _main_text, _files["_us"])
+
+   print('\nAll done!')
diff --git a/intl/crowdin_translation_download.py b/intl/crowdin_translation_download.py
new file mode 100644
index 0000000..d3e7027
--- /dev/null
+++ b/intl/crowdin_translation_download.py
@@ -0,0 +1,93 @@
+#!/usr/bin/env python3
+
+import re
+import os
+import shutil
+import subprocess
+import sys
+import urllib.request
+import zipfile
+import core_option_translation as t
+
+# --------------------          MAIN          -------------------- #
+
+if __name__ == '__main__':
+   # Check Crowdin API Token and core name
+   try:
+      API_KEY = sys.argv[1]
+      CORE_NAME = t.clean_file_name(sys.argv[2])
+   except IndexError as e:
+      print('Please provide Crowdin API Token and core name!')
+      raise e
+
+   DIR_PATH = t.os.path.dirname(t.os.path.realpath(__file__))
+   YAML_PATH = t.os.path.join(DIR_PATH, 'crowdin.yaml')
+
+   # Apply Crowdin API Key
+   with open(YAML_PATH, 'r') as crowdin_config_file:
+      crowdin_config = crowdin_config_file.read()
+   crowdin_config = re.sub(r'"api_token": "_secret_"',
+                           f'"api_token": "{API_KEY}"',
+                           crowdin_config, 1)
+   crowdin_config = re.sub(r'/_core_name_',
+                           f'/{CORE_NAME}'
+                           , crowdin_config)
+   with open(YAML_PATH, 'w') as crowdin_config_file:
+      crowdin_config_file.write(crowdin_config)
+
+   try:
+      # Download Crowdin CLI
+      jar_name = 'crowdin-cli.jar'
+      jar_path = t.os.path.join(DIR_PATH, jar_name)
+      crowdin_cli_file = 'crowdin-cli.zip'
+      crowdin_cli_url = 'https://downloads.crowdin.com/cli/v3/' + crowdin_cli_file
+      crowdin_cli_path = t.os.path.join(DIR_PATH, crowdin_cli_file)
+
+      if not os.path.isfile(t.os.path.join(DIR_PATH, jar_name)):
+         print('download crowdin-cli.jar')
+         urllib.request.urlretrieve(crowdin_cli_url, crowdin_cli_path)
+         with zipfile.ZipFile(crowdin_cli_path, 'r') as zip_ref:
+            jar_dir = t.os.path.join(DIR_PATH, zip_ref.namelist()[0])
+            for file in zip_ref.namelist():
+               if file.endswith(jar_name):
+                  jar_file = file
+                  break
+            zip_ref.extract(jar_file, path=DIR_PATH)
+            os.rename(t.os.path.join(DIR_PATH, jar_file), jar_path)
+            os.remove(crowdin_cli_path)
+            shutil.rmtree(jar_dir)
+
+      print('download translation *.json')
+      subprocess.run(['java', '-jar', jar_path, 'download', '--config', YAML_PATH])
+
+      # Reset Crowdin API Key
+      with open(YAML_PATH, 'r') as crowdin_config_file:
+         crowdin_config = crowdin_config_file.read()
+      crowdin_config = re.sub(r'"api_token": ".*?"',
+                              '"api_token": "_secret_"',
+                              crowdin_config, 1)
+
+      # TODO this is NOT safe!
+      crowdin_config = re.sub(re.escape(f'/{CORE_NAME}'),
+                              '/_core_name_',
+                              crowdin_config)
+
+      with open(YAML_PATH, 'w') as crowdin_config_file:
+         crowdin_config_file.write(crowdin_config)
+
+   except Exception as e:
+      # Try really hard to reset Crowdin API Key
+      with open(YAML_PATH, 'r') as crowdin_config_file:
+         crowdin_config = crowdin_config_file.read()
+      crowdin_config = re.sub(r'"api_token": ".*?"',
+                              '"api_token": "_secret_"',
+                              crowdin_config, 1)
+
+      # TODO this is NOT safe!
+      crowdin_config = re.sub(re.escape(f'/{CORE_NAME}'),
+                              '/_core_name_',
+                              crowdin_config)
+
+      with open(YAML_PATH, 'w') as crowdin_config_file:
+         crowdin_config_file.write(crowdin_config)
+      raise e
diff --git a/intl/download_workflow.py b/intl/download_workflow.py
new file mode 100644
index 0000000..5ce74dd
--- /dev/null
+++ b/intl/download_workflow.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+
+import sys
+import subprocess
+
+try:
+   api_key = sys.argv[1]
+   core_name = sys.argv[2]
+   dir_path = sys.argv[3]
+except IndexError as e:
+   print('Please provide path to libretro_core_options.h, Crowdin API Token and core name!')
+   raise e
+
+subprocess.run(['python3', 'intl/crowdin_prep.py', dir_path, core_name])
+subprocess.run(['python3', 'intl/crowdin_translation_download.py', api_key, core_name])
+subprocess.run(['python3', 'intl/crowdin_translate.py', dir_path, core_name])
diff --git a/intl/initial_sync.py b/intl/initial_sync.py
new file mode 100644
index 0000000..1df39ef
--- /dev/null
+++ b/intl/initial_sync.py
@@ -0,0 +1,125 @@
+#!/usr/bin/env python3
+
+import re
+import os
+import shutil
+import subprocess
+import sys
+import time
+import urllib.request
+import zipfile
+import core_option_translation as t
+
+# --------------------          MAIN          -------------------- #
+
+if __name__ == '__main__':
+   # Check Crowdin API Token and core name
+   try:
+      API_KEY = sys.argv[1]
+      CORE_NAME = t.clean_file_name(sys.argv[2])
+   except IndexError as e:
+      print('Please provide Crowdin API Token and core name!')
+      raise e
+
+   DIR_PATH = os.path.dirname(os.path.realpath(__file__))
+   YAML_PATH = os.path.join(DIR_PATH, 'crowdin.yaml')
+
+   # Apply Crowdin API Key
+   with open(YAML_PATH, 'r') as crowdin_config_file:
+      crowdin_config = crowdin_config_file.read()
+   crowdin_config = re.sub(r'"api_token": "_secret_"',
+                           f'"api_token": "{API_KEY}"',
+                           crowdin_config, 1)
+   crowdin_config = re.sub(r'/_core_name_',
+                           f'/{CORE_NAME}'
+                           , crowdin_config)
+   with open(YAML_PATH, 'w') as crowdin_config_file:
+      crowdin_config_file.write(crowdin_config)
+
+   try:
+      # Download Crowdin CLI
+      jar_name = 'crowdin-cli.jar'
+      jar_path = os.path.join(DIR_PATH, jar_name)
+      crowdin_cli_file = 'crowdin-cli.zip'
+      crowdin_cli_url = 'https://downloads.crowdin.com/cli/v3/' + crowdin_cli_file
+      crowdin_cli_path = os.path.join(DIR_PATH, crowdin_cli_file)
+
+      if not os.path.isfile(os.path.join(DIR_PATH, jar_name)):
+         print('download crowdin-cli.jar')
+         urllib.request.urlretrieve(crowdin_cli_url, crowdin_cli_path)
+         with zipfile.ZipFile(crowdin_cli_path, 'r') as zip_ref:
+            jar_dir = os.path.join(DIR_PATH, zip_ref.namelist()[0])
+            for file in zip_ref.namelist():
+               if file.endswith(jar_name):
+                  jar_file = file
+                  break
+            zip_ref.extract(jar_file, path=DIR_PATH)
+            os.rename(os.path.join(DIR_PATH, jar_file), jar_path)
+            os.remove(crowdin_cli_path)
+            shutil.rmtree(jar_dir)
+
+      print('upload source & translations *.json')
+      subprocess.run(['java', '-jar', jar_path, 'upload', 'sources', '--config', YAML_PATH])
+      subprocess.run(['java', '-jar', jar_path, 'upload', 'translations', '--config', YAML_PATH])
+
+      print('wait for crowdin server to process data')
+      time.sleep(10)
+
+      print('download translation *.json')
+      subprocess.run(['java', '-jar', jar_path, 'download', '--config', YAML_PATH])
+
+      # Reset Crowdin API Key
+      with open(YAML_PATH, 'r') as crowdin_config_file:
+         crowdin_config = crowdin_config_file.read()
+      crowdin_config = re.sub(r'"api_token": ".*?"', '"api_token": "_secret_"', crowdin_config, 1)
+
+      # TODO this is NOT safe!
+      crowdin_config = re.sub(re.escape(f'/{CORE_NAME}'),
+                              '/_core_name_',
+                              crowdin_config)
+
+      with open(YAML_PATH, 'w') as crowdin_config_file:
+         crowdin_config_file.write(crowdin_config)
+
+      with open('intl/upload_workflow.py', 'r') as workflow:
+         workflow_config = workflow.read()
+      workflow_config = workflow_config.replace(
+         "subprocess.run(['python3', 'intl/core_option_translation.py', dir_path, core_name])",
+         "subprocess.run(['python3', 'intl/crowdin_prep.py', dir_path, core_name])"
+      )
+      workflow_config = workflow_config.replace(
+         "subprocess.run(['python3', 'intl/initial_sync.py', api_key, core_name])",
+         "subprocess.run(['python3', 'intl/crowdin_source_upload.py', api_key, core_name])"
+      )
+      with open('intl/upload_workflow.py', 'w') as workflow:
+         workflow.write(workflow_config)
+
+      with open('intl/download_workflow.py', 'r') as workflow:
+         workflow_config = workflow.read()
+      workflow_config = workflow_config.replace(
+         "subprocess.run(['python3', 'intl/core_option_translation.py', dir_path, core_name])",
+         "subprocess.run(['python3', 'intl/crowdin_prep.py', dir_path, core_name])"
+      )
+      workflow_config = workflow_config.replace(
+         "subprocess.run(['python3', 'intl/initial_sync.py', api_key, core_name])",
+         "subprocess.run(['python3', 'intl/crowdin_translation_download.py', api_key, core_name])"
+      )
+      with open('intl/download_workflow.py', 'w') as workflow:
+         workflow.write(workflow_config)
+
+   except Exception as e:
+      # Try really hard to reset Crowdin API Key
+      with open(YAML_PATH, 'r') as crowdin_config_file:
+         crowdin_config = crowdin_config_file.read()
+      crowdin_config = re.sub(r'"api_token": ".*?"',
+                              '"api_token": "_secret_"',
+                              crowdin_config, 1)
+
+      # TODO this is NOT safe!
+      crowdin_config = re.sub(re.escape(f'/{CORE_NAME}'),
+                              '/_core_name_',
+                              crowdin_config)
+
+      with open(YAML_PATH, 'w') as crowdin_config_file:
+         crowdin_config_file.write(crowdin_config)
+      raise e
diff --git a/intl/remove_initial_cycle.py b/intl/remove_initial_cycle.py
new file mode 100644
index 0000000..9d90a50
--- /dev/null
+++ b/intl/remove_initial_cycle.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+
+with open('intl/upload_workflow.py', 'r') as workflow:
+   workflow_config = workflow.read()
+
+workflow_config = workflow_config.replace(
+   "subprocess.run(['python3', 'intl/core_option_translation.py', dir_path, core_name])",
+   "subprocess.run(['python3', 'intl/crowdin_prep.py', dir_path, core_name])"
+)
+workflow_config = workflow_config.replace(
+   "subprocess.run(['python3', 'intl/initial_sync.py', api_key, core_name])",
+   "subprocess.run(['python3', 'intl/crowdin_source_upload.py', api_key, core_name])"
+)
+with open('intl/upload_workflow.py', 'w') as workflow:
+   workflow.write(workflow_config)
+
+
+with open('intl/download_workflow.py', 'r') as workflow:
+   workflow_config = workflow.read()
+
+workflow_config = workflow_config.replace(
+   "subprocess.run(['python3', 'intl/core_option_translation.py', dir_path, core_name])",
+   "subprocess.run(['python3', 'intl/crowdin_prep.py', dir_path, core_name])"
+)
+workflow_config = workflow_config.replace(
+   "subprocess.run(['python3', 'intl/initial_sync.py', api_key, core_name])",
+   "subprocess.run(['python3', 'intl/crowdin_translation_download.py', api_key, core_name])"
+)
+with open('intl/download_workflow.py', 'w') as workflow:
+   workflow.write(workflow_config)
diff --git a/intl/upload_workflow.py b/intl/upload_workflow.py
new file mode 100644
index 0000000..6bfff92
--- /dev/null
+++ b/intl/upload_workflow.py
@@ -0,0 +1,15 @@
+#!/usr/bin/env python3
+
+import sys
+import subprocess
+
+try:
+   api_key = sys.argv[1]
+   core_name = sys.argv[2]
+   dir_path = sys.argv[3]
+except IndexError as e:
+   print('Please provide path to libretro_core_options.h, Crowdin API Token and core name!')
+   raise e
+
+subprocess.run(['python3', 'intl/crowdin_prep.py', dir_path, core_name])
+subprocess.run(['python3', 'intl/crowdin_source_upload.py', api_key, core_name])
diff --git a/intl/v1_to_v2_converter.py b/intl/v1_to_v2_converter.py
new file mode 100644
index 0000000..453183d
--- /dev/null
+++ b/intl/v1_to_v2_converter.py
@@ -0,0 +1,476 @@
+#!/usr/bin/env python3
+
+"""Core options v1 to v2 converter
+
+Just run this script as follows, to convert 'libretro_core_options.h' & 'Libretro_coreoptions_intl.h' to v2:
+python3 "/path/to/v1_to_v2_converter.py" "/path/to/where/libretro_core_options.h & Libretro_coreoptions_intl.h/are"
+
+The original files will be preserved as *.v1
+"""
+import core_option_regex as cor
+import os
+import sys
+import glob
+
+
+def create_v2_code_file(struct_text, file_name):
+   def replace_option(option_match):
+      _offset = option_match.start(0)
+
+      if option_match.group(3):
+         res = option_match.group(0)[:option_match.end(2) - _offset] + ',\n      NULL' + \
+               option_match.group(0)[option_match.end(2) - _offset:option_match.end(3) - _offset] + \
+               'NULL,\n      NULL,\n      ' + option_match.group(0)[option_match.end(3) - _offset:]
+      else:
+         return option_match.group(0)
+
+      return res
+
+   comment_v1 = '/*\n' \
+                ' ********************************\n' \
+                ' * VERSION: 1.3\n' \
+                ' ********************************\n' \
+                ' *\n' \
+                ' * - 1.3: Move translations to libretro_core_options_intl.h\n' \
+                ' *        - libretro_core_options_intl.h includes BOM and utf-8\n' \
+                ' *          fix for MSVC 2010-2013\n' \
+                ' *        - Added HAVE_NO_LANGEXTRA flag to disable translations\n' \
+                ' *          on platforms/compilers without BOM support\n' \
+                ' * - 1.2: Use core options v1 interface when\n' \
+                ' *        RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION is >= 1\n' \
+                ' *        (previously required RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION == 1)\n' \
+                ' * - 1.1: Support generation of core options v0 retro_core_option_value\n' \
+                ' *        arrays containing options with a single value\n' \
+                ' * - 1.0: First commit\n' \
+                '*/\n'
+
+   comment_v2 = '/*\n' \
+                ' ********************************\n' \
+                ' * VERSION: 2.0\n' \
+                ' ********************************\n' \
+                ' *\n' \
+                ' * - 2.0: Add support for core options v2 interface\n' \
+                ' * - 1.3: Move translations to libretro_core_options_intl.h\n' \
+                ' *        - libretro_core_options_intl.h includes BOM and utf-8\n' \
+                ' *          fix for MSVC 2010-2013\n' \
+                ' *        - Added HAVE_NO_LANGEXTRA flag to disable translations\n' \
+                ' *          on platforms/compilers without BOM support\n' \
+                ' * - 1.2: Use core options v1 interface when\n' \
+                ' *        RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION is >= 1\n' \
+                ' *        (previously required RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION == 1)\n' \
+                ' * - 1.1: Support generation of core options v0 retro_core_option_value\n' \
+                ' *        arrays containing options with a single value\n' \
+                ' * - 1.0: First commit\n' \
+                '*/\n'
+
+   p_intl = cor.p_intl
+   p_set = cor.p_set
+   new_set = 'static INLINE void libretro_set_core_options(retro_environment_t environ_cb,\n' \
+             '      bool *categories_supported)\n' \
+             '{\n' \
+             '   unsigned version  = 0;\n' \
+             '#ifndef HAVE_NO_LANGEXTRA\n' \
+             '   unsigned language = 0;\n' \
+             '#endif\n' \
+             '\n' \
+             '   if (!environ_cb || !categories_supported)\n' \
+             '      return;\n' \
+             '\n' \
+             '   *categories_supported = false;\n' \
+             '\n' \
+             '   if (!environ_cb(RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION, &version))\n' \
+             '      version = 0;\n' \
+             '\n' \
+             '   if (version >= 2)\n' \
+             '   {\n' \
+             '#ifndef HAVE_NO_LANGEXTRA\n' \
+             '      struct retro_core_options_v2_intl core_options_intl;\n' \
+             '\n' \
+             '      core_options_intl.us    = &options_us;\n' \
+             '      core_options_intl.local = NULL;\n' \
+             '\n' \
+             '      if (environ_cb(RETRO_ENVIRONMENT_GET_LANGUAGE, &language) &&\n' \
+             '          (language < RETRO_LANGUAGE_LAST) && (language != RETRO_LANGUAGE_ENGLISH))\n' \
+             '         core_options_intl.local = options_intl[language];\n' \
+             '\n' \
+             '      *categories_supported = environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_V2_INTL,\n' \
+             '            &core_options_intl);\n' \
+             '#else\n' \
+             '      *categories_supported = environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_V2,\n' \
+             '            &options_us);\n' \
+             '#endif\n' \
+             '   }\n' \
+             '   else\n' \
+             '   {\n' \
+             '      size_t i, j;\n' \
+             '      size_t option_index              = 0;\n' \
+             '      size_t num_options               = 0;\n' \
+             '      struct retro_core_option_definition\n' \
+             '            *option_v1_defs_us         = NULL;\n' \
+             '#ifndef HAVE_NO_LANGEXTRA\n' \
+             '      size_t num_options_intl          = 0;\n' \
+             '      struct retro_core_option_v2_definition\n' \
+             '            *option_defs_intl          = NULL;\n' \
+             '      struct retro_core_option_definition\n' \
+             '            *option_v1_defs_intl       = NULL;\n' \
+             '      struct retro_core_options_intl\n' \
+             '            core_options_v1_intl;\n' \
+             '#endif\n' \
+             '      struct retro_variable *variables = NULL;\n' \
+             '      char **values_buf                = NULL;\n' \
+             '\n' \
+             '      /* Determine total number of options */\n' \
+             '      while (true)\n' \
+             '      {\n' \
+             '         if (option_defs_us[num_options].key)\n' \
+             '            num_options++;\n' \
+             '         else\n' \
+             '            break;\n' \
+             '      }\n' \
+             '\n' \
+             '      if (version >= 1)\n' \
+             '      {\n' \
+             '         /* Allocate US array */\n' \
+             '         option_v1_defs_us = (struct retro_core_option_definition *)\n' \
+             '               calloc(num_options + 1, sizeof(struct retro_core_option_definition));\n' \
+             '\n' \
+             '         /* Copy parameters from option_defs_us array */\n' \
+             '         for (i = 0; i < num_options; i++)\n' \
+             '         {\n' \
+             '            struct retro_core_option_v2_definition *option_def_us = &option_defs_us[i];\n' \
+             '            struct retro_core_option_value *option_values         = option_def_us->values;\n' \
+             '            struct retro_core_option_definition *option_v1_def_us = &option_v1_defs_us[i];\n' \
+             '            struct retro_core_option_value *option_v1_values      = option_v1_def_us->values;\n' \
+             '\n' \
+             '            option_v1_def_us->key           = option_def_us->key;\n' \
+             '            option_v1_def_us->desc          = option_def_us->desc;\n' \
+             '            option_v1_def_us->info          = option_def_us->info;\n' \
+             '            option_v1_def_us->default_value = option_def_us->default_value;\n' \
+             '\n' \
+             '            /* Values must be copied individually... */\n' \
+             '            while (option_values->value)\n' \
+             '            {\n' \
+             '               option_v1_values->value = option_values->value;\n' \
+             '               option_v1_values->label = option_values->label;\n' \
+             '\n' \
+             '               option_values++;\n' \
+             '               option_v1_values++;\n' \
+             '            }\n' \
+             '         }\n' \
+             '\n' \
+             '#ifndef HAVE_NO_LANGEXTRA\n' \
+             '         if (environ_cb(RETRO_ENVIRONMENT_GET_LANGUAGE, &language) &&\n' \
+             '             (language < RETRO_LANGUAGE_LAST) && (language != RETRO_LANGUAGE_ENGLISH) &&\n' \
+             '             options_intl[language])\n' \
+             '            option_defs_intl = options_intl[language]->definitions;\n' \
+             '\n' \
+             '         if (option_defs_intl)\n' \
+             '         {\n' \
+             '            /* Determine number of intl options */\n' \
+             '            while (true)\n' \
+             '            {\n' \
+             '               if (option_defs_intl[num_options_intl].key)\n' \
+             '                  num_options_intl++;\n' \
+             '               else\n' \
+             '                  break;\n' \
+             '            }\n' \
+             '\n' \
+             '            /* Allocate intl array */\n' \
+             '            option_v1_defs_intl = (struct retro_core_option_definition *)\n' \
+             '                  calloc(num_options_intl + 1, sizeof(struct retro_core_option_definition));\n' \
+             '\n' \
+             '            /* Copy parameters from option_defs_intl array */\n' \
+             '            for (i = 0; i < num_options_intl; i++)\n' \
+             '            {\n' \
+             '               struct retro_core_option_v2_definition *option_def_intl = &option_defs_intl[i];\n' \
+             '               struct retro_core_option_value *option_values           = option_def_intl->values;\n' \
+             '               struct retro_core_option_definition *option_v1_def_intl = &option_v1_defs_intl[i];\n' \
+             '               struct retro_core_option_value *option_v1_values        = option_v1_def_intl->values;\n' \
+             '\n' \
+             '               option_v1_def_intl->key           = option_def_intl->key;\n' \
+             '               option_v1_def_intl->desc          = option_def_intl->desc;\n' \
+             '               option_v1_def_intl->info          = option_def_intl->info;\n' \
+             '               option_v1_def_intl->default_value = option_def_intl->default_value;\n' \
+             '\n' \
+             '               /* Values must be copied individually... */\n' \
+             '               while (option_values->value)\n' \
+             '               {\n' \
+             '                  option_v1_values->value = option_values->value;\n' \
+             '                  option_v1_values->label = option_values->label;\n' \
+             '\n' \
+             '                  option_values++;\n' \
+             '                  option_v1_values++;\n' \
+             '               }\n' \
+             '            }\n' \
+             '         }\n' \
+             '\n' \
+             '         core_options_v1_intl.us    = option_v1_defs_us;\n' \
+             '         core_options_v1_intl.local = option_v1_defs_intl;\n' \
+             '\n' \
+             '         environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_INTL, &core_options_v1_intl);\n' \
+             '#else\n' \
+             '         environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS, option_v1_defs_us);\n' \
+             '#endif\n' \
+             '      }\n' \
+             '      else\n' \
+             '      {\n' \
+             '         /* Allocate arrays */\n' \
+             '         variables  = (struct retro_variable *)calloc(num_options + 1,\n' \
+             '               sizeof(struct retro_variable));\n' \
+             '         values_buf = (char **)calloc(num_options, sizeof(char *));\n' \
+             '\n' \
+             '         if (!variables || !values_buf)\n' \
+             '            goto error;\n' \
+             '\n' \
+             '         /* Copy parameters from option_defs_us array */\n' \
+             '         for (i = 0; i < num_options; i++)\n' \
+             '         {\n' \
+             '            const char *key                        = option_defs_us[i].key;\n' \
+             '            const char *desc                       = option_defs_us[i].desc;\n' \
+             '            const char *default_value              = option_defs_us[i].default_value;\n' \
+             '            struct retro_core_option_value *values = option_defs_us[i].values;\n' \
+             '            size_t buf_len                         = 3;\n' \
+             '            size_t default_index                   = 0;\n' \
+             '\n' \
+             '            values_buf[i] = NULL;\n' \
+             '\n' \
+             '            if (desc)\n' \
+             '            {\n' \
+             '               size_t num_values = 0;\n' \
+             '\n' \
+             '               /* Determine number of values */\n' \
+             '               while (true)\n' \
+             '               {\n' \
+             '                  if (values[num_values].value)\n' \
+             '                  {\n' \
+             '                     /* Check if this is the default value */\n' \
+             '                     if (default_value)\n' \
+             '                        if (strcmp(values[num_values].value, default_value) == 0)\n' \
+             '                           default_index = num_values;\n' \
+             '\n' \
+             '                     buf_len += strlen(values[num_values].value);\n' \
+             '                     num_values++;\n' \
+             '                  }\n' \
+             '                  else\n' \
+             '                     break;\n' \
+             '               }\n' \
+             '\n' \
+             '               /* Build values string */\n' \
+             '               if (num_values > 0)\n' \
+             '               {\n' \
+             '                  buf_len += num_values - 1;\n' \
+             '                  buf_len += strlen(desc);\n' \
+             '\n' \
+             '                  values_buf[i] = (char *)calloc(buf_len, sizeof(char));\n' \
+             '                  if (!values_buf[i])\n' \
+             '                     goto error;\n' \
+             '\n' \
+             '                  strcpy(values_buf[i], desc);\n' \
+             '                  strcat(values_buf[i], "; ");\n' \
+             '\n' \
+             '                  /* Default value goes first */\n' \
+             '                  strcat(values_buf[i], values[default_index].value);\n' \
+             '\n' \
+             '                  /* Add remaining values */\n' \
+             '                  for (j = 0; j < num_values; j++)\n' \
+             '                  {\n' \
+             '                     if (j != default_index)\n' \
+             '                     {\n' \
+             '                        strcat(values_buf[i], "|");\n' \
+             '                        strcat(values_buf[i], values[j].value);\n' \
+             '                     }\n' \
+             '                  }\n' \
+             '               }\n' \
+             '            }\n' \
+             '\n' \
+             '            variables[option_index].key   = key;\n' \
+             '            variables[option_index].value = values_buf[i];\n' \
+             '            option_index++;\n' \
+             '         }\n' \
+             '\n' \
+             '         /* Set variables */\n' \
+             '         environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, variables);\n' \
+             '      }\n' \
+             '\n' \
+             'error:\n' \
+             '      /* Clean up */\n' \
+             '\n' \
+             '      if (option_v1_defs_us)\n' \
+             '      {\n' \
+             '         free(option_v1_defs_us);\n' \
+             '         option_v1_defs_us = NULL;\n' \
+             '      }\n' \
+             '\n' \
+             '#ifndef HAVE_NO_LANGEXTRA\n' \
+             '      if (option_v1_defs_intl)\n' \
+             '      {\n' \
+             '         free(option_v1_defs_intl);\n' \
+             '         option_v1_defs_intl = NULL;\n' \
+             '      }\n' \
+             '#endif\n' \
+             '\n' \
+             '      if (values_buf)\n' \
+             '      {\n' \
+             '         for (i = 0; i < num_options; i++)\n' \
+             '         {\n' \
+             '            if (values_buf[i])\n' \
+             '            {\n' \
+             '               free(values_buf[i]);\n' \
+             '               values_buf[i] = NULL;\n' \
+             '            }\n' \
+             '         }\n' \
+             '\n' \
+             '         free(values_buf);\n' \
+             '         values_buf = NULL;\n' \
+             '      }\n' \
+             '\n' \
+             '      if (variables)\n' \
+             '      {\n' \
+             '         free(variables);\n' \
+             '         variables = NULL;\n' \
+             '      }\n' \
+             '   }\n' \
+             '}\n' \
+             '\n' \
+             '#ifdef __cplusplus\n' \
+             '}\n' \
+             '#endif'
+
+   struct_groups = cor.p_struct.finditer(struct_text)
+   out_text = struct_text
+
+   for construct in struct_groups:
+      repl_text = ''
+      declaration = construct.group(1)
+      struct_match = cor.p_type_name.search(declaration)
+      if struct_match:
+         if struct_match.group(3):
+            struct_type_name_lang = struct_match.group(1, 2, 3)
+            declaration_end = declaration[struct_match.end(1):]
+         elif struct_match.group(4):
+            struct_type_name_lang = struct_match.group(1, 2, 4)
+            declaration_end = declaration[struct_match.end(1):]
+         else:
+            struct_type_name_lang = sum((struct_match.group(1, 2), ('_us',)), ())
+            declaration_end = f'{declaration[struct_match.end(1):struct_match.end(2)]}_us' \
+                              f'{declaration[struct_match.end(2):]}'
+      else:
+         return -1
+
+      if 'retro_core_option_definition' == struct_type_name_lang[0]:
+         import shutil
+         shutil.copy(file_name, file_name + '.v1')
+         new_declaration = f'\nstruct retro_core_option_v2_category option_cats{struct_type_name_lang[2]}[] = ' \
+                           '{\n   { NULL, NULL, NULL },\n' \
+                           '};\n\n' \
+                           + declaration[:struct_match.start(1)] + \
+                           'retro_core_option_v2_definition' \
+                           + declaration_end
+         offset = construct.start(0)
+         repl_text = repl_text + cor.re.sub(cor.re.escape(declaration), new_declaration,
+                                            construct.group(0)[:construct.start(2) - offset])
+         content = construct.group(2)
+         new_content = cor.p_option.sub(replace_option, content)
+
+         repl_text = repl_text + new_content + cor.re.sub(r'{\s*NULL,\s*NULL,\s*NULL,\s*{\{0}},\s*NULL\s*},\s*};',
+                                                          '{ NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },\n};'
+                                                          '\n\nstruct retro_core_options_v2 options' +
+                                                          struct_type_name_lang[2] + ' = {\n'
+                                                                                     f'   option_cats{struct_type_name_lang[2]},\n'
+                                                                                     f'   option_defs{struct_type_name_lang[2]}\n'
+                                                                                     '};',
+                                                          construct.group(0)[construct.end(2) - offset:])
+         out_text = cor.re.sub(cor.re.escape(construct.group(0)), repl_text, out_text)
+      else:
+         return -2
+   with open(file_name, 'w', encoding='utf-8') as code_file:
+      out_text = cor.re.sub(cor.re.escape(comment_v1), comment_v2, out_text)
+      intl = p_intl.search(out_text)
+      if intl:
+         new_intl = out_text[:intl.start(1)] \
+                    + 'struct retro_core_options_v2 *options_intl[RETRO_LANGUAGE_LAST]' \
+                    + out_text[intl.end(1):intl.start(2)] \
+                    + '\n   &options_us, /* RETRO_LANGUAGE_ENGLISH */\n' \
+                      '   &options_ja,      /* RETRO_LANGUAGE_JAPANESE */\n' \
+                      '   &options_fr,      /* RETRO_LANGUAGE_FRENCH */\n' \
+                      '   &options_es,      /* RETRO_LANGUAGE_SPANISH */\n' \
+                      '   &options_de,      /* RETRO_LANGUAGE_GERMAN */\n' \
+                      '   &options_it,      /* RETRO_LANGUAGE_ITALIAN */\n' \
+                      '   &options_nl,      /* RETRO_LANGUAGE_DUTCH */\n' \
+                      '   &options_pt_br,   /* RETRO_LANGUAGE_PORTUGUESE_BRAZIL */\n' \
+                      '   &options_pt_pt,   /* RETRO_LANGUAGE_PORTUGUESE_PORTUGAL */\n' \
+                      '   &options_ru,      /* RETRO_LANGUAGE_RUSSIAN */\n' \
+                      '   &options_ko,      /* RETRO_LANGUAGE_KOREAN */\n' \
+                      '   &options_cht,     /* RETRO_LANGUAGE_CHINESE_TRADITIONAL */\n' \
+                      '   &options_chs,     /* RETRO_LANGUAGE_CHINESE_SIMPLIFIED */\n' \
+                      '   &options_eo,      /* RETRO_LANGUAGE_ESPERANTO */\n' \
+                      '   &options_pl,      /* RETRO_LANGUAGE_POLISH */\n' \
+                      '   &options_vn,      /* RETRO_LANGUAGE_VIETNAMESE */\n' \
+                      '   &options_ar,      /* RETRO_LANGUAGE_ARABIC */\n' \
+                      '   &options_el,      /* RETRO_LANGUAGE_GREEK */\n' \
+                      '   &options_tr,      /* RETRO_LANGUAGE_TURKISH */\n' \
+                      '   &options_sv,      /* RETRO_LANGUAGE_SLOVAK */\n' \
+                      '   &options_fa,      /* RETRO_LANGUAGE_PERSIAN */\n' \
+                      '   &options_he,      /* RETRO_LANGUAGE_HEBREW */\n' \
+                      '   &options_ast,     /* RETRO_LANGUAGE_ASTURIAN */\n' \
+                      '   &options_fi,      /* RETRO_LANGUAGE_FINNISH */\n' \
+                    + out_text[intl.end(2):]
+         out_text = p_set.sub(new_set, new_intl)
+      else:
+         out_text = p_set.sub(new_set, out_text)
+      code_file.write(out_text)
+
+   return 1
+
+
+# --------------------          MAIN          -------------------- #
+
+if __name__ == '__main__':
+   DIR_PATH = os.path.dirname(os.path.realpath(__file__))
+   if os.path.basename(DIR_PATH) != "intl":
+      raise RuntimeError("Script is not in intl folder!")
+
+   BASE_PATH = os.path.dirname(DIR_PATH)
+   CORE_OP_FILE = os.path.join(BASE_PATH, "**", "libretro_core_options.h")
+
+   core_options_hits = glob.glob(CORE_OP_FILE, recursive=True)
+
+   if len(core_options_hits) == 0:
+      raise RuntimeError("libretro_core_options.h not found!")
+   elif len(core_options_hits) > 1:
+      print("More than one libretro_core_options.h file found:\n\n")
+      for i, file in enumerate(core_options_hits):
+         print(f"{i} {file}\n")
+
+      while True:
+         user_choice = input("Please choose one ('q' will exit): ")
+         if user_choice == 'q':
+            exit(0)
+         elif user_choice.isdigit():
+            core_op_file = core_options_hits[int(user_choice)]
+            break
+         else:
+            print("Please make a valid choice!\n\n")
+   else:
+      core_op_file = core_options_hits[0]
+
+   H_FILE_PATH = core_op_file
+   INTL_FILE_PATH = core_op_file.replace("libretro_core_options.h", 'libretro_core_options_intl.h')
+
+   for file in (H_FILE_PATH, INTL_FILE_PATH):
+      if os.path.isfile(file):
+         with open(file, 'r+', encoding='utf-8') as h_file:
+            text = h_file.read()
+            try:
+               test = create_v2_code_file(text, file)
+            except Exception as e:
+               print(e)
+               test = -1
+            if -1 > test:
+               print('Your file looks like it already is v2? (' + file + ')')
+               continue
+            if 0 > test:
+               print('An error occured! Please make sure to use the complete v1 struct! (' + file + ')')
+               continue
+      else:
+         print(file + ' not found.')
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index a9ced62..117ff83 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -688,7 +688,7 @@ static uint32_t palette_switch_get_current_index(void)
 static void palette_switch_init(void)
 {
    size_t i;
-   struct retro_core_option_v2_definition *opt_defs      = option_defs_us_common;
+   struct retro_core_option_v2_definition *opt_defs      = option_defs;
    struct retro_core_option_v2_definition *opt_def       = NULL;
 #ifndef HAVE_NO_LANGEXTRA
    struct retro_core_option_v2_definition *opt_defs_intl = NULL;
@@ -1170,8 +1170,8 @@ static void set_variables(void)
    memset(&option_defs_us, 0, sizeof(option_defs_us));
 
    /* Write common core options to main struct */
-   while (option_defs_us_common[index].key) {
-      memcpy(&option_defs_us[index], &option_defs_us_common[index],
+   while (option_defs[index].key) {
+      memcpy(&option_defs_us[index], &option_defs[index],
             sizeof(struct retro_core_option_v2_definition));
       index++;
    }
diff --git a/src/drivers/libretro/libretro_core_options.h b/src/drivers/libretro/libretro_core_options.h
index ec07d2e..af2e85d 100644
--- a/src/drivers/libretro/libretro_core_options.h
+++ b/src/drivers/libretro/libretro_core_options.h
@@ -7,6 +7,10 @@
 #include <libretro.h>
 #include <retro_inline.h>
 
+#ifndef HAVE_NO_LANGEXTRA
+#include "libretro_core_options_intl.h"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -32,26 +36,26 @@ struct retro_core_option_v2_category option_cats_us[] = {
    {
       "system",
       "System",
-      "Configure region / hardware add-on parameters."
+      "Configure region and hardware add-on parameters."
    },
    {
       "video",
       "Video",
 #ifdef HAVE_NTSC_FILTER
-      "Configure aspect ratio / display cropping / color palette / video filter options."
+      "Configure aspect ratio, display cropping, color palette, video filter options."
 #else
-      "Configure aspect ratio / display cropping / color palette options."
+      "Configure aspect ratio, display cropping, color palette options."
 #endif
    },
    {
       "audio",
       "Audio",
-      "Configure sound quality / volume / channel enable settings."
+      "Configure sound quality, volume, channel enable settings."
    },
    {
       "input",
       "Input",
-      "Configure turbo / light gun parameters."
+      "Configure turbo and light gun parameters."
    },
    {
       "hacks",
@@ -66,7 +70,7 @@ struct retro_core_option_v2_category option_cats_us[] = {
    { NULL, NULL, NULL },
 };
 
-struct retro_core_option_v2_definition option_defs_us_common[] = {
+struct retro_core_option_v2_definition option_defs[] = {
    {
       "fceumm_region",
       "Region",
@@ -85,7 +89,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
    },
    {
       "fceumm_game_genie",
-      "Game Genie Add-On (Restart)",
+      "Game Genie Add-On (Restart Required)",
       NULL,
       "Enable emulation of a Game Genie add-on cartridge, allowing cheat codes to be entered when launching games. The Game Genie ROM file 'gamegenie.nes' must be present in the frontend's system directory. Does not apply to FDS or arcade content.",
       NULL,
@@ -401,7 +405,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
       NULL,
       "input",
       {
-         { "lightgun",    "Lightgun" },
+         { "lightgun",    "Light gun" },
          { "touchscreen", "Touchscreen" },
          { "mouse",       "Mouse" },
          { NULL, NULL },
@@ -459,7 +463,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
       "fceumm_up_down_allowed",
       "Allow Opposing Directions",
       NULL,
-      "Allows simultaneous UP+DOWN or LEFT+RIGHT button combinations which can create different effects in some games.",
+      "Allows simultaneous UP+DOWN or LEFT+RIGHT button combinations, which can create different effects in some games.",
       NULL,
       "input",
       {
@@ -487,7 +491,7 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
       "fceumm_overclocking",
       "Overclock",
       NULL,
-      "Enables or disables overclocking which can reduce slowdowns in some games. Postrender method is more compatible with every game with Vblank more effective for games like Contra Force.",
+      "Enables or disables overclocking, which can reduce slowdowns in some games. Postrender method is more compatible with every game, Vblank is more effective for games like Contra Force.",
       NULL,
       "hacks",
       {
@@ -500,9 +504,9 @@ struct retro_core_option_v2_definition option_defs_us_common[] = {
    },
    {
       "fceumm_ramstate",
-      "RAM Power-On Fill (Restart)",
+      "RAM Power-On Fill (Restart Required)",
       NULL,
-      "Choose RAM startup during power up. Some games rely on initial ram values for random generator as an example.",
+      "RAM values on power up. Some games rely on initial RAM values for random number generation as an example.",
       NULL,
       "hacks",
       {
@@ -532,24 +536,29 @@ struct retro_core_options_v2 options_us = {
 #ifndef HAVE_NO_LANGEXTRA
 struct retro_core_options_v2 *options_intl[RETRO_LANGUAGE_LAST] = {
    &options_us,    /* RETRO_LANGUAGE_ENGLISH */
-   NULL,           /* RETRO_LANGUAGE_JAPANESE */
-   NULL,           /* RETRO_LANGUAGE_FRENCH */
-   NULL,           /* RETRO_LANGUAGE_SPANISH */
-   NULL,           /* RETRO_LANGUAGE_GERMAN */
-   NULL,           /* RETRO_LANGUAGE_ITALIAN */
-   NULL,           /* RETRO_LANGUAGE_DUTCH */
-   NULL,           /* RETRO_LANGUAGE_PORTUGUESE_BRAZIL */
-   NULL,           /* RETRO_LANGUAGE_PORTUGUESE_PORTUGAL */
-   NULL,           /* RETRO_LANGUAGE_RUSSIAN */
-   NULL,           /* RETRO_LANGUAGE_KOREAN */
-   NULL,           /* RETRO_LANGUAGE_CHINESE_TRADITIONAL */
-   NULL,           /* RETRO_LANGUAGE_CHINESE_SIMPLIFIED */
-   NULL,           /* RETRO_LANGUAGE_ESPERANTO */
-   NULL,           /* RETRO_LANGUAGE_POLISH */
-   NULL,           /* RETRO_LANGUAGE_VIETNAMESE */
-   NULL,           /* RETRO_LANGUAGE_ARABIC */
-   NULL,           /* RETRO_LANGUAGE_GREEK */
-   NULL,           /* RETRO_LANGUAGE_TURKISH */
+   &options_ja,      /* RETRO_LANGUAGE_JAPANESE */
+   &options_fr,      /* RETRO_LANGUAGE_FRENCH */
+   &options_es,      /* RETRO_LANGUAGE_SPANISH */
+   &options_de,      /* RETRO_LANGUAGE_GERMAN */
+   &options_it,      /* RETRO_LANGUAGE_ITALIAN */
+   &options_nl,      /* RETRO_LANGUAGE_DUTCH */
+   &options_pt_br,   /* RETRO_LANGUAGE_PORTUGUESE_BRAZIL */
+   &options_pt_pt,   /* RETRO_LANGUAGE_PORTUGUESE_PORTUGAL */
+   &options_ru,      /* RETRO_LANGUAGE_RUSSIAN */
+   &options_ko,      /* RETRO_LANGUAGE_KOREAN */
+   &options_cht,     /* RETRO_LANGUAGE_CHINESE_TRADITIONAL */
+   &options_chs,     /* RETRO_LANGUAGE_CHINESE_SIMPLIFIED */
+   &options_eo,      /* RETRO_LANGUAGE_ESPERANTO */
+   &options_pl,      /* RETRO_LANGUAGE_POLISH */
+   &options_vn,      /* RETRO_LANGUAGE_VIETNAMESE */
+   &options_ar,      /* RETRO_LANGUAGE_ARABIC */
+   &options_el,      /* RETRO_LANGUAGE_GREEK */
+   &options_tr,      /* RETRO_LANGUAGE_TURKISH */
+   &options_sv,      /* RETRO_LANGUAGE_SLOVAK */
+   &options_fa,      /* RETRO_LANGUAGE_PERSIAN */
+   &options_he,      /* RETRO_LANGUAGE_HEBREW */
+   &options_ast,     /* RETRO_LANGUAGE_ASTURIAN */
+   &options_fi,      /* RETRO_LANGUAGE_FINNISH */
 };
 #endif
 
diff --git a/src/drivers/libretro/libretro_core_options_intl.h b/src/drivers/libretro/libretro_core_options_intl.h
index 038553a..6df3209 100644
--- a/src/drivers/libretro/libretro_core_options_intl.h
+++ b/src/drivers/libretro/libretro_core_options_intl.h
@@ -37,55 +37,23023 @@ extern "C" {
  * Core Option Definitions
  ********************************
 */
+/* RETRO_LANGUAGE_AR */
 
-/* RETRO_LANGUAGE_JAPANESE */
+#define CATEGORY_SYSTEM_LABEL_AR NULL
+#define CATEGORY_SYSTEM_INFO_0_AR NULL
+#define CATEGORY_VIDEO_LABEL_AR "فيديو"
+#define CATEGORY_VIDEO_INFO_0_AR NULL
+#define CATEGORY_VIDEO_INFO_1_AR NULL
+#define CATEGORY_AUDIO_LABEL_AR "نظام تشغيل الصوت"
+#define CATEGORY_AUDIO_INFO_0_AR NULL
+#define CATEGORY_INPUT_LABEL_AR "الإدخال"
+#define CATEGORY_INPUT_INFO_0_AR NULL
+#define CATEGORY_HACKS_LABEL_AR NULL
+#define CATEGORY_HACKS_INFO_0_AR NULL
+#define CATEGORY_DIP_SWITCH_LABEL_AR NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_AR NULL
+#define FCEUMM_REGION_LABEL_AR NULL
+#define FCEUMM_REGION_INFO_0_AR NULL
+#define OPTION_VAL_AUTO_AR NULL
+#define OPTION_VAL_NTSC_AR NULL
+#define OPTION_VAL_PAL_AR NULL
+#define OPTION_VAL_DENDY_AR NULL
+#define FCEUMM_GAME_GENIE_LABEL_AR NULL
+#define FCEUMM_GAME_GENIE_INFO_0_AR NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_AR NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_AR NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_AR NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_AR NULL
+#define FCEUMM_ASPECT_LABEL_AR NULL
+#define FCEUMM_ASPECT_INFO_0_AR NULL
+#define OPTION_VAL_8_7_PAR_AR NULL
+#define OPTION_VAL_4_3_AR NULL
+#define OPTION_VAL_PP_AR NULL
+#define FCEUMM_OVERSCAN_LABEL_AR NULL
+#define FCEUMM_OVERSCAN_INFO_0_AR NULL
+#define FCEUMM_OVERSCAN_H_LABEL_AR NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_AR NULL
+#define FCEUMM_OVERSCAN_V_LABEL_AR NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_AR NULL
+#define FCEUMM_PALETTE_LABEL_AR NULL
+#define FCEUMM_PALETTE_INFO_0_AR NULL
+#define OPTION_VAL_DEFAULT_AR NULL
+#define OPTION_VAL_ASQREALC_AR NULL
+#define OPTION_VAL_NINTENDO_VC_AR NULL
+#define OPTION_VAL_RGB_AR NULL
+#define OPTION_VAL_YUV_V3_AR NULL
+#define OPTION_VAL_UNSATURATED_FINAL_AR NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_AR NULL
+#define OPTION_VAL_BMF_FINAL2_AR NULL
+#define OPTION_VAL_BMF_FINAL3_AR NULL
+#define OPTION_VAL_SMOOTH_FBX_AR NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_AR NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_AR NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_AR NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_AR NULL
+#define OPTION_VAL_NESCAP_AR NULL
+#define OPTION_VAL_WAVEBEAM_AR NULL
+#define OPTION_VAL_RAW_AR NULL
+#define OPTION_VAL_CUSTOM_AR NULL
+#define FCEUMM_NTSC_FILTER_LABEL_AR NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_AR NULL
+#define OPTION_VAL_COMPOSITE_AR NULL
+#define OPTION_VAL_SVIDEO_AR NULL
+#define OPTION_VAL_RGB_O9_AR NULL
+#define OPTION_VAL_MONOCHROME_AR NULL
+#define FCEUMM_SNDQUALITY_LABEL_AR NULL
+#define FCEUMM_SNDQUALITY_INFO_0_AR NULL
+#define OPTION_VAL_LOW_AR NULL
+#define OPTION_VAL_HIGH_AR NULL
+#define OPTION_VAL_VERY_HIGH_AR NULL
+#define FCEUMM_SWAPDUTY_LABEL_AR NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_AR NULL
+#define FCEUMM_SWAPDUTY_INFO_0_AR NULL
+#define FCEUMM_SNDVOLUME_LABEL_AR NULL
+#define FCEUMM_SNDVOLUME_INFO_0_AR NULL
+#define OPTION_VAL_0_AR NULL
+#define OPTION_VAL_1_AR NULL
+#define OPTION_VAL_2_AR NULL
+#define OPTION_VAL_3_AR NULL
+#define OPTION_VAL_4_AR NULL
+#define OPTION_VAL_5_AR NULL
+#define OPTION_VAL_6_AR NULL
+#define OPTION_VAL_7_AR NULL
+#define OPTION_VAL_8_AR NULL
+#define OPTION_VAL_9_AR NULL
+#define OPTION_VAL_10_AR NULL
+#define FCEUMM_APU_1_LABEL_AR NULL
+#define FCEUMM_APU_1_LABEL_CAT_AR NULL
+#define FCEUMM_APU_1_INFO_0_AR NULL
+#define FCEUMM_APU_2_LABEL_AR NULL
+#define FCEUMM_APU_2_LABEL_CAT_AR NULL
+#define FCEUMM_APU_2_INFO_0_AR NULL
+#define FCEUMM_APU_3_LABEL_AR NULL
+#define FCEUMM_APU_3_LABEL_CAT_AR NULL
+#define FCEUMM_APU_3_INFO_0_AR NULL
+#define FCEUMM_APU_4_LABEL_AR NULL
+#define FCEUMM_APU_4_LABEL_CAT_AR NULL
+#define FCEUMM_APU_4_INFO_0_AR NULL
+#define FCEUMM_APU_5_LABEL_AR NULL
+#define FCEUMM_APU_5_LABEL_CAT_AR NULL
+#define FCEUMM_APU_5_INFO_0_AR NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_AR NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_AR NULL
+#define OPTION_VAL_NONE_AR NULL
+#define OPTION_VAL_PLAYER_1_AR NULL
+#define OPTION_VAL_PLAYER_2_AR NULL
+#define OPTION_VAL_BOTH_AR NULL
+#define FCEUMM_TURBO_DELAY_LABEL_AR NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_AR NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_AR NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_AR NULL
+#define OPTION_VAL_LIGHTGUN_AR NULL
+#define OPTION_VAL_TOUCHSCREEN_AR NULL
+#define OPTION_VAL_MOUSE_AR NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_AR NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_AR NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_AR NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_AR NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_AR NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_AR NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_AR NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_AR NULL
+#define FCEUMM_OVERCLOCKING_LABEL_AR NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_AR NULL
+#define OPTION_VAL_2X_POSTRENDER_AR NULL
+#define OPTION_VAL_2X_VBLANK_AR NULL
+#define FCEUMM_RAMSTATE_LABEL_AR NULL
+#define FCEUMM_RAMSTATE_INFO_0_AR NULL
+#define OPTION_VAL_FILL_FF_AR NULL
+#define OPTION_VAL_FILL_00_AR NULL
+#define OPTION_VAL_RANDOM_AR NULL
 
-/* RETRO_LANGUAGE_FRENCH */
+struct retro_core_option_v2_category option_cats_ar[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_AR,
+      CATEGORY_SYSTEM_INFO_0_AR
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_AR,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_AR
+#else
+      CATEGORY_VIDEO_INFO_1_AR
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_AR,
+      CATEGORY_AUDIO_INFO_0_AR
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_AR,
+      CATEGORY_INPUT_INFO_0_AR
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_AR,
+      CATEGORY_HACKS_INFO_0_AR
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_AR,
+      CATEGORY_DIP_SWITCH_INFO_0_AR
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_ar[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_AR,
+      NULL,
+      FCEUMM_REGION_INFO_0_AR,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_AR },
+         { "NTSC",  OPTION_VAL_NTSC_AR },
+         { "PAL",   OPTION_VAL_PAL_AR },
+         { "Dendy", OPTION_VAL_DENDY_AR },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_AR,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_AR,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_AR,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_AR,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_AR,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_AR,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_AR,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_AR,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_AR },
+         { "4:3",     OPTION_VAL_4_3_AR },
+         { "PP",      OPTION_VAL_PP_AR },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_AR,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_AR,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_AR,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_AR,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_AR,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_AR,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_AR,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_AR,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_AR },
+         { "asqrealc",             OPTION_VAL_ASQREALC_AR },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_AR },
+         { "rgb",                  OPTION_VAL_RGB_AR },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_AR },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_AR },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_AR },
+         { "pal",                  OPTION_VAL_PAL_AR },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_AR },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_AR },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_AR },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_AR },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_AR },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_AR },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_AR },
+         { "nescap",               OPTION_VAL_NESCAP_AR },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_AR },
+         { "raw",                  OPTION_VAL_RAW_AR },
+         { "custom",               OPTION_VAL_CUSTOM_AR },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_AR,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_AR,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_AR },
+         { "svideo",     OPTION_VAL_SVIDEO_AR },
+         { "rgb",        OPTION_VAL_RGB_O9_AR },
+         { "monochrome", OPTION_VAL_MONOCHROME_AR },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_AR,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_AR,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_AR },
+         { "High",      OPTION_VAL_HIGH_AR },
+         { "Very High", OPTION_VAL_VERY_HIGH_AR },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_AR,
+      FCEUMM_SWAPDUTY_LABEL_CAT_AR,
+      FCEUMM_SWAPDUTY_INFO_0_AR,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_AR,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_AR,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_AR },
+         { "1",  OPTION_VAL_1_AR },
+         { "2",  OPTION_VAL_2_AR },
+         { "3",  OPTION_VAL_3_AR },
+         { "4",  OPTION_VAL_4_AR },
+         { "5",  OPTION_VAL_5_AR },
+         { "6",  OPTION_VAL_6_AR },
+         { "7",  OPTION_VAL_7_AR },
+         { "8",  OPTION_VAL_8_AR },
+         { "9",  OPTION_VAL_9_AR },
+         { "10", OPTION_VAL_10_AR },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_AR,
+      FCEUMM_APU_1_LABEL_CAT_AR,
+      FCEUMM_APU_1_INFO_0_AR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_AR,
+      FCEUMM_APU_2_LABEL_CAT_AR,
+      FCEUMM_APU_2_INFO_0_AR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_AR,
+      FCEUMM_APU_3_LABEL_CAT_AR,
+      FCEUMM_APU_3_INFO_0_AR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_AR,
+      FCEUMM_APU_4_LABEL_CAT_AR,
+      FCEUMM_APU_4_INFO_0_AR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_AR,
+      FCEUMM_APU_5_LABEL_CAT_AR,
+      FCEUMM_APU_5_INFO_0_AR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_AR,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_AR,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_AR },
+         { "Player 1", OPTION_VAL_PLAYER_1_AR },
+         { "Player 2", OPTION_VAL_PLAYER_2_AR },
+         { "Both",     OPTION_VAL_BOTH_AR },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_AR,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_AR,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_AR,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_AR,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_AR },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_AR },
+         { "mouse",       OPTION_VAL_MOUSE_AR },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_AR,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_AR,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_AR,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_AR,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_AR,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_AR,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_AR,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_AR,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_AR,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_AR,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_AR },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_AR },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_AR,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_AR,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_AR },
+         { "fill $00", OPTION_VAL_FILL_00_AR },
+         { "random",   OPTION_VAL_RANDOM_AR },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_ar = {
+   option_cats_ar,
+   option_defs_ar
+};
 
-/* RETRO_LANGUAGE_SPANISH */
+/* RETRO_LANGUAGE_AST */
 
-/* RETRO_LANGUAGE_GERMAN */
+#define CATEGORY_SYSTEM_LABEL_AST "Sistema"
+#define CATEGORY_SYSTEM_INFO_0_AST NULL
+#define CATEGORY_VIDEO_LABEL_AST "Videu"
+#define CATEGORY_VIDEO_INFO_0_AST NULL
+#define CATEGORY_VIDEO_INFO_1_AST NULL
+#define CATEGORY_AUDIO_LABEL_AST "Audiu"
+#define CATEGORY_AUDIO_INFO_0_AST NULL
+#define CATEGORY_INPUT_LABEL_AST "Entrada"
+#define CATEGORY_INPUT_INFO_0_AST NULL
+#define CATEGORY_HACKS_LABEL_AST NULL
+#define CATEGORY_HACKS_INFO_0_AST NULL
+#define CATEGORY_DIP_SWITCH_LABEL_AST NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_AST NULL
+#define FCEUMM_REGION_LABEL_AST NULL
+#define FCEUMM_REGION_INFO_0_AST NULL
+#define OPTION_VAL_AUTO_AST NULL
+#define OPTION_VAL_NTSC_AST NULL
+#define OPTION_VAL_PAL_AST NULL
+#define OPTION_VAL_DENDY_AST NULL
+#define FCEUMM_GAME_GENIE_LABEL_AST NULL
+#define FCEUMM_GAME_GENIE_INFO_0_AST NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_AST NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_AST NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_AST NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_AST NULL
+#define FCEUMM_ASPECT_LABEL_AST NULL
+#define FCEUMM_ASPECT_INFO_0_AST NULL
+#define OPTION_VAL_8_7_PAR_AST NULL
+#define OPTION_VAL_4_3_AST NULL
+#define OPTION_VAL_PP_AST NULL
+#define FCEUMM_OVERSCAN_LABEL_AST NULL
+#define FCEUMM_OVERSCAN_INFO_0_AST NULL
+#define FCEUMM_OVERSCAN_H_LABEL_AST NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_AST NULL
+#define FCEUMM_OVERSCAN_V_LABEL_AST NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_AST NULL
+#define FCEUMM_PALETTE_LABEL_AST NULL
+#define FCEUMM_PALETTE_INFO_0_AST NULL
+#define OPTION_VAL_DEFAULT_AST NULL
+#define OPTION_VAL_ASQREALC_AST NULL
+#define OPTION_VAL_NINTENDO_VC_AST NULL
+#define OPTION_VAL_RGB_AST NULL
+#define OPTION_VAL_YUV_V3_AST NULL
+#define OPTION_VAL_UNSATURATED_FINAL_AST NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_AST NULL
+#define OPTION_VAL_BMF_FINAL2_AST NULL
+#define OPTION_VAL_BMF_FINAL3_AST NULL
+#define OPTION_VAL_SMOOTH_FBX_AST NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_AST NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_AST NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_AST NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_AST NULL
+#define OPTION_VAL_NESCAP_AST NULL
+#define OPTION_VAL_WAVEBEAM_AST NULL
+#define OPTION_VAL_RAW_AST NULL
+#define OPTION_VAL_CUSTOM_AST NULL
+#define FCEUMM_NTSC_FILTER_LABEL_AST NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_AST NULL
+#define OPTION_VAL_COMPOSITE_AST NULL
+#define OPTION_VAL_SVIDEO_AST NULL
+#define OPTION_VAL_RGB_O9_AST NULL
+#define OPTION_VAL_MONOCHROME_AST NULL
+#define FCEUMM_SNDQUALITY_LABEL_AST NULL
+#define FCEUMM_SNDQUALITY_INFO_0_AST NULL
+#define OPTION_VAL_LOW_AST NULL
+#define OPTION_VAL_HIGH_AST NULL
+#define OPTION_VAL_VERY_HIGH_AST NULL
+#define FCEUMM_SWAPDUTY_LABEL_AST NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_AST NULL
+#define FCEUMM_SWAPDUTY_INFO_0_AST NULL
+#define FCEUMM_SNDVOLUME_LABEL_AST NULL
+#define FCEUMM_SNDVOLUME_INFO_0_AST NULL
+#define OPTION_VAL_0_AST NULL
+#define OPTION_VAL_1_AST NULL
+#define OPTION_VAL_2_AST NULL
+#define OPTION_VAL_3_AST NULL
+#define OPTION_VAL_4_AST NULL
+#define OPTION_VAL_5_AST NULL
+#define OPTION_VAL_6_AST NULL
+#define OPTION_VAL_7_AST NULL
+#define OPTION_VAL_8_AST NULL
+#define OPTION_VAL_9_AST NULL
+#define OPTION_VAL_10_AST NULL
+#define FCEUMM_APU_1_LABEL_AST NULL
+#define FCEUMM_APU_1_LABEL_CAT_AST NULL
+#define FCEUMM_APU_1_INFO_0_AST NULL
+#define FCEUMM_APU_2_LABEL_AST NULL
+#define FCEUMM_APU_2_LABEL_CAT_AST NULL
+#define FCEUMM_APU_2_INFO_0_AST NULL
+#define FCEUMM_APU_3_LABEL_AST NULL
+#define FCEUMM_APU_3_LABEL_CAT_AST NULL
+#define FCEUMM_APU_3_INFO_0_AST NULL
+#define FCEUMM_APU_4_LABEL_AST NULL
+#define FCEUMM_APU_4_LABEL_CAT_AST NULL
+#define FCEUMM_APU_4_INFO_0_AST NULL
+#define FCEUMM_APU_5_LABEL_AST NULL
+#define FCEUMM_APU_5_LABEL_CAT_AST NULL
+#define FCEUMM_APU_5_INFO_0_AST NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_AST NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_AST NULL
+#define OPTION_VAL_NONE_AST NULL
+#define OPTION_VAL_PLAYER_1_AST NULL
+#define OPTION_VAL_PLAYER_2_AST NULL
+#define OPTION_VAL_BOTH_AST NULL
+#define FCEUMM_TURBO_DELAY_LABEL_AST NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_AST NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_AST NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_AST NULL
+#define OPTION_VAL_LIGHTGUN_AST NULL
+#define OPTION_VAL_TOUCHSCREEN_AST NULL
+#define OPTION_VAL_MOUSE_AST NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_AST NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_AST NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_AST NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_AST NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_AST NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_AST NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_AST NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_AST NULL
+#define FCEUMM_OVERCLOCKING_LABEL_AST NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_AST NULL
+#define OPTION_VAL_2X_POSTRENDER_AST NULL
+#define OPTION_VAL_2X_VBLANK_AST NULL
+#define FCEUMM_RAMSTATE_LABEL_AST NULL
+#define FCEUMM_RAMSTATE_INFO_0_AST NULL
+#define OPTION_VAL_FILL_FF_AST NULL
+#define OPTION_VAL_FILL_00_AST NULL
+#define OPTION_VAL_RANDOM_AST NULL
 
-/* RETRO_LANGUAGE_ITALIAN */
+struct retro_core_option_v2_category option_cats_ast[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_AST,
+      CATEGORY_SYSTEM_INFO_0_AST
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_AST,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_AST
+#else
+      CATEGORY_VIDEO_INFO_1_AST
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_AST,
+      CATEGORY_AUDIO_INFO_0_AST
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_AST,
+      CATEGORY_INPUT_INFO_0_AST
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_AST,
+      CATEGORY_HACKS_INFO_0_AST
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_AST,
+      CATEGORY_DIP_SWITCH_INFO_0_AST
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_ast[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_AST,
+      NULL,
+      FCEUMM_REGION_INFO_0_AST,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_AST },
+         { "NTSC",  OPTION_VAL_NTSC_AST },
+         { "PAL",   OPTION_VAL_PAL_AST },
+         { "Dendy", OPTION_VAL_DENDY_AST },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_AST,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_AST,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_AST,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_AST,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_AST,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_AST,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_AST,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_AST,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_AST },
+         { "4:3",     OPTION_VAL_4_3_AST },
+         { "PP",      OPTION_VAL_PP_AST },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_AST,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_AST,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_AST,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_AST,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_AST,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_AST,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_AST,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_AST,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_AST },
+         { "asqrealc",             OPTION_VAL_ASQREALC_AST },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_AST },
+         { "rgb",                  OPTION_VAL_RGB_AST },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_AST },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_AST },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_AST },
+         { "pal",                  OPTION_VAL_PAL_AST },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_AST },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_AST },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_AST },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_AST },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_AST },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_AST },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_AST },
+         { "nescap",               OPTION_VAL_NESCAP_AST },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_AST },
+         { "raw",                  OPTION_VAL_RAW_AST },
+         { "custom",               OPTION_VAL_CUSTOM_AST },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_AST,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_AST,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_AST },
+         { "svideo",     OPTION_VAL_SVIDEO_AST },
+         { "rgb",        OPTION_VAL_RGB_O9_AST },
+         { "monochrome", OPTION_VAL_MONOCHROME_AST },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_AST,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_AST,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_AST },
+         { "High",      OPTION_VAL_HIGH_AST },
+         { "Very High", OPTION_VAL_VERY_HIGH_AST },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_AST,
+      FCEUMM_SWAPDUTY_LABEL_CAT_AST,
+      FCEUMM_SWAPDUTY_INFO_0_AST,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_AST,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_AST,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_AST },
+         { "1",  OPTION_VAL_1_AST },
+         { "2",  OPTION_VAL_2_AST },
+         { "3",  OPTION_VAL_3_AST },
+         { "4",  OPTION_VAL_4_AST },
+         { "5",  OPTION_VAL_5_AST },
+         { "6",  OPTION_VAL_6_AST },
+         { "7",  OPTION_VAL_7_AST },
+         { "8",  OPTION_VAL_8_AST },
+         { "9",  OPTION_VAL_9_AST },
+         { "10", OPTION_VAL_10_AST },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_AST,
+      FCEUMM_APU_1_LABEL_CAT_AST,
+      FCEUMM_APU_1_INFO_0_AST,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_AST,
+      FCEUMM_APU_2_LABEL_CAT_AST,
+      FCEUMM_APU_2_INFO_0_AST,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_AST,
+      FCEUMM_APU_3_LABEL_CAT_AST,
+      FCEUMM_APU_3_INFO_0_AST,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_AST,
+      FCEUMM_APU_4_LABEL_CAT_AST,
+      FCEUMM_APU_4_INFO_0_AST,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_AST,
+      FCEUMM_APU_5_LABEL_CAT_AST,
+      FCEUMM_APU_5_INFO_0_AST,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_AST,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_AST,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_AST },
+         { "Player 1", OPTION_VAL_PLAYER_1_AST },
+         { "Player 2", OPTION_VAL_PLAYER_2_AST },
+         { "Both",     OPTION_VAL_BOTH_AST },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_AST,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_AST,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_AST,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_AST,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_AST },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_AST },
+         { "mouse",       OPTION_VAL_MOUSE_AST },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_AST,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_AST,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_AST,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_AST,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_AST,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_AST,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_AST,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_AST,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_AST,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_AST,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_AST },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_AST },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_AST,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_AST,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_AST },
+         { "fill $00", OPTION_VAL_FILL_00_AST },
+         { "random",   OPTION_VAL_RANDOM_AST },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_ast = {
+   option_cats_ast,
+   option_defs_ast
+};
 
-/* RETRO_LANGUAGE_DUTCH */
+/* RETRO_LANGUAGE_CA */
 
-/* RETRO_LANGUAGE_PORTUGUESE_BRAZIL */
+#define CATEGORY_SYSTEM_LABEL_CA NULL
+#define CATEGORY_SYSTEM_INFO_0_CA NULL
+#define CATEGORY_VIDEO_LABEL_CA NULL
+#define CATEGORY_VIDEO_INFO_0_CA NULL
+#define CATEGORY_VIDEO_INFO_1_CA NULL
+#define CATEGORY_AUDIO_LABEL_CA NULL
+#define CATEGORY_AUDIO_INFO_0_CA NULL
+#define CATEGORY_INPUT_LABEL_CA NULL
+#define CATEGORY_INPUT_INFO_0_CA NULL
+#define CATEGORY_HACKS_LABEL_CA NULL
+#define CATEGORY_HACKS_INFO_0_CA NULL
+#define CATEGORY_DIP_SWITCH_LABEL_CA NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_CA NULL
+#define FCEUMM_REGION_LABEL_CA NULL
+#define FCEUMM_REGION_INFO_0_CA NULL
+#define OPTION_VAL_AUTO_CA NULL
+#define OPTION_VAL_NTSC_CA NULL
+#define OPTION_VAL_PAL_CA NULL
+#define OPTION_VAL_DENDY_CA NULL
+#define FCEUMM_GAME_GENIE_LABEL_CA NULL
+#define FCEUMM_GAME_GENIE_INFO_0_CA NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_CA NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_CA NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_CA NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_CA NULL
+#define FCEUMM_ASPECT_LABEL_CA NULL
+#define FCEUMM_ASPECT_INFO_0_CA NULL
+#define OPTION_VAL_8_7_PAR_CA NULL
+#define OPTION_VAL_4_3_CA NULL
+#define OPTION_VAL_PP_CA NULL
+#define FCEUMM_OVERSCAN_LABEL_CA NULL
+#define FCEUMM_OVERSCAN_INFO_0_CA NULL
+#define FCEUMM_OVERSCAN_H_LABEL_CA NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_CA NULL
+#define FCEUMM_OVERSCAN_V_LABEL_CA NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_CA NULL
+#define FCEUMM_PALETTE_LABEL_CA NULL
+#define FCEUMM_PALETTE_INFO_0_CA NULL
+#define OPTION_VAL_DEFAULT_CA NULL
+#define OPTION_VAL_ASQREALC_CA NULL
+#define OPTION_VAL_NINTENDO_VC_CA NULL
+#define OPTION_VAL_RGB_CA NULL
+#define OPTION_VAL_YUV_V3_CA NULL
+#define OPTION_VAL_UNSATURATED_FINAL_CA NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_CA NULL
+#define OPTION_VAL_BMF_FINAL2_CA NULL
+#define OPTION_VAL_BMF_FINAL3_CA NULL
+#define OPTION_VAL_SMOOTH_FBX_CA NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_CA NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_CA NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_CA NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_CA NULL
+#define OPTION_VAL_NESCAP_CA NULL
+#define OPTION_VAL_WAVEBEAM_CA NULL
+#define OPTION_VAL_RAW_CA NULL
+#define OPTION_VAL_CUSTOM_CA NULL
+#define FCEUMM_NTSC_FILTER_LABEL_CA NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_CA NULL
+#define OPTION_VAL_COMPOSITE_CA NULL
+#define OPTION_VAL_SVIDEO_CA NULL
+#define OPTION_VAL_RGB_O9_CA NULL
+#define OPTION_VAL_MONOCHROME_CA NULL
+#define FCEUMM_SNDQUALITY_LABEL_CA NULL
+#define FCEUMM_SNDQUALITY_INFO_0_CA NULL
+#define OPTION_VAL_LOW_CA NULL
+#define OPTION_VAL_HIGH_CA NULL
+#define OPTION_VAL_VERY_HIGH_CA NULL
+#define FCEUMM_SWAPDUTY_LABEL_CA NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_CA NULL
+#define FCEUMM_SWAPDUTY_INFO_0_CA NULL
+#define FCEUMM_SNDVOLUME_LABEL_CA NULL
+#define FCEUMM_SNDVOLUME_INFO_0_CA NULL
+#define OPTION_VAL_0_CA NULL
+#define OPTION_VAL_1_CA NULL
+#define OPTION_VAL_2_CA NULL
+#define OPTION_VAL_3_CA NULL
+#define OPTION_VAL_4_CA NULL
+#define OPTION_VAL_5_CA NULL
+#define OPTION_VAL_6_CA NULL
+#define OPTION_VAL_7_CA NULL
+#define OPTION_VAL_8_CA NULL
+#define OPTION_VAL_9_CA NULL
+#define OPTION_VAL_10_CA NULL
+#define FCEUMM_APU_1_LABEL_CA NULL
+#define FCEUMM_APU_1_LABEL_CAT_CA NULL
+#define FCEUMM_APU_1_INFO_0_CA NULL
+#define FCEUMM_APU_2_LABEL_CA NULL
+#define FCEUMM_APU_2_LABEL_CAT_CA NULL
+#define FCEUMM_APU_2_INFO_0_CA NULL
+#define FCEUMM_APU_3_LABEL_CA NULL
+#define FCEUMM_APU_3_LABEL_CAT_CA NULL
+#define FCEUMM_APU_3_INFO_0_CA NULL
+#define FCEUMM_APU_4_LABEL_CA NULL
+#define FCEUMM_APU_4_LABEL_CAT_CA NULL
+#define FCEUMM_APU_4_INFO_0_CA NULL
+#define FCEUMM_APU_5_LABEL_CA NULL
+#define FCEUMM_APU_5_LABEL_CAT_CA NULL
+#define FCEUMM_APU_5_INFO_0_CA NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_CA NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_CA NULL
+#define OPTION_VAL_NONE_CA NULL
+#define OPTION_VAL_PLAYER_1_CA NULL
+#define OPTION_VAL_PLAYER_2_CA NULL
+#define OPTION_VAL_BOTH_CA NULL
+#define FCEUMM_TURBO_DELAY_LABEL_CA NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_CA NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_CA NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_CA NULL
+#define OPTION_VAL_LIGHTGUN_CA NULL
+#define OPTION_VAL_TOUCHSCREEN_CA NULL
+#define OPTION_VAL_MOUSE_CA NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_CA NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_CA NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_CA NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_CA NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_CA NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_CA NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_CA NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_CA NULL
+#define FCEUMM_OVERCLOCKING_LABEL_CA NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_CA NULL
+#define OPTION_VAL_2X_POSTRENDER_CA NULL
+#define OPTION_VAL_2X_VBLANK_CA NULL
+#define FCEUMM_RAMSTATE_LABEL_CA NULL
+#define FCEUMM_RAMSTATE_INFO_0_CA NULL
+#define OPTION_VAL_FILL_FF_CA NULL
+#define OPTION_VAL_FILL_00_CA NULL
+#define OPTION_VAL_RANDOM_CA NULL
 
-/* RETRO_LANGUAGE_PORTUGUESE_PORTUGAL */
+struct retro_core_option_v2_category option_cats_ca[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_CA,
+      CATEGORY_SYSTEM_INFO_0_CA
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_CA,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_CA
+#else
+      CATEGORY_VIDEO_INFO_1_CA
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_CA,
+      CATEGORY_AUDIO_INFO_0_CA
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_CA,
+      CATEGORY_INPUT_INFO_0_CA
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_CA,
+      CATEGORY_HACKS_INFO_0_CA
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_CA,
+      CATEGORY_DIP_SWITCH_INFO_0_CA
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_ca[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_CA,
+      NULL,
+      FCEUMM_REGION_INFO_0_CA,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_CA },
+         { "NTSC",  OPTION_VAL_NTSC_CA },
+         { "PAL",   OPTION_VAL_PAL_CA },
+         { "Dendy", OPTION_VAL_DENDY_CA },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_CA,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_CA,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_CA,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_CA,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_CA,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_CA,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_CA,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_CA,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_CA },
+         { "4:3",     OPTION_VAL_4_3_CA },
+         { "PP",      OPTION_VAL_PP_CA },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_CA,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_CA,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_CA,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_CA,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_CA,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_CA,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_CA,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_CA,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_CA },
+         { "asqrealc",             OPTION_VAL_ASQREALC_CA },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_CA },
+         { "rgb",                  OPTION_VAL_RGB_CA },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_CA },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_CA },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_CA },
+         { "pal",                  OPTION_VAL_PAL_CA },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_CA },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_CA },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_CA },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_CA },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_CA },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_CA },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_CA },
+         { "nescap",               OPTION_VAL_NESCAP_CA },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_CA },
+         { "raw",                  OPTION_VAL_RAW_CA },
+         { "custom",               OPTION_VAL_CUSTOM_CA },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_CA,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_CA,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_CA },
+         { "svideo",     OPTION_VAL_SVIDEO_CA },
+         { "rgb",        OPTION_VAL_RGB_O9_CA },
+         { "monochrome", OPTION_VAL_MONOCHROME_CA },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_CA,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_CA,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_CA },
+         { "High",      OPTION_VAL_HIGH_CA },
+         { "Very High", OPTION_VAL_VERY_HIGH_CA },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_CA,
+      FCEUMM_SWAPDUTY_LABEL_CAT_CA,
+      FCEUMM_SWAPDUTY_INFO_0_CA,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_CA,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_CA,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_CA },
+         { "1",  OPTION_VAL_1_CA },
+         { "2",  OPTION_VAL_2_CA },
+         { "3",  OPTION_VAL_3_CA },
+         { "4",  OPTION_VAL_4_CA },
+         { "5",  OPTION_VAL_5_CA },
+         { "6",  OPTION_VAL_6_CA },
+         { "7",  OPTION_VAL_7_CA },
+         { "8",  OPTION_VAL_8_CA },
+         { "9",  OPTION_VAL_9_CA },
+         { "10", OPTION_VAL_10_CA },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_CA,
+      FCEUMM_APU_1_LABEL_CAT_CA,
+      FCEUMM_APU_1_INFO_0_CA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_CA,
+      FCEUMM_APU_2_LABEL_CAT_CA,
+      FCEUMM_APU_2_INFO_0_CA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_CA,
+      FCEUMM_APU_3_LABEL_CAT_CA,
+      FCEUMM_APU_3_INFO_0_CA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_CA,
+      FCEUMM_APU_4_LABEL_CAT_CA,
+      FCEUMM_APU_4_INFO_0_CA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_CA,
+      FCEUMM_APU_5_LABEL_CAT_CA,
+      FCEUMM_APU_5_INFO_0_CA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_CA,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_CA,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_CA },
+         { "Player 1", OPTION_VAL_PLAYER_1_CA },
+         { "Player 2", OPTION_VAL_PLAYER_2_CA },
+         { "Both",     OPTION_VAL_BOTH_CA },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_CA,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_CA,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_CA,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_CA,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_CA },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_CA },
+         { "mouse",       OPTION_VAL_MOUSE_CA },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_CA,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_CA,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_CA,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_CA,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_CA,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_CA,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_CA,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_CA,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_CA,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_CA,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_CA },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_CA },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_CA,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_CA,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_CA },
+         { "fill $00", OPTION_VAL_FILL_00_CA },
+         { "random",   OPTION_VAL_RANDOM_CA },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_ca = {
+   option_cats_ca,
+   option_defs_ca
+};
 
-/* RETRO_LANGUAGE_RUSSIAN */
+/* RETRO_LANGUAGE_CHS */
 
-/* RETRO_LANGUAGE_KOREAN */
+#define CATEGORY_SYSTEM_LABEL_CHS "系统"
+#define CATEGORY_SYSTEM_INFO_0_CHS NULL
+#define CATEGORY_VIDEO_LABEL_CHS "视频"
+#define CATEGORY_VIDEO_INFO_0_CHS NULL
+#define CATEGORY_VIDEO_INFO_1_CHS NULL
+#define CATEGORY_AUDIO_LABEL_CHS "音频"
+#define CATEGORY_AUDIO_INFO_0_CHS NULL
+#define CATEGORY_INPUT_LABEL_CHS "输入"
+#define CATEGORY_INPUT_INFO_0_CHS NULL
+#define CATEGORY_HACKS_LABEL_CHS "模拟修改"
+#define CATEGORY_HACKS_INFO_0_CHS "配置处理器超时和模拟精确参数，影响低级性能和兼容性。"
+#define CATEGORY_DIP_SWITCH_LABEL_CHS NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_CHS NULL
+#define FCEUMM_REGION_LABEL_CHS NULL
+#define FCEUMM_REGION_INFO_0_CHS NULL
+#define OPTION_VAL_AUTO_CHS NULL
+#define OPTION_VAL_NTSC_CHS NULL
+#define OPTION_VAL_PAL_CHS NULL
+#define OPTION_VAL_DENDY_CHS NULL
+#define FCEUMM_GAME_GENIE_LABEL_CHS NULL
+#define FCEUMM_GAME_GENIE_INFO_0_CHS NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_CHS NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_CHS NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_CHS NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_CHS NULL
+#define FCEUMM_ASPECT_LABEL_CHS NULL
+#define FCEUMM_ASPECT_INFO_0_CHS NULL
+#define OPTION_VAL_8_7_PAR_CHS NULL
+#define OPTION_VAL_4_3_CHS NULL
+#define OPTION_VAL_PP_CHS NULL
+#define FCEUMM_OVERSCAN_LABEL_CHS NULL
+#define FCEUMM_OVERSCAN_INFO_0_CHS NULL
+#define FCEUMM_OVERSCAN_H_LABEL_CHS NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_CHS NULL
+#define FCEUMM_OVERSCAN_V_LABEL_CHS NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_CHS NULL
+#define FCEUMM_PALETTE_LABEL_CHS NULL
+#define FCEUMM_PALETTE_INFO_0_CHS NULL
+#define OPTION_VAL_DEFAULT_CHS NULL
+#define OPTION_VAL_ASQREALC_CHS NULL
+#define OPTION_VAL_NINTENDO_VC_CHS NULL
+#define OPTION_VAL_RGB_CHS NULL
+#define OPTION_VAL_YUV_V3_CHS NULL
+#define OPTION_VAL_UNSATURATED_FINAL_CHS NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_CHS NULL
+#define OPTION_VAL_BMF_FINAL2_CHS NULL
+#define OPTION_VAL_BMF_FINAL3_CHS NULL
+#define OPTION_VAL_SMOOTH_FBX_CHS NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_CHS NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_CHS NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_CHS NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_CHS NULL
+#define OPTION_VAL_NESCAP_CHS NULL
+#define OPTION_VAL_WAVEBEAM_CHS NULL
+#define OPTION_VAL_RAW_CHS NULL
+#define OPTION_VAL_CUSTOM_CHS NULL
+#define FCEUMM_NTSC_FILTER_LABEL_CHS NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_CHS NULL
+#define OPTION_VAL_COMPOSITE_CHS NULL
+#define OPTION_VAL_SVIDEO_CHS NULL
+#define OPTION_VAL_RGB_O9_CHS NULL
+#define OPTION_VAL_MONOCHROME_CHS NULL
+#define FCEUMM_SNDQUALITY_LABEL_CHS NULL
+#define FCEUMM_SNDQUALITY_INFO_0_CHS NULL
+#define OPTION_VAL_LOW_CHS NULL
+#define OPTION_VAL_HIGH_CHS NULL
+#define OPTION_VAL_VERY_HIGH_CHS NULL
+#define FCEUMM_SWAPDUTY_LABEL_CHS NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_CHS NULL
+#define FCEUMM_SWAPDUTY_INFO_0_CHS NULL
+#define FCEUMM_SNDVOLUME_LABEL_CHS NULL
+#define FCEUMM_SNDVOLUME_INFO_0_CHS NULL
+#define OPTION_VAL_0_CHS NULL
+#define OPTION_VAL_1_CHS NULL
+#define OPTION_VAL_2_CHS NULL
+#define OPTION_VAL_3_CHS NULL
+#define OPTION_VAL_4_CHS NULL
+#define OPTION_VAL_5_CHS NULL
+#define OPTION_VAL_6_CHS NULL
+#define OPTION_VAL_7_CHS NULL
+#define OPTION_VAL_8_CHS NULL
+#define OPTION_VAL_9_CHS NULL
+#define OPTION_VAL_10_CHS NULL
+#define FCEUMM_APU_1_LABEL_CHS NULL
+#define FCEUMM_APU_1_LABEL_CAT_CHS NULL
+#define FCEUMM_APU_1_INFO_0_CHS NULL
+#define FCEUMM_APU_2_LABEL_CHS NULL
+#define FCEUMM_APU_2_LABEL_CAT_CHS NULL
+#define FCEUMM_APU_2_INFO_0_CHS NULL
+#define FCEUMM_APU_3_LABEL_CHS NULL
+#define FCEUMM_APU_3_LABEL_CAT_CHS NULL
+#define FCEUMM_APU_3_INFO_0_CHS NULL
+#define FCEUMM_APU_4_LABEL_CHS NULL
+#define FCEUMM_APU_4_LABEL_CAT_CHS NULL
+#define FCEUMM_APU_4_INFO_0_CHS NULL
+#define FCEUMM_APU_5_LABEL_CHS NULL
+#define FCEUMM_APU_5_LABEL_CAT_CHS NULL
+#define FCEUMM_APU_5_INFO_0_CHS NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_CHS NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_CHS NULL
+#define OPTION_VAL_NONE_CHS NULL
+#define OPTION_VAL_PLAYER_1_CHS NULL
+#define OPTION_VAL_PLAYER_2_CHS NULL
+#define OPTION_VAL_BOTH_CHS NULL
+#define FCEUMM_TURBO_DELAY_LABEL_CHS NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_CHS NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_CHS NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_CHS NULL
+#define OPTION_VAL_LIGHTGUN_CHS NULL
+#define OPTION_VAL_TOUCHSCREEN_CHS NULL
+#define OPTION_VAL_MOUSE_CHS NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_CHS NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_CHS NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_CHS NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_CHS NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_CHS NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_CHS NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_CHS NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_CHS NULL
+#define FCEUMM_OVERCLOCKING_LABEL_CHS NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_CHS NULL
+#define OPTION_VAL_2X_POSTRENDER_CHS NULL
+#define OPTION_VAL_2X_VBLANK_CHS NULL
+#define FCEUMM_RAMSTATE_LABEL_CHS NULL
+#define FCEUMM_RAMSTATE_INFO_0_CHS NULL
+#define OPTION_VAL_FILL_FF_CHS NULL
+#define OPTION_VAL_FILL_00_CHS NULL
+#define OPTION_VAL_RANDOM_CHS NULL
 
-/* RETRO_LANGUAGE_CHINESE_TRADITIONAL */
+struct retro_core_option_v2_category option_cats_chs[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_CHS,
+      CATEGORY_SYSTEM_INFO_0_CHS
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_CHS,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_CHS
+#else
+      CATEGORY_VIDEO_INFO_1_CHS
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_CHS,
+      CATEGORY_AUDIO_INFO_0_CHS
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_CHS,
+      CATEGORY_INPUT_INFO_0_CHS
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_CHS,
+      CATEGORY_HACKS_INFO_0_CHS
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_CHS,
+      CATEGORY_DIP_SWITCH_INFO_0_CHS
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_chs[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_CHS,
+      NULL,
+      FCEUMM_REGION_INFO_0_CHS,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_CHS },
+         { "NTSC",  OPTION_VAL_NTSC_CHS },
+         { "PAL",   OPTION_VAL_PAL_CHS },
+         { "Dendy", OPTION_VAL_DENDY_CHS },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_CHS,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_CHS,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_CHS,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_CHS,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_CHS,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_CHS,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_CHS,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_CHS,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_CHS },
+         { "4:3",     OPTION_VAL_4_3_CHS },
+         { "PP",      OPTION_VAL_PP_CHS },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_CHS,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_CHS,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_CHS,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_CHS,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_CHS,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_CHS,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_CHS,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_CHS,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_CHS },
+         { "asqrealc",             OPTION_VAL_ASQREALC_CHS },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_CHS },
+         { "rgb",                  OPTION_VAL_RGB_CHS },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_CHS },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_CHS },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_CHS },
+         { "pal",                  OPTION_VAL_PAL_CHS },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_CHS },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_CHS },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_CHS },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_CHS },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_CHS },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_CHS },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_CHS },
+         { "nescap",               OPTION_VAL_NESCAP_CHS },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_CHS },
+         { "raw",                  OPTION_VAL_RAW_CHS },
+         { "custom",               OPTION_VAL_CUSTOM_CHS },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_CHS,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_CHS,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_CHS },
+         { "svideo",     OPTION_VAL_SVIDEO_CHS },
+         { "rgb",        OPTION_VAL_RGB_O9_CHS },
+         { "monochrome", OPTION_VAL_MONOCHROME_CHS },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_CHS,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_CHS,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_CHS },
+         { "High",      OPTION_VAL_HIGH_CHS },
+         { "Very High", OPTION_VAL_VERY_HIGH_CHS },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_CHS,
+      FCEUMM_SWAPDUTY_LABEL_CAT_CHS,
+      FCEUMM_SWAPDUTY_INFO_0_CHS,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_CHS,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_CHS,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_CHS },
+         { "1",  OPTION_VAL_1_CHS },
+         { "2",  OPTION_VAL_2_CHS },
+         { "3",  OPTION_VAL_3_CHS },
+         { "4",  OPTION_VAL_4_CHS },
+         { "5",  OPTION_VAL_5_CHS },
+         { "6",  OPTION_VAL_6_CHS },
+         { "7",  OPTION_VAL_7_CHS },
+         { "8",  OPTION_VAL_8_CHS },
+         { "9",  OPTION_VAL_9_CHS },
+         { "10", OPTION_VAL_10_CHS },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_CHS,
+      FCEUMM_APU_1_LABEL_CAT_CHS,
+      FCEUMM_APU_1_INFO_0_CHS,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_CHS,
+      FCEUMM_APU_2_LABEL_CAT_CHS,
+      FCEUMM_APU_2_INFO_0_CHS,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_CHS,
+      FCEUMM_APU_3_LABEL_CAT_CHS,
+      FCEUMM_APU_3_INFO_0_CHS,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_CHS,
+      FCEUMM_APU_4_LABEL_CAT_CHS,
+      FCEUMM_APU_4_INFO_0_CHS,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_CHS,
+      FCEUMM_APU_5_LABEL_CAT_CHS,
+      FCEUMM_APU_5_INFO_0_CHS,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_CHS,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_CHS,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_CHS },
+         { "Player 1", OPTION_VAL_PLAYER_1_CHS },
+         { "Player 2", OPTION_VAL_PLAYER_2_CHS },
+         { "Both",     OPTION_VAL_BOTH_CHS },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_CHS,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_CHS,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_CHS,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_CHS,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_CHS },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_CHS },
+         { "mouse",       OPTION_VAL_MOUSE_CHS },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_CHS,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_CHS,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_CHS,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_CHS,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_CHS,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_CHS,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_CHS,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_CHS,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_CHS,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_CHS,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_CHS },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_CHS },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_CHS,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_CHS,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_CHS },
+         { "fill $00", OPTION_VAL_FILL_00_CHS },
+         { "random",   OPTION_VAL_RANDOM_CHS },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_chs = {
+   option_cats_chs,
+   option_defs_chs
+};
 
-/* RETRO_LANGUAGE_CHINESE_SIMPLIFIED */
+/* RETRO_LANGUAGE_CHT */
 
-/* RETRO_LANGUAGE_ESPERANTO */
+#define CATEGORY_SYSTEM_LABEL_CHT "系統"
+#define CATEGORY_SYSTEM_INFO_0_CHT NULL
+#define CATEGORY_VIDEO_LABEL_CHT "視訊"
+#define CATEGORY_VIDEO_INFO_0_CHT NULL
+#define CATEGORY_VIDEO_INFO_1_CHT NULL
+#define CATEGORY_AUDIO_LABEL_CHT "音訊"
+#define CATEGORY_AUDIO_INFO_0_CHT NULL
+#define CATEGORY_INPUT_LABEL_CHT "輸入"
+#define CATEGORY_INPUT_INFO_0_CHT NULL
+#define CATEGORY_HACKS_LABEL_CHT NULL
+#define CATEGORY_HACKS_INFO_0_CHT NULL
+#define CATEGORY_DIP_SWITCH_LABEL_CHT NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_CHT NULL
+#define FCEUMM_REGION_LABEL_CHT NULL
+#define FCEUMM_REGION_INFO_0_CHT NULL
+#define OPTION_VAL_AUTO_CHT NULL
+#define OPTION_VAL_NTSC_CHT NULL
+#define OPTION_VAL_PAL_CHT NULL
+#define OPTION_VAL_DENDY_CHT NULL
+#define FCEUMM_GAME_GENIE_LABEL_CHT NULL
+#define FCEUMM_GAME_GENIE_INFO_0_CHT NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_CHT NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_CHT NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_CHT NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_CHT NULL
+#define FCEUMM_ASPECT_LABEL_CHT NULL
+#define FCEUMM_ASPECT_INFO_0_CHT NULL
+#define OPTION_VAL_8_7_PAR_CHT NULL
+#define OPTION_VAL_4_3_CHT NULL
+#define OPTION_VAL_PP_CHT NULL
+#define FCEUMM_OVERSCAN_LABEL_CHT NULL
+#define FCEUMM_OVERSCAN_INFO_0_CHT NULL
+#define FCEUMM_OVERSCAN_H_LABEL_CHT NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_CHT NULL
+#define FCEUMM_OVERSCAN_V_LABEL_CHT NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_CHT NULL
+#define FCEUMM_PALETTE_LABEL_CHT NULL
+#define FCEUMM_PALETTE_INFO_0_CHT NULL
+#define OPTION_VAL_DEFAULT_CHT NULL
+#define OPTION_VAL_ASQREALC_CHT NULL
+#define OPTION_VAL_NINTENDO_VC_CHT NULL
+#define OPTION_VAL_RGB_CHT NULL
+#define OPTION_VAL_YUV_V3_CHT NULL
+#define OPTION_VAL_UNSATURATED_FINAL_CHT NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_CHT NULL
+#define OPTION_VAL_BMF_FINAL2_CHT NULL
+#define OPTION_VAL_BMF_FINAL3_CHT NULL
+#define OPTION_VAL_SMOOTH_FBX_CHT NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_CHT NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_CHT NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_CHT NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_CHT NULL
+#define OPTION_VAL_NESCAP_CHT NULL
+#define OPTION_VAL_WAVEBEAM_CHT NULL
+#define OPTION_VAL_RAW_CHT NULL
+#define OPTION_VAL_CUSTOM_CHT NULL
+#define FCEUMM_NTSC_FILTER_LABEL_CHT NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_CHT NULL
+#define OPTION_VAL_COMPOSITE_CHT NULL
+#define OPTION_VAL_SVIDEO_CHT NULL
+#define OPTION_VAL_RGB_O9_CHT NULL
+#define OPTION_VAL_MONOCHROME_CHT NULL
+#define FCEUMM_SNDQUALITY_LABEL_CHT NULL
+#define FCEUMM_SNDQUALITY_INFO_0_CHT NULL
+#define OPTION_VAL_LOW_CHT NULL
+#define OPTION_VAL_HIGH_CHT NULL
+#define OPTION_VAL_VERY_HIGH_CHT NULL
+#define FCEUMM_SWAPDUTY_LABEL_CHT NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_CHT NULL
+#define FCEUMM_SWAPDUTY_INFO_0_CHT NULL
+#define FCEUMM_SNDVOLUME_LABEL_CHT NULL
+#define FCEUMM_SNDVOLUME_INFO_0_CHT NULL
+#define OPTION_VAL_0_CHT NULL
+#define OPTION_VAL_1_CHT NULL
+#define OPTION_VAL_2_CHT NULL
+#define OPTION_VAL_3_CHT NULL
+#define OPTION_VAL_4_CHT NULL
+#define OPTION_VAL_5_CHT NULL
+#define OPTION_VAL_6_CHT NULL
+#define OPTION_VAL_7_CHT NULL
+#define OPTION_VAL_8_CHT NULL
+#define OPTION_VAL_9_CHT NULL
+#define OPTION_VAL_10_CHT NULL
+#define FCEUMM_APU_1_LABEL_CHT NULL
+#define FCEUMM_APU_1_LABEL_CAT_CHT NULL
+#define FCEUMM_APU_1_INFO_0_CHT NULL
+#define FCEUMM_APU_2_LABEL_CHT NULL
+#define FCEUMM_APU_2_LABEL_CAT_CHT NULL
+#define FCEUMM_APU_2_INFO_0_CHT NULL
+#define FCEUMM_APU_3_LABEL_CHT NULL
+#define FCEUMM_APU_3_LABEL_CAT_CHT NULL
+#define FCEUMM_APU_3_INFO_0_CHT NULL
+#define FCEUMM_APU_4_LABEL_CHT NULL
+#define FCEUMM_APU_4_LABEL_CAT_CHT NULL
+#define FCEUMM_APU_4_INFO_0_CHT NULL
+#define FCEUMM_APU_5_LABEL_CHT NULL
+#define FCEUMM_APU_5_LABEL_CAT_CHT NULL
+#define FCEUMM_APU_5_INFO_0_CHT NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_CHT NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_CHT NULL
+#define OPTION_VAL_NONE_CHT NULL
+#define OPTION_VAL_PLAYER_1_CHT NULL
+#define OPTION_VAL_PLAYER_2_CHT NULL
+#define OPTION_VAL_BOTH_CHT NULL
+#define FCEUMM_TURBO_DELAY_LABEL_CHT NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_CHT NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_CHT NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_CHT NULL
+#define OPTION_VAL_LIGHTGUN_CHT NULL
+#define OPTION_VAL_TOUCHSCREEN_CHT NULL
+#define OPTION_VAL_MOUSE_CHT NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_CHT NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_CHT NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_CHT NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_CHT NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_CHT NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_CHT NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_CHT NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_CHT NULL
+#define FCEUMM_OVERCLOCKING_LABEL_CHT NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_CHT NULL
+#define OPTION_VAL_2X_POSTRENDER_CHT NULL
+#define OPTION_VAL_2X_VBLANK_CHT NULL
+#define FCEUMM_RAMSTATE_LABEL_CHT NULL
+#define FCEUMM_RAMSTATE_INFO_0_CHT NULL
+#define OPTION_VAL_FILL_FF_CHT NULL
+#define OPTION_VAL_FILL_00_CHT NULL
+#define OPTION_VAL_RANDOM_CHT NULL
 
-/* RETRO_LANGUAGE_POLISH */
+struct retro_core_option_v2_category option_cats_cht[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_CHT,
+      CATEGORY_SYSTEM_INFO_0_CHT
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_CHT,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_CHT
+#else
+      CATEGORY_VIDEO_INFO_1_CHT
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_CHT,
+      CATEGORY_AUDIO_INFO_0_CHT
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_CHT,
+      CATEGORY_INPUT_INFO_0_CHT
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_CHT,
+      CATEGORY_HACKS_INFO_0_CHT
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_CHT,
+      CATEGORY_DIP_SWITCH_INFO_0_CHT
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_cht[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_CHT,
+      NULL,
+      FCEUMM_REGION_INFO_0_CHT,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_CHT },
+         { "NTSC",  OPTION_VAL_NTSC_CHT },
+         { "PAL",   OPTION_VAL_PAL_CHT },
+         { "Dendy", OPTION_VAL_DENDY_CHT },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_CHT,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_CHT,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_CHT,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_CHT,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_CHT,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_CHT,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_CHT,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_CHT,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_CHT },
+         { "4:3",     OPTION_VAL_4_3_CHT },
+         { "PP",      OPTION_VAL_PP_CHT },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_CHT,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_CHT,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_CHT,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_CHT,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_CHT,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_CHT,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_CHT,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_CHT,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_CHT },
+         { "asqrealc",             OPTION_VAL_ASQREALC_CHT },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_CHT },
+         { "rgb",                  OPTION_VAL_RGB_CHT },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_CHT },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_CHT },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_CHT },
+         { "pal",                  OPTION_VAL_PAL_CHT },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_CHT },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_CHT },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_CHT },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_CHT },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_CHT },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_CHT },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_CHT },
+         { "nescap",               OPTION_VAL_NESCAP_CHT },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_CHT },
+         { "raw",                  OPTION_VAL_RAW_CHT },
+         { "custom",               OPTION_VAL_CUSTOM_CHT },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_CHT,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_CHT,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_CHT },
+         { "svideo",     OPTION_VAL_SVIDEO_CHT },
+         { "rgb",        OPTION_VAL_RGB_O9_CHT },
+         { "monochrome", OPTION_VAL_MONOCHROME_CHT },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_CHT,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_CHT,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_CHT },
+         { "High",      OPTION_VAL_HIGH_CHT },
+         { "Very High", OPTION_VAL_VERY_HIGH_CHT },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_CHT,
+      FCEUMM_SWAPDUTY_LABEL_CAT_CHT,
+      FCEUMM_SWAPDUTY_INFO_0_CHT,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_CHT,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_CHT,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_CHT },
+         { "1",  OPTION_VAL_1_CHT },
+         { "2",  OPTION_VAL_2_CHT },
+         { "3",  OPTION_VAL_3_CHT },
+         { "4",  OPTION_VAL_4_CHT },
+         { "5",  OPTION_VAL_5_CHT },
+         { "6",  OPTION_VAL_6_CHT },
+         { "7",  OPTION_VAL_7_CHT },
+         { "8",  OPTION_VAL_8_CHT },
+         { "9",  OPTION_VAL_9_CHT },
+         { "10", OPTION_VAL_10_CHT },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_CHT,
+      FCEUMM_APU_1_LABEL_CAT_CHT,
+      FCEUMM_APU_1_INFO_0_CHT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_CHT,
+      FCEUMM_APU_2_LABEL_CAT_CHT,
+      FCEUMM_APU_2_INFO_0_CHT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_CHT,
+      FCEUMM_APU_3_LABEL_CAT_CHT,
+      FCEUMM_APU_3_INFO_0_CHT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_CHT,
+      FCEUMM_APU_4_LABEL_CAT_CHT,
+      FCEUMM_APU_4_INFO_0_CHT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_CHT,
+      FCEUMM_APU_5_LABEL_CAT_CHT,
+      FCEUMM_APU_5_INFO_0_CHT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_CHT,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_CHT,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_CHT },
+         { "Player 1", OPTION_VAL_PLAYER_1_CHT },
+         { "Player 2", OPTION_VAL_PLAYER_2_CHT },
+         { "Both",     OPTION_VAL_BOTH_CHT },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_CHT,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_CHT,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_CHT,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_CHT,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_CHT },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_CHT },
+         { "mouse",       OPTION_VAL_MOUSE_CHT },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_CHT,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_CHT,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_CHT,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_CHT,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_CHT,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_CHT,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_CHT,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_CHT,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_CHT,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_CHT,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_CHT },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_CHT },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_CHT,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_CHT,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_CHT },
+         { "fill $00", OPTION_VAL_FILL_00_CHT },
+         { "random",   OPTION_VAL_RANDOM_CHT },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_cht = {
+   option_cats_cht,
+   option_defs_cht
+};
 
-/* RETRO_LANGUAGE_VIETNAMESE */
+/* RETRO_LANGUAGE_CS */
 
-/* RETRO_LANGUAGE_ARABIC */
+#define CATEGORY_SYSTEM_LABEL_CS NULL
+#define CATEGORY_SYSTEM_INFO_0_CS NULL
+#define CATEGORY_VIDEO_LABEL_CS NULL
+#define CATEGORY_VIDEO_INFO_0_CS NULL
+#define CATEGORY_VIDEO_INFO_1_CS NULL
+#define CATEGORY_AUDIO_LABEL_CS "Zvuk"
+#define CATEGORY_AUDIO_INFO_0_CS NULL
+#define CATEGORY_INPUT_LABEL_CS "Vstup"
+#define CATEGORY_INPUT_INFO_0_CS NULL
+#define CATEGORY_HACKS_LABEL_CS NULL
+#define CATEGORY_HACKS_INFO_0_CS NULL
+#define CATEGORY_DIP_SWITCH_LABEL_CS NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_CS NULL
+#define FCEUMM_REGION_LABEL_CS NULL
+#define FCEUMM_REGION_INFO_0_CS NULL
+#define OPTION_VAL_AUTO_CS NULL
+#define OPTION_VAL_NTSC_CS NULL
+#define OPTION_VAL_PAL_CS NULL
+#define OPTION_VAL_DENDY_CS NULL
+#define FCEUMM_GAME_GENIE_LABEL_CS NULL
+#define FCEUMM_GAME_GENIE_INFO_0_CS NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_CS NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_CS NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_CS NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_CS NULL
+#define FCEUMM_ASPECT_LABEL_CS NULL
+#define FCEUMM_ASPECT_INFO_0_CS NULL
+#define OPTION_VAL_8_7_PAR_CS NULL
+#define OPTION_VAL_4_3_CS NULL
+#define OPTION_VAL_PP_CS NULL
+#define FCEUMM_OVERSCAN_LABEL_CS NULL
+#define FCEUMM_OVERSCAN_INFO_0_CS NULL
+#define FCEUMM_OVERSCAN_H_LABEL_CS NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_CS NULL
+#define FCEUMM_OVERSCAN_V_LABEL_CS NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_CS NULL
+#define FCEUMM_PALETTE_LABEL_CS NULL
+#define FCEUMM_PALETTE_INFO_0_CS NULL
+#define OPTION_VAL_DEFAULT_CS NULL
+#define OPTION_VAL_ASQREALC_CS NULL
+#define OPTION_VAL_NINTENDO_VC_CS NULL
+#define OPTION_VAL_RGB_CS NULL
+#define OPTION_VAL_YUV_V3_CS NULL
+#define OPTION_VAL_UNSATURATED_FINAL_CS NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_CS NULL
+#define OPTION_VAL_BMF_FINAL2_CS NULL
+#define OPTION_VAL_BMF_FINAL3_CS NULL
+#define OPTION_VAL_SMOOTH_FBX_CS NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_CS NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_CS NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_CS NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_CS NULL
+#define OPTION_VAL_NESCAP_CS NULL
+#define OPTION_VAL_WAVEBEAM_CS NULL
+#define OPTION_VAL_RAW_CS NULL
+#define OPTION_VAL_CUSTOM_CS NULL
+#define FCEUMM_NTSC_FILTER_LABEL_CS NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_CS NULL
+#define OPTION_VAL_COMPOSITE_CS NULL
+#define OPTION_VAL_SVIDEO_CS NULL
+#define OPTION_VAL_RGB_O9_CS NULL
+#define OPTION_VAL_MONOCHROME_CS NULL
+#define FCEUMM_SNDQUALITY_LABEL_CS NULL
+#define FCEUMM_SNDQUALITY_INFO_0_CS NULL
+#define OPTION_VAL_LOW_CS NULL
+#define OPTION_VAL_HIGH_CS NULL
+#define OPTION_VAL_VERY_HIGH_CS NULL
+#define FCEUMM_SWAPDUTY_LABEL_CS NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_CS NULL
+#define FCEUMM_SWAPDUTY_INFO_0_CS NULL
+#define FCEUMM_SNDVOLUME_LABEL_CS NULL
+#define FCEUMM_SNDVOLUME_INFO_0_CS NULL
+#define OPTION_VAL_0_CS NULL
+#define OPTION_VAL_1_CS NULL
+#define OPTION_VAL_2_CS NULL
+#define OPTION_VAL_3_CS NULL
+#define OPTION_VAL_4_CS NULL
+#define OPTION_VAL_5_CS NULL
+#define OPTION_VAL_6_CS NULL
+#define OPTION_VAL_7_CS NULL
+#define OPTION_VAL_8_CS NULL
+#define OPTION_VAL_9_CS NULL
+#define OPTION_VAL_10_CS NULL
+#define FCEUMM_APU_1_LABEL_CS NULL
+#define FCEUMM_APU_1_LABEL_CAT_CS NULL
+#define FCEUMM_APU_1_INFO_0_CS NULL
+#define FCEUMM_APU_2_LABEL_CS NULL
+#define FCEUMM_APU_2_LABEL_CAT_CS NULL
+#define FCEUMM_APU_2_INFO_0_CS NULL
+#define FCEUMM_APU_3_LABEL_CS NULL
+#define FCEUMM_APU_3_LABEL_CAT_CS NULL
+#define FCEUMM_APU_3_INFO_0_CS NULL
+#define FCEUMM_APU_4_LABEL_CS NULL
+#define FCEUMM_APU_4_LABEL_CAT_CS NULL
+#define FCEUMM_APU_4_INFO_0_CS NULL
+#define FCEUMM_APU_5_LABEL_CS NULL
+#define FCEUMM_APU_5_LABEL_CAT_CS NULL
+#define FCEUMM_APU_5_INFO_0_CS NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_CS NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_CS NULL
+#define OPTION_VAL_NONE_CS NULL
+#define OPTION_VAL_PLAYER_1_CS NULL
+#define OPTION_VAL_PLAYER_2_CS NULL
+#define OPTION_VAL_BOTH_CS NULL
+#define FCEUMM_TURBO_DELAY_LABEL_CS NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_CS NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_CS NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_CS NULL
+#define OPTION_VAL_LIGHTGUN_CS NULL
+#define OPTION_VAL_TOUCHSCREEN_CS NULL
+#define OPTION_VAL_MOUSE_CS NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_CS NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_CS NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_CS NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_CS NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_CS NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_CS NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_CS NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_CS NULL
+#define FCEUMM_OVERCLOCKING_LABEL_CS NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_CS NULL
+#define OPTION_VAL_2X_POSTRENDER_CS NULL
+#define OPTION_VAL_2X_VBLANK_CS NULL
+#define FCEUMM_RAMSTATE_LABEL_CS NULL
+#define FCEUMM_RAMSTATE_INFO_0_CS NULL
+#define OPTION_VAL_FILL_FF_CS NULL
+#define OPTION_VAL_FILL_00_CS NULL
+#define OPTION_VAL_RANDOM_CS NULL
 
-/* RETRO_LANGUAGE_GREEK */
+struct retro_core_option_v2_category option_cats_cs[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_CS,
+      CATEGORY_SYSTEM_INFO_0_CS
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_CS,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_CS
+#else
+      CATEGORY_VIDEO_INFO_1_CS
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_CS,
+      CATEGORY_AUDIO_INFO_0_CS
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_CS,
+      CATEGORY_INPUT_INFO_0_CS
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_CS,
+      CATEGORY_HACKS_INFO_0_CS
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_CS,
+      CATEGORY_DIP_SWITCH_INFO_0_CS
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_cs[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_CS,
+      NULL,
+      FCEUMM_REGION_INFO_0_CS,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_CS },
+         { "NTSC",  OPTION_VAL_NTSC_CS },
+         { "PAL",   OPTION_VAL_PAL_CS },
+         { "Dendy", OPTION_VAL_DENDY_CS },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_CS,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_CS,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_CS,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_CS,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_CS,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_CS,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_CS,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_CS,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_CS },
+         { "4:3",     OPTION_VAL_4_3_CS },
+         { "PP",      OPTION_VAL_PP_CS },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_CS,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_CS,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_CS,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_CS,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_CS,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_CS,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_CS,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_CS,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_CS },
+         { "asqrealc",             OPTION_VAL_ASQREALC_CS },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_CS },
+         { "rgb",                  OPTION_VAL_RGB_CS },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_CS },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_CS },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_CS },
+         { "pal",                  OPTION_VAL_PAL_CS },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_CS },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_CS },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_CS },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_CS },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_CS },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_CS },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_CS },
+         { "nescap",               OPTION_VAL_NESCAP_CS },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_CS },
+         { "raw",                  OPTION_VAL_RAW_CS },
+         { "custom",               OPTION_VAL_CUSTOM_CS },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_CS,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_CS,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_CS },
+         { "svideo",     OPTION_VAL_SVIDEO_CS },
+         { "rgb",        OPTION_VAL_RGB_O9_CS },
+         { "monochrome", OPTION_VAL_MONOCHROME_CS },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_CS,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_CS,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_CS },
+         { "High",      OPTION_VAL_HIGH_CS },
+         { "Very High", OPTION_VAL_VERY_HIGH_CS },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_CS,
+      FCEUMM_SWAPDUTY_LABEL_CAT_CS,
+      FCEUMM_SWAPDUTY_INFO_0_CS,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_CS,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_CS,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_CS },
+         { "1",  OPTION_VAL_1_CS },
+         { "2",  OPTION_VAL_2_CS },
+         { "3",  OPTION_VAL_3_CS },
+         { "4",  OPTION_VAL_4_CS },
+         { "5",  OPTION_VAL_5_CS },
+         { "6",  OPTION_VAL_6_CS },
+         { "7",  OPTION_VAL_7_CS },
+         { "8",  OPTION_VAL_8_CS },
+         { "9",  OPTION_VAL_9_CS },
+         { "10", OPTION_VAL_10_CS },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_CS,
+      FCEUMM_APU_1_LABEL_CAT_CS,
+      FCEUMM_APU_1_INFO_0_CS,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_CS,
+      FCEUMM_APU_2_LABEL_CAT_CS,
+      FCEUMM_APU_2_INFO_0_CS,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_CS,
+      FCEUMM_APU_3_LABEL_CAT_CS,
+      FCEUMM_APU_3_INFO_0_CS,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_CS,
+      FCEUMM_APU_4_LABEL_CAT_CS,
+      FCEUMM_APU_4_INFO_0_CS,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_CS,
+      FCEUMM_APU_5_LABEL_CAT_CS,
+      FCEUMM_APU_5_INFO_0_CS,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_CS,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_CS,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_CS },
+         { "Player 1", OPTION_VAL_PLAYER_1_CS },
+         { "Player 2", OPTION_VAL_PLAYER_2_CS },
+         { "Both",     OPTION_VAL_BOTH_CS },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_CS,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_CS,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_CS,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_CS,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_CS },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_CS },
+         { "mouse",       OPTION_VAL_MOUSE_CS },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_CS,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_CS,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_CS,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_CS,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_CS,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_CS,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_CS,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_CS,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_CS,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_CS,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_CS },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_CS },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_CS,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_CS,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_CS },
+         { "fill $00", OPTION_VAL_FILL_00_CS },
+         { "random",   OPTION_VAL_RANDOM_CS },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_cs = {
+   option_cats_cs,
+   option_defs_cs
+};
 
-/* RETRO_LANGUAGE_TURKISH */
+/* RETRO_LANGUAGE_CY */
 
-/* RETRO_LANGUAGE_SLOVAK */
+#define CATEGORY_SYSTEM_LABEL_CY NULL
+#define CATEGORY_SYSTEM_INFO_0_CY NULL
+#define CATEGORY_VIDEO_LABEL_CY NULL
+#define CATEGORY_VIDEO_INFO_0_CY NULL
+#define CATEGORY_VIDEO_INFO_1_CY NULL
+#define CATEGORY_AUDIO_LABEL_CY NULL
+#define CATEGORY_AUDIO_INFO_0_CY NULL
+#define CATEGORY_INPUT_LABEL_CY "Mewnbwn"
+#define CATEGORY_INPUT_INFO_0_CY NULL
+#define CATEGORY_HACKS_LABEL_CY NULL
+#define CATEGORY_HACKS_INFO_0_CY NULL
+#define CATEGORY_DIP_SWITCH_LABEL_CY NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_CY NULL
+#define FCEUMM_REGION_LABEL_CY NULL
+#define FCEUMM_REGION_INFO_0_CY NULL
+#define OPTION_VAL_AUTO_CY NULL
+#define OPTION_VAL_NTSC_CY NULL
+#define OPTION_VAL_PAL_CY NULL
+#define OPTION_VAL_DENDY_CY NULL
+#define FCEUMM_GAME_GENIE_LABEL_CY NULL
+#define FCEUMM_GAME_GENIE_INFO_0_CY NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_CY NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_CY NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_CY NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_CY NULL
+#define FCEUMM_ASPECT_LABEL_CY NULL
+#define FCEUMM_ASPECT_INFO_0_CY NULL
+#define OPTION_VAL_8_7_PAR_CY NULL
+#define OPTION_VAL_4_3_CY NULL
+#define OPTION_VAL_PP_CY NULL
+#define FCEUMM_OVERSCAN_LABEL_CY NULL
+#define FCEUMM_OVERSCAN_INFO_0_CY NULL
+#define FCEUMM_OVERSCAN_H_LABEL_CY NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_CY NULL
+#define FCEUMM_OVERSCAN_V_LABEL_CY NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_CY NULL
+#define FCEUMM_PALETTE_LABEL_CY NULL
+#define FCEUMM_PALETTE_INFO_0_CY NULL
+#define OPTION_VAL_DEFAULT_CY NULL
+#define OPTION_VAL_ASQREALC_CY NULL
+#define OPTION_VAL_NINTENDO_VC_CY NULL
+#define OPTION_VAL_RGB_CY NULL
+#define OPTION_VAL_YUV_V3_CY NULL
+#define OPTION_VAL_UNSATURATED_FINAL_CY NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_CY NULL
+#define OPTION_VAL_BMF_FINAL2_CY NULL
+#define OPTION_VAL_BMF_FINAL3_CY NULL
+#define OPTION_VAL_SMOOTH_FBX_CY NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_CY NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_CY NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_CY NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_CY NULL
+#define OPTION_VAL_NESCAP_CY NULL
+#define OPTION_VAL_WAVEBEAM_CY NULL
+#define OPTION_VAL_RAW_CY NULL
+#define OPTION_VAL_CUSTOM_CY NULL
+#define FCEUMM_NTSC_FILTER_LABEL_CY NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_CY NULL
+#define OPTION_VAL_COMPOSITE_CY NULL
+#define OPTION_VAL_SVIDEO_CY NULL
+#define OPTION_VAL_RGB_O9_CY NULL
+#define OPTION_VAL_MONOCHROME_CY NULL
+#define FCEUMM_SNDQUALITY_LABEL_CY NULL
+#define FCEUMM_SNDQUALITY_INFO_0_CY NULL
+#define OPTION_VAL_LOW_CY NULL
+#define OPTION_VAL_HIGH_CY NULL
+#define OPTION_VAL_VERY_HIGH_CY NULL
+#define FCEUMM_SWAPDUTY_LABEL_CY NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_CY NULL
+#define FCEUMM_SWAPDUTY_INFO_0_CY NULL
+#define FCEUMM_SNDVOLUME_LABEL_CY NULL
+#define FCEUMM_SNDVOLUME_INFO_0_CY NULL
+#define OPTION_VAL_0_CY NULL
+#define OPTION_VAL_1_CY NULL
+#define OPTION_VAL_2_CY NULL
+#define OPTION_VAL_3_CY NULL
+#define OPTION_VAL_4_CY NULL
+#define OPTION_VAL_5_CY NULL
+#define OPTION_VAL_6_CY NULL
+#define OPTION_VAL_7_CY NULL
+#define OPTION_VAL_8_CY NULL
+#define OPTION_VAL_9_CY NULL
+#define OPTION_VAL_10_CY NULL
+#define FCEUMM_APU_1_LABEL_CY NULL
+#define FCEUMM_APU_1_LABEL_CAT_CY NULL
+#define FCEUMM_APU_1_INFO_0_CY NULL
+#define FCEUMM_APU_2_LABEL_CY NULL
+#define FCEUMM_APU_2_LABEL_CAT_CY NULL
+#define FCEUMM_APU_2_INFO_0_CY NULL
+#define FCEUMM_APU_3_LABEL_CY NULL
+#define FCEUMM_APU_3_LABEL_CAT_CY NULL
+#define FCEUMM_APU_3_INFO_0_CY NULL
+#define FCEUMM_APU_4_LABEL_CY NULL
+#define FCEUMM_APU_4_LABEL_CAT_CY NULL
+#define FCEUMM_APU_4_INFO_0_CY NULL
+#define FCEUMM_APU_5_LABEL_CY NULL
+#define FCEUMM_APU_5_LABEL_CAT_CY NULL
+#define FCEUMM_APU_5_INFO_0_CY NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_CY NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_CY NULL
+#define OPTION_VAL_NONE_CY NULL
+#define OPTION_VAL_PLAYER_1_CY NULL
+#define OPTION_VAL_PLAYER_2_CY NULL
+#define OPTION_VAL_BOTH_CY NULL
+#define FCEUMM_TURBO_DELAY_LABEL_CY NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_CY NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_CY NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_CY NULL
+#define OPTION_VAL_LIGHTGUN_CY NULL
+#define OPTION_VAL_TOUCHSCREEN_CY NULL
+#define OPTION_VAL_MOUSE_CY NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_CY NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_CY NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_CY NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_CY NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_CY NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_CY NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_CY NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_CY NULL
+#define FCEUMM_OVERCLOCKING_LABEL_CY NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_CY NULL
+#define OPTION_VAL_2X_POSTRENDER_CY NULL
+#define OPTION_VAL_2X_VBLANK_CY NULL
+#define FCEUMM_RAMSTATE_LABEL_CY NULL
+#define FCEUMM_RAMSTATE_INFO_0_CY NULL
+#define OPTION_VAL_FILL_FF_CY NULL
+#define OPTION_VAL_FILL_00_CY NULL
+#define OPTION_VAL_RANDOM_CY NULL
 
-/* RETRO_LANGUAGE_PERSIAN */
+struct retro_core_option_v2_category option_cats_cy[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_CY,
+      CATEGORY_SYSTEM_INFO_0_CY
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_CY,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_CY
+#else
+      CATEGORY_VIDEO_INFO_1_CY
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_CY,
+      CATEGORY_AUDIO_INFO_0_CY
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_CY,
+      CATEGORY_INPUT_INFO_0_CY
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_CY,
+      CATEGORY_HACKS_INFO_0_CY
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_CY,
+      CATEGORY_DIP_SWITCH_INFO_0_CY
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_cy[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_CY,
+      NULL,
+      FCEUMM_REGION_INFO_0_CY,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_CY },
+         { "NTSC",  OPTION_VAL_NTSC_CY },
+         { "PAL",   OPTION_VAL_PAL_CY },
+         { "Dendy", OPTION_VAL_DENDY_CY },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_CY,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_CY,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_CY,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_CY,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_CY,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_CY,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_CY,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_CY,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_CY },
+         { "4:3",     OPTION_VAL_4_3_CY },
+         { "PP",      OPTION_VAL_PP_CY },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_CY,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_CY,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_CY,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_CY,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_CY,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_CY,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_CY,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_CY,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_CY },
+         { "asqrealc",             OPTION_VAL_ASQREALC_CY },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_CY },
+         { "rgb",                  OPTION_VAL_RGB_CY },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_CY },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_CY },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_CY },
+         { "pal",                  OPTION_VAL_PAL_CY },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_CY },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_CY },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_CY },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_CY },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_CY },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_CY },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_CY },
+         { "nescap",               OPTION_VAL_NESCAP_CY },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_CY },
+         { "raw",                  OPTION_VAL_RAW_CY },
+         { "custom",               OPTION_VAL_CUSTOM_CY },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_CY,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_CY,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_CY },
+         { "svideo",     OPTION_VAL_SVIDEO_CY },
+         { "rgb",        OPTION_VAL_RGB_O9_CY },
+         { "monochrome", OPTION_VAL_MONOCHROME_CY },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_CY,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_CY,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_CY },
+         { "High",      OPTION_VAL_HIGH_CY },
+         { "Very High", OPTION_VAL_VERY_HIGH_CY },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_CY,
+      FCEUMM_SWAPDUTY_LABEL_CAT_CY,
+      FCEUMM_SWAPDUTY_INFO_0_CY,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_CY,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_CY,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_CY },
+         { "1",  OPTION_VAL_1_CY },
+         { "2",  OPTION_VAL_2_CY },
+         { "3",  OPTION_VAL_3_CY },
+         { "4",  OPTION_VAL_4_CY },
+         { "5",  OPTION_VAL_5_CY },
+         { "6",  OPTION_VAL_6_CY },
+         { "7",  OPTION_VAL_7_CY },
+         { "8",  OPTION_VAL_8_CY },
+         { "9",  OPTION_VAL_9_CY },
+         { "10", OPTION_VAL_10_CY },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_CY,
+      FCEUMM_APU_1_LABEL_CAT_CY,
+      FCEUMM_APU_1_INFO_0_CY,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_CY,
+      FCEUMM_APU_2_LABEL_CAT_CY,
+      FCEUMM_APU_2_INFO_0_CY,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_CY,
+      FCEUMM_APU_3_LABEL_CAT_CY,
+      FCEUMM_APU_3_INFO_0_CY,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_CY,
+      FCEUMM_APU_4_LABEL_CAT_CY,
+      FCEUMM_APU_4_INFO_0_CY,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_CY,
+      FCEUMM_APU_5_LABEL_CAT_CY,
+      FCEUMM_APU_5_INFO_0_CY,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_CY,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_CY,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_CY },
+         { "Player 1", OPTION_VAL_PLAYER_1_CY },
+         { "Player 2", OPTION_VAL_PLAYER_2_CY },
+         { "Both",     OPTION_VAL_BOTH_CY },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_CY,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_CY,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_CY,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_CY,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_CY },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_CY },
+         { "mouse",       OPTION_VAL_MOUSE_CY },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_CY,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_CY,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_CY,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_CY,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_CY,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_CY,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_CY,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_CY,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_CY,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_CY,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_CY },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_CY },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_CY,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_CY,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_CY },
+         { "fill $00", OPTION_VAL_FILL_00_CY },
+         { "random",   OPTION_VAL_RANDOM_CY },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_cy = {
+   option_cats_cy,
+   option_defs_cy
+};
 
-/* RETRO_LANGUAGE_HEBREW */
+/* RETRO_LANGUAGE_DA */
 
-/* RETRO_LANGUAGE_ASTURIAN */
+#define CATEGORY_SYSTEM_LABEL_DA NULL
+#define CATEGORY_SYSTEM_INFO_0_DA NULL
+#define CATEGORY_VIDEO_LABEL_DA NULL
+#define CATEGORY_VIDEO_INFO_0_DA NULL
+#define CATEGORY_VIDEO_INFO_1_DA NULL
+#define CATEGORY_AUDIO_LABEL_DA "Lyd"
+#define CATEGORY_AUDIO_INFO_0_DA NULL
+#define CATEGORY_INPUT_LABEL_DA NULL
+#define CATEGORY_INPUT_INFO_0_DA NULL
+#define CATEGORY_HACKS_LABEL_DA NULL
+#define CATEGORY_HACKS_INFO_0_DA NULL
+#define CATEGORY_DIP_SWITCH_LABEL_DA NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_DA NULL
+#define FCEUMM_REGION_LABEL_DA NULL
+#define FCEUMM_REGION_INFO_0_DA NULL
+#define OPTION_VAL_AUTO_DA NULL
+#define OPTION_VAL_NTSC_DA NULL
+#define OPTION_VAL_PAL_DA NULL
+#define OPTION_VAL_DENDY_DA NULL
+#define FCEUMM_GAME_GENIE_LABEL_DA NULL
+#define FCEUMM_GAME_GENIE_INFO_0_DA NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_DA NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_DA NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_DA NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_DA NULL
+#define FCEUMM_ASPECT_LABEL_DA NULL
+#define FCEUMM_ASPECT_INFO_0_DA NULL
+#define OPTION_VAL_8_7_PAR_DA NULL
+#define OPTION_VAL_4_3_DA NULL
+#define OPTION_VAL_PP_DA NULL
+#define FCEUMM_OVERSCAN_LABEL_DA NULL
+#define FCEUMM_OVERSCAN_INFO_0_DA NULL
+#define FCEUMM_OVERSCAN_H_LABEL_DA NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_DA NULL
+#define FCEUMM_OVERSCAN_V_LABEL_DA NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_DA NULL
+#define FCEUMM_PALETTE_LABEL_DA NULL
+#define FCEUMM_PALETTE_INFO_0_DA NULL
+#define OPTION_VAL_DEFAULT_DA NULL
+#define OPTION_VAL_ASQREALC_DA NULL
+#define OPTION_VAL_NINTENDO_VC_DA NULL
+#define OPTION_VAL_RGB_DA NULL
+#define OPTION_VAL_YUV_V3_DA NULL
+#define OPTION_VAL_UNSATURATED_FINAL_DA NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_DA NULL
+#define OPTION_VAL_BMF_FINAL2_DA NULL
+#define OPTION_VAL_BMF_FINAL3_DA NULL
+#define OPTION_VAL_SMOOTH_FBX_DA NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_DA NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_DA NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_DA NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_DA NULL
+#define OPTION_VAL_NESCAP_DA NULL
+#define OPTION_VAL_WAVEBEAM_DA NULL
+#define OPTION_VAL_RAW_DA NULL
+#define OPTION_VAL_CUSTOM_DA NULL
+#define FCEUMM_NTSC_FILTER_LABEL_DA NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_DA NULL
+#define OPTION_VAL_COMPOSITE_DA NULL
+#define OPTION_VAL_SVIDEO_DA NULL
+#define OPTION_VAL_RGB_O9_DA NULL
+#define OPTION_VAL_MONOCHROME_DA NULL
+#define FCEUMM_SNDQUALITY_LABEL_DA NULL
+#define FCEUMM_SNDQUALITY_INFO_0_DA NULL
+#define OPTION_VAL_LOW_DA NULL
+#define OPTION_VAL_HIGH_DA NULL
+#define OPTION_VAL_VERY_HIGH_DA NULL
+#define FCEUMM_SWAPDUTY_LABEL_DA NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_DA NULL
+#define FCEUMM_SWAPDUTY_INFO_0_DA NULL
+#define FCEUMM_SNDVOLUME_LABEL_DA NULL
+#define FCEUMM_SNDVOLUME_INFO_0_DA NULL
+#define OPTION_VAL_0_DA NULL
+#define OPTION_VAL_1_DA NULL
+#define OPTION_VAL_2_DA NULL
+#define OPTION_VAL_3_DA NULL
+#define OPTION_VAL_4_DA NULL
+#define OPTION_VAL_5_DA NULL
+#define OPTION_VAL_6_DA NULL
+#define OPTION_VAL_7_DA NULL
+#define OPTION_VAL_8_DA NULL
+#define OPTION_VAL_9_DA NULL
+#define OPTION_VAL_10_DA NULL
+#define FCEUMM_APU_1_LABEL_DA NULL
+#define FCEUMM_APU_1_LABEL_CAT_DA NULL
+#define FCEUMM_APU_1_INFO_0_DA NULL
+#define FCEUMM_APU_2_LABEL_DA NULL
+#define FCEUMM_APU_2_LABEL_CAT_DA NULL
+#define FCEUMM_APU_2_INFO_0_DA NULL
+#define FCEUMM_APU_3_LABEL_DA NULL
+#define FCEUMM_APU_3_LABEL_CAT_DA NULL
+#define FCEUMM_APU_3_INFO_0_DA NULL
+#define FCEUMM_APU_4_LABEL_DA NULL
+#define FCEUMM_APU_4_LABEL_CAT_DA NULL
+#define FCEUMM_APU_4_INFO_0_DA NULL
+#define FCEUMM_APU_5_LABEL_DA NULL
+#define FCEUMM_APU_5_LABEL_CAT_DA NULL
+#define FCEUMM_APU_5_INFO_0_DA NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_DA NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_DA NULL
+#define OPTION_VAL_NONE_DA NULL
+#define OPTION_VAL_PLAYER_1_DA NULL
+#define OPTION_VAL_PLAYER_2_DA NULL
+#define OPTION_VAL_BOTH_DA NULL
+#define FCEUMM_TURBO_DELAY_LABEL_DA NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_DA NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_DA NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_DA NULL
+#define OPTION_VAL_LIGHTGUN_DA NULL
+#define OPTION_VAL_TOUCHSCREEN_DA NULL
+#define OPTION_VAL_MOUSE_DA NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_DA NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_DA NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_DA NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_DA NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_DA NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_DA NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_DA NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_DA NULL
+#define FCEUMM_OVERCLOCKING_LABEL_DA NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_DA NULL
+#define OPTION_VAL_2X_POSTRENDER_DA NULL
+#define OPTION_VAL_2X_VBLANK_DA NULL
+#define FCEUMM_RAMSTATE_LABEL_DA NULL
+#define FCEUMM_RAMSTATE_INFO_0_DA NULL
+#define OPTION_VAL_FILL_FF_DA NULL
+#define OPTION_VAL_FILL_00_DA NULL
+#define OPTION_VAL_RANDOM_DA NULL
+
+struct retro_core_option_v2_category option_cats_da[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_DA,
+      CATEGORY_SYSTEM_INFO_0_DA
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_DA,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_DA
+#else
+      CATEGORY_VIDEO_INFO_1_DA
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_DA,
+      CATEGORY_AUDIO_INFO_0_DA
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_DA,
+      CATEGORY_INPUT_INFO_0_DA
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_DA,
+      CATEGORY_HACKS_INFO_0_DA
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_DA,
+      CATEGORY_DIP_SWITCH_INFO_0_DA
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_da[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_DA,
+      NULL,
+      FCEUMM_REGION_INFO_0_DA,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_DA },
+         { "NTSC",  OPTION_VAL_NTSC_DA },
+         { "PAL",   OPTION_VAL_PAL_DA },
+         { "Dendy", OPTION_VAL_DENDY_DA },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_DA,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_DA,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_DA,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_DA,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_DA,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_DA,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_DA,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_DA,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_DA },
+         { "4:3",     OPTION_VAL_4_3_DA },
+         { "PP",      OPTION_VAL_PP_DA },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_DA,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_DA,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_DA,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_DA,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_DA,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_DA,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_DA,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_DA,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_DA },
+         { "asqrealc",             OPTION_VAL_ASQREALC_DA },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_DA },
+         { "rgb",                  OPTION_VAL_RGB_DA },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_DA },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_DA },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_DA },
+         { "pal",                  OPTION_VAL_PAL_DA },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_DA },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_DA },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_DA },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_DA },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_DA },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_DA },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_DA },
+         { "nescap",               OPTION_VAL_NESCAP_DA },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_DA },
+         { "raw",                  OPTION_VAL_RAW_DA },
+         { "custom",               OPTION_VAL_CUSTOM_DA },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_DA,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_DA,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_DA },
+         { "svideo",     OPTION_VAL_SVIDEO_DA },
+         { "rgb",        OPTION_VAL_RGB_O9_DA },
+         { "monochrome", OPTION_VAL_MONOCHROME_DA },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_DA,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_DA,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_DA },
+         { "High",      OPTION_VAL_HIGH_DA },
+         { "Very High", OPTION_VAL_VERY_HIGH_DA },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_DA,
+      FCEUMM_SWAPDUTY_LABEL_CAT_DA,
+      FCEUMM_SWAPDUTY_INFO_0_DA,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_DA,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_DA,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_DA },
+         { "1",  OPTION_VAL_1_DA },
+         { "2",  OPTION_VAL_2_DA },
+         { "3",  OPTION_VAL_3_DA },
+         { "4",  OPTION_VAL_4_DA },
+         { "5",  OPTION_VAL_5_DA },
+         { "6",  OPTION_VAL_6_DA },
+         { "7",  OPTION_VAL_7_DA },
+         { "8",  OPTION_VAL_8_DA },
+         { "9",  OPTION_VAL_9_DA },
+         { "10", OPTION_VAL_10_DA },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_DA,
+      FCEUMM_APU_1_LABEL_CAT_DA,
+      FCEUMM_APU_1_INFO_0_DA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_DA,
+      FCEUMM_APU_2_LABEL_CAT_DA,
+      FCEUMM_APU_2_INFO_0_DA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_DA,
+      FCEUMM_APU_3_LABEL_CAT_DA,
+      FCEUMM_APU_3_INFO_0_DA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_DA,
+      FCEUMM_APU_4_LABEL_CAT_DA,
+      FCEUMM_APU_4_INFO_0_DA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_DA,
+      FCEUMM_APU_5_LABEL_CAT_DA,
+      FCEUMM_APU_5_INFO_0_DA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_DA,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_DA,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_DA },
+         { "Player 1", OPTION_VAL_PLAYER_1_DA },
+         { "Player 2", OPTION_VAL_PLAYER_2_DA },
+         { "Both",     OPTION_VAL_BOTH_DA },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_DA,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_DA,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_DA,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_DA,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_DA },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_DA },
+         { "mouse",       OPTION_VAL_MOUSE_DA },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_DA,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_DA,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_DA,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_DA,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_DA,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_DA,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_DA,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_DA,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_DA,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_DA,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_DA },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_DA },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_DA,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_DA,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_DA },
+         { "fill $00", OPTION_VAL_FILL_00_DA },
+         { "random",   OPTION_VAL_RANDOM_DA },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_da = {
+   option_cats_da,
+   option_defs_da
+};
+
+/* RETRO_LANGUAGE_DE */
+
+#define CATEGORY_SYSTEM_LABEL_DE NULL
+#define CATEGORY_SYSTEM_INFO_0_DE NULL
+#define CATEGORY_VIDEO_LABEL_DE NULL
+#define CATEGORY_VIDEO_INFO_0_DE NULL
+#define CATEGORY_VIDEO_INFO_1_DE NULL
+#define CATEGORY_AUDIO_LABEL_DE NULL
+#define CATEGORY_AUDIO_INFO_0_DE NULL
+#define CATEGORY_INPUT_LABEL_DE NULL
+#define CATEGORY_INPUT_INFO_0_DE NULL
+#define CATEGORY_HACKS_LABEL_DE "Emulations-Hacks"
+#define CATEGORY_HACKS_INFO_0_DE "Parameter für Prozessorübertaktung und Emulationsgenauigkeit, die sich auf die Low-Level-Leistung und Kompatibilität auswirken, anpassen."
+#define CATEGORY_DIP_SWITCH_LABEL_DE NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_DE NULL
+#define FCEUMM_REGION_LABEL_DE NULL
+#define FCEUMM_REGION_INFO_0_DE NULL
+#define OPTION_VAL_AUTO_DE NULL
+#define OPTION_VAL_NTSC_DE NULL
+#define OPTION_VAL_PAL_DE NULL
+#define OPTION_VAL_DENDY_DE NULL
+#define FCEUMM_GAME_GENIE_LABEL_DE NULL
+#define FCEUMM_GAME_GENIE_INFO_0_DE NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_DE NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_DE NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_DE NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_DE NULL
+#define FCEUMM_ASPECT_LABEL_DE NULL
+#define FCEUMM_ASPECT_INFO_0_DE NULL
+#define OPTION_VAL_8_7_PAR_DE NULL
+#define OPTION_VAL_4_3_DE NULL
+#define OPTION_VAL_PP_DE NULL
+#define FCEUMM_OVERSCAN_LABEL_DE NULL
+#define FCEUMM_OVERSCAN_INFO_0_DE NULL
+#define FCEUMM_OVERSCAN_H_LABEL_DE NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_DE NULL
+#define FCEUMM_OVERSCAN_V_LABEL_DE NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_DE NULL
+#define FCEUMM_PALETTE_LABEL_DE NULL
+#define FCEUMM_PALETTE_INFO_0_DE NULL
+#define OPTION_VAL_DEFAULT_DE NULL
+#define OPTION_VAL_ASQREALC_DE NULL
+#define OPTION_VAL_NINTENDO_VC_DE NULL
+#define OPTION_VAL_RGB_DE NULL
+#define OPTION_VAL_YUV_V3_DE NULL
+#define OPTION_VAL_UNSATURATED_FINAL_DE NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_DE NULL
+#define OPTION_VAL_BMF_FINAL2_DE NULL
+#define OPTION_VAL_BMF_FINAL3_DE NULL
+#define OPTION_VAL_SMOOTH_FBX_DE NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_DE NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_DE NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_DE NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_DE NULL
+#define OPTION_VAL_NESCAP_DE NULL
+#define OPTION_VAL_WAVEBEAM_DE NULL
+#define OPTION_VAL_RAW_DE NULL
+#define OPTION_VAL_CUSTOM_DE NULL
+#define FCEUMM_NTSC_FILTER_LABEL_DE NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_DE NULL
+#define OPTION_VAL_COMPOSITE_DE NULL
+#define OPTION_VAL_SVIDEO_DE NULL
+#define OPTION_VAL_RGB_O9_DE NULL
+#define OPTION_VAL_MONOCHROME_DE NULL
+#define FCEUMM_SNDQUALITY_LABEL_DE NULL
+#define FCEUMM_SNDQUALITY_INFO_0_DE NULL
+#define OPTION_VAL_LOW_DE NULL
+#define OPTION_VAL_HIGH_DE NULL
+#define OPTION_VAL_VERY_HIGH_DE NULL
+#define FCEUMM_SWAPDUTY_LABEL_DE NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_DE NULL
+#define FCEUMM_SWAPDUTY_INFO_0_DE NULL
+#define FCEUMM_SNDVOLUME_LABEL_DE NULL
+#define FCEUMM_SNDVOLUME_INFO_0_DE NULL
+#define OPTION_VAL_0_DE NULL
+#define OPTION_VAL_1_DE NULL
+#define OPTION_VAL_2_DE NULL
+#define OPTION_VAL_3_DE NULL
+#define OPTION_VAL_4_DE NULL
+#define OPTION_VAL_5_DE NULL
+#define OPTION_VAL_6_DE NULL
+#define OPTION_VAL_7_DE NULL
+#define OPTION_VAL_8_DE NULL
+#define OPTION_VAL_9_DE NULL
+#define OPTION_VAL_10_DE NULL
+#define FCEUMM_APU_1_LABEL_DE NULL
+#define FCEUMM_APU_1_LABEL_CAT_DE NULL
+#define FCEUMM_APU_1_INFO_0_DE NULL
+#define FCEUMM_APU_2_LABEL_DE NULL
+#define FCEUMM_APU_2_LABEL_CAT_DE NULL
+#define FCEUMM_APU_2_INFO_0_DE NULL
+#define FCEUMM_APU_3_LABEL_DE NULL
+#define FCEUMM_APU_3_LABEL_CAT_DE NULL
+#define FCEUMM_APU_3_INFO_0_DE NULL
+#define FCEUMM_APU_4_LABEL_DE NULL
+#define FCEUMM_APU_4_LABEL_CAT_DE NULL
+#define FCEUMM_APU_4_INFO_0_DE NULL
+#define FCEUMM_APU_5_LABEL_DE NULL
+#define FCEUMM_APU_5_LABEL_CAT_DE NULL
+#define FCEUMM_APU_5_INFO_0_DE NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_DE NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_DE NULL
+#define OPTION_VAL_NONE_DE NULL
+#define OPTION_VAL_PLAYER_1_DE NULL
+#define OPTION_VAL_PLAYER_2_DE NULL
+#define OPTION_VAL_BOTH_DE NULL
+#define FCEUMM_TURBO_DELAY_LABEL_DE NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_DE NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_DE NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_DE NULL
+#define OPTION_VAL_LIGHTGUN_DE NULL
+#define OPTION_VAL_TOUCHSCREEN_DE NULL
+#define OPTION_VAL_MOUSE_DE NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_DE NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_DE NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_DE NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_DE NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_DE NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_DE NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_DE NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_DE NULL
+#define FCEUMM_OVERCLOCKING_LABEL_DE NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_DE NULL
+#define OPTION_VAL_2X_POSTRENDER_DE NULL
+#define OPTION_VAL_2X_VBLANK_DE NULL
+#define FCEUMM_RAMSTATE_LABEL_DE NULL
+#define FCEUMM_RAMSTATE_INFO_0_DE NULL
+#define OPTION_VAL_FILL_FF_DE NULL
+#define OPTION_VAL_FILL_00_DE NULL
+#define OPTION_VAL_RANDOM_DE NULL
+
+struct retro_core_option_v2_category option_cats_de[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_DE,
+      CATEGORY_SYSTEM_INFO_0_DE
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_DE,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_DE
+#else
+      CATEGORY_VIDEO_INFO_1_DE
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_DE,
+      CATEGORY_AUDIO_INFO_0_DE
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_DE,
+      CATEGORY_INPUT_INFO_0_DE
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_DE,
+      CATEGORY_HACKS_INFO_0_DE
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_DE,
+      CATEGORY_DIP_SWITCH_INFO_0_DE
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_de[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_DE,
+      NULL,
+      FCEUMM_REGION_INFO_0_DE,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_DE },
+         { "NTSC",  OPTION_VAL_NTSC_DE },
+         { "PAL",   OPTION_VAL_PAL_DE },
+         { "Dendy", OPTION_VAL_DENDY_DE },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_DE,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_DE,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_DE,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_DE,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_DE,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_DE,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_DE,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_DE,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_DE },
+         { "4:3",     OPTION_VAL_4_3_DE },
+         { "PP",      OPTION_VAL_PP_DE },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_DE,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_DE,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_DE,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_DE,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_DE,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_DE,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_DE,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_DE,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_DE },
+         { "asqrealc",             OPTION_VAL_ASQREALC_DE },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_DE },
+         { "rgb",                  OPTION_VAL_RGB_DE },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_DE },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_DE },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_DE },
+         { "pal",                  OPTION_VAL_PAL_DE },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_DE },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_DE },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_DE },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_DE },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_DE },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_DE },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_DE },
+         { "nescap",               OPTION_VAL_NESCAP_DE },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_DE },
+         { "raw",                  OPTION_VAL_RAW_DE },
+         { "custom",               OPTION_VAL_CUSTOM_DE },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_DE,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_DE,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_DE },
+         { "svideo",     OPTION_VAL_SVIDEO_DE },
+         { "rgb",        OPTION_VAL_RGB_O9_DE },
+         { "monochrome", OPTION_VAL_MONOCHROME_DE },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_DE,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_DE,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_DE },
+         { "High",      OPTION_VAL_HIGH_DE },
+         { "Very High", OPTION_VAL_VERY_HIGH_DE },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_DE,
+      FCEUMM_SWAPDUTY_LABEL_CAT_DE,
+      FCEUMM_SWAPDUTY_INFO_0_DE,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_DE,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_DE,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_DE },
+         { "1",  OPTION_VAL_1_DE },
+         { "2",  OPTION_VAL_2_DE },
+         { "3",  OPTION_VAL_3_DE },
+         { "4",  OPTION_VAL_4_DE },
+         { "5",  OPTION_VAL_5_DE },
+         { "6",  OPTION_VAL_6_DE },
+         { "7",  OPTION_VAL_7_DE },
+         { "8",  OPTION_VAL_8_DE },
+         { "9",  OPTION_VAL_9_DE },
+         { "10", OPTION_VAL_10_DE },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_DE,
+      FCEUMM_APU_1_LABEL_CAT_DE,
+      FCEUMM_APU_1_INFO_0_DE,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_DE,
+      FCEUMM_APU_2_LABEL_CAT_DE,
+      FCEUMM_APU_2_INFO_0_DE,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_DE,
+      FCEUMM_APU_3_LABEL_CAT_DE,
+      FCEUMM_APU_3_INFO_0_DE,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_DE,
+      FCEUMM_APU_4_LABEL_CAT_DE,
+      FCEUMM_APU_4_INFO_0_DE,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_DE,
+      FCEUMM_APU_5_LABEL_CAT_DE,
+      FCEUMM_APU_5_INFO_0_DE,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_DE,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_DE,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_DE },
+         { "Player 1", OPTION_VAL_PLAYER_1_DE },
+         { "Player 2", OPTION_VAL_PLAYER_2_DE },
+         { "Both",     OPTION_VAL_BOTH_DE },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_DE,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_DE,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_DE,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_DE,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_DE },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_DE },
+         { "mouse",       OPTION_VAL_MOUSE_DE },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_DE,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_DE,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_DE,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_DE,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_DE,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_DE,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_DE,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_DE,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_DE,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_DE,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_DE },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_DE },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_DE,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_DE,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_DE },
+         { "fill $00", OPTION_VAL_FILL_00_DE },
+         { "random",   OPTION_VAL_RANDOM_DE },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_de = {
+   option_cats_de,
+   option_defs_de
+};
+
+/* RETRO_LANGUAGE_EL */
+
+#define CATEGORY_SYSTEM_LABEL_EL NULL
+#define CATEGORY_SYSTEM_INFO_0_EL NULL
+#define CATEGORY_VIDEO_LABEL_EL "Οδηγός Βίντεο"
+#define CATEGORY_VIDEO_INFO_0_EL NULL
+#define CATEGORY_VIDEO_INFO_1_EL NULL
+#define CATEGORY_AUDIO_LABEL_EL "Οδηγός Ήχου"
+#define CATEGORY_AUDIO_INFO_0_EL NULL
+#define CATEGORY_INPUT_LABEL_EL "Οδηγός Εισαγωγής"
+#define CATEGORY_INPUT_INFO_0_EL NULL
+#define CATEGORY_HACKS_LABEL_EL NULL
+#define CATEGORY_HACKS_INFO_0_EL NULL
+#define CATEGORY_DIP_SWITCH_LABEL_EL NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_EL NULL
+#define FCEUMM_REGION_LABEL_EL NULL
+#define FCEUMM_REGION_INFO_0_EL NULL
+#define OPTION_VAL_AUTO_EL NULL
+#define OPTION_VAL_NTSC_EL NULL
+#define OPTION_VAL_PAL_EL NULL
+#define OPTION_VAL_DENDY_EL NULL
+#define FCEUMM_GAME_GENIE_LABEL_EL NULL
+#define FCEUMM_GAME_GENIE_INFO_0_EL NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_EL NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_EL NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_EL NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_EL NULL
+#define FCEUMM_ASPECT_LABEL_EL NULL
+#define FCEUMM_ASPECT_INFO_0_EL NULL
+#define OPTION_VAL_8_7_PAR_EL NULL
+#define OPTION_VAL_4_3_EL NULL
+#define OPTION_VAL_PP_EL NULL
+#define FCEUMM_OVERSCAN_LABEL_EL NULL
+#define FCEUMM_OVERSCAN_INFO_0_EL NULL
+#define FCEUMM_OVERSCAN_H_LABEL_EL NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_EL NULL
+#define FCEUMM_OVERSCAN_V_LABEL_EL NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_EL NULL
+#define FCEUMM_PALETTE_LABEL_EL NULL
+#define FCEUMM_PALETTE_INFO_0_EL NULL
+#define OPTION_VAL_DEFAULT_EL NULL
+#define OPTION_VAL_ASQREALC_EL NULL
+#define OPTION_VAL_NINTENDO_VC_EL NULL
+#define OPTION_VAL_RGB_EL NULL
+#define OPTION_VAL_YUV_V3_EL NULL
+#define OPTION_VAL_UNSATURATED_FINAL_EL NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_EL NULL
+#define OPTION_VAL_BMF_FINAL2_EL NULL
+#define OPTION_VAL_BMF_FINAL3_EL NULL
+#define OPTION_VAL_SMOOTH_FBX_EL NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_EL NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_EL NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_EL NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_EL NULL
+#define OPTION_VAL_NESCAP_EL NULL
+#define OPTION_VAL_WAVEBEAM_EL NULL
+#define OPTION_VAL_RAW_EL NULL
+#define OPTION_VAL_CUSTOM_EL NULL
+#define FCEUMM_NTSC_FILTER_LABEL_EL NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_EL NULL
+#define OPTION_VAL_COMPOSITE_EL NULL
+#define OPTION_VAL_SVIDEO_EL NULL
+#define OPTION_VAL_RGB_O9_EL NULL
+#define OPTION_VAL_MONOCHROME_EL NULL
+#define FCEUMM_SNDQUALITY_LABEL_EL NULL
+#define FCEUMM_SNDQUALITY_INFO_0_EL NULL
+#define OPTION_VAL_LOW_EL NULL
+#define OPTION_VAL_HIGH_EL NULL
+#define OPTION_VAL_VERY_HIGH_EL NULL
+#define FCEUMM_SWAPDUTY_LABEL_EL NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_EL NULL
+#define FCEUMM_SWAPDUTY_INFO_0_EL NULL
+#define FCEUMM_SNDVOLUME_LABEL_EL NULL
+#define FCEUMM_SNDVOLUME_INFO_0_EL NULL
+#define OPTION_VAL_0_EL NULL
+#define OPTION_VAL_1_EL NULL
+#define OPTION_VAL_2_EL NULL
+#define OPTION_VAL_3_EL NULL
+#define OPTION_VAL_4_EL NULL
+#define OPTION_VAL_5_EL NULL
+#define OPTION_VAL_6_EL NULL
+#define OPTION_VAL_7_EL NULL
+#define OPTION_VAL_8_EL NULL
+#define OPTION_VAL_9_EL NULL
+#define OPTION_VAL_10_EL NULL
+#define FCEUMM_APU_1_LABEL_EL NULL
+#define FCEUMM_APU_1_LABEL_CAT_EL NULL
+#define FCEUMM_APU_1_INFO_0_EL NULL
+#define FCEUMM_APU_2_LABEL_EL NULL
+#define FCEUMM_APU_2_LABEL_CAT_EL NULL
+#define FCEUMM_APU_2_INFO_0_EL NULL
+#define FCEUMM_APU_3_LABEL_EL NULL
+#define FCEUMM_APU_3_LABEL_CAT_EL NULL
+#define FCEUMM_APU_3_INFO_0_EL NULL
+#define FCEUMM_APU_4_LABEL_EL NULL
+#define FCEUMM_APU_4_LABEL_CAT_EL NULL
+#define FCEUMM_APU_4_INFO_0_EL NULL
+#define FCEUMM_APU_5_LABEL_EL NULL
+#define FCEUMM_APU_5_LABEL_CAT_EL NULL
+#define FCEUMM_APU_5_INFO_0_EL NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_EL NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_EL NULL
+#define OPTION_VAL_NONE_EL NULL
+#define OPTION_VAL_PLAYER_1_EL NULL
+#define OPTION_VAL_PLAYER_2_EL NULL
+#define OPTION_VAL_BOTH_EL NULL
+#define FCEUMM_TURBO_DELAY_LABEL_EL NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_EL NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_EL NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_EL NULL
+#define OPTION_VAL_LIGHTGUN_EL NULL
+#define OPTION_VAL_TOUCHSCREEN_EL NULL
+#define OPTION_VAL_MOUSE_EL NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_EL NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_EL NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_EL NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_EL NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_EL NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_EL NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_EL NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_EL NULL
+#define FCEUMM_OVERCLOCKING_LABEL_EL NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_EL NULL
+#define OPTION_VAL_2X_POSTRENDER_EL NULL
+#define OPTION_VAL_2X_VBLANK_EL NULL
+#define FCEUMM_RAMSTATE_LABEL_EL NULL
+#define FCEUMM_RAMSTATE_INFO_0_EL NULL
+#define OPTION_VAL_FILL_FF_EL NULL
+#define OPTION_VAL_FILL_00_EL NULL
+#define OPTION_VAL_RANDOM_EL NULL
+
+struct retro_core_option_v2_category option_cats_el[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_EL,
+      CATEGORY_SYSTEM_INFO_0_EL
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_EL,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_EL
+#else
+      CATEGORY_VIDEO_INFO_1_EL
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_EL,
+      CATEGORY_AUDIO_INFO_0_EL
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_EL,
+      CATEGORY_INPUT_INFO_0_EL
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_EL,
+      CATEGORY_HACKS_INFO_0_EL
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_EL,
+      CATEGORY_DIP_SWITCH_INFO_0_EL
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_el[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_EL,
+      NULL,
+      FCEUMM_REGION_INFO_0_EL,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_EL },
+         { "NTSC",  OPTION_VAL_NTSC_EL },
+         { "PAL",   OPTION_VAL_PAL_EL },
+         { "Dendy", OPTION_VAL_DENDY_EL },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_EL,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_EL,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_EL,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_EL,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_EL,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_EL,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_EL,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_EL,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_EL },
+         { "4:3",     OPTION_VAL_4_3_EL },
+         { "PP",      OPTION_VAL_PP_EL },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_EL,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_EL,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_EL,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_EL,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_EL,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_EL,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_EL,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_EL,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_EL },
+         { "asqrealc",             OPTION_VAL_ASQREALC_EL },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_EL },
+         { "rgb",                  OPTION_VAL_RGB_EL },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_EL },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_EL },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_EL },
+         { "pal",                  OPTION_VAL_PAL_EL },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_EL },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_EL },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_EL },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_EL },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_EL },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_EL },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_EL },
+         { "nescap",               OPTION_VAL_NESCAP_EL },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_EL },
+         { "raw",                  OPTION_VAL_RAW_EL },
+         { "custom",               OPTION_VAL_CUSTOM_EL },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_EL,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_EL,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_EL },
+         { "svideo",     OPTION_VAL_SVIDEO_EL },
+         { "rgb",        OPTION_VAL_RGB_O9_EL },
+         { "monochrome", OPTION_VAL_MONOCHROME_EL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_EL,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_EL,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_EL },
+         { "High",      OPTION_VAL_HIGH_EL },
+         { "Very High", OPTION_VAL_VERY_HIGH_EL },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_EL,
+      FCEUMM_SWAPDUTY_LABEL_CAT_EL,
+      FCEUMM_SWAPDUTY_INFO_0_EL,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_EL,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_EL,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_EL },
+         { "1",  OPTION_VAL_1_EL },
+         { "2",  OPTION_VAL_2_EL },
+         { "3",  OPTION_VAL_3_EL },
+         { "4",  OPTION_VAL_4_EL },
+         { "5",  OPTION_VAL_5_EL },
+         { "6",  OPTION_VAL_6_EL },
+         { "7",  OPTION_VAL_7_EL },
+         { "8",  OPTION_VAL_8_EL },
+         { "9",  OPTION_VAL_9_EL },
+         { "10", OPTION_VAL_10_EL },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_EL,
+      FCEUMM_APU_1_LABEL_CAT_EL,
+      FCEUMM_APU_1_INFO_0_EL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_EL,
+      FCEUMM_APU_2_LABEL_CAT_EL,
+      FCEUMM_APU_2_INFO_0_EL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_EL,
+      FCEUMM_APU_3_LABEL_CAT_EL,
+      FCEUMM_APU_3_INFO_0_EL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_EL,
+      FCEUMM_APU_4_LABEL_CAT_EL,
+      FCEUMM_APU_4_INFO_0_EL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_EL,
+      FCEUMM_APU_5_LABEL_CAT_EL,
+      FCEUMM_APU_5_INFO_0_EL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_EL,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_EL,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_EL },
+         { "Player 1", OPTION_VAL_PLAYER_1_EL },
+         { "Player 2", OPTION_VAL_PLAYER_2_EL },
+         { "Both",     OPTION_VAL_BOTH_EL },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_EL,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_EL,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_EL,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_EL,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_EL },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_EL },
+         { "mouse",       OPTION_VAL_MOUSE_EL },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_EL,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_EL,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_EL,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_EL,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_EL,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_EL,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_EL,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_EL,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_EL,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_EL,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_EL },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_EL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_EL,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_EL,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_EL },
+         { "fill $00", OPTION_VAL_FILL_00_EL },
+         { "random",   OPTION_VAL_RANDOM_EL },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_el = {
+   option_cats_el,
+   option_defs_el
+};
+
+/* RETRO_LANGUAGE_EO */
+
+#define CATEGORY_SYSTEM_LABEL_EO NULL
+#define CATEGORY_SYSTEM_INFO_0_EO NULL
+#define CATEGORY_VIDEO_LABEL_EO "Video Driver"
+#define CATEGORY_VIDEO_INFO_0_EO NULL
+#define CATEGORY_VIDEO_INFO_1_EO NULL
+#define CATEGORY_AUDIO_LABEL_EO "Audio Driver"
+#define CATEGORY_AUDIO_INFO_0_EO NULL
+#define CATEGORY_INPUT_LABEL_EO "Input Driver"
+#define CATEGORY_INPUT_INFO_0_EO NULL
+#define CATEGORY_HACKS_LABEL_EO NULL
+#define CATEGORY_HACKS_INFO_0_EO NULL
+#define CATEGORY_DIP_SWITCH_LABEL_EO NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_EO NULL
+#define FCEUMM_REGION_LABEL_EO NULL
+#define FCEUMM_REGION_INFO_0_EO NULL
+#define OPTION_VAL_AUTO_EO NULL
+#define OPTION_VAL_NTSC_EO NULL
+#define OPTION_VAL_PAL_EO NULL
+#define OPTION_VAL_DENDY_EO NULL
+#define FCEUMM_GAME_GENIE_LABEL_EO NULL
+#define FCEUMM_GAME_GENIE_INFO_0_EO NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_EO NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_EO NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_EO NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_EO NULL
+#define FCEUMM_ASPECT_LABEL_EO NULL
+#define FCEUMM_ASPECT_INFO_0_EO NULL
+#define OPTION_VAL_8_7_PAR_EO NULL
+#define OPTION_VAL_4_3_EO NULL
+#define OPTION_VAL_PP_EO NULL
+#define FCEUMM_OVERSCAN_LABEL_EO NULL
+#define FCEUMM_OVERSCAN_INFO_0_EO NULL
+#define FCEUMM_OVERSCAN_H_LABEL_EO NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_EO NULL
+#define FCEUMM_OVERSCAN_V_LABEL_EO NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_EO NULL
+#define FCEUMM_PALETTE_LABEL_EO NULL
+#define FCEUMM_PALETTE_INFO_0_EO NULL
+#define OPTION_VAL_DEFAULT_EO NULL
+#define OPTION_VAL_ASQREALC_EO NULL
+#define OPTION_VAL_NINTENDO_VC_EO NULL
+#define OPTION_VAL_RGB_EO NULL
+#define OPTION_VAL_YUV_V3_EO NULL
+#define OPTION_VAL_UNSATURATED_FINAL_EO NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_EO NULL
+#define OPTION_VAL_BMF_FINAL2_EO NULL
+#define OPTION_VAL_BMF_FINAL3_EO NULL
+#define OPTION_VAL_SMOOTH_FBX_EO NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_EO NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_EO NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_EO NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_EO NULL
+#define OPTION_VAL_NESCAP_EO NULL
+#define OPTION_VAL_WAVEBEAM_EO NULL
+#define OPTION_VAL_RAW_EO NULL
+#define OPTION_VAL_CUSTOM_EO NULL
+#define FCEUMM_NTSC_FILTER_LABEL_EO NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_EO NULL
+#define OPTION_VAL_COMPOSITE_EO NULL
+#define OPTION_VAL_SVIDEO_EO NULL
+#define OPTION_VAL_RGB_O9_EO NULL
+#define OPTION_VAL_MONOCHROME_EO NULL
+#define FCEUMM_SNDQUALITY_LABEL_EO NULL
+#define FCEUMM_SNDQUALITY_INFO_0_EO NULL
+#define OPTION_VAL_LOW_EO NULL
+#define OPTION_VAL_HIGH_EO NULL
+#define OPTION_VAL_VERY_HIGH_EO NULL
+#define FCEUMM_SWAPDUTY_LABEL_EO NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_EO NULL
+#define FCEUMM_SWAPDUTY_INFO_0_EO NULL
+#define FCEUMM_SNDVOLUME_LABEL_EO NULL
+#define FCEUMM_SNDVOLUME_INFO_0_EO NULL
+#define OPTION_VAL_0_EO NULL
+#define OPTION_VAL_1_EO NULL
+#define OPTION_VAL_2_EO NULL
+#define OPTION_VAL_3_EO NULL
+#define OPTION_VAL_4_EO NULL
+#define OPTION_VAL_5_EO NULL
+#define OPTION_VAL_6_EO NULL
+#define OPTION_VAL_7_EO NULL
+#define OPTION_VAL_8_EO NULL
+#define OPTION_VAL_9_EO NULL
+#define OPTION_VAL_10_EO NULL
+#define FCEUMM_APU_1_LABEL_EO NULL
+#define FCEUMM_APU_1_LABEL_CAT_EO NULL
+#define FCEUMM_APU_1_INFO_0_EO NULL
+#define FCEUMM_APU_2_LABEL_EO NULL
+#define FCEUMM_APU_2_LABEL_CAT_EO NULL
+#define FCEUMM_APU_2_INFO_0_EO NULL
+#define FCEUMM_APU_3_LABEL_EO NULL
+#define FCEUMM_APU_3_LABEL_CAT_EO NULL
+#define FCEUMM_APU_3_INFO_0_EO NULL
+#define FCEUMM_APU_4_LABEL_EO NULL
+#define FCEUMM_APU_4_LABEL_CAT_EO NULL
+#define FCEUMM_APU_4_INFO_0_EO NULL
+#define FCEUMM_APU_5_LABEL_EO NULL
+#define FCEUMM_APU_5_LABEL_CAT_EO NULL
+#define FCEUMM_APU_5_INFO_0_EO NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_EO NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_EO NULL
+#define OPTION_VAL_NONE_EO NULL
+#define OPTION_VAL_PLAYER_1_EO NULL
+#define OPTION_VAL_PLAYER_2_EO NULL
+#define OPTION_VAL_BOTH_EO NULL
+#define FCEUMM_TURBO_DELAY_LABEL_EO NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_EO NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_EO NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_EO NULL
+#define OPTION_VAL_LIGHTGUN_EO NULL
+#define OPTION_VAL_TOUCHSCREEN_EO NULL
+#define OPTION_VAL_MOUSE_EO NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_EO NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_EO NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_EO NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_EO NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_EO NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_EO NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_EO NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_EO NULL
+#define FCEUMM_OVERCLOCKING_LABEL_EO NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_EO NULL
+#define OPTION_VAL_2X_POSTRENDER_EO NULL
+#define OPTION_VAL_2X_VBLANK_EO NULL
+#define FCEUMM_RAMSTATE_LABEL_EO NULL
+#define FCEUMM_RAMSTATE_INFO_0_EO NULL
+#define OPTION_VAL_FILL_FF_EO NULL
+#define OPTION_VAL_FILL_00_EO NULL
+#define OPTION_VAL_RANDOM_EO NULL
+
+struct retro_core_option_v2_category option_cats_eo[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_EO,
+      CATEGORY_SYSTEM_INFO_0_EO
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_EO,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_EO
+#else
+      CATEGORY_VIDEO_INFO_1_EO
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_EO,
+      CATEGORY_AUDIO_INFO_0_EO
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_EO,
+      CATEGORY_INPUT_INFO_0_EO
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_EO,
+      CATEGORY_HACKS_INFO_0_EO
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_EO,
+      CATEGORY_DIP_SWITCH_INFO_0_EO
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_eo[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_EO,
+      NULL,
+      FCEUMM_REGION_INFO_0_EO,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_EO },
+         { "NTSC",  OPTION_VAL_NTSC_EO },
+         { "PAL",   OPTION_VAL_PAL_EO },
+         { "Dendy", OPTION_VAL_DENDY_EO },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_EO,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_EO,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_EO,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_EO,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_EO,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_EO,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_EO,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_EO,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_EO },
+         { "4:3",     OPTION_VAL_4_3_EO },
+         { "PP",      OPTION_VAL_PP_EO },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_EO,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_EO,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_EO,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_EO,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_EO,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_EO,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_EO,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_EO,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_EO },
+         { "asqrealc",             OPTION_VAL_ASQREALC_EO },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_EO },
+         { "rgb",                  OPTION_VAL_RGB_EO },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_EO },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_EO },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_EO },
+         { "pal",                  OPTION_VAL_PAL_EO },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_EO },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_EO },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_EO },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_EO },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_EO },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_EO },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_EO },
+         { "nescap",               OPTION_VAL_NESCAP_EO },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_EO },
+         { "raw",                  OPTION_VAL_RAW_EO },
+         { "custom",               OPTION_VAL_CUSTOM_EO },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_EO,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_EO,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_EO },
+         { "svideo",     OPTION_VAL_SVIDEO_EO },
+         { "rgb",        OPTION_VAL_RGB_O9_EO },
+         { "monochrome", OPTION_VAL_MONOCHROME_EO },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_EO,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_EO,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_EO },
+         { "High",      OPTION_VAL_HIGH_EO },
+         { "Very High", OPTION_VAL_VERY_HIGH_EO },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_EO,
+      FCEUMM_SWAPDUTY_LABEL_CAT_EO,
+      FCEUMM_SWAPDUTY_INFO_0_EO,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_EO,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_EO,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_EO },
+         { "1",  OPTION_VAL_1_EO },
+         { "2",  OPTION_VAL_2_EO },
+         { "3",  OPTION_VAL_3_EO },
+         { "4",  OPTION_VAL_4_EO },
+         { "5",  OPTION_VAL_5_EO },
+         { "6",  OPTION_VAL_6_EO },
+         { "7",  OPTION_VAL_7_EO },
+         { "8",  OPTION_VAL_8_EO },
+         { "9",  OPTION_VAL_9_EO },
+         { "10", OPTION_VAL_10_EO },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_EO,
+      FCEUMM_APU_1_LABEL_CAT_EO,
+      FCEUMM_APU_1_INFO_0_EO,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_EO,
+      FCEUMM_APU_2_LABEL_CAT_EO,
+      FCEUMM_APU_2_INFO_0_EO,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_EO,
+      FCEUMM_APU_3_LABEL_CAT_EO,
+      FCEUMM_APU_3_INFO_0_EO,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_EO,
+      FCEUMM_APU_4_LABEL_CAT_EO,
+      FCEUMM_APU_4_INFO_0_EO,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_EO,
+      FCEUMM_APU_5_LABEL_CAT_EO,
+      FCEUMM_APU_5_INFO_0_EO,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_EO,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_EO,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_EO },
+         { "Player 1", OPTION_VAL_PLAYER_1_EO },
+         { "Player 2", OPTION_VAL_PLAYER_2_EO },
+         { "Both",     OPTION_VAL_BOTH_EO },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_EO,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_EO,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_EO,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_EO,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_EO },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_EO },
+         { "mouse",       OPTION_VAL_MOUSE_EO },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_EO,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_EO,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_EO,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_EO,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_EO,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_EO,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_EO,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_EO,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_EO,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_EO,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_EO },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_EO },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_EO,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_EO,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_EO },
+         { "fill $00", OPTION_VAL_FILL_00_EO },
+         { "random",   OPTION_VAL_RANDOM_EO },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_eo = {
+   option_cats_eo,
+   option_defs_eo
+};
+
+/* RETRO_LANGUAGE_ES */
+
+#define CATEGORY_SYSTEM_LABEL_ES "Sistema"
+#define CATEGORY_SYSTEM_INFO_0_ES "Cambia los ajustes de región y de expansiones de hardware."
+#define CATEGORY_VIDEO_LABEL_ES "Vídeo"
+#define CATEGORY_VIDEO_INFO_0_ES "Cambia los ajustes de relación de aspecto, recorte de pantalla, paleta de colores y los filtros de vídeo."
+#define CATEGORY_VIDEO_INFO_1_ES "Cambia los ajustes de relación de aspecto, recorte de pantalla y paleta de colores."
+#define CATEGORY_AUDIO_LABEL_ES NULL
+#define CATEGORY_AUDIO_INFO_0_ES "Cambia los ajustes de calidad de sonido, volumen y canales."
+#define CATEGORY_INPUT_LABEL_ES "Entrada"
+#define CATEGORY_INPUT_INFO_0_ES "Cambia los ajustes del turbo y de las «lightguns»."
+#define CATEGORY_HACKS_LABEL_ES "Arreglos de emulación"
+#define CATEGORY_HACKS_INFO_0_ES "Cambia las opciones de overclockeo del procesador y de precisión de la emulación que afectan al rendimiento a bajo nivel y a la compatibilidad."
+#define CATEGORY_DIP_SWITCH_LABEL_ES "Interruptores DIP"
+#define CATEGORY_DIP_SWITCH_INFO_0_ES "Cambia los ajustes para juegos de recreativa o arcade."
+#define FCEUMM_REGION_LABEL_ES NULL
+#define FCEUMM_REGION_INFO_0_ES NULL
+#define OPTION_VAL_AUTO_ES NULL
+#define OPTION_VAL_NTSC_ES NULL
+#define OPTION_VAL_PAL_ES NULL
+#define OPTION_VAL_DENDY_ES NULL
+#define FCEUMM_GAME_GENIE_LABEL_ES NULL
+#define FCEUMM_GAME_GENIE_INFO_0_ES NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_ES NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_ES NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_ES NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_ES NULL
+#define FCEUMM_ASPECT_LABEL_ES NULL
+#define FCEUMM_ASPECT_INFO_0_ES NULL
+#define OPTION_VAL_8_7_PAR_ES NULL
+#define OPTION_VAL_4_3_ES NULL
+#define OPTION_VAL_PP_ES NULL
+#define FCEUMM_OVERSCAN_LABEL_ES NULL
+#define FCEUMM_OVERSCAN_INFO_0_ES NULL
+#define FCEUMM_OVERSCAN_H_LABEL_ES NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_ES NULL
+#define FCEUMM_OVERSCAN_V_LABEL_ES NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_ES NULL
+#define FCEUMM_PALETTE_LABEL_ES NULL
+#define FCEUMM_PALETTE_INFO_0_ES NULL
+#define OPTION_VAL_DEFAULT_ES NULL
+#define OPTION_VAL_ASQREALC_ES NULL
+#define OPTION_VAL_NINTENDO_VC_ES NULL
+#define OPTION_VAL_RGB_ES NULL
+#define OPTION_VAL_YUV_V3_ES NULL
+#define OPTION_VAL_UNSATURATED_FINAL_ES NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_ES NULL
+#define OPTION_VAL_BMF_FINAL2_ES NULL
+#define OPTION_VAL_BMF_FINAL3_ES NULL
+#define OPTION_VAL_SMOOTH_FBX_ES NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_ES NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_ES NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_ES NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_ES NULL
+#define OPTION_VAL_NESCAP_ES NULL
+#define OPTION_VAL_WAVEBEAM_ES NULL
+#define OPTION_VAL_RAW_ES NULL
+#define OPTION_VAL_CUSTOM_ES NULL
+#define FCEUMM_NTSC_FILTER_LABEL_ES NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_ES NULL
+#define OPTION_VAL_COMPOSITE_ES NULL
+#define OPTION_VAL_SVIDEO_ES NULL
+#define OPTION_VAL_RGB_O9_ES NULL
+#define OPTION_VAL_MONOCHROME_ES NULL
+#define FCEUMM_SNDQUALITY_LABEL_ES NULL
+#define FCEUMM_SNDQUALITY_INFO_0_ES NULL
+#define OPTION_VAL_LOW_ES NULL
+#define OPTION_VAL_HIGH_ES NULL
+#define OPTION_VAL_VERY_HIGH_ES NULL
+#define FCEUMM_SWAPDUTY_LABEL_ES NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_ES NULL
+#define FCEUMM_SWAPDUTY_INFO_0_ES NULL
+#define FCEUMM_SNDVOLUME_LABEL_ES NULL
+#define FCEUMM_SNDVOLUME_INFO_0_ES NULL
+#define OPTION_VAL_0_ES NULL
+#define OPTION_VAL_1_ES NULL
+#define OPTION_VAL_2_ES NULL
+#define OPTION_VAL_3_ES NULL
+#define OPTION_VAL_4_ES NULL
+#define OPTION_VAL_5_ES NULL
+#define OPTION_VAL_6_ES NULL
+#define OPTION_VAL_7_ES NULL
+#define OPTION_VAL_8_ES NULL
+#define OPTION_VAL_9_ES NULL
+#define OPTION_VAL_10_ES NULL
+#define FCEUMM_APU_1_LABEL_ES NULL
+#define FCEUMM_APU_1_LABEL_CAT_ES NULL
+#define FCEUMM_APU_1_INFO_0_ES NULL
+#define FCEUMM_APU_2_LABEL_ES NULL
+#define FCEUMM_APU_2_LABEL_CAT_ES NULL
+#define FCEUMM_APU_2_INFO_0_ES NULL
+#define FCEUMM_APU_3_LABEL_ES NULL
+#define FCEUMM_APU_3_LABEL_CAT_ES NULL
+#define FCEUMM_APU_3_INFO_0_ES NULL
+#define FCEUMM_APU_4_LABEL_ES NULL
+#define FCEUMM_APU_4_LABEL_CAT_ES NULL
+#define FCEUMM_APU_4_INFO_0_ES NULL
+#define FCEUMM_APU_5_LABEL_ES NULL
+#define FCEUMM_APU_5_LABEL_CAT_ES NULL
+#define FCEUMM_APU_5_INFO_0_ES NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_ES NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_ES NULL
+#define OPTION_VAL_NONE_ES NULL
+#define OPTION_VAL_PLAYER_1_ES NULL
+#define OPTION_VAL_PLAYER_2_ES NULL
+#define OPTION_VAL_BOTH_ES NULL
+#define FCEUMM_TURBO_DELAY_LABEL_ES NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_ES NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_ES NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_ES NULL
+#define OPTION_VAL_LIGHTGUN_ES NULL
+#define OPTION_VAL_TOUCHSCREEN_ES NULL
+#define OPTION_VAL_MOUSE_ES NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_ES NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_ES NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_ES NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_ES NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_ES NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_ES NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_ES NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_ES NULL
+#define FCEUMM_OVERCLOCKING_LABEL_ES NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_ES NULL
+#define OPTION_VAL_2X_POSTRENDER_ES NULL
+#define OPTION_VAL_2X_VBLANK_ES NULL
+#define FCEUMM_RAMSTATE_LABEL_ES NULL
+#define FCEUMM_RAMSTATE_INFO_0_ES NULL
+#define OPTION_VAL_FILL_FF_ES NULL
+#define OPTION_VAL_FILL_00_ES NULL
+#define OPTION_VAL_RANDOM_ES NULL
+
+struct retro_core_option_v2_category option_cats_es[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_ES,
+      CATEGORY_SYSTEM_INFO_0_ES
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_ES,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_ES
+#else
+      CATEGORY_VIDEO_INFO_1_ES
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_ES,
+      CATEGORY_AUDIO_INFO_0_ES
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_ES,
+      CATEGORY_INPUT_INFO_0_ES
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_ES,
+      CATEGORY_HACKS_INFO_0_ES
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_ES,
+      CATEGORY_DIP_SWITCH_INFO_0_ES
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_es[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_ES,
+      NULL,
+      FCEUMM_REGION_INFO_0_ES,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_ES },
+         { "NTSC",  OPTION_VAL_NTSC_ES },
+         { "PAL",   OPTION_VAL_PAL_ES },
+         { "Dendy", OPTION_VAL_DENDY_ES },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_ES,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_ES,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_ES,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_ES,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_ES,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_ES,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_ES,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_ES,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_ES },
+         { "4:3",     OPTION_VAL_4_3_ES },
+         { "PP",      OPTION_VAL_PP_ES },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_ES,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_ES,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_ES,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_ES,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_ES,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_ES,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_ES,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_ES,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_ES },
+         { "asqrealc",             OPTION_VAL_ASQREALC_ES },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_ES },
+         { "rgb",                  OPTION_VAL_RGB_ES },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_ES },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_ES },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_ES },
+         { "pal",                  OPTION_VAL_PAL_ES },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_ES },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_ES },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_ES },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_ES },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_ES },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_ES },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_ES },
+         { "nescap",               OPTION_VAL_NESCAP_ES },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_ES },
+         { "raw",                  OPTION_VAL_RAW_ES },
+         { "custom",               OPTION_VAL_CUSTOM_ES },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_ES,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_ES,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_ES },
+         { "svideo",     OPTION_VAL_SVIDEO_ES },
+         { "rgb",        OPTION_VAL_RGB_O9_ES },
+         { "monochrome", OPTION_VAL_MONOCHROME_ES },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_ES,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_ES,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_ES },
+         { "High",      OPTION_VAL_HIGH_ES },
+         { "Very High", OPTION_VAL_VERY_HIGH_ES },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_ES,
+      FCEUMM_SWAPDUTY_LABEL_CAT_ES,
+      FCEUMM_SWAPDUTY_INFO_0_ES,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_ES,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_ES,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_ES },
+         { "1",  OPTION_VAL_1_ES },
+         { "2",  OPTION_VAL_2_ES },
+         { "3",  OPTION_VAL_3_ES },
+         { "4",  OPTION_VAL_4_ES },
+         { "5",  OPTION_VAL_5_ES },
+         { "6",  OPTION_VAL_6_ES },
+         { "7",  OPTION_VAL_7_ES },
+         { "8",  OPTION_VAL_8_ES },
+         { "9",  OPTION_VAL_9_ES },
+         { "10", OPTION_VAL_10_ES },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_ES,
+      FCEUMM_APU_1_LABEL_CAT_ES,
+      FCEUMM_APU_1_INFO_0_ES,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_ES,
+      FCEUMM_APU_2_LABEL_CAT_ES,
+      FCEUMM_APU_2_INFO_0_ES,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_ES,
+      FCEUMM_APU_3_LABEL_CAT_ES,
+      FCEUMM_APU_3_INFO_0_ES,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_ES,
+      FCEUMM_APU_4_LABEL_CAT_ES,
+      FCEUMM_APU_4_INFO_0_ES,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_ES,
+      FCEUMM_APU_5_LABEL_CAT_ES,
+      FCEUMM_APU_5_INFO_0_ES,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_ES,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_ES,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_ES },
+         { "Player 1", OPTION_VAL_PLAYER_1_ES },
+         { "Player 2", OPTION_VAL_PLAYER_2_ES },
+         { "Both",     OPTION_VAL_BOTH_ES },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_ES,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_ES,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_ES,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_ES,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_ES },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_ES },
+         { "mouse",       OPTION_VAL_MOUSE_ES },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_ES,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_ES,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_ES,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_ES,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_ES,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_ES,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_ES,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_ES,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_ES,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_ES,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_ES },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_ES },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_ES,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_ES,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_ES },
+         { "fill $00", OPTION_VAL_FILL_00_ES },
+         { "random",   OPTION_VAL_RANDOM_ES },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_es = {
+   option_cats_es,
+   option_defs_es
+};
+
+/* RETRO_LANGUAGE_FA */
+
+#define CATEGORY_SYSTEM_LABEL_FA NULL
+#define CATEGORY_SYSTEM_INFO_0_FA NULL
+#define CATEGORY_VIDEO_LABEL_FA "ویدیو"
+#define CATEGORY_VIDEO_INFO_0_FA NULL
+#define CATEGORY_VIDEO_INFO_1_FA NULL
+#define CATEGORY_AUDIO_LABEL_FA "صدا"
+#define CATEGORY_AUDIO_INFO_0_FA NULL
+#define CATEGORY_INPUT_LABEL_FA "داده"
+#define CATEGORY_INPUT_INFO_0_FA NULL
+#define CATEGORY_HACKS_LABEL_FA NULL
+#define CATEGORY_HACKS_INFO_0_FA NULL
+#define CATEGORY_DIP_SWITCH_LABEL_FA NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_FA NULL
+#define FCEUMM_REGION_LABEL_FA NULL
+#define FCEUMM_REGION_INFO_0_FA NULL
+#define OPTION_VAL_AUTO_FA NULL
+#define OPTION_VAL_NTSC_FA NULL
+#define OPTION_VAL_PAL_FA NULL
+#define OPTION_VAL_DENDY_FA NULL
+#define FCEUMM_GAME_GENIE_LABEL_FA NULL
+#define FCEUMM_GAME_GENIE_INFO_0_FA NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_FA NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_FA NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_FA NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_FA NULL
+#define FCEUMM_ASPECT_LABEL_FA NULL
+#define FCEUMM_ASPECT_INFO_0_FA NULL
+#define OPTION_VAL_8_7_PAR_FA NULL
+#define OPTION_VAL_4_3_FA NULL
+#define OPTION_VAL_PP_FA NULL
+#define FCEUMM_OVERSCAN_LABEL_FA NULL
+#define FCEUMM_OVERSCAN_INFO_0_FA NULL
+#define FCEUMM_OVERSCAN_H_LABEL_FA NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_FA NULL
+#define FCEUMM_OVERSCAN_V_LABEL_FA NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_FA NULL
+#define FCEUMM_PALETTE_LABEL_FA NULL
+#define FCEUMM_PALETTE_INFO_0_FA NULL
+#define OPTION_VAL_DEFAULT_FA NULL
+#define OPTION_VAL_ASQREALC_FA NULL
+#define OPTION_VAL_NINTENDO_VC_FA NULL
+#define OPTION_VAL_RGB_FA NULL
+#define OPTION_VAL_YUV_V3_FA NULL
+#define OPTION_VAL_UNSATURATED_FINAL_FA NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_FA NULL
+#define OPTION_VAL_BMF_FINAL2_FA NULL
+#define OPTION_VAL_BMF_FINAL3_FA NULL
+#define OPTION_VAL_SMOOTH_FBX_FA NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_FA NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_FA NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_FA NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_FA NULL
+#define OPTION_VAL_NESCAP_FA NULL
+#define OPTION_VAL_WAVEBEAM_FA NULL
+#define OPTION_VAL_RAW_FA NULL
+#define OPTION_VAL_CUSTOM_FA NULL
+#define FCEUMM_NTSC_FILTER_LABEL_FA NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_FA NULL
+#define OPTION_VAL_COMPOSITE_FA NULL
+#define OPTION_VAL_SVIDEO_FA NULL
+#define OPTION_VAL_RGB_O9_FA NULL
+#define OPTION_VAL_MONOCHROME_FA NULL
+#define FCEUMM_SNDQUALITY_LABEL_FA NULL
+#define FCEUMM_SNDQUALITY_INFO_0_FA NULL
+#define OPTION_VAL_LOW_FA NULL
+#define OPTION_VAL_HIGH_FA NULL
+#define OPTION_VAL_VERY_HIGH_FA NULL
+#define FCEUMM_SWAPDUTY_LABEL_FA NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_FA NULL
+#define FCEUMM_SWAPDUTY_INFO_0_FA NULL
+#define FCEUMM_SNDVOLUME_LABEL_FA NULL
+#define FCEUMM_SNDVOLUME_INFO_0_FA NULL
+#define OPTION_VAL_0_FA NULL
+#define OPTION_VAL_1_FA NULL
+#define OPTION_VAL_2_FA NULL
+#define OPTION_VAL_3_FA NULL
+#define OPTION_VAL_4_FA NULL
+#define OPTION_VAL_5_FA NULL
+#define OPTION_VAL_6_FA NULL
+#define OPTION_VAL_7_FA NULL
+#define OPTION_VAL_8_FA NULL
+#define OPTION_VAL_9_FA NULL
+#define OPTION_VAL_10_FA NULL
+#define FCEUMM_APU_1_LABEL_FA NULL
+#define FCEUMM_APU_1_LABEL_CAT_FA NULL
+#define FCEUMM_APU_1_INFO_0_FA NULL
+#define FCEUMM_APU_2_LABEL_FA NULL
+#define FCEUMM_APU_2_LABEL_CAT_FA NULL
+#define FCEUMM_APU_2_INFO_0_FA NULL
+#define FCEUMM_APU_3_LABEL_FA NULL
+#define FCEUMM_APU_3_LABEL_CAT_FA NULL
+#define FCEUMM_APU_3_INFO_0_FA NULL
+#define FCEUMM_APU_4_LABEL_FA NULL
+#define FCEUMM_APU_4_LABEL_CAT_FA NULL
+#define FCEUMM_APU_4_INFO_0_FA NULL
+#define FCEUMM_APU_5_LABEL_FA NULL
+#define FCEUMM_APU_5_LABEL_CAT_FA NULL
+#define FCEUMM_APU_5_INFO_0_FA NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_FA NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_FA NULL
+#define OPTION_VAL_NONE_FA NULL
+#define OPTION_VAL_PLAYER_1_FA NULL
+#define OPTION_VAL_PLAYER_2_FA NULL
+#define OPTION_VAL_BOTH_FA NULL
+#define FCEUMM_TURBO_DELAY_LABEL_FA NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_FA NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_FA NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_FA NULL
+#define OPTION_VAL_LIGHTGUN_FA NULL
+#define OPTION_VAL_TOUCHSCREEN_FA NULL
+#define OPTION_VAL_MOUSE_FA NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_FA NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_FA NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_FA NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_FA NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_FA NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_FA NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_FA NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_FA NULL
+#define FCEUMM_OVERCLOCKING_LABEL_FA NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_FA NULL
+#define OPTION_VAL_2X_POSTRENDER_FA NULL
+#define OPTION_VAL_2X_VBLANK_FA NULL
+#define FCEUMM_RAMSTATE_LABEL_FA NULL
+#define FCEUMM_RAMSTATE_INFO_0_FA NULL
+#define OPTION_VAL_FILL_FF_FA NULL
+#define OPTION_VAL_FILL_00_FA NULL
+#define OPTION_VAL_RANDOM_FA NULL
+
+struct retro_core_option_v2_category option_cats_fa[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_FA,
+      CATEGORY_SYSTEM_INFO_0_FA
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_FA,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_FA
+#else
+      CATEGORY_VIDEO_INFO_1_FA
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_FA,
+      CATEGORY_AUDIO_INFO_0_FA
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_FA,
+      CATEGORY_INPUT_INFO_0_FA
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_FA,
+      CATEGORY_HACKS_INFO_0_FA
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_FA,
+      CATEGORY_DIP_SWITCH_INFO_0_FA
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_fa[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_FA,
+      NULL,
+      FCEUMM_REGION_INFO_0_FA,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_FA },
+         { "NTSC",  OPTION_VAL_NTSC_FA },
+         { "PAL",   OPTION_VAL_PAL_FA },
+         { "Dendy", OPTION_VAL_DENDY_FA },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_FA,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_FA,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_FA,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_FA,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_FA,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_FA,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_FA,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_FA,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_FA },
+         { "4:3",     OPTION_VAL_4_3_FA },
+         { "PP",      OPTION_VAL_PP_FA },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_FA,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_FA,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_FA,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_FA,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_FA,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_FA,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_FA,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_FA,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_FA },
+         { "asqrealc",             OPTION_VAL_ASQREALC_FA },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_FA },
+         { "rgb",                  OPTION_VAL_RGB_FA },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_FA },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_FA },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_FA },
+         { "pal",                  OPTION_VAL_PAL_FA },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_FA },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_FA },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_FA },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_FA },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_FA },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_FA },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_FA },
+         { "nescap",               OPTION_VAL_NESCAP_FA },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_FA },
+         { "raw",                  OPTION_VAL_RAW_FA },
+         { "custom",               OPTION_VAL_CUSTOM_FA },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_FA,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_FA,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_FA },
+         { "svideo",     OPTION_VAL_SVIDEO_FA },
+         { "rgb",        OPTION_VAL_RGB_O9_FA },
+         { "monochrome", OPTION_VAL_MONOCHROME_FA },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_FA,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_FA,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_FA },
+         { "High",      OPTION_VAL_HIGH_FA },
+         { "Very High", OPTION_VAL_VERY_HIGH_FA },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_FA,
+      FCEUMM_SWAPDUTY_LABEL_CAT_FA,
+      FCEUMM_SWAPDUTY_INFO_0_FA,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_FA,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_FA,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_FA },
+         { "1",  OPTION_VAL_1_FA },
+         { "2",  OPTION_VAL_2_FA },
+         { "3",  OPTION_VAL_3_FA },
+         { "4",  OPTION_VAL_4_FA },
+         { "5",  OPTION_VAL_5_FA },
+         { "6",  OPTION_VAL_6_FA },
+         { "7",  OPTION_VAL_7_FA },
+         { "8",  OPTION_VAL_8_FA },
+         { "9",  OPTION_VAL_9_FA },
+         { "10", OPTION_VAL_10_FA },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_FA,
+      FCEUMM_APU_1_LABEL_CAT_FA,
+      FCEUMM_APU_1_INFO_0_FA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_FA,
+      FCEUMM_APU_2_LABEL_CAT_FA,
+      FCEUMM_APU_2_INFO_0_FA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_FA,
+      FCEUMM_APU_3_LABEL_CAT_FA,
+      FCEUMM_APU_3_INFO_0_FA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_FA,
+      FCEUMM_APU_4_LABEL_CAT_FA,
+      FCEUMM_APU_4_INFO_0_FA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_FA,
+      FCEUMM_APU_5_LABEL_CAT_FA,
+      FCEUMM_APU_5_INFO_0_FA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_FA,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_FA,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_FA },
+         { "Player 1", OPTION_VAL_PLAYER_1_FA },
+         { "Player 2", OPTION_VAL_PLAYER_2_FA },
+         { "Both",     OPTION_VAL_BOTH_FA },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_FA,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_FA,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_FA,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_FA,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_FA },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_FA },
+         { "mouse",       OPTION_VAL_MOUSE_FA },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_FA,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_FA,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_FA,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_FA,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_FA,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_FA,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_FA,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_FA,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_FA,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_FA,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_FA },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_FA },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_FA,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_FA,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_FA },
+         { "fill $00", OPTION_VAL_FILL_00_FA },
+         { "random",   OPTION_VAL_RANDOM_FA },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_fa = {
+   option_cats_fa,
+   option_defs_fa
+};
+
+/* RETRO_LANGUAGE_FI */
+
+#define CATEGORY_SYSTEM_LABEL_FI "Järjestelmä"
+#define CATEGORY_SYSTEM_INFO_0_FI NULL
+#define CATEGORY_VIDEO_LABEL_FI NULL
+#define CATEGORY_VIDEO_INFO_0_FI NULL
+#define CATEGORY_VIDEO_INFO_1_FI NULL
+#define CATEGORY_AUDIO_LABEL_FI "Ääni"
+#define CATEGORY_AUDIO_INFO_0_FI NULL
+#define CATEGORY_INPUT_LABEL_FI "Syöte"
+#define CATEGORY_INPUT_INFO_0_FI NULL
+#define CATEGORY_HACKS_LABEL_FI "Emulointikikat"
+#define CATEGORY_HACKS_INFO_0_FI "Määritä prosessorin ylikellotus- ja emuloinnin tarkkuuden asetukset, jotka vaikuttavat matalan tason suorituskykyyn ja yhteensopivuuteen."
+#define CATEGORY_DIP_SWITCH_LABEL_FI NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_FI NULL
+#define FCEUMM_REGION_LABEL_FI NULL
+#define FCEUMM_REGION_INFO_0_FI NULL
+#define OPTION_VAL_AUTO_FI NULL
+#define OPTION_VAL_NTSC_FI NULL
+#define OPTION_VAL_PAL_FI NULL
+#define OPTION_VAL_DENDY_FI NULL
+#define FCEUMM_GAME_GENIE_LABEL_FI NULL
+#define FCEUMM_GAME_GENIE_INFO_0_FI NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_FI NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_FI NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_FI NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_FI NULL
+#define FCEUMM_ASPECT_LABEL_FI NULL
+#define FCEUMM_ASPECT_INFO_0_FI NULL
+#define OPTION_VAL_8_7_PAR_FI NULL
+#define OPTION_VAL_4_3_FI NULL
+#define OPTION_VAL_PP_FI NULL
+#define FCEUMM_OVERSCAN_LABEL_FI NULL
+#define FCEUMM_OVERSCAN_INFO_0_FI NULL
+#define FCEUMM_OVERSCAN_H_LABEL_FI NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_FI NULL
+#define FCEUMM_OVERSCAN_V_LABEL_FI NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_FI NULL
+#define FCEUMM_PALETTE_LABEL_FI NULL
+#define FCEUMM_PALETTE_INFO_0_FI NULL
+#define OPTION_VAL_DEFAULT_FI NULL
+#define OPTION_VAL_ASQREALC_FI NULL
+#define OPTION_VAL_NINTENDO_VC_FI NULL
+#define OPTION_VAL_RGB_FI NULL
+#define OPTION_VAL_YUV_V3_FI NULL
+#define OPTION_VAL_UNSATURATED_FINAL_FI NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_FI NULL
+#define OPTION_VAL_BMF_FINAL2_FI NULL
+#define OPTION_VAL_BMF_FINAL3_FI NULL
+#define OPTION_VAL_SMOOTH_FBX_FI NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_FI NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_FI NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_FI NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_FI NULL
+#define OPTION_VAL_NESCAP_FI NULL
+#define OPTION_VAL_WAVEBEAM_FI NULL
+#define OPTION_VAL_RAW_FI NULL
+#define OPTION_VAL_CUSTOM_FI NULL
+#define FCEUMM_NTSC_FILTER_LABEL_FI NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_FI NULL
+#define OPTION_VAL_COMPOSITE_FI NULL
+#define OPTION_VAL_SVIDEO_FI NULL
+#define OPTION_VAL_RGB_O9_FI NULL
+#define OPTION_VAL_MONOCHROME_FI NULL
+#define FCEUMM_SNDQUALITY_LABEL_FI NULL
+#define FCEUMM_SNDQUALITY_INFO_0_FI NULL
+#define OPTION_VAL_LOW_FI NULL
+#define OPTION_VAL_HIGH_FI NULL
+#define OPTION_VAL_VERY_HIGH_FI NULL
+#define FCEUMM_SWAPDUTY_LABEL_FI NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_FI NULL
+#define FCEUMM_SWAPDUTY_INFO_0_FI NULL
+#define FCEUMM_SNDVOLUME_LABEL_FI NULL
+#define FCEUMM_SNDVOLUME_INFO_0_FI NULL
+#define OPTION_VAL_0_FI NULL
+#define OPTION_VAL_1_FI NULL
+#define OPTION_VAL_2_FI NULL
+#define OPTION_VAL_3_FI NULL
+#define OPTION_VAL_4_FI NULL
+#define OPTION_VAL_5_FI NULL
+#define OPTION_VAL_6_FI NULL
+#define OPTION_VAL_7_FI NULL
+#define OPTION_VAL_8_FI NULL
+#define OPTION_VAL_9_FI NULL
+#define OPTION_VAL_10_FI NULL
+#define FCEUMM_APU_1_LABEL_FI NULL
+#define FCEUMM_APU_1_LABEL_CAT_FI NULL
+#define FCEUMM_APU_1_INFO_0_FI NULL
+#define FCEUMM_APU_2_LABEL_FI NULL
+#define FCEUMM_APU_2_LABEL_CAT_FI NULL
+#define FCEUMM_APU_2_INFO_0_FI NULL
+#define FCEUMM_APU_3_LABEL_FI NULL
+#define FCEUMM_APU_3_LABEL_CAT_FI NULL
+#define FCEUMM_APU_3_INFO_0_FI NULL
+#define FCEUMM_APU_4_LABEL_FI NULL
+#define FCEUMM_APU_4_LABEL_CAT_FI NULL
+#define FCEUMM_APU_4_INFO_0_FI NULL
+#define FCEUMM_APU_5_LABEL_FI NULL
+#define FCEUMM_APU_5_LABEL_CAT_FI NULL
+#define FCEUMM_APU_5_INFO_0_FI NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_FI NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_FI NULL
+#define OPTION_VAL_NONE_FI NULL
+#define OPTION_VAL_PLAYER_1_FI NULL
+#define OPTION_VAL_PLAYER_2_FI NULL
+#define OPTION_VAL_BOTH_FI NULL
+#define FCEUMM_TURBO_DELAY_LABEL_FI NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_FI NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_FI NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_FI NULL
+#define OPTION_VAL_LIGHTGUN_FI NULL
+#define OPTION_VAL_TOUCHSCREEN_FI NULL
+#define OPTION_VAL_MOUSE_FI NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_FI NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_FI NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_FI NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_FI NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_FI NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_FI NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_FI NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_FI NULL
+#define FCEUMM_OVERCLOCKING_LABEL_FI NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_FI NULL
+#define OPTION_VAL_2X_POSTRENDER_FI NULL
+#define OPTION_VAL_2X_VBLANK_FI NULL
+#define FCEUMM_RAMSTATE_LABEL_FI NULL
+#define FCEUMM_RAMSTATE_INFO_0_FI NULL
+#define OPTION_VAL_FILL_FF_FI NULL
+#define OPTION_VAL_FILL_00_FI NULL
+#define OPTION_VAL_RANDOM_FI NULL
+
+struct retro_core_option_v2_category option_cats_fi[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_FI,
+      CATEGORY_SYSTEM_INFO_0_FI
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_FI,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_FI
+#else
+      CATEGORY_VIDEO_INFO_1_FI
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_FI,
+      CATEGORY_AUDIO_INFO_0_FI
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_FI,
+      CATEGORY_INPUT_INFO_0_FI
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_FI,
+      CATEGORY_HACKS_INFO_0_FI
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_FI,
+      CATEGORY_DIP_SWITCH_INFO_0_FI
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_fi[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_FI,
+      NULL,
+      FCEUMM_REGION_INFO_0_FI,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_FI },
+         { "NTSC",  OPTION_VAL_NTSC_FI },
+         { "PAL",   OPTION_VAL_PAL_FI },
+         { "Dendy", OPTION_VAL_DENDY_FI },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_FI,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_FI,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_FI,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_FI,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_FI,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_FI,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_FI,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_FI,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_FI },
+         { "4:3",     OPTION_VAL_4_3_FI },
+         { "PP",      OPTION_VAL_PP_FI },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_FI,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_FI,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_FI,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_FI,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_FI,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_FI,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_FI,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_FI,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_FI },
+         { "asqrealc",             OPTION_VAL_ASQREALC_FI },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_FI },
+         { "rgb",                  OPTION_VAL_RGB_FI },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_FI },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_FI },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_FI },
+         { "pal",                  OPTION_VAL_PAL_FI },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_FI },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_FI },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_FI },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_FI },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_FI },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_FI },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_FI },
+         { "nescap",               OPTION_VAL_NESCAP_FI },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_FI },
+         { "raw",                  OPTION_VAL_RAW_FI },
+         { "custom",               OPTION_VAL_CUSTOM_FI },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_FI,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_FI,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_FI },
+         { "svideo",     OPTION_VAL_SVIDEO_FI },
+         { "rgb",        OPTION_VAL_RGB_O9_FI },
+         { "monochrome", OPTION_VAL_MONOCHROME_FI },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_FI,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_FI,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_FI },
+         { "High",      OPTION_VAL_HIGH_FI },
+         { "Very High", OPTION_VAL_VERY_HIGH_FI },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_FI,
+      FCEUMM_SWAPDUTY_LABEL_CAT_FI,
+      FCEUMM_SWAPDUTY_INFO_0_FI,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_FI,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_FI,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_FI },
+         { "1",  OPTION_VAL_1_FI },
+         { "2",  OPTION_VAL_2_FI },
+         { "3",  OPTION_VAL_3_FI },
+         { "4",  OPTION_VAL_4_FI },
+         { "5",  OPTION_VAL_5_FI },
+         { "6",  OPTION_VAL_6_FI },
+         { "7",  OPTION_VAL_7_FI },
+         { "8",  OPTION_VAL_8_FI },
+         { "9",  OPTION_VAL_9_FI },
+         { "10", OPTION_VAL_10_FI },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_FI,
+      FCEUMM_APU_1_LABEL_CAT_FI,
+      FCEUMM_APU_1_INFO_0_FI,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_FI,
+      FCEUMM_APU_2_LABEL_CAT_FI,
+      FCEUMM_APU_2_INFO_0_FI,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_FI,
+      FCEUMM_APU_3_LABEL_CAT_FI,
+      FCEUMM_APU_3_INFO_0_FI,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_FI,
+      FCEUMM_APU_4_LABEL_CAT_FI,
+      FCEUMM_APU_4_INFO_0_FI,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_FI,
+      FCEUMM_APU_5_LABEL_CAT_FI,
+      FCEUMM_APU_5_INFO_0_FI,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_FI,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_FI,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_FI },
+         { "Player 1", OPTION_VAL_PLAYER_1_FI },
+         { "Player 2", OPTION_VAL_PLAYER_2_FI },
+         { "Both",     OPTION_VAL_BOTH_FI },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_FI,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_FI,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_FI,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_FI,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_FI },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_FI },
+         { "mouse",       OPTION_VAL_MOUSE_FI },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_FI,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_FI,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_FI,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_FI,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_FI,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_FI,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_FI,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_FI,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_FI,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_FI,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_FI },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_FI },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_FI,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_FI,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_FI },
+         { "fill $00", OPTION_VAL_FILL_00_FI },
+         { "random",   OPTION_VAL_RANDOM_FI },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_fi = {
+   option_cats_fi,
+   option_defs_fi
+};
+
+/* RETRO_LANGUAGE_FR */
+
+#define CATEGORY_SYSTEM_LABEL_FR "Système"
+#define CATEGORY_SYSTEM_INFO_0_FR NULL
+#define CATEGORY_VIDEO_LABEL_FR "Vidéo"
+#define CATEGORY_VIDEO_INFO_0_FR NULL
+#define CATEGORY_VIDEO_INFO_1_FR NULL
+#define CATEGORY_AUDIO_LABEL_FR NULL
+#define CATEGORY_AUDIO_INFO_0_FR NULL
+#define CATEGORY_INPUT_LABEL_FR "Entrées"
+#define CATEGORY_INPUT_INFO_0_FR NULL
+#define CATEGORY_HACKS_LABEL_FR "Hacks d'émulation"
+#define CATEGORY_HACKS_INFO_0_FR "Configurer les paramètres d'overclocking du processeur et de la précision d'émulation qui affectent les performances de bas niveau et la compatibilité."
+#define CATEGORY_DIP_SWITCH_LABEL_FR NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_FR NULL
+#define FCEUMM_REGION_LABEL_FR NULL
+#define FCEUMM_REGION_INFO_0_FR NULL
+#define OPTION_VAL_AUTO_FR NULL
+#define OPTION_VAL_NTSC_FR NULL
+#define OPTION_VAL_PAL_FR NULL
+#define OPTION_VAL_DENDY_FR NULL
+#define FCEUMM_GAME_GENIE_LABEL_FR NULL
+#define FCEUMM_GAME_GENIE_INFO_0_FR NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_FR NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_FR NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_FR NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_FR NULL
+#define FCEUMM_ASPECT_LABEL_FR NULL
+#define FCEUMM_ASPECT_INFO_0_FR NULL
+#define OPTION_VAL_8_7_PAR_FR NULL
+#define OPTION_VAL_4_3_FR NULL
+#define OPTION_VAL_PP_FR NULL
+#define FCEUMM_OVERSCAN_LABEL_FR NULL
+#define FCEUMM_OVERSCAN_INFO_0_FR NULL
+#define FCEUMM_OVERSCAN_H_LABEL_FR NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_FR NULL
+#define FCEUMM_OVERSCAN_V_LABEL_FR NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_FR NULL
+#define FCEUMM_PALETTE_LABEL_FR NULL
+#define FCEUMM_PALETTE_INFO_0_FR NULL
+#define OPTION_VAL_DEFAULT_FR NULL
+#define OPTION_VAL_ASQREALC_FR NULL
+#define OPTION_VAL_NINTENDO_VC_FR NULL
+#define OPTION_VAL_RGB_FR NULL
+#define OPTION_VAL_YUV_V3_FR NULL
+#define OPTION_VAL_UNSATURATED_FINAL_FR NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_FR NULL
+#define OPTION_VAL_BMF_FINAL2_FR NULL
+#define OPTION_VAL_BMF_FINAL3_FR NULL
+#define OPTION_VAL_SMOOTH_FBX_FR NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_FR NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_FR NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_FR NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_FR NULL
+#define OPTION_VAL_NESCAP_FR NULL
+#define OPTION_VAL_WAVEBEAM_FR NULL
+#define OPTION_VAL_RAW_FR NULL
+#define OPTION_VAL_CUSTOM_FR NULL
+#define FCEUMM_NTSC_FILTER_LABEL_FR NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_FR NULL
+#define OPTION_VAL_COMPOSITE_FR NULL
+#define OPTION_VAL_SVIDEO_FR NULL
+#define OPTION_VAL_RGB_O9_FR NULL
+#define OPTION_VAL_MONOCHROME_FR NULL
+#define FCEUMM_SNDQUALITY_LABEL_FR NULL
+#define FCEUMM_SNDQUALITY_INFO_0_FR NULL
+#define OPTION_VAL_LOW_FR NULL
+#define OPTION_VAL_HIGH_FR NULL
+#define OPTION_VAL_VERY_HIGH_FR NULL
+#define FCEUMM_SWAPDUTY_LABEL_FR NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_FR NULL
+#define FCEUMM_SWAPDUTY_INFO_0_FR NULL
+#define FCEUMM_SNDVOLUME_LABEL_FR NULL
+#define FCEUMM_SNDVOLUME_INFO_0_FR NULL
+#define OPTION_VAL_0_FR NULL
+#define OPTION_VAL_1_FR NULL
+#define OPTION_VAL_2_FR NULL
+#define OPTION_VAL_3_FR NULL
+#define OPTION_VAL_4_FR NULL
+#define OPTION_VAL_5_FR NULL
+#define OPTION_VAL_6_FR NULL
+#define OPTION_VAL_7_FR NULL
+#define OPTION_VAL_8_FR NULL
+#define OPTION_VAL_9_FR NULL
+#define OPTION_VAL_10_FR NULL
+#define FCEUMM_APU_1_LABEL_FR NULL
+#define FCEUMM_APU_1_LABEL_CAT_FR NULL
+#define FCEUMM_APU_1_INFO_0_FR NULL
+#define FCEUMM_APU_2_LABEL_FR NULL
+#define FCEUMM_APU_2_LABEL_CAT_FR NULL
+#define FCEUMM_APU_2_INFO_0_FR NULL
+#define FCEUMM_APU_3_LABEL_FR NULL
+#define FCEUMM_APU_3_LABEL_CAT_FR NULL
+#define FCEUMM_APU_3_INFO_0_FR NULL
+#define FCEUMM_APU_4_LABEL_FR NULL
+#define FCEUMM_APU_4_LABEL_CAT_FR NULL
+#define FCEUMM_APU_4_INFO_0_FR NULL
+#define FCEUMM_APU_5_LABEL_FR NULL
+#define FCEUMM_APU_5_LABEL_CAT_FR NULL
+#define FCEUMM_APU_5_INFO_0_FR NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_FR NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_FR NULL
+#define OPTION_VAL_NONE_FR NULL
+#define OPTION_VAL_PLAYER_1_FR NULL
+#define OPTION_VAL_PLAYER_2_FR NULL
+#define OPTION_VAL_BOTH_FR NULL
+#define FCEUMM_TURBO_DELAY_LABEL_FR NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_FR NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_FR NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_FR NULL
+#define OPTION_VAL_LIGHTGUN_FR NULL
+#define OPTION_VAL_TOUCHSCREEN_FR NULL
+#define OPTION_VAL_MOUSE_FR NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_FR NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_FR NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_FR NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_FR NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_FR NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_FR NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_FR NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_FR NULL
+#define FCEUMM_OVERCLOCKING_LABEL_FR NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_FR NULL
+#define OPTION_VAL_2X_POSTRENDER_FR NULL
+#define OPTION_VAL_2X_VBLANK_FR NULL
+#define FCEUMM_RAMSTATE_LABEL_FR NULL
+#define FCEUMM_RAMSTATE_INFO_0_FR NULL
+#define OPTION_VAL_FILL_FF_FR NULL
+#define OPTION_VAL_FILL_00_FR NULL
+#define OPTION_VAL_RANDOM_FR NULL
+
+struct retro_core_option_v2_category option_cats_fr[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_FR,
+      CATEGORY_SYSTEM_INFO_0_FR
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_FR,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_FR
+#else
+      CATEGORY_VIDEO_INFO_1_FR
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_FR,
+      CATEGORY_AUDIO_INFO_0_FR
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_FR,
+      CATEGORY_INPUT_INFO_0_FR
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_FR,
+      CATEGORY_HACKS_INFO_0_FR
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_FR,
+      CATEGORY_DIP_SWITCH_INFO_0_FR
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_fr[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_FR,
+      NULL,
+      FCEUMM_REGION_INFO_0_FR,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_FR },
+         { "NTSC",  OPTION_VAL_NTSC_FR },
+         { "PAL",   OPTION_VAL_PAL_FR },
+         { "Dendy", OPTION_VAL_DENDY_FR },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_FR,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_FR,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_FR,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_FR,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_FR,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_FR,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_FR,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_FR,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_FR },
+         { "4:3",     OPTION_VAL_4_3_FR },
+         { "PP",      OPTION_VAL_PP_FR },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_FR,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_FR,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_FR,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_FR,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_FR,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_FR,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_FR,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_FR,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_FR },
+         { "asqrealc",             OPTION_VAL_ASQREALC_FR },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_FR },
+         { "rgb",                  OPTION_VAL_RGB_FR },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_FR },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_FR },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_FR },
+         { "pal",                  OPTION_VAL_PAL_FR },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_FR },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_FR },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_FR },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_FR },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_FR },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_FR },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_FR },
+         { "nescap",               OPTION_VAL_NESCAP_FR },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_FR },
+         { "raw",                  OPTION_VAL_RAW_FR },
+         { "custom",               OPTION_VAL_CUSTOM_FR },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_FR,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_FR,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_FR },
+         { "svideo",     OPTION_VAL_SVIDEO_FR },
+         { "rgb",        OPTION_VAL_RGB_O9_FR },
+         { "monochrome", OPTION_VAL_MONOCHROME_FR },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_FR,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_FR,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_FR },
+         { "High",      OPTION_VAL_HIGH_FR },
+         { "Very High", OPTION_VAL_VERY_HIGH_FR },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_FR,
+      FCEUMM_SWAPDUTY_LABEL_CAT_FR,
+      FCEUMM_SWAPDUTY_INFO_0_FR,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_FR,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_FR,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_FR },
+         { "1",  OPTION_VAL_1_FR },
+         { "2",  OPTION_VAL_2_FR },
+         { "3",  OPTION_VAL_3_FR },
+         { "4",  OPTION_VAL_4_FR },
+         { "5",  OPTION_VAL_5_FR },
+         { "6",  OPTION_VAL_6_FR },
+         { "7",  OPTION_VAL_7_FR },
+         { "8",  OPTION_VAL_8_FR },
+         { "9",  OPTION_VAL_9_FR },
+         { "10", OPTION_VAL_10_FR },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_FR,
+      FCEUMM_APU_1_LABEL_CAT_FR,
+      FCEUMM_APU_1_INFO_0_FR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_FR,
+      FCEUMM_APU_2_LABEL_CAT_FR,
+      FCEUMM_APU_2_INFO_0_FR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_FR,
+      FCEUMM_APU_3_LABEL_CAT_FR,
+      FCEUMM_APU_3_INFO_0_FR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_FR,
+      FCEUMM_APU_4_LABEL_CAT_FR,
+      FCEUMM_APU_4_INFO_0_FR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_FR,
+      FCEUMM_APU_5_LABEL_CAT_FR,
+      FCEUMM_APU_5_INFO_0_FR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_FR,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_FR,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_FR },
+         { "Player 1", OPTION_VAL_PLAYER_1_FR },
+         { "Player 2", OPTION_VAL_PLAYER_2_FR },
+         { "Both",     OPTION_VAL_BOTH_FR },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_FR,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_FR,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_FR,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_FR,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_FR },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_FR },
+         { "mouse",       OPTION_VAL_MOUSE_FR },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_FR,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_FR,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_FR,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_FR,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_FR,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_FR,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_FR,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_FR,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_FR,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_FR,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_FR },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_FR },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_FR,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_FR,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_FR },
+         { "fill $00", OPTION_VAL_FILL_00_FR },
+         { "random",   OPTION_VAL_RANDOM_FR },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_fr = {
+   option_cats_fr,
+   option_defs_fr
+};
+
+/* RETRO_LANGUAGE_GL */
+
+#define CATEGORY_SYSTEM_LABEL_GL NULL
+#define CATEGORY_SYSTEM_INFO_0_GL NULL
+#define CATEGORY_VIDEO_LABEL_GL "Vídeo"
+#define CATEGORY_VIDEO_INFO_0_GL NULL
+#define CATEGORY_VIDEO_INFO_1_GL NULL
+#define CATEGORY_AUDIO_LABEL_GL "Son"
+#define CATEGORY_AUDIO_INFO_0_GL NULL
+#define CATEGORY_INPUT_LABEL_GL "Entrada"
+#define CATEGORY_INPUT_INFO_0_GL NULL
+#define CATEGORY_HACKS_LABEL_GL "Hacks de emulación"
+#define CATEGORY_HACKS_INFO_0_GL "Configurar os parámetros do overclocking e a precisión da emulación do procesador que afecten ó rendemento e á compatibilidade de baixo nivel."
+#define CATEGORY_DIP_SWITCH_LABEL_GL NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_GL NULL
+#define FCEUMM_REGION_LABEL_GL NULL
+#define FCEUMM_REGION_INFO_0_GL NULL
+#define OPTION_VAL_AUTO_GL NULL
+#define OPTION_VAL_NTSC_GL NULL
+#define OPTION_VAL_PAL_GL NULL
+#define OPTION_VAL_DENDY_GL NULL
+#define FCEUMM_GAME_GENIE_LABEL_GL NULL
+#define FCEUMM_GAME_GENIE_INFO_0_GL NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_GL NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_GL NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_GL NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_GL NULL
+#define FCEUMM_ASPECT_LABEL_GL NULL
+#define FCEUMM_ASPECT_INFO_0_GL NULL
+#define OPTION_VAL_8_7_PAR_GL NULL
+#define OPTION_VAL_4_3_GL NULL
+#define OPTION_VAL_PP_GL NULL
+#define FCEUMM_OVERSCAN_LABEL_GL NULL
+#define FCEUMM_OVERSCAN_INFO_0_GL NULL
+#define FCEUMM_OVERSCAN_H_LABEL_GL NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_GL NULL
+#define FCEUMM_OVERSCAN_V_LABEL_GL NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_GL NULL
+#define FCEUMM_PALETTE_LABEL_GL NULL
+#define FCEUMM_PALETTE_INFO_0_GL NULL
+#define OPTION_VAL_DEFAULT_GL NULL
+#define OPTION_VAL_ASQREALC_GL NULL
+#define OPTION_VAL_NINTENDO_VC_GL NULL
+#define OPTION_VAL_RGB_GL NULL
+#define OPTION_VAL_YUV_V3_GL NULL
+#define OPTION_VAL_UNSATURATED_FINAL_GL NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_GL NULL
+#define OPTION_VAL_BMF_FINAL2_GL NULL
+#define OPTION_VAL_BMF_FINAL3_GL NULL
+#define OPTION_VAL_SMOOTH_FBX_GL NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_GL NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_GL NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_GL NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_GL NULL
+#define OPTION_VAL_NESCAP_GL NULL
+#define OPTION_VAL_WAVEBEAM_GL NULL
+#define OPTION_VAL_RAW_GL NULL
+#define OPTION_VAL_CUSTOM_GL NULL
+#define FCEUMM_NTSC_FILTER_LABEL_GL NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_GL NULL
+#define OPTION_VAL_COMPOSITE_GL NULL
+#define OPTION_VAL_SVIDEO_GL NULL
+#define OPTION_VAL_RGB_O9_GL NULL
+#define OPTION_VAL_MONOCHROME_GL NULL
+#define FCEUMM_SNDQUALITY_LABEL_GL NULL
+#define FCEUMM_SNDQUALITY_INFO_0_GL NULL
+#define OPTION_VAL_LOW_GL NULL
+#define OPTION_VAL_HIGH_GL NULL
+#define OPTION_VAL_VERY_HIGH_GL NULL
+#define FCEUMM_SWAPDUTY_LABEL_GL NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_GL NULL
+#define FCEUMM_SWAPDUTY_INFO_0_GL NULL
+#define FCEUMM_SNDVOLUME_LABEL_GL NULL
+#define FCEUMM_SNDVOLUME_INFO_0_GL NULL
+#define OPTION_VAL_0_GL NULL
+#define OPTION_VAL_1_GL NULL
+#define OPTION_VAL_2_GL NULL
+#define OPTION_VAL_3_GL NULL
+#define OPTION_VAL_4_GL NULL
+#define OPTION_VAL_5_GL NULL
+#define OPTION_VAL_6_GL NULL
+#define OPTION_VAL_7_GL NULL
+#define OPTION_VAL_8_GL NULL
+#define OPTION_VAL_9_GL NULL
+#define OPTION_VAL_10_GL NULL
+#define FCEUMM_APU_1_LABEL_GL NULL
+#define FCEUMM_APU_1_LABEL_CAT_GL NULL
+#define FCEUMM_APU_1_INFO_0_GL NULL
+#define FCEUMM_APU_2_LABEL_GL NULL
+#define FCEUMM_APU_2_LABEL_CAT_GL NULL
+#define FCEUMM_APU_2_INFO_0_GL NULL
+#define FCEUMM_APU_3_LABEL_GL NULL
+#define FCEUMM_APU_3_LABEL_CAT_GL NULL
+#define FCEUMM_APU_3_INFO_0_GL NULL
+#define FCEUMM_APU_4_LABEL_GL NULL
+#define FCEUMM_APU_4_LABEL_CAT_GL NULL
+#define FCEUMM_APU_4_INFO_0_GL NULL
+#define FCEUMM_APU_5_LABEL_GL NULL
+#define FCEUMM_APU_5_LABEL_CAT_GL NULL
+#define FCEUMM_APU_5_INFO_0_GL NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_GL NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_GL NULL
+#define OPTION_VAL_NONE_GL NULL
+#define OPTION_VAL_PLAYER_1_GL NULL
+#define OPTION_VAL_PLAYER_2_GL NULL
+#define OPTION_VAL_BOTH_GL NULL
+#define FCEUMM_TURBO_DELAY_LABEL_GL NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_GL NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_GL NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_GL NULL
+#define OPTION_VAL_LIGHTGUN_GL NULL
+#define OPTION_VAL_TOUCHSCREEN_GL NULL
+#define OPTION_VAL_MOUSE_GL NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_GL NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_GL NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_GL NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_GL NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_GL NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_GL NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_GL NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_GL NULL
+#define FCEUMM_OVERCLOCKING_LABEL_GL NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_GL NULL
+#define OPTION_VAL_2X_POSTRENDER_GL NULL
+#define OPTION_VAL_2X_VBLANK_GL NULL
+#define FCEUMM_RAMSTATE_LABEL_GL NULL
+#define FCEUMM_RAMSTATE_INFO_0_GL NULL
+#define OPTION_VAL_FILL_FF_GL NULL
+#define OPTION_VAL_FILL_00_GL NULL
+#define OPTION_VAL_RANDOM_GL NULL
+
+struct retro_core_option_v2_category option_cats_gl[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_GL,
+      CATEGORY_SYSTEM_INFO_0_GL
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_GL,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_GL
+#else
+      CATEGORY_VIDEO_INFO_1_GL
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_GL,
+      CATEGORY_AUDIO_INFO_0_GL
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_GL,
+      CATEGORY_INPUT_INFO_0_GL
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_GL,
+      CATEGORY_HACKS_INFO_0_GL
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_GL,
+      CATEGORY_DIP_SWITCH_INFO_0_GL
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_gl[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_GL,
+      NULL,
+      FCEUMM_REGION_INFO_0_GL,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_GL },
+         { "NTSC",  OPTION_VAL_NTSC_GL },
+         { "PAL",   OPTION_VAL_PAL_GL },
+         { "Dendy", OPTION_VAL_DENDY_GL },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_GL,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_GL,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_GL,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_GL,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_GL,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_GL,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_GL,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_GL,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_GL },
+         { "4:3",     OPTION_VAL_4_3_GL },
+         { "PP",      OPTION_VAL_PP_GL },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_GL,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_GL,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_GL,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_GL,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_GL,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_GL,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_GL,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_GL,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_GL },
+         { "asqrealc",             OPTION_VAL_ASQREALC_GL },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_GL },
+         { "rgb",                  OPTION_VAL_RGB_GL },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_GL },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_GL },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_GL },
+         { "pal",                  OPTION_VAL_PAL_GL },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_GL },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_GL },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_GL },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_GL },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_GL },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_GL },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_GL },
+         { "nescap",               OPTION_VAL_NESCAP_GL },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_GL },
+         { "raw",                  OPTION_VAL_RAW_GL },
+         { "custom",               OPTION_VAL_CUSTOM_GL },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_GL,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_GL,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_GL },
+         { "svideo",     OPTION_VAL_SVIDEO_GL },
+         { "rgb",        OPTION_VAL_RGB_O9_GL },
+         { "monochrome", OPTION_VAL_MONOCHROME_GL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_GL,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_GL,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_GL },
+         { "High",      OPTION_VAL_HIGH_GL },
+         { "Very High", OPTION_VAL_VERY_HIGH_GL },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_GL,
+      FCEUMM_SWAPDUTY_LABEL_CAT_GL,
+      FCEUMM_SWAPDUTY_INFO_0_GL,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_GL,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_GL,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_GL },
+         { "1",  OPTION_VAL_1_GL },
+         { "2",  OPTION_VAL_2_GL },
+         { "3",  OPTION_VAL_3_GL },
+         { "4",  OPTION_VAL_4_GL },
+         { "5",  OPTION_VAL_5_GL },
+         { "6",  OPTION_VAL_6_GL },
+         { "7",  OPTION_VAL_7_GL },
+         { "8",  OPTION_VAL_8_GL },
+         { "9",  OPTION_VAL_9_GL },
+         { "10", OPTION_VAL_10_GL },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_GL,
+      FCEUMM_APU_1_LABEL_CAT_GL,
+      FCEUMM_APU_1_INFO_0_GL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_GL,
+      FCEUMM_APU_2_LABEL_CAT_GL,
+      FCEUMM_APU_2_INFO_0_GL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_GL,
+      FCEUMM_APU_3_LABEL_CAT_GL,
+      FCEUMM_APU_3_INFO_0_GL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_GL,
+      FCEUMM_APU_4_LABEL_CAT_GL,
+      FCEUMM_APU_4_INFO_0_GL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_GL,
+      FCEUMM_APU_5_LABEL_CAT_GL,
+      FCEUMM_APU_5_INFO_0_GL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_GL,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_GL,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_GL },
+         { "Player 1", OPTION_VAL_PLAYER_1_GL },
+         { "Player 2", OPTION_VAL_PLAYER_2_GL },
+         { "Both",     OPTION_VAL_BOTH_GL },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_GL,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_GL,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_GL,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_GL,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_GL },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_GL },
+         { "mouse",       OPTION_VAL_MOUSE_GL },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_GL,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_GL,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_GL,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_GL,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_GL,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_GL,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_GL,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_GL,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_GL,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_GL,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_GL },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_GL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_GL,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_GL,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_GL },
+         { "fill $00", OPTION_VAL_FILL_00_GL },
+         { "random",   OPTION_VAL_RANDOM_GL },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_gl = {
+   option_cats_gl,
+   option_defs_gl
+};
+
+/* RETRO_LANGUAGE_HE */
+
+#define CATEGORY_SYSTEM_LABEL_HE NULL
+#define CATEGORY_SYSTEM_INFO_0_HE NULL
+#define CATEGORY_VIDEO_LABEL_HE "וידאו"
+#define CATEGORY_VIDEO_INFO_0_HE NULL
+#define CATEGORY_VIDEO_INFO_1_HE NULL
+#define CATEGORY_AUDIO_LABEL_HE "שמע"
+#define CATEGORY_AUDIO_INFO_0_HE NULL
+#define CATEGORY_INPUT_LABEL_HE "קלט"
+#define CATEGORY_INPUT_INFO_0_HE NULL
+#define CATEGORY_HACKS_LABEL_HE NULL
+#define CATEGORY_HACKS_INFO_0_HE NULL
+#define CATEGORY_DIP_SWITCH_LABEL_HE NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_HE NULL
+#define FCEUMM_REGION_LABEL_HE NULL
+#define FCEUMM_REGION_INFO_0_HE NULL
+#define OPTION_VAL_AUTO_HE NULL
+#define OPTION_VAL_NTSC_HE NULL
+#define OPTION_VAL_PAL_HE NULL
+#define OPTION_VAL_DENDY_HE NULL
+#define FCEUMM_GAME_GENIE_LABEL_HE NULL
+#define FCEUMM_GAME_GENIE_INFO_0_HE NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_HE NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_HE NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_HE NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_HE NULL
+#define FCEUMM_ASPECT_LABEL_HE NULL
+#define FCEUMM_ASPECT_INFO_0_HE NULL
+#define OPTION_VAL_8_7_PAR_HE NULL
+#define OPTION_VAL_4_3_HE NULL
+#define OPTION_VAL_PP_HE NULL
+#define FCEUMM_OVERSCAN_LABEL_HE NULL
+#define FCEUMM_OVERSCAN_INFO_0_HE NULL
+#define FCEUMM_OVERSCAN_H_LABEL_HE NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_HE NULL
+#define FCEUMM_OVERSCAN_V_LABEL_HE NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_HE NULL
+#define FCEUMM_PALETTE_LABEL_HE NULL
+#define FCEUMM_PALETTE_INFO_0_HE NULL
+#define OPTION_VAL_DEFAULT_HE NULL
+#define OPTION_VAL_ASQREALC_HE NULL
+#define OPTION_VAL_NINTENDO_VC_HE NULL
+#define OPTION_VAL_RGB_HE NULL
+#define OPTION_VAL_YUV_V3_HE NULL
+#define OPTION_VAL_UNSATURATED_FINAL_HE NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_HE NULL
+#define OPTION_VAL_BMF_FINAL2_HE NULL
+#define OPTION_VAL_BMF_FINAL3_HE NULL
+#define OPTION_VAL_SMOOTH_FBX_HE NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_HE NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_HE NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_HE NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_HE NULL
+#define OPTION_VAL_NESCAP_HE NULL
+#define OPTION_VAL_WAVEBEAM_HE NULL
+#define OPTION_VAL_RAW_HE NULL
+#define OPTION_VAL_CUSTOM_HE NULL
+#define FCEUMM_NTSC_FILTER_LABEL_HE NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_HE NULL
+#define OPTION_VAL_COMPOSITE_HE NULL
+#define OPTION_VAL_SVIDEO_HE NULL
+#define OPTION_VAL_RGB_O9_HE NULL
+#define OPTION_VAL_MONOCHROME_HE NULL
+#define FCEUMM_SNDQUALITY_LABEL_HE NULL
+#define FCEUMM_SNDQUALITY_INFO_0_HE NULL
+#define OPTION_VAL_LOW_HE NULL
+#define OPTION_VAL_HIGH_HE NULL
+#define OPTION_VAL_VERY_HIGH_HE NULL
+#define FCEUMM_SWAPDUTY_LABEL_HE NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_HE NULL
+#define FCEUMM_SWAPDUTY_INFO_0_HE NULL
+#define FCEUMM_SNDVOLUME_LABEL_HE NULL
+#define FCEUMM_SNDVOLUME_INFO_0_HE NULL
+#define OPTION_VAL_0_HE NULL
+#define OPTION_VAL_1_HE NULL
+#define OPTION_VAL_2_HE NULL
+#define OPTION_VAL_3_HE NULL
+#define OPTION_VAL_4_HE NULL
+#define OPTION_VAL_5_HE NULL
+#define OPTION_VAL_6_HE NULL
+#define OPTION_VAL_7_HE NULL
+#define OPTION_VAL_8_HE NULL
+#define OPTION_VAL_9_HE NULL
+#define OPTION_VAL_10_HE NULL
+#define FCEUMM_APU_1_LABEL_HE NULL
+#define FCEUMM_APU_1_LABEL_CAT_HE NULL
+#define FCEUMM_APU_1_INFO_0_HE NULL
+#define FCEUMM_APU_2_LABEL_HE NULL
+#define FCEUMM_APU_2_LABEL_CAT_HE NULL
+#define FCEUMM_APU_2_INFO_0_HE NULL
+#define FCEUMM_APU_3_LABEL_HE NULL
+#define FCEUMM_APU_3_LABEL_CAT_HE NULL
+#define FCEUMM_APU_3_INFO_0_HE NULL
+#define FCEUMM_APU_4_LABEL_HE NULL
+#define FCEUMM_APU_4_LABEL_CAT_HE NULL
+#define FCEUMM_APU_4_INFO_0_HE NULL
+#define FCEUMM_APU_5_LABEL_HE NULL
+#define FCEUMM_APU_5_LABEL_CAT_HE NULL
+#define FCEUMM_APU_5_INFO_0_HE NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_HE NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_HE NULL
+#define OPTION_VAL_NONE_HE NULL
+#define OPTION_VAL_PLAYER_1_HE NULL
+#define OPTION_VAL_PLAYER_2_HE NULL
+#define OPTION_VAL_BOTH_HE NULL
+#define FCEUMM_TURBO_DELAY_LABEL_HE NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_HE NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_HE NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_HE NULL
+#define OPTION_VAL_LIGHTGUN_HE NULL
+#define OPTION_VAL_TOUCHSCREEN_HE NULL
+#define OPTION_VAL_MOUSE_HE NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_HE NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_HE NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_HE NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_HE NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_HE NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_HE NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_HE NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_HE NULL
+#define FCEUMM_OVERCLOCKING_LABEL_HE NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_HE NULL
+#define OPTION_VAL_2X_POSTRENDER_HE NULL
+#define OPTION_VAL_2X_VBLANK_HE NULL
+#define FCEUMM_RAMSTATE_LABEL_HE NULL
+#define FCEUMM_RAMSTATE_INFO_0_HE NULL
+#define OPTION_VAL_FILL_FF_HE NULL
+#define OPTION_VAL_FILL_00_HE NULL
+#define OPTION_VAL_RANDOM_HE NULL
+
+struct retro_core_option_v2_category option_cats_he[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_HE,
+      CATEGORY_SYSTEM_INFO_0_HE
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_HE,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_HE
+#else
+      CATEGORY_VIDEO_INFO_1_HE
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_HE,
+      CATEGORY_AUDIO_INFO_0_HE
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_HE,
+      CATEGORY_INPUT_INFO_0_HE
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_HE,
+      CATEGORY_HACKS_INFO_0_HE
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_HE,
+      CATEGORY_DIP_SWITCH_INFO_0_HE
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_he[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_HE,
+      NULL,
+      FCEUMM_REGION_INFO_0_HE,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_HE },
+         { "NTSC",  OPTION_VAL_NTSC_HE },
+         { "PAL",   OPTION_VAL_PAL_HE },
+         { "Dendy", OPTION_VAL_DENDY_HE },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_HE,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_HE,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_HE,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_HE,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_HE,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_HE,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_HE,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_HE,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_HE },
+         { "4:3",     OPTION_VAL_4_3_HE },
+         { "PP",      OPTION_VAL_PP_HE },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_HE,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_HE,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_HE,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_HE,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_HE,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_HE,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_HE,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_HE,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_HE },
+         { "asqrealc",             OPTION_VAL_ASQREALC_HE },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_HE },
+         { "rgb",                  OPTION_VAL_RGB_HE },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_HE },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_HE },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_HE },
+         { "pal",                  OPTION_VAL_PAL_HE },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_HE },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_HE },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_HE },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_HE },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_HE },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_HE },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_HE },
+         { "nescap",               OPTION_VAL_NESCAP_HE },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_HE },
+         { "raw",                  OPTION_VAL_RAW_HE },
+         { "custom",               OPTION_VAL_CUSTOM_HE },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_HE,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_HE,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_HE },
+         { "svideo",     OPTION_VAL_SVIDEO_HE },
+         { "rgb",        OPTION_VAL_RGB_O9_HE },
+         { "monochrome", OPTION_VAL_MONOCHROME_HE },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_HE,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_HE,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_HE },
+         { "High",      OPTION_VAL_HIGH_HE },
+         { "Very High", OPTION_VAL_VERY_HIGH_HE },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_HE,
+      FCEUMM_SWAPDUTY_LABEL_CAT_HE,
+      FCEUMM_SWAPDUTY_INFO_0_HE,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_HE,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_HE,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_HE },
+         { "1",  OPTION_VAL_1_HE },
+         { "2",  OPTION_VAL_2_HE },
+         { "3",  OPTION_VAL_3_HE },
+         { "4",  OPTION_VAL_4_HE },
+         { "5",  OPTION_VAL_5_HE },
+         { "6",  OPTION_VAL_6_HE },
+         { "7",  OPTION_VAL_7_HE },
+         { "8",  OPTION_VAL_8_HE },
+         { "9",  OPTION_VAL_9_HE },
+         { "10", OPTION_VAL_10_HE },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_HE,
+      FCEUMM_APU_1_LABEL_CAT_HE,
+      FCEUMM_APU_1_INFO_0_HE,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_HE,
+      FCEUMM_APU_2_LABEL_CAT_HE,
+      FCEUMM_APU_2_INFO_0_HE,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_HE,
+      FCEUMM_APU_3_LABEL_CAT_HE,
+      FCEUMM_APU_3_INFO_0_HE,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_HE,
+      FCEUMM_APU_4_LABEL_CAT_HE,
+      FCEUMM_APU_4_INFO_0_HE,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_HE,
+      FCEUMM_APU_5_LABEL_CAT_HE,
+      FCEUMM_APU_5_INFO_0_HE,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_HE,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_HE,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_HE },
+         { "Player 1", OPTION_VAL_PLAYER_1_HE },
+         { "Player 2", OPTION_VAL_PLAYER_2_HE },
+         { "Both",     OPTION_VAL_BOTH_HE },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_HE,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_HE,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_HE,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_HE,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_HE },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_HE },
+         { "mouse",       OPTION_VAL_MOUSE_HE },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_HE,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_HE,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_HE,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_HE,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_HE,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_HE,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_HE,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_HE,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_HE,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_HE,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_HE },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_HE },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_HE,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_HE,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_HE },
+         { "fill $00", OPTION_VAL_FILL_00_HE },
+         { "random",   OPTION_VAL_RANDOM_HE },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_he = {
+   option_cats_he,
+   option_defs_he
+};
+
+/* RETRO_LANGUAGE_HU */
+
+#define CATEGORY_SYSTEM_LABEL_HU NULL
+#define CATEGORY_SYSTEM_INFO_0_HU NULL
+#define CATEGORY_VIDEO_LABEL_HU "Videó"
+#define CATEGORY_VIDEO_INFO_0_HU NULL
+#define CATEGORY_VIDEO_INFO_1_HU NULL
+#define CATEGORY_AUDIO_LABEL_HU "Hang"
+#define CATEGORY_AUDIO_INFO_0_HU NULL
+#define CATEGORY_INPUT_LABEL_HU "Bevitel"
+#define CATEGORY_INPUT_INFO_0_HU NULL
+#define CATEGORY_HACKS_LABEL_HU NULL
+#define CATEGORY_HACKS_INFO_0_HU NULL
+#define CATEGORY_DIP_SWITCH_LABEL_HU NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_HU NULL
+#define FCEUMM_REGION_LABEL_HU NULL
+#define FCEUMM_REGION_INFO_0_HU NULL
+#define OPTION_VAL_AUTO_HU NULL
+#define OPTION_VAL_NTSC_HU NULL
+#define OPTION_VAL_PAL_HU NULL
+#define OPTION_VAL_DENDY_HU NULL
+#define FCEUMM_GAME_GENIE_LABEL_HU NULL
+#define FCEUMM_GAME_GENIE_INFO_0_HU NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_HU NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_HU NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_HU NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_HU NULL
+#define FCEUMM_ASPECT_LABEL_HU NULL
+#define FCEUMM_ASPECT_INFO_0_HU NULL
+#define OPTION_VAL_8_7_PAR_HU NULL
+#define OPTION_VAL_4_3_HU NULL
+#define OPTION_VAL_PP_HU NULL
+#define FCEUMM_OVERSCAN_LABEL_HU NULL
+#define FCEUMM_OVERSCAN_INFO_0_HU NULL
+#define FCEUMM_OVERSCAN_H_LABEL_HU NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_HU NULL
+#define FCEUMM_OVERSCAN_V_LABEL_HU NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_HU NULL
+#define FCEUMM_PALETTE_LABEL_HU NULL
+#define FCEUMM_PALETTE_INFO_0_HU NULL
+#define OPTION_VAL_DEFAULT_HU NULL
+#define OPTION_VAL_ASQREALC_HU NULL
+#define OPTION_VAL_NINTENDO_VC_HU NULL
+#define OPTION_VAL_RGB_HU NULL
+#define OPTION_VAL_YUV_V3_HU NULL
+#define OPTION_VAL_UNSATURATED_FINAL_HU NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_HU NULL
+#define OPTION_VAL_BMF_FINAL2_HU NULL
+#define OPTION_VAL_BMF_FINAL3_HU NULL
+#define OPTION_VAL_SMOOTH_FBX_HU NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_HU NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_HU NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_HU NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_HU NULL
+#define OPTION_VAL_NESCAP_HU NULL
+#define OPTION_VAL_WAVEBEAM_HU NULL
+#define OPTION_VAL_RAW_HU NULL
+#define OPTION_VAL_CUSTOM_HU NULL
+#define FCEUMM_NTSC_FILTER_LABEL_HU NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_HU NULL
+#define OPTION_VAL_COMPOSITE_HU NULL
+#define OPTION_VAL_SVIDEO_HU NULL
+#define OPTION_VAL_RGB_O9_HU NULL
+#define OPTION_VAL_MONOCHROME_HU NULL
+#define FCEUMM_SNDQUALITY_LABEL_HU NULL
+#define FCEUMM_SNDQUALITY_INFO_0_HU NULL
+#define OPTION_VAL_LOW_HU NULL
+#define OPTION_VAL_HIGH_HU NULL
+#define OPTION_VAL_VERY_HIGH_HU NULL
+#define FCEUMM_SWAPDUTY_LABEL_HU NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_HU NULL
+#define FCEUMM_SWAPDUTY_INFO_0_HU NULL
+#define FCEUMM_SNDVOLUME_LABEL_HU NULL
+#define FCEUMM_SNDVOLUME_INFO_0_HU NULL
+#define OPTION_VAL_0_HU NULL
+#define OPTION_VAL_1_HU NULL
+#define OPTION_VAL_2_HU NULL
+#define OPTION_VAL_3_HU NULL
+#define OPTION_VAL_4_HU NULL
+#define OPTION_VAL_5_HU NULL
+#define OPTION_VAL_6_HU NULL
+#define OPTION_VAL_7_HU NULL
+#define OPTION_VAL_8_HU NULL
+#define OPTION_VAL_9_HU NULL
+#define OPTION_VAL_10_HU NULL
+#define FCEUMM_APU_1_LABEL_HU NULL
+#define FCEUMM_APU_1_LABEL_CAT_HU NULL
+#define FCEUMM_APU_1_INFO_0_HU NULL
+#define FCEUMM_APU_2_LABEL_HU NULL
+#define FCEUMM_APU_2_LABEL_CAT_HU NULL
+#define FCEUMM_APU_2_INFO_0_HU NULL
+#define FCEUMM_APU_3_LABEL_HU NULL
+#define FCEUMM_APU_3_LABEL_CAT_HU NULL
+#define FCEUMM_APU_3_INFO_0_HU NULL
+#define FCEUMM_APU_4_LABEL_HU NULL
+#define FCEUMM_APU_4_LABEL_CAT_HU NULL
+#define FCEUMM_APU_4_INFO_0_HU NULL
+#define FCEUMM_APU_5_LABEL_HU NULL
+#define FCEUMM_APU_5_LABEL_CAT_HU NULL
+#define FCEUMM_APU_5_INFO_0_HU NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_HU NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_HU NULL
+#define OPTION_VAL_NONE_HU NULL
+#define OPTION_VAL_PLAYER_1_HU NULL
+#define OPTION_VAL_PLAYER_2_HU NULL
+#define OPTION_VAL_BOTH_HU NULL
+#define FCEUMM_TURBO_DELAY_LABEL_HU NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_HU NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_HU NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_HU NULL
+#define OPTION_VAL_LIGHTGUN_HU NULL
+#define OPTION_VAL_TOUCHSCREEN_HU NULL
+#define OPTION_VAL_MOUSE_HU NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_HU NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_HU NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_HU NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_HU NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_HU NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_HU NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_HU NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_HU NULL
+#define FCEUMM_OVERCLOCKING_LABEL_HU NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_HU NULL
+#define OPTION_VAL_2X_POSTRENDER_HU NULL
+#define OPTION_VAL_2X_VBLANK_HU NULL
+#define FCEUMM_RAMSTATE_LABEL_HU NULL
+#define FCEUMM_RAMSTATE_INFO_0_HU NULL
+#define OPTION_VAL_FILL_FF_HU NULL
+#define OPTION_VAL_FILL_00_HU NULL
+#define OPTION_VAL_RANDOM_HU NULL
+
+struct retro_core_option_v2_category option_cats_hu[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_HU,
+      CATEGORY_SYSTEM_INFO_0_HU
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_HU,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_HU
+#else
+      CATEGORY_VIDEO_INFO_1_HU
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_HU,
+      CATEGORY_AUDIO_INFO_0_HU
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_HU,
+      CATEGORY_INPUT_INFO_0_HU
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_HU,
+      CATEGORY_HACKS_INFO_0_HU
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_HU,
+      CATEGORY_DIP_SWITCH_INFO_0_HU
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_hu[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_HU,
+      NULL,
+      FCEUMM_REGION_INFO_0_HU,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_HU },
+         { "NTSC",  OPTION_VAL_NTSC_HU },
+         { "PAL",   OPTION_VAL_PAL_HU },
+         { "Dendy", OPTION_VAL_DENDY_HU },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_HU,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_HU,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_HU,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_HU,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_HU,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_HU,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_HU,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_HU,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_HU },
+         { "4:3",     OPTION_VAL_4_3_HU },
+         { "PP",      OPTION_VAL_PP_HU },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_HU,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_HU,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_HU,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_HU,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_HU,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_HU,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_HU,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_HU,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_HU },
+         { "asqrealc",             OPTION_VAL_ASQREALC_HU },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_HU },
+         { "rgb",                  OPTION_VAL_RGB_HU },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_HU },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_HU },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_HU },
+         { "pal",                  OPTION_VAL_PAL_HU },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_HU },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_HU },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_HU },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_HU },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_HU },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_HU },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_HU },
+         { "nescap",               OPTION_VAL_NESCAP_HU },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_HU },
+         { "raw",                  OPTION_VAL_RAW_HU },
+         { "custom",               OPTION_VAL_CUSTOM_HU },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_HU,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_HU,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_HU },
+         { "svideo",     OPTION_VAL_SVIDEO_HU },
+         { "rgb",        OPTION_VAL_RGB_O9_HU },
+         { "monochrome", OPTION_VAL_MONOCHROME_HU },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_HU,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_HU,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_HU },
+         { "High",      OPTION_VAL_HIGH_HU },
+         { "Very High", OPTION_VAL_VERY_HIGH_HU },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_HU,
+      FCEUMM_SWAPDUTY_LABEL_CAT_HU,
+      FCEUMM_SWAPDUTY_INFO_0_HU,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_HU,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_HU,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_HU },
+         { "1",  OPTION_VAL_1_HU },
+         { "2",  OPTION_VAL_2_HU },
+         { "3",  OPTION_VAL_3_HU },
+         { "4",  OPTION_VAL_4_HU },
+         { "5",  OPTION_VAL_5_HU },
+         { "6",  OPTION_VAL_6_HU },
+         { "7",  OPTION_VAL_7_HU },
+         { "8",  OPTION_VAL_8_HU },
+         { "9",  OPTION_VAL_9_HU },
+         { "10", OPTION_VAL_10_HU },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_HU,
+      FCEUMM_APU_1_LABEL_CAT_HU,
+      FCEUMM_APU_1_INFO_0_HU,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_HU,
+      FCEUMM_APU_2_LABEL_CAT_HU,
+      FCEUMM_APU_2_INFO_0_HU,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_HU,
+      FCEUMM_APU_3_LABEL_CAT_HU,
+      FCEUMM_APU_3_INFO_0_HU,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_HU,
+      FCEUMM_APU_4_LABEL_CAT_HU,
+      FCEUMM_APU_4_INFO_0_HU,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_HU,
+      FCEUMM_APU_5_LABEL_CAT_HU,
+      FCEUMM_APU_5_INFO_0_HU,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_HU,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_HU,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_HU },
+         { "Player 1", OPTION_VAL_PLAYER_1_HU },
+         { "Player 2", OPTION_VAL_PLAYER_2_HU },
+         { "Both",     OPTION_VAL_BOTH_HU },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_HU,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_HU,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_HU,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_HU,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_HU },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_HU },
+         { "mouse",       OPTION_VAL_MOUSE_HU },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_HU,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_HU,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_HU,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_HU,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_HU,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_HU,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_HU,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_HU,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_HU,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_HU,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_HU },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_HU },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_HU,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_HU,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_HU },
+         { "fill $00", OPTION_VAL_FILL_00_HU },
+         { "random",   OPTION_VAL_RANDOM_HU },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_hu = {
+   option_cats_hu,
+   option_defs_hu
+};
+
+/* RETRO_LANGUAGE_ID */
+
+#define CATEGORY_SYSTEM_LABEL_ID NULL
+#define CATEGORY_SYSTEM_INFO_0_ID NULL
+#define CATEGORY_VIDEO_LABEL_ID NULL
+#define CATEGORY_VIDEO_INFO_0_ID NULL
+#define CATEGORY_VIDEO_INFO_1_ID NULL
+#define CATEGORY_AUDIO_LABEL_ID "Suara"
+#define CATEGORY_AUDIO_INFO_0_ID NULL
+#define CATEGORY_INPUT_LABEL_ID "Masukan"
+#define CATEGORY_INPUT_INFO_0_ID NULL
+#define CATEGORY_HACKS_LABEL_ID NULL
+#define CATEGORY_HACKS_INFO_0_ID NULL
+#define CATEGORY_DIP_SWITCH_LABEL_ID NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_ID NULL
+#define FCEUMM_REGION_LABEL_ID NULL
+#define FCEUMM_REGION_INFO_0_ID NULL
+#define OPTION_VAL_AUTO_ID NULL
+#define OPTION_VAL_NTSC_ID NULL
+#define OPTION_VAL_PAL_ID NULL
+#define OPTION_VAL_DENDY_ID NULL
+#define FCEUMM_GAME_GENIE_LABEL_ID NULL
+#define FCEUMM_GAME_GENIE_INFO_0_ID NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_ID NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_ID NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_ID NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_ID NULL
+#define FCEUMM_ASPECT_LABEL_ID NULL
+#define FCEUMM_ASPECT_INFO_0_ID NULL
+#define OPTION_VAL_8_7_PAR_ID NULL
+#define OPTION_VAL_4_3_ID NULL
+#define OPTION_VAL_PP_ID NULL
+#define FCEUMM_OVERSCAN_LABEL_ID NULL
+#define FCEUMM_OVERSCAN_INFO_0_ID NULL
+#define FCEUMM_OVERSCAN_H_LABEL_ID NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_ID NULL
+#define FCEUMM_OVERSCAN_V_LABEL_ID NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_ID NULL
+#define FCEUMM_PALETTE_LABEL_ID NULL
+#define FCEUMM_PALETTE_INFO_0_ID NULL
+#define OPTION_VAL_DEFAULT_ID NULL
+#define OPTION_VAL_ASQREALC_ID NULL
+#define OPTION_VAL_NINTENDO_VC_ID NULL
+#define OPTION_VAL_RGB_ID NULL
+#define OPTION_VAL_YUV_V3_ID NULL
+#define OPTION_VAL_UNSATURATED_FINAL_ID NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_ID NULL
+#define OPTION_VAL_BMF_FINAL2_ID NULL
+#define OPTION_VAL_BMF_FINAL3_ID NULL
+#define OPTION_VAL_SMOOTH_FBX_ID NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_ID NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_ID NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_ID NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_ID NULL
+#define OPTION_VAL_NESCAP_ID NULL
+#define OPTION_VAL_WAVEBEAM_ID NULL
+#define OPTION_VAL_RAW_ID NULL
+#define OPTION_VAL_CUSTOM_ID NULL
+#define FCEUMM_NTSC_FILTER_LABEL_ID NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_ID NULL
+#define OPTION_VAL_COMPOSITE_ID NULL
+#define OPTION_VAL_SVIDEO_ID NULL
+#define OPTION_VAL_RGB_O9_ID NULL
+#define OPTION_VAL_MONOCHROME_ID NULL
+#define FCEUMM_SNDQUALITY_LABEL_ID NULL
+#define FCEUMM_SNDQUALITY_INFO_0_ID NULL
+#define OPTION_VAL_LOW_ID NULL
+#define OPTION_VAL_HIGH_ID NULL
+#define OPTION_VAL_VERY_HIGH_ID NULL
+#define FCEUMM_SWAPDUTY_LABEL_ID NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_ID NULL
+#define FCEUMM_SWAPDUTY_INFO_0_ID NULL
+#define FCEUMM_SNDVOLUME_LABEL_ID NULL
+#define FCEUMM_SNDVOLUME_INFO_0_ID NULL
+#define OPTION_VAL_0_ID NULL
+#define OPTION_VAL_1_ID NULL
+#define OPTION_VAL_2_ID NULL
+#define OPTION_VAL_3_ID NULL
+#define OPTION_VAL_4_ID NULL
+#define OPTION_VAL_5_ID NULL
+#define OPTION_VAL_6_ID NULL
+#define OPTION_VAL_7_ID NULL
+#define OPTION_VAL_8_ID NULL
+#define OPTION_VAL_9_ID NULL
+#define OPTION_VAL_10_ID NULL
+#define FCEUMM_APU_1_LABEL_ID NULL
+#define FCEUMM_APU_1_LABEL_CAT_ID NULL
+#define FCEUMM_APU_1_INFO_0_ID NULL
+#define FCEUMM_APU_2_LABEL_ID NULL
+#define FCEUMM_APU_2_LABEL_CAT_ID NULL
+#define FCEUMM_APU_2_INFO_0_ID NULL
+#define FCEUMM_APU_3_LABEL_ID NULL
+#define FCEUMM_APU_3_LABEL_CAT_ID NULL
+#define FCEUMM_APU_3_INFO_0_ID NULL
+#define FCEUMM_APU_4_LABEL_ID NULL
+#define FCEUMM_APU_4_LABEL_CAT_ID NULL
+#define FCEUMM_APU_4_INFO_0_ID NULL
+#define FCEUMM_APU_5_LABEL_ID NULL
+#define FCEUMM_APU_5_LABEL_CAT_ID NULL
+#define FCEUMM_APU_5_INFO_0_ID NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_ID NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_ID NULL
+#define OPTION_VAL_NONE_ID NULL
+#define OPTION_VAL_PLAYER_1_ID NULL
+#define OPTION_VAL_PLAYER_2_ID NULL
+#define OPTION_VAL_BOTH_ID NULL
+#define FCEUMM_TURBO_DELAY_LABEL_ID NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_ID NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_ID NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_ID NULL
+#define OPTION_VAL_LIGHTGUN_ID NULL
+#define OPTION_VAL_TOUCHSCREEN_ID NULL
+#define OPTION_VAL_MOUSE_ID NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_ID NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_ID NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_ID NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_ID NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_ID NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_ID NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_ID NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_ID NULL
+#define FCEUMM_OVERCLOCKING_LABEL_ID NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_ID NULL
+#define OPTION_VAL_2X_POSTRENDER_ID NULL
+#define OPTION_VAL_2X_VBLANK_ID NULL
+#define FCEUMM_RAMSTATE_LABEL_ID NULL
+#define FCEUMM_RAMSTATE_INFO_0_ID NULL
+#define OPTION_VAL_FILL_FF_ID NULL
+#define OPTION_VAL_FILL_00_ID NULL
+#define OPTION_VAL_RANDOM_ID NULL
+
+struct retro_core_option_v2_category option_cats_id[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_ID,
+      CATEGORY_SYSTEM_INFO_0_ID
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_ID,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_ID
+#else
+      CATEGORY_VIDEO_INFO_1_ID
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_ID,
+      CATEGORY_AUDIO_INFO_0_ID
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_ID,
+      CATEGORY_INPUT_INFO_0_ID
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_ID,
+      CATEGORY_HACKS_INFO_0_ID
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_ID,
+      CATEGORY_DIP_SWITCH_INFO_0_ID
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_id[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_ID,
+      NULL,
+      FCEUMM_REGION_INFO_0_ID,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_ID },
+         { "NTSC",  OPTION_VAL_NTSC_ID },
+         { "PAL",   OPTION_VAL_PAL_ID },
+         { "Dendy", OPTION_VAL_DENDY_ID },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_ID,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_ID,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_ID,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_ID,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_ID,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_ID,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_ID,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_ID,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_ID },
+         { "4:3",     OPTION_VAL_4_3_ID },
+         { "PP",      OPTION_VAL_PP_ID },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_ID,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_ID,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_ID,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_ID,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_ID,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_ID,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_ID,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_ID,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_ID },
+         { "asqrealc",             OPTION_VAL_ASQREALC_ID },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_ID },
+         { "rgb",                  OPTION_VAL_RGB_ID },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_ID },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_ID },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_ID },
+         { "pal",                  OPTION_VAL_PAL_ID },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_ID },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_ID },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_ID },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_ID },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_ID },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_ID },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_ID },
+         { "nescap",               OPTION_VAL_NESCAP_ID },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_ID },
+         { "raw",                  OPTION_VAL_RAW_ID },
+         { "custom",               OPTION_VAL_CUSTOM_ID },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_ID,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_ID,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_ID },
+         { "svideo",     OPTION_VAL_SVIDEO_ID },
+         { "rgb",        OPTION_VAL_RGB_O9_ID },
+         { "monochrome", OPTION_VAL_MONOCHROME_ID },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_ID,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_ID,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_ID },
+         { "High",      OPTION_VAL_HIGH_ID },
+         { "Very High", OPTION_VAL_VERY_HIGH_ID },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_ID,
+      FCEUMM_SWAPDUTY_LABEL_CAT_ID,
+      FCEUMM_SWAPDUTY_INFO_0_ID,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_ID,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_ID,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_ID },
+         { "1",  OPTION_VAL_1_ID },
+         { "2",  OPTION_VAL_2_ID },
+         { "3",  OPTION_VAL_3_ID },
+         { "4",  OPTION_VAL_4_ID },
+         { "5",  OPTION_VAL_5_ID },
+         { "6",  OPTION_VAL_6_ID },
+         { "7",  OPTION_VAL_7_ID },
+         { "8",  OPTION_VAL_8_ID },
+         { "9",  OPTION_VAL_9_ID },
+         { "10", OPTION_VAL_10_ID },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_ID,
+      FCEUMM_APU_1_LABEL_CAT_ID,
+      FCEUMM_APU_1_INFO_0_ID,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_ID,
+      FCEUMM_APU_2_LABEL_CAT_ID,
+      FCEUMM_APU_2_INFO_0_ID,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_ID,
+      FCEUMM_APU_3_LABEL_CAT_ID,
+      FCEUMM_APU_3_INFO_0_ID,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_ID,
+      FCEUMM_APU_4_LABEL_CAT_ID,
+      FCEUMM_APU_4_INFO_0_ID,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_ID,
+      FCEUMM_APU_5_LABEL_CAT_ID,
+      FCEUMM_APU_5_INFO_0_ID,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_ID,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_ID,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_ID },
+         { "Player 1", OPTION_VAL_PLAYER_1_ID },
+         { "Player 2", OPTION_VAL_PLAYER_2_ID },
+         { "Both",     OPTION_VAL_BOTH_ID },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_ID,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_ID,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_ID,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_ID,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_ID },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_ID },
+         { "mouse",       OPTION_VAL_MOUSE_ID },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_ID,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_ID,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_ID,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_ID,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_ID,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_ID,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_ID,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_ID,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_ID,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_ID,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_ID },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_ID },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_ID,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_ID,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_ID },
+         { "fill $00", OPTION_VAL_FILL_00_ID },
+         { "random",   OPTION_VAL_RANDOM_ID },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_id = {
+   option_cats_id,
+   option_defs_id
+};
+
+/* RETRO_LANGUAGE_IT */
+
+#define CATEGORY_SYSTEM_LABEL_IT "Sistema"
+#define CATEGORY_SYSTEM_INFO_0_IT "Configurare la regione e i parametri dell'hardware d'espanzione."
+#define CATEGORY_VIDEO_LABEL_IT NULL
+#define CATEGORY_VIDEO_INFO_0_IT "Configurare le proporzioni, visualizzare il ritaglio, la tavolozza dei colori, le opzioni del filtro video."
+#define CATEGORY_VIDEO_INFO_1_IT "Configurare le proporzioni, visualizzare il ritaglio, le opzioni della tavolozza colori."
+#define CATEGORY_AUDIO_LABEL_IT NULL
+#define CATEGORY_AUDIO_INFO_0_IT "Configura la qualità sonora, il volume, le impostazioni di abilitazione del canale."
+#define CATEGORY_INPUT_LABEL_IT NULL
+#define CATEGORY_INPUT_INFO_0_IT "Configura i parametri turbo e pistola ottica."
+#define CATEGORY_HACKS_LABEL_IT "Hack di Emulazione"
+#define CATEGORY_HACKS_INFO_0_IT "Configura i parametri di precisione di overclocking e emulazione del processore che influenzano prestazioni e compatibilità di basso livello."
+#define CATEGORY_DIP_SWITCH_LABEL_IT "Interruttori DIP"
+#define CATEGORY_DIP_SWITCH_INFO_0_IT "Configura le impostazioni di gioco arcade."
+#define FCEUMM_REGION_LABEL_IT NULL
+#define FCEUMM_REGION_INFO_0_IT NULL
+#define OPTION_VAL_AUTO_IT NULL
+#define OPTION_VAL_NTSC_IT NULL
+#define OPTION_VAL_PAL_IT NULL
+#define OPTION_VAL_DENDY_IT NULL
+#define FCEUMM_GAME_GENIE_LABEL_IT NULL
+#define FCEUMM_GAME_GENIE_INFO_0_IT NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_IT NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_IT NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_IT NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_IT NULL
+#define FCEUMM_ASPECT_LABEL_IT NULL
+#define FCEUMM_ASPECT_INFO_0_IT NULL
+#define OPTION_VAL_8_7_PAR_IT NULL
+#define OPTION_VAL_4_3_IT NULL
+#define OPTION_VAL_PP_IT NULL
+#define FCEUMM_OVERSCAN_LABEL_IT NULL
+#define FCEUMM_OVERSCAN_INFO_0_IT NULL
+#define FCEUMM_OVERSCAN_H_LABEL_IT NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_IT NULL
+#define FCEUMM_OVERSCAN_V_LABEL_IT NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_IT NULL
+#define FCEUMM_PALETTE_LABEL_IT NULL
+#define FCEUMM_PALETTE_INFO_0_IT NULL
+#define OPTION_VAL_DEFAULT_IT NULL
+#define OPTION_VAL_ASQREALC_IT NULL
+#define OPTION_VAL_NINTENDO_VC_IT NULL
+#define OPTION_VAL_RGB_IT NULL
+#define OPTION_VAL_YUV_V3_IT NULL
+#define OPTION_VAL_UNSATURATED_FINAL_IT NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_IT NULL
+#define OPTION_VAL_BMF_FINAL2_IT NULL
+#define OPTION_VAL_BMF_FINAL3_IT NULL
+#define OPTION_VAL_SMOOTH_FBX_IT NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_IT NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_IT NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_IT NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_IT NULL
+#define OPTION_VAL_NESCAP_IT NULL
+#define OPTION_VAL_WAVEBEAM_IT NULL
+#define OPTION_VAL_RAW_IT NULL
+#define OPTION_VAL_CUSTOM_IT NULL
+#define FCEUMM_NTSC_FILTER_LABEL_IT NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_IT NULL
+#define OPTION_VAL_COMPOSITE_IT NULL
+#define OPTION_VAL_SVIDEO_IT NULL
+#define OPTION_VAL_RGB_O9_IT NULL
+#define OPTION_VAL_MONOCHROME_IT NULL
+#define FCEUMM_SNDQUALITY_LABEL_IT NULL
+#define FCEUMM_SNDQUALITY_INFO_0_IT NULL
+#define OPTION_VAL_LOW_IT NULL
+#define OPTION_VAL_HIGH_IT NULL
+#define OPTION_VAL_VERY_HIGH_IT NULL
+#define FCEUMM_SWAPDUTY_LABEL_IT NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_IT NULL
+#define FCEUMM_SWAPDUTY_INFO_0_IT NULL
+#define FCEUMM_SNDVOLUME_LABEL_IT NULL
+#define FCEUMM_SNDVOLUME_INFO_0_IT NULL
+#define OPTION_VAL_0_IT NULL
+#define OPTION_VAL_1_IT NULL
+#define OPTION_VAL_2_IT NULL
+#define OPTION_VAL_3_IT NULL
+#define OPTION_VAL_4_IT NULL
+#define OPTION_VAL_5_IT NULL
+#define OPTION_VAL_6_IT NULL
+#define OPTION_VAL_7_IT NULL
+#define OPTION_VAL_8_IT NULL
+#define OPTION_VAL_9_IT NULL
+#define OPTION_VAL_10_IT NULL
+#define FCEUMM_APU_1_LABEL_IT NULL
+#define FCEUMM_APU_1_LABEL_CAT_IT NULL
+#define FCEUMM_APU_1_INFO_0_IT NULL
+#define FCEUMM_APU_2_LABEL_IT NULL
+#define FCEUMM_APU_2_LABEL_CAT_IT NULL
+#define FCEUMM_APU_2_INFO_0_IT NULL
+#define FCEUMM_APU_3_LABEL_IT NULL
+#define FCEUMM_APU_3_LABEL_CAT_IT NULL
+#define FCEUMM_APU_3_INFO_0_IT NULL
+#define FCEUMM_APU_4_LABEL_IT NULL
+#define FCEUMM_APU_4_LABEL_CAT_IT NULL
+#define FCEUMM_APU_4_INFO_0_IT NULL
+#define FCEUMM_APU_5_LABEL_IT NULL
+#define FCEUMM_APU_5_LABEL_CAT_IT NULL
+#define FCEUMM_APU_5_INFO_0_IT NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_IT NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_IT NULL
+#define OPTION_VAL_NONE_IT NULL
+#define OPTION_VAL_PLAYER_1_IT NULL
+#define OPTION_VAL_PLAYER_2_IT NULL
+#define OPTION_VAL_BOTH_IT NULL
+#define FCEUMM_TURBO_DELAY_LABEL_IT NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_IT NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_IT NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_IT NULL
+#define OPTION_VAL_LIGHTGUN_IT NULL
+#define OPTION_VAL_TOUCHSCREEN_IT NULL
+#define OPTION_VAL_MOUSE_IT NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_IT NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_IT NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_IT NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_IT NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_IT NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_IT NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_IT NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_IT NULL
+#define FCEUMM_OVERCLOCKING_LABEL_IT NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_IT NULL
+#define OPTION_VAL_2X_POSTRENDER_IT NULL
+#define OPTION_VAL_2X_VBLANK_IT NULL
+#define FCEUMM_RAMSTATE_LABEL_IT NULL
+#define FCEUMM_RAMSTATE_INFO_0_IT NULL
+#define OPTION_VAL_FILL_FF_IT NULL
+#define OPTION_VAL_FILL_00_IT NULL
+#define OPTION_VAL_RANDOM_IT NULL
+
+struct retro_core_option_v2_category option_cats_it[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_IT,
+      CATEGORY_SYSTEM_INFO_0_IT
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_IT,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_IT
+#else
+      CATEGORY_VIDEO_INFO_1_IT
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_IT,
+      CATEGORY_AUDIO_INFO_0_IT
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_IT,
+      CATEGORY_INPUT_INFO_0_IT
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_IT,
+      CATEGORY_HACKS_INFO_0_IT
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_IT,
+      CATEGORY_DIP_SWITCH_INFO_0_IT
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_it[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_IT,
+      NULL,
+      FCEUMM_REGION_INFO_0_IT,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_IT },
+         { "NTSC",  OPTION_VAL_NTSC_IT },
+         { "PAL",   OPTION_VAL_PAL_IT },
+         { "Dendy", OPTION_VAL_DENDY_IT },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_IT,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_IT,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_IT,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_IT,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_IT,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_IT,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_IT,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_IT,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_IT },
+         { "4:3",     OPTION_VAL_4_3_IT },
+         { "PP",      OPTION_VAL_PP_IT },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_IT,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_IT,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_IT,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_IT,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_IT,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_IT,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_IT,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_IT,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_IT },
+         { "asqrealc",             OPTION_VAL_ASQREALC_IT },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_IT },
+         { "rgb",                  OPTION_VAL_RGB_IT },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_IT },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_IT },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_IT },
+         { "pal",                  OPTION_VAL_PAL_IT },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_IT },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_IT },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_IT },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_IT },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_IT },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_IT },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_IT },
+         { "nescap",               OPTION_VAL_NESCAP_IT },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_IT },
+         { "raw",                  OPTION_VAL_RAW_IT },
+         { "custom",               OPTION_VAL_CUSTOM_IT },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_IT,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_IT,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_IT },
+         { "svideo",     OPTION_VAL_SVIDEO_IT },
+         { "rgb",        OPTION_VAL_RGB_O9_IT },
+         { "monochrome", OPTION_VAL_MONOCHROME_IT },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_IT,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_IT,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_IT },
+         { "High",      OPTION_VAL_HIGH_IT },
+         { "Very High", OPTION_VAL_VERY_HIGH_IT },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_IT,
+      FCEUMM_SWAPDUTY_LABEL_CAT_IT,
+      FCEUMM_SWAPDUTY_INFO_0_IT,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_IT,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_IT,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_IT },
+         { "1",  OPTION_VAL_1_IT },
+         { "2",  OPTION_VAL_2_IT },
+         { "3",  OPTION_VAL_3_IT },
+         { "4",  OPTION_VAL_4_IT },
+         { "5",  OPTION_VAL_5_IT },
+         { "6",  OPTION_VAL_6_IT },
+         { "7",  OPTION_VAL_7_IT },
+         { "8",  OPTION_VAL_8_IT },
+         { "9",  OPTION_VAL_9_IT },
+         { "10", OPTION_VAL_10_IT },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_IT,
+      FCEUMM_APU_1_LABEL_CAT_IT,
+      FCEUMM_APU_1_INFO_0_IT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_IT,
+      FCEUMM_APU_2_LABEL_CAT_IT,
+      FCEUMM_APU_2_INFO_0_IT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_IT,
+      FCEUMM_APU_3_LABEL_CAT_IT,
+      FCEUMM_APU_3_INFO_0_IT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_IT,
+      FCEUMM_APU_4_LABEL_CAT_IT,
+      FCEUMM_APU_4_INFO_0_IT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_IT,
+      FCEUMM_APU_5_LABEL_CAT_IT,
+      FCEUMM_APU_5_INFO_0_IT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_IT,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_IT,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_IT },
+         { "Player 1", OPTION_VAL_PLAYER_1_IT },
+         { "Player 2", OPTION_VAL_PLAYER_2_IT },
+         { "Both",     OPTION_VAL_BOTH_IT },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_IT,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_IT,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_IT,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_IT,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_IT },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_IT },
+         { "mouse",       OPTION_VAL_MOUSE_IT },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_IT,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_IT,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_IT,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_IT,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_IT,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_IT,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_IT,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_IT,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_IT,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_IT,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_IT },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_IT },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_IT,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_IT,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_IT },
+         { "fill $00", OPTION_VAL_FILL_00_IT },
+         { "random",   OPTION_VAL_RANDOM_IT },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_it = {
+   option_cats_it,
+   option_defs_it
+};
+
+/* RETRO_LANGUAGE_JA */
+
+#define CATEGORY_SYSTEM_LABEL_JA "システム"
+#define CATEGORY_SYSTEM_INFO_0_JA NULL
+#define CATEGORY_VIDEO_LABEL_JA "ビデオのドライバ"
+#define CATEGORY_VIDEO_INFO_0_JA NULL
+#define CATEGORY_VIDEO_INFO_1_JA NULL
+#define CATEGORY_AUDIO_LABEL_JA "オーディオのドライバ"
+#define CATEGORY_AUDIO_INFO_0_JA NULL
+#define CATEGORY_INPUT_LABEL_JA "入力"
+#define CATEGORY_INPUT_INFO_0_JA NULL
+#define CATEGORY_HACKS_LABEL_JA NULL
+#define CATEGORY_HACKS_INFO_0_JA NULL
+#define CATEGORY_DIP_SWITCH_LABEL_JA NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_JA NULL
+#define FCEUMM_REGION_LABEL_JA NULL
+#define FCEUMM_REGION_INFO_0_JA NULL
+#define OPTION_VAL_AUTO_JA NULL
+#define OPTION_VAL_NTSC_JA NULL
+#define OPTION_VAL_PAL_JA NULL
+#define OPTION_VAL_DENDY_JA NULL
+#define FCEUMM_GAME_GENIE_LABEL_JA NULL
+#define FCEUMM_GAME_GENIE_INFO_0_JA NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_JA NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_JA NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_JA NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_JA NULL
+#define FCEUMM_ASPECT_LABEL_JA NULL
+#define FCEUMM_ASPECT_INFO_0_JA NULL
+#define OPTION_VAL_8_7_PAR_JA NULL
+#define OPTION_VAL_4_3_JA NULL
+#define OPTION_VAL_PP_JA NULL
+#define FCEUMM_OVERSCAN_LABEL_JA NULL
+#define FCEUMM_OVERSCAN_INFO_0_JA NULL
+#define FCEUMM_OVERSCAN_H_LABEL_JA NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_JA NULL
+#define FCEUMM_OVERSCAN_V_LABEL_JA NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_JA NULL
+#define FCEUMM_PALETTE_LABEL_JA NULL
+#define FCEUMM_PALETTE_INFO_0_JA NULL
+#define OPTION_VAL_DEFAULT_JA NULL
+#define OPTION_VAL_ASQREALC_JA NULL
+#define OPTION_VAL_NINTENDO_VC_JA NULL
+#define OPTION_VAL_RGB_JA NULL
+#define OPTION_VAL_YUV_V3_JA NULL
+#define OPTION_VAL_UNSATURATED_FINAL_JA NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_JA NULL
+#define OPTION_VAL_BMF_FINAL2_JA NULL
+#define OPTION_VAL_BMF_FINAL3_JA NULL
+#define OPTION_VAL_SMOOTH_FBX_JA NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_JA NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_JA NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_JA NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_JA NULL
+#define OPTION_VAL_NESCAP_JA NULL
+#define OPTION_VAL_WAVEBEAM_JA NULL
+#define OPTION_VAL_RAW_JA NULL
+#define OPTION_VAL_CUSTOM_JA NULL
+#define FCEUMM_NTSC_FILTER_LABEL_JA NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_JA NULL
+#define OPTION_VAL_COMPOSITE_JA NULL
+#define OPTION_VAL_SVIDEO_JA NULL
+#define OPTION_VAL_RGB_O9_JA NULL
+#define OPTION_VAL_MONOCHROME_JA NULL
+#define FCEUMM_SNDQUALITY_LABEL_JA NULL
+#define FCEUMM_SNDQUALITY_INFO_0_JA NULL
+#define OPTION_VAL_LOW_JA NULL
+#define OPTION_VAL_HIGH_JA NULL
+#define OPTION_VAL_VERY_HIGH_JA NULL
+#define FCEUMM_SWAPDUTY_LABEL_JA NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_JA NULL
+#define FCEUMM_SWAPDUTY_INFO_0_JA NULL
+#define FCEUMM_SNDVOLUME_LABEL_JA NULL
+#define FCEUMM_SNDVOLUME_INFO_0_JA NULL
+#define OPTION_VAL_0_JA NULL
+#define OPTION_VAL_1_JA NULL
+#define OPTION_VAL_2_JA NULL
+#define OPTION_VAL_3_JA NULL
+#define OPTION_VAL_4_JA NULL
+#define OPTION_VAL_5_JA NULL
+#define OPTION_VAL_6_JA NULL
+#define OPTION_VAL_7_JA NULL
+#define OPTION_VAL_8_JA NULL
+#define OPTION_VAL_9_JA NULL
+#define OPTION_VAL_10_JA NULL
+#define FCEUMM_APU_1_LABEL_JA NULL
+#define FCEUMM_APU_1_LABEL_CAT_JA NULL
+#define FCEUMM_APU_1_INFO_0_JA NULL
+#define FCEUMM_APU_2_LABEL_JA NULL
+#define FCEUMM_APU_2_LABEL_CAT_JA NULL
+#define FCEUMM_APU_2_INFO_0_JA NULL
+#define FCEUMM_APU_3_LABEL_JA NULL
+#define FCEUMM_APU_3_LABEL_CAT_JA NULL
+#define FCEUMM_APU_3_INFO_0_JA NULL
+#define FCEUMM_APU_4_LABEL_JA NULL
+#define FCEUMM_APU_4_LABEL_CAT_JA NULL
+#define FCEUMM_APU_4_INFO_0_JA NULL
+#define FCEUMM_APU_5_LABEL_JA NULL
+#define FCEUMM_APU_5_LABEL_CAT_JA NULL
+#define FCEUMM_APU_5_INFO_0_JA NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_JA NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_JA NULL
+#define OPTION_VAL_NONE_JA NULL
+#define OPTION_VAL_PLAYER_1_JA NULL
+#define OPTION_VAL_PLAYER_2_JA NULL
+#define OPTION_VAL_BOTH_JA NULL
+#define FCEUMM_TURBO_DELAY_LABEL_JA NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_JA NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_JA NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_JA NULL
+#define OPTION_VAL_LIGHTGUN_JA NULL
+#define OPTION_VAL_TOUCHSCREEN_JA NULL
+#define OPTION_VAL_MOUSE_JA NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_JA NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_JA NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_JA NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_JA NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_JA NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_JA NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_JA NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_JA NULL
+#define FCEUMM_OVERCLOCKING_LABEL_JA NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_JA NULL
+#define OPTION_VAL_2X_POSTRENDER_JA NULL
+#define OPTION_VAL_2X_VBLANK_JA NULL
+#define FCEUMM_RAMSTATE_LABEL_JA NULL
+#define FCEUMM_RAMSTATE_INFO_0_JA NULL
+#define OPTION_VAL_FILL_FF_JA NULL
+#define OPTION_VAL_FILL_00_JA NULL
+#define OPTION_VAL_RANDOM_JA NULL
+
+struct retro_core_option_v2_category option_cats_ja[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_JA,
+      CATEGORY_SYSTEM_INFO_0_JA
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_JA,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_JA
+#else
+      CATEGORY_VIDEO_INFO_1_JA
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_JA,
+      CATEGORY_AUDIO_INFO_0_JA
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_JA,
+      CATEGORY_INPUT_INFO_0_JA
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_JA,
+      CATEGORY_HACKS_INFO_0_JA
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_JA,
+      CATEGORY_DIP_SWITCH_INFO_0_JA
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_ja[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_JA,
+      NULL,
+      FCEUMM_REGION_INFO_0_JA,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_JA },
+         { "NTSC",  OPTION_VAL_NTSC_JA },
+         { "PAL",   OPTION_VAL_PAL_JA },
+         { "Dendy", OPTION_VAL_DENDY_JA },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_JA,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_JA,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_JA,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_JA,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_JA,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_JA,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_JA,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_JA,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_JA },
+         { "4:3",     OPTION_VAL_4_3_JA },
+         { "PP",      OPTION_VAL_PP_JA },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_JA,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_JA,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_JA,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_JA,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_JA,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_JA,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_JA,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_JA,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_JA },
+         { "asqrealc",             OPTION_VAL_ASQREALC_JA },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_JA },
+         { "rgb",                  OPTION_VAL_RGB_JA },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_JA },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_JA },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_JA },
+         { "pal",                  OPTION_VAL_PAL_JA },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_JA },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_JA },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_JA },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_JA },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_JA },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_JA },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_JA },
+         { "nescap",               OPTION_VAL_NESCAP_JA },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_JA },
+         { "raw",                  OPTION_VAL_RAW_JA },
+         { "custom",               OPTION_VAL_CUSTOM_JA },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_JA,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_JA,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_JA },
+         { "svideo",     OPTION_VAL_SVIDEO_JA },
+         { "rgb",        OPTION_VAL_RGB_O9_JA },
+         { "monochrome", OPTION_VAL_MONOCHROME_JA },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_JA,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_JA,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_JA },
+         { "High",      OPTION_VAL_HIGH_JA },
+         { "Very High", OPTION_VAL_VERY_HIGH_JA },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_JA,
+      FCEUMM_SWAPDUTY_LABEL_CAT_JA,
+      FCEUMM_SWAPDUTY_INFO_0_JA,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_JA,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_JA,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_JA },
+         { "1",  OPTION_VAL_1_JA },
+         { "2",  OPTION_VAL_2_JA },
+         { "3",  OPTION_VAL_3_JA },
+         { "4",  OPTION_VAL_4_JA },
+         { "5",  OPTION_VAL_5_JA },
+         { "6",  OPTION_VAL_6_JA },
+         { "7",  OPTION_VAL_7_JA },
+         { "8",  OPTION_VAL_8_JA },
+         { "9",  OPTION_VAL_9_JA },
+         { "10", OPTION_VAL_10_JA },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_JA,
+      FCEUMM_APU_1_LABEL_CAT_JA,
+      FCEUMM_APU_1_INFO_0_JA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_JA,
+      FCEUMM_APU_2_LABEL_CAT_JA,
+      FCEUMM_APU_2_INFO_0_JA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_JA,
+      FCEUMM_APU_3_LABEL_CAT_JA,
+      FCEUMM_APU_3_INFO_0_JA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_JA,
+      FCEUMM_APU_4_LABEL_CAT_JA,
+      FCEUMM_APU_4_INFO_0_JA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_JA,
+      FCEUMM_APU_5_LABEL_CAT_JA,
+      FCEUMM_APU_5_INFO_0_JA,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_JA,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_JA,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_JA },
+         { "Player 1", OPTION_VAL_PLAYER_1_JA },
+         { "Player 2", OPTION_VAL_PLAYER_2_JA },
+         { "Both",     OPTION_VAL_BOTH_JA },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_JA,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_JA,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_JA,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_JA,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_JA },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_JA },
+         { "mouse",       OPTION_VAL_MOUSE_JA },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_JA,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_JA,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_JA,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_JA,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_JA,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_JA,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_JA,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_JA,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_JA,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_JA,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_JA },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_JA },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_JA,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_JA,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_JA },
+         { "fill $00", OPTION_VAL_FILL_00_JA },
+         { "random",   OPTION_VAL_RANDOM_JA },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_ja = {
+   option_cats_ja,
+   option_defs_ja
+};
+
+/* RETRO_LANGUAGE_KO */
+
+#define CATEGORY_SYSTEM_LABEL_KO "시스템"
+#define CATEGORY_SYSTEM_INFO_0_KO NULL
+#define CATEGORY_VIDEO_LABEL_KO "비디오"
+#define CATEGORY_VIDEO_INFO_0_KO NULL
+#define CATEGORY_VIDEO_INFO_1_KO NULL
+#define CATEGORY_AUDIO_LABEL_KO "오디오"
+#define CATEGORY_AUDIO_INFO_0_KO NULL
+#define CATEGORY_INPUT_LABEL_KO "입력"
+#define CATEGORY_INPUT_INFO_0_KO NULL
+#define CATEGORY_HACKS_LABEL_KO "에뮬레이션 핵"
+#define CATEGORY_HACKS_INFO_0_KO "성능과 호환성에 영향을 끼치는 프로세서 오버클러킹 및 에뮬레이션 정확도 옵션 등을 설정합니다."
+#define CATEGORY_DIP_SWITCH_LABEL_KO NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_KO NULL
+#define FCEUMM_REGION_LABEL_KO NULL
+#define FCEUMM_REGION_INFO_0_KO NULL
+#define OPTION_VAL_AUTO_KO NULL
+#define OPTION_VAL_NTSC_KO NULL
+#define OPTION_VAL_PAL_KO NULL
+#define OPTION_VAL_DENDY_KO NULL
+#define FCEUMM_GAME_GENIE_LABEL_KO NULL
+#define FCEUMM_GAME_GENIE_INFO_0_KO NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_KO NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_KO NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_KO NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_KO NULL
+#define FCEUMM_ASPECT_LABEL_KO NULL
+#define FCEUMM_ASPECT_INFO_0_KO NULL
+#define OPTION_VAL_8_7_PAR_KO NULL
+#define OPTION_VAL_4_3_KO NULL
+#define OPTION_VAL_PP_KO NULL
+#define FCEUMM_OVERSCAN_LABEL_KO NULL
+#define FCEUMM_OVERSCAN_INFO_0_KO NULL
+#define FCEUMM_OVERSCAN_H_LABEL_KO NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_KO NULL
+#define FCEUMM_OVERSCAN_V_LABEL_KO NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_KO NULL
+#define FCEUMM_PALETTE_LABEL_KO NULL
+#define FCEUMM_PALETTE_INFO_0_KO NULL
+#define OPTION_VAL_DEFAULT_KO NULL
+#define OPTION_VAL_ASQREALC_KO NULL
+#define OPTION_VAL_NINTENDO_VC_KO NULL
+#define OPTION_VAL_RGB_KO NULL
+#define OPTION_VAL_YUV_V3_KO NULL
+#define OPTION_VAL_UNSATURATED_FINAL_KO NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_KO NULL
+#define OPTION_VAL_BMF_FINAL2_KO NULL
+#define OPTION_VAL_BMF_FINAL3_KO NULL
+#define OPTION_VAL_SMOOTH_FBX_KO NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_KO NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_KO NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_KO NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_KO NULL
+#define OPTION_VAL_NESCAP_KO NULL
+#define OPTION_VAL_WAVEBEAM_KO NULL
+#define OPTION_VAL_RAW_KO NULL
+#define OPTION_VAL_CUSTOM_KO NULL
+#define FCEUMM_NTSC_FILTER_LABEL_KO NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_KO NULL
+#define OPTION_VAL_COMPOSITE_KO NULL
+#define OPTION_VAL_SVIDEO_KO NULL
+#define OPTION_VAL_RGB_O9_KO NULL
+#define OPTION_VAL_MONOCHROME_KO NULL
+#define FCEUMM_SNDQUALITY_LABEL_KO NULL
+#define FCEUMM_SNDQUALITY_INFO_0_KO NULL
+#define OPTION_VAL_LOW_KO NULL
+#define OPTION_VAL_HIGH_KO NULL
+#define OPTION_VAL_VERY_HIGH_KO NULL
+#define FCEUMM_SWAPDUTY_LABEL_KO NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_KO NULL
+#define FCEUMM_SWAPDUTY_INFO_0_KO NULL
+#define FCEUMM_SNDVOLUME_LABEL_KO NULL
+#define FCEUMM_SNDVOLUME_INFO_0_KO NULL
+#define OPTION_VAL_0_KO NULL
+#define OPTION_VAL_1_KO NULL
+#define OPTION_VAL_2_KO NULL
+#define OPTION_VAL_3_KO NULL
+#define OPTION_VAL_4_KO NULL
+#define OPTION_VAL_5_KO NULL
+#define OPTION_VAL_6_KO NULL
+#define OPTION_VAL_7_KO NULL
+#define OPTION_VAL_8_KO NULL
+#define OPTION_VAL_9_KO NULL
+#define OPTION_VAL_10_KO NULL
+#define FCEUMM_APU_1_LABEL_KO NULL
+#define FCEUMM_APU_1_LABEL_CAT_KO NULL
+#define FCEUMM_APU_1_INFO_0_KO NULL
+#define FCEUMM_APU_2_LABEL_KO NULL
+#define FCEUMM_APU_2_LABEL_CAT_KO NULL
+#define FCEUMM_APU_2_INFO_0_KO NULL
+#define FCEUMM_APU_3_LABEL_KO NULL
+#define FCEUMM_APU_3_LABEL_CAT_KO NULL
+#define FCEUMM_APU_3_INFO_0_KO NULL
+#define FCEUMM_APU_4_LABEL_KO NULL
+#define FCEUMM_APU_4_LABEL_CAT_KO NULL
+#define FCEUMM_APU_4_INFO_0_KO NULL
+#define FCEUMM_APU_5_LABEL_KO NULL
+#define FCEUMM_APU_5_LABEL_CAT_KO NULL
+#define FCEUMM_APU_5_INFO_0_KO NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_KO NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_KO NULL
+#define OPTION_VAL_NONE_KO NULL
+#define OPTION_VAL_PLAYER_1_KO NULL
+#define OPTION_VAL_PLAYER_2_KO NULL
+#define OPTION_VAL_BOTH_KO NULL
+#define FCEUMM_TURBO_DELAY_LABEL_KO NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_KO NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_KO NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_KO NULL
+#define OPTION_VAL_LIGHTGUN_KO NULL
+#define OPTION_VAL_TOUCHSCREEN_KO NULL
+#define OPTION_VAL_MOUSE_KO NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_KO NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_KO NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_KO NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_KO NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_KO NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_KO NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_KO NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_KO NULL
+#define FCEUMM_OVERCLOCKING_LABEL_KO NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_KO NULL
+#define OPTION_VAL_2X_POSTRENDER_KO NULL
+#define OPTION_VAL_2X_VBLANK_KO NULL
+#define FCEUMM_RAMSTATE_LABEL_KO NULL
+#define FCEUMM_RAMSTATE_INFO_0_KO NULL
+#define OPTION_VAL_FILL_FF_KO NULL
+#define OPTION_VAL_FILL_00_KO NULL
+#define OPTION_VAL_RANDOM_KO NULL
+
+struct retro_core_option_v2_category option_cats_ko[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_KO,
+      CATEGORY_SYSTEM_INFO_0_KO
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_KO,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_KO
+#else
+      CATEGORY_VIDEO_INFO_1_KO
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_KO,
+      CATEGORY_AUDIO_INFO_0_KO
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_KO,
+      CATEGORY_INPUT_INFO_0_KO
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_KO,
+      CATEGORY_HACKS_INFO_0_KO
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_KO,
+      CATEGORY_DIP_SWITCH_INFO_0_KO
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_ko[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_KO,
+      NULL,
+      FCEUMM_REGION_INFO_0_KO,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_KO },
+         { "NTSC",  OPTION_VAL_NTSC_KO },
+         { "PAL",   OPTION_VAL_PAL_KO },
+         { "Dendy", OPTION_VAL_DENDY_KO },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_KO,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_KO,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_KO,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_KO,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_KO,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_KO,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_KO,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_KO,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_KO },
+         { "4:3",     OPTION_VAL_4_3_KO },
+         { "PP",      OPTION_VAL_PP_KO },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_KO,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_KO,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_KO,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_KO,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_KO,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_KO,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_KO,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_KO,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_KO },
+         { "asqrealc",             OPTION_VAL_ASQREALC_KO },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_KO },
+         { "rgb",                  OPTION_VAL_RGB_KO },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_KO },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_KO },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_KO },
+         { "pal",                  OPTION_VAL_PAL_KO },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_KO },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_KO },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_KO },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_KO },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_KO },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_KO },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_KO },
+         { "nescap",               OPTION_VAL_NESCAP_KO },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_KO },
+         { "raw",                  OPTION_VAL_RAW_KO },
+         { "custom",               OPTION_VAL_CUSTOM_KO },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_KO,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_KO,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_KO },
+         { "svideo",     OPTION_VAL_SVIDEO_KO },
+         { "rgb",        OPTION_VAL_RGB_O9_KO },
+         { "monochrome", OPTION_VAL_MONOCHROME_KO },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_KO,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_KO,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_KO },
+         { "High",      OPTION_VAL_HIGH_KO },
+         { "Very High", OPTION_VAL_VERY_HIGH_KO },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_KO,
+      FCEUMM_SWAPDUTY_LABEL_CAT_KO,
+      FCEUMM_SWAPDUTY_INFO_0_KO,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_KO,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_KO,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_KO },
+         { "1",  OPTION_VAL_1_KO },
+         { "2",  OPTION_VAL_2_KO },
+         { "3",  OPTION_VAL_3_KO },
+         { "4",  OPTION_VAL_4_KO },
+         { "5",  OPTION_VAL_5_KO },
+         { "6",  OPTION_VAL_6_KO },
+         { "7",  OPTION_VAL_7_KO },
+         { "8",  OPTION_VAL_8_KO },
+         { "9",  OPTION_VAL_9_KO },
+         { "10", OPTION_VAL_10_KO },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_KO,
+      FCEUMM_APU_1_LABEL_CAT_KO,
+      FCEUMM_APU_1_INFO_0_KO,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_KO,
+      FCEUMM_APU_2_LABEL_CAT_KO,
+      FCEUMM_APU_2_INFO_0_KO,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_KO,
+      FCEUMM_APU_3_LABEL_CAT_KO,
+      FCEUMM_APU_3_INFO_0_KO,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_KO,
+      FCEUMM_APU_4_LABEL_CAT_KO,
+      FCEUMM_APU_4_INFO_0_KO,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_KO,
+      FCEUMM_APU_5_LABEL_CAT_KO,
+      FCEUMM_APU_5_INFO_0_KO,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_KO,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_KO,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_KO },
+         { "Player 1", OPTION_VAL_PLAYER_1_KO },
+         { "Player 2", OPTION_VAL_PLAYER_2_KO },
+         { "Both",     OPTION_VAL_BOTH_KO },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_KO,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_KO,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_KO,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_KO,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_KO },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_KO },
+         { "mouse",       OPTION_VAL_MOUSE_KO },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_KO,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_KO,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_KO,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_KO,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_KO,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_KO,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_KO,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_KO,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_KO,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_KO,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_KO },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_KO },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_KO,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_KO,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_KO },
+         { "fill $00", OPTION_VAL_FILL_00_KO },
+         { "random",   OPTION_VAL_RANDOM_KO },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_ko = {
+   option_cats_ko,
+   option_defs_ko
+};
+
+/* RETRO_LANGUAGE_MT */
+
+#define CATEGORY_SYSTEM_LABEL_MT NULL
+#define CATEGORY_SYSTEM_INFO_0_MT NULL
+#define CATEGORY_VIDEO_LABEL_MT NULL
+#define CATEGORY_VIDEO_INFO_0_MT NULL
+#define CATEGORY_VIDEO_INFO_1_MT NULL
+#define CATEGORY_AUDIO_LABEL_MT NULL
+#define CATEGORY_AUDIO_INFO_0_MT NULL
+#define CATEGORY_INPUT_LABEL_MT NULL
+#define CATEGORY_INPUT_INFO_0_MT NULL
+#define CATEGORY_HACKS_LABEL_MT NULL
+#define CATEGORY_HACKS_INFO_0_MT NULL
+#define CATEGORY_DIP_SWITCH_LABEL_MT NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_MT NULL
+#define FCEUMM_REGION_LABEL_MT NULL
+#define FCEUMM_REGION_INFO_0_MT NULL
+#define OPTION_VAL_AUTO_MT NULL
+#define OPTION_VAL_NTSC_MT NULL
+#define OPTION_VAL_PAL_MT NULL
+#define OPTION_VAL_DENDY_MT NULL
+#define FCEUMM_GAME_GENIE_LABEL_MT NULL
+#define FCEUMM_GAME_GENIE_INFO_0_MT NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_MT NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_MT NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_MT NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_MT NULL
+#define FCEUMM_ASPECT_LABEL_MT NULL
+#define FCEUMM_ASPECT_INFO_0_MT NULL
+#define OPTION_VAL_8_7_PAR_MT NULL
+#define OPTION_VAL_4_3_MT NULL
+#define OPTION_VAL_PP_MT NULL
+#define FCEUMM_OVERSCAN_LABEL_MT NULL
+#define FCEUMM_OVERSCAN_INFO_0_MT NULL
+#define FCEUMM_OVERSCAN_H_LABEL_MT NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_MT NULL
+#define FCEUMM_OVERSCAN_V_LABEL_MT NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_MT NULL
+#define FCEUMM_PALETTE_LABEL_MT NULL
+#define FCEUMM_PALETTE_INFO_0_MT NULL
+#define OPTION_VAL_DEFAULT_MT NULL
+#define OPTION_VAL_ASQREALC_MT NULL
+#define OPTION_VAL_NINTENDO_VC_MT NULL
+#define OPTION_VAL_RGB_MT NULL
+#define OPTION_VAL_YUV_V3_MT NULL
+#define OPTION_VAL_UNSATURATED_FINAL_MT NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_MT NULL
+#define OPTION_VAL_BMF_FINAL2_MT NULL
+#define OPTION_VAL_BMF_FINAL3_MT NULL
+#define OPTION_VAL_SMOOTH_FBX_MT NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_MT NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_MT NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_MT NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_MT NULL
+#define OPTION_VAL_NESCAP_MT NULL
+#define OPTION_VAL_WAVEBEAM_MT NULL
+#define OPTION_VAL_RAW_MT NULL
+#define OPTION_VAL_CUSTOM_MT NULL
+#define FCEUMM_NTSC_FILTER_LABEL_MT NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_MT NULL
+#define OPTION_VAL_COMPOSITE_MT NULL
+#define OPTION_VAL_SVIDEO_MT NULL
+#define OPTION_VAL_RGB_O9_MT NULL
+#define OPTION_VAL_MONOCHROME_MT NULL
+#define FCEUMM_SNDQUALITY_LABEL_MT NULL
+#define FCEUMM_SNDQUALITY_INFO_0_MT NULL
+#define OPTION_VAL_LOW_MT NULL
+#define OPTION_VAL_HIGH_MT NULL
+#define OPTION_VAL_VERY_HIGH_MT NULL
+#define FCEUMM_SWAPDUTY_LABEL_MT NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_MT NULL
+#define FCEUMM_SWAPDUTY_INFO_0_MT NULL
+#define FCEUMM_SNDVOLUME_LABEL_MT NULL
+#define FCEUMM_SNDVOLUME_INFO_0_MT NULL
+#define OPTION_VAL_0_MT NULL
+#define OPTION_VAL_1_MT NULL
+#define OPTION_VAL_2_MT NULL
+#define OPTION_VAL_3_MT NULL
+#define OPTION_VAL_4_MT NULL
+#define OPTION_VAL_5_MT NULL
+#define OPTION_VAL_6_MT NULL
+#define OPTION_VAL_7_MT NULL
+#define OPTION_VAL_8_MT NULL
+#define OPTION_VAL_9_MT NULL
+#define OPTION_VAL_10_MT NULL
+#define FCEUMM_APU_1_LABEL_MT NULL
+#define FCEUMM_APU_1_LABEL_CAT_MT NULL
+#define FCEUMM_APU_1_INFO_0_MT NULL
+#define FCEUMM_APU_2_LABEL_MT NULL
+#define FCEUMM_APU_2_LABEL_CAT_MT NULL
+#define FCEUMM_APU_2_INFO_0_MT NULL
+#define FCEUMM_APU_3_LABEL_MT NULL
+#define FCEUMM_APU_3_LABEL_CAT_MT NULL
+#define FCEUMM_APU_3_INFO_0_MT NULL
+#define FCEUMM_APU_4_LABEL_MT NULL
+#define FCEUMM_APU_4_LABEL_CAT_MT NULL
+#define FCEUMM_APU_4_INFO_0_MT NULL
+#define FCEUMM_APU_5_LABEL_MT NULL
+#define FCEUMM_APU_5_LABEL_CAT_MT NULL
+#define FCEUMM_APU_5_INFO_0_MT NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_MT NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_MT NULL
+#define OPTION_VAL_NONE_MT NULL
+#define OPTION_VAL_PLAYER_1_MT NULL
+#define OPTION_VAL_PLAYER_2_MT NULL
+#define OPTION_VAL_BOTH_MT NULL
+#define FCEUMM_TURBO_DELAY_LABEL_MT NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_MT NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_MT NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_MT NULL
+#define OPTION_VAL_LIGHTGUN_MT NULL
+#define OPTION_VAL_TOUCHSCREEN_MT NULL
+#define OPTION_VAL_MOUSE_MT NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_MT NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_MT NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_MT NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_MT NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_MT NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_MT NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_MT NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_MT NULL
+#define FCEUMM_OVERCLOCKING_LABEL_MT NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_MT NULL
+#define OPTION_VAL_2X_POSTRENDER_MT NULL
+#define OPTION_VAL_2X_VBLANK_MT NULL
+#define FCEUMM_RAMSTATE_LABEL_MT NULL
+#define FCEUMM_RAMSTATE_INFO_0_MT NULL
+#define OPTION_VAL_FILL_FF_MT NULL
+#define OPTION_VAL_FILL_00_MT NULL
+#define OPTION_VAL_RANDOM_MT NULL
+
+struct retro_core_option_v2_category option_cats_mt[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_MT,
+      CATEGORY_SYSTEM_INFO_0_MT
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_MT,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_MT
+#else
+      CATEGORY_VIDEO_INFO_1_MT
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_MT,
+      CATEGORY_AUDIO_INFO_0_MT
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_MT,
+      CATEGORY_INPUT_INFO_0_MT
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_MT,
+      CATEGORY_HACKS_INFO_0_MT
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_MT,
+      CATEGORY_DIP_SWITCH_INFO_0_MT
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_mt[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_MT,
+      NULL,
+      FCEUMM_REGION_INFO_0_MT,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_MT },
+         { "NTSC",  OPTION_VAL_NTSC_MT },
+         { "PAL",   OPTION_VAL_PAL_MT },
+         { "Dendy", OPTION_VAL_DENDY_MT },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_MT,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_MT,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_MT,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_MT,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_MT,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_MT,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_MT,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_MT,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_MT },
+         { "4:3",     OPTION_VAL_4_3_MT },
+         { "PP",      OPTION_VAL_PP_MT },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_MT,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_MT,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_MT,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_MT,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_MT,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_MT,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_MT,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_MT,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_MT },
+         { "asqrealc",             OPTION_VAL_ASQREALC_MT },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_MT },
+         { "rgb",                  OPTION_VAL_RGB_MT },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_MT },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_MT },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_MT },
+         { "pal",                  OPTION_VAL_PAL_MT },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_MT },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_MT },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_MT },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_MT },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_MT },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_MT },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_MT },
+         { "nescap",               OPTION_VAL_NESCAP_MT },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_MT },
+         { "raw",                  OPTION_VAL_RAW_MT },
+         { "custom",               OPTION_VAL_CUSTOM_MT },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_MT,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_MT,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_MT },
+         { "svideo",     OPTION_VAL_SVIDEO_MT },
+         { "rgb",        OPTION_VAL_RGB_O9_MT },
+         { "monochrome", OPTION_VAL_MONOCHROME_MT },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_MT,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_MT,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_MT },
+         { "High",      OPTION_VAL_HIGH_MT },
+         { "Very High", OPTION_VAL_VERY_HIGH_MT },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_MT,
+      FCEUMM_SWAPDUTY_LABEL_CAT_MT,
+      FCEUMM_SWAPDUTY_INFO_0_MT,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_MT,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_MT,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_MT },
+         { "1",  OPTION_VAL_1_MT },
+         { "2",  OPTION_VAL_2_MT },
+         { "3",  OPTION_VAL_3_MT },
+         { "4",  OPTION_VAL_4_MT },
+         { "5",  OPTION_VAL_5_MT },
+         { "6",  OPTION_VAL_6_MT },
+         { "7",  OPTION_VAL_7_MT },
+         { "8",  OPTION_VAL_8_MT },
+         { "9",  OPTION_VAL_9_MT },
+         { "10", OPTION_VAL_10_MT },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_MT,
+      FCEUMM_APU_1_LABEL_CAT_MT,
+      FCEUMM_APU_1_INFO_0_MT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_MT,
+      FCEUMM_APU_2_LABEL_CAT_MT,
+      FCEUMM_APU_2_INFO_0_MT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_MT,
+      FCEUMM_APU_3_LABEL_CAT_MT,
+      FCEUMM_APU_3_INFO_0_MT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_MT,
+      FCEUMM_APU_4_LABEL_CAT_MT,
+      FCEUMM_APU_4_INFO_0_MT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_MT,
+      FCEUMM_APU_5_LABEL_CAT_MT,
+      FCEUMM_APU_5_INFO_0_MT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_MT,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_MT,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_MT },
+         { "Player 1", OPTION_VAL_PLAYER_1_MT },
+         { "Player 2", OPTION_VAL_PLAYER_2_MT },
+         { "Both",     OPTION_VAL_BOTH_MT },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_MT,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_MT,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_MT,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_MT,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_MT },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_MT },
+         { "mouse",       OPTION_VAL_MOUSE_MT },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_MT,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_MT,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_MT,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_MT,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_MT,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_MT,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_MT,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_MT,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_MT,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_MT,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_MT },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_MT },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_MT,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_MT,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_MT },
+         { "fill $00", OPTION_VAL_FILL_00_MT },
+         { "random",   OPTION_VAL_RANDOM_MT },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_mt = {
+   option_cats_mt,
+   option_defs_mt
+};
+
+/* RETRO_LANGUAGE_NL */
+
+#define CATEGORY_SYSTEM_LABEL_NL NULL
+#define CATEGORY_SYSTEM_INFO_0_NL NULL
+#define CATEGORY_VIDEO_LABEL_NL NULL
+#define CATEGORY_VIDEO_INFO_0_NL NULL
+#define CATEGORY_VIDEO_INFO_1_NL NULL
+#define CATEGORY_AUDIO_LABEL_NL "Geluid"
+#define CATEGORY_AUDIO_INFO_0_NL NULL
+#define CATEGORY_INPUT_LABEL_NL "Invoer"
+#define CATEGORY_INPUT_INFO_0_NL NULL
+#define CATEGORY_HACKS_LABEL_NL NULL
+#define CATEGORY_HACKS_INFO_0_NL NULL
+#define CATEGORY_DIP_SWITCH_LABEL_NL NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_NL NULL
+#define FCEUMM_REGION_LABEL_NL NULL
+#define FCEUMM_REGION_INFO_0_NL NULL
+#define OPTION_VAL_AUTO_NL NULL
+#define OPTION_VAL_NTSC_NL NULL
+#define OPTION_VAL_PAL_NL NULL
+#define OPTION_VAL_DENDY_NL NULL
+#define FCEUMM_GAME_GENIE_LABEL_NL NULL
+#define FCEUMM_GAME_GENIE_INFO_0_NL NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_NL NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_NL NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_NL NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_NL NULL
+#define FCEUMM_ASPECT_LABEL_NL NULL
+#define FCEUMM_ASPECT_INFO_0_NL NULL
+#define OPTION_VAL_8_7_PAR_NL NULL
+#define OPTION_VAL_4_3_NL NULL
+#define OPTION_VAL_PP_NL NULL
+#define FCEUMM_OVERSCAN_LABEL_NL NULL
+#define FCEUMM_OVERSCAN_INFO_0_NL NULL
+#define FCEUMM_OVERSCAN_H_LABEL_NL NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_NL NULL
+#define FCEUMM_OVERSCAN_V_LABEL_NL NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_NL NULL
+#define FCEUMM_PALETTE_LABEL_NL NULL
+#define FCEUMM_PALETTE_INFO_0_NL NULL
+#define OPTION_VAL_DEFAULT_NL NULL
+#define OPTION_VAL_ASQREALC_NL NULL
+#define OPTION_VAL_NINTENDO_VC_NL NULL
+#define OPTION_VAL_RGB_NL NULL
+#define OPTION_VAL_YUV_V3_NL NULL
+#define OPTION_VAL_UNSATURATED_FINAL_NL NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_NL NULL
+#define OPTION_VAL_BMF_FINAL2_NL NULL
+#define OPTION_VAL_BMF_FINAL3_NL NULL
+#define OPTION_VAL_SMOOTH_FBX_NL NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_NL NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_NL NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_NL NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_NL NULL
+#define OPTION_VAL_NESCAP_NL NULL
+#define OPTION_VAL_WAVEBEAM_NL NULL
+#define OPTION_VAL_RAW_NL NULL
+#define OPTION_VAL_CUSTOM_NL NULL
+#define FCEUMM_NTSC_FILTER_LABEL_NL NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_NL NULL
+#define OPTION_VAL_COMPOSITE_NL NULL
+#define OPTION_VAL_SVIDEO_NL NULL
+#define OPTION_VAL_RGB_O9_NL NULL
+#define OPTION_VAL_MONOCHROME_NL NULL
+#define FCEUMM_SNDQUALITY_LABEL_NL NULL
+#define FCEUMM_SNDQUALITY_INFO_0_NL NULL
+#define OPTION_VAL_LOW_NL NULL
+#define OPTION_VAL_HIGH_NL NULL
+#define OPTION_VAL_VERY_HIGH_NL NULL
+#define FCEUMM_SWAPDUTY_LABEL_NL NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_NL NULL
+#define FCEUMM_SWAPDUTY_INFO_0_NL NULL
+#define FCEUMM_SNDVOLUME_LABEL_NL NULL
+#define FCEUMM_SNDVOLUME_INFO_0_NL NULL
+#define OPTION_VAL_0_NL NULL
+#define OPTION_VAL_1_NL NULL
+#define OPTION_VAL_2_NL NULL
+#define OPTION_VAL_3_NL NULL
+#define OPTION_VAL_4_NL NULL
+#define OPTION_VAL_5_NL NULL
+#define OPTION_VAL_6_NL NULL
+#define OPTION_VAL_7_NL NULL
+#define OPTION_VAL_8_NL NULL
+#define OPTION_VAL_9_NL NULL
+#define OPTION_VAL_10_NL NULL
+#define FCEUMM_APU_1_LABEL_NL NULL
+#define FCEUMM_APU_1_LABEL_CAT_NL NULL
+#define FCEUMM_APU_1_INFO_0_NL NULL
+#define FCEUMM_APU_2_LABEL_NL NULL
+#define FCEUMM_APU_2_LABEL_CAT_NL NULL
+#define FCEUMM_APU_2_INFO_0_NL NULL
+#define FCEUMM_APU_3_LABEL_NL NULL
+#define FCEUMM_APU_3_LABEL_CAT_NL NULL
+#define FCEUMM_APU_3_INFO_0_NL NULL
+#define FCEUMM_APU_4_LABEL_NL NULL
+#define FCEUMM_APU_4_LABEL_CAT_NL NULL
+#define FCEUMM_APU_4_INFO_0_NL NULL
+#define FCEUMM_APU_5_LABEL_NL NULL
+#define FCEUMM_APU_5_LABEL_CAT_NL NULL
+#define FCEUMM_APU_5_INFO_0_NL NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_NL NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_NL NULL
+#define OPTION_VAL_NONE_NL NULL
+#define OPTION_VAL_PLAYER_1_NL NULL
+#define OPTION_VAL_PLAYER_2_NL NULL
+#define OPTION_VAL_BOTH_NL NULL
+#define FCEUMM_TURBO_DELAY_LABEL_NL NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_NL NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_NL NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_NL NULL
+#define OPTION_VAL_LIGHTGUN_NL NULL
+#define OPTION_VAL_TOUCHSCREEN_NL NULL
+#define OPTION_VAL_MOUSE_NL NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_NL NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_NL NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_NL NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_NL NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_NL NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_NL NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_NL NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_NL NULL
+#define FCEUMM_OVERCLOCKING_LABEL_NL NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_NL NULL
+#define OPTION_VAL_2X_POSTRENDER_NL NULL
+#define OPTION_VAL_2X_VBLANK_NL NULL
+#define FCEUMM_RAMSTATE_LABEL_NL NULL
+#define FCEUMM_RAMSTATE_INFO_0_NL NULL
+#define OPTION_VAL_FILL_FF_NL NULL
+#define OPTION_VAL_FILL_00_NL NULL
+#define OPTION_VAL_RANDOM_NL NULL
+
+struct retro_core_option_v2_category option_cats_nl[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_NL,
+      CATEGORY_SYSTEM_INFO_0_NL
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_NL,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_NL
+#else
+      CATEGORY_VIDEO_INFO_1_NL
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_NL,
+      CATEGORY_AUDIO_INFO_0_NL
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_NL,
+      CATEGORY_INPUT_INFO_0_NL
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_NL,
+      CATEGORY_HACKS_INFO_0_NL
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_NL,
+      CATEGORY_DIP_SWITCH_INFO_0_NL
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_nl[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_NL,
+      NULL,
+      FCEUMM_REGION_INFO_0_NL,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_NL },
+         { "NTSC",  OPTION_VAL_NTSC_NL },
+         { "PAL",   OPTION_VAL_PAL_NL },
+         { "Dendy", OPTION_VAL_DENDY_NL },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_NL,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_NL,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_NL,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_NL,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_NL,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_NL,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_NL,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_NL,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_NL },
+         { "4:3",     OPTION_VAL_4_3_NL },
+         { "PP",      OPTION_VAL_PP_NL },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_NL,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_NL,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_NL,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_NL,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_NL,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_NL,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_NL,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_NL,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_NL },
+         { "asqrealc",             OPTION_VAL_ASQREALC_NL },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_NL },
+         { "rgb",                  OPTION_VAL_RGB_NL },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_NL },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_NL },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_NL },
+         { "pal",                  OPTION_VAL_PAL_NL },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_NL },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_NL },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_NL },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_NL },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_NL },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_NL },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_NL },
+         { "nescap",               OPTION_VAL_NESCAP_NL },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_NL },
+         { "raw",                  OPTION_VAL_RAW_NL },
+         { "custom",               OPTION_VAL_CUSTOM_NL },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_NL,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_NL,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_NL },
+         { "svideo",     OPTION_VAL_SVIDEO_NL },
+         { "rgb",        OPTION_VAL_RGB_O9_NL },
+         { "monochrome", OPTION_VAL_MONOCHROME_NL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_NL,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_NL,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_NL },
+         { "High",      OPTION_VAL_HIGH_NL },
+         { "Very High", OPTION_VAL_VERY_HIGH_NL },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_NL,
+      FCEUMM_SWAPDUTY_LABEL_CAT_NL,
+      FCEUMM_SWAPDUTY_INFO_0_NL,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_NL,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_NL,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_NL },
+         { "1",  OPTION_VAL_1_NL },
+         { "2",  OPTION_VAL_2_NL },
+         { "3",  OPTION_VAL_3_NL },
+         { "4",  OPTION_VAL_4_NL },
+         { "5",  OPTION_VAL_5_NL },
+         { "6",  OPTION_VAL_6_NL },
+         { "7",  OPTION_VAL_7_NL },
+         { "8",  OPTION_VAL_8_NL },
+         { "9",  OPTION_VAL_9_NL },
+         { "10", OPTION_VAL_10_NL },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_NL,
+      FCEUMM_APU_1_LABEL_CAT_NL,
+      FCEUMM_APU_1_INFO_0_NL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_NL,
+      FCEUMM_APU_2_LABEL_CAT_NL,
+      FCEUMM_APU_2_INFO_0_NL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_NL,
+      FCEUMM_APU_3_LABEL_CAT_NL,
+      FCEUMM_APU_3_INFO_0_NL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_NL,
+      FCEUMM_APU_4_LABEL_CAT_NL,
+      FCEUMM_APU_4_INFO_0_NL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_NL,
+      FCEUMM_APU_5_LABEL_CAT_NL,
+      FCEUMM_APU_5_INFO_0_NL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_NL,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_NL,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_NL },
+         { "Player 1", OPTION_VAL_PLAYER_1_NL },
+         { "Player 2", OPTION_VAL_PLAYER_2_NL },
+         { "Both",     OPTION_VAL_BOTH_NL },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_NL,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_NL,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_NL,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_NL,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_NL },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_NL },
+         { "mouse",       OPTION_VAL_MOUSE_NL },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_NL,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_NL,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_NL,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_NL,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_NL,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_NL,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_NL,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_NL,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_NL,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_NL,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_NL },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_NL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_NL,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_NL,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_NL },
+         { "fill $00", OPTION_VAL_FILL_00_NL },
+         { "random",   OPTION_VAL_RANDOM_NL },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_nl = {
+   option_cats_nl,
+   option_defs_nl
+};
+
+/* RETRO_LANGUAGE_OC */
+
+#define CATEGORY_SYSTEM_LABEL_OC NULL
+#define CATEGORY_SYSTEM_INFO_0_OC NULL
+#define CATEGORY_VIDEO_LABEL_OC "Vidèo"
+#define CATEGORY_VIDEO_INFO_0_OC NULL
+#define CATEGORY_VIDEO_INFO_1_OC NULL
+#define CATEGORY_AUDIO_LABEL_OC NULL
+#define CATEGORY_AUDIO_INFO_0_OC NULL
+#define CATEGORY_INPUT_LABEL_OC NULL
+#define CATEGORY_INPUT_INFO_0_OC NULL
+#define CATEGORY_HACKS_LABEL_OC NULL
+#define CATEGORY_HACKS_INFO_0_OC NULL
+#define CATEGORY_DIP_SWITCH_LABEL_OC NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_OC NULL
+#define FCEUMM_REGION_LABEL_OC NULL
+#define FCEUMM_REGION_INFO_0_OC NULL
+#define OPTION_VAL_AUTO_OC NULL
+#define OPTION_VAL_NTSC_OC NULL
+#define OPTION_VAL_PAL_OC NULL
+#define OPTION_VAL_DENDY_OC NULL
+#define FCEUMM_GAME_GENIE_LABEL_OC NULL
+#define FCEUMM_GAME_GENIE_INFO_0_OC NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_OC NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_OC NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_OC NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_OC NULL
+#define FCEUMM_ASPECT_LABEL_OC NULL
+#define FCEUMM_ASPECT_INFO_0_OC NULL
+#define OPTION_VAL_8_7_PAR_OC NULL
+#define OPTION_VAL_4_3_OC NULL
+#define OPTION_VAL_PP_OC NULL
+#define FCEUMM_OVERSCAN_LABEL_OC NULL
+#define FCEUMM_OVERSCAN_INFO_0_OC NULL
+#define FCEUMM_OVERSCAN_H_LABEL_OC NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_OC NULL
+#define FCEUMM_OVERSCAN_V_LABEL_OC NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_OC NULL
+#define FCEUMM_PALETTE_LABEL_OC NULL
+#define FCEUMM_PALETTE_INFO_0_OC NULL
+#define OPTION_VAL_DEFAULT_OC NULL
+#define OPTION_VAL_ASQREALC_OC NULL
+#define OPTION_VAL_NINTENDO_VC_OC NULL
+#define OPTION_VAL_RGB_OC NULL
+#define OPTION_VAL_YUV_V3_OC NULL
+#define OPTION_VAL_UNSATURATED_FINAL_OC NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_OC NULL
+#define OPTION_VAL_BMF_FINAL2_OC NULL
+#define OPTION_VAL_BMF_FINAL3_OC NULL
+#define OPTION_VAL_SMOOTH_FBX_OC NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_OC NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_OC NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_OC NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_OC NULL
+#define OPTION_VAL_NESCAP_OC NULL
+#define OPTION_VAL_WAVEBEAM_OC NULL
+#define OPTION_VAL_RAW_OC NULL
+#define OPTION_VAL_CUSTOM_OC NULL
+#define FCEUMM_NTSC_FILTER_LABEL_OC NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_OC NULL
+#define OPTION_VAL_COMPOSITE_OC NULL
+#define OPTION_VAL_SVIDEO_OC NULL
+#define OPTION_VAL_RGB_O9_OC NULL
+#define OPTION_VAL_MONOCHROME_OC NULL
+#define FCEUMM_SNDQUALITY_LABEL_OC NULL
+#define FCEUMM_SNDQUALITY_INFO_0_OC NULL
+#define OPTION_VAL_LOW_OC NULL
+#define OPTION_VAL_HIGH_OC NULL
+#define OPTION_VAL_VERY_HIGH_OC NULL
+#define FCEUMM_SWAPDUTY_LABEL_OC NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_OC NULL
+#define FCEUMM_SWAPDUTY_INFO_0_OC NULL
+#define FCEUMM_SNDVOLUME_LABEL_OC NULL
+#define FCEUMM_SNDVOLUME_INFO_0_OC NULL
+#define OPTION_VAL_0_OC NULL
+#define OPTION_VAL_1_OC NULL
+#define OPTION_VAL_2_OC NULL
+#define OPTION_VAL_3_OC NULL
+#define OPTION_VAL_4_OC NULL
+#define OPTION_VAL_5_OC NULL
+#define OPTION_VAL_6_OC NULL
+#define OPTION_VAL_7_OC NULL
+#define OPTION_VAL_8_OC NULL
+#define OPTION_VAL_9_OC NULL
+#define OPTION_VAL_10_OC NULL
+#define FCEUMM_APU_1_LABEL_OC NULL
+#define FCEUMM_APU_1_LABEL_CAT_OC NULL
+#define FCEUMM_APU_1_INFO_0_OC NULL
+#define FCEUMM_APU_2_LABEL_OC NULL
+#define FCEUMM_APU_2_LABEL_CAT_OC NULL
+#define FCEUMM_APU_2_INFO_0_OC NULL
+#define FCEUMM_APU_3_LABEL_OC NULL
+#define FCEUMM_APU_3_LABEL_CAT_OC NULL
+#define FCEUMM_APU_3_INFO_0_OC NULL
+#define FCEUMM_APU_4_LABEL_OC NULL
+#define FCEUMM_APU_4_LABEL_CAT_OC NULL
+#define FCEUMM_APU_4_INFO_0_OC NULL
+#define FCEUMM_APU_5_LABEL_OC NULL
+#define FCEUMM_APU_5_LABEL_CAT_OC NULL
+#define FCEUMM_APU_5_INFO_0_OC NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_OC NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_OC NULL
+#define OPTION_VAL_NONE_OC NULL
+#define OPTION_VAL_PLAYER_1_OC NULL
+#define OPTION_VAL_PLAYER_2_OC NULL
+#define OPTION_VAL_BOTH_OC NULL
+#define FCEUMM_TURBO_DELAY_LABEL_OC NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_OC NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_OC NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_OC NULL
+#define OPTION_VAL_LIGHTGUN_OC NULL
+#define OPTION_VAL_TOUCHSCREEN_OC NULL
+#define OPTION_VAL_MOUSE_OC NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_OC NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_OC NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_OC NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_OC NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_OC NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_OC NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_OC NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_OC NULL
+#define FCEUMM_OVERCLOCKING_LABEL_OC NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_OC NULL
+#define OPTION_VAL_2X_POSTRENDER_OC NULL
+#define OPTION_VAL_2X_VBLANK_OC NULL
+#define FCEUMM_RAMSTATE_LABEL_OC NULL
+#define FCEUMM_RAMSTATE_INFO_0_OC NULL
+#define OPTION_VAL_FILL_FF_OC NULL
+#define OPTION_VAL_FILL_00_OC NULL
+#define OPTION_VAL_RANDOM_OC NULL
+
+struct retro_core_option_v2_category option_cats_oc[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_OC,
+      CATEGORY_SYSTEM_INFO_0_OC
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_OC,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_OC
+#else
+      CATEGORY_VIDEO_INFO_1_OC
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_OC,
+      CATEGORY_AUDIO_INFO_0_OC
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_OC,
+      CATEGORY_INPUT_INFO_0_OC
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_OC,
+      CATEGORY_HACKS_INFO_0_OC
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_OC,
+      CATEGORY_DIP_SWITCH_INFO_0_OC
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_oc[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_OC,
+      NULL,
+      FCEUMM_REGION_INFO_0_OC,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_OC },
+         { "NTSC",  OPTION_VAL_NTSC_OC },
+         { "PAL",   OPTION_VAL_PAL_OC },
+         { "Dendy", OPTION_VAL_DENDY_OC },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_OC,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_OC,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_OC,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_OC,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_OC,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_OC,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_OC,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_OC,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_OC },
+         { "4:3",     OPTION_VAL_4_3_OC },
+         { "PP",      OPTION_VAL_PP_OC },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_OC,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_OC,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_OC,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_OC,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_OC,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_OC,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_OC,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_OC,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_OC },
+         { "asqrealc",             OPTION_VAL_ASQREALC_OC },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_OC },
+         { "rgb",                  OPTION_VAL_RGB_OC },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_OC },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_OC },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_OC },
+         { "pal",                  OPTION_VAL_PAL_OC },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_OC },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_OC },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_OC },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_OC },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_OC },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_OC },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_OC },
+         { "nescap",               OPTION_VAL_NESCAP_OC },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_OC },
+         { "raw",                  OPTION_VAL_RAW_OC },
+         { "custom",               OPTION_VAL_CUSTOM_OC },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_OC,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_OC,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_OC },
+         { "svideo",     OPTION_VAL_SVIDEO_OC },
+         { "rgb",        OPTION_VAL_RGB_O9_OC },
+         { "monochrome", OPTION_VAL_MONOCHROME_OC },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_OC,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_OC,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_OC },
+         { "High",      OPTION_VAL_HIGH_OC },
+         { "Very High", OPTION_VAL_VERY_HIGH_OC },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_OC,
+      FCEUMM_SWAPDUTY_LABEL_CAT_OC,
+      FCEUMM_SWAPDUTY_INFO_0_OC,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_OC,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_OC,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_OC },
+         { "1",  OPTION_VAL_1_OC },
+         { "2",  OPTION_VAL_2_OC },
+         { "3",  OPTION_VAL_3_OC },
+         { "4",  OPTION_VAL_4_OC },
+         { "5",  OPTION_VAL_5_OC },
+         { "6",  OPTION_VAL_6_OC },
+         { "7",  OPTION_VAL_7_OC },
+         { "8",  OPTION_VAL_8_OC },
+         { "9",  OPTION_VAL_9_OC },
+         { "10", OPTION_VAL_10_OC },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_OC,
+      FCEUMM_APU_1_LABEL_CAT_OC,
+      FCEUMM_APU_1_INFO_0_OC,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_OC,
+      FCEUMM_APU_2_LABEL_CAT_OC,
+      FCEUMM_APU_2_INFO_0_OC,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_OC,
+      FCEUMM_APU_3_LABEL_CAT_OC,
+      FCEUMM_APU_3_INFO_0_OC,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_OC,
+      FCEUMM_APU_4_LABEL_CAT_OC,
+      FCEUMM_APU_4_INFO_0_OC,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_OC,
+      FCEUMM_APU_5_LABEL_CAT_OC,
+      FCEUMM_APU_5_INFO_0_OC,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_OC,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_OC,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_OC },
+         { "Player 1", OPTION_VAL_PLAYER_1_OC },
+         { "Player 2", OPTION_VAL_PLAYER_2_OC },
+         { "Both",     OPTION_VAL_BOTH_OC },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_OC,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_OC,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_OC,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_OC,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_OC },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_OC },
+         { "mouse",       OPTION_VAL_MOUSE_OC },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_OC,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_OC,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_OC,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_OC,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_OC,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_OC,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_OC,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_OC,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_OC,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_OC,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_OC },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_OC },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_OC,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_OC,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_OC },
+         { "fill $00", OPTION_VAL_FILL_00_OC },
+         { "random",   OPTION_VAL_RANDOM_OC },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_oc = {
+   option_cats_oc,
+   option_defs_oc
+};
+
+/* RETRO_LANGUAGE_PL */
+
+#define CATEGORY_SYSTEM_LABEL_PL NULL
+#define CATEGORY_SYSTEM_INFO_0_PL "Skonfiguruj parametry dodatku regionu i sprzętu."
+#define CATEGORY_VIDEO_LABEL_PL "Wideo"
+#define CATEGORY_VIDEO_INFO_0_PL "Skonfiguruj proporcje obrazów, wyświetlanie przycinania, palety kolorów, opcje filtra wideo."
+#define CATEGORY_VIDEO_INFO_1_PL "Skonfiguruj proporcje obrazów, wyświetlanie przycinania, opcje palety kolorów."
+#define CATEGORY_AUDIO_LABEL_PL NULL
+#define CATEGORY_AUDIO_INFO_0_PL "Skonfiguruj jakość dźwięku, głośność, włączanie ustawień kanału."
+#define CATEGORY_INPUT_LABEL_PL "Wejście"
+#define CATEGORY_INPUT_INFO_0_PL "Skonfiguruj parametry turbo i pistoletu świetlnego."
+#define CATEGORY_HACKS_LABEL_PL "Hacki emulacyjne"
+#define CATEGORY_HACKS_INFO_0_PL "Skonfiguruj przetaktowanie procesora i dokładność emulacji wpływające na niską wydajność i kompatybilność."
+#define CATEGORY_DIP_SWITCH_LABEL_PL "Przełączniki DIP"
+#define CATEGORY_DIP_SWITCH_INFO_0_PL "Skonfiguruj ustawienia gry arcade."
+#define FCEUMM_REGION_LABEL_PL NULL
+#define FCEUMM_REGION_INFO_0_PL NULL
+#define OPTION_VAL_AUTO_PL NULL
+#define OPTION_VAL_NTSC_PL NULL
+#define OPTION_VAL_PAL_PL NULL
+#define OPTION_VAL_DENDY_PL NULL
+#define FCEUMM_GAME_GENIE_LABEL_PL NULL
+#define FCEUMM_GAME_GENIE_INFO_0_PL NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_PL NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_PL NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_PL NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_PL NULL
+#define FCEUMM_ASPECT_LABEL_PL NULL
+#define FCEUMM_ASPECT_INFO_0_PL NULL
+#define OPTION_VAL_8_7_PAR_PL NULL
+#define OPTION_VAL_4_3_PL NULL
+#define OPTION_VAL_PP_PL NULL
+#define FCEUMM_OVERSCAN_LABEL_PL NULL
+#define FCEUMM_OVERSCAN_INFO_0_PL NULL
+#define FCEUMM_OVERSCAN_H_LABEL_PL NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_PL NULL
+#define FCEUMM_OVERSCAN_V_LABEL_PL NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_PL NULL
+#define FCEUMM_PALETTE_LABEL_PL NULL
+#define FCEUMM_PALETTE_INFO_0_PL NULL
+#define OPTION_VAL_DEFAULT_PL NULL
+#define OPTION_VAL_ASQREALC_PL NULL
+#define OPTION_VAL_NINTENDO_VC_PL NULL
+#define OPTION_VAL_RGB_PL NULL
+#define OPTION_VAL_YUV_V3_PL NULL
+#define OPTION_VAL_UNSATURATED_FINAL_PL NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_PL NULL
+#define OPTION_VAL_BMF_FINAL2_PL NULL
+#define OPTION_VAL_BMF_FINAL3_PL NULL
+#define OPTION_VAL_SMOOTH_FBX_PL NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_PL NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_PL NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_PL NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_PL NULL
+#define OPTION_VAL_NESCAP_PL NULL
+#define OPTION_VAL_WAVEBEAM_PL NULL
+#define OPTION_VAL_RAW_PL NULL
+#define OPTION_VAL_CUSTOM_PL NULL
+#define FCEUMM_NTSC_FILTER_LABEL_PL NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_PL NULL
+#define OPTION_VAL_COMPOSITE_PL NULL
+#define OPTION_VAL_SVIDEO_PL NULL
+#define OPTION_VAL_RGB_O9_PL NULL
+#define OPTION_VAL_MONOCHROME_PL NULL
+#define FCEUMM_SNDQUALITY_LABEL_PL NULL
+#define FCEUMM_SNDQUALITY_INFO_0_PL NULL
+#define OPTION_VAL_LOW_PL NULL
+#define OPTION_VAL_HIGH_PL NULL
+#define OPTION_VAL_VERY_HIGH_PL NULL
+#define FCEUMM_SWAPDUTY_LABEL_PL NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_PL NULL
+#define FCEUMM_SWAPDUTY_INFO_0_PL NULL
+#define FCEUMM_SNDVOLUME_LABEL_PL NULL
+#define FCEUMM_SNDVOLUME_INFO_0_PL NULL
+#define OPTION_VAL_0_PL NULL
+#define OPTION_VAL_1_PL NULL
+#define OPTION_VAL_2_PL NULL
+#define OPTION_VAL_3_PL NULL
+#define OPTION_VAL_4_PL NULL
+#define OPTION_VAL_5_PL NULL
+#define OPTION_VAL_6_PL NULL
+#define OPTION_VAL_7_PL NULL
+#define OPTION_VAL_8_PL NULL
+#define OPTION_VAL_9_PL NULL
+#define OPTION_VAL_10_PL NULL
+#define FCEUMM_APU_1_LABEL_PL NULL
+#define FCEUMM_APU_1_LABEL_CAT_PL NULL
+#define FCEUMM_APU_1_INFO_0_PL NULL
+#define FCEUMM_APU_2_LABEL_PL NULL
+#define FCEUMM_APU_2_LABEL_CAT_PL NULL
+#define FCEUMM_APU_2_INFO_0_PL NULL
+#define FCEUMM_APU_3_LABEL_PL NULL
+#define FCEUMM_APU_3_LABEL_CAT_PL NULL
+#define FCEUMM_APU_3_INFO_0_PL NULL
+#define FCEUMM_APU_4_LABEL_PL NULL
+#define FCEUMM_APU_4_LABEL_CAT_PL NULL
+#define FCEUMM_APU_4_INFO_0_PL NULL
+#define FCEUMM_APU_5_LABEL_PL NULL
+#define FCEUMM_APU_5_LABEL_CAT_PL NULL
+#define FCEUMM_APU_5_INFO_0_PL NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_PL NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_PL NULL
+#define OPTION_VAL_NONE_PL NULL
+#define OPTION_VAL_PLAYER_1_PL NULL
+#define OPTION_VAL_PLAYER_2_PL NULL
+#define OPTION_VAL_BOTH_PL NULL
+#define FCEUMM_TURBO_DELAY_LABEL_PL NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_PL NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_PL NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_PL NULL
+#define OPTION_VAL_LIGHTGUN_PL NULL
+#define OPTION_VAL_TOUCHSCREEN_PL NULL
+#define OPTION_VAL_MOUSE_PL NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_PL NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_PL NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_PL NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_PL NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_PL NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_PL NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_PL NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_PL NULL
+#define FCEUMM_OVERCLOCKING_LABEL_PL NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_PL NULL
+#define OPTION_VAL_2X_POSTRENDER_PL NULL
+#define OPTION_VAL_2X_VBLANK_PL NULL
+#define FCEUMM_RAMSTATE_LABEL_PL NULL
+#define FCEUMM_RAMSTATE_INFO_0_PL NULL
+#define OPTION_VAL_FILL_FF_PL NULL
+#define OPTION_VAL_FILL_00_PL NULL
+#define OPTION_VAL_RANDOM_PL NULL
+
+struct retro_core_option_v2_category option_cats_pl[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_PL,
+      CATEGORY_SYSTEM_INFO_0_PL
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_PL,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_PL
+#else
+      CATEGORY_VIDEO_INFO_1_PL
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_PL,
+      CATEGORY_AUDIO_INFO_0_PL
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_PL,
+      CATEGORY_INPUT_INFO_0_PL
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_PL,
+      CATEGORY_HACKS_INFO_0_PL
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_PL,
+      CATEGORY_DIP_SWITCH_INFO_0_PL
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_pl[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_PL,
+      NULL,
+      FCEUMM_REGION_INFO_0_PL,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_PL },
+         { "NTSC",  OPTION_VAL_NTSC_PL },
+         { "PAL",   OPTION_VAL_PAL_PL },
+         { "Dendy", OPTION_VAL_DENDY_PL },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_PL,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_PL,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_PL,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_PL,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_PL,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_PL,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_PL,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_PL,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_PL },
+         { "4:3",     OPTION_VAL_4_3_PL },
+         { "PP",      OPTION_VAL_PP_PL },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_PL,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_PL,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_PL,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_PL,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_PL,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_PL,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_PL,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_PL,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_PL },
+         { "asqrealc",             OPTION_VAL_ASQREALC_PL },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_PL },
+         { "rgb",                  OPTION_VAL_RGB_PL },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_PL },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_PL },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_PL },
+         { "pal",                  OPTION_VAL_PAL_PL },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_PL },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_PL },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_PL },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_PL },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_PL },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_PL },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_PL },
+         { "nescap",               OPTION_VAL_NESCAP_PL },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_PL },
+         { "raw",                  OPTION_VAL_RAW_PL },
+         { "custom",               OPTION_VAL_CUSTOM_PL },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_PL,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_PL,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_PL },
+         { "svideo",     OPTION_VAL_SVIDEO_PL },
+         { "rgb",        OPTION_VAL_RGB_O9_PL },
+         { "monochrome", OPTION_VAL_MONOCHROME_PL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_PL,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_PL,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_PL },
+         { "High",      OPTION_VAL_HIGH_PL },
+         { "Very High", OPTION_VAL_VERY_HIGH_PL },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_PL,
+      FCEUMM_SWAPDUTY_LABEL_CAT_PL,
+      FCEUMM_SWAPDUTY_INFO_0_PL,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_PL,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_PL,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_PL },
+         { "1",  OPTION_VAL_1_PL },
+         { "2",  OPTION_VAL_2_PL },
+         { "3",  OPTION_VAL_3_PL },
+         { "4",  OPTION_VAL_4_PL },
+         { "5",  OPTION_VAL_5_PL },
+         { "6",  OPTION_VAL_6_PL },
+         { "7",  OPTION_VAL_7_PL },
+         { "8",  OPTION_VAL_8_PL },
+         { "9",  OPTION_VAL_9_PL },
+         { "10", OPTION_VAL_10_PL },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_PL,
+      FCEUMM_APU_1_LABEL_CAT_PL,
+      FCEUMM_APU_1_INFO_0_PL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_PL,
+      FCEUMM_APU_2_LABEL_CAT_PL,
+      FCEUMM_APU_2_INFO_0_PL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_PL,
+      FCEUMM_APU_3_LABEL_CAT_PL,
+      FCEUMM_APU_3_INFO_0_PL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_PL,
+      FCEUMM_APU_4_LABEL_CAT_PL,
+      FCEUMM_APU_4_INFO_0_PL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_PL,
+      FCEUMM_APU_5_LABEL_CAT_PL,
+      FCEUMM_APU_5_INFO_0_PL,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_PL,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_PL,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_PL },
+         { "Player 1", OPTION_VAL_PLAYER_1_PL },
+         { "Player 2", OPTION_VAL_PLAYER_2_PL },
+         { "Both",     OPTION_VAL_BOTH_PL },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_PL,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_PL,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_PL,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_PL,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_PL },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_PL },
+         { "mouse",       OPTION_VAL_MOUSE_PL },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_PL,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_PL,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_PL,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_PL,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_PL,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_PL,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_PL,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_PL,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_PL,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_PL,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_PL },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_PL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_PL,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_PL,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_PL },
+         { "fill $00", OPTION_VAL_FILL_00_PL },
+         { "random",   OPTION_VAL_RANDOM_PL },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_pl = {
+   option_cats_pl,
+   option_defs_pl
+};
+
+/* RETRO_LANGUAGE_PT_BR */
+
+#define CATEGORY_SYSTEM_LABEL_PT_BR "Sistema"
+#define CATEGORY_SYSTEM_INFO_0_PT_BR NULL
+#define CATEGORY_VIDEO_LABEL_PT_BR "Vídeo"
+#define CATEGORY_VIDEO_INFO_0_PT_BR NULL
+#define CATEGORY_VIDEO_INFO_1_PT_BR NULL
+#define CATEGORY_AUDIO_LABEL_PT_BR "Áudio"
+#define CATEGORY_AUDIO_INFO_0_PT_BR NULL
+#define CATEGORY_INPUT_LABEL_PT_BR "Entrada"
+#define CATEGORY_INPUT_INFO_0_PT_BR NULL
+#define CATEGORY_HACKS_LABEL_PT_BR "Hacks de emulação"
+#define CATEGORY_HACKS_INFO_0_PT_BR "Configure os parâmetros de precisão de overclock e emulação do processador que afetam o baixo desempenho e a compatibilidade."
+#define CATEGORY_DIP_SWITCH_LABEL_PT_BR NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_PT_BR NULL
+#define FCEUMM_REGION_LABEL_PT_BR NULL
+#define FCEUMM_REGION_INFO_0_PT_BR NULL
+#define OPTION_VAL_AUTO_PT_BR NULL
+#define OPTION_VAL_NTSC_PT_BR NULL
+#define OPTION_VAL_PAL_PT_BR NULL
+#define OPTION_VAL_DENDY_PT_BR NULL
+#define FCEUMM_GAME_GENIE_LABEL_PT_BR NULL
+#define FCEUMM_GAME_GENIE_INFO_0_PT_BR NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_PT_BR NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_PT_BR NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_PT_BR NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_PT_BR NULL
+#define FCEUMM_ASPECT_LABEL_PT_BR NULL
+#define FCEUMM_ASPECT_INFO_0_PT_BR NULL
+#define OPTION_VAL_8_7_PAR_PT_BR NULL
+#define OPTION_VAL_4_3_PT_BR NULL
+#define OPTION_VAL_PP_PT_BR NULL
+#define FCEUMM_OVERSCAN_LABEL_PT_BR NULL
+#define FCEUMM_OVERSCAN_INFO_0_PT_BR NULL
+#define FCEUMM_OVERSCAN_H_LABEL_PT_BR NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_PT_BR NULL
+#define FCEUMM_OVERSCAN_V_LABEL_PT_BR NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_PT_BR NULL
+#define FCEUMM_PALETTE_LABEL_PT_BR NULL
+#define FCEUMM_PALETTE_INFO_0_PT_BR NULL
+#define OPTION_VAL_DEFAULT_PT_BR NULL
+#define OPTION_VAL_ASQREALC_PT_BR NULL
+#define OPTION_VAL_NINTENDO_VC_PT_BR NULL
+#define OPTION_VAL_RGB_PT_BR NULL
+#define OPTION_VAL_YUV_V3_PT_BR NULL
+#define OPTION_VAL_UNSATURATED_FINAL_PT_BR NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_PT_BR NULL
+#define OPTION_VAL_BMF_FINAL2_PT_BR NULL
+#define OPTION_VAL_BMF_FINAL3_PT_BR NULL
+#define OPTION_VAL_SMOOTH_FBX_PT_BR NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_PT_BR NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_PT_BR NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_PT_BR NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_PT_BR NULL
+#define OPTION_VAL_NESCAP_PT_BR NULL
+#define OPTION_VAL_WAVEBEAM_PT_BR NULL
+#define OPTION_VAL_RAW_PT_BR NULL
+#define OPTION_VAL_CUSTOM_PT_BR NULL
+#define FCEUMM_NTSC_FILTER_LABEL_PT_BR NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_PT_BR NULL
+#define OPTION_VAL_COMPOSITE_PT_BR NULL
+#define OPTION_VAL_SVIDEO_PT_BR NULL
+#define OPTION_VAL_RGB_O9_PT_BR NULL
+#define OPTION_VAL_MONOCHROME_PT_BR NULL
+#define FCEUMM_SNDQUALITY_LABEL_PT_BR NULL
+#define FCEUMM_SNDQUALITY_INFO_0_PT_BR NULL
+#define OPTION_VAL_LOW_PT_BR NULL
+#define OPTION_VAL_HIGH_PT_BR NULL
+#define OPTION_VAL_VERY_HIGH_PT_BR NULL
+#define FCEUMM_SWAPDUTY_LABEL_PT_BR NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_PT_BR NULL
+#define FCEUMM_SWAPDUTY_INFO_0_PT_BR NULL
+#define FCEUMM_SNDVOLUME_LABEL_PT_BR NULL
+#define FCEUMM_SNDVOLUME_INFO_0_PT_BR NULL
+#define OPTION_VAL_0_PT_BR NULL
+#define OPTION_VAL_1_PT_BR NULL
+#define OPTION_VAL_2_PT_BR NULL
+#define OPTION_VAL_3_PT_BR NULL
+#define OPTION_VAL_4_PT_BR NULL
+#define OPTION_VAL_5_PT_BR NULL
+#define OPTION_VAL_6_PT_BR NULL
+#define OPTION_VAL_7_PT_BR NULL
+#define OPTION_VAL_8_PT_BR NULL
+#define OPTION_VAL_9_PT_BR NULL
+#define OPTION_VAL_10_PT_BR NULL
+#define FCEUMM_APU_1_LABEL_PT_BR NULL
+#define FCEUMM_APU_1_LABEL_CAT_PT_BR NULL
+#define FCEUMM_APU_1_INFO_0_PT_BR NULL
+#define FCEUMM_APU_2_LABEL_PT_BR NULL
+#define FCEUMM_APU_2_LABEL_CAT_PT_BR NULL
+#define FCEUMM_APU_2_INFO_0_PT_BR NULL
+#define FCEUMM_APU_3_LABEL_PT_BR NULL
+#define FCEUMM_APU_3_LABEL_CAT_PT_BR NULL
+#define FCEUMM_APU_3_INFO_0_PT_BR NULL
+#define FCEUMM_APU_4_LABEL_PT_BR NULL
+#define FCEUMM_APU_4_LABEL_CAT_PT_BR NULL
+#define FCEUMM_APU_4_INFO_0_PT_BR NULL
+#define FCEUMM_APU_5_LABEL_PT_BR NULL
+#define FCEUMM_APU_5_LABEL_CAT_PT_BR NULL
+#define FCEUMM_APU_5_INFO_0_PT_BR NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_PT_BR NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_PT_BR NULL
+#define OPTION_VAL_NONE_PT_BR NULL
+#define OPTION_VAL_PLAYER_1_PT_BR NULL
+#define OPTION_VAL_PLAYER_2_PT_BR NULL
+#define OPTION_VAL_BOTH_PT_BR NULL
+#define FCEUMM_TURBO_DELAY_LABEL_PT_BR NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_PT_BR NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_PT_BR NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_PT_BR NULL
+#define OPTION_VAL_LIGHTGUN_PT_BR NULL
+#define OPTION_VAL_TOUCHSCREEN_PT_BR NULL
+#define OPTION_VAL_MOUSE_PT_BR NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_PT_BR NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_PT_BR NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_PT_BR NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_PT_BR NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_PT_BR NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_PT_BR NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_PT_BR NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_PT_BR NULL
+#define FCEUMM_OVERCLOCKING_LABEL_PT_BR NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_PT_BR NULL
+#define OPTION_VAL_2X_POSTRENDER_PT_BR NULL
+#define OPTION_VAL_2X_VBLANK_PT_BR NULL
+#define FCEUMM_RAMSTATE_LABEL_PT_BR NULL
+#define FCEUMM_RAMSTATE_INFO_0_PT_BR NULL
+#define OPTION_VAL_FILL_FF_PT_BR NULL
+#define OPTION_VAL_FILL_00_PT_BR NULL
+#define OPTION_VAL_RANDOM_PT_BR NULL
+
+struct retro_core_option_v2_category option_cats_pt_br[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_PT_BR,
+      CATEGORY_SYSTEM_INFO_0_PT_BR
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_PT_BR,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_PT_BR
+#else
+      CATEGORY_VIDEO_INFO_1_PT_BR
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_PT_BR,
+      CATEGORY_AUDIO_INFO_0_PT_BR
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_PT_BR,
+      CATEGORY_INPUT_INFO_0_PT_BR
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_PT_BR,
+      CATEGORY_HACKS_INFO_0_PT_BR
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_PT_BR,
+      CATEGORY_DIP_SWITCH_INFO_0_PT_BR
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_pt_br[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_PT_BR,
+      NULL,
+      FCEUMM_REGION_INFO_0_PT_BR,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_PT_BR },
+         { "NTSC",  OPTION_VAL_NTSC_PT_BR },
+         { "PAL",   OPTION_VAL_PAL_PT_BR },
+         { "Dendy", OPTION_VAL_DENDY_PT_BR },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_PT_BR,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_PT_BR,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_PT_BR,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_PT_BR,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_PT_BR,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_PT_BR,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_PT_BR,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_PT_BR,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_PT_BR },
+         { "4:3",     OPTION_VAL_4_3_PT_BR },
+         { "PP",      OPTION_VAL_PP_PT_BR },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_PT_BR,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_PT_BR,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_PT_BR,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_PT_BR,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_PT_BR,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_PT_BR,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_PT_BR,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_PT_BR,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_PT_BR },
+         { "asqrealc",             OPTION_VAL_ASQREALC_PT_BR },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_PT_BR },
+         { "rgb",                  OPTION_VAL_RGB_PT_BR },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_PT_BR },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_PT_BR },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_PT_BR },
+         { "pal",                  OPTION_VAL_PAL_PT_BR },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_PT_BR },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_PT_BR },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_PT_BR },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_PT_BR },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_PT_BR },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_PT_BR },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_PT_BR },
+         { "nescap",               OPTION_VAL_NESCAP_PT_BR },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_PT_BR },
+         { "raw",                  OPTION_VAL_RAW_PT_BR },
+         { "custom",               OPTION_VAL_CUSTOM_PT_BR },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_PT_BR,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_PT_BR,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_PT_BR },
+         { "svideo",     OPTION_VAL_SVIDEO_PT_BR },
+         { "rgb",        OPTION_VAL_RGB_O9_PT_BR },
+         { "monochrome", OPTION_VAL_MONOCHROME_PT_BR },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_PT_BR,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_PT_BR,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_PT_BR },
+         { "High",      OPTION_VAL_HIGH_PT_BR },
+         { "Very High", OPTION_VAL_VERY_HIGH_PT_BR },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_PT_BR,
+      FCEUMM_SWAPDUTY_LABEL_CAT_PT_BR,
+      FCEUMM_SWAPDUTY_INFO_0_PT_BR,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_PT_BR,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_PT_BR,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_PT_BR },
+         { "1",  OPTION_VAL_1_PT_BR },
+         { "2",  OPTION_VAL_2_PT_BR },
+         { "3",  OPTION_VAL_3_PT_BR },
+         { "4",  OPTION_VAL_4_PT_BR },
+         { "5",  OPTION_VAL_5_PT_BR },
+         { "6",  OPTION_VAL_6_PT_BR },
+         { "7",  OPTION_VAL_7_PT_BR },
+         { "8",  OPTION_VAL_8_PT_BR },
+         { "9",  OPTION_VAL_9_PT_BR },
+         { "10", OPTION_VAL_10_PT_BR },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_PT_BR,
+      FCEUMM_APU_1_LABEL_CAT_PT_BR,
+      FCEUMM_APU_1_INFO_0_PT_BR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_PT_BR,
+      FCEUMM_APU_2_LABEL_CAT_PT_BR,
+      FCEUMM_APU_2_INFO_0_PT_BR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_PT_BR,
+      FCEUMM_APU_3_LABEL_CAT_PT_BR,
+      FCEUMM_APU_3_INFO_0_PT_BR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_PT_BR,
+      FCEUMM_APU_4_LABEL_CAT_PT_BR,
+      FCEUMM_APU_4_INFO_0_PT_BR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_PT_BR,
+      FCEUMM_APU_5_LABEL_CAT_PT_BR,
+      FCEUMM_APU_5_INFO_0_PT_BR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_PT_BR,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_PT_BR,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_PT_BR },
+         { "Player 1", OPTION_VAL_PLAYER_1_PT_BR },
+         { "Player 2", OPTION_VAL_PLAYER_2_PT_BR },
+         { "Both",     OPTION_VAL_BOTH_PT_BR },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_PT_BR,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_PT_BR,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_PT_BR,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_PT_BR,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_PT_BR },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_PT_BR },
+         { "mouse",       OPTION_VAL_MOUSE_PT_BR },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_PT_BR,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_PT_BR,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_PT_BR,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_PT_BR,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_PT_BR,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_PT_BR,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_PT_BR,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_PT_BR,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_PT_BR,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_PT_BR,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_PT_BR },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_PT_BR },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_PT_BR,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_PT_BR,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_PT_BR },
+         { "fill $00", OPTION_VAL_FILL_00_PT_BR },
+         { "random",   OPTION_VAL_RANDOM_PT_BR },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_pt_br = {
+   option_cats_pt_br,
+   option_defs_pt_br
+};
+
+/* RETRO_LANGUAGE_PT_PT */
+
+#define CATEGORY_SYSTEM_LABEL_PT_PT NULL
+#define CATEGORY_SYSTEM_INFO_0_PT_PT NULL
+#define CATEGORY_VIDEO_LABEL_PT_PT "Vídeo"
+#define CATEGORY_VIDEO_INFO_0_PT_PT NULL
+#define CATEGORY_VIDEO_INFO_1_PT_PT NULL
+#define CATEGORY_AUDIO_LABEL_PT_PT "Áudio"
+#define CATEGORY_AUDIO_INFO_0_PT_PT NULL
+#define CATEGORY_INPUT_LABEL_PT_PT "Entrada"
+#define CATEGORY_INPUT_INFO_0_PT_PT NULL
+#define CATEGORY_HACKS_LABEL_PT_PT NULL
+#define CATEGORY_HACKS_INFO_0_PT_PT NULL
+#define CATEGORY_DIP_SWITCH_LABEL_PT_PT NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_PT_PT NULL
+#define FCEUMM_REGION_LABEL_PT_PT NULL
+#define FCEUMM_REGION_INFO_0_PT_PT NULL
+#define OPTION_VAL_AUTO_PT_PT NULL
+#define OPTION_VAL_NTSC_PT_PT NULL
+#define OPTION_VAL_PAL_PT_PT NULL
+#define OPTION_VAL_DENDY_PT_PT NULL
+#define FCEUMM_GAME_GENIE_LABEL_PT_PT NULL
+#define FCEUMM_GAME_GENIE_INFO_0_PT_PT NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_PT_PT NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_PT_PT NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_PT_PT NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_PT_PT NULL
+#define FCEUMM_ASPECT_LABEL_PT_PT NULL
+#define FCEUMM_ASPECT_INFO_0_PT_PT NULL
+#define OPTION_VAL_8_7_PAR_PT_PT NULL
+#define OPTION_VAL_4_3_PT_PT NULL
+#define OPTION_VAL_PP_PT_PT NULL
+#define FCEUMM_OVERSCAN_LABEL_PT_PT NULL
+#define FCEUMM_OVERSCAN_INFO_0_PT_PT NULL
+#define FCEUMM_OVERSCAN_H_LABEL_PT_PT NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_PT_PT NULL
+#define FCEUMM_OVERSCAN_V_LABEL_PT_PT NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_PT_PT NULL
+#define FCEUMM_PALETTE_LABEL_PT_PT NULL
+#define FCEUMM_PALETTE_INFO_0_PT_PT NULL
+#define OPTION_VAL_DEFAULT_PT_PT NULL
+#define OPTION_VAL_ASQREALC_PT_PT NULL
+#define OPTION_VAL_NINTENDO_VC_PT_PT NULL
+#define OPTION_VAL_RGB_PT_PT NULL
+#define OPTION_VAL_YUV_V3_PT_PT NULL
+#define OPTION_VAL_UNSATURATED_FINAL_PT_PT NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_PT_PT NULL
+#define OPTION_VAL_BMF_FINAL2_PT_PT NULL
+#define OPTION_VAL_BMF_FINAL3_PT_PT NULL
+#define OPTION_VAL_SMOOTH_FBX_PT_PT NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_PT_PT NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_PT_PT NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_PT_PT NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_PT_PT NULL
+#define OPTION_VAL_NESCAP_PT_PT NULL
+#define OPTION_VAL_WAVEBEAM_PT_PT NULL
+#define OPTION_VAL_RAW_PT_PT NULL
+#define OPTION_VAL_CUSTOM_PT_PT NULL
+#define FCEUMM_NTSC_FILTER_LABEL_PT_PT NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_PT_PT NULL
+#define OPTION_VAL_COMPOSITE_PT_PT NULL
+#define OPTION_VAL_SVIDEO_PT_PT NULL
+#define OPTION_VAL_RGB_O9_PT_PT NULL
+#define OPTION_VAL_MONOCHROME_PT_PT NULL
+#define FCEUMM_SNDQUALITY_LABEL_PT_PT NULL
+#define FCEUMM_SNDQUALITY_INFO_0_PT_PT NULL
+#define OPTION_VAL_LOW_PT_PT NULL
+#define OPTION_VAL_HIGH_PT_PT NULL
+#define OPTION_VAL_VERY_HIGH_PT_PT NULL
+#define FCEUMM_SWAPDUTY_LABEL_PT_PT NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_PT_PT NULL
+#define FCEUMM_SWAPDUTY_INFO_0_PT_PT NULL
+#define FCEUMM_SNDVOLUME_LABEL_PT_PT NULL
+#define FCEUMM_SNDVOLUME_INFO_0_PT_PT NULL
+#define OPTION_VAL_0_PT_PT NULL
+#define OPTION_VAL_1_PT_PT NULL
+#define OPTION_VAL_2_PT_PT NULL
+#define OPTION_VAL_3_PT_PT NULL
+#define OPTION_VAL_4_PT_PT NULL
+#define OPTION_VAL_5_PT_PT NULL
+#define OPTION_VAL_6_PT_PT NULL
+#define OPTION_VAL_7_PT_PT NULL
+#define OPTION_VAL_8_PT_PT NULL
+#define OPTION_VAL_9_PT_PT NULL
+#define OPTION_VAL_10_PT_PT NULL
+#define FCEUMM_APU_1_LABEL_PT_PT NULL
+#define FCEUMM_APU_1_LABEL_CAT_PT_PT NULL
+#define FCEUMM_APU_1_INFO_0_PT_PT NULL
+#define FCEUMM_APU_2_LABEL_PT_PT NULL
+#define FCEUMM_APU_2_LABEL_CAT_PT_PT NULL
+#define FCEUMM_APU_2_INFO_0_PT_PT NULL
+#define FCEUMM_APU_3_LABEL_PT_PT NULL
+#define FCEUMM_APU_3_LABEL_CAT_PT_PT NULL
+#define FCEUMM_APU_3_INFO_0_PT_PT NULL
+#define FCEUMM_APU_4_LABEL_PT_PT NULL
+#define FCEUMM_APU_4_LABEL_CAT_PT_PT NULL
+#define FCEUMM_APU_4_INFO_0_PT_PT NULL
+#define FCEUMM_APU_5_LABEL_PT_PT NULL
+#define FCEUMM_APU_5_LABEL_CAT_PT_PT NULL
+#define FCEUMM_APU_5_INFO_0_PT_PT NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_PT_PT NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_PT_PT NULL
+#define OPTION_VAL_NONE_PT_PT NULL
+#define OPTION_VAL_PLAYER_1_PT_PT NULL
+#define OPTION_VAL_PLAYER_2_PT_PT NULL
+#define OPTION_VAL_BOTH_PT_PT NULL
+#define FCEUMM_TURBO_DELAY_LABEL_PT_PT NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_PT_PT NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_PT_PT NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_PT_PT NULL
+#define OPTION_VAL_LIGHTGUN_PT_PT NULL
+#define OPTION_VAL_TOUCHSCREEN_PT_PT NULL
+#define OPTION_VAL_MOUSE_PT_PT NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_PT_PT NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_PT_PT NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_PT_PT NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_PT_PT NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_PT_PT NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_PT_PT NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_PT_PT NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_PT_PT NULL
+#define FCEUMM_OVERCLOCKING_LABEL_PT_PT NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_PT_PT NULL
+#define OPTION_VAL_2X_POSTRENDER_PT_PT NULL
+#define OPTION_VAL_2X_VBLANK_PT_PT NULL
+#define FCEUMM_RAMSTATE_LABEL_PT_PT NULL
+#define FCEUMM_RAMSTATE_INFO_0_PT_PT NULL
+#define OPTION_VAL_FILL_FF_PT_PT NULL
+#define OPTION_VAL_FILL_00_PT_PT NULL
+#define OPTION_VAL_RANDOM_PT_PT NULL
+
+struct retro_core_option_v2_category option_cats_pt_pt[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_PT_PT,
+      CATEGORY_SYSTEM_INFO_0_PT_PT
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_PT_PT,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_PT_PT
+#else
+      CATEGORY_VIDEO_INFO_1_PT_PT
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_PT_PT,
+      CATEGORY_AUDIO_INFO_0_PT_PT
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_PT_PT,
+      CATEGORY_INPUT_INFO_0_PT_PT
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_PT_PT,
+      CATEGORY_HACKS_INFO_0_PT_PT
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_PT_PT,
+      CATEGORY_DIP_SWITCH_INFO_0_PT_PT
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_pt_pt[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_PT_PT,
+      NULL,
+      FCEUMM_REGION_INFO_0_PT_PT,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_PT_PT },
+         { "NTSC",  OPTION_VAL_NTSC_PT_PT },
+         { "PAL",   OPTION_VAL_PAL_PT_PT },
+         { "Dendy", OPTION_VAL_DENDY_PT_PT },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_PT_PT,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_PT_PT,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_PT_PT,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_PT_PT,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_PT_PT,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_PT_PT,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_PT_PT,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_PT_PT,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_PT_PT },
+         { "4:3",     OPTION_VAL_4_3_PT_PT },
+         { "PP",      OPTION_VAL_PP_PT_PT },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_PT_PT,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_PT_PT,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_PT_PT,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_PT_PT,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_PT_PT,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_PT_PT,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_PT_PT,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_PT_PT,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_PT_PT },
+         { "asqrealc",             OPTION_VAL_ASQREALC_PT_PT },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_PT_PT },
+         { "rgb",                  OPTION_VAL_RGB_PT_PT },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_PT_PT },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_PT_PT },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_PT_PT },
+         { "pal",                  OPTION_VAL_PAL_PT_PT },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_PT_PT },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_PT_PT },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_PT_PT },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_PT_PT },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_PT_PT },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_PT_PT },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_PT_PT },
+         { "nescap",               OPTION_VAL_NESCAP_PT_PT },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_PT_PT },
+         { "raw",                  OPTION_VAL_RAW_PT_PT },
+         { "custom",               OPTION_VAL_CUSTOM_PT_PT },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_PT_PT,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_PT_PT,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_PT_PT },
+         { "svideo",     OPTION_VAL_SVIDEO_PT_PT },
+         { "rgb",        OPTION_VAL_RGB_O9_PT_PT },
+         { "monochrome", OPTION_VAL_MONOCHROME_PT_PT },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_PT_PT,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_PT_PT,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_PT_PT },
+         { "High",      OPTION_VAL_HIGH_PT_PT },
+         { "Very High", OPTION_VAL_VERY_HIGH_PT_PT },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_PT_PT,
+      FCEUMM_SWAPDUTY_LABEL_CAT_PT_PT,
+      FCEUMM_SWAPDUTY_INFO_0_PT_PT,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_PT_PT,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_PT_PT,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_PT_PT },
+         { "1",  OPTION_VAL_1_PT_PT },
+         { "2",  OPTION_VAL_2_PT_PT },
+         { "3",  OPTION_VAL_3_PT_PT },
+         { "4",  OPTION_VAL_4_PT_PT },
+         { "5",  OPTION_VAL_5_PT_PT },
+         { "6",  OPTION_VAL_6_PT_PT },
+         { "7",  OPTION_VAL_7_PT_PT },
+         { "8",  OPTION_VAL_8_PT_PT },
+         { "9",  OPTION_VAL_9_PT_PT },
+         { "10", OPTION_VAL_10_PT_PT },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_PT_PT,
+      FCEUMM_APU_1_LABEL_CAT_PT_PT,
+      FCEUMM_APU_1_INFO_0_PT_PT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_PT_PT,
+      FCEUMM_APU_2_LABEL_CAT_PT_PT,
+      FCEUMM_APU_2_INFO_0_PT_PT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_PT_PT,
+      FCEUMM_APU_3_LABEL_CAT_PT_PT,
+      FCEUMM_APU_3_INFO_0_PT_PT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_PT_PT,
+      FCEUMM_APU_4_LABEL_CAT_PT_PT,
+      FCEUMM_APU_4_INFO_0_PT_PT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_PT_PT,
+      FCEUMM_APU_5_LABEL_CAT_PT_PT,
+      FCEUMM_APU_5_INFO_0_PT_PT,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_PT_PT,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_PT_PT,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_PT_PT },
+         { "Player 1", OPTION_VAL_PLAYER_1_PT_PT },
+         { "Player 2", OPTION_VAL_PLAYER_2_PT_PT },
+         { "Both",     OPTION_VAL_BOTH_PT_PT },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_PT_PT,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_PT_PT,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_PT_PT,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_PT_PT,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_PT_PT },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_PT_PT },
+         { "mouse",       OPTION_VAL_MOUSE_PT_PT },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_PT_PT,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_PT_PT,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_PT_PT,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_PT_PT,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_PT_PT,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_PT_PT,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_PT_PT,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_PT_PT,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_PT_PT,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_PT_PT,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_PT_PT },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_PT_PT },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_PT_PT,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_PT_PT,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_PT_PT },
+         { "fill $00", OPTION_VAL_FILL_00_PT_PT },
+         { "random",   OPTION_VAL_RANDOM_PT_PT },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_pt_pt = {
+   option_cats_pt_pt,
+   option_defs_pt_pt
+};
+
+/* RETRO_LANGUAGE_RO */
+
+#define CATEGORY_SYSTEM_LABEL_RO NULL
+#define CATEGORY_SYSTEM_INFO_0_RO NULL
+#define CATEGORY_VIDEO_LABEL_RO NULL
+#define CATEGORY_VIDEO_INFO_0_RO NULL
+#define CATEGORY_VIDEO_INFO_1_RO NULL
+#define CATEGORY_AUDIO_LABEL_RO NULL
+#define CATEGORY_AUDIO_INFO_0_RO NULL
+#define CATEGORY_INPUT_LABEL_RO NULL
+#define CATEGORY_INPUT_INFO_0_RO NULL
+#define CATEGORY_HACKS_LABEL_RO NULL
+#define CATEGORY_HACKS_INFO_0_RO NULL
+#define CATEGORY_DIP_SWITCH_LABEL_RO NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_RO NULL
+#define FCEUMM_REGION_LABEL_RO NULL
+#define FCEUMM_REGION_INFO_0_RO NULL
+#define OPTION_VAL_AUTO_RO NULL
+#define OPTION_VAL_NTSC_RO NULL
+#define OPTION_VAL_PAL_RO NULL
+#define OPTION_VAL_DENDY_RO NULL
+#define FCEUMM_GAME_GENIE_LABEL_RO NULL
+#define FCEUMM_GAME_GENIE_INFO_0_RO NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_RO NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_RO NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_RO NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_RO NULL
+#define FCEUMM_ASPECT_LABEL_RO NULL
+#define FCEUMM_ASPECT_INFO_0_RO NULL
+#define OPTION_VAL_8_7_PAR_RO NULL
+#define OPTION_VAL_4_3_RO NULL
+#define OPTION_VAL_PP_RO NULL
+#define FCEUMM_OVERSCAN_LABEL_RO NULL
+#define FCEUMM_OVERSCAN_INFO_0_RO NULL
+#define FCEUMM_OVERSCAN_H_LABEL_RO NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_RO NULL
+#define FCEUMM_OVERSCAN_V_LABEL_RO NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_RO NULL
+#define FCEUMM_PALETTE_LABEL_RO NULL
+#define FCEUMM_PALETTE_INFO_0_RO NULL
+#define OPTION_VAL_DEFAULT_RO NULL
+#define OPTION_VAL_ASQREALC_RO NULL
+#define OPTION_VAL_NINTENDO_VC_RO NULL
+#define OPTION_VAL_RGB_RO NULL
+#define OPTION_VAL_YUV_V3_RO NULL
+#define OPTION_VAL_UNSATURATED_FINAL_RO NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_RO NULL
+#define OPTION_VAL_BMF_FINAL2_RO NULL
+#define OPTION_VAL_BMF_FINAL3_RO NULL
+#define OPTION_VAL_SMOOTH_FBX_RO NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_RO NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_RO NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_RO NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_RO NULL
+#define OPTION_VAL_NESCAP_RO NULL
+#define OPTION_VAL_WAVEBEAM_RO NULL
+#define OPTION_VAL_RAW_RO NULL
+#define OPTION_VAL_CUSTOM_RO NULL
+#define FCEUMM_NTSC_FILTER_LABEL_RO NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_RO NULL
+#define OPTION_VAL_COMPOSITE_RO NULL
+#define OPTION_VAL_SVIDEO_RO NULL
+#define OPTION_VAL_RGB_O9_RO NULL
+#define OPTION_VAL_MONOCHROME_RO NULL
+#define FCEUMM_SNDQUALITY_LABEL_RO NULL
+#define FCEUMM_SNDQUALITY_INFO_0_RO NULL
+#define OPTION_VAL_LOW_RO NULL
+#define OPTION_VAL_HIGH_RO NULL
+#define OPTION_VAL_VERY_HIGH_RO NULL
+#define FCEUMM_SWAPDUTY_LABEL_RO NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_RO NULL
+#define FCEUMM_SWAPDUTY_INFO_0_RO NULL
+#define FCEUMM_SNDVOLUME_LABEL_RO NULL
+#define FCEUMM_SNDVOLUME_INFO_0_RO NULL
+#define OPTION_VAL_0_RO NULL
+#define OPTION_VAL_1_RO NULL
+#define OPTION_VAL_2_RO NULL
+#define OPTION_VAL_3_RO NULL
+#define OPTION_VAL_4_RO NULL
+#define OPTION_VAL_5_RO NULL
+#define OPTION_VAL_6_RO NULL
+#define OPTION_VAL_7_RO NULL
+#define OPTION_VAL_8_RO NULL
+#define OPTION_VAL_9_RO NULL
+#define OPTION_VAL_10_RO NULL
+#define FCEUMM_APU_1_LABEL_RO NULL
+#define FCEUMM_APU_1_LABEL_CAT_RO NULL
+#define FCEUMM_APU_1_INFO_0_RO NULL
+#define FCEUMM_APU_2_LABEL_RO NULL
+#define FCEUMM_APU_2_LABEL_CAT_RO NULL
+#define FCEUMM_APU_2_INFO_0_RO NULL
+#define FCEUMM_APU_3_LABEL_RO NULL
+#define FCEUMM_APU_3_LABEL_CAT_RO NULL
+#define FCEUMM_APU_3_INFO_0_RO NULL
+#define FCEUMM_APU_4_LABEL_RO NULL
+#define FCEUMM_APU_4_LABEL_CAT_RO NULL
+#define FCEUMM_APU_4_INFO_0_RO NULL
+#define FCEUMM_APU_5_LABEL_RO NULL
+#define FCEUMM_APU_5_LABEL_CAT_RO NULL
+#define FCEUMM_APU_5_INFO_0_RO NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_RO NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_RO NULL
+#define OPTION_VAL_NONE_RO NULL
+#define OPTION_VAL_PLAYER_1_RO NULL
+#define OPTION_VAL_PLAYER_2_RO NULL
+#define OPTION_VAL_BOTH_RO NULL
+#define FCEUMM_TURBO_DELAY_LABEL_RO NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_RO NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_RO NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_RO NULL
+#define OPTION_VAL_LIGHTGUN_RO NULL
+#define OPTION_VAL_TOUCHSCREEN_RO NULL
+#define OPTION_VAL_MOUSE_RO NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_RO NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_RO NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_RO NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_RO NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_RO NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_RO NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_RO NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_RO NULL
+#define FCEUMM_OVERCLOCKING_LABEL_RO NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_RO NULL
+#define OPTION_VAL_2X_POSTRENDER_RO NULL
+#define OPTION_VAL_2X_VBLANK_RO NULL
+#define FCEUMM_RAMSTATE_LABEL_RO NULL
+#define FCEUMM_RAMSTATE_INFO_0_RO NULL
+#define OPTION_VAL_FILL_FF_RO NULL
+#define OPTION_VAL_FILL_00_RO NULL
+#define OPTION_VAL_RANDOM_RO NULL
+
+struct retro_core_option_v2_category option_cats_ro[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_RO,
+      CATEGORY_SYSTEM_INFO_0_RO
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_RO,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_RO
+#else
+      CATEGORY_VIDEO_INFO_1_RO
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_RO,
+      CATEGORY_AUDIO_INFO_0_RO
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_RO,
+      CATEGORY_INPUT_INFO_0_RO
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_RO,
+      CATEGORY_HACKS_INFO_0_RO
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_RO,
+      CATEGORY_DIP_SWITCH_INFO_0_RO
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_ro[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_RO,
+      NULL,
+      FCEUMM_REGION_INFO_0_RO,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_RO },
+         { "NTSC",  OPTION_VAL_NTSC_RO },
+         { "PAL",   OPTION_VAL_PAL_RO },
+         { "Dendy", OPTION_VAL_DENDY_RO },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_RO,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_RO,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_RO,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_RO,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_RO,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_RO,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_RO,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_RO,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_RO },
+         { "4:3",     OPTION_VAL_4_3_RO },
+         { "PP",      OPTION_VAL_PP_RO },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_RO,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_RO,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_RO,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_RO,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_RO,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_RO,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_RO,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_RO,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_RO },
+         { "asqrealc",             OPTION_VAL_ASQREALC_RO },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_RO },
+         { "rgb",                  OPTION_VAL_RGB_RO },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_RO },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_RO },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_RO },
+         { "pal",                  OPTION_VAL_PAL_RO },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_RO },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_RO },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_RO },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_RO },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_RO },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_RO },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_RO },
+         { "nescap",               OPTION_VAL_NESCAP_RO },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_RO },
+         { "raw",                  OPTION_VAL_RAW_RO },
+         { "custom",               OPTION_VAL_CUSTOM_RO },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_RO,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_RO,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_RO },
+         { "svideo",     OPTION_VAL_SVIDEO_RO },
+         { "rgb",        OPTION_VAL_RGB_O9_RO },
+         { "monochrome", OPTION_VAL_MONOCHROME_RO },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_RO,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_RO,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_RO },
+         { "High",      OPTION_VAL_HIGH_RO },
+         { "Very High", OPTION_VAL_VERY_HIGH_RO },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_RO,
+      FCEUMM_SWAPDUTY_LABEL_CAT_RO,
+      FCEUMM_SWAPDUTY_INFO_0_RO,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_RO,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_RO,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_RO },
+         { "1",  OPTION_VAL_1_RO },
+         { "2",  OPTION_VAL_2_RO },
+         { "3",  OPTION_VAL_3_RO },
+         { "4",  OPTION_VAL_4_RO },
+         { "5",  OPTION_VAL_5_RO },
+         { "6",  OPTION_VAL_6_RO },
+         { "7",  OPTION_VAL_7_RO },
+         { "8",  OPTION_VAL_8_RO },
+         { "9",  OPTION_VAL_9_RO },
+         { "10", OPTION_VAL_10_RO },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_RO,
+      FCEUMM_APU_1_LABEL_CAT_RO,
+      FCEUMM_APU_1_INFO_0_RO,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_RO,
+      FCEUMM_APU_2_LABEL_CAT_RO,
+      FCEUMM_APU_2_INFO_0_RO,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_RO,
+      FCEUMM_APU_3_LABEL_CAT_RO,
+      FCEUMM_APU_3_INFO_0_RO,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_RO,
+      FCEUMM_APU_4_LABEL_CAT_RO,
+      FCEUMM_APU_4_INFO_0_RO,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_RO,
+      FCEUMM_APU_5_LABEL_CAT_RO,
+      FCEUMM_APU_5_INFO_0_RO,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_RO,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_RO,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_RO },
+         { "Player 1", OPTION_VAL_PLAYER_1_RO },
+         { "Player 2", OPTION_VAL_PLAYER_2_RO },
+         { "Both",     OPTION_VAL_BOTH_RO },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_RO,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_RO,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_RO,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_RO,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_RO },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_RO },
+         { "mouse",       OPTION_VAL_MOUSE_RO },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_RO,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_RO,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_RO,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_RO,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_RO,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_RO,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_RO,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_RO,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_RO,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_RO,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_RO },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_RO },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_RO,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_RO,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_RO },
+         { "fill $00", OPTION_VAL_FILL_00_RO },
+         { "random",   OPTION_VAL_RANDOM_RO },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_ro = {
+   option_cats_ro,
+   option_defs_ro
+};
+
+/* RETRO_LANGUAGE_RU */
+
+#define CATEGORY_SYSTEM_LABEL_RU "Системные"
+#define CATEGORY_SYSTEM_INFO_0_RU NULL
+#define CATEGORY_VIDEO_LABEL_RU "Видео"
+#define CATEGORY_VIDEO_INFO_0_RU NULL
+#define CATEGORY_VIDEO_INFO_1_RU NULL
+#define CATEGORY_AUDIO_LABEL_RU "Аудио"
+#define CATEGORY_AUDIO_INFO_0_RU NULL
+#define CATEGORY_INPUT_LABEL_RU "Ввод"
+#define CATEGORY_INPUT_INFO_0_RU NULL
+#define CATEGORY_HACKS_LABEL_RU "Хаки эмуляции"
+#define CATEGORY_HACKS_INFO_0_RU "Настройка разгона процессора и параметров точности эмуляции, влияющих на производительность и совместимость."
+#define CATEGORY_DIP_SWITCH_LABEL_RU NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_RU NULL
+#define FCEUMM_REGION_LABEL_RU NULL
+#define FCEUMM_REGION_INFO_0_RU NULL
+#define OPTION_VAL_AUTO_RU NULL
+#define OPTION_VAL_NTSC_RU NULL
+#define OPTION_VAL_PAL_RU NULL
+#define OPTION_VAL_DENDY_RU NULL
+#define FCEUMM_GAME_GENIE_LABEL_RU NULL
+#define FCEUMM_GAME_GENIE_INFO_0_RU NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_RU NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_RU NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_RU NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_RU NULL
+#define FCEUMM_ASPECT_LABEL_RU NULL
+#define FCEUMM_ASPECT_INFO_0_RU NULL
+#define OPTION_VAL_8_7_PAR_RU NULL
+#define OPTION_VAL_4_3_RU NULL
+#define OPTION_VAL_PP_RU NULL
+#define FCEUMM_OVERSCAN_LABEL_RU NULL
+#define FCEUMM_OVERSCAN_INFO_0_RU NULL
+#define FCEUMM_OVERSCAN_H_LABEL_RU NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_RU NULL
+#define FCEUMM_OVERSCAN_V_LABEL_RU NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_RU NULL
+#define FCEUMM_PALETTE_LABEL_RU NULL
+#define FCEUMM_PALETTE_INFO_0_RU NULL
+#define OPTION_VAL_DEFAULT_RU NULL
+#define OPTION_VAL_ASQREALC_RU NULL
+#define OPTION_VAL_NINTENDO_VC_RU NULL
+#define OPTION_VAL_RGB_RU NULL
+#define OPTION_VAL_YUV_V3_RU NULL
+#define OPTION_VAL_UNSATURATED_FINAL_RU NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_RU NULL
+#define OPTION_VAL_BMF_FINAL2_RU NULL
+#define OPTION_VAL_BMF_FINAL3_RU NULL
+#define OPTION_VAL_SMOOTH_FBX_RU NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_RU NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_RU NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_RU NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_RU NULL
+#define OPTION_VAL_NESCAP_RU NULL
+#define OPTION_VAL_WAVEBEAM_RU NULL
+#define OPTION_VAL_RAW_RU NULL
+#define OPTION_VAL_CUSTOM_RU NULL
+#define FCEUMM_NTSC_FILTER_LABEL_RU NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_RU NULL
+#define OPTION_VAL_COMPOSITE_RU NULL
+#define OPTION_VAL_SVIDEO_RU NULL
+#define OPTION_VAL_RGB_O9_RU NULL
+#define OPTION_VAL_MONOCHROME_RU NULL
+#define FCEUMM_SNDQUALITY_LABEL_RU NULL
+#define FCEUMM_SNDQUALITY_INFO_0_RU NULL
+#define OPTION_VAL_LOW_RU NULL
+#define OPTION_VAL_HIGH_RU NULL
+#define OPTION_VAL_VERY_HIGH_RU NULL
+#define FCEUMM_SWAPDUTY_LABEL_RU NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_RU NULL
+#define FCEUMM_SWAPDUTY_INFO_0_RU NULL
+#define FCEUMM_SNDVOLUME_LABEL_RU NULL
+#define FCEUMM_SNDVOLUME_INFO_0_RU NULL
+#define OPTION_VAL_0_RU NULL
+#define OPTION_VAL_1_RU NULL
+#define OPTION_VAL_2_RU NULL
+#define OPTION_VAL_3_RU NULL
+#define OPTION_VAL_4_RU NULL
+#define OPTION_VAL_5_RU NULL
+#define OPTION_VAL_6_RU NULL
+#define OPTION_VAL_7_RU NULL
+#define OPTION_VAL_8_RU NULL
+#define OPTION_VAL_9_RU NULL
+#define OPTION_VAL_10_RU NULL
+#define FCEUMM_APU_1_LABEL_RU NULL
+#define FCEUMM_APU_1_LABEL_CAT_RU NULL
+#define FCEUMM_APU_1_INFO_0_RU NULL
+#define FCEUMM_APU_2_LABEL_RU NULL
+#define FCEUMM_APU_2_LABEL_CAT_RU NULL
+#define FCEUMM_APU_2_INFO_0_RU NULL
+#define FCEUMM_APU_3_LABEL_RU NULL
+#define FCEUMM_APU_3_LABEL_CAT_RU NULL
+#define FCEUMM_APU_3_INFO_0_RU NULL
+#define FCEUMM_APU_4_LABEL_RU NULL
+#define FCEUMM_APU_4_LABEL_CAT_RU NULL
+#define FCEUMM_APU_4_INFO_0_RU NULL
+#define FCEUMM_APU_5_LABEL_RU NULL
+#define FCEUMM_APU_5_LABEL_CAT_RU NULL
+#define FCEUMM_APU_5_INFO_0_RU NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_RU NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_RU NULL
+#define OPTION_VAL_NONE_RU NULL
+#define OPTION_VAL_PLAYER_1_RU NULL
+#define OPTION_VAL_PLAYER_2_RU NULL
+#define OPTION_VAL_BOTH_RU NULL
+#define FCEUMM_TURBO_DELAY_LABEL_RU NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_RU NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_RU NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_RU NULL
+#define OPTION_VAL_LIGHTGUN_RU NULL
+#define OPTION_VAL_TOUCHSCREEN_RU NULL
+#define OPTION_VAL_MOUSE_RU NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_RU NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_RU NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_RU NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_RU NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_RU NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_RU NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_RU NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_RU NULL
+#define FCEUMM_OVERCLOCKING_LABEL_RU NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_RU NULL
+#define OPTION_VAL_2X_POSTRENDER_RU NULL
+#define OPTION_VAL_2X_VBLANK_RU NULL
+#define FCEUMM_RAMSTATE_LABEL_RU NULL
+#define FCEUMM_RAMSTATE_INFO_0_RU NULL
+#define OPTION_VAL_FILL_FF_RU NULL
+#define OPTION_VAL_FILL_00_RU NULL
+#define OPTION_VAL_RANDOM_RU NULL
+
+struct retro_core_option_v2_category option_cats_ru[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_RU,
+      CATEGORY_SYSTEM_INFO_0_RU
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_RU,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_RU
+#else
+      CATEGORY_VIDEO_INFO_1_RU
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_RU,
+      CATEGORY_AUDIO_INFO_0_RU
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_RU,
+      CATEGORY_INPUT_INFO_0_RU
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_RU,
+      CATEGORY_HACKS_INFO_0_RU
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_RU,
+      CATEGORY_DIP_SWITCH_INFO_0_RU
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_ru[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_RU,
+      NULL,
+      FCEUMM_REGION_INFO_0_RU,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_RU },
+         { "NTSC",  OPTION_VAL_NTSC_RU },
+         { "PAL",   OPTION_VAL_PAL_RU },
+         { "Dendy", OPTION_VAL_DENDY_RU },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_RU,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_RU,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_RU,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_RU,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_RU,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_RU,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_RU,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_RU,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_RU },
+         { "4:3",     OPTION_VAL_4_3_RU },
+         { "PP",      OPTION_VAL_PP_RU },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_RU,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_RU,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_RU,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_RU,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_RU,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_RU,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_RU,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_RU,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_RU },
+         { "asqrealc",             OPTION_VAL_ASQREALC_RU },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_RU },
+         { "rgb",                  OPTION_VAL_RGB_RU },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_RU },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_RU },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_RU },
+         { "pal",                  OPTION_VAL_PAL_RU },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_RU },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_RU },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_RU },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_RU },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_RU },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_RU },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_RU },
+         { "nescap",               OPTION_VAL_NESCAP_RU },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_RU },
+         { "raw",                  OPTION_VAL_RAW_RU },
+         { "custom",               OPTION_VAL_CUSTOM_RU },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_RU,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_RU,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_RU },
+         { "svideo",     OPTION_VAL_SVIDEO_RU },
+         { "rgb",        OPTION_VAL_RGB_O9_RU },
+         { "monochrome", OPTION_VAL_MONOCHROME_RU },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_RU,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_RU,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_RU },
+         { "High",      OPTION_VAL_HIGH_RU },
+         { "Very High", OPTION_VAL_VERY_HIGH_RU },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_RU,
+      FCEUMM_SWAPDUTY_LABEL_CAT_RU,
+      FCEUMM_SWAPDUTY_INFO_0_RU,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_RU,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_RU,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_RU },
+         { "1",  OPTION_VAL_1_RU },
+         { "2",  OPTION_VAL_2_RU },
+         { "3",  OPTION_VAL_3_RU },
+         { "4",  OPTION_VAL_4_RU },
+         { "5",  OPTION_VAL_5_RU },
+         { "6",  OPTION_VAL_6_RU },
+         { "7",  OPTION_VAL_7_RU },
+         { "8",  OPTION_VAL_8_RU },
+         { "9",  OPTION_VAL_9_RU },
+         { "10", OPTION_VAL_10_RU },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_RU,
+      FCEUMM_APU_1_LABEL_CAT_RU,
+      FCEUMM_APU_1_INFO_0_RU,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_RU,
+      FCEUMM_APU_2_LABEL_CAT_RU,
+      FCEUMM_APU_2_INFO_0_RU,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_RU,
+      FCEUMM_APU_3_LABEL_CAT_RU,
+      FCEUMM_APU_3_INFO_0_RU,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_RU,
+      FCEUMM_APU_4_LABEL_CAT_RU,
+      FCEUMM_APU_4_INFO_0_RU,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_RU,
+      FCEUMM_APU_5_LABEL_CAT_RU,
+      FCEUMM_APU_5_INFO_0_RU,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_RU,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_RU,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_RU },
+         { "Player 1", OPTION_VAL_PLAYER_1_RU },
+         { "Player 2", OPTION_VAL_PLAYER_2_RU },
+         { "Both",     OPTION_VAL_BOTH_RU },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_RU,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_RU,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_RU,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_RU,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_RU },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_RU },
+         { "mouse",       OPTION_VAL_MOUSE_RU },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_RU,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_RU,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_RU,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_RU,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_RU,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_RU,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_RU,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_RU,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_RU,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_RU,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_RU },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_RU },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_RU,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_RU,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_RU },
+         { "fill $00", OPTION_VAL_FILL_00_RU },
+         { "random",   OPTION_VAL_RANDOM_RU },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_ru = {
+   option_cats_ru,
+   option_defs_ru
+};
+
+/* RETRO_LANGUAGE_SI */
+
+#define CATEGORY_SYSTEM_LABEL_SI NULL
+#define CATEGORY_SYSTEM_INFO_0_SI NULL
+#define CATEGORY_VIDEO_LABEL_SI NULL
+#define CATEGORY_VIDEO_INFO_0_SI NULL
+#define CATEGORY_VIDEO_INFO_1_SI NULL
+#define CATEGORY_AUDIO_LABEL_SI NULL
+#define CATEGORY_AUDIO_INFO_0_SI NULL
+#define CATEGORY_INPUT_LABEL_SI NULL
+#define CATEGORY_INPUT_INFO_0_SI NULL
+#define CATEGORY_HACKS_LABEL_SI NULL
+#define CATEGORY_HACKS_INFO_0_SI NULL
+#define CATEGORY_DIP_SWITCH_LABEL_SI NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_SI NULL
+#define FCEUMM_REGION_LABEL_SI NULL
+#define FCEUMM_REGION_INFO_0_SI NULL
+#define OPTION_VAL_AUTO_SI NULL
+#define OPTION_VAL_NTSC_SI NULL
+#define OPTION_VAL_PAL_SI NULL
+#define OPTION_VAL_DENDY_SI NULL
+#define FCEUMM_GAME_GENIE_LABEL_SI NULL
+#define FCEUMM_GAME_GENIE_INFO_0_SI NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_SI NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_SI NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_SI NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_SI NULL
+#define FCEUMM_ASPECT_LABEL_SI NULL
+#define FCEUMM_ASPECT_INFO_0_SI NULL
+#define OPTION_VAL_8_7_PAR_SI NULL
+#define OPTION_VAL_4_3_SI NULL
+#define OPTION_VAL_PP_SI NULL
+#define FCEUMM_OVERSCAN_LABEL_SI NULL
+#define FCEUMM_OVERSCAN_INFO_0_SI NULL
+#define FCEUMM_OVERSCAN_H_LABEL_SI NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_SI NULL
+#define FCEUMM_OVERSCAN_V_LABEL_SI NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_SI NULL
+#define FCEUMM_PALETTE_LABEL_SI NULL
+#define FCEUMM_PALETTE_INFO_0_SI NULL
+#define OPTION_VAL_DEFAULT_SI NULL
+#define OPTION_VAL_ASQREALC_SI NULL
+#define OPTION_VAL_NINTENDO_VC_SI NULL
+#define OPTION_VAL_RGB_SI NULL
+#define OPTION_VAL_YUV_V3_SI NULL
+#define OPTION_VAL_UNSATURATED_FINAL_SI NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_SI NULL
+#define OPTION_VAL_BMF_FINAL2_SI NULL
+#define OPTION_VAL_BMF_FINAL3_SI NULL
+#define OPTION_VAL_SMOOTH_FBX_SI NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_SI NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_SI NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_SI NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_SI NULL
+#define OPTION_VAL_NESCAP_SI NULL
+#define OPTION_VAL_WAVEBEAM_SI NULL
+#define OPTION_VAL_RAW_SI NULL
+#define OPTION_VAL_CUSTOM_SI NULL
+#define FCEUMM_NTSC_FILTER_LABEL_SI NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_SI NULL
+#define OPTION_VAL_COMPOSITE_SI NULL
+#define OPTION_VAL_SVIDEO_SI NULL
+#define OPTION_VAL_RGB_O9_SI NULL
+#define OPTION_VAL_MONOCHROME_SI NULL
+#define FCEUMM_SNDQUALITY_LABEL_SI NULL
+#define FCEUMM_SNDQUALITY_INFO_0_SI NULL
+#define OPTION_VAL_LOW_SI NULL
+#define OPTION_VAL_HIGH_SI NULL
+#define OPTION_VAL_VERY_HIGH_SI NULL
+#define FCEUMM_SWAPDUTY_LABEL_SI NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_SI NULL
+#define FCEUMM_SWAPDUTY_INFO_0_SI NULL
+#define FCEUMM_SNDVOLUME_LABEL_SI NULL
+#define FCEUMM_SNDVOLUME_INFO_0_SI NULL
+#define OPTION_VAL_0_SI NULL
+#define OPTION_VAL_1_SI NULL
+#define OPTION_VAL_2_SI NULL
+#define OPTION_VAL_3_SI NULL
+#define OPTION_VAL_4_SI NULL
+#define OPTION_VAL_5_SI NULL
+#define OPTION_VAL_6_SI NULL
+#define OPTION_VAL_7_SI NULL
+#define OPTION_VAL_8_SI NULL
+#define OPTION_VAL_9_SI NULL
+#define OPTION_VAL_10_SI NULL
+#define FCEUMM_APU_1_LABEL_SI NULL
+#define FCEUMM_APU_1_LABEL_CAT_SI NULL
+#define FCEUMM_APU_1_INFO_0_SI NULL
+#define FCEUMM_APU_2_LABEL_SI NULL
+#define FCEUMM_APU_2_LABEL_CAT_SI NULL
+#define FCEUMM_APU_2_INFO_0_SI NULL
+#define FCEUMM_APU_3_LABEL_SI NULL
+#define FCEUMM_APU_3_LABEL_CAT_SI NULL
+#define FCEUMM_APU_3_INFO_0_SI NULL
+#define FCEUMM_APU_4_LABEL_SI NULL
+#define FCEUMM_APU_4_LABEL_CAT_SI NULL
+#define FCEUMM_APU_4_INFO_0_SI NULL
+#define FCEUMM_APU_5_LABEL_SI NULL
+#define FCEUMM_APU_5_LABEL_CAT_SI NULL
+#define FCEUMM_APU_5_INFO_0_SI NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_SI NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_SI NULL
+#define OPTION_VAL_NONE_SI NULL
+#define OPTION_VAL_PLAYER_1_SI NULL
+#define OPTION_VAL_PLAYER_2_SI NULL
+#define OPTION_VAL_BOTH_SI NULL
+#define FCEUMM_TURBO_DELAY_LABEL_SI NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_SI NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_SI NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_SI NULL
+#define OPTION_VAL_LIGHTGUN_SI NULL
+#define OPTION_VAL_TOUCHSCREEN_SI NULL
+#define OPTION_VAL_MOUSE_SI NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_SI NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_SI NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_SI NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_SI NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_SI NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_SI NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_SI NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_SI NULL
+#define FCEUMM_OVERCLOCKING_LABEL_SI NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_SI NULL
+#define OPTION_VAL_2X_POSTRENDER_SI NULL
+#define OPTION_VAL_2X_VBLANK_SI NULL
+#define FCEUMM_RAMSTATE_LABEL_SI NULL
+#define FCEUMM_RAMSTATE_INFO_0_SI NULL
+#define OPTION_VAL_FILL_FF_SI NULL
+#define OPTION_VAL_FILL_00_SI NULL
+#define OPTION_VAL_RANDOM_SI NULL
+
+struct retro_core_option_v2_category option_cats_si[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_SI,
+      CATEGORY_SYSTEM_INFO_0_SI
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_SI,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_SI
+#else
+      CATEGORY_VIDEO_INFO_1_SI
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_SI,
+      CATEGORY_AUDIO_INFO_0_SI
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_SI,
+      CATEGORY_INPUT_INFO_0_SI
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_SI,
+      CATEGORY_HACKS_INFO_0_SI
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_SI,
+      CATEGORY_DIP_SWITCH_INFO_0_SI
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_si[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_SI,
+      NULL,
+      FCEUMM_REGION_INFO_0_SI,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_SI },
+         { "NTSC",  OPTION_VAL_NTSC_SI },
+         { "PAL",   OPTION_VAL_PAL_SI },
+         { "Dendy", OPTION_VAL_DENDY_SI },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_SI,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_SI,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_SI,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_SI,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_SI,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_SI,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_SI,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_SI,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_SI },
+         { "4:3",     OPTION_VAL_4_3_SI },
+         { "PP",      OPTION_VAL_PP_SI },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_SI,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_SI,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_SI,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_SI,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_SI,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_SI,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_SI,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_SI,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_SI },
+         { "asqrealc",             OPTION_VAL_ASQREALC_SI },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_SI },
+         { "rgb",                  OPTION_VAL_RGB_SI },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_SI },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_SI },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_SI },
+         { "pal",                  OPTION_VAL_PAL_SI },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_SI },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_SI },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_SI },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_SI },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_SI },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_SI },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_SI },
+         { "nescap",               OPTION_VAL_NESCAP_SI },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_SI },
+         { "raw",                  OPTION_VAL_RAW_SI },
+         { "custom",               OPTION_VAL_CUSTOM_SI },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_SI,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_SI,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_SI },
+         { "svideo",     OPTION_VAL_SVIDEO_SI },
+         { "rgb",        OPTION_VAL_RGB_O9_SI },
+         { "monochrome", OPTION_VAL_MONOCHROME_SI },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_SI,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_SI,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_SI },
+         { "High",      OPTION_VAL_HIGH_SI },
+         { "Very High", OPTION_VAL_VERY_HIGH_SI },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_SI,
+      FCEUMM_SWAPDUTY_LABEL_CAT_SI,
+      FCEUMM_SWAPDUTY_INFO_0_SI,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_SI,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_SI,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_SI },
+         { "1",  OPTION_VAL_1_SI },
+         { "2",  OPTION_VAL_2_SI },
+         { "3",  OPTION_VAL_3_SI },
+         { "4",  OPTION_VAL_4_SI },
+         { "5",  OPTION_VAL_5_SI },
+         { "6",  OPTION_VAL_6_SI },
+         { "7",  OPTION_VAL_7_SI },
+         { "8",  OPTION_VAL_8_SI },
+         { "9",  OPTION_VAL_9_SI },
+         { "10", OPTION_VAL_10_SI },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_SI,
+      FCEUMM_APU_1_LABEL_CAT_SI,
+      FCEUMM_APU_1_INFO_0_SI,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_SI,
+      FCEUMM_APU_2_LABEL_CAT_SI,
+      FCEUMM_APU_2_INFO_0_SI,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_SI,
+      FCEUMM_APU_3_LABEL_CAT_SI,
+      FCEUMM_APU_3_INFO_0_SI,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_SI,
+      FCEUMM_APU_4_LABEL_CAT_SI,
+      FCEUMM_APU_4_INFO_0_SI,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_SI,
+      FCEUMM_APU_5_LABEL_CAT_SI,
+      FCEUMM_APU_5_INFO_0_SI,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_SI,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_SI,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_SI },
+         { "Player 1", OPTION_VAL_PLAYER_1_SI },
+         { "Player 2", OPTION_VAL_PLAYER_2_SI },
+         { "Both",     OPTION_VAL_BOTH_SI },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_SI,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_SI,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_SI,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_SI,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_SI },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_SI },
+         { "mouse",       OPTION_VAL_MOUSE_SI },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_SI,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_SI,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_SI,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_SI,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_SI,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_SI,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_SI,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_SI,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_SI,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_SI,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_SI },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_SI },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_SI,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_SI,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_SI },
+         { "fill $00", OPTION_VAL_FILL_00_SI },
+         { "random",   OPTION_VAL_RANDOM_SI },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_si = {
+   option_cats_si,
+   option_defs_si
+};
+
+/* RETRO_LANGUAGE_SK */
+
+#define CATEGORY_SYSTEM_LABEL_SK NULL
+#define CATEGORY_SYSTEM_INFO_0_SK NULL
+#define CATEGORY_VIDEO_LABEL_SK NULL
+#define CATEGORY_VIDEO_INFO_0_SK NULL
+#define CATEGORY_VIDEO_INFO_1_SK NULL
+#define CATEGORY_AUDIO_LABEL_SK "Zvuk"
+#define CATEGORY_AUDIO_INFO_0_SK NULL
+#define CATEGORY_INPUT_LABEL_SK "Vstup"
+#define CATEGORY_INPUT_INFO_0_SK NULL
+#define CATEGORY_HACKS_LABEL_SK NULL
+#define CATEGORY_HACKS_INFO_0_SK NULL
+#define CATEGORY_DIP_SWITCH_LABEL_SK NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_SK NULL
+#define FCEUMM_REGION_LABEL_SK NULL
+#define FCEUMM_REGION_INFO_0_SK NULL
+#define OPTION_VAL_AUTO_SK NULL
+#define OPTION_VAL_NTSC_SK NULL
+#define OPTION_VAL_PAL_SK NULL
+#define OPTION_VAL_DENDY_SK NULL
+#define FCEUMM_GAME_GENIE_LABEL_SK NULL
+#define FCEUMM_GAME_GENIE_INFO_0_SK NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_SK NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_SK NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_SK NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_SK NULL
+#define FCEUMM_ASPECT_LABEL_SK NULL
+#define FCEUMM_ASPECT_INFO_0_SK NULL
+#define OPTION_VAL_8_7_PAR_SK NULL
+#define OPTION_VAL_4_3_SK NULL
+#define OPTION_VAL_PP_SK NULL
+#define FCEUMM_OVERSCAN_LABEL_SK NULL
+#define FCEUMM_OVERSCAN_INFO_0_SK NULL
+#define FCEUMM_OVERSCAN_H_LABEL_SK NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_SK NULL
+#define FCEUMM_OVERSCAN_V_LABEL_SK NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_SK NULL
+#define FCEUMM_PALETTE_LABEL_SK NULL
+#define FCEUMM_PALETTE_INFO_0_SK NULL
+#define OPTION_VAL_DEFAULT_SK NULL
+#define OPTION_VAL_ASQREALC_SK NULL
+#define OPTION_VAL_NINTENDO_VC_SK NULL
+#define OPTION_VAL_RGB_SK NULL
+#define OPTION_VAL_YUV_V3_SK NULL
+#define OPTION_VAL_UNSATURATED_FINAL_SK NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_SK NULL
+#define OPTION_VAL_BMF_FINAL2_SK NULL
+#define OPTION_VAL_BMF_FINAL3_SK NULL
+#define OPTION_VAL_SMOOTH_FBX_SK NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_SK NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_SK NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_SK NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_SK NULL
+#define OPTION_VAL_NESCAP_SK NULL
+#define OPTION_VAL_WAVEBEAM_SK NULL
+#define OPTION_VAL_RAW_SK NULL
+#define OPTION_VAL_CUSTOM_SK NULL
+#define FCEUMM_NTSC_FILTER_LABEL_SK NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_SK NULL
+#define OPTION_VAL_COMPOSITE_SK NULL
+#define OPTION_VAL_SVIDEO_SK NULL
+#define OPTION_VAL_RGB_O9_SK NULL
+#define OPTION_VAL_MONOCHROME_SK NULL
+#define FCEUMM_SNDQUALITY_LABEL_SK NULL
+#define FCEUMM_SNDQUALITY_INFO_0_SK NULL
+#define OPTION_VAL_LOW_SK NULL
+#define OPTION_VAL_HIGH_SK NULL
+#define OPTION_VAL_VERY_HIGH_SK NULL
+#define FCEUMM_SWAPDUTY_LABEL_SK NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_SK NULL
+#define FCEUMM_SWAPDUTY_INFO_0_SK NULL
+#define FCEUMM_SNDVOLUME_LABEL_SK NULL
+#define FCEUMM_SNDVOLUME_INFO_0_SK NULL
+#define OPTION_VAL_0_SK NULL
+#define OPTION_VAL_1_SK NULL
+#define OPTION_VAL_2_SK NULL
+#define OPTION_VAL_3_SK NULL
+#define OPTION_VAL_4_SK NULL
+#define OPTION_VAL_5_SK NULL
+#define OPTION_VAL_6_SK NULL
+#define OPTION_VAL_7_SK NULL
+#define OPTION_VAL_8_SK NULL
+#define OPTION_VAL_9_SK NULL
+#define OPTION_VAL_10_SK NULL
+#define FCEUMM_APU_1_LABEL_SK NULL
+#define FCEUMM_APU_1_LABEL_CAT_SK NULL
+#define FCEUMM_APU_1_INFO_0_SK NULL
+#define FCEUMM_APU_2_LABEL_SK NULL
+#define FCEUMM_APU_2_LABEL_CAT_SK NULL
+#define FCEUMM_APU_2_INFO_0_SK NULL
+#define FCEUMM_APU_3_LABEL_SK NULL
+#define FCEUMM_APU_3_LABEL_CAT_SK NULL
+#define FCEUMM_APU_3_INFO_0_SK NULL
+#define FCEUMM_APU_4_LABEL_SK NULL
+#define FCEUMM_APU_4_LABEL_CAT_SK NULL
+#define FCEUMM_APU_4_INFO_0_SK NULL
+#define FCEUMM_APU_5_LABEL_SK NULL
+#define FCEUMM_APU_5_LABEL_CAT_SK NULL
+#define FCEUMM_APU_5_INFO_0_SK NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_SK NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_SK NULL
+#define OPTION_VAL_NONE_SK NULL
+#define OPTION_VAL_PLAYER_1_SK NULL
+#define OPTION_VAL_PLAYER_2_SK NULL
+#define OPTION_VAL_BOTH_SK NULL
+#define FCEUMM_TURBO_DELAY_LABEL_SK NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_SK NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_SK NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_SK NULL
+#define OPTION_VAL_LIGHTGUN_SK NULL
+#define OPTION_VAL_TOUCHSCREEN_SK NULL
+#define OPTION_VAL_MOUSE_SK NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_SK NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_SK NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_SK NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_SK NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_SK NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_SK NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_SK NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_SK NULL
+#define FCEUMM_OVERCLOCKING_LABEL_SK NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_SK NULL
+#define OPTION_VAL_2X_POSTRENDER_SK NULL
+#define OPTION_VAL_2X_VBLANK_SK NULL
+#define FCEUMM_RAMSTATE_LABEL_SK NULL
+#define FCEUMM_RAMSTATE_INFO_0_SK NULL
+#define OPTION_VAL_FILL_FF_SK NULL
+#define OPTION_VAL_FILL_00_SK NULL
+#define OPTION_VAL_RANDOM_SK NULL
+
+struct retro_core_option_v2_category option_cats_sk[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_SK,
+      CATEGORY_SYSTEM_INFO_0_SK
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_SK,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_SK
+#else
+      CATEGORY_VIDEO_INFO_1_SK
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_SK,
+      CATEGORY_AUDIO_INFO_0_SK
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_SK,
+      CATEGORY_INPUT_INFO_0_SK
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_SK,
+      CATEGORY_HACKS_INFO_0_SK
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_SK,
+      CATEGORY_DIP_SWITCH_INFO_0_SK
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_sk[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_SK,
+      NULL,
+      FCEUMM_REGION_INFO_0_SK,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_SK },
+         { "NTSC",  OPTION_VAL_NTSC_SK },
+         { "PAL",   OPTION_VAL_PAL_SK },
+         { "Dendy", OPTION_VAL_DENDY_SK },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_SK,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_SK,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_SK,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_SK,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_SK,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_SK,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_SK,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_SK,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_SK },
+         { "4:3",     OPTION_VAL_4_3_SK },
+         { "PP",      OPTION_VAL_PP_SK },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_SK,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_SK,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_SK,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_SK,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_SK,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_SK,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_SK,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_SK,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_SK },
+         { "asqrealc",             OPTION_VAL_ASQREALC_SK },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_SK },
+         { "rgb",                  OPTION_VAL_RGB_SK },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_SK },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_SK },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_SK },
+         { "pal",                  OPTION_VAL_PAL_SK },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_SK },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_SK },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_SK },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_SK },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_SK },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_SK },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_SK },
+         { "nescap",               OPTION_VAL_NESCAP_SK },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_SK },
+         { "raw",                  OPTION_VAL_RAW_SK },
+         { "custom",               OPTION_VAL_CUSTOM_SK },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_SK,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_SK,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_SK },
+         { "svideo",     OPTION_VAL_SVIDEO_SK },
+         { "rgb",        OPTION_VAL_RGB_O9_SK },
+         { "monochrome", OPTION_VAL_MONOCHROME_SK },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_SK,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_SK,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_SK },
+         { "High",      OPTION_VAL_HIGH_SK },
+         { "Very High", OPTION_VAL_VERY_HIGH_SK },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_SK,
+      FCEUMM_SWAPDUTY_LABEL_CAT_SK,
+      FCEUMM_SWAPDUTY_INFO_0_SK,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_SK,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_SK,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_SK },
+         { "1",  OPTION_VAL_1_SK },
+         { "2",  OPTION_VAL_2_SK },
+         { "3",  OPTION_VAL_3_SK },
+         { "4",  OPTION_VAL_4_SK },
+         { "5",  OPTION_VAL_5_SK },
+         { "6",  OPTION_VAL_6_SK },
+         { "7",  OPTION_VAL_7_SK },
+         { "8",  OPTION_VAL_8_SK },
+         { "9",  OPTION_VAL_9_SK },
+         { "10", OPTION_VAL_10_SK },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_SK,
+      FCEUMM_APU_1_LABEL_CAT_SK,
+      FCEUMM_APU_1_INFO_0_SK,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_SK,
+      FCEUMM_APU_2_LABEL_CAT_SK,
+      FCEUMM_APU_2_INFO_0_SK,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_SK,
+      FCEUMM_APU_3_LABEL_CAT_SK,
+      FCEUMM_APU_3_INFO_0_SK,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_SK,
+      FCEUMM_APU_4_LABEL_CAT_SK,
+      FCEUMM_APU_4_INFO_0_SK,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_SK,
+      FCEUMM_APU_5_LABEL_CAT_SK,
+      FCEUMM_APU_5_INFO_0_SK,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_SK,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_SK,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_SK },
+         { "Player 1", OPTION_VAL_PLAYER_1_SK },
+         { "Player 2", OPTION_VAL_PLAYER_2_SK },
+         { "Both",     OPTION_VAL_BOTH_SK },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_SK,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_SK,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_SK,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_SK,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_SK },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_SK },
+         { "mouse",       OPTION_VAL_MOUSE_SK },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_SK,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_SK,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_SK,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_SK,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_SK,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_SK,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_SK,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_SK,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_SK,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_SK,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_SK },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_SK },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_SK,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_SK,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_SK },
+         { "fill $00", OPTION_VAL_FILL_00_SK },
+         { "random",   OPTION_VAL_RANDOM_SK },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_sk = {
+   option_cats_sk,
+   option_defs_sk
+};
+
+/* RETRO_LANGUAGE_SR */
+
+#define CATEGORY_SYSTEM_LABEL_SR NULL
+#define CATEGORY_SYSTEM_INFO_0_SR NULL
+#define CATEGORY_VIDEO_LABEL_SR NULL
+#define CATEGORY_VIDEO_INFO_0_SR NULL
+#define CATEGORY_VIDEO_INFO_1_SR NULL
+#define CATEGORY_AUDIO_LABEL_SR "Zvuk"
+#define CATEGORY_AUDIO_INFO_0_SR NULL
+#define CATEGORY_INPUT_LABEL_SR "Ulaz"
+#define CATEGORY_INPUT_INFO_0_SR NULL
+#define CATEGORY_HACKS_LABEL_SR NULL
+#define CATEGORY_HACKS_INFO_0_SR NULL
+#define CATEGORY_DIP_SWITCH_LABEL_SR NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_SR NULL
+#define FCEUMM_REGION_LABEL_SR NULL
+#define FCEUMM_REGION_INFO_0_SR NULL
+#define OPTION_VAL_AUTO_SR NULL
+#define OPTION_VAL_NTSC_SR NULL
+#define OPTION_VAL_PAL_SR NULL
+#define OPTION_VAL_DENDY_SR NULL
+#define FCEUMM_GAME_GENIE_LABEL_SR NULL
+#define FCEUMM_GAME_GENIE_INFO_0_SR NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_SR NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_SR NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_SR NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_SR NULL
+#define FCEUMM_ASPECT_LABEL_SR NULL
+#define FCEUMM_ASPECT_INFO_0_SR NULL
+#define OPTION_VAL_8_7_PAR_SR NULL
+#define OPTION_VAL_4_3_SR NULL
+#define OPTION_VAL_PP_SR NULL
+#define FCEUMM_OVERSCAN_LABEL_SR NULL
+#define FCEUMM_OVERSCAN_INFO_0_SR NULL
+#define FCEUMM_OVERSCAN_H_LABEL_SR NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_SR NULL
+#define FCEUMM_OVERSCAN_V_LABEL_SR NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_SR NULL
+#define FCEUMM_PALETTE_LABEL_SR NULL
+#define FCEUMM_PALETTE_INFO_0_SR NULL
+#define OPTION_VAL_DEFAULT_SR NULL
+#define OPTION_VAL_ASQREALC_SR NULL
+#define OPTION_VAL_NINTENDO_VC_SR NULL
+#define OPTION_VAL_RGB_SR NULL
+#define OPTION_VAL_YUV_V3_SR NULL
+#define OPTION_VAL_UNSATURATED_FINAL_SR NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_SR NULL
+#define OPTION_VAL_BMF_FINAL2_SR NULL
+#define OPTION_VAL_BMF_FINAL3_SR NULL
+#define OPTION_VAL_SMOOTH_FBX_SR NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_SR NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_SR NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_SR NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_SR NULL
+#define OPTION_VAL_NESCAP_SR NULL
+#define OPTION_VAL_WAVEBEAM_SR NULL
+#define OPTION_VAL_RAW_SR NULL
+#define OPTION_VAL_CUSTOM_SR NULL
+#define FCEUMM_NTSC_FILTER_LABEL_SR NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_SR NULL
+#define OPTION_VAL_COMPOSITE_SR NULL
+#define OPTION_VAL_SVIDEO_SR NULL
+#define OPTION_VAL_RGB_O9_SR NULL
+#define OPTION_VAL_MONOCHROME_SR NULL
+#define FCEUMM_SNDQUALITY_LABEL_SR NULL
+#define FCEUMM_SNDQUALITY_INFO_0_SR NULL
+#define OPTION_VAL_LOW_SR NULL
+#define OPTION_VAL_HIGH_SR NULL
+#define OPTION_VAL_VERY_HIGH_SR NULL
+#define FCEUMM_SWAPDUTY_LABEL_SR NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_SR NULL
+#define FCEUMM_SWAPDUTY_INFO_0_SR NULL
+#define FCEUMM_SNDVOLUME_LABEL_SR NULL
+#define FCEUMM_SNDVOLUME_INFO_0_SR NULL
+#define OPTION_VAL_0_SR NULL
+#define OPTION_VAL_1_SR NULL
+#define OPTION_VAL_2_SR NULL
+#define OPTION_VAL_3_SR NULL
+#define OPTION_VAL_4_SR NULL
+#define OPTION_VAL_5_SR NULL
+#define OPTION_VAL_6_SR NULL
+#define OPTION_VAL_7_SR NULL
+#define OPTION_VAL_8_SR NULL
+#define OPTION_VAL_9_SR NULL
+#define OPTION_VAL_10_SR NULL
+#define FCEUMM_APU_1_LABEL_SR NULL
+#define FCEUMM_APU_1_LABEL_CAT_SR NULL
+#define FCEUMM_APU_1_INFO_0_SR NULL
+#define FCEUMM_APU_2_LABEL_SR NULL
+#define FCEUMM_APU_2_LABEL_CAT_SR NULL
+#define FCEUMM_APU_2_INFO_0_SR NULL
+#define FCEUMM_APU_3_LABEL_SR NULL
+#define FCEUMM_APU_3_LABEL_CAT_SR NULL
+#define FCEUMM_APU_3_INFO_0_SR NULL
+#define FCEUMM_APU_4_LABEL_SR NULL
+#define FCEUMM_APU_4_LABEL_CAT_SR NULL
+#define FCEUMM_APU_4_INFO_0_SR NULL
+#define FCEUMM_APU_5_LABEL_SR NULL
+#define FCEUMM_APU_5_LABEL_CAT_SR NULL
+#define FCEUMM_APU_5_INFO_0_SR NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_SR NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_SR NULL
+#define OPTION_VAL_NONE_SR NULL
+#define OPTION_VAL_PLAYER_1_SR NULL
+#define OPTION_VAL_PLAYER_2_SR NULL
+#define OPTION_VAL_BOTH_SR NULL
+#define FCEUMM_TURBO_DELAY_LABEL_SR NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_SR NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_SR NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_SR NULL
+#define OPTION_VAL_LIGHTGUN_SR NULL
+#define OPTION_VAL_TOUCHSCREEN_SR NULL
+#define OPTION_VAL_MOUSE_SR NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_SR NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_SR NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_SR NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_SR NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_SR NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_SR NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_SR NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_SR NULL
+#define FCEUMM_OVERCLOCKING_LABEL_SR NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_SR NULL
+#define OPTION_VAL_2X_POSTRENDER_SR NULL
+#define OPTION_VAL_2X_VBLANK_SR NULL
+#define FCEUMM_RAMSTATE_LABEL_SR NULL
+#define FCEUMM_RAMSTATE_INFO_0_SR NULL
+#define OPTION_VAL_FILL_FF_SR NULL
+#define OPTION_VAL_FILL_00_SR NULL
+#define OPTION_VAL_RANDOM_SR NULL
+
+struct retro_core_option_v2_category option_cats_sr[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_SR,
+      CATEGORY_SYSTEM_INFO_0_SR
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_SR,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_SR
+#else
+      CATEGORY_VIDEO_INFO_1_SR
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_SR,
+      CATEGORY_AUDIO_INFO_0_SR
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_SR,
+      CATEGORY_INPUT_INFO_0_SR
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_SR,
+      CATEGORY_HACKS_INFO_0_SR
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_SR,
+      CATEGORY_DIP_SWITCH_INFO_0_SR
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_sr[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_SR,
+      NULL,
+      FCEUMM_REGION_INFO_0_SR,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_SR },
+         { "NTSC",  OPTION_VAL_NTSC_SR },
+         { "PAL",   OPTION_VAL_PAL_SR },
+         { "Dendy", OPTION_VAL_DENDY_SR },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_SR,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_SR,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_SR,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_SR,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_SR,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_SR,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_SR,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_SR,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_SR },
+         { "4:3",     OPTION_VAL_4_3_SR },
+         { "PP",      OPTION_VAL_PP_SR },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_SR,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_SR,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_SR,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_SR,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_SR,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_SR,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_SR,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_SR,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_SR },
+         { "asqrealc",             OPTION_VAL_ASQREALC_SR },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_SR },
+         { "rgb",                  OPTION_VAL_RGB_SR },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_SR },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_SR },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_SR },
+         { "pal",                  OPTION_VAL_PAL_SR },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_SR },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_SR },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_SR },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_SR },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_SR },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_SR },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_SR },
+         { "nescap",               OPTION_VAL_NESCAP_SR },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_SR },
+         { "raw",                  OPTION_VAL_RAW_SR },
+         { "custom",               OPTION_VAL_CUSTOM_SR },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_SR,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_SR,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_SR },
+         { "svideo",     OPTION_VAL_SVIDEO_SR },
+         { "rgb",        OPTION_VAL_RGB_O9_SR },
+         { "monochrome", OPTION_VAL_MONOCHROME_SR },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_SR,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_SR,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_SR },
+         { "High",      OPTION_VAL_HIGH_SR },
+         { "Very High", OPTION_VAL_VERY_HIGH_SR },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_SR,
+      FCEUMM_SWAPDUTY_LABEL_CAT_SR,
+      FCEUMM_SWAPDUTY_INFO_0_SR,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_SR,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_SR,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_SR },
+         { "1",  OPTION_VAL_1_SR },
+         { "2",  OPTION_VAL_2_SR },
+         { "3",  OPTION_VAL_3_SR },
+         { "4",  OPTION_VAL_4_SR },
+         { "5",  OPTION_VAL_5_SR },
+         { "6",  OPTION_VAL_6_SR },
+         { "7",  OPTION_VAL_7_SR },
+         { "8",  OPTION_VAL_8_SR },
+         { "9",  OPTION_VAL_9_SR },
+         { "10", OPTION_VAL_10_SR },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_SR,
+      FCEUMM_APU_1_LABEL_CAT_SR,
+      FCEUMM_APU_1_INFO_0_SR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_SR,
+      FCEUMM_APU_2_LABEL_CAT_SR,
+      FCEUMM_APU_2_INFO_0_SR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_SR,
+      FCEUMM_APU_3_LABEL_CAT_SR,
+      FCEUMM_APU_3_INFO_0_SR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_SR,
+      FCEUMM_APU_4_LABEL_CAT_SR,
+      FCEUMM_APU_4_INFO_0_SR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_SR,
+      FCEUMM_APU_5_LABEL_CAT_SR,
+      FCEUMM_APU_5_INFO_0_SR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_SR,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_SR,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_SR },
+         { "Player 1", OPTION_VAL_PLAYER_1_SR },
+         { "Player 2", OPTION_VAL_PLAYER_2_SR },
+         { "Both",     OPTION_VAL_BOTH_SR },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_SR,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_SR,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_SR,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_SR,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_SR },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_SR },
+         { "mouse",       OPTION_VAL_MOUSE_SR },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_SR,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_SR,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_SR,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_SR,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_SR,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_SR,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_SR,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_SR,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_SR,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_SR,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_SR },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_SR },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_SR,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_SR,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_SR },
+         { "fill $00", OPTION_VAL_FILL_00_SR },
+         { "random",   OPTION_VAL_RANDOM_SR },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_sr = {
+   option_cats_sr,
+   option_defs_sr
+};
+
+/* RETRO_LANGUAGE_SV */
+
+#define CATEGORY_SYSTEM_LABEL_SV NULL
+#define CATEGORY_SYSTEM_INFO_0_SV NULL
+#define CATEGORY_VIDEO_LABEL_SV "Bild"
+#define CATEGORY_VIDEO_INFO_0_SV NULL
+#define CATEGORY_VIDEO_INFO_1_SV NULL
+#define CATEGORY_AUDIO_LABEL_SV "Ljud"
+#define CATEGORY_AUDIO_INFO_0_SV NULL
+#define CATEGORY_INPUT_LABEL_SV "Inmatning"
+#define CATEGORY_INPUT_INFO_0_SV NULL
+#define CATEGORY_HACKS_LABEL_SV NULL
+#define CATEGORY_HACKS_INFO_0_SV NULL
+#define CATEGORY_DIP_SWITCH_LABEL_SV NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_SV NULL
+#define FCEUMM_REGION_LABEL_SV NULL
+#define FCEUMM_REGION_INFO_0_SV NULL
+#define OPTION_VAL_AUTO_SV NULL
+#define OPTION_VAL_NTSC_SV NULL
+#define OPTION_VAL_PAL_SV NULL
+#define OPTION_VAL_DENDY_SV NULL
+#define FCEUMM_GAME_GENIE_LABEL_SV NULL
+#define FCEUMM_GAME_GENIE_INFO_0_SV NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_SV NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_SV NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_SV NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_SV NULL
+#define FCEUMM_ASPECT_LABEL_SV NULL
+#define FCEUMM_ASPECT_INFO_0_SV NULL
+#define OPTION_VAL_8_7_PAR_SV NULL
+#define OPTION_VAL_4_3_SV NULL
+#define OPTION_VAL_PP_SV NULL
+#define FCEUMM_OVERSCAN_LABEL_SV NULL
+#define FCEUMM_OVERSCAN_INFO_0_SV NULL
+#define FCEUMM_OVERSCAN_H_LABEL_SV NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_SV NULL
+#define FCEUMM_OVERSCAN_V_LABEL_SV NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_SV NULL
+#define FCEUMM_PALETTE_LABEL_SV NULL
+#define FCEUMM_PALETTE_INFO_0_SV NULL
+#define OPTION_VAL_DEFAULT_SV NULL
+#define OPTION_VAL_ASQREALC_SV NULL
+#define OPTION_VAL_NINTENDO_VC_SV NULL
+#define OPTION_VAL_RGB_SV NULL
+#define OPTION_VAL_YUV_V3_SV NULL
+#define OPTION_VAL_UNSATURATED_FINAL_SV NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_SV NULL
+#define OPTION_VAL_BMF_FINAL2_SV NULL
+#define OPTION_VAL_BMF_FINAL3_SV NULL
+#define OPTION_VAL_SMOOTH_FBX_SV NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_SV NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_SV NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_SV NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_SV NULL
+#define OPTION_VAL_NESCAP_SV NULL
+#define OPTION_VAL_WAVEBEAM_SV NULL
+#define OPTION_VAL_RAW_SV NULL
+#define OPTION_VAL_CUSTOM_SV NULL
+#define FCEUMM_NTSC_FILTER_LABEL_SV NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_SV NULL
+#define OPTION_VAL_COMPOSITE_SV NULL
+#define OPTION_VAL_SVIDEO_SV NULL
+#define OPTION_VAL_RGB_O9_SV NULL
+#define OPTION_VAL_MONOCHROME_SV NULL
+#define FCEUMM_SNDQUALITY_LABEL_SV NULL
+#define FCEUMM_SNDQUALITY_INFO_0_SV NULL
+#define OPTION_VAL_LOW_SV NULL
+#define OPTION_VAL_HIGH_SV NULL
+#define OPTION_VAL_VERY_HIGH_SV NULL
+#define FCEUMM_SWAPDUTY_LABEL_SV NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_SV NULL
+#define FCEUMM_SWAPDUTY_INFO_0_SV NULL
+#define FCEUMM_SNDVOLUME_LABEL_SV NULL
+#define FCEUMM_SNDVOLUME_INFO_0_SV NULL
+#define OPTION_VAL_0_SV NULL
+#define OPTION_VAL_1_SV NULL
+#define OPTION_VAL_2_SV NULL
+#define OPTION_VAL_3_SV NULL
+#define OPTION_VAL_4_SV NULL
+#define OPTION_VAL_5_SV NULL
+#define OPTION_VAL_6_SV NULL
+#define OPTION_VAL_7_SV NULL
+#define OPTION_VAL_8_SV NULL
+#define OPTION_VAL_9_SV NULL
+#define OPTION_VAL_10_SV NULL
+#define FCEUMM_APU_1_LABEL_SV NULL
+#define FCEUMM_APU_1_LABEL_CAT_SV NULL
+#define FCEUMM_APU_1_INFO_0_SV NULL
+#define FCEUMM_APU_2_LABEL_SV NULL
+#define FCEUMM_APU_2_LABEL_CAT_SV NULL
+#define FCEUMM_APU_2_INFO_0_SV NULL
+#define FCEUMM_APU_3_LABEL_SV NULL
+#define FCEUMM_APU_3_LABEL_CAT_SV NULL
+#define FCEUMM_APU_3_INFO_0_SV NULL
+#define FCEUMM_APU_4_LABEL_SV NULL
+#define FCEUMM_APU_4_LABEL_CAT_SV NULL
+#define FCEUMM_APU_4_INFO_0_SV NULL
+#define FCEUMM_APU_5_LABEL_SV NULL
+#define FCEUMM_APU_5_LABEL_CAT_SV NULL
+#define FCEUMM_APU_5_INFO_0_SV NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_SV NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_SV NULL
+#define OPTION_VAL_NONE_SV NULL
+#define OPTION_VAL_PLAYER_1_SV NULL
+#define OPTION_VAL_PLAYER_2_SV NULL
+#define OPTION_VAL_BOTH_SV NULL
+#define FCEUMM_TURBO_DELAY_LABEL_SV NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_SV NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_SV NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_SV NULL
+#define OPTION_VAL_LIGHTGUN_SV NULL
+#define OPTION_VAL_TOUCHSCREEN_SV NULL
+#define OPTION_VAL_MOUSE_SV NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_SV NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_SV NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_SV NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_SV NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_SV NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_SV NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_SV NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_SV NULL
+#define FCEUMM_OVERCLOCKING_LABEL_SV NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_SV NULL
+#define OPTION_VAL_2X_POSTRENDER_SV NULL
+#define OPTION_VAL_2X_VBLANK_SV NULL
+#define FCEUMM_RAMSTATE_LABEL_SV NULL
+#define FCEUMM_RAMSTATE_INFO_0_SV NULL
+#define OPTION_VAL_FILL_FF_SV NULL
+#define OPTION_VAL_FILL_00_SV NULL
+#define OPTION_VAL_RANDOM_SV NULL
+
+struct retro_core_option_v2_category option_cats_sv[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_SV,
+      CATEGORY_SYSTEM_INFO_0_SV
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_SV,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_SV
+#else
+      CATEGORY_VIDEO_INFO_1_SV
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_SV,
+      CATEGORY_AUDIO_INFO_0_SV
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_SV,
+      CATEGORY_INPUT_INFO_0_SV
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_SV,
+      CATEGORY_HACKS_INFO_0_SV
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_SV,
+      CATEGORY_DIP_SWITCH_INFO_0_SV
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_sv[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_SV,
+      NULL,
+      FCEUMM_REGION_INFO_0_SV,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_SV },
+         { "NTSC",  OPTION_VAL_NTSC_SV },
+         { "PAL",   OPTION_VAL_PAL_SV },
+         { "Dendy", OPTION_VAL_DENDY_SV },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_SV,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_SV,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_SV,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_SV,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_SV,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_SV,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_SV,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_SV,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_SV },
+         { "4:3",     OPTION_VAL_4_3_SV },
+         { "PP",      OPTION_VAL_PP_SV },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_SV,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_SV,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_SV,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_SV,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_SV,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_SV,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_SV,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_SV,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_SV },
+         { "asqrealc",             OPTION_VAL_ASQREALC_SV },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_SV },
+         { "rgb",                  OPTION_VAL_RGB_SV },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_SV },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_SV },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_SV },
+         { "pal",                  OPTION_VAL_PAL_SV },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_SV },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_SV },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_SV },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_SV },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_SV },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_SV },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_SV },
+         { "nescap",               OPTION_VAL_NESCAP_SV },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_SV },
+         { "raw",                  OPTION_VAL_RAW_SV },
+         { "custom",               OPTION_VAL_CUSTOM_SV },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_SV,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_SV,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_SV },
+         { "svideo",     OPTION_VAL_SVIDEO_SV },
+         { "rgb",        OPTION_VAL_RGB_O9_SV },
+         { "monochrome", OPTION_VAL_MONOCHROME_SV },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_SV,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_SV,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_SV },
+         { "High",      OPTION_VAL_HIGH_SV },
+         { "Very High", OPTION_VAL_VERY_HIGH_SV },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_SV,
+      FCEUMM_SWAPDUTY_LABEL_CAT_SV,
+      FCEUMM_SWAPDUTY_INFO_0_SV,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_SV,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_SV,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_SV },
+         { "1",  OPTION_VAL_1_SV },
+         { "2",  OPTION_VAL_2_SV },
+         { "3",  OPTION_VAL_3_SV },
+         { "4",  OPTION_VAL_4_SV },
+         { "5",  OPTION_VAL_5_SV },
+         { "6",  OPTION_VAL_6_SV },
+         { "7",  OPTION_VAL_7_SV },
+         { "8",  OPTION_VAL_8_SV },
+         { "9",  OPTION_VAL_9_SV },
+         { "10", OPTION_VAL_10_SV },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_SV,
+      FCEUMM_APU_1_LABEL_CAT_SV,
+      FCEUMM_APU_1_INFO_0_SV,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_SV,
+      FCEUMM_APU_2_LABEL_CAT_SV,
+      FCEUMM_APU_2_INFO_0_SV,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_SV,
+      FCEUMM_APU_3_LABEL_CAT_SV,
+      FCEUMM_APU_3_INFO_0_SV,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_SV,
+      FCEUMM_APU_4_LABEL_CAT_SV,
+      FCEUMM_APU_4_INFO_0_SV,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_SV,
+      FCEUMM_APU_5_LABEL_CAT_SV,
+      FCEUMM_APU_5_INFO_0_SV,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_SV,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_SV,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_SV },
+         { "Player 1", OPTION_VAL_PLAYER_1_SV },
+         { "Player 2", OPTION_VAL_PLAYER_2_SV },
+         { "Both",     OPTION_VAL_BOTH_SV },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_SV,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_SV,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_SV,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_SV,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_SV },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_SV },
+         { "mouse",       OPTION_VAL_MOUSE_SV },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_SV,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_SV,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_SV,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_SV,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_SV,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_SV,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_SV,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_SV,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_SV,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_SV,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_SV },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_SV },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_SV,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_SV,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_SV },
+         { "fill $00", OPTION_VAL_FILL_00_SV },
+         { "random",   OPTION_VAL_RANDOM_SV },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_sv = {
+   option_cats_sv,
+   option_defs_sv
+};
+
+/* RETRO_LANGUAGE_TR */
+
+#define CATEGORY_SYSTEM_LABEL_TR "Sistem"
+#define CATEGORY_SYSTEM_INFO_0_TR "Bölge ve donanım eklenti parametrelerini yapılandırın."
+#define CATEGORY_VIDEO_LABEL_TR NULL
+#define CATEGORY_VIDEO_INFO_0_TR "En boy oranını, görüntü kırpmayı, renk paletini, video filtresi seçeneklerini yapılandırın."
+#define CATEGORY_VIDEO_INFO_1_TR "En boy oranını, görüntü kırpmayı, renk paleti seçeneklerini yapılandırın."
+#define CATEGORY_AUDIO_LABEL_TR "Ses"
+#define CATEGORY_AUDIO_INFO_0_TR NULL
+#define CATEGORY_INPUT_LABEL_TR "Girdi"
+#define CATEGORY_INPUT_INFO_0_TR NULL
+#define CATEGORY_HACKS_LABEL_TR "Emülatör Geliştirmeleri"
+#define CATEGORY_HACKS_INFO_0_TR "Düşük seviyeli performans ve uyumluluğu etkileyen işlemci hız aşırtma ve emülatör doğruluğu parametrelerini yapılandırın."
+#define CATEGORY_DIP_SWITCH_LABEL_TR NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_TR NULL
+#define FCEUMM_REGION_LABEL_TR NULL
+#define FCEUMM_REGION_INFO_0_TR NULL
+#define OPTION_VAL_AUTO_TR NULL
+#define OPTION_VAL_NTSC_TR NULL
+#define OPTION_VAL_PAL_TR NULL
+#define OPTION_VAL_DENDY_TR NULL
+#define FCEUMM_GAME_GENIE_LABEL_TR NULL
+#define FCEUMM_GAME_GENIE_INFO_0_TR NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_TR NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_TR NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_TR NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_TR NULL
+#define FCEUMM_ASPECT_LABEL_TR NULL
+#define FCEUMM_ASPECT_INFO_0_TR NULL
+#define OPTION_VAL_8_7_PAR_TR NULL
+#define OPTION_VAL_4_3_TR NULL
+#define OPTION_VAL_PP_TR NULL
+#define FCEUMM_OVERSCAN_LABEL_TR NULL
+#define FCEUMM_OVERSCAN_INFO_0_TR NULL
+#define FCEUMM_OVERSCAN_H_LABEL_TR NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_TR NULL
+#define FCEUMM_OVERSCAN_V_LABEL_TR NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_TR NULL
+#define FCEUMM_PALETTE_LABEL_TR NULL
+#define FCEUMM_PALETTE_INFO_0_TR NULL
+#define OPTION_VAL_DEFAULT_TR NULL
+#define OPTION_VAL_ASQREALC_TR NULL
+#define OPTION_VAL_NINTENDO_VC_TR NULL
+#define OPTION_VAL_RGB_TR NULL
+#define OPTION_VAL_YUV_V3_TR NULL
+#define OPTION_VAL_UNSATURATED_FINAL_TR NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_TR NULL
+#define OPTION_VAL_BMF_FINAL2_TR NULL
+#define OPTION_VAL_BMF_FINAL3_TR NULL
+#define OPTION_VAL_SMOOTH_FBX_TR NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_TR NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_TR NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_TR NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_TR NULL
+#define OPTION_VAL_NESCAP_TR NULL
+#define OPTION_VAL_WAVEBEAM_TR NULL
+#define OPTION_VAL_RAW_TR NULL
+#define OPTION_VAL_CUSTOM_TR NULL
+#define FCEUMM_NTSC_FILTER_LABEL_TR NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_TR NULL
+#define OPTION_VAL_COMPOSITE_TR NULL
+#define OPTION_VAL_SVIDEO_TR NULL
+#define OPTION_VAL_RGB_O9_TR NULL
+#define OPTION_VAL_MONOCHROME_TR NULL
+#define FCEUMM_SNDQUALITY_LABEL_TR NULL
+#define FCEUMM_SNDQUALITY_INFO_0_TR NULL
+#define OPTION_VAL_LOW_TR NULL
+#define OPTION_VAL_HIGH_TR NULL
+#define OPTION_VAL_VERY_HIGH_TR NULL
+#define FCEUMM_SWAPDUTY_LABEL_TR NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_TR NULL
+#define FCEUMM_SWAPDUTY_INFO_0_TR NULL
+#define FCEUMM_SNDVOLUME_LABEL_TR NULL
+#define FCEUMM_SNDVOLUME_INFO_0_TR NULL
+#define OPTION_VAL_0_TR NULL
+#define OPTION_VAL_1_TR NULL
+#define OPTION_VAL_2_TR NULL
+#define OPTION_VAL_3_TR NULL
+#define OPTION_VAL_4_TR NULL
+#define OPTION_VAL_5_TR NULL
+#define OPTION_VAL_6_TR NULL
+#define OPTION_VAL_7_TR NULL
+#define OPTION_VAL_8_TR NULL
+#define OPTION_VAL_9_TR NULL
+#define OPTION_VAL_10_TR NULL
+#define FCEUMM_APU_1_LABEL_TR NULL
+#define FCEUMM_APU_1_LABEL_CAT_TR NULL
+#define FCEUMM_APU_1_INFO_0_TR NULL
+#define FCEUMM_APU_2_LABEL_TR NULL
+#define FCEUMM_APU_2_LABEL_CAT_TR NULL
+#define FCEUMM_APU_2_INFO_0_TR NULL
+#define FCEUMM_APU_3_LABEL_TR NULL
+#define FCEUMM_APU_3_LABEL_CAT_TR NULL
+#define FCEUMM_APU_3_INFO_0_TR NULL
+#define FCEUMM_APU_4_LABEL_TR NULL
+#define FCEUMM_APU_4_LABEL_CAT_TR NULL
+#define FCEUMM_APU_4_INFO_0_TR NULL
+#define FCEUMM_APU_5_LABEL_TR NULL
+#define FCEUMM_APU_5_LABEL_CAT_TR NULL
+#define FCEUMM_APU_5_INFO_0_TR NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_TR NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_TR NULL
+#define OPTION_VAL_NONE_TR NULL
+#define OPTION_VAL_PLAYER_1_TR NULL
+#define OPTION_VAL_PLAYER_2_TR NULL
+#define OPTION_VAL_BOTH_TR NULL
+#define FCEUMM_TURBO_DELAY_LABEL_TR NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_TR NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_TR NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_TR NULL
+#define OPTION_VAL_LIGHTGUN_TR NULL
+#define OPTION_VAL_TOUCHSCREEN_TR NULL
+#define OPTION_VAL_MOUSE_TR NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_TR NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_TR NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_TR NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_TR NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_TR NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_TR NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_TR NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_TR NULL
+#define FCEUMM_OVERCLOCKING_LABEL_TR NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_TR NULL
+#define OPTION_VAL_2X_POSTRENDER_TR NULL
+#define OPTION_VAL_2X_VBLANK_TR NULL
+#define FCEUMM_RAMSTATE_LABEL_TR NULL
+#define FCEUMM_RAMSTATE_INFO_0_TR NULL
+#define OPTION_VAL_FILL_FF_TR NULL
+#define OPTION_VAL_FILL_00_TR NULL
+#define OPTION_VAL_RANDOM_TR NULL
+
+struct retro_core_option_v2_category option_cats_tr[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_TR,
+      CATEGORY_SYSTEM_INFO_0_TR
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_TR,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_TR
+#else
+      CATEGORY_VIDEO_INFO_1_TR
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_TR,
+      CATEGORY_AUDIO_INFO_0_TR
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_TR,
+      CATEGORY_INPUT_INFO_0_TR
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_TR,
+      CATEGORY_HACKS_INFO_0_TR
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_TR,
+      CATEGORY_DIP_SWITCH_INFO_0_TR
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_tr[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_TR,
+      NULL,
+      FCEUMM_REGION_INFO_0_TR,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_TR },
+         { "NTSC",  OPTION_VAL_NTSC_TR },
+         { "PAL",   OPTION_VAL_PAL_TR },
+         { "Dendy", OPTION_VAL_DENDY_TR },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_TR,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_TR,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_TR,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_TR,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_TR,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_TR,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_TR,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_TR,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_TR },
+         { "4:3",     OPTION_VAL_4_3_TR },
+         { "PP",      OPTION_VAL_PP_TR },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_TR,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_TR,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_TR,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_TR,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_TR,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_TR,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_TR,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_TR,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_TR },
+         { "asqrealc",             OPTION_VAL_ASQREALC_TR },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_TR },
+         { "rgb",                  OPTION_VAL_RGB_TR },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_TR },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_TR },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_TR },
+         { "pal",                  OPTION_VAL_PAL_TR },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_TR },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_TR },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_TR },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_TR },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_TR },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_TR },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_TR },
+         { "nescap",               OPTION_VAL_NESCAP_TR },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_TR },
+         { "raw",                  OPTION_VAL_RAW_TR },
+         { "custom",               OPTION_VAL_CUSTOM_TR },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_TR,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_TR,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_TR },
+         { "svideo",     OPTION_VAL_SVIDEO_TR },
+         { "rgb",        OPTION_VAL_RGB_O9_TR },
+         { "monochrome", OPTION_VAL_MONOCHROME_TR },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_TR,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_TR,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_TR },
+         { "High",      OPTION_VAL_HIGH_TR },
+         { "Very High", OPTION_VAL_VERY_HIGH_TR },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_TR,
+      FCEUMM_SWAPDUTY_LABEL_CAT_TR,
+      FCEUMM_SWAPDUTY_INFO_0_TR,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_TR,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_TR,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_TR },
+         { "1",  OPTION_VAL_1_TR },
+         { "2",  OPTION_VAL_2_TR },
+         { "3",  OPTION_VAL_3_TR },
+         { "4",  OPTION_VAL_4_TR },
+         { "5",  OPTION_VAL_5_TR },
+         { "6",  OPTION_VAL_6_TR },
+         { "7",  OPTION_VAL_7_TR },
+         { "8",  OPTION_VAL_8_TR },
+         { "9",  OPTION_VAL_9_TR },
+         { "10", OPTION_VAL_10_TR },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_TR,
+      FCEUMM_APU_1_LABEL_CAT_TR,
+      FCEUMM_APU_1_INFO_0_TR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_TR,
+      FCEUMM_APU_2_LABEL_CAT_TR,
+      FCEUMM_APU_2_INFO_0_TR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_TR,
+      FCEUMM_APU_3_LABEL_CAT_TR,
+      FCEUMM_APU_3_INFO_0_TR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_TR,
+      FCEUMM_APU_4_LABEL_CAT_TR,
+      FCEUMM_APU_4_INFO_0_TR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_TR,
+      FCEUMM_APU_5_LABEL_CAT_TR,
+      FCEUMM_APU_5_INFO_0_TR,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_TR,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_TR,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_TR },
+         { "Player 1", OPTION_VAL_PLAYER_1_TR },
+         { "Player 2", OPTION_VAL_PLAYER_2_TR },
+         { "Both",     OPTION_VAL_BOTH_TR },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_TR,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_TR,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_TR,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_TR,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_TR },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_TR },
+         { "mouse",       OPTION_VAL_MOUSE_TR },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_TR,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_TR,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_TR,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_TR,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_TR,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_TR,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_TR,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_TR,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_TR,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_TR,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_TR },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_TR },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_TR,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_TR,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_TR },
+         { "fill $00", OPTION_VAL_FILL_00_TR },
+         { "random",   OPTION_VAL_RANDOM_TR },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_tr = {
+   option_cats_tr,
+   option_defs_tr
+};
+
+/* RETRO_LANGUAGE_UK */
+
+#define CATEGORY_SYSTEM_LABEL_UK "Система"
+#define CATEGORY_SYSTEM_INFO_0_UK NULL
+#define CATEGORY_VIDEO_LABEL_UK "Відео"
+#define CATEGORY_VIDEO_INFO_0_UK NULL
+#define CATEGORY_VIDEO_INFO_1_UK NULL
+#define CATEGORY_AUDIO_LABEL_UK "Аудіо"
+#define CATEGORY_AUDIO_INFO_0_UK NULL
+#define CATEGORY_INPUT_LABEL_UK "Ввід"
+#define CATEGORY_INPUT_INFO_0_UK NULL
+#define CATEGORY_HACKS_LABEL_UK "Гаки емуляції"
+#define CATEGORY_HACKS_INFO_0_UK "Налаштування розгону процесора та точності емуляції, що впливають на низькорівневу продуктивність та сумісність."
+#define CATEGORY_DIP_SWITCH_LABEL_UK NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_UK NULL
+#define FCEUMM_REGION_LABEL_UK NULL
+#define FCEUMM_REGION_INFO_0_UK NULL
+#define OPTION_VAL_AUTO_UK NULL
+#define OPTION_VAL_NTSC_UK NULL
+#define OPTION_VAL_PAL_UK NULL
+#define OPTION_VAL_DENDY_UK NULL
+#define FCEUMM_GAME_GENIE_LABEL_UK NULL
+#define FCEUMM_GAME_GENIE_INFO_0_UK NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_UK NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_UK NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_UK NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_UK NULL
+#define FCEUMM_ASPECT_LABEL_UK NULL
+#define FCEUMM_ASPECT_INFO_0_UK NULL
+#define OPTION_VAL_8_7_PAR_UK NULL
+#define OPTION_VAL_4_3_UK NULL
+#define OPTION_VAL_PP_UK NULL
+#define FCEUMM_OVERSCAN_LABEL_UK NULL
+#define FCEUMM_OVERSCAN_INFO_0_UK NULL
+#define FCEUMM_OVERSCAN_H_LABEL_UK NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_UK NULL
+#define FCEUMM_OVERSCAN_V_LABEL_UK NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_UK NULL
+#define FCEUMM_PALETTE_LABEL_UK NULL
+#define FCEUMM_PALETTE_INFO_0_UK NULL
+#define OPTION_VAL_DEFAULT_UK NULL
+#define OPTION_VAL_ASQREALC_UK NULL
+#define OPTION_VAL_NINTENDO_VC_UK NULL
+#define OPTION_VAL_RGB_UK NULL
+#define OPTION_VAL_YUV_V3_UK NULL
+#define OPTION_VAL_UNSATURATED_FINAL_UK NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_UK NULL
+#define OPTION_VAL_BMF_FINAL2_UK NULL
+#define OPTION_VAL_BMF_FINAL3_UK NULL
+#define OPTION_VAL_SMOOTH_FBX_UK NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_UK NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_UK NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_UK NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_UK NULL
+#define OPTION_VAL_NESCAP_UK NULL
+#define OPTION_VAL_WAVEBEAM_UK NULL
+#define OPTION_VAL_RAW_UK NULL
+#define OPTION_VAL_CUSTOM_UK NULL
+#define FCEUMM_NTSC_FILTER_LABEL_UK NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_UK NULL
+#define OPTION_VAL_COMPOSITE_UK NULL
+#define OPTION_VAL_SVIDEO_UK NULL
+#define OPTION_VAL_RGB_O9_UK NULL
+#define OPTION_VAL_MONOCHROME_UK NULL
+#define FCEUMM_SNDQUALITY_LABEL_UK NULL
+#define FCEUMM_SNDQUALITY_INFO_0_UK NULL
+#define OPTION_VAL_LOW_UK NULL
+#define OPTION_VAL_HIGH_UK NULL
+#define OPTION_VAL_VERY_HIGH_UK NULL
+#define FCEUMM_SWAPDUTY_LABEL_UK NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_UK NULL
+#define FCEUMM_SWAPDUTY_INFO_0_UK NULL
+#define FCEUMM_SNDVOLUME_LABEL_UK NULL
+#define FCEUMM_SNDVOLUME_INFO_0_UK NULL
+#define OPTION_VAL_0_UK NULL
+#define OPTION_VAL_1_UK NULL
+#define OPTION_VAL_2_UK NULL
+#define OPTION_VAL_3_UK NULL
+#define OPTION_VAL_4_UK NULL
+#define OPTION_VAL_5_UK NULL
+#define OPTION_VAL_6_UK NULL
+#define OPTION_VAL_7_UK NULL
+#define OPTION_VAL_8_UK NULL
+#define OPTION_VAL_9_UK NULL
+#define OPTION_VAL_10_UK NULL
+#define FCEUMM_APU_1_LABEL_UK NULL
+#define FCEUMM_APU_1_LABEL_CAT_UK NULL
+#define FCEUMM_APU_1_INFO_0_UK NULL
+#define FCEUMM_APU_2_LABEL_UK NULL
+#define FCEUMM_APU_2_LABEL_CAT_UK NULL
+#define FCEUMM_APU_2_INFO_0_UK NULL
+#define FCEUMM_APU_3_LABEL_UK NULL
+#define FCEUMM_APU_3_LABEL_CAT_UK NULL
+#define FCEUMM_APU_3_INFO_0_UK NULL
+#define FCEUMM_APU_4_LABEL_UK NULL
+#define FCEUMM_APU_4_LABEL_CAT_UK NULL
+#define FCEUMM_APU_4_INFO_0_UK NULL
+#define FCEUMM_APU_5_LABEL_UK NULL
+#define FCEUMM_APU_5_LABEL_CAT_UK NULL
+#define FCEUMM_APU_5_INFO_0_UK NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_UK NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_UK NULL
+#define OPTION_VAL_NONE_UK NULL
+#define OPTION_VAL_PLAYER_1_UK NULL
+#define OPTION_VAL_PLAYER_2_UK NULL
+#define OPTION_VAL_BOTH_UK NULL
+#define FCEUMM_TURBO_DELAY_LABEL_UK NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_UK NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_UK NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_UK NULL
+#define OPTION_VAL_LIGHTGUN_UK NULL
+#define OPTION_VAL_TOUCHSCREEN_UK NULL
+#define OPTION_VAL_MOUSE_UK NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_UK NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_UK NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_UK NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_UK NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_UK NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_UK NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_UK NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_UK NULL
+#define FCEUMM_OVERCLOCKING_LABEL_UK NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_UK NULL
+#define OPTION_VAL_2X_POSTRENDER_UK NULL
+#define OPTION_VAL_2X_VBLANK_UK NULL
+#define FCEUMM_RAMSTATE_LABEL_UK NULL
+#define FCEUMM_RAMSTATE_INFO_0_UK NULL
+#define OPTION_VAL_FILL_FF_UK NULL
+#define OPTION_VAL_FILL_00_UK NULL
+#define OPTION_VAL_RANDOM_UK NULL
+
+struct retro_core_option_v2_category option_cats_uk[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_UK,
+      CATEGORY_SYSTEM_INFO_0_UK
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_UK,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_UK
+#else
+      CATEGORY_VIDEO_INFO_1_UK
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_UK,
+      CATEGORY_AUDIO_INFO_0_UK
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_UK,
+      CATEGORY_INPUT_INFO_0_UK
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_UK,
+      CATEGORY_HACKS_INFO_0_UK
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_UK,
+      CATEGORY_DIP_SWITCH_INFO_0_UK
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_uk[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_UK,
+      NULL,
+      FCEUMM_REGION_INFO_0_UK,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_UK },
+         { "NTSC",  OPTION_VAL_NTSC_UK },
+         { "PAL",   OPTION_VAL_PAL_UK },
+         { "Dendy", OPTION_VAL_DENDY_UK },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_UK,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_UK,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_UK,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_UK,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_UK,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_UK,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_UK,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_UK,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_UK },
+         { "4:3",     OPTION_VAL_4_3_UK },
+         { "PP",      OPTION_VAL_PP_UK },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_UK,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_UK,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_UK,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_UK,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_UK,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_UK,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_UK,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_UK,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_UK },
+         { "asqrealc",             OPTION_VAL_ASQREALC_UK },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_UK },
+         { "rgb",                  OPTION_VAL_RGB_UK },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_UK },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_UK },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_UK },
+         { "pal",                  OPTION_VAL_PAL_UK },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_UK },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_UK },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_UK },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_UK },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_UK },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_UK },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_UK },
+         { "nescap",               OPTION_VAL_NESCAP_UK },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_UK },
+         { "raw",                  OPTION_VAL_RAW_UK },
+         { "custom",               OPTION_VAL_CUSTOM_UK },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_UK,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_UK,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_UK },
+         { "svideo",     OPTION_VAL_SVIDEO_UK },
+         { "rgb",        OPTION_VAL_RGB_O9_UK },
+         { "monochrome", OPTION_VAL_MONOCHROME_UK },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_UK,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_UK,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_UK },
+         { "High",      OPTION_VAL_HIGH_UK },
+         { "Very High", OPTION_VAL_VERY_HIGH_UK },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_UK,
+      FCEUMM_SWAPDUTY_LABEL_CAT_UK,
+      FCEUMM_SWAPDUTY_INFO_0_UK,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_UK,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_UK,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_UK },
+         { "1",  OPTION_VAL_1_UK },
+         { "2",  OPTION_VAL_2_UK },
+         { "3",  OPTION_VAL_3_UK },
+         { "4",  OPTION_VAL_4_UK },
+         { "5",  OPTION_VAL_5_UK },
+         { "6",  OPTION_VAL_6_UK },
+         { "7",  OPTION_VAL_7_UK },
+         { "8",  OPTION_VAL_8_UK },
+         { "9",  OPTION_VAL_9_UK },
+         { "10", OPTION_VAL_10_UK },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_UK,
+      FCEUMM_APU_1_LABEL_CAT_UK,
+      FCEUMM_APU_1_INFO_0_UK,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_UK,
+      FCEUMM_APU_2_LABEL_CAT_UK,
+      FCEUMM_APU_2_INFO_0_UK,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_UK,
+      FCEUMM_APU_3_LABEL_CAT_UK,
+      FCEUMM_APU_3_INFO_0_UK,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_UK,
+      FCEUMM_APU_4_LABEL_CAT_UK,
+      FCEUMM_APU_4_INFO_0_UK,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_UK,
+      FCEUMM_APU_5_LABEL_CAT_UK,
+      FCEUMM_APU_5_INFO_0_UK,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_UK,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_UK,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_UK },
+         { "Player 1", OPTION_VAL_PLAYER_1_UK },
+         { "Player 2", OPTION_VAL_PLAYER_2_UK },
+         { "Both",     OPTION_VAL_BOTH_UK },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_UK,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_UK,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_UK,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_UK,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_UK },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_UK },
+         { "mouse",       OPTION_VAL_MOUSE_UK },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_UK,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_UK,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_UK,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_UK,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_UK,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_UK,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_UK,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_UK,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_UK,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_UK,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_UK },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_UK },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_UK,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_UK,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_UK },
+         { "fill $00", OPTION_VAL_FILL_00_UK },
+         { "random",   OPTION_VAL_RANDOM_UK },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_uk = {
+   option_cats_uk,
+   option_defs_uk
+};
+
+/* RETRO_LANGUAGE_VN */
+
+#define CATEGORY_SYSTEM_LABEL_VN "Hệ thống"
+#define CATEGORY_SYSTEM_INFO_0_VN NULL
+#define CATEGORY_VIDEO_LABEL_VN "Hình ảnh"
+#define CATEGORY_VIDEO_INFO_0_VN NULL
+#define CATEGORY_VIDEO_INFO_1_VN NULL
+#define CATEGORY_AUDIO_LABEL_VN "Âm thanh"
+#define CATEGORY_AUDIO_INFO_0_VN NULL
+#define CATEGORY_INPUT_LABEL_VN "Input Driver"
+#define CATEGORY_INPUT_INFO_0_VN NULL
+#define CATEGORY_HACKS_LABEL_VN NULL
+#define CATEGORY_HACKS_INFO_0_VN NULL
+#define CATEGORY_DIP_SWITCH_LABEL_VN NULL
+#define CATEGORY_DIP_SWITCH_INFO_0_VN NULL
+#define FCEUMM_REGION_LABEL_VN NULL
+#define FCEUMM_REGION_INFO_0_VN NULL
+#define OPTION_VAL_AUTO_VN NULL
+#define OPTION_VAL_NTSC_VN NULL
+#define OPTION_VAL_PAL_VN NULL
+#define OPTION_VAL_DENDY_VN NULL
+#define FCEUMM_GAME_GENIE_LABEL_VN NULL
+#define FCEUMM_GAME_GENIE_INFO_0_VN NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_VN NULL
+#define FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_VN NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_VN NULL
+#define FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_VN NULL
+#define FCEUMM_ASPECT_LABEL_VN NULL
+#define FCEUMM_ASPECT_INFO_0_VN NULL
+#define OPTION_VAL_8_7_PAR_VN NULL
+#define OPTION_VAL_4_3_VN NULL
+#define OPTION_VAL_PP_VN NULL
+#define FCEUMM_OVERSCAN_LABEL_VN NULL
+#define FCEUMM_OVERSCAN_INFO_0_VN NULL
+#define FCEUMM_OVERSCAN_H_LABEL_VN NULL
+#define FCEUMM_OVERSCAN_H_INFO_0_VN NULL
+#define FCEUMM_OVERSCAN_V_LABEL_VN NULL
+#define FCEUMM_OVERSCAN_V_INFO_0_VN NULL
+#define FCEUMM_PALETTE_LABEL_VN NULL
+#define FCEUMM_PALETTE_INFO_0_VN NULL
+#define OPTION_VAL_DEFAULT_VN NULL
+#define OPTION_VAL_ASQREALC_VN NULL
+#define OPTION_VAL_NINTENDO_VC_VN NULL
+#define OPTION_VAL_RGB_VN NULL
+#define OPTION_VAL_YUV_V3_VN NULL
+#define OPTION_VAL_UNSATURATED_FINAL_VN NULL
+#define OPTION_VAL_SONY_CXA2025AS_US_VN NULL
+#define OPTION_VAL_BMF_FINAL2_VN NULL
+#define OPTION_VAL_BMF_FINAL3_VN NULL
+#define OPTION_VAL_SMOOTH_FBX_VN NULL
+#define OPTION_VAL_COMPOSITE_DIRECT_FBX_VN NULL
+#define OPTION_VAL_PVM_STYLE_D93_FBX_VN NULL
+#define OPTION_VAL_NTSC_HARDWARE_FBX_VN NULL
+#define OPTION_VAL_NES_CLASSIC_FBX_FS_VN NULL
+#define OPTION_VAL_NESCAP_VN NULL
+#define OPTION_VAL_WAVEBEAM_VN NULL
+#define OPTION_VAL_RAW_VN NULL
+#define OPTION_VAL_CUSTOM_VN NULL
+#define FCEUMM_NTSC_FILTER_LABEL_VN NULL
+#define FCEUMM_NTSC_FILTER_INFO_0_VN NULL
+#define OPTION_VAL_COMPOSITE_VN NULL
+#define OPTION_VAL_SVIDEO_VN NULL
+#define OPTION_VAL_RGB_O9_VN NULL
+#define OPTION_VAL_MONOCHROME_VN NULL
+#define FCEUMM_SNDQUALITY_LABEL_VN NULL
+#define FCEUMM_SNDQUALITY_INFO_0_VN NULL
+#define OPTION_VAL_LOW_VN NULL
+#define OPTION_VAL_HIGH_VN NULL
+#define OPTION_VAL_VERY_HIGH_VN NULL
+#define FCEUMM_SWAPDUTY_LABEL_VN NULL
+#define FCEUMM_SWAPDUTY_LABEL_CAT_VN NULL
+#define FCEUMM_SWAPDUTY_INFO_0_VN NULL
+#define FCEUMM_SNDVOLUME_LABEL_VN NULL
+#define FCEUMM_SNDVOLUME_INFO_0_VN NULL
+#define OPTION_VAL_0_VN NULL
+#define OPTION_VAL_1_VN NULL
+#define OPTION_VAL_2_VN NULL
+#define OPTION_VAL_3_VN NULL
+#define OPTION_VAL_4_VN NULL
+#define OPTION_VAL_5_VN NULL
+#define OPTION_VAL_6_VN NULL
+#define OPTION_VAL_7_VN NULL
+#define OPTION_VAL_8_VN NULL
+#define OPTION_VAL_9_VN NULL
+#define OPTION_VAL_10_VN NULL
+#define FCEUMM_APU_1_LABEL_VN NULL
+#define FCEUMM_APU_1_LABEL_CAT_VN NULL
+#define FCEUMM_APU_1_INFO_0_VN NULL
+#define FCEUMM_APU_2_LABEL_VN NULL
+#define FCEUMM_APU_2_LABEL_CAT_VN NULL
+#define FCEUMM_APU_2_INFO_0_VN NULL
+#define FCEUMM_APU_3_LABEL_VN NULL
+#define FCEUMM_APU_3_LABEL_CAT_VN NULL
+#define FCEUMM_APU_3_INFO_0_VN NULL
+#define FCEUMM_APU_4_LABEL_VN NULL
+#define FCEUMM_APU_4_LABEL_CAT_VN NULL
+#define FCEUMM_APU_4_INFO_0_VN NULL
+#define FCEUMM_APU_5_LABEL_VN NULL
+#define FCEUMM_APU_5_LABEL_CAT_VN NULL
+#define FCEUMM_APU_5_INFO_0_VN NULL
+#define FCEUMM_TURBO_ENABLE_LABEL_VN NULL
+#define FCEUMM_TURBO_ENABLE_INFO_0_VN NULL
+#define OPTION_VAL_NONE_VN NULL
+#define OPTION_VAL_PLAYER_1_VN NULL
+#define OPTION_VAL_PLAYER_2_VN NULL
+#define OPTION_VAL_BOTH_VN NULL
+#define FCEUMM_TURBO_DELAY_LABEL_VN NULL
+#define FCEUMM_TURBO_DELAY_INFO_0_VN NULL
+#define FCEUMM_ZAPPER_MODE_LABEL_VN NULL
+#define FCEUMM_ZAPPER_MODE_INFO_0_VN NULL
+#define OPTION_VAL_LIGHTGUN_VN NULL
+#define OPTION_VAL_TOUCHSCREEN_VN NULL
+#define OPTION_VAL_MOUSE_VN NULL
+#define FCEUMM_SHOW_CROSSHAIR_LABEL_VN NULL
+#define FCEUMM_SHOW_CROSSHAIR_INFO_0_VN NULL
+#define FCEUMM_ZAPPER_TOLERANCE_LABEL_VN NULL
+#define FCEUMM_ZAPPER_TOLERANCE_INFO_0_VN NULL
+#define FCEUMM_UP_DOWN_ALLOWED_LABEL_VN NULL
+#define FCEUMM_UP_DOWN_ALLOWED_INFO_0_VN NULL
+#define FCEUMM_NOSPRITELIMIT_LABEL_VN NULL
+#define FCEUMM_NOSPRITELIMIT_INFO_0_VN NULL
+#define FCEUMM_OVERCLOCKING_LABEL_VN NULL
+#define FCEUMM_OVERCLOCKING_INFO_0_VN NULL
+#define OPTION_VAL_2X_POSTRENDER_VN NULL
+#define OPTION_VAL_2X_VBLANK_VN NULL
+#define FCEUMM_RAMSTATE_LABEL_VN NULL
+#define FCEUMM_RAMSTATE_INFO_0_VN NULL
+#define OPTION_VAL_FILL_FF_VN NULL
+#define OPTION_VAL_FILL_00_VN NULL
+#define OPTION_VAL_RANDOM_VN NULL
+
+struct retro_core_option_v2_category option_cats_vn[] = {
+   {
+      "system",
+      CATEGORY_SYSTEM_LABEL_VN,
+      CATEGORY_SYSTEM_INFO_0_VN
+   },
+   {
+      "video",
+      CATEGORY_VIDEO_LABEL_VN,
+#ifdef HAVE_NTSC_FILTER
+      CATEGORY_VIDEO_INFO_0_VN
+#else
+      CATEGORY_VIDEO_INFO_1_VN
+#endif
+   },
+   {
+      "audio",
+      CATEGORY_AUDIO_LABEL_VN,
+      CATEGORY_AUDIO_INFO_0_VN
+   },
+   {
+      "input",
+      CATEGORY_INPUT_LABEL_VN,
+      CATEGORY_INPUT_INFO_0_VN
+   },
+   {
+      "hacks",
+      CATEGORY_HACKS_LABEL_VN,
+      CATEGORY_HACKS_INFO_0_VN
+   },
+   {
+      "dip_switch",
+      CATEGORY_DIP_SWITCH_LABEL_VN,
+      CATEGORY_DIP_SWITCH_INFO_0_VN
+   },
+   { NULL, NULL, NULL },
+};
+struct retro_core_option_v2_definition option_defs_vn[] = {
+   {
+      "fceumm_region",
+      FCEUMM_REGION_LABEL_VN,
+      NULL,
+      FCEUMM_REGION_INFO_0_VN,
+      NULL,
+      "system",
+      {
+         { "Auto",  OPTION_VAL_AUTO_VN },
+         { "NTSC",  OPTION_VAL_NTSC_VN },
+         { "PAL",   OPTION_VAL_PAL_VN },
+         { "Dendy", OPTION_VAL_DENDY_VN },
+         { NULL, NULL },
+      },
+      "Auto",
+   },
+   {
+      "fceumm_game_genie",
+      FCEUMM_GAME_GENIE_LABEL_VN,
+      NULL,
+      FCEUMM_GAME_GENIE_INFO_0_VN,
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_show_adv_system_options",
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_LABEL_VN,
+      NULL,
+      FCEUMM_SHOW_ADV_SYSTEM_OPTIONS_INFO_0_VN,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_show_adv_sound_options",
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_LABEL_VN,
+      NULL,
+      FCEUMM_SHOW_ADV_SOUND_OPTIONS_INFO_0_VN,
+      NULL,
+      NULL,
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+   {
+      "fceumm_aspect",
+      FCEUMM_ASPECT_LABEL_VN,
+      NULL,
+      FCEUMM_ASPECT_INFO_0_VN,
+      NULL,
+      "video",
+      {
+         { "8:7 PAR", OPTION_VAL_8_7_PAR_VN },
+         { "4:3",     OPTION_VAL_4_3_VN },
+         { "PP",      OPTION_VAL_PP_VN },
+         { NULL, NULL },
+      },
+      "8:7 PAR",
+   },
+#ifdef PSP /* overscan options */
+   {
+      "fceumm_overscan",
+      FCEUMM_OVERSCAN_LABEL_VN,
+      NULL,
+      FCEUMM_OVERSCAN_INFO_0_VN,
+      NULL,
+      "video",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#else
+   {
+      "fceumm_overscan_h",
+      FCEUMM_OVERSCAN_H_LABEL_VN,
+      NULL,
+      FCEUMM_OVERSCAN_H_INFO_0_VN,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overscan_v",
+      FCEUMM_OVERSCAN_V_LABEL_VN,
+      NULL,
+      FCEUMM_OVERSCAN_V_INFO_0_VN,
+      NULL,
+      "video",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+#endif /* overscan options */
+   {
+      "fceumm_palette",
+      FCEUMM_PALETTE_LABEL_VN,
+      NULL,
+      FCEUMM_PALETTE_INFO_0_VN,
+      NULL,
+      "video",
+      {
+         { "default",              OPTION_VAL_DEFAULT_VN },
+         { "asqrealc",             OPTION_VAL_ASQREALC_VN },
+         { "nintendo-vc",          OPTION_VAL_NINTENDO_VC_VN },
+         { "rgb",                  OPTION_VAL_RGB_VN },
+         { "yuv-v3",               OPTION_VAL_YUV_V3_VN },
+         { "unsaturated-final",    OPTION_VAL_UNSATURATED_FINAL_VN },
+         { "sony-cxa2025as-us",    OPTION_VAL_SONY_CXA2025AS_US_VN },
+         { "pal",                  OPTION_VAL_PAL_VN },
+         { "bmf-final2",           OPTION_VAL_BMF_FINAL2_VN },
+         { "bmf-final3",           OPTION_VAL_BMF_FINAL3_VN },
+         { "smooth-fbx",           OPTION_VAL_SMOOTH_FBX_VN },
+         { "composite-direct-fbx", OPTION_VAL_COMPOSITE_DIRECT_FBX_VN },
+         { "pvm-style-d93-fbx",    OPTION_VAL_PVM_STYLE_D93_FBX_VN },
+         { "ntsc-hardware-fbx",    OPTION_VAL_NTSC_HARDWARE_FBX_VN },
+         { "nes-classic-fbx-fs",   OPTION_VAL_NES_CLASSIC_FBX_FS_VN },
+         { "nescap",               OPTION_VAL_NESCAP_VN },
+         { "wavebeam",             OPTION_VAL_WAVEBEAM_VN },
+         { "raw",                  OPTION_VAL_RAW_VN },
+         { "custom",               OPTION_VAL_CUSTOM_VN },
+         { NULL, NULL },
+      },
+      "default",
+   },
+#ifdef HAVE_NTSC_FILTER
+   {
+      "fceumm_ntsc_filter",
+      FCEUMM_NTSC_FILTER_LABEL_VN,
+      NULL,
+      FCEUMM_NTSC_FILTER_INFO_0_VN,
+      NULL,
+      "video",
+      {
+         { "disabled",   NULL },
+         { "composite",  OPTION_VAL_COMPOSITE_VN },
+         { "svideo",     OPTION_VAL_SVIDEO_VN },
+         { "rgb",        OPTION_VAL_RGB_O9_VN },
+         { "monochrome", OPTION_VAL_MONOCHROME_VN },
+         { NULL, NULL },
+      },
+      "disabled"
+   },
+#endif
+   {
+      "fceumm_sndquality",
+      FCEUMM_SNDQUALITY_LABEL_VN,
+      NULL,
+      FCEUMM_SNDQUALITY_INFO_0_VN,
+      NULL,
+      "audio",
+      {
+         { "Low",       OPTION_VAL_LOW_VN },
+         { "High",      OPTION_VAL_HIGH_VN },
+         { "Very High", OPTION_VAL_VERY_HIGH_VN },
+         { NULL, NULL },
+      },
+      "Low",
+   },
+   {
+      "fceumm_swapduty",
+      FCEUMM_SWAPDUTY_LABEL_VN,
+      FCEUMM_SWAPDUTY_LABEL_CAT_VN,
+      FCEUMM_SWAPDUTY_INFO_0_VN,
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_sndvolume",
+      FCEUMM_SNDVOLUME_LABEL_VN,
+      NULL,
+      FCEUMM_SNDVOLUME_INFO_0_VN,
+      NULL,
+      "audio",
+      {
+         { "0",  OPTION_VAL_0_VN },
+         { "1",  OPTION_VAL_1_VN },
+         { "2",  OPTION_VAL_2_VN },
+         { "3",  OPTION_VAL_3_VN },
+         { "4",  OPTION_VAL_4_VN },
+         { "5",  OPTION_VAL_5_VN },
+         { "6",  OPTION_VAL_6_VN },
+         { "7",  OPTION_VAL_7_VN },
+         { "8",  OPTION_VAL_8_VN },
+         { "9",  OPTION_VAL_9_VN },
+         { "10", OPTION_VAL_10_VN },
+         { NULL, NULL },
+      },
+      "7",
+   },
+   {
+      "fceumm_apu_1",
+      FCEUMM_APU_1_LABEL_VN,
+      FCEUMM_APU_1_LABEL_CAT_VN,
+      FCEUMM_APU_1_INFO_0_VN,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_2",
+      FCEUMM_APU_2_LABEL_VN,
+      FCEUMM_APU_2_LABEL_CAT_VN,
+      FCEUMM_APU_2_INFO_0_VN,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_3",
+      FCEUMM_APU_3_LABEL_VN,
+      FCEUMM_APU_3_LABEL_CAT_VN,
+      FCEUMM_APU_3_INFO_0_VN,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_4",
+      FCEUMM_APU_4_LABEL_VN,
+      FCEUMM_APU_4_LABEL_CAT_VN,
+      FCEUMM_APU_4_INFO_0_VN,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_apu_5",
+      FCEUMM_APU_5_LABEL_VN,
+      FCEUMM_APU_5_LABEL_CAT_VN,
+      FCEUMM_APU_5_INFO_0_VN,
+      NULL,
+      "audio",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_turbo_enable",
+      FCEUMM_TURBO_ENABLE_LABEL_VN,
+      NULL,
+      FCEUMM_TURBO_ENABLE_INFO_0_VN,
+      NULL,
+      "input",
+      {
+         { "None",     OPTION_VAL_NONE_VN },
+         { "Player 1", OPTION_VAL_PLAYER_1_VN },
+         { "Player 2", OPTION_VAL_PLAYER_2_VN },
+         { "Both",     OPTION_VAL_BOTH_VN },
+         { NULL, NULL },
+      },
+      "None",
+   },
+   {
+      "fceumm_turbo_delay",
+      FCEUMM_TURBO_DELAY_LABEL_VN,
+      NULL,
+      FCEUMM_TURBO_DELAY_INFO_0_VN,
+      NULL,
+      "input",
+      {
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "5",  NULL },
+         { "10", NULL },
+         { "15", NULL },
+         { "30", NULL },
+         { "60", NULL },
+         { NULL, NULL },
+      },
+      "3",
+   },
+   {
+      "fceumm_zapper_mode",
+      FCEUMM_ZAPPER_MODE_LABEL_VN,
+      NULL,
+      FCEUMM_ZAPPER_MODE_INFO_0_VN,
+      NULL,
+      "input",
+      {
+         { "lightgun",    OPTION_VAL_LIGHTGUN_VN },
+         { "touchscreen", OPTION_VAL_TOUCHSCREEN_VN },
+         { "mouse",       OPTION_VAL_MOUSE_VN },
+         { NULL, NULL },
+      },
+      "lightgun",
+   },
+   {
+      "fceumm_show_crosshair",
+      FCEUMM_SHOW_CROSSHAIR_LABEL_VN,
+      NULL,
+      FCEUMM_SHOW_CROSSHAIR_INFO_0_VN,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_tolerance",
+      FCEUMM_ZAPPER_TOLERANCE_LABEL_VN,
+      NULL,
+      FCEUMM_ZAPPER_TOLERANCE_INFO_0_VN,
+      NULL,
+      "input",
+      {
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
+         { "11", NULL },
+         { "12", NULL },
+         { "13", NULL },
+         { "14", NULL },
+         { "15", NULL },
+         { "16", NULL },
+         { "17", NULL },
+         { "18", NULL },
+         { "19", NULL },
+         { "20", NULL },
+         { NULL, NULL },
+      },
+      "6",
+   },
+   {
+      "fceumm_up_down_allowed",
+      FCEUMM_UP_DOWN_ALLOWED_LABEL_VN,
+      NULL,
+      FCEUMM_UP_DOWN_ALLOWED_INFO_0_VN,
+      NULL,
+      "input",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_nospritelimit",
+      FCEUMM_NOSPRITELIMIT_LABEL_VN,
+      NULL,
+      FCEUMM_NOSPRITELIMIT_INFO_0_VN,
+      NULL,
+      "hacks",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_overclocking",
+      FCEUMM_OVERCLOCKING_LABEL_VN,
+      NULL,
+      FCEUMM_OVERCLOCKING_INFO_0_VN,
+      NULL,
+      "hacks",
+      {
+         { "disabled",      NULL },
+         { "2x-Postrender", OPTION_VAL_2X_POSTRENDER_VN },
+         { "2x-VBlank",     OPTION_VAL_2X_VBLANK_VN },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
+   {
+      "fceumm_ramstate",
+      FCEUMM_RAMSTATE_LABEL_VN,
+      NULL,
+      FCEUMM_RAMSTATE_INFO_0_VN,
+      NULL,
+      "hacks",
+      {
+         { "fill $ff", OPTION_VAL_FILL_FF_VN },
+         { "fill $00", OPTION_VAL_FILL_00_VN },
+         { "random",   OPTION_VAL_RANDOM_VN },
+         { NULL, NULL },
+      },
+      "fill $ff",
+   },
+   { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+};
+struct retro_core_options_v2 options_vn = {
+   option_cats_vn,
+   option_defs_vn
+};
 
-/* RETRO_LANGUAGE_FINNISH */
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif
\ No newline at end of file

From ee5e9a966fb619f71c6492221db235092552ac89 Mon Sep 17 00:00:00 2001
From: IlDucci <pajaroloco_2@hotmail.com>
Date: Sun, 5 Dec 2021 12:04:31 +0100
Subject: [PATCH 165/295] [Core options text] Text fixes

 - Changing the main category sublabels to follow RetroArch's style.
 - Uppercased the TM Zapper.
 - Changed the "FS" part of the FBX NES Classic palette to "(fixed)" (FS meant fullscreen, as in, FBX did one version of this palette, but said themselves that it was captured incorrectly, so the fixed solution was captured by taking into account the parameters of the full screen. FBX never meant to have a full name for the corrected version).
---
 src/drivers/libretro/libretro_core_options.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/drivers/libretro/libretro_core_options.h b/src/drivers/libretro/libretro_core_options.h
index af2e85d..7a6a2dc 100644
--- a/src/drivers/libretro/libretro_core_options.h
+++ b/src/drivers/libretro/libretro_core_options.h
@@ -36,36 +36,36 @@ struct retro_core_option_v2_category option_cats_us[] = {
    {
       "system",
       "System",
-      "Configure region and hardware add-on parameters."
+      "Change region and hardware add-on settings."
    },
    {
       "video",
       "Video",
 #ifdef HAVE_NTSC_FILTER
-      "Configure aspect ratio, display cropping, color palette, video filter options."
+      "Change aspect ratio, display cropping, color palette and video filter options."
 #else
-      "Configure aspect ratio, display cropping, color palette options."
+      "Change aspect ratio, display cropping and color palette options."
 #endif
    },
    {
       "audio",
       "Audio",
-      "Configure sound quality, volume, channel enable settings."
+      "Change sound quality, volume, channel enable settings."
    },
    {
       "input",
       "Input",
-      "Configure turbo and light gun parameters."
+      "Change turbo and light gun settings."
    },
    {
       "hacks",
       "Emulation Hacks",
-      "Configure processor overclocking and emulation accuracy parameters affecting low-level performance and compatibility."
+      "Change processor overclocking and emulation accuracy settings affecting low-level performance and compatibility."
    },
    {
       "dip_switch",
       "DIP Switches",
-      "Configure arcade game settings."
+      "Change arcade game settings."
    },
    { NULL, NULL, NULL },
 };
@@ -211,7 +211,7 @@ struct retro_core_option_v2_definition option_defs[] = {
          { "composite-direct-fbx", "FBX's Composite Direct" },
          { "pvm-style-d93-fbx",    "FBX's PVM Style D93" },
          { "ntsc-hardware-fbx",    "FBX's NTSC Hardware" },
-         { "nes-classic-fbx-fs",   "FBX's NES-Classic FS" },
+         { "nes-classic-fbx-fs",   "FBX's NES Classic (fixed)" },
          { "nescap",               "RGBSource's NESCAP" },
          { "wavebeam",             "nakedarthur's Wavebeam" },
          { "raw",                  "Raw" },
@@ -401,7 +401,7 @@ struct retro_core_option_v2_definition option_defs[] = {
       "fceumm_zapper_mode",
       "Zapper Mode",
       NULL,
-      "Selects device to use for zapper games.",
+      "Selects device to use for Zapper games.",
       NULL,
       "input",
       {
@@ -416,7 +416,7 @@ struct retro_core_option_v2_definition option_defs[] = {
       "fceumm_show_crosshair",
       "Show Zapper Crosshair",
       NULL,
-      "Shows or hides on-screen crosshairs when using a zapper.",
+      "Shows or hides on-screen crosshairs when using a Zapper.",
       NULL,
       "input",
       {

From ae4215221692693819255425d02f8f535f878fef Mon Sep 17 00:00:00 2001
From: Davis Mosenkovs <davikovs@gmail.com>
Date: Fri, 10 Dec 2021 23:53:45 +0200
Subject: [PATCH 166/295] Add A+B and Turbo A+B buttons

---
 src/drivers/libretro/libretro.c | 34 ++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 117ff83..f94debe 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -103,7 +103,7 @@ static int aspect_ratio_par;
  * each player
  */
 
-#define MAX_BUTTONS 8
+#define MAX_BUTTONS 9
 #define TURBO_BUTTONS 2
 unsigned char turbo_button_toggle[MAX_PLAYERS][TURBO_BUTTONS] = { {0} };
 
@@ -121,6 +121,7 @@ static const keymap turbomap[] = {
 static const keymap bindmap[] = {
    { RETRO_DEVICE_ID_JOYPAD_A, JOY_A },
    { RETRO_DEVICE_ID_JOYPAD_B, JOY_B },
+   { RETRO_DEVICE_ID_JOYPAD_L3, JOY_A | JOY_B },
    { RETRO_DEVICE_ID_JOYPAD_SELECT, JOY_SELECT },
    { RETRO_DEVICE_ID_JOYPAD_START, JOY_START },
    { RETRO_DEVICE_ID_JOYPAD_UP, JOY_UP },
@@ -2011,6 +2012,8 @@ static void FCEUD_UpdateInput(void)
                input_buf |= JOY_A;
             if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_B))
                input_buf |= JOY_B;
+            if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_L3))
+               input_buf |= JOY_A | JOY_B;
             if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_SELECT))
                input_buf |= JOY_SELECT;
             if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_START))
@@ -2052,20 +2055,29 @@ static void FCEUD_UpdateInput(void)
          /* Turbo A and Turbo B buttons are
           * mapped to Joypad X and Joypad Y
           * in RetroArch joypad.
+          * Turbo A+B button is mapped to R3
+          * in RetroArch joypad.
           *
           * We achieve this by keeping track of
           * the number of times it increments
           * the toggle counter and fire or not fire
           * depending on whether the delay value has
           * been reached.
+          *
+          * Each turbo button is activated by
+          * corresponding mapped button
+          * OR mapped Turbo A+B button.
+          * This allows Turbo A+B button to use
+          * the same toggle counters as Turbo A
+          * and Turbo B buttons use separately.
           */
 
          if (nes_input.turbo_enabler[player])
          {
-            /* Handle Turbo A & B buttons */
+            /* Handle Turbo A, B & A+B buttons */
             for (i = 0; i < TURBO_BUTTONS; i++)
             {
-               if (input_cb(player, RETRO_DEVICE_JOYPAD, 0, turbomap[i].retro))
+               if (input_cb(player, RETRO_DEVICE_JOYPAD, 0, turbomap[i].retro) || input_cb(player, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3))
                {
                   if (!turbo_button_toggle[player][i])
                      input_buf |= turbomap[i].nes;
@@ -2767,6 +2779,7 @@ bool retro_load_game(const struct retro_game_info *info)
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT,  "D-Pad Right" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,      "B" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,      "A" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L3,     "A+B" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,  "Start" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2,     "(VSSystem) Insert Coin" },
@@ -2774,6 +2787,7 @@ bool retro_load_game(const struct retro_game_info *info)
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R,      "(FDS) Insert/Eject Disk" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,      "Turbo A" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,      "Turbo B" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3,     "Turbo A+B" },
 
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,   "D-Pad Left" },
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,     "D-Pad Up" },
@@ -2781,10 +2795,12 @@ bool retro_load_game(const struct retro_game_info *info)
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT,  "D-Pad Right" },
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,      "B" },
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,      "A" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L3,     "A+B" },
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,  "Start" },
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,      "Turbo A" },
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,      "Turbo B" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3,     "Turbo A+B" },
 
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,   "D-Pad Left" },
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,     "D-Pad Up" },
@@ -2792,10 +2808,12 @@ bool retro_load_game(const struct retro_game_info *info)
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT,  "D-Pad Right" },
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,      "B" },
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,      "A" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L3,     "A+B" },
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,  "Start" },
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,      "Turbo A" },
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,      "Turbo B" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3,     "Turbo A+B" },
 
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,   "D-Pad Left" },
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,     "D-Pad Up" },
@@ -2803,10 +2821,12 @@ bool retro_load_game(const struct retro_game_info *info)
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT,  "D-Pad Right" },
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,      "B" },
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,      "A" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L3,     "A+B" },
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,  "Start" },
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,      "Turbo A" },
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,      "Turbo B" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3,     "Turbo A+B" },
 
       { 0 },
    };
@@ -2818,6 +2838,7 @@ bool retro_load_game(const struct retro_game_info *info)
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT,  "D-Pad Right" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,      "B" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,      "A" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L3,     "A+B" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,  "Start" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L2,     "Switch Palette (+ Left/Right)" },
@@ -2826,6 +2847,7 @@ bool retro_load_game(const struct retro_game_info *info)
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R,      "(FDS) Insert/Eject Disk" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,      "Turbo A" },
       { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,      "Turbo B" },
+      { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3,     "Turbo A+B" },
 
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,   "D-Pad Left" },
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,     "D-Pad Up" },
@@ -2833,10 +2855,12 @@ bool retro_load_game(const struct retro_game_info *info)
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT,  "D-Pad Right" },
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,      "B" },
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,      "A" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L3,     "A+B" },
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,  "Start" },
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,      "Turbo A" },
       { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,      "Turbo B" },
+      { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3,     "Turbo A+B" },
 
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,   "D-Pad Left" },
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,     "D-Pad Up" },
@@ -2844,10 +2868,12 @@ bool retro_load_game(const struct retro_game_info *info)
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT,  "D-Pad Right" },
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,      "B" },
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,      "A" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L3,     "A+B" },
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,  "Start" },
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,      "Turbo A" },
       { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,      "Turbo B" },
+      { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3,     "Turbo A+B" },
 
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT,   "D-Pad Left" },
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP,     "D-Pad Up" },
@@ -2855,10 +2881,12 @@ bool retro_load_game(const struct retro_game_info *info)
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT,  "D-Pad Right" },
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B,      "B" },
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A,      "A" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L3,     "A+B" },
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,  "Start" },
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X,      "Turbo A" },
       { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y,      "Turbo B" },
+      { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3,     "Turbo A+B" },
 
       { 0 },
    };

From d72c64e5d9a022e1f27290d3c7bb969e3c9e6a68 Mon Sep 17 00:00:00 2001
From: NRS-NewRisingSun <32988436+NRS-NewRisingSun@users.noreply.github.com>
Date: Thu, 6 Jan 2022 08:22:18 +0100
Subject: [PATCH 167/295] Exponential notation of NES 2.0 ROM sizes; mappers
 (#480)

* Support 2 MIB mapper 314 (Y2K 76-in-1)

* Mapper 57: Forgot one Sync() statement

* Mapper 83: Correction for 256 KiB PRG+512 KiB CHR games

* Mapper 114: Use NES 2.0 submapper field if available to differentiate between scrambling patterns

* NES 2.0: Support exponential notation of PRG/CHR sizes, thus adding support for 4 KiB and 8 KiB ROM files.

* Add mapper 553.

* Correct the database regarding the Nanjing game Pegasus Senya

* Add submapper 5 (HST-162) to mapper 176

* Add mapper 436

* Mapper 176.5 has a CNROM latch as well, though it works a bit differently than submapper 1's

* Added mapper 429

* Added mapper 380 submapper 1

* Added mapper 437

* Added mapper 456

* Forgot to include math.h for pow

* Added mapper 434

* Added mapper 452

* Added mapper 438

* Added mappers 391 and 444, corrected the mixup with BS-110 and NC7000M

* Added mapper 443. Added menu-switching funcionality to mapper 444

Co-authored-by: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
---
 src/boards/380.c        |   6 +-
 src/boards/391.c        |  71 ++++++++++++++
 src/boards/434.c        |  62 +++++++++++++
 src/boards/436.c        |  63 +++++++++++++
 src/boards/437.c        |  62 +++++++++++++
 src/boards/438.c        |  62 +++++++++++++
 src/boards/443.c        |  79 ++++++++++++++++
 src/boards/444.c        |  81 ++++++++++++++++
 src/boards/452.c        |  79 ++++++++++++++++
 src/boards/456.c        |  58 ++++++++++++
 src/boards/57.c         |   1 +
 src/boards/BS110.c      | 199 ----------------------------------------
 src/boards/NC7000M.c    | 186 -------------------------------------
 src/boards/bmc64in1nr.c |   4 +-
 src/boards/datalatch.c  |  17 ++++
 src/boards/fk23c.c      |  21 ++++-
 src/boards/mmc3.c       |   6 +-
 src/boards/sachen.c     |  15 +++
 src/boards/yoko.c       |  85 +++++++++--------
 src/ines-correct.h      |   4 +-
 src/ines.c              |  47 ++++++----
 src/ines.h              |  12 ++-
 src/unif.c              |   2 +-
 src/unif.h              |   2 +-
 24 files changed, 767 insertions(+), 457 deletions(-)
 create mode 100644 src/boards/391.c
 create mode 100644 src/boards/434.c
 create mode 100644 src/boards/436.c
 create mode 100644 src/boards/437.c
 create mode 100644 src/boards/438.c
 create mode 100644 src/boards/443.c
 create mode 100644 src/boards/444.c
 create mode 100644 src/boards/452.c
 create mode 100644 src/boards/456.c
 delete mode 100644 src/boards/BS110.c
 delete mode 100644 src/boards/NC7000M.c

diff --git a/src/boards/380.c b/src/boards/380.c
index a6bf1be..280d0a4 100644
--- a/src/boards/380.c
+++ b/src/boards/380.c
@@ -25,6 +25,7 @@
 
 static uint16 latche;
 static uint8 dipswitch;
+static uint8 isKN35A;
 
 static SFORMAT StateRegs[] = {
    { &latche, 2 | FCEUSTATE_RLSB, "LATC" },
@@ -47,14 +48,14 @@ static void Sync(void)
    else /* UxROM */
    {
       setprg16(0x8000, latche >> 2);
-      setprg16(0xC000, (latche >> 2) | 7);
+      setprg16(0xC000, (latche >> 2) | 7 | (isKN35A && latche &0x100? 8: 0));
    }
    setmirror(((latche >> 1) & 1) ^ 1);
 }
 
 static DECLFR(M380Read)
 {
-   if (latche & 0x100)
+   if (latche & 0x100 && !isKN35A)
       return dipswitch;
    return CartBR(A);
 }
@@ -89,6 +90,7 @@ static void StateRestore(int version)
 
 void Mapper380_Init(CartInfo *info)
 {
+   isKN35A = info->iNES2 && info->submapper == 1;
    info->Power = M380Power;
    info->Reset = M380Reset;
    GameStateRestore = StateRestore;
diff --git a/src/boards/391.c b/src/boards/391.c
new file mode 100644
index 0000000..04a02d5
--- /dev/null
+++ b/src/boards/391.c
@@ -0,0 +1,71 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2020 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* BS-110 PCB, previously called NC7000M due to a mix-up. */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static void Mapper391_PRGWrap(uint32 A, uint8 V) {
+	int prgAND =EXPREGS[0] &0x08? 0x0F: 0x1F;
+	int prgOR  =EXPREGS[0] <<4 &0x30;
+	if (EXPREGS[0] &0x20) {
+		if (~A &0x4000) {
+			setprg8(A,         (EXPREGS[0] &0x04? ~2: ~0) &V &prgAND | prgOR &~prgAND);
+			setprg8(A |0x4000, (EXPREGS[0] &0x04?  2:  0) |V &prgAND | prgOR &~prgAND);
+		}
+	} else
+		setprg8(A, V &prgAND | prgOR &~prgAND);
+}
+
+static void Mapper391_CHRWrap(uint32 A, uint8 V) {
+	int chrAND =EXPREGS[0] &0x40? 0x7F: 0xFF;
+	int chrOR  =EXPREGS[0] <<3 &0x80 | EXPREGS[1] <<8 &0x100;
+	setchr1(A, V &chrAND | chrOR &~chrAND);
+}
+
+static DECLFW(Mapper391_Write) {
+	if (~EXPREGS[0] &0x80) {
+		EXPREGS[0] =V;
+		EXPREGS[1] =A >>8 &0xFF;
+		FixMMC3PRG(MMC3_cmd);
+		FixMMC3CHR(MMC3_cmd);
+	}
+}
+
+static void Mapper391_Reset(void) {
+	EXPREGS[0] =EXPREGS[1] =0;
+	MMC3RegReset();
+}
+
+static void Mapper391_Power(void) {
+	EXPREGS[0] =EXPREGS[1] =0;
+	GenMMC3Power();
+	SetWriteHandler(0x6000, 0x7FFF, Mapper391_Write);
+}
+
+void Mapper391_Init(CartInfo *info) {
+	GenMMC3_Init(info, 256, 256, 0, 0);
+	cwrap = Mapper391_CHRWrap;
+	pwrap = Mapper391_PRGWrap;
+	info->Power = Mapper391_Power;
+	info->Reset = Mapper391_Reset;
+	AddExState(EXPREGS, 2, 0, "EXPR");
+}
diff --git a/src/boards/434.c b/src/boards/434.c
new file mode 100644
index 0000000..f005162
--- /dev/null
+++ b/src/boards/434.c
@@ -0,0 +1,62 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2012 CaH4e3
+ *  Copyright (C) 2002 Xodnizel
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+ 
+/* S-009. UNROM plus outer bank register at $6000-$7FFF. */
+ 
+#include "mapinc.h"
+
+static uint16 latch;
+
+static void Mapper434_Sync(void) {	
+	setprg16(0x8000, latch);
+	setprg16(0xC000, latch |7);
+	setchr8(0);
+	setmirror(latch >>8 &1);
+}
+
+static DECLFW(Mapper434_WriteOuterBank) {
+	latch =latch &7 | V <<3;
+	Mapper434_Sync();
+}
+
+static DECLFW(Mapper434_WriteInnerBank) {
+	latch =latch &~7 | V &CartBR(A) &7;
+	Mapper434_Sync();
+}
+
+static void Mapper434_Reset(void) {
+	latch =0;
+	Mapper434_Sync();
+}
+
+static void Mapper434_Power(void) {
+	latch =0;
+	Mapper434_Sync();
+	SetReadHandler(0x8000, 0xFFFF, CartBR);
+	SetWriteHandler(0x6000, 0x7FFF, Mapper434_WriteOuterBank);
+	SetWriteHandler(0x8000, 0xFFFF, Mapper434_WriteInnerBank);
+}
+
+void Mapper434_Init(CartInfo *info) {
+	info->Reset = Mapper434_Reset;
+	info->Power = Mapper434_Power;
+	AddExState(&latch, 2, 0, "LATC");
+}
diff --git a/src/boards/436.c b/src/boards/436.c
new file mode 100644
index 0000000..b7be076
--- /dev/null
+++ b/src/boards/436.c
@@ -0,0 +1,63 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2008 CaH4e3
+ *  Copyright (C) 2019 Libretro Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* NES 2.0 Mapper 436: 820401/T-217 */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static void Mapper436_PWrap(uint32 A, uint8 V) {
+	if (EXPREGS[0] &0x01)
+		setprg8(A, V &0x0F | EXPREGS[0] >>2 &0x30);
+	else
+	if (A == 0x8000)
+		setprg32(A, (EXPREGS[0] >>4));
+}
+
+static void Mapper436_CWrap(uint32 A, uint8 V) {
+	setchr1(A, V &0x7F | EXPREGS[0] <<1 &~0x7F);
+}
+
+static DECLFW(Mapper436_Write) {
+	EXPREGS[0] = A &0xFF;
+	FixMMC3PRG(MMC3_cmd);
+	FixMMC3CHR(MMC3_cmd);
+}
+
+static void Mapper436_Reset(void) {
+	EXPREGS[0] = 0;
+	MMC3RegReset();
+}
+
+static void Mapper436_Power(void) {
+	EXPREGS[0] = 0;
+	GenMMC3Power();
+	SetWriteHandler(0x6000, 0x7FFF, Mapper436_Write);
+}
+
+void Mapper436_Init(CartInfo *info) {
+	GenMMC3_Init(info, 128, 128, 8, 0);
+	pwrap = Mapper436_PWrap;
+	cwrap = Mapper436_CWrap;
+	info->Power = Mapper436_Power;
+	info->Reset = Mapper436_Reset;
+	AddExState(EXPREGS, 1, 0, "EXPR");
+}
diff --git a/src/boards/437.c b/src/boards/437.c
new file mode 100644
index 0000000..d12e294
--- /dev/null
+++ b/src/boards/437.c
@@ -0,0 +1,62 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2012 CaH4e3
+ *  Copyright (C) 2002 Xodnizel
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+ 
+/* NTDEC TH2348 circuit board. UNROM plus outer bank register at $5FFx. */
+ 
+#include "mapinc.h"
+
+static uint8 latch;
+
+static void Mapper437_Sync(void) {	
+	setprg16(0x8000, latch);
+	setprg16(0xC000, latch |7);
+	setchr8(0);
+	setmirror(latch >>6 &1 ^1);
+}
+
+static DECLFW(Mapper437_WriteOuterBank) {
+	latch =latch &7 | A <<3;
+	Mapper437_Sync();
+}
+
+static DECLFW(Mapper437_WriteInnerBank) {
+	latch =latch &~7 | V &CartBR(A) &7;
+	Mapper437_Sync();
+}
+
+static void Mapper437_Reset(void) {
+	latch =0;
+	Mapper437_Sync();
+}
+
+static void Mapper437_Power(void) {
+	latch =0;
+	Mapper437_Sync();
+	SetReadHandler(0x8000, 0xFFFF, CartBR);
+	SetWriteHandler(0x5000, 0x5FFF, Mapper437_WriteOuterBank);
+	SetWriteHandler(0x8000, 0xFFFF, Mapper437_WriteInnerBank);
+}
+
+void Mapper437_Init(CartInfo *info) {
+	info->Reset = Mapper437_Reset;
+	info->Power = Mapper437_Power;
+	AddExState(&latch, 1, 0, "LATC");
+}
diff --git a/src/boards/438.c b/src/boards/438.c
new file mode 100644
index 0000000..1602644
--- /dev/null
+++ b/src/boards/438.c
@@ -0,0 +1,62 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2012 CaH4e3
+ *  Copyright (C) 2002 Xodnizel
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+ 
+/* K-3071 */
+ 
+#include "mapinc.h"
+
+static uint8 latch[2];
+
+static void Mapper438_Sync(void) {
+	if (latch[0] &1)
+		setprg32(0x8000, latch[0] >>2);
+	else {
+		setprg16(0x8000, latch[0] >>1);
+		setprg16(0xC000, latch[0] >>1);
+	}
+	setchr8(latch[1] >>1);
+	setmirror(latch[1] &1 ^1);
+	
+}
+
+static DECLFW(Mapper438_WriteLatch) {
+	latch[0] =A &0xFF;
+	latch[1] =V;
+	Mapper438_Sync();
+}
+
+static void Mapper438_Reset(void) {
+	latch[0] =latch[1] =0;
+	Mapper438_Sync();
+}
+
+static void Mapper438_Power(void) {
+	latch[0] =latch[1] =0;
+	Mapper438_Sync();
+	SetReadHandler(0x8000, 0xFFFF, CartBR);
+	SetWriteHandler(0x8000, 0xFFFF, Mapper438_WriteLatch);
+}
+
+void Mapper438_Init(CartInfo *info) {
+	info->Reset = Mapper438_Reset;
+	info->Power = Mapper438_Power;
+	AddExState(&latch, 2, 0, "LATC");
+}
diff --git a/src/boards/443.c b/src/boards/443.c
new file mode 100644
index 0000000..dcd2c12
--- /dev/null
+++ b/src/boards/443.c
@@ -0,0 +1,79 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2020 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* NC3000M PCB */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static uint8 dip;
+
+static void Mapper443_PRGWrap(uint32 A, uint8 V) {
+	int prgAND =0x0F;
+	int prgOR  =EXPREGS[0] <<4 &0x20 | EXPREGS[0] &0x10;
+	if (EXPREGS[0] &0x04) {
+		if (~A &0x4000) {
+			setprg8(A,         (~EXPREGS[0] &0x08? ~2: ~0) &V &prgAND | prgOR &~prgAND);
+			setprg8(A |0x4000, (~EXPREGS[0] &0x08?  2:  0) |V &prgAND | prgOR &~prgAND);
+		}
+	} else
+		setprg8(A, V &prgAND | prgOR &~prgAND);
+}
+
+static void Mapper443_CHRWrap(uint32 A, uint8 V) {
+	int chrAND =0xFF;
+	int chrOR  =EXPREGS[0] <<8;
+	setchr1(A, V &chrAND | chrOR &~chrAND);
+}
+
+static DECLFR(Mapper443_Read) {
+	return (EXPREGS[0] &0x0C) ==0x08? dip: CartBR(A);
+}
+
+static DECLFW(Mapper443_Write) {
+	EXPREGS[0] =A &0xFF;
+	FixMMC3PRG(MMC3_cmd);
+	FixMMC3CHR(MMC3_cmd);
+}
+
+static void Mapper443_Reset(void) {
+	dip++;
+	dip &= 15;
+	EXPREGS[0] =0;
+	MMC3RegReset();
+}
+
+static void Mapper443_Power(void) {
+	dip =0;
+	EXPREGS[0] =0;
+	GenMMC3Power();
+	SetWriteHandler(0x6000, 0x7FFF, Mapper443_Write);
+	SetReadHandler(0x8000, 0xFFFF, Mapper443_Read);
+}
+
+void Mapper443_Init(CartInfo *info) {
+	GenMMC3_Init(info, 256, 256, 0, 0);
+	cwrap = Mapper443_CHRWrap;
+	pwrap = Mapper443_PRGWrap;
+	info->Power = Mapper443_Power;
+	info->Reset = Mapper443_Reset;
+	AddExState(EXPREGS, 1, 0, "EXPR");
+	AddExState(&dip, 1, 0, "DIPS");
+}
diff --git a/src/boards/444.c b/src/boards/444.c
new file mode 100644
index 0000000..ec6c945
--- /dev/null
+++ b/src/boards/444.c
@@ -0,0 +1,81 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2020 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* NC7000M PCB, with incorrect UNIF MAPR BS-110 due to a mix-up. Submappers denote the setting of two solder pads that configure CHR banking. */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static uint8 pads;
+static uint8 dip;
+
+static void Mapper444_PRGWrap(uint32 A, uint8 V) {
+	int prgAND =0x0F;
+	int prgOR  =EXPREGS[0] <<4;
+	if (EXPREGS[0] &0x04) {
+		if (~A &0x4000) {
+			setprg8(A,         (~EXPREGS[0] &0x08? ~2: ~0) &V &prgAND | prgOR &~prgAND);
+			setprg8(A |0x4000, (~EXPREGS[0] &0x08?  2:  0) |V &prgAND | prgOR &~prgAND);
+		}
+	} else
+		setprg8(A, V &prgAND | prgOR &~prgAND);
+}
+
+static void Mapper444_CHRWrap(uint32 A, uint8 V) {
+	int chrAND =pads &1? 0xFF: 0x7F;
+	int chrOR  =EXPREGS[0] <<7 &(pads &1? 0x00: 0x80) | EXPREGS[0] <<(pads &2? 4: 7) &0x100;
+	setchr1(A, V &chrAND | chrOR &~chrAND);
+}
+
+static DECLFR(Mapper444_Read) {
+	return (EXPREGS[0] &0x0C) ==0x08? dip: CartBR(A);
+}
+
+static DECLFW(Mapper444_Write) {
+	EXPREGS[0] =A &0xFF;
+	FixMMC3PRG(MMC3_cmd);
+	FixMMC3CHR(MMC3_cmd);
+}
+
+static void Mapper444_Reset(void) {
+	dip++;
+	dip &= 3;
+	EXPREGS[0] =0;
+	MMC3RegReset();
+}
+
+static void Mapper444_Power(void) {
+	dip =0;
+	EXPREGS[0] =0;
+	GenMMC3Power();
+	SetWriteHandler(0x6000, 0x7FFF, Mapper444_Write);
+	SetReadHandler(0x8000, 0xFFFF, Mapper444_Read);
+}
+
+void Mapper444_Init(CartInfo *info) {
+	pads = info->submapper; /* UNIF represents submapper 0 */
+	GenMMC3_Init(info, 256, 256, 0, 0);
+	cwrap = Mapper444_CHRWrap;
+	pwrap = Mapper444_PRGWrap;
+	info->Power = Mapper444_Power;
+	info->Reset = Mapper444_Reset;
+	AddExState(EXPREGS, 1, 0, "EXPR");
+	AddExState(&dip, 1, 0, "DIPS");
+}
diff --git a/src/boards/452.c b/src/boards/452.c
new file mode 100644
index 0000000..df50a16
--- /dev/null
+++ b/src/boards/452.c
@@ -0,0 +1,79 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2012 CaH4e3
+ *  Copyright (C) 2002 Xodnizel
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+ 
+/* DS-9-27. Absolutely insane PCB that overlays 8 KiB of WRAM into a selectable position between $8000 and $E000. */
+ 
+#include "mapinc.h"
+
+static uint8 latch[2];
+
+static void Mapper452_Sync(void) {
+	uint8 wramBank = latch[1] >>3 &6 |8;
+	if (latch[1] &2) {
+		setprg8(0x8000, latch[0] >>1);
+		setprg8(0xA000, latch[0] >>1);
+		setprg8(0xC000, latch[0] >>1);
+		setprg8(0xE000, latch[0] >>1);
+		setprg8r(0x10, (wramBank ^4) <<12, 0);
+	} else
+	if (latch[1] &8) {
+		setprg8(0x8000, latch[0] >>1 |0);
+		setprg8(0xA000, latch[0] >>1 |1);
+		setprg8(0xC000, latch[0] >>1 |2);
+		setprg8(0xE000, latch[0] >>1 |3 | latch[1] &4);
+	} else {
+		setprg16(0x8000, latch[0] >>2);
+		setprg16(0xC000, 0);
+	}
+	setprg8r(0x10, wramBank <<12, 0);
+	setchr8(0);
+	setmirror(latch [1] &1 ^1);
+	
+}
+
+static DECLFW(Mapper452_WriteLatch) {
+	latch[0] =A &0xFF;
+	latch[1] =V;
+	Mapper452_Sync();
+	/* Do not relay to CartBW, as RAM mapped to locations other than $8000-$DFFF are not write-enabled. */
+}
+
+static void Mapper452_Reset(void) {
+	latch[0] =latch[1] =0;
+	Mapper452_Sync();
+}
+
+static void Mapper452_Power(void) {
+	latch[0] =latch[1] =0;
+	Mapper452_Sync();
+	SetReadHandler(0x8000, 0xFFFF, CartBR);
+	SetWriteHandler(0x8000, 0xDFFF, Mapper452_WriteLatch);
+	SetWriteHandler(0xE000, 0xFFFF, CartBW);
+	
+	uint8* WRAM = (uint8*) FCEU_gmalloc(8192);
+	SetupCartPRGMapping(0x10, (uint8*) FCEU_gmalloc(8192), 8192, 1);
+}
+
+void Mapper452_Init(CartInfo *info) {
+	info->Reset = Mapper452_Reset;
+	info->Power = Mapper452_Power;
+	AddExState(&latch, 2, 0, "LATC");
+}
diff --git a/src/boards/456.c b/src/boards/456.c
new file mode 100644
index 0000000..accd201
--- /dev/null
+++ b/src/boards/456.c
@@ -0,0 +1,58 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2020 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static void Mapper456_PRGWrap(uint32 A, uint8 V) {
+	setprg8(A, V &0x0F | EXPREGS[0] <<4);
+}
+
+static void Mapper456_CHRWrap(uint32 A, uint8 V) {
+	setchr1(A, V &0x7F | EXPREGS[0] <<7);
+}
+
+static DECLFW(Mapper456_Write) {
+	if (A &0x100) {
+		EXPREGS[0] =V;
+		FixMMC3PRG(MMC3_cmd);
+		FixMMC3CHR(MMC3_cmd);
+	}
+}
+
+static void Mapper456_Reset(void) {
+	EXPREGS[0] =0;
+	MMC3RegReset();
+}
+
+static void Mapper456_Power(void) {
+	EXPREGS[0] =0;
+	GenMMC3Power();
+	SetWriteHandler(0x4020, 0x5FFF, Mapper456_Write);
+}
+
+void Mapper456_Init(CartInfo *info) {
+	GenMMC3_Init(info, 128, 128, 8, 0);
+	cwrap = Mapper456_CHRWrap;
+	pwrap = Mapper456_PRGWrap;
+	info->Power = Mapper456_Power;
+	info->Reset = Mapper456_Reset;
+	AddExState(EXPREGS, 1, 0, "EXPR");
+}
diff --git a/src/boards/57.c b/src/boards/57.c
index ffd6c8c..036c485 100644
--- a/src/boards/57.c
+++ b/src/boards/57.c
@@ -67,6 +67,7 @@ static void M57Reset(void) {
 	hrd_flag++;
 	hrd_flag &= 3;
 	FCEU_printf("Select Register = %02x\n", hrd_flag);
+	Sync();
 }
 
 static void StateRestore(int version) {
diff --git a/src/boards/BS110.c b/src/boards/BS110.c
deleted file mode 100644
index 1f5736f..0000000
--- a/src/boards/BS110.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/* FCE Ultra - NES/Famicom Emulator
-*
-* Copyright notice for this file:
-* Copyright (C) 2008 -2020 dragon2snow,loong2snow from www.nesbbs.com
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*
-*/
-
-#include "mapinc.h"
-#include "mmc3.h"
-
-static uint8 *WRAM;
-static uint32 WRAMSIZE;
-
-static uint8 mmc3_reg[8];
-static uint8 exRegs[8];
-static uint8 pointer;
-static uint8 readDIP;
-static uint16 prgAND;
-static uint16 chrAND;
-static uint16 prgOR;
-static uint16 chrOR;
-static uint8 nrom;
-static uint8 nrom128;
-static uint8 dipswitch;
-
-
-static SFORMAT BS110_StateRegs[] =
-{
-	{ exRegs, 8, "REGS" },
-	{ mmc3_reg, 8, "MREG" },
-	{ &pointer, 1, "PNT0" },
-	{ &readDIP, 1, "RDIP" },
-	{ &prgAND, 2 | FCEUSTATE_RLSB, "PAND" },
-	{ &chrAND, 2 | FCEUSTATE_RLSB, "CAND" },
-	{ &prgOR, 2 | FCEUSTATE_RLSB, "PROR" },
-	{ &chrOR, 2 | FCEUSTATE_RLSB, "CHOR" },
-	{ &nrom, 1, "NROM" },
-	{ &nrom128, 1, "N128" },
-	{ &dipswitch, 1, "DIP0" },
-	{ 0 }
-};
-
-int BS110GetPRGBank(int bank)
-{
-	if ((~bank & 1) && (pointer & 0x40)) bank ^= 2;
-	return (bank & 2) ? 0xFE | (bank & 1) : mmc3_reg[6 | (bank & 1)];
-}
-
-void BS110SyncPRG_GNROM(int A14, int AND, int OR) {
-	setprg8(0x8000, ((BS110GetPRGBank(0) &~A14) &AND) | OR);
-	setprg8(0xA000, ((BS110GetPRGBank(1) &~A14) &AND) | OR);
-	setprg8(0xC000, ((BS110GetPRGBank(0) | A14) &AND) | OR);
-	setprg8(0xE000, ((BS110GetPRGBank(1) | A14) &AND) | OR);
-}
-
-static void BS110CW(uint32 A, uint8 V) {
-
-	uint8 block = ((exRegs[1]) & 0x03);
-	uint8 mask = 0x7F;
-	setchr1(A, (block << 7) | (V & mask));
-
-}
-
-static void BS110PW(uint32 A, uint8 V) {
-	if ((exRegs[1] >> 2) & 0x01)
-	{
-		uint8 mask = 0x0F;
-		uint8 block = (exRegs[1] & 3) << 4;
-		if ((exRegs[1] >> 3) & 0x01)
-		{
-			setprg8(0x8000, ((BS110GetPRGBank(0)) & mask) | block);
-			setprg8(0xA000, ((BS110GetPRGBank(1)) & mask) | block);
-			setprg8(0xC000, ((BS110GetPRGBank(0)) & mask) | block);
-			setprg8(0xE000, ((BS110GetPRGBank(1)) & mask) | block);
-		}
-		else
-		{
-
-			setprg8(0x8000, ((BS110GetPRGBank(0)) & mask) | block);
-			setprg8(0xA000, ((BS110GetPRGBank(1)) & mask) | block);
-			setprg8(0xC000, ((BS110GetPRGBank(0) | 2) & mask) | block);
-			setprg8(0xE000, ((BS110GetPRGBank(1) | 2) & mask) | block);
-		}
-	}
-	else
-	{
-		uint8 mask = 0x0F;
-		uint8 block = (exRegs[1] & 3) << 4;
-		setprg8(A, block | (V & mask));
-	}
-}
-
-
-static DECLFW(BS110WriteHi) {
-
-	A = A & 0xE001;
-
-	if (A < 0xC000)
-	{
-		if (A == 0x8000)
-			pointer = MMC3_cmd ^ V;
-		if (A == 0x8001)
-			mmc3_reg[MMC3_cmd & 0x07] = V;
-
-		MMC3_CMDWrite(A, V);
-		FixMMC3PRG(MMC3_cmd);
-		FixMMC3CHR(MMC3_cmd);
-	}
-	else
-	{
-		MMC3_IRQWrite(A, V);
-	}
-}
-
-static DECLFW(BS110WriteLo) {
-
-	exRegs[1] = A;
-	exRegs[0] = V;
-	FixMMC3PRG(MMC3_cmd);
-	FixMMC3CHR(MMC3_cmd);
-	
-}
-static DECLFR(BS110ReadHi)
-{
-	if ((A == 0xCB00) && ((exRegs[1] & 0x0F) == 0x08))
-		return dipswitch;
-	else
-		return CartBR(A);
-		
-}
-
-static void BS110Power(void)
-{
-   int i = 0;
-	dipswitch = 0;
-	mmc3_reg[0] = 0x00; mmc3_reg[1] = 0x02;
-	mmc3_reg[2] = 0x04; mmc3_reg[3] = 0x05; mmc3_reg[4] = 0x06; mmc3_reg[5] = 0x07;
-	mmc3_reg[6] = 0x00; mmc3_reg[7] = 0x01;
-
-	for (i = 0;i<4;i++)
-		exRegs[i] = 0;
-
-	GenMMC3Power();
-	SetWriteHandler(0x6000, 0x7FFF, BS110WriteLo);
-	SetWriteHandler(0x8000, 0xFFFF, BS110WriteHi);
-	SetReadHandler(0x8000, 0xFFFF, BS110ReadHi);
-}
-
-static void BS110Reset(void)
-{
-	int i = 0;
-
-	dipswitch++;
-	mmc3_reg[0] = 0x00; mmc3_reg[1] = 0x02;
-	mmc3_reg[2] = 0x04; mmc3_reg[3] = 0x05; mmc3_reg[4] = 0x06; mmc3_reg[5] = 0x07;
-	mmc3_reg[6] = 0x00; mmc3_reg[7] = 0x01;
-
-	for (i = 0;i<4;i++)
-		exRegs[i] = 0;
-
-	MMC3RegReset();
-}
-static void BS110Close(void) {
-	GenMMC3Close();
-	if (WRAM)
-		FCEU_free(WRAM);
-	WRAM = NULL;
-}
-
-void BS110_Init(CartInfo *info) {
-	GenMMC3_Init(info, 512, 512, 0, 0);
-	pwrap = BS110PW;
-	cwrap = BS110CW;
-	info->Power = BS110Power;
-	info->Reset = BS110Reset;
-	info->Close = BS110Close;
-
-	WRAMSIZE = 8192;
-	WRAM = (uint8*)FCEU_gmalloc(WRAMSIZE);
-	SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
-	AddExState(WRAM, WRAMSIZE, 0, "WRAM");
-
-	AddExState(EXPREGS, 3, 0, "EXPR");
-	AddExState(BS110_StateRegs, ~0, 0, 0);
-}
diff --git a/src/boards/NC7000M.c b/src/boards/NC7000M.c
deleted file mode 100644
index 0f8b1ce..0000000
--- a/src/boards/NC7000M.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2008 -2020 dragon2snow,loong2snow from www.nesbbs.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * 
- *
- */
-
-#include "mapinc.h"
-#include "mmc3.h"
-
-
-static uint8 *WRAM;
-static uint32 WRAMSIZE;
-
-static uint8 mmc3_reg[8];
-static uint8 exRegs[8];
-static uint8 pointer;
-static uint8 locked;
-static uint8 readDIP;
-static uint16 prgAND;
-static uint16 chrAND;
-static uint16 prgOR;
-static uint16 chrOR;
-static uint8 nrom;
-static uint8 nrom256;
-static uint16 reg;
-
-
-static SFORMAT NC7000M_StateRegs[] =
-{
-	{ exRegs, 8, "REGS" },
-	{ mmc3_reg, 8, "MREG" },
-	{ &pointer, 1, "PNT0" },
-	{ &readDIP, 1, "RDIP" },
-	{ &prgAND, 2 | FCEUSTATE_RLSB, "PAND" },
-	{ &chrAND, 2 | FCEUSTATE_RLSB, "CAND" },
-	{ &prgOR, 2 | FCEUSTATE_RLSB, "PROR" },
-	{ &chrOR, 2 | FCEUSTATE_RLSB, "CHOR" },
-	{ &nrom, 1, "NROM" },
-	{ &nrom256, 1, "N256" },
-	{ &reg, 2 | FCEUSTATE_RLSB, "REG0" },
-	{ 0 }
-};
-
-void NC7000MAnalyzeReg()
-{
-	locked = (reg & 0x80);
-	prgAND = (reg & 0x08 ? 0x0F : 0x1F);
-	chrAND = (reg & 0x40 ? 0x7F : 0xFF);
-	prgOR = (reg << 4 & 0x30);
-	chrOR = ((reg << 3) & 0x080) | (reg & 0x100);
-	nrom = (reg & 0x20);
-	nrom256 = (reg & 0x04);
-}
-
-int NC7000MGetPRGBank(int bank)
-{
-	if ((~bank & 1) && (pointer & 0x40)) bank ^= 2;
-	return (bank & 2) ? 0xFE | (bank & 1) : mmc3_reg[6 | (bank & 1)];
-}	
-		
-void NC7000MSyncPRG_GNROM(int A14, int AND, int OR) {
-	setprg8(0x8000, ((NC7000MGetPRGBank(0) &~A14) &AND) | OR);
-	setprg8(0xA000, ((NC7000MGetPRGBank(1) &~A14) &AND) | OR);
-	setprg8(0xC000, ((NC7000MGetPRGBank(0) | A14) &AND) | OR);
-	setprg8(0xE000, ((NC7000MGetPRGBank(1) | A14) &AND) | OR);
-}
-
-static void NC7000MCW(uint32 A, uint8 V) {
-
-	setchr1(A, (V & chrAND) | (chrOR &~chrAND));
-}
-
-static void NC7000MPW(uint32 A, uint8 V) {
-
-	if (nrom)
-	{
-		NC7000MSyncPRG_GNROM(nrom256 ? 2 : 0, prgAND, prgOR &~prgAND);
-	}	
-	else
-	{
-		setprg8(A, (prgOR &~prgAND) | (V & prgAND));
-	}
-}
-
-
-static DECLFW(NC7000MWriteHi) {
-
-	A = A & 0xE001;
-
-	if (A < 0xC000) 
-	{
-		if(A==0x8000)
-			pointer = MMC3_cmd ^ V;
-		if(A==0x8001)
-			mmc3_reg[MMC3_cmd & 0x07] = V;
-		
-		MMC3_CMDWrite(A, V);
-		FixMMC3PRG(MMC3_cmd);
-		FixMMC3CHR(MMC3_cmd);
-	}
-	else
-	{
-		MMC3_IRQWrite(A, V);
-	}			
-}
-
-static DECLFW(NC7000MWriteLo) {
-
-	if (!(reg & 0x80)) {
-		reg = V | (A & 0x100);
-		NC7000MAnalyzeReg();
-		FixMMC3PRG(MMC3_cmd);
-		FixMMC3CHR(MMC3_cmd);
-	}
-	else
-	{
-		WRAM[A - 0x6000] = V;
-	}
-}
-
-static void NC7000MPower(void) {
-	mmc3_reg[0] = 0x00; mmc3_reg[1] = 0x02;
-	mmc3_reg[2] = 0x04; mmc3_reg[3] = 0x05; mmc3_reg[4] = 0x06; mmc3_reg[5] = 0x07;
-	mmc3_reg[6] = 0x00; mmc3_reg[7] = 0x01;
-
-	reg = 0x0000;
-	
-	NC7000MAnalyzeReg();
-	
-	GenMMC3Power();
-	SetWriteHandler(0x6000, 0x7FFF, NC7000MWriteLo);
-	SetWriteHandler(0x8000, 0xFFFF, NC7000MWriteHi);
-}
-
-static void NC7000MReset(void) {
-
-	mmc3_reg[0] = 0x00; mmc3_reg[1] = 0x02;
-	mmc3_reg[2] = 0x04; mmc3_reg[3] = 0x05; mmc3_reg[4] = 0x06; mmc3_reg[5] = 0x07;
-	mmc3_reg[6] = 0x00; mmc3_reg[7] = 0x01;
-
-	reg = 0x0000;
-	
-	NC7000MAnalyzeReg();
-	
-	MMC3RegReset();
-}
-static void NC7000MClose(void) {
-	GenMMC3Close();
-	if (WRAM)
-		FCEU_gfree(WRAM);
-	WRAM = NULL;
-}
-
-void NC7000M_Init(CartInfo *info) {
-	GenMMC3_Init(info, 512, 512, 0, 0);
-	pwrap = NC7000MPW;
-	cwrap = NC7000MCW;
-	info->Power = NC7000MPower;
-	info->Reset = NC7000MReset;
-	info->Close = NC7000MClose;
-	
-	WRAMSIZE = 8192;
-	WRAM = (uint8*)FCEU_gmalloc(WRAMSIZE);
-	SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
-	AddExState(WRAM, WRAMSIZE, 0, "WRAM");
-
-	AddExState(EXPREGS, 3, 0, "EXPR");
-	AddExState(NC7000M_StateRegs, ~0, 0, 0);
-}
diff --git a/src/boards/bmc64in1nr.c b/src/boards/bmc64in1nr.c
index 7013765..8a6cdb5 100644
--- a/src/boards/bmc64in1nr.c
+++ b/src/boards/bmc64in1nr.c
@@ -33,9 +33,9 @@ static SFORMAT StateRegs[] =
 static void Sync(void) {
 	if (regs[0] & 0x80) { /* NROM mode */
 		if (regs[1] & 0x80)
-			setprg32(0x8000, regs[1] & 0x1F);
+			setprg32(0x8000, regs[1] & 0x3F);
 		else {
-			int bank = ((regs[1] & 0x1f) << 1) | ((regs[1] >> 6) & 1);
+			int bank = ((regs[1] & 0x3F) << 1) | ((regs[1] >> 6) & 1);
 			setprg16(0x8000, bank);
 			setprg16(0xC000, bank);
 		}
diff --git a/src/boards/datalatch.c b/src/boards/datalatch.c
index 32592f3..f547344 100644
--- a/src/boards/datalatch.c
+++ b/src/boards/datalatch.c
@@ -570,3 +570,20 @@ static void BMCK3046Sync(void) {
 void BMCK3046_Init(CartInfo *info) {
 	Latch_Init(info, BMCK3046Sync, 0, 0x8000, 0xFFFF, 0, 0);
 }
+
+/* Mapper 429: LIKO BBG-235-8-1B/Milowork FCFC1 */
+
+static void Mapper429_Sync(void) {
+	setprg32(0x8000, latche >>2);
+	setchr8(latche &3);
+}
+
+static void Mapper429_Reset(void) {
+	latche = 4; /* Initial CHR bank 0, initial PRG bank 1 */
+	Mapper429_Sync();
+}
+
+void Mapper429_Init(CartInfo *info) {
+	info->Reset = Mapper429_Reset;
+	Latch_Init(info, Mapper429_Sync, 0, 0x8000, 0xFFFF, 0, 0);
+}
diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c
index b5c13f5..b1598d0 100644
--- a/src/boards/fk23c.c
+++ b/src/boards/fk23c.c
@@ -29,6 +29,7 @@
 	2 - 外星 FS005/FS006
 	3 - JX9003B
 	4 - GameStar Smart Genius Deluxe
+	5 - HST-162
 	
 	Verified on real hardware:
 	"Legend of Kage" sets CNROM latch 1 and switches between CHR bank 0 and 1 using 5FF2, causing the wrong bank (1 instead of 0) during gameplay.
@@ -87,7 +88,7 @@ static SFORMAT StateRegs[] = {
 #define PRG_MODE              ( fk23_regs[0] & 0x07)
 #define MMC3_EXTENDED       !!( fk23_regs[3] & 0x02)                 /* Extended MMC3 mode, adding extra registers for switching the normally-fixed PRG banks C and E and for eight independent 1 KiB CHR banks. Only available on FK- and FS005 PCBs. */
 #define CHR_8K_MODE         !!( fk23_regs[0] & 0x40)                 /* MMC3 CHR registers are ignored, apply outer bank only, and CNROM latch if it exists */
-#define CHR_CNROM_MODE        (~fk23_regs[0] & 0x20 && subType == 1) /* Only subtype 1 has a CNROM latch, which can be disabled */
+#define CHR_CNROM_MODE        (~fk23_regs[0] & 0x20 && (subType == 1 || subType == 5)) /* Only subtypes 1 and 5 have a CNROM latch, which can be disabled */
 #define CHR_OUTER_BANK_SIZE !!( fk23_regs[0] & 0x10)                 /* Switch between 256 and 128 KiB CHR, or 32 and 16 KiB CHR in CNROM mode */
 #define CHR_MIXED           !!(WRAM_EXTENDED && mmc3_wram &0x04)     /* First 8 KiB of CHR address space are RAM, then ROM */
 
@@ -119,7 +120,8 @@ static void SyncCHR(void)
    if (CHR_8K_MODE)
    {
       uint32 mask = (CHR_CNROM_MODE? (CHR_OUTER_BANK_SIZE? 0x01: 0x03): 0x00);
-      uint32 bank = ((outer & ~mask) | (latch & mask)) << 3; /* Address bits are never OR'd; they either come from the outer bank or from the CNROM latch. */
+      /* In Submapper 1, address bits come either from outer bank or from latch. In Submapper 5, they are OR'd. Both verified on original hardware. */
+      uint32 bank = ((subType ==5? outer: (outer & ~mask)) | (latch & mask)) << 3;
 
       cwrap(0x0000, bank + 0);
       cwrap(0x0400, bank + 1);
@@ -183,6 +185,9 @@ static void SyncPRG(void)
       case 4: /* GameStar Smart Genius Deluxe */
          prg_base |= fk23_regs[2] & 0x80;
 	 break;
+      case 5: /* HST-162 */
+         prg_base = prg_base &0x1F | fk23_regs[5] <<5;
+	 break;
    }
 
    switch (PRG_MODE)
@@ -262,6 +267,11 @@ static void Sync(void)
    SyncMIR();
 }
 
+static DECLFW(Write4800) /* Only used by submapper 5 (HST-162) */
+{
+   fk23_regs[5] = V; /* Register 4800 is a separate register, but we use one of the ASIC registers that is otherwise unused in submapper 5 */
+   SyncPRG();
+}
 static DECLFW(Write5000)
 {
    if (after_power && A > 0x5010 && A != 0x5FF3) /* Ignore writes from $5000-$500F, in particular to $5008, but not $5FF3 */
@@ -381,7 +391,7 @@ static void Reset(void)
       FCEU_printf("BMCFK23C dipswitch set to $%04x\n",0x5000|0x10 << dipswitch);
    }
 
-   fk23_regs[0]   = fk23_regs[1] = fk23_regs[2] = fk23_regs[3] = 0;
+   fk23_regs[0]   = fk23_regs[1] = fk23_regs[2] = fk23_regs[3] = fk23_regs[4] = fk23_regs[5] = fk23_regs[6] = fk23_regs[7] = 0;
    mmc3_regs[0]   = 0;
    mmc3_regs[1]   = 2;
    mmc3_regs[2]   = 4;
@@ -402,7 +412,7 @@ static void Reset(void)
 
 static void Power(void)
 {
-   fk23_regs[0]   = fk23_regs[1] = fk23_regs[2] = fk23_regs[3] = 0;
+   fk23_regs[0]   = fk23_regs[1] = fk23_regs[2] = fk23_regs[3] = fk23_regs[4] = fk23_regs[5] = fk23_regs[6] = fk23_regs[7] = 0;
    mmc3_regs[0]   = 0;
    mmc3_regs[1]   = 2;
    mmc3_regs[2]   = 4;
@@ -424,6 +434,9 @@ static void Power(void)
    SetWriteHandler(0x5000, 0x5FFF, Write5000);
    SetWriteHandler(0x8000, 0xFFFF, Write8000);
 
+   if (subType == 5)
+      SetWriteHandler(0x4800, 0x4FFF, Write4800);
+
    if (WRAMSIZE)
    {
       SetReadHandler(0x6000, 0x7FFF, CartBR);
diff --git a/src/boards/mmc3.c b/src/boards/mmc3.c
index 48885de..25e6f51 100644
--- a/src/boards/mmc3.c
+++ b/src/boards/mmc3.c
@@ -792,10 +792,8 @@ static void M114Reset(void) {
 
 void Mapper114_Init(CartInfo *info) {
 	isRevB = 0;
-	type_Boogerman = 0;
-	if (info->CRC32 == 0x80eb1839 ||	/* Boogerman (Sugar Softec) (Unl) [!] - submapper 1 */
-		info->CRC32 == 0x071e4ee8)		/* 114 test-rom https://forums.nesdev.com/viewtopic.php?f=3&t=17391 */
-		type_Boogerman = 1;
+	/* Use NES 2.0 submapper to identify scrambling pattern, otherwise CRC32 for Boogerman and test rom */
+	type_Boogerman = info->iNES2? (info->submapper ==1): (info->CRC32 ==0x80eb1839 || info->CRC32 ==0x071e4ee8);
 
 	GenMMC3_Init(info, 256, 256, 0, 0);
 	pwrap = M114PWRAP;
diff --git a/src/boards/sachen.c b/src/boards/sachen.c
index 06750a4..82947f9 100644
--- a/src/boards/sachen.c
+++ b/src/boards/sachen.c
@@ -327,3 +327,18 @@ void S74LS374N_Init(CartInfo *info) {
 	AddExState(latch, 8, 0, "LATC");
 	AddExState(&cmd, 1, 0, "CMD");
 }
+
+static DECLFR(Mapper553Read) {
+	return 0x3A;
+}
+
+static void Mapper553Power(void) {
+	setprg16(0xC000, 0);
+	setchr8(0);
+	SetReadHandler(0x8000, 0xBFFF, Mapper553Read);
+	SetReadHandler(0xC000, 0xFFFF, CartBR);
+}
+
+void Mapper553_Init(CartInfo *info) {
+	info->Power = Mapper553Power;
+}
diff --git a/src/boards/yoko.c b/src/boards/yoko.c
index f27ab6f..fa43b47 100644
--- a/src/boards/yoko.c
+++ b/src/boards/yoko.c
@@ -33,7 +33,7 @@ static int32 IRQCount;
 static uint8 *WRAM = NULL;
 static uint32 WRAMSIZE;
 
-static uint8 is2kbank, isnot2kbank;
+static uint8 is2kbank, dbzParty, isYoko;
 
 static SFORMAT StateRegs[] =
 {
@@ -44,7 +44,6 @@ static SFORMAT StateRegs[] =
 	{ reg, 11, "REGS" },
 	{ low, 4, "LOWR" },
 	{ &is2kbank, 1, "IS2K" },
-	{ &isnot2kbank, 1, "NT2K" },
 	{ 0 }
 };
 
@@ -77,7 +76,7 @@ static void M83Sync(void) {
 	case 2: setmirror(MI_0); break;
 	case 3: setmirror(MI_1); break;
 	}
-	if (is2kbank && !isnot2kbank) {
+	if (is2kbank) {
 		setchr2(0x0000, reg[0]);
 		setchr2(0x0800, reg[1]);
 		setchr2(0x1000, reg[6]);
@@ -88,14 +87,21 @@ static void M83Sync(void) {
 			setchr1(x << 10, reg[x] | ((bank & 0x30) << 4));
 	}
 	setprg8r(0x10, 0x6000, 0);
-	if (mode & 0x40) {
-		setprg16(0x8000, (bank & 0x3F));	/* DBZ Party [p1] */
-		setprg16(0xC000, (bank & 0x30) | 0xF);
-	} else {
-		setprg8(0x8000, reg[8]);
-		setprg8(0xA000, reg[9]);
-		setprg8(0xC000, reg[10]);
-		setprg8(0xE000, ~0);
+	switch (mode >>3 &3) {
+		case 0:
+			setprg16(0x8000, bank);
+			setprg16(0xC000, bank |0x0F);
+			break;
+		case 1:
+			setprg32(0x8000, bank >>1);
+			break;
+		case 2:
+		case 3:
+			setprg8(0x8000, bank <<1 &~0x1F | reg[8] &0x1F);
+			setprg8(0xA000, bank <<1 &~0x1F | reg[9] &0x1F);
+			setprg8(0xC000, bank <<1 &~0x1F | reg[10]&0x1F);
+			setprg8(0xE000, bank <<1 &~0x1F |         0x1F);
+			break;
 	}
 }
 
@@ -116,25 +122,22 @@ static DECLFW(UNLYOKOWrite) {
 }
 
 static DECLFW(M83Write) {
-	switch (A) {
-	case 0x8000: is2kbank = 1; M83Sync(); break;
-	case 0xB000:												/* Dragon Ball Z Party [p1] BMC */
-	case 0xB0FF:												/* Dragon Ball Z Party [p1] BMC */
-	case 0xB1FF: bank = V; mode |= 0x40; M83Sync(); break;		/* Dragon Ball Z Party [p1] BMC */
-	case 0x8100: mode = V | (mode & 0x40); M83Sync(); break;
-	case 0x8200: IRQCount &= 0xFF00; IRQCount |= V; X6502_IRQEnd(FCEU_IQEXT); break;
-	case 0x8201: IRQa = mode & 0x80; IRQCount &= 0xFF; IRQCount |= V << 8; break;
-	case 0x8300: reg[8] = V; mode &= 0xBF; M83Sync(); break;
-	case 0x8301: reg[9] = V; mode &= 0xBF; M83Sync(); break;
-	case 0x8302: reg[10] = V; mode &= 0xBF; M83Sync(); break;
-	case 0x8310: reg[0] = V; M83Sync(); break;
-	case 0x8311: reg[1] = V; M83Sync(); break;
-	case 0x8312: reg[2] = V; isnot2kbank = 1; M83Sync(); break;
-	case 0x8313: reg[3] = V; isnot2kbank = 1; M83Sync(); break;
-	case 0x8314: reg[4] = V; isnot2kbank = 1; M83Sync(); break;
-	case 0x8315: reg[5] = V; isnot2kbank = 1; M83Sync(); break;
-	case 0x8316: reg[6] = V; M83Sync(); break;
-	case 0x8317: reg[7] = V; M83Sync(); break;
+	switch (A &0x31F) {
+	case 0x000: bank = V; M83Sync(); break;
+	case 0x100: mode = V; M83Sync(); break;
+	case 0x200: IRQCount &= 0xFF00; IRQCount |= V; X6502_IRQEnd(FCEU_IQEXT); break;
+	case 0x201: IRQa = mode & 0x80; IRQCount &= 0xFF; IRQCount |= V << 8; break;
+	case 0x300: reg[8] = V; mode &= 0xBF; M83Sync(); break;
+	case 0x301: reg[9] = V; mode &= 0xBF; M83Sync(); break;
+	case 0x302: reg[10] = V; mode &= 0xBF; M83Sync(); break;
+	case 0x310: reg[0] = V; M83Sync(); break;
+	case 0x311: reg[1] = V; M83Sync(); break;
+	case 0x312: reg[2] = V; M83Sync(); break;
+	case 0x313: reg[3] = V; M83Sync(); break;
+	case 0x314: reg[4] = V; M83Sync(); break;
+	case 0x315: reg[5] = V; M83Sync(); break;
+	case 0x316: reg[6] = V; M83Sync(); break;
+	case 0x317: reg[7] = V; M83Sync(); break;
 	}
 }
 
@@ -162,8 +165,6 @@ static void UNLYOKOPower(void) {
 }
 
 static void M83Power(void) {
-	is2kbank = 0;
-	isnot2kbank = 0;
 	mode = bank = 0;
 	dip = 0;
 	M83Sync();
@@ -171,7 +172,7 @@ static void M83Power(void) {
 	SetReadHandler(0x5100, 0x5103, UNLYOKOReadLow);
 	SetWriteHandler(0x5100, 0x5103, UNLYOKOWriteLow);
 	SetReadHandler(0x6000, 0x7fff, CartBR);
-	SetWriteHandler(0x6000, 0x7fff, CartBW);/* Pirate Dragon Ball Z Party [p1] used if for saves instead of seraial EEPROM */
+	SetWriteHandler(0x6000, 0x7fff, CartBW);
 	SetReadHandler(0x8000, 0xffff, CartBR);
 	SetWriteHandler(0x8000, 0xffff, M83Write);
 	FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
@@ -185,6 +186,7 @@ static void UNLYOKOReset(void) {
 
 static void M83Reset(void) {
 	dip ^= 1;
+	mode = bank = 0;
 	M83Sync();
 }
 
@@ -228,10 +230,19 @@ void Mapper83_Init(CartInfo *info) {
 	MapIRQHook = UNLYOKOIRQHook;
 	GameStateRestore = M83StateRestore;
 
-	WRAMSIZE = 8192;
-	WRAM = (uint8*)FCEU_gmalloc(WRAMSIZE);
-	SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
-	AddExState(WRAM, WRAMSIZE, 0, "WRAM");
+	if (info->iNES2) {
+		is2kbank =info->submapper ==1;
+		dbzParty =info->submapper ==2;
+	} else {
+		is2kbank = info->CHRRomSize ==512*1024;
+		dbzParty = info->PRGRomSize ==1024*1024;
+	}
+	if (dbzParty) {
+		WRAMSIZE = 8192;
+		WRAM = (uint8*)FCEU_gmalloc(WRAMSIZE);
+		SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
+		AddExState(WRAM, WRAMSIZE, 0, "WRAM");
+	}
 
 	AddExState(&StateRegs, ~0, 0, 0);
 }
diff --git a/src/ines-correct.h b/src/ines-correct.h
index b5d9458..b7a105b 100644
--- a/src/ines-correct.h
+++ b/src/ines-correct.h
@@ -363,6 +363,7 @@
 	{ 0x1C098942,  162,       0,    MI_H, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 西游记后传 */
 	/* Mapper 162: Nanjing games that use an FS304 feature as a protection check */
 	{ 0x8589652D,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 农场小精灵 */
+	{ 0x99FE9AB5,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 时空斗士 - Pegasus Senya */
 	{ 0x82F204AE,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 梁山英雄 */
 	
 	/* Mapper 163: Nanjing, running with $5300=$04 */
@@ -430,7 +431,7 @@
 	{ 0xB35BE92F,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 圣斗士星矢: 北欧突击篇 */
 	{ 0x15E50ECD,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 宠物高达战记 */
 	{ 0xBBAB3A61,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 拳皇R-1: 最强格斗王 */
-	{ 0x2DA3A49C,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 时空斗士 - Pegasus Senya */
+	{ 0x2DA3A49C,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 时空斗士 - Pegasus Senya, turns out to be wrong after all, and the mapper 162 one is the correct one */
 	{ 0x222A136A,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 武侠天地 */
 	{ 0xEBC6E2E2,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 毁灭之神 */
 	{ 0xE08AB52E,  163,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 魔兽世界: 恶魔猎人 */
@@ -453,7 +454,6 @@
 	{ 0x054444A0,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 圣斗士星矢: 北欧突击篇 */
 	{ 0x9BA518BA,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 宠物高达战记 */
 	{ 0x4CE082F8,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 拳皇R-1: 最强格斗王 */
-	{ 0x99FE9AB5,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 时空斗士 - Pegasus Senya */
 	{ 0x57414FB6,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 武侠天地 */
 	{ 0x979239DE,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 毁灭之神 */
 	{ 0xEFF96E8A,  162,       0,    MI_V, 1,    0x70,    0x07,   DENDY, NOEXTRA }, /* 魔兽世界: 恶魔猎人 */
diff --git a/src/ines.c b/src/ines.c
index 795784f..d4c90fe 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <math.h>
 
 #include "fceu-types.h"
 #include "x6502.h"
@@ -790,11 +791,20 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "YY860729C",                386, Mapper386_Init         )
 	INES_BOARD( "YY850735C",                387, Mapper387_Init         )
 	INES_BOARD( "YY850835C",                388, Mapper388_Init         )
-	INES_BOARD( "NC7000M",                  391, NC7000M_Init           )
+	INES_BOARD( "BS-110",                   391, Mapper391_Init         )
 	INES_BOARD( "YY850439C",                397, Mapper397_Init         )
 	INES_BOARD( "831019C J-2282",           402, J2282_Init             )
 	INES_BOARD( "SC871115C",                421, Mapper421_Init         )
 	INES_BOARD( "AB-G1L/WELL-NO-DG450",     428, Mapper428_Init         )
+	INES_BOARD( "LIKO BBG-235-8-1B",        429, Mapper429_Init         )
+	INES_BOARD( "S-009",                    434, Mapper434_Init         )
+	INES_BOARD( "820401/T-217",             436, Mapper436_Init         )
+	INES_BOARD( "NTDEC TH2348",             437, Mapper437_Init         )
+	INES_BOARD( "K-3071",                   438, Mapper438_Init         )
+	INES_BOARD( "NC-3000M",                 443, Mapper443_Init         )
+	INES_BOARD( "NC-7000M",                 444, Mapper444_Init         )
+	INES_BOARD( "DS-9-27",                  452, Mapper452_Init         )
+	INES_BOARD( "K6C3001A",                 456, Mapper456_Init         )
 	INES_BOARD( "SA-9602B",                 513, SA9602B_Init           )
 	INES_BOARD( "DANCE2000",                518, UNLD2000_Init          )
 	INES_BOARD( "EH8813A",                  519, UNLEH8813A_Init        )
@@ -808,6 +818,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "T-230",                    529, UNLT230_Init           )
 	INES_BOARD( "AX5705",                   530, UNLAX5705_Init         )
 	INES_BOARD( "LH53",                     535, LH53_Init              )
+	INES_BOARD( "SACHEN 3013",              553, Mapper553_Init         )
 	INES_BOARD( "YC-03-09",                 558, Mapper558_Init         )
 INES_BOARD_END()
 
@@ -917,7 +928,10 @@ int iNESLoad(const char *name, FCEUFILE *fp)
       filesize -= 512;
    }
 
-   romSize = (ROM_size * 0x4000) + (VROM_size * 0x2000);
+   iNESCart.PRGRomSize = ROM_size >=0xF00? (pow(2, head.ROM_size >>2)*((head.ROM_size &3)*2+1)): (ROM_size*0x4000);
+   iNESCart.CHRRomSize =VROM_size >=0xF00? (pow(2, head.VROM_size>>2)*((head.VROM_size&3)*2+1)): (VROM_size*0x2000);;
+
+   romSize = iNESCart.PRGRomSize + iNESCart.CHRRomSize;
 
    if (romSize > filesize)
    {
@@ -926,17 +940,17 @@ int iNESLoad(const char *name, FCEUFILE *fp)
    else if (romSize < filesize)
       FCEU_PrintError(" File contains %llu bytes of unused data\n", filesize - romSize);
 
-   rom_size_pow2 =  uppow2(ROM_size) * 0x4000;
+   rom_size_pow2 = uppow2(iNESCart.PRGRomSize);
 
    if ((ROM = (uint8*)FCEU_malloc(rom_size_pow2)) == NULL)
       return 0;
 
    memset(ROM, 0xFF, rom_size_pow2);
-   FCEU_fread(ROM, 0x4000, ROM_size, fp);
+   FCEU_fread(ROM, 1, iNESCart.PRGRomSize, fp);
 
-   if (VROM_size)
+   if (iNESCart.CHRRomSize)
    {
-      vrom_size_pow2 = uppow2(VROM_size) * 0x2000;
+      vrom_size_pow2 = uppow2(iNESCart.CHRRomSize);
 
       if ((VROM = (uint8*)FCEU_malloc(vrom_size_pow2)) == NULL)
       {
@@ -946,20 +960,17 @@ int iNESLoad(const char *name, FCEUFILE *fp)
       }
 
       memset(VROM, 0xFF, vrom_size_pow2);
-      FCEU_fread(VROM, 0x2000, VROM_size, fp);
+      FCEU_fread(VROM, 1, iNESCart.CHRRomSize, fp);
    }
 
-   iNESCart.PRGRomSize = ROM_size * 0x4000;
-   iNESCart.CHRRomSize = VROM_size * 0x2000;
-
-   iNESCart.PRGCRC32   = CalcCRC32(0, ROM, ROM_size * 0x4000);
-   iNESCart.CHRCRC32   = CalcCRC32(0, VROM, VROM_size * 0x2000);
-   iNESCart.CRC32      = CalcCRC32(iNESCart.PRGCRC32, VROM, VROM_size * 0x2000);
+   iNESCart.PRGCRC32   = CalcCRC32(0, ROM, iNESCart.PRGRomSize);
+   iNESCart.CHRCRC32   = CalcCRC32(0, VROM, iNESCart.CHRRomSize);
+   iNESCart.CRC32      = CalcCRC32(iNESCart.PRGCRC32, VROM, iNESCart.CHRRomSize);
 
    md5_starts(&md5);
-   md5_update(&md5, ROM, ROM_size * 0x4000);
-   if (VROM_size)
-      md5_update(&md5, VROM, VROM_size * 0x2000);
+   md5_update(&md5, ROM, iNESCart.PRGRomSize);
+   if (iNESCart.CHRRomSize)
+      md5_update(&md5, VROM, iNESCart.CHRRomSize);
    md5_finish(&md5, iNESCart.MD5);
 
    memcpy(&GameInfo->MD5, &iNESCart.MD5, sizeof(iNESCart.MD5));
@@ -997,8 +1008,8 @@ int iNESLoad(const char *name, FCEUFILE *fp)
    FCEU_printf(" PRG-ROM CRC32:  0x%08X\n", iNESCart.PRGCRC32);
    FCEU_printf(" PRG+CHR CRC32:  0x%08X\n", iNESCart.CRC32);
    FCEU_printf(" PRG+CHR MD5:    0x%s\n", md5_asciistr(iNESCart.MD5));
-   FCEU_printf(" PRG-ROM:  %3d x 16KiB\n", ROM_size);
-   FCEU_printf(" CHR-ROM:  %3d x  8KiB\n", VROM_size);
+   FCEU_printf(" PRG-ROM:  %6d KiB\n", iNESCart.PRGRomSize >> 10);
+   FCEU_printf(" CHR-ROM:  %36 KiB\n", iNESCart.CHRRomSize >> 10);
    FCEU_printf(" Mapper #: %3d\n", iNESCart.mapper);
    FCEU_printf(" Mapper name: %s\n", mappername);
    FCEU_printf(" Mirroring: %s\n", iNESCart.mirror == 2 ? "None (Four-screen)" : iNESCart.mirror ? "Vertical" : "Horizontal");
diff --git a/src/ines.h b/src/ines.h
index 6f36333..3a500cc 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -251,7 +251,6 @@ void Mapper282_Init(CartInfo *);
 void Mapper295_Init(CartInfo *);
 
 void Bs5652_Init(CartInfo *);
-void NC7000M_Init(CartInfo *);
 void J2282_Init(CartInfo *);
 
 void Mapper267_Init(CartInfo *);
@@ -281,6 +280,7 @@ void Mapper387_Init(CartInfo *);
 void Mapper388_Init(CartInfo *);
 void Mapper389_Init(CartInfo *);
 void Mapper390_Init(CartInfo *);
+void Mapper391_Init(CartInfo *);
 void Mapper395_Init(CartInfo *);
 void Mapper397_Init(CartInfo *);
 void Mapper401_Init(CartInfo *);
@@ -288,6 +288,15 @@ void Mapper411_Init(CartInfo *);
 void Mapper421_Init(CartInfo *);
 void Mapper422_Init(CartInfo *);
 void Mapper428_Init(CartInfo *);
+void Mapper429_Init(CartInfo *);
+void Mapper434_Init(CartInfo *);
+void Mapper436_Init(CartInfo *);
+void Mapper437_Init(CartInfo *);
+void Mapper438_Init(CartInfo *);
+void Mapper443_Init(CartInfo *);
+void Mapper444_Init(CartInfo *);
+void Mapper452_Init(CartInfo *);
+void Mapper456_Init(CartInfo *);
 void Mapper516_Init(CartInfo *);
 void Mapper523_Init(CartInfo *);
 void Mapper533_Init(CartInfo *);
@@ -298,6 +307,7 @@ void Mapper540_Init(CartInfo *);
 void Mapper541_Init(CartInfo *);
 void Mapper543_Init(CartInfo *);
 void Mapper550_Init(CartInfo *);
+void Mapper553_Init(CartInfo *);
 void Mapper554_Init(CartInfo *);
 void Mapper558_Init(CartInfo *);
 
diff --git a/src/unif.c b/src/unif.c
index a019f17..89b7890 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -443,7 +443,7 @@ static BMAPPING bmap[] = {
 	{ "ANROM",                        7, ANROM_Init,            0 },
 	{ "AX5705",                     530, UNLAX5705_Init,        0 },
 	{ "BB",                         108, UNLBB_Init,            0 },
-	{ "BS-110",                 NO_INES, BS110_Init,            0 },
+	{ "BS-110",                     444, Mapper444_Init,        0 }, /* Due to a mix-up, UNIF MAPR BMC-BS-110 is actually the NC7000M PCB and refers to NES 2.0 Mapper 444 instead. */
 	{ "BS-5",                       286, BMCBS5_Init,           0 },
 	{ "CC-21",                       27, UNLCC21_Init,          0 },
 	{ "CITYFIGHT",                  266, UNLCITYFIGHT_Init,     0 },
diff --git a/src/unif.h b/src/unif.h
index 7738608..15dcf5b 100644
--- a/src/unif.h
+++ b/src/unif.h
@@ -187,11 +187,11 @@ void BMCK3033_Init(CartInfo *info);			/* mm22 */
 void BMC830134C_Init(CartInfo *info);		/* m315 */
 void BMCGN26_Init(CartInfo *info);			/* m344 */
 
-void BS110_Init(CartInfo *info);
 void KG256_Init(CartInfo *info);
 void WAIXINGFS005_Init(CartInfo *info);
 
 void Mapper422_Init(CartInfo *info);
+void Mapper444_Init(CartInfo *info);
 
 #ifdef COPYFAMI
 void MapperCopyFamiMMC3_Init(CartInfo *info);

From 56d75e784ab75a4f93c7344faa5ec55dab0ced83 Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Thu, 6 Jan 2022 02:22:27 -0500
Subject: [PATCH 168/295] options: Add helpful description for NTSC Filters
 (#478)

This adds more descriptive help text to the NTSC filter option.
---
 src/drivers/libretro/libretro_core_options.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/drivers/libretro/libretro_core_options.h b/src/drivers/libretro/libretro_core_options.h
index 7a6a2dc..7bda049 100644
--- a/src/drivers/libretro/libretro_core_options.h
+++ b/src/drivers/libretro/libretro_core_options.h
@@ -225,7 +225,7 @@ struct retro_core_option_v2_definition option_defs[] = {
       "fceumm_ntsc_filter",
       "NTSC Filter",
       NULL,
-      "Enable blargg NTSC filters.",
+      "Blargg's NTSC filters are used to replicate RF, Composite, S-Video, and RGB cable signals.",
       NULL,
       "video",
       {

From eb06d17e7912780a3ee117ae73bc50c3948c761c Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 9 Jan 2022 10:36:57 +0100
Subject: [PATCH 169/295] Buildfixes for MSVC

---
 intl/activate.py                     | 0
 intl/core_option_translation.py      | 0
 intl/crowdin_prep.py                 | 0
 intl/crowdin_source_upload.py        | 0
 intl/crowdin_translate.py            | 0
 intl/crowdin_translation_download.py | 0
 intl/download_workflow.py            | 0
 intl/initial_sync.py                 | 0
 intl/remove_initial_cycle.py         | 0
 intl/upload_workflow.py              | 0
 intl/v1_to_v2_converter.py           | 0
 src/boards/452.c                     | 2 +-
 12 files changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 intl/activate.py
 mode change 100644 => 100755 intl/core_option_translation.py
 mode change 100644 => 100755 intl/crowdin_prep.py
 mode change 100644 => 100755 intl/crowdin_source_upload.py
 mode change 100644 => 100755 intl/crowdin_translate.py
 mode change 100644 => 100755 intl/crowdin_translation_download.py
 mode change 100644 => 100755 intl/download_workflow.py
 mode change 100644 => 100755 intl/initial_sync.py
 mode change 100644 => 100755 intl/remove_initial_cycle.py
 mode change 100644 => 100755 intl/upload_workflow.py
 mode change 100644 => 100755 intl/v1_to_v2_converter.py

diff --git a/intl/activate.py b/intl/activate.py
old mode 100644
new mode 100755
diff --git a/intl/core_option_translation.py b/intl/core_option_translation.py
old mode 100644
new mode 100755
diff --git a/intl/crowdin_prep.py b/intl/crowdin_prep.py
old mode 100644
new mode 100755
diff --git a/intl/crowdin_source_upload.py b/intl/crowdin_source_upload.py
old mode 100644
new mode 100755
diff --git a/intl/crowdin_translate.py b/intl/crowdin_translate.py
old mode 100644
new mode 100755
diff --git a/intl/crowdin_translation_download.py b/intl/crowdin_translation_download.py
old mode 100644
new mode 100755
diff --git a/intl/download_workflow.py b/intl/download_workflow.py
old mode 100644
new mode 100755
diff --git a/intl/initial_sync.py b/intl/initial_sync.py
old mode 100644
new mode 100755
diff --git a/intl/remove_initial_cycle.py b/intl/remove_initial_cycle.py
old mode 100644
new mode 100755
diff --git a/intl/upload_workflow.py b/intl/upload_workflow.py
old mode 100644
new mode 100755
diff --git a/intl/v1_to_v2_converter.py b/intl/v1_to_v2_converter.py
old mode 100644
new mode 100755
diff --git a/src/boards/452.c b/src/boards/452.c
index df50a16..abf1191 100644
--- a/src/boards/452.c
+++ b/src/boards/452.c
@@ -62,13 +62,13 @@ static void Mapper452_Reset(void) {
 }
 
 static void Mapper452_Power(void) {
+	uint8* WRAM = (uint8*) FCEU_gmalloc(8192);
 	latch[0] =latch[1] =0;
 	Mapper452_Sync();
 	SetReadHandler(0x8000, 0xFFFF, CartBR);
 	SetWriteHandler(0x8000, 0xDFFF, Mapper452_WriteLatch);
 	SetWriteHandler(0xE000, 0xFFFF, CartBW);
 	
-	uint8* WRAM = (uint8*) FCEU_gmalloc(8192);
 	SetupCartPRGMapping(0x10, (uint8*) FCEU_gmalloc(8192), 8192, 1);
 }
 

From 758a51eacb122a84f0140336a73db2b2a4bf1395 Mon Sep 17 00:00:00 2001
From: negativeExponent <54053706+negativeExponent@users.noreply.github.com>
Date: Mon, 24 Jan 2022 02:20:46 +0800
Subject: [PATCH 170/295] couple of mapper fixes (#482)

* Fix a couple of mapper issues

- Implement info->Close, to free any unallocated memory (e.g. WRAM)
- Add missing GameStateRestore function
- Add missing state variable

* Simplify header parsing

* Update ines-correct.h

Co-authored-by: negativeExponent <negativeExponent@users.noreply.github.com>
---
 src/boards/162.c    | 24 +++++++++++++++---
 src/boards/163.c    | 24 +++++++++++++++---
 src/boards/164.c    | 25 ++++++++++++++++---
 src/boards/452.c    | 25 ++++++++++++++++---
 src/boards/558.c    | 21 ++++++++++++++--
 src/boards/KS7032.c |  8 ++++++
 src/boards/jyasic.c |  8 ++++++
 src/ines-correct.h  | 24 +++++++++---------
 src/ines.c          | 59 ++++++++++++++++++---------------------------
 9 files changed, 157 insertions(+), 61 deletions(-)

diff --git a/src/boards/162.c b/src/boards/162.c
index 4dd12bf..c2a44e3 100644
--- a/src/boards/162.c
+++ b/src/boards/162.c
@@ -25,6 +25,8 @@
 #include "mapinc.h"
 #include "../ines.h"
 
+static uint8 *WRAM;
+static uint32 WRAMSIZE;
 static uint8 reg[4];
 static SFORMAT StateRegs[] =
 {
@@ -83,20 +85,36 @@ static void reset(void)
    sync();
 }
 
+static void close(void)
+{
+   if (WRAM)
+      FCEU_gfree(WRAM);
+   WRAM = NULL;
+}
+
+static void StateRestore(int version)
+{
+   sync();
+}
+
 void Mapper162_Init (CartInfo *info)
 {
-   uint8 *WRAM;
-   uint32 WRAMSIZE = info->iNES2? (info->PRGRamSize + info->PRGRamSaveSize): 8192;
    info->Power   = power;
    info->Reset   = reset;
+   info->Close   = close;
    GameHBIRQHook = hblank;
+
+   GameStateRestore = StateRestore;
    AddExState(StateRegs, ~0, 0, 0);
 
+   WRAMSIZE = info->iNES2? (info->PRGRamSize + info->PRGRamSaveSize): 8192;
    WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
    SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
+   AddExState(WRAM, WRAMSIZE, 0, "WRAM");
    FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
+
    if (info->battery) {
       info->SaveGame[0] = WRAM;
-      info->SaveGameLen[0] = info->PRGRamSaveSize;
+      info->SaveGameLen[0] = WRAMSIZE;
    }
 }
diff --git a/src/boards/163.c b/src/boards/163.c
index 94ff9d3..f8da4ff 100644
--- a/src/boards/163.c
+++ b/src/boards/163.c
@@ -25,6 +25,8 @@
 #include "mapinc.h"
 #include "../ines.h"
 
+static uint8 *WRAM;
+static uint32 WRAMSIZE;
 static uint8 reg[4];
 static SFORMAT StateRegs[] =
 {
@@ -88,20 +90,36 @@ static void reset(void)
    sync();
 }
 
+static void close(void)
+{
+   if (WRAM)
+      FCEU_gfree(WRAM);
+   WRAM = NULL;
+}
+
+static void StateRestore(int version)
+{
+   sync();
+}
+
 void Mapper163_Init (CartInfo *info)
 {
-   uint8 *WRAM;
-   uint32 WRAMSIZE = info->iNES2? (info->PRGRamSize + info->PRGRamSaveSize): 8192;
    info->Power   = power;
    info->Reset   = reset;
+   info->Close   = close;
    GameHBIRQHook = hblank;
+
+   GameStateRestore = StateRestore;
    AddExState(StateRegs, ~0, 0, 0);
 
+   WRAMSIZE = info->iNES2? (info->PRGRamSize + info->PRGRamSaveSize): 8192;
    WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
    SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
+   AddExState(WRAM, WRAMSIZE, 0, "WRAM");
    FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
+
    if (info->battery) {
       info->SaveGame[0] = WRAM;
-      info->SaveGameLen[0] = info->PRGRamSaveSize;
+      info->SaveGameLen[0] = WRAMSIZE;
    }
 }
diff --git a/src/boards/164.c b/src/boards/164.c
index 06c7b39..8557317 100644
--- a/src/boards/164.c
+++ b/src/boards/164.c
@@ -28,6 +28,8 @@
 #include "mapinc.h"
 #include "eeprom_93C66.h"
 
+static uint8 *WRAM;
+static uint32 WRAMSIZE;
 static uint8 reg[8];
 static uint8 eeprom_data[512];
 static SFORMAT StateRegs[] =
@@ -101,16 +103,31 @@ static void reset(void)
    sync();
 }
 
+static void close(void)
+{
+   if (WRAM)
+      FCEU_gfree(WRAM);
+   WRAM = NULL;
+}
+
+static void StateRestore(int version)
+{
+   sync();
+}
+
 void Mapper164_Init (CartInfo *info)
 {
-   uint8 *WRAM;
-   uint32 WRAMSIZE = info->iNES2? (info->PRGRamSize + (info->PRGRamSaveSize &~0x7FF)): 8192;
-   info->Power = power;
-   info->Reset = reset;
+   info->Power   = power;
+   info->Reset   = reset;
+   info->Close   = close;
+
+   GameStateRestore = StateRestore;
    AddExState(StateRegs, ~0, 0, 0);
 
+   WRAMSIZE = info->iNES2? (info->PRGRamSize + (info->PRGRamSaveSize &~0x7FF)): 8192;
    WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
    SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
+   AddExState(WRAM, WRAMSIZE, 0, "WRAM");
    FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
 
    eeprom_93C66_storage = eeprom_data;
diff --git a/src/boards/452.c b/src/boards/452.c
index abf1191..5791e68 100644
--- a/src/boards/452.c
+++ b/src/boards/452.c
@@ -23,6 +23,8 @@
  
 #include "mapinc.h"
 
+static uint8 *WRAM;
+static uint32 WRAMSIZE;
 static uint8 latch[2];
 
 static void Mapper452_Sync(void) {
@@ -62,18 +64,35 @@ static void Mapper452_Reset(void) {
 }
 
 static void Mapper452_Power(void) {
-	uint8* WRAM = (uint8*) FCEU_gmalloc(8192);
+	
 	latch[0] =latch[1] =0;
 	Mapper452_Sync();
 	SetReadHandler(0x8000, 0xFFFF, CartBR);
 	SetWriteHandler(0x8000, 0xDFFF, Mapper452_WriteLatch);
 	SetWriteHandler(0xE000, 0xFFFF, CartBW);
-	
-	SetupCartPRGMapping(0x10, (uint8*) FCEU_gmalloc(8192), 8192, 1);
+    FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
+}
+
+static void Mapper452_Close(void) {
+   if (WRAM)
+      FCEU_gfree(WRAM);
+   WRAM = NULL;
+}
+
+static void StateRestore(int version) {
+   Mapper452_Sync();
 }
 
 void Mapper452_Init(CartInfo *info) {
 	info->Reset = Mapper452_Reset;
 	info->Power = Mapper452_Power;
+	info->Close = Mapper452_Close;
+	GameStateRestore = StateRestore;
+
+	WRAMSIZE = 8192;
+	WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
+	SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
+	AddExState(WRAM, WRAMSIZE, 0, "WRAM");
+
 	AddExState(&latch, 2, 0, "LATC");
 }
diff --git a/src/boards/558.c b/src/boards/558.c
index a6664c0..c509ba5 100644
--- a/src/boards/558.c
+++ b/src/boards/558.c
@@ -26,6 +26,8 @@
 #include "eeprom_93C66.h"
 #include "../ines.h"
 
+static uint8 *WRAM;
+static uint32 WRAMSIZE;
 static uint8 reg[4];
 static uint8 haveEEPROM;
 static uint8 eeprom_data[512];
@@ -97,17 +99,32 @@ static void reset(void)
    sync();
 }
 
+static void close(void)
+{
+   if (WRAM)
+      FCEU_gfree(WRAM);
+   WRAM = NULL;
+}
+
+static void StateRestore(int version)
+{
+   sync();
+}
+
 void Mapper558_Init (CartInfo *info)
 {
-   uint8 *WRAM;
-   uint32 WRAMSIZE = info->PRGRamSize + (info->PRGRamSaveSize &~0x7FF);
    info->Power   = power;
    info->Reset   = reset;
+   info->Close   = close;
    GameHBIRQHook = hblank;
+
+   GameStateRestore = StateRestore;
    AddExState(StateRegs, ~0, 0, 0);
 
+   WRAMSIZE = info->PRGRamSize + (info->PRGRamSaveSize &~0x7FF);
    WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
    SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
+   AddExState(WRAM, WRAMSIZE, 0, "WRAM");
    FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
    haveEEPROM =!!(info->PRGRamSaveSize &0x200);
    if (haveEEPROM)
diff --git a/src/boards/KS7032.c b/src/boards/KS7032.c
index 8e123e5..a435b3c 100644
--- a/src/boards/KS7032.c
+++ b/src/boards/KS7032.c
@@ -139,6 +139,12 @@ static void UNLKS7032Power(void) {
 	}
 }
 
+static void UNLKS7032Close(void) {
+	if (WRAM)
+		FCEU_gfree(WRAM);
+	WRAM = NULL;
+}
+
 static void StateRestore(int version) {
 	Sync();
 }
@@ -146,6 +152,7 @@ static void StateRestore(int version) {
 void UNLKS7032_Init(CartInfo *info) {
 	KS7032 = 1;
 	info->Power = UNLKS7032Power;
+	info->Close = UNLKS7032Close;
 	MapIRQHook = UNLSMB2JIRQHook;
 	GameStateRestore = StateRestore;
 	AddExState(&StateRegsKS7032, ~0, 0, 0);
@@ -154,6 +161,7 @@ void UNLKS7032_Init(CartInfo *info) {
 void UNLKS202_Init(CartInfo *info) {
 	KS7032 = 0;
 	info->Power = UNLKS7032Power;
+	info->Close = UNLKS7032Close;
 	MapIRQHook = UNLSMB2JIRQHook;
 	GameStateRestore = StateRestore;
 	AddExState(&StateRegsKS7032, ~0, 0, 0);
diff --git a/src/boards/jyasic.c b/src/boards/jyasic.c
index 353b54c..0d1cdf1 100644
--- a/src/boards/jyasic.c
+++ b/src/boards/jyasic.c
@@ -409,6 +409,13 @@ static void JYASIC_reset (void)
 	dipSwitch = (dipSwitch +0x40) &0xC0;
 }
 
+static void JYASIC_close (void)
+{
+	if (WRAM)
+      FCEU_gfree(WRAM);
+   WRAM = NULL;
+}
+
 static void JYASIC_restore (int version)
 {
 	sync();
@@ -418,6 +425,7 @@ void JYASIC_init (CartInfo *info)
 {
    info->Reset = JYASIC_reset;
    info->Power = JYASIC_power;
+   info->Close = JYASIC_close;
    PPU_hook = trapPPUAddressChange;
    MapIRQHook = cpuCycle;
    GameHBIRQHook2 = ppuScanline;
diff --git a/src/ines-correct.h b/src/ines-correct.h
index b7a105b..fb80e15 100644
--- a/src/ines-correct.h
+++ b/src/ines-correct.h
@@ -111,16 +111,18 @@
 	{ 0x02863604,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sukeban Deka III (Japan).nes */
 	{ 0x419461d0,    2, DEFAULT,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Cars (USA).nes */
 
-	/* CNROM by default has bus conflicts enabled, these requires no bus conflict to play correctly */	
-	{ 0x2915faf0,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Incantation (Asia) (Ja) (Unl).nes */
-	{ 0x8f154a0d,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pu Ke Jing Ling (Asia) (Unl).nes */
-	{ 0xb0c871c5,    3,       1,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Wei Lai Xiao Zi (Joy Van).nes */
-	{ 0xb3be2f71,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Yanshan Chess (Unl).nes */
-	{ 0xd04a40e6,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bingo 75 (Asia) (Ja) (Unl).nes */
-	{ 0xe41b440f,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sidewinder (Joy Van).nes */
-	{ 0xebd0644d,    3,       1,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Master Chu & The Drunkard Hu (Joy Van).nes */
-	{ 0xf283cf58,    3,       1,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Colorful Dragon (Sachen).nes */
-	{ 0x2deb12b8,    3,       1,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Venice Beach Volleyball (Asia) (Ja) (Super Mega) (Unl).nes */
+	/* CNROM by default has bus conflicts disabled, set to submapper 2 to enable bus conflicts */
+	{ 0xac8dcdea,    3,       2,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Cybernoid - The Fighting Machine (USA).nes */
+
+	{ 0x2915faf0,    3,       0,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Incantation (Asia) (Ja) (Unl).nes */
+	{ 0x8f154a0d,    3,       0,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Pu Ke Jing Ling (Asia) (Unl).nes */
+	{ 0xb0c871c5,    3,       0,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Wei Lai Xiao Zi (Joy Van).nes */
+	{ 0xb3be2f71,    3,       0,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Yanshan Chess (Unl).nes */
+	{ 0xd04a40e6,    3,       0,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Bingo 75 (Asia) (Ja) (Unl).nes */
+	{ 0xe41b440f,    3,       0,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Sidewinder (Joy Van).nes */
+	{ 0xebd0644d,    3,       0,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Master Chu & The Drunkard Hu (Joy Van).nes */
+	{ 0xf283cf58,    3,       0,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Colorful Dragon (Sachen).nes */
+	{ 0x2deb12b8,    3,       0,    MI_V, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Venice Beach Volleyball (Asia) (Ja) (Super Mega) (Unl).nes */
 
 	{ 0xdbf90772,    3, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Alpha Mission (USA).nes */
 	{ 0xd858033d,    3, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ASO - Armored Scrum Object (J).nes */
@@ -965,4 +967,4 @@
 
 	{ 0x00000000, DEFAULT, DEFAULT, DEFAULT, DEFAULT, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/ines.c b/src/ines.c
index d4c90fe..10a731f 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -822,14 +822,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "YC-03-09",                 558, Mapper558_Init         )
 INES_BOARD_END()
 
-static uint32 get_ines_version(void)
-{
-	if ((head.ROM_type2 & 0x0C) == 0x08)
-		return 1;
-	return 0;
-}
-
-static uint32 get_ines_mapper_id(void)
+static uint32 iNES_get_mapper_id(void)
 {
 	/* If byte 7 AND $0C = $08, and the size taking into account byte 9 does not exceed the actual size of the ROM image, then NES 2.0.
 	 * If byte 7 AND $0C = $00, and bytes 12-15 are all 0, then iNES.
@@ -849,26 +842,25 @@ static uint32 get_ines_mapper_id(void)
 	return ret;
 }
 
-static void rom_load_ines(void) {
-	ROM_size           = head.ROM_size;
-	VROM_size          = head.VROM_size;
-	iNESCart.mirror    = (head.ROM_type & 8) ? 2 : (head.ROM_type & 1);
-	iNESCart.battery   = (head.ROM_type & 2) ? 1 : 0;
-	iNESCart.mapper    = get_ines_mapper_id();
-}
+static void iNES_read_header_info(void) {
+   ROM_size           = head.ROM_size;
+   VROM_size          = head.VROM_size;
+   iNESCart.mirror    = (head.ROM_type & 8) ? 2 : (head.ROM_type & 1);
+   iNESCart.battery   = (head.ROM_type & 2) ? 1 : 0;
+   iNESCart.mapper    = iNES_get_mapper_id();
+   iNESCart.iNES2     = (head.ROM_type2 & 0x0C) == 0x08;
 
-static void rom_load_ines2(void) {
-	ROM_size           = head.ROM_size | ((head.upper_PRG_CHR_size >> 0) & 0xF) << 8;
-	VROM_size          = head.VROM_size | ((head.upper_PRG_CHR_size >> 4) & 0xF) << 8;
-	iNESCart.mirror    = (head.ROM_type & 8) ? 2 : (head.ROM_type & 1);
-	iNESCart.battery   = (head.ROM_type & 2) ? 1 : 0;
-	iNESCart.mapper    = get_ines_mapper_id();
-	iNESCart.submapper = (head.ROM_type3 >> 4) & 0x0F;
-	iNESCart.region    = head.Region & 3;
-	if (head.PRGRAM_size & 0x0F) iNESCart.PRGRamSize     = 64 << ((head.PRGRAM_size >> 0) & 0x0F);
-	if (head.PRGRAM_size & 0xF0) iNESCart.PRGRamSaveSize = 64 << ((head.PRGRAM_size >> 4) & 0x0F);
-	if (head.CHRRAM_size & 0x0F) iNESCart.CHRRamSize     = 64 << ((head.CHRRAM_size >> 0) & 0x0F);
-	if (head.CHRRAM_size & 0xF0) iNESCart.CHRRamSaveSize = 64 << ((head.CHRRAM_size >> 4) & 0x0F);
+   if (iNESCart.iNES2)
+   {
+      ROM_size           |= ((head.upper_PRG_CHR_size >> 0) & 0xF) << 8;
+      VROM_size          |= ((head.upper_PRG_CHR_size >> 4) & 0xF) << 8;	
+      iNESCart.submapper = (head.ROM_type3 >> 4) & 0x0F;
+      iNESCart.region    = head.Region & 3;
+      if (head.PRGRAM_size & 0x0F) iNESCart.PRGRamSize     = 64 << ((head.PRGRAM_size >> 0) & 0x0F);
+      if (head.PRGRAM_size & 0xF0) iNESCart.PRGRamSaveSize = 64 << ((head.PRGRAM_size >> 4) & 0x0F);
+      if (head.CHRRAM_size & 0x0F) iNESCart.CHRRamSize     = 64 << ((head.CHRRAM_size >> 0) & 0x0F);
+      if (head.CHRRAM_size & 0xF0) iNESCart.CHRRamSaveSize = 64 << ((head.CHRRAM_size >> 4) & 0x0F);
+   }
 }
 
 int iNESLoad(const char *name, FCEUFILE *fp)
@@ -879,8 +871,8 @@ int iNESLoad(const char *name, FCEUFILE *fp)
    char* mappername        = NULL;
    uint32 mappertest       = 0;
 #endif
-   uint64 filesize         = FCEU_fgetsize(fp);
-   uint64 romSize          = 0;
+   uint64 filesize         = FCEU_fgetsize(fp); /* size of file including header */
+   uint64 romSize          = 0;                 /* size of PRG + CHR rom */
    /* used for malloc and cart mapping */
    uint32 rom_size_pow2    = 0;
    uint32 vrom_size_pow2   = 0;
@@ -888,8 +880,6 @@ int iNESLoad(const char *name, FCEUFILE *fp)
    if (FCEU_fread(&head, 1, 16, fp) != 16)
       return 0;
 
-   filesize -= 16; /* remove header size from total size */
-
    if (memcmp(&head, "NES\x1a", 4))
    {
       FCEU_PrintError("Not an iNES file!\n");
@@ -912,14 +902,13 @@ int iNESLoad(const char *name, FCEUFILE *fp)
          memset((char*)(&head) + 0xA, 0, 0x6);
    }
 
-   if ((iNESCart.iNES2 = get_ines_version()))
-      rom_load_ines2();
-   else
-      rom_load_ines();
+   iNES_read_header_info();
 
    if (!ROM_size)
       ROM_size = 256;
 
+   filesize -= 16; /* remove header size from total size */
+
    /* Trainer */
    if (head.ROM_type & 4)
    {

From 03c42f32b30374f56f5c2b0a6eaea3557cb69c7d Mon Sep 17 00:00:00 2001
From: negativeExponent <54053706+negativeExponent@users.noreply.github.com>
Date: Mon, 24 Jan 2022 22:53:53 +0800
Subject: [PATCH 171/295] update (#483)

* Fix missing GameStateRestore

* Add mapper 403

Co-authored-by: negativeExponent <negativeExponent@users.noreply.github.com>
---
 src/boards/403.c    | 81 +++++++++++++++++++++++++++++++++++++++++++++
 src/boards/434.c    |  5 +++
 src/boards/437.c    |  5 +++
 src/boards/438.c    |  5 +++
 src/boards/KS7057.c |  5 +++
 src/boards/le05.c   |  5 +++
 src/ines.c          |  1 +
 src/ines.h          |  1 +
 8 files changed, 108 insertions(+)
 create mode 100644 src/boards/403.c

diff --git a/src/boards/403.c b/src/boards/403.c
new file mode 100644
index 0000000..aa1ad46
--- /dev/null
+++ b/src/boards/403.c
@@ -0,0 +1,81 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+/* NES 2.0 Mapper 403 denotes the 89433 circuit board with up to 1 MiB PRG-ROM and 32 KiB of CHR-RAM, bankable with 8 KiB granularity.
+ *
+ * Tetris Family - 玩家 19-in-1 智瑟實典 (NO-1683)
+ * Sachen Superpack (versions A-C)
+ */
+
+#include "mapinc.h"
+
+static uint8 reg[3];
+
+static void Sync(void) {
+	uint8 prg  = reg[0];
+	uint8 chr  = reg[1];
+	uint8 mode = reg[2];
+
+	/* NROM-128 */
+	if (mode & 1) {
+		setprg16(0x8000, prg >> 1);
+		setprg16(0xC000, prg >> 1);
+	/* NROM-256 */
+	} else
+		setprg32(0x8000, prg >> 2);
+	setchr8(chr);
+	setmirror(((mode >> 4) & 1) ^ 1);
+}
+
+static DECLFW(M403Write4) {
+	reg[A & 3] = V;
+	Sync();
+}
+
+static DECLFW(M403Write8) {
+	if (reg[2] & 4) {
+		reg[1] = V;
+		Sync();
+	}
+}
+
+static void M403Reset(void) {
+	reg[0] = reg[1] = reg[2] = 0;
+	Sync();
+}
+
+static void M403Power(void) {
+	reg[0] = reg[1] = reg[2] = 0;
+	Sync();
+	SetReadHandler(0x8000, 0xFFFF, CartBR);
+	SetWriteHandler(0x4100, 0x4103, M403Write4);
+	SetWriteHandler(0x8000, 0xFFFF, M403Write8);
+}
+
+static void StateRestore(void) {
+	Sync();
+}
+
+void Mapper403_Init(CartInfo *info) {
+	info->Reset = M403Reset;
+	info->Power = M403Power;
+	GameStateRestore = StateRestore;
+	AddExState(&reg, 3, 0, "REGS");
+}
diff --git a/src/boards/434.c b/src/boards/434.c
index f005162..2a6c5a2 100644
--- a/src/boards/434.c
+++ b/src/boards/434.c
@@ -55,8 +55,13 @@ static void Mapper434_Power(void) {
 	SetWriteHandler(0x8000, 0xFFFF, Mapper434_WriteInnerBank);
 }
 
+static void StateRestore(void) {
+	Mapper434_Sync();
+}
+
 void Mapper434_Init(CartInfo *info) {
 	info->Reset = Mapper434_Reset;
 	info->Power = Mapper434_Power;
+	GameStateRestore = StateRestore;
 	AddExState(&latch, 2, 0, "LATC");
 }
diff --git a/src/boards/437.c b/src/boards/437.c
index d12e294..5541877 100644
--- a/src/boards/437.c
+++ b/src/boards/437.c
@@ -55,8 +55,13 @@ static void Mapper437_Power(void) {
 	SetWriteHandler(0x8000, 0xFFFF, Mapper437_WriteInnerBank);
 }
 
+static void StateRestore(void) {
+	Mapper437_Sync();
+}
+
 void Mapper437_Init(CartInfo *info) {
 	info->Reset = Mapper437_Reset;
 	info->Power = Mapper437_Power;
+	GameStateRestore = StateRestore;
 	AddExState(&latch, 1, 0, "LATC");
 }
diff --git a/src/boards/438.c b/src/boards/438.c
index 1602644..da5ed83 100644
--- a/src/boards/438.c
+++ b/src/boards/438.c
@@ -55,8 +55,13 @@ static void Mapper438_Power(void) {
 	SetWriteHandler(0x8000, 0xFFFF, Mapper438_WriteLatch);
 }
 
+static void StateRestore(void) {
+	Mapper438_Sync();
+}
+
 void Mapper438_Init(CartInfo *info) {
 	info->Reset = Mapper438_Reset;
 	info->Power = Mapper438_Power;
+	GameStateRestore = StateRestore;
 	AddExState(&latch, 2, 0, "LATC");
 }
diff --git a/src/boards/KS7057.c b/src/boards/KS7057.c
index 3762138..be32d24 100644
--- a/src/boards/KS7057.c
+++ b/src/boards/KS7057.c
@@ -85,8 +85,13 @@ static void UNLKS7057Reset(void) {
 	Sync();
 }
 
+static void StateRestore(int version) {
+	Sync();
+}
+
 void UNLKS7057_Init(CartInfo *info) {
 	info->Power = UNLKS7057Power;
 	info->Reset = UNLKS7057Reset;
+	GameStateRestore = StateRestore;
 	AddExState(&StateRegs, ~0, 0, 0);
 }
diff --git a/src/boards/le05.c b/src/boards/le05.c
index 59eab1a..cd2000e 100644
--- a/src/boards/le05.c
+++ b/src/boards/le05.c
@@ -56,7 +56,12 @@ static void LE05Power(void) {
 	SetWriteHandler(0x8000, 0xFFFF, LE05Write);
 }
 
+static void StateRestore(int version) {
+	Sync();
+}
+
 void LE05_Init(CartInfo *info) {
 	info->Power = LE05Power;
+	GameStateRestore = StateRestore;
 	AddExState(&StateRegs, ~0, 0, 0);
 }
diff --git a/src/ines.c b/src/ines.c
index 10a731f..5dc6722 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -706,6 +706,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "NewStar 12-in-1/7-in-1",   293, Mapper293_Init         )
 	INES_BOARD( "Realtec 8210",             395, Mapper395_Init         )
 	INES_BOARD( "BMC Super 19-in-1 (VIP19)",    401, Mapper401_Init         )
+	INES_BOARD( "89433",                    403, Mapper403_Init         )
 	INES_BOARD( "A88S-1",                   411, Mapper411_Init         )
 	INES_BOARD( "BS-400R/BS-4040",          422, Mapper422_Init         )
 	INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init        )
diff --git a/src/ines.h b/src/ines.h
index 3a500cc..d0f2b0a 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -284,6 +284,7 @@ void Mapper391_Init(CartInfo *);
 void Mapper395_Init(CartInfo *);
 void Mapper397_Init(CartInfo *);
 void Mapper401_Init(CartInfo *);
+void Mapper403_Init(CartInfo *);
 void Mapper411_Init(CartInfo *);
 void Mapper421_Init(CartInfo *);
 void Mapper422_Init(CartInfo *);

From 3923dd51e797fd4fe5de8057e20360f0c79a0002 Mon Sep 17 00:00:00 2001
From: negativeExponent <54053706+negativeExponent@users.noreply.github.com>
Date: Sat, 29 Jan 2022 18:04:20 +0800
Subject: [PATCH 172/295] Fix warnings (#484)

Co-authored-by: negativeExponent <negativeExponent@users.noreply.github.com>
---
 src/boards/403.c | 2 +-
 src/boards/434.c | 2 +-
 src/boards/437.c | 2 +-
 src/boards/438.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/boards/403.c b/src/boards/403.c
index aa1ad46..c0299c8 100644
--- a/src/boards/403.c
+++ b/src/boards/403.c
@@ -69,7 +69,7 @@ static void M403Power(void) {
 	SetWriteHandler(0x8000, 0xFFFF, M403Write8);
 }
 
-static void StateRestore(void) {
+static void StateRestore(int version) {
 	Sync();
 }
 
diff --git a/src/boards/434.c b/src/boards/434.c
index 2a6c5a2..cbe0b45 100644
--- a/src/boards/434.c
+++ b/src/boards/434.c
@@ -55,7 +55,7 @@ static void Mapper434_Power(void) {
 	SetWriteHandler(0x8000, 0xFFFF, Mapper434_WriteInnerBank);
 }
 
-static void StateRestore(void) {
+static void StateRestore(int version) {
 	Mapper434_Sync();
 }
 
diff --git a/src/boards/437.c b/src/boards/437.c
index 5541877..acb4371 100644
--- a/src/boards/437.c
+++ b/src/boards/437.c
@@ -55,7 +55,7 @@ static void Mapper437_Power(void) {
 	SetWriteHandler(0x8000, 0xFFFF, Mapper437_WriteInnerBank);
 }
 
-static void StateRestore(void) {
+static void StateRestore(int version) {
 	Mapper437_Sync();
 }
 
diff --git a/src/boards/438.c b/src/boards/438.c
index da5ed83..b534fb6 100644
--- a/src/boards/438.c
+++ b/src/boards/438.c
@@ -55,7 +55,7 @@ static void Mapper438_Power(void) {
 	SetWriteHandler(0x8000, 0xFFFF, Mapper438_WriteLatch);
 }
 
-static void StateRestore(void) {
+static void StateRestore(int version) {
 	Mapper438_Sync();
 }
 

From e0200b03c83f56b719649969960394f5ca0a0bbd Mon Sep 17 00:00:00 2001
From: negativeExponent <54053706+negativeExponent@users.noreply.github.com>
Date: Mon, 31 Jan 2022 23:34:07 +0800
Subject: [PATCH 173/295] Fix states loading issue of some games in big-endian
 platforms (#490)

* Fix states loading issue of some games in big-endian platforms

* Typo

Co-authored-by: negativeExponent <negativeExponent@users.noreply.github.com>
---
 src/ines.c  | 2 +-
 src/state.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/ines.c b/src/ines.c
index 5dc6722..d823f31 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -999,7 +999,7 @@ int iNESLoad(const char *name, FCEUFILE *fp)
    FCEU_printf(" PRG+CHR CRC32:  0x%08X\n", iNESCart.CRC32);
    FCEU_printf(" PRG+CHR MD5:    0x%s\n", md5_asciistr(iNESCart.MD5));
    FCEU_printf(" PRG-ROM:  %6d KiB\n", iNESCart.PRGRomSize >> 10);
-   FCEU_printf(" CHR-ROM:  %36 KiB\n", iNESCart.CHRRomSize >> 10);
+   FCEU_printf(" CHR-ROM:  %6d KiB\n", iNESCart.CHRRomSize >> 10);
    FCEU_printf(" Mapper #: %3d\n", iNESCart.mapper);
    FCEU_printf(" Mapper name: %s\n", mappername);
    FCEU_printf(" Mirroring: %s\n", iNESCart.mirror == 2 ? "None (Four-screen)" : iNESCart.mirror ? "Vertical" : "Horizontal");
diff --git a/src/state.c b/src/state.c
index 04912fc..5f06bfb 100644
--- a/src/state.c
+++ b/src/state.c
@@ -286,6 +286,7 @@ void FCEUSS_Load_Mem(void)
 
    uint8 header[16];
    int stateversion;
+   int totalsize;
    int x;
 
    memstream_read(mem, header, 16);
@@ -297,8 +298,10 @@ void FCEUSS_Load_Mem(void)
       stateversion = FCEU_de32lsb(header + 8);
    else
       stateversion = header[3] * 100;
+   
+   totalsize = FCEU_de32lsb(header + 4);
 
-   x = ReadStateChunks(mem, *(uint32*)(header + 4));
+   x = ReadStateChunks(mem, totalsize);
 
    if (stateversion < 9500)
       X.IRQlow = 0;

From 85ace685b91204c741e68ae4a6f9a1cfbd0821e7 Mon Sep 17 00:00:00 2001
From: negativeExponent <54053706+negativeExponent@users.noreply.github.com>
Date: Tue, 1 Feb 2022 15:14:16 +0800
Subject: [PATCH 174/295] mapper-related updates and fixes (#491)

* m116: Fix support for Huang-2 chip

* Provide 8K CHR ram if no CHR rom/ram is provided due to bad headers

* m15: Implement CHR write-protect

* Update Namco 106

- Cleanup save state struct
- Implement nametable mirroring
- fix sound issue (fceux)

Co-authored-by: negativeExponent <negativeExponent@users.noreply.github.com>
---
 src/boards/116.c   | 61 +++++++++++++++++++++++++++++++---------------
 src/boards/15.c    |  8 ++++++
 src/boards/71.c    |  1 +
 src/boards/fk23c.c |  4 ++-
 src/boards/n106.c  | 44 ++++++++++++++++-----------------
 src/ines.c         |  3 ++-
 6 files changed, 76 insertions(+), 45 deletions(-)

diff --git a/src/boards/116.c b/src/boards/116.c
index cb7d40f..316f0a1 100644
--- a/src/boards/116.c
+++ b/src/boards/116.c
@@ -35,29 +35,45 @@
 
 #include "mapinc.h"
 
-static uint8 mode;
-static uint8 vrc2_chr[8], vrc2_prg[2], vrc2_mirr;
-static uint8 mmc3_regs[10], mmc3_ctrl, mmc3_mirr;
-static uint8 IRQCount, IRQLatch, IRQa;
-static uint8 IRQReload;
-static uint8 mmc1_regs[4], mmc1_buffer, mmc1_shift;
+static uint8 vrc2_chr[8]   = { 0 };
+static uint8 vrc2_prg[2]   = { 0 };
+static uint8 vrc2_mirr     = 0;
+
+static uint8 mmc3_regs[10] = { 0 };
+static uint8 mmc3_ctrl     = 0;
+static uint8 mmc3_mirr     = 0;
+
+static uint8 mmc1_regs[4]  = { 0 };
+static uint8 mmc1_buffer   = 0;
+static uint8 mmc1_shift    = 0;
+
+static uint8 IRQCount      = 0;
+static uint8 IRQLatch      = 0;
+static uint8 IRQa          = 0;
+static uint8 IRQReload     = 0;
+static uint8 mode          = 0;
+
+static uint32 isHuang2     = 0;
+
+extern uint32 ROM_size;
+extern uint32 VROM_size;
 
 static SFORMAT StateRegs[] =
 {
-	{ &mode, 1, "MODE" },
-	{ vrc2_chr, 8, "VRCC" },
-	{ vrc2_prg, 2, "VRCP" },
-	{ &vrc2_mirr, 1, "VRCM" },
-	{ mmc3_regs, 10, "M3RG" },
-	{ &mmc3_ctrl, 1, "M3CT" },
-	{ &mmc3_mirr, 1, "M3MR" },
-	{ &IRQReload, 1, "IRQR" },
-	{ &IRQCount, 1, "IRQC" },
-	{ &IRQLatch, 1, "IRQL" },
-	{ &IRQa, 1, "IRQA" },
-	{ mmc1_regs, 4, "M1RG" },
+	{ &mode,        1, "MODE" },
+	{ vrc2_chr,     8, "VRCC" },
+	{ vrc2_prg,     2, "VRCP" },
+	{ &vrc2_mirr,   1, "VRCM" },
+	{ mmc3_regs,   10, "M3RG" },
+	{ &mmc3_ctrl,   1, "M3CT" },
+	{ &mmc3_mirr,   1, "M3MR" },
+	{ &IRQReload,   1, "IRQR" },
+	{ &IRQCount,    1, "IRQC" },
+	{ &IRQLatch,    1, "IRQL" },
+	{ &IRQa,        1, "IRQA" },
+	{ mmc1_regs,    4, "M1RG" },
 	{ &mmc1_buffer, 1, "M1BF" },
-	{ &mmc1_shift, 1, "M1MR" },
+	{ &mmc1_shift,  1, "M1MR" },
 	{ 0 }
 };
 
@@ -83,6 +99,8 @@ static void SyncPRG(void) {
 	{
 		uint8 bank = mmc1_regs[3] & 0xF;
 		if (mmc1_regs[0] & 8) {
+			if (isHuang2)
+				bank >>= 1;
 			if (mmc1_regs[0] & 4) {
 				setprg16(0x8000, bank);
 				setprg16(0xC000, 0x0F);
@@ -92,9 +110,9 @@ static void SyncPRG(void) {
 			}
 		} else
 			setprg32(0x8000, bank >> 1);
+		}
 		break;
 	}
-	}
 }
 
 static void SyncCHR(void) {
@@ -322,4 +340,7 @@ void UNLSL12_Init(CartInfo *info) {
 	GameHBIRQHook = UNLSL12HBIRQ;
 	GameStateRestore = StateRestore;
 	AddExState(&StateRegs, ~0, 0, 0);
+	/* PRG 128K and CHR 128K is Huang-2 */
+	if (ROM_size == 8 && VROM_size == 16)
+		isHuang2 = 1;
 }
diff --git a/src/boards/15.c b/src/boards/15.c
index e5ff110..f9c99a7 100644
--- a/src/boards/15.c
+++ b/src/boards/15.c
@@ -63,11 +63,19 @@ static void Sync(void) {
 	setprg8(0xC000, preg[2]);
 	setprg8(0xE000, preg[3]);
 	setmirror(((latched >> 6) & 1) ^ 1);
+	setchr8(0);
 }
 
 static DECLFW(M15Write) {
 	latchea = A;
 	latched = V;
+	/* cah4e3 02.10.19 once again, there may be either two similar mapper 15 exist. the one for 110in1 or 168in1 carts with complex multi game features.
+	   and another implified version for subor/waixing chinese originals and hacks with no different modes, working only in mode 0 and which does not
+	   expect there is any CHR write protection. protecting CHR writes only for mode 3 fixes the problem, all roms may be run on the same source again. */
+	if((latchea & 3) == 3)
+		SetupCartCHRMapping(0, CHRptr[0], 0x2000, 0);
+	else
+		SetupCartCHRMapping(0, CHRptr[0], 0x2000, 1);
 	Sync();
 }
 
diff --git a/src/boards/71.c b/src/boards/71.c
index 12ce402..343bdf0 100644
--- a/src/boards/71.c
+++ b/src/boards/71.c
@@ -46,6 +46,7 @@ static DECLFW(M71Write) {
 }
 
 static void M71Power(void) {
+	preg = 0;
 	mirr = 0;
 	Sync();
 	SetReadHandler(0x8000, 0xFFFF, CartBR);
diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c
index b1598d0..90d4722 100644
--- a/src/boards/fk23c.c
+++ b/src/boards/fk23c.c
@@ -41,7 +41,6 @@
 */
 
 #include "mapinc.h"
-#include "../ines.h"
 
 static uint8 *WRAM            = NULL;
 static uint8 *CHRRAM          = NULL;
@@ -64,6 +63,9 @@ static uint8 jncota523        = 0; /* Jncota board with unusual wiring that turn
 static uint8 dipsw_enable     = 0; /* Change the address mask on every reset? */
 static uint8 after_power      = 0; /* Used for detecting whether a DIP switch is used or not (see above) */
 
+extern uint32 ROM_size;
+extern uint32 VROM_size;
+
 static SFORMAT StateRegs[] = {
    { fk23_regs,               8, "EXPR" },
    { mmc3_regs,              12, "M3RG" },
diff --git a/src/boards/n106.c b/src/boards/n106.c
index b1d6618..a0f0639 100644
--- a/src/boards/n106.c
+++ b/src/boards/n106.c
@@ -53,34 +53,15 @@ static int is210;	/* Lesser mapper. */
 static uint8 PRG[3];
 static uint8 CHR[8];
 
-/* TODO: Clean this up. State variables are expanded for
- * big-endian compatibility when saving and loading states */
 static SFORMAT N106_StateRegs[] = {
-	{ &PRG[0], 1, "PRG1" },
-	{ &PRG[1], 1, "PRG2" },
-	{ &PRG[2], 1, "PRG3" },
-
-	{ &CHR[0], 1, "CHR1" },
-	{ &CHR[1], 1, "CHR2" },
-	{ &CHR[2], 1, "CHR3" },
-	{ &CHR[3], 1, "CHR4" },
-	{ &CHR[4], 1, "CHR5" },
-	{ &CHR[5], 1, "CHR6" },
-	{ &CHR[6], 1, "CHR7" },
-	{ &CHR[7], 1, "CHR8" },
-
-	{ &NTAPage[0], 1, "NTA1" },
-	{ &NTAPage[1], 1, "NTA2" },
-	{ &NTAPage[2], 1, "NTA3" },
-	{ &NTAPage[3], 1, "NTA4" },
-
+	{ PRG, 3, "PRG" },
+	{ CHR, 8, "CHR" },
+	{ NTAPage, 4, "NTA" },
 	{ &IRQCount, 2 | FCEUSTATE_RLSB, "IRQC" },
 	{ &IRQa, 1, "IRQA" },
-
 	{ &dopol, 1, "GORF" },
 	{ &gorfus, 1, "DOPO" },
 	{ &gorko, 1, "GORK" },
-
 	{ 0 }
 };
 
@@ -91,6 +72,15 @@ static void SyncPRG(void) {
 	setprg8(0xe000, 0x3F);
 }
 
+static void SyncMirror() {
+	switch(gorko) {
+	case 0: setmirror(MI_0); break;
+	case 1: setmirror(MI_V); break;
+	case 2: setmirror(MI_H); break;
+	case 3: setmirror(MI_0); break;
+	}
+}
+
 static void FP_FASTAPASS(1) NamcoIRQHook(int a) {
 	if (IRQa) {
 		IRQCount += a;
@@ -167,7 +157,10 @@ static void FixCache(int a, int V) {
 	case 0x02: FreqCache[w] &= ~0x0000FF00; FreqCache[w] |= V << 8; break;
 	case 0x04:
 		FreqCache[w] &= ~0x00030000; FreqCache[w] |= (V & 3) << 16;
-		LengthCache[w] = (8 - ((V >> 2) & 7)) << 2;
+		/* something wrong here http://www.romhacking.net/forum/index.php?topic=21907.msg306903#msg306903 */
+		/* LengthCache[w] = (8 - ((V >> 2) & 7)) << 2; */
+		/* fix be like in https://github.com/SourMesen/Mesen/blob/cda0a0bdcb5525480784f4b8c71de6fc7273b570/Core/Namco163Audio.h#L61 */
+		LengthCache[w] = 256 - (V & 0xFC);
 		break;
 	case 0x07: EnvCache[w] = (double)(V & 0xF) * 576716; break;
 	}
@@ -206,6 +199,10 @@ static DECLFW(Mapper19_write) {
 			gorko = V & 0xC0;
 			PRG[0] = V & 0x3F;
 			SyncPRG();
+			if (is210) {
+				gorko = V >> 6;
+				SyncMirror();
+			}
 			break;
 		case 0xE800:
 			gorfus = V & 0xC0;
@@ -378,6 +375,7 @@ static void DoNamcoSound(int32 *Wave, int Count) {
 static void Mapper19_StateRestore(int version) {
 	int x;
 	SyncPRG();
+	SyncMirror();
 	FixNTAR();
 	FixCRR();
 	for (x = 0x40; x < 0x80; x++)
diff --git a/src/ines.c b/src/ines.c
index d823f31..1b410a2 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -1116,6 +1116,7 @@ static int iNES_Init(int num) {
 			if (!VROM_size) {
 				if (iNESCart.iNES2) {
 					CHRRAMSize = iNESCart.CHRRamSize + iNESCart.CHRRamSaveSize;
+					if (CHRRAMSize == 0) CHRRAMSize = iNESCart.CHRRamSize = 8 * 8192;
 				} else {
 					switch (num) {	/* FIXME, mapper or game data base with the board parameters and ROM/RAM sizes */
 					case 13:  CHRRAMSize = 16 * 1024; break;
@@ -1132,7 +1133,7 @@ static int iNES_Init(int num) {
 					}
 					iNESCart.CHRRamSize = CHRRAMSize;
 				}
-				if (CHRRAMSize) { /* TODO: CHR-RAM are sometimes handled in mappers e.g. MMC1 using submapper 1/2/4 and CHR-RAM can be zero here */
+				if (CHRRAMSize > 0) { /* TODO: CHR-RAM are sometimes handled in mappers e.g. MMC1 using submapper 1/2/4 and CHR-RAM can be zero here */
 					if ((VROM = (uint8*)malloc(CHRRAMSize)) == NULL) return 0;
 					FCEU_MemoryRand(VROM, CHRRAMSize);
 					UNIFchrrama = VROM;

From ffff495072256636a7cd77e4b971f49031c8d82f Mon Sep 17 00:00:00 2001
From: crystalct <nippurct@gmail.com>
Date: Tue, 1 Feb 2022 12:50:25 +0100
Subject: [PATCH 175/295] Simplified makefile.libretro for PS3 (#492)

---
 Makefile.libretro | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index ce0b618..eced6c1 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -259,10 +259,9 @@ else ifneq (,$(filter $(platform), ps3 psl1ght))
     ENDIANNESS_DEFINES =  -DMSB_FIRST
     EXTERNAL_ZLIB = 1
     STATIC_LINKING = 1
-
-    ifneq ($(platdef),)
-        PLATFORM_DEFINES += -D$(platdef)
-    else
+    PLATFORM_DEFINES += -D__PS3__
+    
+    ifeq ($(platform), psl1ght)
         PLATFORM_DEFINES += -D__PSL1GHT__
     endif
 

From 17ad461e7db379073bd928ec7bcfe1635db6c689 Mon Sep 17 00:00:00 2001
From: negativeExponent <54053706+negativeExponent@users.noreply.github.com>
Date: Sat, 5 Feb 2022 10:19:33 -0800
Subject: [PATCH 176/295] mapper cleanups (#494)

* m215: Fix support for submapper 1 cart

* Switch UNL43272 to new Mapper242 implementation

* Merge mappers BMC-70in1/B and 236

* Merge 58/213/GK-192

* Assign GS-2004/GS-2014 to mapper 283

* Cleanup

Co-authored-by: negativeExponent <negativeExponent@users.noreply.github.com>
---
 src/boards/236.c                |   8 ++-
 src/boards/{gs-2013.c => 283.c} |  17 ++---
 src/boards/8237.c               | 113 ++++++++++++-----------------
 src/boards/addrlatch.c          |  53 ++------------
 src/boards/bmc70in1.c           | 123 --------------------------------
 src/boards/gs-2004.c            |  63 ----------------
 src/ines.c                      |  13 ++--
 src/ines.h                      |   2 +
 src/unif.c                      |  22 +++---
 src/unif.h                      |   5 --
 10 files changed, 86 insertions(+), 333 deletions(-)
 rename src/boards/{gs-2013.c => 283.c} (80%)
 delete mode 100644 src/boards/bmc70in1.c
 delete mode 100644 src/boards/gs-2004.c

diff --git a/src/boards/236.c b/src/boards/236.c
index 4915a5d..463e988 100644
--- a/src/boards/236.c
+++ b/src/boards/236.c
@@ -33,13 +33,16 @@ static SFORMAT StateRegs[] =
 static void Sync(void)
 {
 	int prg;
+	int chr;
 	if (chrramvariant)
 	{
 		prg = reg[1] &7 | reg[0] <<3;
+		chr = 0;
 	}
 	else
 	{
-		prg = reg[1] &15;
+		prg = reg[1] & 0x0F;
+		chr = reg[0] & 0x0F;
 	}
 	switch (reg[1] >>4 &3)
 	{
@@ -56,11 +59,10 @@ static void Sync(void)
 			setprg16(0xC000, prg);
 			break;
 	}
-	setchr8(reg[0] &15);
+	setchr8(chr);
 	setmirror((reg[0] >>5 &1) ^1);
 }
 
-
 static DECLFR(M236Read)
 {
 	if ((reg[1] >>4 &3) ==1)
diff --git a/src/boards/gs-2013.c b/src/boards/283.c
similarity index 80%
rename from src/boards/gs-2013.c
rename to src/boards/283.c
index e7cda5f..c3dba2b 100644
--- a/src/boards/gs-2013.c
+++ b/src/boards/283.c
@@ -19,6 +19,7 @@
  */
 
 #include "mapinc.h"
+#include "../ines.h"
 
 static uint8 reg, mirr;
 static SFORMAT StateRegs[] =
@@ -29,25 +30,25 @@ static SFORMAT StateRegs[] =
 };
 
 static void Sync(void) {
-	setprg8(0x6000, 31);
+	setprg8(0x6000, (ROM_size == 17) ? 32 : 31); /* FIXME: Verify these */
 	setprg32(0x8000, reg);
 	setchr8(0);
 }
 
-static DECLFW(BMCGS2013Write) {
+static DECLFW(M283Write) {
 	reg = V;
 	Sync();
 }
 
-static void BMCGS2013Power(void) {
+static void M283Power(void) {
 	reg = 0;
 	Sync();
 	SetReadHandler(0x6000, 0x7FFF, CartBR);
 	SetReadHandler(0x8000, 0xFFFF, CartBR);
-	SetWriteHandler(0x8000, 0xFFFF, BMCGS2013Write);
+	SetWriteHandler(0x8000, 0xFFFF, M283Write);
 }
 
-static void BMCGS2013Reset(void) {
+static void M283Reset(void) {
 	reg = 0;
 }
 
@@ -55,9 +56,9 @@ static void StateRestore(int version) {
 	Sync();
 }
 
-void BMCGS2013_Init(CartInfo *info) {
-	info->Reset = BMCGS2013Reset;
-	info->Power = BMCGS2013Power;
+void Mapper283_Init(CartInfo *info) {
+	info->Reset = M283Reset;
+	info->Power = M283Power;
 	GameStateRestore = StateRestore;
 	AddExState(&StateRegs, ~0, 0, 0);
 }
diff --git a/src/boards/8237.c b/src/boards/8237.c
index 93b4513..fa0c279 100644
--- a/src/boards/8237.c
+++ b/src/boards/8237.c
@@ -17,15 +17,27 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * Super Game (Sugar Softec) protected mapper
- * Pocahontas 2 (Unl) [U][!], etc.
- * TODO: 9in1 LION KING HANGS!
+ * Submapper 0, UNIF board name UNL-8237:
+ * Earthworm Jim 2
+ * Mortal Kombat 3 (SuperGame, not Extra 60, not to be confused by similarly-named games from other developers)
+ * Mortal Kombat 3 Extra 60 (both existing ROM images are just extracts of the 2-in-1 multicart containing this game)
+ * Pocahontas Part 2
+ * 2-in-1: Aladdin, EarthWorm Jim 2 (Super 808)
+ * 2-in-1: The Lion King, Bomber Boy (GD-103)
+ * 2-in-1 Super Golden Card: EarthWorm Jim 2, Boogerman (king002)
+ * 2-in-1: Mortal Kombat 3 Extra 60, The Super Shinobi (king005)
+ * 3-in-1: Boogerman, Adventure Island 3, Double Dragon 3 (Super 308)
+ * 5-in-1 Golden Card: Aladdin, EarthWorm Jim 2, Garo Densetsu Special, Silkworm, Contra Force (SPC005)
+ * 6-in-1 Golden Card: EarthWorm Jim 2, Mortal Kombat 3, Double Dragon 3, Contra 3, The Jungle Book, Turtles Tournament Fighters (SPC009)
+ *
+ * Submapper 1, UNIF board name UNL-8237A:
+ * 9-in-1 High Standard Card: The Lion King, EarthWorm Jim 2, Aladdin, Boogerman, Somari, Turtles Tournament Fighters, Mortal Kombat 3, Captain Tsubasa 2, Taito Basketball (king001)
  */
 
 #include "mapinc.h"
 #include "mmc3.h"
 
-static uint8 cmdin;
+static uint8 submapper;
 
 static uint8 regperm[8][8] =
 {
@@ -52,80 +64,51 @@ static uint8 adrperm[8][8] =
 };
 
 static void UNL8237CW(uint32 A, uint8 V) {
-	if (EXPREGS[0] & 0x40)
-		setchr1(A, ((EXPREGS[1] & 0xc) << 6) | (V & 0x7F) | ((EXPREGS[1] & 0x20) << 2));
+	uint16 outer_bank;
+
+	if (submapper == 1)
+		outer_bank = ((EXPREGS[1] & 0xE) << 7);
 	else
-		setchr1(A, ((EXPREGS[1] & 0xc) << 6) | V);
+		outer_bank = ((EXPREGS[1] & 0xC) << 6);
+
+	if (EXPREGS[0] & 0x40)
+		setchr1(A, outer_bank | (V & 0x7F) | ((EXPREGS[1] & 0x20) << 2));
+	else
+		setchr1(A, outer_bank | V);
 }
 
 static void UNL8237PW(uint32 A, uint8 V) {
+	uint8 outer_bank = ((EXPREGS[1] & 3) << 5);
+
+	if (submapper == 1)
+		outer_bank |= ((EXPREGS[1] & 8) << 4);
+
 	if (EXPREGS[0] & 0x40) {
 		uint8 sbank = (EXPREGS[1] & 0x10);
-		if (EXPREGS[0] & 0x80) {
+		if (EXPREGS[0] & 0x80) { /* NROM */
 			uint8 bank = ((EXPREGS[1] & 3) << 4) | (EXPREGS[0] & 0x7) | (sbank >> 1);
-			if (EXPREGS[0] & 0x20)
+			if (EXPREGS[0] & 0x20) /* NROM-256 */
 				setprg32(0x8000, bank >> 1);
-			else {
+			else { /* NROM-128 */
 				setprg16(0x8000, bank);
 				setprg16(0xC000, bank);
 			}
 		} else
-			setprg8(A, ((EXPREGS[1] & 3) << 5) | (V & 0x0F) | sbank);
+			setprg8(A, outer_bank | (V & 0x0F) | sbank);
 	} else {
-		if (EXPREGS[0] & 0x80) {
+		if (EXPREGS[0] & 0x80) { /* NROM */
 			uint8 bank = ((EXPREGS[1] & 3) << 4) | (EXPREGS[0] & 0xF);
-			if (EXPREGS[0] & 0x20)
+			if (EXPREGS[0] & 0x20) /* NROM-256 */
 				setprg32(0x8000, bank >> 1);
-			else {
+			else { /* NROM-128 */
 				setprg16(0x8000, bank);
 				setprg16(0xC000, bank);
 			}
 		} else
-			setprg8(A, ((EXPREGS[1] & 3) << 5) | (V & 0x1F));
+			setprg8(A, outer_bank | (V & 0x1F));
 	}
 }
 
-static void UNL8237ACW(uint32 A, uint8 V) {
-	if (EXPREGS[0] & 0x40)
-		setchr1(A, ((EXPREGS[1] & 0xE) << 7) | (V & 0x7F) | ((EXPREGS[1] & 0x20) << 2));
-	else
-		setchr1(A, ((EXPREGS[1] & 0xE) << 7) | V);
-}
-
-static void UNL8237APW(uint32 A, uint8 V) {
-	if (EXPREGS[0] & 0x40) {
-		uint8 sbank = (EXPREGS[1] & 0x10);
-		if (EXPREGS[0] & 0x80) {
-			uint8 bank = ((EXPREGS[1] & 3) << 4) | ((EXPREGS[1] & 8) << 3) | (EXPREGS[0] & 0x7) | (sbank >> 1);
-			if (EXPREGS[0] & 0x20) {
-/*				FCEU_printf("8000:%02X\n",bank>>1); */
-				setprg32(0x8000, bank >> 1);
-			} else {
-/*				FCEU_printf("8000-C000:%02X\n",bank); */
-				setprg16(0x8000, bank);
-				setprg16(0xC000, bank);
-			}
-		} else {
-/*			FCEU_printf("%04x:%02X\n",A,((EXPREGS[1]&3)<<5)|((EXPREGS[1]&8)<<4)|(V&0x0F)|sbank); */
-			setprg8(A, ((EXPREGS[1] & 3) << 5) | ((EXPREGS[1] & 8) << 4) | (V & 0x0F) | sbank);
-		}
-	} else {
-		if (EXPREGS[0] & 0x80) {
-			uint8 bank = ((EXPREGS[1] & 3) << 4) | ((EXPREGS[1] & 8) << 3) | (EXPREGS[0] & 0xF);
-			if (EXPREGS[0] & 0x20) {
-/*				FCEU_printf("8000:%02X\n",(bank>>1)&0x07); */
-				setprg32(0x8000, bank >> 1);
-			} else {
-/*				FCEU_printf("8000-C000:%02X\n",bank&0x0F); */
-				setprg16(0x8000, bank);
-				setprg16(0xC000, bank);
-			}
-		} else {
-/*			FCEU_printf("%04X:%02X\n",A,(((EXPREGS[1]&3)<<5)|((EXPREGS[1]&8)<<4)|(V&0x1F))&0x1F); */
-			setprg8(A, ((EXPREGS[1] & 3) << 5) | ((EXPREGS[1] & 8) << 4) | (V & 0x1F));
-		}
-	}
-}
 static DECLFW(UNL8237Write) {
 	uint8 dat = V;
 	uint8 adr = adrperm[EXPREGS[2]][((A >> 12) & 6) | (A & 1)];
@@ -139,8 +122,8 @@ static DECLFW(UNL8237Write) {
 }
 
 static DECLFW(UNL8237ExWrite) {
-	switch (A) {
-	case 0x5000: EXPREGS[0] = V; FixMMC3PRG(MMC3_cmd); break;
+	switch (A & 0xF007) {
+	case 0x5000: EXPREGS[0] = V; FixMMC3PRG(MMC3_cmd); FixMMC3CHR(MMC3_cmd); break;
 	case 0x5001: EXPREGS[1] = V; FixMMC3PRG(MMC3_cmd); FixMMC3CHR(MMC3_cmd); break;
 	case 0x5007: EXPREGS[2] = V; break;
 	}
@@ -148,7 +131,7 @@ static DECLFW(UNL8237ExWrite) {
 
 static void UNL8237Power(void) {
 	EXPREGS[0] = EXPREGS[2] = 0;
-	EXPREGS[1] = 3;
+	EXPREGS[1] = 0x0F;
 	GenMMC3Power();
 	SetWriteHandler(0x8000, 0xFFFF, UNL8237Write);
 	SetWriteHandler(0x5000, 0x7FFF, UNL8237ExWrite);
@@ -160,14 +143,12 @@ void UNL8237_Init(CartInfo *info) {
 	pwrap = UNL8237PW;
 	info->Power = UNL8237Power;
 	AddExState(EXPREGS, 3, 0, "EXPR");
-	AddExState(&cmdin, 1, 0, "CMDI");
+	AddExState(&submapper, 1, 0, "SUBM");
+	if (info->iNES2)
+		submapper = info->submapper;
 }
 
 void UNL8237A_Init(CartInfo *info) {
-	GenMMC3_Init(info, 256, 256, 0, 0);
-	cwrap = UNL8237ACW;
-	pwrap = UNL8237APW;
-	info->Power = UNL8237Power;
-	AddExState(EXPREGS, 3, 0, "EXPR");
-	AddExState(&cmdin, 1, 0, "CMDI");
+	UNL8237_Init(info);
+	submapper = 1;
 }
diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c
index e8fa155..10eef4d 100644
--- a/src/boards/addrlatch.c
+++ b/src/boards/addrlatch.c
@@ -19,6 +19,7 @@
  */
 
 #include "mapinc.h"
+#include "../ines.h"
 
 static uint16 latche, latcheinit;
 static uint16 addrreg0, addrreg1;
@@ -137,38 +138,9 @@ void BMCD1038_Init(CartInfo *info) {
 	AddExState(&dipswitch, 1, 0, "DIPSW");
 }
 
-/*------------------ UNL43272 ---------------------------*/
-/* mapper much complex, including 16K bankswitching */
-static void UNL43272Sync(void) {
-	if ((latche & 0x81) == 0x81) {
-		setprg32(0x8000, (latche & 0x38) >> 3);
-	} else
-		FCEU_printf("unrecognized command %04!\n", latche);
-	setchr8(0);
-	setmirror(0);
-}
-
-static DECLFR(UNL43272Read) {
-	if (latche & 0x400)
-		return CartBR(A & 0xFE);
-	else
-		return CartBR(A);
-}
-
-static void UNL43272Reset(void) {
-	latche = 0;
-	UNL43272Sync();
-}
-
-void UNL43272_Init(CartInfo *info) {
-	Latch_Init(info, UNL43272Sync, UNL43272Read, 0x0081, 0x8000, 0xFFFF, 0);
-	info->Reset = UNL43272Reset;
-	AddExState(&dipswitch, 1, 0, "DIPSW");
-}
-
 /*------------------ Map 058 ---------------------------*/
 
-static void BMCGK192Sync(void) {
+static void M58Sync(void) {
 	if (latche & 0x40) {
 		setprg16(0x8000, latche & 7);
 		setprg16(0xC000, latche & 7);
@@ -178,8 +150,8 @@ static void BMCGK192Sync(void) {
 	setmirror(((latche & 0x80) >> 7) ^ 1);
 }
 
-void BMCGK192_Init(CartInfo *info) {
-	Latch_Init(info, BMCGK192Sync, NULL, 0x0000, 0x8000, 0xFFFF, 0);
+void Mapper58_Init(CartInfo *info) {
+	Latch_Init(info, M58Sync, NULL, 0x0000, 0x8000, 0xFFFF, 0);
 }
 
 /*------------------ Map 059 ---------------------------*/
@@ -373,20 +345,7 @@ void Mapper212_Init(CartInfo *info) {
 
 /*------------------ Map 213 ---------------------------*/
 
-static void M213Sync(void) {
-	if(latche & 0x40) {
-		setprg16(0x8000, (latche & 7));
-		setprg16(0xC000, (latche & 7));
-	} else {
-	setprg32(0x8000, (latche >> 1) & 3);
-	}
-	setchr8((latche >> 3) & 7);
-	setmirror(((latche & 1)^((latche >> 6) & 1)) ^ 1);
-}
-
-void Mapper213_Init(CartInfo *info) {
-	Latch_Init(info, M213Sync, NULL, 0x0000, 0x8000, 0xFFFF, 0);
-}
+/*                SEE MAPPER 58                         */
 
 /*------------------ Map 214 ---------------------------*/
 
@@ -540,7 +499,7 @@ static void M242Sync(void) {
 		}
 	}
 
-	if (!hasBattery && (latche & 0x80) == 0x80)
+	if (!hasBattery && (latche & 0x80) == 0x80 && (ROM_size * 16) > 256)
 		/* CHR-RAM write protect hack, needed for some multicarts */
 		SetupCartCHRMapping(0, CHRptr[0], 0x2000, 0);
 	else
diff --git a/src/boards/bmc70in1.c b/src/boards/bmc70in1.c
deleted file mode 100644
index 97fb34f..0000000
--- a/src/boards/bmc70in1.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2005 CaH4e3
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "mapinc.h"
-
-static uint8 is_large_banks, hw_switch;
-static uint8 large_bank;
-static uint8 prg_bank;
-static uint8 chr_bank;
-static uint8 bank_mode;
-static uint8 mirroring;
-static SFORMAT StateRegs[] =
-{
-	{ &large_bank, 1, "LB" },
-	{ &hw_switch, 1, "DPSW" },
-	{ &prg_bank, 1, "PRG" },
-	{ &chr_bank, 1, "CHR" },
-	{ &bank_mode, 1, "BM" },
-	{ &mirroring, 1, "MIRR" },
-	{ 0 }
-};
-
-static void Sync(void) {
-	switch (bank_mode) {
-	case 0x00:
-	case 0x10:
-		setprg16(0x8000, large_bank | prg_bank);
-		setprg16(0xC000, large_bank | 7);
-		break;
-	case 0x20:
-		setprg32(0x8000, (large_bank | prg_bank) >> 1);
-		break;
-	case 0x30:
-		setprg16(0x8000, large_bank | prg_bank);
-		setprg16(0xC000, large_bank | prg_bank);
-		break;
-	}
-	setmirror(mirroring);
-	if (!is_large_banks)
-		setchr8(chr_bank);
-}
-
-static DECLFR(BMC70in1Read) {
-	if (bank_mode == 0x10)
-/*	if(is_large_banks) */
-		return CartBR((A & 0xFFF0) | hw_switch);
-#if 0
-	else
-		return CartBR((A&0xFFF0)|hw_switch);
-#endif
-	else
-		return CartBR(A);
-}
-
-static DECLFW(BMC70in1Write) {
-	if (A & 0x4000) {
-		bank_mode = A & 0x30;
-		prg_bank = A & 7;
-	} else {
-		mirroring = ((A & 0x20) >> 5) ^ 1;
-		if (is_large_banks)
-			large_bank = (A & 3) << 3;
-		else
-			chr_bank = A & 7;
-	}
-	Sync();
-}
-
-static void BMC70in1Reset(void) {
-	bank_mode = 0;
-	large_bank = 0;
-	Sync();
-	hw_switch++;
-	hw_switch &= 0xf;
-}
-
-static void BMC70in1Power(void) {
-	setchr8(0);
-	bank_mode = 0;
-	large_bank = 0;
-	Sync();
-	SetReadHandler(0x8000, 0xFFFF, BMC70in1Read);
-	SetWriteHandler(0x8000, 0xffff, BMC70in1Write);
-}
-
-static void StateRestore(int version) {
-	Sync();
-}
-
-void BMC70in1_Init(CartInfo *info) {
-	is_large_banks = 0;
-	hw_switch = 0xd;
-	info->Power = BMC70in1Power;
-	info->Reset = BMC70in1Reset;
-	GameStateRestore = StateRestore;
-	AddExState(&StateRegs, ~0, 0, 0);
-}
-
-void BMC70in1B_Init(CartInfo *info) {
-	is_large_banks = 1;
-	hw_switch = 0x6;
-	info->Power = BMC70in1Power;
-	info->Reset = BMC70in1Reset;
-	GameStateRestore = StateRestore;
-	AddExState(&StateRegs, ~0, 0, 0);
-}
diff --git a/src/boards/gs-2004.c b/src/boards/gs-2004.c
deleted file mode 100644
index fd964e5..0000000
--- a/src/boards/gs-2004.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2007 CaH4e3
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "mapinc.h"
-
-static uint8 reg, mirr;
-static SFORMAT StateRegs[] =
-{
-	{ &reg, 1, "REGS" },
-	{ &mirr, 1, "MIRR" },
-	{ 0 }
-};
-
-static void Sync(void) {
-	setprg8(0x6000, 32);
-	setprg32(0x8000, reg);
-	setchr8(0);
-}
-
-static DECLFW(BMCGS2004Write) {
-	reg = V;
-	Sync();
-}
-
-static void BMCGS2004Power(void) {
-	reg = 0x07;
-	Sync();
-	SetReadHandler(0x6000, 0x7FFF, CartBR);
-	SetReadHandler(0x8000, 0xFFFF, CartBR);
-	SetWriteHandler(0x8000, 0xFFFF, BMCGS2004Write);
-}
-
-static void BMCGS2004Reset(void) {
-	reg = 0x07;
-}
-
-static void StateRestore(int version) {
-	Sync();
-}
-
-void BMCGS2004_Init(CartInfo *info) {
-	info->Reset = BMCGS2004Reset;
-	info->Power = BMCGS2004Power;
-	GameStateRestore = StateRestore;
-	AddExState(&StateRegs, ~0, 0, 0);
-}
diff --git a/src/ines.c b/src/ines.c
index 1b410a2..e75a052 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -477,7 +477,7 @@ INES_BOARD_BEGIN()
 /*    INES_BOARD( "",                         55, Mapper55_Init ) */
 	INES_BOARD( "UNLKS202",                  56, UNLKS202_Init          )
 	INES_BOARD( "SIMBPLE BMC PIRATE A",      57, Mapper57_Init          )
-	INES_BOARD( "SIMBPLE BMC PIRATE B",      58, BMCGK192_Init          )
+	INES_BOARD( "SIMBPLE BMC PIRATE B",      58, Mapper58_Init          )
 	INES_BOARD( "BMC T3H53/D1038",           59, BMCD1038_Init          )
 	INES_BOARD( "Reset-based NROM-128 ",     60, Mapper60_Init          )
 	INES_BOARD( "20-in-1 KAISER Rev. A",     61, Mapper61_Init          )
@@ -633,14 +633,14 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "",                         210, Mapper210_Init         )
 	INES_BOARD( "HUMMER/JY BOARD",          211, Mapper211_Init         )
 	INES_BOARD( "",                         212, Mapper212_Init         )
-	INES_BOARD( "",                         213, Mapper213_Init         )
+	INES_BOARD( "",                         213, Mapper58_Init          ) /* in mapper 58 */
 	INES_BOARD( "",                         214, Mapper214_Init         )
 	INES_BOARD( "UNL-8237",                 215, UNL8237_Init           )
 	INES_BOARD( "",                         216, Mapper216_Init         )
 	INES_BOARD( "",                         217, Mapper217_Init         ) /* Redefined to a new Discrete BMC mapper */
 	INES_BOARD( "Magic Floor",              218, Mapper218_Init         )
 	INES_BOARD( "UNLA9746",                 219, UNLA9746_Init          )
-	INES_BOARD( "Debug Mapper",             220, UNLKS7057_Init         )
+/*	INES_BOARD( "Debug Mapper",             220, Mapper220_Init         ) */
 	INES_BOARD( "UNLN625092",               221, UNLN625092_Init        )
 	INES_BOARD( "",                         222, Mapper222_Init         )
 /*    INES_BOARD( "",                            223, Mapper223_Init ) */
@@ -656,13 +656,13 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "BMC 22+20-in-1 RST",       233, Mapper233_Init         )
 	INES_BOARD( "BMC MAXI",                 234, Mapper234_Init         )
 	INES_BOARD( "Golden Game",              235, Mapper235_Init         )
-	INES_BOARD( "Realtec 8155",             236, Mapper236_Init         )
+	INES_BOARD( "Realtec 8031/8155/8099/8106", 236, Mapper236_Init         )
 	INES_BOARD( "Teletubbies / Y2K",        237, Mapper237_Init         )
 	INES_BOARD( "UNL6035052",               238, UNL6035052_Init        )
 /*    INES_BOARD( "",                            239, Mapper239_Init ) */
 	INES_BOARD( "",                         240, Mapper240_Init         )
 	INES_BOARD( "",                         241, Mapper241_Init         )
-	INES_BOARD( "",                         242, Mapper242_Init         )
+	INES_BOARD( "43272",                    242, Mapper242_Init         )
 	INES_BOARD( "SA-020A",                  243, S74LS374N_Init         )
 	INES_BOARD( "DECATHLON",                244, Mapper244_Init         )
 	INES_BOARD( "",                         245, Mapper245_Init         )
@@ -734,8 +734,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "CITYFIGHT",                266, UNLCITYFIGHT_Init      )
 	INES_BOARD( "COOLBOY/MINDKIDS",         268, Mapper268_Init         ) /* Submapper distinguishes between COOLBOY and MINDKIDS */
 	INES_BOARD( "80013-B",                  274, BMC80013B_Init         )
-	INES_BOARD( "GS-2004",                  283, BMCGS2004_Init         )
-/*    INES_BOARD( "GS-2013",                    283, BMCGS2013_Init ) */
+	INES_BOARD( "GS-2004/GS-2013",          283, Mapper283_Init         )
 	INES_BOARD( "A65AS",                    285, BMCA65AS_Init          )
 	INES_BOARD( "BS-5",                     286, BMCBS5_Init            )
 	INES_BOARD( "411120-C",                 287, BMC411120C_Init        )
diff --git a/src/ines.h b/src/ines.h
index d0f2b0a..0e95552 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -94,6 +94,7 @@ void Mapper50_Init(CartInfo *);
 void Mapper51_Init(CartInfo *);
 void Mapper52_Init(CartInfo *);
 void Mapper57_Init(CartInfo *);
+void Mapper58_Init(CartInfo *);
 void Mapper59_Init(CartInfo *);
 void Mapper60_Init(CartInfo *);
 void Mapper61_Init(CartInfo *);
@@ -248,6 +249,7 @@ void Mapper255_Init(CartInfo *);
 void GN45_Init(CartInfo *info); /* m361, m366 */
 void Mapper281_Init(CartInfo *);
 void Mapper282_Init(CartInfo *);
+void Mapper283_Init(CartInfo *);
 void Mapper295_Init(CartInfo *);
 
 void Bs5652_Init(CartInfo *);
diff --git a/src/unif.c b/src/unif.c
index 89b7890..c6dc25c 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -427,11 +427,11 @@ static BMAPPING bmap[] = {
 	{ "3D-BLOCK",                   355, UNL3DBlock_Init,       0 },
 	{ "411120-C",                   287, BMC411120C_Init,       0 },
 	{ "42in1ResetSwitch",           233, Mapper233_Init,        0 },
-	{ "43272",                      227, UNL43272_Init,         0 },
+	{ "43272",                      242, Mapper242_Init,        0 },
 	{ "603-5052",                   238, UNL6035052_Init,       0 },
 	{ "64in1NoRepeat",              314, BMC64in1nr_Init,       0 },
-	{ "70in1",                      236, BMC70in1_Init,         0 },
-	{ "70in1B",                     236, BMC70in1B_Init,        0 },
+	{ "70in1",                      236, Mapper236_Init,         0 },
+	{ "70in1B",                     236, Mapper236_Init,        0 },
 	{ "810544-C-A1",                261, BMC810544CA1_Init,     0 },
 	{ "8157",                       301, UNL8157_Init,          0 },
 	{ "8237",                       215, UNL8237_Init,          0 },
@@ -439,6 +439,8 @@ static BMAPPING bmap[] = {
 	{ "830118C",                    348, BMC830118C_Init,       0 },
 	{ "A65AS",                      285, BMCA65AS_Init,         0 },
 	{ "AB-G1L",                     428, Mapper428_Init,        0 },
+	{ "WELL-NO-DG450",              428, Mapper428_Init,        0 },
+	{ "TF2740",                     428, Mapper428_Init,        0 },
 	{ "AC08",                        42, AC08_Init,             0 },
 	{ "ANROM",                        7, ANROM_Init,            0 },
 	{ "AX5705",                     530, UNLAX5705_Init,        0 },
@@ -464,14 +466,15 @@ static BMAPPING bmap[] = {
 	{ "FK23CA",                     176, BMCFK23CA_Init,        BMCFLAG_256KCHRR },
 	{ "FS304",                      162, Mapper162_Init,        0 },
 	{ "G-146",                      349, BMCG146_Init,          0 },
-	{ "GK-192",                 NO_INES, BMCGK192_Init,         0 }, /* mapper 58? */
-	{ "GS-2004",                    283, BMCGS2004_Init,        0 },
-	{ "GS-2013",                    283, BMCGS2013_Init,        0 },
+	{ "GK-192",                      58, Mapper58_Init,         0 },
+	{ "GS-2004",                    283, Mapper283_Init,        0 },
+	{ "GS-2013",                    283, Mapper283_Init,        0 },
 	{ "Ghostbusters63in1",          226, Mapper226_Init,        0 },
+	{ "G631",                       226, Mapper226_Init,        0 }, /* duplicate, probably wrong name */
 	{ "H2288",                      123, UNLH2288_Init,         0 },
 	{ "HKROM",                        4, HKROM_Init,            0 },
 	{ "KOF97",                      263, UNLKOF97_Init,         0 },
-	{ "KONAMI-QTAI",            NO_INES, Mapper190_Init,        0 },
+/*	{ "KONAMI-QTAI",            NO_INES, Mapper190_Init,        0 }, */
 	{ "KS7012",                     346, UNLKS7012_Init,        0 },
 	{ "KS7013B",                    312, UNLKS7013B_Init,       0 },
 	{ "KS7016",                     306, UNLKS7016_Init,        0 },
@@ -559,10 +562,9 @@ static BMAPPING bmap[] = {
 	{ "UNROM-512-32",                30, UNROM512_Init,         BMCFLAG_32KCHRR },
 	{ "UOROM",                        2, UNROM_Init,            0 },
 	{ "VRC7",                        85, UNLVRC7_Init,          0 },
-	{ "WELL-NO-DG450",              428, Mapper428_Init,        0 },
-	{ "TF2740",                     428, Mapper428_Init,        0 },	
 	{ "YOKO",                       264, UNLYOKO_Init,          0 },
 	{ "COOLBOY",                    268, COOLBOY_Init,          BMCFLAG_256KCHRR },
+	{ "MINDKIDS",                   268, MINDKIDS_Init,         BMCFLAG_256KCHRR },
 	{ "158B",                       258, UNL158B_Init,          0 },
 	{ "DRAGONFIGHTER",              292, UNLBMW8544_Init,       0 },
 	{ "EH8813A",                    519, UNLEH8813A_Init,       0 },
@@ -593,14 +595,12 @@ static BMAPPING bmap[] = {
 	{ "SA005-A",                    338, BMCSA005A_Init,        0 },
 	{ "K-3006",                     339, BMCK3006_Init,         0 },
 	{ "K-3036",                     340, BMCK3036_Init,         0 },
-	{ "MINDKIDS",                   268, MINDKIDS_Init,         BMCFLAG_256KCHRR },
 	{ "KS7021A",                    525, UNLKS7021A_Init,       0 },
 	{ "KS106C",                 NO_INES, BMCKS106C_Init,        0 }, /* split roms */
 	{ "900218",                     524, BTL900218_Init,        0 },
 	{ "JC-016-2",                   205, Mapper205_Init,        0 },
 	{ "AX-40G",                     527, UNLAX40G_Init,         0 },
 	{ "STREETFIGTER-GAME4IN1",  NO_INES, BMCSFGAME4IN1_Init,    0 }, /* mapper 49? submapper 1*/
-	{ "G631",                       226, Mapper226_Init,        0 }, /* duplicate, probably wrong name */
 	{ "BJ-56",                      526, UNLBJ56_Init,          0 },
 	{ "L6IN1",                      345, BMCL6IN1_Init,         0 },
 	{ "CTC-12IN1",                  337, BMCCTC12IN1_Init,      0 },
diff --git a/src/unif.h b/src/unif.h
index 15dcf5b..a0826ff 100644
--- a/src/unif.h
+++ b/src/unif.h
@@ -28,8 +28,6 @@ void BMC12IN1_Init(CartInfo *info);
 void BMC190in1_Init(CartInfo *info);
 void BMC411120C_Init(CartInfo *info);
 void BMC64in1nr_Init(CartInfo *info);
-void BMC70in1B_Init(CartInfo *info);
-void BMC70in1_Init(CartInfo *info);
 void BMC810544CA1_Init(CartInfo *info);
 void BMC830118C_Init(CartInfo *info);
 void BMCA65AS_Init(CartInfo *info);
@@ -38,9 +36,6 @@ void BMCD1038_Init(CartInfo *info);
 void BMCFK23CA_Init(CartInfo *info);
 void BMCFK23C_Init(CartInfo *info);
 void BMCG146_Init(CartInfo *info);
-void BMCGK192_Init(CartInfo *info);
-void BMCGS2004_Init(CartInfo *info);
-void BMCGS2013_Init(CartInfo *info);
 void BMCGhostbusters63in1_Init(CartInfo *info);
 void BMCNTD03_Init(CartInfo *info);
 void BMCT2271_Init(CartInfo *info);

From bc8767ef2616510e4b296ba7d84fa25bb1c41a84 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sun, 6 Feb 2022 18:05:36 +0800
Subject: [PATCH 177/295] Add mapper 396

---
 src/boards/396.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  1 +
 src/ines.h       |  1 +
 src/unif.c       |  1 +
 4 files changed, 76 insertions(+)
 create mode 100644 src/boards/396.c

diff --git a/src/boards/396.c b/src/boards/396.c
new file mode 100644
index 0000000..5b58694
--- /dev/null
+++ b/src/boards/396.c
@@ -0,0 +1,73 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * NES 2.0 Mapper 396 - BMC-830752C
+ * 1995 Super 8-in-1 (JY-050 rev0)
+ * Super 8-in-1 Gold Card Series (JY-085)
+ * Super 8-in-1 Gold Card Series (JY-086)
+ * 2-in-1 (GN-51)
+ */
+
+#include "mapinc.h"
+
+static uint8 reg[2];
+
+static void Sync (void) {
+	setprg16(0x8000, reg[1] << 3 | reg[0] & 7);
+	setprg16(0xC000, reg[1] << 3 | 7);
+	setchr8(0);
+	setmirror(((reg[0] >> 6) & 1) ^ 1);
+}
+
+static DECLFW(M396WriteInnerBank) {
+	reg[0] = V;
+	Sync();
+}
+
+static DECLFW(M396WriteOuterBank) {
+	reg[1] = V;
+	Sync();
+}
+
+static void M396Reset(void) {
+	reg[0] = 0x00;
+	reg[1] = 0x00;
+	Sync();
+}
+
+static void StateRestore(void) {
+	Sync();
+}
+
+static void M396Power(void) {
+	reg[0] = 0x00;
+	reg[1] = 0x00;
+	Sync();
+	SetReadHandler(0x8000, 0xFFFF, CartBR);
+	SetWriteHandler(0x8000, 0x9FFF, M396WriteInnerBank);
+	SetWriteHandler(0xA000, 0xBFFF, M396WriteOuterBank);
+	SetWriteHandler(0xC000, 0xFFFF, M396WriteInnerBank);
+}
+
+void Mapper396_Init(CartInfo *info) {
+	info->Power = M396Power;
+	info->Reset = M396Reset;
+	GameStateRestore = StateRestore;
+	AddExState(reg, 2, 0, "REGS");
+}
diff --git a/src/ines.c b/src/ines.c
index e75a052..4d89bab 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -792,6 +792,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "YY850735C",                387, Mapper387_Init         )
 	INES_BOARD( "YY850835C",                388, Mapper388_Init         )
 	INES_BOARD( "BS-110",                   391, Mapper391_Init         )
+    INES_BOARD( "YY850437C",                396, Mapper396_Init         )
 	INES_BOARD( "YY850439C",                397, Mapper397_Init         )
 	INES_BOARD( "831019C J-2282",           402, J2282_Init             )
 	INES_BOARD( "SC871115C",                421, Mapper421_Init         )
diff --git a/src/ines.h b/src/ines.h
index 0e95552..5874029 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -284,6 +284,7 @@ void Mapper389_Init(CartInfo *);
 void Mapper390_Init(CartInfo *);
 void Mapper391_Init(CartInfo *);
 void Mapper395_Init(CartInfo *);
+void Mapper396_Init(CartInfo *);
 void Mapper397_Init(CartInfo *);
 void Mapper401_Init(CartInfo *);
 void Mapper403_Init(CartInfo *);
diff --git a/src/unif.c b/src/unif.c
index c6dc25c..5ce0560 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -616,6 +616,7 @@ static BMAPPING bmap[] = {
 	{ "SB-5013",                    359, Mapper359_Init,        0 },
 	{ "82112C",                     540, Mapper540_Init,        0 },
 	{ "N49C-300",                   369, Mapper369_Init,        0 },
+	{ "830752C",                    396, Mapper396_Init,        0 },
 
 	{ "BS-400R",                    422, Mapper422_Init,        0 },
 	{ "BS-4040R",                   422, Mapper422_Init,        0 },

From 75774dddc045fa627832a9fdda79a763301de47c Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sun, 6 Feb 2022 19:22:43 +0800
Subject: [PATCH 178/295] Add mapper 377

---
 src/boards/267.c | 14 ++++++-----
 src/boards/377.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  1 +
 src/ines.h       |  1 +
 4 files changed, 74 insertions(+), 6 deletions(-)
 create mode 100644 src/boards/377.c

diff --git a/src/boards/267.c b/src/boards/267.c
index 1b53e89..2780fd0 100644
--- a/src/boards/267.c
+++ b/src/boards/267.c
@@ -34,9 +34,11 @@ static void M267PW(uint32 A, uint8 V) {
 }
 
 static DECLFW(M267Write) {
-	EXPREGS[0] = V;
-	FixMMC3PRG(MMC3_cmd);
-	FixMMC3CHR(MMC3_cmd);
+	if (!(EXPREGS[0] & 0x80)) {
+		EXPREGS[0] = V;
+		FixMMC3PRG(MMC3_cmd);
+		FixMMC3CHR(MMC3_cmd);
+	}
 }
 
 static void M267Reset(void) {
@@ -47,14 +49,14 @@ static void M267Reset(void) {
 static void M267Power(void) {
 	EXPREGS[0] = 0;
 	GenMMC3Power();
-	SetWriteHandler(0x6000, 0x6FFF, M267Write);
+	SetWriteHandler(0x6000, 0x7FFF, M267Write);
 }
 
 void Mapper267_Init(CartInfo *info) {
-	GenMMC3_Init(info, 128, 128, 0, 0);
+	GenMMC3_Init(info, 256, 128, 0, 0);
 	cwrap = M267CW;
 	pwrap = M267PW;
 	info->Reset = M267Reset;
 	info->Power = M267Power;
-	AddExState(EXPREGS, 4, 0, "EXPR");
+	AddExState(EXPREGS, 1, 0, "EXPR");
 }
diff --git a/src/boards/377.c b/src/boards/377.c
new file mode 100644
index 0000000..bece1b2
--- /dev/null
+++ b/src/boards/377.c
@@ -0,0 +1,64 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ * Copyright (C) 2022 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+/* NES 2.0 Mapper 377 - NES 2.0 Mapper 377 is used for the
+ * 1998 Super Game 8-in-1 (JY-111) pirate multicart. It works similarly to Mapper 267 except it has an outer 256KiB PRG-ROM bank.
+ */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+#define OUTER_BANK (((EXPREGS[0] & 0x20) >> 2) | (EXPREGS[0] & 0x06))
+
+static void M377CW(uint32 A, uint8 V) {
+	setchr1(A, (V & 0x7F) | (OUTER_BANK << 6));
+}
+
+static void M377PW(uint32 A, uint8 V) {
+	setprg8(A, (V & 0x0F) | (OUTER_BANK << 3));
+}
+
+static DECLFW(M377Write) {
+    if (!(EXPREGS[0] & 0x80)) {
+		EXPREGS[0] = V;
+		FixMMC3PRG(MMC3_cmd);
+		FixMMC3CHR(MMC3_cmd);
+	}
+}
+
+static void M377Reset(void) {
+	EXPREGS[0] = 0;
+	MMC3RegReset();
+}
+
+static void M377Power(void) {
+	EXPREGS[0] = 0;
+	GenMMC3Power();
+	SetWriteHandler(0x6000, 0x7FFF, M377Write);
+}
+
+void Mapper377_Init(CartInfo *info) {
+	GenMMC3_Init(info, 128, 128, 0, 0);
+	cwrap = M377CW;
+	pwrap = M377PW;
+	info->Reset = M377Reset;
+	info->Power = M377Power;
+	AddExState(EXPREGS, 1, 0, "EXPR");
+}
diff --git a/src/ines.c b/src/ines.c
index 4d89bab..76d090f 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -788,6 +788,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "3D-BLOCK",                 355, UNL3DBlock_Init        )
 	INES_BOARD( "YY860606C",                358, Mapper358_Init         )
 	INES_BOARD( "N49C-300",                 369, Mapper369_Init         )
+	INES_BOARD( "JY-111/JY-112",            377, Mapper377_Init         )
 	INES_BOARD( "YY860729C",                386, Mapper386_Init         )
 	INES_BOARD( "YY850735C",                387, Mapper387_Init         )
 	INES_BOARD( "YY850835C",                388, Mapper388_Init         )
diff --git a/src/ines.h b/src/ines.h
index 5874029..57c87e9 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -273,6 +273,7 @@ void Mapper370_Init(CartInfo *);
 void Mapper372_Init(CartInfo *);
 void Mapper374_Init(CartInfo *);
 void Mapper376_Init(CartInfo *);
+void Mapper377_Init(CartInfo *);
 void Mapper380_Init(CartInfo *);
 void Mapper381_Init(CartInfo *);
 void Mapper382_Init(CartInfo *);

From 257391794607a28fd51c3217d55ef278599c39a8 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sun, 6 Feb 2022 20:17:55 +0800
Subject: [PATCH 179/295] Add mapper 368

---
 src/boards/357.c |   7 +--
 src/boards/368.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |   1 +
 src/ines.h       |   1 +
 4 files changed, 119 insertions(+), 3 deletions(-)
 create mode 100644 src/boards/368.c

diff --git a/src/boards/357.c b/src/boards/357.c
index 2c28e9e..a46bdea 100644
--- a/src/boards/357.c
+++ b/src/boards/357.c
@@ -29,15 +29,16 @@
 
 static uint8 preg[4];
 static uint8 dipswitch;
-static uint32 IRQCount, IRQa;
+static uint8 IRQa;
+static uint16 IRQCount;
 
 static const uint8 banks[8] = { 4, 3, 5, 3, 6, 3, 7, 3 };
 static const uint8 outer_bank[4] = { 0x00, 0x08, 0x10, 0x18 };
 
 static SFORMAT StateRegs[] =
 {
-	{ &IRQCount, 4 | FCEUSTATE_RLSB, "IRQC" },
-	{ &IRQa, 4 | FCEUSTATE_RLSB, "IRQA" },
+	{ &IRQCount, 2 | FCEUSTATE_RLSB, "IRQC" },
+	{ &IRQa, 1 | FCEUSTATE_RLSB, "IRQA" },
 	{ &dipswitch, 1, "DPSW" },
 	{ &preg, 4, "REG" },
 	{ 0 }
diff --git a/src/boards/368.c b/src/boards/368.c
new file mode 100644
index 0000000..459efbf
--- /dev/null
+++ b/src/boards/368.c
@@ -0,0 +1,113 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+/* NES 2.0 Mapper 357 is used for a 4-in-1 multicart (cartridge ID 4602) from Bit Corp.
+ * The first game is Bit Corp's hack of the YUNG-08 conversion of Super Mario Brothers 2 (J) named Mr. Mary 2,
+ * the other three games are UNROM games.
+ *
+ * Implementation is modified so reset actually sets the correct dipswitch (or outer banks) for each of the 4 games
+ */
+
+#include "mapinc.h"
+
+static uint8 preg;
+static uint8 latch;
+static uint8 IRQa;
+static uint16 IRQCount;
+
+static const uint8 banks[8] = { 4, 3, 5, 3, 6, 3, 7, 3 };
+
+static SFORMAT StateRegs[] =
+{
+	{ &IRQCount, 2 | FCEUSTATE_RLSB, "IRQC" },
+	{ &IRQa, 1, "IRQA" },
+	{ &latch, 1, "LATC" },
+	{ &preg, 1, "REG" },
+	{ 0 }
+};
+
+static void Sync(void) {
+	setprg8(0x6000, 2);
+	setprg8(0x8000, 1);
+	setprg8(0xa000, 0);
+	setprg8(0xc000, banks[preg]);
+	setprg8(0xe000, 8);
+	setchr8(0);
+}
+
+static DECLFW(M368WritePRG) {
+    preg = V & 7;
+    Sync();
+}
+
+static DECLFW(M368WriteIRQ) {
+	latch = V & 0x53;
+    IRQa = V & 1;
+	if (!IRQa) {
+		IRQCount = 0;
+		X6502_IRQEnd(FCEU_IQEXT);
+	}
+}
+
+static DECLFR(M368Read) {
+    return (latch | 0xBA);
+}
+
+static void M368Power(void) {
+	preg = 0;
+	latch = 0;
+	IRQa = IRQCount = 0;
+	Sync();
+    SetReadHandler(0x4122, 0x4122, M368Read);
+	SetReadHandler(0x6000, 0x7FFF, CartBR);
+    SetReadHandler(0x8000, 0xFFFF, CartBR);
+	SetWriteHandler(0x4022, 0x4022, M368WritePRG);
+	SetWriteHandler(0x4120, 0x4120, M368WritePRG);
+	SetWriteHandler(0x4122, 0x4122, M368WriteIRQ);
+	//SetWriteHandler(0x8000, 0xffff, M368WriteUNROM);
+}
+
+static void M368Reset(void) {
+	IRQa = IRQCount = 0;
+	Sync();
+}
+
+static void FP_FASTAPASS(1) M368IRQHook(int a) {
+	if (IRQa) {
+		if (IRQCount < 4096)
+			IRQCount += a;
+		else {
+			IRQa = 0;
+			X6502_IRQBegin(FCEU_IQEXT);
+		}
+	}
+}
+
+static void StateRestore(int version) {
+	Sync();
+}
+
+void Mapper368_Init(CartInfo *info) {
+	info->Reset = M368Reset;
+	info->Power = M368Power;
+	MapIRQHook = M368IRQHook;
+	GameStateRestore = StateRestore;
+	AddExState(&StateRegs, ~0, 0, 0);
+}
diff --git a/src/ines.c b/src/ines.c
index 76d090f..cd95bdd 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -693,6 +693,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "Bitcorp 31-in-1",          360, Mapper360_Init         )
 	INES_BOARD( "OK-411",                   361, GN45_Init              ) /* OK-411 is emulated together with GN-45 */
 	INES_BOARD( "GN-45",                    366, GN45_Init              )
+	INES_BOARD( "Yung-08",                  368, Mapper368_Init              )
 	INES_BOARD( "Golden Mario Party II - Around the World 6-in-1",       370, Mapper370_Init         )
 	INES_BOARD( "MMC3 PIRATE SFC-12",       372, Mapper372_Init         )
 	INES_BOARD( "95/96 Super HiK 4-in-1",   374, Mapper374_Init         )
diff --git a/src/ines.h b/src/ines.h
index 57c87e9..fcb7ce5 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -268,6 +268,7 @@ void Mapper357_Init(CartInfo *);
 void Mapper358_Init(CartInfo *);
 void Mapper359_Init(CartInfo *);
 void Mapper360_Init(CartInfo *);
+void Mapper368_Init(CartInfo *);
 void Mapper369_Init(CartInfo *);
 void Mapper370_Init(CartInfo *);
 void Mapper372_Init(CartInfo *);

From b7a1c3bbb385c92b96230f0d2f0ed60ef5646d3e Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sun, 6 Feb 2022 21:10:29 +0800
Subject: [PATCH 180/295] Add mapper 410

---
 src/boards/410.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  1 +
 src/ines.h       |  1 +
 3 files changed, 91 insertions(+)
 create mode 100644 src/boards/410.c

diff --git a/src/boards/410.c b/src/boards/410.c
new file mode 100644
index 0000000..2c0bfa3
--- /dev/null
+++ b/src/boards/410.c
@@ -0,0 +1,89 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* NES 2.0 Mapper 410 is a variant of mapper 45 where the
+ * ASIC's PRG A21/CHR A20 output (set by bit 6 of the third write to $6000)
+ * selects between regularly-banked CHR-ROM (=0) and 8 KiB of unbanked CHR-RAM (=1).
+ * It is used solely for the Super 8-in-1 - 98格鬥天王＋熱血 (JY-302) multicart.
+ */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static uint8 *CHRRAM;
+
+static void M410CW(uint32 A, uint8 V) {
+	if (!(EXPREGS[2] & 0x40)) {
+		uint32 NV = V;
+		NV &= (1 << ((EXPREGS[2] & 7) + 1)) - 1;
+		NV |= EXPREGS[0] | ((EXPREGS[2] & 0xF0) << 4);
+		setchr1(A, NV);
+	} else
+		setchr8r(0x10, 0);
+}
+
+static void M410PW(uint32 A, uint8 V) {
+	uint32 MV = V & ((EXPREGS[3] & 0x3F) ^ 0x3F);
+	MV |= EXPREGS[1];
+	MV |= ((EXPREGS[2] & 0x40) << 2);
+	setprg8(A, MV);
+/*	FCEU_printf("1:%02x 2:%02x 3:%02x A=%04x V=%03x\n",EXPREGS[1],EXPREGS[2],EXPREGS[3],A,MV); */
+}
+
+static DECLFW(M410Write) {
+	EXPREGS[EXPREGS[4]] = V;
+	EXPREGS[4] = (EXPREGS[4] + 1) & 3;
+	FixMMC3PRG(MMC3_cmd);
+	FixMMC3CHR(MMC3_cmd);
+}
+
+static void M410Close(void) {
+	GenMMC3Close();
+	if (CHRRAM)
+		FCEU_free(CHRRAM);
+	CHRRAM = NULL;
+}
+
+static void M410Reset(void) {
+	EXPREGS[0] = EXPREGS[1] = EXPREGS[3] = EXPREGS[4] = 0;
+	EXPREGS[2] = 0x0F;
+	MMC3RegReset();
+}
+
+static void M410Power(void) {
+	GenMMC3Power();
+	EXPREGS[0] = EXPREGS[1] = EXPREGS[3] = EXPREGS[4] = 0;
+	EXPREGS[2] = 0x0F;
+	SetWriteHandler(0x6000, 0x7FFF, M410Write);
+}
+
+void Mapper410_Init(CartInfo *info) {
+	GenMMC3_Init(info, 512, 256, 8, info->battery);
+	cwrap = M410CW;
+	pwrap = M410PW;
+	info->Reset = M410Reset;
+	info->Power = M410Power;
+	info->Close = M410Close;
+	AddExState(EXPREGS, 5, 0, "EXPR");
+
+	CHRRAM = (uint8*)FCEU_gmalloc(8192);
+	SetupCartCHRMapping(0x10, CHRRAM, 8192, 1);
+	AddExState(CHRRAM, 8192, 0, "CRAM");
+}
\ No newline at end of file
diff --git a/src/ines.c b/src/ines.c
index cd95bdd..29b43aa 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -797,6 +797,7 @@ INES_BOARD_BEGIN()
     INES_BOARD( "YY850437C",                396, Mapper396_Init         )
 	INES_BOARD( "YY850439C",                397, Mapper397_Init         )
 	INES_BOARD( "831019C J-2282",           402, J2282_Init             )
+	INES_BOARD( "JY-302",                   410, Mapper410_Init             )
 	INES_BOARD( "SC871115C",                421, Mapper421_Init         )
 	INES_BOARD( "AB-G1L/WELL-NO-DG450",     428, Mapper428_Init         )
 	INES_BOARD( "LIKO BBG-235-8-1B",        429, Mapper429_Init         )
diff --git a/src/ines.h b/src/ines.h
index fcb7ce5..a211b85 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -290,6 +290,7 @@ void Mapper396_Init(CartInfo *);
 void Mapper397_Init(CartInfo *);
 void Mapper401_Init(CartInfo *);
 void Mapper403_Init(CartInfo *);
+void Mapper410_Init(CartInfo *);
 void Mapper411_Init(CartInfo *);
 void Mapper421_Init(CartInfo *);
 void Mapper422_Init(CartInfo *);

From 6e9c54f79564d89a3747b9fc75209365c60a478f Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sun, 6 Feb 2022 21:35:17 +0800
Subject: [PATCH 181/295] Add mapper 404

---
 src/boards/mmc1.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c        |  1 +
 src/ines.h        |  1 +
 3 files changed, 46 insertions(+)

diff --git a/src/boards/mmc1.c b/src/boards/mmc1.c
index e30ba53..126364a 100644
--- a/src/boards/mmc1.c
+++ b/src/boards/mmc1.c
@@ -681,3 +681,47 @@ void Mapper550_Init(CartInfo *info) {
 	AddExState(&latch, 1, 0, "LATC");
 	AddExState(&outerBank, 1, 0, "BANK");
 }
+
+/* ---------------------------- Mapper 404 -------------------------------- */
+
+/* NES 2.0 Mapper 404 - JY012005
+ * 1998 Super HiK 8-in-1 (JY-021B)*/
+
+static uint8_t outerBank;
+
+static void M404PRG16(uint32 A, uint8 V) {
+	uint8 mask = outerBank & 0x40 ? 0x07 : 0x0F;
+	setprg16(A, (V & mask) | (outerBank << 3) & ~mask);
+}
+
+static void M404CHR4(uint32 A, uint8 V) {
+	setchr4(A, (V & 0x1F) | outerBank << 5);
+}
+
+static DECLFW(M404Write) {
+	if (!(outerBank & 0x80)) {
+		outerBank = V;
+		MMC1PRG();
+		MMC1CHR();
+	}
+}
+
+static void M404Reset(void) {
+	outerBank = 0;
+	MMC1CMReset();
+}
+
+static void M404Power(void) {
+	outerBank = 0;
+	GenMMC1Power();
+	SetWriteHandler(0x6000, 0x7FFF, M404Write);
+}
+
+void Mapper404_Init(CartInfo *info) {
+	GenMMC1Init(info, 256, 256, 0, 0);
+	info->Power = M404Power;
+	info->Reset = M404Reset;
+	MMC1CHRHook4 = M404CHR4;
+	MMC1PRGHook16 = M404PRG16;
+	AddExState(&outerBank, 1, 0, "BANK");
+}
\ No newline at end of file
diff --git a/src/ines.c b/src/ines.c
index 29b43aa..48e5d35 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -797,6 +797,7 @@ INES_BOARD_BEGIN()
     INES_BOARD( "YY850437C",                396, Mapper396_Init         )
 	INES_BOARD( "YY850439C",                397, Mapper397_Init         )
 	INES_BOARD( "831019C J-2282",           402, J2282_Init             )
+	INES_BOARD( "JY012005",                 404, Mapper404_Init             )
 	INES_BOARD( "JY-302",                   410, Mapper410_Init             )
 	INES_BOARD( "SC871115C",                421, Mapper421_Init         )
 	INES_BOARD( "AB-G1L/WELL-NO-DG450",     428, Mapper428_Init         )
diff --git a/src/ines.h b/src/ines.h
index a211b85..944c68c 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -290,6 +290,7 @@ void Mapper396_Init(CartInfo *);
 void Mapper397_Init(CartInfo *);
 void Mapper401_Init(CartInfo *);
 void Mapper403_Init(CartInfo *);
+void Mapper404_Init(CartInfo *);
 void Mapper410_Init(CartInfo *);
 void Mapper411_Init(CartInfo *);
 void Mapper421_Init(CartInfo *);

From 74fa4456594d2d73cf22824f20a910685e075cd2 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 7 Feb 2022 12:45:48 +0800
Subject: [PATCH 182/295] Add mapper 416

---
 src/boards/416.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |   1 +
 src/ines.h       |   1 +
 3 files changed, 113 insertions(+)
 create mode 100644 src/boards/416.c

diff --git a/src/boards/416.c b/src/boards/416.c
new file mode 100644
index 0000000..9489b30
--- /dev/null
+++ b/src/boards/416.c
@@ -0,0 +1,111 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+
+
+#include "mapinc.h"
+
+static uint8 reg;
+static uint8 smb2j_reg;
+static uint8 IRQa;
+static uint16 IRQCount;
+
+static void Sync(void) {
+	if (reg & 8) {
+		uint8 prg = ((reg >> 5) & 1) | ((reg >> 6) & 2) | ((reg >> 1) & 4);
+		switch ((reg >> 6) & 3) {
+		case 0:
+			setprg8(0x8000, prg << 1);
+			setprg8(0xA000, prg << 1);
+			setprg8(0xC000, prg << 1);
+			setprg8(0xE000, prg << 1);
+			break;
+		case 1:
+			setprg16(0x8000, prg);
+			setprg16(0xC000, prg);
+			break;
+		case 2:
+		case 3:
+			setprg32(0x8000, prg >> 1);
+			break;
+		}
+	} else {
+		setprg8(0x8000, 0x0);
+		setprg8(0xA000, 0x1);
+		setprg8(0xC000, smb2j_reg);
+		setprg8(0xE000, 0x3);
+	}
+	setprg8(0x6000, 0x7);
+	setchr8((reg >> 1) & 3);
+	setmirror(((reg >> 2) & 1) ^ 1);
+}
+
+static DECLFW(M416Write4) {
+	switch (A & 0xD160) {
+	case 0x4120:
+		IRQa = V & 1;
+		if (!IRQa)
+			IRQCount = 0;
+		X6502_IRQEnd(FCEU_IQEXT);
+		break;
+	case 0x4020:
+		smb2j_reg = ((V & 1) << 2) | ((V & 6) >> 1);
+		Sync();
+		break;
+	}
+}
+
+static DECLFW(M416Write8) {
+	reg = V;
+	Sync();
+}
+
+static void M416Power(void) {
+	reg = smb2j_reg = IRQa = IRQCount = 0;
+	Sync();
+	SetReadHandler(0x6000, 0xFFFF, CartBR);
+	SetWriteHandler(0x4020, 0x5FFF, M416Write4);
+	SetWriteHandler(0x8000, 0x8000, M416Write8);
+}
+
+static void FP_FASTAPASS(1) M416IRQHook(int a) {
+	if (IRQa) {
+		if (IRQCount < 4096)
+			IRQCount += a;
+		else {
+			IRQa = 0;
+			X6502_IRQBegin(FCEU_IQEXT);
+		}
+	}
+}
+
+static void StateRestore(int version) {
+	Sync();
+}
+
+void Mapper416_Init(CartInfo *info) {
+	info->Power = M416Power;
+	MapIRQHook  = M416IRQHook;
+	GameStateRestore = StateRestore;
+	AddExState(&reg, 1, 0, "REGS");
+	AddExState(&smb2j_reg, 1, 0, "SMBJ");
+	AddExState(&IRQa, 1, 0, "IRQa");
+	AddExState(&IRQCount, 2, 0, "IRQC");
+}
diff --git a/src/ines.c b/src/ines.c
index 48e5d35..5a1c8ae 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -709,6 +709,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "BMC Super 19-in-1 (VIP19)",    401, Mapper401_Init         )
 	INES_BOARD( "89433",                    403, Mapper403_Init         )
 	INES_BOARD( "A88S-1",                   411, Mapper411_Init         )
+	INES_BOARD( "4-in-1/N-32",              416, Mapper416_Init         )
 	INES_BOARD( "BS-400R/BS-4040",          422, Mapper422_Init         )
 	INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init        )
 	INES_BOARD( "Sachen 3014",              533, Mapper533_Init         )
diff --git a/src/ines.h b/src/ines.h
index 944c68c..b17abd5 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -293,6 +293,7 @@ void Mapper403_Init(CartInfo *);
 void Mapper404_Init(CartInfo *);
 void Mapper410_Init(CartInfo *);
 void Mapper411_Init(CartInfo *);
+void Mapper416_Init(CartInfo *);
 void Mapper421_Init(CartInfo *);
 void Mapper422_Init(CartInfo *);
 void Mapper428_Init(CartInfo *);

From 34210282bc085354e0ff03c930d47d3df3c11980 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 7 Feb 2022 13:17:21 +0800
Subject: [PATCH 183/295] Add mapper 415

---
 src/boards/datalatch.c | 19 +++++++++++++++++++
 src/ines.c             |  1 +
 src/ines.h             |  1 +
 3 files changed, 21 insertions(+)

diff --git a/src/boards/datalatch.c b/src/boards/datalatch.c
index f547344..08e0c01 100644
--- a/src/boards/datalatch.c
+++ b/src/boards/datalatch.c
@@ -587,3 +587,22 @@ void Mapper429_Init(CartInfo *info) {
 	info->Reset = Mapper429_Reset;
 	Latch_Init(info, Mapper429_Sync, 0, 0x8000, 0xFFFF, 0, 0);
 }
+
+/*------------------ Mapper 415 ---------------------------*/
+
+static void Mapper415_Sync(void) {
+	setprg8(0x6000, latche & 0x0F);
+	setprg32(0x8000, ~0);
+	setchr8(0);
+	setmirror(((latche >> 4) & 1) ^ 1);
+}
+
+static void M415Power(void) {
+	LatchPower();
+	SetReadHandler(0x6000, 0x7FFF, CartBR);
+}
+
+void Mapper415_Init(CartInfo *info) {
+	Latch_Init(info, Mapper415_Sync, 0, 0x8000, 0xFFFF, 0, 0);
+	info->Power = M415Power;
+}
diff --git a/src/ines.c b/src/ines.c
index 5a1c8ae..a4465c5 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -709,6 +709,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "BMC Super 19-in-1 (VIP19)",    401, Mapper401_Init         )
 	INES_BOARD( "89433",                    403, Mapper403_Init         )
 	INES_BOARD( "A88S-1",                   411, Mapper411_Init         )
+	INES_BOARD( "0353",                     415, Mapper415_Init         )
 	INES_BOARD( "4-in-1/N-32",              416, Mapper416_Init         )
 	INES_BOARD( "BS-400R/BS-4040",          422, Mapper422_Init         )
 	INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init        )
diff --git a/src/ines.h b/src/ines.h
index b17abd5..daac2ee 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -293,6 +293,7 @@ void Mapper403_Init(CartInfo *);
 void Mapper404_Init(CartInfo *);
 void Mapper410_Init(CartInfo *);
 void Mapper411_Init(CartInfo *);
+void Mapper415_Init(CartInfo *);
 void Mapper416_Init(CartInfo *);
 void Mapper421_Init(CartInfo *);
 void Mapper422_Init(CartInfo *);

From 4dc7da8e26f3d01a5459162993fb222c31a2f03c Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 7 Feb 2022 14:54:31 +0800
Subject: [PATCH 184/295] Add mapper 432

---
 src/boards/432.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  1 +
 src/ines.h       |  1 +
 3 files changed, 66 insertions(+)
 create mode 100644 src/boards/432.c

diff --git a/src/boards/432.c b/src/boards/432.c
new file mode 100644
index 0000000..777936f
--- /dev/null
+++ b/src/boards/432.c
@@ -0,0 +1,64 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2020 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *
+ */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static void M432CW(uint32 A, uint8 V) {
+    if (EXPREGS[0] & 4)
+        setchr1(A, (V & 0x7F) | ((EXPREGS[0] << 7) & 0x80) | ((EXPREGS[0] << 5) & 0x100));
+    else
+        setchr1(A, V | ((EXPREGS[0] << 5) & 0x100));
+}
+
+static void M432PW(uint32 A, uint8 V) {
+    if (EXPREGS[0] & 4)
+        setprg8(A, (V & 0x0F) | ((EXPREGS[0] << 4) & 0x10) | ((EXPREGS[0] << 1) & 0x20));
+    else
+        setprg8(A, (V & 0x1F) | ((EXPREGS[0] << 1) & 0x20));
+}
+
+static DECLFW(M432Write) {
+    EXPREGS[0] = V;
+    FixMMC3PRG(MMC3_cmd);
+	FixMMC3CHR(MMC3_cmd);
+}
+
+static void M432Reset(void) {
+	EXPREGS[0] = 0;
+	MMC3RegReset();
+}
+
+static void M432Power(void) {
+	EXPREGS[0] = 0;
+	GenMMC3Power();
+	SetWriteHandler(0x6000, 0x7FFF, M432Write);
+}
+
+void Mapper432_Init(CartInfo *info) {
+	GenMMC3_Init(info, 256, 256, 0, 0);
+	cwrap = M432CW;
+	pwrap = M432PW;
+	info->Power = M432Power;
+	info->Reset = M432Reset;
+	AddExState(EXPREGS, 1, 0, "EXPR");
+}
diff --git a/src/ines.c b/src/ines.c
index a4465c5..a4195c8 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -712,6 +712,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "0353",                     415, Mapper415_Init         )
 	INES_BOARD( "4-in-1/N-32",              416, Mapper416_Init         )
 	INES_BOARD( "BS-400R/BS-4040",          422, Mapper422_Init         )
+	INES_BOARD( "Realtec 8090",             432, Mapper432_Init         )
 	INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init        )
 	INES_BOARD( "Sachen 3014",              533, Mapper533_Init         )
 	INES_BOARD( "NJ064",                    534, Mapper534_Init         )
diff --git a/src/ines.h b/src/ines.h
index daac2ee..abdfad7 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -299,6 +299,7 @@ void Mapper421_Init(CartInfo *);
 void Mapper422_Init(CartInfo *);
 void Mapper428_Init(CartInfo *);
 void Mapper429_Init(CartInfo *);
+void Mapper432_Init(CartInfo *);
 void Mapper434_Init(CartInfo *);
 void Mapper436_Init(CartInfo *);
 void Mapper437_Init(CartInfo *);

From e8f1cd53ebd1a1fd09299625f64394b86a70e8dd Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 7 Feb 2022 15:23:44 +0800
Subject: [PATCH 185/295] Add mapper 334

---
 src/boards/334.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  1 +
 src/ines.h       |  1 +
 3 files changed, 67 insertions(+)
 create mode 100644 src/boards/334.c

diff --git a/src/boards/334.c b/src/boards/334.c
new file mode 100644
index 0000000..8dcfed0
--- /dev/null
+++ b/src/boards/334.c
@@ -0,0 +1,65 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2020 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *
+ */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static uint8 dipswitch;
+
+static void M334PW(uint32 A, uint8 V) {
+    setprg32(0x8000, EXPREGS[0] >> 1);
+}
+
+static DECLFW(M334Write) {
+    if (!(A & 1)) {
+        EXPREGS[0] = V;
+        FixMMC3PRG(MMC3_cmd);
+    }
+}
+
+static DECLFR(M334Read) {
+    if (A & 2)
+        return ((X.DB & 0xFE) | (dipswitch & 1));
+    return X.DB;
+}
+
+static void M334Reset(void) {
+    dipswitch++;
+	EXPREGS[0] = 0;
+	MMC3RegReset();
+}
+
+static void M334Power(void) {
+    dipswitch = 0;
+	EXPREGS[0] = 0;
+	GenMMC3Power();
+    SetReadHandler(0x6000, 0x7FFF, M334Read);
+	SetWriteHandler(0x6000, 0x7FFF, M334Write);
+}
+
+void Mapper334_Init(CartInfo *info) {
+	GenMMC3_Init(info, 32, 32, 0, 0);
+	pwrap = M334PW;
+	info->Power = M334Power;
+	info->Reset = M334Reset;
+	AddExState(EXPREGS, 1, 0, "EXPR");
+}
diff --git a/src/ines.c b/src/ines.c
index a4195c8..52fe24a 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -686,6 +686,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "GKCX1",                    288, Mapper288_Init         )
 	INES_BOARD( "MMC3 BMC PIRATE",          294, Bs5652_Init ) /* nesdev redirects this as mapper 134 */
 	INES_BOARD( "TXC 01-22110-000",         297, Mapper297_Init         )
+	INES_BOARD( "5/20-in-1 1993 Copyright", 334, Mapper334_Init         )
 	INES_BOARD( "Super Mario Family",       353, Mapper353_Init         )
 	INES_BOARD( "7-in-1 Rockman (JY-208)",  356, Mapper356_Init         )
 	INES_BOARD( "Bit Corp 4-in-1",          357, Mapper357_Init         )
diff --git a/src/ines.h b/src/ines.h
index abdfad7..b506702 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -262,6 +262,7 @@ void Mapper288_Init(CartInfo *);
 void Mapper293_Init(CartInfo *);
 void Mapper297_Init(CartInfo *);
 void Mapper319_Init(CartInfo *);
+void Mapper334_Init(CartInfo *);
 void Mapper353_Init(CartInfo *);
 void Mapper356_Init(CartInfo *);
 void Mapper357_Init(CartInfo *);

From f49b0d51005f617aff7bf278e95b515103646499 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Tue, 8 Feb 2022 15:19:11 +0800
Subject: [PATCH 186/295] bandai.c: Backport
 (https://github.com/TASEmulators/fceux/commit/6145fe22ab8f6eebc71c5e84b14ed5d4ea87b302#diff-11a2612d6f7ea9399d3d796f82dde9fb84b449a98f22ed187b24643c63c8e5d8)

---
 src/boards/368.c    |   1 -
 src/boards/bandai.c | 393 +++++++++++++++++++++++++++++++-------------
 src/driver.h        |   2 +-
 3 files changed, 277 insertions(+), 119 deletions(-)

diff --git a/src/boards/368.c b/src/boards/368.c
index 459efbf..4ae27fe 100644
--- a/src/boards/368.c
+++ b/src/boards/368.c
@@ -81,7 +81,6 @@ static void M368Power(void) {
 	SetWriteHandler(0x4022, 0x4022, M368WritePRG);
 	SetWriteHandler(0x4120, 0x4120, M368WritePRG);
 	SetWriteHandler(0x4122, 0x4122, M368WriteIRQ);
-	//SetWriteHandler(0x8000, 0xffff, M368WriteUNROM);
 }
 
 static void M368Reset(void) {
diff --git a/src/boards/bandai.c b/src/boards/bandai.c
index 375d2b0..99d04a0 100644
--- a/src/boards/bandai.c
+++ b/src/boards/bandai.c
@@ -65,116 +65,202 @@ static SFORMAT StateRegs[] =
 #define X24C0X_READ			3
 #define X24C0X_WRITE		4
 
-static uint8 x24c0x_data[256], x24c0x_state;
-static uint8 x24c0x_addr, x24c0x_word, x24c0x_latch, x24c0x_bitcount;
-static uint8 x24c0x_sda, x24c0x_scl, x24c0x_out, x24c0x_oe;
+static uint8 x24c0x_data[512];
 
-static SFORMAT x24c0xStateRegs[] =
+static uint8 x24c01_state;
+static uint8 x24c01_addr, x24c01_word, x24c01_latch, x24c01_bitcount;
+static uint8 x24c01_sda, x24c01_scl, x24c01_out;
+
+static uint8 x24c02_state;
+static uint8 x24c02_addr, x24c02_word, x24c02_latch, x24c02_bitcount;
+static uint8 x24c02_sda, x24c02_scl, x24c02_out;
+
+static SFORMAT x24c01StateRegs[] =
 {
-	{ &x24c0x_addr, 1, "ADDR" },
-	{ &x24c0x_word, 1, "WORD" },
-	{ &x24c0x_latch, 1, "LATC" },
-	{ &x24c0x_bitcount, 1, "BITC" },
-	{ &x24c0x_sda, 1, "SDA" },
-	{ &x24c0x_scl, 1, "SCL" },
-	{ &x24c0x_out, 1, "OUT" },
-	{ &x24c0x_oe, 1, "OE" },
-	{ &x24c0x_state, 1, "STAT" },
+	{ &x24c01_addr, 1, "ADDR" },
+	{ &x24c01_word, 1, "WORD" },
+	{ &x24c01_latch, 1, "LATC" },
+	{ &x24c01_bitcount, 1, "BITC" },
+	{ &x24c01_sda, 1, "SDA" },
+	{ &x24c01_scl, 1, "SCL" },
+	{ &x24c01_out, 1, "OUT" },
+	{ &x24c01_state, 1, "STAT" },
 	{ 0 }
 };
 
-static void x24c0x_init() {
-	x24c0x_addr = x24c0x_word = x24c0x_latch = x24c0x_bitcount = x24c0x_sda = x24c0x_scl = x24c0x_oe = 0;
-	x24c0x_state = X24C0X_STANDBY;
+static SFORMAT x24c02StateRegs[] =
+{
+	{ &x24c02_addr, 1, "ADDR" },
+	{ &x24c02_word, 1, "WORD" },
+	{ &x24c02_latch, 1, "LATC" },
+	{ &x24c02_bitcount, 1, "BITC" },
+	{ &x24c02_sda, 1, "SDA" },
+	{ &x24c02_scl, 1, "SCL" },
+	{ &x24c02_out, 1, "OUT" },
+	{ &x24c02_state, 1, "STAT" },
+	{ 0 }
+};
+
+static void x24c01_init(void) {
+	x24c01_addr = x24c01_word = x24c01_latch = x24c01_bitcount = x24c01_sda = x24c01_scl = 0;
+	x24c01_state = X24C0X_STANDBY;
 }
 
-static void x24c0x_write(uint8 data) {
-	uint8 sda = (data >> 6) & 1;
-	uint8 scl = (data >> 5) & 1;
-	x24c0x_oe = (data >> 7);
+static void x24c02_init(void) {
+	x24c02_addr = x24c02_word = x24c02_latch = x24c02_bitcount = x24c02_sda = x24c02_scl = 0;
+	x24c02_state = X24C0X_STANDBY;
+}
 
-	if(x24c0x_scl && scl) {
-		if(x24c0x_sda && !sda) {		/* START */
-			x24c0x_state = X24C0X_ADDRESS;
-			x24c0x_bitcount = 0;
-			x24c0x_addr = 0;
-		} else if(!x24c0x_sda && sda) { /* STOP */
-			x24c0x_state = X24C0X_STANDBY;
+static void x24c01_write(uint8 data) {
+	uint8 scl = (data >> 5) & 1;
+	uint8 sda = (data >> 6) & 1;
+
+	if(x24c01_scl && scl) {
+		if(x24c01_sda && !sda) {			/* START */
+			x24c01_state = X24C0X_ADDRESS;
+			x24c01_bitcount = 0;
+			x24c01_addr = 0;
+		} else if(!x24c01_sda && sda) {		/* STOP */
+			x24c01_state = X24C0X_STANDBY;
 		}
-	} else if(!x24c0x_scl && scl) {		/* RISING EDGE */
-		switch(x24c0x_state) {
+	} else if(!x24c01_scl && scl) {			/* RISING EDGE */
+		switch(x24c01_state) {
 		case X24C0X_ADDRESS:
-			if(x24c0x_bitcount < 7) {
-				x24c0x_addr <<= 1;
-				x24c0x_addr |= sda;
+			if(x24c01_bitcount < 7) {
+				x24c01_addr <<= 1;
+				x24c01_addr |= sda;
 			} else {
-				if(!x24c02)				/* X24C01 mode */
-					x24c0x_word = x24c0x_addr;
-				if(sda) {				/* READ COMMAND */
-					x24c0x_state = X24C0X_READ;
-				} else {				/* WRITE COMMAND */
-					if(x24c02)			/* X24C02 mode */
-						x24c0x_state = X24C0X_WORD;
-					else
-						x24c0x_state = X24C0X_WRITE;
-				}
+				x24c01_word = x24c01_addr;
+				if(sda) 					/* READ COMMAND */
+					x24c01_state = X24C0X_READ;
+				 else 						/* WRITE COMMAND */
+					x24c01_state = X24C0X_WRITE;
 			}
-			x24c0x_bitcount++;
-			break;
-		case X24C0X_WORD:
-			if(x24c0x_bitcount == 8) {	/* ACK */
-				x24c0x_word = 0;
-				x24c0x_out = 0;
-			} else {					/* WORD ADDRESS INPUT */
-				x24c0x_word <<= 1;
-				x24c0x_word |= sda;
-				if(x24c0x_bitcount == 16) {	/* END OF ADDRESS INPUT */
-					x24c0x_bitcount = 7;
-					x24c0x_state = X24C0X_WRITE;
-				}
-			}
-			x24c0x_bitcount++;
+			x24c01_bitcount++;
 			break;
 		case X24C0X_READ:
-			if (x24c0x_bitcount == 8) {	/* ACK */
-				x24c0x_out = 0;
-				x24c0x_latch = x24c0x_data[x24c0x_word];
-				x24c0x_bitcount = 0;
-			} else {					/* REAL OUTPUT */
-				x24c0x_out = x24c0x_latch >> 7;
-				x24c0x_latch <<= 1;
-				x24c0x_bitcount++;
-				if(x24c0x_bitcount == 8) {
-					x24c0x_word++;
-					x24c0x_word &= 0xff;
+			if (x24c01_bitcount == 8) {		/*  ACK */
+				x24c01_out = 0;
+				x24c01_latch = x24c0x_data[x24c01_word];
+				x24c01_bitcount = 0;
+			} else {						/* REAL OUTPUT */
+				x24c01_out = x24c01_latch >> 7;
+				x24c01_latch <<= 1;
+				x24c01_bitcount++;
+				if(x24c01_bitcount == 8) {
+					x24c01_word++;
+					x24c01_word &= 0xff;
 				}
 			}
 			break;
 		case X24C0X_WRITE:
-			if (x24c0x_bitcount == 8) {	/* ACK */
-				x24c0x_out = 0;
-				x24c0x_latch = 0;
-				x24c0x_bitcount = 0;
-			} else {					/* REAL INPUT */
-				x24c0x_latch <<= 1;
-				x24c0x_latch |= sda;
-				x24c0x_bitcount++;
-				if(x24c0x_bitcount == 8) {
-					x24c0x_data[x24c0x_word] = x24c0x_latch;
-					x24c0x_word++;
-					x24c0x_word &= 0xff;
+			if (x24c01_bitcount == 8) {		/* ACK */
+				x24c01_out = 0;
+				x24c01_latch = 0;
+				x24c01_bitcount = 0;
+			} else {						/* REAL INPUT */
+				x24c01_latch <<= 1;
+				x24c01_latch |= sda;
+				x24c01_bitcount++;
+				if(x24c01_bitcount == 8) {
+					x24c0x_data[x24c01_word] = x24c01_latch;
+					x24c01_word++;
+					x24c01_word &= 0xff;
 				}
 			}
 			break;
 		}
 	}
 
-	x24c0x_sda = sda;
-	x24c0x_scl = scl;
+	x24c01_sda = sda;
+	x24c01_scl = scl;
 }
 
-static uint8 x24c0x_read() {
-	return x24c0x_out << 4;
+static void x24c02_write(uint8 data) {
+	uint8 scl = (data >> 5) & 1;
+	uint8 sda = (data >> 6) & 1;
+
+	if (x24c02_scl && scl) {
+		if (x24c02_sda && !sda) {			/* START */
+			x24c02_state = X24C0X_ADDRESS;
+			x24c02_bitcount = 0;
+			x24c02_addr = 0;
+		} else if (!x24c02_sda && sda) {	/* STOP */
+			x24c02_state = X24C0X_STANDBY;
+		}
+	} else if (!x24c02_scl && scl) {		/* RISING EDGE */
+		switch (x24c02_state) {
+		case X24C0X_ADDRESS:
+			if (x24c02_bitcount < 7) {
+				x24c02_addr <<= 1;
+				x24c02_addr |= sda;
+			} else {
+				if (sda)					/* READ COMMAND */
+					x24c02_state = X24C0X_READ;
+				else						/* WRITE COMMAND */
+					x24c02_state = X24C0X_WORD;
+			}
+			x24c02_bitcount++;
+			break;
+		case X24C0X_WORD:
+			if (x24c02_bitcount == 8) {		/* ACK */
+				x24c02_word = 0;
+				x24c02_out = 0;
+			} else {						/* WORD ADDRESS INPUT */
+				x24c02_word <<= 1;
+				x24c02_word |= sda;
+				if (x24c02_bitcount == 16) { /* END OF ADDRESS INPUT */
+					x24c02_bitcount = 7;
+					x24c02_state = X24C0X_WRITE;
+				}
+			}
+			x24c02_bitcount++;
+			break;
+		case X24C0X_READ:
+			if (x24c02_bitcount == 8) {		/* ACK */
+				x24c02_out = 0;
+				x24c02_latch = x24c0x_data[x24c02_word|0x100];
+				x24c02_bitcount = 0;
+			} else {						/* REAL OUTPUT */
+				x24c02_out = x24c02_latch >> 7;
+				x24c02_latch <<= 1;
+				x24c02_bitcount++;
+				if (x24c02_bitcount == 8) {
+					x24c02_word++;
+					x24c02_word &= 0xff;
+				}
+			}
+			break;
+		case X24C0X_WRITE:
+			if (x24c02_bitcount == 8) {		/* ACK */
+				x24c02_out = 0;
+				x24c02_latch = 0;
+				x24c02_bitcount = 0;
+			} else {						/* REAL INPUT */
+				x24c02_latch <<= 1;
+				x24c02_latch |= sda;
+				x24c02_bitcount++;
+				if (x24c02_bitcount == 8) {
+					x24c0x_data[x24c02_word|0x100] = x24c02_latch;
+					x24c02_word++;
+					x24c02_word &= 0xff;
+				}
+			}
+			break;
+		}
+	}
+
+	x24c02_sda = sda;
+	x24c02_scl = scl;
+}
+
+static void SyncMirror(void) {
+	switch (reg[9] & 3) {
+	case 0: setmirror(MI_V); break;
+	case 1: setmirror(MI_H); break;
+	case 2: setmirror(MI_0); break;
+	case 3: setmirror(MI_1); break;
+	}
 }
 
 static void Sync(void) {
@@ -189,12 +275,7 @@ static void Sync(void) {
 		setprg16(0x8000, reg[8]);
 		setprg16(0xC000, ~0);
 	}
-	switch (reg[9] & 3) {
-	case 0: setmirror(MI_V); break;
-	case 1: setmirror(MI_H); break;
-	case 2: setmirror(MI_0); break;
-	case 3: setmirror(MI_1); break;
-	}
+	SyncMirror();
 }
 
 static DECLFW(BandaiWrite) {
@@ -207,12 +288,20 @@ static DECLFW(BandaiWrite) {
 		case 0x0A: X6502_IRQEnd(FCEU_IQEXT); IRQa = V & 1; IRQCount = IRQLatch; break;
 		case 0x0B: IRQLatch &= 0xFF00; IRQLatch |= V; break;
 		case 0x0C: IRQLatch &= 0xFF; IRQLatch |= V << 8; break;
-		case 0x0D: x24c0x_write(V); break;
+		case 0x0D:
+			if (x24c02)
+				x24c02_write(V);
+			else
+				x24c01_write(V);
+			break;
 		}
 }
 
 static DECLFR(BandaiRead) {
-	return (X.DB & 0xEF) | x24c0x_read();
+	if (x24c02)
+		return (X.DB & 0xEF) | (x24c02_out << 4);
+	else
+		return (X.DB & 0xEF) | (x24c01_out << 4);
 }
 
 static void FP_FASTAPASS(1) BandaiIRQHook(int a) {
@@ -228,7 +317,10 @@ static void FP_FASTAPASS(1) BandaiIRQHook(int a) {
 
 static void BandaiPower(void) {
 	IRQa = 0;
-	x24c0x_init();
+	if (x24c02)
+		x24c02_init();
+	else
+		x24c01_init();
 	Sync();
 	SetReadHandler(0x6000, 0x7FFF, BandaiRead);
 	SetReadHandler(0x8000, 0xFFFF, CartBR);
@@ -246,12 +338,12 @@ void Mapper16_Init(CartInfo *info) {
 	MapIRQHook = BandaiIRQHook;
 
 	info->battery = 1;
-	info->SaveGame[0] = x24c0x_data;
+	info->SaveGame[0] = x24c0x_data + 256;
 	info->SaveGameLen[0] = 256;
 	AddExState(x24c0x_data, 256, 0, "DATA");
 
 	GameStateRestore = StateRestore;
-	AddExState(&x24c0xStateRegs, ~0, 0, 0);
+	AddExState(&x24c02StateRegs, ~0, 0, 0);
 	AddExState(&StateRegs, ~0, 0, 0);
 }
 
@@ -267,7 +359,7 @@ void Mapper159_Init(CartInfo *info) {
 	AddExState(x24c0x_data, 128, 0, "DATA");
 
 	GameStateRestore = StateRestore;
-	AddExState(&x24c0xStateRegs, ~0, 0, 0);
+	AddExState(&x24c01StateRegs, ~0, 0, 0);
 	AddExState(&StateRegs, ~0, 0, 0);
 }
 
@@ -323,7 +415,9 @@ static int BarcodeReadPos;
 static int BarcodeCycleCount;
 static uint32 BarcodeOut;
 
-int FCEUI_DatachSet(const uint8 *rcode) {
+/* #define INTERL2OF5 */
+
+int FCEUI_DatachSet(uint8 *rcode) {
 	int prefix_parity_type[10][6] = {
 		{ 0, 0, 0, 0, 0, 0 }, { 0, 0, 1, 0, 1, 1 }, { 0, 0, 1, 1, 0, 1 }, { 0, 0, 1, 1, 1, 0 },
 		{ 0, 1, 0, 0, 1, 1 }, { 0, 1, 1, 0, 0, 1 }, { 0, 1, 1, 1, 0, 0 }, { 0, 1, 0, 1, 0, 1 },
@@ -346,6 +440,7 @@ int FCEUI_DatachSet(const uint8 *rcode) {
 	};
 	uint8 code[13 + 1];
 	uint32 tmp_p = 0;
+	uint32 csum = 0;
 	int i, j;
 	int len;
 
@@ -359,15 +454,45 @@ int FCEUI_DatachSet(const uint8 *rcode) {
 
 	#define BS(x) BarcodeData[tmp_p] = x; tmp_p++
 
-	for (j = 0; j < 32; j++) {
+	for (j = 0; j < 32; j++) { /* delay before sending a code */
 		BS(0x00);
 	}
 
+#ifdef INTERL2OF5
+	
+	BS(1); BS(1); BS(0); BS(0); /* 1 */
+	BS(1); BS(1); BS(0); BS(0); /* 1 */
+	BS(1); BS(1); BS(0); BS(0); /* 1 */
+	BS(1); BS(1); BS(0); BS(0); /* 1 */
+	BS(1); BS(1); BS(0); BS(0); /* 1 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 */
+	BS(1);        BS(0); BS(0); /* 0 cs */
+	BS(1); BS(1); BS(0); BS(0); /* 1 */
+
+#else
 	/* Left guard bars */
 	BS(1); BS(0); BS(1);
 
 	if (len == 13 || len == 12) {
-		uint32 csum;
 
 		for (i = 0; i < 6; i++)
 			if (prefix_parity_type[code[0]][i]) {
@@ -386,24 +511,25 @@ int FCEUI_DatachSet(const uint8 *rcode) {
 			for (j = 0; j < 7; j++) {
 				BS(data_right[code[i]][j]);
 			}
-		csum = 0;
-		for (i = 0; i < 12; i++) csum += code[i] * ((i & 1) ? 3 : 1);
-		csum = (10 - (csum % 10)) % 10;
+		/* Calc and write down the control code if not assigned, instead, send code as is
+		   Battle Rush uses modified type of codes with different control code calculation */
+		if (len == 12) {
+			for (i = 0; i < 12; i++)
+				csum += code[i] * ((i & 1) ? 3 : 1);
+			csum = (10 - (csum % 10)) % 10;
+			rcode[12] = csum + 0x30;	/* update check code to the input string as well */
+			rcode[13] = 0;
+			code[12] = csum;
+		} 
 		for (j = 0; j < 7; j++) {
-			BS(data_right[csum][j]);
+			BS(data_right[code[12]][j]);
 		}
 	} else if (len == 8 || len == 7) {
-		uint32 csum = 0;
-
-		for (i = 0; i < 7; i++) csum += (i & 1) ? code[i] : (code[i] * 3);
-
-		csum = (10 - (csum % 10)) % 10;
-
-		for (i = 0; i < 4; i++)
+		for (i = 0; i < 4; i++) {
 			for (j = 0; j < 7; j++) {
 				BS(data_left_odd[code[i]][j]);
 			}
-
+		}
 
 		/* Center guard bars */
 		BS(0); BS(1); BS(0); BS(1); BS(0);
@@ -412,7 +538,12 @@ int FCEUI_DatachSet(const uint8 *rcode) {
 			for (j = 0; j < 7; j++) {
 				BS(data_right[code[i]][j]);
 			}
-
+		csum = 0;
+		for (i = 0; i < 7; i++)
+			csum += (i & 1) ? code[i] : (code[i] * 3);
+		csum = (10 - (csum % 10)) % 10;
+		rcode[7] = csum + 0x30;	/* update check code to the input string as well */
+		rcode[8] = 0;
 		for (j = 0; j < 7; j++) {
 			BS(data_right[csum][j]);
 		}
@@ -420,6 +551,7 @@ int FCEUI_DatachSet(const uint8 *rcode) {
 
 	/* Right guard bars */
 	BS(1); BS(0); BS(1);
+#endif
 
 	for (j = 0; j < 32; j++) {
 		BS(0x00);
@@ -435,6 +567,26 @@ int FCEUI_DatachSet(const uint8 *rcode) {
 	return(1);
 }
 
+static void BarcodeSync(void) {
+	setchr8(0);
+	setprg16(0x8000, (reg[8] & 0x0F));
+	setprg16(0xC000, 0x0F);
+	SyncMirror();
+}
+
+static DECLFW(BarcodeWrite) {
+	A &= 0x0F;
+	switch (A) {
+	case 0x00: reg[0] = (V & 8) << 2; x24c01_write(reg[0xD] | reg[0]); break;		/* extra EEPROM x24C01 used in Battle Rush mini-cart */
+	case 0x08: 
+	case 0x09: reg[A] = V; BarcodeSync(); break;
+	case 0x0A: X6502_IRQEnd(FCEU_IQEXT); IRQa = V & 1; IRQCount = IRQLatch; break;
+	case 0x0B: IRQLatch &= 0xFF00; IRQLatch |= V; break;
+	case 0x0C: IRQLatch &= 0xFF; IRQLatch |= V << 8; break;
+	case 0x0D: reg[0xD] = V & (~0x20); x24c01_write(reg[0xD] | reg[0]);  x24c02_write(V); break;
+	}
+}
+
 static void FP_FASTAPASS(1) BarcodeIRQHook(int a) {
 	BandaiIRQHook(a);
 
@@ -452,7 +604,7 @@ static void FP_FASTAPASS(1) BarcodeIRQHook(int a) {
 }
 
 static DECLFR(BarcodeRead) {
-	return BarcodeOut;
+	return (X.DB & 0xE7) | ((x24c02_out | x24c01_out) << 4) | BarcodeOut;
 }
 
 static void M157Power(void) {
@@ -462,20 +614,27 @@ static void M157Power(void) {
 	BarcodeOut = 0;
 	BarcodeCycleCount = 0;
 
-	Sync();
+	x24c01_init();
+	x24c02_init();
+	BarcodeSync();
 
-	SetWriteHandler(0x6000, 0xFFFF, BandaiWrite);
 	SetReadHandler(0x6000, 0x7FFF, BarcodeRead);
 	SetReadHandler(0x8000, 0xFFFF, CartBR);
+	SetWriteHandler(0x8000, 0xFFFF, BarcodeWrite);
 }
 
 void Mapper157_Init(CartInfo *info) {
-	is153 = 1;
+	x24c02 = 1;
 	info->Power = M157Power;
 	MapIRQHook = BarcodeIRQHook;
 
 	GameInfo->cspecial = SIS_DATACH;
-
+	info->battery = 1;
+	info->SaveGame[0] = x24c0x_data;
+	info->SaveGameLen[0] = 512;
 	GameStateRestore = StateRestore;
+	AddExState(x24c0x_data, 512, 0, "DATA");
+	AddExState(&x24c01StateRegs, ~0, 0, 0);
+	AddExState(&x24c02StateRegs, ~0, 0, 0);
 	AddExState(&StateRegs, ~0, 0, 0);
 }
diff --git a/src/driver.h b/src/driver.h
index 7e63d29..9529bc4 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -235,7 +235,7 @@ int FCEUI_FDSInsert(int oride);
 int FCEUI_FDSEject(void);
 void FCEUI_FDSSelect(void);
 
-int FCEUI_DatachSet(const uint8 *rcode);
+int FCEUI_DatachSet(uint8 *rcode);
 
 #ifdef  __cplusplus
 }

From c6734c95d020bdf380270f4c2b084447d3bc8dac Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Wed, 9 Feb 2022 18:08:39 +0800
Subject: [PATCH 187/295] Check database for NES 1.0 headered rom only

This would assume that all NES 2.0 roms are correct and is more complete
that what is provided in overrides.
---
 src/ines.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ines.c b/src/ines.c
index 52fe24a..0903fc2 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -1044,7 +1044,9 @@ int iNESLoad(const char *name, FCEUFILE *fp)
    SetupCartPRGMapping(0, ROM, rom_size_pow2, 0);
 
    SetInput();
-   CheckHInfo();
+   
+   if (iNESCart.iNES2 < 1)
+      CheckHInfo();
 
    {
       int x;

From 69c1a07fc466fb61e155105297cc74b694addbae Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Thu, 10 Feb 2022 20:50:21 +0800
Subject: [PATCH 188/295] Add mapper 393

---
 src/boards/393.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |   2 +
 src/ines.h       |   2 +
 3 files changed, 116 insertions(+)
 create mode 100644 src/boards/393.c

diff --git a/src/boards/393.c b/src/boards/393.c
new file mode 100644
index 0000000..dc343cc
--- /dev/null
+++ b/src/boards/393.c
@@ -0,0 +1,112 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *
+ */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static uint8 *CHRRAM;
+static uint32 CHRRAMSIZE;
+
+static int getPRGBank(int bank) {
+	if ((~bank & 1) && (MMC3_cmd & 0x40)) bank ^= 2;
+	return (bank & 2) ? 0xFE | (bank & 1) : DRegBuf[6 | (bank & 1)];
+}
+
+static void M393CW(uint32 A, uint8 V) {
+	if (EXPREGS[0] & 8)
+		setchr8r(0x10, 0);
+	else
+		setchr1(A, V & 0xFF | EXPREGS[0] << 8);
+}
+
+static void M393PW(uint32 A, uint8 V) {
+	switch ((EXPREGS[0] >> 4) & 3) {
+	case 0:
+	case 1:
+		setprg8(A, (V & 0x0F) | (EXPREGS[0] << 4));
+		break;
+	case 2:
+		setprg32(0x8000, ((getPRGBank(0) >> 2) & 3) | (EXPREGS[0] << 2));
+		break;
+	case 3:
+		setprg16(0x8000, (EXPREGS[0] << 3) | (EXPREGS[1] &7));
+		setprg16(0xC000, (EXPREGS[0] << 3) | 7);
+		break;
+	}
+}
+
+static DECLFW(M393Write8) {
+	switch (A & 0xE000) {
+	case 0x8000:
+	case 0xA000:
+		MMC3_CMDWrite(A, V);
+		break;
+	case 0xC000:
+	case 0xE000:
+		MMC3_IRQWrite(A, V);
+		break;
+	}
+
+	EXPREGS[1] = V;
+	FixMMC3CHR(MMC3_cmd);
+	FixMMC3PRG(MMC3_cmd);
+}
+
+static DECLFW(M393Write6) {
+	EXPREGS[0] = A & 0xFF;
+	FixMMC3PRG(MMC3_cmd);
+	FixMMC3CHR(MMC3_cmd);
+}
+
+static void M393Power(void) {
+	EXPREGS[0] = EXPREGS[1] = 0;
+	GenMMC3Power();
+	SetWriteHandler(0x6000, 0x7FFF, M393Write6);
+	SetWriteHandler(0x8000, 0xFFFF, M393Write8);
+}
+
+static void M393Reset(void) {
+	EXPREGS[0] = EXPREGS[1] = 0;
+	MMC3RegReset();
+}
+
+static void M393lose(void) {
+	GenMMC3Close();
+	if (CHRRAM)
+		FCEU_free(CHRRAM);
+	CHRRAM = NULL;
+}
+
+void Mapper393_Init(CartInfo *info) {
+	GenMMC3_Init(info, 1024, 512, 8, 0);
+	pwrap = M393PW;
+	cwrap = M393CW;
+	info->Power = M393Power;
+	info->Reset = M393Reset;
+	info->Close = M393lose;
+	CHRRAMSIZE = 8192;
+	CHRRAM = (uint8 *)FCEU_gmalloc(CHRRAMSIZE);
+	SetupCartCHRMapping(0x10, CHRRAM, CHRRAMSIZE, 1);
+	AddExState(CHRRAM, CHRRAMSIZE, 0, "CHRR");
+
+	AddExState(EXPREGS, 1, 0, "EXPR");
+}
diff --git a/src/ines.c b/src/ines.c
index 0903fc2..8e7a52c 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -693,6 +693,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "SB-5013/GCL8050/841242C",  359, Mapper359_Init         )
 	INES_BOARD( "Bitcorp 31-in-1",          360, Mapper360_Init         )
 	INES_BOARD( "OK-411",                   361, GN45_Init              ) /* OK-411 is emulated together with GN-45 */
+	INES_BOARD( "JY830832C",                365, Mapper364_Init         )
 	INES_BOARD( "GN-45",                    366, GN45_Init              )
 	INES_BOARD( "Yung-08",                  368, Mapper368_Init              )
 	INES_BOARD( "Golden Mario Party II - Around the World 6-in-1",       370, Mapper370_Init         )
@@ -706,6 +707,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "Caltron 9-in-1",           389, Mapper389_Init         )
 	INES_BOARD( "Realtec 8031",             390, Mapper390_Init         )
 	INES_BOARD( "NewStar 12-in-1/7-in-1",   293, Mapper293_Init         )
+	INES_BOARD( "820720C",                  393, Mapper393_Init         )
 	INES_BOARD( "Realtec 8210",             395, Mapper395_Init         )
 	INES_BOARD( "BMC Super 19-in-1 (VIP19)",    401, Mapper401_Init         )
 	INES_BOARD( "89433",                    403, Mapper403_Init         )
diff --git a/src/ines.h b/src/ines.h
index b506702..40356a5 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -269,6 +269,7 @@ void Mapper357_Init(CartInfo *);
 void Mapper358_Init(CartInfo *);
 void Mapper359_Init(CartInfo *);
 void Mapper360_Init(CartInfo *);
+void Mapper364_Init(CartInfo *);
 void Mapper368_Init(CartInfo *);
 void Mapper369_Init(CartInfo *);
 void Mapper370_Init(CartInfo *);
@@ -286,6 +287,7 @@ void Mapper388_Init(CartInfo *);
 void Mapper389_Init(CartInfo *);
 void Mapper390_Init(CartInfo *);
 void Mapper391_Init(CartInfo *);
+void Mapper393_Init(CartInfo *);
 void Mapper395_Init(CartInfo *);
 void Mapper396_Init(CartInfo *);
 void Mapper397_Init(CartInfo *);

From 6fee886589dd8e7848be3aab568e4f0fe6ba6e12 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Thu, 10 Feb 2022 21:43:45 +0800
Subject: [PATCH 189/295] Add mapper 364

---
 src/boards/364.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/boards/393.c |  3 +--
 src/ines.c       |  2 +-
 3 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 src/boards/364.c

diff --git a/src/boards/364.c b/src/boards/364.c
new file mode 100644
index 0000000..b082392
--- /dev/null
+++ b/src/boards/364.c
@@ -0,0 +1,58 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static void M364CW(uint32 A, uint8 V) {
+	V &= (EXPREGS[0] & 0x20) ? 0x7F : 0xFF;
+	setchr1(A, V | ((EXPREGS[0] << 4) & 0x100));
+}
+
+static void M364PW(uint32 A, uint8 V) {
+	V &= (EXPREGS[0] & 0x20) ? 0x0F : 0x1F;
+	setprg8(A, V | ((EXPREGS[0] >> 1) & 0x20));
+}
+
+static DECLFW(M364Write) {
+	EXPREGS[0] = V;
+	FixMMC3PRG(MMC3_cmd);
+	FixMMC3CHR(MMC3_cmd);
+}
+
+static void M364Power(void) {
+	EXPREGS[0] = 0;
+	GenMMC3Power();
+	SetWriteHandler(0x7000, 0x7FFF, M364Write);
+}
+
+static void M364Reset(void) {
+	EXPREGS[0] = 0;
+	MMC3RegReset();
+}
+
+void Mapper364_Init(CartInfo *info) {
+	GenMMC3_Init(info, 512, 512, 8, 0);
+	pwrap = M364PW;
+	cwrap = M364CW;
+	info->Power = M364Power;
+	AddExState(EXPREGS, 1, 0, "EXPR");
+}
diff --git a/src/boards/393.c b/src/boards/393.c
index dc343cc..56eab48 100644
--- a/src/boards/393.c
+++ b/src/boards/393.c
@@ -107,6 +107,5 @@ void Mapper393_Init(CartInfo *info) {
 	CHRRAM = (uint8 *)FCEU_gmalloc(CHRRAMSIZE);
 	SetupCartCHRMapping(0x10, CHRRAM, CHRRAMSIZE, 1);
 	AddExState(CHRRAM, CHRRAMSIZE, 0, "CHRR");
-
-	AddExState(EXPREGS, 1, 0, "EXPR");
+	AddExState(EXPREGS, 2, 0, "EXPR");
 }
diff --git a/src/ines.c b/src/ines.c
index 8e7a52c..2c2c837 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -693,7 +693,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "SB-5013/GCL8050/841242C",  359, Mapper359_Init         )
 	INES_BOARD( "Bitcorp 31-in-1",          360, Mapper360_Init         )
 	INES_BOARD( "OK-411",                   361, GN45_Init              ) /* OK-411 is emulated together with GN-45 */
-	INES_BOARD( "JY830832C",                365, Mapper364_Init         )
+	INES_BOARD( "JY830832C",                364, Mapper364_Init         )
 	INES_BOARD( "GN-45",                    366, GN45_Init              )
 	INES_BOARD( "Yung-08",                  368, Mapper368_Init              )
 	INES_BOARD( "Golden Mario Party II - Around the World 6-in-1",       370, Mapper370_Init         )

From 6dd4fbd3f7d39dedffc3ccaa42409723a6f08f0e Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Thu, 10 Feb 2022 22:45:05 +0800
Subject: [PATCH 190/295] Update m226, m33. Add m433

---
 src/boards/233.c       | 87 ++++++++++++++++++++++++++++++++++++++++++
 src/boards/433.c       | 72 ++++++++++++++++++++++++++++++++++
 src/boards/bmc42in1r.c | 37 +++---------------
 src/ines.c             |  1 +
 src/ines.h             |  1 +
 5 files changed, 167 insertions(+), 31 deletions(-)
 create mode 100644 src/boards/233.c
 create mode 100644 src/boards/433.c

diff --git a/src/boards/233.c b/src/boards/233.c
new file mode 100644
index 0000000..e441772
--- /dev/null
+++ b/src/boards/233.c
@@ -0,0 +1,87 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2005 CaH4e3
+ *  Copyright (C) 2009 qeed
+ *  Copyright (C) 2019 Libretro Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+/* Updated 2019-07-12
+ * Mapper 233 - UNIF 42in1ResetSwitch - reset-based switching
+ */
+
+#include "mapinc.h"
+
+static uint8 latche;
+static uint8 reset;
+
+static SFORMAT StateRegs[] =
+{
+	{ &reset, 1, "RST" },
+	{ &latche, 1, "LATC" },
+	{ 0 }
+};
+
+static void Sync(void) {
+	uint8 bank = (latche & 0x1f) | (reset << 5);
+
+	if (!(latche & 0x20))
+		setprg32(0x8000, bank >> 1);
+	else {
+		setprg16(0x8000, bank);
+		setprg16(0xC000, bank);
+	}
+
+	switch ((latche >> 6) & 3) {
+	case 0: setmirror(MI_0); break;
+	case 1: setmirror(MI_V); break;
+	case 2: setmirror(MI_H); break;
+	case 3: setmirror(MI_1); break;
+	}
+
+	setchr8(0);
+}
+
+static DECLFW(M233Write) {
+	latche = V;
+	Sync();
+}
+
+static void M233Power(void) {
+	latche = reset = 0;
+	Sync();
+	SetWriteHandler(0x8000, 0xFFFF, M233Write);
+	SetReadHandler(0x8000, 0xFFFF, CartBR);
+}
+
+static void StateRestore(int version) {
+	Sync();
+}
+
+static void M233Reset(void) {
+	latche = 0;
+	reset ^= 1;
+	Sync();
+}
+
+void Mapper233_Init(CartInfo *info) {
+	info->Power = M233Power;
+	info->Reset = M233Reset;
+	AddExState(&StateRegs, ~0, 0, 0);
+	GameStateRestore = StateRestore;
+}
diff --git a/src/boards/433.c b/src/boards/433.c
new file mode 100644
index 0000000..d7c00ca
--- /dev/null
+++ b/src/boards/433.c
@@ -0,0 +1,72 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+/* NES 2.0 Mapper 433 denotes the NC-20MB PCB, used for the 20-in-1 (CA-006) multicart. It is almost identical to INES Mapper 433, except that mirroring is selected just by single bit 6 (1=Horizontal).
+ */
+
+#include "mapinc.h"
+
+static uint8 latche;
+
+static SFORMAT StateRegs[] =
+{
+	{ &latche, 1, "LATC" },
+	{ 0 }
+};
+
+static void Sync(void) {
+	if (!(latche & 0x20))
+		setprg32(0x8000, (latche & 0x1f) >> 1);
+	else {
+		setprg16(0x8000, (latche & 0x1f));
+		setprg16(0xC000, (latche & 0x1f));
+	}
+    setmirror(((latche >> 6) & 1) ^ 1);
+	setchr8(0);
+}
+
+static DECLFW(M433Write) {
+	latche = V;
+	Sync();
+}
+
+static void M433Power(void) {
+	latche = 0;
+	Sync();
+	SetWriteHandler(0x8000, 0xFFFF, M433Write);
+	SetReadHandler(0x8000, 0xFFFF, CartBR);
+}
+
+static void StateRestore(int version) {
+	Sync();
+}
+
+static void M433Reset(void) {
+	latche = 0;
+	Sync();
+}
+
+void Mapper433_Init(CartInfo *info) {
+	info->Power = M433Power;
+	info->Reset = M433Reset;
+	AddExState(&StateRegs, ~0, 0, 0);
+	GameStateRestore = StateRestore;
+}
diff --git a/src/boards/bmc42in1r.c b/src/boards/bmc42in1r.c
index 3ac92b8..8675bbb 100644
--- a/src/boards/bmc42in1r.c
+++ b/src/boards/bmc42in1r.c
@@ -18,21 +18,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * BMC 42-in-1 "reset switch" + "select switch"
- *
  */
 
 /* Updated 2019-07-12
- * Mapper 266 - Updated and combine UNIF Ghostbusters63in1 board (1.5 MB carts), different bank order
+ * Mapper 226 - Updated and combine UNIF Ghostbusters63in1 board (1.5 MB carts), different bank order
  * - some 1MB carts can switch game lists using Select
- * Mapper 233 - UNIF 42in1ResetSwitch - reset-based switching
  */
 
 #include "mapinc.h"
 
 static uint8 reorder_banks = 0;
-static uint8 isresetbased = 0;
 static uint8 latche[2], reset;
 static uint8 banks[4] = { 0, 0, 1, 2 };
 static SFORMAT StateRegs[] =
@@ -46,13 +41,9 @@ static void Sync(void) {
 	uint8 bank = 0;
 	uint8 base = ((latche[0] & 0x80) >> 7) | ((latche[1] & 1) << 1);
 
-	if (isresetbased)
-		bank = (latche[0] & 0x1f) | (reset << 5) | ((latche[1] & 1) << 6);
-	else {
-		if (reorder_banks) /* for 1536 KB prg roms */
-			base = banks[base];
-		bank = (base << 5) | (latche[0] & 0x1f);
-	}
+	if (reorder_banks) /* for 1536 KB prg roms */
+		base = banks[base];
+	bank = (base << 5) | (latche[0] & 0x1f);
 
 	if (!(latche[0] & 0x20))
 		setprg32(0x8000, bank >> 1);
@@ -70,7 +61,7 @@ static DECLFW(M226Write) {
 }
 
 static void M226Power(void) {
-	latche[0] = latche[1] = reset = 0;
+	latche[0] = latche[1] = 0;
 	Sync();
 	SetWriteHandler(0x8000, 0xFFFF, M226Write);
 	SetReadHandler(0x8000, 0xFFFF, CartBR);
@@ -81,12 +72,11 @@ static void StateRestore(int version) {
 }
 
 static void M226Reset(void) {
-	latche[0] = latche[1] = reset = 0;
+	latche[0] = latche[1] = 0;
 	Sync();
 }
 
 void Mapper226_Init(CartInfo *info) {
-	isresetbased = 0;
 	/* 1536KiB PRG roms have different bank order */
 	reorder_banks = ((info->PRGRomSize / 1024) == 1536) ? 1 : 0;
 	info->Power = M226Power;
@@ -94,18 +84,3 @@ void Mapper226_Init(CartInfo *info) {
 	AddExState(&StateRegs, ~0, 0, 0);
 	GameStateRestore = StateRestore;
 }
-
-static void M233Reset(void) {
-	latche[0] = latche[1] = 0;
-	reset ^= 1;
-	Sync();
-}
-
-void Mapper233_Init(CartInfo *info) {
-	reorder_banks = 0;
-	isresetbased = 1;
-	info->Power = M226Power;
-	info->Reset = M233Reset;
-	AddExState(&StateRegs, ~0, 0, 0);
-	GameStateRestore = StateRestore;
-}
diff --git a/src/ines.c b/src/ines.c
index 2c2c837..ffb8dc3 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -716,6 +716,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "4-in-1/N-32",              416, Mapper416_Init         )
 	INES_BOARD( "BS-400R/BS-4040",          422, Mapper422_Init         )
 	INES_BOARD( "Realtec 8090",             432, Mapper432_Init         )
+	INES_BOARD( "NC-20MB",                  433, Mapper433_Init         )
 	INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init        )
 	INES_BOARD( "Sachen 3014",              533, Mapper533_Init         )
 	INES_BOARD( "NJ064",                    534, Mapper534_Init         )
diff --git a/src/ines.h b/src/ines.h
index 40356a5..884fd95 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -303,6 +303,7 @@ void Mapper422_Init(CartInfo *);
 void Mapper428_Init(CartInfo *);
 void Mapper429_Init(CartInfo *);
 void Mapper432_Init(CartInfo *);
+void Mapper433_Init(CartInfo *);
 void Mapper434_Init(CartInfo *);
 void Mapper436_Init(CartInfo *);
 void Mapper437_Init(CartInfo *);

From be92cd211c241187eba2872cf2d944d59807b574 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Fri, 11 Feb 2022 22:11:28 +0800
Subject: [PATCH 191/295] m403: Fix for TetrisA

Fix https://github.com/libretro/libretro-fceumm/issues/493
---
 src/boards/403.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/boards/403.c b/src/boards/403.c
index c0299c8..aa04f75 100644
--- a/src/boards/403.c
+++ b/src/boards/403.c
@@ -64,6 +64,7 @@ static void M403Reset(void) {
 static void M403Power(void) {
 	reg[0] = reg[1] = reg[2] = 0;
 	Sync();
+	SetReadHandler(0x6000, 0x7FFF, CartBR); /* For TetrisA (Tetris Family 19-in-1 NO 1683) */
 	SetReadHandler(0x8000, 0xFFFF, CartBR);
 	SetWriteHandler(0x4100, 0x4103, M403Write4);
 	SetWriteHandler(0x8000, 0xFFFF, M403Write8);

From cac8c8fa1cc5fd648d30cb7a7a7f049a81979d16 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sat, 12 Feb 2022 10:13:30 +0800
Subject: [PATCH 192/295] Add mapper 417

---
 src/boards/417.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  1 +
 src/ines.h       |  1 +
 3 files changed, 82 insertions(+)
 create mode 100644 src/boards/417.c

diff --git a/src/boards/417.c b/src/boards/417.c
new file mode 100644
index 0000000..bea2e35
--- /dev/null
+++ b/src/boards/417.c
@@ -0,0 +1,80 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "mapinc.h"
+
+static uint8 preg[4];
+static uint8 creg[8];
+static uint8 nt[4];
+static uint8 IRQa;
+static uint16 IRQCount;
+
+static SFORMAT StateRegs[] = {
+	{ preg, 4, "PREG" },
+    { creg, 8, "CREG" },
+    { nt, 4, "NREG" },
+    { &IRQa, 1, "IRQA" },
+    { &IRQCount, 2, "IRQC" },
+	{ 0 }
+};
+
+static void Sync(void) {
+    int i;
+    setprg8(0x8000, preg[0]);
+    setprg8(0xA000, preg[1]);
+    setprg8(0xC000, preg[2]);
+    setprg8(0xE000, ~0);
+    for (i = 0; i < 8; i++) setchr1(i << 10, creg[i]);
+    setmirrorw(nt[0] & 1, nt[1] & 1, nt[2] & 1, nt[3] & 1);
+}
+
+static DECLFW(M417Write) {
+    switch ((A >> 4) & 7) {
+    case 0: preg[A & 3] = V; Sync(); break;
+    case 1: creg[0 | (A & 3)] = V; Sync(); break;
+    case 2: creg[4 | (A & 3)] = V; Sync(); break;break;
+    case 3: IRQCount = 0; IRQa = 1; break;
+    case 4: IRQa = 0; X6502_IRQEnd(FCEU_IQEXT); break;
+    case 5: nt[A & 3] = V; Sync(); break;
+    }
+}
+
+static void M417Power(void) {
+	Sync();
+    SetReadHandler(0x8000, 0xFFFF, CartBR);
+    SetWriteHandler(0x8000, 0xFFFF, M417Write);
+}
+
+static void M417IRQHook(int a) {
+    IRQCount += a;
+    if (IRQa && IRQCount > 1024)
+        X6502_IRQBegin(FCEU_IQEXT);
+}
+
+static void StateRestore(int version) {
+	Sync();
+}
+
+void Mapper417_Init(CartInfo *info) {
+	info->Power = M417Power;
+    MapIRQHook = M417IRQHook;
+	GameStateRestore = StateRestore;
+	AddExState(&StateRegs, ~0, 0, 0);
+}
diff --git a/src/ines.c b/src/ines.c
index ffb8dc3..8c9035d 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -714,6 +714,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "A88S-1",                   411, Mapper411_Init         )
 	INES_BOARD( "0353",                     415, Mapper415_Init         )
 	INES_BOARD( "4-in-1/N-32",              416, Mapper416_Init         )
+	INES_BOARD( "",                         417, Mapper417_Init         )
 	INES_BOARD( "BS-400R/BS-4040",          422, Mapper422_Init         )
 	INES_BOARD( "Realtec 8090",             432, Mapper432_Init         )
 	INES_BOARD( "NC-20MB",                  433, Mapper433_Init         )
diff --git a/src/ines.h b/src/ines.h
index 884fd95..90f3fa6 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -298,6 +298,7 @@ void Mapper410_Init(CartInfo *);
 void Mapper411_Init(CartInfo *);
 void Mapper415_Init(CartInfo *);
 void Mapper416_Init(CartInfo *);
+void Mapper417_Init(CartInfo *);
 void Mapper421_Init(CartInfo *);
 void Mapper422_Init(CartInfo *);
 void Mapper428_Init(CartInfo *);

From 5e2c907acdd508061fb0c50eed1cd2153d812207 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sat, 12 Feb 2022 15:37:18 +0800
Subject: [PATCH 193/295] Sort mapper numbers

---
 src/ines.c | 111 +++++++++++++++++++++++++----------------------------
 1 file changed, 53 insertions(+), 58 deletions(-)

diff --git a/src/ines.c b/src/ines.c
index 8c9035d..c417a7a 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -553,7 +553,6 @@ INES_BOARD_BEGIN()
 /*    INES_BOARD( "",                            131, Mapper131_Init ) */
 	INES_BOARD( "TXC/UNL-22211",            132, Mapper132_Init         )
 	INES_BOARD( "SA72008",                  133, SA72008_Init           )
-/*    INES_BOARD( "MMC3 BMC PIRATE",            134, Mapper134_Init ) */
 	INES_BOARD( "MMC3 BMC PIRATE",          134, Bs5652_Init            )
 /*    INES_BOARD( "",                            135, Mapper135_Init ) */
 	INES_BOARD( "Sachen 3011",              136, Mapper136_Init         )
@@ -677,59 +676,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "",                         254, Mapper254_Init         )
 	INES_BOARD( "",                         255, Mapper255_Init         ) /* Duplicate of M225? */
 
-	/* NES 2.0 BOARDS THAT DO NOT HAVE UNIF ASSOCIATION */
-
-	INES_BOARD( "8-in-1 JY-119",            267, Mapper267_Init         )
-	INES_BOARD( "Games Xplosion 121-in-1",  269, Mapper269_Init         )
-	INES_BOARD( "YY860417C",                281, Mapper281_Init         )
-	INES_BOARD( "860224C",                  282, Mapper282_Init         )
-	INES_BOARD( "GKCX1",                    288, Mapper288_Init         )
-	INES_BOARD( "MMC3 BMC PIRATE",          294, Bs5652_Init ) /* nesdev redirects this as mapper 134 */
-	INES_BOARD( "TXC 01-22110-000",         297, Mapper297_Init         )
-	INES_BOARD( "5/20-in-1 1993 Copyright", 334, Mapper334_Init         )
-	INES_BOARD( "Super Mario Family",       353, Mapper353_Init         )
-	INES_BOARD( "7-in-1 Rockman (JY-208)",  356, Mapper356_Init         )
-	INES_BOARD( "Bit Corp 4-in-1",          357, Mapper357_Init         )
-	INES_BOARD( "SB-5013/GCL8050/841242C",  359, Mapper359_Init         )
-	INES_BOARD( "Bitcorp 31-in-1",          360, Mapper360_Init         )
-	INES_BOARD( "OK-411",                   361, GN45_Init              ) /* OK-411 is emulated together with GN-45 */
-	INES_BOARD( "JY830832C",                364, Mapper364_Init         )
-	INES_BOARD( "GN-45",                    366, GN45_Init              )
-	INES_BOARD( "Yung-08",                  368, Mapper368_Init              )
-	INES_BOARD( "Golden Mario Party II - Around the World 6-in-1",       370, Mapper370_Init         )
-	INES_BOARD( "MMC3 PIRATE SFC-12",       372, Mapper372_Init         )
-	INES_BOARD( "95/96 Super HiK 4-in-1",   374, Mapper374_Init         )
-	INES_BOARD( "YY841155C",                376, Mapper376_Init         )
-	INES_BOARD( "42 to 80,000 (970630C)",   380, Mapper380_Init         )
-	INES_BOARD( "KN-42",                    381, Mapper381_Init         )
-	INES_BOARD( "830928C",                  382, Mapper382_Init         )
-	INES_BOARD( "YY840708C",                383, Mapper383_Init         )
-	INES_BOARD( "Caltron 9-in-1",           389, Mapper389_Init         )
-	INES_BOARD( "Realtec 8031",             390, Mapper390_Init         )
-	INES_BOARD( "NewStar 12-in-1/7-in-1",   293, Mapper293_Init         )
-	INES_BOARD( "820720C",                  393, Mapper393_Init         )
-	INES_BOARD( "Realtec 8210",             395, Mapper395_Init         )
-	INES_BOARD( "BMC Super 19-in-1 (VIP19)",    401, Mapper401_Init         )
-	INES_BOARD( "89433",                    403, Mapper403_Init         )
-	INES_BOARD( "A88S-1",                   411, Mapper411_Init         )
-	INES_BOARD( "0353",                     415, Mapper415_Init         )
-	INES_BOARD( "4-in-1/N-32",              416, Mapper416_Init         )
-	INES_BOARD( "",                         417, Mapper417_Init         )
-	INES_BOARD( "BS-400R/BS-4040",          422, Mapper422_Init         )
-	INES_BOARD( "Realtec 8090",             432, Mapper432_Init         )
-	INES_BOARD( "NC-20MB",                  433, Mapper433_Init         )
-	INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init        )
-	INES_BOARD( "Sachen 3014",              533, Mapper533_Init         )
-	INES_BOARD( "NJ064",                    534, Mapper534_Init         )
-	INES_BOARD( "60-1064-16L (FDS)",        538, Mapper538_Init         )
-	INES_BOARD( "Kid Ikarus (FDS)",         539, Mapper539_Init         )
-	INES_BOARD( "82112C",                   540, Mapper540_Init         )
-	INES_BOARD( "LittleCom 160-in-1",       541, Mapper541_Init         )
-	INES_BOARD( "5-in-1 (CH-501)",          543, Mapper543_Init         )
-	INES_BOARD( "KS-7010",                  554, Mapper554_Init         )
-	INES_BOARD( "",                         550, Mapper550_Init         )
-
-	/* UNIF to NES 2.0 BOARDS */
+	/* NES 2.0 MAPPERS */
 
 	INES_BOARD( "OneBus",                   256, UNLOneBus_Init         )
 	INES_BOARD( "158B",                     258, UNL158B_Init           )
@@ -741,17 +688,24 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "YOKO",                     264, UNLYOKO_Init           )
 	INES_BOARD( "T-262",                    265, BMCT262_Init           )
 	INES_BOARD( "CITYFIGHT",                266, UNLCITYFIGHT_Init      )
+	INES_BOARD( "8-in-1 JY-119",            267, Mapper267_Init         )
 	INES_BOARD( "COOLBOY/MINDKIDS",         268, Mapper268_Init         ) /* Submapper distinguishes between COOLBOY and MINDKIDS */
+	INES_BOARD( "Games Xplosion 121-in-1",  269, Mapper269_Init         )
 	INES_BOARD( "80013-B",                  274, BMC80013B_Init         )
+	INES_BOARD( "YY860417C",                281, Mapper281_Init         )
+	INES_BOARD( "860224C",                  282, Mapper282_Init         )
 	INES_BOARD( "GS-2004/GS-2013",          283, Mapper283_Init         )
 	INES_BOARD( "A65AS",                    285, BMCA65AS_Init          )
 	INES_BOARD( "BS-5",                     286, BMCBS5_Init            )
-	INES_BOARD( "411120-C",                 287, BMC411120C_Init        )
-/*    INES_BOARD( "K-3088",                    287, BMCK3088_Init ) */
+	INES_BOARD( "411120-C, 811120-C",       287, BMC411120C_Init        )
+	INES_BOARD( "GKCX1",                    288, Mapper288_Init         )
 	INES_BOARD( "60311C",                   289, BMC60311C_Init         )
 	INES_BOARD( "NTD-03",                   290, BMCNTD03_Init          )
 	INES_BOARD( "DRAGONFIGHTER",            292, UNLBMW8544_Init        )
+	INES_BOARD( "NewStar 12-in-1/7-in-1",   293, Mapper293_Init         )
+	INES_BOARD( "MMC3 BMC PIRATE",          294, Bs5652_Init            ) /* nesdev redirects this as mapper 134 */
 	INES_BOARD( "YY860216C",                295, Mapper295_Init         )
+	INES_BOARD( "TXC 01-22110-000",         297, Mapper297_Init         )
 	INES_BOARD( "TF1201",                   298, UNLTF1201_Init         )
 	INES_BOARD( "11160",                    299, BMC11160_Init          )
 	INES_BOARD( "190in1",                   300, BMC190in1_Init         )
@@ -780,6 +734,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "12-IN-1",                  331, BMC12IN1_Init          )
 	INES_BOARD( "WS",                       332, BMCWS_Init             )
 	INES_BOARD( "NEWSTAR-GRM070-8IN1",      333, BMC8IN1_Init           )
+	INES_BOARD( "5/20-in-1 1993 Copyright", 334, Mapper334_Init         )
 	INES_BOARD( "CTC-09",                   335, BMCCTC09_Init          )
 	INES_BOARD( "K-3046",                   336, BMCK3046_Init          )
 	INES_BOARD( "CTC-12IN1",                337, BMCCTC12IN1_Init       )
@@ -794,22 +749,52 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "830118C",                  348, BMC830118C_Init        )
 	INES_BOARD( "G-146",                    349, BMCG146_Init           )
 	INES_BOARD( "891227",                   350, BMC891227_Init         )
+	INES_BOARD( "Super Mario Family",       353, Mapper353_Init         )
 	INES_BOARD( "3D-BLOCK",                 355, UNL3DBlock_Init        )
+	INES_BOARD( "7-in-1 Rockman (JY-208)",  356, Mapper356_Init         )
+	INES_BOARD( "Bit Corp 4-in-1",          357, Mapper357_Init         )
 	INES_BOARD( "YY860606C",                358, Mapper358_Init         )
+	INES_BOARD( "SB-5013/GCL8050/841242C",  359, Mapper359_Init         )
+	INES_BOARD( "Bitcorp 31-in-1",          360, Mapper360_Init         )
+	INES_BOARD( "OK-411",                   361, GN45_Init              ) /* OK-411 is emulated together with GN-45 */
+	INES_BOARD( "JY830832C",                364, Mapper364_Init         )
+	INES_BOARD( "GN-45",                    366, GN45_Init              )
+	INES_BOARD( "Yung-08",                  368, Mapper368_Init         )
 	INES_BOARD( "N49C-300",                 369, Mapper369_Init         )
+	INES_BOARD( "Golden Mario Party II - Around the World 6-in-1", 370, Mapper370_Init         )
+	INES_BOARD( "MMC3 PIRATE SFC-12",       372, Mapper372_Init         )
+	INES_BOARD( "95/96 Super HiK 4-in-1",   374, Mapper374_Init         )
+	INES_BOARD( "YY841155C",                376, Mapper376_Init         )
 	INES_BOARD( "JY-111/JY-112",            377, Mapper377_Init         )
+	INES_BOARD( "42 to 80,000 (970630C)",   380, Mapper380_Init         )
+	INES_BOARD( "KN-42",                    381, Mapper381_Init         )
+	INES_BOARD( "830928C",                  382, Mapper382_Init         )
+	INES_BOARD( "YY840708C",                383, Mapper383_Init         )
 	INES_BOARD( "YY860729C",                386, Mapper386_Init         )
 	INES_BOARD( "YY850735C",                387, Mapper387_Init         )
 	INES_BOARD( "YY850835C",                388, Mapper388_Init         )
+	INES_BOARD( "Caltron 9-in-1",           389, Mapper389_Init         )
+	INES_BOARD( "Realtec 8031",             390, Mapper390_Init         )
 	INES_BOARD( "BS-110",                   391, Mapper391_Init         )
+	INES_BOARD( "820720C",                  393, Mapper393_Init         )
+	INES_BOARD( "Realtec 8210",             395, Mapper395_Init         )
     INES_BOARD( "YY850437C",                396, Mapper396_Init         )
 	INES_BOARD( "YY850439C",                397, Mapper397_Init         )
+	INES_BOARD( "BMC Super 19-in-1 (VIP19)", 401, Mapper401_Init         )
 	INES_BOARD( "831019C J-2282",           402, J2282_Init             )
-	INES_BOARD( "JY012005",                 404, Mapper404_Init             )
-	INES_BOARD( "JY-302",                   410, Mapper410_Init             )
+	INES_BOARD( "89433",                    403, Mapper403_Init         )
+	INES_BOARD( "JY012005",                 404, Mapper404_Init         )
+	INES_BOARD( "JY-302",                   410, Mapper410_Init         )
+	INES_BOARD( "A88S-1",                   411, Mapper411_Init         )
+	INES_BOARD( "0353",                     415, Mapper415_Init         )
+	INES_BOARD( "4-in-1/N-32",              416, Mapper416_Init         )
+	INES_BOARD( "",                         417, Mapper417_Init         )
 	INES_BOARD( "SC871115C",                421, Mapper421_Init         )
+	INES_BOARD( "BS-400R/BS-4040",          422, Mapper422_Init         )
 	INES_BOARD( "AB-G1L/WELL-NO-DG450",     428, Mapper428_Init         )
 	INES_BOARD( "LIKO BBG-235-8-1B",        429, Mapper429_Init         )
+	INES_BOARD( "Realtec 8090",             432, Mapper432_Init         )
+	INES_BOARD( "NC-20MB",                  433, Mapper433_Init         )
 	INES_BOARD( "S-009",                    434, Mapper434_Init         )
 	INES_BOARD( "820401/T-217",             436, Mapper436_Init         )
 	INES_BOARD( "NTDEC TH2348",             437, Mapper437_Init         )
@@ -819,6 +804,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "DS-9-27",                  452, Mapper452_Init         )
 	INES_BOARD( "K6C3001A",                 456, Mapper456_Init         )
 	INES_BOARD( "SA-9602B",                 513, SA9602B_Init           )
+	INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init        )
 	INES_BOARD( "DANCE2000",                518, UNLD2000_Init          )
 	INES_BOARD( "EH8813A",                  519, UNLEH8813A_Init        )
 	INES_BOARD( "DREAMTECH01",              521, DreamTech01_Init       )
@@ -830,8 +816,17 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "AX-40G",                   527, UNLAX40G_Init          )
 	INES_BOARD( "T-230",                    529, UNLT230_Init           )
 	INES_BOARD( "AX5705",                   530, UNLAX5705_Init         )
+	INES_BOARD( "Sachen 3014",              533, Mapper533_Init         )
+	INES_BOARD( "NJ064",                    534, Mapper534_Init         )
 	INES_BOARD( "LH53",                     535, LH53_Init              )
+	INES_BOARD( "60-1064-16L (FDS)",        538, Mapper538_Init         )
+	INES_BOARD( "Kid Ikarus (FDS)",         539, Mapper539_Init         )
+	INES_BOARD( "82112C",                   540, Mapper540_Init         )
+	INES_BOARD( "LittleCom 160-in-1",       541, Mapper541_Init         )
+	INES_BOARD( "5-in-1 (CH-501)",          543, Mapper543_Init         )
 	INES_BOARD( "SACHEN 3013",              553, Mapper553_Init         )
+	INES_BOARD( "KS-7010",                  554, Mapper554_Init         )
+	INES_BOARD( "",                         550, Mapper550_Init         )
 	INES_BOARD( "YC-03-09",                 558, Mapper558_Init         )
 INES_BOARD_END()
 

From 55639a156ab18c75c55189e518c573c2e5f65495 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sat, 12 Feb 2022 16:13:05 +0800
Subject: [PATCH 194/295] Cleanup some includes

---
 src/boards/162.c           | 1 -
 src/boards/163.c           | 1 -
 src/boards/218.c           | 1 -
 src/boards/235.c           | 1 -
 src/boards/283.c           | 1 -
 src/boards/558.c           | 1 -
 src/boards/addrlatch.c     | 1 -
 src/boards/bmc80013b.c     | 1 -
 src/boards/cheapocabra.c   | 1 -
 src/boards/datalatch.c     | 1 -
 src/boards/hp10xx_hp20xx.c | 1 -
 src/boards/mapinc.h        | 1 +
 src/boards/unrom512.c      | 1 -
 13 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/boards/162.c b/src/boards/162.c
index c2a44e3..676b44f 100644
--- a/src/boards/162.c
+++ b/src/boards/162.c
@@ -23,7 +23,6 @@
 /* Waixing FS304 PCB */
 
 #include "mapinc.h"
-#include "../ines.h"
 
 static uint8 *WRAM;
 static uint32 WRAMSIZE;
diff --git a/src/boards/163.c b/src/boards/163.c
index f8da4ff..9709255 100644
--- a/src/boards/163.c
+++ b/src/boards/163.c
@@ -23,7 +23,6 @@
 /* Nanjing FC-001 PCB */
 
 #include "mapinc.h"
-#include "../ines.h"
 
 static uint8 *WRAM;
 static uint32 WRAMSIZE;
diff --git a/src/boards/218.c b/src/boards/218.c
index 84892d3..88d3e11 100644
--- a/src/boards/218.c
+++ b/src/boards/218.c
@@ -19,7 +19,6 @@
  */
 
 #include "mapinc.h"
-#include "../ines.h"
 
 static void M218Power(void) {
 	setchr8(0);
diff --git a/src/boards/235.c b/src/boards/235.c
index b823666..f64b138 100644
--- a/src/boards/235.c
+++ b/src/boards/235.c
@@ -20,7 +20,6 @@
  */
 
 #include "mapinc.h"
-#include "../ines.h"
 
 static uint8 *CHRRAM;
 static uint32 CHRRAMSIZE;
diff --git a/src/boards/283.c b/src/boards/283.c
index c3dba2b..7d9eaef 100644
--- a/src/boards/283.c
+++ b/src/boards/283.c
@@ -19,7 +19,6 @@
  */
 
 #include "mapinc.h"
-#include "../ines.h"
 
 static uint8 reg, mirr;
 static SFORMAT StateRegs[] =
diff --git a/src/boards/558.c b/src/boards/558.c
index c509ba5..9be3ed1 100644
--- a/src/boards/558.c
+++ b/src/boards/558.c
@@ -24,7 +24,6 @@
 
 #include "mapinc.h"
 #include "eeprom_93C66.h"
-#include "../ines.h"
 
 static uint8 *WRAM;
 static uint32 WRAMSIZE;
diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c
index 10eef4d..9273341 100644
--- a/src/boards/addrlatch.c
+++ b/src/boards/addrlatch.c
@@ -19,7 +19,6 @@
  */
 
 #include "mapinc.h"
-#include "../ines.h"
 
 static uint16 latche, latcheinit;
 static uint16 addrreg0, addrreg1;
diff --git a/src/boards/bmc80013b.c b/src/boards/bmc80013b.c
index a58c77d..6bd8460 100644
--- a/src/boards/bmc80013b.c
+++ b/src/boards/bmc80013b.c
@@ -24,7 +24,6 @@
  /* 2020-03-22 - Update support for Cave Story II, FIXME: Arabian does not work for some reasons... */
 
 #include "mapinc.h"
-#include "../ines.h"
 
 static uint8 regs[2], mode;
 
diff --git a/src/boards/cheapocabra.c b/src/boards/cheapocabra.c
index 7730941..4535986 100644
--- a/src/boards/cheapocabra.c
+++ b/src/boards/cheapocabra.c
@@ -31,7 +31,6 @@
  */
 
 #include "mapinc.h"
-#include "../ines.h"
 
 static uint8 reg;
 static uint8 *CHRRAM = NULL;
diff --git a/src/boards/datalatch.c b/src/boards/datalatch.c
index 08e0c01..c86d585 100644
--- a/src/boards/datalatch.c
+++ b/src/boards/datalatch.c
@@ -19,7 +19,6 @@
  */
 
 #include "mapinc.h"
-#include "../ines.h"
 #include "../fds_apu.h"
 
 static uint8 latche, latcheinit, bus_conflict;
diff --git a/src/boards/hp10xx_hp20xx.c b/src/boards/hp10xx_hp20xx.c
index c18c9d1..496c1e0 100644
--- a/src/boards/hp10xx_hp20xx.c
+++ b/src/boards/hp10xx_hp20xx.c
@@ -20,7 +20,6 @@
 
 #include "mapinc.h"
 #include "mmc3.h"
-#include "../ines.h"
 
 /* added on 2019-5-23 - NES 2.0 Mapper 260
  * HP10xx/HP20xx - a simplified version of FK23C mapper with pretty strict and better
diff --git a/src/boards/mapinc.h b/src/boards/mapinc.h
index 8376a0c..ba3964d 100644
--- a/src/boards/mapinc.h
+++ b/src/boards/mapinc.h
@@ -8,4 +8,5 @@
 #include "../cart.h"
 #include "../cheat.h"
 #include "../unif.h"
+#include "../ines.h"
 #include <string.h>
diff --git a/src/boards/unrom512.c b/src/boards/unrom512.c
index 3a1961f..ca3f63b 100644
--- a/src/boards/unrom512.c
+++ b/src/boards/unrom512.c
@@ -35,7 +35,6 @@
 */
 
 #include "mapinc.h"
-#include "../ines.h"
 
 /* Workaround for libretro api compatibility */
 #define ROM_size_max                32

From 690862829ab797d27d8bedb108394bffb4fc58bd Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sat, 12 Feb 2022 16:37:04 +0800
Subject: [PATCH 195/295] mmc3: Make some variables static

---
 src/boards/mmc3.c | 15 ++++++---------
 src/boards/mmc3.h |  6 ------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/boards/mmc3.c b/src/boards/mmc3.c
index 25e6f51..d2c905d 100644
--- a/src/boards/mmc3.c
+++ b/src/boards/mmc3.c
@@ -28,20 +28,17 @@
 #include "mmc3.h"
 
 uint8 MMC3_cmd;
-uint8 *WRAM;
-uint32 WRAMSIZE;
-uint8 *CHRRAM;
-uint32 CHRRAMSIZE;
+static uint8 *WRAM;
+static uint32 WRAMSIZE;
+static uint8 *CHRRAM;
+static uint32 CHRRAMSIZE;
 uint8 DRegBuf[8];
 uint8 EXPREGS[8];	/* For bootleg games, mostly. */
 uint8 A000B, A001B;
 uint8 mmc3opts = 0;
 
-#undef IRQCount
-#undef IRQLatch
-#undef IRQa
-uint8 IRQCount, IRQLatch, IRQa;
-uint8 IRQReload;
+static uint8 IRQCount, IRQLatch, IRQa;
+static uint8 IRQReload;
 
 static SFORMAT MMC3_StateRegs[] =
 {
diff --git a/src/boards/mmc3.h b/src/boards/mmc3.h
index 2479f9d..b29a53e 100644
--- a/src/boards/mmc3.h
+++ b/src/boards/mmc3.h
@@ -8,12 +8,6 @@ extern uint8 A001B;
 extern uint8 EXPREGS[8];
 extern uint8 DRegBuf[8];
 
-#undef IRQCount
-#undef IRQLatch
-#undef IRQa
-extern uint8 IRQCount, IRQLatch, IRQa;
-extern uint8 IRQReload;
-
 extern void (*pwrap)(uint32 A, uint8 V);
 extern void (*cwrap)(uint32 A, uint8 V);
 extern void (*mwrap)(uint8 V);

From dbba42e984042700fa463a0be57cc70c842b4751 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sun, 13 Feb 2022 21:19:47 +0800
Subject: [PATCH 196/295] Update m121

---
 src/boards/121.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/boards/121.c b/src/boards/121.c
index be70aaf..b09a614 100644
--- a/src/boards/121.c
+++ b/src/boards/121.c
@@ -56,15 +56,11 @@ static void M121CW(uint32 A, uint8 V) {
 }
 
 static void M121PW(uint32 A, uint8 V) {
+	setprg8(A, (V & 0x1F) | ((EXPREGS[3] & 0x80) >> 2));
 	if (EXPREGS[5] & 0x3F) {
-/*		FCEU_printf("prot banks: %02x %02x %02x %02x\n",V,EXPREGS[2],EXPREGS[1],EXPREGS[0]); */
-		setprg8(A, (V & 0x1F) | ((EXPREGS[3] & 0x80) >> 2));
 		setprg8(0xE000, (EXPREGS[0]) | ((EXPREGS[3] & 0x80) >> 2));
 		setprg8(0xC000, (EXPREGS[1]) | ((EXPREGS[3] & 0x80) >> 2));
 		setprg8(0xA000, (EXPREGS[2]) | ((EXPREGS[3] & 0x80) >> 2));
-	} else {
-/*		FCEU_printf("gen banks: %04x %02x\n",A,V); */
-		setprg8(A, (V & 0x1F) | ((EXPREGS[3] & 0x80) >> 2));
 	}
 }
 

From a1ca113b3444523c656fd1016a29f2f54a75c017 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Mon, 14 Feb 2022 16:11:58 +0800
Subject: [PATCH 197/295] m208: Add support for submapper 1

---
 src/boards/208.c | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/boards/208.c b/src/boards/208.c
index 95230a2..5088e7b 100644
--- a/src/boards/208.c
+++ b/src/boards/208.c
@@ -2,6 +2,7 @@
  *
  * Copyright notice for this file:
  *  Copyright (C) 2005 CaH4e3
+ *  Copyright (C) 2022 negativeExponent
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,10 +18,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
+ 
+ /* 2022-2-14
+  * - add support for submapper 1, Mortal Kombat (JJ-01) (Ch) [!]
+  * - add mirroring
+  */
 
 #include "mapinc.h"
 #include "mmc3.h"
 
+static uint8 submapper;
+
 static const uint8 lut[256] = {
 	0x59, 0x59, 0x59, 0x59, 0x59, 0x59, 0x59, 0x59, 0x59, 0x49, 0x19, 0x09, 0x59, 0x49, 0x19, 0x09,
 	0x59, 0x59, 0x59, 0x59, 0x59, 0x59, 0x59, 0x59, 0x51, 0x41, 0x11, 0x01, 0x51, 0x41, 0x11, 0x01,
@@ -41,11 +49,21 @@ static const uint8 lut[256] = {
 };
 
 static void M208PW(uint32 A, uint8 V) {
-	setprg32(0x8000, EXPREGS[5]);
+	if (submapper == 1)
+		setprg32(0x8000, DRegBuf[6] >> 2);
+	else
+		setprg32(0x8000, (EXPREGS[5] & 0x1) | ((EXPREGS[5] >> 3) & 0x2));
+}
+
+static void M208MW(uint8 V) {
+	if (submapper == 1)
+		setmirror((V & 1) ^ 1);
+	else
+		setmirror(((EXPREGS[5] >> 5) & 1) ^ 1);
 }
 
 static DECLFW(M208Write) {
-	EXPREGS[5] = (V & 0x1) | ((V >> 3) & 0x2);
+	EXPREGS[5] = V;
 	FixMMC3PRG(MMC3_cmd);
 }
 
@@ -61,7 +79,7 @@ static DECLFR(M208ProtRead) {
 }
 
 static void M208Power(void) {
-	EXPREGS[5] = 3;
+	EXPREGS[5] = 0x11;
 	GenMMC3Power();
 	SetWriteHandler(0x4800, 0x4fff, M208Write);
 	SetWriteHandler(0x6800, 0x6fff, M208Write);
@@ -73,6 +91,8 @@ static void M208Power(void) {
 void Mapper208_Init(CartInfo *info) {
 	GenMMC3_Init(info, 128, 256, 0, 0);
 	pwrap = M208PW;
+	mwrap = M208MW;
 	info->Power = M208Power;
 	AddExState(EXPREGS, 6, 0, "EXPR");
+	submapper = info->submapper;
 }

From 324b85f1072d70d40d742c9f6ee5998b519283d5 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Tue, 15 Feb 2022 16:51:55 +0800
Subject: [PATCH 198/295] Add mappers 272, 291, 409, 414, 431

Add mapper 272

Add mapper 291

Add mapper 409

Add mapper 414

Add mapper 431
---
 src/boards/272.c       | 179 +++++++++++++++++++++++++++++++++++++++++
 src/boards/291.c       |  59 ++++++++++++++
 src/boards/414.c       |  64 +++++++++++++++
 src/boards/431.c       |  62 ++++++++++++++
 src/boards/addrlatch.c |  11 +++
 src/ines.c             |   5 ++
 src/ines.h             |   5 ++
 7 files changed, 385 insertions(+)
 create mode 100644 src/boards/272.c
 create mode 100644 src/boards/291.c
 create mode 100644 src/boards/414.c
 create mode 100644 src/boards/431.c

diff --git a/src/boards/272.c b/src/boards/272.c
new file mode 100644
index 0000000..923f544
--- /dev/null
+++ b/src/boards/272.c
@@ -0,0 +1,179 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * NES 2.0 Mapper 272 is used for a bootleg implementation of
+ * 悪魔城 Special: ぼくDracula君 (Akumajō Special: Boku Dracula-kun).
+ *
+ * as implemented from
+ * https://forums.nesdev.org/viewtopic.php?f=9&t=15302&start=60#p205862
+ *
+ */
+
+#include "mapinc.h"
+
+static uint8 prg[2];
+static uint8 chr[8];
+static uint8 mirr;
+static uint8 pal_mirr;
+static uint8 last_pa13;
+static uint8 IRQCount;
+static uint8 IRQa;
+
+static SFORMAT StateRegs[] =
+{
+	{ prg, 2, "PRG" },
+	{ chr, 8, "CHR" },
+	{ &mirr, 1, "MIRR" },
+	{ &last_pa13, 1, "PA13" },
+	{ &IRQCount, 1, "CNTR" },
+	{ &pal_mirr, 1, "PALM" },
+	{ &IRQa, 1, "CCLK" },
+	{ 0 }
+};
+
+/* shifts bit from position `bit` into position `pos` of expression `exp` */
+#define shi(exp, bit, pos) \
+	((((exp) & (1 << (bit))) >> (bit)) << (pos))
+
+static uint32 vrc_addr_mix(uint32 A) {
+	/* this game wires A0 to VRC_A0 and A1 to VRC_A1 */
+	return (A & 0xf000) | shi(A, 0, 0) | shi(A, 1, 1);
+}
+
+static void Sync(void) {
+	uint8 i;
+	setprg8(0x8000, prg[0]);
+	setprg8(0xa000, prg[1]);
+	setprg16(0xc000, -1);	
+	for (i = 0; i < 8; ++i)
+		setchr1(0x400 * i, chr[i]);
+	switch (pal_mirr) {
+	case 2: setmirror(MI_0); break;
+	case 3: setmirror(MI_1); break;
+	default: 
+		switch (mirr) {
+		case 0: setmirror(MI_V); break;
+		case 1: setmirror(MI_H); break;
+		}
+	}
+}
+
+static DECLFW(M272Write) {
+	/* writes to VRC chip */
+	switch (vrc_addr_mix(A)) {
+	case 0x8000:
+	case 0x8001:
+	case 0x8002:
+	case 0x8003:
+		prg[0] = V;
+		break;
+	case 0x9000:
+	case 0x9001:
+	case 0x9002:
+	case 0x9003:
+		mirr = V & 1;
+		break;
+	case 0xA000:
+	case 0xA001:
+	case 0xA002:
+	case 0xA003:
+		prg[1] = V;
+		break;
+	case 0xb000: chr[0] = (chr[0] & 0xF0) | (V & 0xF); break;
+	case 0xb001: chr[0] = (chr[0] & 0xF) | ((V & 0xF) << 4); break;
+	case 0xb002: chr[1] = (chr[1] & 0xF0) | (V & 0xF); break;
+	case 0xb003: chr[1] = (chr[1] & 0xF) | ((V & 0xF) << 4); break;
+	case 0xc000: chr[2] = (chr[2] & 0xF0) | (V & 0xF); break;
+	case 0xc001: chr[2] = (chr[2] & 0xF) | ((V & 0xF) << 4); break;
+	case 0xc002: chr[3] = (chr[3] & 0xF0) | (V & 0xF); break;
+	case 0xc003: chr[3] = (chr[3] & 0xF) | ((V & 0xF) << 4); break;
+	case 0xd000: chr[4] = (chr[4] & 0xF0) | (V & 0xF); break;
+	case 0xd001: chr[4] = (chr[4] & 0xF) | ((V & 0xF) << 4); break;
+	case 0xd002: chr[5] = (chr[5] & 0xF0) | (V & 0xF); break;
+	case 0xd003: chr[5] = (chr[5] & 0xF) | ((V & 0xF) << 4); break;
+	case 0xe000: chr[6] = (chr[6] & 0xF0) | (V & 0xF); break;
+	case 0xe001: chr[6] = (chr[6] & 0xF) | ((V & 0xF) << 4); break;
+	case 0xe002: chr[7] = (chr[7] & 0xF0) | (V & 0xF); break;
+	case 0xe003: chr[7] = (chr[7] & 0xF) | ((V & 0xF) << 4); break;
+		
+	default:
+		break;
+	}
+
+	/* writes to PAL chip */
+	switch (A & 0xC00C) {
+	case 0x8004: pal_mirr = V & 3; break;
+	case 0x800c: X6502_IRQBegin(FCEU_IQEXT); break;
+	case 0xc004: X6502_IRQEnd(FCEU_IQEXT); break;
+	case 0xc008: IRQa = 1; break;
+	case 0xc00c: IRQa = 0; IRQCount = 0; X6502_IRQEnd(FCEU_IQEXT); break;
+	}
+
+	Sync();
+}
+
+static void M272Power(void) {
+	prg[0] = prg[1] = 0;
+	chr[0] = chr[1] = chr[2] = chr[3] = 0;
+	chr[4] = chr[5] = chr[6] = chr[7] = 0;
+	mirr = pal_mirr = 0;
+	last_pa13 = 0;
+	IRQCount = 0;
+	IRQa = 0;
+	Sync();
+	SetWriteHandler(0x8000, 0xFFFF, M272Write);
+	SetReadHandler(0x8000, 0xFFFF, CartBR);
+}
+
+static void M272Hook(uint32 A) {
+	uint8 pa13 = (A >> 13) & 1;
+	if ((last_pa13 == 1) && (pa13 == 0)) {
+		if (IRQa) {
+			IRQCount++;
+			if (IRQCount == 84) {
+				IRQCount = 0;
+				X6502_IRQBegin(FCEU_IQEXT);
+			}
+		}
+	}
+	last_pa13 = pa13;
+}
+
+static void M272Reset(void) {
+	prg[0] = prg[1] = 0;
+	chr[0] = chr[1] = chr[2] = chr[3] = 0;
+	chr[4] = chr[5] = chr[6] = chr[7] = 0;
+	mirr = pal_mirr = 0;
+	last_pa13 = 0;
+	IRQCount = 0;
+	IRQa = 0;
+	Sync();
+}
+
+static void StateRestore(int version) {
+	Sync();
+}
+
+void Mapper272_Init(CartInfo *info) {
+	info->Power = M272Power;
+	info->Reset = M272Reset;
+	PPU_hook = M272Hook;
+	GameStateRestore = StateRestore;
+	AddExState(&StateRegs, ~0, 0, 0);
+}
diff --git a/src/boards/291.c b/src/boards/291.c
new file mode 100644
index 0000000..da6f7ab
--- /dev/null
+++ b/src/boards/291.c
@@ -0,0 +1,59 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static void M291CW(uint32 A, uint8 V) {
+	setchr1(A, V | ((EXPREGS[0] << 2) & 0x100));
+}
+
+static void M291PW(uint32 A, uint8 V) {
+	if (EXPREGS[0] & 0x20)
+		setprg32(0x8000, ((EXPREGS[0] >> 1) & 3) | ((EXPREGS[0] >> 4) & 4));
+	else
+		setprg8(A, (V & 0x0F) |  ((EXPREGS[0] >> 2) & 0x10));
+}
+
+static DECLFW(M291Write) {
+	EXPREGS[0] = V;
+	FixMMC3PRG(MMC3_cmd);
+	FixMMC3CHR(MMC3_cmd);
+}
+
+static void M291Reset(void) {
+	EXPREGS[0] = 0;
+	MMC3RegReset();
+}
+
+static void M291Power(void) {
+	EXPREGS[0] = 0;
+	GenMMC3Power();
+	SetWriteHandler(0x6000, 0x7FFF, M291Write);
+}
+
+void Mapper291_Init(CartInfo *info) {
+	GenMMC3_Init(info, 256, 512, 0, 0);
+	cwrap = M291CW;
+	pwrap = M291PW;
+	info->Power = M291Power;
+	info->Reset = M291Reset;
+	AddExState(EXPREGS, 1, 0, "EXPR");
+}
diff --git a/src/boards/414.c b/src/boards/414.c
new file mode 100644
index 0000000..79ff817
--- /dev/null
+++ b/src/boards/414.c
@@ -0,0 +1,64 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "mapinc.h"
+
+static uint8 latch_data;
+static uint32 latch_addr;
+
+static SFORMAT StateRegs[] =
+{
+	{ &latch_addr, 4, "ADDR" },
+	{ &latch_data, 1, "DATA" },
+	{ 0 }
+};
+
+static void Sync(void) {
+	if (latch_addr & 0x2000) { /* NROM-256 */
+		setprg32(0x8000, latch_addr >> 2);
+	} else { /* NROM-128 */
+		setprg16(0x8000, latch_addr >> 1);
+		setprg16(0xC000, latch_addr >> 1);
+	}
+	setchr8(latch_data);
+	setmirror((latch_data & 1) ^ 1);
+}
+
+static DECLFW(M414Write) {
+	latch_addr = A;
+	latch_data = V & CartBR(A);
+	Sync();
+}
+
+static void M414Power(void) {
+	Sync();
+	SetReadHandler(0x8000, 0xFFFF, CartBR);
+	SetWriteHandler(0x8000, 0xFFFF, M414Write);
+}
+
+static void StateRestore(int version) {
+	Sync();
+}
+
+void Mapper414_Init(CartInfo *info) {
+	info->Power = M414Power;
+	GameStateRestore = StateRestore;
+	AddExState(&StateRegs, ~0, 0, 0);
+}
diff --git a/src/boards/431.c b/src/boards/431.c
new file mode 100644
index 0000000..11a987f
--- /dev/null
+++ b/src/boards/431.c
@@ -0,0 +1,62 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "mapinc.h"
+
+static uint8 inner_bank;
+static uint8 outer_bank;
+
+static SFORMAT StateRegs[] =
+{
+	{ &outer_bank, 1, "OUTB" },
+	{ &inner_bank, 1, "INNB" },
+	{ 0 }
+};
+
+static void Sync(void) {
+	setprg16(0x8000, ((outer_bank >> 2) & ~7) | (inner_bank & 7));
+	setprg16(0xC000, ((outer_bank >> 2) & ~7) | 7);
+	setchr8(0);
+	setmirror((outer_bank & 1) ^ 1);
+}
+
+static DECLFW(M431Write) {
+	if (A < 0xC000) outer_bank = V;
+    else inner_bank = V;
+	Sync();
+}
+
+static void M431Power(void) {
+    inner_bank = 0;
+    outer_bank = 0;
+	Sync();
+	SetReadHandler(0x8000, 0xFFFF, CartBR);
+	SetWriteHandler(0x8000, 0xFFFF, M431Write);
+}
+
+static void StateRestore(int version) {
+	Sync();
+}
+
+void Mapper431_Init(CartInfo *info) {
+	info->Power = M431Power;
+	GameStateRestore = StateRestore;
+	AddExState(&StateRegs, ~0, 0, 0);
+}
diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c
index 9273341..43946bf 100644
--- a/src/boards/addrlatch.c
+++ b/src/boards/addrlatch.c
@@ -704,3 +704,14 @@ void J2282_Init(CartInfo *info)
 {
     Latch_Init(info, J2282Sync, NULL, 0x0000, 0x8000, 0xFFFF, 0);
 }
+
+/* -------------- Mapper 409 ------------------------ */
+static void M409Sync(void) {
+	setprg16(0x8000, latche);
+	setprg16(0xC000, ~0);
+	setchr8(0);
+}
+
+void Mapper409_Init(CartInfo *info) {
+	Latch_Init(info, M409Sync, NULL, 0x0000, 0xC000, 0xCFFF, 0);
+}
diff --git a/src/ines.c b/src/ines.c
index c417a7a..575ac88 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -691,6 +691,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "8-in-1 JY-119",            267, Mapper267_Init         )
 	INES_BOARD( "COOLBOY/MINDKIDS",         268, Mapper268_Init         ) /* Submapper distinguishes between COOLBOY and MINDKIDS */
 	INES_BOARD( "Games Xplosion 121-in-1",  269, Mapper269_Init         )
+	INES_BOARD( "Akumajō Special: Boku Dracula-kun", 272, Mapper272_Init         )
 	INES_BOARD( "80013-B",                  274, BMC80013B_Init         )
 	INES_BOARD( "YY860417C",                281, Mapper281_Init         )
 	INES_BOARD( "860224C",                  282, Mapper282_Init         )
@@ -701,6 +702,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "GKCX1",                    288, Mapper288_Init         )
 	INES_BOARD( "60311C",                   289, BMC60311C_Init         )
 	INES_BOARD( "NTD-03",                   290, BMCNTD03_Init          )
+	INES_BOARD( "Kasheng 2-in-1 ",          291, Mapper291_Init         )
 	INES_BOARD( "DRAGONFIGHTER",            292, UNLBMW8544_Init        )
 	INES_BOARD( "NewStar 12-in-1/7-in-1",   293, Mapper293_Init         )
 	INES_BOARD( "MMC3 BMC PIRATE",          294, Bs5652_Init            ) /* nesdev redirects this as mapper 134 */
@@ -784,8 +786,10 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "831019C J-2282",           402, J2282_Init             )
 	INES_BOARD( "89433",                    403, Mapper403_Init         )
 	INES_BOARD( "JY012005",                 404, Mapper404_Init         )
+	INES_BOARD( "retroUSB DPCMcart",        409, Mapper409_Init         )
 	INES_BOARD( "JY-302",                   410, Mapper410_Init         )
 	INES_BOARD( "A88S-1",                   411, Mapper411_Init         )
+	INES_BOARD( "9999999-in-1",             414, Mapper414_Init         )
 	INES_BOARD( "0353",                     415, Mapper415_Init         )
 	INES_BOARD( "4-in-1/N-32",              416, Mapper416_Init         )
 	INES_BOARD( "",                         417, Mapper417_Init         )
@@ -793,6 +797,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "BS-400R/BS-4040",          422, Mapper422_Init         )
 	INES_BOARD( "AB-G1L/WELL-NO-DG450",     428, Mapper428_Init         )
 	INES_BOARD( "LIKO BBG-235-8-1B",        429, Mapper429_Init         )
+	INES_BOARD( "Realtek GN-91B",           431, Mapper431_Init         )
 	INES_BOARD( "Realtec 8090",             432, Mapper432_Init         )
 	INES_BOARD( "NC-20MB",                  433, Mapper433_Init         )
 	INES_BOARD( "S-009",                    434, Mapper434_Init         )
diff --git a/src/ines.h b/src/ines.h
index 90f3fa6..0671d68 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -247,9 +247,11 @@ void Mapper254_Init(CartInfo *);
 void Mapper255_Init(CartInfo *);
 
 void GN45_Init(CartInfo *info); /* m361, m366 */
+void Mapper272_Init(CartInfo *);
 void Mapper281_Init(CartInfo *);
 void Mapper282_Init(CartInfo *);
 void Mapper283_Init(CartInfo *);
+void Mapper291_Init(CartInfo *);
 void Mapper295_Init(CartInfo *);
 
 void Bs5652_Init(CartInfo *);
@@ -294,8 +296,10 @@ void Mapper397_Init(CartInfo *);
 void Mapper401_Init(CartInfo *);
 void Mapper403_Init(CartInfo *);
 void Mapper404_Init(CartInfo *);
+void Mapper409_Init(CartInfo *);
 void Mapper410_Init(CartInfo *);
 void Mapper411_Init(CartInfo *);
+void Mapper414_Init(CartInfo *);
 void Mapper415_Init(CartInfo *);
 void Mapper416_Init(CartInfo *);
 void Mapper417_Init(CartInfo *);
@@ -303,6 +307,7 @@ void Mapper421_Init(CartInfo *);
 void Mapper422_Init(CartInfo *);
 void Mapper428_Init(CartInfo *);
 void Mapper429_Init(CartInfo *);
+void Mapper431_Init(CartInfo *);
 void Mapper432_Init(CartInfo *);
 void Mapper433_Init(CartInfo *);
 void Mapper434_Init(CartInfo *);

From c3accb2e947dd3bc415083bc0d75677bc10389df Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 15 Feb 2022 20:44:25 +0100
Subject: [PATCH 199/295] Mapper 414: Correct mirroring selection

---
 src/boards/414.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/boards/414.c b/src/boards/414.c
index 79ff817..546e94a 100644
--- a/src/boards/414.c
+++ b/src/boards/414.c
@@ -38,7 +38,7 @@ static void Sync(void) {
 		setprg16(0xC000, latch_addr >> 1);
 	}
 	setchr8(latch_data);
-	setmirror((latch_data & 1) ^ 1);
+	setmirror((latch_addr & 1) ^ 1);
 }
 
 static DECLFW(M414Write) {

From 8f194ab38c60f602aae817906e861586a43708c6 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 15 Feb 2022 20:51:43 +0100
Subject: [PATCH 200/295] Mapper 396: Take mirroring selection from the correct
 register

---
 src/boards/396.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/boards/396.c b/src/boards/396.c
index 5b58694..434cb48 100644
--- a/src/boards/396.c
+++ b/src/boards/396.c
@@ -32,7 +32,7 @@ static void Sync (void) {
 	setprg16(0x8000, reg[1] << 3 | reg[0] & 7);
 	setprg16(0xC000, reg[1] << 3 | 7);
 	setchr8(0);
-	setmirror(((reg[0] >> 6) & 1) ^ 1);
+	setmirror(((reg[1] >> 6) & 1) ^ 1);
 }
 
 static DECLFW(M396WriteInnerBank) {

From c375bb098f61d64abaa3f0ad56f00151d5d47441 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 15 Feb 2022 20:54:55 +0100
Subject: [PATCH 201/295] Mapper 396: GN-51 uses a different bit for mirroring
 selection

---
 src/boards/396.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/boards/396.c b/src/boards/396.c
index 434cb48..002267f 100644
--- a/src/boards/396.c
+++ b/src/boards/396.c
@@ -32,7 +32,7 @@ static void Sync (void) {
 	setprg16(0x8000, reg[1] << 3 | reg[0] & 7);
 	setprg16(0xC000, reg[1] << 3 | 7);
 	setchr8(0);
-	setmirror(((reg[1] >> 6) & 1) ^ 1);
+	setmirror(reg[1] &0x60? 0: 1);
 }
 
 static DECLFW(M396WriteInnerBank) {

From f39506365a6cfa4de67129e6ec0d6237d8d29564 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 15 Feb 2022 21:02:06 +0100
Subject: [PATCH 202/295] Mapper 554: Correct CHR bank selection during opening

---
 src/boards/554.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/boards/554.c b/src/boards/554.c
index bbb4796..7559a83 100644
--- a/src/boards/554.c
+++ b/src/boards/554.c
@@ -43,17 +43,18 @@ static void Sync(void) {
 }
 
 static DECLFR(M554Read) {
-    if ((A >= 0xCAB6) && (A < 0xCAD7))
+    int A1 = A &~1;
+    if ((A >= 0xCAB6) && (A <= 0xCAD7))
     {
         reg = (A >> 2) & 0x0F;
         Sync();
     }
-    else if ((A == 0xEBE2) || (A == 0xEE32))
+    else if ((A1 == 0xEBE2) || (A1 == 0xEE32))
     {
         reg = (A >> 2) & 0x0F;
         Sync();
     }
-    else if (A == 0xFFFC)
+    else if (A1 == 0xFFFC)
     {
         reg = (A >> 2) & 0x0F;
         Sync();

From 69d3723c37d52430e0284e4e94bf3e17892bba53 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 15 Feb 2022 21:26:10 +0100
Subject: [PATCH 203/295] Mapper 432: Revise to support 160000000-in-1
 multicart

---
 src/boards/432.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/boards/432.c b/src/boards/432.c
index 777936f..80a7ad4 100644
--- a/src/boards/432.c
+++ b/src/boards/432.c
@@ -24,33 +24,43 @@
 #include "mmc3.h"
 
 static void M432CW(uint32 A, uint8 V) {
-    if (EXPREGS[0] & 4)
-        setchr1(A, (V & 0x7F) | ((EXPREGS[0] << 7) & 0x80) | ((EXPREGS[0] << 5) & 0x100));
-    else
-        setchr1(A, V | ((EXPREGS[0] << 5) & 0x100));
+    int chrAND = EXPREGS[1] &0x04? 0x7F: 0xFF;
+    int chrOR  = EXPREGS[1] <<7 &0x080 | EXPREGS[1] <<5 &0x100;
+    setchr1(A, V &chrAND | chrOR &~chrAND);
 }
 
 static void M432PW(uint32 A, uint8 V) {
-    if (EXPREGS[0] & 4)
-        setprg8(A, (V & 0x0F) | ((EXPREGS[0] << 4) & 0x10) | ((EXPREGS[0] << 1) & 0x20));
-    else
-        setprg8(A, (V & 0x1F) | ((EXPREGS[0] << 1) & 0x20));
+    int prgAND = EXPREGS[1] &0x02? 0x0F: 0x1F;
+    int prgOR  = EXPREGS[1] <<4 &0x10 | EXPREGS[1] <<1 &0x20;
+    if (A <0xC000 || ~EXPREGS[1] &0x40) setprg8(A,         V &prgAND | prgOR &~prgAND);
+    if (A <0xC000 &&  EXPREGS[1] &0x40) setprg8(A |0x4000, V &prgAND | prgOR &~prgAND);
+}
+
+static DECLFR(M432Read) {
+   if (EXPREGS[0] &1)
+      return EXPREGS[2];
+   return CartBR(A);
 }
 
 static DECLFW(M432Write) {
-    EXPREGS[0] = V;
+    EXPREGS[A &1] = V;
     FixMMC3PRG(MMC3_cmd);
 	FixMMC3CHR(MMC3_cmd);
 }
 
 static void M432Reset(void) {
 	EXPREGS[0] = 0;
+	EXPREGS[1] = 0;
+	EXPREGS[2] = (EXPREGS[2] +1) &3;
 	MMC3RegReset();
 }
 
 static void M432Power(void) {
 	EXPREGS[0] = 0;
+	EXPREGS[1] = 0;
+	EXPREGS[2] = 0;
 	GenMMC3Power();
+	SetReadHandler(0x8000, 0xFFFF, M432Read);
 	SetWriteHandler(0x6000, 0x7FFF, M432Write);
 }
 
@@ -60,5 +70,5 @@ void Mapper432_Init(CartInfo *info) {
 	pwrap = M432PW;
 	info->Power = M432Power;
 	info->Reset = M432Reset;
-	AddExState(EXPREGS, 1, 0, "EXPR");
+	AddExState(EXPREGS, 3, 0, "EXPR");
 }

From 4f022827b0d00cd973c473ba53139361ab95f805 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Thu, 17 Feb 2022 14:39:06 +0800
Subject: [PATCH 204/295] Cleanup

---
 src/boards/391.c |  2 +-
 src/boards/396.c |  2 +-
 src/boards/432.c | 24 ++++++++++++------------
 src/boards/443.c |  2 +-
 src/boards/456.c |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/boards/391.c b/src/boards/391.c
index 04a02d5..da66b3e 100644
--- a/src/boards/391.c
+++ b/src/boards/391.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/396.c b/src/boards/396.c
index 002267f..ba4ae79 100644
--- a/src/boards/396.c
+++ b/src/boards/396.c
@@ -32,7 +32,7 @@ static void Sync (void) {
 	setprg16(0x8000, reg[1] << 3 | reg[0] & 7);
 	setprg16(0xC000, reg[1] << 3 | 7);
 	setchr8(0);
-	setmirror(reg[1] &0x60? 0: 1);
+	setmirror(reg[1] & 0x60 ? 0 : 1);
 }
 
 static DECLFW(M396WriteInnerBank) {
diff --git a/src/boards/432.c b/src/boards/432.c
index 80a7ad4..817997e 100644
--- a/src/boards/432.c
+++ b/src/boards/432.c
@@ -24,34 +24,34 @@
 #include "mmc3.h"
 
 static void M432CW(uint32 A, uint8 V) {
-    int chrAND = EXPREGS[1] &0x04? 0x7F: 0xFF;
-    int chrOR  = EXPREGS[1] <<7 &0x080 | EXPREGS[1] <<5 &0x100;
-    setchr1(A, V &chrAND | chrOR &~chrAND);
+	int chrAND = (EXPREGS[1] & 0x04) ? 0x7F : 0xFF;
+	int chrOR  = (EXPREGS[1] << 7) & 0x080 | (EXPREGS[1] << 5) & 0x100;
+	setchr1(A, (V & chrAND) | (chrOR & ~chrAND));
 }
 
 static void M432PW(uint32 A, uint8 V) {
-    int prgAND = EXPREGS[1] &0x02? 0x0F: 0x1F;
-    int prgOR  = EXPREGS[1] <<4 &0x10 | EXPREGS[1] <<1 &0x20;
-    if (A <0xC000 || ~EXPREGS[1] &0x40) setprg8(A,         V &prgAND | prgOR &~prgAND);
-    if (A <0xC000 &&  EXPREGS[1] &0x40) setprg8(A |0x4000, V &prgAND | prgOR &~prgAND);
+	int prgAND = (EXPREGS[1] & 0x02) ? 0x0F : 0x1F;
+	int prgOR  = ((EXPREGS[1] << 4) & 0x10) | (EXPREGS[1] << 1) & 0x20;
+	if ((A < 0xC000) || (~EXPREGS[1] & 0x40)) setprg8(A,          (V & prgAND) | (prgOR & ~prgAND));
+	if ((A < 0xC000) &&  (EXPREGS[1] & 0x40)) setprg8(A | 0x4000, (V & prgAND) | (prgOR & ~prgAND));
 }
 
 static DECLFR(M432Read) {
-   if (EXPREGS[0] &1)
-      return EXPREGS[2];
+   if (EXPREGS[0] & 1)
+	  return EXPREGS[2];
    return CartBR(A);
 }
 
 static DECLFW(M432Write) {
-    EXPREGS[A &1] = V;
-    FixMMC3PRG(MMC3_cmd);
+	EXPREGS[A & 1] = V;
+	FixMMC3PRG(MMC3_cmd);
 	FixMMC3CHR(MMC3_cmd);
 }
 
 static void M432Reset(void) {
 	EXPREGS[0] = 0;
 	EXPREGS[1] = 0;
-	EXPREGS[2] = (EXPREGS[2] +1) &3;
+	EXPREGS[2] = (EXPREGS[2] +1) & 3;
 	MMC3RegReset();
 }
 
diff --git a/src/boards/443.c b/src/boards/443.c
index dcd2c12..034f615 100644
--- a/src/boards/443.c
+++ b/src/boards/443.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/456.c b/src/boards/456.c
index accd201..33bf824 100644
--- a/src/boards/456.c
+++ b/src/boards/456.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From d14b2aa0cf26c5132ea18295e7bfa35e16efea33 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Thu, 17 Feb 2022 16:02:40 +0800
Subject: [PATCH 205/295] Add mappers 326, 330

---
 src/boards/326.c |  98 +++++++++++++++++++++++++++++++++
 src/boards/330.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |   2 +
 src/ines.h       |   2 +
 4 files changed, 239 insertions(+)
 create mode 100644 src/boards/326.c
 create mode 100644 src/boards/330.c

diff --git a/src/boards/326.c b/src/boards/326.c
new file mode 100644
index 0000000..d15a6ff
--- /dev/null
+++ b/src/boards/326.c
@@ -0,0 +1,98 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * NES 2.0 Mapper 326 is used for a bootleg version of Contra/Gryzor.
+ * as implemented from
+ * http://forums.nesdev.org/viewtopic.php?f=9&t=17352&p=218722#p218722
+ */
+
+#include "mapinc.h"
+
+static uint8 PRG[3], CHR[8], NTAPage[4];
+
+static SFORMAT StateRegs[] =
+{
+	{ PRG, 3, "PRG" },
+	{ CHR, 8, "CHR" },
+	{ NTAPage, 4, "NT" },
+	{ 0 }
+};
+
+static void SyncPRG(void) {
+	setprg8(0x8000, PRG[0]);
+	setprg8(0xA000, PRG[1]);
+	setprg8(0xC000, PRG[2]);
+	setprg8(0xE000, ~0);
+}
+
+static void DoCHR(int x, uint8 V) {
+	CHR[x] = V;
+	setchr1(x << 10, V);
+}
+
+static void FixCHR(void) {
+	int x;
+	for (x = 0; x < 8; x++)
+		DoCHR(x, CHR[x]);
+}
+
+static void FASTAPASS(2) DoNTARAM(int w, uint8 V) {
+	NTAPage[w] = V;
+	setntamem(NTARAM + ((V & 1) << 10), 1, w);
+}
+
+static void FixNTAR(void) {
+	int x;
+	for (x = 0; x < 4; x++)
+		DoNTARAM(x, NTAPage[x]);
+}
+
+static DECLFW(M326Write) {
+	switch (A & 0xE010) {
+	case 0x8000: PRG[0] = V; SyncPRG(); break;
+	case 0xA000: PRG[1] = V; SyncPRG(); break;
+	case 0xC000: PRG[2] = V; SyncPRG(); break;
+	}
+
+	A &= 0x801F;
+	if ((A >= 0x8010) && (A <= 0x8017))
+		DoCHR(A - 0x8010, V);
+	else if ((A >= 0x8018) && (A <= 0x801B))
+		DoNTARAM(A - 0x8018, V);
+}
+
+static void M326Power(void) {
+	SyncPRG();
+	FixCHR();
+	FixNTAR();
+	SetReadHandler(0x8000, 0xFFFF, CartBR);
+	SetWriteHandler(0x8000, 0xFFFF, M326Write);
+}
+
+static void StateRestore(int version) {
+	SyncPRG();
+	FixCHR();
+	FixNTAR();
+}
+
+void Mapper326_Init(CartInfo *info) {
+	info->Power = M326Power;
+	GameStateRestore = StateRestore;
+	AddExState(&StateRegs, ~0, 0, 0);
+}
diff --git a/src/boards/330.c b/src/boards/330.c
new file mode 100644
index 0000000..e2012c6
--- /dev/null
+++ b/src/boards/330.c
@@ -0,0 +1,137 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * NES 2.0 Mapper 330 is used for a bootleg version of Contra/Gryzor.
+ * as implemented from
+ * http://forums.nesdev.org/viewtopic.php?f=9&t=17352&p=218722#p218722
+ */
+
+#include "mapinc.h"
+
+static uint8 *WRAM;
+
+static uint8 PRG[3], CHR[8], NTAPage[4];
+static uint8 IRQa;
+static uint16 IRQCount;
+
+static SFORMAT StateRegs[] =
+{
+	{ PRG, 3, "PRG" },
+	{ CHR, 8, "CHR" },
+	{ NTAPage, 4, "NT" },
+	{ &IRQa, 1, "IRQA" },
+	{ &IRQCount, 2, "IRQC" },
+	{ 0 }
+};
+
+static void SyncPRG(void) {
+	setprg8(0x8000, PRG[0]);
+	setprg8(0xA000, PRG[1]);
+	setprg8(0xC000, PRG[2]);
+	setprg8(0xE000, ~0);
+}
+
+static void DoCHR(int x, uint8 V) {
+	CHR[x] = V;
+	setchr1(x << 10, V);
+}
+
+static void FixCHR(void) {
+	int x;
+	for (x = 0; x < 8; x++)
+		DoCHR(x, CHR[x]);
+}
+
+static void FASTAPASS(2) DoNTARAM(int w, uint8 V) {
+	NTAPage[w] = V;
+	setntamem(NTARAM + ((V & 1) << 10), 1, w);
+}
+
+static void FixNTAR(void) {
+	int x;
+	for (x = 0; x < 4; x++)
+		DoNTARAM(x, NTAPage[x]);
+}
+
+static DECLFW(M330Write) {
+	if (!(A & 0x400)) {
+		if (A >= 0x8000 && A <= 0xB800)
+			DoCHR((A - 0x8000) >> 11, V);
+		else if (A >= 0xC000 && A <= 0xD800)
+			DoNTARAM((A - 0xC000) >> 11, V);
+		else if (A >= 0xE000 && A <= 0xF000) {
+			PRG[(A - 0xE000) >> 11] = V;
+			SyncPRG();
+		}
+	} else if ((A < 0xC000) && !(A & 0x4000)) {
+		if (A & 0x2000) {
+			IRQCount &= 0x00FF;
+			IRQCount |= (V & 0x7F) << 8;
+			IRQa = V & 0x80;
+			X6502_IRQEnd(FCEU_IQEXT);
+		} else {
+			IRQCount &= 0xFF00;
+			IRQCount |= V;
+		}
+	}
+}
+
+static void M330Power(void) {
+	int i;
+	for (i = 0; i < 4; i++)
+		PRG[i] = i;
+	for (i = 0; i < 8; i++)
+		CHR[i] = i;
+	for (i = 0; i < 4; i++)
+		NTAPage[i] = ~0;
+	IRQa = 0;
+	IRQCount = 0;
+	SyncPRG();
+	FixCHR();
+	FixNTAR();
+	SetReadHandler(0x6000, 0xFFFF, CartBR);
+	SetWriteHandler(0x8000, 0xFFFF, M330Write);
+}
+
+static void FP_FASTAPASS(1) M330IRQHook(int a) {
+	if (IRQa) {
+		IRQCount += a;
+		if (IRQCount > 0x7FFF) {
+			X6502_IRQBegin(FCEU_IQEXT);
+			IRQa = 0;
+			IRQCount = 0;
+		}
+	}
+}
+
+static void StateRestore(int version) {
+	SyncPRG();
+	FixCHR();
+	FixNTAR();
+}
+
+void Mapper330_Init(CartInfo *info) {
+	info->Power = M330Power;
+	MapIRQHook = M330IRQHook;
+	GameStateRestore = StateRestore;
+	AddExState(&StateRegs, ~0, 0, 0);
+	WRAM = (uint8 *)FCEU_gmalloc(8192);
+	SetupCartPRGMapping(0x10, WRAM, 8192, 1);
+	AddExState(WRAM, 8192, 0, "WRAM");
+}
diff --git a/src/ines.c b/src/ines.c
index 575ac88..a29539e 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -730,9 +730,11 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "FARID_SLROM_8-IN-1",       323, FARIDSLROM8IN1_Init    )
 	INES_BOARD( "FARID_UNROM_8-IN-1",       324, FARIDUNROM_Init        )
 	INES_BOARD( "MALISB",                   325, UNLMaliSB_Init         )
+	INES_BOARD( "Contra/Gryzor",            326, Mapper326_Init         )
 	INES_BOARD( "10-24-C-A1",               327, BMC1024CA1_Init        )
 	INES_BOARD( "RT-01",                    328, UNLRT01_Init           )
 	INES_BOARD( "EDU2000",                  329, UNLEDU2000_Init        )
+	INES_BOARD( "Sangokushi II: Haō no Tairiku", 330, Mapper330_Init    )
 	INES_BOARD( "12-IN-1",                  331, BMC12IN1_Init          )
 	INES_BOARD( "WS",                       332, BMCWS_Init             )
 	INES_BOARD( "NEWSTAR-GRM070-8IN1",      333, BMC8IN1_Init           )
diff --git a/src/ines.h b/src/ines.h
index 0671d68..2b70cb9 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -264,6 +264,8 @@ void Mapper288_Init(CartInfo *);
 void Mapper293_Init(CartInfo *);
 void Mapper297_Init(CartInfo *);
 void Mapper319_Init(CartInfo *);
+void Mapper326_Init(CartInfo *);
+void Mapper330_Init(CartInfo *);
 void Mapper334_Init(CartInfo *);
 void Mapper353_Init(CartInfo *);
 void Mapper356_Init(CartInfo *);

From ea0e198cf966a2e72cdf4e4659f4131cf259b209 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Fri, 18 Feb 2022 19:45:05 +0800
Subject: [PATCH 206/295] Update m285/BMC-A65AS

---
 src/boards/datalatch.c | 21 +++++++++++----------
 src/unif.c             |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/boards/datalatch.c b/src/boards/datalatch.c
index c86d585..d5fa8f5 100644
--- a/src/boards/datalatch.c
+++ b/src/boards/datalatch.c
@@ -512,33 +512,34 @@ void Mapper538_Init(CartInfo *info) {
  * mode (one screen) and 32K bankswitching, second one have only
  * 16 bankswitching mode and normal mirroring... But there is no any
  * correlations between modes and they can be used in one mapper code.
+ *
+ * Submapper 0 - 3-in-1 (N068)
+ * Submapper 0 - 3-in-1 (N080)
+ * Submapper 1 - 4-in-1 (JY-066)
  */
+
 static int A65ASsubmapper;
 static void BMCA65ASSync(void) {
 	if (latche & 0x40)
 		setprg32(0x8000, (latche >> 1) & 0x0F);
 	else {
 		if (A65ASsubmapper == 1) {
-			setprg16(0x8000, ((latche & 0x38) >> 0) | (latche & 7));
-			setprg16(0xC000, ((latche & 0x38) >> 0) | 7);
-		} else {
 			setprg16(0x8000, ((latche & 0x30) >> 1) | (latche & 7));
 			setprg16(0xC000, ((latche & 0x30) >> 1) | 7);
+		} else {
+			setprg16(0x8000, latche & 0x0F);
+			setprg16(0xC000, latche & 0x0F | 7);
 		}
 	}
 	setchr8(0);
 	if (latche & 0x80)
 		setmirror(MI_0 + (((latche >> 5) & 1)));
-	else {
-		if (A65ASsubmapper == 1) /* added as workaround since games for this cart uses vertical mirroring */
-			setmirror(MI_V);
-		else
-			setmirror(((latche >> 3) & 1) ^ 1);
-	}
+	else
+		setmirror(((latche >> 3) & 1) ^ 1);
 }
 
 void BMCA65AS_Init(CartInfo *info) {
-	A65ASsubmapper = info->submapper; /* not a real submapper */
+	A65ASsubmapper = info->submapper;
 	Latch_Init(info, BMCA65ASSync, 0, 0x8000, 0xFFFF, 0, 0);
 }
 
diff --git a/src/unif.c b/src/unif.c
index 5ce0560..502351c 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -364,7 +364,7 @@ struct _unif_db {
 };
 
 static struct _unif_db unif_db[] = {
-	{ 0x8ebad077d08e6c78ULL, "A65AS",          1,   -1, -1 }, /* 3-in-1 (N080) [p1][U][!], not a real submapper */
+	{ 0x03ed6963ca50e1d8ULL, "A65AS",          1,   -1, -1 },
 	{ 0x616851e56946893bULL, "RESETNROM-XIN1", 0, MI_V, -1 }, /* Sheng Tian 2-in-1(Unl,ResetBase)[p1].unf */
 	{ 0x4cd729b5ae23a3cfULL, "RESETNROM-XIN1", 0, MI_H, -1 }, /* Sheng Tian 2-in-1(Unl,ResetBase)[p2].unf */
 

From ed91566fd3aef739f8303e06cb5fa9534732b9c2 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Fri, 18 Feb 2022 20:52:11 +0800
Subject: [PATCH 207/295] m297: Fix mapper mode not applied when loading save
 state'

---
 src/boards/mmc1.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/boards/mmc1.c b/src/boards/mmc1.c
index 126364a..9b6ae68 100644
--- a/src/boards/mmc1.c
+++ b/src/boards/mmc1.c
@@ -549,11 +549,16 @@ static void M297Power(void) {
 	SetWriteHandler(0x8000, 0xFFFF, M297Latch);
 }
 
+static void M297StateRestore(void) {
+	Sync();
+}
+
 void Mapper297_Init(CartInfo *info) {
 	GenMMC1Init(info, 256, 256, 0, 0);
 	info->Power = M297Power;
 	MMC1CHRHook4 = M297CHR;
 	MMC1PRGHook16 = M297PRG;
+	GameStateRestore = M297StateRestore;
 	AddExState(&latch, 1, 0, "LATC");
 	AddExState(&mode, 1, 0, "MODE");
 }

From 560b3a7093a7ec3735058c1aa26dfed814fc501e Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Fri, 18 Feb 2022 21:05:50 +0800
Subject: [PATCH 208/295] Add mapper 271

---
 src/boards/datalatch.c | 12 ++++++++++++
 src/ines.c             |  1 +
 src/ines.h             |  1 +
 src/unif.c             |  1 +
 4 files changed, 15 insertions(+)

diff --git a/src/boards/datalatch.c b/src/boards/datalatch.c
index d5fa8f5..7b1007c 100644
--- a/src/boards/datalatch.c
+++ b/src/boards/datalatch.c
@@ -460,6 +460,18 @@ void Mapper241_Init(CartInfo *info) {
 	Latch_Init(info, M241Sync, 0, 0x8000, 0xFFFF, 1, 0);
 }
 
+/*------------------ Map 271 ---------------------------*/
+
+static void M271Sync(void) {
+	setchr8(latche & 0x0F);
+	setprg32(0x8000, latche >> 4);
+	setmirror((latche >> 5) & 1);
+}
+
+void Mapper271_Init(CartInfo *info) {
+	Latch_Init(info, M271Sync, 0, 0x8000, 0xFFFF, 0, 0);
+}
+
 /*------------------ Map 381 ---------------------------*/
 /* 2-in-1 High Standard Game (BC-019), reset-based */
 static uint8 reset = 0;
diff --git a/src/ines.c b/src/ines.c
index a29539e..524475e 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -691,6 +691,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "8-in-1 JY-119",            267, Mapper267_Init         )
 	INES_BOARD( "COOLBOY/MINDKIDS",         268, Mapper268_Init         ) /* Submapper distinguishes between COOLBOY and MINDKIDS */
 	INES_BOARD( "Games Xplosion 121-in-1",  269, Mapper269_Init         )
+	INES_BOARD( "MGC-026",                  271, Mapper271_Init         )
 	INES_BOARD( "Akumajō Special: Boku Dracula-kun", 272, Mapper272_Init         )
 	INES_BOARD( "80013-B",                  274, BMC80013B_Init         )
 	INES_BOARD( "YY860417C",                281, Mapper281_Init         )
diff --git a/src/ines.h b/src/ines.h
index 2b70cb9..bfcf03c 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -260,6 +260,7 @@ void J2282_Init(CartInfo *);
 void Mapper267_Init(CartInfo *);
 void Mapper268_Init(CartInfo *);
 void Mapper269_Init(CartInfo *);
+void Mapper271_Init(CartInfo *);
 void Mapper288_Init(CartInfo *);
 void Mapper293_Init(CartInfo *);
 void Mapper297_Init(CartInfo *);
diff --git a/src/unif.c b/src/unif.c
index 502351c..827c82b 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -620,6 +620,7 @@ static BMAPPING bmap[] = {
 
 	{ "BS-400R",                    422, Mapper422_Init,        0 },
 	{ "BS-4040R",                   422, Mapper422_Init,        0 },
+	{ "22026",                      271, Mapper271_Init,        0 },
 
 #ifdef COPYFAMI
 	{ "COPYFAMI_MMC3",          NO_INES, MapperCopyFamiMMC3_Init, 0 },

From 40d5c973d760142dbe6a14298cf65043c16a8fba Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Fri, 18 Feb 2022 21:07:02 +0800
Subject: [PATCH 209/295] Fix warnings

---
 src/boards/396.c  | 2 +-
 src/boards/mmc1.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/boards/396.c b/src/boards/396.c
index ba4ae79..0e916c4 100644
--- a/src/boards/396.c
+++ b/src/boards/396.c
@@ -51,7 +51,7 @@ static void M396Reset(void) {
 	Sync();
 }
 
-static void StateRestore(void) {
+static void StateRestore(int version) {
 	Sync();
 }
 
diff --git a/src/boards/mmc1.c b/src/boards/mmc1.c
index 9b6ae68..1338759 100644
--- a/src/boards/mmc1.c
+++ b/src/boards/mmc1.c
@@ -549,7 +549,7 @@ static void M297Power(void) {
 	SetWriteHandler(0x8000, 0xFFFF, M297Latch);
 }
 
-static void M297StateRestore(void) {
+static void M297StateRestore(int version) {
 	Sync();
 }
 

From 53457d0928610289cebcabc01bf6d6f918e3e3cd Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sat, 19 Feb 2022 02:09:56 +0800
Subject: [PATCH 210/295] Add mapper 375

---
 src/boards/375.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |   1 +
 src/ines.h       |   1 +
 3 files changed, 127 insertions(+)
 create mode 100644 src/boards/375.c

diff --git a/src/boards/375.c b/src/boards/375.c
new file mode 100644
index 0000000..93d9ec1
--- /dev/null
+++ b/src/boards/375.c
@@ -0,0 +1,125 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ * Copyright (C) 2022 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include "mapinc.h"
+
+static uint8 *WRAM = NULL;
+static uint32 WRAMSIZE;
+
+static uint16 addrlatch;
+static uint8 datalatch;
+
+static void Sync(void) {
+	uint32 S = addrlatch & 1;
+	uint32 p = ((addrlatch >> 2) & 0x1F) + ((addrlatch & 0x100) >> 3) + ((addrlatch & 0x400) >> 4);
+	uint32 L = (addrlatch >> 9) & 1;
+	uint32 p_8000 = p;
+
+	if ((addrlatch >> 11) & 1)
+		p_8000 = (p & 0x7E) | (datalatch & 7);
+
+	if ((addrlatch >> 7) & 1) {
+		if (S) {
+			setprg32(0x8000, p >> 1);
+		} else {
+			setprg16(0x8000, p_8000);
+			setprg16(0xC000, p);
+		}
+	} else {
+		if (S) {
+			if (L) {
+				setprg16(0x8000, p_8000 & 0x7E);
+				setprg16(0xC000, p | 7);
+			} else {
+				setprg16(0x8000, p_8000 & 0x7E);
+				setprg16(0xC000, p & 0x78);
+			}
+		} else {
+			if (L) {
+				setprg16(0x8000, p_8000);
+				setprg16(0xC000, p | 7);
+			} else {
+				setprg16(0x8000, p_8000);
+				setprg16(0xC000, p & 0x78);
+			}
+		}
+	}
+
+	if ((addrlatch & 0x80) == 0x80)
+		/* CHR-RAM write protect hack, needed for some multicarts */
+		SetupCartCHRMapping(0, CHRptr[0], 0x2000, 0);
+	else
+		SetupCartCHRMapping(0, CHRptr[0], 0x2000, 1);
+
+	setmirror(((addrlatch >> 1) & 1) ^ 1);
+	setchr8(0);
+	setprg8r(0x10, 0x6000, 0);
+}
+
+static DECLFR(M375Read) {
+	return CartBR(A);
+}
+
+static DECLFW(M375Write) {
+	if (addrlatch & 0x800)
+		datalatch = V;
+	else {
+		addrlatch = A;
+		datalatch = V;
+	}
+	Sync();
+}
+
+static void M375Reset(void) {
+	addrlatch = 0;
+	datalatch = 0;
+	Sync();
+}
+
+static void M375Power(void) {
+	addrlatch = 0;
+	datalatch = 0;
+	Sync();
+	setchr8(0);
+	SetReadHandler(0x8000, 0xFFFF, CartBR);
+	SetWriteHandler(0x8000, 0xFFFF, M375Write);
+	if (WRAMSIZE) {
+		SetReadHandler(0x6000, 0xFFFF, CartBR);
+		SetWriteHandler(0x6000, 0x7FFF, CartBW);
+		FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
+	}
+}
+
+static void StateRestore(int version) {
+	Sync();
+}
+
+void Mapper375_Init(CartInfo *info) {
+	info->Power = M375Power;
+	info->Reset = M375Reset;
+	GameStateRestore = StateRestore;
+	AddExState(&addrlatch, 2, 0, "ADDR");
+	AddExState(&datalatch, 1, 0, "DATA");
+
+	WRAMSIZE = 8192;
+	WRAM = (uint8*)FCEU_gmalloc(WRAMSIZE);
+	SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
+	AddExState(WRAM, WRAMSIZE, 0, "WRAM");
+}
diff --git a/src/ines.c b/src/ines.c
index 524475e..37b3d1c 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -769,6 +769,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "Golden Mario Party II - Around the World 6-in-1", 370, Mapper370_Init         )
 	INES_BOARD( "MMC3 PIRATE SFC-12",       372, Mapper372_Init         )
 	INES_BOARD( "95/96 Super HiK 4-in-1",   374, Mapper374_Init         )
+	INES_BOARD( "135-in-1",                 375, Mapper375_Init         )
 	INES_BOARD( "YY841155C",                376, Mapper376_Init         )
 	INES_BOARD( "JY-111/JY-112",            377, Mapper377_Init         )
 	INES_BOARD( "42 to 80,000 (970630C)",   380, Mapper380_Init         )
diff --git a/src/ines.h b/src/ines.h
index bfcf03c..6307777 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -280,6 +280,7 @@ void Mapper369_Init(CartInfo *);
 void Mapper370_Init(CartInfo *);
 void Mapper372_Init(CartInfo *);
 void Mapper374_Init(CartInfo *);
+void Mapper375_Init(CartInfo *);
 void Mapper376_Init(CartInfo *);
 void Mapper377_Init(CartInfo *);
 void Mapper380_Init(CartInfo *);

From 395a3df24c41ebf42d0eed0412fc0d416fd9d3bf Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sat, 19 Feb 2022 02:23:06 +0800
Subject: [PATCH 211/295] Add mapper 385

---
 src/boards/addrlatch.c | 15 +++++++++++++++
 src/ines.c             |  1 +
 src/ines.h             |  1 +
 3 files changed, 17 insertions(+)

diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c
index 43946bf..31235eb 100644
--- a/src/boards/addrlatch.c
+++ b/src/boards/addrlatch.c
@@ -544,6 +544,21 @@ void Mapper288_Init(CartInfo *info) {
 	AddExState(&dipswitch, 1, 0, "DIPSW");
 }
 
+/*------------------ Map 385 ---------------------------*/
+
+static void M385Sync(void) {
+	int32 mirror = latche & 1;
+	int32 bank = (latche >> 1) & 0x7;
+	setprg16(0x8000, bank);
+	setprg16(0xc000, bank);
+	setmirror(mirror ^ 1);
+	setchr8(0);
+}
+
+void Mapper385_Init(CartInfo *info) {
+	Latch_Init(info, M385Sync, NULL, 0x0000, 0x8000, 0xFFFF, 0);
+}
+
 /*------------------ Map 541 ---------------------------*/
 /* LittleCom 160-in-1 multicart */
 static void M541Sync(void) {
diff --git a/src/ines.c b/src/ines.c
index 37b3d1c..5569851 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -776,6 +776,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "KN-42",                    381, Mapper381_Init         )
 	INES_BOARD( "830928C",                  382, Mapper382_Init         )
 	INES_BOARD( "YY840708C",                383, Mapper383_Init         )
+	INES_BOARD( "NTDEC 2779",               385, Mapper385_Init         )
 	INES_BOARD( "YY860729C",                386, Mapper386_Init         )
 	INES_BOARD( "YY850735C",                387, Mapper387_Init         )
 	INES_BOARD( "YY850835C",                388, Mapper388_Init         )
diff --git a/src/ines.h b/src/ines.h
index 6307777..b57e80e 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -287,6 +287,7 @@ void Mapper380_Init(CartInfo *);
 void Mapper381_Init(CartInfo *);
 void Mapper382_Init(CartInfo *);
 void Mapper383_Init(CartInfo *);
+void Mapper385_Init(CartInfo *);
 void Mapper386_Init(CartInfo *);
 void Mapper387_Init(CartInfo *);
 void Mapper388_Init(CartInfo *);

From 53bca8e9bfc6ebd25e4e5bdb8315d41067cd3807 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sat, 19 Feb 2022 12:53:26 +0100
Subject: [PATCH 212/295] Rewrite mapper 134 emulation for simplicity. Fix
 WRAM-using games. Remove leftover code from mmc3.c. Initialize the Frame IRQ
 register only on power-on reset, not soft-reset, which is necessary for two
 multicarts.

---
 src/boards/134.c    |  96 +++++++++++++++++
 src/boards/Bs5652.c | 253 --------------------------------------------
 src/boards/mmc3.c   |  43 --------
 src/ines.c          |   4 +-
 src/ines.h          |   1 -
 src/sound.c         |   2 +-
 src/unif.c          |   4 +-
 7 files changed, 101 insertions(+), 302 deletions(-)
 create mode 100644 src/boards/134.c
 delete mode 100644 src/boards/Bs5652.c

diff --git a/src/boards/134.c b/src/boards/134.c
new file mode 100644
index 0000000..0ffa5ef
--- /dev/null
+++ b/src/boards/134.c
@@ -0,0 +1,96 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2020 negativeExponent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* Chipset used on various PCBs named WX-KB4K, T4A54A, BS-5652... */
+/* "Rockman 3" on YH-322 and "King of Fighters 97" on "Super 6-in-1" enable interrupts without initializing the frame IRQ register and therefore freeze on real hardware.
+   They can run if another game is selected that does initialize the frame IRQ register, then soft-resetting to the menu and selecting the previously-freezing games. */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static uint8 dip;
+
+static void Mapper134_PRGWrap(uint32 A, uint8 V) {
+	int prgAND =EXPREGS[1] &0x04? 0x0F: 0x1F;
+	int prgOR  =EXPREGS[1] <<4 &0x30 | EXPREGS[0] <<2 &0x40;
+	if (EXPREGS[1] &0x80) { /* NROM mode */
+		if (EXPREGS[1] &0x08) { /* NROM-128 mode */
+			setprg8(0x8000, (DRegBuf[6] &~1 |0) &prgAND | prgOR &~prgAND);
+			setprg8(0xA000, (DRegBuf[6] &~1 |1) &prgAND | prgOR &~prgAND);
+			setprg8(0xC000, (DRegBuf[6] &~1 |0) &prgAND | prgOR &~prgAND);
+			setprg8(0xE000, (DRegBuf[6] &~1 |1) &prgAND | prgOR &~prgAND);
+		} else {                /* NROM-256 mode */
+			setprg8(0x8000, (DRegBuf[6] &~3 |0) &prgAND | prgOR &~prgAND);
+			setprg8(0xA000, (DRegBuf[6] &~3 |1) &prgAND | prgOR &~prgAND);
+			setprg8(0xC000, (DRegBuf[6] &~3 |2) &prgAND | prgOR &~prgAND);
+			setprg8(0xE000, (DRegBuf[6] &~3 |3) &prgAND | prgOR &~prgAND);
+		}
+	} else
+		setprg8(A, V &prgAND | prgOR &~prgAND);
+}
+
+static void Mapper134_CHRWrap(uint32 A, uint8 V) {
+	int chrAND =EXPREGS[1] &0x40? 0x7F: 0xFF;
+	int chrOR  =EXPREGS[1] <<3 &0x180 | EXPREGS[0] <<4 &0x200;
+	if (EXPREGS[0] &0x08) V =EXPREGS[2] <<3 | A >>10 &7; /* In CNROM mode, outer bank register 2 replaces the MMC3's CHR registers, and CHR A10-A12 are PPU A10-A12. */
+	setchr1(A, V &chrAND | chrOR &~chrAND);
+}
+
+static DECLFR(Mapper134_Read) {
+	return EXPREGS[0] &0x40? dip: CartBR(A);
+}
+
+static DECLFW(Mapper134_Write) {
+	if (~EXPREGS[0] &0x80) {
+		EXPREGS[A &3] =V;
+		FixMMC3PRG(MMC3_cmd);
+		FixMMC3CHR(MMC3_cmd);
+	} else
+	if ((A &3) ==2) {
+		EXPREGS[A &3] =EXPREGS[A &3] &~3 | V &3;
+		FixMMC3CHR(MMC3_cmd);
+	}
+	CartBW(A, V);
+}
+
+static void Mapper134_Reset(void) {
+	dip++;
+	dip &= 15;
+	EXPREGS[0] =EXPREGS[1] =EXPREGS[2] =EXPREGS[3] =0;
+	MMC3RegReset();
+}
+
+static void Mapper134_Power(void) {
+	dip =0;
+	EXPREGS[0] =EXPREGS[1] =EXPREGS[2] =EXPREGS[3] =0;
+	GenMMC3Power();
+	SetWriteHandler(0x6000, 0x7FFF, Mapper134_Write);
+	SetReadHandler(0x8000, 0xFFFF, Mapper134_Read);
+}
+
+void Mapper134_Init(CartInfo *info) {
+	GenMMC3_Init(info, 256, 256, info->iNES2? (info->PRGRamSize + info->PRGRamSaveSize) /1024: 8, info->battery);
+	cwrap = Mapper134_CHRWrap;
+	pwrap = Mapper134_PRGWrap;
+	info->Power = Mapper134_Power;
+	info->Reset = Mapper134_Reset;
+	AddExState(EXPREGS, 4, 0, "EXPR");
+	AddExState(&dip, 1, 0, "DIPS");
+}
diff --git a/src/boards/Bs5652.c b/src/boards/Bs5652.c
deleted file mode 100644
index 237571f..0000000
--- a/src/boards/Bs5652.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2008 -2020 dragon2snow,loong2snow from www.nesbbs.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *
- */
-
-#include "mapinc.h"
-#include "mmc3.h"
-#include "crc32.h"
-
-static uint8 *WRAM;
-static uint32 WRAMSIZE;
-
-static uint8 mmc3_reg[8];
-static uint8 exRegs[8];
-static uint8 pointer;
-static uint8 locked;
-static uint8 readDIP;
-static uint16 prgAND;
-static uint16 chrAND;
-static uint16 prgOR;
-static uint16 chrOR;
-static uint8 nrom;
-static uint8 nrom128;
-static uint8 dipswitch;
-
-static SFORMAT BS5652_StateRegs[] =
-{
-	{ exRegs, 8, "REGS" },
-	{ mmc3_reg, 8, "MREG" },
-	{ &pointer, 1, "PNT0" },
-	{ &readDIP, 1, "RDIP" },
-	{ &prgAND, 2 | FCEUSTATE_RLSB, "PAND" },
-	{ &chrAND, 2 | FCEUSTATE_RLSB, "CAND" },
-	{ &prgOR, 2 | FCEUSTATE_RLSB, "PROR" },
-	{ &chrOR, 2 | FCEUSTATE_RLSB, "CHOR" },
-	{ &nrom, 1, "NROM" },
-	{ &nrom128, 1, "N128" },
-	{ &dipswitch, 1, "DIP0" },
-	{ 0 }
-};
-
-void Bs5652AnalyzeReg()
-{
-	locked = exRegs[0] & 0x80;
-	readDIP = exRegs[0] & 0x40;
-	prgAND = exRegs[1] & 0x04 ? 0x0F : 0x1F;
-	chrAND = exRegs[1] & 0x40 ? 0x7F : 0xFF;
-	prgOR = (exRegs[1] & 0x03) << 4 | (exRegs[0] & 0x10) << 2;
-	chrOR = (exRegs[1] & 0x30) << 3 | (exRegs[0] & 0x20) << 4;
-	nrom = exRegs[0] & 0x08;
-	nrom128 = exRegs[1] & 0x08;
-}
-
-int Bs5652GetPRGBank(int bank)
-{
-	if ((~bank & 1) && (pointer & 0x40)) bank ^= 2;
-	return (bank & 2) ? 0xFE | (bank & 1) : mmc3_reg[6 | (bank & 1)];
-}	
-		
-void Bs5652SyncPRG_GNROM(int A14, int AND, int OR) {
-	setprg8(0x8000, ((Bs5652GetPRGBank(0) &~A14) &AND) | OR);
-	setprg8(0xA000, ((Bs5652GetPRGBank(1) &~A14) &AND) | OR);
-	setprg8(0xC000, ((Bs5652GetPRGBank(0) | A14) &AND) | OR);
-	setprg8(0xE000, ((Bs5652GetPRGBank(1) | A14) &AND) | OR);
-}
-
-static void Bs5652CW(uint32 A, uint8 V) {
-	
-	if (exRegs[0] & 0x08)
-		setchr8((exRegs[2] & 0x0F) | (exRegs[4] & 0x03) | (((exRegs[1] >> 4) & 7) << 4));
-	else
-		setchr1(A, (V & chrAND) | chrOR );
-}
-
-static void Bs5652PW(uint32 A, uint8 V) {
-	if (nrom)
-	{
-		if (exRegs[3] & 0x8) /* 20190504 up2 */
-		{
-			if ((exRegs[1] >> 3) & 0x01)
-			{
-				uint8 _bank = ((exRegs[2] >> 1) & 0x07) | ((exRegs[1] & 3) << 3);
-				setprg16(0x8000, _bank);
-				setprg16(0xC000, _bank);
-	
-			}
-			else
-			{
-				setprg32(0x8000,((exRegs[2] >> 2) & 0x03) | ((exRegs[1] & 3) << 2));
-			}
-		}
-		else
-		{
-			Bs5652SyncPRG_GNROM(nrom128 ? 0 : 2, prgAND, prgOR);
-		}
-		
-	}	
-	else
-	{
-		if (((exRegs[1] >> 7) & 0x01))
-		{
-				setprg32(0x8000,((Bs5652GetPRGBank(0) >> 2) & 0x03) | ((exRegs[1] & 3) << 2));
-		}
-		else
-			setprg8(A, prgOR | (V & prgAND));
-	}
-}
-
-
-static DECLFW(Bs5652WriteHi) {
-
-	A = A & 0xE001;
-
-	if (A < 0xC000) 
-	{
-		if(A==0x8000)
-			pointer = MMC3_cmd ^ V;
-		if(A==0x8001)
-			mmc3_reg[MMC3_cmd & 0x07] = V;
-		
-		MMC3_CMDWrite(A, V);
-		FixMMC3PRG(MMC3_cmd);
-		FixMMC3CHR(MMC3_cmd);
-	}
-	else
-	{
-		MMC3_IRQWrite(A, V);
-	}			
-}
-
-static DECLFW(Bs5652WriteLo) {
-	
-	if (!locked) {
-		exRegs[A & 3] = V;
-		Bs5652AnalyzeReg();
-		FixMMC3PRG(MMC3_cmd);
-		FixMMC3CHR(MMC3_cmd);
-	}
-	else
-	{
-		if ((exRegs[0] & 0x08))
-		{
-			exRegs[4] = V;
-			FixMMC3PRG(MMC3_cmd);
-			FixMMC3CHR(MMC3_cmd);
-		}
-		else
-		{
-			WRAM[A - 0x6000] = V;
-		}
-	}
-}
-static DECLFR(Bs5652ReadHi)
-{
-	if (readDIP)
-		return dipswitch;
-   return CartBR(A);
-}
-
-static void Bs5652Power(void)
-{
-	int i=0;
-
-	dipswitch = 0;
-	mmc3_reg[0] = 0x00; mmc3_reg[1] = 0x02;
-	mmc3_reg[2] = 0x04; mmc3_reg[3] = 0x05; mmc3_reg[4] = 0x06; mmc3_reg[5] = 0x07;
-	mmc3_reg[6] = 0x00; mmc3_reg[7] = 0x01;
-
-	for(i=0;i<4;i++)
-		exRegs[i]=0;
-	
-	Bs5652AnalyzeReg();
-	
-	GenMMC3Power();
-	SetWriteHandler(0x6000, 0x7FFF, Bs5652WriteLo);
-	SetWriteHandler(0x8000, 0xFFFF, Bs5652WriteHi);
-	SetReadHandler(0x8000, 0xFFFF, Bs5652ReadHi);
-}
-
-static void Bs5652Reset(void)
-{
-	int i=0;
-
-	dipswitch++;
-	mmc3_reg[0] = 0x00; mmc3_reg[1] = 0x02;
-	mmc3_reg[2] = 0x04; mmc3_reg[3] = 0x05; mmc3_reg[4] = 0x06; mmc3_reg[5] = 0x07;
-	mmc3_reg[6] = 0x00; mmc3_reg[7] = 0x01;
-	
-	for(i=0;i<4;i++)
-		exRegs[i]=0;
-	
-	Bs5652AnalyzeReg();
-	
-	MMC3RegReset();
-}
-
-static void Bs5652Close(void)
-{
-	GenMMC3Close();
-	if (WRAM)
-		FCEU_gfree(WRAM);
-	WRAM = NULL;
-}
-
-void Bs5652_Init(CartInfo *info)
-{
-   uint32 unif_crc;
-
-	GenMMC3_Init(info, 512, 512, 0, 0);
-	pwrap = Bs5652PW;
-	cwrap = Bs5652CW;
-	info->Power = Bs5652Power;
-	info->Reset = Bs5652Reset;
-	info->Close = Bs5652Close;
-	
-	WRAMSIZE = 8192;
-	WRAM = (uint8*)FCEU_gmalloc(WRAMSIZE);
-	SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
-	AddExState(WRAM, WRAMSIZE, 0, "WRAM");
-
-	unif_crc = CalcCRC32(0, PRGptr[0], PRGsize[0]);
-
-	if (unif_crc == 0xb97641b5) /* Fix my own error, unif CHR 0 error */
-	{
-		if ((CHRsize[0] == 0x2000) && (CHRsize[1] > 0x2000))
-		{
-			CHRsize[0] = CHRsize[1];
-			CHRptr[0] = (uint8*)FCEU_gmalloc(CHRsize[1]);
-			memcpy(CHRptr[0], CHRptr[1], CHRsize[1]);
-			SetupCartCHRMapping(0, CHRptr[0], CHRsize[0], 0);
-		}
-	}
-
-	AddExState(EXPREGS, 3, 0, "EXPR");
-	AddExState(BS5652_StateRegs, ~0, 0, 0);
-}
diff --git a/src/boards/mmc3.c b/src/boards/mmc3.c
index d2c905d..35e7762 100644
--- a/src/boards/mmc3.c
+++ b/src/boards/mmc3.c
@@ -881,49 +881,6 @@ void Mapper119_Init(CartInfo *info) {
    AddExState(CHRRAM, CHRRAMSIZE, 0, "CHRR");
 }
 
-/* ---------------------------- Mapper 134 ------------------------------ */
-/* ---------------------------- UNL-T4A54A ------------------------------ */
-
-/* UNL-T4A54A, functionally the same as mapper 134.
- * Writes @ $6801. Menu @ prg $20000, chr $00000 */
-
-static void M134PW(uint32 A, uint8 V) {
-	uint8 mask = (EXPREGS[0] & 0x04) ? 0x0F : 0x1F;
-	setprg8(A, (V & mask) | ((EXPREGS[0] & 3) << 4));
-}
-
-static void M134CW(uint32 A, uint8 V) {
-	uint8 mask = (EXPREGS[0] & 0x04) ? 0x7F : 0xFF;
-	setchr1(A, (V & mask) | ((EXPREGS[0] & 0x30) << 3));
-}
-
-static DECLFW(M134Write) {
-	EXPREGS[0] = V;
-	FixMMC3CHR(MMC3_cmd);
-	FixMMC3PRG(MMC3_cmd);
-}
-
-static void M134Power(void) {
-	EXPREGS[0] = 0x01;
-	GenMMC3Power();
-	SetWriteHandler(0x6001, 0x6001, M134Write);
-	SetWriteHandler(0x6801, 0x6801, M134Write);
-}
-
-static void M134Reset(void) {
-	EXPREGS[0] = 0x01;
-	MMC3RegReset();
-}
-
-void Mapper134_Init(CartInfo *info) {
-	GenMMC3_Init(info, 256, 256, 0, 0);
-	pwrap = M134PW;
-	cwrap = M134CW;
-	info->Power = M134Power;
-	info->Reset = M134Reset;
-	AddExState(EXPREGS, 4, 0, "EXPR");
-}
-
 /* ---------------------------- Mapper 165 ------------------------------ */
 
 static void M165CW(uint32 A, uint8 V) {
diff --git a/src/ines.c b/src/ines.c
index 575ac88..0b3866f 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -553,7 +553,7 @@ INES_BOARD_BEGIN()
 /*    INES_BOARD( "",                            131, Mapper131_Init ) */
 	INES_BOARD( "TXC/UNL-22211",            132, Mapper132_Init         )
 	INES_BOARD( "SA72008",                  133, SA72008_Init           )
-	INES_BOARD( "MMC3 BMC PIRATE",          134, Bs5652_Init            )
+	INES_BOARD( "MMC3 BMC PIRATE",          134, Mapper134_Init         )
 /*    INES_BOARD( "",                            135, Mapper135_Init ) */
 	INES_BOARD( "Sachen 3011",              136, Mapper136_Init         )
 	INES_BOARD( "S8259D",                   137, S8259D_Init            )
@@ -705,7 +705,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "Kasheng 2-in-1 ",          291, Mapper291_Init         )
 	INES_BOARD( "DRAGONFIGHTER",            292, UNLBMW8544_Init        )
 	INES_BOARD( "NewStar 12-in-1/7-in-1",   293, Mapper293_Init         )
-	INES_BOARD( "MMC3 BMC PIRATE",          294, Bs5652_Init            ) /* nesdev redirects this as mapper 134 */
+	INES_BOARD( "MMC3 BMC PIRATE",          294, Mapper134_Init         ) /* nesdev redirects this as mapper 134 */
 	INES_BOARD( "YY860216C",                295, Mapper295_Init         )
 	INES_BOARD( "TXC 01-22110-000",         297, Mapper297_Init         )
 	INES_BOARD( "TF1201",                   298, UNLTF1201_Init         )
diff --git a/src/ines.h b/src/ines.h
index 0671d68..44e6c17 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -254,7 +254,6 @@ void Mapper283_Init(CartInfo *);
 void Mapper291_Init(CartInfo *);
 void Mapper295_Init(CartInfo *);
 
-void Bs5652_Init(CartInfo *);
 void J2282_Init(CartInfo *);
 
 void Mapper267_Init(CartInfo *);
diff --git a/src/sound.c b/src/sound.c
index cd54114..ade058e 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1028,7 +1028,6 @@ due to that whole MegaMan 2 Game Genie thing.
 void FCEUSND_Reset(void) {
 	int x;
 
-	IRQFrameMode = 0x0;
 	fhcnt = fhinc;
 	fcnt = 0;
 	nreg = 1;
@@ -1079,6 +1078,7 @@ void FCEUSND_Power(void) {
 	for (x = 0; x < 5; x++)
 		ChannelBC[x] = 0;
 	soundtsoffs = 0;
+	IRQFrameMode = 0x0; /* Only initialized by power-on reset, not by soft reset */
 	LoadDMCPeriod(DMCFormat & 0xF);
 }
 
diff --git a/src/unif.c b/src/unif.c
index 5ce0560..1599e5c 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -611,8 +611,8 @@ static BMAPPING bmap[] = {
 	{ "830134C",                    315, BMC830134C_Init,       0 },
 	{ "GN-26",                      344, BMCGN26_Init,          0 },
 	{ "KG256",                  NO_INES, KG256_Init,            0 },
-	{ "T4A54A",                     134, Bs5652_Init,           0 },
-	{ "WX-KB4K",                    134, Bs5652_Init,           0 },
+	{ "T4A54A",                     134, Mapper134_Init,        0 },
+	{ "WX-KB4K",                    134, Mapper134_Init,        0 },
 	{ "SB-5013",                    359, Mapper359_Init,        0 },
 	{ "82112C",                     540, Mapper540_Init,        0 },
 	{ "N49C-300",                   369, Mapper369_Init,        0 },

From c42a1d8a8e4af4ba5d9b81233017c0d894a57e1c Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sun, 20 Feb 2022 06:46:45 +0800
Subject: [PATCH 213/295] Update

---
 src/boards/208.c        | 2 +-
 src/boards/218.c        | 2 +-
 src/boards/225.c        | 2 +-
 src/boards/235.c        | 2 +-
 src/boards/267.c        | 2 +-
 src/boards/269.c        | 2 +-
 src/boards/272.c        | 2 +-
 src/boards/291.c        | 2 +-
 src/boards/293.c        | 2 +-
 src/boards/326.c        | 2 +-
 src/boards/330.c        | 2 +-
 src/boards/334.c        | 2 +-
 src/boards/353.c        | 2 +-
 src/boards/356.c        | 2 +-
 src/boards/357.c        | 2 +-
 src/boards/359.c        | 2 +-
 src/boards/360.c        | 2 +-
 src/boards/364.c        | 2 +-
 src/boards/368.c        | 2 +-
 src/boards/369.c        | 2 +-
 src/boards/370.c        | 2 +-
 src/boards/372.c        | 4 ++--
 src/boards/375.c        | 2 +-
 src/boards/377.c        | 2 +-
 src/boards/380.c        | 2 +-
 src/boards/382.c        | 2 +-
 src/boards/389.c        | 2 +-
 src/boards/390.c        | 2 +-
 src/boards/393.c        | 2 +-
 src/boards/395.c        | 2 +-
 src/boards/396.c        | 2 +-
 src/boards/401.c        | 2 +-
 src/boards/403.c        | 2 +-
 src/boards/410.c        | 2 +-
 src/boards/411.c        | 2 +-
 src/boards/414.c        | 2 +-
 src/boards/416.c        | 2 +-
 src/boards/417.c        | 2 +-
 src/boards/431.c        | 2 +-
 src/boards/432.c        | 2 +-
 src/boards/433.c        | 2 +-
 src/boards/444.c        | 2 +-
 src/boards/516.c        | 2 +-
 src/boards/533.c        | 2 +-
 src/boards/539.c        | 2 +-
 src/boards/554.c        | 2 +-
 src/boards/60.c         | 2 +-
 src/boards/91.c         | 2 +-
 src/boards/fk23c.c      | 2 +-
 src/boards/resettxrom.c | 2 +-
 src/boards/sachen.c     | 2 +-
 src/boards/txcchip.c    | 2 +-
 src/cheat.c             | 2 +-
 53 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/src/boards/208.c b/src/boards/208.c
index 5088e7b..af03010 100644
--- a/src/boards/208.c
+++ b/src/boards/208.c
@@ -2,7 +2,7 @@
  *
  * Copyright notice for this file:
  *  Copyright (C) 2005 CaH4e3
- *  Copyright (C) 2022 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/218.c b/src/boards/218.c
index 88d3e11..97ed530 100644
--- a/src/boards/218.c
+++ b/src/boards/218.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- * Copyright (C) 2020 negativeExponent
+ * Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/225.c b/src/boards/225.c
index 846f965..a00b9fd 100644
--- a/src/boards/225.c
+++ b/src/boards/225.c
@@ -3,7 +3,7 @@
  * Copyright notice for this file:
  *  Copyright (C) 2011 CaH4e3
   * Copyright (C) 2019 Libretro Team
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/235.c b/src/boards/235.c
index f64b138..2532917 100644
--- a/src/boards/235.c
+++ b/src/boards/235.c
@@ -2,7 +2,7 @@
  *
  * Copyright notice for this file:
  *  Copyright (C) 2005 CaH4e3
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/267.c b/src/boards/267.c
index 2780fd0..1f34529 100644
--- a/src/boards/267.c
+++ b/src/boards/267.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- * Copyright (C) 2020 negativeExponent
+ * Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/269.c b/src/boards/269.c
index b62f50f..9985888 100644
--- a/src/boards/269.c
+++ b/src/boards/269.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/272.c b/src/boards/272.c
index 923f544..3e91c1e 100644
--- a/src/boards/272.c
+++ b/src/boards/272.c
@@ -1,7 +1,7 @@
 /* FCE Ultra - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2022 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/291.c b/src/boards/291.c
index da6f7ab..aacce1a 100644
--- a/src/boards/291.c
+++ b/src/boards/291.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2022 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/293.c b/src/boards/293.c
index f70d504..86348b0 100644
--- a/src/boards/293.c
+++ b/src/boards/293.c
@@ -1,7 +1,7 @@
 /* FCE Ultra - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/326.c b/src/boards/326.c
index d15a6ff..a29fced 100644
--- a/src/boards/326.c
+++ b/src/boards/326.c
@@ -1,7 +1,7 @@
 /* FCE Ultra - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2022 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/330.c b/src/boards/330.c
index e2012c6..e2453a3 100644
--- a/src/boards/330.c
+++ b/src/boards/330.c
@@ -1,7 +1,7 @@
 /* FCE Ultra - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2022 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/334.c b/src/boards/334.c
index 8dcfed0..a4dfc27 100644
--- a/src/boards/334.c
+++ b/src/boards/334.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/353.c b/src/boards/353.c
index 765aa08..36126f5 100644
--- a/src/boards/353.c
+++ b/src/boards/353.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- * Copyright (C) 2020 negativeExponent
+ * Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/356.c b/src/boards/356.c
index 3ea1f5f..666b7aa 100644
--- a/src/boards/356.c
+++ b/src/boards/356.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/357.c b/src/boards/357.c
index a46bdea..48088fc 100644
--- a/src/boards/357.c
+++ b/src/boards/357.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/359.c b/src/boards/359.c
index 123e344..db65987 100644
--- a/src/boards/359.c
+++ b/src/boards/359.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/360.c b/src/boards/360.c
index 210e93b..eb61154 100644
--- a/src/boards/360.c
+++ b/src/boards/360.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- * Copyright (C) 2020 negativeExponent
+ * Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/364.c b/src/boards/364.c
index b082392..5fc4c2c 100644
--- a/src/boards/364.c
+++ b/src/boards/364.c
@@ -1,7 +1,7 @@
 /* FCE Ultra - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2022 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/368.c b/src/boards/368.c
index 4ae27fe..a8abf3e 100644
--- a/src/boards/368.c
+++ b/src/boards/368.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2022 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/369.c b/src/boards/369.c
index a11a439..fea0379 100644
--- a/src/boards/369.c
+++ b/src/boards/369.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/370.c b/src/boards/370.c
index 25f5887..297031b 100644
--- a/src/boards/370.c
+++ b/src/boards/370.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/372.c b/src/boards/372.c
index 9da9ee3..3f878b2 100644
--- a/src/boards/372.c
+++ b/src/boards/372.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-/* added 2020-1-28 - negativeExponent */
+/* added 2020-1-28 - */
 /* NES 2.0 Mapper 372 is used for a revision of the Rockman I-VI multicart (PCB ID SFC-12).
  * It is INES Mapper 045 but with one bit of outer bank register #2 working as a CHR-ROM/RAM switch.
  */
diff --git a/src/boards/375.c b/src/boards/375.c
index 93d9ec1..2b78638 100644
--- a/src/boards/375.c
+++ b/src/boards/375.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- * Copyright (C) 2022 negativeExponent
+ * Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/377.c b/src/boards/377.c
index bece1b2..9b0cdd9 100644
--- a/src/boards/377.c
+++ b/src/boards/377.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- * Copyright (C) 2022 negativeExponent
+ * Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/380.c b/src/boards/380.c
index 280d0a4..912e266 100644
--- a/src/boards/380.c
+++ b/src/boards/380.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- * Copyright (C) 2020 negativeExponent
+ * Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/382.c b/src/boards/382.c
index 87e36bc..0372f92 100644
--- a/src/boards/382.c
+++ b/src/boards/382.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/389.c b/src/boards/389.c
index b90beae..b1dbfd0 100644
--- a/src/boards/389.c
+++ b/src/boards/389.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/390.c b/src/boards/390.c
index 0e1e4ba..9d2a953 100644
--- a/src/boards/390.c
+++ b/src/boards/390.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- * Copyright (C) 2020 negativeExponent
+ * Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/393.c b/src/boards/393.c
index 56eab48..5315cce 100644
--- a/src/boards/393.c
+++ b/src/boards/393.c
@@ -1,7 +1,7 @@
 /* FCE Ultra - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2022 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/395.c b/src/boards/395.c
index 6508850..949b099 100644
--- a/src/boards/395.c
+++ b/src/boards/395.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/396.c b/src/boards/396.c
index 0e916c4..a31aee1 100644
--- a/src/boards/396.c
+++ b/src/boards/396.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2022 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/401.c b/src/boards/401.c
index 75cb508..940aa4f 100644
--- a/src/boards/401.c
+++ b/src/boards/401.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/403.c b/src/boards/403.c
index aa04f75..11dfa5c 100644
--- a/src/boards/403.c
+++ b/src/boards/403.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2022 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/410.c b/src/boards/410.c
index 2c0bfa3..1484e59 100644
--- a/src/boards/410.c
+++ b/src/boards/410.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2022 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/411.c b/src/boards/411.c
index eafa3cc..db87fb0 100644
--- a/src/boards/411.c
+++ b/src/boards/411.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/414.c b/src/boards/414.c
index 546e94a..f8c4380 100644
--- a/src/boards/414.c
+++ b/src/boards/414.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2022 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/416.c b/src/boards/416.c
index 9489b30..8c04152 100644
--- a/src/boards/416.c
+++ b/src/boards/416.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2022 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/417.c b/src/boards/417.c
index bea2e35..3af3afc 100644
--- a/src/boards/417.c
+++ b/src/boards/417.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2022 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/431.c b/src/boards/431.c
index 11a987f..afc9ef9 100644
--- a/src/boards/431.c
+++ b/src/boards/431.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2022 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/432.c b/src/boards/432.c
index 817997e..af91e0e 100644
--- a/src/boards/432.c
+++ b/src/boards/432.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/433.c b/src/boards/433.c
index d7c00ca..07dba88 100644
--- a/src/boards/433.c
+++ b/src/boards/433.c
@@ -1,7 +1,7 @@
 /* FCE Ultra - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2022 negativeExponent
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/444.c b/src/boards/444.c
index ec6c945..e6a61b4 100644
--- a/src/boards/444.c
+++ b/src/boards/444.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/516.c b/src/boards/516.c
index d42b2ed..c9e5a86 100644
--- a/src/boards/516.c
+++ b/src/boards/516.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/533.c b/src/boards/533.c
index 821f861..3465576 100644
--- a/src/boards/533.c
+++ b/src/boards/533.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- * Copyright (C) 2020 negativeExponent
+ * Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/539.c b/src/boards/539.c
index 38053c8..cfcc6b6 100644
--- a/src/boards/539.c
+++ b/src/boards/539.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/554.c b/src/boards/554.c
index 7559a83..8084a76 100644
--- a/src/boards/554.c
+++ b/src/boards/554.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/60.c b/src/boards/60.c
index 01e4ccf..29ace51 100644
--- a/src/boards/60.c
+++ b/src/boards/60.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- * Copyright (C) 2020 negativeExponent
+ * Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/boards/91.c b/src/boards/91.c
index 33652aa..4e9ccfe 100644
--- a/src/boards/91.c
+++ b/src/boards/91.c
@@ -2,7 +2,7 @@
  *
  * Copyright notice for this file:
  *  Copyright (C) 2012 CaH4e3
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c
index 90d4722..ac22b6d 100644
--- a/src/boards/fk23c.c
+++ b/src/boards/fk23c.c
@@ -2,7 +2,7 @@
  *
  * Copyright notice for this file:
  *  Copyright (C) 2006 CaH4e3
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/resettxrom.c b/src/boards/resettxrom.c
index 1047283..6d5537d 100644
--- a/src/boards/resettxrom.c
+++ b/src/boards/resettxrom.c
@@ -2,7 +2,7 @@
  *
  * Copyright notice for this file:
  *  Copyright (C) 2019 Libretro Team
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/sachen.c b/src/boards/sachen.c
index 82947f9..cc97bc9 100644
--- a/src/boards/sachen.c
+++ b/src/boards/sachen.c
@@ -2,7 +2,7 @@
  *
  * Copyright notice for this file:
  *  Copyright (C) 2002 Xodnizel
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/txcchip.c b/src/boards/txcchip.c
index 294cd39..69fbb56 100644
--- a/src/boards/txcchip.c
+++ b/src/boards/txcchip.c
@@ -3,7 +3,7 @@
  * Copyright notice for this file:
  *  Copyright (C) 2012 CaH4e3
  *  Copyright (C) 2019 Libretro Team
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/cheat.c b/src/cheat.c
index 0ffb25c..e7b73b2 100644
--- a/src/cheat.c
+++ b/src/cheat.c
@@ -387,7 +387,7 @@ int FCEUI_DecodePAR(const char *str, uint16 *a, uint8 *v, int *c, int *type) {
 
 	*c = -1;
 
-	/* 2020-08-31 - negativeExponent
+	/* 2020-08-31
 	 * Why is the top code set as default on non-debug runtime when
 	 * bottom code is what works for PAR?
 	 */

From cfc3b17e34e9133f8c09811961fdac207de75f5b Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sun, 27 Feb 2022 06:47:59 +0800
Subject: [PATCH 214/295] M134: Update copyright info

negativeExponent did not write (or re-write) this. I have already
removed the name from the last PR as well.
---
 src/boards/134.c       | 2 +-
 src/boards/KS7030.c    | 2 +-
 src/boards/addrlatch.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/boards/134.c b/src/boards/134.c
index 0ffa5ef..3f2f99f 100644
--- a/src/boards/134.c
+++ b/src/boards/134.c
@@ -1,7 +1,7 @@
 /* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2020 negativeExponent
+ *  Copyright (C) 2020
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/boards/KS7030.c b/src/boards/KS7030.c
index fb61a7e..a35b184 100644
--- a/src/boards/KS7030.c
+++ b/src/boards/KS7030.c
@@ -25,7 +25,7 @@
  *
  */
 
-/* 2020-3-6 - update mirroring (negativeExponent)
+/* 2020-3-6 - update mirroring
  * PRG-ROM Bank Select #1/Mirroring Select ($8000-$8FFF, write)
  * A~FEDC BA98 7654 3210
  * -------------------
diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c
index 31235eb..01c1360 100644
--- a/src/boards/addrlatch.c
+++ b/src/boards/addrlatch.c
@@ -265,7 +265,7 @@ void Mapper200_Init(CartInfo *info) {
 
 /*------------------ Map 201 ---------------------------*/
 /* 2020-3-6 - Support for 21-in-1 (CF-043) (2006-V) (Unl) [p1].nes which has mixed mirroring
- * found at the time labeled as submapper 15 (negativeExponent)
+ * found at the time labeled as submapper 15
  * 0x05658DED 128K PRG, 32K CHR */
 static uint32 submapper = 0;
 static void M201Sync(void) {

From 54fed71574bb1ef64ab0c315ebd196341c2d5efe Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sun, 27 Feb 2022 15:45:18 +0800
Subject: [PATCH 215/295] 8237A: Fixed outer PRG banking for NROM mode

---
 src/boards/8237.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/boards/8237.c b/src/boards/8237.c
index fa0c279..4c5b869 100644
--- a/src/boards/8237.c
+++ b/src/boards/8237.c
@@ -86,7 +86,7 @@ static void UNL8237PW(uint32 A, uint8 V) {
 	if (EXPREGS[0] & 0x40) {
 		uint8 sbank = (EXPREGS[1] & 0x10);
 		if (EXPREGS[0] & 0x80) { /* NROM */
-			uint8 bank = ((EXPREGS[1] & 3) << 4) | (EXPREGS[0] & 0x7) | (sbank >> 1);
+			uint8 bank = (outer_bank >> 1) | (EXPREGS[0] & 0x7) | (sbank >> 1);
 			if (EXPREGS[0] & 0x20) /* NROM-256 */
 				setprg32(0x8000, bank >> 1);
 			else { /* NROM-128 */
@@ -97,7 +97,7 @@ static void UNL8237PW(uint32 A, uint8 V) {
 			setprg8(A, outer_bank | (V & 0x0F) | sbank);
 	} else {
 		if (EXPREGS[0] & 0x80) { /* NROM */
-			uint8 bank = ((EXPREGS[1] & 3) << 4) | (EXPREGS[0] & 0xF);
+			uint8 bank = (outer_bank >> 1) | (EXPREGS[0] & 0xF);
 			if (EXPREGS[0] & 0x20) /* NROM-256 */
 				setprg32(0x8000, bank >> 1);
 			else { /* NROM-128 */

From 98244a1c1708ffde0abe6962326a887b583673a3 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 1 Mar 2022 15:28:58 +0100
Subject: [PATCH 216/295] Mapper 432: Add NROM-256 mode and second DIP switchb
 it.

---
 src/boards/432.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/boards/432.c b/src/boards/432.c
index af91e0e..f774783 100644
--- a/src/boards/432.c
+++ b/src/boards/432.c
@@ -32,12 +32,12 @@ static void M432CW(uint32 A, uint8 V) {
 static void M432PW(uint32 A, uint8 V) {
 	int prgAND = (EXPREGS[1] & 0x02) ? 0x0F : 0x1F;
 	int prgOR  = ((EXPREGS[1] << 4) & 0x10) | (EXPREGS[1] << 1) & 0x20;
-	if ((A < 0xC000) || (~EXPREGS[1] & 0x40)) setprg8(A,          (V & prgAND) | (prgOR & ~prgAND));
-	if ((A < 0xC000) &&  (EXPREGS[1] & 0x40)) setprg8(A | 0x4000, (V & prgAND) | (prgOR & ~prgAND));
+	if ((A < 0xC000) || (~EXPREGS[1] & 0x40)) setprg8(A,          (V & prgAND) | (prgOR & ~prgAND) & (EXPREGS[1] & 0x80?~2:~0));
+	if ((A < 0xC000) &&  (EXPREGS[1] & 0x40)) setprg8(A | 0x4000, (V & prgAND) | (prgOR & ~prgAND) | (EXPREGS[1] & 0x80? 2: 0));
 }
 
 static DECLFR(M432Read) {
-   if (EXPREGS[0] & 1)
+   if (EXPREGS[0] & 1 || EXPREGS[1] & 0x20)
 	  return EXPREGS[2];
    return CartBR(A);
 }

From 48d548d23b9722637377f07fa923f70a82f13ff4 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 1 Mar 2022 15:54:01 +0100
Subject: [PATCH 217/295] Mapper 432: register 0 write also clears register 1.
 Mapper 45: Only apply outer bank bits that are unaffected by the inner bank.
 Mapper 45: Add PRG /CE-based menu selection.

---
 src/boards/432.c  |  3 ++-
 src/boards/mmc3.c | 40 +++++++++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/boards/432.c b/src/boards/432.c
index f774783..5c6db48 100644
--- a/src/boards/432.c
+++ b/src/boards/432.c
@@ -44,6 +44,7 @@ static DECLFR(M432Read) {
 
 static DECLFW(M432Write) {
 	EXPREGS[A & 1] = V;
+	if (~A &1 && ~V &1) EXPREGS[1] =0; /* Writing 0 to register 0 clears register 1 */
 	FixMMC3PRG(MMC3_cmd);
 	FixMMC3CHR(MMC3_cmd);
 }
@@ -51,7 +52,7 @@ static DECLFW(M432Write) {
 static void M432Reset(void) {
 	EXPREGS[0] = 0;
 	EXPREGS[1] = 0;
-	EXPREGS[2] = (EXPREGS[2] +1) & 3;
+	EXPREGS[2]++;
 	MMC3RegReset();
 }
 
diff --git a/src/boards/mmc3.c b/src/boards/mmc3.c
index 35e7762..00f770c 100644
--- a/src/boards/mmc3.c
+++ b/src/boards/mmc3.c
@@ -474,27 +474,33 @@ void Mapper44_Init(CartInfo *info) {
 /* ---------------------------- Mapper 45 ------------------------------- */
 
 static void M45CW(uint32 A, uint8 V) {
-	if (!UNIFchrrama) {
-		uint32 NV = V;
-		if (EXPREGS[2] & 8)
-			NV &= (1 << ((EXPREGS[2] & 7) + 1)) - 1;
-		else
-		if (EXPREGS[2])
-			NV &= 0;	/* hack ;( don't know exactly how it should be */
-		NV |= EXPREGS[0] | ((EXPREGS[2] & 0xF0) << 4);
-		setchr1(A, NV);
-	} else
-		/* setchr8(0); */		/* i don't know what cart need this, but a new one need other lol */
+	if (CHRsize[0] ==8192)
 		setchr1(A, V);
+	else {
+		int chrAND =0xFF >>(~EXPREGS[2] &0xF);
+		int chrOR  =EXPREGS[0] | EXPREGS[2] <<4 &0xF00;
+		setchr1(A, V &chrAND | chrOR &~chrAND);
+	}
+}
+
+static DECLFR(M45ReadOB) {
+	return X.DB;
 }
 
 static void M45PW(uint32 A, uint8 V) {
-	uint32 MV = V & ((EXPREGS[3] & 0x3F) ^ 0x3F);
-	MV |= EXPREGS[1];
-	if(UNIFchrrama)
-		MV |= ((EXPREGS[2] & 0x40) << 2);
-	setprg8(A, MV);
-/*	FCEU_printf("1:%02x 2:%02x 3:%02x A=%04x V=%03x\n",EXPREGS[1],EXPREGS[2],EXPREGS[3],A,MV); */
+	int prgAND =~EXPREGS[3] &0x3F;
+	int prgOR  =EXPREGS[1] | EXPREGS[2] <<2 &0x300;
+	setprg8(A, V &prgAND | prgOR &~prgAND);
+
+	/* Some multicarts select between five different menus by connecting one of the higher address lines to PRG /CE.
+	   The menu code selects between menus by checking which of the higher address lines disables PRG-ROM when set. */
+	if (PRGsize[0] <0x200000 && EXPREGS[5] ==1 && EXPREGS[1] &0x80 ||
+	    PRGsize[0] <0x200000 && EXPREGS[5] ==2 && EXPREGS[2] &0x40 ||
+	    PRGsize[0] <0x100000 && EXPREGS[5] ==3 && EXPREGS[1] &0x40 ||
+	    PRGsize[0] <0x100000 && EXPREGS[5] ==4 && EXPREGS[2] &0x20)
+		SetReadHandler(0x8000, 0xFFFF, M45ReadOB);
+	else
+		SetReadHandler(0x8000, 0xFFFF, CartBR);
 }
 
 static DECLFW(M45Write) {

From 7a9a044d22b32f837904cb23091df2271c6a2a24 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 1 Mar 2022 17:15:06 +0100
Subject: [PATCH 218/295] Mapper 344: Remove hack to accomodate a bad dump that
 made it incompatible with other multicarts using the same PCB.

---
 src/boards/gn26.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/boards/gn26.c b/src/boards/gn26.c
index 0af480b..ecaf5f9 100644
--- a/src/boards/gn26.c
+++ b/src/boards/gn26.c
@@ -27,26 +27,25 @@
 #include "mmc3.h"
 
 static void BMCGN26CW(uint32 A, uint8 V) {
-	uint32 base = (EXPREGS[0] & 0x03) << 7;
-	setchr1(A, base | (V & 0xFF));
+	int chrAND = EXPREGS[0]&0x04? 0xFF: 0x7F;
+	int chrOR  = EXPREGS[0] <<7;
+	setchr1(A, V &chrAND | chrOR &~chrAND);
 }
 
 static void BMCGN26PW(uint32 A, uint8 V) {
-	/* Re-ordered -> 0:SF4 1:Contra Force 2:Revolution Hero */
-	uint32 table[] = { 0, 0, 1, 2 };
-	uint32 base = table[(EXPREGS[0] & 0x03)];
-
 	if (EXPREGS[0] & 4) {
 		if (A == 0x8000)
-			setprg32(0x8000, (base << 2) | (V >> 2));
+			setprg32(0x8000, (EXPREGS[0] << 2) | (V >> 2));
 	} else
-		setprg8(A, (base << 4) | (V & 0x0F));
+		setprg8(A, (EXPREGS[0] << 4) | (V & 0x0F));
 }
 
 static DECLFW(BMCGN26Write) {
-	EXPREGS[0] = A & 0x0F;
-	FixMMC3PRG(MMC3_cmd);
-	FixMMC3CHR(MMC3_cmd);
+	if (A001B &0x80 && ~A001B &0x40) {
+		EXPREGS[0] = A;
+		FixMMC3PRG(MMC3_cmd);
+		FixMMC3CHR(MMC3_cmd);
+	}
 }
 
 static void BMCGN26Reset(void) {
@@ -56,7 +55,7 @@ static void BMCGN26Reset(void) {
 
 static void BMCGN26Power(void) {
 	GenMMC3Power();
-	SetWriteHandler(0x6800, 0x68FF, BMCGN26Write);
+	SetWriteHandler(0x6000, 0x7FFF, BMCGN26Write);
 }
 
 void BMCGN26_Init(CartInfo *info) {

From 95b79c474504ba2c59da1c625e9f99ede5dc2e70 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 1 Mar 2022 17:33:39 +0100
Subject: [PATCH 219/295] Mapper 289: Support Super 76-in-1 Contra

---
 src/boards/bmc60311c.c | 72 +++++++++++++-----------------------------
 1 file changed, 22 insertions(+), 50 deletions(-)

diff --git a/src/boards/bmc60311c.c b/src/boards/bmc60311c.c
index 9ea71fa..02c3b23 100644
--- a/src/boards/bmc60311c.c
+++ b/src/boards/bmc60311c.c
@@ -24,79 +24,51 @@
 
 #include "mapinc.h"
 
-static uint8 inner_bank, outer_bank, mode;
+static uint8 latch, reg[2];
 
 static SFORMAT StateRegs[] =
 {
-	{ &inner_bank, 1, "INB0" },
-	{ &outer_bank, 1, "OUTB" },
-	{ &mode, 1, "MODE" },
+	{ &latch, 1, "LATC" },
+	{ reg, 2, "REGS" },
 	{ 0 }
 };
 
 static void Sync(void) {
-	uint8 bbank = (mode & 4) ? 0 : (inner_bank & 7);
-	uint8 bank = outer_bank | bbank;
-	uint8 preg[2];
-
-	/* 0: NROM-128: Same inner/outer 16 KiB bank at CPU $8000-$BFFF
-	 *    and $C000-$FFFF
-	 * 1: NROM-256: 32 kiB bank at CPU $8000-$FFFF (Selected inner/outer bank SHR 1)
-	 * 2: UNROM: Inner/outer bank at CPU $8000-BFFF,
-	 *    fixed inner bank 7 within outer bank at $C000-$FFFF
-	 * 3: Unknown
-	 *
-	 * The combined inner/outer bank is simply the inner bank, selected by the
-	 * latch at $8000-$FFFF (or 0 if the latch is disabled) ORed with the
-	 * outer bank selected by $6001, without any bit shifting.
-	 */
-
-	preg[0] = bank;
-	preg[1] = 0;
-
-	switch (mode & 3) {
-	case 0x00:
-	case 0x01:
-		preg[1] = bank | ((mode & 1) ? 1 : 0);
-		break;
-	case 0x02:
-		preg[1] = outer_bank | 7;
-	case 0x03:
-		break;
+	if (reg[0] &2) { /* UNROM */
+		setprg16(0x8000, latch &7 | reg[1] &~7);
+		setprg16(0xC000,        7 | reg[1] &~7);
+	} else
+	if (reg[0] &1)   /* NROM-256 */
+		setprg32(0x8000, reg[1] >>1);
+	else {           /* NROM-128 */
+		setprg16(0x8000, reg[1]);
+		setprg16(0xC000, reg[1]);
 	}
-
+	SetupCartCHRMapping(0, CHRptr[0], 0x2000, !(reg[0] &4)); /* CHR-RAM write-protect */
 	setchr8(0);
-	setprg16(0x8000, preg[0]);
-	setprg16(0xC000, preg[1]);
-	setmirror(((mode & 8) >> 3) ^ 1);
+	setmirror(!(reg[0] &8));
 }
 
-static DECLFW(Write0) {
-	mode = V;
+static DECLFW(WriteReg) {
+	reg[A &1] =V;
 	Sync();
 }
 
-static DECLFW(Write1) {
-	outer_bank = V;
-	Sync();
-}
-
-static DECLFW(Write8) {
-	inner_bank = V;
+static DECLFW(WriteLatch) {
+	latch = V;
 	Sync();
 }
 
 static void BMC60311CPower(void) {
-	inner_bank = outer_bank = mode = 0;
+	latch =reg[0] =reg[1] =0;
 	Sync();
 	SetReadHandler(0x8000, 0xFFFF, CartBR);
-	SetWriteHandler(0x6000, 0x6000, Write0);
-	SetWriteHandler(0x6001, 0x6001, Write1);
-	SetWriteHandler(0x8000, 0xFFFF, Write8);
+	SetWriteHandler(0x6000, 0x6001, WriteReg);
+	SetWriteHandler(0x8000, 0xFFFF, WriteLatch);
 }
 
 static void BMC60311CReset(void) {
-	inner_bank = outer_bank = mode = 0;
+	latch =reg[0] =reg[1] =0;
 	Sync();
 }
 

From de9e258f314369de8462417d6d2ba7d0775ab147 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 1 Mar 2022 18:04:34 +0100
Subject: [PATCH 220/295] Mapper 256: Add WRAM support.

---
 src/boards/onebus.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/boards/onebus.c b/src/boards/onebus.c
index d970456..bf52b64 100644
--- a/src/boards/onebus.c
+++ b/src/boards/onebus.c
@@ -65,6 +65,8 @@ static SFORMAT StateRegs[] =
 	{ 0 }
 };
 
+static uint8 *WRAM;
+
 static void PSync(void) {
 	uint8 bankmode = cpu410x[0xb] & 7;
 	uint8 mask = (bankmode == 0x7) ? (0xff) : (0x3f >> bankmode);
@@ -263,11 +265,14 @@ static void UNLOneBusPower(void) {
 	SetReadHandler(0x4000, 0x403f, UNLOneBusReadAPU40XX);
 	SetWriteHandler(0x4000, 0x403f, UNLOneBusWriteAPU40XX);
 
-	SetReadHandler(0x8000, 0xFFFF, CartBR);
+	SetReadHandler(0x6000, 0xFFFF, CartBR);
+	SetWriteHandler(0x6000, 0x7FFF, CartBW);
 	SetWriteHandler(0x2010, 0x201f, UNLOneBusWritePPU201X);
 	SetWriteHandler(0x4100, 0x410f, UNLOneBusWriteCPU410X);
 	SetWriteHandler(0x8000, 0xffff, UNLOneBusWriteMMC3);
 
+	FCEU_CheatAddRAM(8, 0x6000, WRAM);
+	setprg8r(0x10, 0x6000, 0);
 	Sync();
 }
 
@@ -285,9 +290,16 @@ static void StateRestore(int version) {
 	Sync();
 }
 
+void UNLOneBus_Close(void) {
+	if (WRAM)
+		FCEU_gfree(WRAM);
+	WRAM = NULL;
+}
+
 void UNLOneBus_Init(CartInfo *info) {
 	info->Power = UNLOneBusPower;
 	info->Reset = UNLOneBusReset;
+	info->Close = UNLOneBus_Close;
 
 	if (((*(uint32*)&(info->MD5)) == 0x305fcdc3) ||	/* PowerJoy Supermax Carts */
 		((*(uint32*)&(info->MD5)) == 0x6abfce8e))
@@ -297,4 +309,8 @@ void UNLOneBus_Init(CartInfo *info) {
 	MapIRQHook = UNLOneBusCpuHook;
 	GameStateRestore = StateRestore;
 	AddExState(&StateRegs, ~0, 0, 0);
+	
+	WRAM = (uint8*)FCEU_gmalloc(8192);
+	SetupCartPRGMapping(0x10, WRAM, 8192, 1);
 }
+

From 1aaccd7429d1d49a3756f396b3e0f4638f4024a1 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 1 Mar 2022 18:18:49 +0100
Subject: [PATCH 221/295] Mapper 256: Add register scrambling based on NES 2.0
 submapper.

---
 src/boards/onebus.c | 86 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 74 insertions(+), 12 deletions(-)

diff --git a/src/boards/onebus.c b/src/boards/onebus.c
index bf52b64..d4eb2f8 100644
--- a/src/boards/onebus.c
+++ b/src/boards/onebus.c
@@ -27,6 +27,8 @@
 
 #include "mapinc.h"
 
+static uint8 submapper;
+
 /* General Purpose Registers */
 static uint8 cpu410x[16], ppu201x[16], apu40xx[64];
 
@@ -35,9 +37,6 @@ static uint8 IRQCount, IRQa, IRQReload;
 #define IRQLatch cpu410x[0x1]	/* accc cccc, a = 0, AD12 switching, a = 1, HSYNC switching */
 
 /* MMC3 Registers */
-static uint8 inv_hack = 0;		/* some OneBus Systems have swapped PRG reg commans in MMC3 inplementation,
-								 * trying to autodetect unusual behavior, due not to add a new mapper.
-								 */
 #define mmc3cmd  cpu410x[0x5]	/* pcv- ----, p - program swap, c - video swap, v - internal VRAM enable */
 #define mirror   cpu410x[0x6]	/* ---- ---m, m = 0 - H, m = 1 - V */
 
@@ -79,8 +78,8 @@ static void PSync(void) {
 	uint8 bank2  = (cpu410x[0xb] & 0x40)?(cpu410x[0x9]):(~1);
 	uint8 bank3  = ~0;
 #endif
-	uint8 bank0 = cpu410x[0x7 ^ inv_hack];
-	uint8 bank1 = cpu410x[0x8 ^ inv_hack];
+	uint8 bank0 = cpu410x[0x7];
+	uint8 bank1 = cpu410x[0x8];
 	uint8 bank2 = (cpu410x[0xb] & 0x40) ? (cpu410x[0x9]) : (~1);
 	uint8 bank3 = ~0;
 
@@ -126,29 +125,91 @@ static void Sync(void) {
 	CSync();
 }
 
+static const uint8 cpuMangle[16][4] = {
+	{ 0, 1, 2, 3 }, 	// Submapper 0: Normal
+	{ 0, 1, 2, 3 }, 	// Submapper 1: Waixing VT03
+	{ 1, 0, 2, 3 }, 	// Submapper 2: Trump Grand
+	{ 0, 1, 2, 3 }, 	// Submapper 3: Zechess
+	{ 0, 1, 2, 3 }, 	// Submapper 4: Qishenglong
+	{ 0, 1, 2, 3 }, 	// Submapper 5: Waixing VT02
+	{ 0, 1, 2, 3 }, 	// Submapper 6: unused so far
+	{ 0, 1, 2, 3 }, 	// Submapper 7: unused so far
+	{ 0, 1, 2, 3 }, 	// Submapper 8: unused so far
+	{ 0, 1, 2, 3 }, 	// Submapper 9: unused so far
+	{ 0, 1, 2, 3 }, 	// Submapper A: unused so far
+	{ 0, 1, 2, 3 }, 	// Submapper B: unused so far
+	{ 0, 1, 2, 3 }, 	// Submapper C: unused so far
+	{ 0, 1, 2, 3 }, 	// Submapper D: Cube Tech (CPU opcode encryption only)
+	{ 0, 1, 2, 3 }, 	// Submapper E: Karaoto (CPU opcode encryption only)
+	{ 0, 1, 2, 3 }  	// Submapper F: Jungletac (CPU opcode encryption only)
+};
 static DECLFW(UNLOneBusWriteCPU410X) {
 /*	FCEU_printf("CPU %04x:%04x\n",A,V); */
-	switch (A & 0xf) {
+	A &=0xF;
+	switch (A) {
 	case 0x1: IRQLatch = V & 0xfe; break;	/* �� �� �������� */
 	case 0x2: IRQReload = 1; break;
 	case 0x3: X6502_IRQEnd(FCEU_IQEXT); IRQa = 0; break;
 	case 0x4: IRQa = 1; break;
 	default:
-		cpu410x[A & 0xf] = V;
+		if (A >=0x7 && A <=0xA) A =0x7 +cpuMangle[submapper][A -0x7];
+		cpu410x[A] = V;
 		Sync();
 	}
 }
 
+static const uint8 ppuMangle[16][6] = {
+	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper 0: Normal
+	{ 1, 0, 5, 4, 3, 2 }, 	// Submapper 1: Waixing VT03
+	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper 2: Trump Grand
+	{ 5, 4, 3, 2, 0, 1 }, 	// Submapper 3: Zechess
+	{ 2, 5, 0, 4, 3, 1 }, 	// Submapper 4: Qishenglong
+	{ 1, 0, 5, 4, 3, 2 }, 	// Submapper 5: Waixing VT02
+	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper 6: unused so far
+	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper 7: unused so far
+	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper 8: unused so far
+	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper 9: unused so far
+	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper A: unused so far
+	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper B: unused so far
+	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper C: unused so far
+	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper D: Cube Tech (CPU opcode encryption only)
+	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper E: Karaoto (CPU opcode encryption only)
+	{ 0, 1, 2, 3, 4, 5 }  	// Submapper F: Jungletac (CPU opcode encryption only)
+};
 static DECLFW(UNLOneBusWritePPU201X) {
 /*	FCEU_printf("PPU %04x:%04x\n",A,V); */
-	ppu201x[A & 0x0f] = V;
+	A &=0x0F;
+	if (A >=2 && A <=7) A =2 +ppuMangle[submapper][A -2];
+	ppu201x[A] = V;
 	Sync();
 }
 
+static const uint8 mmc3Mangle[16][8] = {
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper 0: Normal
+	{ 5, 4, 3, 2, 1, 0, 6, 7 }, 	// Submapper 1: Waixing VT03
+	{ 0, 1, 2, 3, 4, 5, 7, 6 }, 	// Submapper 2: Trump Grand
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper 3: Zechess
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper 4: Qishenglong
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper 5: Waixing VT02
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper 6: unused so far
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper 7: unused so far
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper 8: unused so far
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper 9: unused so far
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper A: unused so far
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper B: unused so far
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper C: unused so far
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper D: Cube Tech (CPU opcode encryption only)
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper E: Karaoto (CPU opcode encryption only)
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }  	// Submapper F: Jungletac (CPU opcode encryption only)
+};
 static DECLFW(UNLOneBusWriteMMC3) {
 /*	FCEU_printf("MMC %04x:%04x\n",A,V); */
 	switch (A & 0xe001) {
-	case 0x8000: mmc3cmd = (mmc3cmd & 0x38) | (V & 0xc7); Sync(); break;
+	case 0x8000: 
+		V =V &0xF8 | mmc3Mangle[submapper][V &0x07];
+		mmc3cmd = (mmc3cmd & 0x38) | (V & 0xc7);
+		Sync();
+		break;
 	case 0x8001:
 	{
 		switch (mmc3cmd & 7) {
@@ -301,9 +362,10 @@ void UNLOneBus_Init(CartInfo *info) {
 	info->Reset = UNLOneBusReset;
 	info->Close = UNLOneBus_Close;
 
-	if (((*(uint32*)&(info->MD5)) == 0x305fcdc3) ||	/* PowerJoy Supermax Carts */
-		((*(uint32*)&(info->MD5)) == 0x6abfce8e))
-		inv_hack = 0xf;
+	if (info->iNES2)
+		submapper =info->submapper;
+	else
+		submapper =(((*(uint32*)&(info->MD5)) == 0x305fcdc3) ||	((*(uint32*)&(info->MD5)) == 0x6abfce8e))? 2: 0; /* PowerJoy Supermax Carts */
 
 	GameHBIRQHook = UNLOneBusIRQHook;
 	MapIRQHook = UNLOneBusCpuHook;

From e88404cd3d7bd881b9b195dd005c91822725ef95 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 1 Mar 2022 18:36:34 +0100
Subject: [PATCH 222/295] C-style comments. :P

---
 src/boards/onebus.c | 96 ++++++++++++++++++++++-----------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/boards/onebus.c b/src/boards/onebus.c
index d4eb2f8..4175ca1 100644
--- a/src/boards/onebus.c
+++ b/src/boards/onebus.c
@@ -126,22 +126,22 @@ static void Sync(void) {
 }
 
 static const uint8 cpuMangle[16][4] = {
-	{ 0, 1, 2, 3 }, 	// Submapper 0: Normal
-	{ 0, 1, 2, 3 }, 	// Submapper 1: Waixing VT03
-	{ 1, 0, 2, 3 }, 	// Submapper 2: Trump Grand
-	{ 0, 1, 2, 3 }, 	// Submapper 3: Zechess
-	{ 0, 1, 2, 3 }, 	// Submapper 4: Qishenglong
-	{ 0, 1, 2, 3 }, 	// Submapper 5: Waixing VT02
-	{ 0, 1, 2, 3 }, 	// Submapper 6: unused so far
-	{ 0, 1, 2, 3 }, 	// Submapper 7: unused so far
-	{ 0, 1, 2, 3 }, 	// Submapper 8: unused so far
-	{ 0, 1, 2, 3 }, 	// Submapper 9: unused so far
-	{ 0, 1, 2, 3 }, 	// Submapper A: unused so far
-	{ 0, 1, 2, 3 }, 	// Submapper B: unused so far
-	{ 0, 1, 2, 3 }, 	// Submapper C: unused so far
-	{ 0, 1, 2, 3 }, 	// Submapper D: Cube Tech (CPU opcode encryption only)
-	{ 0, 1, 2, 3 }, 	// Submapper E: Karaoto (CPU opcode encryption only)
-	{ 0, 1, 2, 3 }  	// Submapper F: Jungletac (CPU opcode encryption only)
+	{ 0, 1, 2, 3 }, 	/* Submapper 0: Normal                                  */
+	{ 0, 1, 2, 3 }, 	/* Submapper 1: Waixing VT03                            */
+	{ 1, 0, 2, 3 }, 	/* Submapper 2: Trump Grand                             */
+	{ 0, 1, 2, 3 }, 	/* Submapper 3: Zechess                                 */
+	{ 0, 1, 2, 3 }, 	/* Submapper 4: Qishenglong                             */
+	{ 0, 1, 2, 3 }, 	/* Submapper 5: Waixing VT02                            */
+	{ 0, 1, 2, 3 }, 	/* Submapper 6: unused so far                           */
+	{ 0, 1, 2, 3 }, 	/* Submapper 7: unused so far                           */
+	{ 0, 1, 2, 3 }, 	/* Submapper 8: unused so far                           */
+	{ 0, 1, 2, 3 }, 	/* Submapper 9: unused so far                           */
+	{ 0, 1, 2, 3 }, 	/* Submapper A: unused so far                           */
+	{ 0, 1, 2, 3 }, 	/* Submapper B: unused so far                           */
+	{ 0, 1, 2, 3 }, 	/* Submapper C: unused so far                           */
+	{ 0, 1, 2, 3 }, 	/* Submapper D: Cube Tech (CPU opcode encryption only)  */
+	{ 0, 1, 2, 3 }, 	/* Submapper E: Karaoto (CPU opcode encryption only)    */
+	{ 0, 1, 2, 3 }  	/* Submapper F: Jungletac (CPU opcode encryption only)  */
 };
 static DECLFW(UNLOneBusWriteCPU410X) {
 /*	FCEU_printf("CPU %04x:%04x\n",A,V); */
@@ -159,22 +159,22 @@ static DECLFW(UNLOneBusWriteCPU410X) {
 }
 
 static const uint8 ppuMangle[16][6] = {
-	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper 0: Normal
-	{ 1, 0, 5, 4, 3, 2 }, 	// Submapper 1: Waixing VT03
-	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper 2: Trump Grand
-	{ 5, 4, 3, 2, 0, 1 }, 	// Submapper 3: Zechess
-	{ 2, 5, 0, 4, 3, 1 }, 	// Submapper 4: Qishenglong
-	{ 1, 0, 5, 4, 3, 2 }, 	// Submapper 5: Waixing VT02
-	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper 6: unused so far
-	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper 7: unused so far
-	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper 8: unused so far
-	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper 9: unused so far
-	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper A: unused so far
-	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper B: unused so far
-	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper C: unused so far
-	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper D: Cube Tech (CPU opcode encryption only)
-	{ 0, 1, 2, 3, 4, 5 }, 	// Submapper E: Karaoto (CPU opcode encryption only)
-	{ 0, 1, 2, 3, 4, 5 }  	// Submapper F: Jungletac (CPU opcode encryption only)
+	{ 0, 1, 2, 3, 4, 5 }, 	/* Submapper 0: Normal                                  */
+	{ 1, 0, 5, 4, 3, 2 }, 	/* Submapper 1: Waixing VT03                            */
+	{ 0, 1, 2, 3, 4, 5 }, 	/* Submapper 2: Trump Grand                             */
+	{ 5, 4, 3, 2, 0, 1 }, 	/* Submapper 3: Zechess                                 */
+	{ 2, 5, 0, 4, 3, 1 }, 	/* Submapper 4: Qishenglong                             */
+	{ 1, 0, 5, 4, 3, 2 }, 	/* Submapper 5: Waixing VT02                            */
+	{ 0, 1, 2, 3, 4, 5 }, 	/* Submapper 6: unused so far                           */
+	{ 0, 1, 2, 3, 4, 5 }, 	/* Submapper 7: unused so far                           */
+	{ 0, 1, 2, 3, 4, 5 }, 	/* Submapper 8: unused so far                           */
+	{ 0, 1, 2, 3, 4, 5 }, 	/* Submapper 9: unused so far                           */
+	{ 0, 1, 2, 3, 4, 5 }, 	/* Submapper A: unused so far                           */
+	{ 0, 1, 2, 3, 4, 5 }, 	/* Submapper B: unused so far                           */
+	{ 0, 1, 2, 3, 4, 5 }, 	/* Submapper C: unused so far                           */
+	{ 0, 1, 2, 3, 4, 5 }, 	/* Submapper D: Cube Tech (CPU opcode encryption only)  */
+	{ 0, 1, 2, 3, 4, 5 }, 	/* Submapper E: Karaoto (CPU opcode encryption only)    */
+	{ 0, 1, 2, 3, 4, 5 }  	/* Submapper F: Jungletac (CPU opcode encryption only)  */
 };
 static DECLFW(UNLOneBusWritePPU201X) {
 /*	FCEU_printf("PPU %04x:%04x\n",A,V); */
@@ -185,22 +185,22 @@ static DECLFW(UNLOneBusWritePPU201X) {
 }
 
 static const uint8 mmc3Mangle[16][8] = {
-	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper 0: Normal
-	{ 5, 4, 3, 2, 1, 0, 6, 7 }, 	// Submapper 1: Waixing VT03
-	{ 0, 1, 2, 3, 4, 5, 7, 6 }, 	// Submapper 2: Trump Grand
-	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper 3: Zechess
-	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper 4: Qishenglong
-	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper 5: Waixing VT02
-	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper 6: unused so far
-	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper 7: unused so far
-	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper 8: unused so far
-	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper 9: unused so far
-	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper A: unused so far
-	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper B: unused so far
-	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper C: unused so far
-	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper D: Cube Tech (CPU opcode encryption only)
-	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	// Submapper E: Karaoto (CPU opcode encryption only)
-	{ 0, 1, 2, 3, 4, 5, 6, 7 }  	// Submapper F: Jungletac (CPU opcode encryption only)
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	/* Submapper 0: Normal                                 */
+	{ 5, 4, 3, 2, 1, 0, 6, 7 }, 	/* Submapper 1: Waixing VT03                           */
+	{ 0, 1, 2, 3, 4, 5, 7, 6 }, 	/* Submapper 2: Trump Grand                            */
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	/* Submapper 3: Zechess                                */
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	/* Submapper 4: Qishenglong                            */
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	/* Submapper 5: Waixing VT02                           */
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	/* Submapper 6: unused so far                          */
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	/* Submapper 7: unused so far                          */
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	/* Submapper 8: unused so far                          */
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	/* Submapper 9: unused so far                          */
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	/* Submapper A: unused so far                          */
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	/* Submapper B: unused so far                          */
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	/* Submapper C: unused so far                          */
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	/* Submapper D: Cube Tech (CPU opcode encryption only) */
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }, 	/* Submapper E: Karaoto (CPU opcode encryption only)   */
+	{ 0, 1, 2, 3, 4, 5, 6, 7 }  	/* Submapper F: Jungletac (CPU opcode encryption only) */
 };
 static DECLFW(UNLOneBusWriteMMC3) {
 /*	FCEU_printf("MMC %04x:%04x\n",A,V); */

From 9e7cf140ecb54dd86e1419dc8b805055b841f193 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 2 Mar 2022 10:35:22 +0100
Subject: [PATCH 223/295] Mapper 432: Small mistake regarding DIP clear bit

---
 src/boards/432.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/boards/432.c b/src/boards/432.c
index 5c6db48..dbdffa0 100644
--- a/src/boards/432.c
+++ b/src/boards/432.c
@@ -44,7 +44,7 @@ static DECLFR(M432Read) {
 
 static DECLFW(M432Write) {
 	EXPREGS[A & 1] = V;
-	if (~A &1 && ~V &1) EXPREGS[1] =0; /* Writing 0 to register 0 clears register 1 */
+	if (~A &1 && ~V &1) EXPREGS[1] &=~0x20; /* Writing 0 to register 0 clears register 1's DIP bit */
 	FixMMC3PRG(MMC3_cmd);
 	FixMMC3CHR(MMC3_cmd);
 }

From 706183bcc9843b79bd43f94d390289411c1231d9 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 2 Mar 2022 13:35:56 +0100
Subject: [PATCH 224/295] Add mapper 394.

---
 src/boards/jyasic.c | 126 ++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c          |   5 +-
 src/ines.h          |   1 +
 3 files changed, 130 insertions(+), 2 deletions(-)

diff --git a/src/boards/jyasic.c b/src/boards/jyasic.c
index 0d1cdf1..cfc1b3b 100644
--- a/src/boards/jyasic.c
+++ b/src/boards/jyasic.c
@@ -21,6 +21,7 @@
  */
 
 #include "mapinc.h"
+#include "mmc3.h"
 
 void 	(*sync)(void);
 static uint8	allowExtendedMirroring;
@@ -45,6 +46,7 @@ static uint8	adder;
 static uint8	test;
 static uint8    dipSwitch;
 
+static uint8 cpuWriteHandlersSet;
 static writefunc cpuWriteHandlers[0x10000]; /* Actual write handlers for CPU write trapping as a method fo IRQ clocking */
 
 static SFORMAT JYASIC_stateRegs[] = {
@@ -373,6 +375,16 @@ static DECLFW(writeMode)
 	sync();
 }
 
+static void JYASIC_restoreWriteHandlers(void)
+{
+   int i;
+   if (cpuWriteHandlersSet) 
+   {
+	   for (i =0; i <0x10000; i++) SetWriteHandler(i, i, cpuWriteHandlers[i]);
+	   cpuWriteHandlersSet =0;
+   }
+}
+
 static void JYASIC_power(void)
 {
    unsigned int i;
@@ -386,8 +398,10 @@ static void JYASIC_power(void)
    SetWriteHandler(0xC000, 0xCFFF, writeIRQ);
    SetWriteHandler(0xD000, 0xD7FF, writeMode);    /* D800-DFFF ignored */
 
+   JYASIC_restoreWriteHandlers();
    for (i =0; i <0x10000; i++) cpuWriteHandlers[i] =GetWriteHandler(i);
    SetWriteHandler(0x0000, 0xFFFF, trapCPUWrite); /* Trap all CPU writes for IRQ clocking purposes */
+   cpuWriteHandlersSet =1;
 
    SetReadHandler(0x5000, 0x5FFF, readALU_DIP);
    SetReadHandler(0x6000, 0xFFFF, CartBR);
@@ -423,6 +437,7 @@ static void JYASIC_restore (int version)
 
 void JYASIC_init (CartInfo *info)
 {
+   cpuWriteHandlersSet =0;
    info->Reset = JYASIC_reset;
    info->Power = JYASIC_power;
    info->Close = JYASIC_close;
@@ -669,3 +684,114 @@ void Mapper421_Init(CartInfo *info)
 	sync =sync421;
 	JYASIC_init(info);
 }
+
+/* Mapper 394: HSK007 circuit board that can simulate J.Y. ASIC, MMC3, and NROM. */
+static uint8 HSK007Reg[4];
+void sync394 (void) /* Called when J.Y. ASIC is active */
+{
+	int prgAND =HSK007Reg[3] &0x10? 0x1F: 0x0F;
+	int chrAND =HSK007Reg[3] &0x80? 0xFF: 0x7F;
+	int prgOR  =HSK007Reg[3] <<1 &0x010 | HSK007Reg[1] <<5 &0x020;
+	int chrOR  =HSK007Reg[3] <<1 &0x080 | HSK007Reg[1] <<8 &0x100;
+	syncPRG(0x1F, prgOR);
+	syncCHR(0xFF, chrOR);
+	syncNT (0xFF, chrOR);	
+}
+static void Mapper394_PWrap(uint32 A, uint8 V)
+{
+	int prgAND =HSK007Reg[3] &0x10? 0x1F: 0x0F;
+	int prgOR  =HSK007Reg[3] <<1 &0x010 | HSK007Reg[1] <<5 &0x020;
+	if (HSK007Reg[1] &0x08)
+		setprg8(A, V &prgAND | prgOR &~prgAND);
+	else
+	if (A ==0x8000)
+		setprg32(A, (prgOR | HSK007Reg[3] <<1 &0x0F) >>2);
+	
+}
+static void Mapper394_CWrap(uint32 A, uint8 V)
+{
+	int chrAND =HSK007Reg[3] &0x80? 0xFF: 0x7F;
+	int chrOR  =HSK007Reg[3] <<1 &0x080 | HSK007Reg[1] <<8 &0x100;
+	setchr1(A, V &chrAND | chrOR &~chrAND);
+}
+static DECLFW(Mapper394_Write)
+{
+	uint8 oldMode =HSK007Reg[1];
+	A &=3;
+	HSK007Reg[A] =V;
+	if (A ==1)
+	{		
+		if (~oldMode &0x10 &&  V &0x10) JYASIC_power();
+		if ( oldMode &0x10 && ~V &0x10)
+		{
+			JYASIC_restoreWriteHandlers();
+			GenMMC3Power();
+		}
+	}
+	else
+	{
+		if (HSK007Reg[1] &0x10)
+			sync();
+		else
+		{
+			FixMMC3PRG(MMC3_cmd);
+			FixMMC3CHR(MMC3_cmd);
+		}
+			
+	}
+}
+static void Mapper394_restore (int version)
+{
+	int i;
+	JYASIC_restoreWriteHandlers();
+	if (HSK007Reg[1] &0x10)
+	{		
+		SetWriteHandler(0x5000, 0x5FFF, writeALU);
+		SetWriteHandler(0x6000, 0x7fff, CartBW);
+		SetWriteHandler(0x8000, 0x87FF, writePRG);     /* 8800-8FFF ignored */
+		SetWriteHandler(0x9000, 0x97FF, writeCHRLow);  /* 9800-9FFF ignored */
+		SetWriteHandler(0xA000, 0xA7FF, writeCHRHigh); /* A800-AFFF ignored */
+		SetWriteHandler(0xB000, 0xB7FF, writeNT);      /* B800-BFFF ignored */
+		SetWriteHandler(0xC000, 0xCFFF, writeIRQ);
+		SetWriteHandler(0xD000, 0xD7FF, writeMode);    /* D800-DFFF ignored */
+		
+		for (i =0; i <0x10000; i++) cpuWriteHandlers[i] =GetWriteHandler(i);
+		SetWriteHandler(0x0000, 0xFFFF, trapCPUWrite); /* Trap all CPU writes for IRQ clocking purposes */
+		cpuWriteHandlersSet =1;
+		
+		SetReadHandler(0x5000, 0x5FFF, readALU_DIP);
+		SetReadHandler(0x6000, 0xFFFF, CartBR);
+		sync();
+	}
+	else
+	{
+		SetWriteHandler(0x8000, 0xBFFF, MMC3_CMDWrite);
+		SetWriteHandler(0xC000, 0xFFFF, MMC3_IRQWrite);
+		SetReadHandler(0x8000, 0xFFFF, CartBR);
+		FixMMC3PRG(MMC3_cmd);
+		FixMMC3CHR(MMC3_cmd);
+	}
+}
+static void Mapper394_power(void)
+{
+	HSK007Reg[0] =0x00;
+	HSK007Reg[1] =0x0F;
+	HSK007Reg[2] =0x00;
+	HSK007Reg[3] =0x10;
+	GenMMC3Power();
+	SetWriteHandler(0x5000, 0x5FFF, Mapper394_Write);
+}
+
+void Mapper394_Init(CartInfo *info)
+{
+	allowExtendedMirroring =1;
+	sync =sync394;
+	JYASIC_init(info);
+	GenMMC3_Init(info, 128, 128, 0, 0);
+	pwrap =Mapper394_PWrap;
+	cwrap =Mapper394_CWrap;
+	info->Reset = Mapper394_power;
+	info->Power = Mapper394_power;
+	AddExState(HSK007Reg, 4, 0, "HSK ");
+	GameStateRestore = Mapper394_restore;
+}
diff --git a/src/ines.c b/src/ines.c
index 97ddef7..bdd384a 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -784,10 +784,11 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "Realtec 8031",             390, Mapper390_Init         )
 	INES_BOARD( "BS-110",                   391, Mapper391_Init         )
 	INES_BOARD( "820720C",                  393, Mapper393_Init         )
+	INES_BOARD( "HSK007",                   394, Mapper394_Init         )
 	INES_BOARD( "Realtec 8210",             395, Mapper395_Init         )
-    INES_BOARD( "YY850437C",                396, Mapper396_Init         )
+	INES_BOARD( "YY850437C",                396, Mapper396_Init         )
 	INES_BOARD( "YY850439C",                397, Mapper397_Init         )
-	INES_BOARD( "BMC Super 19-in-1 (VIP19)", 401, Mapper401_Init         )
+	INES_BOARD( "BMC Super 19-in-1 (VIP19)",401, Mapper401_Init         )
 	INES_BOARD( "831019C J-2282",           402, J2282_Init             )
 	INES_BOARD( "89433",                    403, Mapper403_Init         )
 	INES_BOARD( "JY012005",                 404, Mapper404_Init         )
diff --git a/src/ines.h b/src/ines.h
index 7a568dd..e6ed97b 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -294,6 +294,7 @@ void Mapper389_Init(CartInfo *);
 void Mapper390_Init(CartInfo *);
 void Mapper391_Init(CartInfo *);
 void Mapper393_Init(CartInfo *);
+void Mapper394_Init(CartInfo *);
 void Mapper395_Init(CartInfo *);
 void Mapper396_Init(CartInfo *);
 void Mapper397_Init(CartInfo *);

From 8230ae6ad88b8526a7c675bba26a61fa1a37e57e Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 2 Mar 2022 19:53:30 +0100
Subject: [PATCH 225/295] Add mapper 351. Applied the 'static' property to a
 static functoin in jyasic.c.

---
 src/boards/351.c    | 289 ++++++++++++++++++++++++++++++++++++++++++++
 src/boards/jyasic.c |   2 +-
 src/ines.c          |   1 +
 src/ines.h          |   1 +
 4 files changed, 292 insertions(+), 1 deletion(-)
 create mode 100644 src/boards/351.c

diff --git a/src/boards/351.c b/src/boards/351.c
new file mode 100644
index 0000000..a719813
--- /dev/null
+++ b/src/boards/351.c
@@ -0,0 +1,289 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 NewRisingSun
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "mapinc.h"
+
+uint8 reg[4], dip;
+uint8 MMC1_reg[4], MMC1_shift, MMC1_count, MMC1_filter;
+uint8 MMC3_reg[8], MMC3_index, MMC3_mirroring, MMC3_wram, MMC3_reload, MMC3_count, MMC3_irq;
+uint8 VRC4_prg[2];
+uint8 VRC4_mirroring;
+uint8 VRC4_misc;
+uint16 VRC4_chr[8];
+uint8 VRCIRQ_latch;
+uint8 VRCIRQ_mode;
+uint8 VRCIRQ_count;
+signed short int VRCIRQ_cycles;
+
+static SFORMAT stateRegs[] = {
+	{ reg,             4, "REGS" },
+	{ &dip,            1, "DIPS" },
+	{ MMC1_reg,        4, "MMC1" },
+	{ &MMC1_shift,     1, "M1SH" },
+	{ &MMC1_count,     1, "M1CN" },
+	{ MMC3_reg,        1, "MMC3" },
+	{ &MMC3_index,     1, "M3IX" },
+	{ &MMC3_mirroring, 1, "M3MI" },
+	{ &MMC3_wram,      1, "M3WR" },
+	{ &MMC3_reload,    1, "M3RL" },
+	{ &MMC3_count,     1, "M3CN" },
+	{ &MMC3_irq,       1, "M3IQ" },
+	{ VRC4_prg,        2, "V4PR" },
+	{ &VRC4_mirroring, 1, "V4MI" },
+	{ &VRC4_misc,      1, "V4MS" },
+	{ VRC4_chr,       16, "V4CH" },
+	{ &VRCIRQ_latch,   1, "VILA" },
+	{ &VRCIRQ_mode,    1, "VIMO" },
+	{ &VRCIRQ_count,   1, "VICO" },
+	{ &VRCIRQ_cycles,  2, "VICY" },
+	{ 0 }
+};
+
+
+static void sync () {
+	int prgAND =reg[2] &0x04? 0x0F: 0x1F;
+	int prgOR  =reg[1] >>1;
+	if (reg[2] &0x80) { /* NROM mode */
+		if (reg[2] &0x04) { /* NROM-128 */
+			setprg16(0x8000, prgOR >>1);
+			setprg16(0xC000, prgOR >>1);
+		} else      /* NROM-256 */
+			setprg32(0x8000, prgOR >>2);
+	} else
+	if (~reg[0] &0x02) { /* MMC3 mode */
+		setprg8(0x8000 ^(MMC3_index <<8 &0x4000), MMC3_reg[6] &prgAND | prgOR &~prgAND);
+		setprg8(0xA000,                           MMC3_reg[7] &prgAND | prgOR &~prgAND);
+		setprg8(0xC000 ^(MMC3_index <<8 &0x4000),        0xFE &prgAND | prgOR &~prgAND);
+		setprg8(0xE000,                                  0xFF &prgAND | prgOR &~prgAND);
+	} else
+	if (reg[0] &0x01) { /* VRC4 mode */
+		setprg8(0x8000 ^(VRC4_misc <<13 &0x4000), VRC4_prg[0] &prgAND | prgOR &~prgAND);
+		setprg8(0xA000,                           VRC4_prg[1] &prgAND | prgOR &~prgAND);
+		setprg8(0xC000 ^(VRC4_misc <<13 &0x4000),        0xFE &prgAND | prgOR &~prgAND);
+		setprg8(0xE000,                                  0xFF &prgAND | prgOR &~prgAND);
+	} else { /* MMC1 mode */
+		prgAND >>=1;
+		prgOR  >>=1;
+		if (MMC1_reg[0] &0x8) { /* 16 KiB mode */
+			if (MMC1_reg[0] &0x04) { /* OR logic */
+				setprg16(0x8000, MMC1_reg[3] &prgAND | prgOR &~prgAND);
+				setprg16(0xC000,        0xFF &prgAND | prgOR &~prgAND);
+			} else {                 /* AND logic */
+				setprg16(0x8000,        0x00 &prgAND | prgOR &~prgAND);
+				setprg16(0xC000, MMC1_reg[3] &prgAND | prgOR &~prgAND);
+			}
+		} else
+			setprg32(0x8000, (MMC1_reg[3] &prgAND | prgOR &~prgAND) >>1);
+	}
+	
+	int chrAND =reg[2] &0x10? 0x1F: reg[2] &0x20? 0x7F: 0xFF;
+	int chrOR  =reg[0] <<1;
+	if (reg[2] &0x40)  /* CNROM mode */
+		setchr8(chrOR >>3);
+	else
+	if (~reg[0] &0x02) { /* MMC3 mode */
+		setchr1(0x0000 ^(MMC3_index <<5 &0x1000),(MMC3_reg[0] &0xFE)&chrAND | chrOR &~chrAND);
+		setchr1(0x0400 ^(MMC3_index <<5 &0x1000),(MMC3_reg[0] |0x01)&chrAND | chrOR &~chrAND);
+		setchr1(0x0800 ^(MMC3_index <<5 &0x1000),(MMC3_reg[1] &0xFE)&chrAND | chrOR &~chrAND);
+		setchr1(0x0C00 ^(MMC3_index <<5 &0x1000),(MMC3_reg[1] |0x01)&chrAND | chrOR &~chrAND);
+		setchr1(0x1000 ^(MMC3_index <<5 &0x1000), MMC3_reg[2]       &chrAND | chrOR &~chrAND);
+		setchr1(0x1400 ^(MMC3_index <<5 &0x1000), MMC3_reg[3]       &chrAND | chrOR &~chrAND);
+		setchr1(0x1800 ^(MMC3_index <<5 &0x1000), MMC3_reg[4]       &chrAND | chrOR &~chrAND);
+		setchr1(0x1C00 ^(MMC3_index <<5 &0x1000), MMC3_reg[5]       &chrAND | chrOR &~chrAND);
+	} else
+	if (reg[0] &0x01) { /* VRC4 mode */
+		setchr1(0x0000, VRC4_chr[0] &chrAND | chrOR &~chrAND);
+		setchr1(0x0400, VRC4_chr[1] &chrAND | chrOR &~chrAND);
+		setchr1(0x0800, VRC4_chr[2] &chrAND | chrOR &~chrAND);
+		setchr1(0x0C00, VRC4_chr[3] &chrAND | chrOR &~chrAND);
+		setchr1(0x1000, VRC4_chr[4] &chrAND | chrOR &~chrAND);
+		setchr1(0x1400, VRC4_chr[5] &chrAND | chrOR &~chrAND);
+		setchr1(0x1800, VRC4_chr[6] &chrAND | chrOR &~chrAND);
+		setchr1(0x1C00, VRC4_chr[7] &chrAND | chrOR &~chrAND);
+	} else { /* MMC1 mode */
+		chrAND >>=2;
+		chrOR  >>=2;
+		if (MMC1_reg[0] &0x10) { /* 4 KiB mode */
+			setchr4(0x0000, MMC1_reg[1] &chrAND | chrOR &~chrAND);
+			setchr4(0x1000, MMC1_reg[2] &chrAND | chrOR &~chrAND);
+		} else                   /* 8 KiB mode */
+			setchr8((MMC1_reg[1] &chrAND |chrOR &~chrAND) >>1);		
+	}
+	
+	if (~reg[0] &0x02)  /* MMC3 mode */
+		setmirror(MMC3_mirroring &1 ^1);
+	else
+	if ( reg[0] &0x01) /* VRC4 mode */
+		setmirror(VRC4_mirroring &3 ^(VRC4_mirroring &2? 0: 1));
+	else               /* MMC1 mode */
+		setmirror(MMC1_reg[0] &3 ^3);
+}
+
+static DECLFW(writeMMC3) {
+	switch(A &0xE001) {
+	case 0x8000: MMC3_index =V;              sync();    break;
+	case 0x8001: MMC3_reg[MMC3_index &7] =V; sync();    break;
+	case 0xA000: MMC3_mirroring =V;          sync();    break;
+	case 0xA001: MMC3_wram =V;               sync();    break;
+	case 0xC000: MMC3_reload =V;                        break;
+	case 0xC001: MMC3_count =0;                         break;
+	case 0xE000: MMC3_irq =0; X6502_IRQEnd(FCEU_IQEXT); break;
+	case 0xE001: MMC3_irq =1;                           break;
+	}
+}
+
+static DECLFW(writeMMC1) {
+	if (V &0x80) {
+		MMC1_shift =MMC1_count =0;
+		MMC1_reg[0] |=0x0C;
+		sync();
+	} else
+	if (!MMC1_filter) {
+		MMC1_shift |=(V &1) <<MMC1_count++;
+		if (MMC1_count ==5) {
+			MMC1_reg[A >>13 &3] =MMC1_shift;
+			MMC1_count =0;
+			MMC1_shift =0;
+			sync();
+		}
+	}
+	MMC1_filter =2;
+}
+
+static DECLFW(writeVRC4) {
+	uint8 index;
+	A =A &0xF000 | (A &0x800? ((A &8? 1: 0) | (A &4? 2: 0)): ((A &4? 1: 0) | (A &8? 2: 0)));
+	switch (A &0xF000) {
+	case 0x8000: case 0xA000:
+		VRC4_prg[A >>13 &1] =V;
+		sync();
+		break;
+	case 0x9000:
+		if (~A &2)
+			VRC4_mirroring =V;
+		else
+		if (~A &1)
+			VRC4_misc =V;
+		sync();
+		break;
+	case 0xF000:
+		switch (A &3) {
+		case 0: VRCIRQ_latch =VRCIRQ_latch &0xF0 | V &0x0F; break;
+		case 1: VRCIRQ_latch =VRCIRQ_latch &0x0F | V <<4;   break;
+		case 2: VRCIRQ_mode =V;
+		        if (VRCIRQ_mode &0x02) {
+				VRCIRQ_count =VRCIRQ_latch;
+				VRCIRQ_cycles =341;
+			}
+			X6502_IRQEnd(FCEU_IQEXT);
+			break;
+		case 3: VRCIRQ_mode =VRCIRQ_mode &~0x02 | VRCIRQ_mode <<1 &0x02;
+			X6502_IRQEnd(FCEU_IQEXT);
+			break;
+		}
+		break;
+	default:
+		index =(A -0xB000) >>11 | A >>1 &1;
+		if (A &1)
+			VRC4_chr[index] =VRC4_chr[index] & 0x0F | V <<4;
+		else
+			VRC4_chr[index] =VRC4_chr[index] &~0x0F | V &0x0F;
+		sync();
+		break;
+	}
+}
+
+static void FP_FASTAPASS(1) cpuCycle(int a) {
+	if ((reg[0] &3) ==3) while (a--) { /* VRC4 mode */
+		if (VRCIRQ_mode &0x02 && (VRCIRQ_mode &0x04 || (VRCIRQ_cycles -=3) <=0)) {
+			if (~VRCIRQ_mode &0x04) VRCIRQ_cycles +=341;
+			if (!++VRCIRQ_count) {
+				VRCIRQ_count =VRCIRQ_latch;
+				X6502_IRQBegin(FCEU_IQEXT);
+			}
+		}
+	}
+	if (MMC1_filter) MMC1_filter--;
+}
+	
+static void horizontalBlanking(void) {
+	if (~reg[0] &2) { /* MMC3 mode */
+		MMC3_count =!MMC3_count? MMC3_reload: --MMC3_count;
+		if (!MMC3_count && MMC3_irq) X6502_IRQBegin(FCEU_IQEXT);
+	}
+}
+
+static void applyMode() {
+	switch (reg[0] &3) {
+	case 0:
+	case 1: SetWriteHandler(0x8000, 0xFFFF, writeMMC3); break;
+	case 2: SetWriteHandler(0x8000, 0xFFFF, writeMMC1); break;	
+	case 3: SetWriteHandler(0x8000, 0xFFFF, writeVRC4); break;
+	}
+}
+
+static DECLFR(readDIP) {
+	return dip;
+}
+
+static DECLFW(writeReg) {
+	uint8 previousMode =reg[0] &3;
+	reg[A &3] =V;
+	if ((reg[0] &3) !=previousMode) applyMode();
+	sync();
+}
+
+static void Mapper351_power(void) {
+	int i;
+	for (i =0; i <4; i++) reg[i] =0;
+	for (i =0; i <4; i++) MMC1_reg[i] =0;
+	for (i =0; i <8; i++) MMC3_reg[i] =0;
+	for (i =0; i <2; i++) VRC4_prg[i] =0;
+	for (i =0; i <8; i++) VRC4_chr[i] =0;
+	MMC1_shift =MMC1_count =MMC1_filter =0;
+	MMC1_reg[0] =0x0C;
+	MMC3_index =MMC3_mirroring =MMC3_wram =MMC3_reload =MMC3_count =MMC3_irq =0;	
+	VRC4_mirroring =VRC4_misc =VRCIRQ_latch =VRCIRQ_mode =VRCIRQ_count =VRCIRQ_cycles =0;
+	dip =0;
+	
+	SetReadHandler(0x6000, 0xFFFF, CartBR);
+	SetReadHandler(0x5000, 0x5FFF, readDIP);
+	SetWriteHandler(0x5000, 0x5FFF, writeReg);
+	applyMode();
+	sync();
+}
+
+static void Mapper351_reset (void) {
+	int i;
+	for (i =0; i <4; i++) reg[i] =0;
+	dip++;
+	applyMode();
+	sync();
+}
+
+void Mapper351_Init (CartInfo *info) {
+	info->Reset = Mapper351_reset;
+	info->Power = Mapper351_power;
+	MapIRQHook = cpuCycle;
+	GameHBIRQHook = horizontalBlanking;
+	GameStateRestore = applyMode;
+	AddExState(stateRegs, ~0, 0, 0);
+}
+
diff --git a/src/boards/jyasic.c b/src/boards/jyasic.c
index cfc1b3b..7ffb0a1 100644
--- a/src/boards/jyasic.c
+++ b/src/boards/jyasic.c
@@ -240,7 +240,7 @@ static void ppuScanline(void)
    }
 }
 
-void FP_FASTAPASS(1) cpuCycle(int a)
+static void FP_FASTAPASS(1) cpuCycle(int a)
 {
    if ((irqControl &0x03) ==0x00)
       while (a--)
diff --git a/src/ines.c b/src/ines.c
index bdd384a..41c3b8b 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -754,6 +754,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "830118C",                  348, BMC830118C_Init        )
 	INES_BOARD( "G-146",                    349, BMCG146_Init           )
 	INES_BOARD( "891227",                   350, BMC891227_Init         )
+	INES_BOARD( "Techline XB",              351, Mapper351_Init         )
 	INES_BOARD( "Super Mario Family",       353, Mapper353_Init         )
 	INES_BOARD( "3D-BLOCK",                 355, UNL3DBlock_Init        )
 	INES_BOARD( "7-in-1 Rockman (JY-208)",  356, Mapper356_Init         )
diff --git a/src/ines.h b/src/ines.h
index e6ed97b..1f38801 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -267,6 +267,7 @@ void Mapper319_Init(CartInfo *);
 void Mapper326_Init(CartInfo *);
 void Mapper330_Init(CartInfo *);
 void Mapper334_Init(CartInfo *);
+void Mapper351_Init(CartInfo *);
 void Mapper353_Init(CartInfo *);
 void Mapper356_Init(CartInfo *);
 void Mapper357_Init(CartInfo *);

From f9ba86dc7a83c4ff231b5d7d9e57a748abc65345 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Fri, 4 Mar 2022 22:16:38 +0100
Subject: [PATCH 226/295] Added mapper 435

---
 src/boards/addrlatch.c | 28 ++++++++++++++++++++++++++++
 src/ines.c             |  1 +
 src/ines.h             |  1 +
 3 files changed, 30 insertions(+)

diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c
index 01c1360..e9bf8b4 100644
--- a/src/boards/addrlatch.c
+++ b/src/boards/addrlatch.c
@@ -730,3 +730,31 @@ static void M409Sync(void) {
 void Mapper409_Init(CartInfo *info) {
 	Latch_Init(info, M409Sync, NULL, 0x0000, 0xC000, 0xCFFF, 0);
 }
+
+/*------------------ Map 435 ---------------------------*/
+static void M435Sync(void) {
+	int p =latche >>2 &0x1F | latche >>3 &0x20 | latche >>4 &0x40;
+	if (latche &0x200) {
+		if (latche &0x001) {
+			setprg16(0x8000, p);
+			setprg16(0xC000, p);
+		} else {
+			setprg32(0x8000, p >> 1);
+		}
+	} else {
+		setprg16(0x8000, p);
+		setprg16(0xC000, p | 7);
+	}
+
+	if (latche &0x800)
+		SetupCartCHRMapping(0, CHRptr[0], 0x2000, 0);
+	else
+		SetupCartCHRMapping(0, CHRptr[0], 0x2000, 1);
+
+	setmirror(latche &0x002? MI_H: MI_V);
+	setchr8(0);
+}
+
+void Mapper435_Init(CartInfo *info) {
+	Latch_Init(info, M435Sync, NULL, 0x0000, 0x8000, 0xFFFF, 1);
+}
diff --git a/src/ines.c b/src/ines.c
index 41c3b8b..4e9baa5 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -808,6 +808,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "Realtec 8090",             432, Mapper432_Init         )
 	INES_BOARD( "NC-20MB",                  433, Mapper433_Init         )
 	INES_BOARD( "S-009",                    434, Mapper434_Init         )
+	INES_BOARD( "F-1002",                   435, Mapper435_Init         )
 	INES_BOARD( "820401/T-217",             436, Mapper436_Init         )
 	INES_BOARD( "NTDEC TH2348",             437, Mapper437_Init         )
 	INES_BOARD( "K-3071",                   438, Mapper438_Init         )
diff --git a/src/ines.h b/src/ines.h
index 1f38801..bdb41a6 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -317,6 +317,7 @@ void Mapper431_Init(CartInfo *);
 void Mapper432_Init(CartInfo *);
 void Mapper433_Init(CartInfo *);
 void Mapper434_Init(CartInfo *);
+void Mapper435_Init(CartInfo *);
 void Mapper436_Init(CartInfo *);
 void Mapper437_Init(CartInfo *);
 void Mapper438_Init(CartInfo *);

From 2f05c221de52e1018d235edc063d0cffbb045075 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Fri, 4 Mar 2022 22:25:50 +0100
Subject: [PATCH 227/295] Mapper 351: Correct state saving/loading

---
 src/boards/351.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/boards/351.c b/src/boards/351.c
index a719813..199953c 100644
--- a/src/boards/351.c
+++ b/src/boards/351.c
@@ -38,6 +38,7 @@ static SFORMAT stateRegs[] = {
 	{ MMC1_reg,        4, "MMC1" },
 	{ &MMC1_shift,     1, "M1SH" },
 	{ &MMC1_count,     1, "M1CN" },
+	{ &MMC1_filter,    1, "M1FI" },
 	{ MMC3_reg,        1, "MMC3" },
 	{ &MMC3_index,     1, "M3IX" },
 	{ &MMC3_mirroring, 1, "M3MI" },
@@ -239,6 +240,11 @@ static void applyMode() {
 	}
 }
 
+static void Mapper351_restore (int version) {
+	applyMode();
+	sync();
+}
+
 static DECLFR(readDIP) {
 	return dip;
 }
@@ -283,7 +289,7 @@ void Mapper351_Init (CartInfo *info) {
 	info->Power = Mapper351_power;
 	MapIRQHook = cpuCycle;
 	GameHBIRQHook = horizontalBlanking;
-	GameStateRestore = applyMode;
+	GameStateRestore = Mapper351_restore;
 	AddExState(stateRegs, ~0, 0, 0);
 }
 

From ae3486f80c8c55c2ce6098e09024c8cb0c9292e8 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sat, 5 Mar 2022 01:03:38 +0100
Subject: [PATCH 228/295] Mapper 351: specify static attribute

---
 src/boards/351.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/boards/351.c b/src/boards/351.c
index 199953c..79322e4 100644
--- a/src/boards/351.c
+++ b/src/boards/351.c
@@ -20,17 +20,17 @@
 
 #include "mapinc.h"
 
-uint8 reg[4], dip;
-uint8 MMC1_reg[4], MMC1_shift, MMC1_count, MMC1_filter;
-uint8 MMC3_reg[8], MMC3_index, MMC3_mirroring, MMC3_wram, MMC3_reload, MMC3_count, MMC3_irq;
-uint8 VRC4_prg[2];
-uint8 VRC4_mirroring;
-uint8 VRC4_misc;
-uint16 VRC4_chr[8];
-uint8 VRCIRQ_latch;
-uint8 VRCIRQ_mode;
-uint8 VRCIRQ_count;
-signed short int VRCIRQ_cycles;
+static uint8 reg[4], dip;
+static uint8 MMC1_reg[4], MMC1_shift, MMC1_count, MMC1_filter;
+static uint8 MMC3_reg[8], MMC3_index, MMC3_mirroring, MMC3_wram, MMC3_reload, MMC3_count, MMC3_irq;
+static uint8 VRC4_prg[2];
+static uint8 VRC4_mirroring;
+static uint8 VRC4_misc;
+static uint16 VRC4_chr[8];
+static uint8 VRCIRQ_latch;
+static uint8 VRCIRQ_mode;
+static uint8 VRCIRQ_count;
+static signed short int VRCIRQ_cycles;
 
 static SFORMAT stateRegs[] = {
 	{ reg,             4, "REGS" },

From 470ea398c7d0a50d9cde56d8ec945795333108d1 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 7 Mar 2022 05:57:12 +0100
Subject: [PATCH 229/295] Buildfix for C89/MSVC

---
 src/boards/351.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/boards/351.c b/src/boards/351.c
index 79322e4..1492204 100644
--- a/src/boards/351.c
+++ b/src/boards/351.c
@@ -59,6 +59,8 @@ static SFORMAT stateRegs[] = {
 
 
 static void sync () {
+	int chrAND;
+	int chrOR;
 	int prgAND =reg[2] &0x04? 0x0F: 0x1F;
 	int prgOR  =reg[1] >>1;
 	if (reg[2] &0x80) { /* NROM mode */
@@ -94,8 +96,8 @@ static void sync () {
 			setprg32(0x8000, (MMC1_reg[3] &prgAND | prgOR &~prgAND) >>1);
 	}
 	
-	int chrAND =reg[2] &0x10? 0x1F: reg[2] &0x20? 0x7F: 0xFF;
-	int chrOR  =reg[0] <<1;
+	chrAND =reg[2] &0x10? 0x1F: reg[2] &0x20? 0x7F: 0xFF;
+	chrOR  =reg[0] <<1;
 	if (reg[2] &0x40)  /* CNROM mode */
 		setchr8(chrOR >>3);
 	else

From 49252aa69290330e2dd17f8cca5f0bb97f5f2a20 Mon Sep 17 00:00:00 2001
From: jSTE0 <98854293+jSTE0@users.noreply.github.com>
Date: Mon, 7 Mar 2022 18:58:26 +0000
Subject: [PATCH 230/295] platforms: Add Miyoo target

Based on existing OpenDingux targets, just built for arm32.
---
 .gitlab-ci.yml    | 10 ++++++++++
 Makefile.libretro | 11 +++++++++++
 2 files changed, 21 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f794a11..b6fb018 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,6 +100,10 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/dingux-mips32.yml'
 
+  # OpenDingux (ARM)
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/dingux-arm32.yml'
+
   # tvOS (AppleTV)
   - project: 'libretro-infrastructure/ci-templates'
     file: '/tvos-arm64.yml'
@@ -284,6 +288,12 @@ libretro-build-retrofw-mips32:
     - .libretro-retrofw-mips32-make-default
     - .core-defs
 
+# Miyoo
+libretro-build-miyoo-arm32:
+  extends:
+    - .libretro-miyoo-arm32-make-default
+    - .core-defs
+
 #################################### MISC ##################################
 # Emscripten
 libretro-build-emscripten:
diff --git a/Makefile.libretro b/Makefile.libretro
index eced6c1..036c608 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -450,6 +450,17 @@ else ifeq ($(platform), retrofw)
 	PLATFORM_DEFINES += -ffast-math -march=mips32 -mtune=mips32 -mhard-float -fomit-frame-pointer
 	EXTERNAL_ZLIB = 1
 
+# Miyoo
+else ifeq ($(platform), miyoo)
+	TARGET := $(TARGET_NAME)_libretro.so
+	CC = /opt/miyoo/usr/bin/arm-linux-gcc
+	CXX = /opt/miyoo/usr/bin/arm-linux-g++
+	AR = /opt/miyoo/usr/bin/arm-linux-ar
+	fpic := -fPIC
+	SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
+	PLATFORM_DEFINES += -fomit-frame-pointer -ffast-math -mcpu=arm926ej-s
+	EXTERNAL_ZLIB = 1
+
 # Windows MSVC 2017 all architectures
 else ifneq (,$(findstring windows_msvc2017,$(platform)))
 	CC  = cl.exe

From 3f20020b9620aef6b094725af927cf428c7590e8 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 9 Mar 2022 14:36:00 +0100
Subject: [PATCH 231/295] Mapper 49: Correct AND mask in NROM mode.

---
 src/boards/mmc3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/boards/mmc3.c b/src/boards/mmc3.c
index 00f770c..633f0b5 100644
--- a/src/boards/mmc3.c
+++ b/src/boards/mmc3.c
@@ -597,7 +597,7 @@ static void M49PW(uint32 A, uint8 V) {
 		V |= (EXPREGS[0] & 0xC0) >> 2;
 		setprg8(A, V);
 	} else
-		setprg32(0x8000, (EXPREGS[0] >> 4) & 3);
+		setprg32(0x8000, (EXPREGS[0] >> 4) & 15);
 }
 
 static void M49CW(uint32 A, uint8 V) {

From c01250c28d3bb751a131419ea4c308046dc82963 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Mon, 21 Mar 2022 15:31:21 +0100
Subject: [PATCH 232/295] Mapper 340: Add support for 1 MiB variant

---
 src/boards/bmck3036.c | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/boards/bmck3036.c b/src/boards/bmck3036.c
index bd72ca3..73e03eb 100644
--- a/src/boards/bmck3036.c
+++ b/src/boards/bmck3036.c
@@ -18,41 +18,31 @@
  *
  */
 
-/* NES 2.0 mapper 340 is used for a 35-in-1 multicart.
- * Its UNIF board name is BMC-K-3036.
- * http://wiki.nesdev.com/w/index.php/NES_2.0_Mapper_340
- * TODO: Some games are not working...
- */
-
 #include "mapinc.h"
 
-static uint8 regs[2], mirr, mode;
+static uint8 regs[2];
 
 static SFORMAT StateRegs[] =
 {
 	{ regs,  2, "REGS" },
-	{ &mode, 1, "MODE" },
-	{ &mirr, 1, "MIRR" },
 	{ 0 }
 };
 
 static void Sync(void) {
-	if (mode) {						/* NROM-128 */
-		setprg16(0x8000, regs[0]);
-		setprg16(0xC000, regs[0]);
-	} else {									/* UNROM */
-		setprg16(0x8000, regs[0] | regs[1]);
-		setprg16(0xC000, regs[0] | 0x07);
+	if (regs[0] &0x20) { /* NROM-128 */
+		setprg16(0x8000, regs[0] >>2 &0x20 | regs[0] &0x1F);
+		setprg16(0xC000, regs[0] >>2 &0x20 | regs[0] &0x1F);
+	} else {	    /* UNROM */
+		setprg16(0x8000, regs[0] >>2 &0x20 | regs[0] | regs[1] &7);
+		setprg16(0xC000, regs[0] >>2 &0x20 | regs[0] |          7);
 	}
 	setchr8(0);
-	setmirror(mirr);
+	setmirror((regs[0] &0x40 || regs[0] &0x20 && regs[0] &0x04)? MI_H: MI_V);
 }
 
 static DECLFW(M340Write) {
-	regs[0] = A & 0x1F;
-	regs[1] = V & 0x07;
-	mode = A & 0x20;
-	mirr = ((A & 0x25) == 0x25) ? 0 : 1;
+	regs[0] = A & 0xFF;
+	regs[1] = V;
 	Sync();
 }
 
@@ -63,7 +53,7 @@ static void BMCK3036Power(void) {
 }
 
 static void BMCK3036Reset(void) {
-	regs[0] = regs[1] = mode = mirr = 0;
+	regs[0] = regs[1] = 0;
 	Sync();
 }
 

From dc1d14f3cd29f3ba1bf4e2d0f798b0c2d79c24cf Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Mon, 21 Mar 2022 15:53:24 +0100
Subject: [PATCH 233/295] Mapper 351: Add CHR-RAM mode plus the ability to map
 CHR data into CPU address space

---
 src/boards/351.c | 61 +++++++++++++++++++++++++++++++++++-------------
 1 file changed, 45 insertions(+), 16 deletions(-)

diff --git a/src/boards/351.c b/src/boards/351.c
index 1492204..62fe0fa 100644
--- a/src/boards/351.c
+++ b/src/boards/351.c
@@ -31,6 +31,8 @@ static uint8 VRCIRQ_latch;
 static uint8 VRCIRQ_mode;
 static uint8 VRCIRQ_count;
 static signed short int VRCIRQ_cycles;
+static uint8 *CHRRAM =NULL;
+static uint8 *PRGCHR =NULL;
 
 static SFORMAT stateRegs[] = {
 	{ reg,             4, "REGS" },
@@ -63,34 +65,36 @@ static void sync () {
 	int chrOR;
 	int prgAND =reg[2] &0x04? 0x0F: 0x1F;
 	int prgOR  =reg[1] >>1;
-	if (reg[2] &0x80) { /* NROM mode */
+	int chip   =reg[2] &0x01 && CHRRAM? 0x10: 0x00;
+	
+	if (reg[2] &0x10) { /* NROM mode */
 		if (reg[2] &0x04) { /* NROM-128 */
-			setprg16(0x8000, prgOR >>1);
-			setprg16(0xC000, prgOR >>1);
+			setprg16r(chip, 0x8000, prgOR >>1);
+			setprg16r(chip, 0xC000, prgOR >>1);
 		} else      /* NROM-256 */
-			setprg32(0x8000, prgOR >>2);
+			setprg32r(chip, 0x8000, prgOR >>2);
 	} else
 	if (~reg[0] &0x02) { /* MMC3 mode */
-		setprg8(0x8000 ^(MMC3_index <<8 &0x4000), MMC3_reg[6] &prgAND | prgOR &~prgAND);
-		setprg8(0xA000,                           MMC3_reg[7] &prgAND | prgOR &~prgAND);
-		setprg8(0xC000 ^(MMC3_index <<8 &0x4000),        0xFE &prgAND | prgOR &~prgAND);
-		setprg8(0xE000,                                  0xFF &prgAND | prgOR &~prgAND);
+		setprg8r(chip, 0x8000 ^(MMC3_index <<8 &0x4000), MMC3_reg[6] &prgAND | prgOR &~prgAND);
+		setprg8r(chip, 0xA000,                           MMC3_reg[7] &prgAND | prgOR &~prgAND);
+		setprg8r(chip, 0xC000 ^(MMC3_index <<8 &0x4000),        0xFE &prgAND | prgOR &~prgAND);
+		setprg8r(chip, 0xE000,                                  0xFF &prgAND | prgOR &~prgAND);
 	} else
 	if (reg[0] &0x01) { /* VRC4 mode */
-		setprg8(0x8000 ^(VRC4_misc <<13 &0x4000), VRC4_prg[0] &prgAND | prgOR &~prgAND);
-		setprg8(0xA000,                           VRC4_prg[1] &prgAND | prgOR &~prgAND);
-		setprg8(0xC000 ^(VRC4_misc <<13 &0x4000),        0xFE &prgAND | prgOR &~prgAND);
-		setprg8(0xE000,                                  0xFF &prgAND | prgOR &~prgAND);
+		setprg8r(chip, 0x8000 ^(VRC4_misc <<13 &0x4000), VRC4_prg[0] &prgAND | prgOR &~prgAND);
+		setprg8r(chip, 0xA000,                           VRC4_prg[1] &prgAND | prgOR &~prgAND);
+		setprg8r(chip, 0xC000 ^(VRC4_misc <<13 &0x4000),        0xFE &prgAND | prgOR &~prgAND);
+		setprg8r(chip, 0xE000,                                  0xFF &prgAND | prgOR &~prgAND);
 	} else { /* MMC1 mode */
 		prgAND >>=1;
 		prgOR  >>=1;
 		if (MMC1_reg[0] &0x8) { /* 16 KiB mode */
 			if (MMC1_reg[0] &0x04) { /* OR logic */
-				setprg16(0x8000, MMC1_reg[3] &prgAND | prgOR &~prgAND);
-				setprg16(0xC000,        0xFF &prgAND | prgOR &~prgAND);
+				setprg16r(chip, 0x8000, MMC1_reg[3] &prgAND | prgOR &~prgAND);
+				setprg16r(chip, 0xC000,        0xFF &prgAND | prgOR &~prgAND);
 			} else {                 /* AND logic */
-				setprg16(0x8000,        0x00 &prgAND | prgOR &~prgAND);
-				setprg16(0xC000, MMC1_reg[3] &prgAND | prgOR &~prgAND);
+				setprg16r(chip, 0x8000,        0x00 &prgAND | prgOR &~prgAND);
+				setprg16r(chip, 0xC000, MMC1_reg[3] &prgAND | prgOR &~prgAND);
 			}
 		} else
 			setprg32(0x8000, (MMC1_reg[3] &prgAND | prgOR &~prgAND) >>1);
@@ -98,6 +102,9 @@ static void sync () {
 	
 	chrAND =reg[2] &0x10? 0x1F: reg[2] &0x20? 0x7F: 0xFF;
 	chrOR  =reg[0] <<1;
+	if (reg[2] &0x01)  /* CHR RAM mode */
+		setchr8r(0x10, 0);
+	else
 	if (reg[2] &0x40)  /* CNROM mode */
 		setchr8(chrOR >>3);
 	else
@@ -286,12 +293,34 @@ static void Mapper351_reset (void) {
 	sync();
 }
 
+static void Mapper351_close(void) {
+	if (CHRRAM) FCEU_gfree(CHRRAM);
+	if (PRGCHR) FCEU_gfree(PRGCHR);
+	CHRRAM =NULL;
+	PRGCHR =NULL;
+}
+
 void Mapper351_Init (CartInfo *info) {
+	int CHRRAMSIZE =info->CHRRamSize + info->CHRRamSaveSize;
+	
 	info->Reset = Mapper351_reset;
 	info->Power = Mapper351_power;
+	info->Close = Mapper351_close;
 	MapIRQHook = cpuCycle;
 	GameHBIRQHook = horizontalBlanking;
 	GameStateRestore = Mapper351_restore;
 	AddExState(stateRegs, ~0, 0, 0);
+	
+	if (CHRRAMSIZE) {
+		CHRRAM =(uint8 *)FCEU_gmalloc(CHRRAMSIZE);
+		SetupCartCHRMapping(0x10, CHRRAM, CHRRAMSIZE, 1);
+		AddExState(CHRRAM, CHRRAMSIZE, 0, "CRAM");
+		
+		/* This crazy thing can map CHR-ROM into CPU address space. Allocate a combined PRG+CHR address space and treat it a second "chip". */
+		PRGCHR =(uint8 *)FCEU_gmalloc(PRGsize[0] +CHRsize[0]);
+		memcpy(PRGCHR, PRGptr[0], PRGsize[0]);
+		memcpy(PRGCHR +PRGsize[0], CHRptr[0], CHRsize[0]);
+		SetupCartPRGMapping(0x10, PRGCHR, PRGsize[0] +CHRsize[0], 0);
+	}
 }
 

From d03005689fcc1e131740ade40d94c72fefa56c6b Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Mon, 21 Mar 2022 16:10:51 +0100
Subject: [PATCH 234/295] Mapper 341: correct mirroring

---
 src/boards/addrlatch.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c
index e9bf8b4..dda64dd 100644
--- a/src/boards/addrlatch.c
+++ b/src/boards/addrlatch.c
@@ -658,13 +658,12 @@ void BMCG146_Init(CartInfo *info) {
 /* NES 2.0 mapper 341 is used for a simple 4-in-1 multicart */
 
 static void BMCTJ03Sync(void) {
-	uint8 mirr = ((latche >> 1) & 1) ^ 1;
-	uint8 bank = (latche >> 8) & 7;
+	uint8 mirr = latche &(PRGsize[0] &0x40000? 0x800: 0x200)? MI_H: MI_V;
+	uint8 bank = latche >> 8;
 
 	setprg32(0x8000, bank);
 	setchr8(bank);
 
-	if (bank == 3) mirr ^= 1; /* Twin Bee has incorrect mirroring */
 	setmirror(mirr);
 }
 

From 5ea4d73e6f341aac320107f8f2aac89e6b7bcf0c Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 23 Mar 2022 17:47:58 +0100
Subject: [PATCH 235/295] Mapper 444: Add NC-8000M as submapper bit 2

---
 src/boards/444.c | 5 +++--
 src/ines.c       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/boards/444.c b/src/boards/444.c
index e6a61b4..3872f56 100644
--- a/src/boards/444.c
+++ b/src/boards/444.c
@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-/* NC7000M PCB, with incorrect UNIF MAPR BS-110 due to a mix-up. Submappers denote the setting of two solder pads that configure CHR banking. */
+/* NC7000M PCB, with incorrect UNIF MAPR BS-110 due to a mix-up. Submapper bits 0 and 1. denote the setting of two solder pads that configure CHR banking. */
+/* NC8000M PCB, indicated by submapper bit 2. */
 
 #include "mapinc.h"
 #include "mmc3.h"
@@ -27,7 +28,7 @@ static uint8 pads;
 static uint8 dip;
 
 static void Mapper444_PRGWrap(uint32 A, uint8 V) {
-	int prgAND =0x0F;
+	int prgAND =pads &4 && EXPREGS[0] &0x02? 0x1F: 0x0F;
 	int prgOR  =EXPREGS[0] <<4;
 	if (EXPREGS[0] &0x04) {
 		if (~A &0x4000) {
diff --git a/src/ines.c b/src/ines.c
index 4e9baa5..ac867b1 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -813,7 +813,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "NTDEC TH2348",             437, Mapper437_Init         )
 	INES_BOARD( "K-3071",                   438, Mapper438_Init         )
 	INES_BOARD( "NC-3000M",                 443, Mapper443_Init         )
-	INES_BOARD( "NC-7000M",                 444, Mapper444_Init         )
+	INES_BOARD( "NC-7000M/NC-8000M",        444, Mapper444_Init         )
 	INES_BOARD( "DS-9-27",                  452, Mapper452_Init         )
 	INES_BOARD( "K6C3001A",                 456, Mapper456_Init         )
 	INES_BOARD( "SA-9602B",                 513, SA9602B_Init           )

From a13e82d631dfe8920ee75baa2184ad73b4e79f12 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Fri, 1 Apr 2022 13:06:58 +0200
Subject: [PATCH 236/295] Mapper 258: Is actually a duplicate of 215 that uses
 different features. Correct a few mapper 114, 215 and 258 iNES correction
 database entries.

---
 src/boards/158B.c  | 71 ----------------------------------------------
 src/boards/8237.c  | 31 ++++++++++++++++++--
 src/ines-correct.h | 14 +++++----
 src/ines.c         |  2 +-
 src/unif.c         |  2 +-
 src/unif.h         |  1 -
 6 files changed, 38 insertions(+), 83 deletions(-)
 delete mode 100644 src/boards/158B.c

diff --git a/src/boards/158B.c b/src/boards/158B.c
deleted file mode 100644
index 8bd0f5d..0000000
--- a/src/boards/158B.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2015 CaH4e3
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * "Blood Of Jurassic" protected MMC3 based board (GD-98 Cart ID, 158B PCB ID)
- *
- */
-
-#include "mapinc.h"
-#include "mmc3.h"
-
-static uint8 lut[8] = { 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0F, 0x00 };
-
-static void UNL158BPW(uint32 A, uint8 V) {
-	if (EXPREGS[0] & 0x80) {
-		uint32 bank = EXPREGS[0] & 7; 
-		if(EXPREGS[0] & 0x20) { /* 32Kb mode */
-			setprg32(0x8000, bank >> 1);
-		} else {				/* 16Kb mode */
-			setprg16(0x8000, bank);
-			setprg16(0xC000, bank);
-		}
-	} else {
-		setprg8(A, V & 0xF);
-	}
-}
-
-static DECLFW(UNL158BProtWrite) {
-	EXPREGS[A & 7] = V;
-	switch(A & 7) {
-	case 0:
-		FixMMC3PRG(MMC3_cmd);
-		break;
-	case 7:
-		FCEU_printf("UNK PROT WRITE\n");
-		break;
-	}
-
-}
-
-static DECLFR(UNL158BProtRead) {
-	return X.DB | lut[A & 7];
-}
-
-static void UNL158BPower(void) {
-	GenMMC3Power();
-	SetWriteHandler(0x5000, 0x5FFF, UNL158BProtWrite);
-	SetReadHandler(0x5000, 0x5FFF, UNL158BProtRead);
-}
-
-void UNL158B_Init(CartInfo *info) {
-	GenMMC3_Init(info, 128, 128, 0, 0);
-	pwrap = UNL158BPW;
-	info->Power = UNL158BPower;
-	AddExState(EXPREGS, 8, 0, "EXPR");
-}
diff --git a/src/boards/8237.c b/src/boards/8237.c
index 4c5b869..c72d969 100644
--- a/src/boards/8237.c
+++ b/src/boards/8237.c
@@ -63,6 +63,17 @@ static uint8 adrperm[8][8] =
 	{ 0, 1, 2, 3, 4, 5, 6, 7 },		/* empty */
 };
 
+static uint8 protarray[8][8] = {
+	{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 0 Super Hang-On               */
+	{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00 }, /* 1 Monkey King                 */
+	{ 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x00, 0x00 }, /* 2 Super Hang-On/Monkey King   */
+	{ 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x05, 0x00 }, /* 3 Super Hang-On/Monkey King   */
+	{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 4                             */
+	{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 5                             */
+	{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* 6                             */
+	{ 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0F, 0x00 }  /* 7 (default) Blood of Jurassic */
+};
+
 static void UNL8237CW(uint32 A, uint8 V) {
 	uint16 outer_bank;
 
@@ -109,6 +120,10 @@ static void UNL8237PW(uint32 A, uint8 V) {
 	}
 }
 
+static DECLFR(UNL8237ProtRead) {
+	return protarray[EXPREGS[3]][A &7] &0x0F | 0x50;
+}
+
 static DECLFW(UNL8237Write) {
 	uint8 dat = V;
 	uint8 adr = adrperm[EXPREGS[2]][((A >> 12) & 6) | (A & 1)];
@@ -125,6 +140,7 @@ static DECLFW(UNL8237ExWrite) {
 	switch (A & 0xF007) {
 	case 0x5000: EXPREGS[0] = V; FixMMC3PRG(MMC3_cmd); FixMMC3CHR(MMC3_cmd); break;
 	case 0x5001: EXPREGS[1] = V; FixMMC3PRG(MMC3_cmd); FixMMC3CHR(MMC3_cmd); break;
+	case 0x5002: EXPREGS[3] = V; break;
 	case 0x5007: EXPREGS[2] = V; break;
 	}
 }
@@ -132,9 +148,18 @@ static DECLFW(UNL8237ExWrite) {
 static void UNL8237Power(void) {
 	EXPREGS[0] = EXPREGS[2] = 0;
 	EXPREGS[1] = 0x0F;
+	EXPREGS[3] = 7;
 	GenMMC3Power();
 	SetWriteHandler(0x8000, 0xFFFF, UNL8237Write);
-	SetWriteHandler(0x5000, 0x7FFF, UNL8237ExWrite);
+	SetReadHandler (0x5000, 0x5FFF, UNL8237ProtRead);
+	SetWriteHandler(0x5000, 0x5FFF, UNL8237ExWrite);
+}
+
+static void UNL8237Reset(void) {
+	EXPREGS[0] = EXPREGS[2] = 0;
+	EXPREGS[1] = 0x0F;
+	EXPREGS[3] = 7;
+	MMC3RegReset();
 }
 
 void UNL8237_Init(CartInfo *info) {
@@ -142,8 +167,8 @@ void UNL8237_Init(CartInfo *info) {
 	cwrap = UNL8237CW;
 	pwrap = UNL8237PW;
 	info->Power = UNL8237Power;
-	AddExState(EXPREGS, 3, 0, "EXPR");
-	AddExState(&submapper, 1, 0, "SUBM");
+	info->Reset = UNL8237Reset;
+	AddExState(EXPREGS, 4, 0, "EXPR");
 	if (info->iNES2)
 		submapper = info->submapper;
 }
diff --git a/src/ines-correct.h b/src/ines-correct.h
index fb80e15..18f251d 100644
--- a/src/ines-correct.h
+++ b/src/ines-correct.h
@@ -913,12 +913,14 @@
 	{ 0x6e149729,  189, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Master Fighter II (Unl) [a1].nes */
 	{ 0x60bfeb0c,   90, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mortal Kombat 2 (Unl) [!].nes */
 	{ 0x247cc73d,  150, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Poker II (Asia) (Ja) (Unl).nes */
-	{ 0x1f1326d4,  121, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Sonic 5 (1997) (Unl) [!].nes */
-	{ 0x99748230,  215, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* EarthWorm Jim 2 (SuperGame).nes */
-	{ 0x37876ac7,  215, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Golden Card 6-in-1 (Unl) [!].nes */
-	{ 0x1a3320a3,  215, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mortal Kombat 3 (SuperGame).nes */
-	{ 0x80eb1839,  114, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Boogerman (Sugar Softec) (Unl) [!].nes */
-	{ 0x071e4ee8,  114, DEFAULT,    MI_H, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ?? m114,submapper 1 test rom */
+	{ 0x1f1326d4,  121, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Super Sonic 5 (1997) (Unl) [!].nes */
+	{ 0x99748230,  215, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* EarthWorm Jim 2 (SuperGame).nes */
+	{ 0x37876ac7,  215, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Golden Card 6-in-1 (Unl) [!].nes */
+	{ 0x1a3320a3,  215, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mortal Kombat 3 (SuperGame).nes */
+	{ 0xec70f8d8,  258, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 1997 留念: 港-京 - Super Hang-On (protected version, CHR doubled) */
+	{ 0x224989d9,  258, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* 1997 留念: 港-京 - Super Hang-On (protected version) */
+	{ 0x80eb1839,  114,       1, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Boogerman (Sugar Softec) (Unl) [!].nes */
+	{ 0x071e4ee8,  114, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* ?? m114,submapper 1 test rom */
 	{ 0xfe3e03a1,  197, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mortal Kombat III Special (YY-030) (Ch) [!].nes */
 	{ 0x9151d311,  197, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Mortal Kombat III 28 Peoples (NT-328) (Ch) [!].nes */
 	{ 0x272709b9,  237, DEFAULT, DEFAULT, 0, DEFAULT, DEFAULT, DEFAULT, NOEXTRA }, /* Teletubbies Y2K (420-in-1).nes */
diff --git a/src/ines.c b/src/ines.c
index ac867b1..f2af9d5 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -679,7 +679,7 @@ INES_BOARD_BEGIN()
 	/* NES 2.0 MAPPERS */
 
 	INES_BOARD( "OneBus",                   256, UNLOneBus_Init         )
-	INES_BOARD( "158B",                     258, UNL158B_Init           )
+	INES_BOARD( "158B",                     258, UNL8237_Init           )
 	INES_BOARD( "F-15",                     259, BMCF15_Init            )
 	INES_BOARD( "HPxx / HP2018-A",          260, BMCHPxx_Init           )
 	INES_BOARD( "810544-C-A1",              261, BMC810544CA1_Init      )
diff --git a/src/unif.c b/src/unif.c
index 44f065b..7ee2e29 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -565,7 +565,7 @@ static BMAPPING bmap[] = {
 	{ "YOKO",                       264, UNLYOKO_Init,          0 },
 	{ "COOLBOY",                    268, COOLBOY_Init,          BMCFLAG_256KCHRR },
 	{ "MINDKIDS",                   268, MINDKIDS_Init,         BMCFLAG_256KCHRR },
-	{ "158B",                       258, UNL158B_Init,          0 },
+	{ "158B",                       258, UNL8237_Init,          0 },
 	{ "DRAGONFIGHTER",              292, UNLBMW8544_Init,       0 },
 	{ "EH8813A",                    519, UNLEH8813A_Init,       0 },
 	{ "HP898F",                     319, BMCHP898F_Init,        0 },
diff --git a/src/unif.h b/src/unif.h
index a0826ff..351765c 100644
--- a/src/unif.h
+++ b/src/unif.h
@@ -139,7 +139,6 @@ void UNLYOKO_Init(CartInfo *info);
 void UNROM_Init(CartInfo *info);
 void UNROM512_Init(CartInfo *info);
 void COOLBOY_Init(CartInfo *info);
-void UNL158B_Init(CartInfo *info);
 void UNLBMW8544_Init(CartInfo *info);
 void UNLEH8813A_Init(CartInfo *info);
 void BMCHP898F_Init(CartInfo *info);

From 4feedbc7c1ccbdf1651bbfe666223f7f2f19bbdb Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sat, 2 Apr 2022 17:48:19 +0200
Subject: [PATCH 237/295] Add mapper 310

---
 src/boards/310.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  1 +
 src/ines.h       |  1 +
 3 files changed, 90 insertions(+)
 create mode 100644 src/boards/310.c

diff --git a/src/boards/310.c b/src/boards/310.c
new file mode 100644
index 0000000..7ebfac4
--- /dev/null
+++ b/src/boards/310.c
@@ -0,0 +1,88 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2005 CaH4e3
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include "mapinc.h"
+
+static uint8 regData[2];
+static uint8 regAddr;
+
+static SFORMAT K1053_state[] =
+{
+	{ regData, 2, "REGD" },
+	{&regAddr, 1, "REGA" },
+	{ 0 }
+};
+
+static void K1053_sync (void) {
+	int prg =regData[0] &0x3F | regAddr <<4 &~0x3F;
+	int chrWritable;
+	switch(regAddr &3) {
+		case 0:	setprg32(0x8000, prg >>1);
+			chrWritable =0;
+			break;
+		case 1:	setprg16(0x8000, prg);
+			setprg16(0xC000, prg |7);
+			chrWritable =1;
+			break;
+		case 2:	prg =prg <<1 | regData[0] >>7;
+			setprg8(0x8000, prg);
+			setprg8(0xA000, prg);
+			setprg8(0xC000, prg);
+			setprg8(0xE000, prg);
+			chrWritable =1;
+			break;
+		case 3:	setprg16(0x8000, prg);
+			setprg16(0xC000, prg);
+			chrWritable =0;
+			break;			
+	}
+	SetupCartCHRMapping(0, CHRptr[0], 0x8000, chrWritable);
+	setchr8(regData[1]);
+	setmirror(regData[0] &0x40? MI_H: MI_V);
+}
+
+static void K1053_restore(int version) {
+	K1053_sync();
+}
+
+static DECLFW(K1053_write) {
+	regData[A >>14 &1] =V;
+	if (A &0x4000) regAddr=A &0xFF;
+	K1053_sync();
+}
+
+static void K1053_reset(void) {
+	regData[0] =regData[1] =regAddr =0;
+	K1053_sync();
+}
+
+static void K1053_power(void) {
+	K1053_reset();
+	SetReadHandler(0x8000, 0xFFFF, CartBR);
+	SetWriteHandler(0x8000, 0xFFFF, K1053_write);
+}
+
+void Mapper310_Init(CartInfo *info) {
+	info->Power = K1053_power;
+	info->Reset = K1053_reset;
+	GameStateRestore = K1053_restore;
+	AddExState(&K1053_state, ~0, 0, 0);
+}
diff --git a/src/ines.c b/src/ines.c
index f2af9d5..c288b86 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -721,6 +721,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "KS7037",                   307, UNLKS7037_Init         )
 	INES_BOARD( "TH2131-1",                 308, UNLTH21311_Init        )
 	INES_BOARD( "LH51",                     309, LH51_Init              )
+	INES_BOARD( "K-1053",                   310, Mapper310_Init         )
 	INES_BOARD( "KS7013B",                  312, UNLKS7013B_Init        )
 	INES_BOARD( "RESET-TXROM",              313, BMCRESETTXROM_Init     )
 	INES_BOARD( "64in1NoRepeat",            314, BMC64in1nr_Init        )
diff --git a/src/ines.h b/src/ines.h
index bdb41a6..ef30b65 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -263,6 +263,7 @@ void Mapper271_Init(CartInfo *);
 void Mapper288_Init(CartInfo *);
 void Mapper293_Init(CartInfo *);
 void Mapper297_Init(CartInfo *);
+void Mapper310_Init(CartInfo *);
 void Mapper319_Init(CartInfo *);
 void Mapper326_Init(CartInfo *);
 void Mapper330_Init(CartInfo *);

From a3f2054aa6b6981e91209ff4dcd84fa51a9f3a4e Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sat, 2 Apr 2022 17:49:05 +0200
Subject: [PATCH 238/295] Correct 310.c copyright notice

---
 src/boards/310.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/boards/310.c b/src/boards/310.c
index 7ebfac4..929af1b 100644
--- a/src/boards/310.c
+++ b/src/boards/310.c
@@ -1,7 +1,7 @@
 /* FCE Ultra - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2005 CaH4e3
+ *  Copyright (C) 2022 NewRisingSun
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 12157b4f8251d9a588f7f1499e5ca6e2b9852b4d Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sat, 2 Apr 2022 20:25:09 +0200
Subject: [PATCH 239/295] Add mapper 294

---
 src/boards/294.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  2 +-
 src/ines.h       |  1 +
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 src/boards/294.c

diff --git a/src/boards/294.c b/src/boards/294.c
new file mode 100644
index 0000000..db4956c
--- /dev/null
+++ b/src/boards/294.c
@@ -0,0 +1,61 @@
+/* FCE Ultra - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 NewRisingSun
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include "mapinc.h"
+
+static uint8 latch;
+
+static void Mapper294_sync (void) {
+	setprg16(0x8000, latch);
+	setprg16(0xC000, latch |7);
+	setchr8(0);
+	setmirror(latch &0x80? MI_H: MI_V);
+}
+
+static DECLFW(Mapper294_writeInnerBank) {
+	latch =latch &~7 | V&7;
+	Mapper294_sync();
+}
+
+static DECLFW(Mapper294_writeOuterBank) {
+	if (A &0x100) {
+		latch =latch &7 | V <<3;
+		Mapper294_sync();
+	}
+}
+
+static void Mapper294_reset(void) {
+	latch =0;
+	Mapper294_sync();
+}
+
+static void Mapper294_power(void) {
+	Mapper294_reset();
+	SetReadHandler(0x8000, 0xFFFF, CartBR);
+	SetWriteHandler(0x8000, 0xFFFF, Mapper294_writeInnerBank);
+	SetWriteHandler(0x4020, 0x7FFF, Mapper294_writeOuterBank);
+}
+
+void Mapper294_Init(CartInfo *info) {
+	info->Power = Mapper294_power;
+	info->Reset = Mapper294_reset;
+	AddExState(&latch, 1, 0, "LATC");
+}
diff --git a/src/ines.c b/src/ines.c
index c288b86..9ddcef0 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -706,7 +706,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "Kasheng 2-in-1 ",          291, Mapper291_Init         )
 	INES_BOARD( "DRAGONFIGHTER",            292, UNLBMW8544_Init        )
 	INES_BOARD( "NewStar 12-in-1/7-in-1",   293, Mapper293_Init         )
-	INES_BOARD( "MMC3 BMC PIRATE",          294, Mapper134_Init         ) /* nesdev redirects this as mapper 134 */
+	INES_BOARD( "63-1601 ",                 294, Mapper294_Init         )
 	INES_BOARD( "YY860216C",                295, Mapper295_Init         )
 	INES_BOARD( "TXC 01-22110-000",         297, Mapper297_Init         )
 	INES_BOARD( "TF1201",                   298, UNLTF1201_Init         )
diff --git a/src/ines.h b/src/ines.h
index ef30b65..aefc891 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -262,6 +262,7 @@ void Mapper269_Init(CartInfo *);
 void Mapper271_Init(CartInfo *);
 void Mapper288_Init(CartInfo *);
 void Mapper293_Init(CartInfo *);
+void Mapper294_Init(CartInfo *);
 void Mapper297_Init(CartInfo *);
 void Mapper310_Init(CartInfo *);
 void Mapper319_Init(CartInfo *);

From cfbe777f6183759d7a6ce4e83c9319826d9a8b5d Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sat, 2 Apr 2022 22:03:41 +0200
Subject: [PATCH 240/295] Added mapper 467

---
 src/boards/467.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  1 +
 src/ines.h       |  1 +
 3 files changed, 76 insertions(+)
 create mode 100644 src/boards/467.c

diff --git a/src/boards/467.c b/src/boards/467.c
new file mode 100644
index 0000000..3ec24d5
--- /dev/null
+++ b/src/boards/467.c
@@ -0,0 +1,74 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 NewRisingSun
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include "mapinc.h"
+#include "mmc3.h"
+
+static void Mapper467_PRGWrap(uint32 A, uint8 V) {
+	if (EXPREGS[0] &0x20) {
+		int prgAND =EXPREGS[0] &0x40? 0x0F: 0x03;
+		int prgOR  =EXPREGS[0] <<1 &0x3C | 0x40;
+		setprg8(A, V &prgAND | prgOR &~prgAND);
+	} else
+	if (~A &0x2000)
+		setprg16(A, EXPREGS[0] &0x1F);
+}
+
+static void Mapper467_CHRWrap(uint32 A, uint8 V) {
+	if (~A &0x0800) {
+		A =A &~0x400 | A <<1 &0x800;
+		if (EXPREGS[0] &0x40)
+			setchr2(A, V |0x100);
+		else
+			setchr2(A, V &~3 | A >>11 &3);
+	}
+}
+
+static DECLFW(Mapper467_WriteExtra) {
+	EXPREGS[0] =V;
+	FixMMC3PRG(MMC3_cmd &0x3F);
+	FixMMC3CHR(MMC3_cmd &0x3F);
+	setmirror(EXPREGS[0] &0x80? MI_H: MI_V);
+}
+
+static DECLFW(Mapper467_WriteMMC3) {
+	if (~A &1) V &=0x3F;
+	MMC3_CMDWrite(A, V);
+}
+
+static void Mapper467_Reset(void) {
+	EXPREGS[0] =0;
+	MMC3RegReset();
+}
+
+static void Mapper467_Power(void) {
+	EXPREGS[0] =0;
+	GenMMC3Power();
+	SetWriteHandler(0x8000, 0x8FFF, Mapper467_WriteMMC3);
+	SetWriteHandler(0x9000, 0x9FFF, Mapper467_WriteExtra);
+}
+
+void Mapper467_Init(CartInfo *info) {
+	GenMMC3_Init(info, 256, 256, 0, 0);
+	cwrap = Mapper467_CHRWrap;
+	pwrap = Mapper467_PRGWrap;
+	info->Power = Mapper467_Power;
+	info->Reset = Mapper467_Reset;
+	AddExState(EXPREGS, 1, 0, "EXPR");
+}
diff --git a/src/ines.c b/src/ines.c
index 9ddcef0..a025647 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -817,6 +817,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "NC-7000M/NC-8000M",        444, Mapper444_Init         )
 	INES_BOARD( "DS-9-27",                  452, Mapper452_Init         )
 	INES_BOARD( "K6C3001A",                 456, Mapper456_Init         )
+	INES_BOARD( "47-2",                 	467, Mapper467_Init         )
 	INES_BOARD( "SA-9602B",                 513, SA9602B_Init           )
 	INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init        )
 	INES_BOARD( "DANCE2000",                518, UNLD2000_Init          )
diff --git a/src/ines.h b/src/ines.h
index aefc891..92ad140 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -327,6 +327,7 @@ void Mapper443_Init(CartInfo *);
 void Mapper444_Init(CartInfo *);
 void Mapper452_Init(CartInfo *);
 void Mapper456_Init(CartInfo *);
+void Mapper467_Init(CartInfo *);
 void Mapper516_Init(CartInfo *);
 void Mapper523_Init(CartInfo *);
 void Mapper533_Init(CartInfo *);

From bc3767e37489692586137e2a55de555e5eadc1e1 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sat, 2 Apr 2022 22:50:13 +0200
Subject: [PATCH 241/295] Mapper 467: Remove unnecessary AND mask

---
 src/boards/467.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/boards/467.c b/src/boards/467.c
index 3ec24d5..268a1a6 100644
--- a/src/boards/467.c
+++ b/src/boards/467.c
@@ -42,8 +42,8 @@ static void Mapper467_CHRWrap(uint32 A, uint8 V) {
 
 static DECLFW(Mapper467_WriteExtra) {
 	EXPREGS[0] =V;
-	FixMMC3PRG(MMC3_cmd &0x3F);
-	FixMMC3CHR(MMC3_cmd &0x3F);
+	FixMMC3PRG(MMC3_cmd);
+	FixMMC3CHR(MMC3_cmd);
 	setmirror(EXPREGS[0] &0x80? MI_H: MI_V);
 }
 

From 046637ba73b9fd60e168777cb6fbc803b44ad234 Mon Sep 17 00:00:00 2001
From: jdgleaver <james@leaver.myzen.co.uk>
Date: Tue, 5 Apr 2022 13:45:20 +0100
Subject: [PATCH 242/295] Expose internal audio RF filter option

---
 src/drivers/libretro/libretro.c              |  9 +++++++++
 src/drivers/libretro/libretro_core_options.h | 16 +++++++++++++++-
 src/filter.h                                 |  1 +
 src/sound.c                                  |  4 ++--
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index f94debe..febf8e6 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -1136,6 +1136,7 @@ static bool update_option_visibility(void)
          char options_list[][25] = {
             "fceumm_sndvolume",
             "fceumm_sndquality",
+            "fceumm_sndlowpass",
             "fceumm_swapduty",
             "fceumm_apu_1",
             "fceumm_apu_2",
@@ -1822,6 +1823,14 @@ static void check_variables(bool startup)
          FCEUI_SetSoundQuality(sndquality);
    }
 
+   var.key = "fceumm_sndlowpass";
+
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+   {
+      int lowpass = (!strcmp(var.value, "enabled")) ? 1 : 0;
+      FCEUI_SetLowPass(lowpass);
+   }
+
    var.key = "fceumm_sndvolume";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
diff --git a/src/drivers/libretro/libretro_core_options.h b/src/drivers/libretro/libretro_core_options.h
index 7bda049..1bc1368 100644
--- a/src/drivers/libretro/libretro_core_options.h
+++ b/src/drivers/libretro/libretro_core_options.h
@@ -21,7 +21,7 @@ extern "C" {
  ********************************
 */
 
-#define MAX_CORE_OPTIONS 35
+#define MAX_CORE_OPTIONS 36
 
 /* RETRO_LANGUAGE_ENGLISH */
 
@@ -254,6 +254,20 @@ struct retro_core_option_v2_definition option_defs[] = {
       },
       "Low",
    },
+   {
+      "fceumm_sndlowpass",
+      "Audio RF Filter",
+      NULL,
+      "Apply a low pass audio filter to simulate the 'muted' sound of the NES when connected to a television via the RF modulator.",
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
    {
       "fceumm_swapduty",
       "Swap Audio Duty Cycles",
diff --git a/src/filter.h b/src/filter.h
index f913508..34c0338 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -4,6 +4,7 @@
 int32 NeoFilterSound(int32 *in, int32 *out, uint32 inlen, int32 *leftover);
 void MakeFilters(int32 rate);
 void SexyFilter(int32 *in, int32 *out, int32 count);
+void SexyFilter2(int32 *in, int32 count);
 
 extern int64 sexyfilter_acc1, sexyfilter_acc2;
 
diff --git a/src/sound.c b/src/sound.c
index ade058e..cc58117 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -992,8 +992,8 @@ int FlushEmulateSound(void) {
 
 		SexyFilter(Wave, WaveFinal, end >> 4);
 
-		/* if (FSettings.lowpass)
-			SexyFilter2(WaveFinal, end >> 4); */
+		if (FSettings.lowpass)
+			SexyFilter2(WaveFinal, end >> 4);
 
 		if (end & 0xF)
 			Wave[0] = Wave[(end >> 4)];

From 6173b5c71c47c7a5f646720ccae8dd82552e96d6 Mon Sep 17 00:00:00 2001
From: jdgleaver <james@leaver.myzen.co.uk>
Date: Wed, 6 Apr 2022 13:36:22 +0100
Subject: [PATCH 243/295] Add optional 'fake' stereo sound effect

---
 src/drivers/libretro/libretro.c              | 226 ++++++++++++++++++-
 src/drivers/libretro/libretro_core_options.h |  47 +++-
 2 files changed, 267 insertions(+), 6 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index febf8e6..c057484 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -804,6 +804,181 @@ static void palette_switch_set_index(uint32_t palette_index)
  * Palette switching END
  * ======================================== */
 
+/* ========================================
+ * Stereo Filter START
+ * ======================================== */
+
+enum stereo_filter_type
+{
+   STEREO_FILTER_NULL = 0,
+   STEREO_FILTER_DELAY
+};
+static enum stereo_filter_type current_stereo_filter = STEREO_FILTER_NULL;
+
+#define STEREO_FILTER_DELAY_MS_DEFAULT 15.0f;
+typedef struct
+{
+   int32_t *samples;
+   size_t samples_size;
+   size_t samples_pos;
+   size_t delay_count;
+} stereo_filter_delay_t;
+static stereo_filter_delay_t stereo_filter_delay;
+static float stereo_filter_delay_ms = STEREO_FILTER_DELAY_MS_DEFAULT;
+
+static void stereo_filter_apply_null(int32_t *sound_buffer, size_t size)
+{
+   size_t i;
+   /* Each element of sound_buffer is a 16 bit mono sample
+    * stored in a 32 bit value. We convert this to stereo
+    * by copying the mono sample to both the high and low
+    * 16 bit regions of the value and casting sound_buffer
+    * to int16_t when uploading to the frontend */
+   for (i = 0; i < size; i++)
+      sound_buffer[i] = (sound_buffer[i] << 16) |
+            (sound_buffer[i] & 0xFFFF);
+}
+
+static void stereo_filter_apply_delay(int32_t *sound_buffer, size_t size)
+{
+   size_t delay_capacity = stereo_filter_delay.samples_size -
+         stereo_filter_delay.samples_pos;
+   size_t i;
+
+   /* Copy current samples into the delay buffer
+    * (resizing if required) */
+   if (delay_capacity < size)
+   {
+      int32_t *tmp_buffer = NULL;
+      size_t tmp_buffer_size;
+
+      tmp_buffer_size = stereo_filter_delay.samples_size + (size - delay_capacity);
+      tmp_buffer_size = (tmp_buffer_size << 1) - (tmp_buffer_size >> 1);
+      tmp_buffer      = (int32_t *)malloc(tmp_buffer_size * sizeof(int32_t));
+
+      memcpy(tmp_buffer, stereo_filter_delay.samples,
+            stereo_filter_delay.samples_pos * sizeof(int32_t));
+
+      free(stereo_filter_delay.samples);
+
+      stereo_filter_delay.samples      = tmp_buffer;
+      stereo_filter_delay.samples_size = tmp_buffer_size;
+   }
+
+   for (i = 0; i < size; i++)
+      stereo_filter_delay.samples[i +
+            stereo_filter_delay.samples_pos] = sound_buffer[i];
+
+   stereo_filter_delay.samples_pos += size;
+
+   /* If we have enough samples in the delay
+    * buffer, mix them into the output */
+   if (stereo_filter_delay.samples_pos >
+         stereo_filter_delay.delay_count)
+   {
+      size_t delay_index    = 0;
+      size_t samples_to_mix = stereo_filter_delay.samples_pos -
+            stereo_filter_delay.delay_count;
+      samples_to_mix        = (samples_to_mix > size) ?
+            size : samples_to_mix;
+
+      /* Perform 'null' filtering for any samples for
+       * which a delay buffer entry is unavailable */
+      if (size > samples_to_mix)
+         for (i = 0; i < size - samples_to_mix; i++)
+            sound_buffer[i] = (sound_buffer[i] << 16) |
+                  (sound_buffer[i] & 0xFFFF);
+
+      /* Each element of sound_buffer is a 16 bit mono sample
+       * stored in a 32 bit value. We convert this to stereo
+       * by copying the mono sample to the high (left channel)
+       * 16 bit region and the delayed sample to the low
+       * (right channel) region, casting sound_buffer
+       * to int16_t when uploading to the frontend */
+      for (i = size - samples_to_mix; i < size; i++)
+         sound_buffer[i] = (sound_buffer[i] << 16) |
+               (stereo_filter_delay.samples[delay_index++] & 0xFFFF);
+
+      /* Remove the mixed samples from the delay buffer */
+      memmove(stereo_filter_delay.samples,
+            stereo_filter_delay.samples + samples_to_mix,
+            (stereo_filter_delay.samples_pos - samples_to_mix) *
+                  sizeof(int32_t));
+      stereo_filter_delay.samples_pos -= samples_to_mix;
+   }
+   /* Otherwise apply the regular 'null' filter */
+   else
+      for (i = 0; i < size; i++)
+            sound_buffer[i] = (sound_buffer[i] << 16) |
+                  (sound_buffer[i] & 0xFFFF);
+}
+
+static void (*stereo_filter_apply)(int32_t *sound_buffer, size_t size) = stereo_filter_apply_null;
+
+static void stereo_filter_deinit_delay(void)
+{
+   if (stereo_filter_delay.samples)
+      free(stereo_filter_delay.samples);
+
+   stereo_filter_delay.samples      = NULL;
+   stereo_filter_delay.samples_size = 0;
+   stereo_filter_delay.samples_pos  = 0;
+   stereo_filter_delay.delay_count  = 0;
+}
+
+static void stereo_filter_init_delay(void)
+{
+   size_t initial_samples_size;
+
+   /* Convert delay (ms) to number of samples */
+   stereo_filter_delay.delay_count = (size_t)(
+         (stereo_filter_delay_ms / 1000.0f) *
+               (float)sndsamplerate);
+
+   /* Preallocate delay_count + worst case expected
+    * samples per frame to minimise reallocation of
+    * the samples buffer during runtime */
+   initial_samples_size = stereo_filter_delay.delay_count +
+         (size_t)((float)sndsamplerate / NES_PAL_FPS) + 1;
+
+   stereo_filter_delay.samples      = (int32_t *)malloc(
+         initial_samples_size * sizeof(int32_t));
+   stereo_filter_delay.samples_size = initial_samples_size;
+   stereo_filter_delay.samples_pos  = 0;
+
+   /* Assign function pointer */
+   stereo_filter_apply = stereo_filter_apply_delay;
+}
+
+static void stereo_filter_deinit(void)
+{
+   /* Clean up */
+   stereo_filter_deinit_delay();
+   /* Assign default function pointer */
+   stereo_filter_apply = stereo_filter_apply_null;
+}
+
+static void stereo_filter_init(void)
+{
+   stereo_filter_deinit();
+
+   /* Use a case statement to simplify matters
+    * if more filter types are added in the
+    * future... */
+   switch (current_stereo_filter)
+   {
+      case STEREO_FILTER_DELAY:
+         stereo_filter_init_delay();
+         break;
+      default:
+         break;
+   }
+}
+
+/* ========================================
+ * Stereo Filter END
+ * ======================================== */
+
 #ifdef HAVE_NTSC_FILTER
 /* ntsc */
 #include "nes_ntsc.h"
@@ -1137,6 +1312,7 @@ static bool update_option_visibility(void)
             "fceumm_sndvolume",
             "fceumm_sndquality",
             "fceumm_sndlowpass",
+            "fceumm_sndstereodelay",
             "fceumm_swapduty",
             "fceumm_apu_1",
             "fceumm_apu_2",
@@ -1516,6 +1692,7 @@ void retro_deinit (void)
    NTSCFilter_Cleanup();
 #endif
    palette_switch_deinit();
+   stereo_filter_deinit();
 }
 
 void retro_reset(void)
@@ -1537,6 +1714,7 @@ static void check_variables(bool startup)
    struct retro_variable var = {0};
    char key[256];
    int i, enable_apu;
+   bool stereo_filter_updated = false;
 
    /* 1 = Performs only geometry update: e.g. overscans */
    /* 2 = Performs video/geometry update when needed and timing changes: e.g. region and filter change */
@@ -1831,6 +2009,45 @@ static void check_variables(bool startup)
       FCEUI_SetLowPass(lowpass);
    }
 
+   var.key = "fceumm_sndstereodelay";
+
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+   {
+      enum stereo_filter_type filter_type = STEREO_FILTER_NULL;
+      float filter_delay_ms               = STEREO_FILTER_DELAY_MS_DEFAULT;
+
+      if (strcmp(var.value, "disabled") &&
+          (strlen(var.value) > 1))
+      {
+         char value_str[3];
+
+         value_str[0] = var.value[0];
+         value_str[1] = var.value[1];
+         value_str[2] = '\0';
+
+         filter_type     = STEREO_FILTER_DELAY;
+         filter_delay_ms = (float)atoi(var.value);
+
+         filter_delay_ms = (filter_delay_ms < 1.0f) ?
+               1.0f : filter_delay_ms;
+         filter_delay_ms = (filter_delay_ms > 32.0f) ?
+               32.0f : filter_delay_ms;
+      }
+
+      if ((filter_type != current_stereo_filter) ||
+          ((filter_type == STEREO_FILTER_DELAY) &&
+               (filter_delay_ms != stereo_filter_delay_ms)))
+      {
+         current_stereo_filter  = filter_type;
+         stereo_filter_delay_ms = filter_delay_ms;
+         stereo_filter_updated  = true;
+      }
+   }
+
+   if ((stereo_filter_updated ||
+         (audio_video_updated == 2)) && !startup)
+      stereo_filter_init();
+
    var.key = "fceumm_sndvolume";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@@ -2365,12 +2582,10 @@ void retro_run(void)
    FCEUD_UpdateInput();
    FCEUI_Emulate(&gfx, &sound, &ssize, 0);
 
-   for (i = 0; i < ssize; i++)
-      sound[i] = (sound[i] << 16) | (sound[i] & 0xffff);
-
-   audio_batch_cb((const int16_t*)sound, ssize);
-
    retro_run_blit(gfx);
+
+   stereo_filter_apply(sound, ssize);
+   audio_batch_cb((const int16_t*)sound, ssize);
 }
 
 size_t retro_serialize_size(void)
@@ -3025,6 +3240,7 @@ bool retro_load_game(const struct retro_game_info *info)
    ResetPalette();
    FCEUD_SoundToggle();
    check_variables(true);
+   stereo_filter_init();
    PowerNES();
 
    FCEUI_DisableFourScore(1);
diff --git a/src/drivers/libretro/libretro_core_options.h b/src/drivers/libretro/libretro_core_options.h
index 1bc1368..488b474 100644
--- a/src/drivers/libretro/libretro_core_options.h
+++ b/src/drivers/libretro/libretro_core_options.h
@@ -21,7 +21,7 @@ extern "C" {
  ********************************
 */
 
-#define MAX_CORE_OPTIONS 36
+#define MAX_CORE_OPTIONS 37
 
 /* RETRO_LANGUAGE_ENGLISH */
 
@@ -268,6 +268,51 @@ struct retro_core_option_v2_definition option_defs[] = {
       },
       "disabled",
    },
+   {
+      "fceumm_sndstereodelay",
+      "Stereo Sound Effect",
+      NULL,
+      "Enable a fake stereo sound effect by delaying the right audio channel when upmixing the mono signal output from the NES.",
+      NULL,
+      "audio",
+      {
+         { "disabled",    NULL },
+         { "01_ms_delay", "1ms Delay" },
+         { "02_ms_delay", "2ms Delay" },
+         { "03_ms_delay", "3ms Delay" },
+         { "04_ms_delay", "4ms Delay" },
+         { "05_ms_delay", "5ms Delay" },
+         { "06_ms_delay", "6ms Delay" },
+         { "07_ms_delay", "7ms Delay" },
+         { "08_ms_delay", "8ms Delay" },
+         { "09_ms_delay", "9ms Delay" },
+         { "10_ms_delay", "10ms Delay" },
+         { "11_ms_delay", "11ms Delay" },
+         { "12_ms_delay", "12ms Delay" },
+         { "13_ms_delay", "13ms Delay" },
+         { "14_ms_delay", "14ms Delay" },
+         { "15_ms_delay", "15ms Delay (Default)" },
+         { "16_ms_delay", "16ms Delay" },
+         { "17_ms_delay", "17ms Delay" },
+         { "18_ms_delay", "18ms Delay" },
+         { "19_ms_delay", "19ms Delay" },
+         { "20_ms_delay", "20ms Delay" },
+         { "21_ms_delay", "21ms Delay" },
+         { "22_ms_delay", "22ms Delay" },
+         { "23_ms_delay", "23ms Delay" },
+         { "24_ms_delay", "24ms Delay" },
+         { "25_ms_delay", "25ms Delay" },
+         { "26_ms_delay", "26ms Delay" },
+         { "27_ms_delay", "27ms Delay" },
+         { "28_ms_delay", "28ms Delay" },
+         { "29_ms_delay", "29ms Delay" },
+         { "30_ms_delay", "30ms Delay" },
+         { "31_ms_delay", "31ms Delay" },
+         { "32_ms_delay", "32ms Delay" },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
    {
       "fceumm_swapduty",
       "Swap Audio Duty Cycles",

From 11c179344436c768c7bdce36d3843258b71ce513 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Thu, 9 Jun 2022 13:58:15 +0800
Subject: [PATCH 244/295] Add Firebrandx palettes

---
 src/drivers/libretro/libretro.c              | 90 ++++++++++++++++++--
 src/drivers/libretro/libretro_core_options.h |  4 +
 2 files changed, 89 insertions(+), 5 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index c057484..b828104 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -343,7 +343,7 @@ void FCEUD_SoundToggle (void)
 }
 
 /*palette for FCEU*/
-#define PAL_INTERNAL 16 /* Number of palettes in palettes[] */
+#define PAL_INTERNAL sizeof(palettes) / sizeof(palettes[0]) /* Number of palettes in palettes[] */
 #define PAL_DEFAULT  (PAL_INTERNAL + 1)
 #define PAL_RAW      (PAL_INTERNAL + 2)
 #define PAL_CUSTOM   (PAL_INTERNAL + 3)
@@ -649,6 +649,78 @@ struct st_palettes palettes[] = {
          0XEFC7FF, 0XFFC3E1, 0XFFCAC6, 0XF2DAAD,
          0XEBE3A0, 0XD2EDA2, 0XBCF4B4, 0XB5F1CE,
          0XB6ECF1, 0XBFBFBF, 0X000000, 0X000000 }
+   },
+   { "digital-prime-fbx", "FBX's Digital Prime palette",
+      { 0x616161, 0x000088, 0x1F0D99, 0x371379,
+         0x561260, 0x5D0010, 0x520E00, 0x3A2308,
+         0x21350C, 0x0D410E, 0x174417, 0x003A1F,
+         0x002F57, 0x000000, 0x000000, 0x000000,
+         0xAAAAAA, 0x0D4DC4, 0x4B24DE, 0x6912CF,
+         0x9014AD, 0x9D1C48, 0x923404, 0x735005,
+         0x5D6913, 0x167A11, 0x138008, 0x127649,
+         0x1C6691, 0x000000, 0x000000, 0x000000,
+         0xFCFCFC, 0x639AFC, 0x8A7EFC, 0xB06AFC,
+         0xDD6DF2, 0xE771AB, 0xE38658, 0xCC9E22,
+         0xA8B100, 0x72C100, 0x5ACD4E, 0x34C28E,
+         0x4FBECE, 0x424242, 0x000000, 0x000000,
+         0xFCFCFC, 0xBED4FC, 0xCACAFC, 0xD9C4FC,
+         0xECC1FC, 0xFAC3E7, 0xF7CEC3, 0xE2CDA7,
+         0xDADB9C, 0xC8E39E, 0xBFE5B8, 0xB2EBC8,
+         0xB7E5EB, 0xACACAC, 0x000000, 0x000000 }
+   },
+   { "magnum-fbx", "FBX's Magnum palette",
+      { 0x696969, 0x00148F, 0x1E029B, 0x3F008A,
+         0x600060, 0x660017, 0x570D00, 0x451B00,
+         0x243400, 0x004200, 0x004500, 0x003C1F,
+         0x00315C, 0x000000, 0x000000, 0x000000,
+         0xAFAFAF, 0x0F51DD, 0x442FF3, 0x7220E2,
+         0xA319B3, 0xAE1C51, 0xA43400, 0x884D00,
+         0x676D00, 0x208000, 0x008B00, 0x007F42,
+         0x006C97, 0x010101, 0x000000, 0x000000,
+         0xFFFFFF, 0x65AAFF, 0x8C96FF, 0xB983FF,
+         0xDD6FFF, 0xEA6FBD, 0xEB8466, 0xDCA21F,
+         0xBAB403, 0x7ECB07, 0x54D33E, 0x3CD284,
+         0x3EC7CC, 0x4B4B4B, 0x000000, 0x000000,
+         0xFFFFFF, 0xBDE2FF, 0xCECFFF, 0xE6C2FF,
+         0xF6BCFF, 0xF9C2ED, 0xFACFC6, 0xF8DEAC,
+         0xEEE9A1, 0xD0F59F, 0xBBF5AF, 0xB3F5CD,
+         0xB9EDF0, 0xB9B9B9, 0x000000, 0x000000 }
+   },
+   { "smooth-v2-fbx", "FBX's Smooth V2 palette",
+      { 0x6A6A6A, 0x00148F, 0x1E029B, 0x3F008A,
+         0x600060, 0x660017, 0x570D00, 0x3C1F00,
+         0x1B3300, 0x004200, 0x004500, 0x003C1F,
+         0x00315C, 0x000000, 0x000000, 0x000000,
+         0xB9B9B9, 0x0F4BD4, 0x412DEB, 0x6C1DD9,
+         0x9C17AB, 0xA71A4D, 0x993200, 0x7C4A00,
+         0x546400, 0x1A7800, 0x007F00, 0x00763E,
+         0x00678F, 0x010101, 0x000000, 0x000000,
+         0xFFFFFF, 0x68A6FF, 0x8C9CFF, 0xB586FF,
+         0xD975FD, 0xE377B9, 0xE58D68, 0xD49D29,
+         0xB3AF0C, 0x7BC211, 0x55CA47, 0x46CB81,
+         0x47C1C5, 0x4A4A4A, 0x000000, 0x000000,
+         0xFFFFFF, 0xCCEAFF, 0xDDDEFF, 0xECDAFF,
+         0xF8D7FE, 0xFCD6F5, 0xFDDBCF, 0xF9E7B5,
+         0xF1F0AA, 0xDAFAA9, 0xC9FFBC, 0xC3FBD7,
+         0xC4F6F6, 0xBEBEBE, 0x000000, 0x000000 }
+   },
+   { "nes-classic-fbx", "FBX's NES Classic palette",
+      { 0x616161, 0x000088, 0x1F0D99, 0x371379,
+         0x561260, 0x5D0010, 0x520E00, 0x3A2308,
+         0x21350C, 0x0D410E, 0x174417, 0x003A1F,
+         0x002F57, 0x000000, 0x000000, 0x000000,
+         0xAAAAAA, 0x0D4DC4, 0x4B24DE, 0x6912CF,
+         0x9014AD, 0x9D1C48, 0x923404, 0x735005,
+         0x5D6913, 0x167A11, 0x138008, 0x127649,
+         0x1C6691, 0x000000, 0x000000, 0x000000,
+         0xFCFCFC, 0x639AFC, 0x8A7EFC, 0xB06AFC,
+         0xDD6DF2, 0xE771AB, 0xE38658, 0xCC9E22,
+         0xA8B100, 0x72C100, 0x5ACD4E, 0x34C28E,
+         0x4FBECE, 0x424242, 0x000000, 0x000000,
+         0xFCFCFC, 0xBED4FC, 0xCACAFC, 0xD9C4FC,
+         0xECC1FC, 0xFAC3E7, 0xF7CEC3, 0xE2CDA7,
+         0xDADB9C, 0xC8E39E, 0xBFE5B8, 0xB2EBC8,
+         0xB7E5EB, 0xACACAC, 0x000000, 0x000000 }
    }
 };
 
@@ -1800,12 +1872,20 @@ static void check_variables(bool startup)
          current_palette = 14;
       else if (!strcmp(var.value, "wavebeam"))
          current_palette = 15;
+      else if (!strcmp(var.value, "digital-prime-fbx"))
+         current_palette = 16;
+      else if (!strcmp(var.value, "magnum-fbx"))
+         current_palette = 17;
+      else if (!strcmp(var.value, "smooth-v2-fbx"))
+         current_palette = 18;
+      else if (!strcmp(var.value, "nes-classic-fbx"))
+         current_palette = 19;
 
       if (current_palette != orig_value)
       {
          audio_video_updated = 1;
          ResetPalette();
-      }  
+      }
    }
 
    var.key = "fceumm_up_down_allowed";
@@ -2061,7 +2141,7 @@ static void check_variables(bool startup)
    {
       struct retro_system_av_info av_info;
       retro_get_system_av_info(&av_info);
-      if (audio_video_updated == 2)  
+      if (audio_video_updated == 2)
          environ_cb(RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO, &av_info);
       else
          environ_cb(RETRO_ENVIRONMENT_SET_GEOMETRY, &av_info);
@@ -2357,7 +2437,7 @@ static void FCEUD_UpdateInput(void)
          toggle ^= 1;
          for (i = 0; i < 2; i++)
          {
-            
+
             if (input_cb(i, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B))
                nes_input.FamicomData[0] |= 0x02 << (i * 2);
             else if (input_cb(i, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y))
@@ -2649,7 +2729,7 @@ static int GGisvalid(const char *code)
 {
    size_t len = strlen(code);
    uint32 i;
-   
+
    if (len != 6 && len != 8)
       return 0;
 
diff --git a/src/drivers/libretro/libretro_core_options.h b/src/drivers/libretro/libretro_core_options.h
index 488b474..bf243f3 100644
--- a/src/drivers/libretro/libretro_core_options.h
+++ b/src/drivers/libretro/libretro_core_options.h
@@ -214,6 +214,10 @@ struct retro_core_option_v2_definition option_defs[] = {
          { "nes-classic-fbx-fs",   "FBX's NES Classic (fixed)" },
          { "nescap",               "RGBSource's NESCAP" },
          { "wavebeam",             "nakedarthur's Wavebeam" },
+         { "digital-prime-fbx",    "FBX's Digital Prime" },
+         { "magnum-fbx",           "FBX's Magnum" },
+         { "smooth-v2-fbx",        "FBX's Smooth V2" },
+         { "nes-classic-fbx",      "FBX's NES Classic" },
          { "raw",                  "Raw" },
          { "custom",               "Custom" },
          { NULL, NULL },

From c6f9b96cbb148b378fdedad3653cd91f2d672e4f Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Tue, 7 Jun 2022 18:28:07 +0800
Subject: [PATCH 245/295] FDS: Permanently use new disk handling functions

FDS was already using the new disk handling code. This PR just removes
the old and now unused one.
---
 src/fds.c | 66 ++++---------------------------------------------------
 1 file changed, 4 insertions(+), 62 deletions(-)

diff --git a/src/fds.c b/src/fds.c
index 696d2fa..14f8eee 100644
--- a/src/fds.c
+++ b/src/fds.c
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+/* dec-12-19                                    */
+/* 4024(w), 4025(w), 4031(r) by dink(fbneo)     */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -83,11 +86,6 @@ static int32 DiskPtr;
 static int32 DiskSeekIRQ;
 static uint8 SelectDisk, InDisk;
 
-/* dec-12-19                                    */
-/* 4024(w), 4025(w), 4031(r) by dink(fbneo)     */
-/* remove this and old code after testing phase */
-#define USE_DINK
-
 enum FDS_DiskBlockIDs {
 	DSK_INIT = 0,
 	DSK_VOLUME,
@@ -166,7 +164,6 @@ static void FDSInit(void) {
 	InDisk = 0;
 	SelectDisk = 0;
 
-#ifdef USE_DINK
 	mapperFDS_control = 0;
 	mapperFDS_filesize = 0;
 	mapperFDS_block = 0;
@@ -174,7 +171,6 @@ static void FDSInit(void) {
 	mapperFDS_blocklen = 0;
 	mapperFDS_diskaddr = 0;
 	mapperFDS_diskaccess = 0;
-#endif
 }
 
 void FCEU_FDSInsert(int oride) {
@@ -243,25 +239,6 @@ static DECLFR(FDSRead4030) {
 	return ret;
 }
 
-#ifndef USE_DINK
-static DECLFR(FDSRead4031) {
-	static uint8 z = 0;
-	if (InDisk != 255) {
-		z = diskdata[InDisk][DiskPtr];
-		#ifdef FCEUDEF_DEBUGGER
-		if (!fceuindbg)
-		#endif
-		{
-			if (DiskPtr < 64999) DiskPtr++;
-			DiskSeekIRQ = 150;
-			X6502_IRQEnd(FCEU_IQEXT2);
-		}
-	}
-	return z;
-}
-
-#else /* USE_DISK */
-
 static DECLFR(FDSRead4031) {
 	uint8 ret = 0xff;
 
@@ -302,8 +279,6 @@ static DECLFR(FDSRead4031) {
 	return ret;
 }
 
-#endif /* USE_DINK */
-
 static DECLFR(FDSRead4032) {
 	uint8 ret;
 
@@ -348,18 +323,6 @@ static DECLFW(FDSWrite) {
 		}
 		break;
 	case 0x4024:
-#ifndef USE_DINK
-		if ((InDisk != 255) && !(FDSRegs[5] & 0x4) && (FDSRegs[3] & 0x1)) {
-			if (DiskPtr >= 0 && DiskPtr < 65500) {
-				if (writeskip)
-					writeskip--;
-				else if (DiskPtr >= 2) {
-					DiskWritten = 1;
-					diskdata[InDisk][DiskPtr - 2] = V;
-				}
-			}
-		}
-#else /* USE_DINK */
 		if (FDS_DISK_INSERTED && ~mapperFDS_control & 0x04) {
 
 			if (mapperFDS_diskaccess == 0) {
@@ -392,27 +355,8 @@ static DECLFW(FDSWrite) {
 			}
 
 		}
-#endif /* USE_DINK */
 		break;
 	case 0x4025:
-#ifndef USE_DINK
-		X6502_IRQEnd(FCEU_IQEXT2);
-		if (InDisk != 255) {
-			if (!(V & 0x40)) {
-				if ((FDSRegs[5] & 0x40) && !(V & 0x10)) {
-					DiskSeekIRQ = 200;
-					DiskPtr -= 2;
-				}
-				if (DiskPtr < 0) DiskPtr = 0;
-			}
-			if (!(V & 0x4)) writeskip = 2;
-			if (V & 2) {
-				DiskPtr = 0; DiskSeekIRQ = 200;
-			}
-			if (V & 0x40) DiskSeekIRQ = 200;
-		}
-		setmirror(((V >> 3) & 1) ^ 1);
-#else /* USE_DINK */
 		X6502_IRQEnd(FCEU_IQEXT2);
 		if (FDS_DISK_INSERTED) {
 			if (V & 0x40 && ~mapperFDS_control & 0x40) {
@@ -460,7 +404,6 @@ static DECLFW(FDSWrite) {
 		}
 		mapperFDS_control = V;
 		setmirror(((V >> 3) & 1) ^ 1);
-#endif /* USE_DINK */
 		break;
 	}
 	FDSRegs[A & 7] = V;
@@ -783,7 +726,7 @@ int FDSLoad(const char *name, FCEUFILE *fp) {
 	AddExState(&SelectDisk, 1, 0, "SELD");
 	AddExState(&InDisk, 1, 0, "INDI");
 	AddExState(&DiskWritten, 1, 0, "DSKW");
-#ifdef USE_DINK
+
 	AddExState(&mapperFDS_control, 1, 0, "CTRG");
 	AddExState(&mapperFDS_filesize, 2 | FCEUSTATE_RLSB, 1, "FLSZ");
 	AddExState(&mapperFDS_block, 1, 0, "BLCK");
@@ -791,7 +734,6 @@ int FDSLoad(const char *name, FCEUFILE *fp) {
 	AddExState(&mapperFDS_blocklen, 2 | FCEUSTATE_RLSB, 1, "BLKL");
 	AddExState(&mapperFDS_diskaddr, 2 | FCEUSTATE_RLSB, 1, "DADR");
 	AddExState(&mapperFDS_diskaccess, 1, 0, "DACC");
-#endif
 
 	CHRRAMSize = 8192;
 	CHRRAM = (uint8*)FCEU_gmalloc(CHRRAMSize);

From 75872dab63342f7d4e22b71426dcbe44dd0e51b6 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Tue, 7 Jun 2022 18:12:47 +0800
Subject: [PATCH 246/295] Remove CopyFami stuff

unused in this implementation, not any other emu uses it. considering
its even UNIF based, probably has no use anymore.
---
 src/boards/copyfami_emu.c | 355 -----------------------
 src/boards/copyfami_hwi.c | 596 --------------------------------------
 src/driver.h              |   5 -
 src/fceu.c                |  57 +---
 src/fceu.h                |   4 -
 src/ppu.c                 |  22 +-
 src/state.c               |   4 -
 src/unif.c                |  19 --
 src/unif.h                |   5 -
 9 files changed, 2 insertions(+), 1065 deletions(-)
 delete mode 100644 src/boards/copyfami_emu.c
 delete mode 100644 src/boards/copyfami_hwi.c

diff --git a/src/boards/copyfami_emu.c b/src/boards/copyfami_emu.c
deleted file mode 100644
index 96a22c3..0000000
--- a/src/boards/copyfami_emu.c
+++ /dev/null
@@ -1,355 +0,0 @@
-/* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2011 CaH4e3
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifdef COPYFAMI
-
-#include "__serial.h"
-#include "mapinc.h"
-#include "mmc3.h"
-
-/* #define DEBUG_SERIAL */
-
-/* *** COPY FAMICOM EMULATION *** */
-
-/*
- *
- *
- *	$0000-$1FFF
- *	$2000-$200F  PPU
- *	$2010-$3FFB
- *	$3FFC-$3FFF
- *	$4000-$7FFF APU /
- *	$8000-$FFF9 CART/ROM
- *	$FFFA-$FFFB CART/ NMI
- *	$FFFE-$FFFF CART/ IRQ
- *
- *
- *
- *	CTRL		R/W	$3FFC	---aenic	($00 at reset)
- *
- *		c -
- *			0 -
- *			1 -
- *		i -  IRQ
- *			0 -
- *			1 -
- *		n -  NMI
- *			0 -
- *			1 -
- *		e -  NMI
- *			0 -
- *			1 -
- *		a -  AROM
- *			0 -
- *			1 -
- *
- *	BANK		R/W	$3FFD	---mbbbb
- *
- *		b -
- *		m -    ROM
- *
- *	USBDATA		R/W	$3FFE	dddddddd
- *
- *		d -   /
- *
- *	STATUS		R	$3FFF	vmnicptr
- *
- *			r -      USB
- *			0 -
- *			1 -
- *		t -      USB
- *			0 -
- *			1 -
- *		p -   USB
- *			0 -
- *			1 -
- *		c -
- *			0 -
- *			1 -
- *		i -   IRQ
- *			0 -
- *			1 -
- *		n -   NMI
- *			0 -
- *			1 -
- *		m -    10 VRAM ()
- *		v -  VRAM
- *			0 -
- *			1 -
- *
- * AROM
- *
- *	  VRAM
- *		 8000-FFFF
- */
-
-#define CTRL     0x00
-#define  CCART   0x01
-#define  CVIRQ   0x02
-#define  CVNMI   0x04
-#define  CDNMI   0x08
-#define  CAROM   0x10
-#define BANK     0x01
-#define  BMIRR   0x10
-#define USB      0x02
-#define STATUS   0x03
-#define  SRX     0x01
-#define  STX     0x02
-#define  SPEN    0x04
-#define  SCART   0x08
-#define  SIRQ    0x10
-#define  SNMI    0x20
-#define  SA10    0x40
-#define  SVRAM   0x80
-
-#ifdef DEBUG_SERIAL
-static uint8 debug_serial_data[] = {
-	0xDE, 0xAD, 0xBE, 0xEF, 0x00,
-	0xDE, 0xAD, 0xBE, 0xEF, 0x01,
-
-	0x02,
-
-	0x14, 0x50, 0xB0,
-
-	0x02,
-
-	0x14, 0x50, 0xB0,
-
-	0x02,
-};
-static uint32 debug_serial_data_size = sizeof(debug_serial_data);
-static uint32 debug_serial_data_pos;
-#endif
-
-static uint8 *CHRRAM = NULL;
-static uint32 CHRRAMSIZE;
-
-static uint8 regs[4];
-
-static readfunc def_read_ram, def_read_rom;
-static writefunc def_write_ram;
-
-static SFORMAT StateRegs[] =
-{
-	{ regs, 4, "CREGS" },
-	{ 0 }
-};
-
-static void Sync() {
-	FixMMC3PRG(MMC3_cmd);
-	FixMMC3CHR(MMC3_cmd);
-}
-
-static void MCopyFamiMMC3PW(uint32 A, uint8 V) {
-	if (regs[CTRL] & CCART)
-		setprg8(A, V);
-	else
-		setprg32r(1, 0x8000, (regs[BANK] & 0x0F) ^ 0x08);
-}
-
-static void MCopyFamiMMC3CW(uint32 A, uint8 V) {
-	if ((regs[STATUS] & SCART) && (regs[CTRL] & CAROM))
-		setchr8r(0x10, 0);
-	else
-		setchr1r(0, A, V);
-}
-
-static void MCopyFamiMMC3MW(uint8 V) {
-	if (regs[CTRL] & CAROM) {
-		setmirror(MI_0 + ((regs[BANK] >> 4) & 1));
-	} else {
-		A000B = V;
-		setmirror((V & 1) ^ 1);
-	}
-}
-
-static uint32 direction = 0xffffffff;
-static uint32 bytes_count = 0;
-
-static DECLFW(MCopyFamiWriteReg) {
-	if (((A & 3) == USB) && !fceuindbg) {
-		if (direction != 0) {
-			direction = 0;
-			bytes_count = 0;
-			FCEU_printf(" >");
-		}
-#ifndef DEBUG_SERIAL
-		while (!SerialSendChar(V)) {
-		}
-		;
-#endif
-		bytes_count++;
-/*     FCEU_printf(" %02X",V); */
-	} else {
-		regs[A & 3] = V;
-		Sync();
-	}
-}
-
-static DECLFR(MCopyFamiReadReg) {
-#ifdef DEBUG_SERIAL
-	if (debug_serial_data_pos == debug_serial_data_size)
-		regs[STATUS] |= SRX;
-	else
-		regs[STATUS] &= ~SRX;
-#endif
-	if (!fceuindbg) {
-#ifndef DEBUG_SERIAL
-		if ((A & 3) == STATUS) {
-			int data;
-			if ((data = SerialGetChar()) == EOF)
-				regs[STATUS] |= SRX;
-			else
-				regs[STATUS] &= ~SRX;
-			regs[USB] = data & 0xff;
-		} else
-#endif
-		if ((A & 3) == USB) {
-#ifdef DEBUG_SERIAL
-			regs[USB] = debug_serial_data[debug_serial_data_pos++];
-#endif
-			if (direction != 1) {
-				if (direction != 0xffffffff) FCEU_printf(" bytes sent: %08x", bytes_count);
-				direction = 1;
-				bytes_count = 0;
-				FCEU_printf("\n<");
-			}
-			FCEU_printf(" %02X", regs[USB]);
-		}
-	}
-	return regs[A & 3];
-}
-
-static DECLFW(MCopyFamiMMC3Write) {
-	if (regs[CTRL] & CAROM) {
-		regs[BANK] = V & 0x1F;
-		Sync();
-	} else {
-		if (A >= 0xC000)
-			MMC3_IRQWrite(A, V);
-		else
-			MMC3_CMDWrite(A, V);
-	}
-}
-
-static DECLFW(MCopyFamiMMC3WriteNMI) {
-	if (regs[CTRL] & CVNMI)
-		def_write_ram(0x3FFC + (A & 1), V);
-	else
-		MCopyFamiMMC3Write(A, V);
-}
-
-static DECLFW(MCopyFamiMMC3WriteIRQ) {
-	if (regs[CTRL] & CVIRQ)
-		def_write_ram(0x3FFE + (A & 1), V);
-	else
-		MCopyFamiMMC3Write(A, V);
-}
-
-static DECLFR(MCopyFamiReadNMI) {
-	if (regs[CTRL] & CVNMI)
-		return def_read_ram(0x3FFC + (A & 1));
-	else
-		return def_read_rom(A);
-}
-
-static DECLFR(MCopyFamiReadIRQ) {
-	if (regs[CTRL] & CVIRQ)
-		return def_read_ram(0x3FFE + (A & 1));
-	else
-		return def_read_rom(A);
-}
-
-static void MCopyFamiMMC3Power(void) {
-	regs[CTRL] = regs[USB] = 0;
-	regs[STATUS] = SIRQ | SNMI | SVRAM;
-	regs[BANK] = 0x08;
-#ifdef DEBUG_SERIAL
-	debug_serial_data_pos = 0;
-#endif
-	GenMMC3Power();
-	Sync();
-
-	def_write_ram = GetWriteHandler(0x3FFC);
-	SetWriteHandler(0x3FFC, 0x3FFF, MCopyFamiWriteReg);
-	def_read_ram = GetReadHandler(0x3FFC);
-	SetReadHandler(0x3FFC, 0x3FFF, MCopyFamiReadReg);
-
-	SetWriteHandler(0x8000, 0xFFF9, MCopyFamiMMC3Write);
-	SetWriteHandler(0xFFFA, 0xFFFB, MCopyFamiMMC3WriteNMI);
-	SetWriteHandler(0xFFFE, 0xFFFF, MCopyFamiMMC3WriteIRQ);
-
-	def_read_rom = GetReadHandler(0xFFFA);
-	SetReadHandler(0xFFFA, 0xFFFB, MCopyFamiReadNMI);
-	SetReadHandler(0xFFFE, 0xFFFF, MCopyFamiReadIRQ);
-}
-
-static void MCopyFamiMMC3Reset(void) {
-	regs[CTRL] = regs[USB] = 0;
-	regs[STATUS] = SIRQ | SNMI | SVRAM;
-	regs[BANK] = 0x08;
-#ifdef DEBUG_SERIAL
-	debug_serial_data_pos = 0;
-#endif
-	MMC3RegReset();
-	Sync();
-}
-
-static void MCopyFamiClose(void) {
-	if (CHRRAM)
-		FCEU_gfree(CHRRAM);
-	CHRRAM = NULL;
-	SerialClose();
-}
-
-static void StateRestore(int version) {
-	Sync();
-}
-
-void MapperCopyFamiMMC3_Init(CartInfo *info) {
-	GenMMC3_Init(info, 512, 512, 8, 0);
-
-	cwrap = MCopyFamiMMC3CW;
-	pwrap = MCopyFamiMMC3PW;
-	mwrap = MCopyFamiMMC3MW;
-
-	info->Reset = MCopyFamiMMC3Reset;
-	info->Power = MCopyFamiMMC3Power;
-	info->Close = MCopyFamiClose;
-	GameStateRestore = StateRestore;
-
-	CHRRAMSIZE = 8192;
-	CHRRAM = (uint8*)FCEU_gmalloc(CHRRAMSIZE);
-	SetupCartCHRMapping(0x10, CHRRAM, CHRRAMSIZE, 1);
-	AddExState(CHRRAM, CHRRAMSIZE, 0, "CRAM");
-
-#ifndef DEBUG_SERIAL
-	FCEU_printf("WAITING FOR PORT...\n");
-
-	while (!SerialOpen(20, 921600)) {
-	}
-
-	FCEU_printf("PORT READY.\n");
-#endif
-
-	AddExState(&StateRegs, ~0, 0, 0);
-}
-
-#endif
diff --git a/src/boards/copyfami_hwi.c b/src/boards/copyfami_hwi.c
deleted file mode 100644
index fde8fa4..0000000
--- a/src/boards/copyfami_hwi.c
+++ /dev/null
@@ -1,596 +0,0 @@
-/* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2011 CaH4e3
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifdef COPYFAMI
-
-/* *** COPY FAMICOM HARDWARE INTERFACE *** */
-
-#define MESSAGE_LOG
-#define NO_CACHE
-#define NO_RAM
-
-#include <streams/file_stream.h>
-
-#include "__serial.h"
-#include "mapinc.h"
-
-#define FNV_32_PRIME    ((uint32)0x01000193)
-
-#define CHR_CACHE_SIZE  (1024 * 4)
-#define WRAM_CACHE_SIZE (1024 / 2)
-#define PRG_CACHE_SIZE  (1024 / 4)
-#define CMD_CACHE_SIZE  (1024 * 128)
-
-#define CMD_MAX_SIZE    (5)
-#define CMD_MAX_RETEST  (16)
-#define CMD_MAX_VERIFY  (16)
-
-static uint8 *WRAM = NULL;
-
-uint8 InitVector[] = { 0xDE, 0xAD, 0xBE, 0xEF };/* args none,               return DE AD BE EF		*/
-uint8 ResetCmd[] = { 0x00 };					/* args none,               return none				*/
-uint8 StateCmd[] = { 0x01 };					/* args none,               return 7 bytes status	*/
-uint8 StatusCmd[] = { 0x02 };					/* args none,               return 32 bytes status	*/
-uint8 LoadPlugCmd[] = { 0x03, 0x00, 0x00 };		/* args 2b size, Nb data    return none				*/
-uint8 RunPlugCmd[] = { 0x04 };					/* args none,               return none				*/
-uint8 RunGameCmd[] = { 0x05 };					/* args none,               return none				*/
-uint8 NROMSave[] = { 0x06 };					/* args none,               return 16b + 32kb + 8kb	*/
-
-uint8 PRGWBCmd[] = { 0x08, 0x00, 0x00, 0x00 };	/* args 2b addr, 1b data    return none				*/
-uint8 PRGRBCmd[] = { 0x09, 0x00, 0x00 };		/* args 2b addr             return 1b data			*/
-uint8 CHRWBCmd[] = { 0x0A, 0x00, 0x00, 0x00 };	/* args 2b addr, 1b data    return none				*/
-uint8 CHRRBCmd[] = { 0x0B, 0x00, 0x00 };		/* args 2b addr,            return 1b data			*/
-
-uint8 PRGSUMCmd[] = { 0x10, 0x00, 0x00 };		/* args 1b addr, 1b size    return (256 * N)b		*/
-uint8 PRG32KSUMCmd[] = { 0x10, 0x80, 0x80 };	/* args 1b addr, 1b size    return 32kb				*/
-uint8 PRG16KSUMCmd[] = { 0x10, 0x00, 0x40 };	/* args 1b addr, 1b size    return 16kb				*/
-uint8 PRG8KSUMCmd[] = { 0x10, 0x00, 0x20 };		/* args 1b addr, 1b size    return 8kb				*/
-uint8 PRG4KSUMCmd[] = { 0x10, 0x00, 0x10 };		/* args 1b addr, 1b size    return 4kb				*/
-
-uint8 CHRSUMCmd[] = { 0x11, 0x00, 0x00 };		/* args 1b addr, 1b size    return (256 * N)b		*/
-uint8 CHR8KSUMCmd[] = { 0x11, 0x00, 0x20 };		/* args 1b addr, 1b size    return 8kb				*/
-uint8 CHR4KSUMCmd[] = { 0x11, 0x00, 0x10 };		/* args 1b addr, 1b size    return 4kb				*/
-uint8 CHR2KSUMCmd[] = { 0x11, 0x00, 0x08 };		/* args 1b addr, 1b size    return 2kb				*/
-uint8 CHR1KSUMCmd[] = { 0x11, 0x00, 0x04 };		/* args 1b addr, 1b size    return 1kb				*/
-
-uint8 PRGGetCmd[] = { 0x12, 0x00, 0x00 };		/* args 1b addr, 1b size    return (256 * N)b		*/
-uint8 PRG32KGetCmd[] = { 0x12, 0x80, 0x80 };	/* args 1b addr, 1b size    return 32kb				*/
-uint8 PRG16KGetCmd[] = { 0x12, 0x00, 0x40 };	/* args 1b addr, 1b size    return 16kb				*/
-uint8 PRG8KGetCmd[] = { 0x12, 0x00, 0x20 };		/* args 1b addr, 1b size    return 8kb				*/
-uint8 PRG4KGetCmd[] = { 0x12, 0x00, 0x10 };		/* args 1b addr, 1b size    return 4kb				*/
-
-uint8 CHRGetCmd[] = { 0x13, 0x00, 0x00 };		/* args 1b addr, 1b size    return (256 * N)b		*/
-uint8 CHR8KGetCmd[] = { 0x13, 0x00, 0x20 };		/* args 1b addr, 1b size    return 8kb				*/
-uint8 CHR4KGetCmd[] = { 0x13, 0x00, 0x10 };		/* args 1b addr, 1b size    return 4kb				*/
-uint8 CHR2KGetCmd[] = { 0x13, 0x00, 0x08 };		/* args 1b addr, 1b size    return 2kb				*/
-uint8 CHR1KGetCmd[] = { 0x13, 0x00, 0x04 };		/* args 1b addr, 1b size    return 1kb				*/
-
-uint8 CPUTestCmd[] = { 0x14, 0x00, 0x00 };		/* args 1b addr, 1b size    return (2b + 1b) * N + 3b	*/
-
-typedef struct {
-	int32 mirror;
-	int32 chrsum[8];
-	int32 prgsum[4];
-} SYNC_STATE;
-
-static SYNC_STATE state_cur, state_new, state_def;
-
-typedef struct {
-	uint8 *buf;
-	int32 count;
-} DATA_BANKS;
-
-static DATA_BANKS chr_data;
-static int32 chr_bank[0x10000];
-static DATA_BANKS prg_data;
-static int32 prg_bank[0x10000];
-
-typedef struct {
-	SYNC_STATE states[CMD_CACHE_SIZE];
-	int32 seqs[CMD_CACHE_SIZE][CMD_MAX_SIZE];
-	int32 count;
-} SYNC_CMDS;
-
-typedef struct {
-	int32 seq[CMD_MAX_SIZE];
-	int32 size;
-	int32 found;
-	uint32 hash;
-	uint16 hashf;
-} SYNC_CMD;
-
-static SYNC_CMD cmd;
-static SYNC_CMDS cmds;
-
-typedef struct {
-	int32 index;
-	int32 size;
-	int32 retest;
-	int32 verify;
-} CMD_CACHE;
-
-static CMD_CACHE cmd_cache[0x10000];
-
-static SFORMAT StateRegs[] =
-{
-	{ state_cur.chrsum, sizeof(state_cur.chrsum), "CHRREG" },
-	{ state_cur.prgsum, sizeof(state_cur.prgsum), "ROMREG" },
-	{ &state_cur.mirror, sizeof(state_cur.mirror), "MIRREG" },
-	{ 0 }
-};
-
-#define MI_U 4
-
-static char *mirror_names[5] = { "Horizontal", "Vertical", "Mirror 0", "Mirror 1", "Unknown mirror" };
-static int32 mirror_modes[16] = {
-	MI_0, MI_U, MI_U, MI_H, MI_U, MI_V, MI_U, MI_U,
-	MI_U, MI_U, MI_U, MI_U, MI_U, MI_U, MI_U, MI_1
-};
-
-#define CHRDEF(slot)   (chr_bank[state_def.chrsum[slot]])
-#define PRGDEF(slot)   (prg_bank[state_def.prgsum[slot]])
-#define CHRCUR(slot)   (chr_bank[state_cur.chrsum[slot]])
-#define PRGCUR(slot)   (prg_bank[state_cur.prgsum[slot]])
-#define CHRNEW(slot)   (chr_bank[state_new.chrsum[slot]])
-#define PRGNEW(slot)   (prg_bank[state_new.prgsum[slot]])
-
-static void GetStatus(SYNC_STATE *state) {
-	uint8 resp0;
-	uint16 resp1, i;
-	SEND(StatusCmd);
-	GET(resp0, 1);
-	state->mirror = resp0;
-	GET(resp0, 1);
-	for (i = 0; i < 8; i++) {
-		GET(resp1, 2);
-		state->chrsum[i] = resp1;
-	}
-	for (i = 0; i < 4; i++) {
-		GET(resp1, 2);
-		state->prgsum[i] = resp1;
-	}
-}
-
-static int32 FetchNewCHRBank(int32 slot) {
-	RFILE *ofile;
-	char name[256];
-	int32 bank = chr_data.count++;
-	CHR1KGetCmd[1] = slot << 2;
-	SENDGET(CHR1KGetCmd, chr_data.buf[bank * 1024], 1024);
-	sprintf(name, "%04x.chr", bank);
-	ofile = filestream_open(name,
-			RETRO_VFS_FILE_ACCESS_WRITE,
-			RETRO_VFS_FILE_ACCESS_HINT_NONE);
-	filestream_write(ofile, (void*)&chr_data.buf[bank * 1024], 1024);
-	filestream_close(ofile);
-	return bank;
-}
-
-static int32 FetchNewPRGBank(int32 slot) {
-	RFILE *ofile;
-	char name[256];
-	int32 bank = prg_data.count++;
-	PRG8KGetCmd[1] = 0x80 + (slot << 5);
-	SENDGET(PRG8KGetCmd, prg_data.buf[bank * 8192], 8192);
-	sprintf(name, "%04x.prg", bank);
-	ofile = filestream_open(name,
-			RETRO_VFS_FILE_ACCESS_WRITE,
-			RETRO_VFS_FILE_ACCESS_HINT_NONE);
-	filestream_write(ofile, (void*)&prg_data.buf[bank * 8192], 8192);
-	filestream_close(ofile);
-	return bank;
-}
-
-static int CheckStatus(void) {
-	int32 i, ischanged = 0;
-	GetStatus(&state_new);
-	if (state_cur.mirror != state_new.mirror) {
-		state_cur.mirror = state_new.mirror;
-#ifdef MESSAGE_LOG
-		FCEU_printf(">> mirror changed to %s (%02X)\n", mirror_names[mirror_modes[state_cur.mirror]], state_cur.mirror);
-#endif
-		ischanged = 1;
-	} else {
-		state_new.mirror = -1;
-	}
-	for (i = 0; i < 8; i++) {
-		if (state_cur.chrsum[i] != state_new.chrsum[i]) {
-			state_cur.chrsum[i] = state_new.chrsum[i];
-			if (CHRCUR(i) == -1) {
-				CHRCUR(i) = FetchNewCHRBank(i);
-#ifdef MESSAGE_LOG
-				FCEU_printf(">> chr[%d] bank %d loaded\n", i, CHRCUR(i));
-#endif
-			}
-#ifdef MESSAGE_LOG
-			else
-				FCEU_printf(">> chr[%d] bank %d switched\n", i, CHRCUR(i));
-#endif
-			ischanged = 1;
-		} else {
-			state_new.chrsum[i] = -1;
-		}
-	}
-	for (i = 0; i < 4; i++) {
-		if (state_cur.prgsum[i] != state_new.prgsum[i]) {
-			state_cur.prgsum[i] = state_new.prgsum[i];
-			if (PRGCUR(i) == -1) {
-				PRGCUR(i) = FetchNewPRGBank(i);
-#ifdef MESSAGE_LOG
-				FCEU_printf(">> prg[%d] bank %d loaded\n", i, PRGCUR(i));
-#endif
-			}
-#ifdef MESSAGE_LOG
-			else
-				FCEU_printf(">> prg[%d] bank %d switched\n", i, PRGCUR(i));
-#endif
-			ischanged = 1;
-		} else {
-			state_new.prgsum[i] = -1;
-		}
-	}
-	return ischanged;
-}
-
-#ifndef NO_CACHE
-static void ApplyStatus() {
-	int32 i;
-	if ((cmds.states[cmd.found].mirror != -1) && (cmds.states[cmd.found].mirror != state_cur.mirror)) {
-		state_cur.mirror = cmds.states[cmd.found].mirror;
-		setmirror(mirror_modes[state_cur.mirror]);
-#ifdef MESSAGE_LOG
-		FCEU_printf(">> mirror changed to %s (%02X)\n", mirror_names[mirror_modes[state_cur.mirror]], state_cur.mirror);
-#endif
-	}
-	for (i = 0; i < 8; i++) {
-		int32 sum = cmds.states[cmd.found].chrsum[i];
-		if (sum != -1) {
-			if (sum != state_cur.chrsum[i]) {
-				state_cur.chrsum[i] = sum;
-				setchr1r(1, i * 1024, CHRCUR(i));
-#ifdef MESSAGE_LOG
-				FCEU_printf(">> chr[%d] bank %d switched\n", i, chr_bank[sum]);
-#endif
-			} else
-#ifdef MESSAGE_LOG
-				FCEU_printf(">> chr[%d] bank %d switched the same\n", i, chr_bank[sum]);
-		}
-#endif
-				}
-				for (i = 0; i < 4; i++) {
-					int32 sum = cmds.states[cmd.found].prgsum[i];
-					if (sum != -1) {
-						if (sum != state_cur.prgsum[i]) {
-							state_cur.prgsum[i] = sum;
-							setprg8r(2, 0x8000 + (i * 8192), PRGCUR(i));
-#ifdef MESSAGE_LOG
-							FCEU_printf(">> prg[%d] bank %d switched\n", i, prg_bank[sum]);
-#endif
-						} else
-#ifdef MESSAGE_LOG
-							FCEU_printf(">> prg[%d] bank %d switched the same\n", i, prg_bank[sum]);
-					}
-#endif
-							}
-							}
-
-							static void LogCmd() {
-								int32 i;
-								FCEU_printf(">> new cmd size %d [", cmd_cache[cmd.hashf].size);
-								for (i = 0; i < cmd_cache[cmd.hashf].size; i++)
-									FCEU_printf(" %06X", cmds.seqs[cmd.found][i]);
-								FCEU_printf(" ], switched to (");
-								if (cmds.states[cmd.found].mirror != -1)
-									FCEU_printf(" mirror=%s", mirror_names[mirror_modes[cmds.states[cmd.found].mirror]]);
-								for (i = 0; i < 8; i++)
-									if (cmds.states[cmd.found].chrsum[i] != -1)
-										FCEU_printf(" chr%d=%02X", i, chr_bank[cmds.states[cmd.found].chrsum[i]]);
-								for (i = 0; i < 4; i++)
-									if (cmds.states[cmd.found].prgsum[i] != -1)
-										FCEU_printf(" prg%d=%02X", i, prg_bank[cmds.states[cmd.found].prgsum[i]]);
-								FCEU_printf(" )\n");
-							}
-#endif
-static void Sync() {
-	setchr1r(1, 0x0000, CHRCUR(0));
-	setchr1r(1, 0x0400, CHRCUR(1));
-	setchr1r(1, 0x0800, CHRCUR(2));
-	setchr1r(1, 0x0C00, CHRCUR(3));
-	setchr1r(1, 0x1000, CHRCUR(4));
-	setchr1r(1, 0x1400, CHRCUR(5));
-	setchr1r(1, 0x1800, CHRCUR(6));
-	setchr1r(1, 0x1C00, CHRCUR(7));
-#ifndef NO_RAM
-	setprg8r(1, 0x6000, 0);
-#endif
-	setprg8r(2, 0x8000, PRGCUR(0));
-	setprg8r(2, 0xA000, PRGCUR(1));
-	setprg8r(2, 0xC000, PRGCUR(2));
-	setprg8r(2, 0xE000, PRGCUR(3));
-	setmirror(mirror_modes[state_cur.mirror]);
-}
-#ifndef NO_CACHE
-static void UpdateCmd(uint32 val) {
-	int32 index;
-	if (cmd.size < CMD_MAX_SIZE) {
-		index = cmd.size++;
-	} else {
-		/* ���� ��������� �������� ��� �������, ��������� ����������, �������� �����,
-		 * ���������� �� ������������
-		 */
-		cmd.hash = 0;
-		for (index = 0; index < (CMD_MAX_SIZE - 1); index++) {
-			cmd.seq[index] = cmd.seq[index + 1];
-			cmd.hash *= FNV_32_PRIME;
-			cmd.hash ^= cmd.seq[index];
-		}
-	}
-	cmd.seq[index] = val;
-	cmd.hash *= FNV_32_PRIME;
-	cmd.hash ^= val;
-	cmd.hashf = (cmd.hash >> 16) ^ (cmd.hash & 0xffff);
-	cmd.found = cmd_cache[cmd.hashf].index;
-}
-#endif
-
-static DECLFW(MCopyFamiWrite) {
-#ifndef NO_CACHE
-	int32 i;
-#endif
-
-#ifdef MESSAGE_LOG
-	FCEU_printf("> WRITE %04X:%02X\n", A, V);
-#endif
-
-	PRGWBCmd[1] = A & 0xFF;
-	PRGWBCmd[2] = A >> 8;
-	PRGWBCmd[3] = V & 0xFF;
-	SEND(PRGWBCmd);
-#ifdef NO_CACHE
-	CheckStatus();
-	Sync();
-#else
-	UpdateCmd((A << 8) | V);
-	/* ���� ������� � ���� */
-	if (cmd.found == -1) {
-		/* �� �������, ���������, ���������� �� ��������� ������
-		 * ���� �� ���������� �� ��� ����� ��� �������
-		 */
-		cmd_cache[cmd.hashf].index = cmd.found = cmds.count++;
-		cmd_cache[cmd.hashf].retest = 0;
-		cmd_cache[cmd.hashf].verify = 0;
-		for (i = 0; i < cmd.size; i++)
-			cmds.seqs[cmd.found][i] = cmd.seq[i];
-		cmd_cache[cmd.hashf].size = cmd.size;
-		if (CheckStatus()) {
-			cmds.states[cmd.found] = state_new;
-			LogCmd();
-			cmd.size = 0;
-			cmd.hash = 0;
-			Sync();
-		} else {
-			/* ���� ��������� ������ ������� ��� ������������� */
-			cmd_cache[cmd.hashf].index = -2;
-		}
-	} else if (cmd.found == -2) {
-		/* ��������� ����������, ���� ����� �������� �� ��������� ����� */
-		if (cmd_cache[cmd.hashf].retest < CMD_MAX_RETEST) {
-			/* �� �������� ��������� ������ */
-			if (CheckStatus()) {
-				/* ����������, ������� ����� ������� */
-				cmd_cache[cmd.hashf].index = cmd.found = cmds.count++;
-				cmd_cache[cmd.hashf].retest = 0;
-				cmd_cache[cmd.hashf].verify = 0;
-				for (i = 0; i < cmd.size; i++)
-					cmds.seqs[cmd.found][i] = cmd.seq[i];
-				cmd_cache[cmd.hashf].size = cmd.size;
-				cmds.states[cmd.found] = state_new;
-				LogCmd();
-				cmd.size = 0;
-				cmd.hash = 0;
-				Sync();
-			} else {
-				/* �� ����������, ������� �������� ������� �������� */
-				cmd_cache[cmd.hashf].retest++;
-			}
-		}
-	} else {
-		/* �������, ��������� ����� ������� �� ����� */
-#if 0
-		if(cmd_cache[cmd.hashf].verify < CMD_MAX_VERIFY) {
-			if(CheckStatus()) {
-				int32 changed = 0;
-				if(cmds.states[cmd.found].mirror != state_new.mirror)
-					changed = 1;
-				for(i=0; i<8; i++)
-					if(cmds.states[cmd.found].chrsum[i] != state_new.chrsum[i])
-						changed = 1;
-				for(i=0; i<4; i++)
-					if(cmds.states[cmd.found].prgsum[i] != state_new.prgsum[i])
-						changed = 1;
-				if(changed) {
-					cmd_cache[cmd.hashf].index = -1;
-					cmd_cache[cmd.hashf].retest = 0;
-					cmd_cache[cmd.hashf].verify = 0;
-					Sync();
-				}
-			} else
-				cmd_cache[cmd.hashf].verify++;
-		} else
-#endif
-		{
-			/* ��������� ��� ��������� �������� ������� */
-			ApplyStatus();
-			cmd.size = 0;
-			cmd.hash = 0;
-		}
-	}
-#endif
-}
-
-static DECLFR(MCopyFamiRead) {
-	uint8 result;
-	PRGRBCmd[1] = A & 0xFF;
-	PRGRBCmd[2] = A >> 8;
-	SENDGET(PRGRBCmd, result, 1);
-#ifdef MESSAGE_LOG
-	FCEU_printf("> READ %04X:%02X\n", A, result);
-#endif
-	return result;
-}
-
-static void MCopyFamiReset(void) {
-	state_cur = state_def;
-	Sync();
-}
-
-static void MCopyFamiPower(void) {
-/*  uint32 resp, presp; */
-
-	FCEU_printf("NOW POWERING... ");
-
-	Sync();
-
-	SetWriteHandler(0x4018, 0x7fff, MCopyFamiWrite);
-	SetReadHandler(0x4018, 0x7fff, MCopyFamiRead);
-#ifndef NO_RAM
-	SetWriteHandler(0x6000, 0x7fff, CartBW);
-	SetReadHandler(0x6000, 0x7fff, CartBR);
-#endif
-
-#if 0
-	FCEU_printf("READING MEMORY MAP...\n");
-	CPUTestCmd[1] = 0x50;
-	CPUTestCmd[2] = 0x30;
-	SEND(CPUTestCmd);
-	resp = 0;
-	presp = 0xffffffff;
-	while (presp != 0x00ff0000) {
-		GET(resp, 3);
-		if(presp != 0xffffffff) {
-			switch(presp & 0x00FF0000) {
-				case 0x00000000: /* BUS */
-					FCEU_printf("  %04X-%04X OPEN BUS\n",presp & 0x7fff, (resp - 1) & 0x7fff);
-					break;
-				case 0x00010000: /* RAM */
-					FCEU_printf("  %04X-%04X RAM\n",presp & 0x7fff, (resp - 1) & 0x7fff);
-					SetWriteHandler(presp & 0x7fff, (resp - 1) & 0x7fff, CartBW);
-					SetReadHandler(presp & 0x7fff, (resp - 1) & 0x7fff, CartBR);
-					break;
-			}
-		}
-		presp = resp;
-	}
-#endif
-	SetWriteHandler(0x8000, 0xffff, MCopyFamiWrite);
-	SetReadHandler(0x8000, 0xffff, CartBR);
-
-	FCEU_printf("DONE!\nNOW COLLECTING DATA...\n");
-}
-
-static void MCopyFamiClose(void) {
-	if (chr_data.buf)
-		FCEU_gfree(chr_data.buf);
-	chr_data.buf = NULL;
-	if (prg_data.buf)
-		FCEU_gfree(prg_data.buf);
-	prg_data.buf = NULL;
-	if (WRAM)
-		FCEU_gfree(WRAM);
-	WRAM = NULL;
-
-	SerialClose();
-}
-
-static void StateRestore(int version) {
-	Sync();
-}
-
-void MapperCopyFami_Init(CartInfo *info) {
-	uint32 resp = 0, i, size;
-
-	memset(chr_bank, -1, sizeof(chr_bank));
-	memset(prg_bank, -1, sizeof(chr_bank));
-	memset(cmd_cache, -1, sizeof(cmd_cache));
-	memset(&cmds, 0, sizeof(cmds));
-	memset(&cmd, 0, sizeof(cmd));
-
-	info->Reset = MCopyFamiReset;
-	info->Power = MCopyFamiPower;
-	info->Close = MCopyFamiClose;
-	GameStateRestore = StateRestore;
-
-	size = 1024 * CHR_CACHE_SIZE;	/* ������ �������� 1�� */
-	chr_data.buf = (uint8*)FCEU_gmalloc(size);
-	SetupCartCHRMapping(1, chr_data.buf, size, 1);	/* ��������� ��� ���, ����� ���� ����� ������� ������ */
-	AddExState(chr_data.buf, size, 0, "CCHR");
-
-	size = 8192;	/* ������ �������� 8�� */
-	WRAM = (uint8*)FCEU_gmalloc(size);
-	SetupCartPRGMapping(1, WRAM, size, 1);
-	AddExState(WRAM, size, 0, "CPRM");
-
-	size = 8192 * PRG_CACHE_SIZE;	/* ������ �������� 8�� */
-	prg_data.buf = (uint8*)FCEU_gmalloc(size);
-	SetupCartPRGMapping(2, prg_data.buf, size, 0);
-	AddExState(prg_data.buf, size, 0, "CPPR");
-
-
-	FCEU_printf("WAITING FOR SERIAL PORT... ");
-	while (!SerialOpen(19, 921600)) {
-		Sleep(500);
-	}
-	FCEU_printf("READY!\n");
-
-	FCEU_printf("WAITING FOR DEVICE... ");
-
-	while (resp != *(uint32*)&InitVector[0]) {
-		SEND(ResetCmd);
-		SENDGET(InitVector, resp, 4);
-		Sleep(500);
-	}
-
-	FCEU_printf("READY!\n");
-	FCEU_printf("READING STATUS...\n");
-	GetStatus(&state_cur);
-	FCEU_printf("MIRRORING IS %s (%02X)\n", mirror_names[mirror_modes[state_cur.mirror]], state_cur.mirror);
-	FCEU_printf("READING CHR...\n INITIAL STATE:");
-
-	for (i = 0; i < 8; i++) {
-		if (CHRCUR(i) == -1)
-			CHRCUR(i) = FetchNewCHRBank(i);
-		FCEU_printf(" CHR%d=%02X", i, CHRCUR(i));
-	}
-	FCEU_printf("\n");
-
-	FCEU_printf("READING PRG...\n INITIAL STATE:");
-	for (i = 0; i < 4; i++) {
-		if (PRGCUR(i) == -1)
-			PRGCUR(i) = FetchNewPRGBank(i);
-		FCEU_printf(" PRG%d=%02X", i, PRGCUR(i));
-	}
-	FCEU_printf("\nDONE!\n");
-
-	state_def = state_cur;
-
-	AddExState(&StateRegs, ~0, 0, 0);
-}
-
-#endif
diff --git a/src/driver.h b/src/driver.h
index 9529bc4..af5b130 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -110,11 +110,6 @@ typedef void (*frontend_post_load_init_cb_t)(void);
 FCEUGI *FCEUI_LoadGame(const char *name, const uint8_t *databuf, size_t databufsize,
       frontend_post_load_init_cb_t frontend_post_load_init_cb);
 
-#ifdef COPYFAMI
-/* Fake UNIF board to start new CFHI instance */
-FCEUGI *FCEUI_CopyFamiStart();
-#endif
-
 /* allocates memory.  0 on failure, 1 on success. */
 int FCEUI_Initialize(void);
 
diff --git a/src/fceu.c b/src/fceu.c
index 77fdadd..9d3ec18 100644
--- a/src/fceu.c
+++ b/src/fceu.c
@@ -166,11 +166,7 @@ void FASTAPASS(3) SetWriteHandler(int32 start, int32 end, writefunc func)
 			BWrite[x] = func;
 }
 
-#ifdef COPYFAMI
-uint8 RAM[0x4000];
-#else
 uint8 RAM[0x800];
-#endif
 
 uint8 PAL = 0;
 
@@ -184,7 +180,6 @@ static DECLFR(ARAML)
 	return RAM[A];
 }
 
-#ifndef COPYFAMI
 static DECLFW(BRAMH)
 {
 	RAM[A & 0x7FF] = V;
@@ -194,7 +189,6 @@ static DECLFR(ARAMH)
 {
 	return RAM[A & 0x7FF];
 }
-#endif
 
 void FCEUI_CloseGame(void)
 {
@@ -312,49 +306,6 @@ endlseq:
    return(GameInfo);
 }
 
-int CopyFamiLoad(void);
-
-FCEUGI *FCEUI_CopyFamiStart(void)
-{
-	ResetGameLoaded();
-
-	GameInfo = (FCEUGI*)malloc(sizeof(FCEUGI));
-	memset(GameInfo, 0, sizeof(FCEUGI));
-
-	GameInfo->soundchan = 0;
-	GameInfo->soundrate = 0;
-	GameInfo->name = (uint8_t*)"copyfami";
-	GameInfo->type = GIT_CART;
-	GameInfo->vidsys = GIV_USER;
-	GameInfo->input[0] = GameInfo->input[1] = -1;
-	GameInfo->inputfc = -1;
-	GameInfo->cspecial = 0;
-
-	FCEU_printf("Starting CopyFamicom...\n\n");
-
-	if (!CopyFamiLoad()) {
-		FCEU_PrintError("An error occurred while starting CopyFamicom.");
-		return 0;
-	}
-
-	FCEU_ResetVidSys();
-	if (GameInfo->type != GIT_NSF)
-		if (FSettings.GameGenie)
-			FCEU_OpenGenie();
-
-	PowerNES();
-
-	if (GameInfo->type != GIT_NSF) {
-		FCEU_LoadGamePalette();
-		FCEU_LoadGameCheats();
-	}
-
-	FCEU_ResetPalette();
-	FCEU_ResetMessages();	/* Save state, status messages, etc. */
-
-	return(GameInfo);
-}
-
 int FCEUI_Initialize(void) {
 	if (!FCEU_InitVirtualVideo())
 		return 0;
@@ -447,23 +398,17 @@ void PowerNES(void)
 
 	FCEU_GeniePower();
 
-#ifndef COPYFAMI
 	FCEU_MemoryRand(RAM, 0x800);
-#endif
 
 	SetReadHandler(0x0000, 0xFFFF, ANull);
 	SetWriteHandler(0x0000, 0xFFFF, BNull);
 
-#ifdef COPYFAMI
-	SetReadHandler(0, 0x3FFF, ARAML);
-	SetWriteHandler(0, 0x3FFF, BRAML);
-#else
 	SetReadHandler(0, 0x7FF, ARAML);
 	SetWriteHandler(0, 0x7FF, BRAML);
 
 	SetReadHandler(0x800, 0x1FFF, ARAMH);	/* Part of a little */
 	SetWriteHandler(0x800, 0x1FFF, BRAMH);	/* hack for a small speed boost. */
-#endif
+
 	InitializeInput();
 	FCEUSND_Power();
 	FCEUPPU_Power();
diff --git a/src/fceu.h b/src/fceu.h
index ad21bce..7f67715 100644
--- a/src/fceu.h
+++ b/src/fceu.h
@@ -55,11 +55,7 @@ extern uint8 MMC50x5130;
 extern uint8 MMC5HackSPScroll;
 extern uint8 MMC5HackSPPage;
 
-#ifdef COPYFAMI
-extern uint8 RAM[0x4000];
-#else
 extern uint8 RAM[0x800];
-#endif
 
 extern readfunc ARead[0x10000];
 extern writefunc BWrite[0x10000];
diff --git a/src/ppu.c b/src/ppu.c
index b994b73..f2536d8 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -1096,26 +1096,6 @@ void FCEUPPU_Power(void) {
 	memset(UPALRAM, 0x00, 0x03);
 	memset(SPRAM, 0x00, 0x100);
 	FCEUPPU_Reset();
-#ifdef COPYFAMI
-	for (x = 0x2000; x < 0x2010; x += 8) {
-		ARead[x] = A200x;
-		BWrite[x] = B2000;
-		ARead[x + 1] = A200x;
-		BWrite[x + 1] = B2001;
-		ARead[x + 2] = A2002;
-		BWrite[x + 2] = B2002;
-		ARead[x + 3] = A200x;
-		BWrite[x + 3] = B2003;
-		ARead[x + 4] = A200x;			/* A2004; */
-		BWrite[x + 4] = B2004;
-		ARead[x + 5] = A200x;
-		BWrite[x + 5] = B2005;
-		ARead[x + 6] = A200x;
-		BWrite[x + 6] = B2006;
-		ARead[x + 7] = A2007;
-		BWrite[x + 7] = B2007;
-	}
-#else
 	for (x = 0x2000; x < 0x4000; x += 8) {
 		ARead[x] = A200x;
 		BWrite[x] = B2000;
@@ -1134,7 +1114,7 @@ void FCEUPPU_Power(void) {
 		ARead[x + 7] = A2007;
 		BWrite[x + 7] = B2007;
 	}
-#endif
+
 	BWrite[0x4014] = B4014;
 }
 
diff --git a/src/state.c b/src/state.c
index 5f06bfb..881cd44 100644
--- a/src/state.c
+++ b/src/state.c
@@ -61,11 +61,7 @@ SFORMAT SFCPU[] = {
    { &X.S, 1, "S\0\0" },
    { &X.P, 1, "P\0\0" },
    { &X.DB, 1, "DB"},
-#ifdef COPYFAMI
-   { RAM, 0x4000, "RAM" },
-#else
    { RAM, 0x800, "RAM" },
-#endif
    { 0 }
 };
 
diff --git a/src/unif.c b/src/unif.c
index 7ee2e29..75f39e1 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -622,11 +622,6 @@ static BMAPPING bmap[] = {
 	{ "BS-4040R",                   422, Mapper422_Init,        0 },
 	{ "22026",                      271, Mapper271_Init,        0 },
 
-#ifdef COPYFAMI
-	{ "COPYFAMI_MMC3",          NO_INES, MapperCopyFamiMMC3_Init, 0 },
-	{ "COPYFAMI",               NO_INES, MapperCopyFami_Init,   0 },
-#endif
-
 	{ NULL, NO_INES, NULL, 0 }
 };
 
@@ -849,17 +844,3 @@ int UNIFLoad(const char *name, FCEUFILE *fp) {
 
 	return 1;
 }
-
-int CopyFamiLoad() {
-	ResetCartMapping();
-	ResetExState(0, 0);
-
-	sboardname = (uint8_t*)"COPYFAMI";
-	if (!InitializeBoard()) {
-		Cleanup();
-		return 0;
-	}
-
-	GameInterface = UNIFGI;
-	return 1;
-}
diff --git a/src/unif.h b/src/unif.h
index 351765c..dad6fdb 100644
--- a/src/unif.h
+++ b/src/unif.h
@@ -187,11 +187,6 @@ void WAIXINGFS005_Init(CartInfo *info);
 void Mapper422_Init(CartInfo *info);
 void Mapper444_Init(CartInfo *info);
 
-#ifdef COPYFAMI
-void MapperCopyFamiMMC3_Init(CartInfo *info);
-void MapperCopyFami_Init(CartInfo *info);
-#endif
-
 extern uint8 *UNIFchrrama;	/* Meh.  So I can stop CHR RAM
 							 * bank switcherooing with certain boards...
 							 */

From 9e46701b08d3936ea92f5cb49a3de4659e726b56 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Wed, 8 Jun 2022 14:40:45 +0800
Subject: [PATCH 247/295] palette.c: Remove unused NTSC palette generator

---
 src/driver.h  |   7 ---
 src/palette.c | 153 +-------------------------------------------------
 src/palette.h |   1 -
 3 files changed, 1 insertion(+), 160 deletions(-)

diff --git a/src/driver.h b/src/driver.h
index af5b130..c9decdc 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -47,13 +47,6 @@ int FCEUI_EndWaveRecord(void);
 void FCEUI_ResetNES(void);
 void FCEUI_PowerNES(void);
 
-void FCEUI_NTSCSELHUE(void);
-void FCEUI_NTSCSELTINT(void);
-void FCEUI_NTSCDEC(void);
-void FCEUI_NTSCINC(void);
-void FCEUI_GetNTSCTH(int *tint, int *hue);
-void FCEUI_SetNTSCTH(int n, int tint, int hue);
-
 void FCEUI_SetInput(int port, int type, void *ptr, int attrib);
 void FCEUI_SetInputFC(int type, void *ptr, int attrib);
 void FCEUI_DisableFourScore(int s);
diff --git a/src/palette.c b/src/palette.c
index 5b70179..96fde8b 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -33,20 +33,10 @@
 #include "palette.h"
 #include "palettes/palettes.h"
 
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-static int ntsccol = 0;
-static int ntsctint = 46 + 10;
-static int ntschue = 72;
-
 /* These are dynamically filled/generated palettes: */
 pal palettei[64];		/* Custom palette for an individual game. */
 pal palettec[64];		/* Custom "global" palette. */
-pal paletten[64];		/* Mathematically generated palette. */
 
-static void CalculatePalette(void);
 static void ChoosePalette(void);
 static void WritePalette(void);
 uint8 pale = 0;
@@ -77,14 +67,6 @@ void FCEUI_SetPaletteArray(uint8 *pal) {
 	FCEU_ResetPalette();
 }
 
-
-void FCEUI_SetNTSCTH(int n, int tint, int hue) {
-	ntsctint = tint;
-	ntschue = hue;
-	ntsccol = n;
-	FCEU_ResetPalette();
-}
-
 static uint8 lastd = 0;
 void SetNESDeemph(uint8 d, int force) {
 	static uint16 rtmul[7] = { 32768 * 1.239, 32768 * .794, 32768 * 1.019, 32768 * .905, 32768 * 1.023, 32768 * .741, 32768 * .75 };
@@ -142,50 +124,6 @@ void SetNESDeemph(uint8 d, int force) {
 	lastd = d;
 }
 
-/* Converted from Kevin Horton's qbasic palette generator. */
-static void CalculatePalette(void) {
-	int x, z;
-	int r, g, b;
-	double s, luma, theta;
-	static uint8 cols[16] = { 0, 24, 21, 18, 15, 12, 9, 6, 3, 0, 33, 30, 27, 0, 0, 0 };
-	static uint8 br1[4] = { 6, 9, 12, 12 };
-	static double br2[4] = { .29, .45, .73, .9 };
-	static double br3[4] = { 0, .24, .47, .77 };
-
-	for (x = 0; x <= 3; x++)
-		for (z = 0; z < 16; z++) {
-			s = (double)ntsctint / 128;
-			luma = br2[x];
-			if (z == 0) {
-				s = 0; luma = ((double)br1[x]) / 12;
-			}
-
-			if (z >= 13) {
-				s = luma = 0;
-				if (z == 13)
-					luma = br3[x];
-			}
-
-			theta = (double)M_PI * (double)(((double)cols[z] * 10 + (((double)ntschue / 2) + 300)) / (double)180);
-			r = (int)((luma + s * sin(theta)) * 256);
-			g = (int)((luma - (double)27 / 53 * s * sin(theta) + (double)10 / 53 * s * cos(theta)) * 256);
-			b = (int)((luma - s * cos(theta)) * 256);
-
-
-			if (r > 255) r = 255;
-			if (g > 255) g = 255;
-			if (b > 255) b = 255;
-			if (r < 0) r = 0;
-			if (g < 0) g = 0;
-			if (b < 0) b = 0;
-
-			paletten[(x << 4) + z].r = r;
-			paletten[(x << 4) + z].g = g;
-			paletten[(x << 4) + z].b = b;
-		}
-	WritePalette();
-}
-
 int ipalette = 0;
 
 void FCEU_LoadGamePalette(void) {
@@ -228,10 +166,7 @@ static void ChoosePalette(void) {
 		palo = 0;
 	else if (ipalette)
 		palo = palettei;
-	else if (ntsccol && !PAL && GameInfo->type != GIT_VSUNI) {
-		palo = paletten;
-		CalculatePalette();
-	} else
+	else
 		palo = palpoint[pale];
 }
 
@@ -247,89 +182,3 @@ void WritePalette(void) {
 		SetNESDeemph(lastd, 1);
 	}
 }
-
-void FCEUI_GetNTSCTH(int *tint, int *hue) {
-	*tint = ntsctint;
-	*hue = ntschue;
-}
-
-static int controlselect = 0;
-static int controllength = 0;
-
-void FCEUI_NTSCDEC(void) {
-	if (ntsccol && GameInfo->type != GIT_VSUNI && !PAL && GameInfo->type != GIT_NSF) {
-		int which;
-		if (controlselect) {
-			if (controllength) {
-				which = controlselect == 1 ? ntschue : ntsctint;
-				which--;
-				if (which < 0) which = 0;
-				if (controlselect == 1)
-					ntschue = which;
-				else ntsctint = which;
-				CalculatePalette();
-			}
-			controllength = 360;
-		}
-	}
-}
-
-void FCEUI_NTSCINC(void) {
-	if (ntsccol && GameInfo->type != GIT_VSUNI && !PAL && GameInfo->type != GIT_NSF)
-		if (controlselect) {
-			if (controllength) {
-				switch (controlselect) {
-				case 1: ntschue++;
-					if (ntschue > 128) ntschue = 128;
-					CalculatePalette();
-					break;
-				case 2: ntsctint++;
-					if (ntsctint > 128) ntsctint = 128;
-					CalculatePalette();
-					break;
-				}
-			}
-			controllength = 360;
-		}
-}
-
-void FCEUI_NTSCSELHUE(void) {
-	if (ntsccol && GameInfo->type != GIT_VSUNI && !PAL && GameInfo->type != GIT_NSF) {
-		controlselect = 1; controllength = 360;
-	}
-}
-
-void FCEUI_NTSCSELTINT(void) {
-	if (ntsccol && GameInfo->type != GIT_VSUNI && !PAL && GameInfo->type != GIT_NSF) {
-		controlselect = 2; controllength = 360;
-	}
-}
-
-void FCEU_DrawNTSCControlBars(uint8 *XBuf) {
-	uint8 *XBaf;
-	int which = 0;
-	int x, x2;
-
-	if (!controllength) return;
-	controllength--;
-	if (!XBuf) return;
-
-	if (controlselect == 1) {
-		DrawTextTrans(XBuf + 128 - 12 + 180 * 256, 256, (uint8*)"Hue", 0x85);
-		which = ntschue << 1;
-	} else if (controlselect == 2) {
-		DrawTextTrans(XBuf + 128 - 16 + 180 * 256, 256, (uint8*)"Tint", 0x85);
-		which = ntsctint << 1;
-	}
-
-	XBaf = XBuf + 200 * 256;
-	for (x = 0; x < which; x += 2) {
-		for (x2 = 6; x2 >= -6; x2--) {
-			XBaf[x - 256 * x2] = 0x85;
-		}
-	}
-	for (; x < 256; x += 2) {
-		for (x2 = 2; x2 >= -2; x2--)
-			XBaf[x - 256 * x2] = 0x85;
-	}
-}
diff --git a/src/palette.h b/src/palette.h
index 3ca03b5..f5c71be 100644
--- a/src/palette.h
+++ b/src/palette.h
@@ -12,6 +12,5 @@ void FCEU_ResetPalette(void);
 void FCEU_ResetPalette(void);
 void FCEU_ResetMessages();
 void FCEU_LoadGamePalette(void);
-void FCEU_DrawNTSCControlBars(uint8 *XBuf);
 
 #endif

From cc4696ee621ea8cd011e5b2fd6271aafe1971104 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Thu, 9 Jun 2022 14:47:26 +0800
Subject: [PATCH 248/295] m235: Update support for 150-in-1 and 260-in-1 with
 Contra carts

---
 src/boards/235.c | 42 +++++++++++++-----------------------------
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/src/boards/235.c b/src/boards/235.c
index 2532917..b0a151c 100644
--- a/src/boards/235.c
+++ b/src/boards/235.c
@@ -25,22 +25,24 @@ static uint8 *CHRRAM;
 static uint32 CHRRAMSIZE;
 
 static uint16 cmdreg;
-static uint8 unrom, reg, type, openbus;
+static uint8 unrom, reg, openbus;
+
+static uint32 PRGROMSize;
 
 static SFORMAT StateRegs[] =
 {
 	{ &cmdreg,  2 | FCEUSTATE_RLSB, "CREG" },
 	{ &unrom,   1, "UNRM" },
 	{ &reg,     1, "UNRG" },
-	{ &type,    1, "TYPE" },
 	{ &openbus, 1, "OPNB" },
 	{ 0 }
 };
 
 static void Sync(void) {
-	if (type && unrom) {
-		setprg16(0x8000, 0x80 | (reg & 7));
-		setprg16(0xC000, 0x80 | 7);
+	if (unrom) {
+		uint8 PRGPageSize = PRGROMSize / 16384;
+		setprg16(0x8000, (PRGPageSize & 0xC0) | (reg & 7));
+		setprg16(0xC000, (PRGPageSize & 0xC0) | 7);
 		setchr8(0);
 		setmirror(MI_V);
 	} else {
@@ -49,7 +51,7 @@ static void Sync(void) {
 			setmirror(MI_0);
 		else
 			setmirror(((cmdreg >> 13) & 1) ^ 1);
-		if (bank >= PRGsize[0] / 32768)
+		if (bank >= PRGROMSize / 32768)
 			openbus = 1;
 		else if (cmdreg & 0x800) {
 			setprg16(0x8000, (bank << 1) | ((cmdreg >> 12) & 1));
@@ -74,15 +76,11 @@ static DECLFW(M235Write) {
 	Sync();
 }
 
-static void M235Close(void) {
-	if (CHRRAM)
-		FCEU_free(CHRRAM);
-	CHRRAM = NULL;
-}
-
 static void M235Reset(void) {
 	cmdreg = 0;
-	unrom = (unrom + type) & 1;
+	reg = 0;
+	if (PRGROMSize & 0x20000)
+		unrom = (unrom + 1) & 1;
 	Sync();
 }
 
@@ -90,6 +88,7 @@ static void M235Power(void) {
 	SetWriteHandler(0x8000, 0xFFFF, M235Write);
 	SetReadHandler(0x8000, 0xFFFF, M235Read);
 	cmdreg = 0;
+	reg = 0;
 	Sync();
 }
 
@@ -100,22 +99,7 @@ static void M235Restore(int version) {
 void Mapper235_Init(CartInfo *info) {
 	info->Reset = M235Reset;
 	info->Power = M235Power;
-	info->Close = M235Close;
 	GameStateRestore = M235Restore;
 	AddExState(&StateRegs, ~0, 0, 0);
-
-	/* some nes 2.0 header do can have no chr-ram.
-	 * one such cart is 210-in-1 and Contra 4-in-1 (212-in-1,212 Hong Kong,Reset Based)(Unl).nes (0x745A6791)
-	 */
-	if (CHRsize[0] == 0) {
-		CHRRAMSIZE = 8192;
-		CHRRAM = (uint8*)FCEU_gmalloc(CHRRAMSIZE);
-		SetupCartCHRMapping(0, CHRRAM, CHRRAMSIZE, 1);
-		AddExState(CHRRAM, CHRRAMSIZE, 0, "CRAM");
-	}
-
-	type = 0;
-	/* carts with unrom game, reset-based */
-	if ((info->CRC32) == 0x745A6791) /* 210-in-1 and Contra 4-in-1 (212-in-1,212 Hong Kong,Reset Based)(Unl).nes */
-		type = 1;
+	PRGROMSize = info->PRGRomSize;
 }

From 6a31522981f428a92ce364c3654710e6e4ee4d60 Mon Sep 17 00:00:00 2001
From: libretroadmin <reallibretroretroarch@gmail.com>
Date: Mon, 20 Jun 2022 06:07:40 +0200
Subject: [PATCH 249/295] Get rid of mostly dead code

---
 src/boards/n106.c        |  5 +--
 src/cart.c               |  2 --
 src/fds.c                |  6 ----
 src/filter.c             | 24 +-------------
 src/fir/toh.c            | 24 --------------
 src/input/bworld.c       |  1 -
 src/input/ftrainer.c     |  1 -
 src/input/mahjong.c      | 11 ++-----
 src/input/oekakids.c     |  2 --
 src/input/quiz.c         | 10 ------
 src/ntsc/nes_ntsc_impl.h |  9 ------
 src/ops.h                |  6 ----
 src/palettes/conv.c      | 70 ----------------------------------------
 src/sound.c              |  4 ---
 14 files changed, 5 insertions(+), 170 deletions(-)
 delete mode 100644 src/fir/toh.c
 delete mode 100644 src/palettes/conv.c

diff --git a/src/boards/n106.c b/src/boards/n106.c
index a0f0639..1f26048 100644
--- a/src/boards/n106.c
+++ b/src/boards/n106.c
@@ -130,8 +130,6 @@ static void FixNTAR(void) {
 static void FASTAPASS(2) DoCHRRAMROM(int x, uint8 V) {
 	CHR[x] = V;
 	if (!is210 && !((gorfus >> ((x >> 2) + 6)) & 1) && (V >= 0xE0)) {
-/*		printf("BLAHAHA: %d, %02x\n",x,V); */
-/*		setchr1r(0x10,x<<10,V&7); */
 	} else
 		setchr1(x << 10, V);
 }
@@ -338,9 +336,8 @@ static void DoNamcoSound(int32 *Wave, int Count) {
 			envelope = EnvCache[P];
 			lengo = LengthCache[P];
 
-			if (!freq) {	/*printf("Ack");*/
+			if (!freq)
 				continue;
-			}
 
 			{
 				int c = ((IRAM[0x7F] >> 4) & 7) + 1;
diff --git a/src/cart.c b/src/cart.c
index 5bf0704..9d4a5d6 100644
--- a/src/cart.c
+++ b/src/cart.c
@@ -139,7 +139,6 @@ DECLFR(CartBR) {
 }
 
 DECLFW(CartBW) {
-	/* printf("Ok: %04x:%02x, %d\n",A,V,PRGIsRAM[A>>11]); */
 	if (PRGIsRAM[A >> 11] && Page[A >> 11])
 		Page[A >> 11][A] = V;
 }
@@ -493,7 +492,6 @@ void FixGenieMap(void) {
 
 	VPageR = VPage;
 	FlushGenieRW();
-	/* printf("Rightyo\n"); */
 	for (x = 0; x < 3; x++)
 		if ((modcon >> (4 + x)) & 1) {
 			readfunc tmp[3] = { GenieFix1, GenieFix2, GenieFix3 };
diff --git a/src/fds.c b/src/fds.c
index 14f8eee..ea658cd 100644
--- a/src/fds.c
+++ b/src/fds.c
@@ -256,9 +256,6 @@ static DECLFR(FDSRead4031) {
 					break;
 				case 14:
 					mapperFDS_filesize |= ret << 8;
-					/* char fdsfile[10]; */
-					/* strncpy(fdsfile, (char*)&diskdata[InDisk][mapperFDS_blockstart + 3], 8); */
-					/* printf("Read file: %s (size: %d)\n"), fdsfile, mapperFDS_filesize); */
 					break;
 				}
 				mapperFDS_diskaddr++;
@@ -338,9 +335,6 @@ static DECLFW(FDSWrite) {
 							case 13: mapperFDS_filesize = V; break;
 							case 14:
 								mapperFDS_filesize |= V << 8;
-								/* char fdsfile[10]; */
-								/* strncpy(fdsfile, (char*)&diskdata[InDisk][mapperFDS_blockstart + 3], 8); */
-								/* printf("Write file: %s (size: %d)\n"), fdsfile, mapperFDS_filesize); */
 								break;
 						}
 						mapperFDS_diskaddr++;
diff --git a/src/filter.c b/src/filter.c
index a5fc0f5..fcc752e 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -21,7 +21,6 @@ void SexyFilter2(int32 *in, int32 count) {
 	p = ((double)2 - cos(x)) - sqrt(pow((double)2 - cos(x), 2) - 1);
 
 	c = p * 0x100000;
-	/* printf("%f\n",(double)c/0x100000); */
  #endif
 	static int64 acc = 0;
 
@@ -58,11 +57,9 @@ void SexyFilter(int32 *in, int32 *out, int32 count) {
 		int64 ino = (int64) * in * vmul;
 		sexyfilter_acc1 += ((ino - sexyfilter_acc1) * mul1) >> 16;
 		sexyfilter_acc2 += ((ino - sexyfilter_acc1 - sexyfilter_acc2) * mul2) >> 16;
-		/* printf("%d ",*in); */
 		*in = 0;
 		{
 			int32 t = (sexyfilter_acc1 - ino + sexyfilter_acc2) >> 16;
-			/* if(t>32767 || t<-32768) printf("Flow: %d\n",t); */
 			if (t > 32767) t = 32767;
 			if (t < -32768) t = -32768;
 			*out = t;
@@ -87,17 +84,9 @@ void SexyFilter(int32 *in, int32 *out, int32 count) {
 
 int32 NeoFilterSound(int32 *in, int32 *out, uint32 inlen, int32 *leftover) {
 	uint32 x;
-	uint32 max;
 	int32 *outsave = out;
 	int32 count = 0;
-
-#if 0
-  for(x=0;x<inlen;x++)
-  {
-   if(in[x]>mva) { mva=in[x]; printf("%ld\n",in[x]);}
-  }
-#endif
-	max = (inlen - 1) << 16;
+	uint32 max = (inlen - 1) << 16;
 
 	if (FSettings.soundq == 2) {
 		for (x = mrindex; x < max; x += mrratio) {
@@ -181,15 +170,4 @@ void MakeFilters(int32 rate) {
 	else
 		for (x = 0; x < (NCOEFFS >> 1); x++)
 			coeffs[x] = coeffs[NCOEFFS - 1 - x] = tmp[x];
-
- #ifdef MOO
-	/* Some tests involving precision and error. */
-	{
-		static int64 acc = 0;
-		int x;
-		for (x = 0; x < SQ2NCOEFFS; x++)
-			acc += (int64)32767 * sq2coeffs[x];
-		printf("Foo: %lld\n", acc);
-	}
- #endif
 }
diff --git a/src/fir/toh.c b/src/fir/toh.c
deleted file mode 100644
index 5ae4f0b..0000000
--- a/src/fir/toh.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <stdio.h>
-
-#define MAX        512
-
-void main(void)
-{
- char buf[256];
- int count=0;
-
- while(fgets(buf,256,stdin)>0)
- {
-  double p;
-
-  if(sscanf(buf,"%lf",&p)==1)
-  {
-   p*=65536*16;
-   printf("%ld,\n",(long)p);
-   count++;
-   if(count==MAX) break;
-  }
-
- }
-
-}
diff --git a/src/input/bworld.c b/src/input/bworld.c
index cf22a8c..92a15c0 100644
--- a/src/input/bworld.c
+++ b/src/input/bworld.c
@@ -44,7 +44,6 @@ static uint8 FP_FASTAPASS(2) Read(int w, uint8 ret) {
 }
 
 static void FP_FASTAPASS(1) Write(uint8 V) {
-	/* printf("%02x\n",V); */
 }
 
 static void FP_FASTAPASS(2) Update(void *data, int arg) {
diff --git a/src/input/ftrainer.c b/src/input/ftrainer.c
index 46bafe6..a018e9c 100644
--- a/src/input/ftrainer.c
+++ b/src/input/ftrainer.c
@@ -35,7 +35,6 @@ static uint8 FP_FASTAPASS(2) FT_Read(int w, uint8 ret) {
 static void FP_FASTAPASS(1) FT_Write(uint8 V) {
 	FTValR = 0;
 
-	/* printf("%08x\n",FTVal); */
 	if (!(V & 0x1))
 		FTValR = (FTVal >> 8);
 	else if (!(V & 0x2))
diff --git a/src/input/mahjong.c b/src/input/mahjong.c
index 1f9472d..497563a 100644
--- a/src/input/mahjong.c
+++ b/src/input/mahjong.c
@@ -46,21 +46,16 @@ static void FP_FASTAPASS(1) MJ_Write(uint8 v) {
 	v >>= 1;
 	v &= 3;
 
-	if (v == 3) {
+	if (v == 3)
 		MRet = (MReal >> 14) & 0x7F;
-		/* MRet=((MRet&0x1F) |((MRet&0x40)>>1)|((MRet&0x20)<<1)) <<1; */ /* (MReal>>13)&0x7F; */
-	} else if (v == 2) {
+	else if (v == 2)
 		MRet = MReal & 0xFF;
-	} else if (v == 1) {
+	else if (v == 1)
 		MRet = (MReal >> 8) & 0x3F;
-	}
-/* HSValR=HSVal<<1; */
 }
 
 static void FP_FASTAPASS(2) MJ_Update(void *data, int arg) {
 	MReal = *(uint32*)data;
-	/* printf("%08x\n",MReal>>13); */
-	/* HSVal=*(uint8*)data; */
 }
 
 static INPUTCFC Mahjong = { MJ_Read, MJ_Write, 0, MJ_Update, 0, 0 };
diff --git a/src/input/oekakids.c b/src/input/oekakids.c
index 19ed512..a6a5c57 100644
--- a/src/input/oekakids.c
+++ b/src/input/oekakids.c
@@ -36,7 +36,6 @@ static void FP_FASTAPASS(1) OK_Write(uint8 V) {
 	if (!(V & 0x1)) {
 		int32 vx, vy;
 
-		/* puts("Redo"); */
 		OKValR = OKData = 0;
 
 		if (OKB) OKData |= 1;
@@ -66,7 +65,6 @@ static void FP_FASTAPASS(1) OK_Write(uint8 V) {
 }
 
 static void FP_FASTAPASS(2) OK_Update(void *data, int arg) {
-	/* puts("Sync"); */
 	OKX = ((uint32*)data)[0];
 	OKY = ((uint32*)data)[1];
 	OKB = ((uint32*)data)[2];
diff --git a/src/input/quiz.c b/src/input/quiz.c
index 6775828..77bbb4f 100644
--- a/src/input/quiz.c
+++ b/src/input/quiz.c
@@ -26,18 +26,10 @@ static uint8 FunkyMode;
 
 static uint8 FP_FASTAPASS(2) QZ_Read(int w, uint8 ret) {
 	if (w) {
-		/* if(X.PC==0xdc7d) return(0xFF);
-		printf("Blah: %04x\n",X.PC);
-		FCEUI_DumpMem("dmp2",0xc000,0xffff);
-		*/
-
 		ret |= (QZValR & 0x7) << 2;
 		QZValR = QZValR >> 3;
 
 		if (FunkyMode) {
-			/*ret=0x14;
-			puts("Funky");
-			*/
 			QZValR |= 0x28;
 		} else {
 			QZValR |= 0x38;
@@ -48,11 +40,9 @@ static uint8 FP_FASTAPASS(2) QZ_Read(int w, uint8 ret) {
 
 static void QZ_Strobe(void) {
 	QZValR = QZVal;
-	/* puts("Strobe"); */
 }
 
 static void FP_FASTAPASS(1) QZ_Write(uint8 V) {
-	/* printf("Wr: %02x\n",V); */
 	FunkyMode = V & 4;
 }
 
diff --git a/src/ntsc/nes_ntsc_impl.h b/src/ntsc/nes_ntsc_impl.h
index de3672b..43e45bb 100644
--- a/src/ntsc/nes_ntsc_impl.h
+++ b/src/ntsc/nes_ntsc_impl.h
@@ -159,15 +159,6 @@ static void init_filters( init_t* impl, nes_ntsc_setup_t const* setup )
 		}
 	}
 	
-	/*
-	printf( "luma:\n" );
-	for ( i = kernel_size; i < kernel_size * 2; i++ )
-		printf( "%f\n", kernels [i] );
-	printf( "chroma:\n" );
-	for ( i = 0; i < kernel_size; i++ )
-		printf( "%f\n", kernels [i] );
-	*/
-	
 	/* generate linear rescale kernels */
 	#if rescale_out > 1
 	{
diff --git a/src/ops.h b/src/ops.h
index 20253c5..db8e9f2 100644
--- a/src/ops.h
+++ b/src/ops.h
@@ -322,12 +322,6 @@ case 0x50: JR(!(_P&V_FLAG)); break;
 /* BVS */
 case 0x70: JR(_P&V_FLAG); break;
 
-/* default: printf("Bad %02x at $%04x\n",b1,X.PC);break; */
-/* ifdef moo */
-/* Here comes the undocumented instructions block.  Note that this implementation
-		may be "wrong".  If so, please tell me.
-*/
-
 /* AAC */
 case 0x2B:
 case 0x0B: LD_IM(AND;_P&=~C_FLAG;_P|=_A>>7);
diff --git a/src/palettes/conv.c b/src/palettes/conv.c
deleted file mode 100644
index f712879..0000000
--- a/src/palettes/conv.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Quick conversion stuff for MAME->FCE Ultra */
-
-#include <stdio.h>
-#include "../fceu-types.h"
-#include "../palette.h"
-#include "palettes.h"
-
-/* check 0x08 */
-static uint8 rp2c04001_colortable[] =
-{
-	0x35, 0x23, 0x16, 0x22, 0x1c, 0x09, 0xff, 0x15,     /* 0x00 - 0x07 */
-	0x20, 0x00, 0x27, 0x05, 0x04, 0x27, 0x08, 0x30,     /* 0x08 - 0x0f */
-	0x21, 0xff, 0xff, 0x29, 0x3c, 0x32, 0x36, 0x12,     /* 0x10 - 0x17 */
-	0xff, 0x2b, 0x0f, 0xff, 0x20, 0x10, 0x24, 0x01,     /* 0x18 - 0x1f */
-	0xff, 0x31, 0xff, 0x2a, 0x2c, 0x0c, 0xff, 0xff,     /* 0x20 - 0x27 */
-	0xff, 0x07, 0x34, 0x06, 0x13, 0x02, 0x26, 0x0f,     /* 0x28 - 0x2f */
-	0xff, 0x19, 0x10, 0x0a, 0x39, 0xff, 0x37, 0x17,     /* 0x30 - 0x37 */
-	0xff, 0x11, 0x09, 0xff, 0x39, 0x25, 0x18, 0xff      /* 0x38 - 0x3f */
-};
-
-/* RP2C04-002 */
-static uint8 rp2c04002_colortable[] =
-{
-	0x0f, 0x27, 0x18, 0xff, 0x3a, 0x25, 0xff, 0x31,     /* 0x00 - 0x07 */
-	0x16, 0x13, 0x38, 0x34, 0x20, 0x23, 0xff, 0x0b,     /* 0x08 - 0x0f */
-	0xff, 0x21, 0x06, 0xff, 0x1b, 0x29, 0xff, 0x22,     /* 0x10 - 0x17 */
-	0xff, 0x24, 0xff, 0x2b, 0xff, 0x08, 0xff, 0x03,     /* 0x18 - 0x1f */
-	0xff, 0x36, 0x26, 0x33, 0x11, 0xff, 0x10, 0x02,     /* 0x20 - 0x27 */
-	0x14, 0xff, 0x00, 0x09, 0x12, 0x0f, 0x37, 0x30,     /* 0x28 - 0x2f */
-	0xff, 0xff, 0x2a, 0x17, 0x0c, 0x01, 0x15, 0x19,     /* 0x30 - 0x37 */
-	0xff, 0x2c, 0x07, 0x37, 0xff, 0x05, 0x0a, 0x00      /* 0x38 - 0x3f */
-};
-
-/* RP2C04-003 */
-/* Check 0x00.  Used in Dr Mario. */
-static uint8 rp2c04003_colortable[] =
-{
-	0x03, 0xff, 0xff, 0x00, 0x1a, 0x30, 0x31, 0x09,     /* 0x00 - 0x07 */
-	0x01, 0x0f, 0x36, 0x08, 0x15, 0xff, 0xff, 0x30,     /* 0x08 - 0x0f */
-	0x22, 0x1c, 0xff, 0x12, 0x19, 0x18, 0x17, 0x1b,     /* 0x10 - 0x17 */
-	0x00, 0xff, 0xff, 0x02, 0x16, 0x06, 0xff, 0x35,     /* 0x18 - 0x1f */
-	0x23, 0xff, 0x0f, 0x37, 0xff, 0x27, 0x26, 0x30,     /* 0x20 - 0x27 */
-	0x29, 0xff, 0x21, 0x24, 0x11, 0xff, 0x0f, 0xff,     /* 0x28 - 0x2f */
-	0x2c, 0xff, 0xff, 0xff, 0x07, 0x2a, 0x28, 0xff,     /* 0x30 - 0x37 */
-	0x0a, 0xff, 0x32, 0x37, 0x13, 0xff, 0xff, 0x0c      /* 0x38 - 0x3f */
-};
-
-/* RP2C05-004 */
-/* check 0x1d, 0x38 */
-static uint8 rp2c05004_colortable[] =
-{
-	0x18, 0xff, 0x1c, 0x28, 0xff, 0xff, 0x01, 0x17,     /* 0x00 - 0x07 */
-	0x10, 0x0f, 0x2a, 0x0f, 0x36, 0x37, 0x1a, 0xff,     /* 0x08 - 0x0f */
-	0x25, 0xff, 0x12, 0xff, 0x0f, 0xff, 0xff, 0x26,     /* 0x10 - 0x17 */
-	0xff, 0xff, 0x22, 0x19, 0xff, 0x0f, 0x3a, 0x21,     /* 0x18 - 0x1f */
-	0x05, 0x0a, 0x07, 0x01, 0x13, 0xff, 0x00, 0x15,     /* 0x20 - 0x27 */
-	0x0c, 0xff, 0x11, 0xff, 0xff, 0x38, 0xff, 0xff,     /* 0x28 - 0x2f */
-	0xff, 0xff, 0x08, 0x16, 0xff, 0xff, 0x30, 0x3c,     /* 0x30 - 0x37 */
-	0x0f, 0x27, 0xff, 0x31, 0x29, 0xff, 0x30, 0x09      /* 0x38 - 0x3f */
-};
-
-
-void main(void)
-{
-	int x;
-	for (x = 0; x < 64; x++)
-		printf("{0x%02x, 0x%02x, 0x%02x},\n", palette[rp2c04001_colortable[x] & 0x3F].r,
-				palette[rp2c04001_colortable[x] & 0x3F].g,
-				palette[rp2c04001_colortable[x] & 0x3F].b);
-}
diff --git a/src/sound.c b/src/sound.c
index cc58117..f802b0d 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -187,7 +187,6 @@ static void SQReload(int x, uint8 V) {
 }
 
 static DECLFW(Write_PSG) {
-/* FCEU_printf("APU1 %04x:%04x\n",A,V); */
 	A &= 0x1F;
 	switch (A) {
 	case 0x0:
@@ -271,7 +270,6 @@ static DECLFW(Write_PSG) {
 }
 
 static DECLFW(Write_DMCRegs) {
-/*  FCEU_printf("APU1 %04x:%04x\n",A,V); */
 	A &= 0xF;
 
 	switch (A) {
@@ -306,7 +304,6 @@ static DECLFW(Write_DMCRegs) {
 
 static DECLFW(StatusWrite) {
 	int x;
-/*  FCEU_printf("APU1 %04x:%04x\n",A,V); */
 
 	DoSQ1();
 	DoSQ2();
@@ -552,7 +549,6 @@ static INLINE void RDoSQ(int x) {
 			amp = EnvUnits[x].Speed;
 		else
 			amp = EnvUnits[x].decvolume;
-		/*   printf("%d\n",amp); */
 
 		/* Modify Square wave volume based on channel volume modifiers
 		 * Note: the formulat x = x * y /100 does not yield exact results,

From e9eaedfb64808f39d9204271ffc21c2ae6bb6cff Mon Sep 17 00:00:00 2001
From: libretroadmin <reallibretroretroarch@gmail.com>
Date: Thu, 21 Jul 2022 17:25:38 +0200
Subject: [PATCH 250/295] Reduce strlens

---
 src/cheat.c                     | 17 ++++++-----------
 src/drivers/libretro/libretro.c |  5 +++--
 src/ines.c                      | 15 ++++++++-------
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/cheat.c b/src/cheat.c
index e7b73b2..e8243c0 100644
--- a/src/cheat.c
+++ b/src/cheat.c
@@ -202,8 +202,8 @@ void FCEU_ResetCheats(void)
 
 int FCEUI_AddCheat(const char *name, uint32 addr, uint8 val, int compare, int type) {
 	char *t;
-
-	if (!(t = (char*)malloc(strlen(name) + 1))) {
+	if (!(t = (char*)malloc(strlen(name) + 1)))
+	{
 		CheatMemErr();
 		return(0);
 	}
@@ -318,16 +318,11 @@ static int GGtobin(char c) {
 
 /* Returns 1 on success, 0 on failure. Sets *a,*v,*c. */
 int FCEUI_DecodeGG(const char *str, uint16 *a, uint8 *v, int *c) {
-	uint16 A;
-	uint8 V, C;
 	uint8 t;
-	int s;
-
-	A = 0x8000;
-	V = 0;
-	C = 0;
-
-	s = strlen(str);
+	uint16 A = 0x8000;
+	uint8 V = 0;
+	uint8 C = 0;
+	int s = strlen(str);
 	if (s != 6 && s != 8) return(0);
 
 	t = GGtobin(*str++);
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index b828104..3f3cae0 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -2763,7 +2763,8 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code)
 
    while (codepart)
    {
-      if ((strlen(codepart) == 7) && (codepart[4]==':'))
+      size_t codepart_len = strlen(codepart);
+      if ((codepart_len == 7) && (codepart[4]==':'))
       {
          /* raw code in xxxx:xx format */
          log_cb.log(RETRO_LOG_DEBUG, "Cheat code added: '%s' (Raw)\n", codepart);
@@ -2776,7 +2777,7 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code)
          if (a < 0x0100) type = 0;
          FCEUI_AddCheat(name, a, v, c, type);
       }
-      else if ((strlen(codepart) == 10) && (codepart[4] == '?') && (codepart[7] == ':'))
+      else if ((codepart_len == 10) && (codepart[4] == '?') && (codepart[7] == ':'))
       {
          /* raw code in xxxx?xx:xx */
          log_cb.log(RETRO_LOG_DEBUG, "Cheat code added: '%s' (Raw)\n", codepart);
diff --git a/src/ines.c b/src/ines.c
index a025647..6e34333 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -364,11 +364,12 @@ static void CheckHInfo(void)
    if (tofix) {
       char gigastr[768];
       strcpy(gigastr, " The iNES header contains incorrect information.  For now, the information will be corrected in RAM. ");
+      size_t gigastr_len = strlen(gigastr);
       if (tofix & 1)
-         sprintf(gigastr + strlen(gigastr), "Current mapper # is %d. The mapper number should be set to %d. ", current_mapper, iNESCart.mapper);
+         sprintf(gigastr + gigastr_len, "Current mapper # is %d. The mapper number should be set to %d. ", current_mapper, iNESCart.mapper);
       if (tofix & 2) {
          uint8 *mstr[3] = { (uint8_t*)"Horizontal", (uint8_t*)"Vertical", (uint8_t*)"Four-screen" };
-         sprintf(gigastr + strlen(gigastr), "Current mirroring is %s. Mirroring should be set to \"%s\". ", mstr[cur_mirr & 3], mstr[iNESCart.mirror & 3]);
+         sprintf(gigastr + gigastr_len, "Current mirroring is %s. Mirroring should be set to \"%s\". ", mstr[cur_mirr & 3], mstr[iNESCart.mirror & 3]);
       }
       if (tofix & 4)
          strcat(gigastr, "The battery-backed bit should be set.  ");
@@ -376,19 +377,19 @@ static void CheckHInfo(void)
          strcat(gigastr, "This game should not have any CHR ROM.  ");
       if (tofix & 16) {
          uint8 *rstr[4] = { (uint8*)"NTSC", (uint8*)"PAL", (uint8*)"Multi", (uint8*)"Dendy" };
-         sprintf(gigastr + strlen(gigastr), "This game should run with \"%s\" timings.", rstr[iNESCart.region]);
+         sprintf(gigastr + gigastr_len, "This game should run with \"%s\" timings.", rstr[iNESCart.region]);
       }
       if (tofix & 32) {
          unsigned PRGRAM = iNESCart.PRGRamSize + iNESCart.PRGRamSaveSize;
          unsigned CHRRAM = iNESCart.CHRRamSize + iNESCart.CHRRamSaveSize;
          if (PRGRAM || CHRRAM) {
             if (iNESCart.PRGRamSaveSize == 0)
-               sprintf(gigastr + strlen(gigastr), "workram: %d KB, ", PRGRAM / 1024);
+               sprintf(gigastr + gigastr_len, "workram: %d KB, ", PRGRAM / 1024);
             else if (iNESCart.PRGRamSize == 0)
-               sprintf(gigastr + strlen(gigastr), "saveram: %d KB, ", PRGRAM / 1024);
+               sprintf(gigastr + gigastr_len, "saveram: %d KB, ", PRGRAM / 1024);
             else
-               sprintf(gigastr + strlen(gigastr), "workram: %d KB (%dKB battery-backed), ", PRGRAM / 1024, iNESCart.PRGRamSaveSize / 1024);
-            sprintf(gigastr + strlen(gigastr), "chrram: %d KB.", (CHRRAM + iNESCart.CHRRamSaveSize) / 1024);
+               sprintf(gigastr + gigastr_len, "workram: %d KB (%dKB battery-backed), ", PRGRAM / 1024, iNESCart.PRGRamSaveSize / 1024);
+            sprintf(gigastr + gigastr_len, "chrram: %d KB.", (CHRRAM + iNESCart.CHRRamSaveSize) / 1024);
          }
       }
       strcat(gigastr, "\n");

From 63f9d5359e21adfa66654cd3eccbc41696ff60a0 Mon Sep 17 00:00:00 2001
From: libretroadmin <reallibretroretroarch@gmail.com>
Date: Thu, 21 Jul 2022 17:56:27 +0200
Subject: [PATCH 251/295] Buildfix

---
 src/ines.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ines.c b/src/ines.c
index 6e34333..71070ff 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -362,9 +362,10 @@ static void CheckHInfo(void)
       iNESCart.mirror = 2;
 
    if (tofix) {
+      size_t gigastr_len;
       char gigastr[768];
       strcpy(gigastr, " The iNES header contains incorrect information.  For now, the information will be corrected in RAM. ");
-      size_t gigastr_len = strlen(gigastr);
+      gigastr_len = strlen(gigastr);
       if (tofix & 1)
          sprintf(gigastr + gigastr_len, "Current mapper # is %d. The mapper number should be set to %d. ", current_mapper, iNESCart.mapper);
       if (tofix & 2) {

From ed6e233a97a8521962ef2681d9416a7b68310e33 Mon Sep 17 00:00:00 2001
From: LibretroAdmin <105389611+LibretroAdmin@users.noreply.github.com>
Date: Mon, 25 Jul 2022 14:43:25 +0200
Subject: [PATCH 252/295] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6fb018..33aef29 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -169,7 +169,7 @@ libretro-build-linux-i686:
 # MacOS 64-bit
 libretro-build-osx-x64:
   extends:
-    - .libretro-osx-x64-make-default
+    - .libretro-osx-x64-make-10-7
     - .core-defs
 
 # MacOS ARM 64-bit

From 988be84742eeac6b82891759bb4edcd489cd185e Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 27 Jul 2022 11:07:25 +0200
Subject: [PATCH 253/295] Add mapper 441

---
 src/boards/441.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  1 +
 src/ines.h       |  1 +
 3 files changed, 70 insertions(+)
 create mode 100644 src/boards/441.c

diff --git a/src/boards/441.c b/src/boards/441.c
new file mode 100644
index 0000000..a2ef809
--- /dev/null
+++ b/src/boards/441.c
@@ -0,0 +1,68 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* 850335C PCB */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static void Mapper441_PRGWrap(uint32 A, uint8 V) {
+	int prgAND =EXPREGS[0] &0x08? 0x0F: 0x1F;
+	int prgOR  =EXPREGS[0] <<4 &0x30;
+	if (EXPREGS[0] &0x04) {
+		if (~A &0x4000) {
+			setprg8(A,         ~2 &V &prgAND | prgOR &~prgAND);
+			setprg8(A |0x4000,  2 |V &prgAND | prgOR &~prgAND);
+		}
+	} else
+		setprg8(A, V &prgAND | prgOR &~prgAND);
+}
+
+static void Mapper441_CHRWrap(uint32 A, uint8 V) {
+	int chrAND =EXPREGS[0] &0x40? 0x7F: 0xFF;
+	int chrOR  =EXPREGS[0] <<3 &0x180;
+	setchr1(A, V &chrAND | chrOR &~chrAND);
+}
+
+static DECLFW(Mapper441_Write) {
+	if (~EXPREGS[0] &0x80) EXPREGS[0] =V;
+	FixMMC3PRG(MMC3_cmd);
+	FixMMC3CHR(MMC3_cmd);
+}
+
+static void Mapper441_Reset(void) {
+	EXPREGS[0] =0;
+	MMC3RegReset();
+}
+
+static void Mapper441_Power(void) {
+	EXPREGS[0] =0;
+	GenMMC3Power();
+	SetWriteHandler(0x6000, 0x7FFF, Mapper441_Write);
+}
+
+void Mapper441_Init(CartInfo *info) {
+	GenMMC3_Init(info, 256, 256, 0, 0);
+	cwrap = Mapper441_CHRWrap;
+	pwrap = Mapper441_PRGWrap;
+	info->Power = Mapper441_Power;
+	info->Reset = Mapper441_Reset;
+	AddExState(EXPREGS, 1, 0, "EXPR");
+}
diff --git a/src/ines.c b/src/ines.c
index 71070ff..2fb19e3 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -815,6 +815,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "820401/T-217",             436, Mapper436_Init         )
 	INES_BOARD( "NTDEC TH2348",             437, Mapper437_Init         )
 	INES_BOARD( "K-3071",                   438, Mapper438_Init         )
+	INES_BOARD( "850335C",                  441, Mapper441_Init         )
 	INES_BOARD( "NC-3000M",                 443, Mapper443_Init         )
 	INES_BOARD( "NC-7000M/NC-8000M",        444, Mapper444_Init         )
 	INES_BOARD( "DS-9-27",                  452, Mapper452_Init         )
diff --git a/src/ines.h b/src/ines.h
index 92ad140..4d0a91b 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -323,6 +323,7 @@ void Mapper435_Init(CartInfo *);
 void Mapper436_Init(CartInfo *);
 void Mapper437_Init(CartInfo *);
 void Mapper438_Init(CartInfo *);
+void Mapper441_Init(CartInfo *);
 void Mapper443_Init(CartInfo *);
 void Mapper444_Init(CartInfo *);
 void Mapper452_Init(CartInfo *);

From 95f06256045019cc36b63b5df86c7f161305642b Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 27 Jul 2022 11:27:59 +0200
Subject: [PATCH 254/295] Add mapper 463

---
 src/boards/463.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  1 +
 src/ines.h       |  1 +
 3 files changed, 79 insertions(+)
 create mode 100644 src/boards/463.c

diff --git a/src/boards/463.c b/src/boards/463.c
new file mode 100644
index 0000000..3c70244
--- /dev/null
+++ b/src/boards/463.c
@@ -0,0 +1,77 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "mapinc.h"
+
+static uint8 regs[4]          = { 0 };
+static uint8 dipswitch        = 0;
+
+static SFORMAT StateRegs[] = {
+   { regs,       4, "EXPR" },
+   { &dipswitch, 1, "DPSW" },
+   { 0 }
+};
+
+static void Mapper463_Sync(void)
+{
+   if (regs[0] &4)
+   {
+      setprg16(0x8000, regs[1]);
+      setprg16(0xC000, regs[1]);
+   }
+   else
+   {
+      setprg32(0x8000, regs[1] >>1);
+   }
+   setchr8(regs[2]);
+   setmirror(regs[0] &1? MI_H: MI_V);
+}
+
+static DECLFW(Mapper463_Write5000)
+{
+   if (A &(0x10 << dipswitch))
+   {
+      regs[A &3] =V;
+      Mapper463_Sync();
+   }
+}
+
+static void Mapper463_Reset(void)
+{
+   dipswitch =(dipswitch +1) &7;
+   regs[0] =regs[1] =regs[2] =regs[3] =0;
+   Mapper463_Sync();
+}
+
+static void Mapper463_Power(void)
+{
+   dipswitch =0;
+   regs[0] =regs[1] =regs[2] =regs[3] =0;
+   Mapper463_Sync();
+   SetWriteHandler(0x5000, 0x5FFF, Mapper463_Write5000);
+   SetReadHandler(0x6000, 0xFFFF, CartBR);
+}
+
+void Mapper463_Init(CartInfo *info)
+{
+   info->Power       = Mapper463_Power;
+   info->Reset       = Mapper463_Reset;
+   AddExState(StateRegs, ~0, 0, 0);
+}
\ No newline at end of file
diff --git a/src/ines.c b/src/ines.c
index 2fb19e3..aee8aad 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -820,6 +820,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "NC-7000M/NC-8000M",        444, Mapper444_Init         )
 	INES_BOARD( "DS-9-27",                  452, Mapper452_Init         )
 	INES_BOARD( "K6C3001A",                 456, Mapper456_Init         )
+	INES_BOARD( "YH810X1",                 	463, Mapper463_Init         )
 	INES_BOARD( "47-2",                 	467, Mapper467_Init         )
 	INES_BOARD( "SA-9602B",                 513, SA9602B_Init           )
 	INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init        )
diff --git a/src/ines.h b/src/ines.h
index 4d0a91b..6da5dd1 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -328,6 +328,7 @@ void Mapper443_Init(CartInfo *);
 void Mapper444_Init(CartInfo *);
 void Mapper452_Init(CartInfo *);
 void Mapper456_Init(CartInfo *);
+void Mapper463_Init(CartInfo *);
 void Mapper467_Init(CartInfo *);
 void Mapper516_Init(CartInfo *);
 void Mapper523_Init(CartInfo *);

From 16c10d63c92cb73c01f192963f74d745567a3cce Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 27 Jul 2022 11:39:58 +0200
Subject: [PATCH 255/295] Add mapper 466

---
 src/boards/466.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |   1 +
 src/ines.h       |   1 +
 3 files changed, 102 insertions(+)
 create mode 100644 src/boards/466.c

diff --git a/src/boards/466.c b/src/boards/466.c
new file mode 100644
index 0000000..a8ad361
--- /dev/null
+++ b/src/boards/466.c
@@ -0,0 +1,100 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "mapinc.h"
+
+static uint8 regs[3];
+
+static SFORMAT StateRegs[] =
+{
+   { regs, 3, "EXPR" },
+   { 0 }
+};
+
+static DECLFR(Mapper466_ReadOB)
+{
+   return X.DB;
+}
+
+static void Mapper466_Sync(void)
+{
+   int prg =regs[1] <<5 | regs[0] <<1 &0x1E | regs[0] >>5 &1;
+   
+   /* Return open bus when selecting unpopulated PRG chip */
+   if (prg &0x20 && PRGsize[0] <1024*1024)
+	   SetReadHandler(0x8000, 0xFFFF, Mapper466_ReadOB);
+   else
+	   SetReadHandler(0x8000, 0xFFFF, CartBR);
+   
+   if (regs[0] &0x40)
+   {
+      if (regs[0] &0x10)
+      {
+         setprg16(0x8000, prg);
+         setprg16(0xC000, prg);
+      }
+      else
+      {
+         setprg32(0x8000, prg >>1);
+      }
+   }
+   else
+   {
+      setprg16(0x8000, prg &~7 | regs[2] &7);
+      setprg16(0xC000, prg &~7 |          7);
+   }
+   setprg8r(0x10, 0x6000, 0);
+   setchr8(0);
+   setmirror(regs[0] &0x80? MI_H: MI_V);
+}
+
+static DECLFW(Mapper466_Write5000)
+{
+   regs[A >>11 &1] =A &0xFF;
+   Mapper466_Sync();
+}
+
+static DECLFW(Mapper466_WriteLatch)
+{
+   regs[2] =V;
+   Mapper466_Sync();
+}
+
+static void Mapper466_Reset(void)
+{
+   regs[0] =regs[1] =0;
+   Mapper466_Sync();
+}
+
+static void Mapper466_Power(void)
+{
+   regs[0] =regs[1] =0;
+   Mapper466_Sync();
+   SetWriteHandler(0x5000, 0x5FFF, Mapper466_Write5000);
+   SetWriteHandler(0x8000, 0xFFFF, Mapper466_WriteLatch);
+   SetReadHandler(0x6000, 0xFFFF, CartBR);
+}
+
+void Mapper466_Init(CartInfo *info)
+{
+   info->Power       = Mapper466_Power;
+   info->Reset       = Mapper466_Reset;
+   AddExState(StateRegs, ~0, 0, 0);
+}
\ No newline at end of file
diff --git a/src/ines.c b/src/ines.c
index aee8aad..1d7f0b2 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -821,6 +821,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "DS-9-27",                  452, Mapper452_Init         )
 	INES_BOARD( "K6C3001A",                 456, Mapper456_Init         )
 	INES_BOARD( "YH810X1",                 	463, Mapper463_Init         )
+	INES_BOARD( "Keybyte Computer",        	466, Mapper466_Init         )
 	INES_BOARD( "47-2",                 	467, Mapper467_Init         )
 	INES_BOARD( "SA-9602B",                 513, SA9602B_Init           )
 	INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init        )
diff --git a/src/ines.h b/src/ines.h
index 6da5dd1..8a6d505 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -329,6 +329,7 @@ void Mapper444_Init(CartInfo *);
 void Mapper452_Init(CartInfo *);
 void Mapper456_Init(CartInfo *);
 void Mapper463_Init(CartInfo *);
+void Mapper466_Init(CartInfo *);
 void Mapper467_Init(CartInfo *);
 void Mapper516_Init(CartInfo *);
 void Mapper523_Init(CartInfo *);

From 868edfb32dc5db1d3771e062e60362c05f9dd79d Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 27 Jul 2022 11:51:30 +0200
Subject: [PATCH 256/295] Add mapper 464

---
 src/boards/addrlatch.c | 18 ++++++++++++++++++
 src/ines.c             |  1 +
 src/ines.h             |  1 +
 3 files changed, 20 insertions(+)

diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c
index dda64dd..836e7a8 100644
--- a/src/boards/addrlatch.c
+++ b/src/boards/addrlatch.c
@@ -757,3 +757,21 @@ static void M435Sync(void) {
 void Mapper435_Init(CartInfo *info) {
 	Latch_Init(info, M435Sync, NULL, 0x0000, 0x8000, 0xFFFF, 1);
 }
+
+/*------------------ Map 464 ---------------------------*/
+static void M464Sync(void) {
+	int p =latche >>7;
+	int c =latche &0x1F;
+	if (latche &0x40) {
+		setprg32(0x8000, p >> 1);
+	} else {
+		setprg16(0x8000, p);
+		setprg16(0xC000, p);
+	}
+	setchr8(c);
+	setmirror(latche &0x20? MI_H: MI_V);
+}
+
+void Mapper464_Init(CartInfo *info) {
+	Latch_Init(info, M464Sync, NULL, 0x0000, 0x8000, 0xFFFF, 1);
+}
diff --git a/src/ines.c b/src/ines.c
index 1d7f0b2..ce3791e 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -821,6 +821,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "DS-9-27",                  452, Mapper452_Init         )
 	INES_BOARD( "K6C3001A",                 456, Mapper456_Init         )
 	INES_BOARD( "YH810X1",                 	463, Mapper463_Init         )
+	INES_BOARD( "NTDEC 9012",          	464, Mapper464_Init         )
 	INES_BOARD( "Keybyte Computer",        	466, Mapper466_Init         )
 	INES_BOARD( "47-2",                 	467, Mapper467_Init         )
 	INES_BOARD( "SA-9602B",                 513, SA9602B_Init           )
diff --git a/src/ines.h b/src/ines.h
index 8a6d505..2a489cf 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -329,6 +329,7 @@ void Mapper444_Init(CartInfo *);
 void Mapper452_Init(CartInfo *);
 void Mapper456_Init(CartInfo *);
 void Mapper463_Init(CartInfo *);
+void Mapper464_Init(CartInfo *);
 void Mapper466_Init(CartInfo *);
 void Mapper467_Init(CartInfo *);
 void Mapper516_Init(CartInfo *);

From c80d2b129768755e1bb959df3a2df6f04b8ed115 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 27 Jul 2022 11:56:35 +0200
Subject: [PATCH 257/295] Add mapper 459

---
 src/boards/addrlatch.c | 18 ++++++++++++++++++
 src/ines.c             |  1 +
 src/ines.h             |  1 +
 3 files changed, 20 insertions(+)

diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c
index 836e7a8..14dba25 100644
--- a/src/boards/addrlatch.c
+++ b/src/boards/addrlatch.c
@@ -758,6 +758,24 @@ void Mapper435_Init(CartInfo *info) {
 	Latch_Init(info, M435Sync, NULL, 0x0000, 0x8000, 0xFFFF, 1);
 }
 
+/*------------------ Map 459 ---------------------------*/
+static void M459Sync(void) {
+	int p =latche >>5;
+	int c =latche &0x03 | latche >>2 &0x04 | latche >>4 &0x08;
+	if (latche &0x04) {
+		setprg32(0x8000, p);
+	} else {
+		setprg16(0x8000, p <<1);
+		setprg16(0xC000, p <<1 |7);
+	}
+	setchr8(c &(latche &0x08? 0x0F: 0x08));
+	setmirror(latche &0x100? MI_H: MI_V);
+}
+
+void Mapper459_Init(CartInfo *info) {
+	Latch_Init(info, M459Sync, NULL, 0x0000, 0x8000, 0xFFFF, 1);
+}
+
 /*------------------ Map 464 ---------------------------*/
 static void M464Sync(void) {
 	int p =latche >>7;
diff --git a/src/ines.c b/src/ines.c
index ce3791e..2350f51 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -820,6 +820,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "NC-7000M/NC-8000M",        444, Mapper444_Init         )
 	INES_BOARD( "DS-9-27",                  452, Mapper452_Init         )
 	INES_BOARD( "K6C3001A",                 456, Mapper456_Init         )
+	INES_BOARD( "8-in-1",                   459, Mapper459_Init         )
 	INES_BOARD( "YH810X1",                 	463, Mapper463_Init         )
 	INES_BOARD( "NTDEC 9012",          	464, Mapper464_Init         )
 	INES_BOARD( "Keybyte Computer",        	466, Mapper466_Init         )
diff --git a/src/ines.h b/src/ines.h
index 2a489cf..4afc8c8 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -328,6 +328,7 @@ void Mapper443_Init(CartInfo *);
 void Mapper444_Init(CartInfo *);
 void Mapper452_Init(CartInfo *);
 void Mapper456_Init(CartInfo *);
+void Mapper459_Init(CartInfo *);
 void Mapper463_Init(CartInfo *);
 void Mapper464_Init(CartInfo *);
 void Mapper466_Init(CartInfo *);

From 3999c571c91c014c5acd324d0966ce546d7f10a2 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 27 Jul 2022 12:44:40 +0200
Subject: [PATCH 258/295] Add mapper 465

---
 src/boards/465.c       | 89 ++++++++++++++++++++++++++++++++++++++++++
 src/boards/addrlatch.c |  2 +-
 src/ines.c             |  1 +
 src/ines.h             |  1 +
 4 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 src/boards/465.c

diff --git a/src/boards/465.c b/src/boards/465.c
new file mode 100644
index 0000000..e847a9b
--- /dev/null
+++ b/src/boards/465.c
@@ -0,0 +1,89 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "mapinc.h"
+
+static uint16 latchAddr;
+static uint8  latchData;
+
+static SFORMAT StateRegs[] =
+{
+   { &latchAddr, 2, "ADDR" },
+   { &latchData, 1, "DATA" },
+   { 0 }
+};
+
+static void Mapper465_Sync(void)
+{
+   int prg =latchAddr >>2 &0x1F | latchAddr >>5 &0x20;
+   if (latchAddr &0x200)
+   {
+      setprg16(0x8000, prg &~7 | latchData &7);
+      setprg16(0xC000, prg     |            7);
+   }
+   else
+   {
+      if (latchAddr &0x001)
+      {
+         setprg32(0x8000, prg >>1);
+      }
+      else
+      {
+         setprg16(0x8000, prg);
+         setprg16(0xC000, prg);
+      }
+   }
+   setchr8(0);
+   setmirror(latchAddr &0x002? MI_H: MI_V);
+}
+
+static DECLFW(Mapper465_WriteLatch)
+{
+   if (latchAddr &0x200)
+   {
+      latchData =V;
+   }
+   else
+   {
+      latchAddr =A &0xFFFF;
+   }
+   Mapper465_Sync();
+}
+
+static void Mapper465_Reset(void)
+{
+   latchAddr =latchData =0;
+   Mapper465_Sync();
+}
+
+static void Mapper465_Power(void)
+{
+   latchAddr =latchData =0;
+   Mapper465_Sync();
+   SetWriteHandler(0x8000, 0xFFFF, Mapper465_WriteLatch);
+   SetReadHandler(0x6000, 0xFFFF, CartBR);
+}
+
+void Mapper465_Init(CartInfo *info)
+{
+   info->Power       = Mapper465_Power;
+   info->Reset       = Mapper465_Reset;
+   AddExState(StateRegs, ~0, 0, 0);
+}
\ No newline at end of file
diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c
index 14dba25..a221fb1 100644
--- a/src/boards/addrlatch.c
+++ b/src/boards/addrlatch.c
@@ -792,4 +792,4 @@ static void M464Sync(void) {
 
 void Mapper464_Init(CartInfo *info) {
 	Latch_Init(info, M464Sync, NULL, 0x0000, 0x8000, 0xFFFF, 1);
-}
+}
\ No newline at end of file
diff --git a/src/ines.c b/src/ines.c
index 2350f51..891182a 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -823,6 +823,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "8-in-1",                   459, Mapper459_Init         )
 	INES_BOARD( "YH810X1",                 	463, Mapper463_Init         )
 	INES_BOARD( "NTDEC 9012",          	464, Mapper464_Init         )
+	INES_BOARD( "ET-120",                 	465, Mapper465_Init         )
 	INES_BOARD( "Keybyte Computer",        	466, Mapper466_Init         )
 	INES_BOARD( "47-2",                 	467, Mapper467_Init         )
 	INES_BOARD( "SA-9602B",                 513, SA9602B_Init           )
diff --git a/src/ines.h b/src/ines.h
index 4afc8c8..6e50bee 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -331,6 +331,7 @@ void Mapper456_Init(CartInfo *);
 void Mapper459_Init(CartInfo *);
 void Mapper463_Init(CartInfo *);
 void Mapper464_Init(CartInfo *);
+void Mapper465_Init(CartInfo *);
 void Mapper466_Init(CartInfo *);
 void Mapper467_Init(CartInfo *);
 void Mapper516_Init(CartInfo *);

From 707853d234d023bd61b974333b001498257f44c7 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 27 Jul 2022 12:48:05 +0200
Subject: [PATCH 259/295] Add mapper 461

---
 src/boards/addrlatch.c | 18 ++++++++++++++++++
 src/ines.c             |  1 +
 src/ines.h             |  1 +
 3 files changed, 20 insertions(+)

diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c
index a221fb1..dd67b51 100644
--- a/src/boards/addrlatch.c
+++ b/src/boards/addrlatch.c
@@ -776,6 +776,24 @@ void Mapper459_Init(CartInfo *info) {
 	Latch_Init(info, M459Sync, NULL, 0x0000, 0x8000, 0xFFFF, 1);
 }
 
+/*------------------ Map 461 ---------------------------*/
+static void M461Sync(void) {
+	int p =latche <<1 | latche >>5 &1;
+	int c =latche >>8;
+	if (latche &0x10) {
+		setprg16(0x8000, p);
+		setprg16(0xC000, p);
+	} else {
+		setprg32(0x8000, p >>1);
+	}
+	setchr8(c);
+	setmirror(latche &0x80? MI_H: MI_V);
+}
+
+void Mapper461_Init(CartInfo *info) {
+	Latch_Init(info, M461Sync, NULL, 0x0000, 0x8000, 0xFFFF, 1);
+}
+
 /*------------------ Map 464 ---------------------------*/
 static void M464Sync(void) {
 	int p =latche >>7;
diff --git a/src/ines.c b/src/ines.c
index 891182a..c0100cd 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -821,6 +821,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "DS-9-27",                  452, Mapper452_Init         )
 	INES_BOARD( "K6C3001A",                 456, Mapper456_Init         )
 	INES_BOARD( "8-in-1",                   459, Mapper459_Init         )
+	INES_BOARD( "0324",                 	461, Mapper461_Init         )
 	INES_BOARD( "YH810X1",                 	463, Mapper463_Init         )
 	INES_BOARD( "NTDEC 9012",          	464, Mapper464_Init         )
 	INES_BOARD( "ET-120",                 	465, Mapper465_Init         )
diff --git a/src/ines.h b/src/ines.h
index 6e50bee..61a77be 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -329,6 +329,7 @@ void Mapper444_Init(CartInfo *);
 void Mapper452_Init(CartInfo *);
 void Mapper456_Init(CartInfo *);
 void Mapper459_Init(CartInfo *);
+void Mapper461_Init(CartInfo *);
 void Mapper463_Init(CartInfo *);
 void Mapper464_Init(CartInfo *);
 void Mapper465_Init(CartInfo *);

From 718047a24185199256b38d5ccdfe78d977602548 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 27 Jul 2022 13:24:30 +0200
Subject: [PATCH 260/295] Add mapper 460

---
 src/boards/460.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  1 +
 src/ines.h       |  1 +
 3 files changed, 96 insertions(+)
 create mode 100644 src/boards/460.c

diff --git a/src/boards/460.c b/src/boards/460.c
new file mode 100644
index 0000000..7cbd782
--- /dev/null
+++ b/src/boards/460.c
@@ -0,0 +1,94 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include "mapinc.h"
+#include "mmc3.h"
+
+static uint8 *CHRRAM =NULL;
+
+static DECLFR(Mapper460_ReadOB)
+{
+   return X.DB;
+}
+
+static void Mapper460_PRGWrap(uint32 A, uint8 V) {
+	int prgAND =0x0F;
+	int prgOR  =EXPREGS[0] <<4;
+	if (EXPREGS[0] &0x20) {
+		if (~A &0x4000) {
+			setprg8(A,         (EXPREGS[0] &0x10? ~2: ~0) &V &prgAND | prgOR &~prgAND);
+			setprg8(A |0x4000, (EXPREGS[0] &0x10?  2:  0) |V &prgAND | prgOR &~prgAND);
+		}
+	} else
+		setprg8(A, V &prgAND | prgOR &~prgAND);
+	
+	/* Menu selection by selectively connecting reg's D7 to PRG /CE or not */
+	if (EXPREGS[0] &0x80 && EXPREGS[1] &1)
+		SetReadHandler(0x8000, 0xFFFF, Mapper460_ReadOB);
+	else
+		SetReadHandler(0x8000, 0xFFFF, CartBR);
+}
+
+static void Mapper460_CHRWrap(uint32 A, uint8 V) {
+	if (EXPREGS[0] &0x04) {
+		setchr2(0x0000, DRegBuf[0] &0xFE);
+		setchr2(0x0800, DRegBuf[0] |0x01);
+		setchr2(0x1000, DRegBuf[2]);
+		setchr2(0x1800, DRegBuf[5]);
+	} else
+		setchr8r(0x10, 0);
+}
+
+static DECLFW(Mapper460_WriteExtra) {
+	if (A001B &0x80 && ~A001B &0x40) EXPREGS[0] =A &0xFF;
+	FixMMC3PRG(MMC3_cmd);
+	FixMMC3CHR(MMC3_cmd);
+}
+
+static void Mapper460_Reset(void) {
+	EXPREGS[0] =0;
+	EXPREGS[1]++;
+	MMC3RegReset();
+}
+
+static void Mapper460_Power(void) {
+	EXPREGS[0] =0;
+	EXPREGS[1] =0;
+	GenMMC3Power();
+	SetWriteHandler(0x6000, 0x7FFF, Mapper460_WriteExtra);
+}
+
+static void Mapper460_close(void) {
+	if (CHRRAM) FCEU_gfree(CHRRAM);
+	CHRRAM =NULL;
+}
+
+void Mapper460_Init(CartInfo *info) {
+	GenMMC3_Init(info, 128, 512, 0, 0);
+	cwrap = Mapper460_CHRWrap;
+	pwrap = Mapper460_PRGWrap;
+	info->Power = Mapper460_Power;
+	info->Reset = Mapper460_Reset;
+	info->Close = Mapper460_close;
+	AddExState(EXPREGS, 2, 0, "EXPR");
+	
+	CHRRAM =(uint8 *)FCEU_gmalloc(8192);
+	SetupCartCHRMapping(0x10, CHRRAM, 8192, 1);
+	AddExState(CHRRAM, 8192, 0, "CRAM");
+}
diff --git a/src/ines.c b/src/ines.c
index c0100cd..c69eea0 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -821,6 +821,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "DS-9-27",                  452, Mapper452_Init         )
 	INES_BOARD( "K6C3001A",                 456, Mapper456_Init         )
 	INES_BOARD( "8-in-1",                   459, Mapper459_Init         )
+	INES_BOARD( "FC-29-40/K-3101",        	460, Mapper460_Init         )
 	INES_BOARD( "0324",                 	461, Mapper461_Init         )
 	INES_BOARD( "YH810X1",                 	463, Mapper463_Init         )
 	INES_BOARD( "NTDEC 9012",          	464, Mapper464_Init         )
diff --git a/src/ines.h b/src/ines.h
index 61a77be..988851e 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -329,6 +329,7 @@ void Mapper444_Init(CartInfo *);
 void Mapper452_Init(CartInfo *);
 void Mapper456_Init(CartInfo *);
 void Mapper459_Init(CartInfo *);
+void Mapper460_Init(CartInfo *);
 void Mapper461_Init(CartInfo *);
 void Mapper463_Init(CartInfo *);
 void Mapper464_Init(CartInfo *);

From 43e54d0e4314de6edc201ca9393b10f15a3f733a Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 27 Jul 2022 13:28:57 +0200
Subject: [PATCH 261/295] Mapper 429: Allow more than 32 KiB CHR

---
 src/boards/datalatch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/boards/datalatch.c b/src/boards/datalatch.c
index 7b1007c..d51dd3f 100644
--- a/src/boards/datalatch.c
+++ b/src/boards/datalatch.c
@@ -587,7 +587,7 @@ void BMCK3046_Init(CartInfo *info) {
 
 static void Mapper429_Sync(void) {
 	setprg32(0x8000, latche >>2);
-	setchr8(latche &3);
+	setchr8(latche);
 }
 
 static void Mapper429_Reset(void) {

From d37d644d17ad4f5dd929d3c64c4edd05aa2b4da4 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 27 Jul 2022 13:35:33 +0200
Subject: [PATCH 262/295] Add mapper 449

---
 src/boards/449.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  1 +
 src/ines.h       |  1 +
 3 files changed, 85 insertions(+)
 create mode 100644 src/boards/449.c

diff --git a/src/boards/449.c b/src/boards/449.c
new file mode 100644
index 0000000..bcb17d9
--- /dev/null
+++ b/src/boards/449.c
@@ -0,0 +1,83 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "mapinc.h"
+
+static uint16 latchAddr;
+static uint8  latchData;
+
+static SFORMAT StateRegs[] =
+{
+   { &latchAddr, 2, "ADDR" },
+   { &latchData, 1, "DATA" },
+   { 0 }
+};
+
+static void Mapper449_Sync(void)
+{
+   int prg =latchAddr >>2 &0x1F | latchAddr >>3 &0x20;
+   if (~latchAddr &0x080)
+   {
+      setprg16(0x8000, prg);
+      setprg16(0xC000, prg |7);
+   }
+   else
+   {
+      if (latchAddr &0x001)
+      {
+         setprg32(0x8000, prg >>1);
+      }
+      else
+      {
+         setprg16(0x8000, prg);
+         setprg16(0xC000, prg);
+      }
+   }
+   setchr8(latchData);
+   setmirror(latchAddr &0x002? MI_H: MI_V);
+}
+
+static DECLFW(Mapper449_WriteLatch)
+{
+   latchData =V;
+   latchAddr =A &0xFFFF;
+   Mapper449_Sync();
+}
+
+static void Mapper449_Reset(void)
+{
+   latchAddr =latchData =0;
+   Mapper449_Sync();
+}
+
+static void Mapper449_Power(void)
+{
+   latchAddr =latchData =0;
+   Mapper449_Sync();
+   SetWriteHandler(0x8000, 0xFFFF, Mapper449_WriteLatch);
+   SetReadHandler(0x6000, 0xFFFF, CartBR);
+}
+
+void Mapper449_Init(CartInfo *info)
+{
+   info->Power       = Mapper449_Power;
+   info->Reset       = Mapper449_Reset;
+   AddExState(StateRegs, ~0, 0, 0);
+}
\ No newline at end of file
diff --git a/src/ines.c b/src/ines.c
index c69eea0..7755137 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -818,6 +818,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "850335C",                  441, Mapper441_Init         )
 	INES_BOARD( "NC-3000M",                 443, Mapper443_Init         )
 	INES_BOARD( "NC-7000M/NC-8000M",        444, Mapper444_Init         )
+	INES_BOARD( "22-in-1 King Series",      449, Mapper449_Init         )
 	INES_BOARD( "DS-9-27",                  452, Mapper452_Init         )
 	INES_BOARD( "K6C3001A",                 456, Mapper456_Init         )
 	INES_BOARD( "8-in-1",                   459, Mapper459_Init         )
diff --git a/src/ines.h b/src/ines.h
index 988851e..ac5cc1c 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -326,6 +326,7 @@ void Mapper438_Init(CartInfo *);
 void Mapper441_Init(CartInfo *);
 void Mapper443_Init(CartInfo *);
 void Mapper444_Init(CartInfo *);
+void Mapper449_Init(CartInfo *);
 void Mapper452_Init(CartInfo *);
 void Mapper456_Init(CartInfo *);
 void Mapper459_Init(CartInfo *);

From 94a6359a9d3370eb1f14f6d56b44895324f45aa9 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 27 Jul 2022 13:47:23 +0200
Subject: [PATCH 263/295] Add mapper 455

---
 src/boards/455.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  1 +
 src/ines.h       |  1 +
 3 files changed, 79 insertions(+)
 create mode 100644 src/boards/455.c

diff --git a/src/boards/455.c b/src/boards/455.c
new file mode 100644
index 0000000..55c8bdf
--- /dev/null
+++ b/src/boards/455.c
@@ -0,0 +1,77 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* N625836 PCB */
+
+#include "mapinc.h"
+#include "mmc3.h"
+
+static void Mapper455_PRGWrap(uint32 A, uint8 V) {
+	int prgAND =EXPREGS[1] &0x01? 0x1F: 0x0F;
+	int prgOR  =EXPREGS[0] >>2 &0x07 | EXPREGS[1] <<1 &0x08 | EXPREGS[0] >>2 &0x10;
+	if (EXPREGS[0] &0x01) {
+		if (EXPREGS[0] &0x02) {
+			setprg32(0x8000, prgOR >>1);
+		} else {
+			setprg16(0x8000, prgOR);
+			setprg16(0xC000, prgOR);
+		}
+	} else {
+		prgOR <<=1;
+		setprg8(A, V &prgAND | prgOR &~prgAND);
+	}
+}
+
+static void Mapper455_CHRWrap(uint32 A, uint8 V) {
+	int chrAND =EXPREGS[1] &0x02? 0xFF: 0x7F;
+	int chrOR  =(EXPREGS[0] >>2 &0x07 | EXPREGS[1] <<1 &0x08 | EXPREGS[0] >>2 &0x10) <<4;
+	setchr1(A, V &chrAND | chrOR &~chrAND);
+}
+
+static DECLFW(Mapper455_Write) {
+	if (A &0x100) {
+		EXPREGS[0] =V;
+		EXPREGS[1] =A &0xFF;
+		FixMMC3PRG(MMC3_cmd);
+		FixMMC3CHR(MMC3_cmd);
+	}
+}
+
+static void Mapper455_Reset(void) {
+	EXPREGS[0] =1;
+	EXPREGS[1] =0;
+	MMC3RegReset();
+}
+
+static void Mapper455_Power(void) {
+	EXPREGS[0] =1;
+	EXPREGS[1] =0;
+	GenMMC3Power();
+	SetWriteHandler(0x4100, 0x5FFF, Mapper455_Write);
+}
+
+void Mapper455_Init(CartInfo *info) {
+	GenMMC3_Init(info, 256, 256, 0, 0);
+	cwrap = Mapper455_CHRWrap;
+	pwrap = Mapper455_PRGWrap;
+	info->Power = Mapper455_Power;
+	info->Reset = Mapper455_Reset;
+	AddExState(EXPREGS, 2, 0, "EXPR");
+}
diff --git a/src/ines.c b/src/ines.c
index 7755137..63755d7 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -820,6 +820,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "NC-7000M/NC-8000M",        444, Mapper444_Init         )
 	INES_BOARD( "22-in-1 King Series",      449, Mapper449_Init         )
 	INES_BOARD( "DS-9-27",                  452, Mapper452_Init         )
+	INES_BOARD( "N625836",                  455, Mapper455_Init         )
 	INES_BOARD( "K6C3001A",                 456, Mapper456_Init         )
 	INES_BOARD( "8-in-1",                   459, Mapper459_Init         )
 	INES_BOARD( "FC-29-40/K-3101",        	460, Mapper460_Init         )
diff --git a/src/ines.h b/src/ines.h
index ac5cc1c..4f7bbdf 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -328,6 +328,7 @@ void Mapper443_Init(CartInfo *);
 void Mapper444_Init(CartInfo *);
 void Mapper449_Init(CartInfo *);
 void Mapper452_Init(CartInfo *);
+void Mapper455_Init(CartInfo *);
 void Mapper456_Init(CartInfo *);
 void Mapper459_Init(CartInfo *);
 void Mapper460_Init(CartInfo *);

From 2fd8f6c233ca97388049b513b29ea9f40349005a Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 27 Jul 2022 22:01:05 +0200
Subject: [PATCH 264/295] Mapper 351: Correct CHR mask, add FDS-like mirroring
 control

---
 src/boards/351.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/boards/351.c b/src/boards/351.c
index 62fe0fa..6ef4b59 100644
--- a/src/boards/351.c
+++ b/src/boards/351.c
@@ -100,7 +100,7 @@ static void sync () {
 			setprg32(0x8000, (MMC1_reg[3] &prgAND | prgOR &~prgAND) >>1);
 	}
 	
-	chrAND =reg[2] &0x10? 0x1F: reg[2] &0x20? 0x7F: 0xFF;
+	chrAND =reg[2] &0x10 && ~reg[2] &0x20? 0x1F: reg[2] &0x20? 0x7F: 0xFF;
 	chrOR  =reg[0] <<1;
 	if (reg[2] &0x01)  /* CHR RAM mode */
 		setchr8r(0x10, 0);
@@ -265,6 +265,11 @@ static DECLFW(writeReg) {
 	sync();
 }
 
+static DECLFW(writeFDSMirroring) {
+	MMC3_mirroring =V >>3 &1;
+	sync();
+}
+
 static void Mapper351_power(void) {
 	int i;
 	for (i =0; i <4; i++) reg[i] =0;
@@ -281,6 +286,7 @@ static void Mapper351_power(void) {
 	SetReadHandler(0x6000, 0xFFFF, CartBR);
 	SetReadHandler(0x5000, 0x5FFF, readDIP);
 	SetWriteHandler(0x5000, 0x5FFF, writeReg);
+	SetWriteHandler(0x4025, 0x4025, writeFDSMirroring);
 	applyMode();
 	sync();
 }

From e96b1f7db893a16b1c06757a01be66c0eb5db129 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Thu, 28 Jul 2022 21:14:59 +0200
Subject: [PATCH 265/295] Mapper 449: Add DIP switch/solder pad functionality

---
 src/boards/449.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/boards/449.c b/src/boards/449.c
index bcb17d9..f07ebb4 100644
--- a/src/boards/449.c
+++ b/src/boards/449.c
@@ -22,11 +22,13 @@
 
 static uint16 latchAddr;
 static uint8  latchData;
+static uint8  dipswitch;
 
 static SFORMAT StateRegs[] =
 {
    { &latchAddr, 2, "ADDR" },
    { &latchData, 1, "DATA" },
+   { &latchData, 1, "DIPS" },
    { 0 }
 };
 
@@ -54,6 +56,14 @@ static void Mapper449_Sync(void)
    setmirror(latchAddr &0x002? MI_H: MI_V);
 }
 
+static DECLFR(Mapper449_Read)
+{
+   if (latchAddr &0x200)
+      return CartBR(A | dipswitch);
+   else
+      return CartBR(A);
+}
+
 static DECLFW(Mapper449_WriteLatch)
 {
    latchData =V;
@@ -63,16 +73,18 @@ static DECLFW(Mapper449_WriteLatch)
 
 static void Mapper449_Reset(void)
 {
+   dipswitch =(dipswitch +1) &0xF;
    latchAddr =latchData =0;
    Mapper449_Sync();
 }
 
 static void Mapper449_Power(void)
 {
-   latchAddr =latchData =0;
+   dipswitch =latchAddr =latchData =0;
    Mapper449_Sync();
    SetWriteHandler(0x8000, 0xFFFF, Mapper449_WriteLatch);
-   SetReadHandler(0x6000, 0xFFFF, CartBR);
+   SetReadHandler(0x6000, 0x7FFF, CartBR);
+   SetReadHandler(0x8000, 0xFFFF, Mapper449_Read);
 }
 
 void Mapper449_Init(CartInfo *info)

From 653e58369505e16d187c179a337010f72e5a7239 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Thu, 28 Jul 2022 21:20:25 +0200
Subject: [PATCH 266/295] Mapper 460: Add alternative DIP switch/solder pad
 functionality

---
 src/boards/460.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/boards/460.c b/src/boards/460.c
index 7cbd782..0422a5c 100644
--- a/src/boards/460.c
+++ b/src/boards/460.c
@@ -30,7 +30,7 @@ static DECLFR(Mapper460_ReadOB)
 static void Mapper460_PRGWrap(uint32 A, uint8 V) {
 	int prgAND =0x0F;
 	int prgOR  =EXPREGS[0] <<4;
-	if (EXPREGS[0] &0x20) {
+	if (EXPREGS[0] &0x20 && (EXPREGS[0] !=0x20 || ~EXPREGS[1] &1)) { /* Menu selection by selectively connecting CPU D7 to reg or not */
 		if (~A &0x4000) {
 			setprg8(A,         (EXPREGS[0] &0x10? ~2: ~0) &V &prgAND | prgOR &~prgAND);
 			setprg8(A |0x4000, (EXPREGS[0] &0x10?  2:  0) |V &prgAND | prgOR &~prgAND);

From d3a3cab2d93022ef7b6dcefe43804b614153b89b Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Fri, 29 Jul 2022 22:41:32 +0200
Subject: [PATCH 267/295] Mapper 351: Add NROM-64 mode

---
 src/boards/351.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/boards/351.c b/src/boards/351.c
index 6ef4b59..e8db51c 100644
--- a/src/boards/351.c
+++ b/src/boards/351.c
@@ -68,6 +68,12 @@ static void sync () {
 	int chip   =reg[2] &0x01 && CHRRAM? 0x10: 0x00;
 	
 	if (reg[2] &0x10) { /* NROM mode */
+		if (reg[2] &0x08) { /* NROM-64 */
+			setprg8r(chip, 0x8000, prgOR);
+			setprg8r(chip, 0xA000, prgOR);
+			setprg8r(chip, 0xC000, prgOR);
+			setprg8r(chip, 0xE000, prgOR);
+		} else
 		if (reg[2] &0x04) { /* NROM-128 */
 			setprg16r(chip, 0x8000, prgOR >>1);
 			setprg16r(chip, 0xC000, prgOR >>1);

From 0ce8d972b2339d262667a1997ae964906d061234 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 2 Aug 2022 17:20:02 +0200
Subject: [PATCH 268/295] Mapper 452: Add support for 350-in-1.

---
 src/boards/452.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/boards/452.c b/src/boards/452.c
index 5791e68..5b8b3c9 100644
--- a/src/boards/452.c
+++ b/src/boards/452.c
@@ -25,7 +25,7 @@
 
 static uint8 *WRAM;
 static uint32 WRAMSIZE;
-static uint8 latch[2];
+static uint16 latch[2];
 
 static void Mapper452_Sync(void) {
 	uint8 wramBank = latch[1] >>3 &6 |8;
@@ -37,10 +37,10 @@ static void Mapper452_Sync(void) {
 		setprg8r(0x10, (wramBank ^4) <<12, 0);
 	} else
 	if (latch[1] &8) {
-		setprg8(0x8000, latch[0] >>1 |0);
-		setprg8(0xA000, latch[0] >>1 |1);
-		setprg8(0xC000, latch[0] >>1 |2);
-		setprg8(0xE000, latch[0] >>1 |3 | latch[1] &4);
+		setprg8(0x8000, latch[0] >>1 &~1 |0);
+		setprg8(0xA000, latch[0] >>1 &~1 |1);
+		setprg8(0xC000, latch[0] >>1 &~1 |2);
+		setprg8(0xE000, latch[0] >>1 &~1 |3 | latch[1] &4 | (latch[1] &0x04 && latch[1] &0x40? 8: 0));
 	} else {
 		setprg16(0x8000, latch[0] >>2);
 		setprg16(0xC000, 0);
@@ -52,7 +52,7 @@ static void Mapper452_Sync(void) {
 }
 
 static DECLFW(Mapper452_WriteLatch) {
-	latch[0] =A &0xFF;
+	latch[0] =A &0xFFF;
 	latch[1] =V;
 	Mapper452_Sync();
 	/* Do not relay to CartBW, as RAM mapped to locations other than $8000-$DFFF are not write-enabled. */
@@ -94,5 +94,5 @@ void Mapper452_Init(CartInfo *info) {
 	SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
 	AddExState(WRAM, WRAMSIZE, 0, "WRAM");
 
-	AddExState(&latch, 2, 0, "LATC");
+	AddExState(&latch, 4, 0, "LATC");
 }

From 67c678aaac5f0159b7444ef205b3c6f0b346aaaa Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 3 Aug 2022 15:44:17 +0200
Subject: [PATCH 269/295] Mapper 268: Rewrite and add submapper variants.

---
 src/boards/268.c     | 147 ++++++++++++++++++++++++++++++++++
 src/boards/coolboy.c | 185 -------------------------------------------
 2 files changed, 147 insertions(+), 185 deletions(-)
 create mode 100644 src/boards/268.c
 delete mode 100644 src/boards/coolboy.c

diff --git a/src/boards/268.c b/src/boards/268.c
new file mode 100644
index 0000000..6bfba77
--- /dev/null
+++ b/src/boards/268.c
@@ -0,0 +1,147 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include "mapinc.h"
+#include "mmc3.h"
+
+static uint8 *CHRRAM =NULL;
+static uint8 submapper;
+
+static void Mapper268_PRGWrap(uint32 A, uint8 V) {
+	int prgMaskMMC3, prgMaskGNROM, prgOffset;
+	
+	prgMaskMMC3 =(EXPREGS[3] &0x10? 0x00: 0x0F) // PRG A13-A16
+	            |(EXPREGS[0] &0x40? 0x00: 0x10) // PRG A17
+	            |(EXPREGS[1] &0x80? 0x00: 0x20) // PRG A18
+	            |(EXPREGS[1] &0x40? 0x40: 0x00) // PRG A19
+	            |(EXPREGS[1] &0x20? 0x80: 0x00) // PRG A20
+	;
+	switch(submapper &~1) {
+	default:	/* Original implementation */
+		prgMaskGNROM =EXPREGS[3] &0x10? (EXPREGS[1] &0x02? 0x03: 0x01): 0x00;
+		prgOffset    =EXPREGS[3]     &0x00E
+		             |EXPREGS[0] <<4 &0x070
+			     |EXPREGS[1] <<3 &0x080
+			     |EXPREGS[1] <<6 &0x300
+			     |EXPREGS[0] <<6 &0xC00;
+		break;
+	case 2:		/* Later revision with different arrangement of register 1 */
+		prgMaskGNROM =EXPREGS[3] &0x10? (EXPREGS[1] &0x10? 0x01: 0x03): 0x00;
+		prgOffset    =EXPREGS[3]     &0x00E
+		             |EXPREGS[0] <<4 &0x070
+			     |EXPREGS[1] <<4 &0x080
+			     |EXPREGS[1] <<7 &0x300
+			     |EXPREGS[0] <<6 &0xC00;
+		break;
+	case 4:		/* LD622D: PRG A20-21 moved to register 0 */
+		prgMaskGNROM =EXPREGS[3] &0x10? (EXPREGS[1] &0x10? 0x01: 0x03): 0x00;
+		prgOffset    =EXPREGS[3]     &0x00E
+		             |EXPREGS[0] <<4 &0x070
+			     |EXPREGS[0] <<3 &0x180;
+		break;
+	case 6:		/* J-852C: CHR A17 selects between two PRG chips */
+		prgMaskGNROM =EXPREGS[3] &0x10? (EXPREGS[1] &0x02? 0x03: 0x01): 0x00;
+		prgOffset    =EXPREGS[3]     &0x00E
+		             |EXPREGS[0] <<4 &0x070
+			     |EXPREGS[1] <<3 &0x080
+			     |EXPREGS[1] <<6 &0x300
+			     |EXPREGS[0] <<6 &0xC00;
+		prgOffset &=ROM_size -1;
+		if (EXPREGS[0] &0x80? !!(EXPREGS[0] &0x08): !!(DRegBuf[0] &0x80)) prgOffset |=ROM_size;
+		break;
+	}
+	prgOffset &=~(prgMaskMMC3 | prgMaskGNROM);
+	setprg8(A, V &prgMaskMMC3 | prgOffset | A >>13 &prgMaskGNROM);	
+}
+
+static void Mapper268_CHRWrap(uint32 A, uint8 V) {
+	int chrMaskMMC3, chrMaskGNROM, chrOffset;
+	
+	chrMaskMMC3  =EXPREGS[3] &0x10? 0x00: EXPREGS[0] &0x80? 0x7F: 0xFF;
+	chrMaskGNROM =EXPREGS[3] &0x10? 0x07: 0x00;
+	chrOffset    =EXPREGS[0] <<4 &0x380 | EXPREGS[2] <<3 &0x078;
+	chrOffset   &=~(chrMaskMMC3 | chrMaskGNROM);
+	
+	setchr1r(CHRRAM && EXPREGS[4] &0x01 && (V &0xFE) ==(EXPREGS[4] &0xFE)? 0x10: 0x00, A, V &chrMaskMMC3 | chrOffset | A >>10 &chrMaskGNROM);
+}
+
+static DECLFR(Mapper268_ReadWRAM) {
+	return A001B &0xA0? CartBR(A): X.DB;
+}
+
+static DECLFW(Mapper268_WriteWRAM) {
+	if (A001B &0x80 && ~A001B &0x40 || A001B &0x20) CartBW(A, V);
+}
+
+static DECLFW(Mapper268_WriteReg) {
+	if (~EXPREGS[3] &0x80 || EXPREGS[3] &0x10) {
+		EXPREGS[A &7] =V;
+		FixMMC3PRG(MMC3_cmd);
+		FixMMC3CHR(MMC3_cmd);
+	}
+	if (~submapper &1) Mapper268_WriteWRAM(A, V);
+}
+
+static void Mapper268_Reset(void) {
+	EXPREGS[0] =EXPREGS[1] =EXPREGS[2] =EXPREGS[3] =EXPREGS[4] =EXPREGS[5] =0;
+	MMC3RegReset();
+}
+
+static void Mapper268_Power(void) {	
+	EXPREGS[0] =EXPREGS[1] =EXPREGS[2] =EXPREGS[3] =EXPREGS[4] =EXPREGS[5] =0;
+	GenMMC3Power();
+	SetReadHandler(0x6000, 0x7FFF, Mapper268_ReadWRAM);
+	if (submapper &1) {
+		SetWriteHandler(0x5000, 0x5FFF, Mapper268_WriteReg);
+		SetWriteHandler(0x6000, 0x7FFF, Mapper268_WriteWRAM);
+	} else
+		SetWriteHandler(0x6000, 0x7FFF, Mapper268_WriteReg);
+}
+
+static void Mapper268_close(void) {
+	if (CHRRAM) FCEU_gfree(CHRRAM);
+	CHRRAM =NULL;
+}
+
+void Mapper268_Init(CartInfo *info) {
+	submapper = info->submapper;
+	GenMMC3_Init(info, 512, 256, (info->PRGRamSize +info->PRGRamSaveSize) >>10, info->battery);
+	cwrap = Mapper268_CHRWrap;
+	pwrap = Mapper268_PRGWrap;
+	info->Power = Mapper268_Power;
+	info->Reset = Mapper268_Reset;
+	info->Close = Mapper268_close;
+	AddExState(EXPREGS, 8, 0, "EXPR");
+	
+	if (info->CHRRomSize && info->CHRRamSize + info->CHRRamSaveSize) {
+		CHRRAM =(uint8 *)FCEU_gmalloc(info->CHRRamSize + info->CHRRamSaveSize);
+		SetupCartCHRMapping(0x10, CHRRAM, info->CHRRamSize + info->CHRRamSaveSize, 1);
+		AddExState(CHRRAM, info->CHRRamSize + info->CHRRamSaveSize, 0, "CRAM");
+	}
+}
+
+void COOLBOY_Init(CartInfo *info) {
+	info->submapper =0;
+	Mapper268_Init(info);
+}
+
+void MINDKIDS_Init(CartInfo *info) {
+	info->submapper =1;
+	Mapper268_Init(info);
+}
diff --git a/src/boards/coolboy.c b/src/boards/coolboy.c
deleted file mode 100644
index 357cd2a..0000000
--- a/src/boards/coolboy.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2015 CaH4e3, ClusteR
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * CoolBoy 400-in-1 FK23C-mimic mapper 16Mb/32Mb PROM + 128K/256K CHR RAM, optional SRAM, optional NTRAM
- * only MMC3 mode
- *
- * 6000 (xx76x210) | 0xC0
- * 6001 (xxx354x)
- * 6002 = 0
- * 6003 = 0
- *
- * hardware tested logic, don't try to understand lol
- */
-
-#include "mapinc.h"
-#include "mmc3.h"
-
-static void COOLBOYCW(uint32 A, uint8 V) {
-	uint32 mask = 0xFF ^ (EXPREGS[0] & 0x80);
-	if (EXPREGS[3] & 0x10) {
-		if (EXPREGS[3] & 0x40) { /* Weird mode */
-			int cbase = (MMC3_cmd & 0x80) << 5;
-			switch (cbase ^ A) { /* Don't even try to understand */
-			case 0x0400:
-			case 0x0C00: V &= 0x7F; break;
-			}
-		}
-		/* Highest bit goes from MMC3 registers when EXPREGS[3]&0x80==0 or from EXPREGS[0]&0x08 otherwise */
-		setchr1(A,
-			(V & 0x80 & mask) | ((((EXPREGS[0] & 0x08) << 4) & ~mask)) /* 7th bit */
-			| ((EXPREGS[2] & 0x0F) << 3) /* 6-3 bits */
-			| ((A >> 10) & 7) /* 2-0 bits */
-		);
-	} else {
-		if (EXPREGS[3] & 0x40) { /* Weird mode, again */
-			int cbase = (MMC3_cmd & 0x80) << 5;
-			switch (cbase ^ A) { /* Don't even try to understand */
-			case 0x0000: V = DRegBuf[0]; break;
-			case 0x0800: V = DRegBuf[1]; break;
-			case 0x0400:
-			case 0x0C00: V = 0; break;
-			}
-		}
-		/* Simple MMC3 mode
-		 * Highest bit goes from MMC3 registers when EXPREGS[3]&0x80==0 or from EXPREGS[0]&0x08 otherwise
-		 */
-		setchr1(A, (V & mask) | (((EXPREGS[0] & 0x08) << 4) & ~mask));
-	}
-}
-
-static void COOLBOYPW(uint32 A, uint8 V) {
-	uint32 mask = ((0x3F | (EXPREGS[1] & 0x40) | ((EXPREGS[1] & 0x20) << 2)) ^ ((EXPREGS[0] & 0x40) >> 2)) ^ ((EXPREGS[1] & 0x80) >> 2);
-	uint32 base = ((EXPREGS[0] & 0x07) >> 0) | ((EXPREGS[1] & 0x10) >> 1) | ((EXPREGS[1] & 0x0C) << 2) | ((EXPREGS[0] & 0x30) << 2);
-
-	/* Very weird mode
-	 * Last banks are first in this mode, ignored when MMC3_cmd&0x40
-	 */
-	if ((EXPREGS[3] & 0x40) && (V >= 0xFE) && !((MMC3_cmd & 0x40) != 0)) {
-		switch (A & 0xE000) {
-		case 0xA000:
-			if ((MMC3_cmd & 0x40)) V = 0;
-			break;
-		case 0xC000:
-			if (!(MMC3_cmd & 0x40)) V = 0;
-			break;
-		case 0xE000:
-			V = 0;
-			break;
-		}
-	}
-
-	/* Regular MMC3 mode, internal ROM size can be up to 2048kb! */
-	if (!(EXPREGS[3] & 0x10))
-		setprg8(A, (((base << 4) & ~mask)) | (V & mask));
-	else { /* NROM mode */
-		uint8 emask;
-		mask &= 0xF0;
-		if ((((EXPREGS[1] & 2) != 0))) /* 32kb mode */
-			emask = (EXPREGS[3] & 0x0C) | ((A & 0x4000) >> 13);
-		else /* 16kb mode */
-			emask = EXPREGS[3] & 0x0E;
-		setprg8(A, ((base << 4) & ~mask)   /* 7-4 bits are from base (see below) */
-			| (V & mask)                   /* ... or from MM3 internal regs, depends on mask */
-			| emask                        /* 3-1 (or 3-2 when (EXPREGS[3]&0x0C is set) from EXPREGS[3] */
-			| ((A & 0x2000) >> 13));       /* 0th just as is */
-	}
-}
-
-static DECLFW(COOLBOYWrite) {
-	if(A001B & 0x80)
-		CartBW(A,V);
-
-	/* Deny any further writes when 7th bit is 1 AND 4th is 0 */
-	if ((EXPREGS[3] & 0x90) != 0x80) {
-		EXPREGS[A & 3] = V;
-		FixMMC3PRG(MMC3_cmd);
-		FixMMC3CHR(MMC3_cmd);
-	}
-}
-
-static void COOLBOYReset(void) {
-	MMC3RegReset();
-	EXPREGS[0] = EXPREGS[1] = EXPREGS[2] = EXPREGS[3] = 0;
-#if 0
-	EXPREGS[0] = 0;
-	EXPREGS[1] = 0x60;
-	EXPREGS[2] = 0;
-	EXPREGS[3] = 0;
-#endif
-	FixMMC3PRG(MMC3_cmd);
-	FixMMC3CHR(MMC3_cmd);
-}
-
-static void COOLBOYPower(void) {
-	GenMMC3Power();
-	EXPREGS[0] = EXPREGS[1] = EXPREGS[2] = EXPREGS[3] = 0;
-#if 0
-	EXPREGS[0] = 0;
-	EXPREGS[1] = 0x60;
-	EXPREGS[2] = 0;
-	EXPREGS[3] = 0;
-#endif
-	FixMMC3PRG(MMC3_cmd);
-	FixMMC3CHR(MMC3_cmd);
-	SetWriteHandler(0x5000, 0x5fff, CartBW);            /* some games access random unmapped areas and crashes because of KT-008 PCB hack in MMC3 source lol */
-	SetWriteHandler(0x6000, 0x7fff, COOLBOYWrite);
-}
-
-void COOLBOY_Init(CartInfo *info) {
-	GenMMC3_Init(info, 512, 256, 8, 0);
-	pwrap = COOLBOYPW;
-	cwrap = COOLBOYCW;
-	info->Power = COOLBOYPower;
-	info->Reset = COOLBOYReset;
-	AddExState(EXPREGS, 4, 0, "EXPR");
-}
-
-/*------------------ MINDKIDS ---------------------------*/
-/* A COOLBOY variant that works identically but puts the outer bank registers
- * in the $5xxx range instead of the $6xxx range.
- * The UNIF board name is MINDKIDS (submapper 1).
- * http://wiki.nesdev.com/w/index.php/NES_2.0_Mapper_268
- */
-
-static void MINDKIDSPower(void) {
-	GenMMC3Power();
-	EXPREGS[0] = EXPREGS[1] = EXPREGS[2] = EXPREGS[3] = 0;
-	FixMMC3PRG(MMC3_cmd);
-	FixMMC3CHR(MMC3_cmd);
-	SetWriteHandler(0x5000, 0x5fff, COOLBOYWrite);
-}
-
-void MINDKIDS_Init(CartInfo *info) {
-	GenMMC3_Init(info, 2048, 256, 8, info->battery);
-	pwrap = COOLBOYPW;
-	cwrap = COOLBOYCW;
-	info->Power = MINDKIDSPower;
-	info->Reset = COOLBOYReset;
-	AddExState(EXPREGS, 4, 0, "EXPR");
-}
-
-void Mapper268_Init(CartInfo *info) {
-	/* Technically, the distinction between COOLBOY ($6000-$7FFF) and MINDKIDS ($5000-$5FFF) is based on a solder pad setting. */
-	/* In NES 2.0, the submapper field is used to distinguish between the two settings. */
-	if (info->submapper == 1)
-		MINDKIDS_Init(info);
-	else
-		COOLBOY_Init(info);
-}

From 91867b9844424c5d39a88b2ec2c446c81a278a03 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 3 Aug 2022 15:47:05 +0200
Subject: [PATCH 270/295] Mapper 268: Add GenMMC3Close() to Mapper268_close().

---
 src/boards/268.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/boards/268.c b/src/boards/268.c
index 6bfba77..8e76a94 100644
--- a/src/boards/268.c
+++ b/src/boards/268.c
@@ -117,6 +117,7 @@ static void Mapper268_Power(void) {
 static void Mapper268_close(void) {
 	if (CHRRAM) FCEU_gfree(CHRRAM);
 	CHRRAM =NULL;
+	GenMMC3Close();
 }
 
 void Mapper268_Init(CartInfo *info) {

From f3f1e1f916d1dfa4dac994d6db7cea1d1ce58097 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Thu, 4 Aug 2022 17:22:23 +0200
Subject: [PATCH 271/295] Mapper 268: Correct GNROM mask for submapper 4,
 correctly apply CHR mask bits in register 2.

---
 src/boards/268.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/boards/268.c b/src/boards/268.c
index 8e76a94..c1363aa 100644
--- a/src/boards/268.c
+++ b/src/boards/268.c
@@ -50,7 +50,7 @@ static void Mapper268_PRGWrap(uint32 A, uint8 V) {
 			     |EXPREGS[0] <<6 &0xC00;
 		break;
 	case 4:		/* LD622D: PRG A20-21 moved to register 0 */
-		prgMaskGNROM =EXPREGS[3] &0x10? (EXPREGS[1] &0x10? 0x01: 0x03): 0x00;
+		prgMaskGNROM =EXPREGS[3] &0x10? (EXPREGS[1] &0x02? 0x03: 0x01): 0x00;
 		prgOffset    =EXPREGS[3]     &0x00E
 		             |EXPREGS[0] <<4 &0x070
 			     |EXPREGS[0] <<3 &0x180;
@@ -90,8 +90,13 @@ static DECLFW(Mapper268_WriteWRAM) {
 }
 
 static DECLFW(Mapper268_WriteReg) {
-	if (~EXPREGS[3] &0x80 || EXPREGS[3] &0x10) {
-		EXPREGS[A &7] =V;
+	int index =A &7;
+	if (~EXPREGS[3] &0x80 || index ==2) {
+		if (index ==2) {
+			if (EXPREGS[2] &0x80) V =V &0x0F | EXPREGS[2] &~0x0F;
+			V &=~EXPREGS[2] >>3 &0xE |0xF1;
+		}		
+		EXPREGS[index] =V;
 		FixMMC3PRG(MMC3_cmd);
 		FixMMC3CHR(MMC3_cmd);
 	}

From 24bc7a43bd38970d2fb45e315d7e3f394371de7c Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Thu, 4 Aug 2022 21:46:42 +0200
Subject: [PATCH 272/295] Mapper 432: Add 1 MiB variant

---
 src/boards/432.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/boards/432.c b/src/boards/432.c
index dbdffa0..eba55d0 100644
--- a/src/boards/432.c
+++ b/src/boards/432.c
@@ -25,26 +25,26 @@
 
 static void M432CW(uint32 A, uint8 V) {
 	int chrAND = (EXPREGS[1] & 0x04) ? 0x7F : 0xFF;
-	int chrOR  = (EXPREGS[1] << 7) & 0x080 | (EXPREGS[1] << 5) & 0x100;
+	int chrOR  = (EXPREGS[1] << 7) & 0x080 | (EXPREGS[1] << 5) & 0x100 | (EXPREGS[1] << 4) & 0x200;
 	setchr1(A, (V & chrAND) | (chrOR & ~chrAND));
 }
 
 static void M432PW(uint32 A, uint8 V) {
 	int prgAND = (EXPREGS[1] & 0x02) ? 0x0F : 0x1F;
-	int prgOR  = ((EXPREGS[1] << 4) & 0x10) | (EXPREGS[1] << 1) & 0x20;
+	int prgOR  = ((EXPREGS[1] << 4) & 0x10) | (EXPREGS[1] << 1) & 0x60;
 	if ((A < 0xC000) || (~EXPREGS[1] & 0x40)) setprg8(A,          (V & prgAND) | (prgOR & ~prgAND) & (EXPREGS[1] & 0x80?~2:~0));
 	if ((A < 0xC000) &&  (EXPREGS[1] & 0x40)) setprg8(A | 0x4000, (V & prgAND) | (prgOR & ~prgAND) | (EXPREGS[1] & 0x80? 2: 0));
 }
 
 static DECLFR(M432Read) {
-   if (EXPREGS[0] & 1 || EXPREGS[1] & 0x20)
+   if (EXPREGS[0] & 1 || EXPREGS[1] & 0x20 && ROM_size <64)
 	  return EXPREGS[2];
    return CartBR(A);
 }
 
 static DECLFW(M432Write) {
 	EXPREGS[A & 1] = V;
-	if (~A &1 && ~V &1) EXPREGS[1] &=~0x20; /* Writing 0 to register 0 clears register 1's DIP bit */
+	if (~A &1 && ~V &1 && ROM_size <64) EXPREGS[1] &=~0x20; /* Writing 0 to register 0 clears register 1's DIP bit */
 	FixMMC3PRG(MMC3_cmd);
 	FixMMC3CHR(MMC3_cmd);
 }

From 6d13706e53621acbff901b6e9d609ca13b9e3192 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Sat, 6 Aug 2022 17:29:24 +0200
Subject: [PATCH 273/295] Add mapper 52 submapper 13 (CHR-ROM+CHR-RAM)

---
 src/boards/mmc3.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/boards/mmc3.c b/src/boards/mmc3.c
index 633f0b5..b90e7cb 100644
--- a/src/boards/mmc3.c
+++ b/src/boards/mmc3.c
@@ -659,7 +659,10 @@ static void M52CW(uint32 A, uint8 V) {
 	uint32 mask = 0xFF ^ ((EXPREGS[0] & 0x40) << 1);
 /*	uint32 bank = (((EXPREGS[0]>>3)&4)|((EXPREGS[0]>>1)&2)|((EXPREGS[0]>>6)&(EXPREGS[0]>>4)&1))<<7; */
 	uint32 bank = (((EXPREGS[0] >> 4) & 2) | (EXPREGS[0] & 4) | ((EXPREGS[0] >> 6) & (EXPREGS[0] >> 4) & 1)) << 7;	/* actually 256K CHR banks index bits is inverted! */
-	setchr1(A, bank | (V & mask));
+	if (CHRRAM && (EXPREGS[0] &3) ==3)
+		setchr1r(0x10, A, bank | (V & mask));
+	else
+		setchr1(A, bank | (V & mask));
 }
 
 static DECLFW(M52Write) {
@@ -691,6 +694,12 @@ void Mapper52_Init(CartInfo *info) {
 	info->Reset = M52Reset;
 	info->Power = M52Power;
 	AddExState(EXPREGS, 2, 0, "EXPR");
+	if (info->iNES2 && info->submapper ==13) {
+		CHRRAMSIZE = 8192;
+		CHRRAM = (uint8*)FCEU_gmalloc(CHRRAMSIZE);
+		SetupCartCHRMapping(0x10, CHRRAM, CHRRAMSIZE, 1);
+		AddExState(CHRRAM, CHRRAMSIZE, 0, "CHRR");		
+	}
 }
 
 /* ---------------------------- Mapper 76 ------------------------------- */

From b8517ef63771908d392bb18c35fcfca9e50e3240 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 16 Aug 2022 22:08:43 +0200
Subject: [PATCH 274/295] Mapper 268: correct comment style

---
 src/boards/268.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/boards/268.c b/src/boards/268.c
index c1363aa..b5514f7 100644
--- a/src/boards/268.c
+++ b/src/boards/268.c
@@ -26,11 +26,11 @@ static uint8 submapper;
 static void Mapper268_PRGWrap(uint32 A, uint8 V) {
 	int prgMaskMMC3, prgMaskGNROM, prgOffset;
 	
-	prgMaskMMC3 =(EXPREGS[3] &0x10? 0x00: 0x0F) // PRG A13-A16
-	            |(EXPREGS[0] &0x40? 0x00: 0x10) // PRG A17
-	            |(EXPREGS[1] &0x80? 0x00: 0x20) // PRG A18
-	            |(EXPREGS[1] &0x40? 0x40: 0x00) // PRG A19
-	            |(EXPREGS[1] &0x20? 0x80: 0x00) // PRG A20
+	prgMaskMMC3 =(EXPREGS[3] &0x10? 0x00: 0x0F) /* PRG A13-A16 */
+	            |(EXPREGS[0] &0x40? 0x00: 0x10) /* PRG A17     */
+	            |(EXPREGS[1] &0x80? 0x00: 0x20) /* PRG A18     */
+	            |(EXPREGS[1] &0x40? 0x40: 0x00) /* PRG A19     */
+	            |(EXPREGS[1] &0x20? 0x80: 0x00) /* PRG A20     */
 	;
 	switch(submapper &~1) {
 	default:	/* Original implementation */

From f9c9557f447b40db95805be9ae3e868201d7ca0f Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Wed, 17 Aug 2022 21:59:46 +0200
Subject: [PATCH 275/295] Mapper 40: Add multicart variant

---
 src/boards/40.c | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/boards/40.c b/src/boards/40.c
index 80d1ad0..e64c16d 100644
--- a/src/boards/40.c
+++ b/src/boards/40.c
@@ -2,6 +2,7 @@
  *
  * Copyright notice for this file:
  *  Copyright (C) 2012 CaH4e3
+ *  Copyright (C) 2022 NewRisingSun
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +24,8 @@
 
 #include "mapinc.h"
 
-static uint8 reg;
+static uint8 submapper;
+static uint8 reg, outer;
 static uint32 IRQCount, IRQa;
 
 static SFORMAT StateRegs[] =
@@ -31,34 +33,51 @@ static SFORMAT StateRegs[] =
 	{ &IRQCount, 4, "IRQC" },
 	{ &IRQa, 4, "IRQA" },
 	{ &reg, 1, "REG" },
+	{ &reg, 1, "OUTE" },
 	{ 0 }
 };
 
 static void Sync(void) {
-	setprg8(0x6000, ~1);
-	setprg8(0x8000, ~3);
-	setprg8(0xa000, ~2);
-	setprg8(0xc000, reg);
-	setprg8(0xe000, ~0);
-	setchr8(0);
+	if (outer &0x08) {
+		if (outer &0x10)
+			setprg32(0x8000, 2 | outer >>6);
+		else {
+			setprg16(0x8000, 4 | outer >>5);
+			setprg16(0xC000, 4 | outer >>5);
+		}
+	} else {
+		setprg8(0x6000, 6);
+		setprg8(0x8000, 4);
+		setprg8(0xa000, 5);
+		setprg8(0xc000, reg &7);
+		setprg8(0xe000, 7);
+	}
+	setchr8(outer >>1);
+	setmirror(outer &1? MI_H: MI_V);
 }
 
 static DECLFW(M40Write) {
 	switch (A & 0xe000) {
 	case 0x8000: IRQa = 0; IRQCount = 0; X6502_IRQEnd(FCEU_IQEXT); break;
 	case 0xa000: IRQa = 1; break;
+	case 0xc000: if (submapper ==1) { outer =A &0xFF; Sync(); } break;
 	case 0xe000: reg = V & 7; Sync(); break;
 	}
 }
 
 static void M40Power(void) {
 	reg = 0;
+	outer = 0;
+	IRQa = 0;
+	X6502_IRQEnd(FCEU_IQEXT);
 	Sync();
 	SetReadHandler(0x6000, 0xffff, CartBR);
 	SetWriteHandler(0x8000, 0xffff, M40Write);
 }
 
 static void M40Reset(void) {
+	outer = 0;
+	Sync();
 }
 
 static void FP_FASTAPASS(1) M40IRQHook(int a) {
@@ -77,6 +96,7 @@ static void StateRestore(int version) {
 }
 
 void Mapper40_Init(CartInfo *info) {
+	submapper =info->submapper;
 	info->Reset = M40Reset;
 	info->Power = M40Power;
 	MapIRQHook = M40IRQHook;

From 1dda0a07058cd5c32609be7496c7976d31394f47 Mon Sep 17 00:00:00 2001
From: Carlos O'Connor <carlos.oconnor88@gmail.com>
Date: Sat, 27 Aug 2022 23:01:26 -0500
Subject: [PATCH 276/295] Add sequential targets light gun support

Support for Sequential targets Light Guns has been added. "Gun Aux A" serves as light sensor logic input.
---
 README.md                                     |    2 +
 src/drivers/libretro/libretro.c               |   89 +-
 src/drivers/libretro/libretro_core_options.h  |   33 +-
 .../libretro/libretro_core_options_intl.h     | 1480 +++++++++++++++--
 src/input/zapper.c                            |  149 +-
 5 files changed, 1559 insertions(+), 194 deletions(-)

diff --git a/README.md b/README.md
index 3c1d4d7..a7f8997 100644
--- a/README.md
+++ b/README.md
@@ -4,3 +4,5 @@
 # FCE Ultra mappers modified
 FCEU "mappers modified" is an unofficial build of FCEU Ultra by CaH4e3, which supports a lot of new mappers including some obscure mappers such as one for unlicensed NES ROM's.
 
+# Sequential targets Light Guns support added
+Support for Sequential targets Light Guns has been added. "Gun Aux A" serves as light sensor logic input.
\ No newline at end of file
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 3f3cae0..ab3ad9b 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -47,17 +47,17 @@
 #define MAX_PORTS 2   /* max controller ports,
                        * port 0 for player 1/3, port 1 for player 2/4 */
 
-#define RETRO_DEVICE_AUTO        RETRO_DEVICE_JOYPAD
-#define RETRO_DEVICE_GAMEPAD     RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 1)
-#define RETRO_DEVICE_ZAPPER      RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_MOUSE,  0)
-#define RETRO_DEVICE_ARKANOID    RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_MOUSE,  1)
+#define RETRO_DEVICE_AUTO         RETRO_DEVICE_JOYPAD
+#define RETRO_DEVICE_GAMEPAD      RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 1)
+#define RETRO_DEVICE_ZAPPER       RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_MOUSE,  0)
+#define RETRO_DEVICE_ARKANOID     RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_MOUSE,  1)
 
-#define RETRO_DEVICE_FC_ARKANOID RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_MOUSE,  2)
-#define RETRO_DEVICE_FC_OEKAKIDS RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_MOUSE,  3)
-#define RETRO_DEVICE_FC_SHADOW   RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_MOUSE,  4)
-#define RETRO_DEVICE_FC_4PLAYERS RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 2)
+#define RETRO_DEVICE_FC_ARKANOID  RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_MOUSE,  2)
+#define RETRO_DEVICE_FC_OEKAKIDS  RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_MOUSE,  3)
+#define RETRO_DEVICE_FC_SHADOW    RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_MOUSE,  4)
+#define RETRO_DEVICE_FC_4PLAYERS  RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 2)
 #define RETRO_DEVICE_FC_HYPERSHOT RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 3)
-#define RETRO_DEVICE_FC_AUTO     RETRO_DEVICE_JOYPAD
+#define RETRO_DEVICE_FC_AUTO      RETRO_DEVICE_JOYPAD
 
 #define NES_WIDTH   256
 #define NES_HEIGHT  240
@@ -141,14 +141,15 @@ typedef struct {
    uint32_t type[MAX_PLAYERS + 1];     /* 4-players + famicom expansion */
 
    /* input data */
-   uint32_t JSReturn;                  /* player input data, 1 byte per player (1-4) */
-   uint32_t MouseData[MAX_PORTS][3];   /* nes mouse data */
-   uint32_t FamicomData[3];            /* Famicom expansion port data */
+   uint32_t JSReturn;                     /* player input data, 1 byte per player (1-4) */
+   uint32_t MouseData[MAX_PORTS][4];      /* nes mouse data */
+   uint32_t FamicomData[3];               /* Famicom expansion port data */
 } NES_INPUT_T;
 
 static NES_INPUT_T nes_input = { 0 };
-enum RetroZapperInputModes{RetroLightgun, RetroMouse, RetroPointer};
-static enum RetroZapperInputModes zappermode = RetroLightgun;
+enum RetroZapperInputModes{RetroCLightgun, RetroSTLightgun, RetroMouse, RetroPointer};
+enum RetroZapperInputModes zappermode = RetroCLightgun;
+extern int switchZapper;
 
 static bool libretro_supports_bitmasks = false;
 static bool libretro_supports_option_categories = false;
@@ -206,6 +207,8 @@ extern CartInfo iNESCart;
 extern CartInfo UNIFCart;
 extern int show_crosshair;
 extern int option_ramstate;
+extern int zapper_trigger_invert_option;
+extern int zapper_sensor_invert_option;
 
 /* emulator-specific callback functions */
 
@@ -1949,9 +1952,22 @@ static void check_variables(bool startup)
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
-      if (!strcmp(var.value, "mouse")) zappermode = RetroMouse;
-      else if (!strcmp(var.value, "touchscreen")) zappermode = RetroPointer;
-      else zappermode = RetroLightgun; /*default setting*/
+      if (!strcmp(var.value, "mouse")) {
+         zappermode = RetroMouse;
+         switchZapper = 0;
+      }
+      else if (!strcmp(var.value, "touchscreen")) {
+         zappermode = RetroPointer;
+         switchZapper = 0;
+      }
+      else if (!strcmp(var.value, "stlightgun")) {
+         zappermode = RetroSTLightgun;
+         switchZapper = 1;
+      }
+      else {
+         zappermode = RetroCLightgun; /*default setting*/
+         switchZapper = 0;
+      }
    }
 
    var.key = "fceumm_zapper_tolerance";
@@ -1969,6 +1985,22 @@ static void check_variables(bool startup)
       else if (!strcmp(var.value, "disabled")) show_crosshair = 0;
    }
 
+   var.key = "fceumm_zapper_trigger";
+
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+   {
+      if (!strcmp(var.value, "enabled")) zapper_trigger_invert_option = 1;
+      else if (!strcmp(var.value, "disabled")) zapper_trigger_invert_option = 0;
+   }
+
+   var.key = "fceumm_zapper_sensor";
+
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+   {
+      if (!strcmp(var.value, "enabled")) zapper_sensor_invert_option = 1;
+      else if (!strcmp(var.value, "disabled")) zapper_sensor_invert_option = 0;
+   }
+
 #ifdef PSP
    var.key = "fceumm_overscan";
 
@@ -2195,6 +2227,9 @@ void get_mouse_input(unsigned port, uint32_t *zapdata)
 
    if (zappermode == RetroMouse) /* mouse device */
    {
+      int mouse_Lbutton;
+      int mouse_Rbutton;
+
       min_width   = (adjx ? 8 : 0) + 1;
       min_height  = (adjy ? 8 : 0) + 1;
       max_width  -= (adjx ? 8 : 0);
@@ -2213,10 +2248,13 @@ void get_mouse_input(unsigned port, uint32_t *zapdata)
 
       zapdata[0] = mzx;
       zapdata[1] = mzy;
+      
+      mouse_Lbutton = input_cb(port, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_LEFT);
+      mouse_Rbutton = input_cb(port, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_RIGHT);
 
-      if (input_cb(port, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_LEFT))
+      if (mouse_Lbutton)
          zapdata[2] |= 0x1;
-      if (input_cb(port, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_RIGHT))
+      if (mouse_Rbutton)
          zapdata[2] |= 0x2;
    }
    else if (zappermode == RetroPointer) {
@@ -2240,7 +2278,7 @@ void get_mouse_input(unsigned port, uint32_t *zapdata)
       if (input_cb(port, RETRO_DEVICE_POINTER, 0, RETRO_DEVICE_ID_POINTER_PRESSED))
          zapdata[2] |= 0x1;
    }
-   else /* lightgun device */
+   else  if (zappermode == RetroCLightgun) /* Crosshair lightgun device */
    {
       int offset_x = (adjx ? 0X8FF : 0);
       int offset_y = (adjy ? 0X999 : 0);
@@ -2259,8 +2297,8 @@ void get_mouse_input(unsigned port, uint32_t *zapdata)
       }
       else
       {
-         int _x = input_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X);
-         int _y = input_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y);
+         int _x = input_cb( port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X );
+         int _y = input_cb( port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y );
 
          zapdata[0] = (_x + (0x7FFF + offset_x)) * max_width  / ((0x7FFF + offset_x) * 2);
          zapdata[1] = (_y + (0x7FFF + offset_y)) * max_height  / ((0x7FFF + offset_y) * 2);
@@ -2269,6 +2307,11 @@ void get_mouse_input(unsigned port, uint32_t *zapdata)
       if ( trigger || offscreen_shot )
          zapdata[2] |= 0x1;
    }
+   else /* Sequential targets lightgun device integration */
+   {
+      zapdata[2] = input_cb( port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_TRIGGER );
+      zapdata[3] = input_cb( port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_AUX_A );
+   }
 }
 
 static void FCEUD_UpdateInput(void)
@@ -2415,7 +2458,7 @@ static void FCEUD_UpdateInput(void)
       {
          case RETRO_DEVICE_ARKANOID:
          case RETRO_DEVICE_ZAPPER:
-            get_mouse_input(port, nes_input.MouseData[port]);
+               get_mouse_input(port, nes_input.MouseData[port]);
             break;
       }
    }
diff --git a/src/drivers/libretro/libretro_core_options.h b/src/drivers/libretro/libretro_core_options.h
index bf243f3..92729da 100644
--- a/src/drivers/libretro/libretro_core_options.h
+++ b/src/drivers/libretro/libretro_core_options.h
@@ -468,12 +468,13 @@ struct retro_core_option_v2_definition option_defs[] = {
       NULL,
       "input",
       {
-         { "lightgun",    "Light gun" },
+         { "clightgun",   "Crosshair light gun" },
+         { "stlightgun",  "Sequential Targets light gun" },
          { "touchscreen", "Touchscreen" },
          { "mouse",       "Mouse" },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -522,6 +523,34 @@ struct retro_core_option_v2_definition option_defs[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger",
+      "Invert Zapper Trigger Signal",
+      NULL,
+      "Inverts trigger logic when using a Zapper. Disabling it resembles original hardware behavior.",
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor",
+      "Invert Zapper Sensor Signal",
+      NULL,
+      "Inverts sensor logic when using a Zapper (Sequential Targets Light gun mode only). Disabling it resembles original NES/FC hardware behavior.",
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       "Allow Opposing Directions",
diff --git a/src/drivers/libretro/libretro_core_options_intl.h b/src/drivers/libretro/libretro_core_options_intl.h
index 6df3209..f59ce1c 100644
--- a/src/drivers/libretro/libretro_core_options_intl.h
+++ b/src/drivers/libretro/libretro_core_options_intl.h
@@ -147,13 +147,18 @@ extern "C" {
 #define FCEUMM_TURBO_DELAY_INFO_0_AR NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_AR NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_AR NULL
-#define OPTION_VAL_LIGHTGUN_AR NULL
+#define OPTION_VAL_C_LIGHTGUN_AR NULL
+#define OPTION_VAL_ST_LIGHTGUN_AR NULL
 #define OPTION_VAL_TOUCHSCREEN_AR NULL
 #define OPTION_VAL_MOUSE_AR NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_AR NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_AR NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_AR NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_AR NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_AR NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_AR NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_AR NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_AR NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_AR NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_AR NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_AR NULL
@@ -540,12 +545,13 @@ struct retro_core_option_v2_definition option_defs_ar[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_AR },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_AR },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_AR },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_AR },
          { "mouse",       OPTION_VAL_MOUSE_AR },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -594,6 +600,34 @@ struct retro_core_option_v2_definition option_defs_ar[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_AR,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_AR,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_AR,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_AR,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_AR,
@@ -769,13 +803,18 @@ struct retro_core_options_v2 options_ar = {
 #define FCEUMM_TURBO_DELAY_INFO_0_AST NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_AST NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_AST NULL
-#define OPTION_VAL_LIGHTGUN_AST NULL
+#define OPTION_VAL_C_LIGHTGUN_AST NULL
+#define OPTION_VAL_ST_LIGHTGUN_AST NULL
 #define OPTION_VAL_TOUCHSCREEN_AST NULL
 #define OPTION_VAL_MOUSE_AST NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_AST NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_AST NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_AST NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_AST NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_AST NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_AST NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_AST NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_AST NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_AST NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_AST NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_AST NULL
@@ -1162,12 +1201,13 @@ struct retro_core_option_v2_definition option_defs_ast[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_AST },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_AST },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_AST },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_AST },
          { "mouse",       OPTION_VAL_MOUSE_AST },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -1216,6 +1256,34 @@ struct retro_core_option_v2_definition option_defs_ast[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_AST,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_AST,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_AST,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_AST,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_AST,
@@ -1391,13 +1459,18 @@ struct retro_core_options_v2 options_ast = {
 #define FCEUMM_TURBO_DELAY_INFO_0_CA NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_CA NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_CA NULL
-#define OPTION_VAL_LIGHTGUN_CA NULL
+#define OPTION_VAL_C_LIGHTGUN_CA NULL
+#define OPTION_VAL_ST_LIGHTGUN_CA NULL
 #define OPTION_VAL_TOUCHSCREEN_CA NULL
 #define OPTION_VAL_MOUSE_CA NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_CA NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_CA NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_CA NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_CA NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_CA NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_CA NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_CA NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_CA NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_CA NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_CA NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_CA NULL
@@ -1784,12 +1857,13 @@ struct retro_core_option_v2_definition option_defs_ca[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_CA },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_CA },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_CA },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_CA },
          { "mouse",       OPTION_VAL_MOUSE_CA },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -1838,6 +1912,34 @@ struct retro_core_option_v2_definition option_defs_ca[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_CA,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_CA,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_CA,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_CA,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_CA,
@@ -2013,13 +2115,18 @@ struct retro_core_options_v2 options_ca = {
 #define FCEUMM_TURBO_DELAY_INFO_0_CHS NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_CHS NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_CHS NULL
-#define OPTION_VAL_LIGHTGUN_CHS NULL
+#define OPTION_VAL_C_LIGHTGUN_CHS NULL
+#define OPTION_VAL_ST_LIGHTGUN_CHS NULL
 #define OPTION_VAL_TOUCHSCREEN_CHS NULL
 #define OPTION_VAL_MOUSE_CHS NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_CHS NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_CHS NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_CHS NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_CHS NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_CHS NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_CHS NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_CHS NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_CHS NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_CHS NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_CHS NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_CHS NULL
@@ -2406,12 +2513,13 @@ struct retro_core_option_v2_definition option_defs_chs[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_CHS },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_CHS },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_CHS },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_CHS },
          { "mouse",       OPTION_VAL_MOUSE_CHS },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -2460,6 +2568,34 @@ struct retro_core_option_v2_definition option_defs_chs[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_CHS,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_CHS,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_CHS,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_CHS,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_CHS,
@@ -2635,13 +2771,18 @@ struct retro_core_options_v2 options_chs = {
 #define FCEUMM_TURBO_DELAY_INFO_0_CHT NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_CHT NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_CHT NULL
-#define OPTION_VAL_LIGHTGUN_CHT NULL
+#define OPTION_VAL_C_LIGHTGUN_CHT NULL
+#define OPTION_VAL_ST_LIGHTGUN_CHT NULL
 #define OPTION_VAL_TOUCHSCREEN_CHT NULL
 #define OPTION_VAL_MOUSE_CHT NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_CHT NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_CHT NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_CHT NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_CHT NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_CHT NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_CHT NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_CHT NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_CHT NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_CHT NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_CHT NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_CHT NULL
@@ -3028,12 +3169,13 @@ struct retro_core_option_v2_definition option_defs_cht[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_CHT },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_CHT },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_CHT },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_CHT },
          { "mouse",       OPTION_VAL_MOUSE_CHT },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -3082,6 +3224,34 @@ struct retro_core_option_v2_definition option_defs_cht[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_CHT,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_CHT,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_CHT,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_CHT,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_CHT,
@@ -3257,13 +3427,18 @@ struct retro_core_options_v2 options_cht = {
 #define FCEUMM_TURBO_DELAY_INFO_0_CS NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_CS NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_CS NULL
-#define OPTION_VAL_LIGHTGUN_CS NULL
+#define OPTION_VAL_C_LIGHTGUN_CS NULL
+#define OPTION_VAL_ST_LIGHTGUN_CS NULL
 #define OPTION_VAL_TOUCHSCREEN_CS NULL
 #define OPTION_VAL_MOUSE_CS NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_CS NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_CS NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_CS NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_CS NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_CS NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_CS NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_CS NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_CS NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_CS NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_CS NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_CS NULL
@@ -3650,12 +3825,13 @@ struct retro_core_option_v2_definition option_defs_cs[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_CS },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_CS },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_CS },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_CS },
          { "mouse",       OPTION_VAL_MOUSE_CS },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -3704,6 +3880,34 @@ struct retro_core_option_v2_definition option_defs_cs[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_CS,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_CS,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_CS,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_CS,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_CS,
@@ -3879,13 +4083,18 @@ struct retro_core_options_v2 options_cs = {
 #define FCEUMM_TURBO_DELAY_INFO_0_CY NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_CY NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_CY NULL
-#define OPTION_VAL_LIGHTGUN_CY NULL
+#define OPTION_VAL_C_LIGHTGUN_CY NULL
+#define OPTION_VAL_ST_LIGHTGUN_CY NULL
 #define OPTION_VAL_TOUCHSCREEN_CY NULL
 #define OPTION_VAL_MOUSE_CY NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_CY NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_CY NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_CY NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_CY NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_CY NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_CY NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_CY NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_CY NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_CY NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_CY NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_CY NULL
@@ -4272,12 +4481,13 @@ struct retro_core_option_v2_definition option_defs_cy[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_CY },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_CY },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_CY },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_CY },
          { "mouse",       OPTION_VAL_MOUSE_CY },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -4326,6 +4536,34 @@ struct retro_core_option_v2_definition option_defs_cy[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_CY,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_CY,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_CY,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_CY,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_CY,
@@ -4501,13 +4739,18 @@ struct retro_core_options_v2 options_cy = {
 #define FCEUMM_TURBO_DELAY_INFO_0_DA NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_DA NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_DA NULL
-#define OPTION_VAL_LIGHTGUN_DA NULL
+#define OPTION_VAL_C_LIGHTGUN_DA NULL
+#define OPTION_VAL_ST_LIGHTGUN_DA NULL
 #define OPTION_VAL_TOUCHSCREEN_DA NULL
 #define OPTION_VAL_MOUSE_DA NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_DA NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_DA NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_DA NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_DA NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_DA NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_DA NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_DA NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_DA NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_DA NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_DA NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_DA NULL
@@ -4894,12 +5137,13 @@ struct retro_core_option_v2_definition option_defs_da[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_DA },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_DA },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_DA },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_DA },
          { "mouse",       OPTION_VAL_MOUSE_DA },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -4948,6 +5192,34 @@ struct retro_core_option_v2_definition option_defs_da[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_DA,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_DA,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_DA,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_DA,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_DA,
@@ -5123,13 +5395,18 @@ struct retro_core_options_v2 options_da = {
 #define FCEUMM_TURBO_DELAY_INFO_0_DE NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_DE NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_DE NULL
-#define OPTION_VAL_LIGHTGUN_DE NULL
+#define OPTION_VAL_C_LIGHTGUN_DE NULL
+#define OPTION_VAL_ST_LIGHTGUN_DE NULL
 #define OPTION_VAL_TOUCHSCREEN_DE NULL
 #define OPTION_VAL_MOUSE_DE NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_DE NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_DE NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_DE NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_DE NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_DE NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_DE NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_DE NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_DE NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_DE NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_DE NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_DE NULL
@@ -5516,12 +5793,13 @@ struct retro_core_option_v2_definition option_defs_de[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_DE },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_DE },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_DE },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_DE },
          { "mouse",       OPTION_VAL_MOUSE_DE },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -5570,6 +5848,34 @@ struct retro_core_option_v2_definition option_defs_de[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_DE,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_DE,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_DE,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_DE,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_DE,
@@ -5745,13 +6051,18 @@ struct retro_core_options_v2 options_de = {
 #define FCEUMM_TURBO_DELAY_INFO_0_EL NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_EL NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_EL NULL
-#define OPTION_VAL_LIGHTGUN_EL NULL
+#define OPTION_VAL_C_LIGHTGUN_EL NULL
+#define OPTION_VAL_ST_LIGHTGUN_EL NULL
 #define OPTION_VAL_TOUCHSCREEN_EL NULL
 #define OPTION_VAL_MOUSE_EL NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_EL NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_EL NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_EL NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_EL NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_EL NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_EL NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_EL NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_EL NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_EL NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_EL NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_EL NULL
@@ -6138,12 +6449,13 @@ struct retro_core_option_v2_definition option_defs_el[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_EL },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_EL },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_EL },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_EL },
          { "mouse",       OPTION_VAL_MOUSE_EL },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -6192,6 +6504,34 @@ struct retro_core_option_v2_definition option_defs_el[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_EL,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_EL,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_EL,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_EL,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_EL,
@@ -6367,13 +6707,18 @@ struct retro_core_options_v2 options_el = {
 #define FCEUMM_TURBO_DELAY_INFO_0_EO NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_EO NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_EO NULL
-#define OPTION_VAL_LIGHTGUN_EO NULL
+#define OPTION_VAL_C_LIGHTGUN_EO NULL
+#define OPTION_VAL_ST_LIGHTGUN_EO NULL
 #define OPTION_VAL_TOUCHSCREEN_EO NULL
 #define OPTION_VAL_MOUSE_EO NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_EO NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_EO NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_EO NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_EO NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_EO NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_EO NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_EO NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_EO NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_EO NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_EO NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_EO NULL
@@ -6760,12 +7105,13 @@ struct retro_core_option_v2_definition option_defs_eo[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_EO },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_EO },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_EO },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_EO },
          { "mouse",       OPTION_VAL_MOUSE_EO },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -6814,6 +7160,34 @@ struct retro_core_option_v2_definition option_defs_eo[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_EO,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_EO,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_EO,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_EO,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_EO,
@@ -6989,13 +7363,18 @@ struct retro_core_options_v2 options_eo = {
 #define FCEUMM_TURBO_DELAY_INFO_0_ES NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_ES NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_ES NULL
-#define OPTION_VAL_LIGHTGUN_ES NULL
+#define OPTION_VAL_C_LIGHTGUN_ES NULL
+#define OPTION_VAL_ST_LIGHTGUN_ES NULL
 #define OPTION_VAL_TOUCHSCREEN_ES NULL
 #define OPTION_VAL_MOUSE_ES NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_ES NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_ES NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_ES NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_ES NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_ES NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_ES NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_ES NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_ES NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_ES NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_ES NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_ES NULL
@@ -7382,12 +7761,13 @@ struct retro_core_option_v2_definition option_defs_es[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_ES },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_ES },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_ES },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_ES },
          { "mouse",       OPTION_VAL_MOUSE_ES },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -7436,6 +7816,34 @@ struct retro_core_option_v2_definition option_defs_es[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_ES,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_ES,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_ES,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_ES,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_ES,
@@ -7611,13 +8019,18 @@ struct retro_core_options_v2 options_es = {
 #define FCEUMM_TURBO_DELAY_INFO_0_FA NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_FA NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_FA NULL
-#define OPTION_VAL_LIGHTGUN_FA NULL
+#define OPTION_VAL_C_LIGHTGUN_FA NULL
+#define OPTION_VAL_ST_LIGHTGUN_FA NULL
 #define OPTION_VAL_TOUCHSCREEN_FA NULL
 #define OPTION_VAL_MOUSE_FA NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_FA NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_FA NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_FA NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_FA NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_FA NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_FA NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_FA NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_FA NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_FA NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_FA NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_FA NULL
@@ -8004,12 +8417,13 @@ struct retro_core_option_v2_definition option_defs_fa[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_FA },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_FA },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_FA },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_FA },
          { "mouse",       OPTION_VAL_MOUSE_FA },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -8058,6 +8472,34 @@ struct retro_core_option_v2_definition option_defs_fa[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_FA,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_FA,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_FA,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_FA,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_FA,
@@ -8233,13 +8675,18 @@ struct retro_core_options_v2 options_fa = {
 #define FCEUMM_TURBO_DELAY_INFO_0_FI NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_FI NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_FI NULL
-#define OPTION_VAL_LIGHTGUN_FI NULL
+#define OPTION_VAL_C_LIGHTGUN_FI NULL
+#define OPTION_VAL_ST_LIGHTGUN_FI NULL
 #define OPTION_VAL_TOUCHSCREEN_FI NULL
 #define OPTION_VAL_MOUSE_FI NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_FI NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_FI NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_FI NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_FI NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_FI NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_FI NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_FI NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_FI NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_FI NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_FI NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_FI NULL
@@ -8626,12 +9073,13 @@ struct retro_core_option_v2_definition option_defs_fi[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_FI },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_FI },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_FI },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_FI },
          { "mouse",       OPTION_VAL_MOUSE_FI },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -8680,6 +9128,34 @@ struct retro_core_option_v2_definition option_defs_fi[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_FI,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_FI,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_FI,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_FI,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_FI,
@@ -8855,13 +9331,18 @@ struct retro_core_options_v2 options_fi = {
 #define FCEUMM_TURBO_DELAY_INFO_0_FR NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_FR NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_FR NULL
-#define OPTION_VAL_LIGHTGUN_FR NULL
+#define OPTION_VAL_C_LIGHTGUN_FR NULL
+#define OPTION_VAL_ST_LIGHTGUN_FR NULL
 #define OPTION_VAL_TOUCHSCREEN_FR NULL
 #define OPTION_VAL_MOUSE_FR NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_FR NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_FR NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_FR NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_FR NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_FR NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_FR NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_FR NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_FR NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_FR NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_FR NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_FR NULL
@@ -9248,12 +9729,13 @@ struct retro_core_option_v2_definition option_defs_fr[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_FR },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_FR },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_FR },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_FR },
          { "mouse",       OPTION_VAL_MOUSE_FR },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -9302,6 +9784,34 @@ struct retro_core_option_v2_definition option_defs_fr[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_FR,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_FR,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_FR,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_FR,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_FR,
@@ -9477,13 +9987,18 @@ struct retro_core_options_v2 options_fr = {
 #define FCEUMM_TURBO_DELAY_INFO_0_GL NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_GL NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_GL NULL
-#define OPTION_VAL_LIGHTGUN_GL NULL
+#define OPTION_VAL_C_LIGHTGUN_GL NULL
+#define OPTION_VAL_ST_LIGHTGUN_GL NULL
 #define OPTION_VAL_TOUCHSCREEN_GL NULL
 #define OPTION_VAL_MOUSE_GL NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_GL NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_GL NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_GL NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_GL NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_GL NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_GL NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_GL NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_GL NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_GL NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_GL NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_GL NULL
@@ -9870,12 +10385,13 @@ struct retro_core_option_v2_definition option_defs_gl[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_GL },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_GL },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_GL },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_GL },
          { "mouse",       OPTION_VAL_MOUSE_GL },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -9924,6 +10440,34 @@ struct retro_core_option_v2_definition option_defs_gl[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_GL,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_GL,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_GL,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_GL,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_GL,
@@ -10099,13 +10643,18 @@ struct retro_core_options_v2 options_gl = {
 #define FCEUMM_TURBO_DELAY_INFO_0_HE NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_HE NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_HE NULL
-#define OPTION_VAL_LIGHTGUN_HE NULL
+#define OPTION_VAL_C_LIGHTGUN_HE NULL
+#define OPTION_VAL_ST_LIGHTGUN_HE NULL
 #define OPTION_VAL_TOUCHSCREEN_HE NULL
 #define OPTION_VAL_MOUSE_HE NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_HE NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_HE NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_HE NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_HE NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_HE NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_HE NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_HE NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_HE NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_HE NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_HE NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_HE NULL
@@ -10492,12 +11041,13 @@ struct retro_core_option_v2_definition option_defs_he[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_HE },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_HE },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_HE },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_HE },
          { "mouse",       OPTION_VAL_MOUSE_HE },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -10546,6 +11096,34 @@ struct retro_core_option_v2_definition option_defs_he[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_HE,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_HE,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_HE,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_HE,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_HE,
@@ -10721,13 +11299,18 @@ struct retro_core_options_v2 options_he = {
 #define FCEUMM_TURBO_DELAY_INFO_0_HU NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_HU NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_HU NULL
-#define OPTION_VAL_LIGHTGUN_HU NULL
+#define OPTION_VAL_C_LIGHTGUN_HU NULL
+#define OPTION_VAL_ST_LIGHTGUN_HU NULL
 #define OPTION_VAL_TOUCHSCREEN_HU NULL
 #define OPTION_VAL_MOUSE_HU NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_HU NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_HU NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_HU NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_HU NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_HU NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_HU NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_HU NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_HU NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_HU NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_HU NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_HU NULL
@@ -11114,12 +11697,13 @@ struct retro_core_option_v2_definition option_defs_hu[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_HU },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_HU },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_HU },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_HU },
          { "mouse",       OPTION_VAL_MOUSE_HU },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -11168,6 +11752,34 @@ struct retro_core_option_v2_definition option_defs_hu[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_HU,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_HU,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_HU,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_HU,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_HU,
@@ -11343,13 +11955,18 @@ struct retro_core_options_v2 options_hu = {
 #define FCEUMM_TURBO_DELAY_INFO_0_ID NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_ID NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_ID NULL
-#define OPTION_VAL_LIGHTGUN_ID NULL
+#define OPTION_VAL_C_LIGHTGUN_ID NULL
+#define OPTION_VAL_ST_LIGHTGUN_ID NULL
 #define OPTION_VAL_TOUCHSCREEN_ID NULL
 #define OPTION_VAL_MOUSE_ID NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_ID NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_ID NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_ID NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_ID NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_ID NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_ID NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_ID NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_ID NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_ID NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_ID NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_ID NULL
@@ -11736,12 +12353,13 @@ struct retro_core_option_v2_definition option_defs_id[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_ID },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_ID },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_ID },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_ID },
          { "mouse",       OPTION_VAL_MOUSE_ID },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -11790,6 +12408,34 @@ struct retro_core_option_v2_definition option_defs_id[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_ID,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_ID,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_ID,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_ID,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_ID,
@@ -11965,13 +12611,18 @@ struct retro_core_options_v2 options_id = {
 #define FCEUMM_TURBO_DELAY_INFO_0_IT NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_IT NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_IT NULL
-#define OPTION_VAL_LIGHTGUN_IT NULL
+#define OPTION_VAL_C_LIGHTGUN_IT NULL
+#define OPTION_VAL_ST_LIGHTGUN_IT NULL
 #define OPTION_VAL_TOUCHSCREEN_IT NULL
 #define OPTION_VAL_MOUSE_IT NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_IT NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_IT NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_IT NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_IT NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_IT NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_IT NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_IT NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_IT NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_IT NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_IT NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_IT NULL
@@ -12358,12 +13009,13 @@ struct retro_core_option_v2_definition option_defs_it[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_IT },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_IT },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_IT },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_IT },
          { "mouse",       OPTION_VAL_MOUSE_IT },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -12412,6 +13064,34 @@ struct retro_core_option_v2_definition option_defs_it[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_IT,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_IT,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_IT,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_IT,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_IT,
@@ -12587,13 +13267,18 @@ struct retro_core_options_v2 options_it = {
 #define FCEUMM_TURBO_DELAY_INFO_0_JA NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_JA NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_JA NULL
-#define OPTION_VAL_LIGHTGUN_JA NULL
+#define OPTION_VAL_C_LIGHTGUN_JA NULL
+#define OPTION_VAL_ST_LIGHTGUN_JA NULL
 #define OPTION_VAL_TOUCHSCREEN_JA NULL
 #define OPTION_VAL_MOUSE_JA NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_JA NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_JA NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_JA NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_JA NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_JA NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_JA NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_JA NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_JA NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_JA NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_JA NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_JA NULL
@@ -12980,12 +13665,13 @@ struct retro_core_option_v2_definition option_defs_ja[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_JA },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_JA },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_JA },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_JA },
          { "mouse",       OPTION_VAL_MOUSE_JA },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -13034,6 +13720,34 @@ struct retro_core_option_v2_definition option_defs_ja[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_JA,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_JA,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_JA,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_JA,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_JA,
@@ -13209,13 +13923,18 @@ struct retro_core_options_v2 options_ja = {
 #define FCEUMM_TURBO_DELAY_INFO_0_KO NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_KO NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_KO NULL
-#define OPTION_VAL_LIGHTGUN_KO NULL
+#define OPTION_VAL_C_LIGHTGUN_KO NULL
+#define OPTION_VAL_ST_LIGHTGUN_KO NULL
 #define OPTION_VAL_TOUCHSCREEN_KO NULL
 #define OPTION_VAL_MOUSE_KO NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_KO NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_KO NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_KO NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_KO NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_KO NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_KO NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_KO NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_KO NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_KO NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_KO NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_KO NULL
@@ -13602,12 +14321,13 @@ struct retro_core_option_v2_definition option_defs_ko[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_KO },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_KO },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_KO },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_KO },
          { "mouse",       OPTION_VAL_MOUSE_KO },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -13656,6 +14376,34 @@ struct retro_core_option_v2_definition option_defs_ko[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_KO,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_KO,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_KO,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_KO,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_KO,
@@ -13831,13 +14579,18 @@ struct retro_core_options_v2 options_ko = {
 #define FCEUMM_TURBO_DELAY_INFO_0_MT NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_MT NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_MT NULL
-#define OPTION_VAL_LIGHTGUN_MT NULL
+#define OPTION_VAL_C_LIGHTGUN_MT NULL
+#define OPTION_VAL_ST_LIGHTGUN_MT NULL
 #define OPTION_VAL_TOUCHSCREEN_MT NULL
 #define OPTION_VAL_MOUSE_MT NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_MT NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_MT NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_MT NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_MT NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_MT NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_MT NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_MT NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_MT NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_MT NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_MT NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_MT NULL
@@ -14224,12 +14977,13 @@ struct retro_core_option_v2_definition option_defs_mt[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_MT },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_MT },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_MT },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_MT },
          { "mouse",       OPTION_VAL_MOUSE_MT },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -14278,6 +15032,34 @@ struct retro_core_option_v2_definition option_defs_mt[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_MT,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_MT,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_MT,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_MT,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_MT,
@@ -14453,13 +15235,18 @@ struct retro_core_options_v2 options_mt = {
 #define FCEUMM_TURBO_DELAY_INFO_0_NL NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_NL NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_NL NULL
-#define OPTION_VAL_LIGHTGUN_NL NULL
+#define OPTION_VAL_C_LIGHTGUN_NL NULL
+#define OPTION_VAL_ST_LIGHTGUN_NL NULL
 #define OPTION_VAL_TOUCHSCREEN_NL NULL
 #define OPTION_VAL_MOUSE_NL NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_NL NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_NL NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_NL NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_NL NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_NL NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_NL NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_NL NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_NL NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_NL NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_NL NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_NL NULL
@@ -14846,12 +15633,13 @@ struct retro_core_option_v2_definition option_defs_nl[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_NL },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_NL },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_NL },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_NL },
          { "mouse",       OPTION_VAL_MOUSE_NL },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -14900,6 +15688,34 @@ struct retro_core_option_v2_definition option_defs_nl[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_NL,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_NL,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_NL,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_NL,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_NL,
@@ -15075,13 +15891,18 @@ struct retro_core_options_v2 options_nl = {
 #define FCEUMM_TURBO_DELAY_INFO_0_OC NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_OC NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_OC NULL
-#define OPTION_VAL_LIGHTGUN_OC NULL
+#define OPTION_VAL_C_LIGHTGUN_OC NULL
+#define OPTION_VAL_ST_LIGHTGUN_OC NULL
 #define OPTION_VAL_TOUCHSCREEN_OC NULL
 #define OPTION_VAL_MOUSE_OC NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_OC NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_OC NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_OC NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_OC NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_OC NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_OC NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_OC NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_OC NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_OC NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_OC NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_OC NULL
@@ -15468,12 +16289,13 @@ struct retro_core_option_v2_definition option_defs_oc[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_OC },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_OC },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_OC },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_OC },
          { "mouse",       OPTION_VAL_MOUSE_OC },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -15522,6 +16344,34 @@ struct retro_core_option_v2_definition option_defs_oc[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_OC,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_OC,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_OC,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_OC,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_OC,
@@ -15697,13 +16547,18 @@ struct retro_core_options_v2 options_oc = {
 #define FCEUMM_TURBO_DELAY_INFO_0_PL NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_PL NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_PL NULL
-#define OPTION_VAL_LIGHTGUN_PL NULL
+#define OPTION_VAL_C_LIGHTGUN_PL NULL
+#define OPTION_VAL_ST_LIGHTGUN_PL NULL
 #define OPTION_VAL_TOUCHSCREEN_PL NULL
 #define OPTION_VAL_MOUSE_PL NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_PL NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_PL NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_PL NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_PL NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_PL NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_PL NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_PL NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_PL NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_PL NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_PL NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_PL NULL
@@ -16090,12 +16945,13 @@ struct retro_core_option_v2_definition option_defs_pl[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_PL },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_PL },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_PL },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_PL },
          { "mouse",       OPTION_VAL_MOUSE_PL },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -16144,6 +17000,34 @@ struct retro_core_option_v2_definition option_defs_pl[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_PL,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_PL,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_PL,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_PL,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_PL,
@@ -16319,13 +17203,18 @@ struct retro_core_options_v2 options_pl = {
 #define FCEUMM_TURBO_DELAY_INFO_0_PT_BR NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_PT_BR NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_PT_BR NULL
-#define OPTION_VAL_LIGHTGUN_PT_BR NULL
+#define OPTION_VAL_C_LIGHTGUN_PT_BR NULL
+#define OPTION_VAL_ST_LIGHTGUN_PT_BR NULL
 #define OPTION_VAL_TOUCHSCREEN_PT_BR NULL
 #define OPTION_VAL_MOUSE_PT_BR NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_PT_BR NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_PT_BR NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_PT_BR NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_PT_BR NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_BR NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_BR NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_PT_BR NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_PT_BR NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_PT_BR NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_PT_BR NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_PT_BR NULL
@@ -16712,12 +17601,13 @@ struct retro_core_option_v2_definition option_defs_pt_br[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_PT_BR },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_PT_BR },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_PT_BR },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_PT_BR },
          { "mouse",       OPTION_VAL_MOUSE_PT_BR },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -16766,6 +17656,34 @@ struct retro_core_option_v2_definition option_defs_pt_br[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_BR,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_BR,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_PT_BR,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_PT_BR,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_PT_BR,
@@ -16941,13 +17859,18 @@ struct retro_core_options_v2 options_pt_br = {
 #define FCEUMM_TURBO_DELAY_INFO_0_PT_PT NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_PT_PT NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_PT_PT NULL
-#define OPTION_VAL_LIGHTGUN_PT_PT NULL
+#define OPTION_VAL_C_LIGHTGUN_PT_PT NULL
+#define OPTION_VAL_ST_LIGHTGUN_PT_PT NULL
 #define OPTION_VAL_TOUCHSCREEN_PT_PT NULL
 #define OPTION_VAL_MOUSE_PT_PT NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_PT_PT NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_PT_PT NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_PT_PT NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_PT_PT NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_PT NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_PT NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_PT_PT NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_PT_PT NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_PT_PT NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_PT_PT NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_PT_PT NULL
@@ -17334,12 +18257,13 @@ struct retro_core_option_v2_definition option_defs_pt_pt[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_PT_PT },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_PT_PT },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_PT_PT },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_PT_PT },
          { "mouse",       OPTION_VAL_MOUSE_PT_PT },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -17388,6 +18312,34 @@ struct retro_core_option_v2_definition option_defs_pt_pt[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_PT,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_PT,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_PT_PT,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_PT_PT,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_PT_PT,
@@ -17563,13 +18515,18 @@ struct retro_core_options_v2 options_pt_pt = {
 #define FCEUMM_TURBO_DELAY_INFO_0_RO NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_RO NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_RO NULL
-#define OPTION_VAL_LIGHTGUN_RO NULL
+#define OPTION_VAL_C_LIGHTGUN_RO NULL
+#define OPTION_VAL_ST_LIGHTGUN_RO NULL
 #define OPTION_VAL_TOUCHSCREEN_RO NULL
 #define OPTION_VAL_MOUSE_RO NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_RO NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_RO NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_RO NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_RO NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_RO NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_RO NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_RO NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_RO NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_RO NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_RO NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_RO NULL
@@ -17956,12 +18913,13 @@ struct retro_core_option_v2_definition option_defs_ro[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_RO },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_RO },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_RO },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_RO },
          { "mouse",       OPTION_VAL_MOUSE_RO },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -18010,6 +18968,34 @@ struct retro_core_option_v2_definition option_defs_ro[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_RO,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_RO,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_RO,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_RO,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_RO,
@@ -18185,13 +19171,18 @@ struct retro_core_options_v2 options_ro = {
 #define FCEUMM_TURBO_DELAY_INFO_0_RU NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_RU NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_RU NULL
-#define OPTION_VAL_LIGHTGUN_RU NULL
+#define OPTION_VAL_C_LIGHTGUN_RU NULL
+#define OPTION_VAL_ST_LIGHTGUN_RU NULL
 #define OPTION_VAL_TOUCHSCREEN_RU NULL
 #define OPTION_VAL_MOUSE_RU NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_RU NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_RU NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_RU NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_RU NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_RU NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_RU NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_RU NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_RU NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_RU NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_RU NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_RU NULL
@@ -18578,12 +19569,13 @@ struct retro_core_option_v2_definition option_defs_ru[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_RU },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_RU },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_RU },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_RU },
          { "mouse",       OPTION_VAL_MOUSE_RU },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -18632,6 +19624,34 @@ struct retro_core_option_v2_definition option_defs_ru[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_RU,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_RU,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_RU,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_RU,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_RU,
@@ -18807,13 +19827,18 @@ struct retro_core_options_v2 options_ru = {
 #define FCEUMM_TURBO_DELAY_INFO_0_SI NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_SI NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_SI NULL
-#define OPTION_VAL_LIGHTGUN_SI NULL
+#define OPTION_VAL_C_LIGHTGUN_SI NULL
+#define OPTION_VAL_ST_LIGHTGUN_SI NULL
 #define OPTION_VAL_TOUCHSCREEN_SI NULL
 #define OPTION_VAL_MOUSE_SI NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_SI NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_SI NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_SI NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_SI NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_SI NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_SI NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_SI NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_SI NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_SI NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_SI NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_SI NULL
@@ -19200,12 +20225,13 @@ struct retro_core_option_v2_definition option_defs_si[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_SI },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_SI },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_SI },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_SI },
          { "mouse",       OPTION_VAL_MOUSE_SI },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -19254,6 +20280,34 @@ struct retro_core_option_v2_definition option_defs_si[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_SI,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_SI,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_SI,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_SI,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_SI,
@@ -19429,13 +20483,18 @@ struct retro_core_options_v2 options_si = {
 #define FCEUMM_TURBO_DELAY_INFO_0_SK NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_SK NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_SK NULL
-#define OPTION_VAL_LIGHTGUN_SK NULL
+#define OPTION_VAL_C_LIGHTGUN_SK NULL
+#define OPTION_VAL_ST_LIGHTGUN_SK NULL
 #define OPTION_VAL_TOUCHSCREEN_SK NULL
 #define OPTION_VAL_MOUSE_SK NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_SK NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_SK NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_SK NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_SK NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_SK NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_SK NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_SK NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_SK NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_SK NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_SK NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_SK NULL
@@ -19822,12 +20881,13 @@ struct retro_core_option_v2_definition option_defs_sk[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_SK },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_SK },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_SK },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_SK },
          { "mouse",       OPTION_VAL_MOUSE_SK },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -19876,6 +20936,34 @@ struct retro_core_option_v2_definition option_defs_sk[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_SK,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_SK,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_SK,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_SK,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_SK,
@@ -20051,13 +21139,18 @@ struct retro_core_options_v2 options_sk = {
 #define FCEUMM_TURBO_DELAY_INFO_0_SR NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_SR NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_SR NULL
-#define OPTION_VAL_LIGHTGUN_SR NULL
+#define OPTION_VAL_C_LIGHTGUN_SR NULL
+#define OPTION_VAL_ST_LIGHTGUN_SR NULL
 #define OPTION_VAL_TOUCHSCREEN_SR NULL
 #define OPTION_VAL_MOUSE_SR NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_SR NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_SR NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_SR NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_SR NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_SR NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_SR NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_SR NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_SR NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_SR NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_SR NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_SR NULL
@@ -20444,12 +21537,13 @@ struct retro_core_option_v2_definition option_defs_sr[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_SR },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_SR },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_SR },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_SR },
          { "mouse",       OPTION_VAL_MOUSE_SR },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -20498,6 +21592,34 @@ struct retro_core_option_v2_definition option_defs_sr[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_SR,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_SR,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_SR,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_SR,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_SR,
@@ -20673,13 +21795,18 @@ struct retro_core_options_v2 options_sr = {
 #define FCEUMM_TURBO_DELAY_INFO_0_SV NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_SV NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_SV NULL
-#define OPTION_VAL_LIGHTGUN_SV NULL
+#define OPTION_VAL_C_LIGHTGUN_SV NULL
+#define OPTION_VAL_ST_LIGHTGUN_SV NULL
 #define OPTION_VAL_TOUCHSCREEN_SV NULL
 #define OPTION_VAL_MOUSE_SV NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_SV NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_SV NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_SV NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_SV NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_SV NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_SV NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_SV NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_SV NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_SV NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_SV NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_SV NULL
@@ -21066,12 +22193,13 @@ struct retro_core_option_v2_definition option_defs_sv[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_SV },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_SV },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_SV },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_SV },
          { "mouse",       OPTION_VAL_MOUSE_SV },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -21120,6 +22248,34 @@ struct retro_core_option_v2_definition option_defs_sv[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_SV,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_SV,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_SV,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_SV,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_SV,
@@ -21295,13 +22451,18 @@ struct retro_core_options_v2 options_sv = {
 #define FCEUMM_TURBO_DELAY_INFO_0_TR NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_TR NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_TR NULL
-#define OPTION_VAL_LIGHTGUN_TR NULL
+#define OPTION_VAL_C_LIGHTGUN_TR NULL
+#define OPTION_VAL_ST_LIGHTGUN_TR NULL
 #define OPTION_VAL_TOUCHSCREEN_TR NULL
 #define OPTION_VAL_MOUSE_TR NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_TR NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_TR NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_TR NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_TR NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_TR NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_TR NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_TR NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_TR NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_TR NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_TR NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_TR NULL
@@ -21688,12 +22849,13 @@ struct retro_core_option_v2_definition option_defs_tr[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_TR },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_TR },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_TR },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_TR },
          { "mouse",       OPTION_VAL_MOUSE_TR },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -21742,6 +22904,34 @@ struct retro_core_option_v2_definition option_defs_tr[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_TR,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_TR,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_TR,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_TR,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_TR,
@@ -21917,13 +23107,18 @@ struct retro_core_options_v2 options_tr = {
 #define FCEUMM_TURBO_DELAY_INFO_0_UK NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_UK NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_UK NULL
-#define OPTION_VAL_LIGHTGUN_UK NULL
+#define OPTION_VAL_C_LIGHTGUN_UK NULL
+#define OPTION_VAL_ST_LIGHTGUN_UK NULL
 #define OPTION_VAL_TOUCHSCREEN_UK NULL
 #define OPTION_VAL_MOUSE_UK NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_UK NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_UK NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_UK NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_UK NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_UK NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_UK NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_UK NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_UK NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_UK NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_UK NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_UK NULL
@@ -22310,12 +23505,13 @@ struct retro_core_option_v2_definition option_defs_uk[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_UK },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_UK },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_UK },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_UK },
          { "mouse",       OPTION_VAL_MOUSE_UK },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -22364,6 +23560,34 @@ struct retro_core_option_v2_definition option_defs_uk[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_UK,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_UK,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_UK,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_UK,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_UK,
@@ -22539,13 +23763,18 @@ struct retro_core_options_v2 options_uk = {
 #define FCEUMM_TURBO_DELAY_INFO_0_VN NULL
 #define FCEUMM_ZAPPER_MODE_LABEL_VN NULL
 #define FCEUMM_ZAPPER_MODE_INFO_0_VN NULL
-#define OPTION_VAL_LIGHTGUN_VN NULL
+#define OPTION_VAL_C_LIGHTGUN_VN NULL
+#define OPTION_VAL_ST_LIGHTGUN_VN NULL
 #define OPTION_VAL_TOUCHSCREEN_VN NULL
 #define OPTION_VAL_MOUSE_VN NULL
 #define FCEUMM_SHOW_CROSSHAIR_LABEL_VN NULL
 #define FCEUMM_SHOW_CROSSHAIR_INFO_0_VN NULL
 #define FCEUMM_ZAPPER_TOLERANCE_LABEL_VN NULL
 #define FCEUMM_ZAPPER_TOLERANCE_INFO_0_VN NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_VN NULL
+#define FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_VN NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_VN NULL
+#define FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_VN NULL
 #define FCEUMM_UP_DOWN_ALLOWED_LABEL_VN NULL
 #define FCEUMM_UP_DOWN_ALLOWED_INFO_0_VN NULL
 #define FCEUMM_NOSPRITELIMIT_LABEL_VN NULL
@@ -22932,12 +24161,13 @@ struct retro_core_option_v2_definition option_defs_vn[] = {
       NULL,
       "input",
       {
-         { "lightgun",    OPTION_VAL_LIGHTGUN_VN },
+         { "clightgun",   OPTION_VAL_C_LIGHTGUN_VN },
+         { "stlightgun",  OPTION_VAL_ST_LIGHTGUN_VN },
          { "touchscreen", OPTION_VAL_TOUCHSCREEN_VN },
          { "mouse",       OPTION_VAL_MOUSE_VN },
          { NULL, NULL },
       },
-      "lightgun",
+      "clightgun",
    },
    {
       "fceumm_show_crosshair",
@@ -22986,6 +24216,34 @@ struct retro_core_option_v2_definition option_defs_vn[] = {
       },
       "6",
    },
+   {
+      "fceumm_zapper_trigger_invert",
+      FCEUMM_ZAPPER_TRIGGER_INVERT_LABEL_VN,
+      NULL,
+      FCEUMM_ZAPPER_TRIGGER_INVERT_INFO_0_VN,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
+   {
+      "fceumm_zapper_sensor_invert",
+      FCEUMM_ZAPPER_SENSOR_INVERT_LABEL_VN,
+      NULL,
+      FCEUMM_ZAPPER_SENSOR_INVERT_INFO_0_VN,
+      NULL,
+      "input",
+      {
+         { "enabled",  NULL },
+         { "disabled", NULL },
+         { NULL, NULL },
+      },
+      "enabled",
+   },
    {
       "fceumm_up_down_allowed",
       FCEUMM_UP_DOWN_ALLOWED_LABEL_VN,
diff --git a/src/input/zapper.c b/src/input/zapper.c
index 3d891f4..e14239f 100644
--- a/src/input/zapper.c
+++ b/src/input/zapper.c
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include        <string.h>
-#include        <stdlib.h>
+#include		<string.h>
+#include		<stdlib.h>
 
-#include        "share.h"
+#include		"share.h"
 
 #define ROUNDED_TARGET
 #ifdef ROUNDED_TARGET
@@ -29,68 +29,79 @@
 static uint32 targetExpansion[MAX_TOLERANCE+1];
 #endif
 static uint32 tolerance;
+static uint32 ZapperStrobe[2];
+
+int switchZapper = 0;
+int zapper_trigger_invert_option = 1;
+int zapper_sensor_invert_option = 1;
 
 typedef struct {
-	uint32 mzx, mzy, mzb;
+	uint32 mzx, mzy, mzb, mzs; /* sequential targets lightgun sensor added */
 	int zap_readbit;
 	int bogo;
 	int zappo;
+
 	uint64 zaphit;
 } ZAPPER;
 
 static ZAPPER ZD[2];
 
 static void FP_FASTAPASS(3) ZapperFrapper(int w, uint8 * bg, uint8 * spr, uint32 linets, int final) {
-	int xs, xe;
-	int zx, zy;
+	if (!switchZapper) {
+	   int xs, xe;
+	   int zx, zy;
 
-	if (!bg) {	/* New line, so reset stuff. */
-		ZD[w].zappo = 0;
-		return;
-	}
-	xs = ZD[w].zappo;
-	xe = final;
-
-	zx = ZD[w].mzx;
-	zy = ZD[w].mzy;
-
-	if (xe > 256) xe = 256;
-
-	if (scanline >= (zy - tolerance) && scanline <= (zy + tolerance)) {
-#ifdef ROUNDED_TARGET
-		int spread;
-		int dy = scanline - zy;
-		if (dy < 0)
-			dy = -dy;
-		spread = targetExpansion[dy];
-#else
-		int spread = tolerance;
-#endif
-		while (xs < xe) {
-			uint8 a1, a2;
-			uint32 sum;
-			if (xs <= (zx + spread) && xs >= (zx - spread)) {
-				a1 = bg[xs];
-				if (spr) {
-					a2 = spr[xs];
-
-					if (!(a2 & 0x80))
-						if (!(a2 & 0x40) || (a1 & 64))
-							a1 = a2;
-				}
-				a1 &= 63;
-
-				sum = palo[a1].r + palo[a1].g + palo[a1].b;
-				if (sum >= 100 * 3) {
-					ZD[w].zaphit = ((uint64)linets + (uint64)(xs + 16) * (PAL ? 15 : 16)) / 48 + timestampbase;
-					goto endo;
-				}
-			}
-			xs++;
+		if (!bg) {	/* New line, so reset stuff. */
+			ZD[w].zappo = 0;
+			return;
 		}
+		xs = ZD[w].zappo;
+		xe = final;
+
+		zx = ZD[w].mzx;
+		zy = ZD[w].mzy;
+
+		if (xe > 256) xe = 256;
+
+		if (scanline >= (zy - tolerance) && scanline <= (zy + tolerance)) {
+	#ifdef ROUNDED_TARGET
+			int spread;
+			int dy = scanline - zy;
+			if (dy < 0)
+				dy = -dy;
+			spread = targetExpansion[dy];
+	#else
+			int spread = tolerance;
+	#endif
+			while (xs < xe) {
+				uint8 a1, a2;
+				uint32 sum;
+				if (xs <= (zx + spread) && xs >= (zx - spread)) {
+					a1 = bg[xs];
+					if (spr) {
+						a2 = spr[xs];
+
+						if (!(a2 & 0x80))
+							if (!(a2 & 0x40) || (a1 & 64))
+								a1 = a2;
+					}
+					a1 &= 63;
+
+					sum = palo[a1].r + palo[a1].g + palo[a1].b;
+					if (sum >= 100 * 3) {
+						ZD[w].zaphit = ((uint64)linets + (uint64)(xs + 16) * (PAL ? 15 : 16)) / 48 + timestampbase;
+						goto endo;
+					}
+				}
+				xs++;
+			}
+		}
+ 	endo:
+		ZD[w].zappo = final;
+	}
+	else {
+		ZD[w].zappo = 0;
 	}
- endo:
-	ZD[w].zappo = final;
 }
 
 static INLINE int CheckColor(int w) {
@@ -109,12 +120,18 @@ static uint8 FP_FASTAPASS(1) ReadZapperVS(int w) {
 
 	if (ZD[w].zap_readbit == 7) {
 		if (ZD[w].bogo)
-			ret |= 0x1;
+			ret |= 0x1;	
 	}
+
 	if (ZD[w].zap_readbit == 6) {
-		if (!CheckColor(w))
+		if (!switchZapper) {
+			if (!CheckColor(w))
+				ret |= 0x1;
+		}
+		else if (!ZD[w].mzs)
 			ret |= 0x1;
 	}
+
 				#ifdef FCEUDEF_DEBUGGER
 	if (!fceuindbg)
 				#endif
@@ -128,15 +145,22 @@ static void FP_FASTAPASS(1) StrobeZapperVS(int w) {
 
 static uint8 FP_FASTAPASS(1) ReadZapper(int w) {
 	uint8 ret = 0;
-	if (ZD[w].bogo)
+		
+	if (ZD[w].bogo) 
 		ret |= 0x10;
-	if (CheckColor(w))
-		ret |= 0x8;
+
+	if (!switchZapper) {
+		if (CheckColor(w))
+			ret |= 0x8;
+	}
+	else if (ZD[w].mzs)
+			ret |= 0x8;	
+
 	return ret;
 }
 
 static void FASTAPASS(3) DrawZapper(int w, uint8 * buf, int arg) {
-	if (arg)
+	if (arg && !switchZapper)
 		FCEU_DrawGunSight(buf, ZD[w].mzx, ZD[w].mzy);
 }
 
@@ -150,7 +174,16 @@ static void FP_FASTAPASS(3) UpdateZapper(int w, void *data, int arg) {
 
 	ZD[w].mzx = ptr[0];
 	ZD[w].mzy = ptr[1];
-	ZD[w].mzb = ptr[2];
+
+	if (zapper_trigger_invert_option)
+		ZD[w].mzb = ptr[2];
+	else
+		ZD[w].mzb = !ptr[2];
+
+	if (zapper_sensor_invert_option)
+		ZD[w].mzs = !ptr[3];
+	else
+		ZD[w].mzs = ptr[3];
 }
 
 static INPUTC ZAPC = { ReadZapper, 0, 0, UpdateZapper, ZapperFrapper, DrawZapper };

From ca7c563de7d91809cef35b36036f3a7c41cb5c96 Mon Sep 17 00:00:00 2001
From: DigiDwrf <74699493+DigiDwrf@users.noreply.github.com>
Date: Thu, 1 Sep 2022 17:44:22 -0500
Subject: [PATCH 277/295] Update zapper.c

After testing trigger logic invertion option in VS roms, realized that ZD[w].bogo has to be inverted to work propperly
---
 src/input/zapper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/zapper.c b/src/input/zapper.c
index e14239f..49caae3 100644
--- a/src/input/zapper.c
+++ b/src/input/zapper.c
@@ -119,7 +119,7 @@ static uint8 FP_FASTAPASS(1) ReadZapperVS(int w) {
 	if (ZD[w].zap_readbit == 4) ret = 1;
 
 	if (ZD[w].zap_readbit == 7) {
-		if (ZD[w].bogo)
+		if (!ZD[w].bogo)
 			ret |= 0x1;	
 	}
 

From 9e8257183cfc9ec7db15bd98996cfa662d7e4c07 Mon Sep 17 00:00:00 2001
From: LibretroAdmin <reallibretroretroarch@gmail.com>
Date: Mon, 5 Sep 2022 01:15:51 +0200
Subject: [PATCH 278/295] Remove misc.c

---
 Makefile.common   |  1 -
 src/driver.h      |  7 -------
 src/input.c       |  1 -
 src/input.h       |  2 --
 src/input/share.h |  1 -
 src/misc.c        | 18 ------------------
 src/sound.c       |  4 +---
 7 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 src/misc.c

diff --git a/Makefile.common b/Makefile.common
index 1aa3df5..d0ca21d 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -38,7 +38,6 @@ SOURCES_C += \
 	$(CORE_DIR)/crc32.c \
 	$(CORE_DIR)/fceu-endian.c \
 	$(CORE_DIR)/fceu-memory.c \
-	$(CORE_DIR)/misc.c \
 	$(CORE_DIR)/fceu.c \
 	$(CORE_DIR)/fds.c \
 	$(CORE_DIR)/fds_apu.c \
diff --git a/src/driver.h b/src/driver.h
index c9decdc..629725b 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -41,9 +41,6 @@ void FCEUD_Message(char *s);
 void FCEUD_DispMessage(enum retro_log_level level, unsigned duration, const char *str);
 void FCEU_DispMessage(enum retro_log_level level, unsigned duration, const char *format, ...);
 
-int FCEUI_BeginWaveRecord(char *fn);
-int FCEUI_EndWaveRecord(void);
-
 void FCEUI_ResetNES(void);
 void FCEUI_PowerNES(void);
 
@@ -159,10 +156,6 @@ void FCEUI_SelectState(int);
 void FCEUI_SaveState(char *fname);
 void FCEUI_LoadState(char *fname);
 
-void FCEUI_SelectMovie(int);
-void FCEUI_SaveMovie(char *fname);
-void FCEUI_LoadMovie(char *fname);
-
 int32 FCEUI_GetDesiredFPS(void);
 void FCEUI_SaveSnapshot(void);
 
diff --git a/src/input.c b/src/input.c
index 03defa6..fa52f8c 100644
--- a/src/input.c
+++ b/src/input.c
@@ -195,7 +195,6 @@ static void FP_FASTAPASS(3) UpdateGP(int w, void *data, int arg) {
 		joy[1] = *(uint32*)ptr >> 8;
 		joy[3] = *(uint32*)ptr >> 24;
 	}
-	FCEUMOV_AddJoy(joy);
 }
 
 static void FP_FASTAPASS(1) StrobeGP(int w) {
diff --git a/src/input.h b/src/input.h
index 82061bc..0dcaa06 100644
--- a/src/input.h
+++ b/src/input.h
@@ -19,8 +19,6 @@ typedef struct {
 	void FP_FASTAPASS(2) (*Draw)(uint8 *buf, int arg);
 } INPUTCFC;
 
-void FCEUMOV_AddJoy(uint8 *js);
-
 void FCEU_DrawInput(uint8 *buf);
 void FCEU_UpdateInput(void);
 void InitializeInput(void);
diff --git a/src/input/share.h b/src/input/share.h
index a5e1e4b..8a3d2c5 100644
--- a/src/input/share.h
+++ b/src/input/share.h
@@ -9,7 +9,6 @@
 #include "../palette.h"
 #include "../state.h"
 
-void FCEUMOV_AddJoy(uint8 *js);
 void FCEU_DrawCursor(uint8 *buf, int xc, int yc);
 void FCEU_DrawGunSight(uint8 *buf, int xc, int yc);
 
diff --git a/src/misc.c b/src/misc.c
deleted file mode 100644
index 11314b5..0000000
--- a/src/misc.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "fceu-types.h"
-#include "fceu.h"
-
-#include "driver.h"
-
-/* wave.c */
-
-void FCEU_WriteWaveData(int32 *Buffer, int Count) { }
-int FCEUI_EndWaveRecord(void) { return 0; }
-int FCEUI_BeginWaveRecord(char *fn) { return 0; }
-
-/* netplay.c */
-int FCEUNET_SendFile(uint8 cmd, char *fn) { return 0; }
-
-/* movie.c */
-void FCEUMOV_AddJoy(uint8 *js) { }
-void FCEUMOV_Stop(void) {}
-void FCEUI_SelectMovie(int w) { }
diff --git a/src/sound.c b/src/sound.c
index f802b0d..d31a9f7 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1007,9 +1007,7 @@ int FlushEmulateSound(void) {
 	}
 	inbuf = end;
 
-	/* FCEU_WriteWaveData(WaveFinal, end);	 This function will just return
-										if sound recording is off. */
-	return(end);
+	return end;
 }
 
 int GetSoundBuffer(int32 **W) {

From 8df9b2ed108dc3d741745986121a10f7dfb6a440 Mon Sep 17 00:00:00 2001
From: LibretroAdmin <reallibretroretroarch@gmail.com>
Date: Mon, 5 Sep 2022 01:17:09 +0200
Subject: [PATCH 279/295] Remove FCEUI_SetSnapName()

---
 src/driver.h | 3 ---
 src/fceu.c   | 5 -----
 src/fceu.h   | 2 --
 3 files changed, 10 deletions(-)

diff --git a/src/driver.h b/src/driver.h
index 629725b..2b17d6e 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -82,9 +82,6 @@ void FCEUI_DisableFourScore(int s);
 
 /* New interface functions */
 
-/* 0 to order screen snapshots numerically(0.png), 1 to order them file base-numerically(smb3-0.png). */
-void FCEUI_SetSnapName(int a);
-
 /* 0 to keep 8-sprites limitation, 1 to remove it */
 void FCEUI_DisableSpriteLimitation(int a);
 
diff --git a/src/fceu.c b/src/fceu.c
index 9d3ec18..7ff77fd 100644
--- a/src/fceu.c
+++ b/src/fceu.c
@@ -522,11 +522,6 @@ void FCEUI_SetGameGenie(int a)
 	FSettings.GameGenie = a ? 1 : 0;
 }
 
-void FCEUI_SetSnapName(int a)
-{
-	FSettings.SnapName = a;
-}
-
 int32 FCEUI_GetDesiredFPS(void)
 {
 	if (PAL || dendy)
diff --git a/src/fceu.h b/src/fceu.h
index 7f67715..7588e77 100644
--- a/src/fceu.h
+++ b/src/fceu.h
@@ -69,7 +69,6 @@ extern void (*GameStateRestore)(int version);
 
 #include "git.h"
 extern FCEUGI *GameInfo;
-extern int GameAttributes;
 
 extern uint8 PAL;
 
@@ -93,7 +92,6 @@ typedef struct {
 	 */
 	int UsrFirstSLine[2];
 	int UsrLastSLine[2];
-	int SnapName;
 	uint32 SndRate;
 	int soundq;
 	int lowpass;

From 45532d2c4aff72e7424ec74c5efb08ae78d272a7 Mon Sep 17 00:00:00 2001
From: LibretroAdmin <reallibretroretroarch@gmail.com>
Date: Mon, 5 Sep 2022 01:20:43 +0200
Subject: [PATCH 280/295] Cleanup driver.h

---
 src/crc32.c   |  5 -----
 src/driver.h  | 23 ++---------------------
 src/general.c |  7 -------
 src/ppu.c     |  5 -----
 src/video.c   |  7 -------
 src/video.h   |  1 -
 6 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/src/crc32.c b/src/crc32.c
index 2daa51d..fc70611 100644
--- a/src/crc32.c
+++ b/src/crc32.c
@@ -103,8 +103,3 @@ uint32 CalcCRC32(uint32 crc, uint8 *buf, uint32 len)
 {
 	return(crc32(crc, buf, len));
 }
-
-uint32 FCEUI_CRC32(uint32 crc, uint8 *buf, uint32 len)
-{
-	return(CalcCRC32(crc, buf, len));
-}
diff --git a/src/driver.h b/src/driver.h
index 2b17d6e..910f5f9 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -147,14 +147,7 @@ void FCEUI_Sound(int Rate);
 void FCEUI_SetSoundVolume(uint32 volume);
 void FCEUI_SetSoundQuality(int quality);
 
-void FCEUI_SelectState(int);
-
-/* "fname" overrides the default save state filename code if non-NULL. */
-void FCEUI_SaveState(char *fname);
-void FCEUI_LoadState(char *fname);
-
 int32 FCEUI_GetDesiredFPS(void);
-void FCEUI_SaveSnapshot(void);
 
 int FCEUI_DecodePAR(const char *code, uint16 *a, uint8 *v, int *c, int *type);
 int FCEUI_DecodeGG(const char *str, uint16 *a, uint8 *v, int *c);
@@ -175,17 +168,7 @@ int FCEUI_SetCheat(uint32 which, const char *name, int32 a, int32 v, int compare
 void FCEUI_CheatSearchShowExcluded(void);
 void FCEUI_CheatSearchSetCurrentAsOriginal(void);
 
-#define FCEUIOD_STATE   0
-#define FCEUIOD_SNAPS   1
-#define FCEUIOD_NV      2
-#define FCEUIOD_CHEATS  3
-#define FCEUIOD_MISC    4
-#define FCEUIOD_MOVIE  5
-
-#define FCEUIOD__COUNT  6
-
-void FCEUI_SetDirOverride(int which, char *n);
-
+#ifdef FCEUDEF_DEBUGGER
 void FCEUI_MemDump(uint16 a, int32 len, void (*callb)(uint16 a, uint8 v));
 uint8 FCEUI_MemSafePeek(uint16 A);
 void FCEUI_MemPoke(uint16 a, uint8 v, int hl);
@@ -193,10 +176,8 @@ void FCEUI_NMI(void);
 void FCEUI_IRQ(void);
 uint16 FCEUI_Disassemble(void *XA, uint16 a, char *stringo);
 void FCEUI_GetIVectors(uint16 *reset, uint16 *irq, uint16 *nmi);
+#endif
 
-uint32 FCEUI_CRC32(uint32 crc, uint8 *buf, uint32 len);
-
-/* void FCEUI_ToggleTileView(void); */
 void FCEUI_SetLowPass(int q);
 
 void FCEUI_NSFSetVis(int mode);
diff --git a/src/general.c b/src/general.c
index f919283..3578ae1 100644
--- a/src/general.c
+++ b/src/general.c
@@ -50,13 +50,6 @@ void FCEUI_SetBaseDirectory(const char *dir)
 	BaseDirectory[2047] = 0;
 }
 
-static char *odirs[FCEUIOD__COUNT] = { 0, 0, 0, 0, 0, 0 };		/* odirs, odors. ^_^ */
-
-void FCEUI_SetDirOverride(int which, char *n)
-{
-	odirs[which] = n;
-}
-
 char *FCEU_MakeFName(int type, int id1, char *cd1)
 {
    char tmp[4096 + 512] = {0}; /* +512 for no reason :D */
diff --git a/src/ppu.c b/src/ppu.c
index f2536d8..628e564 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -384,13 +384,8 @@ void FCEUPPU_LineUpdate(void) {
 	}
 }
 
-static int tileview = 0;
 static int rendis = 0;
 
-void FCEUI_ToggleTileView(void) {
-	tileview ^= 1;
-}
-
 void FCEUI_SetRenderDisable(int sprites, int bg) {
 	if (sprites >= 0) {
 		if (sprites == 2) rendis ^= 1;
diff --git a/src/video.c b/src/video.c
index 5f78db6..765f140 100644
--- a/src/video.c
+++ b/src/video.c
@@ -67,8 +67,6 @@ int FCEU_InitVirtualVideo(void)
 
 #include "drawing.h"
 
-void FCEUI_SaveSnapshot(void) { }
-
 void FCEU_PutImage(void)
 {
 	if (GameInfo->type == GIT_NSF)
@@ -104,8 +102,3 @@ void FCEU_DispMessage(enum retro_log_level level, unsigned duration, const char
 void FCEU_ResetMessages(void)
 {
 }
-
-int SaveSnapshot(void)
-{
-	return(0);
-}
diff --git a/src/video.h b/src/video.h
index 9eef95b..34873d6 100644
--- a/src/video.h
+++ b/src/video.h
@@ -3,7 +3,6 @@
 
 int FCEU_InitVirtualVideo(void);
 void FCEU_KillVirtualVideo(void);
-int SaveSnapshot(void);
 extern uint8 *XBuf;
 extern uint8 *XDBuf;
 extern int show_crosshair;

From 9dbe8e86715c02ce45c805fcdf374e2899538c80 Mon Sep 17 00:00:00 2001
From: LibretroAdmin <reallibretroretroarch@gmail.com>
Date: Mon, 5 Sep 2022 01:22:26 +0200
Subject: [PATCH 281/295] * Remove FCEU_memmove * Remove FCEU_ResetMessages

---
 src/fceu-memory.h | 1 -
 src/fceu.c        | 1 -
 src/palette.h     | 1 -
 src/video.c       | 4 ----
 4 files changed, 7 deletions(-)

diff --git a/src/fceu-memory.h b/src/fceu-memory.h
index 437da24..bd61d6b 100644
--- a/src/fceu-memory.h
+++ b/src/fceu-memory.h
@@ -33,6 +33,5 @@ void *FCEU_malloc(uint32 size);
 void *FCEU_gmalloc(uint32 size);
 void FCEU_gfree(void *ptr);
 void FCEU_free(void *ptr);
-void FASTAPASS(3) FCEU_memmove(void *d, void *s, uint32 l);
 
 #endif
diff --git a/src/fceu.c b/src/fceu.c
index 7ff77fd..35c172b 100644
--- a/src/fceu.c
+++ b/src/fceu.c
@@ -301,7 +301,6 @@ endlseq:
    }
 
    FCEU_ResetPalette();
-   FCEU_ResetMessages();	/* Save state, status messages, etc. */
 
    return(GameInfo);
 }
diff --git a/src/palette.h b/src/palette.h
index f5c71be..a1bf2e8 100644
--- a/src/palette.h
+++ b/src/palette.h
@@ -10,7 +10,6 @@ extern int ipalette;
 void FCEU_ResetPalette(void);
 
 void FCEU_ResetPalette(void);
-void FCEU_ResetMessages();
 void FCEU_LoadGamePalette(void);
 
 #endif
diff --git a/src/video.c b/src/video.c
index 765f140..10b0c96 100644
--- a/src/video.c
+++ b/src/video.c
@@ -98,7 +98,3 @@ void FCEU_DispMessage(enum retro_log_level level, unsigned duration, const char
 
    FCEUD_DispMessage(level, duration, msg);
 }
-
-void FCEU_ResetMessages(void)
-{
-}

From 025b8f8bcbce5c1cae99cdf8a10baa1a1f7746e8 Mon Sep 17 00:00:00 2001
From: LibretroAdmin <reallibretroretroarch@gmail.com>
Date: Mon, 5 Sep 2022 01:24:02 +0200
Subject: [PATCH 282/295] fds.c - Remove unused functions

---
 src/fds.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/fds.c b/src/fds.c
index ea658cd..196fbd0 100644
--- a/src/fds.c
+++ b/src/fds.c
@@ -51,12 +51,6 @@ static DECLFR(FDSRead4033);
 
 static DECLFW(FDSWrite);
 
-static DECLFW(FDSWaveWrite);
-static DECLFR(FDSWaveRead);
-
-static DECLFR(FDSSRead);
-static DECLFW(FDSSWrite);
-
 static void FDSInit(void);
 static void FDSClose(void);
 

From a821de094d73435cd205315535dd944a15f20d13 Mon Sep 17 00:00:00 2001
From: LibretroAdmin <reallibretroretroarch@gmail.com>
Date: Mon, 5 Sep 2022 01:27:12 +0200
Subject: [PATCH 283/295] Remove unused variables/functions

---
 src/boards/235.c                | 3 ---
 src/boards/364.c                | 5 -----
 src/boards/375.c                | 4 ----
 src/boards/hp898f.c             | 7 -------
 src/boards/jyasic.c             | 2 --
 src/drivers/libretro/libretro.c | 7 +++----
 src/sound.c                     | 4 +---
 7 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/src/boards/235.c b/src/boards/235.c
index b0a151c..c26d451 100644
--- a/src/boards/235.c
+++ b/src/boards/235.c
@@ -21,9 +21,6 @@
 
 #include "mapinc.h"
 
-static uint8 *CHRRAM;
-static uint32 CHRRAMSIZE;
-
 static uint16 cmdreg;
 static uint8 unrom, reg, openbus;
 
diff --git a/src/boards/364.c b/src/boards/364.c
index 5fc4c2c..b5f4a5d 100644
--- a/src/boards/364.c
+++ b/src/boards/364.c
@@ -44,11 +44,6 @@ static void M364Power(void) {
 	SetWriteHandler(0x7000, 0x7FFF, M364Write);
 }
 
-static void M364Reset(void) {
-	EXPREGS[0] = 0;
-	MMC3RegReset();
-}
-
 void Mapper364_Init(CartInfo *info) {
 	GenMMC3_Init(info, 512, 512, 8, 0);
 	pwrap = M364PW;
diff --git a/src/boards/375.c b/src/boards/375.c
index 2b78638..5004fb2 100644
--- a/src/boards/375.c
+++ b/src/boards/375.c
@@ -73,10 +73,6 @@ static void Sync(void) {
 	setprg8r(0x10, 0x6000, 0);
 }
 
-static DECLFR(M375Read) {
-	return CartBR(A);
-}
-
 static DECLFW(M375Write) {
 	if (addrlatch & 0x800)
 		datalatch = V;
diff --git a/src/boards/hp898f.c b/src/boards/hp898f.c
index 43ba53d..5ce27df 100644
--- a/src/boards/hp898f.c
+++ b/src/boards/hp898f.c
@@ -48,13 +48,6 @@ static DECLFW(HP898FWrite) {
 	}
 }
 
-static DECLFW(HP898FWriteEx) {
-	switch (A & 4) {
-	case 0:	regs[0] = V; break; /* CHR */
-	case 4:	regs[1] = (V & 0xC0) | ((V >> 2) & 6) | ((V & 0x20) ? 1 : 0); break; /* PRG */
-	}
-	Sync();
-}
 static void HP898FPower(void) {
 	regs[0] = regs[1] = 0;
 	Sync();
diff --git a/src/boards/jyasic.c b/src/boards/jyasic.c
index 7ffb0a1..89fd170 100644
--- a/src/boards/jyasic.c
+++ b/src/boards/jyasic.c
@@ -689,8 +689,6 @@ void Mapper421_Init(CartInfo *info)
 static uint8 HSK007Reg[4];
 void sync394 (void) /* Called when J.Y. ASIC is active */
 {
-	int prgAND =HSK007Reg[3] &0x10? 0x1F: 0x0F;
-	int chrAND =HSK007Reg[3] &0x80? 0xFF: 0x7F;
 	int prgOR  =HSK007Reg[3] <<1 &0x010 | HSK007Reg[1] <<5 &0x020;
 	int chrOR  =HSK007Reg[3] <<1 &0x080 | HSK007Reg[1] <<8 &0x100;
 	syncPRG(0x1F, prgOR);
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index ab3ad9b..cdec31d 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -1321,7 +1321,6 @@ static bool update_option_visibility(void)
 {
    struct retro_variable var = {0};
    bool updated              = false;
-   size_t i, size;
 
    /* If frontend supports core option categories,
     * then fceumm_show_adv_system_options and
@@ -1415,7 +1414,7 @@ static bool update_option_visibility(void)
 static void set_variables(void)
 {
    struct retro_core_option_display option_display;
-   unsigned i = 0, index = 0;
+   unsigned index = 0;
 
    option_display.visible = false;
 
@@ -2696,8 +2695,8 @@ static void retro_run_blit(uint8_t *gfx)
 void retro_run(void)
 {
    uint8_t *gfx;
-   int32_t i, ssize = 0;
-   bool updated = false;
+   int32_t ssize = 0;
+   bool updated  = false;
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated)
       check_variables(false);
diff --git a/src/sound.c b/src/sound.c
index d31a9f7..dbf1c8a 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -691,9 +691,7 @@ static void RDoSQLQ(void) {
 
 static void RDoTriangle(void) {
 	int32 V;
-	int32 tcout, cout;
-
-	tcout = (tristep & 0xF);
+	int32 tcout = (tristep & 0xF);
 	if (!(tristep & 0x10)) tcout ^= 0xF;
 	tcout = (tcout * 3) << 16;	/* (tcout<<1); */
 

From f7c1b002eec15214a41aaf80cf813c57473ce679 Mon Sep 17 00:00:00 2001
From: LibretroAdmin <reallibretroretroarch@gmail.com>
Date: Mon, 5 Sep 2022 01:28:42 +0200
Subject: [PATCH 284/295] Fix warning (-Wimplicit-int)

---
 src/fds_apu.c |  4 ++--
 src/fds_apu.h | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/fds_apu.c b/src/fds_apu.c
index 8115c03..f57d480 100644
--- a/src/fds_apu.c
+++ b/src/fds_apu.c
@@ -282,13 +282,13 @@ void FDSSoundReset(void) {
 	GameExpSound.RChange = FDS_ESI;
 }
 
-DECLFR(FDSSoundRead) {
+uint8 FDSSoundRead(uint32 A) {
 	if (A >= 0x4040 && A < 0x4080) return FDSWaveRead(A);
 	if (A >= 0x4090 && A < 0x4093) return FDSSRead(A);
 	return X.DB;
 }
 
-DECLFW(FDSSoundWrite) {
+void FDSSoundWrite(uint32 A, uint8 V) {
 	if (A >= 0x4040 && A < 0x4080) FDSWaveWrite(A, V);
 	else if (A >= 0x4080 && A < 0x408B) FDSSWrite(A, V);
 }
diff --git a/src/fds_apu.h b/src/fds_apu.h
index 0aac02c..92902a3 100644
--- a/src/fds_apu.h
+++ b/src/fds_apu.h
@@ -1,12 +1,14 @@
 #ifndef FDS_APU_H
 #define FDS_APU_H
 
+#include "fceu-types.h"
+
 void FDSSoundReset(void);
 void FDSSoundStateAdd(void);
 
-/* Used for fds conversion-based mappers to allow access to fds apu registers */
+/* Used for FDS conversion-based mappers to allow access to FDS APU registers */
 void FDSSoundPower(void); 
-DECLFR(FDSSoundRead);   /* $4040-$407F, $4090-$4092 */
-DECLFW(FDSSoundWrite);  /* $4040-$407F, $4080-$408A */
+uint8 FDSSoundRead(uint32 A);          /* $4040-$407F, $4090-$4092 */
+void FDSSoundWrite(uint32 A, uint8 V); /* $4040-$407F, $4080-$408A */
 
-#endif /* FDS_APU_H */
\ No newline at end of file
+#endif /* FDS_APU_H */

From 27130037ae77be6a9e432c8218d440c3976e8d8a Mon Sep 17 00:00:00 2001
From: LibretroAdmin <reallibretroretroarch@gmail.com>
Date: Mon, 5 Sep 2022 01:29:39 +0200
Subject: [PATCH 285/295] Fix warning about misleading indentation

---
 src/boards/tf-1201.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/boards/tf-1201.c b/src/boards/tf-1201.c
index 6470e0f..4d3aba6 100644
--- a/src/boards/tf-1201.c
+++ b/src/boards/tf-1201.c
@@ -72,16 +72,21 @@ static DECLFW(UNLTF1201Write) {
 		int sar = ((A & 2) << 1);
 		chr[ind] = (chr[ind] & (0xF0 >> sar)) | ((V & 0x0F) << sar);
 		SyncChr();
-	} else switch (A & 0xF003) {
-		case 0x8000: prg0 = V; SyncPrg(); break;
-		case 0xA000: prg1 = V; SyncPrg(); break;
-		case 0x9000: mirr = V & 1; SyncChr(); break;
-		case 0x9001: swap = V & 3; SyncPrg(); break;
-		case 0xF000: IRQCount = ((IRQCount & 0xF0) | (V & 0xF)); break;
-		case 0xF002: IRQCount = ((IRQCount & 0x0F) | ((V & 0xF) << 4)); break;
-		case 0xF001:
-		case 0xF003: IRQa = V & 2; X6502_IRQEnd(FCEU_IQEXT); if (scanline < 240) IRQCount -= 8; break;
+	}
+	else
+	{
+		switch (A & 0xF003)
+		{
+			case 0x8000: prg0 = V; SyncPrg(); break;
+			case 0xA000: prg1 = V; SyncPrg(); break;
+			case 0x9000: mirr = V & 1; SyncChr(); break;
+			case 0x9001: swap = V & 3; SyncPrg(); break;
+			case 0xF000: IRQCount = ((IRQCount & 0xF0) | (V & 0xF)); break;
+			case 0xF002: IRQCount = ((IRQCount & 0x0F) | ((V & 0xF) << 4)); break;
+			case 0xF001:
+			case 0xF003: IRQa = V & 2; X6502_IRQEnd(FCEU_IQEXT); if (scanline < 240) IRQCount -= 8; break;
 		}
+	}
 }
 
 static void UNLTF1201IRQCounter(void) {

From 1eaa96286427c2d3f3ea2093e3210554be535c22 Mon Sep 17 00:00:00 2001
From: LibretroAdmin <reallibretroretroarch@gmail.com>
Date: Mon, 5 Sep 2022 01:33:09 +0200
Subject: [PATCH 286/295] Libretro_dipswitch - unused variable

---
 src/drivers/libretro/libretro_dipswitch.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/drivers/libretro/libretro_dipswitch.c b/src/drivers/libretro/libretro_dipswitch.c
index 7346309..49b2898 100644
--- a/src/drivers/libretro/libretro_dipswitch.c
+++ b/src/drivers/libretro/libretro_dipswitch.c
@@ -1101,10 +1101,9 @@ static void make_core_options(struct retro_core_option_v2_definition *vs_core_op
 
    for (i = 0; i < numCoreOptions; i++)
    {
-      struct retro_core_option_value vars_empty = { NULL, NULL };
-      const char *game_name = vsgame->game_name;
+      const char *game_name   = vsgame->game_name;
       const char *option_name = vsgame->core_options[i].option_name;
-      char key[100] = {0};
+      char key[100]           = {0};
 
       memset(&vs_core_options[i], 0,
             sizeof(struct retro_core_option_v2_definition));

From 23f21966be7574a68c427caf9f0e3e950afaf0d8 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Tue, 20 Sep 2022 16:49:13 +0200
Subject: [PATCH 287/295] Mapper 268: Write to WRAM before corrupting V when
 index==2.

---
 src/boards/268.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/boards/268.c b/src/boards/268.c
index b5514f7..9f2a966 100644
--- a/src/boards/268.c
+++ b/src/boards/268.c
@@ -91,6 +91,7 @@ static DECLFW(Mapper268_WriteWRAM) {
 
 static DECLFW(Mapper268_WriteReg) {
 	int index =A &7;
+	if (~submapper &1) Mapper268_WriteWRAM(A, V);
 	if (~EXPREGS[3] &0x80 || index ==2) {
 		if (index ==2) {
 			if (EXPREGS[2] &0x80) V =V &0x0F | EXPREGS[2] &~0x0F;
@@ -100,7 +101,6 @@ static DECLFW(Mapper268_WriteReg) {
 		FixMMC3PRG(MMC3_cmd);
 		FixMMC3CHR(MMC3_cmd);
 	}
-	if (~submapper &1) Mapper268_WriteWRAM(A, V);
 }
 
 static void Mapper268_Reset(void) {

From 392fe6b2978eb8dea117b9c673f2ac8ae1307d7c Mon Sep 17 00:00:00 2001
From: "Tilman M. Jaeschke" <carlosfritz@posteo.net>
Date: Sat, 5 Nov 2022 10:42:03 +0100
Subject: [PATCH 288/295] Update Makefile.libretro

makes it compile with platform "rpi4" and also "rpi4_64"
---
 Makefile.libretro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index 036c608..14b8cbe 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -247,7 +247,7 @@ else ifeq ($(platform), rpi3_64)
 	CFLAGS += -fomit-frame-pointer -fstrict-aliasing -ffast-math
 
 # Raspberry Pi 4 (64-bit)
-else ifeq ($(platform), rpi4)
+else ifneq (,$(findstring rpi4,$(platform)))
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
 	SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined

From c4fca66b8f11ccc314915d283561f0c6e6ac30f6 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Thu, 29 Dec 2022 21:37:43 +0100
Subject: [PATCH 289/295] Mapper 268: Correct submappers 2/3, add submappers
 8/9

---
 src/boards/268.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/boards/268.c b/src/boards/268.c
index 9f2a966..328fd90 100644
--- a/src/boards/268.c
+++ b/src/boards/268.c
@@ -46,7 +46,8 @@ static void Mapper268_PRGWrap(uint32 A, uint8 V) {
 		prgOffset    =EXPREGS[3]     &0x00E
 		             |EXPREGS[0] <<4 &0x070
 			     |EXPREGS[1] <<4 &0x080
-			     |EXPREGS[1] <<7 &0x300
+			     |EXPREGS[1] <<6 &0x100
+			     |EXPREGS[1] <<8 &0x200
 			     |EXPREGS[0] <<6 &0xC00;
 		break;
 	case 4:		/* LD622D: PRG A20-21 moved to register 0 */
@@ -67,7 +68,10 @@ static void Mapper268_PRGWrap(uint32 A, uint8 V) {
 		break;
 	}
 	prgOffset &=~(prgMaskMMC3 | prgMaskGNROM);
-	setprg8(A, V &prgMaskMMC3 | prgOffset | A >>13 &prgMaskGNROM);	
+	setprg8(A, V &prgMaskMMC3 | prgOffset | A >>13 &prgMaskGNROM);
+
+	/* CHR-RAM write protect on submapper 8/9) */
+	SetupCartCHRMapping(0, CHRptr[0], CHRsize[0], (submapper &~1) ==8 && EXPREGS[0] &0x10? 0: 1);
 }
 
 static void Mapper268_CHRWrap(uint32 A, uint8 V) {

From e85c0e2d56002fd8f19caf07ff27d63d323a2721 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Thu, 29 Dec 2022 21:57:02 +0100
Subject: [PATCH 290/295] Add mapper 354

---
 src/boards/354.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ines.c       |  1 +
 src/ines.h       |  1 +
 3 files changed, 94 insertions(+)
 create mode 100644 src/boards/354.c

diff --git a/src/boards/354.c b/src/boards/354.c
new file mode 100644
index 0000000..0b4d731
--- /dev/null
+++ b/src/boards/354.c
@@ -0,0 +1,92 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "mapinc.h"
+
+static uint16 latchAddr;
+static uint8  latchData;
+static uint8  submapper;
+
+static SFORMAT StateRegs[] =
+{
+   { &latchAddr, 2, "ADDR" },
+   { &latchData, 1, "DATA" },
+   { 0 }
+};
+
+static void Mapper354_Sync(void)
+{
+   int prg =latchData &0x3F | latchAddr <<2 &0x40 | latchAddr >>5 &0x80;
+   switch(latchAddr &7)
+   {
+      case 0: case 4:
+         setprg32(0x8000, prg >>1);
+         break;
+      case 1:
+         setprg16(0x8000, prg);
+         setprg16(0xC000, prg |7);
+         break;
+      case 2: case 6:
+         setprg8(0x8000, prg <<1 | latchData >>7);
+         setprg8(0xA000, prg <<1 | latchData >>7);
+         setprg8(0xC000, prg <<1 | latchData >>7);
+         setprg8(0xE000, prg <<1 | latchData >>7);
+         break;
+      case 3: case 7:
+         setprg16(0x8000, prg);
+         setprg16(0xC000, prg);
+         break;
+      case 5:
+         setprg8(0x6000, prg <<1 | latchData >>7);
+         setprg32(0x8000, prg >>1 |3);
+         break;
+   }
+   setchr8(0);
+   setmirror(latchData &0x40? MI_H: MI_V);
+}
+
+static DECLFW(Mapper354_WriteLatch)
+{
+   latchData =V;
+   latchAddr =A &0xFFFF;
+   Mapper354_Sync();
+}
+
+static void Mapper354_Reset(void)
+{
+   latchAddr =latchData =0;
+   Mapper354_Sync();
+}
+
+static void Mapper354_Power(void)
+{
+   latchAddr =latchData =0;
+   SetReadHandler(0x6000, 0xFFFF, CartBR);
+   SetWriteHandler(submapper ==1? 0xE000: 0xF000, 0xFFFF, Mapper354_WriteLatch);
+   Mapper354_Sync();
+}
+
+void Mapper354_Init(CartInfo *info)
+{
+   submapper = info->submapper;
+   info->Power =Mapper354_Power;
+   info->Reset =Mapper354_Reset;
+   AddExState(StateRegs, ~0, 0, 0);
+}
diff --git a/src/ines.c b/src/ines.c
index 63755d7..7a791fe 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -759,6 +759,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "891227",                   350, BMC891227_Init         )
 	INES_BOARD( "Techline XB",              351, Mapper351_Init         )
 	INES_BOARD( "Super Mario Family",       353, Mapper353_Init         )
+	INES_BOARD( "FAM250/81-01-39-C/SCHI-24",354, Mapper354_Init         )
 	INES_BOARD( "3D-BLOCK",                 355, UNL3DBlock_Init        )
 	INES_BOARD( "7-in-1 Rockman (JY-208)",  356, Mapper356_Init         )
 	INES_BOARD( "Bit Corp 4-in-1",          357, Mapper357_Init         )
diff --git a/src/ines.h b/src/ines.h
index 4f7bbdf..ef072a5 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -271,6 +271,7 @@ void Mapper330_Init(CartInfo *);
 void Mapper334_Init(CartInfo *);
 void Mapper351_Init(CartInfo *);
 void Mapper353_Init(CartInfo *);
+void Mapper354_Init(CartInfo *);
 void Mapper356_Init(CartInfo *);
 void Mapper357_Init(CartInfo *);
 void Mapper358_Init(CartInfo *);

From f6b5f60399ee06e3f9ced96d2a8b3635b46ea212 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Thu, 29 Dec 2022 23:12:47 +0100
Subject: [PATCH 291/295] Add submapper 1 to mapper 452

---
 src/boards/452.c | 108 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 73 insertions(+), 35 deletions(-)

diff --git a/src/boards/452.c b/src/boards/452.c
index 5b8b3c9..bd83f51 100644
--- a/src/boards/452.c
+++ b/src/boards/452.c
@@ -18,44 +18,85 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
- 
+
 /* DS-9-27. Absolutely insane PCB that overlays 8 KiB of WRAM into a selectable position between $8000 and $E000. */
- 
+
 #include "mapinc.h"
 
 static uint8 *WRAM;
 static uint32 WRAMSIZE;
 static uint16 latch[2];
+static uint8 submapper;
 
+static void SetWRAM(uint16 A) {
+	setprg8r(0x10, A, 0);
+	SetWriteHandler(A, A |0x1FFF, CartBW);
+}
+
+static DECLFW(Mapper452_WriteLatch);
 static void Mapper452_Sync(void) {
-	uint8 wramBank = latch[1] >>3 &6 |8;
-	if (latch[1] &2) {
-		setprg8(0x8000, latch[0] >>1);
-		setprg8(0xA000, latch[0] >>1);
-		setprg8(0xC000, latch[0] >>1);
-		setprg8(0xE000, latch[0] >>1);
-		setprg8r(0x10, (wramBank ^4) <<12, 0);
-	} else
-	if (latch[1] &8) {
-		setprg8(0x8000, latch[0] >>1 &~1 |0);
-		setprg8(0xA000, latch[0] >>1 &~1 |1);
-		setprg8(0xC000, latch[0] >>1 &~1 |2);
-		setprg8(0xE000, latch[0] >>1 &~1 |3 | latch[1] &4 | (latch[1] &0x04 && latch[1] &0x40? 8: 0));
+	SetWriteHandler(0x8000, 0xFFFF, Mapper452_WriteLatch);
+	if (submapper ==1) {
+		switch(latch[0] &0xF000) {
+		case 0xA000:
+			setprg16(0x8000, latch[0] >>1);
+			setprg8 (0xC000, 0);
+			SetWRAM(latch[0] <<4 &0x6000 |0x8000);
+			break;
+		case 0xC000:
+			setprg16(0x8000, latch[0] >>1 |0);
+			setprg16(0xC000, latch[0] >>1 |1);
+			SetWRAM(latch[0] <<4 &0x6000 |0x8000);
+			break;
+		case 0xD000:
+			setprg8(0x8000, latch[0]);
+			setprg8(0xA000, latch[0]);
+			setprg8(0xC000, latch[0]);
+			setprg8(0xE000, latch[0]);
+			SetWRAM(latch[0] <<4 &0x2000 |0x8000);
+			SetWRAM(latch[0] <<4 &0x2000 |0xC000);
+			break;
+		case 0xE000:
+			setprg16(0x8000, latch[0] >>1);
+			setprg16(0xC000, latch[0] &0x100? (latch[0] >>1 |7): 0);
+			SetWRAM(latch[0] <<4 &0x6000 |0x8000);
+			break;
+		default:
+			setprg16(0x8000, latch[0] >>1);
+			setprg16(0xC000, 0);
+			break;
+		}
+		setchr8(0);
+		setmirror(latch[0] &0x800? MI_H: MI_V);
 	} else {
-		setprg16(0x8000, latch[0] >>2);
-		setprg16(0xC000, 0);
+		uint8 wramBank = latch[1] >>3 &6 |8;
+		if (latch[1] &2) {
+			setprg8(0x8000, latch[0] >>1);
+			setprg8(0xA000, latch[0] >>1);
+			setprg8(0xC000, latch[0] >>1);
+			setprg8(0xE000, latch[0] >>1);
+			SetWRAM((wramBank ^4) <<12);
+		} else
+		if (latch[1] &8) {
+			setprg8(0x8000, latch[0] >>1 &~1 |0);
+			setprg8(0xA000, latch[0] >>1 &~1 |1);
+			setprg8(0xC000, latch[0] >>1 &~1 |2);
+			setprg8(0xE000, latch[0] >>1 &~1 |3 | latch[1] &4 | (latch[1] &0x04 && latch[1] &0x40? 8: 0));
+		} else {
+			setprg16(0x8000, latch[0] >>2);
+			setprg16(0xC000, 0);
+		}
+		SetWRAM(wramBank <<12);
+		setchr8(0);
+		setmirror(latch [1] &1 ^1);
 	}
-	setprg8r(0x10, wramBank <<12, 0);
-	setchr8(0);
-	setmirror(latch [1] &1 ^1);
-	
 }
 
 static DECLFW(Mapper452_WriteLatch) {
-	latch[0] =A &0xFFF;
+	CartBW(A, V);
+	latch[0] =A &0xFFFF;
 	latch[1] =V;
 	Mapper452_Sync();
-	/* Do not relay to CartBW, as RAM mapped to locations other than $8000-$DFFF are not write-enabled. */
 }
 
 static void Mapper452_Reset(void) {
@@ -64,35 +105,32 @@ static void Mapper452_Reset(void) {
 }
 
 static void Mapper452_Power(void) {
-	
 	latch[0] =latch[1] =0;
+	SetReadHandler(0x6000, 0xFFFF, CartBR);
 	Mapper452_Sync();
-	SetReadHandler(0x8000, 0xFFFF, CartBR);
-	SetWriteHandler(0x8000, 0xDFFF, Mapper452_WriteLatch);
-	SetWriteHandler(0xE000, 0xFFFF, CartBW);
-    FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
+	FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
 }
 
 static void Mapper452_Close(void) {
-   if (WRAM)
-      FCEU_gfree(WRAM);
-   WRAM = NULL;
+	if (WRAM)
+		FCEU_gfree(WRAM);
+	WRAM = NULL;
 }
 
 static void StateRestore(int version) {
-   Mapper452_Sync();
+	Mapper452_Sync();
 }
 
 void Mapper452_Init(CartInfo *info) {
+	submapper =info->submapper;
 	info->Reset = Mapper452_Reset;
 	info->Power = Mapper452_Power;
 	info->Close = Mapper452_Close;
 	GameStateRestore = StateRestore;
 
-	WRAMSIZE = 8192;
-	WRAM = (uint8*) FCEU_gmalloc(WRAMSIZE);
+	WRAMSIZE =8192;
+	WRAM =(uint8*) FCEU_gmalloc(WRAMSIZE);
 	SetupCartPRGMapping(0x10, WRAM, WRAMSIZE, 1);
 	AddExState(WRAM, WRAMSIZE, 0, "WRAM");
-
 	AddExState(&latch, 4, 0, "LATC");
 }

From a99b4b11bdd539a891b5f59f68bcc49c90215c62 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Fri, 30 Dec 2022 00:13:22 +0100
Subject: [PATCH 292/295] Properly name a few Waixing mappers. Ambiguous mapper
 199 changed to nesdev definition. Add mapper 227 submapper 2.

---
 src/boards/199.c       | 83 ++++++------------------------------------
 src/boards/addrlatch.c |  8 ++--
 src/ines.c             | 12 +++---
 3 files changed, 22 insertions(+), 81 deletions(-)

diff --git a/src/boards/199.c b/src/boards/199.c
index c6cd39f..16beb17 100644
--- a/src/boards/199.c
+++ b/src/boards/199.c
@@ -1,7 +1,7 @@
-/* FCE Ultra - NES/Famicom Emulator
+/* FCEUmm - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2006 CaH4e3
+ *  Copyright (C) 2022
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,83 +16,24 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Dragon Ball Z 2 - Gekishin Freeza! (C)
- * Dragon Ball Z Gaiden - Saiya Jin Zetsumetsu Keikaku (C)
- * San Guo Zhi 2 (C)
- *
  */
-
 #include "mapinc.h"
 #include "mmc3.h"
 
-static uint8 *CHRRAM = NULL;
-static uint32 CHRRAMSIZE;
-
-static void M199PW(uint32 A, uint8 V) {
-	setprg8(A, V);
-	setprg8(0xC000, EXPREGS[0]);
-	setprg8(0xE000, EXPREGS[1]);
+static void Mapper199_CHRWrap(uint32 A, uint8 V) {
+	setchr8(0); /* Unbanked CHR RAM */
 }
 
-static void M199CW(uint32 A, uint8 V) {
-	setchr1r((V < 8) ? 0x10 : 0x00, A, V);
-	setchr1r((DRegBuf[0] < 8) ? 0x10 : 0x00, 0x0000, DRegBuf[0]);
-	setchr1r((EXPREGS[2] < 8) ? 0x10 : 0x00, 0x0400, EXPREGS[2]);
-	setchr1r((DRegBuf[1] < 8) ? 0x10 : 0x00, 0x0800, DRegBuf[1]);
-	setchr1r((EXPREGS[3] < 8) ? 0x10 : 0x00, 0x0c00, EXPREGS[3]);
-}
-
-static void M199MW(uint8 V) {
-/*	FCEU_printf("%02x\n",V); */
-	switch (V & 3) {
-	case 0: setmirror(MI_V); break;
-	case 1: setmirror(MI_H); break;
-	case 2: setmirror(MI_0); break;
-	case 3: setmirror(MI_1); break;
-	}
-}
-
-static DECLFW(M199Write) {
-	if ((A == 0x8001) && (MMC3_cmd & 8)) {
-		EXPREGS[MMC3_cmd & 3] = V;
-		FixMMC3PRG(MMC3_cmd);
-		FixMMC3CHR(MMC3_cmd);
-	} else
-	if (A < 0xC000)
-		MMC3_CMDWrite(A, V);
-	else
-		MMC3_IRQWrite(A, V);
-}
-
-static void M199Power(void) {
-	EXPREGS[0] = ~1;
-	EXPREGS[1] = ~0;
-	EXPREGS[2] = 1;
-	EXPREGS[3] = 3;
+static void Mapper199_Power(void) {
 	GenMMC3Power();
-	SetWriteHandler(0x8000, 0xFFFF, M199Write);
-}
-
-static void M199Close(void) {
-	GenMMC3Close();
-	if (CHRRAM)
-		FCEU_gfree(CHRRAM);
-	CHRRAM = NULL;
+	setprg4r(0x10, 0x5000, 2);
+	SetWriteHandler(0x5000, 0x5FFF, CartBW);
+	SetReadHandler(0x5000, 0x5FFF, CartBR);
 }
 
 void Mapper199_Init(CartInfo *info) {
-	GenMMC3_Init(info, 512, 256, 8, info->battery);
-	cwrap = M199CW;
-	pwrap = M199PW;
-	mwrap = M199MW;
-	info->Power = M199Power;
-	info->Close = M199Close;
-
-	CHRRAMSIZE = 8192;
-	CHRRAM = (uint8*)FCEU_gmalloc(CHRRAMSIZE);
-	SetupCartCHRMapping(0x10, CHRRAM, CHRRAMSIZE, 1);
-	AddExState(CHRRAM, CHRRAMSIZE, 0, "CHRR");
-
-	AddExState(EXPREGS, 4, 0, "EXPR");
+	GenMMC3_Init(info, 1024, 0, 16, info->battery);
+	cwrap = Mapper199_CHRWrap;
+	info->Power = Mapper199_Power;
+	info->Reset = MMC3RegReset;
 }
diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c
index dd67b51..a989010 100644
--- a/src/boards/addrlatch.c
+++ b/src/boards/addrlatch.c
@@ -28,6 +28,7 @@ static readfunc defread;
 static uint8 *WRAM = NULL;
 static uint32 WRAMSIZE;
 static uint32 hasBattery;
+static uint32 submapper = 0;
 
 static DECLFW(LatchWrite) {
 	latche = A;
@@ -267,7 +268,6 @@ void Mapper200_Init(CartInfo *info) {
 /* 2020-3-6 - Support for 21-in-1 (CF-043) (2006-V) (Unl) [p1].nes which has mixed mirroring
  * found at the time labeled as submapper 15
  * 0x05658DED 128K PRG, 32K CHR */
-static uint32 submapper = 0;
 static void M201Sync(void) {
 	if (latche & 8 || submapper == 15) {
 		setprg32(0x8000, latche & 3);
@@ -281,8 +281,7 @@ static void M201Sync(void) {
 }
 
 void Mapper201_Init(CartInfo *info) {
-	submapper = 0;
-	if (info->submapper > 0) submapper = info->submapper;
+	submapper = info->submapper;
 	Latch_Init(info, M201Sync, NULL, 0xFFFF, 0x8000, 0xFFFF, 0);
 }
 
@@ -398,7 +397,7 @@ static void M227Sync(void) {
 				setprg16(0xC000, p | 7);
 			} else {
 				setprg16(0x8000, p);
-				setprg16(0xC000, p & 0x38);
+				setprg16(0xC000, submapper ==2? 0: p & 0x38);
 			}
 		}
 	}
@@ -415,6 +414,7 @@ static void M227Sync(void) {
 }
 
 void Mapper227_Init(CartInfo *info) {
+	submapper =info->submapper;
 	Latch_Init(info, M227Sync, NULL, 0x0000, 0x8000, 0xFFFF, 1);
 }
 
diff --git a/src/ines.c b/src/ines.c
index 7a791fe..aea8215 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -583,7 +583,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "BANDAI 24C01",             159, Mapper159_Init         ) /* Different type of EEPROM on the  bandai board */
 	INES_BOARD( "SA009",                    160, SA009_Init             )
 /*    INES_BOARD( "",                            161, Mapper161_Init ) */
-	INES_BOARD( "",                         162, Mapper162_Init         )
+	INES_BOARD( "Waixing FS304",            162, Mapper162_Init         )
 	INES_BOARD( "",                         163, Mapper163_Init         )
 	INES_BOARD( "",                         164, Mapper164_Init         )
 	INES_BOARD( "",                         165, Mapper165_Init         )
@@ -599,7 +599,7 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "",                         175, Mapper175_Init         )
 	INES_BOARD( "BMCFK23C",                 176, Mapper176_Init         )
 	INES_BOARD( "",                         177, Mapper177_Init         )
-	INES_BOARD( "",                         178, Mapper178_Init         )
+	INES_BOARD( "Waixing FS305",            178, Mapper178_Init         )
 /*    INES_BOARD( "",                            179, Mapper179_Init ) */
 	INES_BOARD( "",                         180, Mapper180_Init         )
 	INES_BOARD( "",                         181, Mapper181_Init         )
@@ -613,21 +613,21 @@ INES_BOARD_BEGIN()
 	INES_BOARD( "",                         189, Mapper189_Init         )
 	INES_BOARD( "",                         190, Mapper190_Init         )
 	INES_BOARD( "",                         191, Mapper191_Init         )
-	INES_BOARD( "TW MMC3+VRAM Rev. B",      192, Mapper192_Init         )
+	INES_BOARD( "Waixing FS308",            192, Mapper192_Init         )
 	INES_BOARD( "NTDEC TC-112",             193, Mapper193_Init         ) /* War in the Gulf */
 	INES_BOARD( "TW MMC3+VRAM Rev. C",      194, Mapper194_Init         )
-	INES_BOARD( "TW MMC3+VRAM Rev. D",      195, Mapper195_Init         )
+	INES_BOARD( "Waixing FS303",            195, Mapper195_Init         )
 	INES_BOARD( "",                         196, Mapper196_Init         )
 	INES_BOARD( "",                         197, Mapper197_Init         )
 	INES_BOARD( "TW MMC3+VRAM Rev. E",      198, Mapper198_Init         )
-	INES_BOARD( "",                         199, Mapper199_Init         )
+	INES_BOARD( "Waixing FS309",            199, Mapper199_Init         )
 	INES_BOARD( "",                         200, Mapper200_Init         )
 	INES_BOARD( "21-in-1",                  201, Mapper201_Init         )
 	INES_BOARD( "",                         202, Mapper202_Init         )
 	INES_BOARD( "",                         203, Mapper203_Init         )
 	INES_BOARD( "",                         204, Mapper204_Init         )
 	INES_BOARD( "BMC 15-in-1/3-in-1",       205, Mapper205_Init         )
-	INES_BOARD( "NAMCOT 108 Rev. C",        206, Mapper206_Init         ) /* Deprecated, Used to be "DEIROM" whatever it means, but actually simple version of MMC3 */
+	INES_BOARD( "Nintendo DE(1)ROM",        206, Mapper206_Init         )
 	INES_BOARD( "TAITO X1-005 Rev. B",      207, Mapper207_Init         )
 	INES_BOARD( "",                         208, Mapper208_Init         )
 	INES_BOARD( "HUMMER/JY BOARD",          209, Mapper209_Init         )

From 2b172d3eb2b62fd57dc8e2a27f3242a0c8d7ab42 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Fri, 30 Dec 2022 00:43:48 +0100
Subject: [PATCH 293/295] Mapper 195: Reimplemented according to nesdev
 description. This makes the emulaton compatible with unhacked Captain Tsubasa
 2, and IN-compatible with hacked Captain Tsubasa 2.

---
 src/boards/195.c  | 88 +++++++++++++++++++++++++++++++++++++++++++++++
 src/boards/mmc3.c | 34 +++++-------------
 2 files changed, 96 insertions(+), 26 deletions(-)
 create mode 100644 src/boards/195.c

diff --git a/src/boards/195.c b/src/boards/195.c
new file mode 100644
index 0000000..c33fb08
--- /dev/null
+++ b/src/boards/195.c
@@ -0,0 +1,88 @@
+/* FCEUmm - NES/Famicom Emulator
+ *
+ * Copyright notice for this file:
+ *  Copyright (C) 2022
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include "mapinc.h"
+#include "mmc3.h"
+
+writefunc writePPU;
+static uint8 *CHRRAM;
+static uint32 CHRRAMSIZE;
+static uint8 mask;
+static uint8 compare;
+extern uint32 RefreshAddr;
+
+static void Mapper195_CHRWrap(uint32 A, uint8 V) {
+	if ((V &mask) ==compare)
+		setchr1r(0x10, A, V);
+	else
+		setchr1r(0, A, V);
+}
+
+static const uint8 compares[8] = { 0x28, 0x00, 0x4C, 0x64, 0x46, 0x7C, 0x04, 0xFF };
+static DECLFW(Mapper195_InterceptPPUWrite) {
+	if (RefreshAddr <0x2000) {
+		int addr =RefreshAddr;
+		int reg, bank;
+
+		if (MMC3_cmd &0x80) addr ^=0x1000;
+		if (addr <0x1000)
+			reg =addr >>11;
+		else
+			reg =(addr >>10) -2;
+
+		bank =DRegBuf[reg];
+		if (bank &0x80) {
+			if (bank &0x10) {
+				mask =0x00;
+				compare =0xFF;
+			} else {
+				int index =(bank &0x02? 1: 0) | (bank &0x08? 2: 0) | (bank &0x40? 4: 0);
+				mask =bank &0x40? 0xFE: 0xFC;
+				compare =compares[index];
+			}
+			FixMMC3CHR(MMC3_cmd);
+		}
+	}
+	writePPU(A, V);
+}
+
+static void Mapper195_Power(void) {
+	mask =0xFC;
+	compare =0x00;
+	GenMMC3Power();
+	setprg4r(0x10, 0x5000, 2);
+	SetWriteHandler(0x5000, 0x5FFF, CartBW);
+	SetReadHandler(0x5000, 0x5FFF, CartBR);
+	
+	if (GetWriteHandler(0x2007) !=Mapper195_InterceptPPUWrite) {
+		writePPU =GetWriteHandler(0x2007);
+		SetWriteHandler(0x2007, 0x2007, Mapper195_InterceptPPUWrite);
+	}
+}
+
+void Mapper195_Init(CartInfo *info) {
+	GenMMC3_Init(info, 512, 256, 16, info->battery);
+	cwrap = Mapper195_CHRWrap;
+	info->Power = Mapper195_Power;
+	info->Reset = MMC3RegReset;
+	CHRRAMSIZE =4096;
+	CHRRAM =(uint8*)FCEU_gmalloc(CHRRAMSIZE);
+	SetupCartCHRMapping(0x10, CHRRAM, CHRRAMSIZE, 1);
+	AddExState(CHRRAM, CHRRAMSIZE, 0, "CHRR");
+}
diff --git a/src/boards/mmc3.c b/src/boards/mmc3.c
index b90e7cb..864e498 100644
--- a/src/boards/mmc3.c
+++ b/src/boards/mmc3.c
@@ -1007,31 +1007,6 @@ void Mapper194_Init(CartInfo *info) {
 	AddExState(CHRRAM, CHRRAMSIZE, 0, "CHRR");
 }
 
-/* ---------------------------- Mapper 195 ------------------------------- */
-static void M195CW(uint32 A, uint8 V) {
-	if (V <= 3)	/* Crystalis (c).nes, Captain Tsubasa Vol 2 - Super Striker (C) */
-		setchr1r(0x10, A, V);
-	else
-		setchr1r(0, A, V);
-}
-
-static void M195Power(void) {
-	GenMMC3Power();
-	setprg4r(0x10, 0x5000, 2);
-	SetWriteHandler(0x5000, 0x5fff, CartBW);
-	SetReadHandler(0x5000, 0x5fff, CartBR);
-}
-
-void Mapper195_Init(CartInfo *info) {
-	GenMMC3_Init(info, 512, 256, 16, info->battery);
-	cwrap = M195CW;
-	info->Power = M195Power;
-	CHRRAMSIZE = 4096;
-	CHRRAM = (uint8*)FCEU_gmalloc(CHRRAMSIZE);
-	SetupCartCHRMapping(0x10, CHRRAM, CHRRAMSIZE, 1);
-	AddExState(CHRRAM, CHRRAMSIZE, 0, "CHRR");
-}
-
 /* ---------------------------- Mapper 196 ------------------------------- */
 /* MMC3 board with optional command address line connection, allows to
  * make three-four different wirings to IRQ address lines and separately to
@@ -1127,6 +1102,13 @@ void Mapper197_Init(CartInfo *info) {
 
 /* ---------------------------- Mapper 198 ------------------------------- */
 
+static void M198Power(void) {
+	GenMMC3Power();
+	setprg4r(0x10, 0x5000, 2);
+	SetWriteHandler(0x5000, 0x5fff, CartBW);
+	SetReadHandler(0x5000, 0x5fff, CartBR);
+}
+
 static void M198PW(uint32 A, uint8 V) {
 	if (V >= 0x50)	/* Tenchi o Kurau II - Shokatsu Koumei Den (J) (C).nes */
 		setprg8(A, V & 0x4F);
@@ -1137,7 +1119,7 @@ static void M198PW(uint32 A, uint8 V) {
 void Mapper198_Init(CartInfo *info) {
 	GenMMC3_Init(info, 1024, 0, 16, info->battery);
 	pwrap = M198PW;
-	info->Power = M195Power;
+	info->Power = M198Power;
 }
 
 /* ---------------------------- Mapper 205 ------------------------------ */

From 8e7ba746dc27e0c7e21f5f6f9d01d8a4d5b97bb8 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Fri, 30 Dec 2022 01:04:26 +0100
Subject: [PATCH 294/295] Mapper 195: Properly deallocate CHRRAM

---
 src/boards/195.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/boards/195.c b/src/boards/195.c
index c33fb08..37b2adf 100644
--- a/src/boards/195.c
+++ b/src/boards/195.c
@@ -76,11 +76,18 @@ static void Mapper195_Power(void) {
 	}
 }
 
+void Mapper195_Close(void) {
+	if (CHRRAM)
+		FCEU_gfree(CHRRAM);
+	CHRRAM = NULL;
+}
+
 void Mapper195_Init(CartInfo *info) {
 	GenMMC3_Init(info, 512, 256, 16, info->battery);
 	cwrap = Mapper195_CHRWrap;
 	info->Power = Mapper195_Power;
 	info->Reset = MMC3RegReset;
+	info->Close = Mapper195_Close;
 	CHRRAMSIZE =4096;
 	CHRRAM =(uint8*)FCEU_gmalloc(CHRRAMSIZE);
 	SetupCartCHRMapping(0x10, CHRRAM, CHRRAMSIZE, 1);

From d67592bdfbc853f40b09be062966ebfe680393a1 Mon Sep 17 00:00:00 2001
From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com>
Date: Fri, 30 Dec 2022 01:12:34 +0100
Subject: [PATCH 295/295] Mapper 195: Properly save GAL state

---
 src/boards/195.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/boards/195.c b/src/boards/195.c
index 37b2adf..f956a1a 100644
--- a/src/boards/195.c
+++ b/src/boards/195.c
@@ -92,4 +92,6 @@ void Mapper195_Init(CartInfo *info) {
 	CHRRAM =(uint8*)FCEU_gmalloc(CHRRAMSIZE);
 	SetupCartCHRMapping(0x10, CHRRAM, CHRRAMSIZE, 1);
 	AddExState(CHRRAM, CHRRAMSIZE, 0, "CHRR");
+	AddExState(&mask, 1, 0, "EXP0");
+	AddExState(&compare, 1, 0, "EXP1");
 }