From 044bde786a7975d4d980bbe88bced9ade25d26b1 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 14 Jun 2025 09:16:08 +0200 Subject: [PATCH] commit object_vase --- assets/objects/object_vase/gUnusedVaseDL.c | 18 ++++++++++++++++++ assets/objects/object_vase/object_vase.h | 19 +++++++++++++++++++ spec/spec | 2 +- tools/assets/extract/write_source.txt | 1 - 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 assets/objects/object_vase/gUnusedVaseDL.c create mode 100644 assets/objects/object_vase/object_vase.h diff --git a/assets/objects/object_vase/gUnusedVaseDL.c b/assets/objects/object_vase/gUnusedVaseDL.c new file mode 100644 index 0000000000..0619074953 --- /dev/null +++ b/assets/objects/object_vase/gUnusedVaseDL.c @@ -0,0 +1,18 @@ +#include "object_vase.h" +#include "gfx.h" + +Gfx gUnusedVaseDL[52] = { +#include "assets/objects/object_vase/gUnusedVaseDL.inc.c" +}; + +Vtx gUnusedVaseVtx[] = { +#include "assets/objects/object_vase/gUnusedVaseVtx.inc.c" +}; + +u64 gUnusedVaseBodyTex[TEX_LEN(u64, gUnusedVaseBodyTex_WIDTH, gUnusedVaseBodyTex_HEIGHT, 16)] = { +#include "assets/objects/object_vase/gUnusedVaseBodyTex.rgba16.inc.c" +}; + +u64 gUnusedVaseTopTex[TEX_LEN(u64, gUnusedVaseTopTex_WIDTH, gUnusedVaseTopTex_HEIGHT, 16)] = { +#include "assets/objects/object_vase/gUnusedVaseTopTex.rgba16.inc.c" +}; diff --git a/assets/objects/object_vase/object_vase.h b/assets/objects/object_vase/object_vase.h new file mode 100644 index 0000000000..4048f41e48 --- /dev/null +++ b/assets/objects/object_vase/object_vase.h @@ -0,0 +1,19 @@ +#ifndef OBJECT_VASE_H +#define OBJECT_VASE_H + +#include "ultra64.h" +#include "tex_len.h" + +extern Gfx gUnusedVaseDL[52]; + +extern Vtx gUnusedVaseVtx[]; + +#define gUnusedVaseBodyTex_WIDTH 32 +#define gUnusedVaseBodyTex_HEIGHT 32 +extern u64 gUnusedVaseBodyTex[TEX_LEN(u64, gUnusedVaseBodyTex_WIDTH, gUnusedVaseBodyTex_HEIGHT, 16)]; + +#define gUnusedVaseTopTex_WIDTH 32 +#define gUnusedVaseTopTex_HEIGHT 32 +extern u64 gUnusedVaseTopTex[TEX_LEN(u64, gUnusedVaseTopTex_WIDTH, gUnusedVaseTopTex_HEIGHT, 16)]; + +#endif diff --git a/spec/spec b/spec/spec index fa629a3b92..60eed2fd82 100644 --- a/spec/spec +++ b/spec/spec @@ -1924,7 +1924,7 @@ beginseg name "object_vase" compress romalign 0x1000 - include "$(BUILD_DIR)/assets/objects/object_vase/object_vase.o" + include "$(BUILD_DIR)/assets/objects/object_vase/gUnusedVaseDL.o" number 6 endseg diff --git a/tools/assets/extract/write_source.txt b/tools/assets/extract/write_source.txt index 9d324cd884..233db3b12c 100644 --- a/tools/assets/extract/write_source.txt +++ b/tools/assets/extract/write_source.txt @@ -362,7 +362,6 @@ assets/objects/object_tsubo/object_tsubo.c assets/objects/object_tw/object_tw.c assets/objects/object_umajump/object_umajump.c assets/objects/object_vali/object_vali.c -assets/objects/object_vase/object_vase.c assets/objects/object_vm/object_vm.c assets/objects/object_wallmaster/object_wallmaster.c assets/objects/object_warp1/object_warp1.c