M include/mgba/internal/ds/io.h → include/mgba/internal/ds/io.h

@@ -73,6 +73,24 @@ DS_REG_IPCFIFOSEND_HI = 0x18A,
 	DS_REG_IPCFIFORECV_LO = 0x100000,
 	DS_REG_IPCFIFORECV_HI = 0x100002,
 
+	// Game card
+	DS_REG_AUXSPICNT = 0x1A0,
+	DS_REG_AUXSPIDATA = 0x1A2,
+	DS_REG_SLOT1CNT_LO = 0x1A4,
+	DS_REG_SLOT1CNT_HI = 0x1A6,
+	DS_REG_SLOT1CMD_0 = 0x1A8,
+	DS_REG_SLOT1CMD_1 = 0x1A9,
+	DS_REG_SLOT1CMD_2 = 0x1AA,
+	DS_REG_SLOT1CMD_3 = 0x1AB,
+	DS_REG_SLOT1CMD_4 = 0x1AC,
+	DS_REG_SLOT1CMD_5 = 0x1AD,
+	DS_REG_SLOT1CMD_6 = 0x1AE,
+	DS_REG_SLOT1CMD_7 = 0x1AF,
+	DS_REG_SLOT1DATA_0 = 0x100010,
+	DS_REG_SLOT1DATA_1 = 0x100011,
+	DS_REG_SLOT1DATA_2 = 0x100012,
+	DS_REG_SLOT1DATA_3 = 0x100013,
+
 	// Interrupts
 	DS_REG_IME = 0x208,
 	DS_REG_IE_LO = 0x210,
@@ -209,24 +227,6 @@ DS9_REG_B_BLDCNT = 0x1050,
 	DS9_REG_B_BLDALPHA = 0x1052,
 	DS9_REG_B_BLDY = 0x1054,
 	DS9_REG_B_MASTER_BRIGHT = 0x106C,
-
-	// Game card
-	DS9_REG_AUXSPICNT = 0x1A0,
-	DS9_REG_AUXSPIDATA = 0x1A2,
-	DS9_REG_SLOT1CNT_LO = 0x1A4,
-	DS9_REG_SLOT1CNT_HI = 0x1A6,
-	DS9_REG_SLOT1CMD_0 = 0x1A8,
-	DS9_REG_SLOT1CMD_1 = 0x1A9,
-	DS9_REG_SLOT1CMD_2 = 0x1AA,
-	DS9_REG_SLOT1CMD_3 = 0x1AB,
-	DS9_REG_SLOT1CMD_4 = 0x1AC,
-	DS9_REG_SLOT1CMD_5 = 0x1AD,
-	DS9_REG_SLOT1CMD_6 = 0x1AE,
-	DS9_REG_SLOT1CMD_7 = 0x1AF,
-	DS9_REG_SLOT1DATA_0 = 0x100010,
-	DS9_REG_SLOT1DATA_1 = 0x100011,
-	DS9_REG_SLOT1DATA_2 = 0x100012,
-	DS9_REG_SLOT1DATA_3 = 0x100013,
 
 	// Etc
 	DS9_REG_EXMEMCNT = 0x204,

M src/ds/io.c → src/ds/io.c

@@ -83,6 +83,7 @@ value &= 0x00C7;
 		DSTimerWriteTMCNT_HI(&dscore->timers[3], &dscore->timing, dscore->cpu, &dscore->memory.io[DS_REG_TM3CNT_LO >> 1], value);
 		break;
 
+	// IPC
 	case DS_REG_IPCSYNC:
 		value &= 0x6F00;
 		value |= dscore->memory.io[address >> 1] & 0x000F;
@@ -91,10 +92,19 @@ break;
 	case DS_REG_IPCFIFOCNT:
 		value = DSIPCWriteFIFOCNT(dscore, value);
 		break;
+
+	// Cart bus
+	case DS_REG_SLOT1CNT_LO:
+		mLOG(DS_IO, STUB, "ROM control not implemented");
+		value &= 0x7FFF;
+		break;
+
+	// Interrupts
 	case DS_REG_IME:
 		DSWriteIME(dscore->cpu, dscore->memory.io, value);
 		break;
 	case 0x20A:
+		value = 0;
 		// Some bad interrupt libraries will write to this
 		break;
 	case DS_REG_IF_LO:
@@ -267,6 +277,7 @@ case DS_REG_TM3CNT_HI:
 	case DS_REG_IPCSYNC:
 	case DS_REG_IPCFIFOCNT:
 	case DS_REG_IME:
+	case 0x20A:
 	case DS_REG_IE_LO:
 	case DS_REG_IE_HI:
 	case DS_REG_IF_LO:
@@ -434,6 +445,7 @@ case DS_REG_TM3CNT_HI:
 	case DS_REG_IPCSYNC:
 	case DS_REG_IPCFIFOCNT:
 	case DS_REG_IME:
+	case 0x20A:
 	case DS_REG_IE_LO:
 	case DS_REG_IE_HI:
 	case DS_REG_IF_LO: