commit object_syokudai

assets/objects/object_syokudai/gGoldenTorchDL.c

@@ -0,0 +1,10 @@
+#include "object_syokudai.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"
+};

spec/spec

@@ -2172,7 +2172,10 @@ beginseg
     name "object_syokudai"
     compress
     romalign 0x1000
-    include "$(BUILD_DIR)/assets/objects/object_syokudai/object_syokudai.o"
+    include "$(BUILD_DIR)/assets/objects/object_syokudai/gGoldenTorchDL.o"
+    include "$(BUILD_DIR)/assets/objects/object_syokudai/gWoodenTorchDL.o"
+    include "$(BUILD_DIR)/assets/objects/object_syokudai/gTimedTorchDL.o"
+    include "$(BUILD_DIR)/assets/objects/object_syokudai/textures.o"
     number 6
 endseg
 

tools/assets/extract/write_source.txt

@@ -345,7 +345,6 @@ assets/objects/object_ssh/object_ssh.c
 assets/objects/object_sst/object_sst.c
 assets/objects/object_st/object_st.c
 assets/objects/object_stream/object_stream.c
-assets/objects/object_syokudai/object_syokudai.c
 assets/objects/object_tite/object_tite.c
 assets/objects/object_tk/object_tk.c
 assets/objects/object_toki_objects/object_toki_objects.c