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

fix extracted data to no longer produce compilation warnings

Browse source
This commit is contained in:
Dragorn421 2025-02-05 23:30:27 +01:00
parent 66db26a999
commit 8ec6769124
No known key found for this signature in database
GPG key ID: 381AEBAF3D429335
2 changed files with 17 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

52
tools/assets/extract/extase_oot64/room_shape_resources.py
View file

@ -138,25 +138,15 @@ class RoomShapeNormalResource(CDataResource):
f.write(memory_context.get_c_reference_at_segmented(address)) f.write(memory_context.get_c_reference_at_segmented(address))
return True return True
def report_unk_8(resource, memory_context: "MemoryContext", v): def write_entriesEnd(
assert isinstance(v, int)
address = v
memory_context.report_resource_at_segmented(
resource,
address,
BinaryBlobResource,
lambda file, offset: BinaryBlobResource(
file, offset, offset + 1, f"{resource.name}_{address:08X}_Unk8"
),
)
def write_unk_8(
resource, memory_context: "MemoryContext", v, f: io.TextIOBase, line_prefix: str resource, memory_context: "MemoryContext", v, f: io.TextIOBase, line_prefix: str
): ):
assert isinstance(v, int) address = resource.cdata_unpacked["entries"]
address = v assert isinstance(address, int)
f.write(line_prefix) f.write(line_prefix)
f.write(memory_context.get_c_reference_at_segmented(address)) f.write(memory_context.get_c_reference_at_segmented(address))
f.write(" + ")
f.write(memory_context.get_c_expression_length_at_segmented(address))
return True return True
cdata_ext = CDataExt_Struct( cdata_ext = CDataExt_Struct(
@ -169,9 +159,9 @@ class RoomShapeNormalResource(CDataResource):
CDataExt_Value("I").set_report(report_entries).set_write(write_entries), CDataExt_Value("I").set_report(report_entries).set_write(write_entries),
), ),
( (
"unk_8", "entriesEnd",
CDataExt_Value("I").set_report(report_unk_8).set_write(write_unk_8), CDataExt_Value("I").set_write(write_entriesEnd),
), # "entriesEnd" ),
) )
) )
@ -294,25 +284,15 @@ class RoomShapeCullableResource(CDataResource):
f.write(memory_context.get_c_reference_at_segmented(address)) f.write(memory_context.get_c_reference_at_segmented(address))
return True return True
def report_unk_8(resource, memory_context: "MemoryContext", v): def write_entriesEnd(
assert isinstance(v, int)
address = v
memory_context.report_resource_at_segmented(
resource,
address,
BinaryBlobResource,
lambda file, offset: BinaryBlobResource(
file, offset, offset + 1, f"{resource.name}_{address:08X}_Unk8"
),
)
def write_unk_8(
resource, memory_context: "MemoryContext", v, f: io.TextIOBase, line_prefix: str resource, memory_context: "MemoryContext", v, f: io.TextIOBase, line_prefix: str
): ):
assert isinstance(v, int) address = resource.cdata_unpacked["entries"]
address = v assert isinstance(address, int)
f.write(line_prefix) f.write(line_prefix)
f.write(memory_context.get_c_reference_at_segmented(address)) f.write(memory_context.get_c_reference_at_segmented(address))
f.write(" + ")
f.write(memory_context.get_c_expression_length_at_segmented(address))
return True return True
cdata_ext = CDataExt_Struct( cdata_ext = CDataExt_Struct(
@ -325,9 +305,9 @@ class RoomShapeCullableResource(CDataResource):
CDataExt_Value("I").set_report(report_entries).set_write(write_entries), CDataExt_Value("I").set_report(report_entries).set_write(write_entries),
), ),
( (
"unk_8", "entriesEnd",
CDataExt_Value("I").set_report(report_unk_8).set_write(write_unk_8), CDataExt_Value("I").set_write(write_entriesEnd),
), # "entriesEnd" ),
) )
) )

2
tools/assets/extract/extase_oot64/skeleton_resources.py
View file

@ -88,7 +88,7 @@ class LimbsArrayResourceABC(CDataArrayResource):
) )
def get_c_declaration_base(self): def get_c_declaration_base(self):
return f"{self.c_limb_type}* {self.symbol_name}[]" return f"void* {self.symbol_name}[]"
class StandardLimbsArrayResource(LimbsArrayResourceABC): class StandardLimbsArrayResource(LimbsArrayResourceABC):