X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fdraw_arm.s;h=9ca1f57bdcab9b7379a855735cc231de0888a0e9;hb=b78efee2b2213cf62a1b8a3b7a5adf05e39b4e4e;hp=5074a637a92314a11f4773b66c6ffb25ecb67670;hpb=1cfc5cc4ce06642b9bc45ca3b9d32793718e9455;p=picodrive.git

diff --git a/pico/draw_arm.s b/pico/draw_arm.s
index 5074a63..9ca1f57 100644
--- a/pico/draw_arm.s
+++ b/pico/draw_arm.s
@@ -72,7 +72,7 @@
 .endif
     ldreqb  r4, [r1,#\offs]
     orrne   r4, r3, r4
-    andeq   r4, r4, #0x3f
+    andeq   r4, r4, #0xbf
     strb    r4, [r1,#\offs]
 .endm
 
@@ -163,14 +163,12 @@
 .endif
     beq     0f
     cmp     r4, #0xe
-    ldrgeb  r4, [r1,#\ofs]
-    orrlt   r4, r3, r4            @ normal
-
-    biceq   r4, r4, #0xc0         @ hilight
-    orreq   r4, r4, #0x80
-    orrgt   r4, r4, #0xc0         @ shadow
+    ldrgeb  r7, [r1,#\ofs]
+    orrlt   r7, r3, r4            @ normal
 
-    strb    r4, [r1,#\ofs]
+    bicge   r7, r7, #0xc0
+    orrge   r7, r7, r4, lsl #6
+    strb    r7, [r1,#\ofs]
 0:
 .endm
 
@@ -198,38 +196,41 @@
     TileDoShGenPixel 16,  7 @ #0x000f0000
 .endm
 
-.macro TileDoShGenPixel_noop shift ofs
+.macro TileDoShGenPixel_markop shift ofs
 .if \shift
-    and     r4, r12, r2, lsr #\shift
+    ands    r4, r12, r2, lsr #\shift
 .else
-    and     r4, r12, r2
+    ands    r4, r12, r2
 .endif
-    sub     r7, r4, #1
-    cmp     r7, #0xd
-    orrcc   r4, r3, r4           @ 0-0xc (was 1-0xd)
-    strccb  r4, [r1,#\ofs]
+    beq     0f
+    cmp     r4, #0xe
+    ldrgeb  r4, [r1,#\ofs]
+    orrlt   r4, r3, r4
+    orrge   r4, r4, #0x80
+    strb    r4, [r1,#\ofs]
+0:
 .endm
 
-.macro TileFlipSh_noop
-    TileDoShGenPixel_noop 16,  0 @ #0x000f0000
-    TileDoShGenPixel_noop 20,  1 @ #0x00f00000
-    TileDoShGenPixel_noop 24,  2 @ #0x0f000000
-    TileDoShGenPixel_noop 28,  3 @ #0xf0000000
-    TileDoShGenPixel_noop  0,  4 @ #0x0000000f
-    TileDoShGenPixel_noop  4,  5 @ #0x000000f0
-    TileDoShGenPixel_noop  8,  6 @ #0x00000f00
-    TileDoShGenPixel_noop 12,  7 @ #0x0000f000
+.macro TileFlipSh_markop
+    TileDoShGenPixel_markop 16,  0 @ #0x000f0000
+    TileDoShGenPixel_markop 20,  1 @ #0x00f00000
+    TileDoShGenPixel_markop 24,  2 @ #0x0f000000
+    TileDoShGenPixel_markop 28,  3 @ #0xf0000000
+    TileDoShGenPixel_markop  0,  4 @ #0x0000000f
+    TileDoShGenPixel_markop  4,  5 @ #0x000000f0
+    TileDoShGenPixel_markop  8,  6 @ #0x00000f00
+    TileDoShGenPixel_markop 12,  7 @ #0x0000f000
 .endm
 
-.macro TileNormSh_noop
-    TileDoShGenPixel_noop 12,  0 @ #0x0000f000
-    TileDoShGenPixel_noop  8,  1 @ #0x00000f00
-    TileDoShGenPixel_noop  4,  2 @ #0x000000f0
-    TileDoShGenPixel_noop  0,  3 @ #0x0000000f
-    TileDoShGenPixel_noop 28,  4 @ #0xf0000000
-    TileDoShGenPixel_noop 24,  5 @ #0x0f000000
-    TileDoShGenPixel_noop 20,  6 @ #0x00f00000
-    TileDoShGenPixel_noop 16,  7 @ #0x000f0000
+.macro TileNormSh_markop
+    TileDoShGenPixel_markop 12,  0 @ #0x0000f000
+    TileDoShGenPixel_markop  8,  1 @ #0x00000f00
+    TileDoShGenPixel_markop  4,  2 @ #0x000000f0
+    TileDoShGenPixel_markop  0,  3 @ #0x0000000f
+    TileDoShGenPixel_markop 28,  4 @ #0xf0000000
+    TileDoShGenPixel_markop 24,  5 @ #0x0f000000
+    TileDoShGenPixel_markop 20,  6 @ #0x00f00000
+    TileDoShGenPixel_markop 16,  7 @ #0x000f0000
 .endm
 
 .macro TileDoShGenPixel_onlyop_lp shift ofs
@@ -239,14 +240,13 @@
     ands    r7, r12, r2
 .endif
     ldrneb  r4, [r1,#\ofs]
-    tstne   r4, #0x40
-    beq     0f
-
     cmp     r7, #0xe
-    biceq   r4, r4, #0xc0         @ hilight
-    orreq   r4, r4, #0x80
-    orrgt   r4, r4, #0xc0         @ shadow
-    strgeb  r4, [r1,#\ofs]
+    blt     0f
+
+    tst     r4, #0xc0
+    bicne   r4, r4, #0xc0
+    orrne   r4, r4, r7, lsl #6
+    strneb  r4, [r1,#\ofs]
 0:
 .endm
 
@@ -873,8 +873,8 @@ DrawTilesFromCache:
 .dtfc_shadow_blank:
     tst     r1, #1
     ldrneb  r4, [r1]
-    mov     r6, #0x3f
-    and     r4, r4, #0x3f
+    mov     r6, #0xbf
+    and     r4, r4, #0xbf
     strneb  r4, [r1], #1
     ldrh    r4, [r1]
     orr     r6, r6, r6, lsl #8
@@ -925,7 +925,7 @@ DrawTilesFromCache:
 
     add     r1, r11,#8
     mov     r3, #320/4/4
-    mov     r6, #0x3f
+    mov     r6, #0xbf
     orr     r6, r6, r6, lsl #8
     orr     r6, r6, r6, lsl #16
 .dtfc_loop_shprep:
@@ -991,7 +991,7 @@ DrawSpriteSHi:
     orr     r9, r9, r4, lsl #16
     orr     r9, r9, #0x90000000 @ r9=scc1 ???? ... <code> (s=shadow/hilight, cc=pal)
     cmp     r12,r9, lsr #28 @ sh/hi with pal3?
-    cmpne   r3, #1          @ if not, is ir hi prio?
+    cmpne   r3, #1          @ if not, is it hi prio?
     bne     DrawSpriteSHi   @ non-operator low sprite, already drawn
 
     ldr     r3, [r0]        @ sprite[0]
@@ -1089,7 +1089,7 @@ DrawSpriteSHi:
     tst     r9, #0x0800
     bne     .dsprShi_TileFlip_sh
 
-    @ (r1=pdest, r2=pixels8, r3=pal) r4: scratch, r12: helper pattern
+    @ (r1=pdest, r2=pixels8, r3=pal) r4, r7: scratch, r12: helper pattern
 .dsprShi_TileNorm_sh:
     TileNormSh
     b       .dsprShi_loop
@@ -1271,7 +1271,7 @@ DrawSprite: @ was: unsigned int *sprite, int sh, int acc_sprites
 
 .dspr_singlec_sh:
     cmp     r2, #0xe0000000
-    bcs     .dspr_loop          @ operator tileline, ignore
+    bcs     .dspr_TileNorm_sh   @ op. tileline, markop. XXX: maybe add a spec. handler?
 
 .dspr_SingleColor:
     and     r4, r2, #0xf
@@ -1295,11 +1295,11 @@ DrawSprite: @ was: unsigned int *sprite, int sh, int acc_sprites
 
     @ (r1=pdest, r2=pixels8, r3=pal) r4: scratch, r12: helper pattern
 .dspr_TileNorm_sh:
-    TileNormSh_noop
+    TileNormSh_markop
     b       .dspr_loop
 
 .dspr_TileFlip_sh:
-    TileFlipSh_noop
+    TileFlipSh_markop
     b       .dspr_loop