From: notaz <notasas@gmail.com>
Date: Tue, 26 Sep 2017 23:59:50 +0000 (+0300)
Subject: scroll size improvement
X-Git-Tag: v1.92~27
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eced0190981a424f9910a7052765023474483b33;p=picodrive.git

scroll size improvement
---

diff --git a/pico/draw.c b/pico/draw.c
index 7b4dd99b..2aa37f8d 100644
--- a/pico/draw.c
+++ b/pico/draw.c
@@ -394,8 +394,11 @@ static void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells,
 
   ts.xmask=(1<<shift[width])-1; // X Mask in tiles (0x1f-0x7f)
   ymask=(height<<8)|0xff;       // Y Mask in pixels
-  if(width == 1)   ymask&=0x1ff;
-  else if(width>1) ymask =0x0ff;
+  switch (width) {
+    case 1: ymask &= 0x1ff; break;
+    case 2: ymask =  0x007; break;
+    case 3: ymask =  0x0ff; break;
+  }
 
   // Find name table:
   if (plane_sh&1) ts.nametab=(pvid->reg[4]&0x07)<<12; // B
diff --git a/pico/draw_arm.S b/pico/draw_arm.S
index 023b0a2f..e19abd88 100644
--- a/pico/draw_arm.S
+++ b/pico/draw_arm.S
@@ -303,7 +303,9 @@ DrawLayer:
     cmp     r10, #1
     biclt   r1,  r1, #0xfc00
     biceq   r1,  r1, #0xfe00
-    bicgt   r1,  r1, #0xff00      @ r1=ymask=(height<<8)|0xff; ...; // Y Mask in pixels
+    cmp     r10, #2
+    moveq   r1,      #0x0007
+    movgt   r1,      #0x00ff      @ r1=ymask=(height<<8)|0xff; ...; // Y Mask in pixels
 
     add     r10, r10, #5
     cmp     r10, #7