From f51bc06739a95fff15a69a6ee40b6786e1f50060 Mon Sep 17 00:00:00 2001
From: byuu <2107894+byuu@users.noreply.github.com>
Date: Sat, 26 Oct 2019 23:34:24 +0900
Subject: [PATCH] v112.2

Temporarily disabled crash detector to work around Windows issue.
Corrected PPU OAM address latching with the accuracy PPU.
---
 bsnes/emulator/emulator.hpp            | 2 +-
 bsnes/sfc/ppu/object.cpp               | 4 ++--
 bsnes/target-bsnes/program/program.cpp | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bsnes/emulator/emulator.hpp b/bsnes/emulator/emulator.hpp
index 2c7af478..042f9b42 100644
--- a/bsnes/emulator/emulator.hpp
+++ b/bsnes/emulator/emulator.hpp
@@ -29,7 +29,7 @@ using namespace nall;
 
 namespace Emulator {
   static const string Name    = "bsnes";
-  static const string Version = "112.1";
+  static const string Version = "112.2";
   static const string Author  = "byuu";
   static const string License = "GPLv3";
   static const string Website = "https://byuu.org";
diff --git a/bsnes/sfc/ppu/object.cpp b/bsnes/sfc/ppu/object.cpp
index 157d3c5e..d22068b2 100644
--- a/bsnes/sfc/ppu/object.cpp
+++ b/bsnes/sfc/ppu/object.cpp
@@ -103,8 +103,8 @@ auto PPU::Object::fetch() -> void {
       continue;
     }
 
-    ppu.latch.oamAddress = oamItem[i].index;
-    const auto& sprite = oam.object[ppu.latch.oamAddress];
+    ppu.latch.oamAddress = 0x0200 + (oamItem[i].index >> 2);
+    const auto& sprite = oam.object[oamItem[i].index];
 
     uint tileWidth = sprite.width() >> 3;
     int x = sprite.x;
diff --git a/bsnes/target-bsnes/program/program.cpp b/bsnes/target-bsnes/program/program.cpp
index 24c17c9e..773bf612 100644
--- a/bsnes/target-bsnes/program/program.cpp
+++ b/bsnes/target-bsnes/program/program.cpp
@@ -44,7 +44,8 @@ auto Program::create() -> void {
   stateManager.create();
   manifestViewer.create();
 
-  if(settings.general.crashed) {
+  //seems to be misfiring on Windows, so disable for now
+  if(0 && settings.general.crashed) {
     MessageDialog(
       "Driver crash detected. Hardware drivers have been disabled.\n"
       "Please reconfigure drivers in the advanced settings panel."