--- np2/font/fontpc88.c	2003/10/16 17:58:36	1.1
+++ np2/font/fontpc88.c	2005/02/09 20:11:34	1.6
@@ -1,17 +1,17 @@
 #include	"compiler.h"
 #include	"dosio.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"font.h"
 #include	"fontdata.h"
 
 
-static void pc88knjcpy1(BYTE *dst, const BYTE *src, int from, int to) {
+static void pc88knjcpy1(UINT8 *dst, const UINT8 *src, int from, int to) {
 
 	int		i;
 	int		j;
 	int		k;
-const BYTE	*p;
-	BYTE	*q;
+const UINT8	*p;
+	UINT8	*q;
 
 	for (i=from; i<to; i++) {
 		q = dst + 0x21000 + (i << 4);
@@ -42,11 +42,11 @@ const BYTE	*p;
 	}
 }
 
-static void pc88knjcpy2(BYTE *dst, const BYTE *src, int from, int to) {
+static void pc88knjcpy2(UINT8 *dst, const UINT8 *src, int from, int to) {
 
 	int		i, j, k;
-const BYTE	*p;
-	BYTE	*q;
+const UINT8	*p;
+	UINT8	*q;
 
 	for (i=from; i<to; i++) {
 		q = dst + 0x21000 + (i << 4);
@@ -78,24 +78,24 @@ const BYTE	*p;
 	}
 }
 
-BYTE fontpc88_read(const char *filename, BYTE loading) {
+UINT8 fontpc88_read(const OEMCHAR *filename, UINT8 loading) {
 
 	FILEH	fh;
-	BYTE	*work;
-	char	fname[MAX_PATH];
+	UINT8	*work;
+	OEMCHAR	fname[MAX_PATH];
 
-	work = (BYTE *)_MALLOC(0x20000, "pc88font");
+	work = (UINT8 *)_MALLOC(0x20000, "pc88font");
 	if (work == NULL) {
 		goto fr88_err1;
 	}
-	file_cpyname(fname, filename, sizeof(fname));
+	file_cpyname(fname, filename, NELEMENTS(fname));
 
 	// 第２水準以外を読む必要はある？
 	if (loading & (FONT_ANK8 | FONTLOAD_ANK | FONT_KNJ1)) {
 
 		// あったら読み込んでみる
 		file_cutname(fname);
-		file_catname(fname, pc88knj1name, sizeof(fname));
+		file_catname(fname, pc88knj1name, NELEMENTS(fname));
 		fh = file_open_rb(fname);
 		if (fh != FILEH_INVALID) {
 			if (file_read(fh, work, 0x20000) == 0x20000) {
@@ -103,25 +103,25 @@ BYTE fontpc88_read(const char *filename,
 				// 8dot ANKを読む必要があるか
 				if (loading & FONT_ANK8) {
 					loading &= ~FONT_ANK8;
-					CopyMemory(font + 0x82000, work + 0x1000, 8*256);
+					fontdata_ank8store(work + 0x1000, 0, 256);
 				}
 
 				// 16dot ASCIIを読む必要があるか
 				if (loading & FONT_ANK16a) {
 					loading &= ~FONT_ANK16a;
-					CopyMemory(font + 0x80000, work + 0x0000, 16*128);
+					CopyMemory(fontrom + 0x80000, work + 0x0000, 16*128);
 				}
 
 				// 16dot ANK(0x80〜)を読む必要があるか
 				if (loading & FONT_ANK16b) {
 					loading &= ~FONT_ANK16b;
-					CopyMemory(font + 0x80800, work + 0x0800, 16*128);
+					CopyMemory(fontrom + 0x80800, work + 0x0800, 16*128);
 				}
 
 				// 第一水準漢字を読み込む？
 				if (loading & FONT_KNJ1) {
 					loading &= ~FONT_KNJ1;
-					pc88knjcpy1(font, work, 0x01, 0x30);
+					pc88knjcpy1(fontrom, work, 0x01, 0x30);
 					fontdata_patchjis();
 				}
 			}
@@ -136,13 +136,13 @@ BYTE fontpc88_read(const char *filename,
 
 		// あったら読み込んでみる
 		file_cutname(fname);
-		file_catname(fname, pc88knj2name, sizeof(fname));
+		file_catname(fname, pc88knj2name, NELEMENTS(fname));
 		fh = file_open_rb(fname);
 		if (fh != FILEH_INVALID) {
 			if (file_read(fh, work, 0x20000) == 0x20000) {
 
 				loading &= ~FONT_KNJ2;
-				pc88knjcpy2(font, work, 0x31, 0x56);
+				pc88knjcpy2(fontrom, work, 0x31, 0x56);
 			}
 
 			// クローズして セクション終わり
@@ -155,7 +155,7 @@ BYTE fontpc88_read(const char *filename,
 
 		// あったら読み込んでみる
 		file_cutname(fname);
-		file_catname(fname, pc88ankname, sizeof(fname));
+		file_catname(fname, pc88ankname, NELEMENTS(fname));
 		fh = file_open_rb(fname);
 		if (fh != FILEH_INVALID) {
 
@@ -165,19 +165,19 @@ BYTE fontpc88_read(const char *filename,
 				// 8dot ANKを読む必要があるか
 				if (loading & FONT_ANK8) {
 					loading &= ~FONT_ANK8;
-					CopyMemory(font + 0x82000, work + 0x0000, 8*256);
+					fontdata_ank8store(work + 0x0000, 0, 256);
 				}
 
 				// 16dot ASCIIを読む必要があるか
 				if (loading & FONT_ANK16a) {
 					loading &= ~FONT_ANK16a;
-					CopyMemory(font + 0x80000, work + 0x0800, 16*128);
+					CopyMemory(fontrom + 0x80000, work + 0x0800, 16*128);
 				}
 
 				// 16dot ANK(0x80〜)を読む必要があるか
 				if (loading & FONT_ANK16b) {
 					loading &= ~FONT_ANK16b;
-					CopyMemory(font + 0x80800, work + 0x1000, 16*128);
+					CopyMemory(fontrom + 0x80800, work + 0x1000, 16*128);
 				}
 			}