commit object_umajump

assets/objects/object_umajump/gJumpableHorseFenceCol.c

@@ -0,0 +1,24 @@
+#include "object_umajump.h"
+#include "array_count.h"
+#include "camera.h"
+#include "z_math.h"
+
+BgCamInfo gJumpableHorseFenceBgCamList[] = {
+#include "assets/objects/object_umajump/gJumpableHorseFenceBgCamList.inc.c"
+};
+
+SurfaceType gJumpableHorseFenceSurfaceTypes[] = {
+#include "assets/objects/object_umajump/gJumpableHorseFenceSurfaceTypes.inc.c"
+};
+
+CollisionPoly gJumpableHorseFencePolyList[] = {
+#include "assets/objects/object_umajump/gJumpableHorseFencePolyList.inc.c"
+};
+
+Vec3s gJumpableHorseFenceVtxList[] = {
+#include "assets/objects/object_umajump/gJumpableHorseFenceVtxList.inc.c"
+};
+
+CollisionHeader gJumpableHorseFenceCol = {
+#include "assets/objects/object_umajump/gJumpableHorseFenceCol.inc.c"
+};

assets/objects/object_umajump/gJumpableHorseFenceDL.c

@@ -0,0 +1,23 @@
+#include "object_umajump.h"
+#include "gfx.h"
+#include "tex_len.h"
+
+#define gJumpableHorseFenceBrickTex_WIDTH 16
+#define gJumpableHorseFenceBrickTex_HEIGHT 64
+u64 gJumpableHorseFenceBrickTex[TEX_LEN(u64, gJumpableHorseFenceBrickTex_WIDTH, gJumpableHorseFenceBrickTex_HEIGHT, 16)] = {
+#include "assets/objects/object_umajump/gJumpableHorseFenceBrickTex.rgba16.inc.c"
+};
+
+#define gJumpableHorseFenceMetalBarTex_WIDTH 16
+#define gJumpableHorseFenceMetalBarTex_HEIGHT 64
+u64 gJumpableHorseFenceMetalBarTex[TEX_LEN(u64, gJumpableHorseFenceMetalBarTex_WIDTH, gJumpableHorseFenceMetalBarTex_HEIGHT, 16)] = {
+#include "assets/objects/object_umajump/gJumpableHorseFenceMetalBarTex.rgba16.inc.c"
+};
+
+Vtx gJumpableHorseFenceVtx[] = {
+#include "assets/objects/object_umajump/gJumpableHorseFenceVtx.inc.c"
+};
+
+Gfx gJumpableHorseFenceDL[37] = {
+#include "assets/objects/object_umajump/gJumpableHorseFenceDL.inc.c"
+};

assets/objects/object_umajump/object_umajump.h

@@ -0,0 +1,10 @@
+#ifndef OBJECT_UMAJUMP_H
+#define OBJECT_UMAJUMP_H
+
+#include "ultra64.h"
+#include "bgcheck.h"
+
+extern Gfx gJumpableHorseFenceDL[37];
+extern CollisionHeader gJumpableHorseFenceCol;
+
+#endif

spec/spec

@@ -2884,7 +2884,8 @@ beginseg
     name "object_umajump"
     compress
     romalign 0x1000
-    include "$(BUILD_DIR)/assets/objects/object_umajump/object_umajump.o"
+    include "$(BUILD_DIR)/assets/objects/object_umajump/gJumpableHorseFenceDL.o"
+    include "$(BUILD_DIR)/assets/objects/object_umajump/gJumpableHorseFenceCol.o"
     number 6
 endseg
 

tools/assets/extract/write_source.txt

@@ -360,7 +360,6 @@ assets/objects/object_tr/object_tr.c
 assets/objects/object_ts/object_ts.c
 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_vm/object_vm.c
 assets/objects/object_wallmaster/object_wallmaster.c