--- np2/font/fontfm7.c	2003/11/15 07:10:02	1.2
+++ np2/font/fontfm7.c	2005/02/07 14:46:10	1.5
@@ -1,14 +1,14 @@
 #include	"compiler.h"
 #include	"dosio.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"font.h"
 #include	"fontdata.h"
 
 
-static void fm7ankcpy(BYTE *dst, const BYTE *src, int from, int to) {
+static void fm7ankcpy(UINT8 *dst, const UINT8 *src, int from, int to) {
 
 	int		y;
-const BYTE	*p;
+const UINT8	*p;
 	int		ank;
 
 	for (ank=from; ank<to; ank++) {
@@ -22,11 +22,11 @@ const BYTE	*p;
 	}
 }
 
-static void fm7knjcpy(BYTE *dst, const BYTE *src, int from, int to) {
+static void fm7knjcpy(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);
@@ -66,13 +66,13 @@ const BYTE	*p;
 	}
 }
 
-BYTE fontfm7_read(const char *filename, BYTE loading) {
+UINT8 fontfm7_read(const char *filename, UINT8 loading) {
 
 	FILEH	fh;
-	BYTE	*work;
+	UINT8	*work;
 	char	fname[MAX_PATH];
 
-	work = (BYTE *)_MALLOC(0x20000, "fm7font");
+	work = (UINT8 *)_MALLOC(0x20000, "fm7font");
 	if (work == NULL) {
 		goto frf7_err1;
 	}
@@ -86,8 +86,8 @@ BYTE fontfm7_read(const char *filename, 
 		if (fh != FILEH_INVALID) {
 			if (file_read(fh, work, 2048) == 2048) {
 				loading &= ~FONT_ANK8;
-				CopyMemory(fontrom + 0x82100, work + 0x100, 0x60*8);
-				CopyMemory(fontrom + 0x82500, work + 0x500, 0x40*8);
+				fontdata_ank8store(work + 0x100, 0x20, 0x60);
+				fontdata_ank8store(work + 0x500, 0xa0, 0x40);
 			}
 			file_close(fh);
 		}