diff --git a/emulators/amiberry.yml b/emulators/amiberry.yml
index 346aaed2..06d32ac7 100644
--- a/emulators/amiberry.yml
+++ b/emulators/amiberry.yml
@@ -64,14 +64,14 @@ files:
     required: true
     size: 262144
     note: "A500 Kickstart v1.3 rev 34.005, default for A500 model"
-    source_ref: "libretro/libretro.cpp:1776"
+    source_ref: "libretro/libretro.cpp:1517"
 
   - name: kick12.rom
     system: commodore-amiga
     required: false
     size: 262144
     note: "A500 Kickstart v1.2 rev 33.180, for A500OG model"
-    source_ref: "libretro/libretro.cpp:1775"
+    source_ref: "libretro/libretro.cpp:1516"
 
   - name: kick20.rom
     system: commodore-amiga
@@ -79,41 +79,41 @@ files:
     size: 524288
     aliases: [kick204.rom]
     note: "A500+ Kickstart v2.04 rev 37.175"
-    source_ref: "libretro/libretro.cpp:1777"
+    source_ref: "libretro/libretro.cpp:1518"
 
   - name: kick205.rom
     system: commodore-amiga
     required: false
     size: 524288
     note: "A600 Kickstart v2.05 rev 37.350, also used for WHDLoad"
-    source_ref: "libretro/libretro.cpp:1778"
+    source_ref: "libretro/libretro.cpp:1519"
 
   - name: kick31.rom
     system: commodore-amiga
     required: false
     size: 524288
     note: "Kickstart v3.1 (generic), first candidate for A1200 and A4000"
-    source_ref: "libretro/libretro.cpp:1779-1780"
+    source_ref: "libretro/libretro.cpp:1520-1521"
 
   - name: kick40068.A1200
     system: commodore-amiga
     required: false
     size: 524288
     note: "A1200 Kickstart v3.1 rev 40.68, fallback after kick31.rom"
-    source_ref: "libretro/libretro.cpp:1779"
+    source_ref: "libretro/libretro.cpp:1520"
 
   - name: kick40068.A4000
     system: commodore-amiga
     required: false
     size: 524288
     note: "A4000 Kickstart v3.1 rev 40.68, fallback after kick31.rom"
-    source_ref: "libretro/libretro.cpp:1780"
+    source_ref: "libretro/libretro.cpp:1521"
 
   - name: kick.rom
     system: commodore-amiga
     required: false
     note: "Generic name, any Kickstart ROM. Last resort fallback for all models."
-    source_ref: "libretro/libretro.cpp:1769-1781"
+    source_ref: "libretro/libretro.cpp:1510-1522"
 
   # --- CD32 ROMs ---
 
@@ -123,7 +123,7 @@ files:
     size: 524288
     aliases: [amiga-os-310-cd32.rom, kick40060.CD32]
     note: "CD32 Kickstart v3.1 rev 40.60"
-    source_ref: "libretro/libretro.cpp:1781"
+    source_ref: "libretro/libretro.cpp:1522"
 
   - name: cd32ext.rom
     system: commodore-cd32
@@ -140,7 +140,7 @@ files:
     required: false
     aliases: [kick34005.CDTV]
     note: "CDTV extended ROM v1.00, used as kickstart candidate"
-    source_ref: "libretro/libretro.cpp:1782"
+    source_ref: "libretro/libretro.cpp:1523"
 
   - name: cdtvext.rom
     system: commodore-cdtv
@@ -172,7 +172,7 @@ files:
     system: commodore-amiga
     required: false
     note: "Decryption key for Cloanto Amiga Forever encrypted ROMs"
-    source_ref: "src/rommgr.cpp:1458-1539"
+    source_ref: "src/rommgr.cpp:1444-1525"
 
   # --- Keyboard MCU ROMs ---
   # Loaded when keyboard_mode is set to MCU emulation.
@@ -184,21 +184,21 @@ files:
     required: false
     size: 2048
     note: "6500-1/6570-036 keyboard MCU ROM for A500/A600/A1000 models"
-    source_ref: "src/kbmcu/keyboard_mcu_6500_1.cpp:385-408, src/rommgr.cpp:136"
+    source_ref: "src/kbmcu/keyboard_mcu_6500_1.cpp:385-408, src/rommgr.cpp:126"
 
   - name: "68HC05.rom"
     system: commodore-amiga
     required: false
     size: 8192
     note: "68HC05 keyboard MCU ROM for A1200"
-    source_ref: "src/kbmcu/keyboard_mcu_6805.cpp:544-567, src/rommgr.cpp:138"
+    source_ref: "src/kbmcu/keyboard_mcu_6805.cpp:544-567, src/rommgr.cpp:128"
 
   - name: "D8039HLC.rom"
     system: commodore-amiga
     required: false
     size: 2048
     note: "D8039HLC keyboard MCU ROM for A2000"
-    source_ref: "src/kbmcu/keyboard_mcu_d8039hlc.cpp:235-258, src/rommgr.cpp:140"
+    source_ref: "src/kbmcu/keyboard_mcu_d8039hlc.cpp:235-258, src/rommgr.cpp:130"
 
   # --- Munt MT-32/CM-32L MIDI ROMs ---
   # Located in mt32-roms/ subdirectory of the ROM path.
@@ -221,14 +221,14 @@ files:
       - mt32-roms/ctrl_mt32_2_06.rom
       - mt32-roms/ctrl_mt32_2_03.rom
     note: "Roland MT-32 control ROM for Munt MIDI emulation"
-    source_ref: "src/midiemu.cpp:38-62, src/midiemu.cpp:159-164"
+    source_ref: "src/midiemu.cpp:38-62, src/midiemu.cpp:151-156"
 
   - name: mt32-roms/pcm_mt32.rom
     system: commodore-amiga
     required: false
     aliases: [mt32-roms/mt32_pcm.rom]
     note: "Roland MT-32 PCM ROM for Munt MIDI emulation"
-    source_ref: "src/midiemu.cpp:141-148"
+    source_ref: "src/midiemu.cpp:133-140"
 
   - name: mt32-roms/cm32l_control.rom
     system: commodore-amiga
@@ -239,11 +239,11 @@ files:
       - mt32-roms/ctrl_cm32l_1_02.rom
       - mt32-roms/ctrl_cm32l_1_00.rom
     note: "Roland CM-32L control ROM for Munt MIDI emulation"
-    source_ref: "src/midiemu.cpp:25-37, src/midiemu.cpp:159-164"
+    source_ref: "src/midiemu.cpp:25-37, src/midiemu.cpp:151-156"
 
   - name: mt32-roms/pcm_cm32l.rom
     system: commodore-amiga
     required: false
     aliases: [mt32-roms/cm32l_pcm.rom]
     note: "Roland CM-32L PCM ROM for Munt MIDI emulation"
-    source_ref: "src/midiemu.cpp:150-157"
+    source_ref: "src/midiemu.cpp:142-149"
diff --git a/emulators/ares.yml b/emulators/ares.yml
index abff1888..6846ceee 100644
--- a/emulators/ares.yml
+++ b/emulators/ares.yml
@@ -339,7 +339,7 @@ files:
     sha256: "0e87a3385a27b3a4cac51934819b7eefa5b3d690768d2495633838488cd0e2e4"
     validation: [sha256]
     description: "NEC PAC-N10 LaserActive module (US)"
-    source_ref: "desktop-ui/emulator/pc-engine-ld.cpp:12"
+    source_ref: "desktop-ui/emulator/pc-engine-ld.cpp:14"
 
   - name: pac-n1.pce
     system: pc-engine-ld
@@ -357,7 +357,7 @@ files:
     sha256: "3f43b3b577117d84002e99cb0baeb97b0d65b1d70b4adadc68817185c6a687f0"
     validation: [sha256]
     description: "NEC PCE-LP1 LaserActive module (Japan)"
-    source_ref: "desktop-ui/emulator/pc-engine-ld.cpp:14"
+    source_ref: "desktop-ui/emulator/pc-engine-ld.cpp:16"
 
   # --- PlayStation ---
   - name: scph5501.bin
diff --git a/emulators/bsnes.yml b/emulators/bsnes.yml
index 9b0b2ba7..9a08e069 100644
--- a/emulators/bsnes.yml
+++ b/emulators/bsnes.yml
@@ -36,7 +36,7 @@ files:
     required: false
     hle_fallback: true
     note: "NEC uPD7725 program ROM for DSP1"
-    source_ref: "bsnes/sfc/cartridge/load.cpp:490-494, bsnes/heuristics/super-famicom.cpp:601"
+    source_ref: "sfc/cartridge/load.cpp:490-494, heuristics/super-famicom.cpp:601"
 
   - name: "dsp1.data.rom"
     system: nintendo-snes
@@ -45,7 +45,7 @@ files:
     required: false
     hle_fallback: true
     note: "NEC uPD7725 data ROM for DSP1"
-    source_ref: "bsnes/sfc/cartridge/load.cpp:498-503"
+    source_ref: "sfc/cartridge/load.cpp:498-503"
 
   - name: "dsp1b.program.rom"
     system: nintendo-snes
@@ -54,7 +54,7 @@ files:
     required: false
     hle_fallback: true
     note: "NEC uPD7725 program ROM for DSP1B (default NEC identifier)"
-    source_ref: "bsnes/heuristics/super-famicom.cpp:606"
+    source_ref: "heuristics/super-famicom.cpp:606"
 
   - name: "dsp1b.data.rom"
     system: nintendo-snes
@@ -63,7 +63,7 @@ files:
     required: false
     hle_fallback: true
     note: "NEC uPD7725 data ROM for DSP1B"
-    source_ref: "bsnes/heuristics/super-famicom.cpp:606"
+    source_ref: "heuristics/super-famicom.cpp:606"
 
   - name: "dsp2.program.rom"
     system: nintendo-snes
@@ -72,7 +72,7 @@ files:
     required: false
     hle_fallback: true
     note: "NEC uPD7725 program ROM for DSP2 (Dungeon Master)"
-    source_ref: "bsnes/sfc/cartridge/load.cpp:515-520, bsnes/heuristics/super-famicom.cpp:602"
+    source_ref: "sfc/cartridge/load.cpp:515-520, heuristics/super-famicom.cpp:602"
 
   - name: "dsp2.data.rom"
     system: nintendo-snes
@@ -81,7 +81,7 @@ files:
     required: false
     hle_fallback: true
     note: "NEC uPD7725 data ROM for DSP2"
-    source_ref: "bsnes/sfc/cartridge/load.cpp:498-503"
+    source_ref: "sfc/cartridge/load.cpp:498-503"
 
   - name: "dsp3.program.rom"
     system: nintendo-snes
@@ -89,7 +89,7 @@ files:
     validation: [size]
     required: true
     note: "NEC uPD7725 program ROM for DSP3 (SD Gundam GX). No HLE fallback"
-    source_ref: "bsnes/sfc/cartridge/load.cpp:531-534"
+    source_ref: "sfc/cartridge/load.cpp:531-534"
 
   - name: "dsp3.data.rom"
     system: nintendo-snes
@@ -97,7 +97,7 @@ files:
     validation: [size]
     required: true
     note: "NEC uPD7725 data ROM for DSP3. No HLE fallback"
-    source_ref: "bsnes/sfc/cartridge/load.cpp:531-534"
+    source_ref: "sfc/cartridge/load.cpp:531-534"
 
   - name: "dsp4.program.rom"
     system: nintendo-snes
@@ -106,7 +106,7 @@ files:
     required: false
     hle_fallback: true
     note: "NEC uPD7725 program ROM for DSP4 (Top Gear 3000)"
-    source_ref: "bsnes/sfc/cartridge/load.cpp:522-528, bsnes/heuristics/super-famicom.cpp:604-605"
+    source_ref: "sfc/cartridge/load.cpp:522-528, heuristics/super-famicom.cpp:604-605"
 
   - name: "dsp4.data.rom"
     system: nintendo-snes
@@ -115,7 +115,7 @@ files:
     required: false
     hle_fallback: true
     note: "NEC uPD7725 data ROM for DSP4"
-    source_ref: "bsnes/sfc/cartridge/load.cpp:498-503"
+    source_ref: "sfc/cartridge/load.cpp:498-503"
 
   # -- NEC uPD96050 coprocessor (ST010, ST011) --
   # Used by: Exhaust Heat 2 / F1 ROC II (ST010), 2dan Morita Shougi (ST011)
@@ -128,7 +128,7 @@ files:
     required: false
     hle_fallback: true
     note: "NEC uPD96050 program ROM for ST010"
-    source_ref: "bsnes/sfc/cartridge/load.cpp:570-574, bsnes/heuristics/super-famicom.cpp:583-587"
+    source_ref: "sfc/cartridge/load.cpp:570-574, heuristics/super-famicom.cpp:583-587"
 
   - name: "st010.data.rom"
     system: nintendo-snes
@@ -137,7 +137,7 @@ files:
     required: false
     hle_fallback: true
     note: "NEC uPD96050 data ROM for ST010"
-    source_ref: "bsnes/sfc/cartridge/load.cpp:578-583"
+    source_ref: "sfc/cartridge/load.cpp:578-583"
 
   - name: "st011.program.rom"
     system: nintendo-snes
@@ -145,7 +145,7 @@ files:
     validation: [size]
     required: true
     note: "NEC uPD96050 program ROM for ST011 (2dan Morita Shougi). No HLE fallback"
-    source_ref: "bsnes/sfc/cartridge/load.cpp:599-601, bsnes/heuristics/super-famicom.cpp:586"
+    source_ref: "sfc/cartridge/load.cpp:599-601, heuristics/super-famicom.cpp:586"
 
   - name: "st011.data.rom"
     system: nintendo-snes
@@ -153,7 +153,7 @@ files:
     validation: [size]
     required: true
     note: "NEC uPD96050 data ROM for ST011. No HLE fallback"
-    source_ref: "bsnes/sfc/cartridge/load.cpp:599-601"
+    source_ref: "sfc/cartridge/load.cpp:599-601"
 
   # -- SETA ST018 (ARM6 coprocessor) --
   # Used by: Hayazashi Nidan Morita Shougi
@@ -165,7 +165,7 @@ files:
     validation: [size]
     required: true
     note: "ARM6 program ROM for ST018 (Hayazashi Nidan Morita Shougi). No HLE fallback"
-    source_ref: "bsnes/sfc/cartridge/load.cpp:379-385, bsnes/sfc/coprocessor/armdsp/armdsp.hpp:31, bsnes/heuristics/super-famicom.cpp:580"
+    source_ref: "sfc/cartridge/load.cpp:379-385, armdsp/armdsp.hpp:31, heuristics/super-famicom.cpp:580"
 
   - name: "st018.data.rom"
     system: nintendo-snes
@@ -173,7 +173,7 @@ files:
     validation: [size]
     required: true
     note: "ARM6 data ROM for ST018. No HLE fallback"
-    source_ref: "bsnes/sfc/cartridge/load.cpp:387-393, bsnes/sfc/coprocessor/armdsp/armdsp.hpp:32"
+    source_ref: "sfc/cartridge/load.cpp:387-393, armdsp/armdsp.hpp:32"
 
   # -- Hitachi HG51BS169 (Cx4 coprocessor) --
   # Used by: Mega Man X2, Mega Man X3
diff --git a/emulators/cap32.yml b/emulators/cap32.yml
index ff1a0a4f..638f4829 100644
--- a/emulators/cap32.yml
+++ b/emulators/cap32.yml
@@ -76,7 +76,7 @@ files:
     mode: standalone
     size: 16384
     note: "AMSDOS disc ROM (sideways slot 7)"
-    source_ref: "src/cap32.cpp:1202"
+    source_ref: "src/cap32.cpp:1190"
   - name: system.cpr
     system: amstrad-cpc
     required: false
@@ -90,7 +90,7 @@ files:
     mode: standalone
     size: 8192
     note: "Multiface 2 ROM"
-    source_ref: "caprice32/rom/MF2.rom, src/cap32.cpp:1280-1299"
+    source_ref: "caprice32/rom/MF2.rom, src/cap32.cpp:1268-1287"
 
 platform_details:
   bios_mapping:
diff --git a/emulators/clk.yml b/emulators/clk.yml
index 9ed502f8..11623a52 100644
--- a/emulators/clk.yml
+++ b/emulators/clk.yml
@@ -84,7 +84,7 @@ files:
     crc32: "3c14fc70"
     required: true
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:459-465"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:448-454"
 
   - name: dfs09.rom
     path: BBCMicro/dfs09.rom
@@ -94,7 +94,7 @@ files:
     required: false
     note: "Conditional: only when using 8271 disk interface"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:467-473"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:456-462"
 
   - name: dfs-2.26.rom
     path: BBCMicro/dfs-2.26.rom
@@ -104,7 +104,7 @@ files:
     required: false
     note: "Conditional: needed for 1770 DFS or tube processor"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:475-481"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:464-470"
 
   - name: adfs-1.30.rom
     path: BBCMicro/adfs-1.30.rom
@@ -114,7 +114,7 @@ files:
     required: false
     note: "Conditional: needed for ADFS support"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:483-489"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:472-478"
 
   - name: ADT-1.40.rom
     path: BBCMicro/ADT-1.40.rom
@@ -124,7 +124,7 @@ files:
     required: false
     note: "Optional: fetched separately, silently skipped if absent"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:491-497"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:480-486"
 
   - name: TUBE110.rom
     path: BBCMicro/TUBE110.rom
@@ -134,7 +134,7 @@ files:
     required: false
     note: "Conditional: needed for 6502 tube processor"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:499-505"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:488-494"
 
   - name: Z80_122.rom
     path: BBCMicro/Z80_122.rom
@@ -144,7 +144,7 @@ files:
     required: false
     note: "Conditional: needed for Z80 tube processor"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:507-513"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:496-502"
 
   # -------------------------------------------------------
   # Acorn Electron (machine_name: "Electron")
@@ -237,7 +237,7 @@ files:
     crc32: "c4f0f55f"
     required: true
     mode: standalone
-    source_ref: "Machines/Amiga/Amiga.cpp:60-61, Machines/Utility/ROMCatalogue.cpp:216-222"
+    source_ref: "Machines/Amiga/Amiga.cpp:60-61, Machines/Utility/ROMCatalogue.cpp:205-211"
 
   # -------------------------------------------------------
   # Amstrad CPC (machine_name: "AmstradCPC")
@@ -251,7 +251,7 @@ files:
     required: false
     note: "Built into binary. Required for CPC 464 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:284-289, Machines/Utility/ROMLibrary.cpp:14535"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:273-278, Machines/Utility/ROMLibrary.cpp:14535"
 
   - name: basic464.rom
     path: AmstradCPC/basic464.rom
@@ -261,7 +261,7 @@ files:
     required: false
     note: "Built into binary. Required for CPC 464 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:291-298, Machines/Utility/ROMLibrary.cpp:14532"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:280-287, Machines/Utility/ROMLibrary.cpp:14532"
 
   - name: os664.rom
     path: AmstradCPC/os664.rom
@@ -271,7 +271,7 @@ files:
     required: false
     note: "Built into binary. Required for CPC 664 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:300-304, Machines/Utility/ROMLibrary.cpp:14536"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:289-293, Machines/Utility/ROMLibrary.cpp:14536"
 
   - name: basic664.rom
     path: AmstradCPC/basic664.rom
@@ -281,7 +281,7 @@ files:
     required: false
     note: "Built into binary. Required for CPC 664 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:306-313, Machines/Utility/ROMLibrary.cpp:14534"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:295-302, Machines/Utility/ROMLibrary.cpp:14534"
 
   - name: os6128.rom
     path: AmstradCPC/os6128.rom
@@ -291,7 +291,7 @@ files:
     required: false
     note: "Built into binary. Required for CPC 6128 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:315-321, Machines/Utility/ROMLibrary.cpp:14536"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:304-310, Machines/Utility/ROMLibrary.cpp:14536"
 
   - name: basic6128.rom
     path: AmstradCPC/basic6128.rom
@@ -301,7 +301,7 @@ files:
     required: false
     note: "Built into binary. Required for CPC 6128 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:323-329, Machines/Utility/ROMLibrary.cpp:14533"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:312-318, Machines/Utility/ROMLibrary.cpp:14533"
 
   - name: amsdos.rom
     path: AmstradCPC/amsdos.rom
@@ -311,7 +311,7 @@ files:
     required: false
     note: "Built into binary. Needed for CPC 664/6128 disk support."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:276-282, Machines/Utility/ROMLibrary.cpp:14531"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:265-271, Machines/Utility/ROMLibrary.cpp:14531"
 
   # -------------------------------------------------------
   # Apple II (machine_name: "AppleII")
@@ -324,7 +324,7 @@ files:
     required: true
     note: "Required for original Apple II model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:359-365"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:348-354"
 
   - name: apple2.rom
     path: AppleII/apple2.rom
@@ -334,7 +334,7 @@ files:
     required: true
     note: "Required for Apple II+ model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:351-357"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:340-346"
 
   - name: apple2eu.rom
     path: AppleII/apple2eu.rom
@@ -344,7 +344,7 @@ files:
     required: true
     note: "Required for Apple IIe model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:343-349"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:332-338"
 
   - name: apple2e.rom
     path: AppleII/apple2e.rom
@@ -354,7 +354,7 @@ files:
     required: true
     note: "Required for Enhanced IIe model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:335-341"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:324-330"
 
   - name: apple2-character.rom
     path: AppleII/apple2-character.rom
@@ -364,7 +364,7 @@ files:
     required: true
     note: "Required for Apple II and II+ models"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:367-373"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:356-362"
 
   - name: apple2eu-character.rom
     path: AppleII/apple2eu-character.rom
@@ -374,7 +374,7 @@ files:
     required: true
     note: "Required for Apple IIe model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:375-381"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:364-370"
 
   - name: apple2e-character.rom
     path: AppleII/apple2e-character.rom
@@ -384,7 +384,7 @@ files:
     required: true
     note: "Required for Enhanced IIe model. Also used by Apple IIgs."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:383-389"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:372-378"
 
   - name: scsi.rom
     path: AppleII/scsi.rom
@@ -394,7 +394,7 @@ files:
     required: false
     note: "Conditional: needed for SCSI controller"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:391-397"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:380-386"
 
   # -------------------------------------------------------
   # Apple IIgs (machine_name: "AppleIIgs")
@@ -407,7 +407,7 @@ files:
     required: true
     note: "Required for ROM01 model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:403-409"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:392-398"
 
   - name: apple2gs.rom2
     path: AppleIIgs/apple2gs.rom2
@@ -417,7 +417,7 @@ files:
     required: true
     note: "Required for ROM03 model (default)"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:411-417"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:400-406"
 
   - name: apple2gs.chr
     path: AppleIIgs/apple2gs.chr
@@ -426,7 +426,7 @@ files:
     crc32: "91e53cd8"
     required: true
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:419-425"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:408-414"
 
   - name: "341s0632-2"
     path: "AppleIIgs/341s0632-2"
@@ -435,7 +435,7 @@ files:
     crc32: "e1c11fb0"
     required: true
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:427-432"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:416-421"
 
   # -------------------------------------------------------
   # Atari ST (machine_name: "AtariST")
@@ -447,7 +447,7 @@ files:
     crc32: "1a586c64"
     required: true
     mode: standalone
-    source_ref: "Machines/Atari/ST/AtariST.cpp:99-100, Machines/Utility/ROMCatalogue.cpp:439-445"
+    source_ref: "Machines/Atari/ST/AtariST.cpp:98-99, Machines/Utility/ROMCatalogue.cpp:428-434"
 
   # -------------------------------------------------------
   # ColecoVision (machine_name: "ColecoVision")
@@ -459,7 +459,7 @@ files:
     crc32: "3aa93ef3"
     required: true
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:519-525"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:508-514"
 
   # -------------------------------------------------------
   # Commodore 1540/1541 (machine_name: "Commodore1540")
@@ -473,7 +473,7 @@ files:
     required: false
     note: "Conditional: needed when VIC-20 has 1540 drive"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:531-537"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:520-526"
 
   - name: 1541.bin
     path: Commodore1540/1541.bin
@@ -483,7 +483,7 @@ files:
     required: false
     note: "Conditional: needed when Plus/4 has 1541 drive"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:539-545"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:528-534"
 
   # -------------------------------------------------------
   # Disk II (machine_name: "DiskII")
@@ -497,7 +497,7 @@ files:
     required: false
     note: "Conditional: needed for 16-sector disk controller"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:551-557"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:540-546"
 
   - name: state-machine-16.rom
     path: DiskII/state-machine-16.rom
@@ -507,7 +507,7 @@ files:
     required: false
     note: "Conditional: needed for disk controller. Also used by Oric Pravetz."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:595-601"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:548-554"
 
   - name: boot-13.rom
     path: DiskII/boot-13.rom
@@ -527,7 +527,7 @@ files:
     required: false
     note: "Conditional: needed for 13-sector disk controller"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:647-653"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:600-606"
 
   # -------------------------------------------------------
   # Enterprise 64/128 (machine_name: "Enterprise")
@@ -541,7 +541,7 @@ files:
     aliases: ["Exos (198x)(Enterprise).bin"]
     note: "One EXOS version required. Selected by target or any available."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:695-704"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:648-657"
 
   - name: exos20.bin
     path: Enterprise/exos20.bin
@@ -552,7 +552,7 @@ files:
     aliases: ["Expandible OS v2.0 (1984)(Intelligent Software).bin"]
     note: "Alternative EXOS version"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:706-715"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:659-668"
 
   - name: exos21.bin
     path: Enterprise/exos21.bin
@@ -563,7 +563,7 @@ files:
     aliases: ["Expandible OS v2.1 (1985)(Intelligent Software).bin"]
     note: "Alternative EXOS version"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:717-726"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:670-679"
 
   - name: exos23.bin
     path: Enterprise/exos23.bin
@@ -574,7 +574,7 @@ files:
     aliases: ["Expandible OS v2.3 (1987)(Intelligent Software).bin"]
     note: "Alternative EXOS version"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:728-737"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:681-690"
 
   - name: basic10.bin
     path: Enterprise/basic10.bin
@@ -584,7 +584,7 @@ files:
     required: true
     note: "One BASIC version required. v1.0 single-file version."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:740-746"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:693-699"
 
   - name: "BASIC 1.0 - EPROM 1-2 (198x)(Enterprise).bin"
     path: "Enterprise/BASIC 1.0 - EPROM 1-2 (198x)(Enterprise).bin"
@@ -594,7 +594,7 @@ files:
     required: false
     note: "Alternative: both parts needed together as substitute for basic10.bin"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:748-754"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:701-707"
 
   - name: "BASIC 1.0 - EPROM 2-2 (198x)(Enterprise).bin"
     path: "Enterprise/BASIC 1.0 - EPROM 2-2 (198x)(Enterprise).bin"
@@ -604,7 +604,7 @@ files:
     required: false
     note: "Alternative: both parts needed together as substitute for basic10.bin"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:756-762"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:709-715"
 
   - name: basic11.bin
     path: Enterprise/basic11.bin
@@ -614,7 +614,7 @@ files:
     required: true
     note: "Alternative BASIC version"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:764-770"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:717-723"
 
   - name: "BASIC 1.1 - EPROM 1.1 (198x)(Enterprise).bin"
     path: "Enterprise/BASIC 1.1 - EPROM 1.1 (198x)(Enterprise).bin"
@@ -624,7 +624,7 @@ files:
     required: false
     note: "Alternative format of BASIC v1.1 with trailing byte"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:772-778"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:725-731"
 
   - name: basic21.bin
     path: Enterprise/basic21.bin
@@ -637,7 +637,7 @@ files:
       - "BASIC Interpreter v2.1 (1985)(Intelligent Software)[a].bin"
     note: "Alternative BASIC version"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:780-790"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:733-743"
 
   - name: epdos.bin
     path: Enterprise/epdos.bin
@@ -648,7 +648,7 @@ files:
     aliases: ["EPDOS v1.7 (19xx)(Haluska, Laszlo).bin"]
     note: "Conditional: needed for EPDOS disk interface"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:792-802"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:745-755"
 
   - name: exdos.bin
     path: Enterprise/exdos.bin
@@ -659,7 +659,7 @@ files:
     aliases: ["EX-DOS EPROM (198x)(Enterprise).bin"]
     note: "Conditional: needed when DOS is set to EXDOS"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:804-813"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:757-766"
 
   # -------------------------------------------------------
   # Apple Macintosh (machine_name: "Macintosh")
@@ -672,7 +672,7 @@ files:
     required: true
     note: "Required for Macintosh 128k model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:819-825"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:772-778"
 
   - name: mac512k.rom
     path: Macintosh/mac512k.rom
@@ -682,7 +682,7 @@ files:
     required: true
     note: "Required for Macintosh 512k model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:827-833"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:780-786"
 
   - name: macplus.rom
     path: Macintosh/macplus.rom
@@ -692,7 +692,7 @@ files:
     required: true
     note: "Required for Macintosh 512ke and Plus models"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:835-845"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:788-798"
 
   # -------------------------------------------------------
   # Master System (machine_name: "MasterSystem")
@@ -705,7 +705,7 @@ files:
     required: false
     note: "Optional. Boots cartridge directly if absent."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:859-865"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:812-818"
 
   - name: japanese-bios.sms
     path: MasterSystem/japanese-bios.sms
@@ -715,7 +715,7 @@ files:
     required: false
     note: "Optional. Used for Japan region. Boots without if absent."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:851-857"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:804-810"
 
   # -------------------------------------------------------
   # MSX (machine_name: "MSX")
@@ -729,7 +729,7 @@ files:
     required: true
     note: "Required for MSX1. Region bytes patched in memory if regional BIOS absent."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:872-878"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:825-831"
 
   - name: msx-japanese.rom
     path: MSX/msx-japanese.rom
@@ -739,7 +739,7 @@ files:
     required: false
     note: "Alternative to msx.rom for Japanese region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:880-886"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:833-839"
 
   - name: msx-american.rom
     path: MSX/msx-american.rom
@@ -748,7 +748,7 @@ files:
     required: false
     note: "Alternative to msx.rom for American region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:888-894"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:841-847"
 
   - name: msx-european.rom
     path: MSX/msx-european.rom
@@ -757,7 +757,7 @@ files:
     required: false
     note: "Alternative to msx.rom for European region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:896-902"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:849-855"
 
   - name: disk.rom
     path: MSX/disk.rom
@@ -767,7 +767,7 @@ files:
     required: false
     note: "Conditional: needed for disk drive support"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:904-910"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:857-863"
 
   - name: msx2.rom
     aliases: [MSX2.ROM]
@@ -778,7 +778,7 @@ files:
     required: true
     note: "Required for MSX2"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:912-919"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:865-872"
 
   - name: msx2ext.rom
     aliases: [MSX2EXT.ROM]
@@ -789,7 +789,7 @@ files:
     required: true
     note: "Required for MSX2"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:921-927"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:874-880"
 
   - name: fmpac.rom
     path: MSX/fmpac.rom
@@ -799,7 +799,7 @@ files:
     required: false
     note: "Conditional: needed for MSX-Music support"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:929-935"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:882-888"
 
   # -------------------------------------------------------
   # Oric (machine_name: "Oric")
@@ -812,7 +812,7 @@ files:
     required: true
     note: "Required for Oric-1 model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:965-971"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:918-924"
 
   - name: basic11.rom
     path: Oric/basic11.rom
@@ -822,7 +822,7 @@ files:
     required: true
     note: "Required for Oric Atmos model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:973-979"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:926-932"
 
   - name: pravetz.rom
     path: Oric/pravetz.rom
@@ -832,7 +832,7 @@ files:
     required: true
     note: "Required for Pravetz 8D model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:981-987"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:934-940"
 
   - name: colour.rom
     path: Oric/colour.rom
@@ -842,7 +842,7 @@ files:
     required: false
     note: "Optional. Enables colour video output."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:941-947"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:894-900"
 
   - name: ORIC.PAL-PROM-TBP24S10-1ab9b572.bin
     path: Oric/ORIC.PAL-PROM-TBP24S10-1ab9b572.bin
@@ -852,7 +852,7 @@ files:
     required: false
     note: "Optional. Alternative colour ROM."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:949-955"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:902-908"
 
   - name: PRAVETZ-8D.PAL-PROM-82S129-1576a69b.bin
     path: Oric/PRAVETZ-8D.PAL-PROM-82S129-1576a69b.bin
@@ -862,7 +862,7 @@ files:
     required: false
     note: "Optional. Colour ROM for Pravetz model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:957-963"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:910-916"
 
   - name: bd500.rom
     path: Oric/bd500.rom
@@ -872,7 +872,7 @@ files:
     required: false
     note: "Conditional: needed for Byte Drive 500 disk interface"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:989-995"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:942-948"
 
   - name: jasmin.rom
     path: Oric/jasmin.rom
@@ -882,7 +882,7 @@ files:
     required: false
     note: "Conditional: needed for Jasmin disk interface"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:997-1003"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:950-956"
 
   - name: microdisc.rom
     path: Oric/microdisc.rom
@@ -892,7 +892,7 @@ files:
     required: false
     note: "Conditional: needed for Microdisc disk interface"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1005-1011"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:958-964"
 
   - name: 8dos.rom
     path: Oric/8dos.rom
@@ -902,7 +902,7 @@ files:
     required: false
     note: "Conditional: needed for Pravetz 8-DOS disk interface"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1013-1019"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:966-972"
 
   # -------------------------------------------------------
   # PC Compatible (machine_name: "PCCompatible")
@@ -915,7 +915,7 @@ files:
     required: true
     note: "Required for XT-class emulation"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1025-1031"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:978-984"
 
   - name: GLaTICK_0.8.5_AT.ROM
     path: PCCompatible/GLaTICK_0.8.5_AT.ROM
@@ -925,7 +925,7 @@ files:
     required: false
     note: "XT-class RTC option ROM"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1033-1039"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:986-992"
 
   - name: "Phoenix 80286 ROM BIOS Version 3.05.bin"
     path: "PCCompatible/Phoenix 80286 ROM BIOS Version 3.05.bin"
@@ -935,7 +935,7 @@ files:
     required: true
     note: "Required for AT-class emulation (alternative to IBM AT BIOS)"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1041-1047"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:994-1000"
 
   - name: at-bios.bin
     path: PCCompatible/at-bios.bin
@@ -945,7 +945,7 @@ files:
     required: true
     note: "AT-class: single-file IBM AT BIOS (alternative to split U27/U47)"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1049-1055"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1002-1008"
 
   - name: BIOS_5170_15NOV85_U27_61X9266_27256.BIN
     path: PCCompatible/BIOS_5170_15NOV85_U27_61X9266_27256.BIN
@@ -955,7 +955,7 @@ files:
     required: false
     note: "AT-class: split BIOS, used with U47 chip"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1057-1063"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1010-1016"
 
   - name: BIOS_5170_15NOV85_U47_61X9265_27256.BIN
     path: PCCompatible/BIOS_5170_15NOV85_U47_61X9265_27256.BIN
@@ -995,7 +995,7 @@ files:
     required: false
     note: "Needed for EGA video adapter"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1217-1223"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1042-1048"
 
   - name: ibm_vga.bin
     path: PCCompatible/ibm_vga.bin
@@ -1005,7 +1005,7 @@ files:
     required: false
     note: "Needed for VGA video adapter"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1225-1231"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1050-1056"
 
   - name: ibm-basic-1.10.rom
     path: PCCompatible/ibm-basic-1.10.rom
@@ -1015,7 +1015,7 @@ files:
     required: false
     note: "Required for AT-class with IBM BIOS (not needed with Phoenix)"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1233-1239"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1058-1064"
 
   # -------------------------------------------------------
   # Commodore Plus/4 (machine_name: "Plus4")
@@ -1027,7 +1027,7 @@ files:
     crc32: "74eaae87"
     required: true
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1401-1408"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1221-1228"
 
   - name: kernal.318004-05.bin
     path: Plus4/kernal.318004-05.bin
@@ -1037,7 +1037,7 @@ files:
     required: true
     note: "Default kernel version requested by machine code"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1394-1400"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1214-1220"
 
   - name: kernal.318004-03.bin
     path: Plus4/kernal.318004-03.bin
@@ -1091,7 +1091,7 @@ files:
     crc32: "db4c43c1"
     required: true
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1579-1585"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1399-1405"
 
   - name: characters-english.bin
     path: Vic20/characters-english.bin
@@ -1101,7 +1101,7 @@ files:
     required: true
     note: "Required for English region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1587-1593"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1407-1413"
 
   - name: kernel-pal.bin
     path: Vic20/kernel-pal.bin
@@ -1111,7 +1111,7 @@ files:
     required: true
     note: "Required for English PAL region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1595-1601"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1415-1421"
 
   - name: kernel-ntsc.bin
     path: Vic20/kernel-ntsc.bin
@@ -1121,7 +1121,7 @@ files:
     required: true
     note: "Required for English NTSC region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1603-1609"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1423-1429"
 
   - name: characters-danish.bin
     path: Vic20/characters-danish.bin
@@ -1131,7 +1131,7 @@ files:
     required: false
     note: "Required for Danish region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1611-1617"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1431-1437"
 
   - name: kernel-danish.bin
     path: Vic20/kernel-danish.bin
@@ -1141,7 +1141,7 @@ files:
     required: false
     note: "Required for Danish region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1619-1625"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1439-1445"
 
   - name: characters-japanese.bin
     path: Vic20/characters-japanese.bin
@@ -1151,7 +1151,7 @@ files:
     required: false
     note: "Required for Japanese region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1627-1633"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1447-1453"
 
   - name: kernel-japanese.bin
     path: Vic20/kernel-japanese.bin
@@ -1161,7 +1161,7 @@ files:
     required: false
     note: "Required for Japanese region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1635-1641"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1455-1461"
 
   - name: characters-swedish.bin
     path: Vic20/characters-swedish.bin
@@ -1171,7 +1171,7 @@ files:
     required: false
     note: "Required for Swedish region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1643-1649"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1463-1469"
 
   - name: kernel-swedish.bin
     path: Vic20/kernel-swedish.bin
@@ -1181,7 +1181,7 @@ files:
     required: false
     note: "Required for Swedish region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1651-1657"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1471-1477"
 
   # -------------------------------------------------------
   # Sinclair ZX Spectrum (machine_name: "ZXSpectrum")
@@ -1195,7 +1195,7 @@ files:
     required: false
     note: "Built into binary. Required for 16K/48K model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1663-1669, Machines/Utility/ROMLibrary.cpp:14539"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1483-1489, Machines/Utility/ROMLibrary.cpp:14539"
 
   - name: 128.rom
     path: ZXSpectrum/128.rom
@@ -1205,7 +1205,7 @@ files:
     required: false
     note: "Built into binary. Required for 128K model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1671-1677, Machines/Utility/ROMLibrary.cpp:14540"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1491-1497, Machines/Utility/ROMLibrary.cpp:14540"
 
   - name: plus2.rom
     path: ZXSpectrum/plus2.rom
@@ -1215,7 +1215,7 @@ files:
     required: false
     note: "Built into binary. Required for +2 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1679-1685, Machines/Utility/ROMLibrary.cpp:14541"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1499-1505, Machines/Utility/ROMLibrary.cpp:14541"
 
   - name: plus3.rom
     path: ZXSpectrum/plus3.rom
@@ -1225,7 +1225,7 @@ files:
     required: false
     note: "Built into binary. Required for +2a/+3 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1687-1696, Machines/Utility/ROMLibrary.cpp:14542"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1507-1516, Machines/Utility/ROMLibrary.cpp:14542"
 
   # -------------------------------------------------------
   # Sinclair ZX80/ZX81 (machine_name: "ZX8081")
@@ -1239,7 +1239,7 @@ files:
     required: false
     note: "Built into binary. Required for ZX80 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1702-1708, Machines/Utility/ROMLibrary.cpp:14544"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1522-1528, Machines/Utility/ROMLibrary.cpp:14544"
 
   - name: zx81.rom
     path: ZX8081/zx81.rom
@@ -1249,4 +1249,4 @@ files:
     required: false
     note: "Built into binary. Required for ZX81 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1710-1716, Machines/Utility/ROMLibrary.cpp:14545"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1530-1536, Machines/Utility/ROMLibrary.cpp:14545"
diff --git a/emulators/dolphin.yml b/emulators/dolphin.yml
index 3a7788cd..8f709344 100644
--- a/emulators/dolphin.yml
+++ b/emulators/dolphin.yml
@@ -45,7 +45,7 @@ files:
     required: false
     hle_fallback: true
     note: "GameCube PAL boot ROM"
-    source_ref: "Source/Core/Core/Config/MainSettings.cpp:792-798"
+    source_ref: "Source/Core/Core/Config/MainSettings.cpp:776-782"
 
   - name: "IPL.bin"
     path: "GC/JAP/IPL.bin"
@@ -144,7 +144,7 @@ files:
     required: false
     hle_fallback: true
     note: "OTP/SEEPROM dump (Wii encryption keys). Needed if not appended to nand.bin for NAND import"
-    source_ref: "Source/Core/DiscIO/NANDImporter.cpp:20, Source/Core/DiscIO/NANDImporter.cpp:85-97, Source/Core/DiscIO/NANDImporter.h:55"
+    source_ref: "Source/Core/DiscIO/NANDImporter.cpp:20, Source/Core/DiscIO/NANDImporter.cpp:82-94, Source/Core/DiscIO/NANDImporter.h:46"
 
   # -- Wii SD Card Image --
   - name: "WiiSD.raw"
@@ -169,7 +169,7 @@ files:
     hle_fallback: true
     mode: standalone
     note: "Wii System Menu WAD. Installed to NAND via Tools > Install WAD, needed for Wii Menu boot"
-    source_ref: "Source/Core/DolphinQt/MainWindow.cpp:1653-1655, Source/Core/DolphinQt/MenuBar.cpp:1240-1254"
+    source_ref: "Source/Core/DolphinQt/MainWindow.cpp:1629-1631, Source/Core/DolphinQt/MenuBar.cpp:1218-1232"
 
   # -- NAND Certificates (auto-extracted) --
   - name: "clientca.pem"
@@ -177,14 +177,14 @@ files:
     required: false
     hle_fallback: true
     note: "SSL client certificate. Auto-extracted from IOS13 content during NAND import"
-    source_ref: "Source/Core/DiscIO/NANDImporter.cpp:258-342"
+    source_ref: "Source/Core/DiscIO/NANDImporter.cpp:239-323"
 
   - name: "clientcakey.pem"
     path: "Wii/clientcakey.pem"
     required: false
     hle_fallback: true
     note: "SSL client private key. Auto-extracted from IOS13 content during NAND import"
-    source_ref: "Source/Core/DiscIO/NANDImporter.cpp:294"
+    source_ref: "Source/Core/DiscIO/NANDImporter.cpp:275"
 
   - name: "rootca.pem"
     path: "Wii/rootca.pem"
@@ -205,105 +205,105 @@ files:
     required: false
     mode: standalone
     note: "Realtek 8723A BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:414"
+    source_ref: "RealtekFirmwareLoader.cpp:387"
 
   - name: "rtl8723b_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8723b_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8723B BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:416"
+    source_ref: "RealtekFirmwareLoader.cpp:389"
 
   - name: "rtl8723d_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8723d_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8723D BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:418"
+    source_ref: "RealtekFirmwareLoader.cpp:391"
 
   - name: "rtl8761a_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8761a_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8761A BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:420"
+    source_ref: "RealtekFirmwareLoader.cpp:393"
 
   - name: "rtl8761bu_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8761bu_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8761BU BT firmware for Wiimote passthrough (most common USB dongle)"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:422"
+    source_ref: "RealtekFirmwareLoader.cpp:395"
 
   - name: "rtl8821a_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8821a_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8821A BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:424"
+    source_ref: "RealtekFirmwareLoader.cpp:397"
 
   - name: "rtl8821c_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8821c_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8821C BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:426"
+    source_ref: "RealtekFirmwareLoader.cpp:399"
 
   - name: "rtl8822b_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8822b_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8822B BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:430"
+    source_ref: "RealtekFirmwareLoader.cpp:403"
 
   - name: "rtl8822cu_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8822cu_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8822CU BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:428"
+    source_ref: "RealtekFirmwareLoader.cpp:401"
 
   - name: "rtl8851bu_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8851bu_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8851BU BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:432"
+    source_ref: "RealtekFirmwareLoader.cpp:405"
 
   - name: "rtl8852au_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8852au_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8852AU BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:434"
+    source_ref: "RealtekFirmwareLoader.cpp:407"
 
   - name: "rtl8852bu_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8852bu_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8852BU BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:436"
+    source_ref: "RealtekFirmwareLoader.cpp:409"
 
   - name: "rtl8852cu_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8852cu_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8852CU BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:438"
+    source_ref: "RealtekFirmwareLoader.cpp:411"
 
   - name: "rtl8852btu_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8852btu_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8852BT/8852BE-VT BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:440"
+    source_ref: "RealtekFirmwareLoader.cpp:413"
 
   - name: "rtl8922au_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8922au_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8922AU BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:442"
+    source_ref: "RealtekFirmwareLoader.cpp:415"
 
 notes:
   hle_available: true
diff --git a/emulators/dosbox-staging.yml b/emulators/dosbox-staging.yml
index 13008d6f..9ff315c4 100644
--- a/emulators/dosbox-staging.yml
+++ b/emulators/dosbox-staging.yml
@@ -106,7 +106,7 @@ files:
     size: 65536
     sha1: "5a5cb5a77d7d55ee69657c2f870416daed52dea7"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:110, src/midi/mt32.cpp:154-160, munt ROMInfo.cpp:59, munt ROMInfo.cpp:89"
+    source_ref: "mt32.cpp:110, mt32.cpp:154-160, munt ROMInfo.cpp:59, munt ROMInfo.cpp:89"
 
   - name: "ctrl_mt32_1_05.rom"
     path: "mt32-roms/ctrl_mt32_1_05.rom"
@@ -115,7 +115,7 @@ files:
     size: 65536
     sha1: "e17a3a6d265bf1fa150312061134293d2b58288c"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:114, src/midi/mt32.cpp:162-168, munt ROMInfo.cpp:62, munt ROMInfo.cpp:92"
+    source_ref: "mt32.cpp:114, mt32.cpp:162-168, munt ROMInfo.cpp:62, munt ROMInfo.cpp:92"
 
   - name: "ctrl_mt32_1_06.rom"
     path: "mt32-roms/ctrl_mt32_1_06.rom"
@@ -124,7 +124,7 @@ files:
     size: 65536
     sha1: "a553481f4e2794c10cfe597fef154eef0d8257de"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:118, src/midi/mt32.cpp:170-176, munt ROMInfo.cpp:65, munt ROMInfo.cpp:95"
+    source_ref: "mt32.cpp:118, mt32.cpp:170-176, munt ROMInfo.cpp:65, munt ROMInfo.cpp:95"
 
   - name: "ctrl_mt32_1_07.rom"
     path: "mt32-roms/ctrl_mt32_1_07.rom"
@@ -133,7 +133,7 @@ files:
     size: 65536
     sha1: "b083518fffb7f66b03c23b7eb4f868e62dc5a987"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:122, src/midi/mt32.cpp:178-184, munt ROMInfo.cpp:68, munt ROMInfo.cpp:98"
+    source_ref: "mt32.cpp:122, mt32.cpp:178-184, munt ROMInfo.cpp:68, munt ROMInfo.cpp:98"
 
   - name: "ctrl_mt32_bluer.rom"
     path: "mt32-roms/ctrl_mt32_bluer.rom"
@@ -142,7 +142,7 @@ files:
     size: 65536
     sha1: "7b8c2a5ddb42fd0732e2f22b3340dcf5360edf92"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:126, src/midi/mt32.cpp:186-192, munt ROMInfo.cpp:71, munt ROMInfo.cpp:101"
+    source_ref: "mt32.cpp:126, mt32.cpp:186-192, munt ROMInfo.cpp:71, munt ROMInfo.cpp:101"
 
   # -- MT-32 v2.x control ROMs, full images (131072 bytes) --
   # MAME dumps mt32_2.0.3.ic28, mt32_2.0.4.ic28 and mt32_2.0.7.ic28.
@@ -154,7 +154,7 @@ files:
     size: 131072
     sha1: "5837064c9df4741a55f7c4d8787ac158dff2d3ce"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:130, src/midi/mt32.cpp:194-200, munt ROMInfo.cpp:73, munt ROMInfo.cpp:103"
+    source_ref: "mt32.cpp:130, mt32.cpp:194-200, munt ROMInfo.cpp:73, munt ROMInfo.cpp:103"
 
   - name: "ctrl_mt32_2_04.rom"
     path: "mt32-roms/ctrl_mt32_2_04.rom"
@@ -163,7 +163,7 @@ files:
     size: 131072
     sha1: "2c16432b6c73dd2a3947cba950a0f4c19d6180eb"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:132, src/midi/mt32.cpp:202-208, munt ROMInfo.cpp:74, munt ROMInfo.cpp:104"
+    source_ref: "mt32.cpp:132, mt32.cpp:202-208, munt ROMInfo.cpp:74, munt ROMInfo.cpp:104"
 
   - name: "ctrl_mt32_2_06.rom"
     path: "mt32-roms/ctrl_mt32_2_06.rom"
@@ -172,7 +172,7 @@ files:
     size: 131072
     sha1: "2869cf4c235d671668cfcb62415e2ce8323ad4ed"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:134, src/midi/mt32.cpp:210-216, munt ROMInfo.cpp:75, munt ROMInfo.cpp:105"
+    source_ref: "mt32.cpp:134, mt32.cpp:210-216, munt ROMInfo.cpp:75, munt ROMInfo.cpp:105"
 
   - name: "ctrl_mt32_2_07.rom"
     path: "mt32-roms/ctrl_mt32_2_07.rom"
@@ -181,7 +181,7 @@ files:
     size: 131072
     sha1: "47b52adefedaec475c925e54340e37673c11707c"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:136, src/midi/mt32.cpp:218-224, munt ROMInfo.cpp:76, munt ROMInfo.cpp:106"
+    source_ref: "mt32.cpp:136, mt32.cpp:218-224, munt ROMInfo.cpp:76, munt ROMInfo.cpp:106"
 
   # -- CM-32L family control ROMs, full images (65536 bytes) --
   # MAME dumps lapc-i.v1.0.0.ic3.bin and cm32l_control.rom.
@@ -193,7 +193,7 @@ files:
     size: 65536
     sha1: "73683d585cd6948cc19547942ca0e14a0319456d"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:143, src/midi/mt32.cpp:226-232, munt ROMInfo.cpp:77, munt ROMInfo.cpp:107"
+    source_ref: "mt32.cpp:143, mt32.cpp:226-232, munt ROMInfo.cpp:77, munt ROMInfo.cpp:107"
 
   - name: "ctrl_cm32l_1_02.rom"
     path: "mt32-roms/ctrl_cm32l_1_02.rom"
@@ -202,7 +202,7 @@ files:
     size: 65536
     sha1: "a439fbb390da38cada95a7cbb1d6ca199cd66ef8"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:144, src/midi/mt32.cpp:234-240, munt ROMInfo.cpp:78, munt ROMInfo.cpp:108"
+    source_ref: "mt32.cpp:144, mt32.cpp:234-240, munt ROMInfo.cpp:78, munt ROMInfo.cpp:108"
 
   - name: "ctrl_cm32ln_1_00.rom"
     path: "mt32-roms/ctrl_cm32ln_1_00.rom"
@@ -211,7 +211,7 @@ files:
     size: 65536
     sha1: "dc1c5b1b90a4646d00f7daf3679733c7badc7077"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:145, src/midi/mt32.cpp:242-248, munt ROMInfo.cpp:79, munt ROMInfo.cpp:109"
+    source_ref: "mt32.cpp:145, mt32.cpp:242-248, munt ROMInfo.cpp:79, munt ROMInfo.cpp:109"
 
   # -- MT-32 control ROM chip dumps (32768 bytes each) --
   # The _a dump holds the even bytes, the _b dump the odd ones; munt
@@ -226,7 +226,7 @@ files:
     size: 32768
     sha1: "9cd4858014c4e8a9dff96053f784bfaac1092a2e"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:111, src/midi/mt32.cpp:154-160, munt ROMInfo.cpp:57, munt ROMInfo.cpp:87"
+    source_ref: "mt32.cpp:111, mt32.cpp:154-160, munt ROMInfo.cpp:57, munt ROMInfo.cpp:87"
 
   - name: "ctrl_mt32_1_04_b.rom"
     path: "mt32-roms/ctrl_mt32_1_04_b.rom"
@@ -235,7 +235,7 @@ files:
     size: 32768
     sha1: "fe8db469b5bfeb37edb269fd47e3ce6d91014652"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:112, src/midi/mt32.cpp:154-160, munt ROMInfo.cpp:58, munt ROMInfo.cpp:88"
+    source_ref: "mt32.cpp:112, mt32.cpp:154-160, munt ROMInfo.cpp:58, munt ROMInfo.cpp:88"
 
   - name: "ctrl_mt32_1_05_a.rom"
     path: "mt32-roms/ctrl_mt32_1_05_a.rom"
@@ -244,7 +244,7 @@ files:
     size: 32768
     sha1: "57a09d80d2f7ca5b9734edbe9645e6e700f83701"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:115, src/midi/mt32.cpp:162-168, munt ROMInfo.cpp:60, munt ROMInfo.cpp:90"
+    source_ref: "mt32.cpp:115, mt32.cpp:162-168, munt ROMInfo.cpp:60, munt ROMInfo.cpp:90"
 
   - name: "ctrl_mt32_1_05_b.rom"
     path: "mt32-roms/ctrl_mt32_1_05_b.rom"
@@ -253,7 +253,7 @@ files:
     size: 32768
     sha1: "52e3c6666db9ef962591a8ee99be0cde17f3a6b6"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:116, src/midi/mt32.cpp:162-168, munt ROMInfo.cpp:61, munt ROMInfo.cpp:91"
+    source_ref: "mt32.cpp:116, mt32.cpp:162-168, munt ROMInfo.cpp:61, munt ROMInfo.cpp:91"
 
   - name: "ctrl_mt32_1_06_a.rom"
     path: "mt32-roms/ctrl_mt32_1_06_a.rom"
@@ -262,7 +262,7 @@ files:
     size: 32768
     sha1: "cc83bf23cee533097fb4c7e2c116e43b50ebacc8"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:119, src/midi/mt32.cpp:170-176, munt ROMInfo.cpp:63, munt ROMInfo.cpp:93"
+    source_ref: "mt32.cpp:119, mt32.cpp:170-176, munt ROMInfo.cpp:63, munt ROMInfo.cpp:93"
 
   - name: "ctrl_mt32_1_06_b.rom"
     path: "mt32-roms/ctrl_mt32_1_06_b.rom"
@@ -271,7 +271,7 @@ files:
     size: 32768
     sha1: "bf4f15666bc46679579498386704893b630c1171"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:120, src/midi/mt32.cpp:170-176, munt ROMInfo.cpp:64, munt ROMInfo.cpp:94"
+    source_ref: "mt32.cpp:120, mt32.cpp:170-176, munt ROMInfo.cpp:64, munt ROMInfo.cpp:94"
 
   - name: "ctrl_mt32_1_07_a.rom"
     path: "mt32-roms/ctrl_mt32_1_07_a.rom"
@@ -280,7 +280,7 @@ files:
     size: 32768
     sha1: "13f06b38f0d9e0fc050b6503ab777bb938603260"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:123, src/midi/mt32.cpp:178-184, munt ROMInfo.cpp:66, munt ROMInfo.cpp:96"
+    source_ref: "mt32.cpp:123, mt32.cpp:178-184, munt ROMInfo.cpp:66, munt ROMInfo.cpp:96"
 
   - name: "ctrl_mt32_1_07_b.rom"
     path: "mt32-roms/ctrl_mt32_1_07_b.rom"
@@ -289,7 +289,7 @@ files:
     size: 32768
     sha1: "c55e165487d71fa88bd8c5e9c083bc456c1a89aa"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:124, src/midi/mt32.cpp:178-184, munt ROMInfo.cpp:67, munt ROMInfo.cpp:97"
+    source_ref: "mt32.cpp:124, mt32.cpp:178-184, munt ROMInfo.cpp:67, munt ROMInfo.cpp:97"
 
   - name: "ctrl_mt32_bluer_a.rom"
     path: "mt32-roms/ctrl_mt32_bluer_a.rom"
@@ -298,7 +298,7 @@ files:
     size: 32768
     sha1: "11a6ae5d8b6ee328b371af7f1e40b82125aa6b4d"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:127, src/midi/mt32.cpp:186-192, munt ROMInfo.cpp:69, munt ROMInfo.cpp:99"
+    source_ref: "mt32.cpp:127, mt32.cpp:186-192, munt ROMInfo.cpp:69, munt ROMInfo.cpp:99"
 
   - name: "ctrl_mt32_bluer_b.rom"
     path: "mt32-roms/ctrl_mt32_bluer_b.rom"
@@ -307,7 +307,7 @@ files:
     size: 32768
     sha1: "e0934320d7cbb5edfaa29e0d01ae835ef620085b"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:128, src/midi/mt32.cpp:186-192, munt ROMInfo.cpp:70, munt ROMInfo.cpp:100"
+    source_ref: "mt32.cpp:128, mt32.cpp:186-192, munt ROMInfo.cpp:70, munt ROMInfo.cpp:100"
 
   # -- PCM ROMs --
   # Every MT-32 model, v1.x and v2.x, pairs with the MT-32 PCM ROM. The CM-32L
@@ -325,7 +325,7 @@ files:
     note: >
       also serves as the first half of the CM-32L PCM ROM, paired with
       pcm_cm32l_h.rom
-    source_ref: "src/midi/mt32.cpp:138, src/midi/mt32.cpp:151, munt ROMInfo.cpp:83, munt ROMInfo.cpp:113, munt ROMInfo.cpp:115"
+    source_ref: "mt32.cpp:138, mt32.cpp:151, munt ROMInfo.cpp:83, munt ROMInfo.cpp:113, munt ROMInfo.cpp:115"
 
   - name: "pcm_mt32_l.rom"
     path: "mt32-roms/pcm_mt32_l.rom"
@@ -334,7 +334,7 @@ files:
     size: 262144
     sha1: "3a1e19b0cd4036623fd1d1d11f5f25995585962b"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:139, munt ROMInfo.cpp:81, munt ROMInfo.cpp:111"
+    source_ref: "mt32.cpp:139, munt ROMInfo.cpp:81, munt ROMInfo.cpp:111"
 
   - name: "pcm_mt32_h.rom"
     path: "mt32-roms/pcm_mt32_h.rom"
@@ -343,7 +343,7 @@ files:
     size: 262144
     sha1: "2cadb99d21a6a4a6f5b61b6218d16e9b43f61d01"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:140, munt ROMInfo.cpp:82, munt ROMInfo.cpp:112"
+    source_ref: "mt32.cpp:140, munt ROMInfo.cpp:82, munt ROMInfo.cpp:112"
 
   - name: "pcm_cm32l.rom"
     path: "mt32-roms/pcm_cm32l.rom"
@@ -352,7 +352,7 @@ files:
     size: 1048576
     sha1: "289cc298ad532b702461bfc738009d9ebe8025ea"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:147, src/midi/mt32.cpp:226-248, munt ROMInfo.cpp:85, munt ROMInfo.cpp:117"
+    source_ref: "mt32.cpp:147, mt32.cpp:226-248, munt ROMInfo.cpp:85, munt ROMInfo.cpp:117"
 
   - name: "pcm_cm32l_h.rom"
     path: "mt32-roms/pcm_cm32l_h.rom"
@@ -361,7 +361,7 @@ files:
     size: 524288
     sha1: "3ad889fde5db5b6437cbc2eb6e305312fec3df93"
     validation: [sha1, size]
-    source_ref: "src/midi/mt32.cpp:148, munt ROMInfo.cpp:84, munt ROMInfo.cpp:116"
+    source_ref: "mt32.cpp:148, munt ROMInfo.cpp:84, munt ROMInfo.cpp:116"
 
   # -- Roland SC-55 wave ROMs --
   # Shared by every SC-55 firmware version. The plugin scans one model
@@ -599,7 +599,7 @@ files:
       any SoundFont loads; GeneralUser GS, Fluid R3, the AWE32 4MB GM/GS/MT
       bank and the Trevor0402 SC-55 SoundFont are recognised by filename or
       RIFF INFO name and get their own reverb, chorus and filter presets
-    source_ref: "src/midi/fluidsynth.cpp:672-689, src/midi/fluidsynth.cpp:816-883, src/midi/fluidsynth.cpp:1229-1242"
+    source_ref: "fluidsynth.cpp:672-689, fluidsynth.cpp:816-883, fluidsynth.cpp:1229-1242"
 
   # -- PCjr system ROM --
 
@@ -613,7 +613,7 @@ files:
       the host working directory; bytes 0x3000 to 0xDFFF are copied to
       physical F3000. A short read leaves the region untouched and the
       cartridge still boots
-    source_ref: "src/dos/programs/boot.cpp:379-397, src/dos/programs/boot.cpp:83-124"
+    source_ref: "boot.cpp:379-397, boot.cpp:83-124"
 
   # -- LOADROM images --
   # Read from the mounted DOS drive under the name given on the command line
@@ -627,7 +627,7 @@ files:
     note: >
       accepted when the file is exactly 32768 bytes, starts with E9 8F 7E and
       carries the string IBM at offset 0x4CD4
-    source_ref: "src/dos/programs/loadrom.cpp:56-80, src/dos/programs/loadrom.cpp:95"
+    source_ref: "loadrom.cpp:56-80, loadrom.cpp:95"
 
   - name: "Video BIOS ROM"
     description: "Option ROM image mapped at C000:0 and initialised"
@@ -639,4 +639,4 @@ files:
       accepted when the file is 16384 bytes or larger, starts with 55 AA,
       has byte 3 masked to E8 and carries the string IBM at offset 0x1E;
       needs an EGA or better machine type
-    source_ref: "src/dos/programs/loadrom.cpp:56-75, src/dos/programs/loadrom.cpp:88-93"
+    source_ref: "loadrom.cpp:56-75, loadrom.cpp:88-93"
diff --git a/emulators/dosbox_pure.yml b/emulators/dosbox_pure.yml
index 4746a3aa..a9139e2b 100644
--- a/emulators/dosbox_pure.yml
+++ b/emulators/dosbox_pure.yml
@@ -48,7 +48,7 @@ files:
     size: 65536
     sha1: "5a5cb5a77d7d55ee69657c2f870416daed52dea7"
     validation: [sha1, size]
-    source_ref: "src/gui/mt32emu.h:5112, src/gui/mt32emu.h:5129"
+    source_ref: "mt32emu.h:5112, mt32emu.h:5129"
 
   - name: "MT32_CONTROL.ROM"
     description: "MT-32 Control v1.05"
@@ -57,7 +57,7 @@ files:
     size: 65536
     sha1: "e17a3a6d265bf1fa150312061134293d2b58288c"
     validation: [sha1, size]
-    source_ref: "src/gui/mt32emu.h:5113, src/gui/mt32emu.h:5130"
+    source_ref: "mt32emu.h:5113, mt32emu.h:5130"
 
   - name: "MT32_CONTROL.ROM"
     description: "MT-32 Control v1.06"
@@ -66,7 +66,7 @@ files:
     size: 65536
     sha1: "a553481f4e2794c10cfe597fef154eef0d8257de"
     validation: [sha1, size]
-    source_ref: "src/gui/mt32emu.h:5114, src/gui/mt32emu.h:5131"
+    source_ref: "mt32emu.h:5114, mt32emu.h:5131"
 
   - name: "MT32_CONTROL.ROM"
     description: "MT-32 Control v1.07"
@@ -75,7 +75,7 @@ files:
     size: 65536
     sha1: "b083518fffb7f66b03c23b7eb4f868e62dc5a987"
     validation: [sha1, size]
-    source_ref: "src/gui/mt32emu.h:5115, src/gui/mt32emu.h:5132"
+    source_ref: "mt32emu.h:5115, mt32emu.h:5132"
 
   - name: "MT32_CONTROL.ROM"
     description: "MT-32 Control BlueRidge"
@@ -84,7 +84,7 @@ files:
     size: 65536
     sha1: "7b8c2a5ddb42fd0732e2f22b3340dcf5360edf92"
     validation: [sha1, size]
-    source_ref: "src/gui/mt32emu.h:5116, src/gui/mt32emu.h:5133"
+    source_ref: "mt32emu.h:5116, mt32emu.h:5133"
 
   # -- MT-32 v2.x Control ROMs (128 KB) --
 
@@ -95,7 +95,7 @@ files:
     size: 131072
     sha1: "5837064c9df4741a55f7c4d8787ac158dff2d3ce"
     validation: [sha1, size]
-    source_ref: "src/gui/mt32emu.h:5118, src/gui/mt32emu.h:5135"
+    source_ref: "mt32emu.h:5118, mt32emu.h:5135"
 
   - name: "MT32_CONTROL.ROM"
     description: "MT-32 Control v2.04"
@@ -104,7 +104,7 @@ files:
     size: 131072
     sha1: "2c16432b6c73dd2a3947cba950a0f4c19d6180eb"
     validation: [sha1, size]
-    source_ref: "src/gui/mt32emu.h:5119, src/gui/mt32emu.h:5136"
+    source_ref: "mt32emu.h:5119, mt32emu.h:5136"
 
   - name: "MT32_CONTROL.ROM"
     description: "MT-32 Control v2.06"
@@ -113,7 +113,7 @@ files:
     size: 131072
     sha1: "2869cf4c235d671668cfcb62415e2ce8323ad4ed"
     validation: [sha1, size]
-    source_ref: "src/gui/mt32emu.h:5120, src/gui/mt32emu.h:5137"
+    source_ref: "mt32emu.h:5120, mt32emu.h:5137"
 
   - name: "MT32_CONTROL.ROM"
     description: "MT-32 Control v2.07"
@@ -122,7 +122,7 @@ files:
     size: 131072
     sha1: "47b52adefedaec475c925e54340e37673c11707c"
     validation: [sha1, size]
-    source_ref: "src/gui/mt32emu.h:5121, src/gui/mt32emu.h:5138"
+    source_ref: "mt32emu.h:5121, mt32emu.h:5138"
 
   # -- CM-32L / LAPC-I Control ROMs (64 KB) --
 
@@ -133,7 +133,7 @@ files:
     size: 65536
     sha1: "73683d585cd6948cc19547942ca0e14a0319456d"
     validation: [sha1, size]
-    source_ref: "src/gui/mt32emu.h:5122, src/gui/mt32emu.h:5139"
+    source_ref: "mt32emu.h:5122, mt32emu.h:5139"
 
   - name: "CM32L_CONTROL.ROM"
     description: "CM-32L/LAPC-I Control v1.02"
@@ -142,7 +142,7 @@ files:
     size: 65536
     sha1: "a439fbb390da38cada95a7cbb1d6ca199cd66ef8"
     validation: [sha1, size]
-    source_ref: "src/gui/mt32emu.h:5123, src/gui/mt32emu.h:5140"
+    source_ref: "mt32emu.h:5123, mt32emu.h:5140"
 
   # -- CM-32LN / CM-500 / LAPC-N Control ROM (64 KB) --
 
@@ -153,7 +153,7 @@ files:
     size: 65536
     sha1: "dc1c5b1b90a4646d00f7daf3679733c7badc7077"
     validation: [sha1, size]
-    source_ref: "src/gui/mt32emu.h:5124, src/gui/mt32emu.h:5141"
+    source_ref: "mt32emu.h:5124, mt32emu.h:5141"
 
   # -- PCM ROMs --
 
@@ -164,7 +164,7 @@ files:
     size: 524288
     sha1: "f6b1eebc4b2d200ec6d3d21d51325d5b48c60252"
     validation: [sha1, size]
-    source_ref: "src/gui/mt32emu.h:5126, src/gui/mt32emu.h:5143"
+    source_ref: "mt32emu.h:5126, mt32emu.h:5143"
     note: >
       accepted by every MT-32 control ROM, v1.x and v2.x. Each control ROM
       fixes the PCM size it accepts through its pcmCount: 128 requires this
@@ -178,7 +178,7 @@ files:
     sha1: "289cc298ad532b702461bfc738009d9ebe8025ea"
     validation: [sha1, size]
     aliases: ["CM32LN_PCM.ROM"]
-    source_ref: "src/gui/mt32emu.h:5127, src/gui/mt32emu.h:5144"
+    source_ref: "mt32emu.h:5127, mt32emu.h:5144"
     note: >
       accepted by the CM-32L and CM-32LN control ROMs, which carry pcmCount
       256 and require this 1048576 byte image. The alias covers the name
@@ -191,7 +191,7 @@ files:
     description: "General MIDI SoundFont (any .sf2/.sf3 accepted)"
     required: false
     hle_fallback: true
-    source_ref: "dosbox_pure_libretro.cpp:1439, dosbox_pure_libretro.cpp:2889"
+    source_ref: "dosbox_pure_libretro.cpp:1439, dosbox_pure_libretro.cpp:2846"
     note: >
       Any .SF2 or .SF3 file in the system directory works. The core lists all
       found SoundFonts in the MIDI config dropdown. DOSBOX.SF2 is the conventional
diff --git a/emulators/ep128emu.yml b/emulators/ep128emu.yml
index 45f6ab9b..1aed0bbd 100644
--- a/emulators/ep128emu.yml
+++ b/emulators/ep128emu.yml
@@ -74,7 +74,7 @@ files:
     system: enterprise-128
     has_builtin: true
     note: "Enterprise 128 EXOS 2.1. Default OS for EP128 machines."
-    source_ref: "core/core.cpp:237-240"
+    source_ref: "core/core.cpp:236-239"
 
   - name: exos20.rom
     path: ep128emu/roms/exos20.rom
@@ -84,7 +84,7 @@ files:
     system: enterprise-64
     has_builtin: true
     note: "Enterprise 64 EXOS 2.0. Used when EP64 machine type is selected."
-    source_ref: "core/core.cpp:229-232"
+    source_ref: "core/core.cpp:228-231"
 
   - name: exos24uk.rom
     path: ep128emu/roms/exos24uk.rom
@@ -94,7 +94,7 @@ files:
     system: enterprise-128
     has_builtin: true
     note: "Enterprise 128 EXOS 2.4 (UK). Used when enhanced ROM mode is enabled. 64K, loaded across segments 0-3."
-    source_ref: "core/core.cpp:217-224"
+    source_ref: "core/core.cpp:216-223"
 
   # ============================================================
   # Enterprise 64/128 - BASIC interpreter
@@ -108,7 +108,7 @@ files:
     system: enterprise-128
     has_builtin: true
     note: "Enterprise 128 BASIC 2.1. Loaded when cartridge mode is active (default)."
-    source_ref: "core/core.cpp:251, core/core.cpp:279"
+    source_ref: "core/core.cpp:250, core/core.cpp:278"
 
   - name: basic20.rom
     path: ep128emu/roms/basic20.rom
@@ -118,7 +118,7 @@ files:
     system: enterprise-64
     has_builtin: true
     note: "Enterprise 64 BASIC 2.0. Used with EP64 machine type."
-    source_ref: "core/core.cpp:249, core/core.cpp:267, core/core.cpp:277"
+    source_ref: "core/core.cpp:248, core/core.cpp:266, core/core.cpp:276"
 
   # ============================================================
   # Enterprise 64/128 - disk controllers
@@ -158,7 +158,7 @@ files:
     has_builtin: true
     bundled: true
     note: "Direct file I/O extension. Loaded for EP128_FILE and EP64_FILE modes. Source included in roms/ directory."
-    source_ref: "core/core.cpp:286-287"
+    source_ref: "core/core.cpp:285-286"
 
   - name: zt19uk.rom
     path: ep128emu/roms/zt19uk.rom
@@ -168,7 +168,7 @@ files:
     system: enterprise-128
     has_builtin: true
     note: "ZozoTools 1.9 (UK). Loaded for DTF (direct tape file) mode. 32K across segments 0x40-0x41."
-    source_ref: "core/core.cpp:290-293"
+    source_ref: "core/core.cpp:289-292"
 
   # ============================================================
   # Enterprise 64/128 - locale extensions
@@ -182,7 +182,7 @@ files:
     system: enterprise-128
     has_builtin: true
     note: "Hungarian language extension. Auto-loaded when content locale is Hungarian."
-    source_ref: "core/core.cpp:245-246"
+    source_ref: "core/core.cpp:244-245"
 
   - name: epdos16f.rom
     path: ep128emu/roms/epdos16f.rom
@@ -203,7 +203,7 @@ files:
     system: enterprise-128
     has_builtin: true
     note: "German (BRD) language extension. Auto-loaded when content locale is German."
-    source_ref: "core/core.cpp:263-264"
+    source_ref: "core/core.cpp:262-263"
 
   # epd19hft.rom and zt19hfnt.rom: listed in .info (firmware8, firmware9) but
   # NOT referenced in core source code and NOT in builtin_rom map (roms.hpp:46516-46538).
@@ -231,7 +231,7 @@ files:
     system: videoton-tvc
     has_builtin: true
     note: "TVC extension ROM v2.2. Loaded alongside tvc22_sys.rom."
-    source_ref: "core/core.cpp:366-367"
+    source_ref: "core/core.cpp:348-349"
 
   - name: tvcfileio.rom
     path: ep128emu/roms/tvcfileio.rom
@@ -242,7 +242,7 @@ files:
     has_builtin: true
     bundled: true
     note: "TVC direct file I/O extension. Used for TVC64_FILE mode. Source included in roms/ directory."
-    source_ref: "core/core.cpp:370-371"
+    source_ref: "core/core.cpp:352-353"
 
   - name: tvc_dos12d.rom
     path: ep128emu/roms/tvc_dos12d.rom
@@ -252,7 +252,7 @@ files:
     system: videoton-tvc
     has_builtin: true
     note: "TVC DOS 1.2d. Loaded for TVC64_DISK mode."
-    source_ref: "core/core.cpp:375-376"
+    source_ref: "core/core.cpp:357-358"
 
   # ============================================================
   # Amstrad CPC
@@ -266,7 +266,7 @@ files:
     system: amstrad-cpc
     has_builtin: true
     note: "CPC 464 combined ROM (OS + BASIC). 32K loaded at segments 0x10 (OS) and 0x00 (BASIC) with offset."
-    source_ref: "core/core.cpp:389-392"
+    source_ref: "core/core.cpp:371-374"
 
   - name: cpc664.rom
     path: ep128emu/roms/cpc664.rom
@@ -276,7 +276,7 @@ files:
     system: amstrad-cpc
     has_builtin: true
     note: "CPC 664 combined ROM (OS + BASIC). Used for CPC_664_DISK mode."
-    source_ref: "core/core.cpp:397-400"
+    source_ref: "core/core.cpp:379-382"
 
   - name: cpc6128.rom
     path: ep128emu/roms/cpc6128.rom
@@ -286,7 +286,7 @@ files:
     system: amstrad-cpc
     has_builtin: true
     note: "CPC 6128 combined ROM (OS + BASIC). Default CPC machine when no specific model requested."
-    source_ref: "core/core.cpp:406-409"
+    source_ref: "core/core.cpp:388-391"
 
   - name: cpc_amsdos.rom
     path: ep128emu/roms/cpc_amsdos.rom
@@ -296,7 +296,7 @@ files:
     system: amstrad-cpc
     has_builtin: true
     note: "AMSDOS disk controller ROM. Loaded for CPC_DISK and CPC_664_DISK modes."
-    source_ref: "core/core.cpp:413-414"
+    source_ref: "core/core.cpp:395-396"
 
   # ============================================================
   # ZX Spectrum
@@ -310,7 +310,7 @@ files:
     system: zx-spectrum
     has_builtin: true
     note: "ZX Spectrum 128K ROM. 32K loaded at segments 0x00-0x01."
-    source_ref: "core/core.cpp:436-439"
+    source_ref: "core/core.cpp:418-421"
 
   - name: zx48.rom
     path: ep128emu/roms/zx48.rom
@@ -320,4 +320,4 @@ files:
     system: zx-spectrum
     has_builtin: true
     note: "ZX Spectrum 48K ROM. Used for ZX16 and ZX48 modes."
-    source_ref: "core/core.cpp:443-444"
+    source_ref: "core/core.cpp:425-426"
diff --git a/emulators/fbneo.yml b/emulators/fbneo.yml
index bf793624..48babba4 100644
--- a/emulators/fbneo.yml
+++ b/emulators/fbneo.yml
@@ -100,7 +100,7 @@ files:
     size: 131072
     crc32: "9036d879"
     note: "MVS Asia/Europe ver. 5 (1 slot)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1665"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1645"
 
   - name: "sp-s.sp1"
     archive: neogeo.zip
@@ -109,7 +109,7 @@ files:
     size: 131072
     crc32: "c7f2fa45"
     note: "MVS Asia/Europe ver. 3 (4 slot)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1666"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1646"
 
   - name: "sp-u2.sp1"
     aliases: ["usa_2slt.bin"]
@@ -119,7 +119,7 @@ files:
     size: 131072
     crc32: "e72943de"
     note: "MVS USA ver. 5 (2 slot)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1667"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1647"
 
   - name: "sp1-u2"
     archive: neogeo.zip
@@ -128,7 +128,7 @@ files:
     size: 131072
     crc32: "62f021f4"
     note: "MVS USA ver. 5 (4 slot)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1668"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1648"
 
   - name: "sp-e.sp1"
     archive: neogeo.zip
@@ -137,7 +137,7 @@ files:
     size: 131072
     crc32: "2723a5b5"
     note: "MVS USA ver. 5 (6 slot)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1669"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1649"
 
   - name: "sp1-u4.bin"
     archive: neogeo.zip
@@ -146,7 +146,7 @@ files:
     size: 131072
     crc32: "1179a30f"
     note: "MVS USA (U4)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1670"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1650"
 
   - name: "sp1-u3.bin"
     archive: neogeo.zip
@@ -164,7 +164,7 @@ files:
     size: 131072
     crc32: "f0e8f27d"
     note: "MVS Japan ver. 6"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1672"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1652"
 
   - name: "sp-j2.sp1"
     archive: neogeo.zip
@@ -173,7 +173,7 @@ files:
     size: 131072
     crc32: "acede59c"
     note: "MVS Japan ver. 5"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1673"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1653"
 
   - name: "sp1.jipan.1024"
     archive: neogeo.zip
@@ -182,7 +182,7 @@ files:
     size: 131072
     crc32: "9fb0abe4"
     note: "MVS Japan ver. 3 (4 slot)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1674"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1654"
 
   - name: "sp-45.sp1"
     archive: neogeo.zip
@@ -209,7 +209,7 @@ files:
     size: 131072
     crc32: "dff6d41f"
     note: "MVS Japan (J3)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1677"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1657"
 
   - name: "sp1-j3.bin"
     archive: neogeo.zip
@@ -255,7 +255,7 @@ files:
     size: 131072
     crc32: "162f0ebe"
     note: "Deck ver. 6 (Git Ver 1.3)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1688"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1668"
 
   # Universe BIOS (third-party, multiple versions)
   - name: "uni-bios_4_0.rom"
@@ -265,7 +265,7 @@ files:
     size: 131072
     crc32: "a7aab458"
     note: "Universe BIOS ver. 4.0 (hack)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1689"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1669"
 
   - name: "uni-bios_3_3.rom"
     archive: neogeo.zip
@@ -274,7 +274,7 @@ files:
     size: 131072
     crc32: "24858466"
     note: "Universe BIOS ver. 3.3 (hack)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1690"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1670"
 
   - name: "uni-bios_3_2.rom"
     archive: neogeo.zip
@@ -310,7 +310,7 @@ files:
     size: 131072
     crc32: "27664eb5"
     note: "Universe BIOS ver. 2.3 (hack)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1694"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1674"
 
   - name: "uni-bios_2_3o.rom"
     archive: neogeo.zip
@@ -382,7 +382,7 @@ files:
     size: 131072
     crc32: "5dda0d84"
     note: "Universe BIOS ver. 1.1 (hack)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1702"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1682"
 
   - name: "uni-bios_1_0.rom"
     archive: neogeo.zip
@@ -400,7 +400,7 @@ files:
     size: 131072
     crc32: "cb915e76"
     note: "NeoOpen BIOS v0.1 beta (hack)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1705"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1685"
 
   # Neo Geo shared ROMs (always required)
   - name: "sm1.sm1"
@@ -428,7 +428,7 @@ files:
     size: 131072
     crc32: "5a86cff2"
     note: "Zoom lookup table"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1714"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1694"
 
   # -------------------------------------------------------
   # Neo Geo Trackball BIOS (for irrmaze)
@@ -470,7 +470,7 @@ files:
     size: 524288
     crc32: "148dd727"
     note: "PCB BIOS for KOF 2003 PCB"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1939"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1919"
 
   # -------------------------------------------------------
   # Neo Geo CDZ (neocdz.zip)
@@ -491,7 +491,7 @@ files:
     size: 524288
     crc32: "42f6b6c4"
     note: "Neo Geo CDZ custom BIOS by SMKDan"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:2024"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:2004"
 
   - name: "uni-bioscd33.rom"
     archive: neocdz.zip
@@ -500,7 +500,7 @@ files:
     size: 524288
     crc32: "ff3abc59"
     note: "Universe BIOS CD ver. 3.3 (hack)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:2025"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:2005"
 
   - name: "uni-bioscd32.rom"
     archive: neocdz.zip
@@ -1336,7 +1336,7 @@ files:
     size: 131072  # 0x20000
     crc32: "2292585c"
     note: "ISG Selection Master Type 2006 BIOS"
-    source_ref: "src/burn/drv/sega/d_sys16b.cpp:11720"
+    source_ref: "src/burn/drv/sega/d_sys16b.cpp:11495"
 
   # -------------------------------------------------------
   # NMK16 (nmk004.zip)
@@ -1396,7 +1396,7 @@ files:
     size: 69632  # 0x11000
     crc32: "aa11ee2d"
     note: "Seta ST010 coprocessor microcode"
-    source_ref: "src/burn/drv/snes/d_snes.cpp:580"
+    source_ref: "src/burn/drv/snes/d_snes.cpp:577"
 
   - name: "st011.bin"
     archive: st011.zip
@@ -1405,7 +1405,7 @@ files:
     size: 69632  # 0x11000
     crc32: "34d2952c"
     note: "Seta ST011 coprocessor microcode"
-    source_ref: "src/burn/drv/snes/d_snes.cpp:599"
+    source_ref: "src/burn/drv/snes/d_snes.cpp:596"
 
   - name: "dsp1.bin"
     archive: dsp1.zip
@@ -1414,7 +1414,7 @@ files:
     size: 10240  # 0x2800
     crc32: "2838f9f5"
     note: "DSP-1 coprocessor microcode"
-    source_ref: "src/burn/drv/snes/d_snes.cpp:676"
+    source_ref: "src/burn/drv/snes/d_snes.cpp:654"
 
   - name: "dsp1b.bin"
     archive: dsp1b.zip
@@ -1423,7 +1423,7 @@ files:
     size: 10240  # 0x2800
     crc32: "453557e0"
     note: "DSP-1B coprocessor microcode (revised)"
-    source_ref: "src/burn/drv/snes/d_snes.cpp:695"
+    source_ref: "src/burn/drv/snes/d_snes.cpp:673"
 
   - name: "dsp2.bin"
     archive: dsp2.zip
@@ -1432,7 +1432,7 @@ files:
     size: 10240  # 0x2800
     crc32: "8e9fbd9b"
     note: "DSP-2 coprocessor microcode"
-    source_ref: "src/burn/drv/snes/d_snes.cpp:714"
+    source_ref: "src/burn/drv/snes/d_snes.cpp:692"
 
   - name: "dsp3.bin"
     archive: dsp3.zip
@@ -1441,7 +1441,7 @@ files:
     size: 10240  # 0x2800
     crc32: "6b86728a"
     note: "DSP-3 coprocessor microcode"
-    source_ref: "src/burn/drv/snes/d_snes.cpp:733"
+    source_ref: "src/burn/drv/snes/d_snes.cpp:711"
 
   - name: "dsp4.bin"
     archive: dsp4.zip
@@ -1450,7 +1450,7 @@ files:
     size: 10240  # 0x2800
     crc32: "ce0c7783"
     note: "DSP-4 coprocessor microcode"
-    source_ref: "src/burn/drv/snes/d_snes.cpp:752"
+    source_ref: "src/burn/drv/snes/d_snes.cpp:730"
 
   # -------------------------------------------------------
   # System support files (fbneo/)
@@ -1522,7 +1522,7 @@ files:
     required: true
     size: 163840
     crc32: "5c403cc5"
-    source_ref: "src/burn/drv/snes/d_snes.cpp:684"
+    source_ref: "src/burn/drv/snes/d_snes.cpp:662"
 
   - name: "136032.205.l13"
     archive: atarisy1.zip
diff --git a/emulators/fbneo_neogeo.yml b/emulators/fbneo_neogeo.yml
index afd96ba2..02f26368 100644
--- a/emulators/fbneo_neogeo.yml
+++ b/emulators/fbneo_neogeo.yml
@@ -61,7 +61,7 @@ files:
     size: 131072
     crc32: "9036d879"
     note: "MVS Asia/Europe ver. 5 (1 slot)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1665"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1645"
 
   - name: "sp-s.sp1"
     archive: neogeo.zip
@@ -70,7 +70,7 @@ files:
     size: 131072
     crc32: "c7f2fa45"
     note: "MVS Asia/Europe ver. 3 (4 slot)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1666"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1646"
 
   - name: "sp-u2.sp1"
     aliases: ["usa_2slt.bin"]
@@ -80,7 +80,7 @@ files:
     size: 131072
     crc32: "e72943de"
     note: "MVS USA ver. 5 (2 slot)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1667"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1647"
 
   - name: "sp1-u2"
     archive: neogeo.zip
@@ -89,7 +89,7 @@ files:
     size: 131072
     crc32: "62f021f4"
     note: "MVS USA ver. 5 (4 slot)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1668"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1648"
 
   - name: "sp-e.sp1"
     archive: neogeo.zip
@@ -98,7 +98,7 @@ files:
     size: 131072
     crc32: "2723a5b5"
     note: "MVS USA ver. 5 (6 slot)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1669"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1649"
 
   - name: "sp1-u4.bin"
     archive: neogeo.zip
@@ -107,7 +107,7 @@ files:
     size: 131072
     crc32: "1179a30f"
     note: "MVS USA (U4)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1670"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1650"
 
   - name: "sp1-u3.bin"
     archive: neogeo.zip
@@ -125,7 +125,7 @@ files:
     size: 131072
     crc32: "f0e8f27d"
     note: "MVS Japan ver. 6"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1672"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1652"
 
   - name: "sp-j2.sp1"
     archive: neogeo.zip
@@ -134,7 +134,7 @@ files:
     size: 131072
     crc32: "acede59c"
     note: "MVS Japan ver. 5"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1673"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1653"
 
   - name: "sp1.jipan.1024"
     archive: neogeo.zip
@@ -143,7 +143,7 @@ files:
     size: 131072
     crc32: "9fb0abe4"
     note: "MVS Japan ver. 3 (4 slot)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1674"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1654"
 
   - name: "sp-45.sp1"
     archive: neogeo.zip
@@ -170,7 +170,7 @@ files:
     size: 131072
     crc32: "dff6d41f"
     note: "MVS Japan (J3)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1677"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1657"
 
   - name: "sp1-j3.bin"
     archive: neogeo.zip
@@ -215,7 +215,7 @@ files:
     size: 131072
     crc32: "162f0ebe"
     note: "Deck ver. 6 (Git Ver 1.3)"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1688"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1668"
 
   # Universe BIOS (third-party, multiple versions)
   - name: "uni-bios_4_0.rom"
@@ -225,7 +225,7 @@ files:
     size: 131072
     crc32: "a7aab458"
     note: "Universe BIOS ver. 4.0"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1689"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1669"
 
   - name: "uni-bios_3_3.rom"
     archive: neogeo.zip
@@ -234,7 +234,7 @@ files:
     size: 131072
     crc32: "24858466"
     note: "Universe BIOS ver. 3.3"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1690"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1670"
 
   - name: "uni-bios_3_2.rom"
     archive: neogeo.zip
@@ -270,7 +270,7 @@ files:
     size: 131072
     crc32: "27664eb5"
     note: "Universe BIOS ver. 2.3"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1694"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1674"
 
   - name: "uni-bios_2_3o.rom"
     archive: neogeo.zip
@@ -342,7 +342,7 @@ files:
     size: 131072
     crc32: "5dda0d84"
     note: "Universe BIOS ver. 1.1"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1702"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1682"
 
   - name: "uni-bios_1_0.rom"
     archive: neogeo.zip
@@ -360,7 +360,7 @@ files:
     size: 131072
     crc32: "cb915e76"
     note: "NeoOpen BIOS v0.1 beta"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1705"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1685"
 
   # Neo Geo shared ROMs (always required)
   - name: "sm1.sm1"
@@ -388,7 +388,7 @@ files:
     size: 131072
     crc32: "5a86cff2"
     note: "Zoom lookup table"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1714"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1694"
 
   # -------------------------------------------------------
   # Neo Geo Trackball BIOS (for irrmaze)
@@ -430,7 +430,7 @@ files:
     size: 524288
     crc32: "148dd727"
     note: "PCB BIOS for KOF 2003 PCB"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1939"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:1919"
 
   # -------------------------------------------------------
   # Neo Geo CDZ (neocdz.zip)
@@ -451,7 +451,7 @@ files:
     size: 524288
     crc32: "42f6b6c4"
     note: "Neo Geo CDZ custom BIOS by SMKDan"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:2024"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:2004"
 
   - name: "uni-bioscd33.rom"
     archive: neocdz.zip
@@ -460,7 +460,7 @@ files:
     size: 524288
     crc32: "ff3abc59"
     note: "Universe BIOS CD ver. 3.3"
-    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:2025"
+    source_ref: "src/burn/drv/neogeo/d_neogeo.cpp:2005"
 
   - name: "uni-bioscd32.rom"
     archive: neocdz.zip
diff --git a/emulators/lindbergh-loader.yml b/emulators/lindbergh-loader.yml
index 48231028..7143a4c8 100644
--- a/emulators/lindbergh-loader.yml
+++ b/emulators/lindbergh-loader.yml
@@ -70,7 +70,7 @@ files:
     required: true
     validation: [signature]
     description: "NVIDIA Cg 2.0.0.12 runtime used to recompile the game shaders"
-    source_ref: "src/lindbergh/shaderPatches.c:1028-1108, src/lindbergh/shaderPatches.c:1110-1170"
+    source_ref: "shaderPatches.c:1028-1108, shaderPatches.c:1110-1170"
     note: >-
       Searched at LIBCG_PATH, /app/lib32/libCg2.so, $APP_IMG_ROOT/usr/lib32/
       libCg2.so, then ./libCg.so and $LINDBERGH_LOADER_CURRENT_DIR/libCg.so. The
@@ -85,7 +85,7 @@ files:
     system: sega-lindbergh
     required: true
     description: "NVIDIA Cg 3.1 OpenGL runtime linked by the game binaries"
-    source_ref: "src/lindbergh/lindbergh.c:336-378, scripts/flatpak/com.github.lindberghloader.yml:181-189"
+    source_ref: "lindbergh.c:336-378, scripts/flatpak/com.github.lindberghloader.yml:181-189"
     note: >-
       Resolved by the dynamic linker for the game ELF through the
       LD_LIBRARY_PATH the launcher builds, not opened by loader code. Upstream
@@ -97,7 +97,7 @@ files:
     system: sega-lindbergh
     required: true
     description: "NVIDIA Cg 3.1 runtime linked by the game binaries"
-    source_ref: "src/lindbergh/lindbergh.c:336-378, scripts/flatpak/com.github.lindberghloader.yml:181-189"
+    source_ref: "lindbergh.c:336-378, scripts/flatpak/com.github.lindberghloader.yml:181-189"
     note: >-
       Same origin and mechanism as libCgGL.so, and a different build from the
       2.0.0.12 library the shader recompiler loads. Batocera keeps the two Cg
@@ -111,7 +111,7 @@ files:
     system: sega-lindbergh
     required: false
     description: "OpenSSL 0.9.7 crypto library linked by the networked games"
-    source_ref: "src/lindbergh/lindbergh.c:336-378, scripts/flatpak/com.github.lindberghloader.yml:244"
+    source_ref: "lindbergh.c:336-378, scripts/flatpak/com.github.lindberghloader.yml:244"
     note: >-
       Vendored as libs/libcrypto.so.0.9.7 and installed into the runtime library
       directory by both the AppImage and Flatpak builds. Resolved by the dynamic
@@ -121,14 +121,14 @@ files:
     system: sega-lindbergh
     required: false
     description: "OpenSSL 0.9.7 TLS library linked by the networked games"
-    source_ref: "src/lindbergh/lindbergh.c:336-378, scripts/flatpak/com.github.lindberghloader.yml:245"
+    source_ref: "lindbergh.c:336-378, scripts/flatpak/com.github.lindberghloader.yml:245"
     note: "Vendored as libs/libssl.so.0.9.7, paired with libcrypto.so.0.9.7."
 
   - name: libopenal.so.0
     system: sega-lindbergh
     required: false
     description: "OpenAL runtime preloaded for Quiz Answer x Answer"
-    source_ref: "src/lindbergh/lindbergh.c:22, src/lindbergh/lindbergh.c:315-328, src/lindbergh/lindbergh.c:882-890"
+    source_ref: "lindbergh.c:22, lindbergh.c:315-328, lindbergh.c:882-890"
     note: >-
       When the ELF is q2satl_lind the launcher looks the file up through
       findPreloadLibrary and appends it to LD_PRELOAD. Absence prints "You might
@@ -143,7 +143,7 @@ files:
     crc32: "38d56318"
     validation: [crc32]
     description: "Sega Lindbergh boot and hardware check program, version 2.4"
-    source_ref: "src/lindbergh/lindbergh.c:696-698, src/lindbergh/lindbergh.c:892-895, config.h:57-58, src/lindbergh/gameData.c:51-52"
+    source_ref: "lindbergh.c:696-698, lindbergh.c:892-895, config.h:57-58, gameData.c:51-52"
     note: >-
       Run as "segaboot -t" under -s or --segaboot. detectGame() matches the
       ELF CRC32 against the table, where 0x38d56318 is Segaboot 2.4 and
@@ -159,7 +159,7 @@ files:
     required: false
     hle_fallback: true
     description: "Lindbergh boot logo, read from /usr/lib/boot on the original system"
-    source_ref: "src/lindbergh/hook.c:655-667, src/lindbergh/hook.c:888-900"
+    source_ref: "hook.c:655-667, hook.c:888-900"
     note: >-
       Read from the game directory only when DISABLE_BUILTIN_LOGOS is set.
       Otherwise the logoLL array in resources/logo.h answers the read.
@@ -169,7 +169,7 @@ files:
     required: false
     hle_fallback: true
     description: "Lindbergh Red boot logo, read from /usr/lib/boot on the original system"
-    source_ref: "src/lindbergh/hook.c:669-681, src/lindbergh/hook.c:874-886"
+    source_ref: "hook.c:669-681, hook.c:874-886"
     note: >-
       Read from the game directory only when DISABLE_BUILTIN_LOGOS is set.
       Otherwise the logoLLRed array in resources/logo.h answers the read.
@@ -179,7 +179,7 @@ files:
     required: false
     hle_fallback: true
     description: "Sega Kaku Gothic console font texture"
-    source_ref: "src/lindbergh/hook.c:718-730, src/lindbergh/hook.c:902-914"
+    source_ref: "hook.c:718-730, hook.c:902-914"
     note: >-
       Read from the game directory only when DISABLE_BUILTIN_FONT is set.
       Otherwise the fontTGA array in resources/font.h answers the read.
@@ -189,7 +189,7 @@ files:
     required: false
     hle_fallback: true
     description: "Sega Kaku Gothic console font metrics"
-    source_ref: "src/lindbergh/hook.c:732-744, src/lindbergh/hook.c:916-928"
+    source_ref: "hook.c:732-744, hook.c:916-928"
     note: >-
       Read from the game directory only when DISABLE_BUILTIN_FONT is set.
       Otherwise the fontABC array in resources/font.h answers the read, with
@@ -200,7 +200,7 @@ files:
     required: false
     hle_fallback: true
     description: "Lucida Console font texture"
-    source_ref: "src/lindbergh/hook.c:683-695"
+    source_ref: "hook.c:683-695"
     note: >-
       Read from the game directory only when DISABLE_BUILTIN_FONT is set.
       Otherwise the fontTGA array in resources/font.h answers the read.
@@ -210,7 +210,7 @@ files:
     required: false
     hle_fallback: true
     description: "Lucida Console font metrics"
-    source_ref: "src/lindbergh/hook.c:697-709"
+    source_ref: "hook.c:697-709"
     note: >-
       Read from the game directory only when DISABLE_BUILTIN_FONT is set.
       Otherwise the fontABC array in resources/font.h answers the read.
@@ -221,7 +221,7 @@ files:
     system: sega-lindbergh
     required: false
     description: "Lindbergh runtime configuration read by the games from /root"
-    source_ref: "src/lindbergh/hook.c:650-653"
+    source_ref: "hook.c:650-653"
     note: >-
       The fopen hook rewrites /root/lindbergrc to lindbergrc in the game
       directory. The loader neither creates the file nor substitutes for it.
@@ -231,7 +231,7 @@ files:
     category: game_data
     required: false
     description: "SDL gamepad mappings added on top of the built-in table"
-    source_ref: "src/lindbergh/lindbergh.c:415-430, src/lindbergh/lindbergh.c:478, src/lindbergh/sdlInput.c:209-217"
+    source_ref: "lindbergh.c:415-430, lindbergh.c:478, sdlInput.c:209-217"
     note: >-
       Loaded from the path given by -d or --controllerdb, passed through the
       LINDBERGH_CONTROLS_DB_PATH environment variable. The built-in mappings in
diff --git a/emulators/lrps2.yml b/emulators/lrps2.yml
index 5b4421d7..d47477bb 100644
--- a/emulators/lrps2.yml
+++ b/emulators/lrps2.yml
@@ -68,7 +68,7 @@ files:
     hle_fallback: true
     size: 1024
     description: "NVRAM / EEPROM data"
-    source_ref: "pcsx2/CDVD/CDVD.cpp:224-267"
+    source_ref: "pcsx2/CDVD/CDVD.cpp:201-244"
     note: >
       Console EEPROM data (language, timezone, region, iLink ID, OSD settings).
       Path derived from BIOS path with extension replaced to .nvm.
@@ -80,7 +80,7 @@ files:
     hle_fallback: true
     size: 4
     description: "Mechacon version"
-    source_ref: "pcsx2/CDVD/CDVD.cpp:255-266"
+    source_ref: "pcsx2/CDVD/CDVD.cpp:232-243"
     note: >
       Mechacon (disc drive controller) version as u32.
       Auto-created with default 0x00020603 if missing.
@@ -89,7 +89,7 @@ files:
     path: "pcsx2/resources/GameIndex.yaml"
     required: false
     description: "game compatibility database"
-    source_ref: "pcsx2/GameDatabase.cpp:47, pcsx2/GameDatabase.cpp:904"
+    source_ref: "pcsx2/GameDatabase.cpp:47, pcsx2/GameDatabase.cpp:896"
     note: >
       YAML database of per-game patches, settings overrides, and compatibility fixes.
       OSD warning shown if missing. Some games may not boot or have issues without it.
diff --git a/emulators/mame.yml b/emulators/mame.yml
index 84d149c8..11a7ff10 100644
--- a/emulators/mame.yml
+++ b/emulators/mame.yml
@@ -906,7 +906,7 @@ files:
     required: true
     category: bios_zip
     system: sega-triforce
-    source_ref: "src/mame/sega/triforce.cpp:1322"
+    source_ref: "src/mame/sega/triforce.cpp:1316"
     contents:
       - name: triforce_bootrom.bin
         size: 2097152
@@ -926,7 +926,7 @@ files:
   - name: sammymdl.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/sigma/sammymdl.cpp:1021"
+    source_ref: "src/mame/sigma/sammymdl.cpp:1023"
     contents:
       - name: vm1211l01.u2
         description: IPL Ver. 5.0
@@ -949,7 +949,7 @@ files:
     required: true
     category: bios_zip
     system: sega-megaplay
-    source_ref: "src/mame/sega/megaplay.cpp:1022"
+    source_ref: "src/mame/sega/megaplay.cpp:1020"
     contents:
       - name: ep15294.ic2
         size: 131072
@@ -989,7 +989,7 @@ files:
     required: true
     category: bios_zip
     system: sega-megatech
-    source_ref: "src/mame/sega/megatech.cpp:1406"
+    source_ref: "src/mame/sega/megatech.cpp:1418"
     contents:
       - name: epr-12664.20
         description: Ver 1
@@ -1401,7 +1401,7 @@ files:
     required: true
     category: bios_zip
     system: commodore-cubo
-    source_ref: "src/mame/amiga/cubo.cpp:1439"
+    source_ref: "src/mame/amiga/cubo.cpp:1437"
     contents:
       - name: 391640-03.u6a
         size: 1048576
@@ -1483,7 +1483,7 @@ files:
     required: true
     category: bios_zip
     system: konami-gv
-    source_ref: "src/mame/konami/konamigv.cpp:1453"
+    source_ref: "src/mame/konami/konamigv.cpp:1450"
     contents:
       - name: 999a01.7e
         size: 524288
@@ -1493,7 +1493,7 @@ files:
   - name: kviper.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/konami/viper.cpp:3105"
+    source_ref: "src/mame/konami/viper.cpp:3159"
     contents:
       - name: 941b01.u25
         size: 262144
@@ -1512,7 +1512,7 @@ files:
     required: true
     category: bios_zip
     system: konami-twinkle
-    source_ref: "src/mame/konami/twinkle.cpp:1624"
+    source_ref: "src/mame/konami/twinkle.cpp:1636"
 
   - name: bubsys.zip
     required: true
@@ -1571,7 +1571,7 @@ files:
     required: true
     category: bios_zip
     system: capcom-zn1
-    source_ref: "src/mame/sony/zn.cpp:5973"
+    source_ref: "src/mame/sony/zn.cpp:5971"
     contents:
       - name: m534002c-13.ic353
         description: japan
@@ -1592,7 +1592,7 @@ files:
     required: true
     category: bios_zip
     system: capcom-zn2
-    source_ref: "src/mame/sony/zn.cpp:6059"
+    source_ref: "src/mame/sony/zn.cpp:6057"
     contents:
       - name: m534002c-59.ic353
         size: 524288
@@ -1606,7 +1606,7 @@ files:
   - name: coh1000t.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/sony/zn.cpp:5993"
+    source_ref: "src/mame/sony/zn.cpp:5991"
     contents:
       - name: m534002c-14.ic353
         size: 524288
@@ -1620,7 +1620,7 @@ files:
   - name: coh1000a.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/sony/zn.cpp:6019"
+    source_ref: "src/mame/sony/zn.cpp:6017"
     contents:
       - name: m534002c-15.ic353
         size: 524288
@@ -1676,7 +1676,7 @@ files:
   - name: coh1002e.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/sony/zn.cpp:6042"
+    source_ref: "src/mame/sony/zn.cpp:6040"
     contents:
       - name: m27c402cz-54.ic353
         size: 524288
@@ -1690,7 +1690,7 @@ files:
   - name: coh1002m.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/sony/zn.cpp:6093"
+    source_ref: "src/mame/sony/zn.cpp:6091"
     contents:
       - name: m534002c-61.ic353
         size: 524288
@@ -1769,7 +1769,7 @@ files:
   - name: taitotz.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/taito/taitotz.cpp:3020"
+    source_ref: "src/mame/taito/taitotz.cpp:3018"
     contents:
       - name: e68-05-1.ic6
         size: 524288
@@ -1882,7 +1882,7 @@ files:
     required: true
     category: bios_zip
     system: hyper-neogeo64
-    source_ref: "src/mame/snk/hng64.cpp:3232"
+    source_ref: "src/mame/snk/hng64.cpp:3235"
     contents:
       - name: brom1.bin
         size: 524288
@@ -2139,7 +2139,7 @@ files:
   - name: aristmk5.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/acorn/aristmk5.cpp:9308"
+    source_ref: "src/mame/acorn/aristmk5.cpp:9303"
 
   - name: aristmk6.zip
     required: true
@@ -2575,7 +2575,7 @@ files:
   - name: gp_110.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/pinball/gp_1.cpp:571"
+    source_ref: "src/mame/pinball/gp_1.cpp:573"
     contents:
       - name: a-110.u12
         size: 2048
@@ -2589,7 +2589,7 @@ files:
   - name: gts1.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/pinball/gts1.cpp:1062"
+    source_ref: "src/mame/pinball/gts1.cpp:1066"
     contents:
       - name: a1752cf.u5
         size: 2048
@@ -3098,7 +3098,7 @@ files:
   - name: pumpitup.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/misc/xtom3d.cpp:999"
+    source_ref: "src/mame/misc/xtom3d.cpp:998"
     contents:
       - name: mk3_1.0_bios.u22
         description: mk3 v1.0
@@ -3158,7 +3158,7 @@ files:
     required: true
     category: bios_zip
     system: apple2gs
-    source_ref: "src/mame/apple/apple2gs.cpp:3853-3867"
+    source_ref: "src/mame/apple/apple2gs.cpp:3868-3882"
     contents:
       - name: 341s0632-2.bin
         description: ADB microcontroller ROM (M50740/50741)
@@ -3356,7 +3356,7 @@ files:
     required: true
     category: bios_zip
     system: sega-beena
-    source_ref: "src/mame/sega/sega_beena.cpp:2239-2251"
+    source_ref: "src/mame/sega/sega_beena.cpp:2237-2249"
     contents:
       - name: 9h0-0008.bios.ic1
         description: SoC internal BIOS (ARM7, dumped via JTAG)
@@ -3603,7 +3603,7 @@ files:
     required: true
     category: bios_zip
     system: vtech-vsmile
-    source_ref: "src/mame/vtech/vsmile.cpp:359-389"
+    source_ref: "src/mame/vtech/vsmile.cpp:364-394"
     note: "MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS. Clone: vsmilem (V.Smile Motion)."
     validation: [crc32]
     contents:
@@ -4187,7 +4187,7 @@ files:
     required: true
     category: bios_zip
     system: tutor
-    source_ref: "src/mame/tomy/tutor.cpp:794-797"
+    source_ref: "src/mame/tomy/tutor.cpp:796-799"
     note: >-
       Tomy Tutor home computer (1983). TMS9995 CPU @10.7MHz, TMS9928A VDP,
       SN76489AN sound. 3 machines: tutor (parent, US/UK), pyuuta (clone,
@@ -4275,7 +4275,7 @@ files:
   - name: ekara.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/tvgames/xavix.cpp:2956"
+    source_ref: "src/mame/tvgames/xavix.cpp:2930"
     contents:
       - name: ekara.bin
         size: 1048576
@@ -4305,7 +4305,7 @@ files:
   - name: ekarag.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/tvgames/xavix.cpp:2959"
+    source_ref: "src/mame/tvgames/xavix.cpp:2933"
     contents:
       - name: ekaragermany.bin
         size: 2097152
@@ -4325,7 +4325,7 @@ files:
   - name: isinger.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/tvgames/xavix.cpp:2962"
+    source_ref: "src/mame/tvgames/xavix.cpp:2936"
     contents:
       - name: kr_isinger.bin
         size: 1048576
@@ -4335,7 +4335,7 @@ files:
   - name: ekaraphs.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/tvgames/xavix.cpp:2965"
+    source_ref: "src/mame/tvgames/xavix.cpp:2939"
     contents:
       - name: ekaraheadset.bin
         size: 2097152
diff --git a/emulators/mame2003.yml b/emulators/mame2003.yml
index 8455c923..fc80acab 100644
--- a/emulators/mame2003.yml
+++ b/emulators/mame2003.yml
@@ -65,7 +65,7 @@ files:
     path: "mame2003/history.dat"
     required: false
     category: game_data
-    source_ref: "src/datafile.c:327, src/datafile.c:563"
+    source_ref: "src/datafile.c:327, src/datafile.c:578"
     note: "game history and information database"
 
   - name: mameinfo.dat
@@ -146,14 +146,14 @@ files:
     required: true
     category: bios_zip
     system: sega-megaplay
-    source_ref: "src/drivers/segac2.c:4468"
+    source_ref: "src/drivers/segac2.c:4483"
 
   # Sega Mega Tech
   - name: megatech.zip
     required: true
     category: bios_zip
     system: sega-megatech
-    source_ref: "src/drivers/segac2.c:4390"
+    source_ref: "src/drivers/segac2.c:4405"
 
   # DECO Cassette
   - name: decocass.zip
diff --git a/emulators/mamearcade.yml b/emulators/mamearcade.yml
index 59c74df9..3e29a342 100644
--- a/emulators/mamearcade.yml
+++ b/emulators/mamearcade.yml
@@ -709,7 +709,7 @@ files:
     required: true
     category: bios_zip
     system: sammy-medal
-    source_ref: "src/mame/sigma/sammymdl.cpp:1021"
+    source_ref: "src/mame/sigma/sammymdl.cpp:1023"
     contents:
       - name: vm1211l01.u2
         description: IPL Ver. 5.0
@@ -732,7 +732,7 @@ files:
     required: true
     category: bios_zip
     system: sega-megaplay
-    source_ref: "src/mame/sega/megaplay.cpp:1022"
+    source_ref: "src/mame/sega/megaplay.cpp:1020"
     contents:
       - name: ep15294.ic2
         size: 131072
@@ -772,7 +772,7 @@ files:
     required: true
     category: bios_zip
     system: sega-megatech
-    source_ref: "src/mame/sega/megatech.cpp:1406"
+    source_ref: "src/mame/sega/megatech.cpp:1418"
     contents:
       - name: epr-12664.20
         description: Ver 1
@@ -1155,7 +1155,7 @@ files:
     required: true
     category: bios_zip
     system: commodore-cubo
-    source_ref: "src/mame/amiga/cubo.cpp:1439"
+    source_ref: "src/mame/amiga/cubo.cpp:1437"
     contents:
       - name: 391640-03.u6a
         size: 1048576
@@ -1216,7 +1216,7 @@ files:
     required: true
     category: bios_zip
     system: konami-gv
-    source_ref: "src/mame/konami/konamigv.cpp:1453"
+    source_ref: "src/mame/konami/konamigv.cpp:1450"
     contents:
       - name: 999a01.7e
         size: 524288
@@ -1227,7 +1227,7 @@ files:
     required: true
     category: bios_zip
     system: konami-viper
-    source_ref: "src/mame/konami/viper.cpp:3105"
+    source_ref: "src/mame/konami/viper.cpp:3159"
     contents:
       - name: 941b01.u25
         size: 262144
@@ -1246,7 +1246,7 @@ files:
     required: true
     category: bios_zip
     system: konami-twinkle
-    source_ref: "src/mame/konami/twinkle.cpp:1624"
+    source_ref: "src/mame/konami/twinkle.cpp:1636"
 
   - name: bubsys.zip
     required: true
@@ -1276,7 +1276,7 @@ files:
     required: true
     category: bios_zip
     system: capcom-zn1
-    source_ref: "src/mame/sony/zn.cpp:5973"
+    source_ref: "src/mame/sony/zn.cpp:5971"
     contents:
       - name: m534002c-13.ic353
         description: japan
@@ -1297,7 +1297,7 @@ files:
     required: true
     category: bios_zip
     system: capcom-zn2
-    source_ref: "src/mame/sony/zn.cpp:6059"
+    source_ref: "src/mame/sony/zn.cpp:6057"
     contents:
       - name: m534002c-59.ic353
         size: 524288
@@ -1312,7 +1312,7 @@ files:
     required: true
     category: bios_zip
     system: taito-fx1
-    source_ref: "src/mame/sony/zn.cpp:5993"
+    source_ref: "src/mame/sony/zn.cpp:5991"
     contents:
       - name: m534002c-14.ic353
         size: 524288
@@ -1327,7 +1327,7 @@ files:
     required: true
     category: bios_zip
     system: acclaim-zn1
-    source_ref: "src/mame/sony/zn.cpp:6019"
+    source_ref: "src/mame/sony/zn.cpp:6017"
     contents:
       - name: m534002c-15.ic353
         size: 524288
@@ -1387,7 +1387,7 @@ files:
     required: true
     category: bios_zip
     system: eighting-zn1
-    source_ref: "src/mame/sony/zn.cpp:6042"
+    source_ref: "src/mame/sony/zn.cpp:6040"
     contents:
       - name: m27c402cz-54.ic353
         size: 524288
@@ -1402,7 +1402,7 @@ files:
     required: true
     category: bios_zip
     system: tecmo-tps
-    source_ref: "src/mame/sony/zn.cpp:6093"
+    source_ref: "src/mame/sony/zn.cpp:6091"
     contents:
       - name: m534002c-61.ic353
         size: 524288
@@ -1546,7 +1546,7 @@ files:
     required: true
     category: bios_zip
     system: hyper-neogeo64
-    source_ref: "src/mame/snk/hng64.cpp:3232"
+    source_ref: "src/mame/snk/hng64.cpp:3235"
     contents:
       - name: brom1.bin
         size: 524288
@@ -1897,7 +1897,7 @@ files:
     required: true
     category: bios_zip
     system: andamiro-pumpitup
-    source_ref: "src/mame/misc/xtom3d.cpp:999"
+    source_ref: "src/mame/misc/xtom3d.cpp:998"
     contents:
       - name: mk3_1.0_bios.u22
         description: mk3 v1.0
diff --git a/emulators/mamemess.yml b/emulators/mamemess.yml
index 4342bca5..5acacbaf 100644
--- a/emulators/mamemess.yml
+++ b/emulators/mamemess.yml
@@ -250,7 +250,7 @@ files:
   - name: ekara.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/tvgames/xavix.cpp:2956"
+    source_ref: "src/mame/tvgames/xavix.cpp:2930"
     contents:
       - name: ekara.bin
         size: 1048576
@@ -280,7 +280,7 @@ files:
   - name: ekarag.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/tvgames/xavix.cpp:2959"
+    source_ref: "src/mame/tvgames/xavix.cpp:2933"
     contents:
       - name: ekaragermany.bin
         size: 2097152
@@ -300,7 +300,7 @@ files:
   - name: isinger.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/tvgames/xavix.cpp:2962"
+    source_ref: "src/mame/tvgames/xavix.cpp:2936"
     contents:
       - name: kr_isinger.bin
         size: 1048576
@@ -310,7 +310,7 @@ files:
   - name: ekaraphs.zip
     required: true
     category: bios_zip
-    source_ref: "src/mame/tvgames/xavix.cpp:2965"
+    source_ref: "src/mame/tvgames/xavix.cpp:2939"
     contents:
       - name: ekaraheadset.bin
         size: 2097152
@@ -481,7 +481,7 @@ files:
     required: true
     category: bios_zip
     system: apple2
-    source_ref: "src/mame/apple/apple2.cpp:665"
+    source_ref: "src/mame/apple/apple2.cpp:774"
     contents:
       - name: a2.chr
         description: Character generator ROM
@@ -655,7 +655,7 @@ files:
     required: true
     category: bios_zip
     system: apple2gs
-    source_ref: "src/mame/apple/apple2gs.cpp:3853-3867"
+    source_ref: "src/mame/apple/apple2gs.cpp:3868-3882"
     contents:
       - name: 341s0632-2.bin
         description: ADB microcontroller ROM (M50740/50741)
@@ -1467,7 +1467,7 @@ files:
     required: true
     category: bios_zip
     system: mz2500
-    source_ref: "src/mame/sharp/mz2500.cpp:1884-1903"
+    source_ref: "src/mame/sharp/mz2500.cpp:1881-1900"
     contents:
       - name: ipl.rom
         description: IPL ROM
diff --git a/emulators/o2em.yml b/emulators/o2em.yml
index 07d6c0ac..c2638530 100644
--- a/emulators/o2em.yml
+++ b/emulators/o2em.yml
@@ -42,7 +42,7 @@ files:
     crc32: "8016a315"
     validation: [size, crc32]
     note: "Odyssey2 BIOS (G7000 NTSC). Default, vpp=0."
-    source_ref: "libretro.c:233-237"
+    source_ref: "libretro.c:216-220"
 
   - name: "c52.bin"
     system: videopac
@@ -54,7 +54,7 @@ files:
     crc32: "a318e8d6"
     validation: [size, crc32]
     note: "Videopac G7000 European BIOS. vpp=0, auto-sets PAL."
-    source_ref: "libretro.c:243-248"
+    source_ref: "libretro.c:226-231"
 
   - name: "g7400.bin"
     system: videopac
@@ -66,7 +66,7 @@ files:
     crc32: "e20a9f41"
     validation: [size, crc32]
     note: "Videopac+ G7400 European BIOS. vpp=1."
-    source_ref: "libretro.c:238-242"
+    source_ref: "libretro.c:221-225"
 
   - name: "jopac.bin"
     system: videopac
@@ -78,10 +78,10 @@ files:
     crc32: "11647ca5"
     validation: [size, crc32]
     note: "Videopac+ G7400 French BIOS (JoPac). vpp=1."
-    source_ref: "libretro.c:249-254"
+    source_ref: "libretro.c:232-237"
 
   - name: "voice/"
     required: false
     category: game_data
     note: "The Voice speech synthesis WAV samples. 9 banks (E4, E8-EF) × 128 samples."
-    source_ref: "voice.c:38-79, libretro.c:1130-1137"
+    source_ref: "voice.c:38-79, libretro.c:1095-1102"
diff --git a/emulators/primehack.yml b/emulators/primehack.yml
index bd681d07..fe4545f7 100644
--- a/emulators/primehack.yml
+++ b/emulators/primehack.yml
@@ -179,7 +179,7 @@ files:
     mode: standalone
     hle_fallback: true
     note: "Wii System Menu WAD. Installed to NAND via Tools > Install WAD, needed for Wii Menu boot"
-    source_ref: "Source/Core/DolphinQt/MenuBar.cpp:335, Source/Core/DolphinQt/MenuBar.cpp:1582-1590"
+    source_ref: "Source/Core/DolphinQt/MenuBar.cpp:331, Source/Core/DolphinQt/MenuBar.cpp:1461-1469"
 
   # -- NAND Certificates (auto-extracted) --
   - name: "clientca.pem"
@@ -217,7 +217,7 @@ files:
     required: false
     mode: standalone
     note: "Realtek 8723A BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:379"
+    source_ref: "RealtekFirmwareLoader.cpp:379"
 
   - name: "rtl8723b_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8723b_fw.bin"
@@ -231,91 +231,91 @@ files:
     required: false
     mode: standalone
     note: "Realtek 8723D BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:383"
+    source_ref: "RealtekFirmwareLoader.cpp:383"
 
   - name: "rtl8761a_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8761a_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8761A BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:385"
+    source_ref: "RealtekFirmwareLoader.cpp:385"
 
   - name: "rtl8761bu_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8761bu_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8761BU BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:387"
+    source_ref: "RealtekFirmwareLoader.cpp:387"
 
   - name: "rtl8821a_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8821a_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8821A BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:389"
+    source_ref: "RealtekFirmwareLoader.cpp:389"
 
   - name: "rtl8821c_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8821c_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8821C BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:391"
+    source_ref: "RealtekFirmwareLoader.cpp:391"
 
   - name: "rtl8822b_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8822b_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8822B BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:395"
+    source_ref: "RealtekFirmwareLoader.cpp:395"
 
   - name: "rtl8822cu_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8822cu_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8822CU BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:393"
+    source_ref: "RealtekFirmwareLoader.cpp:393"
 
   - name: "rtl8851bu_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8851bu_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8851BU BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:397"
+    source_ref: "RealtekFirmwareLoader.cpp:397"
 
   - name: "rtl8852au_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8852au_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8852AU BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:399"
+    source_ref: "RealtekFirmwareLoader.cpp:399"
 
   - name: "rtl8852bu_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8852bu_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8852BU BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:401"
+    source_ref: "RealtekFirmwareLoader.cpp:401"
 
   - name: "rtl8852cu_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8852cu_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8852CU BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:403"
+    source_ref: "RealtekFirmwareLoader.cpp:403"
 
   - name: "rtl8852btu_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8852btu_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8852BT/8852BE-VT BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:405"
+    source_ref: "RealtekFirmwareLoader.cpp:405"
 
   - name: "rtl8922au_fw.bin"
     path: "Load/Firmware/rtl_bt/rtl8922au_fw.bin"
     required: false
     mode: standalone
     note: "Realtek 8922AU BT firmware for Wiimote passthrough"
-    source_ref: "Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp:407"
+    source_ref: "RealtekFirmwareLoader.cpp:407"
 
 notes:
   hle_available: true
diff --git a/emulators/same_cdi.yml b/emulators/same_cdi.yml
index 1419dd9e..2c9dacc6 100644
--- a/emulators/same_cdi.yml
+++ b/emulators/same_cdi.yml
@@ -76,7 +76,7 @@ files:
     system: cdi
     required: false
     note: "CD-i Mono-II (NTSC). MACHINE_NOT_WORKING. Listed in .info as optional."
-    source_ref: "src/mame/drivers/cdi.cpp:210-219"
+    source_ref: "src/mame/drivers/cdi.cpp:337-346"
     contents:
       - name: "philips__cdi-220_ph3_r1.2__mb834200b-15__02f_aa__9402_z04.tc574200-le._1.7211"
         description: Mono-II main CPU BIOS, Philips CDI-220 PH3 R1.2
diff --git a/emulators/smsplus.yml b/emulators/smsplus.yml
index 8a24fb7e..09f405b5 100644
--- a/emulators/smsplus.yml
+++ b/emulators/smsplus.yml
@@ -39,7 +39,7 @@ files:
     description: "Sega Master System boot ROM"
     required: false
     aliases: ["BIOS.sms"]
-    source_ref: "source/ports/libretro/smsplus_libretro.c:219-237"
+    source_ref: "smsplus_libretro.c:211-229"
     note: |
       Loaded into bios.rom (up to 1 MB allocated). Only active when core
       option smsplus_sms_bios is "auto". Displays SMS startup screen
@@ -50,7 +50,7 @@ files:
     description: "ColecoVision BIOS ROM"
     required: true
     size: 8192
-    source_ref: "source/ports/libretro/smsplus_libretro.c:240-256"
+    source_ref: "smsplus_libretro.c:232-248"
     note: |
       Required for ColecoVision games. Read as 0x2000 (8192) bytes into
       coleco.rom. Without this file, retro_load_game() returns false for
diff --git a/emulators/snes9x.yml b/emulators/snes9x.yml
index 3ffccfdf..980b64b0 100644
--- a/emulators/snes9x.yml
+++ b/emulators/snes9x.yml
@@ -32,7 +32,7 @@ files:
     required: false
     size: 1048576
     validation: [size]
-    source_ref: "libretro/libretro.cpp:1414, bsx.cpp:1209, bsx.cpp:1214"
+    source_ref: "libretro.cpp:1209, bsx.cpp:1209, bsx.cpp:1214"
     aliases: ["BS-X.bios"]
     note: "Needed for Satellaview (.bs) games."
 
@@ -42,7 +42,7 @@ files:
     required: false
     size: 262144
     validation: [size]
-    source_ref: "libretro.cpp:1203, libretro/libretro.cpp:1546, memmap.cpp:1720"
+    source_ref: "libretro.cpp:1203, libretro.cpp:1317, memmap.cpp:1704"
     note: "Needed for Sufami Turbo multi-cart games."
 
 notes:
diff --git a/emulators/swanstation.yml b/emulators/swanstation.yml
index 016625d7..42fcf474 100644
--- a/emulators/swanstation.yml
+++ b/emulators/swanstation.yml
@@ -37,7 +37,7 @@ files:
     md5: "8dd7d5296a650fac7319bce665a6a53c"
     size: 524288
     validation: [size, md5]
-    source_ref: "src/core/bios.cpp:50"
+    source_ref: "src/core/bios.cpp:49"
     aliases: []
 
   - name: "scph5501.bin"
@@ -47,7 +47,7 @@ files:
     md5: "490f666e1afb15b7362b406ed1cea246"
     size: 524288
     validation: [size, md5]
-    source_ref: "src/core/bios.cpp:51-52"
+    source_ref: "src/core/bios.cpp:50-51"
     aliases: []
 
   - name: "scph5502.bin"
@@ -57,7 +57,7 @@ files:
     md5: "32736f17079d0b2b7024407c39bd3050"
     size: 524288
     validation: [size, md5]
-    source_ref: "src/core/bios.cpp:53-54"
+    source_ref: "src/core/bios.cpp:52-53"
     aliases: []
 
   - name: "psxonpsp660.bin"
@@ -67,7 +67,7 @@ files:
     md5: "c53ca5908936d412331790f4426c6c33"
     size: 524288
     validation: [size, md5]
-    source_ref: "src/core/bios.cpp:68-69"
+    source_ref: "src/core/bios.cpp:67-68"
     aliases: []
 
   - name: "ps1_rom.bin"
@@ -78,5 +78,5 @@ files:
     size: [524288, 4194304, 4089584]
     validation: [size, md5]
     note: "Accepts PS1 (512KB), PS2 (4MB), and PS3 (0x3E66F0) sizes. Only first 512KB used."
-    source_ref: "src/core/bios.h:9, src/core/bios.cpp:71, src/core/bios.cpp:86"
+    source_ref: "src/core/bios.h:9, src/core/bios.cpp:71, src/core/bios.cpp:85"
     aliases: []
diff --git a/emulators/vice.yml b/emulators/vice.yml
index f745753a..02f0612d 100644
--- a/emulators/vice.yml
+++ b/emulators/vice.yml
@@ -1069,7 +1069,7 @@ files:
     hle_fallback: true
     embedded: false
     note: "SuperCPU DOS v1.40 external kernal. Optional, selected via core option. Goes in system/vice/SCPU64/."
-    source_ref: "retrodep/ui.c:266, libretro/libretro-core.c:2826"
+    source_ref: "retrodep/ui.c:266, libretro/libretro-core.c:2825"
 
   - name: "vice/SCPU64/scpu-dos-2.04.bin"
     system: commodore-c64
@@ -1077,7 +1077,7 @@ files:
     hle_fallback: true
     embedded: false
     note: "SuperCPU DOS v2.04 external kernal. Optional, selected via core option. Goes in system/vice/SCPU64/."
-    source_ref: "retrodep/ui.c:263, libretro/libretro-core.c:2828"
+    source_ref: "retrodep/ui.c:263, libretro/libretro-core.c:2827"
 
   # -------------------------------------------------------
   # Drive ROMs (shared across all cores with True Drive Emulation)
@@ -1261,7 +1261,7 @@ files:
     hle_fallback: true
     embedded: false
     note: "JiffyDOS C64 kernal replacement. Optional, proprietary. Requires True Drive Emulation + 1541/1571/1581 drive."
-    source_ref: "retrodep/ui.c:302, libretro/libretro-core.c:2856"
+    source_ref: "retrodep/ui.c:302, libretro/libretro-core.c:2855"
 
   - name: "vice/JiffyDOS_SX-64.bin"
     system: commodore-c64
@@ -1277,7 +1277,7 @@ files:
     hle_fallback: true
     embedded: false
     note: "JiffyDOS C128 kernal replacement. Optional, proprietary. C128 core only."
-    source_ref: "retrodep/ui.c:309, libretro/libretro-core.c:2858"
+    source_ref: "retrodep/ui.c:309, libretro/libretro-core.c:2857"
 
   - name: "vice/JiffyDOS_1541-II.bin"
     system: commodore-c64