From 5296176151a6caa404e0c5d35cc78e18e659f08a Mon Sep 17 00:00:00 2001
From: byuu <2107894+byuu@users.noreply.github.com>
Date: Wed, 26 Feb 2020 19:57:21 +0900
Subject: [PATCH] v114.6

Fixed accuracy PPU rendering issue affecting Secret of Mana
---
 README.md                     | 1 -
 bsnes/emulator/emulator.hpp   | 2 +-
 bsnes/sfc/ppu-fast/object.cpp | 2 +-
 bsnes/sfc/ppu/background.cpp  | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 39506c80..faf74468 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,6 @@ Links
 
   - [Official website](https://byuu.org/bsnes)
   - [Official git repository](https://github.com/byuu/bsnes)
-  - [Developer resources](https://byuu.net)
   - [Donations](https://patreon.com/byuu)
 
 Release Builds
diff --git a/bsnes/emulator/emulator.hpp b/bsnes/emulator/emulator.hpp
index b7020590..69d4d72d 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   = "114.5";
+  static const string Version   = "114.6";
   static const string Copyright = "byuu";
   static const string License   = "GPLv3";
   static const string Website   = "https://byuu.org";
diff --git a/bsnes/sfc/ppu-fast/object.cpp b/bsnes/sfc/ppu-fast/object.cpp
index 9074dff1..c0456cf4 100644
--- a/bsnes/sfc/ppu-fast/object.cpp
+++ b/bsnes/sfc/ppu-fast/object.cpp
@@ -142,7 +142,7 @@ auto PPU::readObject(uint10 address) -> uint8 {
     uint n = address >> 2;  //object#
     address &= 3;
     if(address == 0) return objects[n].x;
-    if(address == 1) return objects[n].y - 1;
+    if(address == 1) return objects[n].y - 1;  //-1 => rendering happens one scanline late
     if(address == 2) return objects[n].character;
     return (
       objects[n].nameselect << 0
diff --git a/bsnes/sfc/ppu/background.cpp b/bsnes/sfc/ppu/background.cpp
index 797f7747..dcf3cc9d 100644
--- a/bsnes/sfc/ppu/background.cpp
+++ b/bsnes/sfc/ppu/background.cpp
@@ -14,7 +14,7 @@ auto PPU::Background::scanline() -> void {
   mosaic.hoffset = 0;
 
   renderingIndex = 0;
-  pixelCounter = io.hoffset & 7;
+  pixelCounter = (io.hoffset & 7) << hires();
 
   opt.hoffset = 0;
   opt.voffset = 0;