X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.c;h=df5a23e984dca76abbc040e09fc6f0001956e423;hb=655913f0313102c92ca9e817262cb38ac4fe96c6;hp=82ce2c1d55aab26386103d2a8d1e28923d183b8c;hpb=82c03114f1398b387713ae095b130ac9c57d96bc;p=16.git

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 82ce2c1d..df5a23e9 100644
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -1,13 +1,40 @@
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ *
+ * 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 <dos.h>
 #include <string.h>
 #include <mem.h>
 #include <conio.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "src\lib\modex16.h"
-
+#include "src/lib/modex16.h"
 
 byte far* VGA=(byte far*) 0xA0000000; 	/* this points to video memory. */
+/*word text_mask[16] = {
+	0x0002, 0x0102, 0x0202, 0x0302,
+	0x0402, 0x0502, 0x0602, 0x0702,
+	0x0802, 0x0902, 0x0A02, 0x0B02,
+	0x0C02, 0x0D02, 0x0E02, 0x0F02
+};*/
 
 static void fadePalette(sbyte fade, sbyte start, word iter, byte *palette);
 static byte tmppal[PAL_SIZE];
@@ -91,6 +118,7 @@ modexDefaultPage() {
     page.dy = 0;
     page.width = SCREEN_WIDTH;
     page.height = SCREEN_HEIGHT;
+	page.id = 0;
 
     return page;
 }
@@ -107,6 +135,23 @@ modexNextPage(page_t *p) {
     result.dy = 0;
     result.width = p->width;
     result.height = p->height;
+	result.id = p->id+1;
+
+    return result;
+}
+
+//next page with defined dimentions~
+page_t
+modexNextPage0(page_t *p, word x, word y)
+{
+	page_t result;
+
+	result.data = p->data + (p->width/4)*p->height;  /* compute the offset */
+	result.dx = 0;
+	result.dy = 0;
+	result.width = x;
+	result.height = y;
+	result.id = p->id+1;
 
     return result;
 }
@@ -138,7 +183,7 @@ modexShowPage(page_t *page) {
     outp(CRTC_DATA, crtcOffset);
 
     /*  wait for one retrace */
-    while (!(inp(INPUT_STATUS_1) & VRETRACE)); 
+    while (!(inp(INPUT_STATUS_1) & VRETRACE));
 
     /* do PEL panning here */
     outp(AC_INDEX, 0x33);
@@ -215,6 +260,28 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
 }
 
 
+void
+oldDrawBmp(byte far* page, int x, int y, bitmap_t *bmp, byte sprite)
+{
+	byte plane;
+	word px, py;
+	word offset;
+
+	/* TODO Make this fast.  It's SLOOOOOOW */
+	for(plane=0; plane < 4; plane++) {
+		modexSelectPlane(PLANE(plane+x));
+		for(px = plane; px < bmp->width; px+=4) {
+			offset=px;
+			for(py=0; py<bmp->height; py++) {
+			if(!sprite || bmp->data[offset])
+				page[PAGE_OFFSET(x+px, y+py)] = bmp->data[offset];
+			offset+=bmp->width;
+			}
+		}
+	}
+}
+
+
 void
 modexDrawBmp(page_t *page, int x, int y, bitmap_t *bmp) {
     /* draw the region (the entire freakin bitmap) */
@@ -253,7 +320,7 @@ modexDrawBmpRegion(page_t *page, int x, int y,
 
 		;-- begin plane painting
 		MOV AX, height		; start the row counter
-		MOV rowCounter, AX	; 
+		MOV rowCounter, AX	;
 		MOV DI, poffset		; go to the first pixel
 		MOV SI, bmpOffset	; go to the bmp pixel
 	ROW_LOOP:
@@ -333,7 +400,7 @@ modexDrawSpriteRegion(page_t *page, int x, int y,
 
 		;-- begin plane painting
 		MOV AX, height		; start the row counter
-		MOV rowCounter, AX	; 
+		MOV rowCounter, AX	;
 		MOV DI, poffset		; go to the first pixel
 		MOV SI, bmpOffset	; go to the bmp pixel
 	ROW_LOOP:
@@ -481,7 +548,7 @@ fadePalette(sbyte fade, sbyte start, word iter, byte *palette) {
 
     /* handle the case where we just update */
     if(iter == 0) {
-	modexPalUpdate2(palette);
+	modexPalUpdate1(palette);
 	return;
     }
 
@@ -494,7 +561,7 @@ fadePalette(sbyte fade, sbyte start, word iter, byte *palette) {
 		tmppal[i] = 63;
 	    }
 	}
-        modexPalUpdate2(tmppal);
+        modexPalUpdate1(tmppal);
 	iter--;
 	dim += fade;
     }
@@ -591,21 +658,21 @@ modexPalWhite() {
 
 /* utility */
 void
-modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqpp)
+modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset)
 {
 	byte *p = bmp->palette;
 	word w=0;
 	word q=0;
 	word qq=0;
-	word ii;
-	static word a[256] = { 0 };
-	word z=0,aq=0,aa=0;
-	word pp=0,spee=0,ppee=0;
-	sword aqpw;
+	static word a[PAL_SIZE];	//palette array of change values!
+	word z=0, aq=0, aa=0, pp=0;
 
-//	if(qp>0) printf("(*i)=%02d\n", (*i));
 	modexWaitBorder();
-	if((*i)==0) outp(PAL_WRITE_REG, 0);  /* start at the beginning of palette */
+	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);
@@ -617,7 +684,6 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqpp)
 //		printf("q: %02d\n", (q));
 //		printf("qq: %02d\n", (qq));
 		//printf("	(*i)-q=%02d\n", (*i)-q);
-//		printf("================\n");
 		outp(PAL_WRITE_REG, qq);  /* start at the beginning of palette */
 	}
 	if((*i)<PAL_SIZE/2 && w==0)
@@ -626,49 +692,30 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqpp)
 		{
 			//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) || ((qp>0)&&((*i)-(bmp->offset*3))%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]))
+			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]))
 			{
-				if(qp>0)
-				{
-					(*i)-=(aqpp*3);
-					aqpw=aqpp-1;
-					outp(PAL_WRITE_REG, qq+(((*i)+(aqpw*3)-(bmp->offset*3))/3));
-					for(ii=aqpp; ii>0; ii--)
-					{
-						outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))]);
-						outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3)+1)-(bmp->offset*3))]);
-						outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3)+2)-(bmp->offset*3))]);
-//						printf("position	=	%d\n", qq+(((*i)+(aqpw*3)-(bmp->offset*3))/3));
-/*if(qp>0){ //printf("[%d]", p[((*i)-q)]);	printf("[%d]", p[((*i)-q)+1]);	printf("[%d]", p[((*i)-q)+2]);	printf("[%d]", p[((*i)-q)+3]);			printf("[%d]", p[((*i)-q)+4]);			printf("[%d]", p[((*i)-q)+5]);			printf("	%d [%d]\n", (*i), p[((*i)-q)]); }
-printf("[%d]", p[((((*i)+((aqpp-ii)*3)))-(bmp->offset*3))]);
-printf("[%d]", p[((((*i)+((aqpp-ii)*3))+1)-(bmp->offset*3))]);
-printf("[%d] | ", p[((((*i)+((aqpp-ii)*3))+2)-(bmp->offset*3))]);
-printf("[%d]", p[((((*i)+((aqpp-ii)*3))+3)-(bmp->offset*3))]);
-printf("[%d]", p[((((*i)+((aqpp-ii)*3))+4)-(bmp->offset*3))]);
-printf("[%d]", p[((((*i)+((aqpp-ii)*3))+5)-(bmp->offset*3))]);
-printf("	%d [%d]\n",((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))/3, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))]); }*/
-						//printf("%d\n", ((*i)+((ii)*3))/3);
-						//printf("ii=%d\n", ii);
-						//printf("aqpp=%d\n", aqpp);
-						//printf("			%d\n", ((*i)+((aqpp-ii)*3))/3);
-					}
-					//printf("	%d\n",((((*i)+((aqpp-ii)*3)))-(bmp->offset*3)));
-					//printf("	%d\n",((((*i)+((aqpp-ii)*3))+1)-(bmp->offset*3)));
-					//printf("	%d\n",((((*i)+((aqpp-ii)*3))+2)-(bmp->offset*3)));
-					//printf("(*i)=%d\n", (*i));
-				}
-				//printf("[%d]", p[((*i)-q)]);	printf("[%d]", p[((*i)-q)+1]);	printf("[%d]", p[((*i)-q)+2]);	printf("[%d]", p[((*i)-q)+3]);			printf("[%d]", p[((*i)-q)+4]);			printf("[%d]", p[((*i)-q)+5]);			printf("	%d [%d]\n", (*i), p[((*i)-q)]);
 				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))]);
+				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 */
 	if((*i)>=PAL_SIZE/2 && w==0)
@@ -676,144 +723,109 @@ printf("	%d [%d]\n",((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))/3, p[
 		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) || ((qp>0)&&((*i)-(bmp->offset*3))%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]))
+			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]))
 			{
-				if(qp>0)
-				{
-					(*i)-=(aqpp*3);
-					aqpw=aqpp-1;
-					outp(PAL_WRITE_REG, qq+(((*i)+(aqpw*3)-(bmp->offset*3))/3));
-					for(ii=aqpp; ii>0; ii--)
-					{
-						outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))]);
-						outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3)+1)-(bmp->offset*3))]);
-						outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3)+2)-(bmp->offset*3))]);
-//						printf("position	=	%d\n", qq+(((*i)+(aqpw*3)-(bmp->offset*3))/3));
-/*if(qp>0){ //printf("[%d]", p[((*i)-q)]);	printf("[%d]", p[((*i)-q)+1]);	printf("[%d]", p[((*i)-q)+2]);	printf("[%d]", p[((*i)-q)+3]);			printf("[%d]", p[((*i)-q)+4]);			printf("[%d]", p[((*i)-q)+5]);			printf("	%d [%d]\n", (*i), p[((*i)-q)]); }
-printf("[%d]", p[((((*i)+((aqpp-ii)*3)))-(bmp->offset*3))]);
-printf("[%d]", p[((((*i)+((aqpp-ii)*3))+1)-(bmp->offset*3))]);
-printf("[%d] | ", p[((((*i)+((aqpp-ii)*3))+2)-(bmp->offset*3))]);
-printf("[%d]", p[((((*i)+((aqpp-ii)*3))+3)-(bmp->offset*3))]);
-printf("[%d]", p[((((*i)+((aqpp-ii)*3))+4)-(bmp->offset*3))]);
-printf("[%d]", p[((((*i)+((aqpp-ii)*3))+5)-(bmp->offset*3))]);
-printf("	%d [%d]\n",((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))/3, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))]); }*/
-						//printf("%d\n", ((*i)+((ii)*3))/3);
-						//printf("ii=%d\n", ii);
-						//printf("aqpp=%d\n", aqpp);
-						//printf("			%d\n", ((*i)+((aqpp-ii)*3))/3);
-					}
-					//printf("	%d\n",((((*i)+((aqpp-ii)*3)))-(bmp->offset*3)));
-					//printf("	%d\n",((((*i)+((aqpp-ii)*3))+1)-(bmp->offset*3)));
-					//printf("	%d\n",((((*i)+((aqpp-ii)*3))+2)-(bmp->offset*3)));
-					//printf("(*i)=%d\n", (*i));
-				}
-				//printf("[%d]", p[((*i)-q)]);	printf("[%d]", p[((*i)-q)+1]);	printf("[%d]", p[((*i)-q)+2]);	printf("[%d]", p[((*i)-q)+3]);			printf("[%d]", p[((*i)-q)+4]);			printf("[%d]", p[((*i)-q)+5]);			printf("	%d [%d]\n", (*i), p[((*i)-q)]);
 				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))]);
+				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);
-		chkcolor(bmp, &q, &a, &aa, &z);
-
-		/*printf("z=%d\n", z/3);
-		printf("q+z=%d\n", (q+z)/3);
-		printf("z-ppee=%d\n", (z-ppee)/3);
-		printf("q=%d\n", q/3);
-		printf("aa=%d\n", aa);*/
-
-		aq=0; pp = q; ppee=q;
+		pp = q;
+		//printf("1(*i)=%02d\n", (*i)/3);
+		//printf("1z=%02d\n", z/3);
+		chkcolor(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)", aq, a[aq]);
-			if(a[aq]==0) aq++;
-			else{ aqpp++; break; }
+//			printf("a[%02d]=(%d)\n", aq, a[aq]);
+			if(a[aq]==-1) aq++;
+			else { aqoffset++; break; }
 		}
-
-/*		printf("aq=%02d\n", aq);
-		printf("z=%02d\n", z/3);
-		printf("(z/3)-aqpp=%02d\n", (z/3)-aqpp);
-		printf("aqpp=%02d\n", aqpp);*/
-
+//update the image data here!
 	for(lq=0; lq<bufSize; lq++)
 	{
-		if(bmp->data[lq]+bmp->offset==aq)
+				/*
+									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("\n%02d\n", bmp->data[lq]);
+			//printf("%02d", bmp->data[lq]);
 			//printf("\n%02d\n", bmp->offset);
-			//printf("\naq=	%02d\n", aq);
-			//printf("a[aq]=	%02d\n", a[aq]);
+			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];
-			//printf("_%d \n", bmp->data[lq]);
+//++++			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 < (z/3)-aqpp)
+		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;
-			else bmp->data[lq]+=(bmp->offset);
-		}
+			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]);
+		//printf("%02d`", bmp->data[lq]);
 		//if(lq > 0 && lq%bmp->width==0) printf("\n");
 	}
 
-	while(pp<=(aq*3))
-	{
-		if(((pp/3)==aq || spee>0))
-		{
-			/*printf("spee=%d\n", spee);
-			printf("		pp=%02d	", pp/3);
-			printf("old	bmp: [%d]", bmp->palette[(pp-ppee)]);
-			printf("[%d]", bmp->palette[(pp-ppee)+1]);
-			printf("[%d]\n", bmp->palette[(pp-ppee)+2]);*/
-			//if(spee==0) printf("\npp=%02d\n\n", pp/3);
-			bmp->palette[(pp-ppee)]=		bmp->palette[(pp-ppee)+3];
-			bmp->palette[(pp-ppee)+1]=	bmp->palette[(pp-ppee)+4];
-			bmp->palette[(pp-ppee)+2]=	bmp->palette[(pp-ppee)+5];
-			if(spee==0) spee++;
-		}
-		/*printf("		pp=%02d	", pp/3);
-		printf("	bmp: [%d]", bmp->palette[(pp-ppee)]);
-		printf("[%d]", bmp->palette[(pp-ppee)+1]);
-		printf("[%d]\n", bmp->palette[(pp-ppee)+2]);*/
-		pp+=3;
-	}
+//printf("		aq=%02d\n", aq);
+//printf("		aa=%02d\n", aa);
 
 	//update the palette~
-	//printf("	aqpp=		%d\n", aqpp);
-	modexPalUpdate(bmp, &ppee, 1, aqpp);
-	(*i)=ppee;
-	//printf("	aqpp=	%d\n", aqpp);
-	//printf("	ppee=	%d\n", ppee);
-
-	/*printf(".\n");
-	printf("aqpp=	%02d\n", aqpp/3);
-	printf("aq=	%02d\n", aq);
-	printf("aa=	%02d\n", aa);
-	printf("		ppee=	%02d\n", ppee);*/
-
-	if(aq<aa){ /*printf("~~~~\n"); */ppee=q; aq++; goto aqpee; }
-	/*printf("ppee=%d\n", ppee);
-	printf("pp=%d\n", pp);
-	printf("q=%d\n", q);
-	printf("(*i)=%d\n", (*i));*/
+	modexPalUpdate(bmp, &pp, aq, aqoffset);
+	(*i)=pp;
 
+	if(aq<aa){ pp=q; aq++; goto aqpee; }
 	}
 }
 
 void
-modexPalUpdate2(byte *p)
+modexPalUpdate1(byte *p)
 {
 	int i;
 	modexWaitBorder();
@@ -830,7 +842,7 @@ modexPalUpdate2(byte *p)
 }
 
 void
-modexPalUpdate3(byte *p)
+modexPalUpdate0(byte *p)
 {
 	int i;
 	modexWaitBorder();
@@ -848,36 +860,43 @@ modexPalUpdate3(byte *p)
 
 //color checker~
 //i want to make another vesion that checks the palette when the palette is being appened~
-void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z)
+void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/)
 {
 		byte *pal;
 		word zz=0;
 		pal = modexNewPal();
 		modexPalSave(pal);
 		//printf("q: %02d\n", (*q));
-
+		printf("chkcolor start~\n");
+		printf("1				(*z): %d\n", (*z)/3);
+		printf("1				(*i): %d\n", (*i)/3);
+//		printf("1 offset of color in palette	(*q): %d\n", (*q)/3);
+		printf("wwwwwwwwwwwwwwww\n");
 		//check palette for dups
-		for((*z)=0; (*z)<PAL_SIZE; (*z)+=3)
+		for(; (*z)<PAL_SIZE; (*z)+=3)
 		{
-//			printf("\n		z: %d\n", (*z));
-//			printf("		q: %d\n", (*q));
-//			printf("		z+q: %d\n\n", ((*z)+(*q)));
-			if((*z)%3==0)
-			{
-				if(pal[(*z)]==pal[(*z)+3] && pal[(*z)+1]==pal[(*z)+4] && pal[(*z)+2]==pal[(*z)+5])
+			//printf("\n		z: %d\n", (*z));
+			//printf("		q: %d\n", (*q));
+			//printf("		z+q: %d\n\n", ((*z)+(*q)));
+			//if((*z)%3==0)
+			//{
+//----				if(pal[(*z)]==pal[(*z)+3] && pal[(*z)+1]==pal[(*z)+4] && pal[(*z)+2]==pal[(*z)+5])
+				if((*z)==(*i))
 				{
 //					printf("\n%d	[%02d][%02d][%02d]\n", (*z), pal[(*z)], pal[(*z)+1], pal[(*z)+2]);
 //					printf("%d	[%02d][%02d][%02d]\n\n", (*z)+3, pal[(*z)+3], pal[(*z)+4], pal[(*z)+5]);
+//0000					(*z)-=3;
 					break;
 				}
 				else for(zz=0; zz<(*q); zz+=3)
 				{
-					//zq=(zz+(q-3));
 					//printf("zz: %02d\n", zz/3);
 					if(zz%3==0)
 					{
-						if(pal[((*z)+(*q))]==pal[((*z)+(*q))+3] && pal[((*z)+(*q))+1]==pal[((*z)+(*q))+4] && pal[((*z)+(*q))+2]==pal[((*z)+(*q))+5])
+						if(pal[((*z)+(*q))]==pal[((*z)+(*q))+3] && pal[((*z)+(*q))+1]==pal[((*z)+(*q))+4] && pal[((*z)+(*q))+2]==pal[((*z)+(*q))+5])	//break if duplicate colors found in palette because it have reached the end of the current data of the palette
 						{
+//							(*z)-=3;
+//							(*i)-=3;
 //							printf("\nzq1:%d[%02d][%02d][%02d]\n", (zz+q), pal[(zz+q)], pal[(zz+q)+1], pal[(zz+q)+2]);
 //							printf("zq2:%d[%02d][%02d][%02d]\n\n", (zz+q)+3, pal[(zz+q)+3], pal[(zz+q)+4], pal[(zz+q)+5]);
 							break;
@@ -889,8 +908,22 @@ void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z)
 //							printf("	zz: %d	[%02d][%02d][%02d] value that the previous value is going to change to~\n", (zz)/3, pal[zz], pal[zz+1], pal[zz+2]);
 //							//printf("	zv: %d	[%02d][%02d][%02d] wwww\n", (zz-z+q)/3, pal[(zz-z+q)], pal[(zz-z+q)+1], pal[(zz-z+q)+2]);
 //							printf("	z : %d	[%02d][%02d][%02d] offset value~\n", (*z)/3, pal[(*z)], pal[(*z)+1], pal[(*z)+2]);
-							a[((*z)+(*q))/3]=zz/3;
-							(*aa)=((*z)+(*q))/3;
+//++++							(*i)--;
+//							(*z)--;
+							//expand dong here
+/*
+planned features that i plan to implement~
+image that has values on the pallete list!
+wwww
+no... wait.... no wwww
+*/
+							//for(zzii=0; zzii<3; zzii++)
+							//{
+								//printf("z+q: %d\n\n", ((*z)+(*q)));
+								a[(((*z)+(*q)))]=zz;
+							//}
+							(*aa)=(((*z)+(*q)));
+							printf("!!					a[%02d]: %d\n", (((*z)+(*q))/3), zz/3);
 //							printf("\n		aa: %d\n\n", (*aa));
 //							printf("	a[%02d]=(%02d) offset array i think the palette should be updated again~\n", ((*z)+(*q))/3, a[((*z)+(*q))/3]);
 //							printf("wwwwwwwwwwwwwwww\n\n");
@@ -906,11 +939,12 @@ void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z)
 						//printf("[%d]", (zz+q));
 					}
 				}
-				//printf("\nz:	%d\n", z);
-				//printf("q:	%d\n", q);
-				//printf("zz:	%d\n", zz);
-			}
 		}
+		printf("wwwwwwwwwwwwwwww\n");
+		printf("2				(*z): %d\n", (*z)/3);
+		printf("2				(*i): %d\n", (*i)/3);
+//		printf("2 offset of color in palette	(*q): %d\n", (*q)/3);
+		printf("chkcolor end~\n");
 		free(pal);
 }