--- np2/sound/soundrom.c	2003/10/16 17:58:08	1.1.1.1
+++ np2/sound/soundrom.c	2003/12/08 00:55:33	1.6
@@ -1,5 +1,6 @@
 #include	"compiler.h"
 #include	"dosio.h"
+#include	"pccore.h"
 #include	"memory.h"
 #include	"soundrom.h"
 
@@ -16,15 +17,17 @@ static const BYTE defsoundrom[9] = {
 static BOOL loadsoundrom(UINT address, const char *name) {
 
 	char	romname[24];
+	char	path[MAX_PATH];
 	FILEH	fh;
 	UINT	rsize;
 
-	milstr_ncpy(romname, file_sound, sizeof(romname));
+	file_cpyname(romname, file_sound, sizeof(romname));
 	if (name) {
-		milstr_ncat(romname, name, sizeof(romname));
+		file_catname(romname, name, sizeof(romname));
 	}
-	milstr_ncat(romname, file_extrom, sizeof(romname));
-	fh = file_open_c(romname);
+	file_catname(romname, file_extrom, sizeof(romname));
+	getbiospath(path, romname, sizeof(path));
+	fh = file_open_rb(path);
 	if (fh == FILEH_INVALID) {
 		goto lsr_err;
 	}
@@ -33,7 +36,7 @@ static BOOL loadsoundrom(UINT address, c
 	if (rsize != 0x4000) {
 		goto lsr_err;
 	}
-	milstr_ncpy(soundrom.name, romname, sizeof(soundrom.name));
+	file_cpyname(soundrom.name, romname, sizeof(soundrom.name));
 	soundrom.address = address;
 	return(SUCCESS);
 
@@ -64,7 +67,7 @@ void soundrom_load(UINT32 address, const
 	soundrom.address = address;
 }
 
-void soundrom_loadex(BYTE sw, const char *primary) {
+void soundrom_loadex(UINT sw, const char *primary) {
 
 	if (sw < 4) {
 		soundrom_load((0xc8000 + ((UINT32)sw << 14)), primary);