mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 14:34:32 +00:00
Code Issues Projects Releases Wiki Activity

Whitespace (#1112)

Browse source 
* remove trailing whitespaces

* minor docs tweaks

* some more trailing whitespaces

* few more tweaks
This commit is contained in:
playerskel 2022-01-24 00:09:02 +01:00 • committed by GitHub
parent f344fe648b
commit f4a72303cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
150 changed files with 493 additions and 494 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tools/overlayhelpers/filemap.py
View file

@ -36,7 +36,7 @@ def CreateAddrLookup(dict, recs, tracer):
print(length)
recs.append((recs[length-1][1], None, None))
recs = sorted(recs, key=lambda x: x[0], reverse=True)
for i in range(length):
if recs[i][0] != recs[i+1][1]:
if tracer != "ra" or recs[i][0] != recs[i+1][1] + 0xFFF & -0x1000:
@ -51,7 +51,7 @@ def CreateTable():
vrecs = []
rrecs = []
vrecs.append((PVA(0x80157D90), PVA(0x80800000), None))
dict = {
"va" : {},
"ra" : {},
@ -67,14 +67,14 @@ def CreateTable():
vrecs.append(vrec)
dict["ft"][li[7]] = (rrec[0], rrec[1])
file = None
with open("filetable2.txt", "r") as file:
for line in file:
li = line.rstrip().split('\t')
rrec = (int(li[2],16), int(li[3],16), li[5])
rrecs.append(rrec)
dict["ft"][li[5]] = (rrec[0], rrec[1])
CreateAddrLookup(dict["va"], vrecs, "va")
CreateAddrLookup(dict["ra"], rrecs, "ra")
@ -85,7 +85,7 @@ def AddressLookup(lookupTable, addr):
start = 0;
end = 0;
key = None;
for k, v in lookupTable.items():
if addr >= k:
start = k
@ -93,13 +93,13 @@ def AddressLookup(lookupTable, addr):
break
end = k
return (key, start, end)
def GetFromVRam(addr):
key, vramStart, vramEnd = AddressLookup(table["va"], PVA(addr))
if key is None:
return None
ftl = table["ft"][key]
vrom = AddrRange(ftl[0], ftl[1])
vram = AddrRange(UVA(vramStart), UVA(vramEnd))
@ -107,13 +107,13 @@ def GetFromVRam(addr):
offset = addr - vram.start
return FileResult(key, vrom, vram, offset)
def GetFromRom(addr):
key, romStart, romEnd = AddressLookup(table["ra"], addr)
if key is None:
return None
vrom = AddrRange(romStart, romEnd)
offset = addr - vrom.start

2
tools/overlayhelpers/lmapmark.py
View file

@ -69,7 +69,7 @@ def IND(n):
scriptDir = os.path.dirname(os.path.realpath(__file__))
repo = scriptDir + os.sep + ".." + os.sep + ".."
repo = scriptDir + os.sep + ".." + os.sep + ".."
kaleido_scope_data = []

4
tools/overlayhelpers/mapmark.py
View file

@ -110,7 +110,7 @@ for i in range(NUM_SCENES):
cstr = HEADER
for scenemap in scenemaps:
cstr += f"MapMarkData {GetDungeonSymbol(scenemap[0])}[] = {{\n"
cstr += f"MapMarkData {GetDungeonSymbol(scenemap[0])}[] = {{\n"
for mapId, map in enumerate(scenemap[1]):
cstr += IND(1) + f"// {GetDungeonName(scenemap[0])} minimap {mapId}\n"
cstr += IND(1) + "{\n"
@ -130,7 +130,7 @@ for scenemap in scenemaps:
cstr += "MapMarkData* gMapMarkDataTable[] = {\n"
for scenemap in scenemaps:
cstr += f" {GetDungeonSymbol(scenemap[0])},\n"
cstr += f" {GetDungeonSymbol(scenemap[0])},\n"
cstr += "};\n"
with open(sys.argv[1], "w") as file: