diff --git a/Ample/Resources/roms.plist b/Ample/Resources/roms.plist
index a073927..100241a 100644
--- a/Ample/Resources/roms.plist
+++ b/Ample/Resources/roms.plist
@@ -30,13 +30,13 @@
value
agat840k_hle
description
- Agat 840K floppy card
+ Agat 840K Floppy Card
value
agat_fdc
description
- Agat 840K floppy controller card
+ Agat 840K Floppy Controller Card
value
@@ -48,7 +48,7 @@
value
agat7_flop
description
- Agat-7 140K floppy card
+ Agat-7 140K Floppy Card
value
@@ -60,7 +60,7 @@
value
agat9_flop
description
- Agat-9 140K floppy card
+ Agat-9 140K Floppy Card
value
@@ -88,15 +88,15 @@
value
- apple2c0
+ apple2c4
description
- Apple //c (UniDisk 3.5)
+ Apple //c (Rev 4)
value
- apple2c4
+ apple2c0
description
- Apple //c (rev 4)
+ Apple //c (UniDisk 3.5)
value
@@ -110,6 +110,24 @@
description
Apple //e
+
+ value
+ apple2ee
+ description
+ Apple //e (Enhanced)
+
+
+ value
+ apple2eefr
+ description
+ Apple //e (Enhanced, France)
+
+
+ value
+ apple2eeuk
+ description
+ Apple //e (Enhanced, UK)
+
value
apple2ep
@@ -128,24 +146,6 @@
description
Apple //e (UK)
-
- value
- apple2ee
- description
- Apple //e (enhanced)
-
-
- value
- apple2eefr
- description
- Apple //e (enhanced, France)
-
-
- value
- apple2eeuk
- description
- Apple //e (enhanced, UK)
-
value
adbmodem
@@ -156,31 +156,31 @@
value
cuda
description
- Apple Cuda v2.xx ADB/I2C
-
-
- value
- a2iwm
- description
- Apple Disk II IWM controller
-
-
- value
- diskii13
- description
- Apple Disk II NG controller (13-sector)
-
-
- value
- a2diskiing
- description
- Apple Disk II NG controller (16-sector)
+ Apple Cuda V2.xx ADB/I2C
value
d2fdc
description
- Apple Disk II floppy controller
+ Apple Disk II Floppy Controller
+
+
+ value
+ a2iwm
+ description
+ Apple Disk II IWM Controller
+
+
+ value
+ diskii13
+ description
+ Apple Disk II NG Controller (13-sector)
+
+
+ value
+ a2diskiing
+ description
+ Apple Disk II NG Controller (16-sector)
value
@@ -198,7 +198,7 @@
value
a1cass
description
- Apple I cassette board
+ Apple I Cassette Board
value
@@ -264,19 +264,19 @@
value
a3fdc
description
- Apple III floppy controller
+ Apple III Floppy Controller
value
apple2gsr0p2
description
- Apple IIgs (ROM00 prototype 3/10/1986)
+ Apple IIgs (ROM00 Prototype 3/10/1986)
value
apple2gsr0p
description
- Apple IIgs (ROM00 prototype 6/19/1986)
+ Apple IIgs (ROM00 Prototype 6/19/1986)
value
@@ -324,7 +324,7 @@
value
nb_aenet
description
- Apple NuBus Ethernet card
+ Apple NuBus Ethernet Card
value
@@ -360,7 +360,7 @@
value
nb_qdlink
description
- Applied Engineering Quadralink serial card
+ Applied Engineering Quadralink Serial Card
value
@@ -390,19 +390,19 @@
value
a2vulgld
description
- Applied Engineering Vulcan Gold IDE controller (IIgs version)
+ Applied Engineering Vulcan Gold IDE Controller (IIgs Version)
value
a2vuliie
description
- Applied Engineering Vulcan IDE controller (//e version)
+ Applied Engineering Vulcan IDE Controller (//e Version)
value
a2vulcan
description
- Applied Engineering Vulcan IDE controller (IIgs version)
+ Applied Engineering Vulcan IDE Controller (IIgs Version)
value
@@ -414,13 +414,13 @@
value
nb_amc3b
description
- Asante MC3NB Ethernet card
+ Asante MC3NB Ethernet Card
value
pdslc_macconlc
description
- Asante MacCON i LC Ethernet card
+ Asante MacCON I LC Ethernet Card
value
@@ -456,7 +456,7 @@
value
nb_btbug
description
- Brigent BootBug debugger card
+ Brigent BootBug Debugger Card
value
@@ -468,19 +468,19 @@
value
a2cffa02
description
- CFFA 2.0 Compact Flash (6502 firmware)
+ CFFA 2.0 Compact Flash (6502 Firmware)
value
a2cffa2
description
- CFFA 2.0 Compact Flash (65C02 firmware)
+ CFFA 2.0 Compact Flash (65c02 Firmware)
value
cffa1
description
- CFFA Compact Flash for Apple I
+ CFFA Compact Flash For Apple I
value
@@ -528,13 +528,13 @@
value
cp2024
description
- Conner Peripherals CP-2024 hard disk
+ Conner Peripherals CP-2024 Hard Disk
value
a2corvus
description
- Corvus Flat Cable interface
+ Corvus Flat Cable Interface
value
@@ -588,7 +588,7 @@
value
pds30_emac
description
- Farallon EtherMac 30i-TH Ethernet card
+ Farallon EtherMac 30i-TH Ethernet Card
value
@@ -666,13 +666,13 @@
value
a2ap16
description
- IBS AP-16 80 column card
+ IBS AP-16 80 Column Card
value
a2ap16a
description
- IBS AP-16 80 column card (alt. version)
+ IBS AP-16 80 Column Card (Alt. Version)
value
@@ -726,19 +726,19 @@
value
laser128o
description
- Laser 128 (original hardware)
+ Laser 128 (Original Hardware)
value
las128ex
description
- Laser 128ex (version 4.5)
+ Laser 128ex (Version 4.5)
value
las128e2
description
- Laser 128ex2 (version 6.1)
+ Laser 128ex2 (Version 6.1)
value
@@ -996,7 +996,7 @@
value
nb_vikbw
description
- Moniterm MacViking II video card
+ Moniterm MacViking II Video Card
value
@@ -1014,7 +1014,7 @@
value
upd7220
description
- NEC uPD7220
+ NEC UPD7220
value
@@ -1026,7 +1026,7 @@
value
a2bufgrapplerplusa
description
- Orange Micro Buffered Grappler+ (rev A) Printer Interface
+ Orange Micro Buffered Grappler+ (Rev A) Printer Interface
value
@@ -1104,19 +1104,19 @@
value
nb_thungx
description
- Radius Thunder IV GX video card
+ Radius Thunder IV GX Video Card
value
nb_rtpd
description
- Radius Two Page Display video card
+ Radius Two Page Display Video Card
value
nb_c264
description
- RasterOps ColorBoard 264 video card
+ RasterOps ColorBoard 264 Video Card
value
@@ -1128,7 +1128,7 @@
value
cv8lc
description
- RasterOps ColorVue 8LC video card
+ RasterOps ColorVue 8LC Video Card
value
@@ -1158,7 +1158,7 @@
value
nb_laserview
description
- Sigma Designs LaserView video card
+ Sigma Designs LaserView Video Card
value
@@ -1188,13 +1188,13 @@
value
nb_spdq
description
- SuperMac Spectrum PDQ video card
+ SuperMac Spectrum PDQ Video Card
value
nb_sp8s3
description
- SuperMac Spectrum/8 Series III video card
+ SuperMac Spectrum/8 Series III Video Card
value
@@ -1224,13 +1224,13 @@
value
uniap2pt
description
- Unitron AP II (in Brazilian Portuguese)
+ Unitron AP II (In Brazilian Portuguese)
value
uniap2en
description
- Unitron AP II (in English)
+ Unitron AP II (In English)
value
@@ -1238,17 +1238,23 @@
description
Unitron AP II+ (Teclado Inteligente)
+
+ value
+ a2vtc1
+ description
+ Unknown Videoterm Clone
+
value
a2ultrme
description
- Videx UltraTerm (enhanced //e)
+ Videx UltraTerm (Enhanced //e)
value
a2ulttrm
description
- Videx UltraTerm (original)
+ Videx UltraTerm (Original)
value
@@ -1266,7 +1272,7 @@
value
a2vistaa800
description
- Vista A800 8inch disk Controller Card
+ Vista A800 8" Disk Controller Card
value
@@ -1298,11 +1304,5 @@
description
Zip Technologies ZipDrive
-
- value
- a2vtc1
- description
- unknown Videoterm clone
-
diff --git a/python/mkroms.py b/python/mkroms.py
index 53a057a..e794f34 100644
--- a/python/mkroms.py
+++ b/python/mkroms.py
@@ -1,4 +1,5 @@
import argparse
+import re
import xml.etree.ElementTree as ET
from html.parser import HTMLParser
@@ -130,6 +131,10 @@ EXCLUDE = set([
def fix_machine_description(x, devname):
# CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)
x = x.replace(", www.dreher.net","")
+ x = x.replace('8inch','8"') #
+ x = x.replace("65C02", "65c02")
+ x = re.sub(r"((^| |\()[a-z])", lambda x: x[0].upper(), x) # fix capital-case
+
if devname in ("st", "megast"): x = "Atari " + x
return x