ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

C64: Fix some bugs

This commit is contained in:
alyosha-tas 2017-12-31 11:11:24 -05:00
parent b1320f38ef
commit df8edae97e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Cia.Port.cs
View File

@ -124,7 +124,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
_ret = ~ddrb & 0xFF;
_tst = (pra | ~ddra) & GetJoystick2();
_ret &= GetKeyboardRows(_tst);
return (_ret | (prb & ddrb)) & GetJoystick1();
return (_ret | (prb & ddrb)) & (GetJoystick1() | (~pra & 0x1F));
}
}

2
BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Registers.cs
View File

@ -99,7 +99,7 @@
return 0x01 | ((_pointerVm & 0x3C00) >> 6) |
((_pointerCb & 0x7) << 1);
case 0x19:
return 0x70 | (_intRaster ? 0x01 : 0x00) |
return 0x70 | (_rasterInterruptTriggered ? 0x01 : 0x00) |
(_intSpriteDataCollision ? 0x02 : 0x00) |
(_intSpriteCollision ? 0x04 : 0x00) |
(_intLightPen ? 0x08 : 0x00) |

2
BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs
View File

@ -54,7 +54,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial
public override void SyncState(Serializer ser)
{
ser.BeginSection("Disk");
_disk.SyncState(ser);
if (_disk != null) { _disk.SyncState(ser); }
ser.EndSection();
ser.Sync("BitHistory", ref _bitHistory);