From c91c001093f19370095e900ae020790814f276aa Mon Sep 17 00:00:00 2001 From: beirich Date: Sat, 1 Sep 2012 21:04:40 +0000 Subject: [PATCH] gen: Fix bug with word-reading Z80 bus status; fixes music in Monster World IV, Thunder Force 3 still boots --- BizHawk.Emulation/Consoles/Sega/Genesis/MemoryMap.68000.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/MemoryMap.68000.cs b/BizHawk.Emulation/Consoles/Sega/Genesis/MemoryMap.68000.cs index e6fbac67b5..73f2249281 100644 --- a/BizHawk.Emulation/Consoles/Sega/Genesis/MemoryMap.68000.cs +++ b/BizHawk.Emulation/Consoles/Sega/Genesis/MemoryMap.68000.cs @@ -60,10 +60,7 @@ namespace BizHawk.Emulation.Consoles.Sega return (sbyte)ReadIO(address); if (address == 0xA11100) // Z80 BUS status - { - // TODO: note, its possible that something is supposed to be on the MSB (crap from the bus, ie, the next instruction) - return (short)(M68000HasZ80Bus && Z80Reset == false ? 0 : 1); - } + return (short)(M68000HasZ80Bus && Z80Reset == false ? 0x0000 : 0x0100); Console.WriteLine("UNHANDLED READW {0:X6}", address); return 0x7DCD;