mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-10 19:20:13 +00:00
a497f33bda
* Initial progress on z_message_PAL, very messy * Fix merge * Some more progress * Fix merge * More z_message_PAL * Small progress * More small progress * message_data_static files OK * Prepare z_message_tables * Matched another function, small updates * Attempt to use asm-processor static-symbols branch * Refactor text id declarations * Begin large text codes parser function * Fix merge * Refactor done * Build OK, add color and highscore names * Remove encoded text headers and automatically encode during build * Fix kanfont * Various cleanups * DISP macros * Another match aside data * Further progress * Small improvements * Deduplicate magic values for text control codes, small improvements * Tiny progress * Minor cleanups * Clean up z_message_PAL comment * Progress on large functions * Further progress on large functions * Changes to mkldscript to link .data in the .rodata section * data OK * Few improvements * Use gDPLoadTextureBlock macros where appropriate * rm z_message_tables, progress on large functions * 2 more matches * Improvements * Small progress * More progress on big function * progress * match func_80107980 * match Message_Update * match func_8010BED8 * done * Progress on remaining large functions * Small progress on largest function * Another match, extract text and move to assets, improve text build system * Small nonmatchings improvements * docs wip * Largest function maybe equivalent * Fix merge * Document do_action values, largest function is almost instruction-matching * Rename NAVI do_action to NONE, as that appears to be how that value is used in practice * Fix merge * one match * Last function is instruction-matching * Fix * Improvements thanks to engineer124 * Stack matched thanks to petrie911, now just a/v/low t regalloc issues, some cleanup * More variables labeled, use text state enum everywhere * More labels and names * Fix * Actor_IsTalking -> Actor_TalkRequested * Match func_8010C39C and remove unused asm * More docs * Mostly ocarina related docs * All msgModes named * Fix assetclean * Cleanup * Extraction fixes and headers * Suggestions * Review suggestions * Change text extraction again, only extract if the headers do not already exist * Fix * Use ast for charmap, fix assetclean for real this time * Review suggestions * BGM ids and ran formatter * Review comments * rename include_readonly to include_data_with_rodata * Remove leading 0s in number directives * Review suggestions for message_data_static * textbox pos enum comments, rename several enum names from Message to TextBox Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Roman971 <romanlasnier@hotmail.com>
142 lines
No EOL
5.6 KiB
Python
Executable file
142 lines
No EOL
5.6 KiB
Python
Executable file
#!/usr/bin/env python3
|
|
|
|
import argparse, json, os, signal, time
|
|
from multiprocessing import Pool, cpu_count, Event, Manager, ProcessError
|
|
|
|
EXTRACTED_ASSETS_NAMEFILE = ".extracted-assets.json"
|
|
|
|
|
|
def SignalHandler(sig, frame):
|
|
print(f'Signal {sig} received. Aborting...')
|
|
mainAbort.set()
|
|
# Don't exit immediately to update the extracted assets file.
|
|
|
|
def ExtractFile(xmlPath, outputPath, outputSourcePath):
|
|
if globalAbort.is_set():
|
|
# Don't extract if another file wasn't extracted properly.
|
|
return
|
|
|
|
execStr = "tools/ZAPD/ZAPD.out e -eh -i %s -b baserom/ -o %s -osf %s -gsf 1 -rconf tools/ZAPDConfigs/MqDbg/Config.xml" % (xmlPath, outputPath, outputSourcePath)
|
|
|
|
if "overlays" in xmlPath:
|
|
execStr += " --static"
|
|
|
|
if globalUnaccounted:
|
|
execStr += " -wu"
|
|
|
|
print(execStr)
|
|
exitValue = os.system(execStr)
|
|
if exitValue != 0:
|
|
globalAbort.set()
|
|
print("\n")
|
|
print("Error when extracting from file " + xmlPath, file=os.sys.stderr)
|
|
print("Aborting...", file=os.sys.stderr)
|
|
print("\n")
|
|
|
|
def ExtractFunc(fullPath):
|
|
*pathList, xmlName = fullPath.split(os.sep)
|
|
objectName = os.path.splitext(xmlName)[0]
|
|
|
|
outPath = os.path.join("assets", *pathList[2:], objectName)
|
|
outSourcePath = outPath
|
|
|
|
if fullPath in globalExtractedAssetsTracker:
|
|
timestamp = globalExtractedAssetsTracker[fullPath]["timestamp"]
|
|
modificationTime = int(os.path.getmtime(fullPath))
|
|
if modificationTime < timestamp:
|
|
# XML has not been modified since last extraction.
|
|
return
|
|
|
|
currentTimeStamp = int(time.time())
|
|
|
|
ExtractFile(fullPath, outPath, outSourcePath)
|
|
|
|
if not globalAbort.is_set():
|
|
# Only update timestamp on succesful extractions
|
|
if fullPath not in globalExtractedAssetsTracker:
|
|
globalExtractedAssetsTracker[fullPath] = globalManager.dict()
|
|
globalExtractedAssetsTracker[fullPath]["timestamp"] = currentTimeStamp
|
|
|
|
def initializeWorker(abort, unaccounted: bool, extractedAssetsTracker: dict, manager):
|
|
global globalAbort
|
|
global globalUnaccounted
|
|
global globalExtractedAssetsTracker
|
|
global globalManager
|
|
globalAbort = abort
|
|
globalUnaccounted = unaccounted
|
|
globalExtractedAssetsTracker = extractedAssetsTracker
|
|
globalManager = manager
|
|
|
|
def main():
|
|
parser = argparse.ArgumentParser(description="baserom asset extractor")
|
|
parser.add_argument("-s", "--single", help="asset path relative to assets/, e.g. objects/gameplay_keep")
|
|
parser.add_argument("-f", "--force", help="Force the extraction of every xml instead of checking the touched ones.", action="store_true")
|
|
parser.add_argument("-u", "--unaccounted", help="Enables ZAPD unaccounted detector warning system.", action="store_true")
|
|
args = parser.parse_args()
|
|
|
|
global mainAbort
|
|
mainAbort = Event()
|
|
manager = Manager()
|
|
signal.signal(signal.SIGINT, SignalHandler)
|
|
|
|
extractedAssetsTracker = manager.dict()
|
|
if os.path.exists(EXTRACTED_ASSETS_NAMEFILE) and not args.force:
|
|
with open(EXTRACTED_ASSETS_NAMEFILE, encoding='utf-8') as f:
|
|
extractedAssetsTracker.update(json.load(f, object_hook=manager.dict))
|
|
|
|
asset_path = args.single
|
|
if asset_path is not None:
|
|
fullPath = os.path.join("assets", "xml", asset_path + ".xml")
|
|
if not os.path.exists(fullPath):
|
|
print(f"Error. File {fullPath} doesn't exists.", file=os.sys.stderr)
|
|
exit(1)
|
|
|
|
initializeWorker(mainAbort, args.unaccounted, extractedAssetsTracker, manager)
|
|
# Always extract if -s is used.
|
|
if fullPath in extractedAssetsTracker:
|
|
del extractedAssetsTracker[fullPath]
|
|
ExtractFunc(fullPath)
|
|
else:
|
|
extract_text_path = "assets/text/message_data.h"
|
|
if os.path.isfile(extract_text_path):
|
|
extract_text_path = None
|
|
extract_staff_text_path = "assets/text/message_data_staff.h"
|
|
if os.path.isfile(extract_staff_text_path):
|
|
extract_staff_text_path = None
|
|
# Only extract text if the header does not already exist, or if --force was passed
|
|
if args.force or extract_text_path is not None or extract_staff_text_path is not None:
|
|
print("Extracting text")
|
|
from tools import msgdis
|
|
msgdis.extract_all_text(extract_text_path, extract_staff_text_path)
|
|
|
|
xmlFiles = []
|
|
for currentPath, _, files in os.walk(os.path.join("assets", "xml")):
|
|
for file in files:
|
|
fullPath = os.path.join(currentPath, file)
|
|
if file.endswith(".xml"):
|
|
xmlFiles.append(fullPath)
|
|
|
|
try:
|
|
numCores = cpu_count()
|
|
print("Extracting assets with " + str(numCores) + " CPU cores.")
|
|
with Pool(numCores, initializer=initializeWorker, initargs=(mainAbort, args.unaccounted, extractedAssetsTracker, manager)) as p:
|
|
p.map(ExtractFunc, xmlFiles)
|
|
except (ProcessError, TypeError):
|
|
print("Warning: Multiprocessing exception ocurred.", file=os.sys.stderr)
|
|
print("Disabling mutliprocessing.", file=os.sys.stderr)
|
|
|
|
initializeWorker(mainAbort, args.unaccounted, extractedAssetsTracker, manager)
|
|
for singlePath in xmlFiles:
|
|
ExtractFunc(singlePath)
|
|
|
|
with open(EXTRACTED_ASSETS_NAMEFILE, 'w', encoding='utf-8') as f:
|
|
serializableDict = dict()
|
|
for xml, data in extractedAssetsTracker.items():
|
|
serializableDict[xml] = dict(data)
|
|
json.dump(dict(serializableDict), f, ensure_ascii=False, indent=4)
|
|
|
|
if mainAbort.is_set():
|
|
exit(1)
|
|
|
|
if __name__ == "__main__":
|
|
main() |