don't draw layer where window is (for World Championship Soccer II)

[picodrive.git] / Pico / Draw.s

diff --git a/Pico/Draw.s b/Pico/Draw.s
index 5032f15..e31ba0b 100644 (file)
--- a/Pico/Draw.s
+++ b/Pico/Draw.s
@@ -211,9 +211,9 @@
 @   int cells;   // 0x14\r
 @ };\r
 \r
-@ int DrawLayer(int plane, int *hcache, int maxcells, int sh)\r
+@ void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells);\r
 \r
-.global DrawLayer @ int plane, int *hcache, int maxcells, int sh\r
+.global DrawLayer\r
 \r
 DrawLayer:\r
     stmfd   sp!, {r4-r11,lr}\r
@@ -221,10 +221,11 @@ DrawLayer:
     ldr     r11, =(Pico+0x22228)  @ Pico.video\r
     mov     r8, #1\r
 \r
-    ldrb    r7, [r11, #16]        @ ??hh??ww\r
+    ldrb    r7, [r11, #16]        @ ??vv??hh\r
 \r
     mov     r6, r1                @ hcache\r
-    orr     r9, r2, r3, lsl #31   @ r9=maxcells|(sh<<31)\r
+    orr     r9, r3, r0, lsl #30\r
+    orr     r9, r9, r2, lsl #8    @ r9=sh[31]|cellskip[15:8]|maxcells[7:0]  (tmp)\r
 \r
     mov     r1, r7, lsl #4\r
     orr     r1, r1, #0x00ff\r
@@ -244,7 +245,7 @@ DrawLayer:
     sub     r5, r5, #1            @ r5=xmask\r
 \r
     @ Find name table:\r
-    tst     r0,  r0\r
+    ands    r0,  r0, #1\r
     ldreqb  r12, [r11, #2]\r
     ldrneb  r12, [r11, #4]\r
 \r
@@ -309,11 +310,15 @@ DrawLayer:
     orrne   r10,r10, #1<<23 @ r10=(cells<<24|sh<<23|hi_not_empty<<22|had_output<<21|ty)\r
     movne   r3, #0x40       @ default to shadowed pal on sh mode\r
 \r
-    mvn     r9, #0          @ r9=prevcode=-1\r
-\r
     cmp     r7, #8\r
     addne   r10,r10, #0x01000000 @ we will loop cells+1 times if there is scroll\r
 \r
+    and     r9, r9, #0xff00\r
+    add     r8, r8, r9, lsr #8   @ tilex+=cellskip\r
+    add     r7, r7, r9, lsr #5   @ dx+=cellskip<<3;\r
+    sub     r10,r10,r9, lsl #16  @ cells-=cellskip\r
+    mvn     r9, #0               @ r9=prevcode=-1\r
+\r
     @ cache some stuff to avoid mem access\r
     ldr     r11,=HighCol\r
     mov     r0, #0xf\r
@@ -432,7 +437,7 @@ DrawLayer:
     rsb     r8, r3, #0\r
     mov     r8, r8, lsr #3        @ r8=tilex=(-ts->hscroll)>>3\r
     bic     r8, r8, #0xff000000\r
-    orr     r8, r8, r5, lsl #25   @ r8=(xmask[31:25]|had_output[24]|tilex[15:0])\r
+    orr     r8, r8, r5, lsl #25   @ r8=(xmask[31:25]|had_output[24]|tilex[23:0])\r
 \r
     ldr     r4, =Scanline\r
     orr     r5, r1, r10, lsl #24\r
@@ -443,24 +448,28 @@ DrawLayer:
     add     r7, r1, #1            @ r7=dx=((ts->hscroll-1)&7)+1\r
 \r
     mov     r10,r9, lsl #16\r
-    tst     r0, r0\r
+    tst     r0, #1\r
     orrne   r10,r10, #0x8000\r
     tst     r9, #1<<31\r
     mov     r3, #0\r
     orr     r10,r10, #0xff000000 @ will be adjusted on entering loop\r
-    orrne   r10,r10, #1<<23 @ r10=(cells[31:24]|sh[23]|hi_not_empty[22]|cells_max[21:16]|plane[15]|ty[14:0])\r
+    orrne   r10,r10, #1<<23 @ r10=(cell[31:24]|sh[23]|hi_not_empty[22]|cells_max[21:16]|plane[15]|ty[14:0])\r
     movne   r3, #0x40       @ default to shadowed pal on sh mode\r
 \r
-    mvn     r9, #0          @ r9=prevcode=-1\r
+    cmp     r7, #8\r
+    subne   r10,r10, #0x01000000 @ have hscroll, start with negative cell\r
+\r
+    and     r9, r9, #0xff00\r
+    add     r8, r8, r9, lsr #8   @ tilex+=cellskip\r
+    add     r7, r7, r9, lsr #5   @ dx+=cellskip<<3;\r
+    add     r10,r10,r9, lsl #16  @ cell+=cellskip\r
+    mvn     r9, #0               @ r9=prevcode=-1\r
 \r
     @ cache some stuff to avoid mem access\r
     ldr     r11,=HighCol\r
     mov     r0, #0xf\r
     add     r1, r11, r7         @ r1=pdest\r
 \r
-    cmp     r7, #8\r
-    subne   r10,r10, #0x01000000 @ have hscroll, start with negative cell\r
-\r
 \r
     @ r4 & r7 are scratch in this loop\r
 .dsloop_vs_subr1:\r