Remove "z64" prefix from all headers (#2518)

* z64 - a

* z64 - b

* z64 - c

* z64 - d

* z64 - e

* z64 - f

* z64 - g

* z64 - h

* z64 - i

* z64 - l

* z64 - m

* z64 - o

* z64 - p

* z64 - q

* z64 - r

* z64 - s

* z64 - t

* z64 - v

* restore file

* fix merge

* fix merge

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

tools/assets/extract/extase/cdata_resources.py

@@ -443,7 +443,7 @@ class Vec3sArrayResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64math.h",)
+        return ("z_math.h",)
 
 
 class S16ArrayResource(CDataResource):

tools/assets/extract/extase_oot64/animation_resources.py

@@ -84,7 +84,7 @@ class AnimationJointIndicesResource(CDataResource, can_size_be_unknown=True):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64animation.h",)
+        return ("animation.h",)
 
 
 class AnimationResource(CDataResource):
@@ -210,4 +210,4 @@ class AnimationResource(CDataResource):
         return f"AnimationHeader {self.symbol_name}"
 
     def get_h_includes(self):
-        return ("z64animation.h",)
+        return ("animation.h",)

tools/assets/extract/extase_oot64/collision_resources.py

@@ -58,7 +58,7 @@ class CollisionVtxListResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64math.h",)
+        return ("z_math.h",)
 
 
 class CollisionPolyListResource(CDataResource):
@@ -177,7 +177,7 @@ class CollisionPolyListResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64bgcheck.h",)
+        return ("bgcheck.h",)
 
 
 class CollisionSurfaceTypeListResource(CDataResource):
@@ -305,7 +305,7 @@ class CollisionSurfaceTypeListResource(CDataResource):
         return ("stdbool.h",)
 
     def get_h_includes(self):
-        return ("z64bgcheck.h",)
+        return ("bgcheck.h",)
 
 
 class BgCamFuncDataResource(CDataResource):
@@ -332,7 +332,7 @@ class BgCamFuncDataResource(CDataResource):
         return f"&{self.symbol_name}[{index}]"
 
     def get_h_includes(self):
-        return ("z64math.h",)
+        return ("z_math.h",)
 
 
 class CollisionBgCamListResource(CDataResource):
@@ -429,10 +429,10 @@ class CollisionBgCamListResource(CDataResource):
             raise ValueError()
 
     def get_c_includes(self):
-        return ("z64camera.h",)
+        return ("camera.h",)
 
     def get_h_includes(self):
-        return ("z64bgcheck.h",)
+        return ("bgcheck.h",)
 
 
 class CollisionWaterBoxesResource(CDataResource):
@@ -479,7 +479,7 @@ class CollisionWaterBoxesResource(CDataResource):
         return ("stdbool.h",)
 
     def get_h_includes(self):
-        return ("z64bgcheck.h",)
+        return ("bgcheck.h",)
 
 
 def transfer_HACK_IS_STATIC_ON(source, dest):
@@ -829,4 +829,4 @@ class CollisionResource(CDataResource):
         return ("array_count.h",)
 
     def get_h_includes(self):
-        return ("z64bgcheck.h",)
+        return ("bgcheck.h",)

tools/assets/extract/extase_oot64/misc_resources.py

@@ -53,11 +53,11 @@ class CutsceneResource(Resource, can_size_be_unknown=True):
 
     def get_c_includes(self):
         return (
-            "z64cutscene_commands.h",
+            "cutscene_commands.h",
             # TODO these are not always needed:
-            "z64ocarina.h", # for OCARINA_ACTION_*
-            "z64player.h", # for PLAYER_CUEID_*
+            "ocarina.h", # for OCARINA_ACTION_*
+            "player.h", # for PLAYER_CUEID_*
         )
 
     def get_h_includes(self):
-        return ("z64cutscene.h",)
+        return ("cutscene.h",)

tools/assets/extract/extase_oot64/playeranim_resources.py

@@ -35,7 +35,7 @@ class PlayerAnimationDataResource(CDataArrayResource):
         return f"s16 {self.symbol_name}[{self.frame_count_name} * (PLAYER_LIMB_MAX * 3 + 1)]"
 
     def get_h_includes(self):
-        return ("ultra64.h", "z64player.h")
+        return ("ultra64.h", "player.h")
 
 
 class PlayerAnimationResource(CDataResource):
@@ -99,4 +99,4 @@ class PlayerAnimationResource(CDataResource):
         return f"LinkAnimationHeader {self.symbol_name}"
 
     def get_h_includes(self):
-        return ("z64animation.h",)
+        return ("animation.h",)

tools/assets/extract/extase_oot64/room_shape_resources.py

@@ -113,7 +113,7 @@ class RoomShapeNormalEntryArrayResource(CDataArrayNamedLengthResource):
         return f"RoomShapeDListsEntry {self.symbol_name}[{self.length_name}]"
 
     def get_h_includes(self):
-        return ("z64room.h",)
+        return ("room.h",)
 
 
 class RoomShapeNormalResource(CDataResource):
@@ -191,7 +191,7 @@ class RoomShapeNormalResource(CDataResource):
         return ("array_count.h",)
 
     def get_h_includes(self):
-        return ("z64room.h",)
+        return ("room.h",)
 
 
 class RoomShapeDListsEntryResource(CDataResource):
@@ -207,7 +207,7 @@ class RoomShapeDListsEntryResource(CDataResource):
             raise ValueError
 
     def get_h_includes(self):
-        return ("z64room.h",)
+        return ("room.h",)
 
 
 def report_RoomShapeImageBase_entry(resource, memory_context: "MemoryContext", v):
@@ -343,7 +343,7 @@ class RoomShapeImageSingleResource(CDataResource):
             raise ValueError
 
     def get_h_includes(self):
-        return ("z64room.h",)
+        return ("room.h",)
 
 
 class RoomShapeImageMultiBgEntryArrayResource(CDataArrayNamedLengthResource):
@@ -395,7 +395,7 @@ class RoomShapeImageMultiBgEntryArrayResource(CDataArrayNamedLengthResource):
         return f"RoomShapeImageMultiBgEntry {self.name}[{self.length_name}]"
 
     def get_h_includes(self):
-        return ("z64room.h",)
+        return ("room.h",)
 
 
 class RoomShapeImageMultiResource(CDataResource):
@@ -462,7 +462,7 @@ class RoomShapeImageMultiResource(CDataResource):
             raise ValueError
 
     def get_h_includes(self):
-        return ("z64room.h",)
+        return ("room.h",)
 
 
 class RoomShapeCullableEntryArrayResource(CDataArrayNamedLengthResource):
@@ -479,7 +479,7 @@ class RoomShapeCullableEntryArrayResource(CDataArrayNamedLengthResource):
         return f"RoomShapeCullableEntry {self.symbol_name}[{self.length_name}]"
 
     def get_h_includes(self):
-        return ("z64room.h",)
+        return ("room.h",)
 
 
 class RoomShapeCullableResource(CDataResource):
@@ -554,4 +554,4 @@ class RoomShapeCullableResource(CDataResource):
             raise ValueError
 
     def get_h_includes(self):
-        return ("z64room.h",)
+        return ("room.h",)

tools/assets/extract/extase_oot64/scene_commands_resource.py

@@ -635,14 +635,14 @@ class SceneCommandsResource(Resource, can_size_be_unknown=True):
     def get_c_includes(self):
         return (
             "array_count.h",
-            "z64object.h",  # for OBJECT_*
+            "object.h",  # for OBJECT_*
             # TODO these are not always needed:
             "sequence.h",  # for NATURE_ID_* and NA_BGM_*
-            "z64skybox.h",  # for SKYBOX_*
+            "skybox.h",  # for SKYBOX_*
         )
 
     def get_h_includes(self):
-        return ("z64scene.h",)
+        return ("scene.h",)
 
 
 class AltHeadersResource(CDataArrayResource):
@@ -714,4 +714,4 @@ class AltHeadersResource(CDataArrayResource):
         return f"SceneCmd* {self.symbol_name}[]"
 
     def get_h_includes(self):
-        return ("z64scene.h",)
+        return ("scene.h",)

tools/assets/extract/extase_oot64/scene_rooms_resources.py

@@ -76,10 +76,10 @@ class ActorEntryListResource(CDataArrayNamedLengthResource):
         return f"ActorEntry {self.symbol_name}[{self.length_name}]"
 
     def get_c_includes(self):
-        return ("z64actor.h",)
+        return ("actor.h",)
 
     def get_h_includes(self):
-        return ("z64scene.h",)
+        return ("scene.h",)
 
 
 class ObjectListResource(CDataArrayNamedLengthResource):
@@ -91,7 +91,7 @@ class ObjectListResource(CDataArrayNamedLengthResource):
         return f"s16 {self.symbol_name}[{self.length_name}]"
 
     def get_c_includes(self):
-        return ("z64object.h",)
+        return ("object.h",)
 
     def get_h_includes(self):
         return ("ultra64.h",)
@@ -256,7 +256,7 @@ class SpawnListResource(CDataArrayResource):
         return f"Spawn {self.symbol_name}[]"
 
     def get_h_includes(self):
-        return ("z64scene.h",)
+        return ("scene.h",)
 
 
 class ExitListResource(CDataArrayResource):
@@ -316,7 +316,7 @@ class EnvLightSettingsListResource(CDataArrayNamedLengthResource):
         return f"EnvLightSettings {self.symbol_name}[{self.length_name}]"
 
     def get_h_includes(self):
-        return ("z64environment.h",)
+        return ("environment.h",)
 
 
 class TransitionActorEntryListResource(CDataArrayNamedLengthResource):
@@ -392,10 +392,10 @@ class TransitionActorEntryListResource(CDataArrayNamedLengthResource):
         return f"TransitionActorEntry {self.symbol_name}[{self.length_name}]"
 
     def get_c_includes(self):
-        return ("z64actor.h",)
+        return ("actor.h",)
 
     def get_h_includes(self):
-        return ("z64scene.h",)
+        return ("scene.h",)
 
 
 class PathListResource(CDataArrayResource):
@@ -454,4 +454,4 @@ class PathListResource(CDataArrayResource):
         return f"Path {self.symbol_name}[]"
 
     def get_h_includes(self):
-        return ("z64path.h",)
+        return ("path.h",)

tools/assets/extract/extase_oot64/skelanime_legacy_resources.py

@@ -79,7 +79,7 @@ class LegacyLimbResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64animation_legacy.h",)
+        return ("animation_legacy.h",)
 
 
 class LegacyJointKeyArrayResource(CDataArrayResource):
@@ -104,7 +104,7 @@ class LegacyJointKeyArrayResource(CDataArrayResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64animation_legacy.h",)
+        return ("animation_legacy.h",)
 
 
 class LegacyAnimationResource(CDataResource):
@@ -207,7 +207,7 @@ class LegacyAnimationResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64animation_legacy.h",)
+        return ("animation_legacy.h",)
 
 
 class LegacyLimbsArrayResource(skeleton_resources.LimbsArrayResourceABC):
@@ -215,4 +215,4 @@ class LegacyLimbsArrayResource(skeleton_resources.LimbsArrayResourceABC):
     c_limb_type = "LegacyLimb"
 
     def get_h_includes(self):
-        return ("z64animation_legacy.h",)
+        return ("animation_legacy.h",)

tools/assets/extract/extase_oot64/skelcurve_resources.py

@@ -83,7 +83,7 @@ class CurveInterpKnotArrayResource(CDataResource, can_size_be_unknown=True):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64curve.h",)
+        return ("curve.h",)
 
 
 class ConstantDataArrayResource(CDataResource, can_size_be_unknown=True):
@@ -254,7 +254,7 @@ class CurveAnimationHeaderResource(CDataResource):
         raise ValueError()
 
     def get_h_includes(self):
-        return ("z64curve.h",)
+        return ("curve.h",)
 
 
 class SkelCurveLimbResource(CDataResource):
@@ -283,7 +283,7 @@ class SkelCurveLimbResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64curve.h",)
+        return ("curve.h",)
 
 
 class SkelCurveLimbArrayResource(CDataResource):
@@ -328,7 +328,7 @@ class SkelCurveLimbArrayResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64curve.h",)
+        return ("curve.h",)
 
 
 class CurveSkeletonHeaderResource(CDataResource):
@@ -375,4 +375,4 @@ class CurveSkeletonHeaderResource(CDataResource):
         raise ValueError()
 
     def get_h_includes(self):
-        return ("z64curve.h",)
+        return ("curve.h",)

tools/assets/extract/extase_oot64/skeleton_resources.py

@@ -75,7 +75,7 @@ class StandardLimbResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64animation.h",)
+        return ("animation.h",)
 
 
 class LODLimbResource(CDataResource):
@@ -111,7 +111,7 @@ class LODLimbResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64animation.h",)
+        return ("animation.h",)
 
 
 class LimbsArrayResourceABC(CDataArrayResource):
@@ -299,7 +299,7 @@ class SkeletonResourceABC(SkeletonResourceBaseABC):
         return ("array_count.h",)
 
     def get_h_includes(self):
-        return ("z64animation.h",)
+        return ("animation.h",)
 
 
 class SkeletonNormalResource(SkeletonResourceABC):
@@ -345,7 +345,7 @@ class SkeletonFlexResourceABC(SkeletonResourceBaseABC):
         return ("array_count.h",)
 
     def get_h_includes(self):
-        return ("z64animation.h",)
+        return ("animation.h",)
 
 
 class SkeletonFlexResource(SkeletonFlexResourceABC):

tools/assets/extract/extase_oot64/skeleton_skin_resources.py

@@ -38,7 +38,7 @@ class SkinVertexArrayResource(CDataArrayResource):
         return f"SkinVertex {self.symbol_name}[]"
 
     def get_h_includes(self):
-        return ("z64skin.h",)
+        return ("skin.h",)
 
 
 class SkinTransformationArrayResource(CDataArrayResource):
@@ -58,7 +58,7 @@ class SkinTransformationArrayResource(CDataArrayResource):
         return f"SkinTransformation {self.symbol_name}[]"
 
     def get_h_includes(self):
-        return ("z64skin.h",)
+        return ("skin.h",)
 
 
 class SkinLimbModifArrayResource(CDataArrayResource):
@@ -132,7 +132,7 @@ class SkinLimbModifArrayResource(CDataArrayResource):
         return f"SkinLimbModif {self.symbol_name}[]"
 
     def get_h_includes(self):
-        return ("z64skin.h",)
+        return ("skin.h",)
 
 
 class SkinAnimatedLimbDataResource(CDataResource):
@@ -186,7 +186,7 @@ class SkinAnimatedLimbDataResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64skin.h",)
+        return ("skin.h",)
 
 
 class SkinLimbResource(CDataResource):
@@ -267,7 +267,7 @@ class SkinLimbResource(CDataResource):
             raise ValueError()
 
     def get_h_includes(self):
-        return ("z64skin.h",)
+        return ("skin.h",)
 
 
 class SkinLimbsArrayResource(skeleton_resources.LimbsArrayResourceABC):