add aFTR_rig_c data

This commit is contained in:
Prakxo
2024-03-09 19:49:09 +01:00
parent 0acf3b23f7
commit 1d962b9acf
85 changed files with 661 additions and 16 deletions
+4
View File
@@ -933,6 +933,10 @@ audio.c:
.bss: [0x8148DA78, 0x8148DA7C]
ac_weather_fine.c:
.data: [0x806D1DA0, 0x806D1DB8]
f_furniture.c:
.text: [0x8062E96C, 0x80641254]
.rodata: [0x8064D360,0x8064D4D0]
.data: [0x806D4D40,0x806E02A0]
# dataobject.obj files
data/combi/data_combi.c:
+1 -1
View File
@@ -115,7 +115,7 @@ extern u16 sAdo_Get_WalkLabel(int type);
extern int sAdo_Get_KokeruLabel(int type);
extern void sAdo_SceneMode(u8 mode);
extern void sAdo_RoomIncectPos(u32 f, u16 u, xyz_t* pos);
extern s8 sAdo_RoomIncectPos(u32 f, u16 u, xyz_t* pos);
extern void sAdo_FurnitureInstPos(u32 f, xyz_t* pos);
extern void sAdo_Set_ongenpos_refuse_fg(int state);
+1 -1
View File
@@ -52,7 +52,7 @@ extern void Na_RoomType(u8);
extern void Na_Museum(u8);
extern void Na_SoftReset();
extern void Na_SceneMode(u8);
extern void Na_RoomIncectPos(int, u16, u16, f32);
extern s8 Na_RoomIncectPos(int, u16, u16, f32);
extern void Na_FurnitureInstPos(int, u16, f32);
extern int Na_GetSoundFrameCounter();
extern void Na_kazagurumaLevel(f32);
+2 -2
View File
@@ -443,13 +443,13 @@ extern void sAdo_SceneMode(u8 mode) {
Na_SceneMode(mode);
}
extern void sAdo_RoomIncectPos(u32 f, u16 u, xyz_t* pos) {
extern s8 sAdo_RoomIncectPos(u32 f, u16 u, xyz_t* pos) {
u16 scalc;
f32 fcalc;
sAdo_Calc_MicPosition_forLevel(&fcalc, &scalc, pos);
Na_RoomIncectPos(f, u, scalc, fcalc);
return Na_RoomIncectPos(f, u, scalc, fcalc);
}
extern void sAdo_FurnitureInstPos(u32 f, xyz_t* pos) {
+1 -1
View File
@@ -53,7 +53,7 @@ static Gfx* fIJS_GetTwoTileGfx(int x0, int y0, int x1, int y1, GAME* game) {
return two_tex_scroll_dolphin(game->graph, 0, x0, y0, 32, 32, 1, x1, y1, 32, 32);
}
static void fNS_dw(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data) {
static void fIJS_dw(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data) {
GAME_PLAY* play = (GAME_PLAY*)game;
u32 ctr_ofs;
Gfx* scroll;
+4
View File
@@ -53,6 +53,10 @@ static void fIJT_dw(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8*
CLOSE_DISP(game->graph);
}
static void fIJT_dt(FTR_ACTOR* ftr_actor, u8* data){
}
static aFTR_vtable_c fIJT_func = {
&fIJT_ct,
&fIJT_mv,
+9
View File
@@ -4,6 +4,15 @@ static void aKonCracker_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* gam
static void aKonCracker_dw(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data);
static void aKonCracker_dt(FTR_ACTOR* ftr_actor, u8* data);
extern cKF_Skeleton_R_c cKF_bs_r_int_kon_cracker;
extern cKF_Animation_R_c cKF_ba_r_int_kon_cracker;
aFTR_rig_c aKonCracker_sklkey {
cKF_bs_r_int_kon_cracker,
cKF_ba_r_int_kon_cracker,
0.5f,
};
static void aKonCracker_ct(FTR_ACTOR* ftr_actor, u8* data) {
}
+4 -4
View File
@@ -9,14 +9,14 @@ extern Gfx int_kon_musya_dou_onT_model[];
extern Gfx int_kon_musya_hako_on_model[];
extern Gfx int_kon_musya_tare_onT_model[];
static void aKonJihanki02_ct(FTR_ACTOR* ftr_actor, u8* data){
static void aKonMusya_ct(FTR_ACTOR* ftr_actor, u8* data){
}
static void aKonJihanki02_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data){
static void aKonMusya_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data){
}
static void aKonJihanki02_dw(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data){
static void aKonMusya_dw(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data){
OPEN_DISP(game->graph);
@@ -32,7 +32,7 @@ static void aKonJihanki02_dw(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* g
CLOSE_DISP(game->graph);
}
static void aKonJihanki02_dt(FTR_ACTOR* ftr_actor, u8* data){
static void aKonMusya_dt(FTR_ACTOR* ftr_actor, u8* data){
}
+10
View File
@@ -2,6 +2,16 @@ extern aFTR_rig_c aKonSisiodosi_sklkey;
static void aKonSisiodosi_ct(FTR_ACTOR* ftr_actor, u8* data);
static void aKonSisiodosi_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data);
extern cKF_Skeleton_R_c cKF_bs_r_int_kon_sisiodosi;
extern cKF_Animation_R_c cKF_ba_r_int_kon_sisiodosi;
aFTR_rig_c aKonSisiodosi_sklkey {
cKF_bs_r_int_kon_sisiodosi,
cKF_ba_r_int_kon_sisiodosi,
0.5f,
};
static void aKonSisiodosi_ct(FTR_ACTOR* ftr_actor, u8* data){
ftr_actor->keyframe.frame_control.current_frame = (int)(1.0f + RANDOM_F(119.0f));
}
+1 -1
View File
@@ -17,7 +17,7 @@ static void aKonsnowtansu_ct(FTR_ACTOR* ftr_actor, u8* data){
}
static void aKonsnowtansu_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data){
static void aKonSnowtansu_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data){
if(Common_Get(clip).my_room_clip != NULL){
Common_Get(clip).my_room_clip->open_close_common_move_proc(ftr_actor,my_room_actor,game,1.0f,16.0f);
+1 -1
View File
@@ -27,7 +27,7 @@ static void aKonWaclock_dw(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* gam
cKF_Si3_draw_R_SV(game, &ftr_actor->keyframe, mtx , aKonWaclock_DwBefore, aKonWaclock_DwAfter, ftr_actor);
}
static void aKonwaclock_ct(FTR_ACTOR* ftr_actor, u8* data){
static void aKonWaclock_ct(FTR_ACTOR* ftr_actor, u8* data){
cKF_SkeletonInfo_R_c* keyf;
keyf = &ftr_actor->keyframe;
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aNogAmenbo_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_nog_amenbo;
extern cKF_Animation_R_c cKF_ba_r_int_nog_amenbo;
aFTR_rig_c aNogAmenbo_key_anime_data {
cKF_bs_r_int_nog_amenbo,
cKF_ba_r_int_nog_amenbo,
0.5f,
};
aFTR_PROFILE iam_nog_amenbo = {
NULL,
NULL,
+10
View File
@@ -1,5 +1,15 @@
extern aFTR_rig_c aNogDango_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_nog_dango;
extern cKF_Animation_R_c cKF_ba_r_int_nog_dango;
aFTR_rig_c aNogDango_key_anime_data {
cKF_bs_r_int_nog_dango,
cKF_ba_r_int_nog_dango,
0.5f,
};
aFTR_PROFILE iam_nog_dango = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aNogIsidai_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_nog_isidai;
extern cKF_Animation_R_c cKF_ba_r_int_nog_isidai;
aFTR_rig_c aNogIsidai_key_anime_data {
cKF_bs_r_int_nog_isidai,
cKF_ba_r_int_nog_isidai,
0.5f,
};
aFTR_PROFILE iam_nog_isidai = {
NULL,
NULL,
+9
View File
@@ -1,6 +1,15 @@
extern aFTR_rig_c aNogKa_key_anime_data;
static void fNKA_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data);
extern cKF_Skeleton_R_c cKF_bs_r_int_nog_ka;
extern cKF_Animation_R_c cKF_ba_r_int_nog_ka;
aFTR_rig_c aNogKa_key_anime_data {
cKF_bs_r_int_nog_ka,
cKF_ba_r_int_nog_ka,
0.5f,
};
static void fNKA_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data) {
if(aFTR_CAN_PLAY_SE(ftr_actor)) {
sAdo_RoomIncectPos((u32) ftr_actor, 0x43, &ftr_actor->position);
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aNogKaeru_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_nog_kaeru;
extern cKF_Animation_R_c cKF_ba_r_int_nog_kaeru;
aFTR_rig_c aNogKaeru_key_anime_data {
cKF_bs_r_int_nog_kaeru,
cKF_ba_r_int_nog_kaeru,
0.5f,
};
static void fNKR_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data) {
if (aFTR_CAN_PLAY_SE(ftr_actor)) {
sAdo_RoomIncectPos((u32)ftr_actor, 0x41, &ftr_actor->position);
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aNogKera_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_nog_kera;
extern cKF_Animation_R_c cKF_ba_r_int_nog_kera;
aFTR_rig_c aNogKera_key_anime_data {
cKF_bs_r_int_nog_kera,
cKF_ba_r_int_nog_kera,
0.5f,
};
static void fNgKr_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data) {
if (aFTR_CAN_PLAY_SE(ftr_actor)) {
sAdo_RoomIncectPos((u32)ftr_actor, 0x42, &ftr_actor->position);
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aNogKumo_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_nog_kumo;
extern cKF_Animation_R_c cKF_ba_r_int_nog_kumo;
aFTR_rig_c aNogKumo_key_anime_data {
cKF_bs_r_int_nog_kumo,
cKF_ba_r_int_nog_kumo,
0.5f,
};
aFTR_PROFILE iam_nog_kumo = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aNogKurage_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_nog_kurage;
extern cKF_Animation_R_c cKF_ba_r_int_nog_kurage;
aFTR_rig_c aNogKurage_key_anime_data {
cKF_bs_r_int_nog_kurage,
cKF_ba_r_int_nog_kurage,
0.5f,
};
aFTR_PROFILE iam_nog_kurage = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aNogMaimai_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_nog_maimai;
extern cKF_Animation_R_c cKF_ba_r_int_nog_maimai;
aFTR_rig_c aNogMaimai_key_anime_data {
cKF_bs_r_int_nog_maimai,
cKF_ba_r_int_nog_maimai,
0.5f,
};
aFTR_PROFILE iam_nog_maimai = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aNogMedaka_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_nog_medaka;
extern cKF_Animation_R_c cKF_ba_r_int_nog_medaka;
aFTR_rig_c aNogMedaka_key_anime_data {
cKF_bs_r_int_nog_medaka,
cKF_ba_r_int_nog_medaka,
0.5f,
};
aFTR_PROFILE iam_nog_medaka = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aNogMino_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_nog_mino;
extern cKF_Animation_R_c cKF_ba_r_int_nog_mino;
aFTR_rig_c aNogMino_key_anime_data {
cKF_bs_r_int_nog_mino,
cKF_ba_r_int_nog_mino,
0.5f,
};
aFTR_PROFILE iam_nog_mino = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aNogPiraluku_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_nog_piraluku;
extern cKF_Animation_R_c cKF_ba_r_int_nog_piraluku;
aFTR_rig_c aNogPiraluku_key_anime_data {
cKF_bs_r_int_nog_piraluku,
cKF_ba_r_int_nog_piraluku,
0.5f,
};
aFTR_PROFILE iam_nog_piraluku = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aNogSuzuki_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_nog_suzuki;
extern cKF_Animation_R_c cKF_ba_r_int_nog_suzuki;
aFTR_rig_c aNogSuzuki_key_anime_data {
cKF_bs_r_int_nog_suzuki,
cKF_ba_r_int_nog_suzuki,
0.5f,
};
aFTR_PROFILE iam_nog_suzuki = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aNogTai_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_nog_tai;
extern cKF_Animation_R_c cKF_ba_r_int_nog_tai;
aFTR_rig_c aNogTai_key_anime_data {
cKF_bs_r_int_nog_tai,
cKF_ba_r_int_nog_tai,
0.5f,
};
aFTR_PROFILE iam_nog_tai = {
NULL,
NULL,
+10
View File
@@ -1,5 +1,15 @@
extern aFTR_rig_c aNogZarigani_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_nog_zarigani;
extern cKF_Animation_R_c cKF_ba_r_int_nog_zarigani;
aFTR_rig_c aNogZarigani_key_anime_data {
cKF_bs_r_int_nog_zarigani,
cKF_ba_r_int_nog_zarigani,
0.5f,
};
aFTR_PROFILE iam_nog_zarigani = {
NULL,
NULL,
+10
View File
@@ -1,5 +1,15 @@
extern aFTR_rig_c aSumAkiakane_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_akiakane;
extern cKF_Animation_R_c cKF_ba_r_int_sum_akiakane;
aFTR_rig_c aSumAkiakane_key_anime_data {
cKF_bs_r_int_sum_akiakane,
cKF_ba_r_int_sum_akiakane,
0.5f,
};
aFTR_PROFILE iam_sum_akiakane = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumAngel_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_angel;
extern cKF_Animation_R_c cKF_ba_r_int_sum_angel;
aFTR_rig_c aSumAngel_key_anime_data {
cKF_bs_r_int_sum_angel,
cKF_ba_r_int_sum_angel,
0.5f,
};
aFTR_PROFILE iam_sum_angel = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumAroana_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_aroana;
extern cKF_Animation_R_c cKF_ba_r_int_sum_aroana;
aFTR_rig_c aSumAroana_key_anime_data {
cKF_bs_r_int_sum_aroana,
cKF_ba_r_int_sum_aroana,
0.5f,
};
aFTR_PROFILE iam_sum_aroana = {
NULL,
NULL,
+1 -1
View File
@@ -8,7 +8,7 @@ static void aSumasitaiko_dt(FTR_ACTOR* ftr_actor, u8* data);
static void aSumasitaiko_ct(FTR_ACTOR* ftr_actor, u8* data) {
}
static void aSumasitaiko_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor) {
static void aSumasitaiko_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data) {
if (Common_Get(clip).my_room_clip != NULL) {
Common_Get(clip).my_room_clip->sound_melody_proc(ftr_actor, my_room_actor, 12);
}
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumAyu_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_akiakane;
extern cKF_Animation_R_c cKF_ba_r_int_sum_akiakane;
aFTR_rig_c aSumAyu_key_anime_data {
cKF_bs_r_int_sum_akiakane,
cKF_ba_r_int_sum_akiakane,
0.5f,
};
aFTR_PROFILE iam_sum_ayu = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumBass_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_bass;
extern cKF_Animation_R_c cKF_ba_r_int_sum_bass;
aFTR_rig_c aSumBass_key_anime_data {
cKF_bs_r_int_sum_bass,
cKF_ba_r_int_sum_bass,
0.5f,
};
aFTR_PROFILE iam_sum_bass = {
NULL,
NULL,
+1 -1
View File
@@ -8,7 +8,7 @@ static void aSumBass01_dt(FTR_ACTOR* ftr_actor, u8* data);
static void aSumBass01_ct(FTR_ACTOR* ftr_actor, u8* data) {
}
static void aSumBass01_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor) {
static void aSumBass01_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data) {
if (Common_Get(clip).my_room_clip != NULL) {
Common_Get(clip).my_room_clip->sound_melody_proc(ftr_actor, my_room_actor, 9);
}
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumBassl_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_bassl;
extern cKF_Animation_R_c cKF_ba_r_int_sum_bassl;
aFTR_rig_c aSumBassl_key_anime_data {
cKF_bs_r_int_sum_bassl,
cKF_ba_r_int_sum_bassl,
0.5f,
};
aFTR_PROFILE iam_sum_bassl = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumBassm_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_bassm;
extern cKF_Animation_R_c cKF_ba_r_int_sum_bassm;
aFTR_rig_c aSumBassm_key_anime_data {
cKF_bs_r_int_sum_bassm,
cKF_ba_r_int_sum_bassm,
0.5f,
};
aFTR_PROFILE iam_sum_bassm = {
NULL,
NULL,
+1 -1
View File
@@ -8,7 +8,7 @@ static void aSumBiwa01_dt(FTR_ACTOR* ftr_actor, u8* data);
static void aSumBiwa01_ct(FTR_ACTOR* ftr_actor, u8* data) {
}
static void aSumBiwa01_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor) {
static void aSumBiwa01_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data) {
if (Common_Get(clip).my_room_clip != NULL) {
Common_Get(clip).my_room_clip->sound_melody_proc(ftr_actor, my_room_actor, 6);
}
+1 -1
View File
@@ -8,7 +8,7 @@ static void asumconga01_dt(FTR_ACTOR* ftr_actor, u8* data);
static void asumconga01_ct(FTR_ACTOR* ftr_actor, u8* data) {
}
static void asumconga01_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor) {
static void asumconga01_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data){
if (Common_Get(clip).my_room_clip != NULL) {
Common_Get(clip).my_room_clip->sound_melody_proc(ftr_actor, my_room_actor, 14);
}
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumDanna_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_danna;
extern cKF_Animation_R_c cKF_ba_r_int_sum_danna;
aFTR_rig_c aSumDanna_key_anime_data {
cKF_bs_r_int_sum_danna,
cKF_ba_r_int_sum_danna,
0.5f,
};
aFTR_PROFILE iam_sum_danna = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumDemekin_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_demekin;
extern cKF_Animation_R_c cKF_ba_r_int_sum_demekin;
aFTR_rig_c aSumDemekin_key_anime_data {
cKF_bs_r_int_sum_demekin,
cKF_ba_r_int_sum_demekin,
0.5f,
};
aFTR_PROFILE iam_sum_demekin = {
NULL,
NULL,
+8
View File
@@ -1,5 +1,13 @@
extern aFTR_rig_c aSumDojyo_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_dojyo;
extern cKF_Animation_R_c cKF_ba_r_int_sum_dojyo;
aFTR_rig_c aSumDojyo_key_anime_data {
cKF_bs_r_int_sum_dojyo,
cKF_ba_r_int_sum_dojyo,
0.5f,
};
aFTR_PROFILE iam_sum_dojyo = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumDonko_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_donko;
extern cKF_Animation_R_c cKF_ba_r_int_sum_donko;
aFTR_rig_c aSumDonko_key_anime_data {
cKF_bs_r_int_sum_donko,
cKF_ba_r_int_sum_donko,
0.5f,
};
aFTR_PROFILE iam_sum_donko = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumFuna_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_funa;
extern cKF_Animation_R_c cKF_ba_r_int_sum_funa;
aFTR_rig_c aSumFuna_key_anime_data {
cKF_bs_r_int_sum_funa,
cKF_ba_r_int_sum_funa,
0.5f,
};
aFTR_PROFILE iam_sum_funa = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumGill_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_gill;
extern cKF_Animation_R_c cKF_ba_r_int_sum_gill;
aFTR_rig_c aSumGill_key_anime_data {
cKF_bs_r_int_sum_gill,
cKF_ba_r_int_sum_gill,
0.5f,
};
aFTR_PROFILE iam_sum_gill = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumGinyanma_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_ginyanma;
extern cKF_Animation_R_c cKF_ba_r_int_sum_ginyanma;
aFTR_rig_c aSumGinyanma_key_anime_data {
cKF_bs_r_int_sum_ginyanma,
cKF_ba_r_int_sum_ginyanma,
0.5f,
};
aFTR_PROFILE iam_sum_ginyanma = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumGomadara_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_gomadara;
extern cKF_Animation_R_c cKF_ba_r_int_sum_gomadara;
aFTR_rig_c aSumGomadara_key_anime_data {
cKF_bs_r_int_sum_gomadara,
cKF_ba_r_int_sum_gomadara,
0.5f,
};
aFTR_PROFILE iam_sum_gomadara = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumGupi_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_gupi;
extern cKF_Animation_R_c cKF_ba_r_int_sum_gupi;
aFTR_rig_c aSumGupi_key_anime_data {
cKF_bs_r_int_sum_gupi,
cKF_ba_r_int_sum_gupi,
0.5f,
};
aFTR_PROFILE iam_sum_gupi = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumHachi_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_hachi;
extern cKF_Animation_R_c cKF_ba_r_int_sum_hachi;
aFTR_rig_c aSumHachi_key_anime_data {
cKF_bs_r_int_sum_hachi,
cKF_ba_r_int_sum_hachi,
0.5f,
};
aFTR_PROFILE iam_sum_hachi = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumHera_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_hera;
extern cKF_Animation_R_c cKF_ba_r_int_sum_hera;
aFTR_rig_c aSumHera_key_anime_data {
cKF_bs_r_int_sum_hera,
cKF_ba_r_int_sum_hera,
0.5f,
};
aFTR_PROFILE iam_sum_hera = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumHirata_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_hirata;
extern cKF_Animation_R_c cKF_ba_r_int_sum_hirata;
aFTR_rig_c aSumHirata_key_anime_data {
cKF_bs_r_int_sum_hirata,
cKF_ba_r_int_sum_hirata,
0.5f,
};
aFTR_PROFILE iam_sum_hirata = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumIto_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_ito;
extern cKF_Animation_R_c cKF_ba_r_int_sum_ito;
aFTR_rig_c aSumIto_key_anime_data {
cKF_bs_r_int_sum_ito,
cKF_ba_r_int_sum_ito,
0.5f,
};
aFTR_PROFILE iam_sum_ito = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumIwana_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_iwana;
extern cKF_Animation_R_c cKF_ba_r_int_sum_iwana;
aFTR_rig_c aSumIwana_key_anime_data {
cKF_bs_r_int_sum_iwana,
cKF_ba_r_int_sum_iwana,
0.5f,
};
aFTR_PROFILE iam_sum_iwana = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumKabuto_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_kabuto;
extern cKF_Animation_R_c cKF_ba_r_int_sum_kabuto;
aFTR_rig_c aSumKabuto_key_anime_data {
cKF_bs_r_int_sum_kabuto,
cKF_ba_r_int_sum_kabuto,
0.5f,
};
aFTR_PROFILE iam_sum_kabuto = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumKamakiri_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_kamakiri;
extern cKF_Animation_R_c cKF_ba_r_int_sum_kamakiri;
aFTR_rig_c aSumKamakiri_key_anime_data {
cKF_bs_r_int_sum_kamakiri,
cKF_ba_r_int_sum_kamakiri,
0.5f,
};
aFTR_PROFILE iam_sum_kamakiri = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumKanabun_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_hanabun;
extern cKF_Animation_R_c cKF_ba_r_int_sum_hanabun;
aFTR_rig_c aSumHanabun_key_anime_data {
cKF_bs_r_int_sum_hanabun,
cKF_ba_r_int_sum_hanabun,
0.5f,
};
aFTR_PROFILE iam_sum_kanabun = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumKaseki_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_kaseki;
extern cKF_Animation_R_c cKF_ba_r_int_sum_kaseki;
aFTR_rig_c aSumKaseki_key_anime_data {
cKF_bs_r_int_sum_kaseki,
cKF_ba_r_int_sum_kaseki,
0.5f,
};
aFTR_PROFILE iam_sum_kaseki = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumKiageha_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_kkiageha;
extern cKF_Animation_R_c cKF_ba_r_int_sum_kkiageha;
aFTR_rig_c aSumKiageha_key_anime_data {
cKF_bs_r_int_sum_kkiageha,
cKF_ba_r_int_sum_kkiageha,
0.5f,
};
aFTR_PROFILE iam_sum_kiageha = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumKingyo_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_kingyo;
extern cKF_Animation_R_c cKF_ba_r_int_sum_kingyo;
aFTR_rig_c aSumKingyo_key_anime_data {
cKF_bs_r_int_sum_kingyo,
cKF_ba_r_int_sum_kingyo,
0.5f,
};
aFTR_PROFILE iam_sum_kingyo = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumKoi_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_koi;
extern cKF_Animation_R_c cKF_ba_r_int_sum_koi;
aFTR_rig_c aSumKoi_key_anime_data {
cKF_bs_r_int_sum_koi,
cKF_ba_r_int_sum_koi,
0.5f,
};
aFTR_PROFILE iam_sum_koi = {
NULL,
NULL,
+9
View File
@@ -2,6 +2,15 @@ extern aFTR_rig_c aSumMezaClock_sklkey;
extern Gfx int_sum_mezaclock_short_model[];
extern Gfx int_sum_mezaclock_long_model[];
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_mezaclock;
extern cKF_Animation_R_c cKF_ba_r_int_sum_mezaclock;
aFTR_rig_c aSumMezaClock_sklkey {
cKF_bs_r_int_sum_mezaclock,
cKF_ba_r_int_sum_mezaclock,
0.5f,
};
static int aSumMezaClock_DwAfter(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int joint_idx, Gfx** joint_shape,
u8* joint_flags, void* arg, s_xyz* joint_rot, xyz_t* joint_pos) {
if (joint_idx == 3) {
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumMiyama_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_miyama;
extern cKF_Animation_R_c cKF_ba_r_int_sum_miyama;
aFTR_rig_c aSumMiyama_key_anime_data {
cKF_bs_r_int_sum_miyama,
cKF_ba_r_int_sum_miyama,
0.5f,
};
aFTR_PROFILE iam_sum_miyama = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumMizunomi_sklkey;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_mizunomi;
extern cKF_Animation_R_c cKF_ba_r_int_sum_mizunomi;
aFTR_rig_c aSumMizunomi_sklkey {
cKF_bs_r_int_sum_mizunomi,
cKF_ba_r_int_sum_mizunomi,
0.5f,
};
static void aSumMizunomi_ct(FTR_ACTOR* ftr_actor, u8* data) {
// nothing
}
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumMonki_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_monki;
extern cKF_Animation_R_c cKF_ba_r_int_sum_monki;
aFTR_rig_c aSumMonki_key_anime_data {
cKF_bs_r_int_sum_monki,
cKF_ba_r_int_sum_monki,
0.5f,
};
aFTR_PROFILE iam_sum_monki = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumMonshiro_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_monshiro;
extern cKF_Animation_R_c cKF_ba_r_int_sum_monshiro;
aFTR_rig_c aSumMiyama_key_anime_data {
cKF_bs_r_int_sum_monshiro,
cKF_ba_r_int_sum_monshiro,
0.5f,
};
aFTR_PROFILE iam_sum_monshiro = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumNamazu_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_namazu;
extern cKF_Animation_R_c cKF_ba_r_int_sum_namazu;
aFTR_rig_c aSumNamazu_key_anime_data {
cKF_bs_r_int_sum_namazu,
cKF_ba_r_int_sum_namazu,
0.5f,
};
aFTR_PROFILE iam_sum_namazu = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumNanahoshi_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_nanahoshi;
extern cKF_Animation_R_c cKF_ba_r_int_sum_nanahoshi;
aFTR_rig_c aSumNanahoshi_key_anime_data {
cKF_bs_r_int_sum_nanahoshi,
cKF_ba_r_int_sum_nanahoshi,
0.5f,
};
aFTR_PROFILE iam_sum_nanahoshi = {
NULL,
NULL,
+4
View File
@@ -1,5 +1,9 @@
extern aFTR_rig_c aSumOkuwa_key_anime_data;
aFTR_rig_c aSumOkuwa_key_anime_data = {
}
aFTR_PROFILE iam_sum_okuwa = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumOniyanma_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_oniyanma;
extern cKF_Animation_R_c cKF_ba_r_int_sum_oniyanma;
aFTR_rig_c aSumOniyanma_key_anime_data {
cKF_bs_r_int_sum_oniyanma,
cKF_ba_r_int_sum_oniyanma,
0.5f,
};
aFTR_PROFILE iam_sum_oniyanma = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumOonamazu_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_oonamazu;
extern cKF_Animation_R_c cKF_ba_r_int_sum_oonamazu;
aFTR_rig_c aSumOonamazu_key_anime_data {
cKF_bs_r_int_sum_oonamazu,
cKF_ba_r_int_sum_oonamazu,
0.5f,
};
aFTR_PROFILE iam_sum_oonamazu = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumPirania_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_pirania;
extern cKF_Animation_R_c cKF_ba_r_int_sum_pirania;
aFTR_rig_c aSumPirania_key_anime_data {
cKF_bs_r_int_sum_pirania,
cKF_ba_r_int_sum_pirania,
0.5f,
};
aFTR_PROFILE iam_sum_pirania = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumRaigyo_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_raigyo;
extern cKF_Animation_R_c cKF_ba_r_int_sum_raigyo;
aFTR_rig_c aSumRaigyo_key_anime_data {
cKF_bs_r_int_sum_raigyo,
cKF_ba_r_int_sum_raigyo,
0.5f,
};
aFTR_PROFILE iam_sum_raigyo = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumSake_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_sake;
extern cKF_Animation_R_c cKF_ba_r_int_sum_sake;
aFTR_rig_c aSumSake_key_anime_data {
cKF_bs_r_int_sum_sake,
cKF_ba_r_int_sum_sake,
0.5f,
};
aFTR_PROFILE iam_sum_sake = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumShiokara_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_shiokara;
extern cKF_Animation_R_c cKF_ba_r_int_sum_shiokara;
aFTR_rig_c aSumShiokara_key_anime_data {
cKF_bs_r_int_sum_shiokara,
cKF_ba_r_int_sum_shiokara,
0.5f,
};
aFTR_PROFILE iam_sum_shiokara = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumTamamushi_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_tamamushi;
extern cKF_Animation_R_c cKF_ba_r_int_sum_tamamushi;
aFTR_rig_c aSumTamamushi_key_anime_data {
cKF_bs_r_int_sum_tamamushi,
cKF_ba_r_int_sum_tamamushi,
0.5f,
};
aFTR_PROFILE iam_sum_tamamushi = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumTanago_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_tanago;
extern cKF_Animation_R_c cKF_ba_r_int_sum_tanago;
aFTR_rig_c aSumTanago_key_anime_data {
cKF_bs_r_int_sum_tanago,
cKF_ba_r_int_sum_tanago,
0.5f,
};
aFTR_PROFILE iam_sum_tanago = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumTentou_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_tentou;
extern cKF_Animation_R_c cKF_ba_r_int_sum_tentou;
aFTR_rig_c aSumTentou_key_anime_data {
cKF_bs_r_int_sum_tentou,
cKF_ba_r_int_sum_tentou,
0.5f,
};
aFTR_PROFILE iam_sum_tentou = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumUgui_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_ugui;
extern cKF_Animation_R_c cKF_ba_r_int_sum_ugui;
aFTR_rig_c aSumUgui_key_anime_data {
cKF_bs_r_int_sum_ugui,
cKF_ba_r_int_sum_ugui,
0.5f,
};
aFTR_PROFILE iam_sum_ugui = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumUnagi_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_unagi;
extern cKF_Animation_R_c cKF_ba_r_int_sum_unagi;
aFTR_rig_c aSumUnagi_key_anime_data {
cKF_bs_r_int_sum_unagi,
cKF_ba_r_int_sum_unagi,
0.5f,
};
aFTR_PROFILE iam_sum_unagi = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumWakasagi_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_wakasagi;
extern cKF_Animation_R_c cKF_ba_r_int_sum_wakasagi;
aFTR_rig_c aSumWakasagi_key_anime_data {
cKF_bs_r_int_sum_wakasagi,
cKF_ba_r_int_sum_wakasagi,
0.5f,
};
aFTR_PROFILE iam_sum_wakasagi = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aSumYamame_key_anime_data;
extern cKF_Skeleton_R_c cKF_bs_r_int_sum_yamame;
extern cKF_Animation_R_c cKF_ba_r_int_sum_yamame;
aFTR_rig_c aSumYamame_key_anime_data {
cKF_bs_r_int_sum_yamame,
cKF_ba_r_int_sum_yamame,
0.5f,
};
aFTR_PROFILE iam_sum_yamame = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aTakAsteroid1_sklkey;
extern cKF_Skeleton_R_c cKF_bs_r_int_tak_asteroid1;
extern cKF_Animation_R_c cKF_ba_r_int_tak_asteroid1;
aFTR_rig_c aTakAsteroid1_sklkey {
cKF_bs_r_int_tak_asteroid1,
cKF_ba_r_int_tak_asteroid1,
0.5f,
};
aFTR_PROFILE iam_tak_asteroid1 = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aTakBarber_sklkey;
extern cKF_Skeleton_R_c cKF_bs_r_int_tak_barber;
extern cKF_Animation_R_c cKF_ba_r_int_tak_barber;
aFTR_rig_c aTakBarber_sklkey {
cKF_bs_r_int_tak_barber,
cKF_ba_r_int_tak_barber,
0.5f,
};
aFTR_PROFILE iam_tak_barber = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aTakEisei_sklkey;
extern cKF_Skeleton_R_c cKF_bs_r_int_tak_eisei;
extern cKF_Animation_R_c cKF_ba_r_int_tak_eisei;
aFTR_rig_c aTakEisei_sklkey {
cKF_bs_r_int_tak_eisei,
cKF_ba_r_int_tak_eisei,
0.5f,
};
aFTR_PROFILE iam_tak_eisei = {
NULL,
NULL,
+1 -1
View File
@@ -56,7 +56,7 @@ extern Gfx int_tak_lion_on_model[];
extern Gfx int_tak_lion_onT_model[];
extern Gfx int_tak_lion_alphaT_model[];
static void fSKP_dw(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data) {
static void fTL_dw(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data) {
GAME_PLAY* play = (GAME_PLAY*)game;
u32 ctr_ofs;
Gfx* scroll_gfx;
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aTakStation_sklkey;
extern cKF_Skeleton_R_c cKF_bs_r_int_tak_station;
extern cKF_Animation_R_c cKF_ba_r_int_tak_station;
aFTR_rig_c aTakStation_sklkey {
cKF_bs_r_int_tak_station,
cKF_ba_r_int_tak_station,
0.5f,
};
aFTR_PROFILE iam_tak_station = {
NULL,
NULL,
+9
View File
@@ -1,5 +1,14 @@
extern aFTR_rig_c aTakUfo_sklkey;
extern cKF_Skeleton_R_c cKF_bs_r_int_tak_ufo;
extern cKF_Animation_R_c cKF_ba_r_int_tak_ufo;
aFTR_rig_c aTakUfo_sklkey {
cKF_bs_r_int_tak_ufo,
cKF_ba_r_int_tak_ufo,
0.5f,
};
aFTR_PROFILE iam_tak_ufo = {
NULL,
NULL,