diff options
34 files changed, 938 insertions, 12 deletions
diff --git a/assets/objects/object_spot15_obj/gLonLonCorralFenceCol.c b/assets/objects/object_spot15_obj/gLonLonCorralFenceCol.c new file mode 100644 index 000000000..b5f448559 --- /dev/null +++ b/assets/objects/object_spot15_obj/gLonLonCorralFenceCol.c @@ -0,0 +1,24 @@ +#include "object_spot15_obj.h" +#include "array_count.h" +#include "camera.h" +#include "z_math.h" + +BgCamInfo gLonLonCorralFenceBgCamList[] = { +#include "assets/objects/object_spot15_obj/gLonLonCorralFenceBgCamList.inc.c" +}; + +SurfaceType gLonLonCorralFenceSurfaceTypes[] = { +#include "assets/objects/object_spot15_obj/gLonLonCorralFenceSurfaceTypes.inc.c" +}; + +CollisionPoly gLonLonCorralFencePolyList[] = { +#include "assets/objects/object_spot15_obj/gLonLonCorralFencePolyList.inc.c" +}; + +Vec3s gLonLonCorralFenceVtxList[] = { +#include "assets/objects/object_spot15_obj/gLonLonCorralFenceVtxList.inc.c" +}; + +CollisionHeader gLonLonCorralFenceCol = { +#include "assets/objects/object_spot15_obj/gLonLonCorralFenceCol.inc.c" +}; diff --git a/assets/objects/object_spot15_obj/gLonLonCorralFenceDL.c b/assets/objects/object_spot15_obj/gLonLonCorralFenceDL.c new file mode 100644 index 000000000..2c86d667e --- /dev/null +++ b/assets/objects/object_spot15_obj/gLonLonCorralFenceDL.c @@ -0,0 +1,10 @@ +#include "object_spot15_obj.h" +#include "gfx.h" + +Vtx gLonLonCorralFenceVtx[] = { +#include "assets/objects/object_spot15_obj/gLonLonCorralFenceVtx.inc.c" +}; + +Gfx gLonLonCorralFenceDL[18] = { +#include "assets/objects/object_spot15_obj/gLonLonCorralFenceDL.inc.c" +}; diff --git a/assets/objects/object_spot15_obj/gLonLonMilkCrateCol.c b/assets/objects/object_spot15_obj/gLonLonMilkCrateCol.c new file mode 100644 index 000000000..204e73eb9 --- /dev/null +++ b/assets/objects/object_spot15_obj/gLonLonMilkCrateCol.c @@ -0,0 +1,24 @@ +#include "object_spot15_obj.h" +#include "array_count.h" +#include "camera.h" +#include "z_math.h" + +BgCamInfo gLonLonMilkCrateBgCamList[] = { +#include "assets/objects/object_spot15_obj/gLonLonMilkCrateBgCamList.inc.c" +}; + +SurfaceType gLonLonMilkCrateSurfaceTypes[] = { +#include "assets/objects/object_spot15_obj/gLonLonMilkCrateSurfaceTypes.inc.c" +}; + +CollisionPoly gLonLonMilkCratePolyList[] = { +#include "assets/objects/object_spot15_obj/gLonLonMilkCratePolyList.inc.c" +}; + +Vec3s gLonLonMilkCrateVtxList[] = { +#include "assets/objects/object_spot15_obj/gLonLonMilkCrateVtxList.inc.c" +}; + +CollisionHeader gLonLonMilkCrateCol = { +#include "assets/objects/object_spot15_obj/gLonLonMilkCrateCol.inc.c" +}; diff --git a/assets/objects/object_spot15_obj/gLonLonMilkCrateDL.c b/assets/objects/object_spot15_obj/gLonLonMilkCrateDL.c new file mode 100644 index 000000000..44fd4ba07 --- /dev/null +++ b/assets/objects/object_spot15_obj/gLonLonMilkCrateDL.c @@ -0,0 +1,10 @@ +#include "object_spot15_obj.h" +#include "gfx.h" + +Vtx gLonLonMilkCrateVtx[] = { +#include "assets/objects/object_spot15_obj/gLonLonMilkCrateVtx.inc.c" +}; + +Gfx gLonLonMilkCrateDL[23] = { +#include "assets/objects/object_spot15_obj/gLonLonMilkCrateDL.inc.c" +}; diff --git a/assets/objects/object_spot15_obj/object_spot15_obj.h b/assets/objects/object_spot15_obj/object_spot15_obj.h new file mode 100644 index 000000000..474a98b82 --- /dev/null +++ b/assets/objects/object_spot15_obj/object_spot15_obj.h @@ -0,0 +1,24 @@ +#ifndef OBJECT_SPOT15_OBJ_H +#define OBJECT_SPOT15_OBJ_H + +#include "ultra64.h" +#include "bgcheck.h" +#include "tex_len.h" + +extern Gfx gLonLonMilkCrateDL[23]; + +extern CollisionHeader gLonLonMilkCrateCol; + +extern Gfx gLonLonCorralFenceDL[18]; + +extern CollisionHeader gLonLonCorralFenceCol; + +#define gLonLonCorralFenceTex_WIDTH 32 +#define gLonLonCorralFenceTex_HEIGHT 128 +extern u64 gLonLonCorralFenceTex[TEX_LEN(u64, gLonLonCorralFenceTex_WIDTH, gLonLonCorralFenceTex_HEIGHT, 4)]; + +#define gLonLonMilkCrateTex_WIDTH 32 +#define gLonLonMilkCrateTex_HEIGHT 64 +extern u64 gLonLonMilkCrateTex[TEX_LEN(u64, gLonLonMilkCrateTex_WIDTH, gLonLonMilkCrateTex_HEIGHT, 16)]; + +#endif diff --git a/assets/objects/object_spot15_obj/textures.c b/assets/objects/object_spot15_obj/textures.c new file mode 100644 index 000000000..6c9c601e8 --- /dev/null +++ b/assets/objects/object_spot15_obj/textures.c @@ -0,0 +1,9 @@ +#include "object_spot15_obj.h" + +u64 gLonLonCorralFenceTex[TEX_LEN(u64, gLonLonCorralFenceTex_WIDTH, gLonLonCorralFenceTex_HEIGHT, 4)] = { +#include "assets/objects/object_spot15_obj/gLonLonCorralFenceTex.i4.inc.c" +}; + +u64 gLonLonMilkCrateTex[TEX_LEN(u64, gLonLonMilkCrateTex_WIDTH, gLonLonMilkCrateTex_HEIGHT, 16)] = { +#include "assets/objects/object_spot15_obj/gLonLonMilkCrateTex.rgba16.inc.c" +}; diff --git a/assets/objects/object_spot16_obj/gDeathMountainRingDL.c b/assets/objects/object_spot16_obj/gDeathMountainRingDL.c new file mode 100644 index 000000000..9a4a390ca --- /dev/null +++ b/assets/objects/object_spot16_obj/gDeathMountainRingDL.c @@ -0,0 +1,17 @@ +#include "object_spot16_obj.h" +#include "gfx.h" +#include "tex_len.h" + +#define gDeathMountainRingTex_WIDTH 32 +#define gDeathMountainRingTex_HEIGHT 32 +u64 gDeathMountainRingTex[TEX_LEN(u64, gDeathMountainRingTex_WIDTH, gDeathMountainRingTex_HEIGHT, 16)] = { +#include "assets/objects/object_spot16_obj/gDeathMountainRingTex.ia16.inc.c" +}; + +Vtx gDeathMountainRingVtx[] = { +#include "assets/objects/object_spot16_obj/gDeathMountainRingVtx.inc.c" +}; + +Gfx gDeathMountainRingDL[18] = { +#include "assets/objects/object_spot16_obj/gDeathMountainRingDL.inc.c" +}; diff --git a/assets/objects/object_spot16_obj/gDodongosCavernRockDL.c b/assets/objects/object_spot16_obj/gDodongosCavernRockDL.c new file mode 100644 index 000000000..9172e9c92 --- /dev/null +++ b/assets/objects/object_spot16_obj/gDodongosCavernRockDL.c @@ -0,0 +1,29 @@ +#include "object_spot16_obj.h" +#include "gfx.h" +#include "tex_len.h" + +#define gDodongosCavernRockTex_WIDTH 64 +#define gDodongosCavernRockTex_HEIGHT 64 +u64 gDodongosCavernRockTex[TEX_LEN(u64, gDodongosCavernRockTex_WIDTH, gDodongosCavernRockTex_HEIGHT, 4)] = { +#include "assets/objects/object_spot16_obj/gDodongosCavernRockTex.i4.inc.c" +}; + +Vtx gDodongosCavernRockVtx[] = { +#include "assets/objects/object_spot16_obj/gDodongosCavernRockVtx.inc.c" +}; + +Vtx gDodongosCavernRock2Vtx[] = { +#include "assets/objects/object_spot16_obj/gDodongosCavernRock2Vtx.inc.c" +}; + +Gfx gDodongosCavernRockDL[32] = { +#include "assets/objects/object_spot16_obj/gDodongosCavernRockDL.inc.c" +}; + +Gfx gDodongosCavernRock2DL[4] = { +#include "assets/objects/object_spot16_obj/gDodongosCavernRock2DL.inc.c" +}; + +Gfx gDodongosCavernRock3DL[2] = { +#include "assets/objects/object_spot16_obj/gDodongosCavernRock3DL.inc.c" +}; diff --git a/assets/objects/object_spot16_obj/object_spot16_obj.h b/assets/objects/object_spot16_obj/object_spot16_obj.h new file mode 100644 index 000000000..d4ef947f3 --- /dev/null +++ b/assets/objects/object_spot16_obj/object_spot16_obj.h @@ -0,0 +1,12 @@ +#ifndef OBJECT_SPOT16_OBJ_H +#define OBJECT_SPOT16_OBJ_H + +#include "ultra64.h" + +extern Gfx gDodongosCavernRockDL[32]; +extern Gfx gDodongosCavernRock2DL[4]; +extern Gfx gDodongosCavernRock3DL[2]; + +extern Gfx gDeathMountainRingDL[18]; + +#endif diff --git a/assets/objects/object_spot17_obj/bombable_wall_dls.c b/assets/objects/object_spot17_obj/bombable_wall_dls.c new file mode 100644 index 000000000..105793915 --- /dev/null +++ b/assets/objects/object_spot17_obj/bombable_wall_dls.c @@ -0,0 +1,28 @@ +#include "object_spot17_obj.h" +#include "gfx.h" + +u64 gCraterRockTLUT[] = { +#include "assets/objects/object_spot17_obj/gCraterRockTex.tlut.rgba16.inc.c" +}; + +#define gCraterRockTex_WIDTH 64 +#define gCraterRockTex_HEIGHT 64 +u64 gCraterRockTex[TEX_LEN(u64, gCraterRockTex_WIDTH, gCraterRockTex_HEIGHT, 4)] = { +#include "assets/objects/object_spot17_obj/gCraterRockTex.ci4.inc.c" +}; + +Vtx gCraterBombableWallVtx[] = { +#include "assets/objects/object_spot17_obj/gCraterBombableWallVtx.inc.c" +}; + +Vtx gCraterBombableWallCracksVtx[] = { +#include "assets/objects/object_spot17_obj/gCraterBombableWallCracksVtx.inc.c" +}; + +Gfx gCraterBombableWallDL[24] = { +#include "assets/objects/object_spot17_obj/gCraterBombableWallDL.inc.c" +}; + +Gfx gCraterBombableWallCracksDL[18] = { +#include "assets/objects/object_spot17_obj/gCraterBombableWallCracksDL.inc.c" +}; diff --git a/assets/objects/object_spot17_obj/gCraterBombableWallCol.c b/assets/objects/object_spot17_obj/gCraterBombableWallCol.c new file mode 100644 index 000000000..3826332f7 --- /dev/null +++ b/assets/objects/object_spot17_obj/gCraterBombableWallCol.c @@ -0,0 +1,24 @@ +#include "object_spot17_obj.h" +#include "array_count.h" +#include "camera.h" +#include "z_math.h" + +BgCamInfo gCraterBombableWallBgCamList[] = { +#include "assets/objects/object_spot17_obj/gCraterBombableWallBgCamList.inc.c" +}; + +SurfaceType gCraterBombableWallSurfaceTypes[] = { +#include "assets/objects/object_spot17_obj/gCraterBombableWallSurfaceTypes.inc.c" +}; + +CollisionPoly gCraterBombableWallPolyList[] = { +#include "assets/objects/object_spot17_obj/gCraterBombableWallPolyList.inc.c" +}; + +Vec3s gCraterBombableWallVtxList[] = { +#include "assets/objects/object_spot17_obj/gCraterBombableWallVtxList.inc.c" +}; + +CollisionHeader gCraterBombableWallCol = { +#include "assets/objects/object_spot17_obj/gCraterBombableWallCol.inc.c" +}; diff --git a/assets/objects/object_spot17_obj/gCraterBombableWallCracksTex.c b/assets/objects/object_spot17_obj/gCraterBombableWallCracksTex.c new file mode 100644 index 000000000..7d0e4b7dc --- /dev/null +++ b/assets/objects/object_spot17_obj/gCraterBombableWallCracksTex.c @@ -0,0 +1,6 @@ +#include "object_spot17_obj.h" + +u64 gCraterBombableWallCracksTex[TEX_LEN(u64, gCraterBombableWallCracksTex_WIDTH, gCraterBombableWallCracksTex_HEIGHT, + 4)] = { +#include "assets/objects/object_spot17_obj/gCraterBombableWallCracksTex.i4.inc.c" +}; diff --git a/assets/objects/object_spot17_obj/gCraterSmokeConeDL.c b/assets/objects/object_spot17_obj/gCraterSmokeConeDL.c new file mode 100644 index 000000000..cfaed1f73 --- /dev/null +++ b/assets/objects/object_spot17_obj/gCraterSmokeConeDL.c @@ -0,0 +1,18 @@ +#include "object_spot17_obj.h" +#include "gfx.h" + +#define gCraterSmokeConeTex_WIDTH 32 +#define gCraterSmokeConeTex_HEIGHT 32 +extern u64 gCraterSmokeConeTex[TEX_LEN(u64, gCraterSmokeConeTex_WIDTH, gCraterSmokeConeTex_HEIGHT, 8)]; + +Vtx gCraterSmokeConeVtx[] = { +#include "assets/objects/object_spot17_obj/gCraterSmokeConeVtx.inc.c" +}; + +Gfx gCraterSmokeConeDL[30] = { +#include "assets/objects/object_spot17_obj/gCraterSmokeConeDL.inc.c" +}; + +u64 gCraterSmokeConeTex[TEX_LEN(u64, gCraterSmokeConeTex_WIDTH, gCraterSmokeConeTex_HEIGHT, 8)] = { +#include "assets/objects/object_spot17_obj/gCraterSmokeConeTex.ia8.inc.c" +}; diff --git a/assets/objects/object_spot17_obj/object_spot17_obj.h b/assets/objects/object_spot17_obj/object_spot17_obj.h new file mode 100644 index 000000000..58b3df6a4 --- /dev/null +++ b/assets/objects/object_spot17_obj/object_spot17_obj.h @@ -0,0 +1,19 @@ +#ifndef OBJECT_SPOT17_OBJ_H +#define OBJECT_SPOT17_OBJ_H + +#include "ultra64.h" +#include "bgcheck.h" +#include "tex_len.h" + +extern Gfx gCraterBombableWallDL[24]; +extern Gfx gCraterBombableWallCracksDL[18]; + +extern CollisionHeader gCraterBombableWallCol; + +extern Gfx gCraterSmokeConeDL[30]; + +#define gCraterBombableWallCracksTex_WIDTH 64 +#define gCraterBombableWallCracksTex_HEIGHT 64 +extern u64 gCraterBombableWallCracksTex[TEX_LEN(u64, gCraterBombableWallCracksTex_WIDTH, gCraterBombableWallCracksTex_HEIGHT, 4)]; + +#endif diff --git a/assets/objects/object_syokudai/gGoldenTorchDL.c b/assets/objects/object_syokudai/gGoldenTorchDL.c new file mode 100644 index 000000000..ceeb24533 --- /dev/null +++ b/assets/objects/object_syokudai/gGoldenTorchDL.c @@ -0,0 +1,11 @@ +#include "object_syokudai.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "gfx.h" + +Vtx gGoldenTorchVtx[] = { +#include "assets/objects/object_syokudai/gGoldenTorchVtx.inc.c" +}; + +Gfx gGoldenTorchDL[58] = { +#include "assets/objects/object_syokudai/gGoldenTorchDL.inc.c" +}; diff --git a/assets/objects/object_syokudai/gTimedTorchDL.c b/assets/objects/object_syokudai/gTimedTorchDL.c new file mode 100644 index 000000000..2b54bc121 --- /dev/null +++ b/assets/objects/object_syokudai/gTimedTorchDL.c @@ -0,0 +1,10 @@ +#include "object_syokudai.h" +#include "gfx.h" + +Vtx gTimedTorchVtx[] = { +#include "assets/objects/object_syokudai/gTimedTorchVtx.inc.c" +}; + +Gfx gTimedTorchDL[32] = { +#include "assets/objects/object_syokudai/gTimedTorchDL.inc.c" +}; diff --git a/assets/objects/object_syokudai/gWoodenTorchDL.c b/assets/objects/object_syokudai/gWoodenTorchDL.c new file mode 100644 index 000000000..e98c5fc55 --- /dev/null +++ b/assets/objects/object_syokudai/gWoodenTorchDL.c @@ -0,0 +1,10 @@ +#include "object_syokudai.h" +#include "gfx.h" + +Vtx gWoodenTorchVtx[] = { +#include "assets/objects/object_syokudai/gWoodenTorchVtx.inc.c" +}; + +Gfx gWoodenTorchDL[43] = { +#include "assets/objects/object_syokudai/gWoodenTorchDL.inc.c" +}; diff --git a/assets/objects/object_syokudai/object_syokudai.h b/assets/objects/object_syokudai/object_syokudai.h new file mode 100644 index 000000000..220362cf7 --- /dev/null +++ b/assets/objects/object_syokudai/object_syokudai.h @@ -0,0 +1,31 @@ +#ifndef OBJECT_SYOKUDAI_H +#define OBJECT_SYOKUDAI_H + +#include "ultra64.h" +#include "tex_len.h" + +extern Gfx gGoldenTorchDL[58]; +extern Gfx gWoodenTorchDL[43]; +extern Gfx gTimedTorchDL[32]; + +#define gGoldenTorch1Tex_WIDTH 32 +#define gGoldenTorch1Tex_HEIGHT 32 +extern u64 gGoldenTorch1Tex[TEX_LEN(u64, gGoldenTorch1Tex_WIDTH, gGoldenTorch1Tex_HEIGHT, 16)]; + +#define gGoldenTorch2Tex_WIDTH 32 +#define gGoldenTorch2Tex_HEIGHT 64 +extern u64 gGoldenTorch2Tex[TEX_LEN(u64, gGoldenTorch2Tex_WIDTH, gGoldenTorch2Tex_HEIGHT, 16)]; + +#define gTorchFlameGuardTex_WIDTH 32 +#define gTorchFlameGuardTex_HEIGHT 32 +extern u64 gTorchFlameGuardTex[TEX_LEN(u64, gTorchFlameGuardTex_WIDTH, gTorchFlameGuardTex_HEIGHT, 16)]; + +#define gTimedTorchTex_WIDTH 32 +#define gTimedTorchTex_HEIGHT 32 +extern u64 gTimedTorchTex[TEX_LEN(u64, gTimedTorchTex_WIDTH, gTimedTorchTex_HEIGHT, 16)]; + +#define gWoodenTorchTex_WIDTH 16 +#define gWoodenTorchTex_HEIGHT 64 +extern u64 gWoodenTorchTex[TEX_LEN(u64, gWoodenTorchTex_WIDTH, gWoodenTorchTex_HEIGHT, 16)]; + +#endif diff --git a/assets/objects/object_syokudai/textures.c b/assets/objects/object_syokudai/textures.c new file mode 100644 index 000000000..f2969c776 --- /dev/null +++ b/assets/objects/object_syokudai/textures.c @@ -0,0 +1,21 @@ +#include "object_syokudai.h" + +u64 gGoldenTorch1Tex[TEX_LEN(u64, gGoldenTorch1Tex_WIDTH, gGoldenTorch1Tex_HEIGHT, 16)] = { +#include "assets/objects/object_syokudai/gGoldenTorch1Tex.rgba16.inc.c" +}; + +u64 gGoldenTorch2Tex[TEX_LEN(u64, gGoldenTorch2Tex_WIDTH, gGoldenTorch2Tex_HEIGHT, 16)] = { +#include "assets/objects/object_syokudai/gGoldenTorch2Tex.rgba16.inc.c" +}; + +u64 gTorchFlameGuardTex[TEX_LEN(u64, gTorchFlameGuardTex_WIDTH, gTorchFlameGuardTex_HEIGHT, 16)] = { +#include "assets/objects/object_syokudai/gTorchFlameGuardTex.rgba16.inc.c" +}; + +u64 gTimedTorchTex[TEX_LEN(u64, gTimedTorchTex_WIDTH, gTimedTorchTex_HEIGHT, 16)] = { +#include "assets/objects/object_syokudai/gTimedTorchTex.rgba16.inc.c" +}; + +u64 gWoodenTorchTex[TEX_LEN(u64, gWoodenTorchTex_WIDTH, gWoodenTorchTex_HEIGHT, 16)] = { +#include "assets/objects/object_syokudai/gWoodenTorchTex.rgba16.inc.c" +}; diff --git a/assets/objects/object_ta/gTalonRunAnim.c b/assets/objects/object_ta/gTalonRunAnim.c new file mode 100644 index 000000000..04cee5f6c --- /dev/null +++ b/assets/objects/object_ta/gTalonRunAnim.c @@ -0,0 +1,13 @@ +#include "object_ta.h" + +s16 gTalonRunFrameData[] = { +#include "assets/objects/object_ta/gTalonRunFrameData.inc.c" +}; + +JointIndex gTalonRunJointIndices[] = { +#include "assets/objects/object_ta/gTalonRunJointIndices.inc.c" +}; + +AnimationHeader gTalonRunAnim = { +#include "assets/objects/object_ta/gTalonRunAnim.inc.c" +}; diff --git a/assets/objects/object_ta/gTalonRunTransitionAnim.c b/assets/objects/object_ta/gTalonRunTransitionAnim.c new file mode 100644 index 000000000..d81fd8fd1 --- /dev/null +++ b/assets/objects/object_ta/gTalonRunTransitionAnim.c @@ -0,0 +1,13 @@ +#include "object_ta.h" + +s16 gTalonRunTransitionFrameData[] = { +#include "assets/objects/object_ta/gTalonRunTransitionFrameData.inc.c" +}; + +JointIndex gTalonRunTransitionJointIndices[] = { +#include "assets/objects/object_ta/gTalonRunTransitionJointIndices.inc.c" +}; + +AnimationHeader gTalonRunTransitionAnim = { +#include "assets/objects/object_ta/gTalonRunTransitionAnim.inc.c" +}; diff --git a/assets/objects/object_ta/gTalonSitHandsUpAnim.c b/assets/objects/object_ta/gTalonSitHandsUpAnim.c new file mode 100644 index 000000000..43636e7e3 --- /dev/null +++ b/assets/objects/object_ta/gTalonSitHandsUpAnim.c @@ -0,0 +1,13 @@ +#include "object_ta.h" + +s16 gTalonSitHandsUpFrameData[] = { +#include "assets/objects/object_ta/gTalonSitHandsUpFrameData.inc.c" +}; + +JointIndex gTalonSitHandsUpJointIndices[] = { +#include "assets/objects/object_ta/gTalonSitHandsUpJointIndices.inc.c" +}; + +AnimationHeader gTalonSitHandsUpAnim = { +#include "assets/objects/object_ta/gTalonSitHandsUpAnim.inc.c" +}; diff --git a/assets/objects/object_ta/gTalonSitSleepingAnim.c b/assets/objects/object_ta/gTalonSitSleepingAnim.c new file mode 100644 index 000000000..4d7fa6b7c --- /dev/null +++ b/assets/objects/object_ta/gTalonSitSleepingAnim.c @@ -0,0 +1,13 @@ +#include "object_ta.h" + +s16 gTalonSitSleepingFrameData[] = { +#include "assets/objects/object_ta/gTalonSitSleepingFrameData.inc.c" +}; + +JointIndex gTalonSitSleepingJointIndices[] = { +#include "assets/objects/object_ta/gTalonSitSleepingJointIndices.inc.c" +}; + +AnimationHeader gTalonSitSleepingAnim = { +#include "assets/objects/object_ta/gTalonSitSleepingAnim.inc.c" +}; diff --git a/assets/objects/object_ta/gTalonSitWakeUpAnim.c b/assets/objects/object_ta/gTalonSitWakeUpAnim.c new file mode 100644 index 000000000..49960e4f1 --- /dev/null +++ b/assets/objects/object_ta/gTalonSitWakeUpAnim.c @@ -0,0 +1,13 @@ +#include "object_ta.h" + +s16 gTalonSitWakeUpFrameData[] = { +#include "assets/objects/object_ta/gTalonSitWakeUpFrameData.inc.c" +}; + +JointIndex gTalonSitWakeUpJointIndices[] = { +#include "assets/objects/object_ta/gTalonSitWakeUpJointIndices.inc.c" +}; + +AnimationHeader gTalonSitWakeUpAnim = { +#include "assets/objects/object_ta/gTalonSitWakeUpAnim.inc.c" +}; diff --git a/assets/objects/object_ta/gTalonSkel.c b/assets/objects/object_ta/gTalonSkel.c new file mode 100644 index 000000000..92bcba3c0 --- /dev/null +++ b/assets/objects/object_ta/gTalonSkel.c @@ -0,0 +1,365 @@ +#include "object_ta.h" +#include "array_count.h" +#include "gfx.h" + +u64 gTalonSkinAndClothesTLUT[]; + +#define gTalonSkinTex_WIDTH 8 +#define gTalonSkinTex_HEIGHT 8 +u64 gTalonSkinTex[TEX_LEN(u64, gTalonSkinTex_WIDTH, gTalonSkinTex_HEIGHT, 8)]; + +#define gTalonFingersTex_WIDTH 16 +#define gTalonFingersTex_HEIGHT 16 +u64 gTalonFingersTex[TEX_LEN(u64, gTalonFingersTex_WIDTH, gTalonFingersTex_HEIGHT, 8)]; + +#define gTalonArmHairTex_WIDTH 16 +#define gTalonArmHairTex_HEIGHT 32 +u64 gTalonArmHairTex[TEX_LEN(u64, gTalonArmHairTex_WIDTH, gTalonArmHairTex_HEIGHT, 8)]; + +#define gTalonSleeveTex_WIDTH 8 +#define gTalonSleeveTex_HEIGHT 8 +u64 gTalonSleeveTex[TEX_LEN(u64, gTalonSleeveTex_WIDTH, gTalonSleeveTex_HEIGHT, 8)]; + +#define gTalonBlueTex_WIDTH 8 +#define gTalonBlueTex_HEIGHT 8 +u64 gTalonBlueTex[TEX_LEN(u64, gTalonBlueTex_WIDTH, gTalonBlueTex_HEIGHT, 8)]; + +#define gTalonBluePatternTex_WIDTH 8 +#define gTalonBluePatternTex_HEIGHT 8 +u64 gTalonBluePatternTex[TEX_LEN(u64, gTalonBluePatternTex_WIDTH, gTalonBluePatternTex_HEIGHT, 8)]; + +#define gTalonBrownBlueOutlineTex_WIDTH 16 +#define gTalonBrownBlueOutlineTex_HEIGHT 16 +u64 gTalonBrownBlueOutlineTex[TEX_LEN(u64, gTalonBrownBlueOutlineTex_WIDTH, gTalonBrownBlueOutlineTex_HEIGHT, 8)]; + +#define gTalonNecklaceStringUpperTex_WIDTH 16 +#define gTalonNecklaceStringUpperTex_HEIGHT 32 +u64 gTalonNecklaceStringUpperTex[TEX_LEN(u64, gTalonNecklaceStringUpperTex_WIDTH, gTalonNecklaceStringUpperTex_HEIGHT, + 8)]; + +#define gTalonBowserTex_WIDTH 16 +#define gTalonBowserTex_HEIGHT 32 +u64 gTalonBowserTex[TEX_LEN(u64, gTalonBowserTex_WIDTH, gTalonBowserTex_HEIGHT, 16)]; + +#define gTalonNecklaceLowerStringsTex_WIDTH 8 +#define gTalonNecklaceLowerStringsTex_HEIGHT 16 +u64 gTalonNecklaceLowerStringsTex[TEX_LEN(u64, gTalonNecklaceLowerStringsTex_WIDTH, + gTalonNecklaceLowerStringsTex_HEIGHT, 16)]; + +Vtx gTalonLeftHandVtx[] = { +#include "assets/objects/object_ta/gTalonLeftHandVtx.inc.c" +}; + +Vtx gTalonLeftArmVtx[] = { +#include "assets/objects/object_ta/gTalonLeftArmVtx.inc.c" +}; + +Vtx gTalonLeftShoulderVtx[] = { +#include "assets/objects/object_ta/gTalonLeftShoulderVtx.inc.c" +}; + +Vtx gTalonRightHandVtx[] = { +#include "assets/objects/object_ta/gTalonRightHandVtx.inc.c" +}; + +Vtx gTalonRightArmVtx[] = { +#include "assets/objects/object_ta/gTalonRightArmVtx.inc.c" +}; + +Vtx gTalonRightShoulderVtx[] = { +#include "assets/objects/object_ta/gTalonRightShoulderVtx.inc.c" +}; + +Vtx gTalonChestVtx[] = { +#include "assets/objects/object_ta/gTalonChestVtx.inc.c" +}; + +Vtx gTalonLeftLegVtx[] = { +#include "assets/objects/object_ta/gTalonLeftLegVtx.inc.c" +}; + +Vtx gTalonLeftThighVtx[] = { +#include "assets/objects/object_ta/gTalonLeftThighVtx.inc.c" +}; + +Vtx gTalonRightLegVtx[] = { +#include "assets/objects/object_ta/gTalonRightLegVtx.inc.c" +}; + +Vtx gTalonRightThighVtx[] = { +#include "assets/objects/object_ta/gTalonRightThighVtx.inc.c" +}; + +Vtx gTalonTorsoVtx[] = { +#include "assets/objects/object_ta/gTalonTorsoVtx.inc.c" +}; + +Gfx gTalonTorsoDL[99] = { +#include "assets/objects/object_ta/gTalonTorsoDL.inc.c" +}; + +Gfx gTalonChestDL[210] = { +#include "assets/objects/object_ta/gTalonChestDL.inc.c" +}; + +Gfx gTalonRightShoulderDL[69] = { +#include "assets/objects/object_ta/gTalonRightShoulderDL.inc.c" +}; + +Gfx gTalonRightArmDL[86] = { +#include "assets/objects/object_ta/gTalonRightArmDL.inc.c" +}; + +Gfx gTalonRightHandDL[149] = { +#include "assets/objects/object_ta/gTalonRightHandDL.inc.c" +}; + +Gfx gTalonLeftShoulderDL[69] = { +#include "assets/objects/object_ta/gTalonLeftShoulderDL.inc.c" +}; + +Gfx gTalonLeftArmDL[86] = { +#include "assets/objects/object_ta/gTalonLeftArmDL.inc.c" +}; + +Gfx gTalonLeftHandDL[133] = { +#include "assets/objects/object_ta/gTalonLeftHandDL.inc.c" +}; + +Gfx gTalonRightThighDL[136] = { +#include "assets/objects/object_ta/gTalonRightThighDL.inc.c" +}; + +Gfx gTalonRightLegDL[107] = { +#include "assets/objects/object_ta/gTalonRightLegDL.inc.c" +}; + +Gfx gTalonLeftThighDL[136] = { +#include "assets/objects/object_ta/gTalonLeftThighDL.inc.c" +}; + +Gfx gTalonLeftLegDL[106] = { +#include "assets/objects/object_ta/gTalonLeftLegDL.inc.c" +}; + +u64 gTalon2TLUT[] = { +#include "assets/objects/object_ta/gTalon2TLUT.tlut.rgba16.inc.c" +}; + +u64 gTalonEyeTLUT[] = { +#include "assets/objects/object_ta/gTalonEyeTLUT.tlut.rgba16.inc.c" +}; + +u64 gTalonHeadSkinTex[TEX_LEN(u64, gTalonHeadSkinTex_WIDTH, gTalonHeadSkinTex_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonHeadSkinTex.ci8.tlut_gTalon2TLUT.inc.c" +}; + +#define gTalonEarTex_WIDTH 8 +#define gTalonEarTex_HEIGHT 8 +u64 gTalonEarTex[TEX_LEN(u64, gTalonEarTex_WIDTH, gTalonEarTex_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonEarTex.ci8.tlut_gTalon2TLUT.inc.c" +}; + +#define gTalonFaceHairTex_WIDTH 8 +#define gTalonFaceHairTex_HEIGHT 16 +u64 gTalonFaceHairTex[TEX_LEN(u64, gTalonFaceHairTex_WIDTH, gTalonFaceHairTex_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonFaceHairTex.ci8.tlut_gTalon2TLUT.inc.c" +}; + +u64 gTalonEyeHalfTex[TEX_LEN(u64, TALON_EYE_TEX_WIDTH, TALON_EYE_TEX_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonEyeHalfTex.ci8.tlut_gTalonEyeTLUT.inc.c" +}; + +u64 gTalonEyeClosedTex[TEX_LEN(u64, TALON_EYE_TEX_WIDTH, TALON_EYE_TEX_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonEyeClosedTex.ci8.tlut_gTalonEyeTLUT.inc.c" +}; + +u64 gTalonEyeClosed2Tex[TEX_LEN(u64, TALON_EYE_TEX_WIDTH, TALON_EYE_TEX_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonEyeClosed2Tex.ci8.tlut_gTalonEyeTLUT.inc.c" +}; + +u64 gTalonRedTex[TEX_LEN(u64, gTalonRedTex_WIDTH, gTalonRedTex_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonRedTex.ci8.tlut_gTalon2TLUT.inc.c" +}; + +#define gTalonHeadHairTex_WIDTH 16 +#define gTalonHeadHairTex_HEIGHT 32 +u64 gTalonHeadHairTex[TEX_LEN(u64, gTalonHeadHairTex_WIDTH, gTalonHeadHairTex_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonHeadHairTex.ci8.tlut_gTalon2TLUT.inc.c" +}; + +#define gTalonBootSideTex_WIDTH 16 +#define gTalonBootSideTex_HEIGHT 16 +u64 gTalonBootSideTex[TEX_LEN(u64, gTalonBootSideTex_WIDTH, gTalonBootSideTex_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonBootSideTex.ci8.tlut_gTalon2TLUT.inc.c" +}; + +#define gTalonBootTopTex_WIDTH 16 +#define gTalonBootTopTex_HEIGHT 16 +u64 gTalonBootTopTex[TEX_LEN(u64, gTalonBootTopTex_WIDTH, gTalonBootTopTex_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonBootTopTex.ci8.tlut_gTalon2TLUT.inc.c" +}; + +#define gTalonHeadHairTopTex_WIDTH 8 +#define gTalonHeadHairTopTex_HEIGHT 16 +u64 gTalonHeadHairTopTex[TEX_LEN(u64, gTalonHeadHairTopTex_WIDTH, gTalonHeadHairTopTex_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonHeadHairTopTex.ci8.tlut_gTalon2TLUT.inc.c" +}; + +u64 gTalonEyeOpenTex[TEX_LEN(u64, TALON_EYE_TEX_WIDTH, TALON_EYE_TEX_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonEyeOpenTex.ci8.tlut_gTalonEyeTLUT.inc.c" +}; + +Vtx gTalonHeadVtx[] = { +#include "assets/objects/object_ta/gTalonHeadVtx.inc.c" +}; + +Vtx gTalonRightFootVtx[] = { +#include "assets/objects/object_ta/gTalonRightFootVtx.inc.c" +}; + +Vtx gTalonLeftFootVtx[] = { +#include "assets/objects/object_ta/gTalonLeftFootVtx.inc.c" +}; + +Gfx gTalonHeadDL[389] = { +#include "assets/objects/object_ta/gTalonHeadDL.inc.c" +}; + +Gfx gTalonRightFootDL[52] = { +#include "assets/objects/object_ta/gTalonRightFootDL.inc.c" +}; + +Gfx gTalonLeftFootDL[52] = { +#include "assets/objects/object_ta/gTalonLeftFootDL.inc.c" +}; + +u64 gTalonSkinAndClothesTLUT[] = { +#include "assets/objects/object_ta/gTalonSkinAndClothesTLUT.tlut.rgba16.inc.c" +}; + +#define gTalonGradient2Tex_WIDTH 8 +#define gTalonGradient2Tex_HEIGHT 8 +u64 gTalonGradient2Tex[TEX_LEN(u64, gTalonGradient2Tex_WIDTH, gTalonGradient2Tex_HEIGHT, 16)] = { +#include "assets/objects/object_ta/gTalonGradient2Tex.rgba16.inc.c" +}; + +u64 gTalonSkinTex[TEX_LEN(u64, gTalonSkinTex_WIDTH, gTalonSkinTex_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonSkinTex.ci8.tlut_gTalonSkinAndClothesTLUT.inc.c" +}; + +u64 gTalonFingersTex[TEX_LEN(u64, gTalonFingersTex_WIDTH, gTalonFingersTex_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonFingersTex.ci8.tlut_gTalonSkinAndClothesTLUT.inc.c" +}; + +u64 gTalonArmHairTex[TEX_LEN(u64, gTalonArmHairTex_WIDTH, gTalonArmHairTex_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonArmHairTex.ci8.tlut_gTalonSkinAndClothesTLUT.inc.c" +}; + +u64 gTalonSleeveTex[TEX_LEN(u64, gTalonSleeveTex_WIDTH, gTalonSleeveTex_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonSleeveTex.ci8.tlut_gTalonSkinAndClothesTLUT.inc.c" +}; + +u64 gTalonBlueTex[TEX_LEN(u64, gTalonBlueTex_WIDTH, gTalonBlueTex_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonBlueTex.ci8.tlut_gTalonSkinAndClothesTLUT.inc.c" +}; + +u64 gTalonBluePatternTex[TEX_LEN(u64, gTalonBluePatternTex_WIDTH, gTalonBluePatternTex_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonBluePatternTex.ci8.tlut_gTalonSkinAndClothesTLUT.inc.c" +}; + +u64 gTalonBrownBlueOutlineTex[TEX_LEN(u64, gTalonBrownBlueOutlineTex_WIDTH, gTalonBrownBlueOutlineTex_HEIGHT, 8)] = { +#include "assets/objects/object_ta/gTalonBrownBlueOutlineTex.ci8.tlut_gTalonSkinAndClothesTLUT.inc.c" +}; + +u64 gTalonNecklaceStringUpperTex[TEX_LEN(u64, gTalonNecklaceStringUpperTex_WIDTH, gTalonNecklaceStringUpperTex_HEIGHT, + 8)] = { +#include "assets/objects/object_ta/gTalonNecklaceStringUpperTex.ci8.tlut_gTalonSkinAndClothesTLUT.inc.c" +}; + +u64 gTalonBowserTex[TEX_LEN(u64, gTalonBowserTex_WIDTH, gTalonBowserTex_HEIGHT, 16)] = { +#include "assets/objects/object_ta/gTalonBowserTex.rgba16.inc.c" +}; + +u64 gTalonNecklaceLowerStringsTex[TEX_LEN(u64, gTalonNecklaceLowerStringsTex_WIDTH, + gTalonNecklaceLowerStringsTex_HEIGHT, 16)] = { +#include "assets/objects/object_ta/gTalonNecklaceLowerStringsTex.rgba16.inc.c" +}; + +#define gTalonUnusedTex_WIDTH 16 +#define gTalonUnusedTex_HEIGHT 16 +u64 gTalonUnusedTex[TEX_LEN(u64, gTalonUnusedTex_WIDTH, gTalonUnusedTex_HEIGHT, 16)] = { +#include "assets/objects/object_ta/gTalonUnusedTex.rgba16.inc.c" +}; + +StandardLimb gTalonRootLimb = { +#include "assets/objects/object_ta/gTalonRootLimb.inc.c" +}; + +StandardLimb gTalonLeftThighLimb = { +#include "assets/objects/object_ta/gTalonLeftThighLimb.inc.c" +}; + +StandardLimb gTalonLeftLegLimb = { +#include "assets/objects/object_ta/gTalonLeftLegLimb.inc.c" +}; + +StandardLimb gTalonLeftFootLimb = { +#include "assets/objects/object_ta/gTalonLeftFootLimb.inc.c" +}; + +StandardLimb gTalonRightThighLimb = { +#include "assets/objects/object_ta/gTalonRightThighLimb.inc.c" +}; + +StandardLimb gTalonRightLegLimb = { +#include "assets/objects/object_ta/gTalonRightLegLimb.inc.c" +}; + +StandardLimb gTalonRightFootLimb = { +#include "assets/objects/object_ta/gTalonRightFootLimb.inc.c" +}; + +StandardLimb gTalonChestLimb = { +#include "assets/objects/object_ta/gTalonChestLimb.inc.c" +}; + +StandardLimb gTalonLeftShoulderLimb = { +#include "assets/objects/object_ta/gTalonLeftShoulderLimb.inc.c" +}; + +StandardLimb gTalonLeftArmLimb = { +#include "assets/objects/object_ta/gTalonLeftArmLimb.inc.c" +}; + +StandardLimb gTalonLeftHandLimb = { +#include "assets/objects/object_ta/gTalonLeftHandLimb.inc.c" +}; + +StandardLimb gTalonRightShoulderLimb = { +#include "assets/objects/object_ta/gTalonRightShoulderLimb.inc.c" +}; + +StandardLimb gTalonRightArmLimb = { +#include "assets/objects/object_ta/gTalonRightArmLimb.inc.c" +}; + +StandardLimb gTalonRightHandLimb = { +#include "assets/objects/object_ta/gTalonRightHandLimb.inc.c" +}; + +StandardLimb gTalonHeadLimb = { +#include "assets/objects/object_ta/gTalonHeadLimb.inc.c" +}; + +StandardLimb gTalonTorsoLimb = { +#include "assets/objects/object_ta/gTalonTorsoLimb.inc.c" +}; + +void* gTalonLimbs[] = { +#include "assets/objects/object_ta/gTalonLimbs.inc.c" +}; + +FlexSkeletonHeader gTalonSkel = { +#include "assets/objects/object_ta/gTalonSkel.inc.c" +}; diff --git a/assets/objects/object_ta/gTalonSleepAnim.c b/assets/objects/object_ta/gTalonSleepAnim.c new file mode 100644 index 000000000..4368fba36 --- /dev/null +++ b/assets/objects/object_ta/gTalonSleepAnim.c @@ -0,0 +1,13 @@ +#include "object_ta.h" + +s16 gTalonSleepFrameData[] = { +#include "assets/objects/object_ta/gTalonSleepFrameData.inc.c" +}; + +JointIndex gTalonSleepJointIndices[] = { +#include "assets/objects/object_ta/gTalonSleepJointIndices.inc.c" +}; + +AnimationHeader gTalonSleepAnim = { +#include "assets/objects/object_ta/gTalonSleepAnim.inc.c" +}; diff --git a/assets/objects/object_ta/gTalonStandAnim.c b/assets/objects/object_ta/gTalonStandAnim.c new file mode 100644 index 000000000..c7d7fdefc --- /dev/null +++ b/assets/objects/object_ta/gTalonStandAnim.c @@ -0,0 +1,13 @@ +#include "object_ta.h" + +s16 gTalonStandFrameData[] = { +#include "assets/objects/object_ta/gTalonStandFrameData.inc.c" +}; + +JointIndex gTalonStandJointIndices[] = { +#include "assets/objects/object_ta/gTalonStandJointIndices.inc.c" +}; + +AnimationHeader gTalonStandAnim = { +#include "assets/objects/object_ta/gTalonStandAnim.inc.c" +}; diff --git a/assets/objects/object_ta/gTalonWakeUpAnim.c b/assets/objects/object_ta/gTalonWakeUpAnim.c new file mode 100644 index 000000000..6d354644c --- /dev/null +++ b/assets/objects/object_ta/gTalonWakeUpAnim.c @@ -0,0 +1,13 @@ +#include "object_ta.h" + +s16 gTalonWakeUpFrameData[] = { +#include "assets/objects/object_ta/gTalonWakeUpFrameData.inc.c" +}; + +JointIndex gTalonWakeUpJointIndices[] = { +#include "assets/objects/object_ta/gTalonWakeUpJointIndices.inc.c" +}; + +AnimationHeader gTalonWakeUpAnim = { +#include "assets/objects/object_ta/gTalonWakeUpAnim.inc.c" +}; diff --git a/assets/objects/object_ta/object_ta.h b/assets/objects/object_ta/object_ta.h new file mode 100644 index 000000000..0714d5936 --- /dev/null +++ b/assets/objects/object_ta/object_ta.h @@ -0,0 +1,55 @@ +#ifndef OBJECT_TA_H +#define OBJECT_TA_H + +#include "ultra64.h" +#include "animation.h" +#include "tex_len.h" + +#define gTalonHeadSkinTex_WIDTH 8 +#define gTalonHeadSkinTex_HEIGHT 8 +extern u64 gTalonHeadSkinTex[TEX_LEN(u64, gTalonHeadSkinTex_WIDTH, gTalonHeadSkinTex_HEIGHT, 8)]; + +#define gTalonRedTex_WIDTH 8 +#define gTalonRedTex_HEIGHT 8 +extern u64 gTalonRedTex[TEX_LEN(u64, gTalonRedTex_WIDTH, gTalonRedTex_HEIGHT, 8)]; + +#define TALON_EYE_TEX_WIDTH 32 +#define TALON_EYE_TEX_HEIGHT 32 +extern u64 gTalonEyeHalfTex[TEX_LEN(u64, TALON_EYE_TEX_WIDTH, TALON_EYE_TEX_HEIGHT, 8)]; +extern u64 gTalonEyeClosedTex[TEX_LEN(u64, TALON_EYE_TEX_WIDTH, TALON_EYE_TEX_HEIGHT, 8)]; +extern u64 gTalonEyeClosed2Tex[TEX_LEN(u64, TALON_EYE_TEX_WIDTH, TALON_EYE_TEX_HEIGHT, 8)]; +extern u64 gTalonEyeOpenTex[TEX_LEN(u64, TALON_EYE_TEX_WIDTH, TALON_EYE_TEX_HEIGHT, 8)]; + +typedef enum TalonLimb { + /* 0 */ TALON_LIMB_NONE, + /* 1 */ TALON_LIMB_ROOT, + /* 2 */ TALON_LIMB_LEFT_THIGH, + /* 3 */ TALON_LIMB_LEFT_LEG, + /* 4 */ TALON_LIMB_LEFT_FOOT, + /* 5 */ TALON_LIMB_RIGHT_THIGH, + /* 6 */ TALON_LIMB_RIGHT_LEG, + /* 7 */ TALON_LIMB_RIGHT_FOOT, + /* 8 */ TALON_LIMB_CHEST, + /* 9 */ TALON_LIMB_LEFT_SHOULDER, + /* 10 */ TALON_LIMB_LEFT_ARM, + /* 11 */ TALON_LIMB_LEFT_HAND, + /* 12 */ TALON_LIMB_RIGHT_SHOULDER, + /* 13 */ TALON_LIMB_RIGHT_ARM, + /* 14 */ TALON_LIMB_RIGHT_HAND, + /* 15 */ TALON_LIMB_HEAD, + /* 16 */ TALON_LIMB_TORSO, + /* 17 */ TALON_LIMB_MAX +} TalonLimb; + +extern FlexSkeletonHeader gTalonSkel; + +extern AnimationHeader gTalonSitSleepingAnim; +extern AnimationHeader gTalonStandAnim; +extern AnimationHeader gTalonSitHandsUpAnim; +extern AnimationHeader gTalonSitWakeUpAnim; +extern AnimationHeader gTalonRunAnim; +extern AnimationHeader gTalonSleepAnim; +extern AnimationHeader gTalonRunTransitionAnim; +extern AnimationHeader gTalonWakeUpAnim; + +#endif diff --git a/assets/objects/object_timeblock/gSongOfTimeBlockCol.c b/assets/objects/object_timeblock/gSongOfTimeBlockCol.c new file mode 100644 index 000000000..b97544953 --- /dev/null +++ b/assets/objects/object_timeblock/gSongOfTimeBlockCol.c @@ -0,0 +1,24 @@ +#include "object_timeblock.h" +#include "array_count.h" +#include "camera.h" +#include "z_math.h" + +BgCamInfo gSongOfTimeBlockBgCamList[] = { +#include "assets/objects/object_timeblock/gSongOfTimeBlockBgCamList.inc.c" +}; + +SurfaceType gSongOfTimeBlockSurfaceTypes[] = { +#include "assets/objects/object_timeblock/gSongOfTimeBlockSurfaceTypes.inc.c" +}; + +CollisionPoly gSongOfTimeBlockPolyList[] = { +#include "assets/objects/object_timeblock/gSongOfTimeBlockPolyList.inc.c" +}; + +Vec3s gSongOfTimeBlockVtxList[] = { +#include "assets/objects/object_timeblock/gSongOfTimeBlockVtxList.inc.c" +}; + +CollisionHeader gSongOfTimeBlockCol = { +#include "assets/objects/object_timeblock/gSongOfTimeBlockCol.inc.c" +}; diff --git a/assets/objects/object_timeblock/gSongOfTimeBlockDL.c b/assets/objects/object_timeblock/gSongOfTimeBlockDL.c new file mode 100644 index 000000000..7275a0be9 --- /dev/null +++ b/assets/objects/object_timeblock/gSongOfTimeBlockDL.c @@ -0,0 +1,17 @@ +#include "object_timeblock.h" +#include "gfx.h" +#include "tex_len.h" + +#define gSongOfTimeBlockTex_WIDTH 64 +#define gSongOfTimeBlockTex_HEIGHT 64 +u64 gSongOfTimeBlockTex[TEX_LEN(u64, gSongOfTimeBlockTex_WIDTH, gSongOfTimeBlockTex_HEIGHT, 4)] = { +#include "assets/objects/object_timeblock/gSongOfTimeBlockTex.i4.inc.c" +}; + +Vtx gSongOfTimeBlockVtx[] = { +#include "assets/objects/object_timeblock/gSongOfTimeBlockVtx.inc.c" +}; + +Gfx gSongOfTimeBlockDL[22] = { +#include "assets/objects/object_timeblock/gSongOfTimeBlockDL.inc.c" +}; diff --git a/assets/objects/object_timeblock/object_timeblock.h b/assets/objects/object_timeblock/object_timeblock.h new file mode 100644 index 000000000..d374c5478 --- /dev/null +++ b/assets/objects/object_timeblock/object_timeblock.h @@ -0,0 +1,10 @@ +#ifndef OBJECT_TIMEBLOCK_H +#define OBJECT_TIMEBLOCK_H + +#include "ultra64.h" +#include "bgcheck.h" + +extern Gfx gSongOfTimeBlockDL[22]; +extern CollisionHeader gSongOfTimeBlockCol; + +#endif @@ -2080,7 +2080,15 @@ beginseg name "object_ta" compress romalign 0x1000 - include "$(BUILD_DIR)/assets/objects/object_ta/object_ta.o" + include "$(BUILD_DIR)/assets/objects/object_ta/gTalonSitSleepingAnim.o" + include "$(BUILD_DIR)/assets/objects/object_ta/gTalonStandAnim.o" + include "$(BUILD_DIR)/assets/objects/object_ta/gTalonSkel.o" + include "$(BUILD_DIR)/assets/objects/object_ta/gTalonSitHandsUpAnim.o" + include "$(BUILD_DIR)/assets/objects/object_ta/gTalonSitWakeUpAnim.o" + include "$(BUILD_DIR)/assets/objects/object_ta/gTalonRunAnim.o" + include "$(BUILD_DIR)/assets/objects/object_ta/gTalonSleepAnim.o" + include "$(BUILD_DIR)/assets/objects/object_ta/gTalonRunTransitionAnim.o" + include "$(BUILD_DIR)/assets/objects/object_ta/gTalonWakeUpAnim.o" number 6 endseg @@ -2304,7 +2312,10 @@ beginseg name "object_syokudai" compress romalign 0x1000 - include "$(BUILD_DIR)/assets/objects/object_syokudai/object_syokudai.o" + include "$(BUILD_DIR)/assets/objects/object_syokudai/gGoldenTorchDL.o" + include "$(BUILD_DIR)/assets/objects/object_syokudai/gWoodenTorchDL.o" + include "$(BUILD_DIR)/assets/objects/object_syokudai/gTimedTorchDL.o" + include "$(BUILD_DIR)/assets/objects/object_syokudai/textures.o" number 6 endseg @@ -2408,7 +2419,10 @@ beginseg name "object_spot17_obj" compress romalign 0x1000 - include "$(BUILD_DIR)/assets/objects/object_spot17_obj/object_spot17_obj.o" + include "$(BUILD_DIR)/assets/objects/object_spot17_obj/bombable_wall_dls.o" + include "$(BUILD_DIR)/assets/objects/object_spot17_obj/gCraterBombableWallCol.o" + include "$(BUILD_DIR)/assets/objects/object_spot17_obj/gCraterSmokeConeDL.o" + include "$(BUILD_DIR)/assets/objects/object_spot17_obj/gCraterBombableWallCracksTex.o" number 6 endseg @@ -2544,7 +2558,8 @@ beginseg name "object_spot16_obj" compress romalign 0x1000 - include "$(BUILD_DIR)/assets/objects/object_spot16_obj/object_spot16_obj.o" + include "$(BUILD_DIR)/assets/objects/object_spot16_obj/gDodongosCavernRockDL.o" + include "$(BUILD_DIR)/assets/objects/object_spot16_obj/gDeathMountainRingDL.o" number 6 endseg @@ -2896,7 +2911,11 @@ beginseg name "object_spot15_obj" compress romalign 0x1000 - include "$(BUILD_DIR)/assets/objects/object_spot15_obj/object_spot15_obj.o" + include "$(BUILD_DIR)/assets/objects/object_spot15_obj/gLonLonMilkCrateDL.o" + include "$(BUILD_DIR)/assets/objects/object_spot15_obj/gLonLonMilkCrateCol.o" + include "$(BUILD_DIR)/assets/objects/object_spot15_obj/gLonLonCorralFenceDL.o" + include "$(BUILD_DIR)/assets/objects/object_spot15_obj/gLonLonCorralFenceCol.o" + include "$(BUILD_DIR)/assets/objects/object_spot15_obj/textures.o" number 6 endseg @@ -4194,7 +4213,8 @@ beginseg name "object_timeblock" compress romalign 0x1000 - include "$(BUILD_DIR)/assets/objects/object_timeblock/object_timeblock.o" + include "$(BUILD_DIR)/assets/objects/object_timeblock/gSongOfTimeBlockDL.o" + include "$(BUILD_DIR)/assets/objects/object_timeblock/gSongOfTimeBlockCol.o" number 6 endseg diff --git a/tools/assets/extract/write_source.txt b/tools/assets/extract/write_source.txt index 9ba73ee36..7aece6661 100644 --- a/tools/assets/extract/write_source.txt +++ b/tools/assets/extract/write_source.txt @@ -333,17 +333,11 @@ assets/objects/object_spot08_obj/object_spot08_obj.c assets/objects/object_spot09_obj/object_spot09_obj.c assets/objects/object_spot11_obj/object_spot11_obj.c assets/objects/object_spot12_obj/object_spot12_obj.c -assets/objects/object_spot15_obj/object_spot15_obj.c -assets/objects/object_spot16_obj/object_spot16_obj.c -assets/objects/object_spot17_obj/object_spot17_obj.c assets/objects/object_spot18_obj/object_spot18_obj.c assets/objects/object_ssh/object_ssh.c assets/objects/object_sst/object_sst.c assets/objects/object_st/object_st.c assets/objects/object_stream/object_stream.c -assets/objects/object_syokudai/object_syokudai.c -assets/objects/object_ta/object_ta.c -assets/objects/object_timeblock/object_timeblock.c assets/objects/object_tite/object_tite.c assets/objects/object_tk/object_tk.c assets/objects/object_toki_objects/object_toki_objects.c |