--- np2/bios/bios.c	2005/02/04 05:32:23	1.70
+++ np2/bios/bios.c	2005/02/27 15:07:36	1.73
@@ -56,7 +56,7 @@ const IODATA	*pterm;
 	gdc_biosreset();
 
 	p = iodata;
-	pterm = iodata + (sizeof(iodata) / sizeof(IODATA));
+	pterm = iodata + NELEMENTS(iodata);
 	while(p < pterm) {
 		iocore_out8(p->port, p->data);
 		p++;
@@ -211,14 +211,14 @@ static void setbiosseed(UINT8 *ptr, UINT
 void bios_initialize(void) {
 
 	BOOL	biosrom;
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 	FILEH	fh;
 	UINT	i;
 	UINT32	tmp;
 	UINT	pos;
 
 	biosrom = FALSE;
-	getbiospath(path, str_biosrom, sizeof(path));
+	getbiospath(path, str_biosrom, NELEMENTS(path));
 	fh = file_open_rb(path);
 	if (fh != FILEH_INVALID) {
 		biosrom = (file_read(fh, mem + 0x0e8000, 0x18000) == 0x18000);
@@ -249,7 +249,7 @@ void bios_initialize(void) {
 	}
 
 #if defined(SUPPORT_PC9821)
-	getbiospath(path, "bios9821.rom", sizeof(path));
+	getbiospath(path, OEMTEXT("bios9821.rom"), sizeof(path));
 	fh = file_open_rb(path);
 	if (fh != FILEH_INVALID) {
 		if (file_read(fh, mem + 0x0d8000, 0x2000) == 0x2000) {
@@ -259,9 +259,11 @@ void bios_initialize(void) {
 		}
 		file_close(fh);
 	}
+#if defined(BIOS_SIMULATE)
 	mem[0xf8e80] = 0x98;
 	mem[0xf8e81] = 0x21;
 #endif
+#endif
 
 #if defined(BIOS_SIMULATE)
 	CopyMemory(mem + BIOS_BASE, biosfd80, sizeof(biosfd80));