--- np2/font/fontv98.c	2003/10/16 17:58:36	1.1.1.1
+++ np2/font/fontv98.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"
 
 
 #define	V98FILESIZE		0x46800
 
-static void v98knjcpy(BYTE *dst, const BYTE *src, int from, int to) {
+static void v98knjcpy(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++) {
 		p = src + 0x1800 + (0x60 * 32 * (i - 1));
@@ -27,10 +27,10 @@ const BYTE	*p;
 	}
 }
 
-BYTE fontv98_read(const char *filename, BYTE loading) {
+UINT8 fontv98_read(const OEMCHAR *filename, UINT8 loading) {
 
 	FILEH	fh;
-	BYTE	*v98fnt;
+	UINT8	*v98fnt;
 
 	if (!(loading & FONTLOAD_ALL)) {
 		goto frv_err1;
@@ -42,7 +42,7 @@ BYTE fontv98_read(const char *filename, 
 		goto frv_err1;
 	}
 
-	v98fnt = (BYTE *)_MALLOC(V98FILESIZE, "v98font");
+	v98fnt = (UINT8 *)_MALLOC(V98FILESIZE, "v98font");
 	if (v98fnt == NULL) {
 		goto frv_err2;
 	}
@@ -55,33 +55,33 @@ BYTE fontv98_read(const char *filename, 
 	// 8x8 フォントを読む必要がある？
 	if (loading & FONT_ANK8) {
 		loading &= ~FONT_ANK8;
-		CopyMemory(font + 0x82000, v98fnt, 8*256);
+		fontdata_ank8store(v98fnt, 0, 256);
 	}
 	// 8x16 フォント(〜0x7f)を読む必要がある？
 	if (loading & FONT_ANK16a) {
 		loading &= ~FONT_ANK16a;
-		CopyMemory(font + 0x80000, v98fnt + 0x0800, 16*128);
+		CopyMemory(fontrom + 0x80000, v98fnt + 0x0800, 16*128);
 	}
 	// 8x16 フォント(0x80〜)を読む必要がある？
 	if (loading & FONT_ANK16b) {
 		loading &= ~FONT_ANK16b;
-		CopyMemory(font + 0x80800, v98fnt + 0x1000, 16*128);
+		CopyMemory(fontrom + 0x80800, v98fnt + 0x1000, 16*128);
 	}
 
 	// 第一水準漢字を読む必要がある？
 	if (loading & FONT_KNJ1) {
 		loading &= ~FONT_KNJ1;
-		v98knjcpy(font, v98fnt, 0x01, 0x30);
+		v98knjcpy(fontrom, v98fnt, 0x01, 0x30);
 	}
 	// 第二水準漢字を読む必要がある？
 	if (loading & FONT_KNJ2) {
 		loading &= ~FONT_KNJ2;
-		v98knjcpy(font, v98fnt, 0x30, 0x56);
+		v98knjcpy(fontrom, v98fnt, 0x30, 0x56);
 	}
 	// 拡張漢字を読む必要がある？
 	if (loading & FONT_KNJ3) {
 		loading &= ~FONT_KNJ3;
-		v98knjcpy(font, v98fnt, 0x58, 0x5d);
+		v98knjcpy(fontrom, v98fnt, 0x58, 0x5d);
 	}
 
 frv_err3: