commit object_timeblock

assets/objects/object_timeblock/gSongOfTimeBlockCol.c

@@ -0,0 +1,24 @@
+#include "object_timeblock.h"
+#include "array_count.h"
+#include "camera.h"
+#include "z_math.h"
+
+BgCamInfo gSongOfTimeBlockBgCamList[] = {
+#include "assets/objects/object_timeblock/gSongOfTimeBlockBgCamList.inc.c"
+};
+
+SurfaceType gSongOfTimeBlockSurfaceTypes[] = {
+#include "assets/objects/object_timeblock/gSongOfTimeBlockSurfaceTypes.inc.c"
+};
+
+CollisionPoly gSongOfTimeBlockPolyList[] = {
+#include "assets/objects/object_timeblock/gSongOfTimeBlockPolyList.inc.c"
+};
+
+Vec3s gSongOfTimeBlockVtxList[] = {
+#include "assets/objects/object_timeblock/gSongOfTimeBlockVtxList.inc.c"
+};
+
+CollisionHeader gSongOfTimeBlockCol = {
+#include "assets/objects/object_timeblock/gSongOfTimeBlockCol.inc.c"
+};

assets/objects/object_timeblock/gSongOfTimeBlockDL.c

@@ -0,0 +1,17 @@
+#include "object_timeblock.h"
+#include "gfx.h"
+#include "tex_len.h"
+
+#define gSongOfTimeBlockTex_WIDTH 64
+#define gSongOfTimeBlockTex_HEIGHT 64
+u64 gSongOfTimeBlockTex[TEX_LEN(u64, gSongOfTimeBlockTex_WIDTH, gSongOfTimeBlockTex_HEIGHT, 4)] = {
+#include "assets/objects/object_timeblock/gSongOfTimeBlockTex.i4.inc.c"
+};
+
+Vtx gSongOfTimeBlockVtx[] = {
+#include "assets/objects/object_timeblock/gSongOfTimeBlockVtx.inc.c"
+};
+
+Gfx gSongOfTimeBlockDL[22] = {
+#include "assets/objects/object_timeblock/gSongOfTimeBlockDL.inc.c"
+};

assets/objects/object_timeblock/object_timeblock.h

@@ -0,0 +1,10 @@
+#ifndef OBJECT_TIMEBLOCK_H
+#define OBJECT_TIMEBLOCK_H
+
+#include "ultra64.h"
+#include "bgcheck.h"
+
+extern Gfx gSongOfTimeBlockDL[22];
+extern CollisionHeader gSongOfTimeBlockCol;
+
+#endif

spec/spec

@@ -4054,7 +4054,8 @@ beginseg
     name "object_timeblock"
     compress
     romalign 0x1000
-    include "$(BUILD_DIR)/assets/objects/object_timeblock/object_timeblock.o"
+    include "$(BUILD_DIR)/assets/objects/object_timeblock/gSongOfTimeBlockDL.o"
+    include "$(BUILD_DIR)/assets/objects/object_timeblock/gSongOfTimeBlockCol.o"
     number 6
 endseg
 

tools/assets/extract/write_source.txt

@@ -347,7 +347,6 @@ assets/objects/object_st/object_st.c
 assets/objects/object_stream/object_stream.c
 assets/objects/object_syokudai/object_syokudai.c
 assets/objects/object_ta/object_ta.c
-assets/objects/object_timeblock/object_timeblock.c
 assets/objects/object_tite/object_tite.c
 assets/objects/object_tk/object_tk.c
 assets/objects/object_toki_objects/object_toki_objects.c