From ba699f472cbc1fc478ce5c89408656f1ad8c85e3 Mon Sep 17 00:00:00 2001
From: Abdessamad Derraz <3028866+Abdess@users.noreply.github.com>
Date: Mon, 10 Aug 2026 17:15:57 +0200
Subject: [PATCH] feat: add thomson mo6 machines to clk

---
 emulators/clk.yml | 308 ++++++++++++++++++++++++++++------------------
 1 file changed, 186 insertions(+), 122 deletions(-)

diff --git a/emulators/clk.yml b/emulators/clk.yml
index 11623a52..ee079cec 100644
--- a/emulators/clk.yml
+++ b/emulators/clk.yml
@@ -3,8 +3,8 @@ type: standalone
 source: "https://github.com/TomHarte/CLK"
 upstream: "https://github.com/TomHarte/CLK"
 profiled_date: "2026-03-26"
-source_commit: "8294efdacbd9c58858924fb954e6738804f19ef0"
-core_version: "2026-03-25"
+source_commit: "096de57445920ecf16cf066979422e34aceb843a"
+core_version: "2026-07-28"
 display_name: "Clock Signal"
 cores: [clk]
 systems:
@@ -30,6 +30,7 @@ systems:
   - sinclair-zx80-81
   - sinclair-zx-spectrum
   - thomson-mo5
+  - thomson-mo6
 
 notes: |
   Multi-system cycle-accurate emulator by Tom Harte. Used by Batocera and
@@ -62,7 +63,7 @@ files:
     crc32: "54c0c963"
     required: true
     mode: standalone
-    source_ref: "Machines/Acorn/Archimedes/Archimedes.cpp:120-121,Machines/Utility/ROMCatalogue.cpp:59-65"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:58-65"
 
   # -------------------------------------------------------
   # Acorn BBC Micro (machine_name: "BBCMicro")
@@ -75,7 +76,7 @@ files:
     required: true
     aliases: [basic2.rom]
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:79-85"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:78-85"
 
   - name: os12.rom
     path: BBCMicro/os12.rom
@@ -84,7 +85,7 @@ files:
     crc32: "3c14fc70"
     required: true
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:448-454"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:436-443"
 
   - name: dfs09.rom
     path: BBCMicro/dfs09.rom
@@ -94,7 +95,7 @@ files:
     required: false
     note: "Conditional: only when using 8271 disk interface"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:456-462"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:444-451"
 
   - name: dfs-2.26.rom
     path: BBCMicro/dfs-2.26.rom
@@ -104,7 +105,7 @@ files:
     required: false
     note: "Conditional: needed for 1770 DFS or tube processor"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:464-470"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:452-459"
 
   - name: adfs-1.30.rom
     path: BBCMicro/adfs-1.30.rom
@@ -114,7 +115,7 @@ files:
     required: false
     note: "Conditional: needed for ADFS support"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:472-478"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:460-467"
 
   - name: ADT-1.40.rom
     path: BBCMicro/ADT-1.40.rom
@@ -124,7 +125,7 @@ files:
     required: false
     note: "Optional: fetched separately, silently skipped if absent"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:480-486"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:468-475"
 
   - name: TUBE110.rom
     path: BBCMicro/TUBE110.rom
@@ -134,7 +135,7 @@ files:
     required: false
     note: "Conditional: needed for 6502 tube processor"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:488-494"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:476-483"
 
   - name: Z80_122.rom
     path: BBCMicro/Z80_122.rom
@@ -144,7 +145,7 @@ files:
     required: false
     note: "Conditional: needed for Z80 tube processor"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:496-502"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:484-491"
 
   # -------------------------------------------------------
   # Acorn Electron (machine_name: "Electron")
@@ -156,7 +157,7 @@ files:
     crc32: "79434781"
     required: true
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:91-97"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:90-97"
 
   - name: os.rom
     path: Electron/os.rom
@@ -165,7 +166,11 @@ files:
     crc32: "bf63fb1f"
     required: true
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:148-153"
+    note: >
+      The catalogue accepts five images: 406a42ce, 0886741b, bf63fb1f, 6fea0978
+      and d61135d7. They differ only in the credits text, which lives on the IO
+      page of a real machine.
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:146-156"
 
   - name: ADFS-E00_1.rom
     path: Electron/ADFS-E00_1.rom
@@ -175,7 +180,7 @@ files:
     required: false
     note: "Conditional: needed for PRES ADFS"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:99-105"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:98-105"
 
   - name: ADFS-E00_2.rom
     path: Electron/ADFS-E00_2.rom
@@ -185,7 +190,7 @@ files:
     required: false
     note: "Conditional: needed for PRES ADFS"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:107-113"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:106-113"
 
   - name: adfs.rom
     path: Electron/adfs.rom
@@ -195,7 +200,7 @@ files:
     required: false
     note: "Conditional: needed for Acorn ADFS"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:115-121"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:114-121"
 
   - name: DFS-1770-2.20.rom
     path: Electron/DFS-1770-2.20.rom
@@ -205,7 +210,7 @@ files:
     required: false
     note: "Conditional: needed for DFS disk images"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:123-129"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:122-129"
 
   - name: ELK130E.rom
     path: Electron/ELK130E.rom
@@ -215,7 +220,7 @@ files:
     required: false
     note: "Conditional: needed for IDE interface"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:131-137"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:130-137"
 
   - name: AP6v133.rom
     path: Electron/AP6v133.rom
@@ -225,7 +230,7 @@ files:
     required: false
     note: "Conditional: needed for AP6 commands"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:139-145"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:138-145"
 
   # -------------------------------------------------------
   # Amiga (machine_name: "Amiga")
@@ -237,7 +242,7 @@ files:
     crc32: "c4f0f55f"
     required: true
     mode: standalone
-    source_ref: "Machines/Amiga/Amiga.cpp:60-61, Machines/Utility/ROMCatalogue.cpp:205-211"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:193-200"
 
   # -------------------------------------------------------
   # Amstrad CPC (machine_name: "AmstradCPC")
@@ -251,7 +256,7 @@ files:
     required: false
     note: "Built into binary. Required for CPC 464 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:273-278, Machines/Utility/ROMLibrary.cpp:14535"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:261-268, Machines/Utility/ROMLibrary.cpp:14535"
 
   - name: basic464.rom
     path: AmstradCPC/basic464.rom
@@ -261,7 +266,7 @@ files:
     required: false
     note: "Built into binary. Required for CPC 464 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:280-287, Machines/Utility/ROMLibrary.cpp:14532"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:269-276, Machines/Utility/ROMLibrary.cpp:14532"
 
   - name: os664.rom
     path: AmstradCPC/os664.rom
@@ -271,7 +276,7 @@ files:
     required: false
     note: "Built into binary. Required for CPC 664 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:289-293, Machines/Utility/ROMLibrary.cpp:14536"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:277-283, Machines/Utility/ROMLibrary.cpp:14537"
 
   - name: basic664.rom
     path: AmstradCPC/basic664.rom
@@ -281,7 +286,7 @@ files:
     required: false
     note: "Built into binary. Required for CPC 664 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:295-302, Machines/Utility/ROMLibrary.cpp:14534"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:284-291, Machines/Utility/ROMLibrary.cpp:14534"
 
   - name: os6128.rom
     path: AmstradCPC/os6128.rom
@@ -291,7 +296,7 @@ files:
     required: false
     note: "Built into binary. Required for CPC 6128 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:304-310, Machines/Utility/ROMLibrary.cpp:14536"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:292-299, Machines/Utility/ROMLibrary.cpp:14536"
 
   - name: basic6128.rom
     path: AmstradCPC/basic6128.rom
@@ -301,7 +306,7 @@ files:
     required: false
     note: "Built into binary. Required for CPC 6128 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:312-318, Machines/Utility/ROMLibrary.cpp:14533"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:300-307, Machines/Utility/ROMLibrary.cpp:14533"
 
   - name: amsdos.rom
     path: AmstradCPC/amsdos.rom
@@ -311,7 +316,7 @@ files:
     required: false
     note: "Built into binary. Needed for CPC 664/6128 disk support."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:265-271, Machines/Utility/ROMLibrary.cpp:14531"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:253-260, Machines/Utility/ROMLibrary.cpp:14531"
 
   # -------------------------------------------------------
   # Apple II (machine_name: "AppleII")
@@ -324,7 +329,7 @@ files:
     required: true
     note: "Required for original Apple II model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:348-354"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:336-343"
 
   - name: apple2.rom
     path: AppleII/apple2.rom
@@ -334,7 +339,7 @@ files:
     required: true
     note: "Required for Apple II+ model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:340-346"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:328-335"
 
   - name: apple2eu.rom
     path: AppleII/apple2eu.rom
@@ -344,7 +349,7 @@ files:
     required: true
     note: "Required for Apple IIe model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:332-338"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:320-327"
 
   - name: apple2e.rom
     path: AppleII/apple2e.rom
@@ -354,7 +359,7 @@ files:
     required: true
     note: "Required for Enhanced IIe model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:324-330"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:312-319"
 
   - name: apple2-character.rom
     path: AppleII/apple2-character.rom
@@ -364,7 +369,7 @@ files:
     required: true
     note: "Required for Apple II and II+ models"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:356-362"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:344-351"
 
   - name: apple2eu-character.rom
     path: AppleII/apple2eu-character.rom
@@ -374,7 +379,7 @@ files:
     required: true
     note: "Required for Apple IIe model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:364-370"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:352-359"
 
   - name: apple2e-character.rom
     path: AppleII/apple2e-character.rom
@@ -384,7 +389,7 @@ files:
     required: true
     note: "Required for Enhanced IIe model. Also used by Apple IIgs."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:372-378"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:360-367"
 
   - name: scsi.rom
     path: AppleII/scsi.rom
@@ -394,7 +399,7 @@ files:
     required: false
     note: "Conditional: needed for SCSI controller"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:380-386"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:368-375"
 
   # -------------------------------------------------------
   # Apple IIgs (machine_name: "AppleIIgs")
@@ -407,7 +412,7 @@ files:
     required: true
     note: "Required for ROM01 model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:392-398"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:380-387"
 
   - name: apple2gs.rom2
     path: AppleIIgs/apple2gs.rom2
@@ -417,7 +422,7 @@ files:
     required: true
     note: "Required for ROM03 model (default)"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:400-406"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:388-395"
 
   - name: apple2gs.chr
     path: AppleIIgs/apple2gs.chr
@@ -426,7 +431,7 @@ files:
     crc32: "91e53cd8"
     required: true
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:408-414"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:396-403"
 
   - name: "341s0632-2"
     path: "AppleIIgs/341s0632-2"
@@ -435,7 +440,7 @@ files:
     crc32: "e1c11fb0"
     required: true
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:416-421"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:404-411"
 
   # -------------------------------------------------------
   # Atari ST (machine_name: "AtariST")
@@ -447,7 +452,7 @@ files:
     crc32: "1a586c64"
     required: true
     mode: standalone
-    source_ref: "Machines/Atari/ST/AtariST.cpp:98-99, Machines/Utility/ROMCatalogue.cpp:428-434"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:416-423"
 
   # -------------------------------------------------------
   # ColecoVision (machine_name: "ColecoVision")
@@ -459,7 +464,7 @@ files:
     crc32: "3aa93ef3"
     required: true
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:508-514"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:496-503"
 
   # -------------------------------------------------------
   # Commodore 1540/1541 (machine_name: "Commodore1540")
@@ -473,7 +478,7 @@ files:
     required: false
     note: "Conditional: needed when VIC-20 has 1540 drive"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:520-526"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:508-515"
 
   - name: 1541.bin
     path: Commodore1540/1541.bin
@@ -483,7 +488,7 @@ files:
     required: false
     note: "Conditional: needed when Plus/4 has 1541 drive"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:528-534"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:516-523"
 
   # -------------------------------------------------------
   # Disk II (machine_name: "DiskII")
@@ -497,7 +502,7 @@ files:
     required: false
     note: "Conditional: needed for 16-sector disk controller"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:540-546"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:528-535"
 
   - name: state-machine-16.rom
     path: DiskII/state-machine-16.rom
@@ -507,7 +512,7 @@ files:
     required: false
     note: "Conditional: needed for disk controller. Also used by Oric Pravetz."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:548-554"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:536-543"
 
   - name: boot-13.rom
     path: DiskII/boot-13.rom
@@ -517,7 +522,7 @@ files:
     required: false
     note: "Conditional: needed for 13-sector disk controller"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:545-551"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:544-551"
 
   - name: state-machine-13.rom
     path: DiskII/state-machine-13.rom
@@ -527,7 +532,7 @@ files:
     required: false
     note: "Conditional: needed for 13-sector disk controller"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:600-606"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:552-559"
 
   # -------------------------------------------------------
   # Enterprise 64/128 (machine_name: "Enterprise")
@@ -541,7 +546,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:648-657"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:600-607"
 
   - name: exos20.bin
     path: Enterprise/exos20.bin
@@ -552,7 +557,7 @@ files:
     aliases: ["Expandible OS v2.0 (1984)(Intelligent Software).bin"]
     note: "Alternative EXOS version"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:659-668"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:611-618"
 
   - name: exos21.bin
     path: Enterprise/exos21.bin
@@ -563,7 +568,7 @@ files:
     aliases: ["Expandible OS v2.1 (1985)(Intelligent Software).bin"]
     note: "Alternative EXOS version"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:670-679"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:622-629"
 
   - name: exos23.bin
     path: Enterprise/exos23.bin
@@ -574,7 +579,7 @@ files:
     aliases: ["Expandible OS v2.3 (1987)(Intelligent Software).bin"]
     note: "Alternative EXOS version"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:681-690"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:633-640"
 
   - name: basic10.bin
     path: Enterprise/basic10.bin
@@ -584,7 +589,7 @@ files:
     required: true
     note: "One BASIC version required. v1.0 single-file version."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:693-699"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:645-652"
 
   - name: "BASIC 1.0 - EPROM 1-2 (198x)(Enterprise).bin"
     path: "Enterprise/BASIC 1.0 - EPROM 1-2 (198x)(Enterprise).bin"
@@ -594,7 +599,7 @@ files:
     required: false
     note: "Alternative: both parts needed together as substitute for basic10.bin"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:701-707"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:653-660"
 
   - name: "BASIC 1.0 - EPROM 2-2 (198x)(Enterprise).bin"
     path: "Enterprise/BASIC 1.0 - EPROM 2-2 (198x)(Enterprise).bin"
@@ -604,7 +609,7 @@ files:
     required: false
     note: "Alternative: both parts needed together as substitute for basic10.bin"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:709-715"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:661-668"
 
   - name: basic11.bin
     path: Enterprise/basic11.bin
@@ -614,7 +619,7 @@ files:
     required: true
     note: "Alternative BASIC version"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:717-723"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:669-676"
 
   - name: "BASIC 1.1 - EPROM 1.1 (198x)(Enterprise).bin"
     path: "Enterprise/BASIC 1.1 - EPROM 1.1 (198x)(Enterprise).bin"
@@ -624,7 +629,7 @@ files:
     required: false
     note: "Alternative format of BASIC v1.1 with trailing byte"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:725-731"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:677-684"
 
   - name: basic21.bin
     path: Enterprise/basic21.bin
@@ -637,7 +642,7 @@ files:
       - "BASIC Interpreter v2.1 (1985)(Intelligent Software)[a].bin"
     note: "Alternative BASIC version"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:733-743"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:685-693"
 
   - name: epdos.bin
     path: Enterprise/epdos.bin
@@ -648,7 +653,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:745-755"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:698-705"
 
   - name: exdos.bin
     path: Enterprise/exdos.bin
@@ -659,7 +664,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:757-766"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:709-716"
 
   # -------------------------------------------------------
   # Apple Macintosh (machine_name: "Macintosh")
@@ -672,7 +677,7 @@ files:
     required: true
     note: "Required for Macintosh 128k model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:772-778"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:724-731"
 
   - name: mac512k.rom
     path: Macintosh/mac512k.rom
@@ -682,7 +687,7 @@ files:
     required: true
     note: "Required for Macintosh 512k model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:780-786"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:732-739"
 
   - name: macplus.rom
     path: Macintosh/macplus.rom
@@ -692,7 +697,7 @@ files:
     required: true
     note: "Required for Macintosh 512ke and Plus models"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:788-798"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:740-751"
 
   # -------------------------------------------------------
   # Master System (machine_name: "MasterSystem")
@@ -700,22 +705,24 @@ files:
   - name: bios.sms
     path: MasterSystem/bios.sms
     description: "European/US Master System BIOS"
+    region: [north-america, europe]
     size: 8192
     crc32: "0072ed54"
     required: false
     note: "Optional. Boots cartridge directly if absent."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:812-818"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:764-771"
 
   - name: japanese-bios.sms
     path: MasterSystem/japanese-bios.sms
     description: "Japanese Master System BIOS"
+    region: [japan]
     size: 8192
     crc32: "48d44a13"
     required: false
     note: "Optional. Used for Japan region. Boots without if absent."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:804-810"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:756-763"
 
   # -------------------------------------------------------
   # MSX (machine_name: "MSX")
@@ -729,35 +736,38 @@ files:
     required: true
     note: "Required for MSX1. Region bytes patched in memory if regional BIOS absent."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:825-831"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:777-784"
 
   - name: msx-japanese.rom
     path: MSX/msx-japanese.rom
     description: "Japanese MSX BIOS"
+    region: [japan]
     size: 32768
     crc32: "ee229390"
     required: false
     note: "Alternative to msx.rom for Japanese region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:833-839"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:785-792"
 
   - name: msx-american.rom
     path: MSX/msx-american.rom
     description: "American MSX BIOS"
+    region: [north-america]
     size: 32768
     required: false
     note: "Alternative to msx.rom for American region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:841-847"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:793-800"
 
   - name: msx-european.rom
     path: MSX/msx-european.rom
     description: "European MSX BIOS"
+    region: [europe]
     size: 32768
     required: false
     note: "Alternative to msx.rom for European region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:849-855"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:801-808"
 
   - name: disk.rom
     path: MSX/disk.rom
@@ -767,7 +777,7 @@ files:
     required: false
     note: "Conditional: needed for disk drive support"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:857-863"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:809-816"
 
   - name: msx2.rom
     aliases: [MSX2.ROM]
@@ -778,7 +788,7 @@ files:
     required: true
     note: "Required for MSX2"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:865-872"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:818-825"
 
   - name: msx2ext.rom
     aliases: [MSX2EXT.ROM]
@@ -789,7 +799,7 @@ files:
     required: true
     note: "Required for MSX2"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:874-880"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:826-833"
 
   - name: fmpac.rom
     path: MSX/fmpac.rom
@@ -799,7 +809,7 @@ files:
     required: false
     note: "Conditional: needed for MSX-Music support"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:882-888"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:834-841"
 
   # -------------------------------------------------------
   # Oric (machine_name: "Oric")
@@ -812,7 +822,7 @@ files:
     required: true
     note: "Required for Oric-1 model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:918-924"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:870-877"
 
   - name: basic11.rom
     path: Oric/basic11.rom
@@ -822,7 +832,7 @@ files:
     required: true
     note: "Required for Oric Atmos model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:926-932"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:878-885"
 
   - name: pravetz.rom
     path: Oric/pravetz.rom
@@ -832,7 +842,7 @@ files:
     required: true
     note: "Required for Pravetz 8D model"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:934-940"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:886-893"
 
   - name: colour.rom
     path: Oric/colour.rom
@@ -842,7 +852,7 @@ files:
     required: false
     note: "Optional. Enables colour video output."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:894-900"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:846-853"
 
   - name: ORIC.PAL-PROM-TBP24S10-1ab9b572.bin
     path: Oric/ORIC.PAL-PROM-TBP24S10-1ab9b572.bin
@@ -852,7 +862,7 @@ files:
     required: false
     note: "Optional. Alternative colour ROM."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:902-908"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:854-861"
 
   - name: PRAVETZ-8D.PAL-PROM-82S129-1576a69b.bin
     path: Oric/PRAVETZ-8D.PAL-PROM-82S129-1576a69b.bin
@@ -862,7 +872,7 @@ files:
     required: false
     note: "Optional. Colour ROM for Pravetz model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:910-916"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:862-869"
 
   - name: bd500.rom
     path: Oric/bd500.rom
@@ -872,7 +882,7 @@ files:
     required: false
     note: "Conditional: needed for Byte Drive 500 disk interface"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:942-948"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:894-901"
 
   - name: jasmin.rom
     path: Oric/jasmin.rom
@@ -882,7 +892,7 @@ files:
     required: false
     note: "Conditional: needed for Jasmin disk interface"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:950-956"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:902-909"
 
   - name: microdisc.rom
     path: Oric/microdisc.rom
@@ -892,7 +902,7 @@ files:
     required: false
     note: "Conditional: needed for Microdisc disk interface"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:958-964"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:910-917"
 
   - name: 8dos.rom
     path: Oric/8dos.rom
@@ -902,7 +912,7 @@ files:
     required: false
     note: "Conditional: needed for Pravetz 8-DOS disk interface"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:966-972"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:918-925"
 
   # -------------------------------------------------------
   # PC Compatible (machine_name: "PCCompatible")
@@ -915,7 +925,7 @@ files:
     required: true
     note: "Required for XT-class emulation"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:978-984"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:930-937"
 
   - name: GLaTICK_0.8.5_AT.ROM
     path: PCCompatible/GLaTICK_0.8.5_AT.ROM
@@ -925,7 +935,7 @@ files:
     required: false
     note: "XT-class RTC option ROM"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:986-992"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:938-945"
 
   - name: "Phoenix 80286 ROM BIOS Version 3.05.bin"
     path: "PCCompatible/Phoenix 80286 ROM BIOS Version 3.05.bin"
@@ -935,7 +945,7 @@ files:
     required: true
     note: "Required for AT-class emulation (alternative to IBM AT BIOS)"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:994-1000"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:946-953"
 
   - name: at-bios.bin
     path: PCCompatible/at-bios.bin
@@ -945,7 +955,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:1002-1008"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:954-961"
 
   - name: BIOS_5170_15NOV85_U27_61X9266_27256.BIN
     path: PCCompatible/BIOS_5170_15NOV85_U27_61X9266_27256.BIN
@@ -955,7 +965,7 @@ files:
     required: false
     note: "AT-class: split BIOS, used with U47 chip"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1010-1016"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:962-969"
 
   - name: BIOS_5170_15NOV85_U47_61X9265_27256.BIN
     path: PCCompatible/BIOS_5170_15NOV85_U47_61X9265_27256.BIN
@@ -965,7 +975,7 @@ files:
     required: false
     note: "AT-class: split BIOS, used with U27 chip"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1018-1024"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:970-977"
 
   - name: CGA.F08
     path: PCCompatible/CGA.F08
@@ -975,7 +985,7 @@ files:
     required: true
     note: "Required for CGA video adapter"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1026-1032"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:978-985"
 
   - name: EUMDA9.F14
     path: PCCompatible/EUMDA9.F14
@@ -985,7 +995,7 @@ files:
     required: true
     note: "Required for MDA video adapter"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1034-1040"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:986-993"
 
   - name: ibm_6277356_ega_card_u44_27128.bin
     path: PCCompatible/ibm_6277356_ega_card_u44_27128.bin
@@ -995,7 +1005,7 @@ files:
     required: false
     note: "Needed for EGA video adapter"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1042-1048"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:994-1001"
 
   - name: ibm_vga.bin
     path: PCCompatible/ibm_vga.bin
@@ -1005,7 +1015,7 @@ files:
     required: false
     note: "Needed for VGA video adapter"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1050-1056"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1002-1009"
 
   - name: ibm-basic-1.10.rom
     path: PCCompatible/ibm-basic-1.10.rom
@@ -1015,7 +1025,7 @@ files:
     required: false
     note: "Required for AT-class with IBM BIOS (not needed with Phoenix)"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1058-1064"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1010-1017"
 
   # -------------------------------------------------------
   # Commodore Plus/4 (machine_name: "Plus4")
@@ -1027,7 +1037,7 @@ files:
     crc32: "74eaae87"
     required: true
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1221-1228"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1046-1053"
 
   - name: kernal.318004-05.bin
     path: Plus4/kernal.318004-05.bin
@@ -1037,7 +1047,7 @@ files:
     required: true
     note: "Default kernel version requested by machine code"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1214-1220"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1038-1045"
 
   - name: kernal.318004-03.bin
     path: Plus4/kernal.318004-03.bin
@@ -1047,7 +1057,7 @@ files:
     required: false
     note: "Alternative kernel version (in catalogue but not default)"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1023-1029"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1022-1029"
 
   - name: kernal.318004-04.bin
     path: Plus4/kernal.318004-04.bin
@@ -1057,11 +1067,20 @@ files:
     required: false
     note: "Alternative kernel version (in catalogue but not default)"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1031-1037"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1030-1037"
 
   # -------------------------------------------------------
   # Thomson MO5 (machine_name: "Thomson")
   # -------------------------------------------------------
+  - name: mo5-v1.0.rom
+    path: Thomson/mo5-v1.0.rom
+    description: "Thomson MO5 ROM, version 1"
+    size: 16384
+    crc32: "f62d2f3a"
+    required: true
+    mode: standalone
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1157-1164"
+
   - name: mo5-v1.1.rom
     path: Thomson/mo5-v1.1.rom
     description: "Thomson MO5 ROM, version 1.1"
@@ -1069,17 +1088,53 @@ files:
     crc32: "237c60bf"
     required: true
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1032-1038"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1165-1172"
 
-  - name: mo5-v1.0.rom
-    path: Thomson/mo5-v1.0.rom
-    description: "Thomson MO5 ROM, version 1"
-    size: 16384
-    crc32: "f62d2f3a"
-    required: false
-    note: "In catalogue but machine requests v1.1 only"
+  - name: mo6-v1.rom
+    path: Thomson/mo6-v1.rom
+    description: "Thomson MO6 ROM, version 1"
+    size: 65536
+    crc32: "45e859c6"
+    required: true
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1024-1030"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1173-1180"
+
+  - name: mo6-v2.rom
+    path: Thomson/mo6-v2.rom
+    description: "Thomson MO6 ROM, version 2"
+    size: 65536
+    crc32: "b4430a3b"
+    required: true
+    mode: standalone
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1181-1188"
+
+  - name: mo6-v3.rom
+    path: Thomson/mo6-v3.rom
+    description: "Thomson MO6 ROM, version 3"
+    size: 65536
+    crc32: "7a012322"
+    required: true
+    mode: standalone
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1189-1196"
+
+  - name: pc128.rom
+    path: Thomson/pc128.rom
+    description: "Olivetti Prodest PC128 ROM"
+    size: 65536
+    crc32: "fc173504"
+    required: true
+    mode: standalone
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1197-1204"
+
+  - name: cd90-640.rom
+    path: Thomson/cd90-640.rom
+    description: "Thomson CD90-640 floppy controller ROM"
+    size: 1984
+    crc32: "5114c0a5"
+    required: false
+    note: "Requested on top of the machine ROM when a disk is attached."
+    mode: standalone
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1206-1213"
 
   # -------------------------------------------------------
   # Commodore VIC-20 (machine_name: "Vic20")
@@ -1091,97 +1146,106 @@ files:
     crc32: "db4c43c1"
     required: true
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1399-1405"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1218-1225"
 
   - name: characters-english.bin
     path: Vic20/characters-english.bin
     description: "English-language VIC-20 character ROM"
+    region: [north-america, europe]
     size: 4096
     crc32: "83e032a6"
     required: true
     note: "Required for English region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1407-1413"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1226-1233"
 
   - name: kernel-pal.bin
     path: Vic20/kernel-pal.bin
     description: "English-language PAL VIC-20 kernel ROM"
+    region: [europe]
     size: 8192
     crc32: "4be07cb4"
     required: true
     note: "Required for English PAL region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1415-1421"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1234-1241"
 
   - name: kernel-ntsc.bin
     path: Vic20/kernel-ntsc.bin
     description: "English-language NTSC VIC-20 kernel ROM"
+    region: [north-america]
     size: 8192
     crc32: "e5e7c174"
     required: true
     note: "Required for English NTSC region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1423-1429"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1242-1249"
 
   - name: characters-danish.bin
     path: Vic20/characters-danish.bin
     description: "Danish VIC-20 character ROM"
+    region: [denmark]
     size: 4096
     crc32: "7fc11454"
     required: false
     note: "Required for Danish region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1431-1437"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1250-1257"
 
   - name: kernel-danish.bin
     path: Vic20/kernel-danish.bin
     description: "Danish VIC-20 kernel ROM"
+    region: [denmark]
     size: 8192
     crc32: "02adaf16"
     required: false
     note: "Required for Danish region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1439-1445"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1258-1265"
 
   - name: characters-japanese.bin
     path: Vic20/characters-japanese.bin
     description: "Japanese VIC-20 character ROM"
+    region: [japan]
     size: 4096
     crc32: "fcfd8a4b"
     required: false
     note: "Required for Japanese region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1447-1453"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1266-1273"
 
   - name: kernel-japanese.bin
     path: Vic20/kernel-japanese.bin
     description: "Japanese VIC-20 kernel ROM"
+    region: [japan]
     size: 8192
     crc32: "336900d7"
     required: false
     note: "Required for Japanese region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1455-1461"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1274-1281"
 
   - name: characters-swedish.bin
     path: Vic20/characters-swedish.bin
     description: "Swedish VIC-20 character ROM"
+    region: [sweden]
     size: 4096
     crc32: "d808551d"
     required: false
     note: "Required for Swedish region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1463-1469"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1282-1289"
 
   - name: kernel-swedish.bin
     path: Vic20/kernel-swedish.bin
     description: "Swedish VIC-20 kernel ROM"
+    region: [sweden]
     size: 8192
     crc32: "b2a60662"
     required: false
     note: "Required for Swedish region"
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1471-1477"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1290-1297"
 
   # -------------------------------------------------------
   # Sinclair ZX Spectrum (machine_name: "ZXSpectrum")
@@ -1195,7 +1259,7 @@ files:
     required: false
     note: "Built into binary. Required for 16K/48K model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1483-1489, Machines/Utility/ROMLibrary.cpp:14539"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1302-1309, Machines/Utility/ROMLibrary.cpp:14539"
 
   - name: 128.rom
     path: ZXSpectrum/128.rom
@@ -1205,7 +1269,7 @@ files:
     required: false
     note: "Built into binary. Required for 128K model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1491-1497, Machines/Utility/ROMLibrary.cpp:14540"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1310-1317, Machines/Utility/ROMLibrary.cpp:14540"
 
   - name: plus2.rom
     path: ZXSpectrum/plus2.rom
@@ -1215,7 +1279,7 @@ files:
     required: false
     note: "Built into binary. Required for +2 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1499-1505, Machines/Utility/ROMLibrary.cpp:14541"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1318-1325, Machines/Utility/ROMLibrary.cpp:14541"
 
   - name: plus3.rom
     path: ZXSpectrum/plus3.rom
@@ -1225,7 +1289,7 @@ files:
     required: false
     note: "Built into binary. Required for +2a/+3 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1507-1516, Machines/Utility/ROMLibrary.cpp:14542"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1326-1336, Machines/Utility/ROMLibrary.cpp:14542"
 
   # -------------------------------------------------------
   # Sinclair ZX80/ZX81 (machine_name: "ZX8081")
@@ -1239,7 +1303,7 @@ files:
     required: false
     note: "Built into binary. Required for ZX80 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1522-1528, Machines/Utility/ROMLibrary.cpp:14544"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1341-1348, Machines/Utility/ROMLibrary.cpp:14544"
 
   - name: zx81.rom
     path: ZX8081/zx81.rom
@@ -1249,4 +1313,4 @@ files:
     required: false
     note: "Built into binary. Required for ZX81 model."
     mode: standalone
-    source_ref: "Machines/Utility/ROMCatalogue.cpp:1530-1536, Machines/Utility/ROMLibrary.cpp:14545"
+    source_ref: "Machines/Utility/ROMCatalogue.cpp:1349-1356, Machines/Utility/ROMLibrary.cpp:14545"