Washi1337
/
Emux
mirror of https://github.com/Washi1337/Emux.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master'

This commit is contained in:
Washi 2017-07-27 01:58:21 +02:00
parent 3e02059dde 5eb04b9dd0
commit 728386a728
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Emux.GameBoy/Cartridge/CartridgeType.cs
View File

@ -1,7 +1,8 @@
using System.Collections;
namespace Emux.GameBoy.Cartridge
namespace Emux.GameBoy.Cartridge
{
/// <summary>
/// Provides a collection of valid (but not necessarily supported) cartridge types.
/// </summary>
public enum CartridgeType : byte
{
RomOnly = 0x00,

3
Emux.GameBoy/Cpu/InterruptFlags.cs
View File

@ -2,6 +2,9 @@
namespace Emux.GameBoy.Cpu
{
/// <summary>
/// Provides valid interrupt flags used by the interrupt registers IF and IE.
/// </summary>
[Flags]
public enum InterruptFlags : byte
{

2
Emux.GameBoy/Graphics/GameBoyGpu.cs
View File

@ -258,7 +258,7 @@ namespace Emux.GameBoy.Graphics
{
_modeClock -= HBlankCycles;
LY++;
if (LY >= FrameHeight - 1)
if (LY == FrameHeight - 1)
{
currentMode = LcdStatusFlags.VBlankMode;
VideoOutput.RenderFrame(_frameBuffer);