Commit objects 2: object_spot15_obj, object_spot16_obj, object_spot17_obj, object_syokudai, object_ta, object_timeblock

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"
+};

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"
+};

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"
+};

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"
+};

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

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"
+};

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"
+};

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"
+};

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

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"
+};

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"
+};

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"
+};

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"
+};

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

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"
+};

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"
+};

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"
+};

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

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"
+};

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"
+};

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"
+};

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"
+};