From 0bcd6231c605e2b8201a19ab56d69e3601cfa542 Mon Sep 17 00:00:00 2001 From: roeming Date: Thu, 24 Jul 2025 11:04:57 -0400 Subject: [PATCH] link 70 more data objects --- config/GAFE01_00/config.yml | 718 ++++++++++++++++++++++++++- configure.py | 146 +++--- src/data/model/mFm_obj_palm_01.c | 8 + src/data/model/mFm_obj_tree_01.c | 8 + src/data/model/mFm_obj_tree_01_dol.c | 8 + src/data/model/obj_item_tane.c | 30 ++ src/data/model/obj_s_palm1.c | 25 + src/data/model/obj_s_stoneA.c | 32 ++ src/data/model/obj_s_stoneB.c | 17 + src/data/model/obj_s_stoneC.c | 17 + src/data/model/obj_s_stoneD.c | 18 + src/data/model/obj_s_stoneE.c | 18 + src/data/model/obj_s_stump2.c | 31 ++ src/data/model/obj_s_stump3.c | 31 ++ src/data/model/obj_s_stump4.c | 35 ++ src/data/model/obj_s_stump5.c | 31 ++ src/data/model/obj_s_tree1.c | 32 ++ src/data/model/obj_s_tree2.c | 28 ++ src/data/model/obj_s_tree3.c | 49 ++ src/data/model/obj_s_tree4.c | 43 ++ src/data/model/obj_s_tree5.c | 54 ++ src/data/model/obj_s_tree5_apple.c | 15 + src/data/model/obj_s_tree_dead.c | 32 ++ src/data/model/obj_sightmap_shadow.c | 24 + src/data/model/obj_stoneA_shadow.c | 28 ++ src/data/model/obj_stoneB_shadow.c | 17 + src/data/model/obj_stoneC_shadow.c | 17 + src/data/model/obj_stoneD_shadow.c | 16 + src/data/model/obj_stoneE_shadow.c | 17 + src/data/model/obj_stump3_shadow.c | 24 + src/data/model/obj_stump4_shadow.c | 22 + src/data/model/obj_stump5_shadow.c | 22 + src/data/model/obj_tree4_shadow.c | 22 + src/data/model/obj_tree5_shadow.c | 22 + src/data/model/obj_tree_shadow.c | 24 + src/data/model/obj_w_cedar1.c | 25 + src/data/model/obj_w_cedar1_dead.c | 25 + src/data/model/obj_w_cedar2.c | 24 + src/data/model/obj_w_cedar3.c | 45 ++ src/data/model/obj_w_cedar4.c | 47 ++ src/data/model/obj_w_cedar5.c | 49 ++ src/data/model/obj_w_cstump2.c | 24 + src/data/model/obj_w_cstump3.c | 24 + src/data/model/obj_w_cstump4.c | 28 ++ src/data/model/obj_w_cstump5.c | 24 + src/data/model/obj_w_fenceL.c | 28 ++ src/data/model/obj_w_fenceS.c | 25 + src/data/model/obj_w_honeycomb.c | 43 ++ src/data/model/obj_w_melody.c | 31 ++ src/data/model/obj_w_notice.c | 31 ++ src/data/model/obj_w_palm1_dead.c | 27 + src/data/model/obj_w_palm2.c | 26 + src/data/model/obj_w_palm3.c | 45 ++ src/data/model/obj_w_palm4.c | 47 ++ src/data/model/obj_w_palm5.c | 51 ++ src/data/model/obj_w_palm5_coco.c | 15 + src/data/model/obj_w_pstump2.c | 26 + src/data/model/obj_w_pstump3.c | 26 + src/data/model/obj_w_pstump4.c | 26 + src/data/model/obj_w_pstump5.c | 26 + src/data/model/obj_w_sightmap.c | 31 ++ src/data/model/obj_w_stoneA.c | 32 ++ src/data/model/obj_w_stoneB.c | 17 + src/data/model/obj_w_stoneC.c | 17 + src/data/model/obj_w_stoneD.c | 18 + src/data/model/obj_w_stoneE.c | 18 + src/data/model/obj_w_tree1.c | 32 ++ src/data/model/obj_w_tree1_dead.c | 32 ++ src/data/model/obj_w_tree2.c | 33 ++ src/data/model/obj_w_tree3.c | 56 +++ src/data/model/obj_w_tree4.c | 57 +++ src/data/model/obj_w_tree5.c | 56 +++ src/data/model/obj_x_cedar5.c | 39 ++ src/data/model/obj_x_honeycomb.c | 43 ++ src/data/model/obj_x_tree5.c | 33 ++ tools/converters/assetdis.py | 2 +- 76 files changed, 2910 insertions(+), 75 deletions(-) create mode 100644 src/data/model/mFm_obj_palm_01.c create mode 100644 src/data/model/mFm_obj_tree_01.c create mode 100644 src/data/model/mFm_obj_tree_01_dol.c create mode 100644 src/data/model/obj_item_tane.c create mode 100644 src/data/model/obj_s_palm1.c create mode 100644 src/data/model/obj_s_stoneA.c create mode 100644 src/data/model/obj_s_stoneB.c create mode 100644 src/data/model/obj_s_stoneC.c create mode 100644 src/data/model/obj_s_stoneD.c create mode 100644 src/data/model/obj_s_stoneE.c create mode 100644 src/data/model/obj_s_stump2.c create mode 100644 src/data/model/obj_s_stump3.c create mode 100644 src/data/model/obj_s_stump4.c create mode 100644 src/data/model/obj_s_stump5.c create mode 100644 src/data/model/obj_s_tree1.c create mode 100644 src/data/model/obj_s_tree2.c create mode 100644 src/data/model/obj_s_tree3.c create mode 100644 src/data/model/obj_s_tree4.c create mode 100644 src/data/model/obj_s_tree5.c create mode 100644 src/data/model/obj_s_tree5_apple.c create mode 100644 src/data/model/obj_s_tree_dead.c create mode 100644 src/data/model/obj_sightmap_shadow.c create mode 100644 src/data/model/obj_stoneA_shadow.c create mode 100644 src/data/model/obj_stoneB_shadow.c create mode 100644 src/data/model/obj_stoneC_shadow.c create mode 100644 src/data/model/obj_stoneD_shadow.c create mode 100644 src/data/model/obj_stoneE_shadow.c create mode 100644 src/data/model/obj_stump3_shadow.c create mode 100644 src/data/model/obj_stump4_shadow.c create mode 100644 src/data/model/obj_stump5_shadow.c create mode 100644 src/data/model/obj_tree4_shadow.c create mode 100644 src/data/model/obj_tree5_shadow.c create mode 100644 src/data/model/obj_tree_shadow.c create mode 100644 src/data/model/obj_w_cedar1.c create mode 100644 src/data/model/obj_w_cedar1_dead.c create mode 100644 src/data/model/obj_w_cedar2.c create mode 100644 src/data/model/obj_w_cedar3.c create mode 100644 src/data/model/obj_w_cedar4.c create mode 100644 src/data/model/obj_w_cedar5.c create mode 100644 src/data/model/obj_w_cstump2.c create mode 100644 src/data/model/obj_w_cstump3.c create mode 100644 src/data/model/obj_w_cstump4.c create mode 100644 src/data/model/obj_w_cstump5.c create mode 100644 src/data/model/obj_w_fenceL.c create mode 100644 src/data/model/obj_w_fenceS.c create mode 100644 src/data/model/obj_w_honeycomb.c create mode 100644 src/data/model/obj_w_melody.c create mode 100644 src/data/model/obj_w_notice.c create mode 100644 src/data/model/obj_w_palm1_dead.c create mode 100644 src/data/model/obj_w_palm2.c create mode 100644 src/data/model/obj_w_palm3.c create mode 100644 src/data/model/obj_w_palm4.c create mode 100644 src/data/model/obj_w_palm5.c create mode 100644 src/data/model/obj_w_palm5_coco.c create mode 100644 src/data/model/obj_w_pstump2.c create mode 100644 src/data/model/obj_w_pstump3.c create mode 100644 src/data/model/obj_w_pstump4.c create mode 100644 src/data/model/obj_w_pstump5.c create mode 100644 src/data/model/obj_w_sightmap.c create mode 100644 src/data/model/obj_w_stoneA.c create mode 100644 src/data/model/obj_w_stoneB.c create mode 100644 src/data/model/obj_w_stoneC.c create mode 100644 src/data/model/obj_w_stoneD.c create mode 100644 src/data/model/obj_w_stoneE.c create mode 100644 src/data/model/obj_w_tree1.c create mode 100644 src/data/model/obj_w_tree1_dead.c create mode 100644 src/data/model/obj_w_tree2.c create mode 100644 src/data/model/obj_w_tree3.c create mode 100644 src/data/model/obj_w_tree4.c create mode 100644 src/data/model/obj_w_tree5.c create mode 100644 src/data/model/obj_x_cedar5.c create mode 100644 src/data/model/obj_x_honeycomb.c create mode 100644 src/data/model/obj_x_tree5.c diff --git a/config/GAFE01_00/config.yml b/config/GAFE01_00/config.yml index 690381fb..1c795309 100644 --- a/config/GAFE01_00/config.yml +++ b/config/GAFE01_00/config.yml @@ -27016,4 +27016,720 @@ modules: header: assets/obj_s_sightmap_v.inc header_type: none custom_type: vtx - \ No newline at end of file + + - symbol: obj_sightmap_shadow_tex + binary: assets/obj_sightmap_shadow_tex.bin + header: assets/obj_sightmap_shadow_tex.inc + header_type: raw + + - symbol: obj_sightmap_shadow_v + binary: assets/obj_sightmap_shadow_v.bin + header: assets/obj_sightmap_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_stoneA_pal + binary: assets/obj_s_stoneA_pal.bin + header: assets/obj_s_stoneA_pal.inc + header_type: none + custom_type: pal16 + + - symbol: obj_s_stoneA_tex + binary: assets/obj_s_stoneA_tex.bin + header: assets/obj_s_stoneA_tex.inc + header_type: raw + + - symbol: obj_s_stoneA_v + binary: assets/obj_s_stoneA_v.bin + header: assets/obj_s_stoneA_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_stone_shadow_tex + binary: assets/obj_stone_shadow_tex.bin + header: assets/obj_stone_shadow_tex.inc + header_type: raw + + - symbol: obj_stoneA_shadow_v + binary: assets/obj_stoneA_shadow_v.bin + header: assets/obj_stoneA_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_stoneB_v + binary: assets/obj_s_stoneB_v.bin + header: assets/obj_s_stoneB_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_stoneB_shadow_v + binary: assets/obj_stoneB_shadow_v.bin + header: assets/obj_stoneB_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_stoneC_v + binary: assets/obj_s_stoneC_v.bin + header: assets/obj_s_stoneC_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_stoneC_shadow_v + binary: assets/obj_stoneC_shadow_v.bin + header: assets/obj_stoneC_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_stoneD_v + binary: assets/obj_s_stoneD_v.bin + header: assets/obj_s_stoneD_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_stoneD_shadow_v + binary: assets/obj_stoneD_shadow_v.bin + header: assets/obj_stoneD_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_stoneE_v + binary: assets/obj_s_stoneE_v.bin + header: assets/obj_s_stoneE_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_stoneE_shadow_v + binary: assets/obj_stoneE_shadow_v.bin + header: assets/obj_stoneE_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_stump2_v + binary: assets/obj_s_stump2_v.bin + header: assets/obj_s_stump2_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_stump3_v + binary: assets/obj_s_stump3_v.bin + header: assets/obj_s_stump3_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_stump_shadow_tex + binary: assets/obj_stump_shadow_tex.bin + header: assets/obj_stump_shadow_tex.inc + header_type: raw + + - symbol: obj_stump3_shadow_v + binary: assets/obj_stump3_shadow_v.bin + header: assets/obj_stump3_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_tree_stump_tex + binary: assets/obj_s_tree_stump_tex.bin + header: assets/obj_s_tree_stump_tex.inc + header_type: raw + + - symbol: obj_s_stump4_v + binary: assets/obj_s_stump4_v.bin + header: assets/obj_s_stump4_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_stump4_shadow_v + binary: assets/obj_stump4_shadow_v.bin + header: assets/obj_stump4_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_stump5_v + binary: assets/obj_s_stump5_v.bin + header: assets/obj_s_stump5_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_stump5_shadow_v + binary: assets/obj_stump5_shadow_v.bin + header: assets/obj_stump5_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_item_tane_pal!.data:0x10f700 + binary: assets/obj_item_tane/obj_item_tane_pal.bin + header: assets/obj_item_tane/obj_item_tane_pal.inc + header_type: none + custom_type: pal16 + + - symbol: obj_item_tane_tex!.data:0x10f720 + binary: assets/obj_item_tane/obj_item_tane_tex.bin + header: assets/obj_item_tane/obj_item_tane_tex.inc + header_type: raw + + - symbol: obj_item_tane_v!.data:0x10f7a0 + binary: assets/obj_item_tane/obj_item_tane_v.bin + header: assets/obj_item_tane/obj_item_tane_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_tree_baby_tex + binary: assets/obj_s_tree_baby_tex.bin + header: assets/obj_s_tree_baby_tex.inc + header_type: raw + + - symbol: obj_s_tree1_v + binary: assets/obj_s_tree1_v.bin + header: assets/obj_s_tree1_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_tree_dead_tex + binary: assets/obj_s_tree_dead_tex.bin + header: assets/obj_s_tree_dead_tex.inc + header_type: raw + + - symbol: obj_s_tree1_dead_v + binary: assets/obj_s_tree1_dead_v.bin + header: assets/obj_s_tree1_dead_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_tree_young_tex + binary: assets/obj_s_tree_young_tex.bin + header: assets/obj_s_tree_young_tex.inc + header_type: raw + + - symbol: obj_s_tree2_v + binary: assets/obj_s_tree2_v.bin + header: assets/obj_s_tree2_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_tree3_leaf_tex + binary: assets/obj_s_tree3_leaf_tex.bin + header: assets/obj_s_tree3_leaf_tex.inc + header_type: raw + + - symbol: obj_s_tree3_v + binary: assets/obj_s_tree3_v.bin + header: assets/obj_s_tree3_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_tree_shadow_tex + binary: assets/obj_tree_shadow_tex.bin + header: assets/obj_tree_shadow_tex.inc + header_type: raw + + - symbol: obj_tree3_shadow_v + binary: assets/obj_tree3_shadow_v.bin + header: assets/obj_tree3_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_tree4_trunk_tex + binary: assets/obj_s_tree4_trunk_tex.bin + header: assets/obj_s_tree4_trunk_tex.inc + header_type: raw + + - symbol: obj_s_tree4_v + binary: assets/obj_s_tree4_v.bin + header: assets/obj_s_tree4_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_tree4_shadow_v + binary: assets/obj_tree4_shadow_v.bin + header: assets/obj_tree4_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_tree5_v + binary: assets/obj_s_tree5_v.bin + header: assets/obj_s_tree5_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_tree5_apple_v + binary: assets/obj_s_tree5_apple_v.bin + header: assets/obj_s_tree5_apple_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_tree5_shadow_v + binary: assets/obj_tree5_shadow_v.bin + header: assets/obj_tree5_shadow_v.inc + header_type: none + custom_type: vtx + + - symbol: mFM_obj_palm_01_pal + binary: assets/mFM_obj_palm_01_pal.bin + header: assets/mFM_obj_palm_01_pal.inc + header_type: none + custom_type: pal16 + + - symbol: mFM_obj_tree_01_pal + binary: assets/mFM_obj_tree_01_pal.bin + header: assets/mFM_obj_tree_01_pal.inc + header_type: none + custom_type: pal16 + + - symbol: mFM_obj_tree_01_pal_dol + binary: assets/mFM_obj_tree_01_pal_dol.bin + header: assets/mFM_obj_tree_01_pal_dol.inc + header_type: none + custom_type: pal16 + + - symbol: obj_w_cedar_baby_tex + binary: assets/obj_w_cedar_baby_tex.bin + header: assets/obj_w_cedar_baby_tex.inc + header_type: raw + + - symbol: obj_w_cedar1_v + binary: assets/obj_w_cedar1_v.bin + header: assets/obj_w_cedar1_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_cedar_dead_tex + binary: assets/obj_w_cedar_dead_tex.bin + header: assets/obj_w_cedar_dead_tex.inc + header_type: raw + + - symbol: obj_w_cedar1_dead_v + binary: assets/obj_w_cedar1_dead_v.bin + header: assets/obj_w_cedar1_dead_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_cedar2_v + binary: assets/obj_w_cedar2_v.bin + header: assets/obj_w_cedar2_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_cedar_leaf_tex + binary: assets/obj_w_cedar_leaf_tex.bin + header: assets/obj_w_cedar_leaf_tex.inc + header_type: raw + + - symbol: obj_w_cedar_young_tex + binary: assets/obj_w_cedar_young_tex.bin + header: assets/obj_w_cedar_young_tex.inc + header_type: raw + + - symbol: obj_w_cedar3_v + binary: assets/obj_w_cedar3_v.bin + header: assets/obj_w_cedar3_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_cedar_trunk_tex + binary: assets/obj_w_cedar_trunk_tex.bin + header: assets/obj_w_cedar_trunk_tex.inc + header_type: raw + + - symbol: obj_w_cedar4_v + binary: assets/obj_w_cedar4_v.bin + header: assets/obj_w_cedar4_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_cedar5_v + binary: assets/obj_w_cedar5_v.bin + header: assets/obj_w_cedar5_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_cstump2_v + binary: assets/obj_w_cstump2_v.bin + header: assets/obj_w_cstump2_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_cstump3_v + binary: assets/obj_w_cstump3_v.bin + header: assets/obj_w_cstump3_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_cedar_stump_tex + binary: assets/obj_w_cedar_stump_tex.bin + header: assets/obj_w_cedar_stump_tex.inc + header_type: raw + + - symbol: obj_w_cstump4_v + binary: assets/obj_w_cstump4_v.bin + header: assets/obj_w_cstump4_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_cstump5_v + binary: assets/obj_w_cstump5_v.bin + header: assets/obj_w_cstump5_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_fence_tex + binary: assets/obj_w_fence_tex.bin + header: assets/obj_w_fence_tex.inc + header_type: raw + + - symbol: obj_w_fenceL_v + binary: assets/obj_w_fenceL_v.bin + header: assets/obj_w_fenceL_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_fenceS_v + binary: assets/obj_w_fenceS_v.bin + header: assets/obj_w_fenceS_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_honeycomb_pal + binary: assets/obj_w_honeycomb_pal.bin + header: assets/obj_w_honeycomb_pal.inc + header_type: none + custom_type: pal16 + + - symbol: obj_w_honeycomb_tex + binary: assets/obj_w_honeycomb_tex.bin + header: assets/obj_w_honeycomb_tex.inc + header_type: raw + + - symbol: obj_w_honeycomb_v + binary: assets/obj_w_honeycomb_v.bin + header: assets/obj_w_honeycomb_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_melody_pal!.data:0x115a60 + binary: assets/obj_w_melody/obj_melody_pal.bin + header: assets/obj_w_melody/obj_melody_pal.inc + header_type: none + custom_type: pal16 + + - symbol: obj_w_melody_tex + binary: assets/obj_w_melody_tex.bin + header: assets/obj_w_melody_tex.inc + header_type: raw + + - symbol: obj_w_melody_v + binary: assets/obj_w_melody_v.bin + header: assets/obj_w_melody_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_notice_pal!.data:0x116360 + binary: assets/obj_w_notice/obj_notice_pal.bin + header: assets/obj_w_notice/obj_notice_pal.inc + header_type: none + custom_type: pal16 + + - symbol: obj_w_notice_tex + binary: assets/obj_w_notice_tex.bin + header: assets/obj_w_notice_tex.inc + header_type: raw + + - symbol: obj_w_notice_v + binary: assets/obj_w_notice_v.bin + header: assets/obj_w_notice_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_s_palm_baby_tex + binary: assets/obj_s_palm_baby_tex.bin + header: assets/obj_s_palm_baby_tex.inc + header_type: raw + + - symbol: obj_w_palm1_v + binary: assets/obj_w_palm1_v.bin + header: assets/obj_w_palm1_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_palm_dead_tex + binary: assets/obj_w_palm_dead_tex.bin + header: assets/obj_w_palm_dead_tex.inc + header_type: raw + + - symbol: obj_w_palm1_dead_v + binary: assets/obj_w_palm1_dead_v.bin + header: assets/obj_w_palm1_dead_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_palm_young_tex!.data:0x116fe0 + binary: assets/obj_w_palm2/obj_w_palm_young_tex.bin + header: assets/obj_w_palm2/obj_w_palm_young_tex.inc + header_type: raw + + - symbol: obj_w_palm2_v + binary: assets/obj_w_palm2_v.bin + header: assets/obj_w_palm2_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_palm_leaf_tex!.data:0x1178a0 + binary: assets/obj_w_palm3/obj_w_palm_leaf_tex.bin + header: assets/obj_w_palm3/obj_w_palm_leaf_tex.inc + header_type: raw + + - symbol: obj_w_palm_young_tex!.data:0x1180a0 + binary: assets/obj_w_palm3/obj_w_palm_young_tex.bin + header: assets/obj_w_palm3/obj_w_palm_young_tex.inc + header_type: raw + + - symbol: obj_w_palm3_v + binary: assets/obj_w_palm3_v.bin + header: assets/obj_w_palm3_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_palm_leaf_tex!.data:0x118aa0 + binary: assets/obj_w_palm4/obj_w_palm_leaf_tex.bin + header: assets/obj_w_palm4/obj_w_palm_leaf_tex.inc + header_type: raw + + - symbol: obj_w_palm_trunk_tex!.data:0x1192a0 + binary: assets/obj_w_palm4/obj_w_palm_trunk_tex.bin + header: assets/obj_w_palm4/obj_w_palm_trunk_tex.inc + header_type: raw + + - symbol: obj_w_palm4_v + binary: assets/obj_w_palm4_v.bin + header: assets/obj_w_palm4_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_palm_leaf_tex!.data:0x119dc0 + binary: assets/obj_w_palm5/obj_w_palm_leaf_tex.bin + header: assets/obj_w_palm5/obj_w_palm_leaf_tex.inc + header_type: raw + + - symbol: obj_w_palm_trunk_tex!.data:0x11a5c0 + binary: assets/obj_w_palm5/obj_w_palm_trunk_tex.bin + header: assets/obj_w_palm5/obj_w_palm_trunk_tex.inc + header_type: raw + + - symbol: obj_w_palm5_v + binary: assets/obj_w_palm5_v.bin + header: assets/obj_w_palm5_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_palm5_coco_v + binary: assets/obj_w_palm5_coco_v.bin + header: assets/obj_w_palm5_coco_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_palm_young_tex!.data:0x11b2a0 + binary: assets/obj_w_pstump2/obj_w_palm_young_tex.bin + header: assets/obj_w_pstump2/obj_w_palm_young_tex.inc + header_type: raw + + - symbol: obj_w_pstump2_v + binary: assets/obj_w_pstump2_v.bin + header: assets/obj_w_pstump2_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_palm_young_tex!.data:0x11bb60 + binary: assets/obj_w_pstump3/obj_w_palm_young_tex.bin + header: assets/obj_w_pstump3/obj_w_palm_young_tex.inc + header_type: raw + + - symbol: obj_w_pstump3_v + binary: assets/obj_w_pstump3_v.bin + header: assets/obj_w_pstump3_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_palm_stump_tex!.data:0x11c420 + binary: assets/obj_w_pstump4/obj_w_palm_stump_tex.bin + header: assets/obj_w_pstump4/obj_w_palm_stump_tex.inc + header_type: raw + + - symbol: obj_w_pstump4_v + binary: assets/obj_w_pstump4_v.bin + header: assets/obj_w_pstump4_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_palm_stump_tex!.data:0x11c8e0 + binary: assets/obj_w_pstump5/obj_w_palm_stump_tex.bin + header: assets/obj_w_pstump5/obj_w_palm_stump_tex.inc + header_type: raw + + - symbol: obj_w_pstump5_v + binary: assets/obj_w_pstump5_v.bin + header: assets/obj_w_pstump5_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_sightmap_pal!.data:0x11cda0 + binary: assets/obj_w_sightmap/obj_sightmap_pal.bin + header: assets/obj_w_sightmap/obj_sightmap_pal.inc + header_type: none + custom_type: pal16 + + - symbol: obj_w_sightmap_tex + binary: assets/obj_w_sightmap_tex.bin + header: assets/obj_w_sightmap_tex.inc + header_type: raw + + - symbol: obj_w_sightmap_v + binary: assets/obj_w_sightmap_v.bin + header: assets/obj_w_sightmap_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_stone_pal + binary: assets/obj_w_stone_pal.bin + header: assets/obj_w_stone_pal.inc + header_type: none + custom_type: pal16 + + - symbol: obj_w_stone_tex + binary: assets/obj_w_stone_tex.bin + header: assets/obj_w_stone_tex.inc + header_type: raw + + - symbol: obj_w_stoneA_v + binary: assets/obj_w_stoneA_v.bin + header: assets/obj_w_stoneA_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_stoneB_v + binary: assets/obj_w_stoneB_v.bin + header: assets/obj_w_stoneB_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_stoneC_v + binary: assets/obj_w_stoneC_v.bin + header: assets/obj_w_stoneC_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_stoneD_v + binary: assets/obj_w_stoneD_v.bin + header: assets/obj_w_stoneD_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_stoneE_v + binary: assets/obj_w_stoneE_v.bin + header: assets/obj_w_stoneE_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_tree_baby_tex + binary: assets/obj_w_tree_baby_tex.bin + header: assets/obj_w_tree_baby_tex.inc + header_type: raw + + - symbol: obj_w_tree1_v + binary: assets/obj_w_tree1_v.bin + header: assets/obj_w_tree1_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_tree_dead_tex + binary: assets/obj_w_tree_dead_tex.bin + header: assets/obj_w_tree_dead_tex.inc + header_type: raw + + - symbol: obj_w_tree1_dead_v + binary: assets/obj_w_tree1_dead_v.bin + header: assets/obj_w_tree1_dead_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_tree_young_tex + binary: assets/obj_w_tree_young_tex.bin + header: assets/obj_w_tree_young_tex.inc + header_type: raw + + - symbol: obj_w_tree2_v + binary: assets/obj_w_tree2_v.bin + header: assets/obj_w_tree2_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_tree_leaf_tex + binary: assets/obj_w_tree_leaf_tex.bin + header: assets/obj_w_tree_leaf_tex.inc + header_type: raw + + - symbol: obj_w_tree3_v + binary: assets/obj_w_tree3_v.bin + header: assets/obj_w_tree3_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_tree_trunk_tex + binary: assets/obj_w_tree_trunk_tex.bin + header: assets/obj_w_tree_trunk_tex.inc + header_type: raw + + - symbol: obj_w_tree4_v + binary: assets/obj_w_tree4_v.bin + header: assets/obj_w_tree4_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_w_tree5_v + binary: assets/obj_w_tree5_v.bin + header: assets/obj_w_tree5_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_cedar_light_pal!.data:0x120020 + binary: assets/obj_x_cedar5/obj_cedar_light_pal.bin + header: assets/obj_x_cedar5/obj_cedar_light_pal.inc + header_type: none + custom_type: pal16 + + - symbol: obj_x_cedar_light_tex + binary: assets/obj_x_cedar_light_tex.bin + header: assets/obj_x_cedar_light_tex.inc + header_type: raw + + - symbol: obj_x_cedar5_light_v + binary: assets/obj_x_cedar5_light_v.bin + header: assets/obj_x_cedar5_light_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_x_honeycomb_pal + binary: assets/obj_x_honeycomb_pal.bin + header: assets/obj_x_honeycomb_pal.inc + header_type: none + custom_type: pal16 + + - symbol: obj_x_honeycomb_tex + binary: assets/obj_x_honeycomb_tex.bin + header: assets/obj_x_honeycomb_tex.inc + header_type: raw + + - symbol: obj_x_honeycomb_v + binary: assets/obj_x_honeycomb_v.bin + header: assets/obj_x_honeycomb_v.inc + header_type: none + custom_type: vtx + + - symbol: obj_x_tree_light_tex + binary: assets/obj_x_tree_light_tex.bin + header: assets/obj_x_tree_light_tex.inc + header_type: raw + + - symbol: obj_x_tree5_light_v + binary: assets/obj_x_tree5_light_v.bin + header: assets/obj_x_tree5_light_v.inc + header_type: none + custom_type: vtx \ No newline at end of file diff --git a/configure.py b/configure.py index 8657c353..1cffc033 100644 --- a/configure.py +++ b/configure.py @@ -2698,79 +2698,79 @@ config.libs = [ 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"), - Object(NonMatching, "data/model/obj_s_stoneB.c"), - Object(NonMatching, "data/model/obj_stoneB_shadow.c"), - Object(NonMatching, "data/model/obj_s_stoneC.c"), - Object(NonMatching, "data/model/obj_stoneC_shadow.c"), - Object(NonMatching, "data/model/obj_s_stoneD.c"), - Object(NonMatching, "data/model/obj_stoneD_shadow.c"), - Object(NonMatching, "data/model/obj_s_stoneE.c"), - Object(NonMatching, "data/model/obj_stoneE_shadow.c"), - Object(NonMatching, "data/model/obj_s_stump2.c"), - Object(NonMatching, "data/model/obj_s_stump3.c"), - Object(NonMatching, "data/model/obj_stump3_shadow.c"), - Object(NonMatching, "data/model/obj_s_stump4.c"), - Object(NonMatching, "data/model/obj_stump4_shadow.c"), - Object(NonMatching, "data/model/obj_s_stump5.c"), - Object(NonMatching, "data/model/obj_stump5_shadow.c"), - Object(NonMatching, "data/model/obj_item_tane.c"), - Object(NonMatching, "data/model/obj_s_tree1.c"), - Object(NonMatching, "data/model/obj_s_tree_dead.c"), - Object(NonMatching, "data/model/obj_s_tree2.c"), - Object(NonMatching, "data/model/obj_s_tree3.c"), - Object(NonMatching, "data/model/obj_tree_shadow.c"), - Object(NonMatching, "data/model/obj_s_tree4.c"), - Object(NonMatching, "data/model/obj_tree4_shadow.c"), - Object(NonMatching, "data/model/obj_s_tree5.c"), - Object(NonMatching, "data/model/obj_s_tree5_apple.c"), - Object(NonMatching, "data/model/obj_tree5_shadow.c"), - Object(NonMatching, "data/model/mFm_obj_palm_01.c"), - Object(NonMatching, "data/model/mFm_obj_tree_01.c"), - Object(NonMatching, "data/model/mFm_obj_tree_01_dol.c"), - Object(NonMatching, "data/model/obj_w_cedar1.c"), - Object(NonMatching, "data/model/obj_w_cedar1_dead.c"), - Object(NonMatching, "data/model/obj_w_cedar2.c"), - Object(NonMatching, "data/model/obj_w_cedar3.c"), - Object(NonMatching, "data/model/obj_w_cedar4.c"), - Object(NonMatching, "data/model/obj_w_cedar5.c"), - Object(NonMatching, "data/model/obj_w_cstump2.c"), - Object(NonMatching, "data/model/obj_w_cstump3.c"), - Object(NonMatching, "data/model/obj_w_cstump4.c"), - Object(NonMatching, "data/model/obj_w_cstump5.c"), - Object(NonMatching, "data/model/obj_w_fenceL.c"), - Object(NonMatching, "data/model/obj_w_fenceS.c"), - Object(NonMatching, "data/model/obj_w_honeycomb.c"), - Object(NonMatching, "data/model/obj_w_melody.c"), - Object(NonMatching, "data/model/obj_w_notice.c"), - Object(NonMatching, "data/model/obj_s_palm1.c"), - Object(NonMatching, "data/model/obj_w_palm1_dead.c"), - Object(NonMatching, "data/model/obj_w_palm2.c"), - Object(NonMatching, "data/model/obj_w_palm3.c"), - Object(NonMatching, "data/model/obj_w_palm4.c"), - Object(NonMatching, "data/model/obj_w_palm5.c"), - Object(NonMatching, "data/model/obj_w_palm5_coco.c"), - Object(NonMatching, "data/model/obj_w_pstump2.c"), - Object(NonMatching, "data/model/obj_w_pstump3.c"), - Object(NonMatching, "data/model/obj_w_pstump4.c"), - Object(NonMatching, "data/model/obj_w_pstump5.c"), - Object(NonMatching, "data/model/obj_w_sightmap.c"), - Object(NonMatching, "data/model/obj_w_stoneA.c"), - Object(NonMatching, "data/model/obj_w_stoneB.c"), - Object(NonMatching, "data/model/obj_w_stoneC.c"), - Object(NonMatching, "data/model/obj_w_stoneD.c"), - Object(NonMatching, "data/model/obj_w_stoneE.c"), - Object(NonMatching, "data/model/obj_w_tree1.c"), - Object(NonMatching, "data/model/obj_w_tree1_dead.c"), - Object(NonMatching, "data/model/obj_w_tree2.c"), - Object(NonMatching, "data/model/obj_w_tree3.c"), - Object(NonMatching, "data/model/obj_w_tree4.c"), - Object(NonMatching, "data/model/obj_w_tree5.c"), - Object(NonMatching, "data/model/obj_x_cedar5.c"), - Object(NonMatching, "data/model/obj_x_honeycomb.c"), - Object(NonMatching, "data/model/obj_x_tree5.c"), + Object(Matching, "data/model/obj_sightmap_shadow.c"), + Object(Matching, "data/model/obj_s_stoneA.c"), + Object(Matching, "data/model/obj_stoneA_shadow.c"), + Object(Matching, "data/model/obj_s_stoneB.c"), + Object(Matching, "data/model/obj_stoneB_shadow.c"), + Object(Matching, "data/model/obj_s_stoneC.c"), + Object(Matching, "data/model/obj_stoneC_shadow.c"), + Object(Matching, "data/model/obj_s_stoneD.c"), + Object(Matching, "data/model/obj_stoneD_shadow.c"), + Object(Matching, "data/model/obj_s_stoneE.c"), + Object(Matching, "data/model/obj_stoneE_shadow.c"), + Object(Matching, "data/model/obj_s_stump2.c"), + Object(Matching, "data/model/obj_s_stump3.c"), + Object(Matching, "data/model/obj_stump3_shadow.c"), + Object(Matching, "data/model/obj_s_stump4.c"), + Object(Matching, "data/model/obj_stump4_shadow.c"), + Object(Matching, "data/model/obj_s_stump5.c"), + Object(Matching, "data/model/obj_stump5_shadow.c"), + Object(Matching, "data/model/obj_item_tane.c"), + Object(Matching, "data/model/obj_s_tree1.c"), + Object(Matching, "data/model/obj_s_tree_dead.c"), + Object(Matching, "data/model/obj_s_tree2.c"), + Object(Matching, "data/model/obj_s_tree3.c"), + Object(Matching, "data/model/obj_tree_shadow.c"), + Object(Matching, "data/model/obj_s_tree4.c"), + Object(Matching, "data/model/obj_tree4_shadow.c"), + Object(Matching, "data/model/obj_s_tree5.c"), + Object(Matching, "data/model/obj_s_tree5_apple.c"), + Object(Matching, "data/model/obj_tree5_shadow.c"), + Object(Matching, "data/model/mFm_obj_palm_01.c"), + Object(Matching, "data/model/mFm_obj_tree_01.c"), + Object(Matching, "data/model/mFm_obj_tree_01_dol.c"), + Object(Matching, "data/model/obj_w_cedar1.c"), + Object(Matching, "data/model/obj_w_cedar1_dead.c"), + Object(Matching, "data/model/obj_w_cedar2.c"), + Object(Matching, "data/model/obj_w_cedar3.c"), + Object(Matching, "data/model/obj_w_cedar4.c"), + Object(Matching, "data/model/obj_w_cedar5.c"), + Object(Matching, "data/model/obj_w_cstump2.c"), + Object(Matching, "data/model/obj_w_cstump3.c"), + Object(Matching, "data/model/obj_w_cstump4.c"), + Object(Matching, "data/model/obj_w_cstump5.c"), + Object(Matching, "data/model/obj_w_fenceL.c"), + Object(Matching, "data/model/obj_w_fenceS.c"), + Object(Matching, "data/model/obj_w_honeycomb.c"), + Object(Matching, "data/model/obj_w_melody.c"), + Object(Matching, "data/model/obj_w_notice.c"), + Object(Matching, "data/model/obj_s_palm1.c"), + Object(Matching, "data/model/obj_w_palm1_dead.c"), + Object(Matching, "data/model/obj_w_palm2.c"), + Object(Matching, "data/model/obj_w_palm3.c"), + Object(Matching, "data/model/obj_w_palm4.c"), + Object(Matching, "data/model/obj_w_palm5.c"), + Object(Matching, "data/model/obj_w_palm5_coco.c"), + Object(Matching, "data/model/obj_w_pstump2.c"), + Object(Matching, "data/model/obj_w_pstump3.c"), + Object(Matching, "data/model/obj_w_pstump4.c"), + Object(Matching, "data/model/obj_w_pstump5.c"), + Object(Matching, "data/model/obj_w_sightmap.c"), + Object(Matching, "data/model/obj_w_stoneA.c"), + Object(Matching, "data/model/obj_w_stoneB.c"), + Object(Matching, "data/model/obj_w_stoneC.c"), + Object(Matching, "data/model/obj_w_stoneD.c"), + Object(Matching, "data/model/obj_w_stoneE.c"), + Object(Matching, "data/model/obj_w_tree1.c"), + Object(Matching, "data/model/obj_w_tree1_dead.c"), + Object(Matching, "data/model/obj_w_tree2.c"), + Object(Matching, "data/model/obj_w_tree3.c"), + Object(Matching, "data/model/obj_w_tree4.c"), + Object(Matching, "data/model/obj_w_tree5.c"), + Object(Matching, "data/model/obj_x_cedar5.c"), + Object(Matching, "data/model/obj_x_honeycomb.c"), + Object(Matching, "data/model/obj_x_tree5.c"), Object(Matching, "data/model/boy_model.c"), Object(Matching, "data/model/player_anim.c"), Object(Matching, "data/model/player_tool.c"), diff --git a/src/data/model/mFm_obj_palm_01.c b/src/data/model/mFm_obj_palm_01.c new file mode 100644 index 00000000..97c9da2c --- /dev/null +++ b/src/data/model/mFm_obj_palm_01.c @@ -0,0 +1,8 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 mFM_obj_palm_01_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/mFM_obj_palm_01_pal.inc" +}; diff --git a/src/data/model/mFm_obj_tree_01.c b/src/data/model/mFm_obj_tree_01.c new file mode 100644 index 00000000..542f8a9a --- /dev/null +++ b/src/data/model/mFm_obj_tree_01.c @@ -0,0 +1,8 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 mFM_obj_tree_01_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/mFM_obj_tree_01_pal.inc" +}; diff --git a/src/data/model/mFm_obj_tree_01_dol.c b/src/data/model/mFm_obj_tree_01_dol.c new file mode 100644 index 00000000..35dc6c85 --- /dev/null +++ b/src/data/model/mFm_obj_tree_01_dol.c @@ -0,0 +1,8 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 mFM_obj_tree_01_pal_dol[] = { +#include "assets/mFM_obj_tree_01_pal_dol.inc" +}; diff --git a/src/data/model/obj_item_tane.c b/src/data/model/obj_item_tane.c new file mode 100644 index 00000000..5ce972f5 --- /dev/null +++ b/src/data/model/obj_item_tane.c @@ -0,0 +1,30 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u16 obj_item_tane_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_item_tane/obj_item_tane_pal.inc" +}; + +static u8 obj_item_tane_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_item_tane/obj_item_tane_tex.inc" +}; + +static Vtx obj_item_tane_v[] = { +#include "assets/obj_item_tane/obj_item_tane_v.inc" +}; + +Gfx obj_taneT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPLoadTLUT_Dolphin(15, 16, 1, obj_item_tane_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, obj_item_tane_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_MIRROR, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_taneT_gfx_model[] = { + gsSPVertex(obj_item_tane_v, 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_palm1.c b/src/data/model/obj_s_palm1.c new file mode 100644 index 00000000..af8daaf6 --- /dev/null +++ b/src/data/model/obj_s_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_baby_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_palm_baby_tex.inc" +}; + +Vtx obj_w_palm1_v[] = { +#include "assets/obj_w_palm1_v.inc" +}; + +Gfx obj_s_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_s_palm_baby_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_palm1T_gfx_model[] = { + gsSPVertex(obj_w_palm1_v, 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 3, 0, 2, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_stoneA.c b/src/data/model/obj_s_stoneA.c new file mode 100644 index 00000000..461e1ef3 --- /dev/null +++ b/src/data/model/obj_s_stoneA.c @@ -0,0 +1,32 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 obj_s_stoneA_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_stoneA_pal.inc" +}; + +u8 obj_s_stoneA_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_stoneA_tex.inc" +}; + +Vtx obj_s_stoneA_v[] = { +#include "assets/obj_s_stoneA_v.inc" +}; + +Gfx obj_s_stoneA_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPLoadTLUT_Dolphin(15, 16, 1, obj_s_stoneA_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, obj_s_stoneA_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_REPEAT, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_stoneA_gfx_model[] = { + gsSPVertex(obj_s_stoneA_v, 10, 0), + gsSPNTrianglesInit_5b(10, 0, 1, 2, 1, 3, 2, 4, 1, 0), + gsSPNTriangles_5b(4, 5, 1, 1, 6, 3, 6, 7, 3, 1, 5, 6), + gsSPNTriangles_5b(2, 8, 9, 2, 3, 8, 3, 7, 8, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_stoneB.c b/src/data/model/obj_s_stoneB.c new file mode 100644 index 00000000..27c409fe --- /dev/null +++ b/src/data/model/obj_s_stoneB.c @@ -0,0 +1,17 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_s_stoneB_v[] = { +#include "assets/obj_s_stoneB_v.inc" +}; + +Gfx obj_s_stoneB_gfx_model[] = { + gsSPVertex(obj_s_stoneB_v, 12, 0), + gsSPNTrianglesInit_5b(12, 0, 1, 2, 1, 3, 2, 3, 4, 2), + gsSPNTriangles_5b(1, 5, 3, 5, 6, 3, 1, 7, 5, 3, 8, 4), + gsSPNTriangles_5b(8, 9, 4, 3, 6, 8, 0, 10, 1, 10, 7, 1), + gsSPNTriangles_5b(0, 11, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_stoneC.c b/src/data/model/obj_s_stoneC.c new file mode 100644 index 00000000..82571d90 --- /dev/null +++ b/src/data/model/obj_s_stoneC.c @@ -0,0 +1,17 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_s_stoneC_v[] = { +#include "assets/obj_s_stoneC_v.inc" +}; + +Gfx obj_s_stoneC_gfx_model[] = { + gsSPVertex(obj_s_stoneC_v, 12, 0), + gsSPNTrianglesInit_5b(12, 0, 1, 2, 3, 4, 0, 3, 0, 2), + gsSPNTriangles_5b(5, 6, 7, 8, 9, 5, 8, 5, 7, 10, 4, 3), + gsSPNTriangles_5b(7, 6, 10, 7, 10, 3, 11, 8, 7, 11, 7, 3), + gsSPNTriangles_5b(11, 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_stoneD.c b/src/data/model/obj_s_stoneD.c new file mode 100644 index 00000000..61de8d7e --- /dev/null +++ b/src/data/model/obj_s_stoneD.c @@ -0,0 +1,18 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_s_stoneD_v[] = { +#include "assets/obj_s_stoneD_v.inc" +}; + +Gfx obj_s_stoneD_gfx_model[] = { + gsSPVertex(obj_s_stoneD_v, 15, 0), + gsSPNTrianglesInit_5b(17, 0, 1, 2, 0, 3, 1, 4, 5, 6), + gsSPNTriangles_5b(5, 7, 6, 3, 8, 1, 8, 9, 1, 3, 10, 8), + gsSPNTriangles_5b(5, 10, 7, 5, 11, 10, 4, 12, 5, 12, 11, 5), + gsSPNTriangles_5b(1, 13, 2, 1, 9, 13, 0, 10, 3, 0, 14, 10), + gsSPNTriangles_5b(7, 14, 6, 7, 10, 14, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_stoneE.c b/src/data/model/obj_s_stoneE.c new file mode 100644 index 00000000..4626fd24 --- /dev/null +++ b/src/data/model/obj_s_stoneE.c @@ -0,0 +1,18 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_s_stoneE_v[] = { +#include "assets/obj_s_stoneE_v.inc" +}; + +Gfx obj_s_stoneE_gfx_model[] = { + gsSPVertex(obj_s_stoneE_v, 15, 0), + gsSPNTrianglesInit_5b(17, 0, 1, 2, 0, 3, 1, 4, 3, 5), + gsSPNTriangles_5b(4, 1, 3, 3, 6, 5, 3, 0, 6, 4, 7, 1), + gsSPNTriangles_5b(7, 2, 1, 8, 6, 9, 6, 0, 9, 10, 11, 12), + gsSPNTriangles_5b(10, 13, 11, 9, 14, 10, 9, 0, 14, 14, 13, 10), + gsSPNTriangles_5b(8, 9, 12, 9, 10, 12, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_stump2.c b/src/data/model/obj_s_stump2.c new file mode 100644 index 00000000..5adae2f6 --- /dev/null +++ b/src/data/model/obj_s_stump2.c @@ -0,0 +1,31 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_s_stump2_v[] = { +#include "assets/obj_s_stump2_v.inc" +}; + +extern u8 obj_s_tree_young_tex[]; + +Gfx obj_stump2T_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_tree_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_gold_stump2T_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_tree_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_stump2T_gfx_model[] = { + gsSPVertex(obj_s_stump2_v, 7, 0), + gsSPNTrianglesInit_5b(7, 0, 1, 2, 3, 4, 5, 4, 6, 5), + gsSPNTriangles_5b(0, 3, 1, 3, 5, 1, 1, 6, 2, 1, 5, 6), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_stump3.c b/src/data/model/obj_s_stump3.c new file mode 100644 index 00000000..468e9663 --- /dev/null +++ b/src/data/model/obj_s_stump3.c @@ -0,0 +1,31 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_s_stump3_v[] = { +#include "assets/obj_s_stump3_v.inc" +}; + +extern u8 obj_s_tree_young_tex[]; + +Gfx obj_stump3T_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_tree_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_gold_stump3T_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_tree_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_stump3T_gfx_model[] = { + gsSPVertex(obj_s_stump3_v, 7, 0), + gsSPNTrianglesInit_5b(7, 0, 1, 2, 2, 3, 0, 3, 4, 0), + gsSPNTriangles_5b(0, 5, 1, 0, 4, 5, 3, 6, 4, 4, 6, 5), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_stump4.c b/src/data/model/obj_s_stump4.c new file mode 100644 index 00000000..1556c48e --- /dev/null +++ b/src/data/model/obj_s_stump4.c @@ -0,0 +1,35 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + + +u8 obj_s_tree_stump_tex[] ATTRIBUTE_ALIGN(32)= { +#include "assets/obj_s_tree_stump_tex.inc" +}; + +Vtx obj_s_stump4_v[] = { +#include "assets/obj_s_stump4_v.inc" +}; + +Gfx obj_stump4T_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_tree_stump_tex), +gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_CLAMP, GX_CLAMP, 0, 0), +gsSPEndDisplayList() +}; + +Gfx obj_gold_stump4T_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_tree_stump_tex), +gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), +gsSPEndDisplayList() +}; + +Gfx obj_stump4T_gfx_model[] = { +gsSPVertex(obj_s_stump4_v, 7, 0), +gsSPNTrianglesInit_5b(7, 0, 1, 2, 1, 3, 2, 1, 4, 3), +gsSPNTriangles_5b(0, 5, 1, 5, 4, 1, 6, 3, 4, 5, 6, 4), +gsSPEndDisplayList() +}; + diff --git a/src/data/model/obj_s_stump5.c b/src/data/model/obj_s_stump5.c new file mode 100644 index 00000000..e76323e3 --- /dev/null +++ b/src/data/model/obj_s_stump5.c @@ -0,0 +1,31 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_s_stump5_v[] = { +#include "assets/obj_s_stump5_v.inc" +}; + +extern u8 obj_s_tree_stump_tex[]; + +Gfx obj_stump5T_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_tree_stump_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_gold_stump5T_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_tree_stump_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_stump5T_gfx_model[] = { + gsSPVertex(obj_s_stump5_v, 7, 0), + gsSPNTrianglesInit_5b(7, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(0, 5, 1, 5, 4, 1, 6, 3, 4, 5, 6, 4), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_tree1.c b/src/data/model/obj_s_tree1.c new file mode 100644 index 00000000..95bc3be3 --- /dev/null +++ b/src/data/model/obj_s_tree1.c @@ -0,0 +1,32 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_s_tree_baby_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_tree_baby_tex.inc" +}; + +Vtx obj_s_tree1_v[] = { +#include "assets/obj_s_tree1_v.inc" +}; + +Gfx obj_s_tree1T_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 24, obj_s_tree_baby_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_gold_tree1T_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 24, obj_s_tree_baby_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_tree1T_gfx_model[] = { + gsSPVertex(obj_s_tree1_v, 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 1, 3, 2, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_tree2.c b/src/data/model/obj_s_tree2.c new file mode 100644 index 00000000..4cd05903 --- /dev/null +++ b/src/data/model/obj_s_tree2.c @@ -0,0 +1,28 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + + +u8 obj_s_tree_young_tex[] ATTRIBUTE_ALIGN(32)= { +#include "assets/obj_s_tree_young_tex.inc" +}; + +Vtx obj_s_tree2_v[] = { +#include "assets/obj_s_tree2_v.inc" +}; + +Gfx obj_s_gold_tree2T_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_tree_young_tex), +gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), +gsSPEndDisplayList() +}; + +Gfx obj_s_tree2T_gfx_model[] = { +gsSPVertex(obj_s_tree2_v, 7, 0), +gsSPNTrianglesInit_5b(7, 0, 1, 2, 2, 3, 0, 3, 4, 0), +gsSPNTriangles_5b(0, 5, 1, 0, 4, 5, 3, 6, 4, 4, 6, 5), +gsSPEndDisplayList() +}; + diff --git a/src/data/model/obj_s_tree3.c b/src/data/model/obj_s_tree3.c new file mode 100644 index 00000000..e4c33624 --- /dev/null +++ b/src/data/model/obj_s_tree3.c @@ -0,0 +1,49 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_s_tree3_leaf_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_tree3_leaf_tex.inc" +}; + +Vtx obj_s_tree3_v[] = { +#include "assets/obj_s_tree3_v.inc" +}; + +extern u8 obj_s_tree_young_tex[]; + +Gfx obj_s_gold_tree3_leafT_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_tree3_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_tree3_leafT_gfx_model[] = { + gsSPVertex(obj_s_tree3_v, 5, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 1, 3, 2, 0, 2, 4), + gsSPNTriangles_5b(3, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_tree3_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_tree_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_gold_tree3_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_tree_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_tree3_trunkT_gfx_model[] = { + gsSPVertex(&obj_s_tree3_v[5], 7, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 0, 3, 1, 2, 1, 4), + gsSPNTriangles_5b(1, 5, 4, 3, 6, 1, 1, 6, 5, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_tree4.c b/src/data/model/obj_s_tree4.c new file mode 100644 index 00000000..10184e56 --- /dev/null +++ b/src/data/model/obj_s_tree4.c @@ -0,0 +1,43 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_s_tree4_trunk_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_tree4_trunk_tex.inc" +}; + +Vtx obj_s_tree4_v[] = { +#include "assets/obj_s_tree4_v.inc" +}; + +extern u8 obj_s_tree3_leaf_tex[]; + +Gfx obj_s_gold_tree4_leafT_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_tree3_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_tree4_leafT_gfx_model[] = { + gsSPVertex(obj_s_tree4_v, 10, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 0, 2, 4), + gsSPNTriangles_5b(3, 4, 2, 5, 6, 7, 8, 5, 7, 9, 7, 6), + gsSPNTriangles_5b(9, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_gold_tree4_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_tree4_trunk_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_tree4_trunkT_gfx_model[] = { + gsSPVertex(&obj_s_tree4_v[10], 7, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 1, 3, 2, 4, 2, 5), + gsSPNTriangles_5b(4, 0, 2, 5, 2, 6, 2, 3, 6, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_tree5.c b/src/data/model/obj_s_tree5.c new file mode 100644 index 00000000..abe9f3f9 --- /dev/null +++ b/src/data/model/obj_s_tree5.c @@ -0,0 +1,54 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_s_tree5_v[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_tree5_v.inc" +}; + +extern u8 obj_s_tree3_leaf_tex[], obj_s_tree4_trunk_tex[]; + +Gfx obj_s_tree5_leafT_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_tree3_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_gold_tree5_leafT_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_tree3_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_tree5_leafT_gfx_model[] = { + gsSPVertex(obj_s_tree5_v, 15, 0), + gsSPNTrianglesInit_5b(12, 0, 1, 2, 3, 2, 1, 4, 0, 2), + gsSPNTriangles_5b(3, 4, 2, 5, 6, 7, 8, 5, 7, 9, 8, 7), + gsSPNTriangles_5b(9, 7, 6, 10, 11, 12, 10, 13, 11, 13, 14, 11), + gsSPNTriangles_5b(14, 12, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_tree5_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_tree4_trunk_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_gold_tree5_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_tree4_trunk_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_tree5_trunkT_gfx_model[] = { + gsSPVertex(&obj_s_tree5_v[15], 7, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 1, 3, 2, 4, 2, 5), + gsSPNTriangles_5b(4, 0, 2, 5, 2, 6, 2, 3, 6, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_tree5_apple.c b/src/data/model/obj_s_tree5_apple.c new file mode 100644 index 00000000..f0caf58d --- /dev/null +++ b/src/data/model/obj_s_tree5_apple.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_tree5_apple_v[] = { +#include "assets/obj_s_tree5_apple_v.inc" +}; + +Gfx obj_s_tree5_apple_appleT_gfx_model[] = { + gsSPVertex(obj_s_tree5_apple_v, 12, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 8, 9, 10, 8, 10, 11, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_s_tree_dead.c b/src/data/model/obj_s_tree_dead.c new file mode 100644 index 00000000..5234def9 --- /dev/null +++ b/src/data/model/obj_s_tree_dead.c @@ -0,0 +1,32 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_s_tree_dead_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_s_tree_dead_tex.inc" +}; + +Vtx obj_s_tree1_dead_v[] = { +#include "assets/obj_s_tree1_dead_v.inc" +}; + +Gfx obj_s_tree1_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_tree_dead_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_gold_tree1_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_tree_dead_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_s_tree1_deadT_gfx_model[] = { + gsSPVertex(obj_s_tree1_dead_v, 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 1, 3, 2, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_sightmap_shadow.c b/src/data/model/obj_sightmap_shadow.c new file mode 100644 index 00000000..7fdc6592 --- /dev/null +++ b/src/data/model/obj_sightmap_shadow.c @@ -0,0 +1,24 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_sightmap_shadow_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_sightmap_shadow_tex.inc" +}; + +Vtx obj_sightmap_shadow_v[] = { +#include "assets/obj_sightmap_shadow_v.inc" +}; + +Gfx obj_sightmap_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_sightmap_shadow_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_sightmap_shadowT_gfx_model[] = { + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_stoneA_shadow.c b/src/data/model/obj_stoneA_shadow.c new file mode 100644 index 00000000..e4282f08 --- /dev/null +++ b/src/data/model/obj_stoneA_shadow.c @@ -0,0 +1,28 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + + +u8 obj_stone_shadow_tex[] ATTRIBUTE_ALIGN(32)= { +#include "assets/obj_stone_shadow_tex.inc" +}; + +Vtx obj_stoneA_shadow_v[] = { +#include "assets/obj_stoneA_shadow_v.inc" +}; + +Gfx obj_stoneA_shadowT_mat_model[] = { +gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), +gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 16, 16, obj_stone_shadow_tex), +gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), +gsSPEndDisplayList() +}; + +Gfx obj_stoneA_shadowT_gfx_model[] = { +gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 3, 2, 4), +gsSPNTriangles_5b(3, 4, 5, 5, 4, 6, 5, 6, 7, 8, 9, 1), +gsSPNTriangles_5b(8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), +gsSPEndDisplayList() +}; + diff --git a/src/data/model/obj_stoneB_shadow.c b/src/data/model/obj_stoneB_shadow.c new file mode 100644 index 00000000..33cf86a0 --- /dev/null +++ b/src/data/model/obj_stoneB_shadow.c @@ -0,0 +1,17 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + + +Vtx obj_stoneB_shadow_v[] = { +#include "assets/obj_stoneB_shadow_v.inc" +}; + +Gfx obj_stoneB_shadowT_gfx_model[] = { +gsSPNTrianglesInit_5b(10, 0, 1, 2, 0, 2, 3, 4, 5, 6), +gsSPNTriangles_5b(4, 6, 7, 7, 6, 8, 7, 8, 9, 9, 8, 1), +gsSPNTriangles_5b(9, 1, 0, 10, 11, 5, 10, 5, 4, 0, 0, 0), +gsSPEndDisplayList() +}; + diff --git a/src/data/model/obj_stoneC_shadow.c b/src/data/model/obj_stoneC_shadow.c new file mode 100644 index 00000000..0a039fdc --- /dev/null +++ b/src/data/model/obj_stoneC_shadow.c @@ -0,0 +1,17 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + + +Vtx obj_stoneC_shadow_v[] = { +#include "assets/obj_stoneC_shadow_v.inc" +}; + +Gfx obj_stoneC_shadowT_gfx_model[] = { +gsSPNTrianglesInit_5b(10, 0, 1, 2, 0, 2, 3, 4, 5, 6), +gsSPNTriangles_5b(4, 6, 7, 8, 9, 5, 8, 5, 4, 3, 2, 9), +gsSPNTriangles_5b(3, 9, 8, 7, 6, 10, 7, 10, 11, 0, 0, 0), +gsSPEndDisplayList() +}; + diff --git a/src/data/model/obj_stoneD_shadow.c b/src/data/model/obj_stoneD_shadow.c new file mode 100644 index 00000000..ef810531 --- /dev/null +++ b/src/data/model/obj_stoneD_shadow.c @@ -0,0 +1,16 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + + +Vtx obj_stoneD_shadow_v[] = { +#include "assets/obj_stoneD_shadow_v.inc" +}; + +Gfx obj_stoneD_shadowT_gfx_model[] = { +gsSPNTrianglesInit_5b(6, 0, 1, 2, 0, 2, 3, 4, 5, 6), +gsSPNTriangles_5b(4, 6, 7, 3, 2, 5, 3, 5, 4, 0, 0, 0), +gsSPEndDisplayList() +}; + diff --git a/src/data/model/obj_stoneE_shadow.c b/src/data/model/obj_stoneE_shadow.c new file mode 100644 index 00000000..81356d7b --- /dev/null +++ b/src/data/model/obj_stoneE_shadow.c @@ -0,0 +1,17 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + + +Vtx obj_stoneE_shadow_v[] = { +#include "assets/obj_stoneE_shadow_v.inc" +}; + +Gfx obj_stoneE_shadowT_gfx_model[] = { +gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 4, 5, 6), +gsSPNTriangles_5b(4, 6, 7, 8, 9, 5, 8, 5, 4, 3, 2, 9), +gsSPNTriangles_5b(3, 9, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), +gsSPEndDisplayList() +}; + diff --git a/src/data/model/obj_stump3_shadow.c b/src/data/model/obj_stump3_shadow.c new file mode 100644 index 00000000..0340e7c3 --- /dev/null +++ b/src/data/model/obj_stump3_shadow.c @@ -0,0 +1,24 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_stump_shadow_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_stump_shadow_tex.inc" +}; + +Vtx obj_stump3_shadow_v[] = { +#include "assets/obj_stump3_shadow_v.inc" +}; + +Gfx obj_stump3_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_stump_shadow_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_stump3_shadowT_gfx_model[] = { + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_stump4_shadow.c b/src/data/model/obj_stump4_shadow.c new file mode 100644 index 00000000..a18d9be7 --- /dev/null +++ b/src/data/model/obj_stump4_shadow.c @@ -0,0 +1,22 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_stump4_shadow_v[] = { +#include "assets/obj_stump4_shadow_v.inc" +}; + +extern u8 obj_stump_shadow_tex[]; + +Gfx obj_stump4_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_stump_shadow_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_stump4_shadowT_gfx_model[] = { + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_stump5_shadow.c b/src/data/model/obj_stump5_shadow.c new file mode 100644 index 00000000..6751999c --- /dev/null +++ b/src/data/model/obj_stump5_shadow.c @@ -0,0 +1,22 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_stump5_shadow_v[] = { +#include "assets/obj_stump5_shadow_v.inc" +}; + +extern u8 obj_stump_shadow_tex[]; + +Gfx obj_stump5_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_stump_shadow_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_stump5_shadowT_gfx_model[] = { + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_tree4_shadow.c b/src/data/model/obj_tree4_shadow.c new file mode 100644 index 00000000..5f98e0de --- /dev/null +++ b/src/data/model/obj_tree4_shadow.c @@ -0,0 +1,22 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_tree4_shadow_v[] = { +#include "assets/obj_tree4_shadow_v.inc" +}; + +extern u8 obj_tree_shadow_tex[]; + +Gfx obj_tree4_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_tree_shadow_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_tree4_shadowT_gfx_model[] = { + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_tree5_shadow.c b/src/data/model/obj_tree5_shadow.c new file mode 100644 index 00000000..e253f0db --- /dev/null +++ b/src/data/model/obj_tree5_shadow.c @@ -0,0 +1,22 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_tree5_shadow_v[] = { +#include "assets/obj_tree5_shadow_v.inc" +}; + +extern u8 obj_tree_shadow_tex[]; + +Gfx obj_tree5_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_tree_shadow_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_tree5_shadowT_gfx_model[] = { + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_tree_shadow.c b/src/data/model/obj_tree_shadow.c new file mode 100644 index 00000000..af211604 --- /dev/null +++ b/src/data/model/obj_tree_shadow.c @@ -0,0 +1,24 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_tree_shadow_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_tree_shadow_tex.inc" +}; + +Vtx obj_tree3_shadow_v[] = { +#include "assets/obj_tree3_shadow_v.inc" +}; + +Gfx obj_tree3_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_tree_shadow_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_tree3_shadowT_gfx_model[] = { + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_cedar1.c b/src/data/model/obj_w_cedar1.c new file mode 100644 index 00000000..69df063f --- /dev/null +++ b/src/data/model/obj_w_cedar1.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_cedar_baby_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_cedar_baby_tex.inc" +}; + +Vtx obj_w_cedar1_v[] = { +#include "assets/obj_w_cedar1_v.inc" +}; + +Gfx obj_w_cedar1T_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_cedar_baby_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_cedar1T_gfx_model[] = { + gsSPVertex(obj_w_cedar1_v, 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 1, 3, 2, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_cedar1_dead.c b/src/data/model/obj_w_cedar1_dead.c new file mode 100644 index 00000000..d8747f2d --- /dev/null +++ b/src/data/model/obj_w_cedar1_dead.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_cedar_dead_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_cedar_dead_tex.inc" +}; + +Vtx obj_w_cedar1_dead_v[] = { +#include "assets/obj_w_cedar1_dead_v.inc" +}; + +Gfx obj_w_cedar1_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_w_cedar_dead_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_cedar1_deadT_gfx_model[] = { + gsSPVertex(obj_w_cedar1_dead_v, 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 1, 3, 2, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_cedar2.c b/src/data/model/obj_w_cedar2.c new file mode 100644 index 00000000..c3f31acd --- /dev/null +++ b/src/data/model/obj_w_cedar2.c @@ -0,0 +1,24 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_w_cedar2_v[] = { +#include "assets/obj_w_cedar2_v.inc" +}; + +extern u8 obj_w_cedar_young_tex[]; + +Gfx obj_w_cedar2T_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_w_cedar_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_cedar2T_gfx_model[] = { + gsSPVertex(obj_w_cedar2_v, 7, 0), + gsSPNTrianglesInit_5b(7, 0, 1, 2, 2, 3, 0, 3, 4, 0), + gsSPNTriangles_5b(0, 5, 1, 0, 4, 5, 3, 6, 4, 4, 6, 5), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_cedar3.c b/src/data/model/obj_w_cedar3.c new file mode 100644 index 00000000..51780d55 --- /dev/null +++ b/src/data/model/obj_w_cedar3.c @@ -0,0 +1,45 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_w_cedar_leaf_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_cedar_leaf_tex.inc" +}; + +u8 obj_w_cedar_young_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_cedar_young_tex.inc" +}; + +Vtx obj_w_cedar3_v[] = { +#include "assets/obj_w_cedar3_v.inc" +}; + +Gfx obj_w_cedar3_leafT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_w_cedar_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_REPEAT, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_cedar3_leafT_gfx_model[] = { + gsSPVertex(obj_w_cedar3_v, 23, 0), + gsSPNTrianglesInit_5b(9, 0, 1, 2, 2, 3, 4, 5, 6, 0), + gsSPNTriangles_5b(7, 8, 5, 9, 10, 11, 12, 13, 7, 14, 15, 16), + gsSPNTriangles_5b(17, 18, 19, 20, 21, 22, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_cedar3_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_w_cedar_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_cedar3_trunkT_gfx_model[] = { + gsSPVertex(&obj_w_cedar3_v[23], 7, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 0, 3, 1, 2, 1, 4), + gsSPNTriangles_5b(1, 5, 4, 3, 6, 1, 1, 6, 5, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_cedar4.c b/src/data/model/obj_w_cedar4.c new file mode 100644 index 00000000..54bd7d0f --- /dev/null +++ b/src/data/model/obj_w_cedar4.c @@ -0,0 +1,47 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_w_cedar_trunk_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_cedar_trunk_tex.inc" +}; + +Vtx obj_w_cedar4_v[] = { +#include "assets/obj_w_cedar4_v.inc" +}; + +Gfx obj_w_cedar4_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_w_cedar_trunk_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_cedar4_trunkT_gfx_model[] = { + gsSPVertex(obj_w_cedar4_v, 7, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 1, 3, 2, 4, 2, 5), + gsSPNTriangles_5b(4, 0, 2, 5, 2, 6, 2, 3, 6, 0, 0, 0), + gsSPEndDisplayList(), +}; + +extern u8 obj_w_cedar_leaf_tex[]; + +Gfx obj_w_cedar4_leafT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_w_cedar_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_REPEAT, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_cedar4_leafT_gfx_model[] = { + gsSPVertex(&obj_w_cedar4_v[7], 32, 0), + gsSPNTrianglesInit_5b(13, 0, 1, 2, 2, 3, 4, 5, 6, 0), + gsSPNTriangles_5b(7, 8, 5, 9, 10, 11, 11, 12, 13, 14, 15, 9), + gsSPNTriangles_5b(16, 17, 14, 18, 19, 20, 21, 22, 23, 23, 24, 16), + gsSPNTriangles_5b(25, 26, 7, 27, 28, 29, 0, 0, 0, 0, 0, 0), + gsSPVertex(&obj_w_cedar4_v[37], 17, 0), + gsSPNTrianglesInit_5b(7, 0, 1, 2, 3, 4, 5, 6, 7, 8), + gsSPNTriangles_5b(8, 9, 10, 10, 11, 12, 13, 14, 15, 12, 16, 13), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_cedar5.c b/src/data/model/obj_w_cedar5.c new file mode 100644 index 00000000..b7449a99 --- /dev/null +++ b/src/data/model/obj_w_cedar5.c @@ -0,0 +1,49 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_w_cedar5_v[] = { +#include "assets/obj_w_cedar5_v.inc" +}; + +extern u8 obj_w_cedar_leaf_tex[]; + +Gfx obj_w_cedar5_leafT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_w_cedar_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_REPEAT, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_cedar5_leafT_gfx_model[] = { + gsSPVertex(obj_w_cedar5_v, 32, 0), + gsSPNTrianglesInit_5b(14, 0, 1, 2, 2, 3, 4, 5, 6, 0), + gsSPNTriangles_5b(7, 8, 5, 9, 10, 11, 11, 12, 13, 14, 15, 9), + gsSPNTriangles_5b(16, 17, 14, 18, 19, 20, 20, 21, 22, 23, 24, 18), + gsSPNTriangles_5b(25, 26, 23, 27, 28, 29, 29, 30, 31, 0, 0, 0), + gsSPVertex(&obj_w_cedar5_v[32], 32, 0), + gsSPNTrianglesInit_5b(12, 0, 1, 2, 3, 4, 0, 5, 6, 7), + gsSPNTriangles_5b(8, 9, 10, 10, 11, 3, 12, 13, 14, 14, 15, 16), + gsSPNTriangles_5b(16, 17, 18, 19, 20, 21, 21, 22, 23, 24, 25, 26), + gsSPNTriangles_5b(27, 28, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPVertex(&obj_w_cedar5_v[62], 6, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 3, 4, 5, 0, 0, 0), + gsSPEndDisplayList(), +}; + +extern u8 obj_w_cedar_trunk_tex[]; + +Gfx obj_w_cedar5_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_w_cedar_trunk_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_cedar5_trunkT_gfx_model[] = { + gsSPVertex(&obj_w_cedar5_v[68], 7, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 1, 3, 2, 4, 2, 5), + gsSPNTriangles_5b(4, 0, 2, 5, 2, 6, 2, 3, 6, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_cstump2.c b/src/data/model/obj_w_cstump2.c new file mode 100644 index 00000000..faa6900d --- /dev/null +++ b/src/data/model/obj_w_cstump2.c @@ -0,0 +1,24 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_w_cstump2_v[] = { +#include "assets/obj_w_cstump2_v.inc" +}; + +extern u8 obj_w_cedar_young_tex[]; + +Gfx obj_w_cstump2T_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_w_cedar_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_cstump2T_gfx_model[] = { + gsSPVertex(obj_w_cstump2_v, 7, 0), + gsSPNTrianglesInit_5b(7, 0, 1, 2, 3, 4, 5, 4, 6, 5), + gsSPNTriangles_5b(0, 3, 1, 3, 5, 1, 1, 6, 2, 1, 5, 6), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_cstump3.c b/src/data/model/obj_w_cstump3.c new file mode 100644 index 00000000..8b81b62c --- /dev/null +++ b/src/data/model/obj_w_cstump3.c @@ -0,0 +1,24 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_w_cstump3_v[] = { +#include "assets/obj_w_cstump3_v.inc" +}; + +extern u8 obj_w_cedar_young_tex[]; + +Gfx obj_w_cstump3T_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_w_cedar_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_cstump3T_gfx_model[] = { + gsSPVertex(obj_w_cstump3_v, 7, 0), + gsSPNTrianglesInit_5b(7, 0, 1, 2, 3, 4, 2, 2, 5, 3), + gsSPNTriangles_5b(1, 5, 2, 1, 6, 5, 5, 6, 3, 2, 4, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_cstump4.c b/src/data/model/obj_w_cstump4.c new file mode 100644 index 00000000..dbf78def --- /dev/null +++ b/src/data/model/obj_w_cstump4.c @@ -0,0 +1,28 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + + +u8 obj_w_cedar_stump_tex[] ATTRIBUTE_ALIGN(32)= { +#include "assets/obj_w_cedar_stump_tex.inc" +}; + +Vtx obj_w_cstump4_v[] = { +#include "assets/obj_w_cstump4_v.inc" +}; + +Gfx obj_w_cstump4T_mat_model[] = { +gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), +gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, obj_w_cedar_stump_tex), +gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), +gsSPEndDisplayList(), +}; + +Gfx obj_w_cstump4T_gfx_model[] = { +gsSPVertex(obj_w_cstump4_v, 7, 0), +gsSPNTrianglesInit_5b(7, 0, 1, 2, 3, 4, 2, 2, 4, 0), +gsSPNTriangles_5b(1, 5, 2, 2, 5, 3, 1, 6, 5, 5, 6, 3), +gsSPEndDisplayList(), +}; + diff --git a/src/data/model/obj_w_cstump5.c b/src/data/model/obj_w_cstump5.c new file mode 100644 index 00000000..1b656ca1 --- /dev/null +++ b/src/data/model/obj_w_cstump5.c @@ -0,0 +1,24 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_w_cstump5_v[] = { +#include "assets/obj_w_cstump5_v.inc" +}; + +extern u8 obj_w_cedar_stump_tex[]; + +Gfx obj_w_cstump5T_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, obj_w_cedar_stump_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_cstump5T_gfx_model[] = { + gsSPVertex(obj_w_cstump5_v, 7, 0), + gsSPNTrianglesInit_5b(7, 0, 1, 2, 3, 4, 2, 2, 4, 0), + gsSPNTriangles_5b(1, 5, 2, 2, 5, 3, 1, 6, 5, 5, 6, 3), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_fenceL.c b/src/data/model/obj_w_fenceL.c new file mode 100644 index 00000000..45d12cc6 --- /dev/null +++ b/src/data/model/obj_w_fenceL.c @@ -0,0 +1,28 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_w_fence_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_fence_tex.inc" +}; + +Vtx obj_w_fenceL_v[] = { +#include "assets/obj_w_fenceL_v.inc" +}; + +extern u16 obj_fence_pal[]; + +Gfx obj_w_fenceLT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPLoadTLUT_Dolphin(15, 16, 1, obj_fence_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, obj_w_fence_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_REPEAT, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_fenceLT_gfx_model[] = { + gsSPVertex(obj_w_fenceL_v, 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_fenceS.c b/src/data/model/obj_w_fenceS.c new file mode 100644 index 00000000..0a8c84d7 --- /dev/null +++ b/src/data/model/obj_w_fenceS.c @@ -0,0 +1,25 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_w_fenceS_v[] = { +#include "assets/obj_w_fenceS_v.inc" +}; + +extern u16 obj_fence_pal[]; +extern u8 obj_w_fence_tex[]; + +Gfx obj_w_fenceST_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPLoadTLUT_Dolphin(15, 16, 1, obj_fence_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, obj_w_fence_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_REPEAT, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_fenceST_gfx_model[] = { + gsSPVertex(obj_w_fenceS_v, 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_honeycomb.c b/src/data/model/obj_w_honeycomb.c new file mode 100644 index 00000000..8a1c0815 --- /dev/null +++ b/src/data/model/obj_w_honeycomb.c @@ -0,0 +1,43 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 obj_w_honeycomb_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_honeycomb_pal.inc" +}; + +u8 obj_w_honeycomb_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_honeycomb_tex.inc" +}; + +Vtx obj_w_honeycomb_v[] = { +#include "assets/obj_w_honeycomb_v.inc" +}; + +Gfx obj_w_honeycombT_mat_model[] = { + gsDPPipeSync(), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, obj_w_honeycomb_pal), + gsDPTileSync(), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_4b, 0, 496, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, + G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD), + gsDPLoadSync(), + gsDPLoadTLUTCmd(G_TX_LOADTILE, 15), + gsDPPipeSync(), + gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_16b, 1, obj_w_honeycomb_tex), + gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, + G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD), + gsDPLoadSync(), + gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 255, 1024), + gsDPPipeSync(), + gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0, G_TX_RENDERTILE, 15, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, + G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD), + gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 124, 124), + gsSPEndDisplayList(), +}; + +Gfx obj_w_honeycombT_gfx_model[] = { + gsSPVertex(obj_w_honeycomb_v, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_melody.c b/src/data/model/obj_w_melody.c new file mode 100644 index 00000000..caeadf6f --- /dev/null +++ b/src/data/model/obj_w_melody.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_melody_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_melody/obj_melody_pal.inc" +}; + +u8 obj_w_melody_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_melody_tex.inc" +}; + +Vtx obj_w_melody_v[] = { +#include "assets/obj_w_melody_v.inc" +}; + +Gfx obj_w_melodyT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPLoadTLUT_Dolphin(15, 16, 1, obj_melody_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_w_melody_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_melodyT_gfx_model[] = { + gsSPVertex(obj_w_melody_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_notice.c b/src/data/model/obj_w_notice.c new file mode 100644 index 00000000..2a8d41e5 --- /dev/null +++ b/src/data/model/obj_w_notice.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_notice_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_notice/obj_notice_pal.inc" +}; + +u8 obj_w_notice_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_notice_tex.inc" +}; + +Vtx obj_w_notice_v[] = { +#include "assets/obj_w_notice_v.inc" +}; + +Gfx obj_w_noticeT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPLoadTLUT_Dolphin(15, 16, 1, obj_notice_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_w_notice_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_noticeT_gfx_model[] = { + gsSPVertex(obj_w_notice_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_palm1_dead.c b/src/data/model/obj_w_palm1_dead.c new file mode 100644 index 00000000..06076053 --- /dev/null +++ b/src/data/model/obj_w_palm1_dead.c @@ -0,0 +1,27 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + + +u8 obj_w_palm_dead_tex[] ATTRIBUTE_ALIGN(32)= { +#include "assets/obj_w_palm_dead_tex.inc" +}; + +Vtx obj_w_palm1_dead_v[] = { +#include "assets/obj_w_palm1_dead_v.inc" +}; + +Gfx obj_w_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_w_palm_dead_tex), +gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), +gsSPEndDisplayList(), +}; + +Gfx obj_w_palm1_deadT_gfx_model[] = { +gsSPVertex(obj_w_palm1_dead_v, 4, 0), +gsSPNTrianglesInit_5b(2, 0, 1, 2, 1, 3, 2, 0, 0, 0), +gsSPEndDisplayList(), +}; + diff --git a/src/data/model/obj_w_palm2.c b/src/data/model/obj_w_palm2.c new file mode 100644 index 00000000..767a3cc8 --- /dev/null +++ b/src/data/model/obj_w_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_w_palm_young_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_palm2/obj_w_palm_young_tex.inc" +}; + +Vtx obj_w_palm2_v[] = { +#include "assets/obj_w_palm2_v.inc" +}; + +Gfx obj_w_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_w_palm_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_palm2T_gfx_model[] = { + gsSPVertex(obj_w_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_w_palm3.c b/src/data/model/obj_w_palm3.c new file mode 100644 index 00000000..eb423d51 --- /dev/null +++ b/src/data/model/obj_w_palm3.c @@ -0,0 +1,45 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u8 obj_w_palm_leaf_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_palm3/obj_w_palm_leaf_tex.inc" +}; + +static u8 obj_w_palm_young_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_palm3/obj_w_palm_young_tex.inc" +}; + +Vtx obj_w_palm3_v[] = { +#include "assets/obj_w_palm3_v.inc" +}; + +Gfx obj_w_palm3_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_w_palm_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_palm3_leafT_gfx_model[] = { + gsSPVertex(obj_w_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_w_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_w_palm_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_palm3_trunkT_gfx_model[] = { + gsSPVertex(&obj_w_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_w_palm4.c b/src/data/model/obj_w_palm4.c new file mode 100644 index 00000000..eb318f1e --- /dev/null +++ b/src/data/model/obj_w_palm4.c @@ -0,0 +1,47 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u8 obj_w_palm_leaf_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_palm4/obj_w_palm_leaf_tex.inc" +}; + +static u8 obj_w_palm_trunk_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_palm4/obj_w_palm_trunk_tex.inc" +}; + +Vtx obj_w_palm4_v[] = { +#include "assets/obj_w_palm4_v.inc" +}; + +Gfx obj_w_palm4_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_w_palm_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_palm4_leafT_gfx_model[] = { + gsSPVertex(obj_w_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_w_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_w_palm_trunk_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_palm4_trunkT_gfx_model[] = { + gsSPVertex(&obj_w_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_w_palm5.c b/src/data/model/obj_w_palm5.c new file mode 100644 index 00000000..b0359538 --- /dev/null +++ b/src/data/model/obj_w_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_w_palm_leaf_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_palm5/obj_w_palm_leaf_tex.inc" +}; + +static u8 obj_w_palm_trunk_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_palm5/obj_w_palm_trunk_tex.inc" +}; + +Vtx obj_w_palm5_v[] = { +#include "assets/obj_w_palm5_v.inc" +}; + +Gfx obj_w_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_w_palm_trunk_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_palm5_trunkT_gfx_model[] = { + gsSPVertex(obj_w_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_w_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_w_palm_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_palm5_leafT_gfx_model[] = { + gsSPVertex(&obj_w_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_w_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_w_palm5_coco.c b/src/data/model/obj_w_palm5_coco.c new file mode 100644 index 00000000..60834559 --- /dev/null +++ b/src/data/model/obj_w_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_w_palm5_coco_v[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_palm5_coco_v.inc" +}; + +Gfx obj_w_palm5_cocoT_gfx_model[] = { + gsSPVertex(obj_w_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_w_pstump2.c b/src/data/model/obj_w_pstump2.c new file mode 100644 index 00000000..789fed57 --- /dev/null +++ b/src/data/model/obj_w_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_w_palm_young_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_pstump2/obj_w_palm_young_tex.inc" +}; + +Vtx obj_w_pstump2_v[] = { +#include "assets/obj_w_pstump2_v.inc" +}; + +Gfx obj_w_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_w_palm_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_pstump2T_gfx_model[] = { + gsSPVertex(obj_w_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_w_pstump3.c b/src/data/model/obj_w_pstump3.c new file mode 100644 index 00000000..392fbc76 --- /dev/null +++ b/src/data/model/obj_w_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_w_palm_young_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_pstump3/obj_w_palm_young_tex.inc" +}; + +Vtx obj_w_pstump3_v[] = { +#include "assets/obj_w_pstump3_v.inc" +}; + +Gfx obj_w_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_w_palm_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_pstump3T_gfx_model[] = { + gsSPVertex(obj_w_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_w_pstump4.c b/src/data/model/obj_w_pstump4.c new file mode 100644 index 00000000..b576f33c --- /dev/null +++ b/src/data/model/obj_w_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_w_palm_stump_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_pstump4/obj_w_palm_stump_tex.inc" +}; + +Vtx obj_w_pstump4_v[] = { +#include "assets/obj_w_pstump4_v.inc" +}; + +Gfx obj_w_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_w_palm_stump_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_pstump4T_gfx_model[] = { + gsSPVertex(obj_w_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_w_pstump5.c b/src/data/model/obj_w_pstump5.c new file mode 100644 index 00000000..f0631c5c --- /dev/null +++ b/src/data/model/obj_w_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_w_palm_stump_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_pstump5/obj_w_palm_stump_tex.inc" +}; + +Vtx obj_w_pstump5_v[] = { +#include "assets/obj_w_pstump5_v.inc" +}; + +Gfx obj_w_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_w_palm_stump_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 7, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_spstump5T_gfx_model[] = { + gsSPVertex(obj_w_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_w_sightmap.c b/src/data/model/obj_w_sightmap.c new file mode 100644 index 00000000..1992ce94 --- /dev/null +++ b/src/data/model/obj_w_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_w_sightmap/obj_sightmap_pal.inc" +}; + +u8 obj_w_sightmap_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_sightmap_tex.inc" +}; + +Vtx obj_w_sightmap_v[] = { +#include "assets/obj_w_sightmap_v.inc" +}; + +Gfx obj_w_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_w_sightmap_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_sightmapT_gfx_model[] = { + gsSPVertex(obj_w_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_stoneA.c b/src/data/model/obj_w_stoneA.c new file mode 100644 index 00000000..65a74c01 --- /dev/null +++ b/src/data/model/obj_w_stoneA.c @@ -0,0 +1,32 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 obj_w_stone_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_stone_pal.inc" +}; + +u8 obj_w_stone_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_stone_tex.inc" +}; + +Vtx obj_w_stoneA_v[] = { +#include "assets/obj_w_stoneA_v.inc" +}; + +Gfx obj_w_stoneA_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPLoadTLUT_Dolphin(15, 16, 1, obj_w_stone_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, obj_w_stone_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_REPEAT, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_stoneA_gfx_model[] = { + gsSPVertex(obj_w_stoneA_v, 10, 0), + gsSPNTrianglesInit_5b(10, 0, 1, 2, 1, 3, 2, 4, 1, 0), + gsSPNTriangles_5b(4, 5, 1, 1, 6, 3, 6, 7, 3, 1, 5, 6), + gsSPNTriangles_5b(2, 8, 9, 2, 3, 8, 3, 7, 8, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_stoneB.c b/src/data/model/obj_w_stoneB.c new file mode 100644 index 00000000..088e406e --- /dev/null +++ b/src/data/model/obj_w_stoneB.c @@ -0,0 +1,17 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_w_stoneB_v[] = { +#include "assets/obj_w_stoneB_v.inc" +}; + +Gfx obj_w_stoneB_gfx_model[] = { + gsSPVertex(obj_w_stoneB_v, 12, 0), + gsSPNTrianglesInit_5b(12, 0, 1, 2, 1, 3, 2, 3, 4, 2), + gsSPNTriangles_5b(1, 5, 3, 5, 6, 3, 1, 7, 5, 3, 8, 4), + gsSPNTriangles_5b(8, 9, 4, 3, 6, 8, 0, 10, 1, 10, 7, 1), + gsSPNTriangles_5b(0, 11, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_stoneC.c b/src/data/model/obj_w_stoneC.c new file mode 100644 index 00000000..8083bdbe --- /dev/null +++ b/src/data/model/obj_w_stoneC.c @@ -0,0 +1,17 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_w_stoneC_v[] = { +#include "assets/obj_w_stoneC_v.inc" +}; + +Gfx obj_w_stoneC_gfx_model[] = { + gsSPVertex(obj_w_stoneC_v, 12, 0), + gsSPNTrianglesInit_5b(12, 0, 1, 2, 3, 4, 0, 3, 0, 2), + gsSPNTriangles_5b(5, 6, 7, 8, 9, 5, 8, 5, 7, 10, 4, 3), + gsSPNTriangles_5b(7, 6, 10, 7, 10, 3, 11, 8, 7, 11, 7, 3), + gsSPNTriangles_5b(11, 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_stoneD.c b/src/data/model/obj_w_stoneD.c new file mode 100644 index 00000000..db5561e3 --- /dev/null +++ b/src/data/model/obj_w_stoneD.c @@ -0,0 +1,18 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_w_stoneD_v[] = { +#include "assets/obj_w_stoneD_v.inc" +}; + +Gfx obj_w_stoneD_gfx_model[] = { + gsSPVertex(obj_w_stoneD_v, 15, 0), + gsSPNTrianglesInit_5b(17, 0, 1, 2, 0, 3, 1, 4, 5, 6), + gsSPNTriangles_5b(5, 7, 6, 3, 8, 1, 8, 9, 1, 3, 10, 8), + gsSPNTriangles_5b(5, 10, 7, 5, 11, 10, 4, 12, 5, 12, 11, 5), + gsSPNTriangles_5b(1, 13, 2, 1, 9, 13, 0, 10, 3, 0, 14, 10), + gsSPNTriangles_5b(7, 14, 6, 7, 10, 14, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_stoneE.c b/src/data/model/obj_w_stoneE.c new file mode 100644 index 00000000..e568b4d8 --- /dev/null +++ b/src/data/model/obj_w_stoneE.c @@ -0,0 +1,18 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_w_stoneE_v[] = { +#include "assets/obj_w_stoneE_v.inc" +}; + +Gfx obj_w_stoneE_gfx_model[] = { + gsSPVertex(obj_w_stoneE_v, 15, 0), + gsSPNTrianglesInit_5b(17, 0, 1, 2, 0, 3, 1, 4, 3, 5), + gsSPNTriangles_5b(4, 1, 3, 3, 6, 5, 3, 0, 6, 4, 7, 1), + gsSPNTriangles_5b(7, 2, 1, 8, 6, 9, 6, 0, 9, 10, 11, 12), + gsSPNTriangles_5b(10, 13, 11, 9, 14, 10, 9, 0, 14, 14, 13, 10), + gsSPNTriangles_5b(8, 9, 12, 9, 10, 12, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_tree1.c b/src/data/model/obj_w_tree1.c new file mode 100644 index 00000000..87671ee3 --- /dev/null +++ b/src/data/model/obj_w_tree1.c @@ -0,0 +1,32 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_w_tree_baby_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_tree_baby_tex.inc" +}; + +Vtx obj_w_tree1_v[] = { +#include "assets/obj_w_tree1_v.inc" +}; + +Gfx obj_w_tree1T_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_tree_baby_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_gold_tree1T_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_tree_baby_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_tree1T_gfx_model[] = { + gsSPVertex(obj_w_tree1_v, 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 1, 3, 2, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_tree1_dead.c b/src/data/model/obj_w_tree1_dead.c new file mode 100644 index 00000000..95a59854 --- /dev/null +++ b/src/data/model/obj_w_tree1_dead.c @@ -0,0 +1,32 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_w_tree_dead_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_tree_dead_tex.inc" +}; + +Vtx obj_w_tree1_dead_v[] = { +#include "assets/obj_w_tree1_dead_v.inc" +}; + +Gfx obj_w_tree1_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_w_tree_dead_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_MIRROR, GX_MIRROR, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_gold_tree1_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_w_tree_dead_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_MIRROR, GX_MIRROR, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_tree1_deadT_gfx_model[] = { + gsSPVertex(obj_w_tree1_dead_v, 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 1, 3, 2, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_tree2.c b/src/data/model/obj_w_tree2.c new file mode 100644 index 00000000..52c1c087 --- /dev/null +++ b/src/data/model/obj_w_tree2.c @@ -0,0 +1,33 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_w_tree_young_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_tree_young_tex.inc" +}; + +Vtx obj_w_tree2_v[] = { +#include "assets/obj_w_tree2_v.inc" +}; + +Gfx obj_w_tree2T_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_w_tree_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_gold_tree2T_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_w_tree_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_tree2T_gfx_model[] = { + gsSPVertex(obj_w_tree2_v, 7, 0), + gsSPNTrianglesInit_5b(7, 0, 1, 2, 2, 3, 0, 3, 4, 0), + gsSPNTriangles_5b(0, 5, 1, 0, 4, 5, 3, 6, 4, 4, 6, 5), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_tree3.c b/src/data/model/obj_w_tree3.c new file mode 100644 index 00000000..b41ec355 --- /dev/null +++ b/src/data/model/obj_w_tree3.c @@ -0,0 +1,56 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_w_tree_leaf_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_tree_leaf_tex.inc" +}; + +Vtx obj_w_tree3_v[] = { +#include "assets/obj_w_tree3_v.inc" +}; + +Gfx obj_w_tree3_leafT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_w_tree_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_gold_tree3_leafT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_w_tree_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_tree3_leafT_gfx_model[] = { + gsSPVertex(obj_w_tree3_v, 5, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 1, 3, 2, 0, 2, 4), + gsSPNTriangles_5b(3, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +extern u8 obj_w_tree_young_tex[]; + +Gfx obj_w_tree3_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_w_tree_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_gold_tree3_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_w_tree_young_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_tree3_trunkT_gfx_model[] = { + gsSPVertex(&obj_w_tree3_v[5], 7, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 0, 3, 1, 2, 1, 4), + gsSPNTriangles_5b(1, 5, 4, 3, 6, 1, 1, 6, 5, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_tree4.c b/src/data/model/obj_w_tree4.c new file mode 100644 index 00000000..45930852 --- /dev/null +++ b/src/data/model/obj_w_tree4.c @@ -0,0 +1,57 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_w_tree_trunk_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_w_tree_trunk_tex.inc" +}; + +Vtx obj_w_tree4_v[] = { +#include "assets/obj_w_tree4_v.inc" +}; + +extern u8 obj_w_tree_leaf_tex[]; + +Gfx obj_w_tree4_leafT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_w_tree_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_gold_tree4_leafT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_w_tree_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_tree4_leafT_gfx_model[] = { + gsSPVertex(obj_w_tree4_v, 10, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 0, 2, 4), + gsSPNTriangles_5b(3, 4, 2, 5, 6, 7, 8, 5, 7, 9, 7, 6), + gsSPNTriangles_5b(9, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_tree4_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_w_tree_trunk_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_gold_tree4_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_w_tree_trunk_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_tree4_trunkT_gfx_model[] = { + gsSPVertex(&obj_w_tree4_v[10], 7, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 1, 3, 2, 4, 2, 5), + gsSPNTriangles_5b(4, 0, 2, 5, 2, 6, 2, 3, 6, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_w_tree5.c b/src/data/model/obj_w_tree5.c new file mode 100644 index 00000000..327ef805 --- /dev/null +++ b/src/data/model/obj_w_tree5.c @@ -0,0 +1,56 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +Vtx obj_w_tree5_v[] = { +#include "assets/obj_w_tree5_v.inc" +}; + +extern u8 obj_w_tree_leaf_tex[]; + +Gfx obj_w_tree5_leafT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_w_tree_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_gold_tree5_leafT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, obj_w_tree_leaf_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_tree5_leafT_gfx_model[] = { + gsSPVertex(obj_w_tree5_v, 15, 0), + gsSPNTrianglesInit_5b(12, 0, 1, 2, 3, 2, 1, 4, 0, 2), + gsSPNTriangles_5b(3, 4, 2, 5, 6, 7, 8, 5, 7, 9, 8, 7), + gsSPNTriangles_5b(9, 7, 6, 10, 11, 12, 10, 13, 11, 13, 14, 11), + gsSPNTriangles_5b(14, 12, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +extern u8 obj_w_tree_trunk_tex[]; + +Gfx obj_w_tree5_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_w_tree_trunk_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 6, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_gold_tree5_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_w_tree_trunk_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 8, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx obj_w_tree5_trunkT_gfx_model[] = { + gsSPVertex(&obj_w_tree5_v[15], 7, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 1, 3, 2, 4, 2, 5), + gsSPNTriangles_5b(4, 0, 2, 5, 2, 6, 2, 3, 6, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_x_cedar5.c b/src/data/model/obj_x_cedar5.c new file mode 100644 index 00000000..6504fe20 --- /dev/null +++ b/src/data/model/obj_x_cedar5.c @@ -0,0 +1,39 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u16 obj_cedar_light_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_x_cedar5/obj_cedar_light_pal.inc" +}; + +u8 obj_x_cedar_light_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_x_cedar_light_tex.inc" +}; + +Vtx obj_x_cedar5_light_v[] = { +#include "assets/obj_x_cedar5_light_v.inc" +}; + +Gfx obj_x_ceder5_lightT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPLoadTLUT_Dolphin(15, 16, 1, obj_cedar_light_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, obj_x_cedar_light_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_REPEAT, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; + +Gfx obj_x_ceder5_lightT_gfx_model[] = { + gsSPVertex(obj_x_cedar5_light_v, 28, 0), + gsSPNTrianglesInit_5b(20, 0, 1, 2, 3, 0, 2, 4, 5, 6), + gsSPNTriangles_5b(7, 4, 6, 8, 9, 10, 11, 8, 10, 12, 11, 13), + gsSPNTriangles_5b(14, 12, 13, 12, 15, 16, 9, 12, 16, 8, 14, 17), + gsSPNTriangles_5b(15, 8, 17, 18, 19, 20, 19, 21, 20, 22, 23, 24), + gsSPNTriangles_5b(23, 18, 24, 21, 23, 25, 23, 26, 25, 26, 19, 27), + gsSPNTriangles_5b(19, 22, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_x_honeycomb.c b/src/data/model/obj_x_honeycomb.c new file mode 100644 index 00000000..08836f0c --- /dev/null +++ b/src/data/model/obj_x_honeycomb.c @@ -0,0 +1,43 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 obj_x_honeycomb_pal[] = { +#include "assets/obj_x_honeycomb_pal.inc" +}; + +u8 obj_x_honeycomb_tex[] = { +#include "assets/obj_x_honeycomb_tex.inc" +}; + +Vtx obj_x_honeycomb_v[] = { +#include "assets/obj_x_honeycomb_v.inc" +}; + +Gfx obj_x_honeycombT_mat_model[] = { + gsDPPipeSync(), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, obj_x_honeycomb_pal), + gsDPTileSync(), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_4b, 0, 496, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, + G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD), + gsDPLoadSync(), + gsDPLoadTLUTCmd(G_TX_LOADTILE, 15), + gsDPPipeSync(), + gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_16b, 1, obj_x_honeycomb_tex), + gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, + G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD), + gsDPLoadSync(), + gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 255, 1024), + gsDPPipeSync(), + gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0, G_TX_RENDERTILE, 15, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, + G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD), + gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 124, 124), + gsSPEndDisplayList(), +}; + +Gfx obj_x_honeycombT_gfx_model[] = { + gsSPVertex(obj_x_honeycomb_v, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/obj_x_tree5.c b/src/data/model/obj_x_tree5.c new file mode 100644 index 00000000..ec7a8c1a --- /dev/null +++ b/src/data/model/obj_x_tree5.c @@ -0,0 +1,33 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 obj_x_tree_light_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/obj_x_tree_light_tex.inc" +}; + +Vtx obj_x_tree5_light_v[] = { +#include "assets/obj_x_tree5_light_v.inc" +}; + +extern u16 obj_tree_light_pal[]; + +Gfx obj_x_tree5_lightT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPLoadTLUT_Dolphin(15, 16, 1, obj_tree_light_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, obj_x_tree_light_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; + +Gfx obj_x_tree5_lightT_gfx_model[] = { + gsSPVertex(obj_x_tree5_light_v, 12, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 0, 3, 1, 4, 5, 6), + gsSPNTriangles_5b(5, 7, 6, 8, 9, 10, 8, 11, 9, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/tools/converters/assetdis.py b/tools/converters/assetdis.py index 6fa01056..a2bea551 100644 --- a/tools/converters/assetdis.py +++ b/tools/converters/assetdis.py @@ -381,7 +381,7 @@ def convert_source_to_gfx_c_source(src_file, dest_path): elif type == "Gfx": data = convert_binary_to_gfx( *lookup_bins_and_symbols(lines, obj_name)) - converted_types[obj_name] = (type, data, NO_ALIGN) + converted_types[obj_name] = (type, data + ",", NO_ALIGN) elif type == "PAL": data = f'#include "assets/{obj_name}.inc"' converted_types[obj_name] = ("u16", data, ASSET_ALIGN)