hotfix for widescreen markers (plus SMws BSO tweak)

DerKoun · Feb 21, 2021 · cba4f02 · cba4f02
1 parent f0b6cf3
commit cba4f02
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/bsnes/sfc/ppu-fast/line.cpp b/bsnes/sfc/ppu-fast/line.cpp
@@ -390,6 +390,7 @@ auto PPU::Line::pixel(uint x, Pixel above, Pixel below, uint ws, uint wsm,
   else r = blend(above.color, below.color, io.col.halve && windowAbove[x] && below.source != Source::COL);
   if(wsm > 0) {
     x /= ppufast.hdScale();
+    x %= 256 + 2 * ws;
     if(x == ws - 1 || x == ws + 256 || wsm == 2 && (x <= ws - 1 || x >= ws + 256)) {
       int b = wsm == 2 ? 0 : ((y / 4) % 2 == 0) ? 0 : 255;
       r = ((((((r >> 16) & 255) * wsma) + b) / (wsma + 1)) << 16)

diff --git a/pack/gamefixes/Super Metroid widescreen patch/Super Metroid WS.bso b/pack/gamefixes/Super Metroid widescreen patch/Super Metroid WS.bso
@@ -4,10 +4,10 @@ w :    1    % enabled widescreen permanently %
 W : 1609    % aspect ratio 16:9 %
 P :    0    % disable pixel aspect ratio correction %
 s :    1    % widescreen sprites/objects %
-b :    2    % backround layer 1 auto widescreen %
-B :    2    % backround layer 2 auto widescreen %
-c : 2040    % backround layer 3 widescreen below line 40 %
-C :    2    % backround layer 4 auto widescreen %
+b :    2    % background layer 1 auto widescreen %
+B :    2    % background layer 2 auto widescreen %
+c : 2032    % background layer 3 widescreen below line 32 %
+C :    2    % background layer 4 auto widescreen %
 i :    0    % disable ignore window %
 m :    0    % disable widescreen markers %
 O :  120    % overclock CPU to 120 percent %