diff options
Diffstat (limited to 'src')
20 files changed, 235 insertions, 10 deletions
diff --git a/src/objects/tol_cracker_1/tol_cracker_1.h b/src/objects/tol_cracker_1/tol_cracker_1.h index 2b86462..50c1c26 100644 --- a/src/objects/tol_cracker_1/tol_cracker_1.h +++ b/src/objects/tol_cracker_1/tol_cracker_1.h @@ -3,6 +3,11 @@ #include "gbi.h" +/** + * @file tol_cracker_1 + * クラッカー Party Popper + */ + extern Vtx tol_cracker_1_v[]; extern Gfx tol_cracker_1T_model[]; extern unsigned short tol_cracker_1_pal[]; diff --git a/src/objects/tol_hata_01/tol_hata_01.c b/src/objects/tol_hata_01/tol_hata_01.c new file mode 100644 index 0000000..bb07458 --- /dev/null +++ b/src/objects/tol_hata_01/tol_hata_01.c @@ -0,0 +1,8 @@ +#include "tol_hata_01.h" + +#include "assets/jp/objects/tol_hata_01/tol_hata_01_v.vtx.inc.c" +#include "assets/jp/objects/tol_hata_01/tol_hata_e_model.gfx.inc.c" +#include "assets/jp/objects/tol_hata_01/tol_hata_hataT_model.gfx.inc.c" +#include "assets/jp/objects/tol_hata_01/tol_hata_e_pal.palette.inc.c" +#include "assets/jp/objects/tol_hata_01/tol_hata_e_tex.ci4.inc.c" +#include "assets/jp/objects/tol_hata_01/tol_hata_hata_tex_inta_ia8.ia8.inc.c" diff --git a/src/objects/tol_hata_01/tol_hata_01.h b/src/objects/tol_hata_01/tol_hata_01.h new file mode 100644 index 0000000..c17ca49 --- /dev/null +++ b/src/objects/tol_hata_01/tol_hata_01.h @@ -0,0 +1,24 @@ +#ifndef OBJECT_TOL_HATA_01_H +#define OBJECT_TOL_HATA_01_H + +#include "gbi.h" +#include "evw_anime.h" + +/** + * @file tol_hata_01 + * 旗 Flag used in the Sports Fair + */ + +extern Vtx tol_hata_01_v[]; +extern Gfx tol_hata_e_model[]; +extern Gfx tol_hata_hataT_model[]; +extern unsigned short tol_hata_e_pal[]; +extern unsigned char tol_hata_e_tex[]; +extern unsigned char tol_hata_hata_tex_inta_ia8[]; +extern void* tol_hata_01_evw_anime_1_tex_table; +extern u8 tol_hata_01_evw_anime_1_anime_ptn[]; +extern EvwAnimeTexAnime tol_hata_01_evw_anime_1; +extern EvwAnimeScroll tol_hata_01_evw_anime_2[]; +extern EvwAnimeData tol_hata_01_evw_anime[]; + +#endif diff --git a/src/objects/tol_hata_01/tol_hata_01_evw_anime.c b/src/objects/tol_hata_01/tol_hata_01_evw_anime.c new file mode 100644 index 0000000..b792b54 --- /dev/null +++ b/src/objects/tol_hata_01/tol_hata_01_evw_anime.c @@ -0,0 +1,7 @@ +#include "tol_hata_01.h" + +#include "assets/jp/objects/tol_hata_01/tol_hata_01_evw_anime_1_tex_table.inc.c" +#include "assets/jp/objects/tol_hata_01/tol_hata_01_evw_anime_1_anime_ptn.inc.c" +#include "assets/jp/objects/tol_hata_01/tol_hata_01_evw_anime_1.inc.c" +#include "assets/jp/objects/tol_hata_01/tol_hata_01_evw_anime_2.inc.c" +#include "assets/jp/objects/tol_hata_01/tol_hata_01_evw_anime.inc.c" diff --git a/src/objects/tol_kamicup/tol_kamicup.c b/src/objects/tol_kamicup/tol_kamicup.c new file mode 100644 index 0000000..dc239cf --- /dev/null +++ b/src/objects/tol_kamicup/tol_kamicup.c @@ -0,0 +1,6 @@ +#include "tol_kamicup.h" + +#include "assets/jp/objects/tol_kamicup/tol_kamicup_1_v.vtx.inc.c" +#include "assets/jp/objects/tol_kamicup/tol_kamicup_1T_model.gfx.inc.c" +#include "assets/jp/objects/tol_kamicup/tol_kamicup_pal.palette.inc.c" +#include "assets/jp/objects/tol_kamicup/tol_kamicup_tex.ci4.inc.c" diff --git a/src/objects/tol_kamicup/tol_kamicup.h b/src/objects/tol_kamicup/tol_kamicup.h new file mode 100644 index 0000000..752b763 --- /dev/null +++ b/src/objects/tol_kamicup/tol_kamicup.h @@ -0,0 +1,16 @@ +#ifndef OBJECT_TOL_KAMICUP_H +#define OBJECT_TOL_KAMICUP_H + +#include "gbi.h" + +/** + * @file tol_kamicup + * 紙コップ Paper Cup + */ + +extern Vtx tol_kamicup_1_v[]; +extern Gfx tol_kamicup_1T_model[]; +extern unsigned short tol_kamicup_pal[]; +extern unsigned char tol_kamicup_tex[]; + +#endif diff --git a/src/objects/tol_keitai_1/keitai_off1.c b/src/objects/tol_keitai_1/keitai_off1.c new file mode 100644 index 0000000..f0ab81d --- /dev/null +++ b/src/objects/tol_keitai_1/keitai_off1.c @@ -0,0 +1,7 @@ +#include "tol_keitai_1.h" + +#include "assets/jp/objects/tol_keitai_1/cKF_ckcb_r_tol_keitai_1_keitai_off1_tbl.inc.c" +#include "assets/jp/objects/tol_keitai_1/cKF_kn_tol_keitai_1_keitai_off1_tbl.inc.c" +#include "assets/jp/objects/tol_keitai_1/cKF_c_tol_keitai_1_keitai_off1_tbl.inc.c" +#include "assets/jp/objects/tol_keitai_1/cKF_ds_tol_keitai_1_keitai_off1_tbl.inc.c" +#include "assets/jp/objects/tol_keitai_1/cKF_ba_r_tol_keitai_1_keitai_off1.inc.c" diff --git a/src/objects/tol_keitai_1/keitai_on1.c b/src/objects/tol_keitai_1/keitai_on1.c new file mode 100644 index 0000000..25e1f92 --- /dev/null +++ b/src/objects/tol_keitai_1/keitai_on1.c @@ -0,0 +1,7 @@ +#include "tol_keitai_1.h" + +#include "assets/jp/objects/tol_keitai_1/cKF_ckcb_r_tol_keitai_1_keitai_on1_tbl.inc.c" +#include "assets/jp/objects/tol_keitai_1/cKF_kn_tol_keitai_1_keitai_on1_tbl.inc.c" +#include "assets/jp/objects/tol_keitai_1/cKF_c_tol_keitai_1_keitai_on1_tbl.inc.c" +#include "assets/jp/objects/tol_keitai_1/cKF_ds_tol_keitai_1_keitai_on1_tbl.inc.c" +#include "assets/jp/objects/tol_keitai_1/cKF_ba_r_tol_keitai_1_keitai_on1.inc.c" diff --git a/src/objects/tol_keitai_1/tol_keitai_1.c b/src/objects/tol_keitai_1/tol_keitai_1.c new file mode 100644 index 0000000..e5e6637 --- /dev/null +++ b/src/objects/tol_keitai_1/tol_keitai_1.c @@ -0,0 +1,12 @@ +#include "tol_keitai_1.h" + +#include "assets/jp/objects/tol_keitai_1/tol_keitai_1_v.vtx.inc.c" +#include "assets/jp/objects/tol_keitai_1/main1_keitai1_model.gfx.inc.c" +#include "assets/jp/objects/tol_keitai_1/main2_keitai1_model.gfx.inc.c" +#include "assets/jp/objects/tol_keitai_1/tol_keitai_1_pal.palette.inc.c" +#include "assets/jp/objects/tol_keitai_1/tol_keitai_1_ueura1_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_keitai_1/tol_keitai_1_ueomote1_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_keitai_1/tol_keitai_1_shitaura1_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_keitai_1/tol_keitai_1_shitaomote1_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_keitai_1/cKF_je_r_tol_keitai_1_tbl.inc.c" +#include "assets/jp/objects/tol_keitai_1/cKF_bs_r_tol_keitai_1.inc.c" diff --git a/src/objects/tol_keitai_1/tol_keitai_1.h b/src/objects/tol_keitai_1/tol_keitai_1.h new file mode 100644 index 0000000..00aa025 --- /dev/null +++ b/src/objects/tol_keitai_1/tol_keitai_1.h @@ -0,0 +1,37 @@ +#ifndef OBJECT_TOL_KEITAI_1_H +#define OBJECT_TOL_KEITAI_1_H + +#include "gbi.h" +#include "c_keyframe.h" + +/** + * @file tol_keitai_1 + * 携帯 Cell Phone + */ + +extern u8 cKF_ckcb_r_tol_keitai_1_keitai_off1_tbl[]; +extern s16 cKF_kn_tol_keitai_1_keitai_off1_tbl[]; +extern s16 cKF_c_tol_keitai_1_keitai_off1_tbl[]; +extern Keyframe cKF_ds_tol_keitai_1_keitai_off1_tbl[]; +extern BaseAnimationR cKF_ba_r_tol_keitai_1_keitai_off1; +extern u8 cKF_ckcb_r_tol_keitai_1_keitai_on1_tbl[]; +extern s16 cKF_kn_tol_keitai_1_keitai_on1_tbl[]; +extern s16 cKF_c_tol_keitai_1_keitai_on1_tbl[]; +extern Keyframe cKF_ds_tol_keitai_1_keitai_on1_tbl[]; +extern BaseAnimationR cKF_ba_r_tol_keitai_1_keitai_on1; +extern Vtx tol_keitai_1_v[]; +extern Gfx main1_keitai1_model[]; +extern Gfx main2_keitai1_model[]; +extern unsigned short tol_keitai_1_pal[]; +// 上裏 Top half back side +extern unsigned char tol_keitai_1_ueura1_tex_txt[]; +// 上面 Top half front side +extern unsigned char tol_keitai_1_ueomote1_tex_txt[]; +// 下裏 Bottom half back side +extern unsigned char tol_keitai_1_shitaura1_tex_txt[]; +// 下面 Bottom half front side +extern unsigned char tol_keitai_1_shitaomote1_tex_txt[]; +extern JointElemR cKF_je_r_tol_keitai_1_tbl[]; +extern BaseSkeletonR cKF_bs_r_tol_keitai_1; + +#endif diff --git a/src/objects/tol_kenjyu_1/tol_kenjyu_1.c b/src/objects/tol_kenjyu_1/tol_kenjyu_1.c new file mode 100644 index 0000000..a4f6a17 --- /dev/null +++ b/src/objects/tol_kenjyu_1/tol_kenjyu_1.c @@ -0,0 +1,6 @@ +#include "tol_kenjyu_1.h" + +#include "assets/jp/objects/tol_kenjyu_1/tol_kenjyu_1_v.vtx.inc.c" +#include "assets/jp/objects/tol_kenjyu_1/tol_kenjyu_1T_model.gfx.inc.c" +#include "assets/jp/objects/tol_kenjyu_1/tol_kenjyu_1_pal.palette.inc.c" +#include "assets/jp/objects/tol_kenjyu_1/tol_kenjyu_1_tex.ci4.inc.c" diff --git a/src/objects/tol_kenjyu_1/tol_kenjyu_1.h b/src/objects/tol_kenjyu_1/tol_kenjyu_1.h new file mode 100644 index 0000000..da805f3 --- /dev/null +++ b/src/objects/tol_kenjyu_1/tol_kenjyu_1.h @@ -0,0 +1,16 @@ +#ifndef OBJECT_TOL_KENJYU_1_H +#define OBJECT_TOL_KENJYU_1_H + +#include "gbi.h" + +/** + * @file tol_kenjyu_1 + * 拳銃 Starting Pistol for the Sports Fair Foot Race + */ + +extern Vtx tol_kenjyu_1_v[]; +extern Gfx tol_kenjyu_1T_model[]; +extern unsigned short tol_kenjyu_1_pal[]; +extern unsigned char tol_kenjyu_1_tex[]; + +#endif diff --git a/src/objects/tol_npcsao_1/tol_npcsao_1.c b/src/objects/tol_npcsao_1/tol_npcsao_1.c new file mode 100644 index 0000000..b340f14 --- /dev/null +++ b/src/objects/tol_npcsao_1/tol_npcsao_1.c @@ -0,0 +1,7 @@ +#include "tol_npcsao_1.h" + +#include "assets/jp/objects/tol_npcsao_1/tol_npcsao_1_v.vtx.inc.c" +#include "assets/jp/objects/tol_npcsao_1/tol_npcsao_1_sao_model.gfx.inc.c" +#include "assets/jp/objects/tol_npcsao_1/tol_npcsao_1_uki_model.gfx.inc.c" +#include "assets/jp/objects/tol_npcsao_1/tol_npcsao_1_pal.palette.inc.c" +#include "assets/jp/objects/tol_npcsao_1/tol_npcsao_1_tex.ci4.inc.c" diff --git a/src/objects/tol_npcsao_1/tol_npcsao_1.h b/src/objects/tol_npcsao_1/tol_npcsao_1.h new file mode 100644 index 0000000..deb8b10 --- /dev/null +++ b/src/objects/tol_npcsao_1/tol_npcsao_1.h @@ -0,0 +1,18 @@ +#ifndef OBJECT_TOL_NPCSAO_1_H +#define OBJECT_TOL_NPCSAO_1_H + +#include "gbi.h" + +/** + * @file tol_npcsao_1 + * NPC竿 NPC Fishing Rod + */ + +extern Vtx tol_npcsao_1_v[]; +extern Gfx tol_npcsao_1_sao_model[]; +// 浮き Fishing Bobber +extern Gfx tol_npcsao_1_uki_model[]; +extern unsigned short tol_npcsao_1_pal[]; +extern unsigned char tol_npcsao_1_tex[]; + +#endif diff --git a/src/objects/tol_tamaire/ef_tamaire01.c b/src/objects/tol_tamaire/ef_tamaire01.c new file mode 100644 index 0000000..6843a6c --- /dev/null +++ b/src/objects/tol_tamaire/ef_tamaire01.c @@ -0,0 +1,7 @@ +#include "tol_tamaire.h" + +#include "assets/jp/objects/tol_tamaire/ef_tamaire01_r_v.vtx.inc.c" +#include "assets/jp/objects/tol_tamaire/tama01_model.gfx.inc.c" +#include "assets/jp/objects/tol_tamaire/ef_tamaire01_r_pal.palette.inc.c" +#include "assets/jp/objects/tol_tamaire/tama01_r_tex.ci4.inc.c" +#include "assets/jp/objects/tol_tamaire/tama01_w_tex.ci4.inc.c" diff --git a/src/objects/tol_tamaire/tol_tamaire.c b/src/objects/tol_tamaire/tol_tamaire.c new file mode 100644 index 0000000..713e17c --- /dev/null +++ b/src/objects/tol_tamaire/tol_tamaire.c @@ -0,0 +1,11 @@ +#include "tol_tamaire.h" + +#include "assets/jp/objects/tol_tamaire/tol_tamaire_v.vtx.inc.c" +#include "assets/jp/objects/tol_tamaire/tol_tamaire_model.gfx.inc.c" +#include "assets/jp/objects/tol_tamaire/tol_tamaire_pal.palette.inc.c" +#include "assets/jp/objects/tol_tamaire/tol_tamaire_r1_tex.ci4.inc.c" +#include "assets/jp/objects/tol_tamaire/tol_tamaire_r2_tex.ci4.inc.c" +#include "assets/jp/objects/tol_tamaire/tol_tamaire_r3_tex.ci4.inc.c" +#include "assets/jp/objects/tol_tamaire/tol_tamaire_w1_tex.ci4.inc.c" +#include "assets/jp/objects/tol_tamaire/tol_tamaire_w2_tex.ci4.inc.c" +#include "assets/jp/objects/tol_tamaire/tol_tamaire_w3_tex.ci4.inc.c" diff --git a/src/objects/tol_tamaire/tol_tamaire.h b/src/objects/tol_tamaire/tol_tamaire.h new file mode 100644 index 0000000..f617e84 --- /dev/null +++ b/src/objects/tol_tamaire/tol_tamaire.h @@ -0,0 +1,26 @@ +#ifndef OBJECT_TOL_TAMAIRE_H +#define OBJECT_TOL_TAMAIRE_H + +#include "gbi.h" + +/** + * @file tol_tamaire + * 玉入れ Balls for the Sports Fair Ball Toss + */ + +extern Vtx ef_tamaire01_r_v[]; +extern Gfx tama01_model[]; +extern unsigned short ef_tamaire01_r_pal[]; +extern unsigned char tama01_r_tex[]; +extern unsigned char tama01_w_tex[]; +extern Vtx tol_tamaire_v[]; +extern Gfx tol_tamaire_model[]; +extern unsigned short tol_tamaire_pal[]; +extern unsigned char tol_tamaire_r1_tex[]; +extern unsigned char tol_tamaire_r2_tex[]; +extern unsigned char tol_tamaire_r3_tex[]; +extern unsigned char tol_tamaire_w1_tex[]; +extern unsigned char tol_tamaire_w2_tex[]; +extern unsigned char tol_tamaire_w3_tex[]; + +#endif diff --git a/src/objects/tol_utiwa_1/tol_utiwa_1.h b/src/objects/tol_utiwa_1/tol_utiwa_1.h index 3116154..15e8df5 100644 --- a/src/objects/tol_utiwa_1/tol_utiwa_1.h +++ b/src/objects/tol_utiwa_1/tol_utiwa_1.h @@ -3,6 +3,11 @@ #include "gbi.h" +/** + * @file tol_utiwa_1 + * 団扇 Firework Festival Blue Uchiwa Fan + */ + extern Vtx tol_utiwa_1_v[]; extern Gfx main_utiwa1_model[]; extern unsigned short tol_utiwa1_pal[]; diff --git a/src/overlays/actors/ovl_Tools/ac_tools.c b/src/overlays/actors/ovl_Tools/ac_tools.c index 1bfaaf4..0a639a8 100644 --- a/src/overlays/actors/ovl_Tools/ac_tools.c +++ b/src/overlays/actors/ovl_Tools/ac_tools.c @@ -95,15 +95,15 @@ ToolActor* aTOL_birth_proc(ToolName toolName, s32 arg1, ToolActor* toolActor, Ga ACTOR_T_TAMA, ACTOR_T_TAMA, }; static s16 objectTable[] = { - OBJECT_TOL_UMB_01, OBJECT_TOL_UMB_02, OBJECT_TOL_UMB_03, OBJECT_TOL_UMB_04, OBJECT_TOL_UMB_05, - OBJECT_TOL_UMB_06, OBJECT_TOL_UMB_07, OBJECT_TOL_UMB_08, OBJECT_TOL_UMB_09, OBJECT_TOL_UMB_10, - OBJECT_TOL_UMB_11, OBJECT_TOL_UMB_12, OBJECT_TOL_UMB_13, OBJECT_TOL_UMB_14, OBJECT_TOL_UMB_15, - OBJECT_TOL_UMB_16, OBJECT_TOL_UMB_17, OBJECT_TOL_UMB_18, OBJECT_TOL_UMB_19, OBJECT_TOL_UMB_20, - OBJECT_TOL_UMB_21, OBJECT_TOL_UMB_22, OBJECT_TOL_UMB_23, OBJECT_TOL_UMB_24, OBJECT_TOL_UMB_25, - OBJECT_TOL_UMB_26, OBJECT_TOL_UMB_27, OBJECT_TOL_UMB_28, OBJECT_TOL_UMB_29, OBJECT_TOL_UMB_30, - OBJECT_TOL_UMB_31, OBJECT_TOL_UMB_32, OBJECT_45, OBJECT_TOL_UTIWA_1, OBJECT_TOL_UTIWA_1, - OBJECT_TOL_CRACKER_1, OBJECT_16, OBJECT_6, OBJECT_371, OBJECT_370, - OBJECT_391, OBJECT_391, OBJECT_391, OBJECT_391, + OBJECT_TOL_UMB_01, OBJECT_TOL_UMB_02, OBJECT_TOL_UMB_03, OBJECT_TOL_UMB_04, OBJECT_TOL_UMB_05, + OBJECT_TOL_UMB_06, OBJECT_TOL_UMB_07, OBJECT_TOL_UMB_08, OBJECT_TOL_UMB_09, OBJECT_TOL_UMB_10, + OBJECT_TOL_UMB_11, OBJECT_TOL_UMB_12, OBJECT_TOL_UMB_13, OBJECT_TOL_UMB_14, OBJECT_TOL_UMB_15, + OBJECT_TOL_UMB_16, OBJECT_TOL_UMB_17, OBJECT_TOL_UMB_18, OBJECT_TOL_UMB_19, OBJECT_TOL_UMB_20, + OBJECT_TOL_UMB_21, OBJECT_TOL_UMB_22, OBJECT_TOL_UMB_23, OBJECT_TOL_UMB_24, OBJECT_TOL_UMB_25, + OBJECT_TOL_UMB_26, OBJECT_TOL_UMB_27, OBJECT_TOL_UMB_28, OBJECT_TOL_UMB_29, OBJECT_TOL_UMB_30, + OBJECT_TOL_UMB_31, OBJECT_TOL_UMB_32, OBJECT_TOL_KEITAI_1, OBJECT_TOL_UTIWA_1, OBJECT_TOL_UTIWA_1, + OBJECT_TOL_CRACKER_1, OBJECT_TOL_KENJYU_1, OBJECT_TOL_HATA_01, OBJECT_TOL_KAMICUP, OBJECT_TOL_NPCSAO_1, + OBJECT_TOL_TAMAIRE, OBJECT_TOL_TAMAIRE, OBJECT_TOL_TAMAIRE, OBJECT_TOL_TAMAIRE, }; s32 pad[3] UNUSED; ToolActor* ret = NULL; diff --git a/src/overlays/actors/ovl_Train_Window/ac_train_window.c b/src/overlays/actors/ovl_Train_Window/ac_train_window.c index 299198f..9b89edf 100644 --- a/src/overlays/actors/ovl_Train_Window/ac_train_window.c +++ b/src/overlays/actors/ovl_Train_Window/ac_train_window.c @@ -35,7 +35,7 @@ extern Gfx rom_train_out_shineglass_modelT[]; extern u8 till_data[15][2]; extern u16 aTrainWindow_tree_pal_table[15][16]; -extern EvwAnimeUnk aTrainWindow_evw_anime_data; +extern EvwAnimeData aTrainWindow_evw_anime_data; s32 aTrainWindow_NoDraw(Actor* thisx, Game* game); s32 aTrainWindow_DrawGoneOutTunnel(Actor* thisx, Game* game); |