Merge from trunk

This commit is contained in:
SarahW 2019-04-18 20:46:38 +01:00
commit 50e7de5214
282 changed files with 51494 additions and 22451 deletions

View file

@ -986,6 +986,14 @@ int loadbios()
fclose(f);
biosmask = 0x1ffff;
return 1;
case ROM_FIC_VA503P:
f = romfopen("fic_va503p/je4333.bin","rb");
if (!f) break;
romfread(rom, 0x20000, 1, f);
fclose(f);
biosmask = 0x1ffff;
return 1;
}
printf("Failed to load ROM!\n");
if (f) fclose(f);