--- np2/vram/sdraw.mcr	2003/10/17 07:17:20	1.2
+++ np2/vram/sdraw.mcr	2004/01/31 20:05:24	1.5
@@ -148,7 +148,7 @@ const BYTE	*p;
 
 		if (sdraw->dirty[y+1]) {
 			for (x=0; x<sdraw->width; x++) {
-				*(UINT32 *)q = np2_pal32[NP2PAL_TEXT].d;
+				SDSETPIXEL(q, NP2PAL_TEXT);
 				q += sdraw->xalign;
 			}
 			q -= sdraw->xbytes;
@@ -261,6 +261,7 @@ const BYTE	*q;
 	y = sdraw->y;
 	do {
 		if (sdraw->dirty[y]) {
+			sdraw->dirty[y+1] |= 0xff;
 			for (x=0; x<sdraw->width; x++) {
 				SDSETPIXEL(r, p[x] + q[x] + NP2PAL_GRPH);
 				r += sdraw->xalign;
@@ -314,11 +315,11 @@ static void SCRNCALL SDSYM(n_0)(SDRAW sd
 	y = sdraw->y;
 	do {
 		if (sdraw->dirty[y]) {
+			SDSETPIXEL(p, NP2PAL_TEXT3);
 			for (x=0; x<sdraw->width; x++) {
-				SDSETPIXEL(p, NP2PAL_TEXT2);
 				p += sdraw->xalign;
+				SDSETPIXEL(p, NP2PAL_TEXT2);
 			}
-			SDSETPIXEL(p, NP2PAL_TEXT2);
 			p -= sdraw->xbytes;
 		}
 		p += sdraw->yalign;
@@ -341,7 +342,9 @@ const BYTE	*p;
 	y = sdraw->y;
 	do {
 		if (sdraw->dirty[y]) {
-			for (x=0; x<sdraw->width; x++) {
+			SDSETPIXEL(q, p[0] + NP2PAL_TEXT3);
+			q += sdraw->xalign;
+			for (x=1; x<sdraw->width; x++) {
 				SDSETPIXEL(q, p[x] + NP2PAL_GRPH);
 				q += sdraw->xalign;
 			}
@@ -370,7 +373,7 @@ const BYTE	*p;
 	y = sdraw->y;
 	do {
 		if (sdraw->dirty[y]) {
-			SDSETPIXEL(q, NP2PAL_TEXT2);
+			SDSETPIXEL(q, NP2PAL_TEXT3);
 			for (x=0; x<sdraw->width; x++) {
 				q += sdraw->xalign;
 				SDSETPIXEL(q, p[x] + NP2PAL_GRPH);
@@ -401,7 +404,7 @@ const BYTE	*q;
 	y = sdraw->y;
 	do {
 		if (sdraw->dirty[y]) {
-			SDSETPIXEL(r, q[0] + NP2PAL_GRPH);
+			SDSETPIXEL(r, (q[0] >> 4) + NP2PAL_TEXT3);
 			r += sdraw->xalign;
 			for (x=1; x<sdraw->width; x++) {
 				SDSETPIXEL(r, p[x-1] + q[x] + NP2PAL_GRPH);
@@ -479,7 +482,7 @@ const BYTE	*p;
 	y = sdraw->y;
 	do {
 		if (sdraw->dirty[y]) {
-			SDSETPIXEL(q, 0);
+			SDSETPIXEL(q, NP2PAL_TEXT3);
 			for (x=0; x<sdraw->width; x++) {
 				q += sdraw->xalign;
 				SDSETPIXEL(q, p[x] + NP2PAL_GRPH);
@@ -490,7 +493,7 @@ const BYTE	*p;
 		q += sdraw->yalign;
 
 		if (sdraw->dirty[y+1]) {
-			SDSETPIXEL(q, NP2PAL_TEXT);
+			SDSETPIXEL(q, NP2PAL_TEXT3);
 			for (x=0; x<sdraw->width; x++) {
 				q += sdraw->xalign;
 				SDSETPIXEL(q, NP2PAL_TEXT);
@@ -571,7 +574,7 @@ const BYTE	*p;
 	do {
 		if (sdraw->dirty[y]) {
 			sdraw->dirty[y+1] |= 0xff;
-			SDSETPIXEL(q, 0);
+			SDSETPIXEL(q, NP2PAL_TEXT3);
 			for (x=0; x<sdraw->width; x++) {
 				q += sdraw->xalign;
 				SDSETPIXEL(q, p[x] + NP2PAL_GRPH);
@@ -581,7 +584,7 @@ const BYTE	*p;
 		q += sdraw->yalign;
 
 		if (sdraw->dirty[y+1]) {
-			SDSETPIXEL(q, 0);
+			SDSETPIXEL(q, NP2PAL_TEXT3);
 			for (x=0; x<sdraw->width; x++) {
 				SDSETPIXEL(q, p[x] + NP2PAL_SKIP);
 				q += sdraw->xalign;