diff --git a/assets/objects/object_spot16_obj/gDeathMountainRingDL.c b/assets/objects/object_spot16_obj/gDeathMountainRingDL.c new file mode 100644 index 0000000000..9a4a390ca7 --- /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 0000000000..9172e9c92f --- /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 0000000000..d4ef947f33 --- /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/spec/spec b/spec/spec index e6a3f4a124..c597eee353 100644 --- a/spec/spec +++ b/spec/spec @@ -2418,7 +2418,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 diff --git a/tools/assets/extract/write_source.txt b/tools/assets/extract/write_source.txt index 33f8a0c010..359c266a92 100644 --- a/tools/assets/extract/write_source.txt +++ b/tools/assets/extract/write_source.txt @@ -338,7 +338,6 @@ 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_spot18_obj/object_spot18_obj.c assets/objects/object_ssh/object_ssh.c assets/objects/object_sst/object_sst.c