Fix files from MM

1 files changed, 6 insertions, 12 deletions

diff --git a/extract_assets.py b/extract_assets.py
index 1e31109..bc32572 100755
--- a/extract_assets.py
+++ b/extract_assets.py
@@ -10,9 +10,9 @@ import argparse
 
 def BuildOTR(xmlPath, rom, zapd_exe=None, genHeaders=None, customAssetsPath=None, customOtrFile=None, portVer=None):
     if not zapd_exe:
-        zapd_exe = "Debug\\ZAPD.exe" if sys.platform == "win32" else "../ZAPDTR/ZAPD.out"
+        zapd_exe = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPDTR/ZAPD.out"
 
-    exec_cmd = [zapd_exe, "ed", "-eh", "-i", xmlPath, "-b", rom, "-fl", "CFG/filelists",
+    exec_cmd = [zapd_exe, "ed", "-i", xmlPath, "-b", rom, "-fl", "CFG/filelists",
                 "-o", "placeholder", "-osf", "placeholder", "-rconf", "CFG/Config.xml"]
 
     # generate headers, but not otrs by excluding the otr exporter
@@ -21,8 +21,7 @@ def BuildOTR(xmlPath, rom, zapd_exe=None, genHeaders=None, customAssetsPath=None
     else:
         # generate otrs, but not headers
         exec_cmd.extend(["-gsf", "0", "-se", "OTR", "--customAssetsPath", customAssetsPath,
-                "--customOtrFile", customOtrFile, "--otrfile",
-                "oot-mq.otr" if Z64Rom.isMqRom(rom) else "mm.otr"])
+                "--customOtrFile", customOtrFile, "--otrfile", "mm.otr"])
 
     if portVer:
         exec_cmd.extend(["--portVer", portVer])
@@ -37,7 +36,7 @@ def BuildOTR(xmlPath, rom, zapd_exe=None, genHeaders=None, customAssetsPath=None
 
 def BuildCustomOtr(zapd_exe=None, assets_path=None, otrfile=None, portVer=None):
     if not zapd_exe:
-        zapd_exe = "Debug\\ZAPD.exe" if sys.platform == "win32" else "../ZAPDTR/ZAPD.out"
+        zapd_exe = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPDTR/ZAPD.out"
 
     if not assets_path or not otrfile:
         print("\n")
@@ -79,13 +78,8 @@ def main():
 
     roms = [ Z64Rom(args.rom) ] if args.rom else rom_chooser.chooseROM(args.verbose, args.non_interactive)
     for rom in roms:
-        if (not rom.isMMRom):
-            continue
-
-        if (os.path.exists("Extract")):
-            shutil.rmtree("Extract")
-
-        BuildOTR("../mm/assets/xml/", rom.file_path, zapd_exe=args.zapd_exe, genHeaders=args.gen_headers)
+        BuildOTR(os.path.join(args.xml_root, rom.version.xml_ver), rom.file_path, zapd_exe=args.zapd_exe, genHeaders=args.gen_headers,
+                 customAssetsPath=args.custom_assets_path, customOtrFile=args.custom_otr_file, portVer=args.port_ver)
 
 if __name__ == "__main__":
     main()