From c95affa70d7025252d63f7d931535f8c10bb483b Mon Sep 17 00:00:00 2001
From: notaz
Date: Tue, 18 Sep 2012 01:30:43 +0300
Subject: merge an assorment of calc84maniac's fixes.

---
 arm/video_blend.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'arm/video_blend.S')

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