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

Merge pull request #654 from alyosha-tas/master 

Fix typo
This commit is contained in:
alyosha-tas 2016-06-28 19:58:27 -04:00 committed by GitHub
parent 35a07f42eb f846dc5172
commit 7fa2ada249
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs
View File

@ -369,7 +369,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return DB;
//return apu.ReadReg(addr);
case 0x4014: /*OAM DMA*/ break;
case 0x4015: return (byte)((byte)(apu.ReadReg(addr) & 0xCF) + (byte)(DB&0x20));
case 0x4015: return (byte)((byte)(apu.ReadReg(addr) & 0xDF) + (byte)(DB&0x20));
case 0x4016:
case 0x4017:
return read_joyport(addr);
@ -670,4 +670,4 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
}
}
}