diff --git a/emulators/c64-emu.yml b/emulators/c64-emu.yml index 91c6a7db3..f1781a51b 100644 --- a/emulators/c64-emu.yml +++ b/emulators/c64-emu.yml @@ -181,7 +181,6 @@ files: size: 8192 sha1: "4ff0f11e80f4b57430d8f0c3799ed0f0e0f4565d" validation: [size, sha1] - region: [japan] description: "Japanese C64 kernal" source_ref: "source C64.emu/src/vice/c64/c64rom.h:49, 90, source C64.emu/src/vice/c64/c64model.c:148-151, source C64.emu/src/vice/c64/c64-resources.c:246" @@ -230,7 +229,6 @@ files: required: false size: 4096 validation: [size] - region: [japan] description: "Japanese C64 character generator" source_ref: "source C64.emu/src/vice/c64/c64rom.h:61, source C64.emu/src/vice/c64/c64model.c:148-151, 323" @@ -279,7 +277,6 @@ files: required: false size: 4096 validation: [size] - region: [japan] description: "Japanese character generator, Japanese SuperCPU model" source_ref: "source C64.emu/src/vice/scpu64/scpu64model.c:303, source C64.emu/src/vice/c64/c64rom.h:61" @@ -580,7 +577,6 @@ files: required: false size: 8192 validation: [size] - region: [japan] description: "VIC-1001 kernal" source_ref: "source C64.emu/src/vice/vic20/vic20rom.h:51, source C64.emu/src/vice/vic20/vic20model.c:60, 140" @@ -608,7 +604,6 @@ files: required: false size: 4096 validation: [size] - region: [japan] description: "VIC-1001 character generator" source_ref: "source C64.emu/src/vice/vic20/vic20rom.h:57, source C64.emu/src/vice/vic20/vic20model.c:60, 139" diff --git a/emulators/vice_xvic.yml b/emulators/vice_xvic.yml index c1c80c99b..3a7e74996 100644 --- a/emulators/vice_xvic.yml +++ b/emulators/vice_xvic.yml @@ -26,7 +26,6 @@ notes: > files: - name: "kernal.901486-02.bin" description: "VIC-1001 Kernal Rev 2 (Japanese NTSC)" - region: [japan] required: false size: 8192 validation: [size] @@ -35,7 +34,6 @@ files: - name: "chargen-901460-02.bin" description: "VIC-1001 Character ROM (Japanese)" - region: [japan] required: false size: 4096 validation: [size] diff --git a/emulators/x64sdl.yml b/emulators/x64sdl.yml index d9222de86..e09b38ab8 100644 --- a/emulators/x64sdl.yml +++ b/emulators/x64sdl.yml @@ -55,7 +55,6 @@ files: - name: "jpkernal" description: "Japanese C64 Kernal ROM" - region: [japan] required: false size: 8192 path: "data/C64/jpkernal" @@ -64,7 +63,6 @@ files: - name: "jpchrgen" description: "Japanese C64 character generator ROM" - region: [japan] required: false size: 4096 path: "data/C64/jpchrgen" diff --git a/emulators/xroar.yml b/emulators/xroar.yml index 4729f716a..0d1198c74 100644 --- a/emulators/xroar.yml +++ b/emulators/xroar.yml @@ -81,7 +81,6 @@ files: - name: "d200e_1.rom" system: dragon64 description: "Dragon 200-E BASIC IC18 (Spanish)" - region: [spain] required: true size: 16384 crc32: "95af0a0a" @@ -93,7 +92,6 @@ files: - name: "d200e_2.rom" system: dragon64 description: "Dragon 200-E BASIC IC17 (Spanish)" - region: [spain] required: false size: 16384 crc32: "48b985df" @@ -104,7 +102,6 @@ files: - name: "d200e_26.rom" system: dragon64 description: "Dragon 200-E external character generator ROM" - region: [spain] required: false size: 4096 crc32: "565724bc" @@ -258,7 +255,6 @@ files: - name: "alice.rom" system: mc10 description: "Matra & Hachette Alice Microcolour BASIC" - region: [france] required: true size: 8192 crc32: "f876abe9" diff --git a/tests/test_region.py b/tests/test_region.py index 8cc861c9b..1699c0894 100644 --- a/tests/test_region.py +++ b/tests/test_region.py @@ -1384,5 +1384,32 @@ class YmirLibretroRegions(unittest.TestCase): if e["name"] == "sega_101.bin")) +class MachineModelRomsCarryNoTerritory(unittest.TestCase): + """XRoar reads d200e_1.rom for the dragon200e machine and alice.rom for + the alice machine (src/xroar.c:437-444, 552-558), and VICE the Japanese + kernal and chargen for the C64 JAP and VIC-1001 models, which a file name + tagged (Japan) never selects (libretro-core.c:2018-2034 sets NTSC). The + site told a Spanish Dragon 64 owner to start with d200e_1.rom.""" + + CASES = { + "xroar": ("d200e_1.rom", "d200e_2.rom", "d200e_26.rom", "alice.rom"), + "x64sdl": ("jpkernal", "jpchrgen"), + "vice_xvic": ("kernal.901486-02.bin", "chargen-901460-02.bin"), + } + + def test_model_roms_are_unregioned(self): + profiles = common.load_emulator_profiles( + os.path.join(os.path.dirname(__file__), "..", "emulators") + ) + for profile, names in self.CASES.items(): + for entry in profiles[profile]["files"]: + if entry["name"] in names: + with self.subTest(profile=profile, name=entry["name"]): + self.assertNotIn("region", entry) + self.assertFalse( + [e["name"] for e in profiles["c64-emu"]["files"] if e.get("region")] + ) + + if __name__ == "__main__": unittest.main()