scroll size improvement

[picodrive.git] / pico / draw_arm.S

diff --git a/pico/draw_arm.S b/pico/draw_arm.S
index 23c522b..e19abd8 100644 (file)
--- a/pico/draw_arm.S
+++ b/pico/draw_arm.S
@@ -303,7 +303,9 @@ DrawLayer:
     cmp     r10, #1\r
     biclt   r1,  r1, #0xfc00\r
     biceq   r1,  r1, #0xfe00\r
-    bicgt   r1,  r1, #0xff00      @ r1=ymask=(height<<8)|0xff; ...; // Y Mask in pixels\r
+    cmp     r10, #2\r
+    moveq   r1,      #0x0007\r
+    movgt   r1,      #0x00ff      @ r1=ymask=(height<<8)|0xff; ...; // Y Mask in pixels\r
 \r
     add     r10, r10, #5\r
     cmp     r10, #7\r
@@ -1101,17 +1103,6 @@ DrawSpriteSHi:
 \r
 DrawAllSprites:\r
     orr     r1, r2, r1, lsl #1\r
-    ldr     r12,[r3, #OFS_rendstatus]\r
-    tst     r12,#(PDRAW_DIRTY_SPRITES|PDRAW_SPRITES_MOVED)\r
-    beq     das_no_prep\r
-    stmfd   sp!, {r0,r1,r3,lr}\r
-    and     r0, r12,#PDRAW_DIRTY_SPRITES\r
-    bic     r12,r12,#(PDRAW_DIRTY_SPRITES|PDRAW_SPRITES_MOVED)\r
-    str     r12,[r3, #OFS_rendstatus]\r
-    bl      PrepareSprites\r
-    ldmfd   sp!, {r0,r1,r3,lr}\r
-\r
-das_no_prep:\r
     ldr     r2, [r0]\r
     ands    r2, r2, #0x7f\r
     bxeq    lr\r
@@ -1497,7 +1488,7 @@ PicoDoHighPal555:
 PicoDoHighPal555_nopush:\r
     orr     r9, r1, r0, lsl #31  @ 0:called from FinalizeLine555, 31: s/h\r
 \r
-    ldr     r0, =HighPal\r
+    add     r0, r10, #OFS_HighPal\r
 \r
     mov     r1, #0\r
     strb    r1, [r8, #-0x1a]     @ 0x2220e ~ dirtyPal\r
@@ -1513,7 +1504,7 @@ PicoDoHighPal555_nopush:
     tst     r9, #(1<<31)\r
     beq     PicoDoHighPal555_end\r
 \r
-    ldr     r3, =HighPal\r
+    add     r3, r10, #OFS_HighPal\r
 \r
     @ shadowed pixels:\r
     mov     r12,    #0x008e\r
@@ -1575,7 +1566,7 @@ FinalizeLine555:
     bne     PicoDoHighPal555_nopush\r
 \r
 FinalizeLineRGB555_pal_done:\r
-    ldr     r3, =HighPal\r
+    add     r3, r10, #OFS_HighPal\r
 \r
     ldr     r12, [r10, #OFS_rendstatus]\r
     eors    r0, r0, #1           @ sh is 0\r