Merge branch 'master' into doc-frontierpass2

1 files changed, 2 insertions, 2 deletions

diff --git a/src/image_processing_effects.c b/src/image_processing_effects.c
index 4a56871a4..fa6867f2c 100644
--- a/src/image_processing_effects.c
+++ b/src/image_processing_effects.c
@@ -804,8 +804,8 @@ void ConvertImageProcessingToGBA(struct ImageProcessingContext *context)
                     dest = dest_ + ((i * width + j) << 4) + (k << 1);
                     src = src_ + ((((i << 3) + k) << 3) * width) + (j << 3);
 
-                    dest[0] = src[0] | (src[1] << 4) | (src[2] << 8) | (src[3] << 0xC);
-                    dest[1] = src[4] | (src[5] << 4) | (src[6] << 8) | (src[7] << 0xC);
+                    dest[0] = src[0] | (src[1] << 4) | (src[2] << 8) | (src[3] << 12);
+                    dest[1] = src[4] | (src[5] << 4) | (src[6] << 8) | (src[7] << 12);
                 }
             }
         }