--- np2/font/fontdata.c	2003/10/16 17:58:35	1.1.1.1
+++ np2/font/fontdata.c	2005/02/09 20:11:34	1.6
@@ -1,29 +1,29 @@
 #include	"compiler.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"font.h"
 #include	"fontdata.h"
 #include	"fontdata.res"
 
 
-const char pc88ankname[]	= "PC88.FNT";
-const char pc88knj1name[]	= "KANJI1.ROM";
-const char pc88knj2name[]	= "KANJI2.ROM";
-const char pc98fontname[]	= "FONT.BMP";
-const char v98fontname[]	= "FONT.ROM";
-const char fm7ankname[]		= "SUBSYS_C.ROM";
-const char fm7knjname[]		= "KANJI.ROM";
-const char x1ank1name[]		= "FNT0808.X1";
-const char x1ank2name[]		= "FNT0816.X1";
-const char x1knjname[]		= "FNT1616.X1";
-const char x68kfontname[]	= "CGROM.DAT";
+const OEMCHAR pc88ankname[]		= OEMTEXT("PC88.FNT");
+const OEMCHAR pc88knj1name[]	= OEMTEXT("KANJI1.ROM");
+const OEMCHAR pc88knj2name[]	= OEMTEXT("KANJI2.ROM");
+const OEMCHAR pc98fontname[]	= OEMTEXT("FONT.BMP");
+const OEMCHAR v98fontname[]		= OEMTEXT("FONT.ROM");
+const OEMCHAR fm7ankname[]		= OEMTEXT("SUBSYS_C.ROM");
+const OEMCHAR fm7knjname[]		= OEMTEXT("KANJI.ROM");
+const OEMCHAR x1ank1name[]		= OEMTEXT("FNT0808.X1");
+const OEMCHAR x1ank2name[]		= OEMTEXT("FNT0816.X1");
+const OEMCHAR x1knjname[]		= OEMTEXT("FNT1616.X1");
+const OEMCHAR x68kfontname[]	= OEMTEXT("CGROM.DAT");
 
 
-static void patch29(UINT jish, const BYTE *src) {
+static void patch29(UINT jish, const UINT8 *src) {
 
 	UINT	i;
-	BYTE	*p;
+	UINT8	*p;
 
-	p = font + 0x21000 + (jish << 4);
+	p = fontrom + 0x21000 + (jish << 4);
 	for (i=0x21; i<0x7f; i++) {
 		CopyMemory(p, src, 16);
 		p += 0x1000;
@@ -35,11 +35,11 @@ static void patch2c(void) {
 
 	UINT	i;
 	UINT	j;
-const BYTE	*p;
-	BYTE	*q;
+const UINT8	*p;
+	UINT8	*q;
 
 	p = fontdata_2c;
-	q = font + 0x240c0;
+	q = fontrom + 0x240c0;
 	for (i=0x24; i<0x70; i++) {
 		for (j=0; j<16; j++) {
 			q[j + 0x800] = p[0];
@@ -53,15 +53,27 @@ const BYTE	*p;
 
 // ----
 
+void fontdata_ank8store(const UINT8 *ptr, UINT pos, UINT cnt) {
+
+	UINT8	*dat;
+
+	dat = fontrom + 0x82000 + (pos * 16);
+	while(cnt--) {
+		CopyMemory(dat, ptr, 8);
+		dat += 16;
+		ptr += 8;
+	}
+}
+
 void fontdata_patch16a(void) {
 
-	CopyMemory(font + 0x80000, fontdata_16 + 0*32*16, 32*16);
+	CopyMemory(fontrom + 0x80000, fontdata_16 + 0*32*16, 32*16);
 }
 
 void fontdata_patch16b(void) {
 
-	CopyMemory(font + 0x80800, fontdata_16 + 1*32*16, 32*16);
-	CopyMemory(font + 0x80e00, fontdata_16 + 2*32*16, 32*16);
+	CopyMemory(fontrom + 0x80800, fontdata_16 + 1*32*16, 32*16);
+	CopyMemory(fontrom + 0x80e00, fontdata_16 + 2*32*16, 32*16);
 }
 
 void fontdata_patchjis(void) {