--- np2/font/font.h	2003/10/16 17:58:31	1.1.1.1
+++ np2/font/font.h	2005/02/07 14:46:10	1.4
@@ -7,14 +7,14 @@ extern "C" {
 #endif
 
 #ifdef FONTMEMORYBIND
-#define	font	(mem + FONT_ADRS)
+#define	fontrom		(mem + FONT_ADRS)
 #else
-extern	BYTE	__font[0x84000];
-#define	font	(__font)
+extern	UINT8	__font[0x84000];
+#define	fontrom		(__font)
 #endif
 
-void font_init(void);
-BYTE font_load(const char *filename, BOOL force);
+void font_initialize(void);
+UINT8 font_load(const char *filename, BOOL force);
 
 #ifdef __cplusplus
 }