mirror of
https://github.com/zeldaret/oot.git
synced 2024-12-27 07:07:09 +00:00
Make progress.py count libultra files towards boot or code by using _*SegmentStart/End in the map (#1043)
This commit is contained in:
parent
f1d183d6fe
commit
1cf11907fa
1 changed files with 11 additions and 2 deletions
13
progress.py
13
progress.py
|
@ -60,12 +60,21 @@ def GetNonMatchingSize(path):
|
||||||
|
|
||||||
|
|
||||||
mapFile = ReadAllLines("build/z64.map")
|
mapFile = ReadAllLines("build/z64.map")
|
||||||
|
curSegment = None
|
||||||
src = 0
|
src = 0
|
||||||
code = 0
|
code = 0
|
||||||
boot = 0
|
boot = 0
|
||||||
ovl = 0
|
ovl = 0
|
||||||
|
|
||||||
for line in mapFile:
|
for line in mapFile:
|
||||||
|
|
||||||
|
if "_codeSegmentStart" in line:
|
||||||
|
curSegment = "code"
|
||||||
|
elif "_bootSegmentStart" in line:
|
||||||
|
curSegment = "boot"
|
||||||
|
elif "_codeSegmentEnd" in line or "_bootSegmentEnd" in line:
|
||||||
|
curSegment = None
|
||||||
|
|
||||||
lineSplit = list(filter(None, line.split(" ")))
|
lineSplit = list(filter(None, line.split(" ")))
|
||||||
|
|
||||||
if (len(lineSplit) == 4 and lineSplit[0].startswith(".")):
|
if (len(lineSplit) == 4 and lineSplit[0].startswith(".")):
|
||||||
|
@ -77,9 +86,9 @@ for line in mapFile:
|
||||||
if (objFile.startswith("build/src")):
|
if (objFile.startswith("build/src")):
|
||||||
src += size
|
src += size
|
||||||
|
|
||||||
if (objFile.startswith("build/src/code") or objFile.startswith("build/src/libultra_code")):
|
if (objFile.startswith("build/src/code") or (objFile.startswith("build/src/libultra/") and curSegment == "code")):
|
||||||
code += size
|
code += size
|
||||||
elif (objFile.startswith("build/src/boot") or objFile.startswith("build/src/libultra_boot")):
|
elif (objFile.startswith("build/src/boot") or (objFile.startswith("build/src/libultra/") and curSegment == "boot")):
|
||||||
boot += size
|
boot += size
|
||||||
elif (objFile.startswith("build/src/overlays")):
|
elif (objFile.startswith("build/src/overlays")):
|
||||||
ovl += size
|
ovl += size
|
||||||
|
|
Loading…
Reference in a new issue