fix bit mask for interrupt 6 (fixes Marvin's Marv. Adv. AGA)

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 
 set(VERSION_MAJOR 1)
-set(VERSION_MINOR 78)
+set(VERSION_MINOR 79)
 
 if(BUILD_PSP2)
 if (NOT DEFINED CMAKE_TOOLCHAIN_FILE)

README.MD

@@ -1,8 +1,8 @@
 Changes in this Version
 ======
-1.78
+1.79
 
-- fix 68020+ bitfield instructions (fixes crash in Virocop AGA)
+- fix interrupt 6 bitmask (fixes Marvin's Marv. Adv. AGA)
 
 Description
 =====
@@ -210,10 +210,6 @@ Games with no fixes (or unknown fixes)
   Issue: no sound fx
   Fix: unknown, but can play PlayStation 1 version in Retroarch instead. This requires cycle exact, which is not supported.
 
-- Marvin’s Marvellous Adventure AGA
-  Issue: nothing happens when selecting “start game”
-  Fix: unknown. Apparently something to do with an interrupt for the music routine that is ignored. The game refuses to start unless the music is playing at the correct volume.
-
 - Nebulus 2
   Issue: doors are not showing
   Fix: unknown. This requires cycle exact, which is not supported.
@@ -275,6 +271,10 @@ Compiling
 
 CHANGELOG
 =====
+1.79
+
+- fix interrupt 6 bitmask (fixes Marvin's Marv. Adv. AGA)
+
 1.78
 
 - fix 68020+ bitfield instructions (fixes crash in Virocop AGA)

src/custom.cpp

@@ -2417,7 +2417,7 @@ static _INLINE_ void SET_INTERRUPT(void)
 		if (imask & 0x0070) { new_irqs |= 1 << 3; }
 		if (imask & 0x0780) { new_irqs |= 1 << 4; }
 		if (imask & 0x1800) { new_irqs |= 1 << 5; }
-		if (imask & 0x2000) { new_irqs |= 1 << 6; }
+		if (imask & 0x6000) { new_irqs |= 1 << 6; }
 	}
 
 	if (new_irqs == M68KCONTEXT.interrupts[0]); // nothing changed