diff options
| author | emilybrooks <emilybrooksemilybrooks@gmail.com> | 2024-01-08 13:00:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-08 13:00:03 -0700 |
| commit | 93fa8a0e9eab5c519113ee0f23ce1961c278195f (patch) | |
| tree | 42e5e8981b04384ac829fa96c78d8156b5544e5c /src/objects | |
| parent | 093b8b7b9b20150a2eb6d2a8ab887f9387298fee (diff) | |
Implement asset extraction (#131)
* got stuff to extract properly
* je and bs extensions done
* got symbols named correctly
* extensions done, symbol naming done
* fixed some errors
* fixed more of them
* stuff
* started editing make file
* makefile works
* ci4 and palette extensions done
* cleaned up ckf_je extension
* fixed vertex problem
* cleaned up asset yaml
* cleaned up extensions
* added tol_cracker_1
* builds properly
* finished obj_s_yamishop and obj_w_yamishop
* updated to work with latest splat
* fixes
* makefile asset dir
* remove old codes from af_ci4.py
Diffstat (limited to 'src/objects')
| -rw-r--r-- | src/objects/object_00D5B000/object_00D5B000.c | 19 | ||||
| -rw-r--r-- | src/objects/object_00D5E000/object_00D5E000.c | 87 | ||||
| -rw-r--r-- | src/objects/tol_cracker_1/tol_cracker_1.c | 6 | ||||
| -rw-r--r-- | src/objects/tol_cracker_1/tol_cracker_1.h | 11 | ||||
| -rw-r--r-- | src/objects/tol_utiwa_1/tol_utiwa_1.c | 7 | ||||
| -rw-r--r-- | src/objects/tol_utiwa_1/tol_utiwa_1.h | 12 |
6 files changed, 142 insertions, 0 deletions
diff --git a/src/objects/object_00D5B000/object_00D5B000.c b/src/objects/object_00D5B000/object_00D5B000.c new file mode 100644 index 0000000..2851ca1 --- /dev/null +++ b/src/objects/object_00D5B000/object_00D5B000.c @@ -0,0 +1,19 @@ +// #include "assets/jp/objects/object_00D5B000/obj_s_house1_a_pal.palette.inc.c" +// #include "assets/jp/objects/object_00D5B000/obj_s_house1_b_pal.palette.inc.c" + +// #include "assets/jp/objects/object_00D5B000/obj_s_yamishop_pal.palette.inc.c" +// #include "assets/jp/objects/object_00D5B000/obj_w_yamishop_pal.palette.inc.c" + +// #include "assets/jp/objects/object_00D5B000/obj_s_windmill_a_pal.palette.inc.c" +// #include "assets/jp/objects/object_00D5B000/obj_s_windmill_b_pal.palette.inc.c" +// #include "assets/jp/objects/object_00D5B000/obj_s_windmill_c_pal.palette.inc.c" +// #include "assets/jp/objects/object_00D5B000/obj_s_windmill_d_pal.palette.inc.c" +// #include "assets/jp/objects/object_00D5B000/obj_s_windmill_e_pal.palette.inc.c" +// #include "assets/jp/objects/object_00D5B000/obj_w_windmill_a_pal.palette.inc.c" +// #include "assets/jp/objects/object_00D5B000/obj_w_windmill_b_pal.palette.inc.c" +// #include "assets/jp/objects/object_00D5B000/obj_w_windmill_c_pal.palette.inc.c" +// #include "assets/jp/objects/object_00D5B000/obj_w_windmill_d_pal.palette.inc.c" +// #include "assets/jp/objects/object_00D5B000/obj_w_windmill_e_pal.palette.inc.c" + +// #include "assets/jp/objects/object_00D5B000/obj_s_toudai_pal.palette.inc.c" +// #include "assets/jp/objects/object_00D5B000/obj_w_toudai_pal.palette.inc.c" diff --git a/src/objects/object_00D5E000/object_00D5E000.c b/src/objects/object_00D5E000/object_00D5E000.c new file mode 100644 index 0000000..7db807f --- /dev/null +++ b/src/objects/object_00D5E000/object_00D5E000.c @@ -0,0 +1,87 @@ +// // obj_s_yamishop +// #include "assets/jp/objects/object_00D5E000/obj_s_yamishop/obj_s_yamishop_v.vtx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_yamishop/obj_s_yamishop_window_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_yamishop/obj_s_yamishop_t1_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_yamishop/obj_s_yamishop_light_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_yamishop/obj_s_yamishop_door1_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_yamishop/obj_s_yamishop_door2_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_yamishop/obj_s_yamishop_t2_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_yamishop/obj_s_yamishop_t1_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_yamishop/obj_s_yamishop_window_tex_txt.i4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_yamishop/cKF_je_r_obj_s_yamishop_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_yamishop/cKF_bs_r_obj_s_yamishop.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_yamishop/cKF_ckcb_r_obj_s_yamishop_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_yamishop/cKF_kn_obj_s_yamishop_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_yamishop/cKF_c_obj_s_yamishop_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_yamishop/cKF_ds_obj_s_yamishop_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_yamishop/cKF_ba_r_obj_s_yamishop.inc.c" + +// // obj_w_yamishop +// #include "assets/jp/objects/object_00D5E000/obj_w_yamishop/obj_w_yamishop_v.vtx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_yamishop/obj_w_yamishop_window_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_yamishop/obj_w_yamishop_t1_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_yamishop/obj_w_yamishop_light_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_yamishop/obj_w_yamishop_door1_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_yamishop/obj_w_yamishop_door2_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_yamishop/obj_w_yamishop_t2_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_yamishop/obj_w_yamishop_t1_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_yamishop/obj_w_yamishop_window_tex_txt.i4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_yamishop/cKF_je_r_obj_w_yamishop_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_yamishop/cKF_bs_r_obj_w_yamishop.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_yamishop/cKF_ckcb_r_obj_w_yamishop_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_yamishop/cKF_kn_obj_w_yamishop_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_yamishop/cKF_c_obj_w_yamishop_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_yamishop/cKF_ds_obj_w_yamishop_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_yamishop/cKF_ba_r_obj_w_yamishop.inc.c" + +// obj_s_toudai +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/obj_s_toudai_v.vtx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/obj_s_toudai_mirror_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/obj_s_toudai_glass_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/obj_s_toudai_body_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/obj_s_toudai_light_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/obj_s_toudai_lenz_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/obj_s_toudai_arm_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/obj_s_toudai_light_tex_txt.i8.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/obj_s_toudai_arm_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/obj_s_toudai_dai_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/obj_s_toudai_dou_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/obj_s_toudai_plate_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/obj_s_toudai_side_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/obj_s_toudai_tesuri_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/obj_s_toudai_yane_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/obj_s_toudai_glass_tex_pic_ci4_pal.palette.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/obj_s_toudai_glass_tex_pic_ci4.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/cKF_je_r_obj_s_toudai_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/cKF_bs_r_obj_s_toudai.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/cKF_ckcb_r_obj_s_toudai_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/cKF_kn_obj_s_toudai_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/cKF_c_obj_s_toudai_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/cKF_ds_obj_s_toudai_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_s_toudai/cKF_ba_r_obj_s_toudai.inc.c" + +// obj_w_toudai +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/obj_w_toudai_v.vtx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/obj_w_toudai_mirror_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/obj_w_toudai_glass_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/obj_w_toudai_body_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/obj_w_toudai_light_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/obj_w_toudai_lenz_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/obj_w_toudai_arm_model.gfx.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/obj_w_toudai_light_tex_txt.i8.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/obj_w_toudai_arm_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/obj_w_toudai_dai_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/obj_w_toudai_dou_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/obj_w_toudai_plate_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/obj_w_toudai_side_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/obj_w_toudai_tesuri_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/obj_w_toudai_yane_tex_txt.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/obj_w_toudai_glass_tex_pic_ci4_pal.palette.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/obj_w_toudai_glass_tex_pic_ci4.ci4.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/cKF_je_r_obj_w_toudai_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/cKF_bs_r_obj_w_toudai.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/cKF_ckcb_r_obj_w_toudai_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/cKF_kn_obj_w_toudai_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/cKF_c_obj_w_toudai_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/cKF_ds_obj_w_toudai_tbl.inc.c" +// #include "assets/jp/objects/object_00D5E000/obj_w_toudai/cKF_ba_r_obj_w_toudai.inc.c" diff --git a/src/objects/tol_cracker_1/tol_cracker_1.c b/src/objects/tol_cracker_1/tol_cracker_1.c new file mode 100644 index 0000000..d37af15 --- /dev/null +++ b/src/objects/tol_cracker_1/tol_cracker_1.c @@ -0,0 +1,6 @@ +#include "tol_cracker_1.h" + +#include "assets/jp/objects/tol_cracker_1/tol_cracker_1_v.vtx.inc.c" +#include "assets/jp/objects/tol_cracker_1/tol_cracker_1T_model.gfx.inc.c" +#include "assets/jp/objects/tol_cracker_1/tol_cracker_1_pal.palette.inc.c" +#include "assets/jp/objects/tol_cracker_1/tol_cracker_1_tex.ci4.inc.c" diff --git a/src/objects/tol_cracker_1/tol_cracker_1.h b/src/objects/tol_cracker_1/tol_cracker_1.h new file mode 100644 index 0000000..2b86462 --- /dev/null +++ b/src/objects/tol_cracker_1/tol_cracker_1.h @@ -0,0 +1,11 @@ +#ifndef OBJECT_TOL_CRACKER_1_H +#define OBJECT_TOL_CRACKER_1_H + +#include "gbi.h" + +extern Vtx tol_cracker_1_v[]; +extern Gfx tol_cracker_1T_model[]; +extern unsigned short tol_cracker_1_pal[]; +extern unsigned char tol_cracker_1_tex[]; + +#endif diff --git a/src/objects/tol_utiwa_1/tol_utiwa_1.c b/src/objects/tol_utiwa_1/tol_utiwa_1.c new file mode 100644 index 0000000..04c44ff --- /dev/null +++ b/src/objects/tol_utiwa_1/tol_utiwa_1.c @@ -0,0 +1,7 @@ +#include "tol_utiwa_1.h" + +#include "assets/jp/objects/tol_utiwa_1/tol_utiwa_1_v.vtx.inc.c" +#include "assets/jp/objects/tol_utiwa_1/main_utiwa1_model.gfx.inc.c" +#include "assets/jp/objects/tol_utiwa_1/tol_utiwa1_pal.palette.inc.c" +#include "assets/jp/objects/tol_utiwa_1/tol_utiwa_1_main1_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_utiwa_1/tol_utiwa_1_main2_tex_txt.ci4.inc.c" diff --git a/src/objects/tol_utiwa_1/tol_utiwa_1.h b/src/objects/tol_utiwa_1/tol_utiwa_1.h new file mode 100644 index 0000000..3116154 --- /dev/null +++ b/src/objects/tol_utiwa_1/tol_utiwa_1.h @@ -0,0 +1,12 @@ +#ifndef OBJECT_TOL_UTIWA_1_H +#define OBJECT_TOL_UTIWA_1_H + +#include "gbi.h" + +extern Vtx tol_utiwa_1_v[]; +extern Gfx main_utiwa1_model[]; +extern unsigned short tol_utiwa1_pal[]; +extern unsigned char tol_utiwa_1_main1_tex_txt[]; +extern unsigned char tol_utiwa_1_main2_tex_txt[]; + +#endif |
