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         )