From f0557edb3b57ac9e2dfd2b11cdc50a5ddaca6cf3 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 14 Jun 2025 09:24:10 +0200 Subject: [PATCH] commit object_triforce_spot --- .../object_triforce_spot.c | 30 +++++++++++++++++++ .../object_triforce_spot.h | 22 ++++++++++++++ tools/assets/extract/write_source.txt | 1 - 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 assets/objects/object_triforce_spot/object_triforce_spot.c create mode 100644 assets/objects/object_triforce_spot/object_triforce_spot.h diff --git a/assets/objects/object_triforce_spot/object_triforce_spot.c b/assets/objects/object_triforce_spot/object_triforce_spot.c new file mode 100644 index 0000000000..49729e7253 --- /dev/null +++ b/assets/objects/object_triforce_spot/object_triforce_spot.c @@ -0,0 +1,30 @@ +#include "object_triforce_spot.h" +#include "gfx.h" + +Vtx gTriforceVtx[] = { +#include "assets/objects/object_triforce_spot/gTriforceVtx.inc.c" +}; + +Vtx gTriforceLightColumnVtx[] = { +#include "assets/objects/object_triforce_spot/gTriforceLightColumnVtx.inc.c" +}; + +Gfx gTriforceDL[72] = { +#include "assets/objects/object_triforce_spot/gTriforceDL.inc.c" +}; + +Gfx gTriforceLightColumnDL[26] = { +#include "assets/objects/object_triforce_spot/gTriforceLightColumnDL.inc.c" +}; + +u64 gTriforceTex[TEX_LEN(u64, gTriforceTex_WIDTH, gTriforceTex_HEIGHT, 8)] = { +#include "assets/objects/object_triforce_spot/gTriforceTex.i8.inc.c" +}; + +u64 gTriforceColumnSide1Tex[TEX_LEN(u64, gTriforceColumnSide1Tex_WIDTH, gTriforceColumnSide1Tex_HEIGHT, 8)] = { +#include "assets/objects/object_triforce_spot/gTriforceColumnSide1Tex.i8.inc.c" +}; + +u64 gTriforceColumnSide2Tex[TEX_LEN(u64, gTriforceColumnSide2Tex_WIDTH, gTriforceColumnSide2Tex_HEIGHT, 8)] = { +#include "assets/objects/object_triforce_spot/gTriforceColumnSide2Tex.i8.inc.c" +}; diff --git a/assets/objects/object_triforce_spot/object_triforce_spot.h b/assets/objects/object_triforce_spot/object_triforce_spot.h new file mode 100644 index 0000000000..7e499dcfa4 --- /dev/null +++ b/assets/objects/object_triforce_spot/object_triforce_spot.h @@ -0,0 +1,22 @@ +#ifndef OBJECT_TRIFORCE_SPOT_H +#define OBJECT_TRIFORCE_SPOT_H + +#include "ultra64.h" +#include "tex_len.h" + +extern Gfx gTriforceDL[72]; +extern Gfx gTriforceLightColumnDL[26]; + +#define gTriforceTex_WIDTH 64 +#define gTriforceTex_HEIGHT 64 +extern u64 gTriforceTex[TEX_LEN(u64, gTriforceTex_WIDTH, gTriforceTex_HEIGHT, 8)]; + +#define gTriforceColumnSide1Tex_WIDTH 64 +#define gTriforceColumnSide1Tex_HEIGHT 32 +extern u64 gTriforceColumnSide1Tex[TEX_LEN(u64, gTriforceColumnSide1Tex_WIDTH, gTriforceColumnSide1Tex_HEIGHT, 8)]; + +#define gTriforceColumnSide2Tex_WIDTH 64 +#define gTriforceColumnSide2Tex_HEIGHT 32 +extern u64 gTriforceColumnSide2Tex[TEX_LEN(u64, gTriforceColumnSide2Tex_WIDTH, gTriforceColumnSide2Tex_HEIGHT, 8)]; + +#endif diff --git a/tools/assets/extract/write_source.txt b/tools/assets/extract/write_source.txt index 07980d17e8..7681d56cbf 100644 --- a/tools/assets/extract/write_source.txt +++ b/tools/assets/extract/write_source.txt @@ -355,7 +355,6 @@ assets/objects/object_torch2/object_torch2.c assets/objects/object_toryo/object_toryo.c assets/objects/object_tp/object_tp.c assets/objects/object_trap/object_trap.c -assets/objects/object_triforce_spot/object_triforce_spot.c assets/objects/object_tr/object_tr.c assets/objects/object_ts/object_ts.c assets/objects/object_tsubo/object_tsubo.c