diff --git a/tools/assets/extract/extase/__init__.py b/tools/assets/extract/extase/__init__.py index 527a187a72..029b20d214 100644 --- a/tools/assets/extract/extase/__init__.py +++ b/tools/assets/extract/extase/__init__.py @@ -1110,6 +1110,10 @@ class BinaryBlobResource(Resource): # Nothing specific to do return RESOURCE_PARSE_SUCCESS + def get_as_xml(self): + return f"""\ + """ + def get_c_reference(self, resource_offset): return f"&{self.symbol_name}[{resource_offset}]" diff --git a/tools/assets/extract/extase_oot64/dlist_resources.py b/tools/assets/extract/extase_oot64/dlist_resources.py index ad470c33aa..fb69fc2b90 100644 --- a/tools/assets/extract/extase_oot64/dlist_resources.py +++ b/tools/assets/extract/extase_oot64/dlist_resources.py @@ -275,6 +275,15 @@ class TextureResource(Resource): self.width_name = f"{self.symbol_name}_WIDTH" self.height_name = f"{self.symbol_name}_HEIGHT" + def get_as_xml(self): + tlut_offset_attr = ( + f' TlutOffset="0x{self.resource_tlut.range_start:X}"' + if self.resource_tlut + else "" + ) + return f"""\ + """ + def check_declare_length(self): return ( hasattr(self, "HACK_IS_STATIC_ON") or EXPLICIT_DL_AND_TEX_SIZES @@ -1347,6 +1356,10 @@ class DListResource(Resource, can_size_be_unknown=True): return RESOURCE_PARSE_SUCCESS + def get_as_xml(self): + return f"""\ + """ + def get_c_declaration_base(self): if hasattr(self, "HACK_IS_STATIC_ON") or EXPLICIT_DL_AND_TEX_SIZES: length = (self.range_end - self.range_start) // 8 diff --git a/tools/assets/extract/extase_oot64/skelanime_legacy_resources.py b/tools/assets/extract/extase_oot64/skelanime_legacy_resources.py index df21aa8d28..42cf8c4c3f 100644 --- a/tools/assets/extract/extase_oot64/skelanime_legacy_resources.py +++ b/tools/assets/extract/extase_oot64/skelanime_legacy_resources.py @@ -164,7 +164,11 @@ class LegacyAnimationResource(CDataResource): lambda file, offset: LegacyJointKeyArrayResource( file, offset, - f"{self.name}_{address_jointKey:08X}_JointKeys", + ( + f"{self.symbol_name.removesuffix('Anim')}JointKeys" + if self.symbol_name.endswith("Anim") + else f"{self.symbol_name}_{address_jointKey:08X}_JointKeys" + ), ), ) resource_jointKey.set_length(self.cdata_unpacked["limbCount"] + 1) diff --git a/tools/assets/extract/extase_oot64/skeleton_resources.py b/tools/assets/extract/extase_oot64/skeleton_resources.py index 3cff22c59b..12fe050a61 100644 --- a/tools/assets/extract/extase_oot64/skeleton_resources.py +++ b/tools/assets/extract/extase_oot64/skeleton_resources.py @@ -65,6 +65,10 @@ class StandardLimbResource(CDataResource): def set_enum_member_name(self, enum_member_name: str): self.enum_member_name = enum_member_name + def get_as_xml(self) -> str: + return f"""\ + """ + def get_c_declaration_base(self): return f"StandardLimb {self.symbol_name}" @@ -101,6 +105,10 @@ class LODLimbResource(CDataResource): def set_enum_member_name(self, enum_member_name: str): self.enum_member_name = enum_member_name + def get_as_xml(self): + return f"""\ + """ + def get_c_declaration_base(self): return f"LodLimb {self.symbol_name}" @@ -241,7 +249,11 @@ class SkeletonResourceABC(SkeletonResourceBaseABC): lambda file, offset: resource.limbs_array_type( file, offset, - f"{resource.name}_{address:08X}_Limbs", + ( + f"{resource.name.removesuffix('Skel')}Limbs" + if resource.name.endswith("Skel") + else f"{resource.name}_{address:08X}_Limbs" + ), ), ) resource_limbs.set_length(