From 1e12d9fe38480c78b9a60f7425a80e9837943a94 Mon Sep 17 00:00:00 2001
From: Abdessamad Derraz <3028866+Abdess@users.noreply.github.com>
Date: Mon, 9 Nov 2026 17:40:00 +0100
Subject: [PATCH] feat: group the first-found BIOS lists

Each list read at the profile's pin, every member required: true where
the code needs one of the set, the order left in priority.

- yabause, yabasanshiro, kronos: libretro.c tries saturn_bios.bin,
  sega_101.bin, mpr-17933.bin (yabause 1035-1049, yabasanshiro
  1048-1071, kronos 1619-1638 after kronos/saturn_bios.bin). kronos
  also reads saturn_bios.bin at the system root, now its own entry.
  yabasanshiro refuses the game with no file even under forced HLE
  (1064-1071), so its hle_fallback is gone.
- yabadabadoo: bios_for_region (libretro.c:262-284) takes any of the
  three in an order the disc region picks. One group, no priority:
  region keeps that order, no single rank would be true.
- ymir libretro: kBiosFilenames (libretro.cpp:305-309), region first,
  else the first found, no game without one (1231-1236).
- duckstation: FindBIOSImageInDirectory (bios.cpp:397-450) keeps any
  image of the right size, a region mismatch only warns: one set.
- picodrive: find_bios walks one list per disc region
  (libretro.c:1272-1336), three groups.
- px68k: BIOSFILE then cgrom.dat or cgrom.tmp (libretro.c:984-1032).
- px68k-sdl: BIOSFILE and FONTFILE lists (winx68k.cpp:277-331).
- numero: ti83se, ti83plus, ti83 (libretronew.cpp:575-594), no ROM
  leaves a blank screen.
- freechaf: sl90025 then sl31253, HLE without either
  (libretro.c:186-199), optional set.
- pcsx1: scph1001, scph5501, scph7001 then any scph* (libretro.c:1229),
  HLE without, optional set.
- odin: three boot ROMs inside hikaru.zip.
---
 emulators/duckstation.yml  | 309 +++++++++++++++++++++++++------------
 emulators/freechaf.yml     |   2 +
 emulators/kronos.yml       |  23 ++-
 emulators/numero.yml       |   9 +-
 emulators/odin.yml         |   9 +-
 emulators/pcsx1.yml        |   3 +
 emulators/picodrive.yml    |  30 ++--
 emulators/px68k-sdl.yml    |  20 ++-
 emulators/px68k.yml        |  16 +-
 emulators/yabadabadoo.yml  |   7 +-
 emulators/yabasanshiro.yml |  16 +-
 emulators/yabause.yml      |   7 +-
 emulators/ymir.yml         |   5 +-
 13 files changed, 311 insertions(+), 145 deletions(-)

diff --git a/emulators/duckstation.yml b/emulators/duckstation.yml
index b457e9363..b4c67cd73 100644
--- a/emulators/duckstation.yml
+++ b/emulators/duckstation.yml
@@ -81,7 +81,8 @@ files:
     standalone_path: "bios/scph1000.bin"
     description: "SCPH-1000, DTL-H1000 (v1.0)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "239665b1a3dade1b5a52c06338011044"
     region_check: true
     fast_boot: Type1
@@ -92,7 +93,8 @@ files:
     standalone_path: "bios/scph1001.bin"
     description: "SCPH-1001, 5003, DTL-H1201, H3001 (v2.2 12-04-95 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "924e392ed05558ffdb115408c263dccf"
     region_check: false
     fast_boot: Type1
@@ -103,7 +105,8 @@ files:
     standalone_path: "bios/scph1002a.bin"
     description: "SCPH-1002, DTL-H1002 (v2.0 05-10-95 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "54847e693405ffeb0359c6287434cbef"
     region_check: false
     fast_boot: Type1
@@ -114,7 +117,8 @@ files:
     standalone_path: "bios/scph1002b.bin"
     description: "SCPH-1002, DTL-H1102 (v2.1 07-17-95 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "417b34706319da7cf001e76e40136c23"
     region_check: false
     fast_boot: Type1
@@ -125,7 +129,8 @@ files:
     standalone_path: "bios/scph1002c.bin"
     description: "SCPH-1002, DTL-H1202, H3002 (v2.2 12-04-95 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "e2110b8a2b97a8e0b857a45d32f7e187"
     region_check: false
     fast_boot: Type1
@@ -136,7 +141,8 @@ files:
     standalone_path: "bios/dtlh1100.bin"
     description: "DTL-H1100 (v2.2 03-06-96 D)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "ca5cfc321f916756e3f0effbfaeba13b"
     region_check: true
     fast_boot: Type1
@@ -147,7 +153,8 @@ files:
     standalone_path: "bios/scph3000.bin"
     description: "SCPH-3000, DTL-H1000H (v1.1 01-22-95)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "849515939161e62f6b866f6853006780"
     region_check: true
     fast_boot: Type1
@@ -158,7 +165,8 @@ files:
     standalone_path: "bios/scph1001_v20.bin"
     description: "SCPH-1001, DTL-H1001 (v2.0 05-07-95 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "dc2b9bf8da62ec93e868cfd29f0d067d"
     region_check: false
     fast_boot: Type1
@@ -169,7 +177,8 @@ files:
     standalone_path: "bios/scph3500.bin"
     description: "SCPH-3500 (v2.1 07-17-95 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "cba733ceeff5aef5c32254f1d617fa62"
     region_check: true
     fast_boot: Type1
@@ -180,7 +189,8 @@ files:
     standalone_path: "bios/scph1001_v21.bin"
     description: "SCPH-1001, DTL-H1101 (v2.1 07-17-95 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "da27e8b6dab242d8f91a9b25d80c63b8"
     region_check: false
     fast_boot: Type1
@@ -191,7 +201,8 @@ files:
     standalone_path: "bios/scph5000.bin"
     description: "SCPH-5000, DTL-H1200, H3000 (v2.2 12-04-95 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "57a06303dfa9cf9351222dfcbb4a29d9"
     region_check: true
     fast_boot: Type1
@@ -202,6 +213,7 @@ files:
     standalone_path: "bios/scph5500.bin"
     description: "SCPH-5500 (v3.0 09-09-96 J)"
     region: [japan]
+    group: ps-bios
     required: true
     md5: "8dd7d5296a650fac7319bce665a6a53c"
     region_check: true
@@ -213,6 +225,7 @@ files:
     standalone_path: "bios/scph5501.bin"
     description: "SCPH-5501, 5503, 7003 (v3.0 11-18-96 A)"
     region: [north-america, latin-america]
+    group: ps-bios
     required: true
     md5: "490f666e1afb15b7362b406ed1cea246"
     region_check: false
@@ -224,6 +237,7 @@ files:
     standalone_path: "bios/scph5502.bin"
     description: "SCPH-5502, 5552 (v3.0 01-06-97 E)"
     region: [europe, oceania]
+    group: ps-bios
     required: true
     md5: "32736f17079d0b2b7024407c39bd3050"
     region_check: false
@@ -235,7 +249,8 @@ files:
     standalone_path: "bios/scph7000.bin"
     description: "SCPH-7000, 7500, 9000 (v4.0 08-18-97 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "8e4c14f567745eff2f0408c8129f72a6"
     region_check: true
     fast_boot: Type1
@@ -246,7 +261,8 @@ files:
     standalone_path: "bios/scph7000w.bin"
     description: "SCPH-7000W (v4.1 11-14-97 A)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "b84be139db3ee6cbd075630aa20a6553"
     region_check: false
     fast_boot: Type1
@@ -257,7 +273,8 @@ files:
     standalone_path: "bios/scph7001.bin"
     description: "SCPH-7001, 7501, 7503, 9001, 9003, 9903 (v4.1 12-16-97 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "1e68c231d0896b7eadcad1d7d8e76129"
     region_check: false
     fast_boot: Type1
@@ -268,7 +285,8 @@ files:
     standalone_path: "bios/scph7002.bin"
     description: "SCPH-7002, 7502, 9002 (v4.1 12-16-97 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "b9d9a0286c33dc6b7237bb13cd46fdee"
     region_check: false
     fast_boot: Type1
@@ -279,7 +297,8 @@ files:
     standalone_path: "bios/scph100.bin"
     description: "SCPH-100 (v4.3 03-11-00 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "8abc1b549a4a80954addc48ef02c4521"
     region_check: true
     fast_boot: Type1
@@ -290,7 +309,8 @@ files:
     standalone_path: "bios/scph101_v44.bin"
     description: "SCPH-101 (v4.4 03-24-00 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "9a09ab7e49b422c007e6d54d7c49b965"
     region_check: false
     fast_boot: Type1
@@ -301,7 +321,8 @@ files:
     standalone_path: "bios/scph101_v45.bin"
     description: "SCPH-101 (v4.5 05-25-00 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "6e3735ff4c7dc899ee98981385f6f3d0"
     region_check: false
     fast_boot: Type1
@@ -312,7 +333,8 @@ files:
     standalone_path: "bios/scph102_v44.bin"
     description: "SCPH-102 (v4.4 03-24-00 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "b10f5e0e3d9eb60e5159690680b1e774"
     region_check: true
     fast_boot: Type1
@@ -323,7 +345,8 @@ files:
     standalone_path: "bios/scph102_v45.bin"
     description: "SCPH-102 (v4.5 05-25-00 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "de93caec13d1a141a40a79f5c86168d6"
     region_check: true
     fast_boot: Type1
@@ -334,7 +357,8 @@ files:
     standalone_path: "bios/scph1000r.bin"
     description: "SCPH-1000R (v4.5 05-25-00 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "476d68a94ccec3b9c8303bbd1daf2810"
     region_check: true
     fast_boot: Type1
@@ -349,7 +373,8 @@ files:
     standalone_path: "bios/ps2_scph18000.bin"
     description: "PS2, SCPH-18000 (v5.0 10-27-00 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "d8f485717a5237285e4d7c5f881b7f32"
     region_check: true
     fast_boot: Type2
@@ -360,7 +385,8 @@ files:
     standalone_path: "bios/ps2_scph30003.bin"
     description: "PS2, SCPH-30003 (v5.0 09-02-00 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "71f50ef4f4e17c163c78908e16244f7d"
     region_check: true
     fast_boot: Type2
@@ -371,7 +397,8 @@ files:
     standalone_path: "bios/ps2_dtlh10000_0117.bin"
     description: "PS2, DTL-H10000 (v5.0 01/17/00 T)"
     region: [world]
-    required: false
+    group: ps-bios
+    required: true
     md5: "32f2e4d5ff5ee11072a6bc45530f5765"
     region_check: true
     fast_boot: Type2
@@ -382,7 +409,8 @@ files:
     standalone_path: "bios/ps2_scph10000_0117.bin"
     description: "PS2, SCPH-10000 (v5.0 01/17/00 T)"
     region: [world]
-    required: false
+    group: ps-bios
+    required: true
     md5: "acf4730ceb38ac9d8c7d8e21f2614600"
     region_check: true
     fast_boot: Type2
@@ -393,7 +421,8 @@ files:
     standalone_path: "bios/ps2_dtlh10000_0217.bin"
     description: "PS2, DTL-H10000 (v5.0 02/17/00 T)"
     region: [world]
-    required: false
+    group: ps-bios
+    required: true
     md5: "acf9968c8f596d2b15f42272082513d1"
     region_check: true
     fast_boot: Type2
@@ -404,7 +433,8 @@ files:
     standalone_path: "bios/ps2_scph10000_15000.bin"
     description: "PS2, SCPH-10000/SCPH-15000 (v5.0 02/17/00 T)"
     region: [world]
-    required: false
+    group: ps-bios
+    required: true
     md5: "b1459d7446c69e3e97e6ace3ae23dd1c"
     region_check: true
     fast_boot: Type2
@@ -415,7 +445,8 @@ files:
     standalone_path: "bios/ps2_dtlh10000_0224.bin"
     description: "PS2, DTL-H10000 (v5.0 02/24/00 T)"
     region: [world]
-    required: false
+    group: ps-bios
+    required: true
     md5: "d3f1853a16c2ec18f3cd1ae655213308"
     region_check: true
     fast_boot: Type2
@@ -426,7 +457,8 @@ files:
     standalone_path: "bios/ps2_dtlh30001.bin"
     description: "PS2, DTL-H30001 (v5.0 07/27/00 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "63e6fd9b3c72e0d7b920e80cf76645cd"
     region_check: true
     fast_boot: Type2
@@ -437,7 +469,8 @@ files:
     standalone_path: "bios/ps2_scph30001_0727.bin"
     description: "PS2, SCPH-30001 (v5.0 07/27/00 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "a20c97c02210f16678ca3010127caf36"
     region_check: true
     fast_boot: Type2
@@ -448,7 +481,8 @@ files:
     standalone_path: "bios/ps2_scph30001_0902.bin"
     description: "PS2, SCPH-30001 (v5.0 09/02/00 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "8db2fbbac7413bf3e7154c1e0715e565"
     region_check: true
     fast_boot: Type2
@@ -459,7 +493,8 @@ files:
     standalone_path: "bios/ps2_dtlh30002.bin"
     description: "PS2, DTL-H30002 (v5.0 09/02/00 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "91c87cb2f2eb6ce529a2360f80ce2457"
     region_check: true
     fast_boot: Type2
@@ -470,7 +505,8 @@ files:
     standalone_path: "bios/ps2_dtlh30102_0902.bin"
     description: "PS2, DTL-H30102 (v5.0 09/02/00 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "3016b3dd42148a67e2c048595ca4d7ce"
     region_check: true
     fast_boot: Type2
@@ -481,7 +517,8 @@ files:
     standalone_path: "bios/ps2_scph30002_0902.bin"
     description: "PS2, SCPH-30002/SCPH-30003/SCPH-30004 (v5.0 09/02/00 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "b7fa11e87d51752a98b38e3e691cbf17"
     region_check: true
     fast_boot: Type2
@@ -492,7 +529,8 @@ files:
     standalone_path: "bios/ps2_scph18000_gh003.bin"
     description: "PS2, SCPH-18000 (GH-003) (v5.0 10/27/00 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "f63bc530bd7ad7c026fcd6f7bd0d9525"
     region_check: true
     fast_boot: Type2
@@ -503,7 +541,8 @@ files:
     standalone_path: "bios/ps2_scph18000_gh008.bin"
     description: "PS2, SCPH-18000 (GH-008) (v5.0 10/27/00 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "cee06bd68c333fc5768244eae77e4495"
     region_check: true
     fast_boot: Type2
@@ -514,7 +553,8 @@ files:
     standalone_path: "bios/ps2_dtlh30101.bin"
     description: "PS2, DTL-H30101 (v5.0 12/28/00 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "0bf988e9c7aaa4c051805b0fa6eb3387"
     region_check: true
     fast_boot: Type2
@@ -525,7 +565,8 @@ files:
     standalone_path: "bios/ps2_scph30001_35001.bin"
     description: "PS2, SCPH-30001/SCPH-35001 (v5.0 12/28/00 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "8accc3c49ac45f5ae2c5db0adc854633"
     region_check: true
     fast_boot: Type2
@@ -536,7 +577,8 @@ files:
     standalone_path: "bios/ps2_dtlh30102_1228.bin"
     description: "PS2, DTL-H30102 (v5.0 12/28/00 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "6f9a6feb749f0533aaae2cc45090b0ed"
     region_check: true
     fast_boot: Type2
@@ -547,7 +589,8 @@ files:
     standalone_path: "bios/ps2_scph30002_1228.bin"
     description: "PS2, SCPH-30002/SCPH-30003/SCPH-30004/SCHP-35002/SCPH-35003/SCPH-35004 (v5.0 12/28/00 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "838544f12de9b0abc90811279ee223c8"
     region_check: true
     fast_boot: Type2
@@ -558,7 +601,8 @@ files:
     standalone_path: "bios/ps2_dtlh30000.bin"
     description: "PS2, DTL-H30000 (v5.0 01/18/01 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "bb6bbc850458fff08af30e969ffd0175"
     region_check: true
     fast_boot: Type2
@@ -569,7 +613,8 @@ files:
     standalone_path: "bios/ps2_scph30000_35000.bin"
     description: "PS2, SCPH-30000/SCPH-35000 (v5.0 01/18/01 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "815ac991d8bc3b364696bead3457de7d"
     region_check: true
     fast_boot: Type2
@@ -580,7 +625,8 @@ files:
     standalone_path: "bios/ps2_scph30001r_0427.bin"
     description: "PS2, SCPH-30001R (v5.0 04/27/01 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "b107b5710042abe887c0f6175f6e94bb"
     region_check: true
     fast_boot: Type2
@@ -591,7 +637,8 @@ files:
     standalone_path: "bios/ps2_scph30000_0427.bin"
     description: "PS2, SCPH-30000 (v5.0 04/27/01 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "ab55cceea548303c22c72570cfd4dd71"
     region_check: true
     fast_boot: Type2
@@ -602,7 +649,8 @@ files:
     standalone_path: "bios/ps2_scph30001r_0704.bin"
     description: "PS2, SCPH-30001R (v5.0 07/04/01 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "18bcaadb9ff74ed3add26cdf709fff2e"
     region_check: true
     fast_boot: Type2
@@ -613,7 +661,8 @@ files:
     standalone_path: "bios/ps2_scph30002r_0704.bin"
     description: "PS2, SCPH-30002R/SCPH-30003R/SCPH-30004R (v5.0 07/04/01 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "491209dd815ceee9de02dbbc408c06d6"
     region_check: true
     fast_boot: Type2
@@ -624,7 +673,8 @@ files:
     standalone_path: "bios/ps2_scph30001r_1004.bin"
     description: "PS2, SCPH-30001R (v5.0 10/04/01 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "7200a03d51cacc4c14fcdfdbc4898431"
     region_check: true
     fast_boot: Type2
@@ -635,7 +685,8 @@ files:
     standalone_path: "bios/ps2_scph30002r_1004.bin"
     description: "PS2, SCPH-30002R/SCPH-30003R/SCPH-30004R (v5.0 10/04/01 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "8359638e857c8bc18c3c18ac17d9cc3c"
     region_check: true
     fast_boot: Type2
@@ -646,7 +697,8 @@ files:
     standalone_path: "bios/ps2_scph30005r.bin"
     description: "PS2, SCPH-30005R/SCPH-30006R/SCPH-30007R (v5.0 07/30/01 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "352d2ff9b3f68be7e6fa7e6dd8389346"
     region_check: true
     fast_boot: Type2
@@ -657,7 +709,8 @@ files:
     standalone_path: "bios/ps2_scph39001.bin"
     description: "PS2, SCPH-39001 (v5.0 02/07/02 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "d5ce2c7d119f563ce04bc04dbc3a323e"
     region_check: true
     fast_boot: Type2
@@ -668,7 +721,8 @@ files:
     standalone_path: "bios/ps2_scph39002.bin"
     description: "PS2, SCPH-39002/SCPH-39003/SCPH-39004 (v5.0 03/19/02 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "0d2228e6fd4fb639c9c39d077a9ec10c"
     region_check: true
     fast_boot: Type2
@@ -679,7 +733,8 @@ files:
     standalone_path: "bios/ps2_scph37000_39000.bin"
     description: "PS2, SCPH-37000/SCPH-39000 (v5.0 04/26/02 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "72da56fccb8fcd77bba16d1b6f479914"
     region_check: true
     fast_boot: Type2
@@ -690,7 +745,8 @@ files:
     standalone_path: "bios/ps2_scph39008.bin"
     description: "PS2, SCPH-39008 (v5.0 04/26/02 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "5b1f47fbeb277c6be2fccdd6344ff2fd"
     region_check: true
     fast_boot: Type2
@@ -701,7 +757,8 @@ files:
     standalone_path: "bios/ps2_scph39005.bin"
     description: "PS2, SCPH-39005/SCPH-39006/SCPH-39007 (v5.0 04/26/02 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "315a4003535dfda689752cb25f24785c"
     region_check: true
     fast_boot: Type2
@@ -712,7 +769,8 @@ files:
     standalone_path: "bios/ps2_dtlh50000.bin"
     description: "PS2, DTL-H50000 (v5.0 02/06/03 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "54ecde087258557e2ddb5c3ddb004028"
     region_check: true
     fast_boot: Type2
@@ -723,7 +781,8 @@ files:
     standalone_path: "bios/ps2_scph50000_55000.bin"
     description: "PS2, SCPH-50000/SCPH-55000 (v5.0 02/06/03 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "312ad4816c232a9606e56f946bc0678a"
     region_check: true
     fast_boot: Type2
@@ -734,7 +793,8 @@ files:
     standalone_path: "bios/ps2_dtlh50002.bin"
     description: "PS2, DTL-H50002 (v5.0 02/27/03 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "666018ffec65c5c7e04796081295c6c7"
     region_check: true
     fast_boot: Type2
@@ -745,7 +805,8 @@ files:
     standalone_path: "bios/ps2_scph50002_0227.bin"
     description: "PS2, SCPH-50002/SCPH-50003/SCPH-50004 (v5.0 02/27/03 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "6e69920fa6eef8522a1d688a11e41bc6"
     region_check: true
     fast_boot: Type2
@@ -756,7 +817,8 @@ files:
     standalone_path: "bios/ps2_dtlh50001_0325.bin"
     description: "PS2, DTL-H50001 (v5.0 03/25/03 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "eb960de68f0c0f7f9fa083e9f79d0360"
     region_check: true
     fast_boot: Type2
@@ -767,7 +829,8 @@ files:
     standalone_path: "bios/ps2_scph50001_0325.bin"
     description: "PS2, SCPH-50001 (v5.0 03/25/03 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "8aa12ce243210128c5074552d3b86251"
     region_check: true
     fast_boot: Type2
@@ -778,7 +841,8 @@ files:
     standalone_path: "bios/ps2_dtlh50009.bin"
     description: "PS2, DTL-H50009 (v5.0 02/24/03 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "240d4c5ddd4b54069bdc4a3cd2faf99d"
     region_check: true
     fast_boot: Type2
@@ -789,7 +853,8 @@ files:
     standalone_path: "bios/ps2_desr5000.bin"
     description: "PS2, DESR-5000/DESR-5100/DESR-7000/DESR-7100 (v5.0 10/28/03 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "1c6cd089e6c83da618fbf2a081eb4888"
     region_check: true
     fast_boot: Type2
@@ -800,7 +865,8 @@ files:
     standalone_path: "bios/ps2_scph55000_0623.bin"
     description: "PS2, SCPH-55000 (v5.0 06/23/03 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "463d87789c555a4a7604e97d7db545d1"
     region_check: true
     fast_boot: Type2
@@ -811,7 +877,8 @@ files:
     standalone_path: "bios/ps2_dtlh50001_0623.bin"
     description: "PS2, DTL-H50001 (v5.0 06/23/03 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "ab9d49ad40ae49f19856ad187777b1b3"
     region_check: true
     fast_boot: Type2
@@ -822,7 +889,8 @@ files:
     standalone_path: "bios/ps2_scph50001_0623.bin"
     description: "PS2, SCPH-50001/SCPH-50010 (v5.0 06/23/03 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "35461cecaa51712b300b2d6798825048"
     region_check: true
     fast_boot: Type2
@@ -833,7 +901,8 @@ files:
     standalone_path: "bios/ps2_scph50002_0623.bin"
     description: "PS2, SCPH-50002/SCPH-50003/SCPH-50004 (v5.0 06/23/03 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "bd6415094e1ce9e05daabe85de807666"
     region_check: true
     fast_boot: Type2
@@ -844,7 +913,8 @@ files:
     standalone_path: "bios/ps2_scph50006.bin"
     description: "PS2, SCPH-50006/SCPH-50007 (v5.0 06/23/03 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "2e70ad008d4ec8549aada8002fdf42fb"
     region_check: true
     fast_boot: Type2
@@ -855,7 +925,8 @@ files:
     standalone_path: "bios/ps2_scph50005.bin"
     description: "PS2, SCPH-50005 (v5.0 06/23/03 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "50d5b97b57d8c9b6534adcb46c2027d4"
     region_check: true
     fast_boot: Type2
@@ -866,7 +937,8 @@ files:
     standalone_path: "bios/ps2_scph50008.bin"
     description: "PS2, SCPH-50008 (v5.0 06/23/03 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "b53d51edc7fc086685e31b811dc32aad"
     region_check: true
     fast_boot: Type2
@@ -877,7 +949,8 @@ files:
     standalone_path: "bios/ps2_scph50009.bin"
     description: "PS2, SCPH-50009 (v5.0 06/23/03 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "1b6e631b536247756287b916f9396872"
     region_check: true
     fast_boot: Type2
@@ -888,7 +961,8 @@ files:
     standalone_path: "bios/ps2_scph50000_0822.bin"
     description: "PS2, SCPH-50000 (v5.0 08/22/03 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "00da1b177096cfd2532c8fa22b43e667"
     region_check: true
     fast_boot: Type2
@@ -899,7 +973,8 @@ files:
     standalone_path: "bios/ps2_scph50004_0822.bin"
     description: "PS2, SCPH-50004 (v5.0 08/22/03 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "afde410bd026c16be605a1ae4bd651fd"
     region_check: true
     fast_boot: Type2
@@ -910,7 +985,8 @@ files:
     standalone_path: "bios/ps2_scph50011.bin"
     description: "PS2, SCPH-50011 (v5.0 03/29/04 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "81f4336c1de607dd0865011c0447052e"
     region_check: true
     fast_boot: Type2
@@ -921,7 +997,8 @@ files:
     standalone_path: "bios/ps2_scph70000.bin"
     description: "PS2, SCPH-70000 (v5.0 06/14/04 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "0eee5d1c779aa50e94edd168b4ebf42e"
     region_check: true
     fast_boot: Type2
@@ -932,7 +1009,8 @@ files:
     standalone_path: "bios/ps2_scph70001.bin"
     description: "PS2, SCPH-70001/SCPH-70011/SCPH-70012 (v5.0 06/14/04 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "d333558cc14561c1fdc334c75d5f37b7"
     region_check: true
     fast_boot: Type2
@@ -943,7 +1021,8 @@ files:
     standalone_path: "bios/ps2_scph70002.bin"
     description: "PS2, SCPH-70002/SCPH-70003/SCPH-70004/SCPH-70008 (v5.0 06/14/04 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "dc752f160044f2ed5fc1f4964db2a095"
     region_check: true
     fast_boot: Type2
@@ -954,7 +1033,8 @@ files:
     standalone_path: "bios/ps2_scph70002_alt.bin"
     description: "PS2, SCPH-70002 (v5.0 06/14/04 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "7ebb4fc5eab6f79a27d76ac9aad392b2"
     region_check: true
     fast_boot: Type2
@@ -965,7 +1045,8 @@ files:
     standalone_path: "bios/ps2_dtlh70002.bin"
     description: "PS2, DTL-H70002 (v5.0 06/14/04 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "63ead1d74893bf7f36880af81f68a82d"
     region_check: true
     fast_boot: Type2
@@ -976,7 +1057,8 @@ files:
     standalone_path: "bios/ps2_scph70005.bin"
     description: "PS2, SCPH-70005/SCPH-70006/SCPH-70007 (v5.0 06/14/04 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "3e3e030c0f600442fa05b94f87a1e238"
     region_check: true
     fast_boot: Type2
@@ -987,7 +1069,8 @@ files:
     standalone_path: "bios/ps2_desr5500.bin"
     description: "PS2, DESR-5500/DESR-5700/DESR-7500/DESR-7700 (v5.0 09/17/04 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "1ad977bb539fc9448a08ab276a836bbc"
     region_check: true
     fast_boot: Type2
@@ -998,7 +1081,8 @@ files:
     standalone_path: "bios/ps2_dtlh75000.bin"
     description: "PS2, DTL-H75000 (v5.0 06/20/05 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "bf0078ba5e19d57eae18047407f3b6e5"
     region_check: true
     fast_boot: Type2
@@ -1009,7 +1093,8 @@ files:
     standalone_path: "bios/ps2_scph75000.bin"
     description: "PS2, SCPH-75000 (v5.0 06/20/05 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "eb4f40fcf4911ede39c1bbfe91e7a89a"
     region_check: true
     fast_boot: Type2
@@ -1020,7 +1105,8 @@ files:
     standalone_path: "bios/ps2_dtlh75000a.bin"
     description: "PS2, DTL-H75000A (v5.0 06/20/05 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "9959ad7a8685cad66206e7752ca23f8b"
     region_check: true
     fast_boot: Type2
@@ -1031,7 +1117,8 @@ files:
     standalone_path: "bios/ps2_scph75001.bin"
     description: "PS2, SCPH-75001/SCPH-75010 (v5.0 06/20/05 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "929a14baca1776b00869f983aa6e14d2"
     region_check: true
     fast_boot: Type2
@@ -1042,7 +1129,8 @@ files:
     standalone_path: "bios/ps2_scph75002.bin"
     description: "PS2, SCPH-75002/SCPH-75003/SCPH-75004/SCPH-75008 (v5.0 06/20/05 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "573f7d4a430c32b3cc0fd0c41e104bbd"
     region_check: true
     fast_boot: Type2
@@ -1053,7 +1141,8 @@ files:
     standalone_path: "bios/ps2_scph75006.bin"
     description: "PS2, SCPH-75006 (v5.0 06/20/05 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "df63a604e8bff5b0599bd1a6c2721bd0"
     region_check: true
     fast_boot: Type2
@@ -1064,7 +1153,8 @@ files:
     standalone_path: "bios/ps2_scph77000.bin"
     description: "PS2, SCPH-77000 (v5.0 02/10/06 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "5b1ba4bb914406fae75ab8e38901684d"
     region_check: true
     fast_boot: Type2
@@ -1075,7 +1165,8 @@ files:
     standalone_path: "bios/ps2_scph77001.bin"
     description: "PS2, SCPH-77001/SCPH-77010 (v5.0 02/10/06 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "cb801b7920a7d536ba07b6534d2433ca"
     region_check: true
     fast_boot: Type2
@@ -1086,7 +1177,8 @@ files:
     standalone_path: "bios/ps2_scph77002.bin"
     description: "PS2, SCPH-77002/SCPH-77003/SCPH-77004/SCPH-77008 (v5.0 02/10/06 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "af60e6d1a939019d55e5b330d24b1c25"
     region_check: true
     fast_boot: Type2
@@ -1097,7 +1189,8 @@ files:
     standalone_path: "bios/ps2_scph77006.bin"
     description: "PS2, SCPH-77006/SCPH-77007 (v5.0 02/10/06 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "549a66d0c698635ca9fa3ab012da7129"
     region_check: true
     fast_boot: Type2
@@ -1108,7 +1201,8 @@ files:
     standalone_path: "bios/ps2_dtlh90000_j.bin"
     description: "PS2, DTL-H90000 (v5.0 09/05/06 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "5e2014472c88f74f7547d8c2c60eca45"
     region_check: true
     fast_boot: Type2
@@ -1119,7 +1213,8 @@ files:
     standalone_path: "bios/ps2_scph79000_90000.bin"
     description: "PS2, SCPH-79000/SCPH-90000 (v5.0 09/05/06 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "5de9d0d730ff1e7ad122806335332524"
     region_check: true
     fast_boot: Type2
@@ -1130,7 +1225,8 @@ files:
     standalone_path: "bios/ps2_dtlh90000_a.bin"
     description: "PS2, DTL-H90000 (v5.0 09/05/06 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "21fe4cad111f7dc0f9af29477057f88d"
     region_check: true
     fast_boot: Type2
@@ -1141,7 +1237,8 @@ files:
     standalone_path: "bios/ps2_scph79001_90001.bin"
     description: "PS2, SCPH-79001/SCPH-79010/SCPH-90001 (v5.0 09/05/06 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "40c11c063b3b9409aa5e4058e984e30c"
     region_check: true
     fast_boot: Type2
@@ -1152,7 +1249,8 @@ files:
     standalone_path: "bios/ps2_scph79002_90002.bin"
     description: "PS2, SCPH-79002/SCPH-79003/SCPH-79004/SCPH-79008/SCPH-90002/SCPH-90003/SCPH-90004 (v5.0 09/05/06 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "80bbb237a6af9c611df43b16b930b683"
     region_check: true
     fast_boot: Type2
@@ -1163,7 +1261,8 @@ files:
     standalone_path: "bios/ps2_scph79006_90006.bin"
     description: "PS2, SCPH-79006/SCPH-79007/SCPH-90006/SCPH-90007 (v5.0 09/05/06 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "c37bce95d32b2be480f87dd32704e664"
     region_check: true
     fast_boot: Type2
@@ -1174,7 +1273,8 @@ files:
     standalone_path: "bios/ps2_scph90000_0220.bin"
     description: "PS2, SCPH-90000 (v5.0 02/20/08 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "80ac46fa7e77b8ab4366e86948e54f83"
     region_check: true
     fast_boot: Type2
@@ -1185,7 +1285,8 @@ files:
     standalone_path: "bios/ps2_scph90001_0220.bin"
     description: "PS2, SCPH-90001/SCPH-90010 (v5.0 02/20/08 A)"
     region: [north-america, latin-america]
-    required: false
+    group: ps-bios
+    required: true
     md5: "21038400dc633070a78ad53090c53017"
     region_check: true
     fast_boot: Type2
@@ -1196,7 +1297,8 @@ files:
     standalone_path: "bios/ps2_scph90002_0220.bin"
     description: "PS2, SCPH-90002/SCPH-90003/SCPH-90004/SCPH-90008 (v5.0 02/20/08 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "dc69f0643a3030aaa4797501b483d6c4"
     region_check: true
     fast_boot: Type2
@@ -1207,7 +1309,8 @@ files:
     standalone_path: "bios/ps2_scph90005_0220.bin"
     description: "PS2, SCPH-90005/SCPH-90006/SCPH-90007 (v5.0 02/20/08 J)"
     region: [japan]
-    required: false
+    group: ps-bios
+    required: true
     md5: "30d56e79d89fbddf10938fa67fe3f34e"
     region_check: true
     fast_boot: Type2
@@ -1218,7 +1321,8 @@ files:
     standalone_path: "bios/ps2_kdl22px300.bin"
     description: "PS2, KDL-22PX300 (v5.0 04/15/10 E)"
     region: [europe, oceania]
-    required: false
+    group: ps-bios
+    required: true
     md5: "93ea3bcee4252627919175ff1b16a1d9"
     region_check: true
     fast_boot: Type2
@@ -1232,7 +1336,8 @@ files:
     standalone_path: "bios/openbios.bin"
     description: "OpenBIOS"
     region: [world]
-    required: false
+    group: ps-bios
+    required: true
     md5: null
     region_check: false
     fast_boot: unsupported
diff --git a/emulators/freechaf.yml b/emulators/freechaf.yml
index 527674410..5b8681430 100644
--- a/emulators/freechaf.yml
+++ b/emulators/freechaf.yml
@@ -40,6 +40,7 @@ notes: |
 files:
   - name: "sl31253.bin"
     system: fairchild-channelf
+    group: psu1
     priority: 2
     required: false
     hle_fallback: true
@@ -55,6 +56,7 @@ files:
 
   - name: "sl90025.bin"
     system: fairchild-channelf
+    group: psu1
     priority: 1
     required: false
     hle_fallback: true
diff --git a/emulators/kronos.yml b/emulators/kronos.yml
index 3b8d90937..43b4fb0f4 100644
--- a/emulators/kronos.yml
+++ b/emulators/kronos.yml
@@ -55,20 +55,32 @@ files:
   - name: "saturn_bios.bin"
     path: "kronos/saturn_bios.bin"
     system: sega-saturn
+    group: saturn-bios
     priority: 1
     required: true
     size: 524288
     validation: [size]
     note: "Primary Saturn BIOS. Any region accepted. Searched in kronos/ subdir first."
-    source_ref: "source yabause/src/libretro/libretro.c:1619-1623"
+    source_ref: "source yabause/src/libretro/libretro.c:1619-1620"
+
+  - name: "saturn_bios.bin"
+    system: sega-saturn
+    group: saturn-bios
+    priority: 2
+    required: true
+    size: 524288
+    validation: [size]
+    note: "The same name in the system directory, read when kronos/ holds none."
+    source_ref: "source yabause/src/libretro/libretro.c:1623-1624"
 
   # -----------------------------------------------------------
   # Saturn BIOS - Japan v1.01 (fallback)
   # -----------------------------------------------------------
   - name: "sega_101.bin"
     system: sega-saturn
-    priority: 2
-    required: false
+    group: saturn-bios
+    priority: 3
+    required: true
     size: 524288
     validation: [size]
     note: "Saturn BIOS v1.01 (Japan). Fallback if saturn_bios.bin missing."
@@ -79,8 +91,9 @@ files:
   # -----------------------------------------------------------
   - name: "mpr-17933.bin"
     system: sega-saturn
-    priority: 3
-    required: false
+    group: saturn-bios
+    priority: 4
+    required: true
     size: 524288
     validation: [size]
     note: "Saturn BIOS (NA/EU). Last fallback for Saturn mode."
diff --git a/emulators/numero.yml b/emulators/numero.yml
index 41727febb..d750e5ab5 100644
--- a/emulators/numero.yml
+++ b/emulators/numero.yml
@@ -43,23 +43,26 @@ files:
   - name: "ti83se.rom"
     system: ti-83
     description: "TI-83 Plus Silver Edition ROM dump"
+    group: rom
     priority: 1
-    required: false
+    required: true
     source_ref: "source libnumero/libretro/libretronew.cpp:576-578"
     note: "Checked first. Recommended for largest storage capacity."
 
   - name: "ti83plus.rom"
     system: ti-83
     description: "TI-83 Plus ROM dump"
+    group: rom
     priority: 2
-    required: false
+    required: true
     source_ref: "source libnumero/libretro/libretronew.cpp:583-585"
     note: "Checked second, used if ti83se.rom is missing."
 
   - name: "ti83.rom"
     system: ti-83
     description: "TI-83 ROM dump"
+    group: rom
     priority: 3
-    required: false
+    required: true
     source_ref: "source libnumero/libretro/libretronew.cpp:591-593"
     note: "Checked last. Original TI-83 (non-Plus)."
diff --git a/emulators/odin.yml b/emulators/odin.yml
index a0b46e398..bfdf1ac9c 100644
--- a/emulators/odin.yml
+++ b/emulators/odin.yml
@@ -83,7 +83,8 @@ files:
   - name: "epr-23400a.ic94"
     archive: hikaru.zip
     system: sega-hikaru
-    required: false
+    group: boot-rom
+    required: true
     variant_group: "hikaru-bootrom"
     priority: 1
     size: 2097152
@@ -95,7 +96,8 @@ files:
   - name: "epr-23400.ic94"
     archive: hikaru.zip
     system: sega-hikaru
-    required: false
+    group: boot-rom
+    required: true
     variant_group: "hikaru-bootrom"
     priority: 2
     size: 2097152
@@ -107,7 +109,8 @@ files:
   - name: "epr-21904.ic94"
     archive: hikaru.zip
     system: sega-hikaru
-    required: false
+    group: boot-rom
+    required: true
     variant_group: "hikaru-bootrom"
     priority: 3
     size: 2097152
diff --git a/emulators/pcsx1.yml b/emulators/pcsx1.yml
index 6191bc337..bc4c8fbf2 100644
--- a/emulators/pcsx1.yml
+++ b/emulators/pcsx1.yml
@@ -25,6 +25,7 @@ notes: >
 files:
   - name: "scph1001.bin"
     description: "SCPH-1001 (v2.2 12-04-95 A)"
+    group: bios
     priority: 1
     required: false
     hle_fallback: true
@@ -37,6 +38,7 @@ files:
 
   - name: "scph5501.bin"
     description: "SCPH-5501 (v3.0 11-18-96 A)"
+    group: bios
     priority: 2
     required: false
     hle_fallback: true
@@ -49,6 +51,7 @@ files:
 
   - name: "scph7001.bin"
     description: "SCPH-7001 (v4.1 12-16-97 A)"
+    group: bios
     priority: 3
     required: false
     hle_fallback: true
diff --git a/emulators/picodrive.yml b/emulators/picodrive.yml
index 027f87c02..17d67015d 100644
--- a/emulators/picodrive.yml
+++ b/emulators/picodrive.yml
@@ -71,6 +71,7 @@ files:
     system: sega-megacd
     variant_group: "mega-cd-bios"
     region: [north-america, latin-america]
+    group: mega-cd-us
     priority: 1
     required: true
     size: 131072  # 128 KB (0x20000)
@@ -81,8 +82,9 @@ files:
     system: sega-megacd
     variant_group: "mega-cd-bios"
     region: [north-america, latin-america]
+    group: mega-cd-us
     priority: 2
-    required: false
+    required: true
     size: 131072
     note: "US Sega CD BIOS (March 1993). Second in US search order."
     source_ref: "source platform/libretro/libretro.c:1273"
@@ -91,8 +93,9 @@ files:
     system: sega-megacd
     variant_group: "mega-cd-bios"
     region: [north-america, latin-america]
+    group: mega-cd-us
     priority: 3
-    required: false
+    required: true
     size: 131072
     note: "US Sega CD Model 1 BIOS (October 1992). Third in US search order."
     source_ref: "source platform/libretro/libretro.c:1273"
@@ -101,8 +104,9 @@ files:
     system: sega-megacd
     variant_group: "mega-cd-bios"
     region: [north-america, latin-america]
+    group: mega-cd-us
     priority: 4
-    required: false
+    required: true
     size: 131072
     note: "US Sega CD BIOS (generic name). Last in US search order."
     source_ref: "source platform/libretro/libretro.c:1273"
@@ -114,6 +118,7 @@ files:
     system: sega-megacd
     variant_group: "mega-cd-bios"
     region: [europe, oceania]
+    group: mega-cd-eu
     priority: 1
     required: true
     size: 131072
@@ -124,8 +129,9 @@ files:
     system: sega-megacd
     variant_group: "mega-cd-bios"
     region: [europe, oceania]
+    group: mega-cd-eu
     priority: 2
-    required: false
+    required: true
     size: 131072
     note: "EU Mega CD Model 2 BIOS (March 1993). Second in EU search order."
     source_ref: "source platform/libretro/libretro.c:1276"
@@ -134,8 +140,9 @@ files:
     system: sega-megacd
     variant_group: "mega-cd-bios"
     region: [europe, oceania]
+    group: mega-cd-eu
     priority: 3
-    required: false
+    required: true
     size: 131072
     note: "EU Mega CD Model 1 BIOS (October 1992). Third in EU search order."
     source_ref: "source platform/libretro/libretro.c:1276"
@@ -144,8 +151,9 @@ files:
     system: sega-megacd
     variant_group: "mega-cd-bios"
     region: [europe, oceania]
+    group: mega-cd-eu
     priority: 4
-    required: false
+    required: true
     size: 131072
     note: "EU Mega CD BIOS (generic name). Last in EU search order."
     source_ref: "source platform/libretro/libretro.c:1276"
@@ -157,6 +165,7 @@ files:
     system: sega-megacd
     variant_group: "mega-cd-bios"
     region: [japan]
+    group: mega-cd-jp
     priority: 1
     required: true
     size: 131072
@@ -167,8 +176,9 @@ files:
     system: sega-megacd
     variant_group: "mega-cd-bios"
     region: [japan]
+    group: mega-cd-jp
     priority: 2
-    required: false
+    required: true
     size: 131072
     note: "JP Mega CD Model 1 BIOS (December 1991). Second in JP search order."
     source_ref: "source platform/libretro/libretro.c:1279"
@@ -177,8 +187,9 @@ files:
     system: sega-megacd
     variant_group: "mega-cd-bios"
     region: [japan]
+    group: mega-cd-jp
     priority: 3
-    required: false
+    required: true
     size: 131072
     note: "JP Mega CD Model 1 BIOS (November 1991). Third in JP search order."
     source_ref: "source platform/libretro/libretro.c:1279"
@@ -187,8 +198,9 @@ files:
     system: sega-megacd
     variant_group: "mega-cd-bios"
     region: [japan]
+    group: mega-cd-jp
     priority: 4
-    required: false
+    required: true
     size: 131072
     note: "JP Mega CD BIOS (generic name). Last in JP search order."
     source_ref: "source platform/libretro/libretro.c:1279"
diff --git a/emulators/px68k-sdl.yml b/emulators/px68k-sdl.yml
index c618d3473..eeee0254f 100644
--- a/emulators/px68k-sdl.yml
+++ b/emulators/px68k-sdl.yml
@@ -51,6 +51,7 @@ files:
   - name: "iplrom.dat"
     system: sharp-x68000
     path: "iplrom.dat"
+    group: ipl
     priority: 1
     required: true
     size: 131072
@@ -64,8 +65,9 @@ files:
   - name: "iplromxv.dat"
     system: sharp-x68000
     path: "iplromxv.dat"
+    group: ipl
     priority: 2
-    required: false
+    required: true
     size: 131072
     source_ref: "SDL/SDL2/winx68k.cpp:277-279,288-307"
     note: "X68000 XVI IPL ROM, read when iplrom.dat is absent."
@@ -73,8 +75,9 @@ files:
   - name: "iplromco.dat"
     system: sharp-x68000
     path: "iplromco.dat"
+    group: ipl
     priority: 3
-    required: false
+    required: true
     size: 131072
     source_ref: "SDL/SDL2/winx68k.cpp:277-279,288-307"
     note: "X68000 Compact IPL ROM, read when the first two names are absent."
@@ -82,8 +85,9 @@ files:
   - name: "iplrom30.dat"
     system: sharp-x68000
     path: "iplrom30.dat"
+    group: ipl
     priority: 4
-    required: false
+    required: true
     size: 131072
     source_ref: "SDL/SDL2/winx68k.cpp:277-279,288-307"
     note: "X68030 IPL ROM, read when the three other names are absent."
@@ -91,8 +95,9 @@ files:
   - name: "cgrom30.dat"
     system: sharp-x68000
     path: "cgrom30.dat"
+    group: font
     priority: 1
-    required: false
+    required: true
     size: 786432
     source_ref: "SDL/SDL2/winx68k.cpp:280-282,317-331"
     note: >
@@ -103,8 +108,9 @@ files:
   - name: "cgrom30.tmp"
     system: sharp-x68000
     path: "cgrom30.tmp"
+    group: font
     priority: 2
-    required: false
+    required: true
     unsourceable: "rendered from TrueType fonts by the font generator, no canonical file"
     size: 786432
     source_ref: "SDL/SDL2/winx68k.cpp:280-282,317-331"
@@ -113,6 +119,7 @@ files:
   - name: "cgrom.dat"
     system: sharp-x68000
     path: "cgrom.dat"
+    group: font
     priority: 3
     required: true
     size: 786432
@@ -122,8 +129,9 @@ files:
   - name: "cgrom.tmp"
     system: sharp-x68000
     path: "cgrom.tmp"
+    group: font
     priority: 4
-    required: false
+    required: true
     unsourceable: "rendered from TrueType fonts by the font generator, no canonical file"
     size: 786432
     source_ref: "SDL/SDL2/winx68k.cpp:280-282,317-331, SDL/tool/create_cgrom.c:20"
diff --git a/emulators/px68k.yml b/emulators/px68k.yml
index c3b4ec4b3..1f0bbe529 100644
--- a/emulators/px68k.yml
+++ b/emulators/px68k.yml
@@ -48,6 +48,7 @@ files:
   - name: "iplrom.dat"
     installed_on: [recalbox]
     path: "keropi/iplrom.dat"
+    group: ipl
     priority: 1
     size: 131072
     required: true
@@ -59,9 +60,10 @@ files:
 
   - name: "iplrom30.dat"
     path: "keropi/iplrom30.dat"
+    group: ipl
     priority: 2
     size: 131072
-    required: false
+    required: true
     note: >
       X68030 IPL ROM. Alternative to iplrom.dat for X68030 model emulation.
       Only used if iplrom.dat is not found.
@@ -69,9 +71,10 @@ files:
 
   - name: "iplromco.dat"
     path: "keropi/iplromco.dat"
+    group: ipl
     priority: 3
     size: 131072
-    required: false
+    required: true
     note: >
       X68000 Compact IPL ROM. Alternative to iplrom.dat.
       Only used if iplrom.dat and iplrom30.dat are not found.
@@ -79,9 +82,10 @@ files:
 
   - name: "iplromxv.dat"
     path: "keropi/iplromxv.dat"
+    group: ipl
     priority: 4
     size: 131072
-    required: false
+    required: true
     note: >
       X68000 XVI IPL ROM. Last fallback in the IPL search order.
       Only used if the three other IPL variants are not found.
@@ -93,6 +97,8 @@ files:
     installed_on: [recalbox]
     path: "keropi/cgrom.dat"
     size: 786432
+    group: font
+    priority: 1
     required: true
     note: >
       X68000 character generator ROM. 768 KB, provides the font glyphs for text
@@ -103,7 +109,9 @@ files:
   - name: "cgrom.tmp"
     path: "keropi/cgrom.tmp"
     size: 786432
-    required: false
+    group: font
+    priority: 2
+    required: true
     unsourceable: "generated by WinX68k from the host fonts, no canonical file"
     note: >
       Alternative font file, used as fallback when cgrom.dat is absent.
diff --git a/emulators/yabadabadoo.yml b/emulators/yabadabadoo.yml
index 1f27a4d77..32f1625a8 100644
--- a/emulators/yabadabadoo.yml
+++ b/emulators/yabadabadoo.yml
@@ -61,6 +61,7 @@ notes: |
 files:
   - name: "saturn_bios.bin"
     system: sega-saturn
+    group: saturn-bios
     required: true
     max_size: 524288
     validation: [max_size]
@@ -69,7 +70,8 @@ files:
 
   - name: "sega_101.bin"
     system: sega-saturn
-    required: false
+    group: saturn-bios
+    required: true
     region: [japan, asia-ntsc, south-korea]
     max_size: 524288
     validation: [max_size]
@@ -78,7 +80,8 @@ files:
 
   - name: "mpr-17933.bin"
     system: sega-saturn
-    required: false
+    group: saturn-bios
+    required: true
     region: [north-america, europe, oceania, asia-pal, brazil, latin-america]
     max_size: 524288
     validation: [max_size]
diff --git a/emulators/yabasanshiro.yml b/emulators/yabasanshiro.yml
index b5ed0c276..7c281eb80 100644
--- a/emulators/yabasanshiro.yml
+++ b/emulators/yabasanshiro.yml
@@ -47,9 +47,9 @@ notes: |
     1. {system}/saturn_bios.bin
     2. {system}/sega_101.bin
     3. {system}/mpr-17933.bin
-  First file found wins. Real BIOS required for normal operation.
-  HLE available via yabasanshiro_force_hle_bios core option (deprecated,
-  debug only).
+  First file found wins. Without any of the three the core refuses the
+  game, even with the yabasanshiro_force_hle_bios core option set
+  (yabause/src/libretro/libretro.c:1064-1071).
 
   Addon cartridges: 1M/4M RAM expansion via core option (no files needed).
   ROM cartridge and MPEG card ROM loading disabled in libretro port
@@ -84,26 +84,26 @@ files:
   - name: "saturn_bios.bin"
     system: sega-saturn
     mode: libretro
+    group: saturn-bios
     priority: 1
     required: true
-    hle_fallback: true
     note: "Primary Saturn BIOS. Any region accepted."
     source_ref: "yabause/src/libretro/libretro.c:1048"
 
   - name: "sega_101.bin"
     system: sega-saturn
     mode: libretro
+    group: saturn-bios
     priority: 2
-    required: false
-    hle_fallback: true
+    required: true
     note: "Saturn BIOS v1.01 (Japan). Fallback if saturn_bios.bin missing."
     source_ref: "yabause/src/libretro/libretro.c:1052"
 
   - name: "mpr-17933.bin"
     system: sega-saturn
     mode: libretro
+    group: saturn-bios
     priority: 3
-    required: false
-    hle_fallback: true
+    required: true
     note: "Saturn BIOS v1.003 (NA/EU). Last fallback."
     source_ref: "yabause/src/libretro/libretro.c:1056"
diff --git a/emulators/yabause.yml b/emulators/yabause.yml
index 2140005e7..e086cab20 100644
--- a/emulators/yabause.yml
+++ b/emulators/yabause.yml
@@ -50,6 +50,7 @@ notes: |
 files:
   - name: "saturn_bios.bin"
     system: sega-saturn
+    group: saturn-bios
     priority: 1
     required: true
     hle_fallback: true
@@ -60,8 +61,9 @@ files:
 
   - name: "sega_101.bin"
     system: sega-saturn
+    group: saturn-bios
     priority: 2
-    required: false
+    required: true
     hle_fallback: true
     max_size: 524288
     validation: [max_size]
@@ -70,8 +72,9 @@ files:
 
   - name: "mpr-17933.bin"
     system: sega-saturn
+    group: saturn-bios
     priority: 3
-    required: false
+    required: true
     hle_fallback: true
     max_size: 524288
     validation: [max_size]
diff --git a/emulators/ymir.yml b/emulators/ymir.yml
index 27d85df6d..507235e2e 100644
--- a/emulators/ymir.yml
+++ b/emulators/ymir.yml
@@ -96,6 +96,7 @@ files:
   - name: "sega_101.bin"
     system: sega-saturn
     region: [japan]
+    group: ipl
     priority: 1
     required: true
     mode: libretro
@@ -110,6 +111,7 @@ files:
   - name: "mpr-17933.bin"
     system: sega-saturn
     region: [north-america, europe, asia-ntsc, asia-pal, brazil, latin-america]
+    group: ipl
     priority: 2
     required: true
     mode: libretro
@@ -123,8 +125,9 @@ files:
 
   - name: "saturn_bios.bin"
     system: sega-saturn
+    group: ipl
     priority: 3
-    required: false
+    required: true
     mode: libretro
     size: 524288
     validation: [size]