MultiMBC1: Fix bank1 index ignoring multicart mode

drhelius · drhelius · commit 71967ca559d3 · 2026-03-14T13:58:55.000+01:00
diff --git a/src/MultiMBC1MemoryRule.cpp b/src/MultiMBC1MemoryRule.cpp
@@ -178,7 +178,10 @@ u8* MultiMBC1MemoryRule::GetCurrentRomBank1()
 
 int MultiMBC1MemoryRule::GetCurrentRomBank1Index()
 {
-    return m_iMBC1Bank_1;
+    if (m_iMulticartMode == 0)
+        return m_iMBC1Bank_1;
+    else
+        return m_iMBC1MBank_1;
 }
 
 void MultiMBC1MemoryRule::SaveState(std::ostream& stream)

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,10 @@ u8* MultiMBC1MemoryRule::GetCurrentRomBank1()`
`178`	`178`
`179`	`179`	`int MultiMBC1MemoryRule::GetCurrentRomBank1Index()`
`180`	`180`	`{`
`181`		`- return m_iMBC1Bank_1;`
	`181`	`+ if (m_iMulticartMode == 0)`
	`182`	`+ return m_iMBC1Bank_1;`
	`183`	`+ else`
	`184`	`+ return m_iMBC1MBank_1;`
`182`	`185`	`}`
`183`	`186`
`184`	`187`	`void MultiMBC1MemoryRule::SaveState(std::ostream& stream)`