diff --git a/emulators/jazz2-native.yml b/emulators/jazz2-native.yml
index 8e5972a45..394b7f6dd 100644
--- a/emulators/jazz2-native.yml
+++ b/emulators/jazz2-native.yml
@@ -4,7 +4,7 @@ core_classification: game_engine
 source: "https://github.com/deathkiller/jazz2-native"
 upstream: "https://github.com/deathkiller/jazz2-native"
 profiled_date: "2026-10-04"
-source_commit: "ff9ddb7be9c84bdcf71b22d9380da06135edeb62"
+source_commit: "d436ec62052339527887909a6e0fa2db405749d8"
 core_version: "3.9.0"
 version_basis:
   kind: file
@@ -17,20 +17,20 @@ systems: [jazz-jackrabbit-2]
 data_root:
   android:
     path: "Android/data/jazz2.resurrection/files"
-    source_ref: "Sources/Jazz2/ContentResolver.cpp:426-477, Sources/Shared/IO/AndroidAssetStream.cpp:213-216, CMakeLists.txt:35, Sources/nCine/Backends/Android/Bridge/app/build.gradle.in:11"
+    source_ref: "Sources/Jazz2/ContentResolver.cpp:506-557, Sources/Shared/IO/AndroidAssetStream.cpp:213-216, CMakeLists.txt:35, Sources/nCine/Backends/Android/Bridge/app/build.gradle.in:11"
     note: "with all-files access, the first of Games/Jazz² Resurrection, Games/Jazz2 Resurrection, Download/Jazz² Resurrection and Download/Jazz2 Resurrection on shared storage that holds Source, else the first one"
   ios:
     path: "Documents"
-    source_ref: "Sources/Jazz2/ContentResolver.cpp:485-489, Sources/Jazz2/ContentResolver.cpp:757-758"
+    source_ref: "Sources/Jazz2/ContentResolver.cpp:565-569, Sources/Jazz2/ContentResolver.cpp:837-838"
   windows:
     path: "<folder of Jazz2.exe>"
-    source_ref: "Sources/nCine/MainApplication.cpp:696-715, Sources/Jazz2/ContentResolver.cpp:243-244, Sources/Jazz2/ContentResolver.cpp:389-390"
+    source_ref: "Sources/nCine/MainApplication.cpp:696-715, Sources/Jazz2/ContentResolver.cpp:244-245, Sources/Jazz2/ContentResolver.cpp:469-470"
   macos:
     path: "~/Library/Application Support/Jazz² Resurrection"
-    source_ref: "Sources/Jazz2/ContentResolver.cpp:490-494, Sources/Shared/IO/FileSystem.cpp:1767-1792, Sources/Shared/IO/FileSystem.cpp:1724-1731"
+    source_ref: "Sources/Jazz2/ContentResolver.cpp:570-574, Sources/Shared/IO/FileSystem.cpp:1768-1793, Sources/Shared/IO/FileSystem.cpp:1725-1732"
   linux:
     path: "$XDG_DATA_HOME/jazz2, else ~/.local/share/jazz2"
-    source_ref: "Sources/Jazz2/ContentResolver.cpp:495-571, Sources/Shared/IO/FileSystem.cpp:1933-1946, CMakeLists.txt:30, cmake/ncine_options.cmake:408-409"
+    source_ref: "Sources/Jazz2/ContentResolver.cpp:575-651, Sources/Shared/IO/FileSystem.cpp:1934-1947, CMakeLists.txt:30, cmake/ncine_options.cmake:274-275"
     note: "the folder of the executable for a portable copy with Content beside it. $XDG_DATA_HOME/Jazz² Resurrection when it already holds Cache. The AppImage uses the folder of the .AppImage when its Source holds Anims.j2a"
 
 notes: |
@@ -38,18 +38,18 @@ notes: |
   ships its own Content/ tree (animations, metadata, translations) that
   sits next to the executable in a portable copy, or under
   <prefix>/share/<package>/ once installed.
-  ref: Sources/Jazz2/ContentResolver.cpp:196-248 (GetContentPath per
-       platform), Sources/Jazz2/ContentResolver.cpp:495-571 (Unix layouts)
+  ref: Sources/Jazz2/ContentResolver.cpp:197-249 (GetContentPath per
+       platform), Sources/Jazz2/ContentResolver.cpp:575-651 (Unix layouts)
 
   Original Jazz Jackrabbit 2 data is read from Source/ and converted
   on first launch into the engine's own formats under Cache/: Anims.j2a
   and Data.j2d into a package, then every .j2e, .j2l and the tilesets
   the levels name. Music and cinematics are read from Source/ as they
   are.
-  ref: Sources/Jazz2/ContentResolver.cpp:364-393 (GetSourcePath),
-       Sources/Main.cpp:2235-2299 (RefreshCache),
-       Sources/Jazz2/Compatibility/AssetConverter.cpp:477-493,
-       Sources/Jazz2/Compatibility/AssetConverter.cpp:642-768
+  ref: Sources/Jazz2/ContentResolver.cpp:444-473 (GetSourcePath),
+       Sources/Main.cpp:2259-2323 (RefreshCache),
+       Sources/Jazz2/Compatibility/AssetConverter.cpp:478-494,
+       Sources/Jazz2/Compatibility/AssetConverter.cpp:686-848
 
   Content/ is the engine runtime, shipped with the release package.
   Source/ holds the user's own copy of the 1998 game data. Without
@@ -57,20 +57,20 @@ notes: |
   cache the engine starts but is not playable. A Content/ tree prepared
   by the AssetPacker tool carries Prebaked.pak: the conversion is then
   skipped and Source/ is not read.
-  ref: Sources/Main.cpp:2147-2153,
-       Sources/Jazz2/ContentResolver.cpp:738-746
+  ref: Sources/Main.cpp:2171-2177,
+       Sources/Jazz2/ContentResolver.cpp:818-826
 
   On Android, Apple, Unix, UWP, Switch and Vita a Content/ directory
   next to Cache/ (next to Source/ on iOS) is searched before the shipped
   one, its .pak files first.
-  ref: Sources/Jazz2/ContentResolver.cpp:748-787,
-       Sources/Jazz2/ContentResolver.cpp:853-902
+  ref: Sources/Jazz2/ContentResolver.cpp:828-867,
+       Sources/Jazz2/ContentResolver.cpp:933-982
 
   The libretro build looks for Content/ next to the loaded file, in the
   core assets directory or in <system>/jazz2/, and for the original
   files in Source/ beside it, in the system directory itself or in
   <system>/jazz2/Source/.
-  ref: Sources/Main.cpp:286-374
+  ref: Sources/Main.cpp:294-382
 
 files:
   # ================================================================
@@ -84,7 +84,7 @@ files:
     standalone_path: "Content/Animations/"
     mode: libretro
     required: true
-    source_ref: "Sources/Jazz2/ContentResolver.cpp:1394, Sources/Jazz2/ContentResolver.cpp:1543, Sources/Jazz2/ContentResolver.cpp:3371-3372"
+    source_ref: "Sources/Jazz2/ContentResolver.cpp:1613, Sources/Jazz2/ContentResolver.cpp:1762, Sources/Jazz2/ContentResolver.cpp:3601-3602"
     note: "Native graphics, sounds and the UI fonts, opened through OpenContentFile. No libretro build is published with the release, so the tree is placed by hand."
 
   - name: "Animations/"
@@ -95,7 +95,7 @@ files:
     mode: standalone
     bundled: true
     required: true
-    source_ref: "Sources/Jazz2/ContentResolver.cpp:1394, Sources/Jazz2/ContentResolver.cpp:1543, Sources/Jazz2/ContentResolver.cpp:3371-3372"
+    source_ref: "Sources/Jazz2/ContentResolver.cpp:1613, Sources/Jazz2/ContentResolver.cpp:1762, Sources/Jazz2/ContentResolver.cpp:3601-3602"
     note: "Native graphics, sounds and the UI fonts, opened through OpenContentFile. Shipped beside the executable in the 3.8.0 Windows and Linux zips."
 
   - name: "Metadata/"
@@ -105,7 +105,7 @@ files:
     standalone_path: "Content/Metadata/"
     mode: libretro
     required: true
-    source_ref: "Sources/Jazz2/ContentResolver.cpp:1141"
+    source_ref: "Sources/Jazz2/ContentResolver.cpp:1360"
     note: "Actor .res descriptors (Common, Enemy, Player, UI, Boss, ...). No libretro build is published with the release, so the tree is placed by hand."
 
   - name: "Metadata/"
@@ -116,7 +116,7 @@ files:
     mode: standalone
     bundled: true
     required: true
-    source_ref: "Sources/Jazz2/ContentResolver.cpp:1141"
+    source_ref: "Sources/Jazz2/ContentResolver.cpp:1360"
     note: "Actor .res descriptors (Common, Enemy, Player, UI, Boss, ...). Shipped beside the executable in the 3.8.0 Windows and Linux zips."
 
   - name: "Translations/"
@@ -126,7 +126,7 @@ files:
     standalone_path: "Content/Translations/"
     mode: libretro
     required: false
-    source_ref: "Sources/Main.cpp:2023-2031, Sources/Jazz2/UI/Menu/LanguageSelectSection.cpp:83-95"
+    source_ref: "Sources/Main.cpp:2047-2055, Sources/Jazz2/UI/Menu/LanguageSelectSection.cpp:83-95"
     note: "Language .mo bundles, searched in the user Content/Translations/ and in Cache/Translations/ first. Built-in English is used when none is loaded. No libretro build is published with the release, so the tree is placed by hand."
 
   - name: "Translations/"
@@ -137,7 +137,7 @@ files:
     mode: standalone
     bundled: true
     required: false
-    source_ref: "Sources/Main.cpp:2023-2031, Sources/Jazz2/UI/Menu/LanguageSelectSection.cpp:83-95"
+    source_ref: "Sources/Main.cpp:2047-2055, Sources/Jazz2/UI/Menu/LanguageSelectSection.cpp:83-95"
     note: "Language .mo bundles, searched in the user Content/Translations/ and in Cache/Translations/ first. Built-in English is used when none is loaded. Shipped beside the executable in the 3.8.0 Windows and Linux zips."
 
   # ================================================================
@@ -151,7 +151,7 @@ files:
     path: "jazz2/Source/Anims.j2a"
     standalone_path: "Source/Anims.j2a"
     required: true
-    source_ref: "Sources/Main.cpp:2235-2251, Sources/Jazz2/Compatibility/AssetConverter.cpp:481-484"
+    source_ref: "Sources/Main.cpp:2259-2275, Sources/Jazz2/Compatibility/AssetConverter.cpp:482-485"
     note: "Main animation archive. The cache cannot be created without it and the game is not flagged playable."
 
   - name: "AnimsSw.j2a"
@@ -160,7 +160,7 @@ files:
     path: "jazz2/Source/AnimsSw.j2a"
     standalone_path: "Source/AnimsSw.j2a"
     required: false
-    source_ref: "Sources/Main.cpp:2238-2240"
+    source_ref: "Sources/Main.cpp:2262-2264"
     note: "Animation archive of the shareware demo, read when Anims.j2a is absent."
 
   - name: "Data.j2d"
@@ -169,7 +169,7 @@ files:
     path: "jazz2/Source/Data.j2d"
     standalone_path: "Source/Data.j2d"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:486-489"
+    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:487-490"
     note: "Converted into the cache package when present."
 
   - name: "Plus.j2d"
@@ -178,12 +178,12 @@ files:
     path: "jazz2/Source/Plus.j2d"
     standalone_path: "Source/Plus.j2d"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:416-461, Sources/Jazz2/Compatibility/AssetConverter.cpp:614-617, Sources/Jazz2/Compatibility/JJ2Level.cpp:1115"
+    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:417-462, Sources/Jazz2/Compatibility/AssetConverter.cpp:658-661, Sources/Jazz2/Compatibility/JJ2Level.cpp:1322"
     note: "Data file of a JJ2+ installation. Read once a converted level names one of its TextureBG.<n> textures. Without it a texture is made up for that layer."
 
   # Episode descriptors (.j2e) and level files (.j2l) are optional per
   # episode. Every one present in Source/ is converted.
-  # ref: Sources/Jazz2/Compatibility/AssetConverter.cpp:642-768
+  # ref: Sources/Jazz2/Compatibility/AssetConverter.cpp:686-848
 
   - name: "prince.j2e"
     category: game_data
@@ -191,7 +191,7 @@ files:
     path: "jazz2/Source/prince.j2e"
     standalone_path: "Source/prince.j2e"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:44-47, Sources/Jazz2/Compatibility/AssetConverter.cpp:518-551, Sources/Jazz2/Compatibility/AssetConverter.cpp:592-594, Sources/Jazz2/Compatibility/AssetConverter.cpp:642-671"
+    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:44-47, Sources/Jazz2/Compatibility/AssetConverter.cpp:545-589, Sources/Jazz2/Compatibility/AssetConverter.cpp:634-638, Sources/Jazz2/Compatibility/AssetConverter.cpp:686-734"
     note: "First episode of the chain prince, rescue, flash, monk."
 
   - name: "rescue.j2e"
@@ -200,7 +200,7 @@ files:
     path: "jazz2/Source/rescue.j2e"
     standalone_path: "Source/rescue.j2e"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:44-47, Sources/Jazz2/Compatibility/AssetConverter.cpp:518-551, Sources/Jazz2/Compatibility/AssetConverter.cpp:595-596, Sources/Jazz2/Compatibility/AssetConverter.cpp:642-671"
+    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:44-47, Sources/Jazz2/Compatibility/AssetConverter.cpp:545-589, Sources/Jazz2/Compatibility/AssetConverter.cpp:639-640, Sources/Jazz2/Compatibility/AssetConverter.cpp:686-734"
     note: "Second episode of the chain."
 
   - name: "flash.j2e"
@@ -209,7 +209,7 @@ files:
     path: "jazz2/Source/flash.j2e"
     standalone_path: "Source/flash.j2e"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:518-545, Sources/Jazz2/Compatibility/AssetConverter.cpp:597-598, Sources/Jazz2/Compatibility/AssetConverter.cpp:642-671"
+    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:545-572, Sources/Jazz2/Compatibility/AssetConverter.cpp:641-642, Sources/Jazz2/Compatibility/AssetConverter.cpp:686-734"
     note: "Third episode of the chain."
 
   - name: "monk.j2e"
@@ -218,7 +218,7 @@ files:
     path: "jazz2/Source/monk.j2e"
     standalone_path: "Source/monk.j2e"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:518-545, Sources/Jazz2/Compatibility/AssetConverter.cpp:599-600, Sources/Jazz2/Compatibility/AssetConverter.cpp:642-671"
+    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:545-572, Sources/Jazz2/Compatibility/AssetConverter.cpp:643-644, Sources/Jazz2/Compatibility/AssetConverter.cpp:686-734"
     note: "Fourth episode of the chain."
 
   - name: "share.j2e"
@@ -227,7 +227,7 @@ files:
     path: "jazz2/Source/share.j2e"
     standalone_path: "Source/share.j2e"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:518-545, Sources/Jazz2/Compatibility/AssetConverter.cpp:572-573, Sources/Jazz2/Compatibility/AssetConverter.cpp:642-671"
+    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:545-572, Sources/Jazz2/Compatibility/AssetConverter.cpp:614-615, Sources/Jazz2/Compatibility/AssetConverter.cpp:686-734"
     note: "Shareware Demo episode."
 
   - name: "xmas98.j2e"
@@ -236,7 +236,7 @@ files:
     path: "jazz2/Source/xmas98.j2e"
     standalone_path: "Source/xmas98.j2e"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:574-575, Sources/Jazz2/Compatibility/AssetConverter.cpp:647, Sources/Jazz2/Compatibility/AssetConverter.cpp:655-656, Sources/Jazz2/Compatibility/AssetConverter.cpp:669"
+    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:616-617, Sources/Jazz2/Compatibility/AssetConverter.cpp:691, Sources/Jazz2/Compatibility/AssetConverter.cpp:718-719, Sources/Jazz2/Compatibility/AssetConverter.cpp:732"
     note: "Holiday Hare '98. Stored under the name xmas99 and skipped when xmas99.j2e is present."
 
   - name: "xmas99.j2e"
@@ -245,7 +245,7 @@ files:
     path: "jazz2/Source/xmas99.j2e"
     standalone_path: "Source/xmas99.j2e"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:507, Sources/Jazz2/Compatibility/AssetConverter.cpp:518-545, Sources/Jazz2/Compatibility/AssetConverter.cpp:576-577"
+    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:520, Sources/Jazz2/Compatibility/AssetConverter.cpp:545-572, Sources/Jazz2/Compatibility/AssetConverter.cpp:618-619"
     note: "The Christmas Chronicles."
 
   - name: "secretf.j2e"
@@ -254,7 +254,7 @@ files:
     path: "jazz2/Source/secretf.j2e"
     standalone_path: "Source/secretf.j2e"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:518-545, Sources/Jazz2/Compatibility/AssetConverter.cpp:578-579, Sources/Jazz2/Compatibility/AssetConverter.cpp:642-671"
+    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:545-572, Sources/Jazz2/Compatibility/AssetConverter.cpp:620-621, Sources/Jazz2/Compatibility/AssetConverter.cpp:686-734"
     note: "The Secret Files episode."
 
   - name: "home.j2e"
@@ -263,12 +263,12 @@ files:
     path: "jazz2/Source/home.j2e"
     standalone_path: "Source/home.j2e"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:658-664"
+    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:721-727"
     note: "Entry that lists custom levels."
 
   # Levels of the Shareware Demo. Every .j2l present in Source/ is
   # converted, whatever its name.
-  # ref: Sources/Jazz2/Compatibility/AssetConverter.cpp:672-768
+  # ref: Sources/Jazz2/Compatibility/AssetConverter.cpp:735-848
 
   - name: "share1.j2l"
     category: game_data
@@ -276,7 +276,7 @@ files:
     path: "jazz2/Source/share1.j2l"
     standalone_path: "Source/share1.j2l"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:518-556, Sources/Jazz2/Compatibility/AssetConverter.cpp:672-698, Sources/Jazz2/Compatibility/AssetConverter.cpp:721-735"
+    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:545-598, Sources/Jazz2/Compatibility/AssetConverter.cpp:735-764, Sources/Jazz2/Compatibility/AssetConverter.cpp:787-808"
     note: "First level of share.j2e, stored as share/share1. Its exit names share2."
 
   - name: "share2.j2l"
@@ -285,7 +285,7 @@ files:
     path: "jazz2/Source/share2.j2l"
     standalone_path: "Source/share2.j2l"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:518-556, Sources/Jazz2/Compatibility/AssetConverter.cpp:672-698, Sources/Jazz2/Compatibility/AssetConverter.cpp:721-735"
+    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:545-598, Sources/Jazz2/Compatibility/AssetConverter.cpp:735-764, Sources/Jazz2/Compatibility/AssetConverter.cpp:787-808"
     note: "Second level of the Shareware Demo episode. Its exit names share3."
 
   - name: "share3.j2l"
@@ -294,7 +294,7 @@ files:
     path: "jazz2/Source/share3.j2l"
     standalone_path: "Source/share3.j2l"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:518-556, Sources/Jazz2/Compatibility/AssetConverter.cpp:672-698, Sources/Jazz2/Compatibility/AssetConverter.cpp:721-735"
+    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:545-598, Sources/Jazz2/Compatibility/AssetConverter.cpp:735-764, Sources/Jazz2/Compatibility/AssetConverter.cpp:787-808"
     note: "Third level of the Shareware Demo episode. Its exit ends the episode."
 
   - name: "sharectf.j2l"
@@ -303,7 +303,7 @@ files:
     path: "jazz2/Source/sharectf.j2l"
     standalone_path: "Source/sharectf.j2l"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:76, Sources/Jazz2/Compatibility/AssetConverter.cpp:553-556, Sources/Jazz2/Compatibility/AssetConverter.cpp:672-698, Sources/Jazz2/Compatibility/AssetConverter.cpp:721-735"
+    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:77, Sources/Jazz2/Compatibility/AssetConverter.cpp:592-598, Sources/Jazz2/Compatibility/AssetConverter.cpp:735-764, Sources/Jazz2/Compatibility/AssetConverter.cpp:787-808"
     note: "Capture the flag level of the Shareware Demo, stored under unknown/."
 
   - name: "sharect2.j2l"
@@ -312,7 +312,7 @@ files:
     path: "jazz2/Source/sharect2.j2l"
     standalone_path: "Source/sharect2.j2l"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:76, Sources/Jazz2/Compatibility/AssetConverter.cpp:553-556, Sources/Jazz2/Compatibility/AssetConverter.cpp:672-698, Sources/Jazz2/Compatibility/AssetConverter.cpp:721-735"
+    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:77, Sources/Jazz2/Compatibility/AssetConverter.cpp:592-598, Sources/Jazz2/Compatibility/AssetConverter.cpp:735-764, Sources/Jazz2/Compatibility/AssetConverter.cpp:787-808"
     note: "Capture the flag level of the Shareware Demo, stored under unknown/."
 
   - name: "sharetrs.j2l"
@@ -321,14 +321,14 @@ files:
     path: "jazz2/Source/sharetrs.j2l"
     standalone_path: "Source/sharetrs.j2l"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:76, Sources/Jazz2/Compatibility/AssetConverter.cpp:553-556, Sources/Jazz2/Compatibility/AssetConverter.cpp:672-698, Sources/Jazz2/Compatibility/AssetConverter.cpp:721-735"
+    source_ref: "Sources/Jazz2/Compatibility/AssetConverter.cpp:77, Sources/Jazz2/Compatibility/AssetConverter.cpp:592-598, Sources/Jazz2/Compatibility/AssetConverter.cpp:735-764, Sources/Jazz2/Compatibility/AssetConverter.cpp:787-808"
     note: "Treasure hunt level of the Shareware Demo, stored under unknown/."
 
   # Tilesets. Only those a converted level names are converted. The name
   # is read from the level, lowercased and looked up in Source/ without
   # regard to case.
-  # ref: Sources/Jazz2/Compatibility/JJ2Level.cpp:178, 861-864,
-  #      Sources/Jazz2/Compatibility/AssetConverter.cpp:749, 817-844
+  # ref: Sources/Jazz2/Compatibility/JJ2Level.cpp:187, 1055-1058,
+  #      Sources/Jazz2/Compatibility/AssetConverter.cpp:829, 916-943
 
   - name: "labrat1n.j2t"
     category: game_data
@@ -336,7 +336,7 @@ files:
     path: "jazz2/Source/labrat1n.j2t"
     standalone_path: "Source/labrat1n.j2t"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/JJ2Level.cpp:178, Sources/Jazz2/Compatibility/JJ2Level.cpp:861-864, Sources/Jazz2/Compatibility/AssetConverter.cpp:749, Sources/Jazz2/Compatibility/AssetConverter.cpp:817-844"
+    source_ref: "Sources/Jazz2/Compatibility/JJ2Level.cpp:187, Sources/Jazz2/Compatibility/JJ2Level.cpp:1055-1058, Sources/Jazz2/Compatibility/AssetConverter.cpp:829, Sources/Jazz2/Compatibility/AssetConverter.cpp:916-943"
     note: "Tileset named by share1.j2l, sharect2.j2l and sharetrs.j2l."
 
   - name: "psych2.j2t"
@@ -345,7 +345,7 @@ files:
     path: "jazz2/Source/psych2.j2t"
     standalone_path: "Source/psych2.j2t"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/JJ2Level.cpp:178, Sources/Jazz2/Compatibility/JJ2Level.cpp:861-864, Sources/Jazz2/Compatibility/AssetConverter.cpp:749, Sources/Jazz2/Compatibility/AssetConverter.cpp:817-844"
+    source_ref: "Sources/Jazz2/Compatibility/JJ2Level.cpp:187, Sources/Jazz2/Compatibility/JJ2Level.cpp:1055-1058, Sources/Jazz2/Compatibility/AssetConverter.cpp:829, Sources/Jazz2/Compatibility/AssetConverter.cpp:916-943"
     note: "Tileset named by share2.j2l."
 
   - name: "diam2.j2t"
@@ -354,11 +354,11 @@ files:
     path: "jazz2/Source/diam2.j2t"
     standalone_path: "Source/diam2.j2t"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/JJ2Level.cpp:178, Sources/Jazz2/Compatibility/JJ2Level.cpp:861-864, Sources/Jazz2/Compatibility/AssetConverter.cpp:749, Sources/Jazz2/Compatibility/AssetConverter.cpp:817-844"
+    source_ref: "Sources/Jazz2/Compatibility/JJ2Level.cpp:187, Sources/Jazz2/Compatibility/JJ2Level.cpp:1055-1058, Sources/Jazz2/Compatibility/AssetConverter.cpp:829, Sources/Jazz2/Compatibility/AssetConverter.cpp:916-943"
     note: "Tileset named by share3.j2l and sharectf.j2l."
 
   # Music, read from the user Content/Music/, then Content/Music/, then Source/
-  # ref: Sources/Jazz2/ContentResolver.cpp:3307-3328
+  # ref: Sources/Jazz2/ContentResolver.cpp:3527-3558
 
   - name: "menu.j2b"
     category: game_data
@@ -366,7 +366,7 @@ files:
     path: "jazz2/Source/menu.j2b"
     standalone_path: "Source/menu.j2b"
     required: false
-    source_ref: "Sources/Jazz2/UI/Menu/MainMenu.cpp:514-516, Sources/Jazz2/Compatibility/AssetConverter.cpp:777-780"
+    source_ref: "Sources/Jazz2/UI/Menu/MainMenu.cpp:514-516, Sources/Jazz2/Compatibility/AssetConverter.cpp:876-879"
     note: "Main menu music."
 
   - name: "bonus2.j2b"
@@ -375,7 +375,7 @@ files:
     path: "jazz2/Source/bonus2.j2b"
     standalone_path: "Source/bonus2.j2b"
     required: false
-    source_ref: "Sources/Jazz2/UI/Menu/MainMenu.cpp:508-509, Sources/Jazz2/Compatibility/AssetConverter.cpp:777-780"
+    source_ref: "Sources/Jazz2/UI/Menu/MainMenu.cpp:508-509, Sources/Jazz2/Compatibility/AssetConverter.cpp:876-879"
     note: "Menu music of the reforged main menu, picked at random with bonus3.j2b."
 
   - name: "bonus3.j2b"
@@ -384,7 +384,7 @@ files:
     path: "jazz2/Source/bonus3.j2b"
     standalone_path: "Source/bonus3.j2b"
     required: false
-    source_ref: "Sources/Jazz2/UI/Menu/MainMenu.cpp:508-509, Sources/Jazz2/Compatibility/AssetConverter.cpp:777-780"
+    source_ref: "Sources/Jazz2/UI/Menu/MainMenu.cpp:508-509, Sources/Jazz2/Compatibility/AssetConverter.cpp:876-879"
     note: "Menu music of the reforged main menu, picked at random with bonus2.j2b."
 
   - name: "intro.j2b"
@@ -393,7 +393,7 @@ files:
     path: "jazz2/Source/intro.j2b"
     standalone_path: "Source/intro.j2b"
     required: false
-    source_ref: "Sources/Jazz2/UI/Cinematics.cpp:549, Sources/Main.cpp:615, Sources/Jazz2/Compatibility/AssetConverter.cpp:777-780"
+    source_ref: "Sources/Jazz2/UI/Cinematics.cpp:549, Sources/Main.cpp:645, Sources/Jazz2/Compatibility/AssetConverter.cpp:876-879"
     note: "Music of the intro cinematic."
 
   - name: "ending.j2b"
@@ -402,12 +402,12 @@ files:
     path: "jazz2/Source/ending.j2b"
     standalone_path: "Source/ending.j2b"
     required: false
-    source_ref: "Sources/Jazz2/UI/Cinematics.cpp:549, Sources/Main.cpp:1098, Sources/Jazz2/Compatibility/AssetConverter.cpp:777-780"
+    source_ref: "Sources/Jazz2/UI/Cinematics.cpp:549, Sources/Main.cpp:1128, Sources/Jazz2/Compatibility/AssetConverter.cpp:876-879"
     note: "Music of the ending cinematic."
 
   # Level music. The name is read from the level, lowercased and given
   # the .j2b extension when it has none.
-  # ref: Sources/Jazz2/Compatibility/JJ2Level.cpp:182, 871-877
+  # ref: Sources/Jazz2/Compatibility/JJ2Level.cpp:191, 1065-1071
 
   - name: "labrat.j2b"
     category: game_data
@@ -415,7 +415,7 @@ files:
     path: "jazz2/Source/labrat.j2b"
     standalone_path: "Source/labrat.j2b"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/JJ2Level.cpp:182, Sources/Jazz2/Compatibility/JJ2Level.cpp:871-877, Sources/Jazz2/LevelHandler.cpp:705-711, Sources/Jazz2/ContentResolver.cpp:3307-3320"
+    source_ref: "Sources/Jazz2/Compatibility/JJ2Level.cpp:191, Sources/Jazz2/Compatibility/JJ2Level.cpp:1065-1071, Sources/Jazz2/LevelHandler.cpp:832-838, Sources/Jazz2/ContentResolver.cpp:3527-3550"
     note: "Music named by share1.j2l, sharect2.j2l and sharetrs.j2l."
 
   - name: "funkyg.j2b"
@@ -424,7 +424,7 @@ files:
     path: "jazz2/Source/funkyg.j2b"
     standalone_path: "Source/funkyg.j2b"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/JJ2Level.cpp:182, Sources/Jazz2/Compatibility/JJ2Level.cpp:871-877, Sources/Jazz2/LevelHandler.cpp:705-711, Sources/Jazz2/ContentResolver.cpp:3307-3320"
+    source_ref: "Sources/Jazz2/Compatibility/JJ2Level.cpp:191, Sources/Jazz2/Compatibility/JJ2Level.cpp:1065-1071, Sources/Jazz2/LevelHandler.cpp:832-838, Sources/Jazz2/ContentResolver.cpp:3527-3550"
     note: "Music named by share2.j2l."
 
   - name: "diamond.j2b"
@@ -433,7 +433,7 @@ files:
     path: "jazz2/Source/diamond.j2b"
     standalone_path: "Source/diamond.j2b"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/JJ2Level.cpp:182, Sources/Jazz2/Compatibility/JJ2Level.cpp:871-877, Sources/Jazz2/LevelHandler.cpp:705-711, Sources/Jazz2/ContentResolver.cpp:3307-3320"
+    source_ref: "Sources/Jazz2/Compatibility/JJ2Level.cpp:191, Sources/Jazz2/Compatibility/JJ2Level.cpp:1065-1071, Sources/Jazz2/LevelHandler.cpp:832-838, Sources/Jazz2/ContentResolver.cpp:3527-3550"
     note: "Music named by share3.j2l and sharectf.j2l."
 
   - name: "boss2.j2b"
@@ -442,7 +442,7 @@ files:
     path: "jazz2/Source/boss2.j2b"
     standalone_path: "Source/boss2.j2b"
     required: false
-    source_ref: "Sources/Jazz2/Compatibility/EventConverter.cpp:413-423, Sources/Jazz2/Compatibility/AssetConverter.cpp:762-765, Sources/Jazz2/LevelHandler.cpp:1599-1602, Sources/Jazz2/ContentResolver.cpp:3307-3320"
+    source_ref: "Sources/Jazz2/Compatibility/EventConverter.cpp:413-423, Sources/Jazz2/Compatibility/AssetConverter.cpp:842-845, Sources/Jazz2/LevelHandler.cpp:1785-1788, Sources/Jazz2/ContentResolver.cpp:3527-3550"
     note: "Boss music. The boss activation event carries a music index that is converted to boss1.j2b or boss2.j2b and recorded as music the level uses. share3.j2l carries index 1."
 
   # Cinematics, read from Content/Cinematics/ then from Source/
@@ -453,7 +453,7 @@ files:
     path: "jazz2/Source/intro.j2v"
     standalone_path: "Source/intro.j2v"
     required: false
-    source_ref: "Sources/Jazz2/UI/Cinematics.cpp:576-593, Sources/Main.cpp:615"
+    source_ref: "Sources/Jazz2/UI/Cinematics.cpp:576-593, Sources/Main.cpp:645"
     note: "Intro cinematic. Skipped when absent."
 
   - name: "ending.j2v"
@@ -462,5 +462,5 @@ files:
     path: "jazz2/Source/ending.j2v"
     standalone_path: "Source/ending.j2v"
     required: false
-    source_ref: "Sources/Jazz2/UI/Cinematics.cpp:576-593, Sources/Main.cpp:1098"
+    source_ref: "Sources/Jazz2/UI/Cinematics.cpp:576-593, Sources/Main.cpp:1128"
     note: "Ending cinematic. Skipped when absent."