--- np2/font/fontfm7.c	2003/10/16 17:58:36	1.1
+++ np2/font/fontfm7.c	2004/02/07 21:23:22	1.4
@@ -1,6 +1,6 @@
 #include	"compiler.h"
 #include	"dosio.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"font.h"
 #include	"fontdata.h"
 
@@ -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(font + 0x82100, work + 0x100, 0x60*8);
-				CopyMemory(font + 0x82500, work + 0x500, 0x40*8);
+				fontdata_ank8store(work + 0x100, 0x20, 0x60);
+				fontdata_ank8store(work + 0x500, 0xa0, 0x40);
 			}
 			file_close(fh);
 		}
@@ -104,14 +104,14 @@ BYTE fontfm7_read(const char *filename, 
 				// 16dot ASCIIを読み込む？
 				if (loading & FONT_ANK16a) {
 					loading &= ~FONT_ANK16a;
-					fm7ankcpy(font + 0x80200, work, 0x20, 0x7f);
+					fm7ankcpy(fontrom + 0x80200, work, 0x20, 0x7f);
 					fontdata_patch16a();
 				}
 
 				// 第一水準漢字を読み込む？
 				if (loading & FONT_KNJ1) {
 					loading &= ~FONT_KNJ1;
-					fm7knjcpy(font, work, 0x01, 0x30);
+					fm7knjcpy(fontrom, work, 0x01, 0x30);
 					fontdata_patchjis();
 				}
 			}