From a856fbeca9b4416052e3adc714f355015a5846cb Mon Sep 17 00:00:00 2001
From: Richard Wheeler <2762690+zephyris@users.noreply.github.com>
Date: Mon, 27 Nov 2023 13:00:20 +0000
Subject: [PATCH] Fix: Incorrect mask files for NE river slopes (#11503)

---
 media/baseset/orig_extra.grf               | Bin 420418 -> 420256 bytes
 media/baseset/orig_extra/rivers/rapids.nfo |  32 ++++++++++-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/media/baseset/orig_extra.grf b/media/baseset/orig_extra.grf
index 5f2298a354108040a842dd843933b6b0594c6de6..9adc6e04f8daf499c9a659472fde96a6cc9c0924 100644
GIT binary patch
delta 12636
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
Z5ro1HXAmCd%6M2cFGnlP%ZVxD{~H{GK@0!@

delta 12703
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
ChAP|u

diff --git a/media/baseset/orig_extra/rivers/rapids.nfo b/media/baseset/orig_extra/rivers/rapids.nfo
index 99f87c7392..b4ed88cd9e 100644
--- a/media/baseset/orig_extra/rivers/rapids.nfo
+++ b/media/baseset/orig_extra/rivers/rapids.nfo
@@ -13,7 +13,7 @@
     | sprites/rapids.png          mask  90   10
    -1 sprites/rapids.png          8bpp 170   10  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170   10  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10   10
+    | sprites/rapids.png          mask 170   10
    -1 sprites/rapids.png          8bpp 250   10  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250   10  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250   10
@@ -28,7 +28,7 @@
     | sprites/rapids.png          mask  90   60
    -1 sprites/rapids.png          8bpp 170   60  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170   60  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10   60
+    | sprites/rapids.png          mask 170   60
    -1 sprites/rapids.png          8bpp 250   60  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250   60  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250   60
@@ -43,7 +43,7 @@
     | sprites/rapids.png          mask  90  110
    -1 sprites/rapids.png          8bpp 170  110  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  110  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  110
+    | sprites/rapids.png          mask 170  110
    -1 sprites/rapids.png          8bpp 250  110  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  110  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  110
@@ -58,7 +58,7 @@
     | sprites/rapids.png          mask  90  160
    -1 sprites/rapids.png          8bpp 170  160  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  160  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  160
+    | sprites/rapids.png          mask 170  160
    -1 sprites/rapids.png          8bpp 250  160  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  160  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  160
@@ -73,7 +73,7 @@
     | sprites/rapids.png          mask  90  210
    -1 sprites/rapids.png          8bpp 170  210  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  210  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  210
+    | sprites/rapids.png          mask 170  210
    -1 sprites/rapids.png          8bpp 250  210  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  210  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  210
@@ -88,7 +88,7 @@
     | sprites/rapids.png          mask  90  260
    -1 sprites/rapids.png          8bpp 170  260  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  260  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  260
+    | sprites/rapids.png          mask 170  260
    -1 sprites/rapids.png          8bpp 250  260  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  260  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  260
@@ -103,7 +103,7 @@
     | sprites/rapids.png          mask  90  310
    -1 sprites/rapids.png          8bpp 170  310  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  310  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  310
+    | sprites/rapids.png          mask 170  310
    -1 sprites/rapids.png          8bpp 250  310  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  310  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  310
@@ -118,7 +118,7 @@
     | sprites/rapids.png          mask  90  360
    -1 sprites/rapids.png          8bpp 170  360  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  360  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  360
+    | sprites/rapids.png          mask 170  360
    -1 sprites/rapids.png          8bpp 250  360  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  360  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  360
@@ -133,7 +133,7 @@
     | sprites/rapids.png          mask  90  410
    -1 sprites/rapids.png          8bpp 170  410  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  410  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  410
+    | sprites/rapids.png          mask 170  410
    -1 sprites/rapids.png          8bpp 250  410  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  410  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  410
@@ -148,7 +148,7 @@
     | sprites/rapids.png          mask  90  460
    -1 sprites/rapids.png          8bpp 170  460  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  460  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  460
+    | sprites/rapids.png          mask 170  460
    -1 sprites/rapids.png          8bpp 250  460  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  460  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  460
@@ -163,7 +163,7 @@
     | sprites/rapids.png          mask  90  510
    -1 sprites/rapids.png          8bpp 170  510  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  510  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  510
+    | sprites/rapids.png          mask 170  510
    -1 sprites/rapids.png          8bpp 250  510  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  510  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  510
@@ -178,7 +178,7 @@
     | sprites/rapids.png          mask  90  560
    -1 sprites/rapids.png          8bpp 170  560  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  560  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  560
+    | sprites/rapids.png          mask 170  560
    -1 sprites/rapids.png          8bpp 250  560  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  560  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  560
@@ -193,7 +193,7 @@
     | sprites/rapids.png          mask  90  610
    -1 sprites/rapids.png          8bpp 170  610  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  610  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  610
+    | sprites/rapids.png          mask 170  610
    -1 sprites/rapids.png          8bpp 250  610  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  610  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  610
@@ -208,7 +208,7 @@
     | sprites/rapids.png          mask  90  660
    -1 sprites/rapids.png          8bpp 170  660  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  660  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  660
+    | sprites/rapids.png          mask 170  660
    -1 sprites/rapids.png          8bpp 250  660  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  660  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  660
@@ -223,7 +223,7 @@
     | sprites/rapids.png          mask  90  710
    -1 sprites/rapids.png          8bpp 170  710  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  710  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  710
+    | sprites/rapids.png          mask 170  710
    -1 sprites/rapids.png          8bpp 250  710  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  710  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  710
@@ -238,7 +238,7 @@
     | sprites/rapids.png          mask  90  760
    -1 sprites/rapids.png          8bpp 170  760  64  23 -31   0 normal
     | sprites/rapids_shading.png 32bpp 170  760  64  23 -31   0 normal
-    | sprites/rapids.png          mask  10  760
+    | sprites/rapids.png          mask 170  760
    -1 sprites/rapids.png          8bpp 250  760  64  39 -31  -8 normal
     | sprites/rapids_shading.png 32bpp 250  760  64  39 -31  -8 normal
     | sprites/rapids.png          mask 250  760