diff options
| author | emilybrooks <emilybrooksemilybrooks@gmail.com> | 2024-09-21 13:03:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-21 13:03:08 -0700 |
| commit | 946ee8e9c28a04c7b0a485c9b49543677112d5ec (patch) | |
| tree | 7c661497815e426c6e6cb961a8add161985f4fcc /src/objects | |
| parent | 2c7d61be83bedf7252cb0dccc0c681bfb6bb29da (diff) | |
clchest03 matched and hal_chest02 cleanup (#213)
* initial commit
* func_80A70C60_jp
* func_80A70CF4_jp
* fully matching
* inported data
* improved furniture actor profile struct
* extracted spooky wardrobe object
* extracted clchest03 object
* forgot
Diffstat (limited to 'src/objects')
4 files changed, 126 insertions, 0 deletions
diff --git a/src/objects/furniture/int_sum_clchest03/int_sum_clchest03.c b/src/objects/furniture/int_sum_clchest03/int_sum_clchest03.c new file mode 100644 index 0000000..af0c5ce --- /dev/null +++ b/src/objects/furniture/int_sum_clchest03/int_sum_clchest03.c @@ -0,0 +1,44 @@ +#include "int_sum_clchest03.h" + +#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_pal01_pal.palette.inc.c" +u8 int_sum_clchest03_hiki_txt[] = { +#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_hiki_txt.ci4.inc.c" +}; +u8 int_sum_clchest03_hikiura_txt[] = { +#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_hikiura_txt.ci4.inc.c" +}; +u8 int_sum_clchest03_top_txt[] = { +#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_top_txt.ci4.inc.c" +}; +u8 int_sum_clchest03_stand_txt[] = { +#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_stand_txt.ci4.inc.c" +}; +u8 int_sum_clchest03_front_txt[] = { +#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_front_txt.ci4.inc.c" +}; +u8 int_sum_clchest03_side_txt[] = { +#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_side_txt.ci4.inc.c" +}; +u8 int_sum_clchest03_hisasi_txt[] = { +#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_hisasi_txt.ci4.inc.c" +}; +s32 pad15D0720[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; +#include "assets/jp/objects/furniture/int_sum_clchest03/cKF_ckcb_r_int_sum_clchest03_tbl.inc.c" +#include "assets/jp/objects/furniture/int_sum_clchest03/cKF_kn_int_sum_clchest03_tbl.inc.c" +#include "assets/jp/objects/furniture/int_sum_clchest03/cKF_c_int_sum_clchest03_tbl.inc.c" +#include "assets/jp/objects/furniture/int_sum_clchest03/cKF_ds_int_sum_clchest03_tbl.inc.c" +#include "assets/jp/objects/furniture/int_sum_clchest03/cKF_ba_r_int_sum_clchest03.inc.c" +#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_v.vtx.inc.c" +#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_door_model.gfx.inc.c" +#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_base_model.gfx.inc.c" +#include "assets/jp/objects/furniture/int_sum_clchest03/cKF_je_r_int_sum_clchest03_tbl.inc.c" +#include "assets/jp/objects/furniture/int_sum_clchest03/cKF_bs_r_int_sum_clchest03.inc.c" diff --git a/src/objects/furniture/int_sum_clchest03/int_sum_clchest03.h b/src/objects/furniture/int_sum_clchest03/int_sum_clchest03.h new file mode 100644 index 0000000..328a1bf --- /dev/null +++ b/src/objects/furniture/int_sum_clchest03/int_sum_clchest03.h @@ -0,0 +1,26 @@ +#ifndef OBJECT_INT_SUM_CLCHEST03_H +#define OBJECT_INT_SUM_CLCHEST03_H + +#include "gbi.h" +#include "c_keyframe.h" + +extern u16 int_sum_clchest03_pal01_pal[]; +extern u8 int_sum_clchest03_hiki_txt[]; +extern u8 int_sum_clchest03_hikiura_txt[]; +extern u8 int_sum_clchest03_top_txt[]; +extern u8 int_sum_clchest03_stand_txt[]; +extern u8 int_sum_clchest03_front_txt[]; +extern u8 int_sum_clchest03_side_txt[]; +extern u8 int_sum_clchest03_hisasi_txt[]; +extern u8 cKF_ckcb_r_int_sum_clchest03_tbl[]; +extern s16 cKF_kn_int_sum_clchest03_tbl[]; +extern s16 cKF_c_int_sum_clchest03_tbl[]; +extern Keyframe cKF_ds_int_sum_clchest03_tbl[]; +extern BaseAnimationR cKF_ba_r_int_sum_clchest03; +extern Vtx int_sum_clchest03_v[]; +extern Gfx int_sum_clchest03_door_model[]; +extern Gfx int_sum_clchest03_base_model[]; +extern JointElemR cKF_je_r_int_sum_clchest03_tbl[]; +extern BaseSkeletonR cKF_bs_r_int_sum_clchest03; + +#endif diff --git a/src/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02.c b/src/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02.c new file mode 100644 index 0000000..f8340c8 --- /dev/null +++ b/src/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02.c @@ -0,0 +1,31 @@ +#include "int_sum_hal_chest02.h" + +#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_pal.palette.inc.c" +u8 int_sum_hal_chest02_hiki_tex_txt[] = { +#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_hiki_tex_txt.ci4.inc.c" +}; +u8 int_sum_hal_chest02_hiite_tex_txt[] = { +#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_hiite_tex_txt.ci4.inc.c" +}; +u8 int_sum_hal_chest02_top_tex_txt[] = { +#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_top_tex_txt.ci4.inc.c" +}; +u8 int_sum_hal_chest02_front_tex_txt[] = { +#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_front_tex_txt.ci4.inc.c" +}; +u8 int_sum_hal_chest02_back_tex_txt[] = { +#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_back_tex_txt.ci4.inc.c" +}; +u8 int_sum_hal_chest02_kuki_tex_txt[] = { +#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_kuki_tex_txt.ci4.inc.c" +}; +#include "assets/jp/objects/furniture/int_sum_hal_chest02/cKF_ckcb_r_int_sum_hal_chest02_tbl.inc.c" +#include "assets/jp/objects/furniture/int_sum_hal_chest02/cKF_kn_int_sum_hal_chest02_tbl.inc.c" +#include "assets/jp/objects/furniture/int_sum_hal_chest02/cKF_c_int_sum_hal_chest02_tbl.inc.c" +#include "assets/jp/objects/furniture/int_sum_hal_chest02/cKF_ds_int_sum_hal_chest02_tbl.inc.c" +#include "assets/jp/objects/furniture/int_sum_hal_chest02/cKF_ba_r_int_sum_hal_chest02.inc.c" +#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_v.vtx.inc.c" +#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest01_door_model.gfx.inc.c" +#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_base_model.gfx.inc.c" +#include "assets/jp/objects/furniture/int_sum_hal_chest02/cKF_je_r_int_sum_hal_chest02_tbl.inc.c" +#include "assets/jp/objects/furniture/int_sum_hal_chest02/cKF_bs_r_int_sum_hal_chest02.inc.c" diff --git a/src/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02.h b/src/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02.h new file mode 100644 index 0000000..f9b0593 --- /dev/null +++ b/src/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02.h @@ -0,0 +1,25 @@ +#ifndef OBJECT_INT_SUM_HAL_CHEST02_H +#define OBJECT_INT_SUM_HAL_CHEST02_H + +#include "gbi.h" +#include "c_keyframe.h" + +extern u16 int_sum_hal_chest02_pal[]; +extern u8 int_sum_hal_chest02_hiki_tex_txt[]; +extern u8 int_sum_hal_chest02_hiite_tex_txt[]; +extern u8 int_sum_hal_chest02_top_tex_txt[]; +extern u8 int_sum_hal_chest02_front_tex_txt[]; +extern u8 int_sum_hal_chest02_back_tex_txt[]; +extern u8 int_sum_hal_chest02_kuki_tex_txt[]; +extern u8 cKF_ckcb_r_int_sum_hal_chest02_tbl[]; +extern s16 cKF_kn_int_sum_hal_chest02_tbl[]; +extern s16 cKF_c_int_sum_hal_chest02_tbl[]; +extern Keyframe cKF_ds_int_sum_hal_chest02_tbl[]; +extern BaseAnimationR cKF_ba_r_int_sum_hal_chest02; +extern Vtx int_sum_hal_chest02_v[]; +extern Gfx int_sum_hal_chest01_door_model[]; +extern Gfx int_sum_hal_chest02_base_model[]; +extern JointElemR cKF_je_r_int_sum_hal_chest02_tbl[]; +extern BaseSkeletonR cKF_bs_r_int_sum_hal_chest02; + +#endif |
