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 0000000000..1057939155 --- /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 0000000000..3826332f7d --- /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 0000000000..a23b15af54 --- /dev/null +++ b/assets/objects/object_spot17_obj/gCraterBombableWallCracksTex.c @@ -0,0 +1,5 @@ +#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 0000000000..cfaed1f73b --- /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 0000000000..58b3df6a4d --- /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/spec/spec b/spec/spec index 8da3d439f3..e6a3f4a124 100644 --- a/spec/spec +++ b/spec/spec @@ -2279,7 +2279,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 diff --git a/tools/assets/extract/write_source.txt b/tools/assets/extract/write_source.txt index 4364c7ba7f..33f8a0c010 100644 --- a/tools/assets/extract/write_source.txt +++ b/tools/assets/extract/write_source.txt @@ -339,7 +339,6 @@ 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