diff options
| author | AloXado320 <38191089+AloXado320@users.noreply.github.com> | 2022-02-22 22:27:50 -0500 |
|---|---|---|
| committer | M4xw <m4x@m4xw.net> | 2022-03-22 02:37:40 +0100 |
| commit | 447295df842156860f07f36d08f0c217f5ad52b6 (patch) | |
| tree | 436f236c9e3b820a3e11ef76e229711efb005719 | |
| parent | 8370d48c57bfa2d2f6a5a1cec37033cdd70b1435 (diff) | |
Merge branch 'master' into master
| -rw-r--r-- | OTRExporter/DisplayListExporter.cpp | 2 | ||||
| -rwxr-xr-x | extract_assets.py | 8 | ||||
| -rw-r--r-- | offsets.json | 8 |
3 files changed, 15 insertions, 3 deletions
diff --git a/OTRExporter/DisplayListExporter.cpp b/OTRExporter/DisplayListExporter.cpp index e9dccf5..12f4267 100644 --- a/OTRExporter/DisplayListExporter.cpp +++ b/OTRExporter/DisplayListExporter.cpp @@ -768,7 +768,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina break; case G_VTX: { - if (GETSEGNUM(data) == 0xC) + if (GETSEGNUM(data) == 0xC || GETSEGNUM(data) == 0x8) { // hack for dynamic verticies used in en_ganon_mant and en_jsjutan // TODO is there a better way? diff --git a/extract_assets.py b/extract_assets.py index 6e4e752..4e02765 100755 --- a/extract_assets.py +++ b/extract_assets.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -import argparse, json, os, signal, time, sys +import argparse, json, os, signal, time, sys, shutil from multiprocessing import Pool, cpu_count, Event, Manager, ProcessError #EXTRACTED_ASSETS_NAMEFILE = ".extracted-assets.json" @@ -15,6 +15,10 @@ def BuildOTR(): #if globalAbort.is_set(): # Don't extract if another file wasn't extracted properly. # return + + shutil.copyfile("baserom/Audiobank", "Extract/Audiobank") + shutil.copyfile("baserom/Audioseq", "Extract/Audioseq") + shutil.copyfile("baserom/Audiotable", "Extract/Audiotable") execStr = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPD/ZAPD.out" @@ -133,7 +137,7 @@ def main(): xmlFiles.append(fullPath) try: - numCores = cpu_count() + numCores = 2 print("Extracting assets with " + str(numCores) + " CPU cores.") #with Pool(numCores, initializer=initializeWorker, initargs=(mainAbort, args.unaccounted, extractedAssetsTracker, manager)) as p: with Pool(numCores, initializer=initializeWorker, initargs=(mainAbort, 0)) as p: diff --git a/offsets.json b/offsets.json new file mode 100644 index 0000000..e033116 --- /dev/null +++ b/offsets.json @@ -0,0 +1,8 @@ +{ + "MQDebug": { + "bankdefs": [1281424, 128], + "fontdefs": [1278576, 624], + "fontmaps": [1279200, 448], + "seqdefs": [1279648, 1776] + } +}
\ No newline at end of file |