Merge branch 'master' into string-block

happyleavesaoc · Oct 2, 2022 · b289cb6 · b289cb6
2 parents 4ffe9ad + 0366980
commit b289cb6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/mgz/common/map.py b/mgz/common/map.py
@@ -104,7 +104,9 @@ def lookup_name(map_id, name, version, reference):
     custom = True
     is_de = version == Version.DE
     is_hd = version == Version.HD
-    if (map_id != 44 and not (is_de or is_hd)) or (map_id != 59 and (is_de or is_hd)):
+    # 59: RM custom
+    # 138: DM custom
+    if (map_id != 44 and not (is_de or is_hd)) or (map_id not in [59, 138] and (is_de or is_hd)):
         map_keys = [int(k) for k in reference['maps'].keys()]
         if map_id in map_keys:
             name = reference['maps'][str(map_id)]