From 276317de459bb9b9d77601b43dfc1b4de4152e91 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 14 Jun 2025 09:11:00 +0200 Subject: [PATCH] commit object_yukabyun --- .../object_yukabyun/gFloorTileEnemyDL.c | 14 +++++++++++ .../gFloorTileEnemyFragmentDL.c | 18 +++++++++++++++ .../objects/object_yukabyun/object_yukabyun.h | 23 +++++++++++++++++++ spec/spec | 3 ++- tools/assets/extract/write_source.txt | 1 - 5 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 assets/objects/object_yukabyun/gFloorTileEnemyDL.c create mode 100644 assets/objects/object_yukabyun/gFloorTileEnemyFragmentDL.c create mode 100644 assets/objects/object_yukabyun/object_yukabyun.h diff --git a/assets/objects/object_yukabyun/gFloorTileEnemyDL.c b/assets/objects/object_yukabyun/gFloorTileEnemyDL.c new file mode 100644 index 0000000000..0092f4bc58 --- /dev/null +++ b/assets/objects/object_yukabyun/gFloorTileEnemyDL.c @@ -0,0 +1,14 @@ +#include "object_yukabyun.h" +#include "gfx.h" + +u64 gFloorTileEnemyBottomTex[TEX_LEN(u64, gFloorTileEnemyBottomTex_WIDTH, gFloorTileEnemyBottomTex_HEIGHT, 16)] = { +#include "assets/objects/object_yukabyun/gFloorTileEnemyBottomTex.rgba16.inc.c" +}; + +Vtx gFloorTileEnemyVtx[] = { +#include "assets/objects/object_yukabyun/gFloorTileEnemyVtx.inc.c" +}; + +Gfx gFloorTileEnemyDL[23] = { +#include "assets/objects/object_yukabyun/gFloorTileEnemyDL.inc.c" +}; diff --git a/assets/objects/object_yukabyun/gFloorTileEnemyFragmentDL.c b/assets/objects/object_yukabyun/gFloorTileEnemyFragmentDL.c new file mode 100644 index 0000000000..4f640b381c --- /dev/null +++ b/assets/objects/object_yukabyun/gFloorTileEnemyFragmentDL.c @@ -0,0 +1,18 @@ +#include "object_yukabyun.h" +#include "gfx.h" + +Vtx gFloorTileEnemyFragmentVtx[] = { +#include "assets/objects/object_yukabyun/gFloorTileEnemyFragmentVtx.inc.c" +}; + +Gfx gFloorTileEnemyFragmentDL[18] = { +#include "assets/objects/object_yukabyun/gFloorTileEnemyFragmentDL.inc.c" +}; + +u64 gFloorTileEnemyTopTex[TEX_LEN(u64, gFloorTileEnemyTopTex_WIDTH, gFloorTileEnemyTopTex_HEIGHT, 16)] = { +#include "assets/objects/object_yukabyun/gFloorTileEnemyTopTex.rgba16.inc.c" +}; + +u64 gFloorTileEnemyFragmentTex[TEX_LEN(u64, gFloorTileEnemyFragmentTex_WIDTH, gFloorTileEnemyFragmentTex_HEIGHT, 16)] = { +#include "assets/objects/object_yukabyun/gFloorTileEnemyFragmentTex.rgba16.inc.c" +}; diff --git a/assets/objects/object_yukabyun/object_yukabyun.h b/assets/objects/object_yukabyun/object_yukabyun.h new file mode 100644 index 0000000000..d568240d67 --- /dev/null +++ b/assets/objects/object_yukabyun/object_yukabyun.h @@ -0,0 +1,23 @@ +#ifndef OBJECT_YUKABYUN_H +#define OBJECT_YUKABYUN_H + +#include "ultra64.h" +#include "tex_len.h" + +#define gFloorTileEnemyBottomTex_WIDTH 32 +#define gFloorTileEnemyBottomTex_HEIGHT 32 +extern u64 gFloorTileEnemyBottomTex[TEX_LEN(u64, gFloorTileEnemyBottomTex_WIDTH, gFloorTileEnemyBottomTex_HEIGHT, 16)]; + +extern Gfx gFloorTileEnemyDL[23]; + +extern Gfx gFloorTileEnemyFragmentDL[18]; + +#define gFloorTileEnemyTopTex_WIDTH 32 +#define gFloorTileEnemyTopTex_HEIGHT 32 +extern u64 gFloorTileEnemyTopTex[TEX_LEN(u64, gFloorTileEnemyTopTex_WIDTH, gFloorTileEnemyTopTex_HEIGHT, 16)]; + +#define gFloorTileEnemyFragmentTex_WIDTH 16 +#define gFloorTileEnemyFragmentTex_HEIGHT 16 +extern u64 gFloorTileEnemyFragmentTex[TEX_LEN(u64, gFloorTileEnemyFragmentTex_WIDTH, gFloorTileEnemyFragmentTex_HEIGHT, 16)]; + +#endif diff --git a/spec/spec b/spec/spec index ccc228a047..fa629a3b92 100644 --- a/spec/spec +++ b/spec/spec @@ -1707,7 +1707,8 @@ beginseg name "object_yukabyun" compress romalign 0x1000 - include "$(BUILD_DIR)/assets/objects/object_yukabyun/object_yukabyun.o" + include "$(BUILD_DIR)/assets/objects/object_yukabyun/gFloorTileEnemyDL.o" + include "$(BUILD_DIR)/assets/objects/object_yukabyun/gFloorTileEnemyFragmentDL.o" number 6 endseg diff --git a/tools/assets/extract/write_source.txt b/tools/assets/extract/write_source.txt index 15493b2338..9d324cd884 100644 --- a/tools/assets/extract/write_source.txt +++ b/tools/assets/extract/write_source.txt @@ -372,7 +372,6 @@ assets/objects/object_wood02/object_wood02.c assets/objects/object_xc/object_xc.c assets/objects/object_yabusame_point/object_yabusame_point.c assets/objects/object_ydan_objects/object_ydan_objects.c -assets/objects/object_yukabyun/object_yukabyun.c assets/objects/object_zf/object_zf.c assets/objects/object_zl1/object_zl1.c assets/objects/object_zl2_anime1/object_zl2_anime1.c