From 130455c39b5e861d1a8e5d15c281bffdd7962d96 Mon Sep 17 00:00:00 2001 From: roeming Date: Tue, 22 Jul 2025 21:07:27 -0400 Subject: [PATCH] matching more data --- config/GAFE01_00/config.yml | 205 ++++++++++++++++++++++++++++++ configure.py | 36 +++--- src/data/model/obj_palm3.c | 24 ++++ src/data/model/obj_palm4.c | 22 ++++ src/data/model/obj_palm5.c | 22 ++++ src/data/model/obj_pstump3.c | 24 ++++ src/data/model/obj_pstump4.c | 24 ++++ src/data/model/obj_pstump5.c | 24 ++++ src/data/model/obj_s_palm2.c | 26 ++++ src/data/model/obj_s_palm3.c | 44 +++++++ src/data/model/obj_s_palm4.c | 46 +++++++ src/data/model/obj_s_palm5.c | 51 ++++++++ src/data/model/obj_s_palm5_coco.c | 15 +++ src/data/model/obj_s_pstump2.c | 26 ++++ src/data/model/obj_s_pstump3.c | 26 ++++ src/data/model/obj_s_pstump4.c | 26 ++++ src/data/model/obj_s_pstump5.c | 26 ++++ src/data/model/obj_s_sightmap.c | 31 +++++ src/data/model/obj_w_palm.c | 25 ++++ src/data/model/obj_w_palm1.c | 25 ++++ 20 files changed, 730 insertions(+), 18 deletions(-) create mode 100644 src/data/model/obj_palm3.c create mode 100644 src/data/model/obj_palm4.c create mode 100644 src/data/model/obj_palm5.c create mode 100644 src/data/model/obj_pstump3.c create mode 100644 src/data/model/obj_pstump4.c create mode 100644 src/data/model/obj_pstump5.c create mode 100644 src/data/model/obj_s_palm2.c create mode 100644 src/data/model/obj_s_palm3.c create mode 100644 src/data/model/obj_s_palm4.c create mode 100644 src/data/model/obj_s_palm5.c create mode 100644 src/data/model/obj_s_palm5_coco.c create mode 100644 src/data/model/obj_s_pstump2.c create mode 100644 src/data/model/obj_s_pstump3.c create mode 100644 src/data/model/obj_s_pstump4.c create mode 100644 src/data/model/obj_s_pstump5.c create mode 100644 src/data/model/obj_s_sightmap.c create mode 100644 src/data/model/obj_w_palm.c create mode 100644 src/data/model/obj_w_palm1.c diff --git a/config/GAFE01_00/config.yml b/config/GAFE01_00/config.yml index 7715407a..690381fb 100644 --- a/config/GAFE01_00/config.yml +++ b/config/GAFE01_00/config.yml @@ -26812,3 +26812,208 @@ modules: header: assets/tol_fan8_v.inc header_type: none custom_type: vtx + + - symbol: obj_palm_shadow_tex + binary: assets/obj_palm_shadow_tex.bin + header: assets/obj_palm_shadow_tex.inc + header_type: raw + + - symbol: obj_palm3_shadow_v + binary: assets/obj_palm3_shadow_v.bin + header: assets/obj_palm3_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_palm4_shadow_v + binary: assets/obj_palm4_shadow_v.bin + header: assets/obj_palm4_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_palm5_shadow_v + binary: assets/obj_palm5_shadow_v.bin + header: assets/obj_palm5_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_pstump_shadow_tex!.data:0x106c60 + binary: assets/obj_pstump3/obj_pstump_shadow_tex.bin + header: assets/obj_pstump3/obj_pstump_shadow_tex.inc + header_type: raw + + - symbol: obj_pstump3_shadow_v + binary: assets/obj_pstump3_shadow_v.bin + header: assets/obj_pstump3_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_pstump_shadow_tex!.data:0x106ee0 + binary: assets/obj_pstump4/obj_pstump_shadow_tex.bin + header: assets/obj_pstump4/obj_pstump_shadow_tex.inc + header_type: raw + + - symbol: obj_pstump4_shadow_v + binary: assets/obj_pstump4_shadow_v.bin + header: assets/obj_pstump4_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_pstump_shadow_tex!.data:0x107160 + binary: assets/obj_pstump5/obj_pstump_shadow_tex.bin + header: assets/obj_pstump5/obj_pstump_shadow_tex.inc + header_type: raw + + - symbol: obj_pstump5_shadow_v + binary: assets/obj_pstump5_shadow_v.bin + header: assets/obj_pstump5_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_palm_baby_tex + binary: assets/obj_w_palm_baby_tex.bin + header: assets/obj_w_palm_baby_tex.inc + header_type: raw + + - symbol: obj_s_palm1_v + binary: assets/obj_s_palm1_v.bin + header: assets/obj_s_palm1_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_palm_dead_tex + binary: assets/obj_s_palm_dead_tex.bin + header: assets/obj_s_palm_dead_tex.inc + header_type: raw + + - symbol: obj_s_palm1_dead_v + binary: assets/obj_s_palm1_dead_v.bin + header: assets/obj_s_palm1_dead_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_palm_young_tex!.data:0x107760 + binary: assets/obj_s_palm2/obj_s_palm_young_tex.bin + header: assets/obj_s_palm2/obj_s_palm_young_tex.inc + header_type: raw + + - symbol: obj_s_palm2_v + binary: assets/obj_s_palm2_v.bin + header: assets/obj_s_palm2_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_palm_leaf_tex!.data:0x108020 + binary: assets/obj_s_palm3/obj_s_palm_leaf_tex.bin + header: assets/obj_s_palm3/obj_s_palm_leaf_tex.inc + header_type: raw + + - symbol: obj_s_palm_young_tex!.data:0x108820 + binary: assets/obj_s_palm3/obj_s_palm_young_tex.bin + header: assets/obj_s_palm3/obj_s_palm_young_tex.inc + header_type: raw + + - symbol: obj_s_palm3_v + binary: assets/obj_s_palm3_v.bin + header: assets/obj_s_palm3_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_palm_leaf_tex!.data:0x109220 + binary: assets/obj_s_palm4/obj_s_palm_leaf_tex.bin + header: assets/obj_s_palm4/obj_s_palm_leaf_tex.inc + header_type: raw + + - symbol: obj_s_palm_trunk_tex!.data:0x109a20 + binary: assets/obj_s_palm4/obj_s_palm_trunk_tex.bin + header: assets/obj_s_palm4/obj_s_palm_trunk_tex.inc + header_type: raw + + - symbol: obj_s_palm4_v + binary: assets/obj_s_palm4_v.bin + header: assets/obj_s_palm4_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_palm_leaf_tex!.data:0x10a520 + binary: assets/obj_s_palm5/obj_s_palm_leaf_tex.bin + header: assets/obj_s_palm5/obj_s_palm_leaf_tex.inc + header_type: raw + + - symbol: obj_s_palm_trunk_tex!.data:0x10ad20 + binary: assets/obj_s_palm5/obj_s_palm_trunk_tex.bin + header: assets/obj_s_palm5/obj_s_palm_trunk_tex.inc + header_type: raw + + - symbol: obj_s_palm5_v + binary: assets/obj_s_palm5_v.bin + header: assets/obj_s_palm5_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_palm5_coco_v + binary: assets/obj_s_palm5_coco_v.bin + header: assets/obj_s_palm5_coco_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_palm_young_tex!.data:0x10ba00 + binary: assets/obj_s_pstump2/obj_s_palm_young_tex.bin + header: assets/obj_s_pstump2/obj_s_palm_young_tex.inc + header_type: raw + + - symbol: obj_s_pstump2_v + binary: assets/obj_s_pstump2_v.bin + header: assets/obj_s_pstump2_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_palm_young_tex!.data:0x10c2c0 + binary: assets/obj_s_pstump3/obj_s_palm_young_tex.bin + header: assets/obj_s_pstump3/obj_s_palm_young_tex.inc + header_type: raw + + - symbol: obj_s_pstump3_v + binary: assets/obj_s_pstump3_v.bin + header: assets/obj_s_pstump3_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_palm_stump_tex!.data:0x10cb80 + binary: assets/obj_s_pstump4/obj_s_palm_stump_tex.bin + header: assets/obj_s_pstump4/obj_s_palm_stump_tex.inc + header_type: raw + + - symbol: obj_s_pstump4_v + binary: assets/obj_s_pstump4_v.bin + header: assets/obj_s_pstump4_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_palm_stump_tex!.data:0x10cb80 + binary: assets/obj_s_pstump5/obj_s_palm_stump_tex.bin + header: assets/obj_s_pstump5/obj_s_palm_stump_tex.inc + header_type: raw + + - symbol: obj_s_pstump5_v + binary: assets/obj_s_pstump5_v.bin + header: assets/obj_s_pstump5_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_sightmap_pal!.data:0x10d500 + binary: assets/obj_s_sightmap/obj_sightmap_pal.bin + header: assets/obj_s_sightmap/obj_sightmap_pal.inc + header_type: none + custom_type: pal16 + + - symbol: obj_s_sightmap_tex + binary: assets/obj_s_sightmap_tex.bin + header: assets/obj_s_sightmap_tex.inc + header_type: raw + + - symbol: obj_s_sightmap_v + binary: assets/obj_s_sightmap_v.bin + header: assets/obj_s_sightmap_v.inc + header_type: none + custom_type: vtx + \ No newline at end of file diff --git a/configure.py b/configure.py index e38f907f..8657c353 100644 --- a/configure.py +++ b/configure.py @@ -2680,24 +2680,24 @@ config.libs = [ Object(Matching, "data/model/obj_melody.c"), Object(Matching, "data/model/obj_s_notice.c"), Object(Matching, "data/model/obj_notice.c"), - Object(NonMatching, "data/model/obj_palm3.c"), - Object(NonMatching, "data/model/obj_palm4.c"), - Object(NonMatching, "data/model/obj_palm5.c"), - Object(NonMatching, "data/model/obj_pstump3.c"), - Object(NonMatching, "data/model/obj_pstump4.c"), - Object(NonMatching, "data/model/obj_pstump5.c"), - Object(NonMatching, "data/model/obj_w_palm.c"), - Object(NonMatching, "data/model/obj_w_palm1.c"), - Object(NonMatching, "data/model/obj_s_palm2.c"), - Object(NonMatching, "data/model/obj_s_palm3.c"), - Object(NonMatching, "data/model/obj_s_palm4.c"), - Object(NonMatching, "data/model/obj_s_palm5.c"), - Object(NonMatching, "data/model/obj_s_palm5_coco.c"), - Object(NonMatching, "data/model/obj_s_pstump2.c"), - Object(NonMatching, "data/model/obj_s_pstump3.c"), - Object(NonMatching, "data/model/obj_s_pstump4.c"), - Object(NonMatching, "data/model/obj_s_pstump5.c"), - Object(NonMatching, "data/model/obj_s_sightmap.c"), + Object(Matching, "data/model/obj_palm3.c"), + Object(Matching, "data/model/obj_palm4.c"), + Object(Matching, "data/model/obj_palm5.c"), + Object(Matching, "data/model/obj_pstump3.c"), + Object(Matching, "data/model/obj_pstump4.c"), + Object(Matching, "data/model/obj_pstump5.c"), + Object(Matching, "data/model/obj_w_palm.c"), + Object(Matching, "data/model/obj_w_palm1.c"), + Object(Matching, "data/model/obj_s_palm2.c"), + Object(Matching, "data/model/obj_s_palm3.c"), + Object(Matching, "data/model/obj_s_palm4.c"), + Object(Matching, "data/model/obj_s_palm5.c"), + Object(Matching, "data/model/obj_s_palm5_coco.c"), + Object(Matching, "data/model/obj_s_pstump2.c"), + Object(Matching, "data/model/obj_s_pstump3.c"), + Object(Matching, "data/model/obj_s_pstump4.c"), + Object(Matching, "data/model/obj_s_pstump5.c"), + Object(Matching, "data/model/obj_s_sightmap.c"), Object(NonMatching, "data/model/obj_sightmap_shadow.c"), Object(NonMatching, "data/model/obj_s_stoneA.c"), Object(NonMatching, "data/model/obj_stoneA_shadow.c"), diff --git a/src/data/model/obj_palm3.c b/src/data/model/obj_palm3.c new file mode 100644 index 00000000..91f06acb --- /dev/null +++ b/src/data/model/obj_palm3.c @@ -0,0 +1,24 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_palm_shadow_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_palm_shadow_tex.inc" +}; + +Vtx obj_palm3_shadow_v[] = { +#include "assets/obj_palm3_shadow_v.inc" +}; + +Gfx obj_palm3_shadowT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, obj_palm_shadow_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_palm3_shadowT_gfx_model[] = { + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_palm4.c b/src/data/model/obj_palm4.c new file mode 100644 index 00000000..0edf1f31 --- /dev/null +++ b/src/data/model/obj_palm4.c @@ -0,0 +1,22 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_palm4_shadow_v[] = { +#include "assets/obj_palm4_shadow_v.inc" +}; + +extern u8 obj_palm_shadow_tex[]; + +Gfx obj_palm4_shadowT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, obj_palm_shadow_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_palm4_shadowT_gfx_model[] = { + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_palm5.c b/src/data/model/obj_palm5.c new file mode 100644 index 00000000..69a427eb --- /dev/null +++ b/src/data/model/obj_palm5.c @@ -0,0 +1,22 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_palm5_shadow_v[] = { +#include "assets/obj_palm5_shadow_v.inc" +}; + +extern u8 obj_palm_shadow_tex[]; + +Gfx obj_palm5_shadowT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, obj_palm_shadow_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_palm5_shadowT_gfx_model[] = { + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_pstump3.c b/src/data/model/obj_pstump3.c new file mode 100644 index 00000000..19a60680 --- /dev/null +++ b/src/data/model/obj_pstump3.c @@ -0,0 +1,24 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u8 obj_pstump_shadow_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_pstump3/obj_pstump_shadow_tex.inc" +}; + +Vtx obj_pstump3_shadow_v[] = { +#include "assets/obj_pstump3_shadow_v.inc" +}; + +Gfx obj_pstump3_shadowT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, obj_pstump_shadow_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_pstump3_shadowT_gfx_model[] = { + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_pstump4.c b/src/data/model/obj_pstump4.c new file mode 100644 index 00000000..ffc3fb99 --- /dev/null +++ b/src/data/model/obj_pstump4.c @@ -0,0 +1,24 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u8 obj_pstump_shadow_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_pstump4/obj_pstump_shadow_tex.inc" +}; + +Vtx obj_pstump4_shadow_v[] = { +#include "assets/obj_pstump4_shadow_v.inc" +}; + +Gfx obj_pstump4_shadowT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, obj_pstump_shadow_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_pstump4_shadowT_gfx_model[] = { + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_pstump5.c b/src/data/model/obj_pstump5.c new file mode 100644 index 00000000..3d3d6601 --- /dev/null +++ b/src/data/model/obj_pstump5.c @@ -0,0 +1,24 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u8 obj_pstump_shadow_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_pstump5/obj_pstump_shadow_tex.inc" +}; + +Vtx obj_pstump5_shadow_v[] = { +#include "assets/obj_pstump5_shadow_v.inc" +}; + +Gfx obj_pstump5_shadowT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, obj_pstump_shadow_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_pstump5_shadowT_gfx_model[] = { + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_palm2.c b/src/data/model/obj_s_palm2.c new file mode 100644 index 00000000..32659a69 --- /dev/null +++ b/src/data/model/obj_s_palm2.c @@ -0,0 +1,26 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u8 obj_s_palm_young_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_palm2/obj_s_palm_young_tex.inc" +}; + +Vtx obj_s_palm2_v[] = { +#include "assets/obj_s_palm2_v.inc" +}; + +Gfx obj_s_palm2T_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_s_palm_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_palm2T_gfx_model[] = { + gsSPVertex(obj_s_palm2_v, 7, 0), + gsSPNTrianglesInit_5b(7, 0, 1, 2, 0, 3, 1, 3, 4, 1), + gsSPNTriangles_5b(4, 5, 1, 5, 2, 1, 0, 6, 3, 6, 4, 3), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_palm3.c b/src/data/model/obj_s_palm3.c new file mode 100644 index 00000000..0694173d --- /dev/null +++ b/src/data/model/obj_s_palm3.c @@ -0,0 +1,44 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u8 obj_s_palm_leaf_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_palm3/obj_s_palm_leaf_tex.inc" +}; + +static u8 obj_s_palm_young_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_palm3/obj_s_palm_young_tex.inc" +}; + +Vtx obj_s_palm3_v[] = { +#include "assets/obj_s_palm3_v.inc" +}; + +Gfx obj_s_palm3_leafT_mat_model[] = { + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 128, 32, obj_s_palm_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_palm3_leafT_gfx_model[] = { + gsSPVertex(obj_s_palm3_v, 16, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 8, 9, 10, 8, 10, 11, 12, 13, 14), + gsSPNTriangles_5b(12, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_palm3_trunkT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_s_palm_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_palm3_trunkT_gfx_model[] = { + gsSPVertex(&obj_s_palm3_v[16], 7, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 6, 1, 6, 4, 1, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_palm4.c b/src/data/model/obj_s_palm4.c new file mode 100644 index 00000000..64a7e1a1 --- /dev/null +++ b/src/data/model/obj_s_palm4.c @@ -0,0 +1,46 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u8 obj_s_palm_leaf_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_palm4/obj_s_palm_leaf_tex.inc" +}; + +static u8 obj_s_palm_trunk_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_palm4/obj_s_palm_trunk_tex.inc" +}; + +Vtx obj_s_palm4_v[] = { +#include "assets/obj_s_palm4_v.inc" +}; + +Gfx obj_s_palm4_leafT_mat_model[] = { + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 128, 32, obj_s_palm_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_palm4_leafT_gfx_model[] = { + gsSPVertex(obj_s_palm4_v, 32, 0), + gsSPNTrianglesInit_5b(16, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 8, 9, 10, 8, 10, 11, 12, 13, 14), + gsSPNTriangles_5b(12, 14, 15, 16, 17, 18, 16, 18, 19, 20, 21, 22), + gsSPNTriangles_5b(20, 22, 23, 24, 25, 26, 24, 26, 27, 28, 29, 30), + gsSPNTriangles_5b(28, 30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_palm4_trunkT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_s_palm_trunk_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_palm4_trunkT_gfx_model[] = { + gsSPVertex(&obj_s_palm4_v[32], 7, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 3, 0, 2, 2, 1, 4), + gsSPNTriangles_5b(2, 4, 5, 3, 2, 5, 3, 5, 6, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_palm5.c b/src/data/model/obj_s_palm5.c new file mode 100644 index 00000000..5fea90e3 --- /dev/null +++ b/src/data/model/obj_s_palm5.c @@ -0,0 +1,51 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u8 obj_s_palm_leaf_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_palm5/obj_s_palm_leaf_tex.inc" +}; + +static u8 obj_s_palm_trunk_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_palm5/obj_s_palm_trunk_tex.inc" +}; + +Vtx obj_s_palm5_v[] = { +#include "assets/obj_s_palm5_v.inc" +}; + +Gfx obj_s_palm5_trunkT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_s_palm_trunk_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_palm5_trunkT_gfx_model[] = { + gsSPVertex(obj_s_palm5_v, 7, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 6, 1, 6, 4, 1, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_palm5_leafT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 128, 32, obj_s_palm_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_palm5_leafT_gfx_model[] = { + gsSPVertex(&obj_s_palm5_v[7], 32, 0), + gsSPNTrianglesInit_5b(16, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 8, 9, 10, 8, 10, 11, 12, 13, 14), + gsSPNTriangles_5b(12, 14, 15, 16, 17, 18, 16, 18, 19, 20, 21, 22), + gsSPNTriangles_5b(20, 22, 23, 24, 25, 26, 24, 26, 27, 28, 29, 30), + gsSPNTriangles_5b(28, 30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPVertex(&obj_s_palm5_v[39], 16, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 8, 9, 10, 8, 10, 11, 12, 13, 14), + gsSPNTriangles_5b(12, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_palm5_coco.c b/src/data/model/obj_s_palm5_coco.c new file mode 100644 index 00000000..33de7d4a --- /dev/null +++ b/src/data/model/obj_s_palm5_coco.c @@ -0,0 +1,15 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_s_palm5_coco_v[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_palm5_coco_v.inc" +}; + +Gfx obj_s_palm5_cocoT_gfx_model[] = { + gsSPVertex(obj_s_palm5_coco_v, 8, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_pstump2.c b/src/data/model/obj_s_pstump2.c new file mode 100644 index 00000000..01df65a2 --- /dev/null +++ b/src/data/model/obj_s_pstump2.c @@ -0,0 +1,26 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u8 obj_s_palm_young_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_pstump2/obj_s_palm_young_tex.inc" +}; + +Vtx obj_s_pstump2_v[] = { +#include "assets/obj_s_pstump2_v.inc" +}; + +Gfx obj_s_pstump2T_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_s_palm_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_pstump2T_gfx_model[] = { + gsSPVertex(obj_s_pstump2_v, 7, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 6, 1, 6, 4, 1, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_pstump3.c b/src/data/model/obj_s_pstump3.c new file mode 100644 index 00000000..81884fdc --- /dev/null +++ b/src/data/model/obj_s_pstump3.c @@ -0,0 +1,26 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u8 obj_s_palm_young_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_pstump3/obj_s_palm_young_tex.inc" +}; + +Vtx obj_s_pstump3_v[] = { +#include "assets/obj_s_pstump3_v.inc" +}; + +Gfx obj_s_pstump3T_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_s_palm_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_pstump3T_gfx_model[] = { + gsSPVertex(obj_s_pstump3_v, 7, 0), + gsSPNTrianglesInit_5b(7, 0, 1, 2, 2, 1, 3, 1, 4, 3), + gsSPNTriangles_5b(0, 5, 1, 5, 4, 1, 4, 6, 3, 4, 5, 6), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_pstump4.c b/src/data/model/obj_s_pstump4.c new file mode 100644 index 00000000..29868d27 --- /dev/null +++ b/src/data/model/obj_s_pstump4.c @@ -0,0 +1,26 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u8 obj_s_palm_stump_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_pstump4/obj_s_palm_stump_tex.inc" +}; + +Vtx obj_s_pstump4_v[] = { +#include "assets/obj_s_pstump4_v.inc" +}; + +Gfx obj_s_pstump4T_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, obj_s_palm_stump_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_pstump4T_gfx_model[] = { + gsSPVertex(obj_s_pstump4_v, 7, 0), + gsSPNTrianglesInit_5b(7, 0, 1, 2, 3, 0, 2, 3, 4, 0), + gsSPNTriangles_5b(4, 5, 0, 5, 1, 0, 3, 6, 4, 6, 5, 4), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_pstump5.c b/src/data/model/obj_s_pstump5.c new file mode 100644 index 00000000..35b89f82 --- /dev/null +++ b/src/data/model/obj_s_pstump5.c @@ -0,0 +1,26 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u8 obj_s_palm_stump_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_pstump5/obj_s_palm_stump_tex.inc" +}; + +Vtx obj_s_pstump5_v[] = { +#include "assets/obj_s_pstump5_v.inc" +}; + +Gfx obj_s_spstump5T_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, obj_s_palm_stump_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_spstump5T_gfx_model[] = { + gsSPVertex(obj_s_pstump5_v, 7, 0), + gsSPNTrianglesInit_5b(7, 0, 1, 2, 3, 4, 5, 6, 3, 5), + gsSPNTriangles_5b(5, 4, 1, 4, 2, 1, 6, 1, 0, 6, 5, 1), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_sightmap.c b/src/data/model/obj_s_sightmap.c new file mode 100644 index 00000000..ac4e1d13 --- /dev/null +++ b/src/data/model/obj_s_sightmap.c @@ -0,0 +1,31 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u16 obj_sightmap_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_sightmap/obj_sightmap_pal.inc" +}; + +u8 obj_s_sightmap_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_sightmap_tex.inc" +}; + +Vtx obj_s_sightmap_v[] = { +#include "assets/obj_s_sightmap_v.inc" +}; + +Gfx obj_s_sightmapT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPLoadTLUT_Dolphin(15, 16, 1, obj_sightmap_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_s_sightmap_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_sightmapT_gfx_model[] = { + gsSPVertex(obj_s_sightmap_v, 8, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_palm.c b/src/data/model/obj_w_palm.c new file mode 100644 index 00000000..1d66f71d --- /dev/null +++ b/src/data/model/obj_w_palm.c @@ -0,0 +1,25 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_w_palm_baby_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_palm_baby_tex.inc" +}; + +Vtx obj_s_palm1_v[] = { +#include "assets/obj_s_palm1_v.inc" +}; + +Gfx obj_w_palm1T_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 24, obj_w_palm_baby_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_palm1T_gfx_model[] = { + gsSPVertex(obj_s_palm1_v, 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 3, 0, 2, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_palm1.c b/src/data/model/obj_w_palm1.c new file mode 100644 index 00000000..bb524186 --- /dev/null +++ b/src/data/model/obj_w_palm1.c @@ -0,0 +1,25 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_s_palm_dead_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_palm_dead_tex.inc" +}; + +Vtx obj_s_palm1_dead_v[] = { +#include "assets/obj_s_palm1_dead_v.inc" +}; + +Gfx obj_s_palm1_deadT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 16, obj_s_palm_dead_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_palm1_deadT_gfx_model[] = { + gsSPVertex(obj_s_palm1_dead_v, 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 1, 3, 2, 0, 0, 0), + gsSPEndDisplayList(), +};