From 02ebe5d276d33d55b9d46fef19a8ef939b7c9743 Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Sat, 4 Feb 2017 13:04:37 -0600
Subject: [PATCH] moved my palette function failure to 16_vlpal.c

---
 MEMINFO.16W        |   0
 db.exe             | Bin 13186 -> 13186 bytes
 makefile           |   5 +-
 src/lib/16_vl.c    | 175 +----------------------------------------
 src/lib/16_vl.h    |   3 +-
 src/lib/16_vlpal.c | 191 +++++++++++++++++++++++++++++++++++++++++++++
 src/lib/16_vlpal.h |   8 ++
 src/lib/doslib     |   2 +-
 src/palettel.c     |   4 +-
 src/pcxtest.c      |   2 +-
 src/pcxtest2.c     |   2 +-
 src/scroll.c       |   8 +-
 src/test.c         |   2 +-
 src/vrstest.c      |   2 +-
 src/zcroll.c       |   5 +-
 wcpu.exe           | Bin 13312 -> 13328 bytes
 16 files changed, 220 insertions(+), 189 deletions(-)
 delete mode 100755 MEMINFO.16W
 create mode 100755 src/lib/16_vlpal.c
 create mode 100755 src/lib/16_vlpal.h

diff --git a/MEMINFO.16W b/MEMINFO.16W
deleted file mode 100755
index e69de29b..00000000
diff --git a/db.exe b/db.exe
index 457a9fa192d31529e39312c63fcfc8b50357625a..af80cac81c36b2b54df02442584b23793f3cadcb 100755
GIT binary patch
delta 801
zcmZvaUr5tY6vyxVd38U3`<MAAr|yrbKT6x0x)NcTk()(CsaQ;#;gdupgzhDUO=Az&
z#ZvA=nSt0qD+z=jg!N!+6BUF&+QY0US`d?og@N`^t}{b=>B8sU@4bg}4)>fh*frQS
zJmc2qBQy@gfVTw*kwS!ufHL4wT7;VfIzjgV4}mG5vIwC@pc{w*2_T0=xTjk1*CEsj
z3<Cim2!sKb9-(dEImCMja0Y}5NJQYKL5vk6<dJGI<*~@ZnRc8f2|_b2sUiUjq3h18
z9c_;G<=Op6RTqzC(M502b@T6Snz`jVVj>e}HX+Xj5iqk^d3U;r`0~uGLSe*H%%P~q
z_3VM-7LKr7r4diE)5;n=#`=_6JR*%MM=>sB)#?yVur2i~w;%iM0uB4$iHkNKA-do>
zS>9U?Z$rdt?muCzb=QhM8&5+kv6UDO4UzjRF{2sbkX@v$d}4LJ<Cl0_#)<PX8Ww$x
zJK!l&8}AMF+w3X5XcLl2kJaRI+EW^SZY}RUwio}*5lGMg355SA5E856wv!h<=Lw&f
zk=nABI6Nnn<j6De4R%yph(ED&+D@!s&$O-C>yWiqvtZvrYuA(XCsgkP%hfs6_6!<^
z8aB~Qx}=H^umN3@S}&&|`Wjvj(eJAGWA<6sj2+CPZ^JHjSFgb%?1{cFRo6N*J8U?M
zO{~XIcclvIY$5)R9V(lRaP%_gkKPGV-M_{`-&&fQFTIFxVE0FT$1TJMX783O)BE0)
zzS~&;N1x0GuB(A6LLnTD(oI#|$dttga62n2{-z!KN`oylyc=R@{1owg!R925wl7x(
z*WO5#2ell&$1ap=aEx6mwFx!+aN@_>I!}YrTxmlFz9^+t{FZ4D%<e95?5z!$$qlBd
ScI?ZC>BWX@Lu&7Vw)_EMa}2rw

delta 822
zcmZ9KZAep57{|}qZhF0Y^Bw2f-85b0aE&<>Wm=Y-6uq#Cikfeq41y$_A5y_#h#ePW
zaIjh+xYRyYa3M^n)+`mI=))k1eF{di+1mn*u&rlW6dm|o{^xL?|9Q^yJY#)heclJ7
z$^wLZKp1#gh)@E^S0SVU?ubL8yFdr%LEr}92lV?9ss}CrVITtJG9l5N8sdR-JVKMe
zG_VLf2KqG!eFYwZ-y*OBx{wKRqIoSsQ$+|33DuaeSWA~OY&cWkI0rspU}lXB+3f7@
zYH#aUTgXQ8x@b6ytc(W+FYoQ<>8ONfOpM=5{gNCIvu3&=xwOy3xbw|aFD=J@+9o}Q
zYv^t15Pn7TWaW5<o{&}HDLO1uW4GXw`7q9-6^bB^&@IK&+H2Tj<H(Zdt!~B2B1D#5
zN6VZC;cSwz7)NR>)uWY*9MZY1?Dhu|oMdj58xaoLbflS$g=tS#zJnbPj2yQ?1UPWX
zq|0I$Y`3K}LM}_0)AYy73SRYlUflm)Tr8~H?qqeYGYlIOgr2Nb5q>Tl&Xr`S2R?eq
zItea>M4t5|KO_Dv=EUUnMughcy*Qf+>gJp{<l$5<+Y)HwVv>A^+P$MHzEg2JjVwV0
z?IccC<<SW`!P^z35)vfO;PeprB9Gpq?|BFArZt*&)v&~yvEu1UY&CGKlYenO&E3el
zTRCvMN$+chQ<bhW(<9oG*hH^r>#7V;c_RY>BpnhXt&rsP0O9|(5<1yrceFeTiFOlr
zR~i{NZ=j#F1*HatKrB2iE{|4l-q>1Gst;R@60K9zvF2`+!mYhjU-TKesw!6DkWf{u
z7OAFLUo76z+Dsx>HyN@_x^~Ff1bG8LM`?eFHM5rW#=dRDSrS0IOL$V!kcLkQV*Sr_
f<qsJ66#uR$3}=)oE7~%%VVtp6rcHeZpntyr8vYp%

diff --git a/makefile b/makefile
index 0aa855fb..850d92ed 100755
--- a/makefile
+++ b/makefile
@@ -124,7 +124,7 @@ LIBFLAGS=$(WLIBQ) -b -n
 #
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
-GFXLIBOBJS = 16_vl.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_spri.$(OBJ) $(OLDLIBOBJS)
+GFXLIBOBJS = 16_vl.$(OBJ) 16_vlpal.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_spri.$(OBJ) $(OLDLIBOBJS)
 16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_head.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ) 16_enti.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
@@ -320,7 +320,8 @@ joytest.exe:
 	cd $(DOSLIB_JOYSTICK:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
 	$(COPYCOMMAND) $(DOSLIB_JOYSTICK:$(to_os_path))$(DIRSEP)$(DOSLIB_MEMMODE)$(DIRSEP)test.exe joytest.exe
 
-16_vl.$(OBJ):$(SRCLIB)/16_vl.c $(SRCLIB)/16_vl.h
+16_vl.$(OBJ):	$(SRCLIB)/16_vl.c $(SRCLIB)/16_vl.h
+16_vlpal.$(OBJ):	$(SRCLIB)/16_vlpal.c $(SRCLIB)/16_vlpal.h
 bakapee.$(OBJ):$(SRCLIB)/bakapee.c $(SRCLIB)/bakapee.h
 16render.$(OBJ):$(SRCLIB)/16render.c $(SRCLIB)/16render.h
 16planar.$(OBJ):$(MODEXLIB16)/16planar.c $(MODEXLIB16)/16planar.h
diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index ab9a143b..a0b58723 100755
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -617,7 +617,7 @@ fadePalette(sbyte fade, sbyte start, word iter, byte *palette) {
 
 	/* handle the case where we just update */
 	if(iter == 0) {
-	modexPalUpdate1(palette);
+	modexPalUpdate(palette);
 	return;
 	}
 
@@ -630,7 +630,7 @@ fadePalette(sbyte fade, sbyte start, word iter, byte *palette) {
 		tmppal[i] = 63;
 		}
 	}
-	modexPalUpdate1(tmppal);
+	modexPalUpdate(tmppal);
 	iter--;
 	dim += fade;
 	}
@@ -740,177 +740,10 @@ modexPalWhite() {
 
 
 /* utility */
-void
-modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset)
-{
-	byte *p = bmp->palette;
-	word w=0;
-	word q=0;
-	word qq=0;
-	static word a[PAL_SIZE];	//palette array of change values!
-	word z=0, aq=0, aa=0, pp=0;
-
-	//modexWaitBorder();
-	vga_wait_for_vsync();
-	if((*i)==0)
-	{
-		memset(a, -1, sizeof(a));
-		outp(PAL_WRITE_REG, 0);  /* start at the beginning of palette */
-	}
-	else if(qp==0)
-	{
-		q=(*i);
-	}
-	else
-	{
-		q=(*i);
-		qq=(*i)/3;
-//		  printf("q: %02d\n", (q));
-//		  printf("qq: %02d\n", (qq));
-		//printf("	  (*i)-q=%02d\n", (*i)-q);
-		outp(PAL_WRITE_REG, qq);  /* start at the beginning of palette */
-	}
-	if((*i)<PAL_SIZE/2 && w==0)
-	{
-		for(; (*i)<PAL_SIZE/2; (*i)++)
-		{
-			//if(i%3==0 && (p[i+5]==p[i+4] && p[i+4]==p[i+3] && p[i+3]==p[i+2] && p[i+2]==p[i+1] && p[i+1]==p[i] && p[i+5]==p[i]))
-//____		  if((qp>0)&&((*i)-q)%3==0 && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5])) outp(PAL_DATA_REG, p[(*i)-q]); else
-			if(((((*i)-q)%3==0)) && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5]))
-			{
-				w++;
-				break;
-			}
-			else if(qp>0 && (*i)>=(qp) && (*i)<((qp)+3))
-			{
-				//printf("qp=%d\n", qp);
-				//printf("		  (*i)=%d a[%d]=%d\n", (*i), qp, a[qp]);
-				printf("		%d's color=%d\n", (*i), (a[qp])-(bmp->offset*3)+qp);
-				//outp(PAL_DATA_REG, p[((a[qp])-(bmp->offset*3)+qp)]);// fix this shit!
-				if((*i)+1==(qp)+3){ w++; /*(*i)++;*/ break; }
-			}
-			else
-			{
-				if(bmp->offset==0 && (*i)<3 && q==0) outp(PAL_DATA_REG, 0);
-				else
-				if(qp==0) outp(PAL_DATA_REG, p[(*i)-q]);
-				else{ //outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3)+qp)]);
-				printf("p[]=%d  qp=%d   p[]-qp=%d\n", ((*i)-(bmp->offset*3)), qp, ((*i)-(bmp->offset*3))+qp); }
-			}
-		}
-		//if(qp>0) printf("qp=%d\n", qp);
-		//if(qp>0) printf("						 (*i)=%d\n", (*i)/3);
-	}
-	//modexWaitBorder();	  /* waits one retrace -- less flicker */
-	vga_wait_for_vsync();
-	if((*i)>=PAL_SIZE/2 && w==0)
-	{
-		for(; (*i)<PAL_SIZE; (*i)++)
-		{
-//____		  if((qp>0)&&((*i)-q)%3==0 && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5])) outp(PAL_DATA_REG, p[(*i)-q]); else
-			if(((((*i)-q)%3==0)) && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5]))
-			{
-				w++;
-				break;
-			}
-			else if(qp>0 && (*i)>=(qp) && (*i)<((qp)+3))
-			{
-				//printf("qp=%d\n", qp);
-				//printf("		  (*i)=%d a[%d]=%d\n", (*i), qp, a[qp]);
-				printf("		%d's color=%d\n", (*i), (a[qp]-(bmp->offset*3)+qp));
-				//outp(PAL_DATA_REG, p[((a[qp])-(bmp->offset*3)+qp)]);// fix this shit!
-				if((*i)+1==(qp)+3){ w++; /*(*i)++;*/ break; }
-			}
-			else
-			{
-				if(qp==0) outp(PAL_DATA_REG, p[(*i)-q]);
-				else{ //outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3)+qp)]);
-				printf("p[]=%d  qp=%d   p[]-qp=%d\n", ((*i)-(bmp->offset*3)), qp, ((*i)-(bmp->offset*3))+qp); }
-			}
-		}
-		//printf("						  (*i)=%d\n", (*i)/3);
-	}
-
-printf("\nqqqqqqqq\n\n");
-
-	//palette checker~
-	if(q>0 && qp==0)
-	{
-		long lq;
-		long bufSize = (bmp->width * bmp->height);
-		pp = q;
-		//printf("1(*i)=%02d\n", (*i)/3);
-		//printf("1z=%02d\n", z/3);
-		modexchkcolor(bmp, &q, &a, &aa, &z, i);
-		//printf("2(*i)=%02d\n", (*i)/3);
-		//printf("2z=%02d\n", z/3);
-		aq=0;
-aqpee:
-		while(aq<=aa)
-		{
-//			  printf("a[%02d]=(%d)\n", aq, a[aq]);
-			if(a[aq]==-1) aq++;
-			else { aqoffset++; break; }
-		}
-//update the image data here!
-	for(lq=0; lq<bufSize; lq++)
-	{
-				/*
-									note to self
-									use a[qp] instead of bmp->offset for this spot!
-									NO! wwww
-				*/
-
-				/*
-				Facking bloody point the values of the changed palette to correct values.... major confusion! wwww
-				*/
-
-		//(offset/bmp->offset)*bmp->offset
-
-
-		//printf("%02d ",bmp->data[lq]+bmp->offset);
-		//if(lq > 0 && lq%bmp->width==0) printf("\n");
-		//printf("%02d_", bmp->data[lq]+bmp->offset);
-		/*if(bmp->data[lq]+bmp->offset==aq)
-		{
-			//printf("%02d", bmp->data[lq]);
-			//printf("\n%02d\n", bmp->offset);
-			printf("aq=%02d ", aq);
-			printf("a[aq]=%02d	  ", a[aq]);
-			printf("a[aq]+aqpp=%02d ", a[aq]+aqpp);
-			printf("a[aq]-aqpp=%02d\n", a[aq]-aqpp);
-			//bmp->data[lq]=((bmp->data[lq]+bmp->offset)-a[aq]);
-//++++		  bmp->data[lq]=a[aq]-aqpp;
-//			  printf("_%d ", bmp->data[lq]);
-			//if(lq > 0 && lq%bmp->width==0) printf("\n");
-		}
-		else if(bmp->data[lq]+bmp->offset < ((*i)/3)-aqpp)
-		{
-			if(bmp->data[lq]+bmp->offset >= aq)
-			{
-				bmp->data[lq]=(bmp->data[lq]+bmp->offset)-aqpp;//-((z-(*i))/3);
-				//printf("_%d ", bmp->data[lq]+bmp->offset)-aqpp-((z-(*i))/3);
-			}
-			else bmp->data[lq]+=(bmp->offset-aqpp);
-		}*/
-
-		//printf("%02d`", bmp->data[lq]);
-		//if(lq > 0 && lq%bmp->width==0) printf("\n");
-	}
-
-//printf("		  aq=%02d\n", aq);
-//printf("		  aa=%02d\n", aa);
-
-	//update the palette~
-	modexPalUpdate(bmp, &pp, aq, aqoffset);
-	(*i)=pp;
-
-	if(aq<aa){ pp=q; aq++; goto aqpee; }
-	}
-}
+//moved to 16_vlpal.c
 
 void
-modexPalUpdate1(byte *p)
+modexPalUpdate(byte *p)
 {
 	int i;
 	//modexWaitBorder();
diff --git a/src/lib/16_vl.h b/src/lib/16_vl.h
index de5c8576..f375d1ff 100755
--- a/src/lib/16_vl.h
+++ b/src/lib/16_vl.h
@@ -132,8 +132,7 @@ void modexPalBlack();
 void modexPalWhite();
 
 /* utility functions */
-void modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset);
-void modexPalUpdate1(byte *p);
+void modexPalUpdate(byte *p);
 void modexPalUpdate0(byte *p);
 void modexPalOverscan(word col);
 void modexchkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/);
diff --git a/src/lib/16_vlpal.c b/src/lib/16_vlpal.c
new file mode 100755
index 00000000..d6e92a8c
--- /dev/null
+++ b/src/lib/16_vlpal.c
@@ -0,0 +1,191 @@
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ *
+ * This file is part of Project 16.
+ *
+ * Project 16 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Project 16 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include "src/lib/16_vlpal.h"
+
+void VL_palette(bitmap_t *bmp, word *i, word qp, word aqoffset)
+{
+	byte *p = bmp->palette;
+	word w=0;
+	word q=0;
+	word qq=0;
+	static word a[PAL_SIZE];	//palette array of change values!
+	word z=0, aq=0, aa=0, pp=0;
+
+	//modexWaitBorder();
+	vga_wait_for_vsync();
+	if((*i)==0)
+	{
+		memset(a, -1, sizeof(a));
+		outp(PAL_WRITE_REG, 0);  /* start at the beginning of palette */
+	}
+	else if(qp==0)
+	{
+		q=(*i);
+	}
+	else
+	{
+		q=(*i);
+		qq=(*i)/3;
+//		  printf("q: %02d\n", (q));
+//		  printf("qq: %02d\n", (qq));
+		//printf("	  (*i)-q=%02d\n", (*i)-q);
+		outp(PAL_WRITE_REG, qq);  /* start at the beginning of palette */
+	}
+	if((*i)<PAL_SIZE/2 && w==0)
+	{
+		for(; (*i)<PAL_SIZE/2; (*i)++)
+		{
+			//if(i%3==0 && (p[i+5]==p[i+4] && p[i+4]==p[i+3] && p[i+3]==p[i+2] && p[i+2]==p[i+1] && p[i+1]==p[i] && p[i+5]==p[i]))
+//____		  if((qp>0)&&((*i)-q)%3==0 && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5])) outp(PAL_DATA_REG, p[(*i)-q]); else
+			if(((((*i)-q)%3==0)) && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5]))
+			{
+				w++;
+				break;
+			}
+			else if(qp>0 && (*i)>=(qp) && (*i)<((qp)+3))
+			{
+				//printf("qp=%d\n", qp);
+				//printf("		  (*i)=%d a[%d]=%d\n", (*i), qp, a[qp]);
+				printf("		%d's color=%d\n", (*i), (a[qp])-(bmp->offset*3)+qp);
+				//outp(PAL_DATA_REG, p[((a[qp])-(bmp->offset*3)+qp)]);// fix this shit!
+				if((*i)+1==(qp)+3){ w++; /*(*i)++;*/ break; }
+			}
+			else
+			{
+				if(bmp->offset==0 && (*i)<3 && q==0) outp(PAL_DATA_REG, 0);
+				else
+				if(qp==0) outp(PAL_DATA_REG, p[(*i)-q]);
+				else{ //outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3)+qp)]);
+				printf("p[]=%d  qp=%d   p[]-qp=%d\n", ((*i)-(bmp->offset*3)), qp, ((*i)-(bmp->offset*3))+qp); }
+			}
+		}
+		//if(qp>0) printf("qp=%d\n", qp);
+		//if(qp>0) printf("						 (*i)=%d\n", (*i)/3);
+	}
+	//modexWaitBorder();	  /* waits one retrace -- less flicker */
+	vga_wait_for_vsync();
+	if((*i)>=PAL_SIZE/2 && w==0)
+	{
+		for(; (*i)<PAL_SIZE; (*i)++)
+		{
+//____		  if((qp>0)&&((*i)-q)%3==0 && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5])) outp(PAL_DATA_REG, p[(*i)-q]); else
+			if(((((*i)-q)%3==0)) && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5]))
+			{
+				w++;
+				break;
+			}
+			else if(qp>0 && (*i)>=(qp) && (*i)<((qp)+3))
+			{
+				//printf("qp=%d\n", qp);
+				//printf("		  (*i)=%d a[%d]=%d\n", (*i), qp, a[qp]);
+				printf("		%d's color=%d\n", (*i), (a[qp]-(bmp->offset*3)+qp));
+				//outp(PAL_DATA_REG, p[((a[qp])-(bmp->offset*3)+qp)]);// fix this shit!
+				if((*i)+1==(qp)+3){ w++; /*(*i)++;*/ break; }
+			}
+			else
+			{
+				if(qp==0) outp(PAL_DATA_REG, p[(*i)-q]);
+				else{ //outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3)+qp)]);
+				printf("p[]=%d  qp=%d   p[]-qp=%d\n", ((*i)-(bmp->offset*3)), qp, ((*i)-(bmp->offset*3))+qp); }
+			}
+		}
+		//printf("						  (*i)=%d\n", (*i)/3);
+	}
+
+printf("\nqqqqqqqq\n\n");
+
+	//palette checker~
+	if(q>0 && qp==0)
+	{
+		long lq;
+		long bufSize = (bmp->width * bmp->height);
+		pp = q;
+		//printf("1(*i)=%02d\n", (*i)/3);
+		//printf("1z=%02d\n", z/3);
+		modexchkcolor(bmp, &q, &a, &aa, &z, i);
+		//printf("2(*i)=%02d\n", (*i)/3);
+		//printf("2z=%02d\n", z/3);
+		aq=0;
+aqpee:
+		while(aq<=aa)
+		{
+//			  printf("a[%02d]=(%d)\n", aq, a[aq]);
+			if(a[aq]==-1) aq++;
+			else { aqoffset++; break; }
+		}
+//update the image data here!
+	for(lq=0; lq<bufSize; lq++)
+	{
+				/*
+									note to self
+									use a[qp] instead of bmp->offset for this spot!
+									NO! wwww
+				*/
+
+				/*
+				Facking bloody point the values of the changed palette to correct values.... major confusion! wwww
+				*/
+
+		//(offset/bmp->offset)*bmp->offset
+
+
+		//printf("%02d ",bmp->data[lq]+bmp->offset);
+		//if(lq > 0 && lq%bmp->width==0) printf("\n");
+		//printf("%02d_", bmp->data[lq]+bmp->offset);
+		/*if(bmp->data[lq]+bmp->offset==aq)
+		{
+			//printf("%02d", bmp->data[lq]);
+			//printf("\n%02d\n", bmp->offset);
+			printf("aq=%02d ", aq);
+			printf("a[aq]=%02d	  ", a[aq]);
+			printf("a[aq]+aqpp=%02d ", a[aq]+aqpp);
+			printf("a[aq]-aqpp=%02d\n", a[aq]-aqpp);
+			//bmp->data[lq]=((bmp->data[lq]+bmp->offset)-a[aq]);
+//++++		  bmp->data[lq]=a[aq]-aqpp;
+//			  printf("_%d ", bmp->data[lq]);
+			//if(lq > 0 && lq%bmp->width==0) printf("\n");
+		}
+		else if(bmp->data[lq]+bmp->offset < ((*i)/3)-aqpp)
+		{
+			if(bmp->data[lq]+bmp->offset >= aq)
+			{
+				bmp->data[lq]=(bmp->data[lq]+bmp->offset)-aqpp;//-((z-(*i))/3);
+				//printf("_%d ", bmp->data[lq]+bmp->offset)-aqpp-((z-(*i))/3);
+			}
+			else bmp->data[lq]+=(bmp->offset-aqpp);
+		}*/
+
+		//printf("%02d`", bmp->data[lq]);
+		//if(lq > 0 && lq%bmp->width==0) printf("\n");
+	}
+
+//printf("		  aq=%02d\n", aq);
+//printf("		  aa=%02d\n", aa);
+
+	//update the palette~
+	VL_palette(bmp, &pp, aq, aqoffset);
+	(*i)=pp;
+
+	if(aq<aa){ pp=q; aq++; goto aqpee; }
+	}
+}
diff --git a/src/lib/16_vlpal.h b/src/lib/16_vlpal.h
new file mode 100755
index 00000000..63dc75d1
--- /dev/null
+++ b/src/lib/16_vlpal.h
@@ -0,0 +1,8 @@
+#ifndef __16_VLPAL_H__
+#define __16_VLPAL_H__
+
+#include "src/lib/16_vl.h"
+
+void VL_palette(bitmap_t *bmp, word *i, word qp, word aqoffset);
+
+#endif //__16_VLPAL_H__
diff --git a/src/lib/doslib b/src/lib/doslib
index c3d08df6..667d7190 160000
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit c3d08df66b34c30bcf2252217384a6bf9c79fd44
+Subproject commit 667d71906b174472d4a2432c5c5c0d7167187be8
diff --git a/src/palettel.c b/src/palettel.c
index f2ff1944..e7f2ace0 100755
--- a/src/palettel.c
+++ b/src/palettel.c
@@ -43,12 +43,12 @@ main(int argc, char *argv[])
 	modexPalBlack();
 
 	modexLoadPalFile(bakapee, &pal);
-	modexPalUpdate1(pal);
+	modexPalUpdate(pal);
 	modexFadeOn(1, pal);
 	modexpdump(&gvar.video.page[0]);
 	getch();
 	VGAmodeX(0, 0, &gvar);
-	modexPalUpdate1(pal);
+	modexPalUpdate(pal);
 	/*for(i=0;i<768;i++)
 	{
 		printf("%02X ", pal[i]);
diff --git a/src/pcxtest.c b/src/pcxtest.c
index 357e2cae..1360cb6d 100755
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -74,7 +74,7 @@ void main() {
 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 
 	/* fix up the palette and everything */
-	modexPalUpdate1(&PCXBMP->palette);
+	modexPalUpdate(&PCXBMP->palette);
 
 	/* clear and draw one sprite and one bitmap */
 	modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 1);
diff --git a/src/pcxtest2.c b/src/pcxtest2.c
index efebd168..ab6e3b1e 100755
--- a/src/pcxtest2.c
+++ b/src/pcxtest2.c
@@ -95,7 +95,7 @@ void main() {
 	gvar.video.page[0].sh+=32;
 
 	/* fix up the palette and everything */
-	modexPalUpdate1(bmp.palette);
+	modexPalUpdate(bmp.palette);
 
 	/* clear and draw one sprite and one bitmap */
 	modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].sw, gvar.video.page[0].sh, 1);
diff --git a/src/scroll.c b/src/scroll.c
index de0cefd2..6e7664f0 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -88,9 +88,9 @@ void main(int argc, char *argv[])
 #endif
 #endif
 //++++	PCXBMPVAR.offset=(paloffset/3);
-//++++	modexPalUpdate1(&PCXBMPVAR, &paloffset, 0, 0);
-	modexPalUpdate1(&PCXBMP->palette);
-//++++0000		modexPalUpdate1(map.tiles->btdata->palette);
+//++++	modexPalUpdate(&PCXBMPVAR, &paloffset, 0, 0);
+	modexPalUpdate(&PCXBMP->palette);
+//++++0000		modexPalUpdate(map.tiles->btdata->palette);
 	//printf("	%d\n", sizeof(ptmp->data));
 	//printf("1:	%d\n", paloffset);
 //++++	map.tiles->data->offset=(paloffset/3);
@@ -220,7 +220,7 @@ void main(int argc, char *argv[])
 
 	//9
 #ifdef FADE
-		if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }
+		if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(dpal); IN_UserInput(1,1); }
 #endif
 		if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r
 
diff --git a/src/test.c b/src/test.c
index 839915fc..2f4fd6b5 100755
--- a/src/test.c
+++ b/src/test.c
@@ -182,7 +182,7 @@ void main(int argc, char *argv[])
 			for(i=0;i<3;i++)
 			{
 				pal2[i] = rand()%64;
-				modexPalUpdate1(pal2);
+				modexPalUpdate(pal2);
 				colo++;
 				if(colo>HGQ) colo=LGQ;
 			}
diff --git a/src/vrstest.c b/src/vrstest.c
index d006969d..1037b7c9 100755
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -120,7 +120,7 @@ void main()
 	t2 = (*clockw-start)/18.2;
 
 	/*modexLoadPalFile("data/spri/chikyuu.pal", &pal);
-	modexPalUpdate1(pal);*/
+	modexPalUpdate(pal);*/
 	//modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 2);
 	VL_LoadPalFile("data/spri/chikyuu.pal", &gvar.video.palette);
 	for (i = 0; i < 10; i++){
diff --git a/src/zcroll.c b/src/zcroll.c
index 7d586501..c0bd1079 100755
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -110,8 +110,7 @@ void main(int argc, char *argv[])
 
 	/* load color palette */
 	VL_LoadPalFile(bakapee1p, &gvar.video.palette);
-// 	CA_LoadFile("data/spri/"BAKAPEEFILE1".pal", &pal, &gvar);
-// 	modexPalUpdate1(pal);
+
 #ifdef FADE
 	gpal = modexNewPal();
 	modexPalSave(gpal);
@@ -202,7 +201,7 @@ void main(int argc, char *argv[])
 			VL_LoadPalFile(bakapee1p, &gvar.video.palette);
 		}//JK
 #ifdef FADE
-		if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }
+		if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(dpal); IN_UserInput(1,1); }
 #endif
 		if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r
 
diff --git a/wcpu.exe b/wcpu.exe
index 6a5fae4e3fd918f9bbf60ed7c83cc5b9a7215290..dc69eb74367539890f767ce8868d1d928b5bfdc5 100755
GIT binary patch
delta 2421
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
VeH3+-8q@J*K<VR<UW?C|e*@yttatzb

delta 2414
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
TdMeGCk52+hXQKLKe82n)i=eAd

-- 
2.39.2