--- np2/vram/maketext.c	2004/02/09 20:39:39	1.7
+++ np2/vram/maketext.c	2005/02/07 14:46:13	1.12
@@ -14,16 +14,11 @@ static	UINT32	text_table[512];
 static	UINT32	text_tblx2[512][2];
 
 
-void maketext_reset(void) {
-
-	ZeroMemory(&tramflag, sizeof(tramflag));
-}
-
-void maketext_init(void) {
+void maketext_initialize(void) {
 
 	int		i;
 	int		j;
-	BYTE	bit;
+	UINT8	bit;
 
 	ZeroMemory(text_table, sizeof(text_table));
 	for (i=0; i<8; i++) {
@@ -67,9 +62,14 @@ void maketext_init(void) {
 	}
 }
 
-static BYTE dirtyonblink(void) {
+void maketext_reset(void) {
 
-	BYTE	ret;
+	ZeroMemory(&tramflag, sizeof(tramflag));
+}
+
+static UINT8 dirtyonblink(void) {
+
+	UINT8	ret;
 	int		i;
 
 	ret = 0;
@@ -82,9 +82,9 @@ static BYTE dirtyonblink(void) {
 	return(ret);
 }
 
-BYTE maketext_curblink(void) {
+UINT8 maketext_curblink(void) {
 
-	BYTE	ret;
+	UINT8	ret;
 	UINT16	csrw;
 
 	ret = 0;
@@ -126,7 +126,7 @@ BYTE maketext_curblink(void) {
 void maketext(int text_renewal) {
 
 	UINT8	multiple;
-	BYTE	TEXT_LR;
+	UINT8	TEXT_LR;
 	int		TEXT_PL;
 	int		TEXT_BL;
 	int		TEXT_CL;
@@ -135,24 +135,24 @@ void maketext(int text_renewal) {
 	int 	topline;
 	int		lines;
 	int		nowline;
-	BYTE	wait2;
+	UINT8	wait2;
 	UINT	pitch;
 	UINT	csrw;
 	UINT	esi;
 	UINT	scroll;
 	int		scrp;
-	BYTE	wait1;
-	BYTE	LRcnt;
+	UINT8	wait1;
+	UINT8	LRcnt;
 	BOOL	reloadline;
 	int		new_flag;
 	int		cur_line;
 	int		linecnt;
-	BYTE	*q;
+	UINT8	*q;
 	UINT	y;
-	BYTE	line_effect = 0;		// for gcc
+	UINT8	line_effect = 0;		// for gcc
 	int		x;
 	UINT32	bitmap[TEXTXMAX];
-	BYTE	curx[TEXTXMAX+1];
+	UINT8	curx[TEXTXMAX+1];
 	UINT16	color[TEXTXMAX];
 
 	if (text_renewal) {
@@ -239,7 +239,7 @@ void maketext(int text_renewal) {
 				edi = esi;
 				gaiji1st = 0;
 				kanji2nd = FALSE;
-				lastbitp = 0;										// ver0.28
+				lastbitp = 0;
 				for (x=0; x<TEXTXMAX; x++) {						// width80
 					if (edi == csrw) {
 						cur_line = x;
@@ -252,9 +252,9 @@ void maketext(int text_renewal) {
 					}
 					if (kanji2nd) {
 						kanji2nd = FALSE;
-						bitmap[x] = lastbitp + 0x800;				// ver0.28
+						bitmap[x] = lastbitp + 0x800;
 						curx[x-1] |= 0x80;
-						curx[x] |= curx[x-1] & 0x20;				// ver0.28
+						curx[x] |= curx[x-1] & 0x20;
 					}
 					else if (!(mem[0xa0001 + edi*2] & gdc.bitac)) {
 						gaiji1st = 0;
@@ -278,8 +278,8 @@ void maketext(int text_renewal) {
 						UINT kc;
 						kc = LOADINTELWORD(mem + 0xa0000 + edi*2);
 						bitmap[x] = (kc & 0x7f7f) << 4;
-						kc &= 0x7e;
-						if (kc == 0x56) {							// ver0.28
+						kc &= 0x7f;									// ver0.78
+						if ((kc == 0x56) || (kc == 0x57)) {
 							tramflag.gaiji = 1;
 							if ((gaiji1st) &&
 								(bitmap[x] == (lastbitp & (~15)))) {
@@ -290,11 +290,10 @@ void maketext(int text_renewal) {
 						}
 						else {
 							gaiji1st = 0;
-							if ((kc < 0x08) || (kc >= 0x0c)) {
+							if ((kc < 0x09) || (kc >= 0x0c)) {
 								kanji2nd = TRUE;
 							}
 						}
-																	// ver0.28
 						if ((curx[x] & TXTATR_BG) && (gdc.mode1 & 1)) {
 							curx[x] |= 0x20;
 							bitmap[x] += 8;
@@ -335,13 +334,13 @@ void maketext(int text_renewal) {
 					if ((nowline >= (gdc.m.para[GDC_CSRFORM+1] & 0x1f)) &&
 						(nowline <= (gdc.m.para[GDC_CSRFORM+2] >> 3))) {
 						color[cur_line] |= 256;
-						if (curx[cur_line] & 0x80) {				// ver0.28
+						if (curx[cur_line] & 0x80) {
 							color[cur_line+1] |= 256;
 						}
 					}
 					else {
 						color[cur_line] &= ~(256);
-						if (curx[cur_line] & 0x80) {				// ver0.28
+						if (curx[cur_line] & 0x80) {
 							color[cur_line+1] &= ~(256);
 						}
 					}
@@ -389,7 +388,6 @@ void maketext(int text_renewal) {
 					}
 					q += 4;
 				}
-													// virtical line ver0.27
 				if ((line_effect & TXTATR_VL) && (!(gdc.mode1 & 1))) {
 					// width80
 					q -= TEXTXMAX * 8;
@@ -437,7 +435,7 @@ void maketext(int text_renewal) {
 void maketext40(int text_renewal) {
 
 	UINT8	multiple;
-	BYTE	TEXT_LR;
+	UINT8	TEXT_LR;
 	int		TEXT_PL;
 	int		TEXT_BL;
 	int		TEXT_CL;
@@ -446,24 +444,24 @@ void maketext40(int text_renewal) {
 	int		topline;
 	int		lines;
 	int		nowline;
-	BYTE	wait2;
+	UINT8	wait2;
 	UINT	pitch;
 	UINT	csrw;
 	UINT	esi;
 	UINT	scroll;
 	int		scrp;
-	BYTE	wait1;
-	BYTE	LRcnt;
+	UINT8	wait1;
+	UINT8	LRcnt;
 	BOOL	reloadline;
 	int		new_flag;
 	int		cur_line;
 	int		linecnt;
-	BYTE	*q;
+	UINT8	*q;
 	UINT	y;
-	BYTE	line_effect = 0;		// for gcc
+	UINT8	line_effect = 0;		// for gcc
 	int		x;
 	UINT32	bitmap[TEXTXMAX];
-	BYTE	curx[TEXTXMAX+1];
+	UINT8	curx[TEXTXMAX+1];
 	UINT16	color[TEXTXMAX];
 
 	if (text_renewal) {
@@ -550,7 +548,7 @@ void maketext40(int text_renewal) {
 				edi = esi;
 				gaiji1st = 0;
 				kanji2nd = 0;
-				lastbitp = 0;										// ver0.28
+				lastbitp = 0;
 				for (x=0; x<(TEXTXMAX/2); x++) {					// width40
 					if (edi == csrw) {
 						cur_line = x;
@@ -563,9 +561,9 @@ void maketext40(int text_renewal) {
 					}
 					if (kanji2nd) {
 						kanji2nd = FALSE;
-						bitmap[x] = lastbitp + 0x800;				// ver0.28
+						bitmap[x] = lastbitp + 0x800;
 						curx[x-1] |= 0x80;
-						curx[x] |= curx[x-1] & 0x20;				// ver0.28
+						curx[x] |= curx[x-1] & 0x20;
 					}
 					else if (!(mem[0xa0001 + edi*2] & gdc.bitac)) {
 						gaiji1st = 0;
@@ -589,8 +587,8 @@ void maketext40(int text_renewal) {
 						UINT kc;
 						kc = LOADINTELWORD(mem + 0xa0000 + edi*2);
 						bitmap[x] = (kc & 0x7f7f) << 4;
-						kc &= 0x7e;
-						if (kc == 0x56) {							// ver0.28
+						kc &= 0x7f;									// ver0.78
+						if ((kc == 0x56) || (kc == 0x57)) {
 							tramflag.gaiji = 1;
 							if ((gaiji1st) &&
 								(bitmap[x] == (lastbitp & (~15)))) {
@@ -601,11 +599,10 @@ void maketext40(int text_renewal) {
 						}
 						else {
 							gaiji1st = 0;
-							if ((kc < 0x08) || (kc >= 0x0c)) {
+							if ((kc < 0x09) || (kc >= 0x0c)) {
 								kanji2nd = TRUE;
 							}
 						}
-																	// ver0.28
 						if ((curx[x] & TXTATR_BG) && (gdc.mode1 & 1)) {
 							curx[x] |= 0x20;
 							bitmap[x] += 8;
@@ -646,13 +643,13 @@ void maketext40(int text_renewal) {
 					if ((nowline >= (gdc.m.para[GDC_CSRFORM+1] & 0x1f)) &&
 						(nowline <= (gdc.m.para[GDC_CSRFORM+2] >> 3))) {
 						color[cur_line] |= 256;
-						if (curx[cur_line] & 0x80) {				// ver0.28
+						if (curx[cur_line] & 0x80) {
 							color[cur_line+1] |= 256;
 						}
 					}
 					else {
 						color[cur_line] &= ~(256);
-						if (curx[cur_line] & 0x80) {				// ver0.28
+						if (curx[cur_line] & 0x80) {
 							color[cur_line+1] &= ~(256);
 						}
 					}
@@ -661,7 +658,7 @@ void maketext40(int text_renewal) {
 					// width40
 					for (x=0; x<(TEXTXMAX/2); x++) {
 						int fntline;
-						BYTE data;
+						UINT8 data;
 						fntline = nowline;
 						if (curx[x] & 0x20) {
 							fntline >>= 1;
@@ -716,7 +713,6 @@ void maketext40(int text_renewal) {
 					}
 					q += 12;
 				}
-													// virtical line ver0.27
 				if ((line_effect & TXTATR_VL) && (!(gdc.mode1 & 1))) {
 					// width40
 					q -= TEXTXMAX * 8;