chris 1.1 hotfix

tools/rom_data.py

@@ -14,9 +14,9 @@ CANONICAL_YELLOW_SHA1 = "cc7d03262ebfaf2f06772c1a480c7d9d5f4a38e1"
 # Gold and Silver are Gen 2: 2 MiB carts, twice the size of the Gen 1 ROMs above.
 CANONICAL_GOLD_SHA1 = "d8b8a3600a465308c9953dfa04f0081c05bdcb94"
 CANONICAL_SILVER_SHA1 = "49b163f7e57702bc939d642a18f591de55d92dae"
-# Crystal is the retail international v1.0 build (pret/pokecrystal's default
-# `make` target), also 2 MiB.
+# Crystal is the retail international v1.0 cart, also 2 MiB.
 CANONICAL_CRYSTAL_SHA1 = "f4cd194bdee0d04ca4eac29e09b8e4e9d818c133"
+CANONICAL_CRYSTAL11_SHA1 = "f2f52230b536214ef7c9924f483392993e226cfb"
 ROM_BANK_SIZE = 0x4000
 
 
@@ -74,9 +74,16 @@ class RomImage:
         with open(path, "rb") as f:
             self.data = f.read()
         self.sha1 = hashlib.sha1(self.data).hexdigest()
-        if expected_sha1 and self.sha1 != expected_sha1:
+        if isinstance(expected_sha1, (tuple, set, frozenset, list)):
+            allowed = expected_sha1
+        elif expected_sha1:
+            allowed = (expected_sha1,)
+        else:
+            allowed = None
+        if allowed and self.sha1 not in allowed:
             raise ValueError(
-                f"unsupported ROM SHA-1 {self.sha1}; expected {expected_sha1}")
+                f"unsupported ROM SHA-1 {self.sha1}; "
+                f"expected {' or '.join(allowed)}")
 
     @staticmethod
     def offset(bank, address):