new 32x renderers, auto fskip change, massive refactoring

[picodrive.git] / pico / draw_arm.s

diff --git a/pico/draw_arm.s b/pico/draw_arm.s
index 9ca1f57..de40eaa 100644 (file)
--- a/pico/draw_arm.s
+++ b/pico/draw_arm.s
@@ -19,6 +19,8 @@
 .extern DrawStripInterlace\r
 .extern HighCacheS_ptr\r
 \r
+.equiv OVERRIDE_HIGHCOL,  1\r
+\r
 .equ PDRAW_SPRITES_MOVED, (1<<0)\r
 .equ PDRAW_WND_DIFF_PRIO, (1<<1)\r
 .equ PDRAW_ACC_SPRITES,   (1<<2)\r
@@ -1674,7 +1676,7 @@ PicoDoHighPal555:
     ldr     r8, =(Pico+0x22228)  @ Pico.video\r
 \r
 PicoDoHighPal555_nopush:\r
-    str     r1, [sp, #-8]        @ is called from FinalizeLineRGB555?\r
+    str     r1, [sp, #-8]        @ is called from FinalizeLine555?\r
 \r
     str     r0, [sp, #-4]\r
     ldr     r0, =HighPal\r
@@ -1728,9 +1730,9 @@ PicoDoHighPal555_end:
     b       FinalizeLineRGB555_pal_done\r
 \r
 \r
-.global FinalizeLineRGB555 @ int sh\r
+.global FinalizeLine555 @ int sh\r
 \r
-FinalizeLineRGB555:\r
+FinalizeLine555:\r
     stmfd   sp!, {r4-r9,lr}\r
     ldr     r8, =(Pico+0x22228)  @ Pico.video\r
 \r