diff --git a/emulators/ares.yml b/emulators/ares.yml
index 5d979792..6362bf7f 100644
--- a/emulators/ares.yml
+++ b/emulators/ares.yml
@@ -61,7 +61,7 @@ notes: |
   Firmware path resolution: settings.paths.firmware (user override) or
   {userData}/ares/Firmware/ (default). Per-system firmware assigned in
   Settings > Firmware dialog or via scan-by-hash.
-  ref: desktop-ui/settings/settings.hpp:89-101, desktop-ui/desktop-ui.cpp:68-75
+  ref: desktop-ui/settings/settings.hpp:87-99, desktop-ui/desktop-ui.cpp:68-75
 
   Systems with fully embedded firmware (no user files needed):
   Game Boy (boot.rom), Game Boy Color (boot.rom), Mega Drive (TMSS),
diff --git a/emulators/beetle_vb.yml b/emulators/beetle_vb.yml
index 6452c07a..5e2772db 100644
--- a/emulators/beetle_vb.yml
+++ b/emulators/beetle_vb.yml
@@ -14,7 +14,7 @@ notes: |
   Libretro port of Mednafen's Virtual Boy emulation module.
   No external BIOS or firmware files. The Virtual Boy has no boot
   ROM; the V810 CPU executes directly from the game ROM mapped at
-  0x07000000. Load() in libretro.cpp:1833 takes only ROM data.
+  0x07000000. Load() in libretro.cpp:1810 takes only ROM data.
   Upstream Mednafen supports an optional vb.pal palette file
   (Documentation/vb.html); the libretro port handles palette via
   core options instead.
diff --git a/emulators/boytacean.yml b/emulators/boytacean.yml
index 40125e96..75aff30c 100644
--- a/emulators/boytacean.yml
+++ b/emulators/boytacean.yml
@@ -36,7 +36,7 @@ files:
     mode: standalone
     size: 256
     note: "Original Nintendo DMG boot ROM"
-    source_ref: "src/gb.rs:1516, src/data.rs:14"
+    source_ref: "src/gb.rs:1416, src/data.rs:14"
 
   - name: sgb_boot.bin
     system: nintendo-gb
@@ -45,7 +45,7 @@ files:
     mode: standalone
     size: 256
     note: "Super Game Boy boot ROM"
-    source_ref: "src/gb.rs:1517, src/data.rs:29"
+    source_ref: "src/gb.rs:1417, src/data.rs:29"
 
   - name: dmg_bootix.bin
     system: nintendo-gb
@@ -54,7 +54,7 @@ files:
     mode: standalone
     size: 256
     note: "Open-source DMG boot ROM from Bootix (default DMG)"
-    source_ref: "src/gb.rs:1518, src/data.rs:44"
+    source_ref: "src/gb.rs:1418, src/data.rs:44"
 
   - name: mgb_bootix.bin
     system: nintendo-gb
@@ -63,7 +63,7 @@ files:
     mode: standalone
     size: 256
     note: "Open-source MGB (Pocket) boot ROM from Bootix"
-    source_ref: "src/gb.rs:1519, src/data.rs:59"
+    source_ref: "src/gb.rs:1419, src/data.rs:59"
 
   - name: cgb_boot.bin
     system: nintendo-gbc
@@ -81,4 +81,4 @@ files:
     mode: standalone
     size: 2304
     note: "Custom open-source CGB boot ROM (default CGB)"
-    source_ref: "src/gb.rs:1484, src/data.rs:177"
+    source_ref: "src/gb.rs:1421, src/data.rs:177"
diff --git a/emulators/dosbox_core.yml b/emulators/dosbox_core.yml
index f9ac95f5..7da671b2 100644
--- a/emulators/dosbox_core.yml
+++ b/emulators/dosbox_core.yml
@@ -16,7 +16,7 @@ notes: |
   ref: src/gui/midi_mt32.cpp:35,51-66
   MUNT identifies ROMs by SHA1+size (libretro/deps/munt/mt32emu/src/ROMInfo.cpp:171-180).
   FluidSynth reads .sf2/.sf3/.dls/.gig from system/soundfonts/.
-  ref: libretro/src/libretro.cpp:1112-1123
+  ref: libretro/src/libretro.cpp:1099-1110
   BASSMIDI reads .sf2/.sfz from system/soundfonts/, requires BASS +
   BASSMIDI shared libs in system dir (dlopen'd at runtime).
   ref: libretro/src/midi_bassmidi.cpp:232-254
diff --git a/emulators/duckstation.yml b/emulators/duckstation.yml
index d852b3ce..5e957a9e 100644
--- a/emulators/duckstation.yml
+++ b/emulators/duckstation.yml
@@ -30,7 +30,7 @@ notes: |
   only by the two settings screens, which fall back to the real filename when it
   is null.
   ref: src/core/bios.h:41-43 (field declarations)
-  ref: src/duckstation-qt/biossettingswidget.cpp:149, src/core/fullscreenui_settings.cpp:3301
+  ref: src/duckstation-qt/biossettingswidget.cpp:149, src/core/fullscreenui_settings.cpp:3281
   Lower priority = preferred. PS2 deprioritized (>= 100) for dynamic fast boot.
   Late PAL deprioritized (>= 150) due to additional regional checks.
   OpenBIOS detected by signature at offset 0x78, not by hash.
diff --git a/emulators/ecwolf.yml b/emulators/ecwolf.yml
index a8c11368..870c2b23 100644
--- a/emulators/ecwolf.yml
+++ b/emulators/ecwolf.yml
@@ -24,7 +24,7 @@ notes: |
   "embedded" when that fails. The system directory is still passed to SelectGame,
   but for the game data search, not for the engine package.
   ref: src/libretro/ecwolf_pk3_data.c, src/wl_iwad.cpp:664-672,
-  src/libretro/libretro.cpp:1028-1030
+  src/libretro/libretro.cpp:1009-1011
 
   Standalone: ecwolf.pk3 searched in progdir (binary directory).
   ref: src/libretro/wl_main.cpp:1247 (progdir passed to SelectGame)
diff --git a/emulators/freeintv.yml b/emulators/freeintv.yml
index 5303595f..e24f3023 100644
--- a/emulators/freeintv.yml
+++ b/emulators/freeintv.yml
@@ -16,7 +16,7 @@ notes: |
   contributed by Joe Zbiciak (jzIntv), mask ROM embedded in source
   (src/ivoice.c:337-510, 4097-byte static array). No external ivoice ROM.
 
-  BIOS loading in retro_init() (src/libretro.c:1184-1192). Paths joined
+  BIOS loading in retro_init() (src/libretro.c:1175-1183). Paths joined
   directly to system directory, no subdirectory.
 
   loadExec() reads exec.bin as big-endian 16-bit words into 0x1000-0x1FFF.
@@ -35,11 +35,11 @@ files:
     required: true
     size: 8192
     note: "Executive ROM. Big-endian 16-bit words loaded at 0x1000-0x1FFF."
-    source_ref: "src/intv.c:55-142, src/libretro.c:1187"
+    source_ref: "src/intv.c:51-96, src/libretro.c:1178"
 
   - name: "grom.bin"
     system: intellivision
     required: true
     size: 2048
     note: "Graphics ROM. Raw bytes loaded at 0x3000-0x37FF."
-    source_ref: "src/intv.c:144-190, src/libretro.c:1191"
+    source_ref: "src/intv.c:98-144, src/libretro.c:1182"
diff --git a/emulators/gearsystem.yml b/emulators/gearsystem.yml
index 090c21ed..7ec19122 100644
--- a/emulators/gearsystem.yml
+++ b/emulators/gearsystem.yml
@@ -34,17 +34,17 @@ files:
   - name: "bios.sms"
     system: sega-mastersystem
     required: false
-    source_ref: "platforms/libretro/libretro.cpp:777, platforms/libretro/libretro.cpp:780 (load_bootroms)"
+    source_ref: "platforms/libretro/libretro.cpp:736, platforms/libretro/libretro.cpp:731-743 (load_bootroms)"
 
   - name: "bios.gg"
     system: sega-gamegear
     required: false
-    source_ref: "platforms/libretro/libretro.cpp:1067, platforms/libretro/libretro.cpp:780 (load_bootroms)"
+    source_ref: "platforms/libretro/libretro.cpp:737, platforms/libretro/libretro.cpp:731-743 (load_bootroms)"
 
 platform_details:
   mastersystem:
     bios_filename: "bios.sms"
-    source_ref: "src/Memory.cpp:227-232"
+    source_ref: "src/Memory.cpp:267-272"
     note: |
       Boot ROM loaded via LoadBootromSMS() -> LoadBootroom(path, false).
       Raw binary read, stored in m_pBootromSMS. Bank count computed as
@@ -52,7 +52,7 @@ platform_details:
 
   gamegear:
     bios_filename: "bios.gg"
-    source_ref: "src/Memory.cpp:234-239"
+    source_ref: "src/Memory.cpp:274-279"
     note: |
       Boot ROM loaded via LoadBootromGG() -> LoadBootroom(path, true).
       Raw binary read, stored in m_pBootromGG. Same bank computation.
diff --git a/emulators/lutro.yml b/emulators/lutro.yml
index c342f043..d0456d82 100644
--- a/emulators/lutro.yml
+++ b/emulators/lutro.yml
@@ -17,7 +17,7 @@ notes: |
   standalone upstream.
 
   retro_load_game() calls lutro_load(info->path) to load the game
-  directory or archive (libretro.c:267). The core exposes
+  directory or archive (libretro.c:241). The core exposes
   love.filesystem.getAppdataDirectory to games as the system_dir
   (filesystem.c:296) but does not load any files from it itself.
   No BIOS, firmware, or system files required.
diff --git a/emulators/np2kai.yml b/emulators/np2kai.yml
index dd261bd2..1ecb4506 100644
--- a/emulators/np2kai.yml
+++ b/emulators/np2kai.yml
@@ -215,4 +215,4 @@ files:
     note: >
       Keyboard remapping configuration (text file). User-created file
       for custom keyboard layout. The core uses built-in defaults if absent.
-    source_ref: "keystat.c:43,113-148"
+    source_ref: "keystat.c:46,116-151"
diff --git a/emulators/nxengine.yml b/emulators/nxengine.yml
index c3913136..a51ba8cd 100644
--- a/emulators/nxengine.yml
+++ b/emulators/nxengine.yml
@@ -20,7 +20,7 @@ notes: |
   Doukutsu.exe there (nxengine/libretro/libretro.cpp:289-294). When launched with a .exe
   content file, it uses the parent directory of that file (nxengine/libretro/libretro.cpp:272).
 
-  At startup (main.cpp:75-90), the core opens Doukutsu.exe and extracts:
+  At startup (nxengine/main.cpp:75-90), the core opens Doukutsu.exe and extracts:
   ORG music (extractorg.c), PXT sound effects (extractpxt.c), stage tile
   attributes (extractstages.c), 18 credit BMPs + pixel.bmp (endpic/),
   and the wavetable (nxengine/extract-auto/cachefiles.c:464-485). All kept in memory.
@@ -28,7 +28,7 @@ notes: |
   The data/ directory (399 files from the freeware release) is loaded into
   an in-memory cache at init (nxengine/extract-auto/cachefiles.c:38-439, 497-540). All subsequent
   file access goes through this cache. The core verifies data/ by checking
-  for data/npc.tbl (main.cpp:47-58).
+  for data/npc.tbl (nxengine/main.cpp:47-58).
 
   The font is compiled-in (bitmap_font.h). The upstream standalone version
   uses font.ttf via SDL_ttf.
@@ -45,7 +45,7 @@ files:
     size: 1478656
     md5: "38695d3d69d7a0ada8178072dad4c58b"
     sha1: "bb2d0441e073da9c584f23c2ad8c7ab8aac293bf"
-    source_ref: "main.cpp:77-78 (opened for extraction), nxengine/libretro/libretro.cpp:290 (existence check)"
+    source_ref: "nxengine/main.cpp:77-78 (opened for extraction), nxengine/libretro/libretro.cpp:278 (existence check)"
     note: "Placed in system/nxengine/. The core extracts ORG music, PXT sounds, stage tile attributes, BMP graphics, and wavetable from this binary at each launch."
 
   - name: "data/"
@@ -64,7 +64,7 @@ files:
     system: cave-story
     description: "NPC attribute table (entity behavior flags, HP, damage, display rect offsets)"
     required: true
-    source_ref: "main.cpp:50 (existence check for data/ directory), ai/ai.cpp:56-59 (loaded for NPC properties)"
+    source_ref: "nxengine/main.cpp:47-53 (existence check for data/ directory), nxengine/ai/ai.cpp:56-59 (loaded for NPC properties)"
     note: "Located in system/nxengine/data/. Used to validate data directory presence and to load NPC behavior attributes."
 
   - name: "data/sprites.sif"
@@ -84,5 +84,5 @@ files:
     description: "Tile attribute lookup table (maps tile codes to collision/behavior attributes)"
     required: false
     hle_fallback: true
-    source_ref: "map.cpp:290-303 (loaded at init, hardcoded default if missing)"
-    note: "Not part of the freeware distribution. Generated by the standalone NXEngine extraction tool. The libretro core has hardcoded defaults in map.cpp:30."
+    source_ref: "nxengine/map.cpp:290-303 (loaded at init, hardcoded default if missing)"
+    note: "Not part of the freeware distribution. Generated by the standalone NXEngine extraction tool. The libretro core has hardcoded defaults in nxengine/map.cpp:30."
diff --git a/emulators/parallel_n64.yml b/emulators/parallel_n64.yml
index 86bd5ac4..d335bfed 100644
--- a/emulators/parallel_n64.yml
+++ b/emulators/parallel_n64.yml
@@ -16,7 +16,7 @@ files:
     required: false
     description: "64DD IPL ROM"
     note: "Only loaded when a 64DD disk image (.ndd) is present via subsystem API. Core fails to load disk games without it."
-    source_ref: "libretro/libretro.c:1021"
+    source_ref: "libretro/libretro.c:848"
 
 notes:
   hle_available: true
diff --git a/emulators/prboom.yml b/emulators/prboom.yml
index ddc9e3d1..c76372ce 100644
--- a/emulators/prboom.yml
+++ b/emulators/prboom.yml
@@ -51,5 +51,5 @@ files:
     md5: "72ae1b47820fcc93cc0df9c428d0face"
     sha1: "5f4aed208301449c2e9514edfd325fe9dead76fa"
     crc32: "a5751b99"
-    source_ref: "src/d_main.c:1438-1476 (PACKAGE .wad load), libretro/libretro.c:4254-4330 (I_FindFile search), src/config.h:39 (PACKAGE=prboom)"
+    source_ref: "src/d_main.c:1449-1465 (PACKAGE .wad load), libretro/libretro.c:4171-4252 (I_FindFile search), src/config.h:39 (PACKAGE=prboom)"
     note: "Searched in system/prboom/ then system/. Falls back to internal defaults if missing, but menus and HUD may render incorrectly without it."
diff --git a/emulators/puae.yml b/emulators/puae.yml
index 91a9f1b9..8da34b59 100644
--- a/emulators/puae.yml
+++ b/emulators/puae.yml
@@ -56,7 +56,7 @@ notes: |
   capsimg.so/capsimg.dll is an optional shared library for IPF floppy image
   support (SPS/CAPS format). Not a BIOS file, loaded dynamically at runtime.
 
-  Source: libretro/libretro-core.h:140-245, libretro/libretro-core.c:5612-5752,
+  Source: libretro/libretro-core.h:140-245, libretro/libretro-core.c:5609-5777,
   libretro/libretro-core.c:6044-6093
 
 files:
@@ -243,20 +243,20 @@ files:
     system: commodore-amiga
     required: false
     note: "Amiga Forever ROM decryption key. Copied to saves/WHDLoad/Devs/Kickstarts/ for WHDLoad."
-    source_ref: "libretro/libretro-core.c:5969-5980"
+    source_ref: "libretro/libretro-core.c:5963-5978"
 
   - name: "WHDLoad.key"
     system: commodore-amiga
     required: false
     unsourceable: "per-user signed registration key, never distributed generically, WHDLoad free since v18.2"
     note: "WHDLoad license key. Copied to saves/WHDLoad/L/ for registered WHDLoad use."
-    source_ref: "libretro/libretro-core.c:5985-5998"
+    source_ref: "libretro/libretro-core.c:5979-5994"
 
   - name: "WHDLoad.prefs"
     system: commodore-amiga
     required: false
     note: "WHDLoad preferences. Copied to saves/WHDLoad/S/ when present."
-    source_ref: "libretro/libretro-core.c:6000-6023"
+    source_ref: "libretro/libretro-core.c:5995-6018"
 
 model_kickstart_map:
   A500:     {kickstart: "kick34005.A500", ext: null}
@@ -290,4 +290,4 @@ platform_details:
     amiga_forever: "amiga-os-{version}.rom"
     tosec: "Kickstart v{version} rev {rev} ({year})(Commodore)({model}).rom"
   scan_prefixes: ["kick", "amiga-os", "KS ROM"]
-  source_ref: "libretro/libretro-core.c:2651-2678"
+  source_ref: "libretro/libretro-core.c:2650-2677"
diff --git a/emulators/puae2021.yml b/emulators/puae2021.yml
index 8584e3fe..187c2fda 100644
--- a/emulators/puae2021.yml
+++ b/emulators/puae2021.yml
@@ -60,8 +60,8 @@ notes: |
   capsimg.so/capsimg.dll is an optional shared library for IPF floppy image
   support (SPS/CAPS format). Not a BIOS file, loaded dynamically at runtime.
 
-  Source: libretro/libretro-core.h:140-245, libretro/libretro-core.c:5384-5550,
-  libretro/libretro-core.c:5636-5795
+  Source: libretro/libretro-core.h:140-245, libretro/libretro-core.c:5533-5701,
+  libretro/libretro-core.c:5788-5879
 
 files:
   # -------------------------------------------------------
@@ -247,20 +247,20 @@ files:
     system: commodore-amiga
     required: false
     note: "Amiga Forever ROM decryption key. Copied to saves/WHDLoad/Devs/Kickstarts/ for WHDLoad."
-    source_ref: "libretro/libretro-core.c:5735-5746"
+    source_ref: "libretro/libretro-core.c:5887-5902"
 
   - name: "WHDLoad.key"
     system: commodore-amiga
     required: false
     unsourceable: "per-user signed registration key, never distributed generically, WHDLoad free since v18.2"
     note: "WHDLoad license key. Copied to saves/WHDLoad/L/ for registered WHDLoad use."
-    source_ref: "libretro/libretro-core.c:5751-5764"
+    source_ref: "libretro/libretro-core.c:5903-5918"
 
   - name: "WHDLoad.prefs"
     system: commodore-amiga
     required: false
     note: "WHDLoad preferences. Copied to saves/WHDLoad/S/ when present."
-    source_ref: "libretro/libretro-core.c:5768-5791"
+    source_ref: "libretro/libretro-core.c:5919-5942"
 
 model_kickstart_map:
   A500:     {kickstart: "kick34005.A500", ext: null}
@@ -294,4 +294,4 @@ platform_details:
     amiga_forever: "amiga-os-{version}.rom"
     tosec: "Kickstart v{version} rev {rev} ({year})(Commodore)({model}).rom"
   scan_prefixes: ["kick", "amiga-os", "KS ROM"]
-  source_ref: "libretro/libretro-core.c:2577-2616"
+  source_ref: "libretro/libretro-core.c:2629-2656"
diff --git a/emulators/vice.yml b/emulators/vice.yml
index 48203c9b..c433e3ce 100644
--- a/emulators/vice.yml
+++ b/emulators/vice.yml
@@ -74,7 +74,7 @@ notes: |
   Source: retrodep/embedded/*.c (embedded ROM tables),
   vice/src/*/rom.h (ROM name defines), vice/src/drive/driverom.h (drive ROMs),
   retrodep/ui.c:274-315 (JiffyDOS loading), retrodep/ui.c:258-271 (SCPU kernal),
-  libretro/libretro-core.c:2807-2872 (core options for JiffyDOS/SCPU)
+  libretro/libretro-core.c:2806-2871 (core options for JiffyDOS/SCPU)
 
 files:
   # -------------------------------------------------------
@@ -1082,7 +1082,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:2832"
+    source_ref: "retrodep/ui.c:266, libretro/libretro-core.c:2830"
 
   - name: "vice/SCPU64/scpu-dos-2.04.bin"
     system: commodore-c64
@@ -1090,7 +1090,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:2834"
+    source_ref: "retrodep/ui.c:263, libretro/libretro-core.c:2831"
 
   # -------------------------------------------------------
   # Drive ROMs (shared across all cores with True Drive Emulation)
@@ -1274,7 +1274,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:2862"
+    source_ref: "retrodep/ui.c:302, libretro/libretro-core.c:2859"
 
   - name: "vice/JiffyDOS_SX-64.bin"
     system: commodore-c64
@@ -1290,7 +1290,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:2864"
+    source_ref: "retrodep/ui.c:309, libretro/libretro-core.c:2861"
 
   - name: "vice/JiffyDOS_1541-II.bin"
     system: commodore-c64