X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arm%2Fvideo_blend.S;h=170be8f9f9decd36aa7e05eb921faff21f5d9736;hb=c95affa70d7025252d63f7d931535f8c10bb483b;hp=63a54800e09d6986a6242bf1202d619c7f952bb3;hpb=d5e0983c10e0ca717603dd1a406ff0d6e450e905;p=gpsp.git

diff --git a/arm/video_blend.S b/arm/video_blend.S
index 63a5480..170be8f 100644
--- a/arm/video_blend.S
+++ b/arm/video_blend.S
@@ -24,14 +24,14 @@ expand_blend:
   add r1, r1, r2, lsl #1          @ screen_dest_ptr += start
   sub r2, r3, r2                  @ r2 = end - start
   ldr r3, 6b                      @ r3 = io_registers
-  ldr r3, [r3, #0x52]             @ r3 = bldalpha
+  ldrh r3, [r3, #0x52]            @ r3 = bldalpha
   mov r4, r3, lsr #8              @ r4 = bldalpha >> 8
   and r3, r3, #0x1F               @ r3 = blend_a
   and r4, r4, #0x1F               @ r4 = blend_b
   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