more Pandora porting work

[picodrive.git] / Pico / Draw.c

diff --git a/Pico/Draw.c b/Pico/Draw.c
index 8635d79..acdd15d 100644 (file)
--- a/Pico/Draw.c
+++ b/Pico/Draw.c
@@ -1138,6 +1138,37 @@ static void BackFill(int reg7, int sh)
 \r
 unsigned short HighPal[0x100];\r
 \r
+void PicoDoHighPal555(int sh)\r
+{\r
+  unsigned short *pal=HighPal;\r
+  int i, t;\r
+\r
+  Pico.m.dirtyPal = 0;\r
+\r
+  {\r
+    unsigned int *spal=(void *)Pico.cram;\r
+    unsigned int *dpal=(void *)HighPal;\r
+    for (i = 0x3f/2; i >= 0; i--)\r
+#ifdef USE_BGR555\r
+      dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);\r
+#else\r
+      dpal[i] = ((spal[i]&0x000f000f)<<12)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)>>7);\r
+#endif\r
+  }\r
+\r
+  if (sh)\r
+  {\r
+    // shadowed pixels\r
+    for (i = 0x3f; i >= 0; i--)\r
+      pal[0x40|i] = pal[0xc0|i] = (unsigned short)((pal[i]>>1)&0x738e);\r
+    // hilighted pixels\r
+    for (i = 0x3f; i >= 0; i--) {\r
+      t=pal[i]&0xe71c;t+=0x4208;if(t&0x20)t|=0x1c;if(t&0x800)t|=0x700;if(t&0x10000)t|=0xe000;t&=0xe71c;\r
+      pal[0x80|i]=(unsigned short)t;\r
+    }\r
+  }\r
+}\r
+\r
 #ifndef _ASM_DRAW_C\r
 static void FinalizeLineBGR444(int sh)\r
 {\r
@@ -1182,34 +1213,10 @@ static void FinalizeLineRGB555(int sh)
   unsigned short *pd=DrawLineDest;\r
   unsigned char  *ps=HighCol+8;\r
   unsigned short *pal=HighPal;\r
-  int len, i, t, dirtyPal = Pico.m.dirtyPal;\r
-\r
-  if (dirtyPal)\r
-  {\r
-    unsigned int *spal=(void *)Pico.cram;\r
-    unsigned int *dpal=(void *)HighPal;\r
-    for (i = 0x3f/2; i >= 0; i--)\r
-#ifdef USE_BGR555\r
-      dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);\r
-#else\r
-      dpal[i] = ((spal[i]&0x000f000f)<<12)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)>>7);\r
-#endif\r
-    Pico.m.dirtyPal = 0;\r
-  }\r
+  int len;\r
 \r
-  if (sh)\r
-  {\r
-    if (dirtyPal) {\r
-      // shadowed pixels\r
-      for (i = 0x3f; i >= 0; i--)\r
-        pal[0x40|i] = pal[0xc0|i] = (unsigned short)((pal[i]>>1)&0x738e);\r
-      // hilighted pixels\r
-      for (i = 0x3f; i >= 0; i--) {\r
-        t=pal[i]&0xe71c;t+=0x4208;if(t&0x20)t|=0x1c;if(t&0x800)t|=0x700;if(t&0x10000)t|=0xe000;t&=0xe71c;\r
-        pal[0x80|i]=(unsigned short)t;\r
-      }\r
-    }\r
-  }\r
+  if (Pico.m.dirtyPal)\r
+    PicoDoHighPal555(sh);\r
 \r
   if (Pico.video.reg[12]&1) {\r
     len = 320;\r
@@ -1220,7 +1227,7 @@ static void FinalizeLineRGB555(int sh)
 \r
   {\r
 #ifndef PSP\r
-    int mask=0xff;\r
+    int i, mask=0xff;\r
     if (!sh && (rendstatus & PDRAW_ACC_SPRITES))\r
       mask=0x3f; // accurate sprites, upper bits are priority stuff\r
 \r