mirror of
https://github.com/zeldaret/mm.git
synced 2026-07-09 13:45:23 -04:00
[Audio 8/?] Check-in handwritten sequences, build sequences, automate various sfx arrays (#1679)
* [Audio 8/?] Check-in handwritten sequences, build sequences, automate various sfx arrays * Fix whitespace in aseq.h * Suggested changes, adjust some MML syntax and add more instruction descriptions * Special case progress script (#9) * Hack progress script * Small adjustment to text fileSectionFixer * Add the dir of the input .seq file to the list of includes to sequence assembling so that assembler-level includes like .include or .incbin work intuitively * Remove old comment that was missed before * aseq.h tweaks * Review suggestions, aseq.h adjustments --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
This commit is contained in:
+9
-5
@@ -154,12 +154,13 @@ assetsTracker = dict()
|
||||
# Assets that we don't have a proper way of tracking right now
|
||||
ignoredAssets = {
|
||||
"archives",
|
||||
"code",
|
||||
}
|
||||
|
||||
# Manual fixer for files that would be counted in wrong categories
|
||||
# "filename": "correctSection"
|
||||
fileSectionFixer = {
|
||||
"osFlash": "code" # Currently in `src/libultra` (would be counted as boot)
|
||||
"sequence_font_table": "code", # Currently in assets (would be counted as an audio asset)
|
||||
}
|
||||
|
||||
for assetCat in assetsCategories:
|
||||
@@ -222,10 +223,9 @@ for line in map_file:
|
||||
srcCat = srcCategoriesFixer[srcCat]
|
||||
|
||||
if objFileName in fileSectionFixer:
|
||||
correctSection = fileSectionFixer[objFileName]
|
||||
if correctSection in srcTracker:
|
||||
srcTracker[correctSection]["totalSize"] += file_size
|
||||
elif obj_file.startswith("build/n64-us/src"):
|
||||
srcCat = fileSectionFixer[objFileName]
|
||||
|
||||
if obj_file.startswith("build/n64-us/src"):
|
||||
if srcCat in srcTracker:
|
||||
srcTracker[srcCat]["totalSize"] += file_size
|
||||
elif (obj_file.startswith("build/n64-us/asm")):
|
||||
@@ -238,6 +238,10 @@ for line in map_file:
|
||||
assetCat = obj_file.split("/")[4]
|
||||
else:
|
||||
assetCat = obj_file.split("/")[3]
|
||||
|
||||
if objFileName in fileSectionFixer:
|
||||
assetCat = fileSectionFixer[objFileName]
|
||||
|
||||
if assetCat in assetsTracker:
|
||||
assetsTracker[assetCat]["currentSize"] += file_size
|
||||
elif assetCat in ignoredAssets:
|
||||
|
||||
Reference in New Issue
Block a user