diff --git a/higan/emulator/emulator.hpp b/higan/emulator/emulator.hpp index 76fdac4e..e07b8fa6 100644 --- a/higan/emulator/emulator.hpp +++ b/higan/emulator/emulator.hpp @@ -9,7 +9,7 @@ using namespace nall; namespace Emulator { static const string Name = "higan"; - static const string Version = "098.19"; + static const string Version = "099"; static const string Author = "byuu"; static const string License = "GPLv3"; static const string Website = "http://byuu.org/"; diff --git a/higan/fc/fc.hpp b/higan/fc/fc.hpp index 20d5a570..6e7bc582 100644 --- a/higan/fc/fc.hpp +++ b/higan/fc/fc.hpp @@ -8,7 +8,7 @@ namespace Famicom { namespace Info { - static const uint SerializerVersion = 2; + static const uint SerializerVersion = 3; } } diff --git a/higan/gb/gb.hpp b/higan/gb/gb.hpp index 0338cba6..3e93cd47 100644 --- a/higan/gb/gb.hpp +++ b/higan/gb/gb.hpp @@ -8,7 +8,7 @@ namespace GameBoy { namespace Info { - static const uint SerializerVersion = 4; + static const uint SerializerVersion = 5; } } diff --git a/higan/gb/ppu/mmio.cpp b/higan/gb/ppu/mmio.cpp index 7c8c86a6..b77b41b2 100644 --- a/higan/gb/ppu/mmio.cpp +++ b/higan/gb/ppu/mmio.cpp @@ -140,8 +140,9 @@ auto PPU::mmio_write(uint16 addr, uint8 data) -> void { status.interrupt_vblank = data & 0x10; status.interrupt_hblank = data & 0x08; - //hardware bug: writes to STAT on DMG,SGB during blanking triggers STAT IRQ - if(!system.cgb() && status.mode < 2) { + //hardware bug: writes to STAT on DMG,SGB during vblank triggers STAT IRQ + //note: this behavior isn't entirely correct; more research is needed ... + if(!system.cgb() && status.mode == 1) { cpu.raise(CPU::Interrupt::Stat); } diff --git a/higan/gb/ppu/ppu.cpp b/higan/gb/ppu/ppu.cpp index bad9ed05..e7487bcc 100644 --- a/higan/gb/ppu/ppu.cpp +++ b/higan/gb/ppu/ppu.cpp @@ -50,7 +50,6 @@ auto PPU::main() -> void { } auto PPU::mode(uint mode) -> void { - if(!enabled()) mode = 1; //force blank status.mode = mode; } diff --git a/higan/gba/gba.hpp b/higan/gba/gba.hpp index 4d2a68a4..7dba458e 100644 --- a/higan/gba/gba.hpp +++ b/higan/gba/gba.hpp @@ -8,7 +8,7 @@ namespace GameBoyAdvance { namespace Info { - static const uint SerializerVersion = 3; + static const uint SerializerVersion = 4; } } diff --git a/higan/ws/ws.hpp b/higan/ws/ws.hpp index 6c089fc2..76ec2a4a 100644 --- a/higan/ws/ws.hpp +++ b/higan/ws/ws.hpp @@ -8,7 +8,7 @@ namespace WonderSwan { namespace Info { - static const uint SerializerVersion = 1; + static const uint SerializerVersion = 2; } }