merge an assorment of calc84maniac's fixes.

[gpsp.git] / arm / video_blend.S

diff --git a/arm/video_blend.S b/arm/video_blend.S
index ed70839..170be8f 100644 (file)
--- a/arm/video_blend.S
+++ b/arm/video_blend.S
@@ -31,7 +31,7 @@ expand_blend:
   cmp r3, #16                     @ if(blend_a > 16)\r
   movgt r3, #16                   @   blend_a = 16\r
   cmp r4, #16                     @ if(blend_b > 16)\r
-  movgt r3, #16                   @   blend_b = 16\r
+  movgt r4, #16                   @   blend_b = 16\r
 \r
   ldr r14, 6b + 4                 @ r14 = palette_ram_converted\r
   ldr r12, 6b + 8                 @ r12 = 0x04000200\r