From 27660505c86588d41e7fa8d89258facbf056b82e Mon Sep 17 00:00:00 2001
From: Tim Allen <screwtape@froup.com>
Date: Mon, 21 Dec 2015 23:21:31 +1100
Subject: [PATCH] Update to v096 release.

byuu says:

Changelog (since v095):

- higan: absolutely massive amounts of coding style updates; probably
  150 hours of work here
- higan: manifest format updated for much greater consistency and
  simplicity
- higan: wrote popen() replacement to suppress console flashing when
  loading games via icarus
- icarus: now includes external database with mapping information for
  all verified games
- icarus: added support for importing Campus Challenge '92 and Powerfest
  '94
- icarus: merged settings.bml with higan; changing library path in one
  affects the other now
- SFC: added MSU1 audio resume support
- SFC: added new expansion port device (eBoot); simulation of SNES-Boot
  hardware
- SFC: expansion port device can now be selected from system menu
- SFC: updated handling of open bus (thanks to Exophase for the design
  idea)
- SFC: "BS-X Satellaview" library folder renamed to "BS Memory"
- GBA: fixed 8-bit SRAM reading/writing
- GBA: PRAM is 16-bits wide
- GBA: VRAM OBJ 8-bit writes are ignored
- GBA: BGnCNT unused bits are writable
- GBA: BG(0,1)CNT can't set d13
- GBA: BLDALPHA is readable (fixes many games including Donkey Kong
  Country)
- GBA: DMA masks &~1/Half, &~3/Word
- GBA: fixed many other I/O register reads; gets perfect score on
  endrift's I/O tests
- GBA: fixed caching of r(d) to pass armwrestler tests (Jonas Quinn)
- GBA: blocked DMA to/from BIOS region (Cydrak)
- GBA: fixed sign-extend and rotate on ldrs instructions (Cydrak)
- tomoko: added "Ignore Manifests" option to advanced settings panel
- tomoko: re-added support for ruby/quark video shaders
- tomoko: improved aspect correction behavior
- tomoko: added new tool, "Manifest Viewer" (mostly useful for
  developers)
- ruby: fixed mouse capture clipping on Windows (Cydrak)
- ruby: won't crash when using OpenGL 3.2 Linux driver with only OpenGL
  2.0 available
- ruby: added Linux fallback OpenGL 2.0 driver (not compiled in by
  default)
- ruby: added preliminary WASAPI driver (not compiled in by default, due
  to bugginess)
- hiro: fixed the appearance of Button and ListView::CheckButton on
  Windows classic
- hiro: added missing return values from several functions (fixes
  crashes with Clang)
---
 emulator/emulator.hpp               | 2 +-
 icarus/heuristics/super-famicom.hpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/emulator/emulator.hpp b/emulator/emulator.hpp
index 01f1a255..bc403fed 100644
--- a/emulator/emulator.hpp
+++ b/emulator/emulator.hpp
@@ -7,7 +7,7 @@ using namespace nall;
 
 namespace Emulator {
   static const string Name = "higan";
-  static const string Version = "095.18";
+  static const string Version = "096";
   static const string Author = "byuu";
   static const string License = "GPLv3";
   static const string Website = "http://byuu.org/";
diff --git a/icarus/heuristics/super-famicom.hpp b/icarus/heuristics/super-famicom.hpp
index 3c4fd17e..df22a961 100644
--- a/icarus/heuristics/super-famicom.hpp
+++ b/icarus/heuristics/super-famicom.hpp
@@ -600,19 +600,19 @@ auto SuperFamicomCartridge::readHeader(const uint8* data, uint size) -> void {
 
   //detect competition carts
   if(!memcmp(data + index, "\x00\x08\x22\x02\x1c\x00\x10\x00\x08\x65\x80\x84\x20\x00\x22\x25\x00\x83\x0c\x80\x10", 21)
-  && complement == 0x0100 && checksum == 0x2d02 && (size == 0x1c0000 || size == 0x1c8000)) {
+  && complement == 0x0100 && checksum == 0x2d02 && (size == 0x1c0000 || size == 0x1c2000)) {
     type = Type::CampusChallenge92;  //dark title screen version
     return;
   }
 
   if(!memcmp(data + index, "\xc9\x80\x80\x44\x15\x00\x62\x09\x29\xa0\x52\x70\x50\x12\x05\x35\x31\x63\xc0\x22\x01", 21)
-  && complement == 0x2011 && checksum == 0xf8c0 && (size == 0x240000 || size == 0x248000)) {
+  && complement == 0x2011 && checksum == 0xf8c0 && (size == 0x240000 || size == 0x242000)) {
     type = Type::Powerfest94;  //10,000 points version
     return;
   }
 
   if(!memcmp(data + index, "PREHISTORIK MAN      ", 21)
-  && complement == 0xffff && checksum == 0x0000 && (size == 0x240000 || size == 0x248000)) {
+  && complement == 0xffff && checksum == 0x0000 && (size == 0x240000 || size == 0x242000)) {
     type = Type::Powerfest94;  //1,000,000 points version
     return;
   }