commit object_spot15_obj

assets/objects/object_spot15_obj/gLonLonCorralFenceCol.c

@@ -0,0 +1,24 @@
+#include "object_spot15_obj.h"
+#include "array_count.h"
+#include "camera.h"
+#include "z_math.h"
+
+BgCamInfo gLonLonCorralFenceBgCamList[] = {
+#include "assets/objects/object_spot15_obj/gLonLonCorralFenceBgCamList.inc.c"
+};
+
+SurfaceType gLonLonCorralFenceSurfaceTypes[] = {
+#include "assets/objects/object_spot15_obj/gLonLonCorralFenceSurfaceTypes.inc.c"
+};
+
+CollisionPoly gLonLonCorralFencePolyList[] = {
+#include "assets/objects/object_spot15_obj/gLonLonCorralFencePolyList.inc.c"
+};
+
+Vec3s gLonLonCorralFenceVtxList[] = {
+#include "assets/objects/object_spot15_obj/gLonLonCorralFenceVtxList.inc.c"
+};
+
+CollisionHeader gLonLonCorralFenceCol = {
+#include "assets/objects/object_spot15_obj/gLonLonCorralFenceCol.inc.c"
+};

assets/objects/object_spot15_obj/gLonLonCorralFenceDL.c

@@ -0,0 +1,10 @@
+#include "object_spot15_obj.h"
+#include "gfx.h"
+
+Vtx gLonLonCorralFenceVtx[] = {
+#include "assets/objects/object_spot15_obj/gLonLonCorralFenceVtx.inc.c"
+};
+
+Gfx gLonLonCorralFenceDL[18] = {
+#include "assets/objects/object_spot15_obj/gLonLonCorralFenceDL.inc.c"
+};

assets/objects/object_spot15_obj/gLonLonMilkCrateCol.c

@@ -0,0 +1,24 @@
+#include "object_spot15_obj.h"
+#include "array_count.h"
+#include "camera.h"
+#include "z_math.h"
+
+BgCamInfo gLonLonMilkCrateBgCamList[] = {
+#include "assets/objects/object_spot15_obj/gLonLonMilkCrateBgCamList.inc.c"
+};
+
+SurfaceType gLonLonMilkCrateSurfaceTypes[] = {
+#include "assets/objects/object_spot15_obj/gLonLonMilkCrateSurfaceTypes.inc.c"
+};
+
+CollisionPoly gLonLonMilkCratePolyList[] = {
+#include "assets/objects/object_spot15_obj/gLonLonMilkCratePolyList.inc.c"
+};
+
+Vec3s gLonLonMilkCrateVtxList[] = {
+#include "assets/objects/object_spot15_obj/gLonLonMilkCrateVtxList.inc.c"
+};
+
+CollisionHeader gLonLonMilkCrateCol = {
+#include "assets/objects/object_spot15_obj/gLonLonMilkCrateCol.inc.c"
+};

assets/objects/object_spot15_obj/gLonLonMilkCrateDL.c

@@ -0,0 +1,10 @@
+#include "object_spot15_obj.h"
+#include "gfx.h"
+
+Vtx gLonLonMilkCrateVtx[] = {
+#include "assets/objects/object_spot15_obj/gLonLonMilkCrateVtx.inc.c"
+};
+
+Gfx gLonLonMilkCrateDL[23] = {
+#include "assets/objects/object_spot15_obj/gLonLonMilkCrateDL.inc.c"
+};

assets/objects/object_spot15_obj/object_spot15_obj.h

@@ -0,0 +1,24 @@
+#ifndef OBJECT_SPOT15_OBJ_H
+#define OBJECT_SPOT15_OBJ_H
+
+#include "ultra64.h"
+#include "bgcheck.h"
+#include "tex_len.h"
+
+extern Gfx gLonLonMilkCrateDL[23];
+
+extern CollisionHeader gLonLonMilkCrateCol;
+
+extern Gfx gLonLonCorralFenceDL[18];
+
+extern CollisionHeader gLonLonCorralFenceCol;
+
+#define gLonLonCorralFenceTex_WIDTH 32
+#define gLonLonCorralFenceTex_HEIGHT 128
+extern u64 gLonLonCorralFenceTex[TEX_LEN(u64, gLonLonCorralFenceTex_WIDTH, gLonLonCorralFenceTex_HEIGHT, 4)];
+
+#define gLonLonMilkCrateTex_WIDTH 32
+#define gLonLonMilkCrateTex_HEIGHT 64
+extern u64 gLonLonMilkCrateTex[TEX_LEN(u64, gLonLonMilkCrateTex_WIDTH, gLonLonMilkCrateTex_HEIGHT, 16)];
+
+#endif

assets/objects/object_spot15_obj/textures.c

@@ -0,0 +1,9 @@
+#include "object_spot15_obj.h"
+
+u64 gLonLonCorralFenceTex[TEX_LEN(u64, gLonLonCorralFenceTex_WIDTH, gLonLonCorralFenceTex_HEIGHT, 4)] = {
+#include "assets/objects/object_spot15_obj/gLonLonCorralFenceTex.i4.inc.c"
+};
+
+u64 gLonLonMilkCrateTex[TEX_LEN(u64, gLonLonMilkCrateTex_WIDTH, gLonLonMilkCrateTex_HEIGHT, 16)] = {
+#include "assets/objects/object_spot15_obj/gLonLonMilkCrateTex.rgba16.inc.c"
+};

spec/spec

@@ -2771,7 +2771,11 @@ beginseg
     name "object_spot15_obj"
     compress
     romalign 0x1000
-    include "$(BUILD_DIR)/assets/objects/object_spot15_obj/object_spot15_obj.o"
+    include "$(BUILD_DIR)/assets/objects/object_spot15_obj/gLonLonMilkCrateDL.o"
+    include "$(BUILD_DIR)/assets/objects/object_spot15_obj/gLonLonMilkCrateCol.o"
+    include "$(BUILD_DIR)/assets/objects/object_spot15_obj/gLonLonCorralFenceDL.o"
+    include "$(BUILD_DIR)/assets/objects/object_spot15_obj/gLonLonCorralFenceCol.o"
+    include "$(BUILD_DIR)/assets/objects/object_spot15_obj/textures.o"
     number 6
 endseg
 

tools/assets/extract/write_source.txt

@@ -337,7 +337,6 @@ assets/objects/object_spot08_obj/object_spot08_obj.c
 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_spot18_obj/object_spot18_obj.c
 assets/objects/object_ssh/object_ssh.c
 assets/objects/object_sst/object_sst.c