diff --git a/config/rel_slices.yml b/config/rel_slices.yml index bf012e37..bd01de0d 100644 --- a/config/rel_slices.yml +++ b/config/rel_slices.yml @@ -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: diff --git a/include/audio.h b/include/audio.h index f20a82ec..2c3baf9a 100644 --- a/include/audio.h +++ b/include/audio.h @@ -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); diff --git a/include/jaudio_NES/game64.h b/include/jaudio_NES/game64.h index ac8b35e1..fce0e5be 100644 --- a/include/jaudio_NES/game64.h +++ b/include/jaudio_NES/game64.h @@ -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); diff --git a/src/audio.c b/src/audio.c index d67f5fd8..932856c9 100644 --- a/src/audio.c +++ b/src/audio.c @@ -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) { diff --git a/src/ftr/ac_ike_jny_syon01.c b/src/ftr/ac_ike_jny_syon01.c index 3f91b983..18960f65 100644 --- a/src/ftr/ac_ike_jny_syon01.c +++ b/src/ftr/ac_ike_jny_syon01.c @@ -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; diff --git a/src/ftr/ac_ike_jny_truth01.c b/src/ftr/ac_ike_jny_truth01.c index 211340ab..54cfab65 100644 --- a/src/ftr/ac_ike_jny_truth01.c +++ b/src/ftr/ac_ike_jny_truth01.c @@ -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, diff --git a/src/ftr/ac_kon_cracker.c b/src/ftr/ac_kon_cracker.c index a3a6b65a..5bfe5a37 100644 --- a/src/ftr/ac_kon_cracker.c +++ b/src/ftr/ac_kon_cracker.c @@ -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) { } diff --git a/src/ftr/ac_kon_musya.c b/src/ftr/ac_kon_musya.c index 4edc6fea..cdb89e63 100644 --- a/src/ftr/ac_kon_musya.c +++ b/src/ftr/ac_kon_musya.c @@ -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){ } diff --git a/src/ftr/ac_kon_sisiodosi.c b/src/ftr/ac_kon_sisiodosi.c index 60d93abc..2d2a7aa7 100644 --- a/src/ftr/ac_kon_sisiodosi.c +++ b/src/ftr/ac_kon_sisiodosi.c @@ -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)); } diff --git a/src/ftr/ac_kon_snowtansu.c b/src/ftr/ac_kon_snowtansu.c index 00268160..57b770e9 100644 --- a/src/ftr/ac_kon_snowtansu.c +++ b/src/ftr/ac_kon_snowtansu.c @@ -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); diff --git a/src/ftr/ac_kon_waclock.c b/src/ftr/ac_kon_waclock.c index b9598b6f..f922078d 100644 --- a/src/ftr/ac_kon_waclock.c +++ b/src/ftr/ac_kon_waclock.c @@ -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; diff --git a/src/ftr/ac_nog_amenbo.c b/src/ftr/ac_nog_amenbo.c index 563bb69b..0ed6a484 100644 --- a/src/ftr/ac_nog_amenbo.c +++ b/src/ftr/ac_nog_amenbo.c @@ -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, diff --git a/src/ftr/ac_nog_dango.c b/src/ftr/ac_nog_dango.c index 98ddb1b9..a4d88258 100644 --- a/src/ftr/ac_nog_dango.c +++ b/src/ftr/ac_nog_dango.c @@ -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, diff --git a/src/ftr/ac_nog_isidai.c b/src/ftr/ac_nog_isidai.c index e369aea4..98bf31d5 100644 --- a/src/ftr/ac_nog_isidai.c +++ b/src/ftr/ac_nog_isidai.c @@ -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, diff --git a/src/ftr/ac_nog_ka.c b/src/ftr/ac_nog_ka.c index 95f7be45..69162f46 100644 --- a/src/ftr/ac_nog_ka.c +++ b/src/ftr/ac_nog_ka.c @@ -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); diff --git a/src/ftr/ac_nog_kaeru.c b/src/ftr/ac_nog_kaeru.c index db6897b6..f3c6daa6 100644 --- a/src/ftr/ac_nog_kaeru.c +++ b/src/ftr/ac_nog_kaeru.c @@ -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); diff --git a/src/ftr/ac_nog_kera.c b/src/ftr/ac_nog_kera.c index 3053d84c..41a84f8c 100644 --- a/src/ftr/ac_nog_kera.c +++ b/src/ftr/ac_nog_kera.c @@ -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); diff --git a/src/ftr/ac_nog_kumo.c b/src/ftr/ac_nog_kumo.c index de2d68d4..0fcdb589 100644 --- a/src/ftr/ac_nog_kumo.c +++ b/src/ftr/ac_nog_kumo.c @@ -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, diff --git a/src/ftr/ac_nog_kurage.c b/src/ftr/ac_nog_kurage.c index 7b438b0b..0c2ce08a 100644 --- a/src/ftr/ac_nog_kurage.c +++ b/src/ftr/ac_nog_kurage.c @@ -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, diff --git a/src/ftr/ac_nog_maimai.c b/src/ftr/ac_nog_maimai.c index b93d9d2d..cc1a4701 100644 --- a/src/ftr/ac_nog_maimai.c +++ b/src/ftr/ac_nog_maimai.c @@ -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, diff --git a/src/ftr/ac_nog_medaka.c b/src/ftr/ac_nog_medaka.c index e54b56c9..a3333c9e 100644 --- a/src/ftr/ac_nog_medaka.c +++ b/src/ftr/ac_nog_medaka.c @@ -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, diff --git a/src/ftr/ac_nog_mino.c b/src/ftr/ac_nog_mino.c index c417816b..f79cd3d2 100644 --- a/src/ftr/ac_nog_mino.c +++ b/src/ftr/ac_nog_mino.c @@ -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, diff --git a/src/ftr/ac_nog_piraluku.c b/src/ftr/ac_nog_piraluku.c index 9aef7ae1..5f752123 100644 --- a/src/ftr/ac_nog_piraluku.c +++ b/src/ftr/ac_nog_piraluku.c @@ -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, diff --git a/src/ftr/ac_nog_suzuki.c b/src/ftr/ac_nog_suzuki.c index b80cb8db..1d7415af 100644 --- a/src/ftr/ac_nog_suzuki.c +++ b/src/ftr/ac_nog_suzuki.c @@ -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, diff --git a/src/ftr/ac_nog_tai.c b/src/ftr/ac_nog_tai.c index 2cf9b26a..65fa3266 100644 --- a/src/ftr/ac_nog_tai.c +++ b/src/ftr/ac_nog_tai.c @@ -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, diff --git a/src/ftr/ac_nog_zarigani.c b/src/ftr/ac_nog_zarigani.c index e0d57702..ea507db9 100644 --- a/src/ftr/ac_nog_zarigani.c +++ b/src/ftr/ac_nog_zarigani.c @@ -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, diff --git a/src/ftr/ac_sum_akiakane.c b/src/ftr/ac_sum_akiakane.c index dddf962e..1adfd1e0 100644 --- a/src/ftr/ac_sum_akiakane.c +++ b/src/ftr/ac_sum_akiakane.c @@ -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, diff --git a/src/ftr/ac_sum_angel.c b/src/ftr/ac_sum_angel.c index 7d5bb496..fce01158 100644 --- a/src/ftr/ac_sum_angel.c +++ b/src/ftr/ac_sum_angel.c @@ -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, diff --git a/src/ftr/ac_sum_aroana.c b/src/ftr/ac_sum_aroana.c index 2f7f6e4a..8c57ac5a 100644 --- a/src/ftr/ac_sum_aroana.c +++ b/src/ftr/ac_sum_aroana.c @@ -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, diff --git a/src/ftr/ac_sum_asi_taiko.c b/src/ftr/ac_sum_asi_taiko.c index 407c13c2..064e54a7 100644 --- a/src/ftr/ac_sum_asi_taiko.c +++ b/src/ftr/ac_sum_asi_taiko.c @@ -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); } diff --git a/src/ftr/ac_sum_ayu.c b/src/ftr/ac_sum_ayu.c index 3cddebd5..2c3bce43 100644 --- a/src/ftr/ac_sum_ayu.c +++ b/src/ftr/ac_sum_ayu.c @@ -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, diff --git a/src/ftr/ac_sum_bass.c b/src/ftr/ac_sum_bass.c index 1cdec5e3..7861286a 100644 --- a/src/ftr/ac_sum_bass.c +++ b/src/ftr/ac_sum_bass.c @@ -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, diff --git a/src/ftr/ac_sum_bass01.c b/src/ftr/ac_sum_bass01.c index 435e4a1c..5ccb4899 100644 --- a/src/ftr/ac_sum_bass01.c +++ b/src/ftr/ac_sum_bass01.c @@ -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); } diff --git a/src/ftr/ac_sum_bassl.c b/src/ftr/ac_sum_bassl.c index 6d833f29..4fd011e3 100644 --- a/src/ftr/ac_sum_bassl.c +++ b/src/ftr/ac_sum_bassl.c @@ -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, diff --git a/src/ftr/ac_sum_bassm.c b/src/ftr/ac_sum_bassm.c index 2f3e09ab..3a7fdf9e 100644 --- a/src/ftr/ac_sum_bassm.c +++ b/src/ftr/ac_sum_bassm.c @@ -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, diff --git a/src/ftr/ac_sum_biwa01.c b/src/ftr/ac_sum_biwa01.c index 92621503..311f0903 100644 --- a/src/ftr/ac_sum_biwa01.c +++ b/src/ftr/ac_sum_biwa01.c @@ -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); } diff --git a/src/ftr/ac_sum_conga01.c b/src/ftr/ac_sum_conga01.c index 2584d86e..1d16224d 100644 --- a/src/ftr/ac_sum_conga01.c +++ b/src/ftr/ac_sum_conga01.c @@ -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); } diff --git a/src/ftr/ac_sum_danna.c b/src/ftr/ac_sum_danna.c index 9ac0b744..0269c5ef 100644 --- a/src/ftr/ac_sum_danna.c +++ b/src/ftr/ac_sum_danna.c @@ -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, diff --git a/src/ftr/ac_sum_demekin.c b/src/ftr/ac_sum_demekin.c index 02bb823c..fc0ef3de 100644 --- a/src/ftr/ac_sum_demekin.c +++ b/src/ftr/ac_sum_demekin.c @@ -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, diff --git a/src/ftr/ac_sum_dojyo.c b/src/ftr/ac_sum_dojyo.c index 5e342ade..cdcf075c 100644 --- a/src/ftr/ac_sum_dojyo.c +++ b/src/ftr/ac_sum_dojyo.c @@ -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, diff --git a/src/ftr/ac_sum_donko.c b/src/ftr/ac_sum_donko.c index c988bc92..e22aa304 100644 --- a/src/ftr/ac_sum_donko.c +++ b/src/ftr/ac_sum_donko.c @@ -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, diff --git a/src/ftr/ac_sum_funa.c b/src/ftr/ac_sum_funa.c index a3fcf72d..2155bf14 100644 --- a/src/ftr/ac_sum_funa.c +++ b/src/ftr/ac_sum_funa.c @@ -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, diff --git a/src/ftr/ac_sum_gill.c b/src/ftr/ac_sum_gill.c index 5e095197..ab8d72c1 100644 --- a/src/ftr/ac_sum_gill.c +++ b/src/ftr/ac_sum_gill.c @@ -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, diff --git a/src/ftr/ac_sum_ginyanma.c b/src/ftr/ac_sum_ginyanma.c index 5fd9ca86..f82c0c21 100644 --- a/src/ftr/ac_sum_ginyanma.c +++ b/src/ftr/ac_sum_ginyanma.c @@ -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, diff --git a/src/ftr/ac_sum_gomadara.c b/src/ftr/ac_sum_gomadara.c index 42d54f80..3ca72f52 100644 --- a/src/ftr/ac_sum_gomadara.c +++ b/src/ftr/ac_sum_gomadara.c @@ -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, diff --git a/src/ftr/ac_sum_gupi.c b/src/ftr/ac_sum_gupi.c index b206de4c..3c7e601b 100644 --- a/src/ftr/ac_sum_gupi.c +++ b/src/ftr/ac_sum_gupi.c @@ -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, diff --git a/src/ftr/ac_sum_hachi.c b/src/ftr/ac_sum_hachi.c index 7ff1111e..0f6922f7 100644 --- a/src/ftr/ac_sum_hachi.c +++ b/src/ftr/ac_sum_hachi.c @@ -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, diff --git a/src/ftr/ac_sum_hera.c b/src/ftr/ac_sum_hera.c index 332c1b2b..a0102bf2 100644 --- a/src/ftr/ac_sum_hera.c +++ b/src/ftr/ac_sum_hera.c @@ -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, diff --git a/src/ftr/ac_sum_hirata.c b/src/ftr/ac_sum_hirata.c index b7d17a17..56548433 100644 --- a/src/ftr/ac_sum_hirata.c +++ b/src/ftr/ac_sum_hirata.c @@ -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, diff --git a/src/ftr/ac_sum_ito.c b/src/ftr/ac_sum_ito.c index bc6bc66f..c7e72f5f 100644 --- a/src/ftr/ac_sum_ito.c +++ b/src/ftr/ac_sum_ito.c @@ -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, diff --git a/src/ftr/ac_sum_iwana.c b/src/ftr/ac_sum_iwana.c index 350cb339..b0c1e41a 100644 --- a/src/ftr/ac_sum_iwana.c +++ b/src/ftr/ac_sum_iwana.c @@ -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, diff --git a/src/ftr/ac_sum_kabuto.c b/src/ftr/ac_sum_kabuto.c index 5aea5f62..1d69c0c4 100644 --- a/src/ftr/ac_sum_kabuto.c +++ b/src/ftr/ac_sum_kabuto.c @@ -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, diff --git a/src/ftr/ac_sum_kamakiri.c b/src/ftr/ac_sum_kamakiri.c index 899a2505..5cda4c4f 100644 --- a/src/ftr/ac_sum_kamakiri.c +++ b/src/ftr/ac_sum_kamakiri.c @@ -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, diff --git a/src/ftr/ac_sum_kanabun.c b/src/ftr/ac_sum_kanabun.c index 71a96999..b3eb5940 100644 --- a/src/ftr/ac_sum_kanabun.c +++ b/src/ftr/ac_sum_kanabun.c @@ -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, diff --git a/src/ftr/ac_sum_kaseki.c b/src/ftr/ac_sum_kaseki.c index 8430cbdc..4ea303f9 100644 --- a/src/ftr/ac_sum_kaseki.c +++ b/src/ftr/ac_sum_kaseki.c @@ -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, diff --git a/src/ftr/ac_sum_kiageha.c b/src/ftr/ac_sum_kiageha.c index 56982ee9..80134bf6 100644 --- a/src/ftr/ac_sum_kiageha.c +++ b/src/ftr/ac_sum_kiageha.c @@ -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, diff --git a/src/ftr/ac_sum_kingyo.c b/src/ftr/ac_sum_kingyo.c index b5b29a8f..2de5f088 100644 --- a/src/ftr/ac_sum_kingyo.c +++ b/src/ftr/ac_sum_kingyo.c @@ -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, diff --git a/src/ftr/ac_sum_koi.c b/src/ftr/ac_sum_koi.c index 6f04346b..871679ce 100644 --- a/src/ftr/ac_sum_koi.c +++ b/src/ftr/ac_sum_koi.c @@ -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, diff --git a/src/ftr/ac_sum_mezaclock.c b/src/ftr/ac_sum_mezaclock.c index 6ebde6dd..8f2ac8fb 100644 --- a/src/ftr/ac_sum_mezaclock.c +++ b/src/ftr/ac_sum_mezaclock.c @@ -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) { diff --git a/src/ftr/ac_sum_miyama.c b/src/ftr/ac_sum_miyama.c index bb7241e0..4447e1e9 100644 --- a/src/ftr/ac_sum_miyama.c +++ b/src/ftr/ac_sum_miyama.c @@ -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, diff --git a/src/ftr/ac_sum_mizunomi.c b/src/ftr/ac_sum_mizunomi.c index 6ee91cb5..91e326ff 100644 --- a/src/ftr/ac_sum_mizunomi.c +++ b/src/ftr/ac_sum_mizunomi.c @@ -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 } diff --git a/src/ftr/ac_sum_monki.c b/src/ftr/ac_sum_monki.c index 923a8694..26b76c5c 100644 --- a/src/ftr/ac_sum_monki.c +++ b/src/ftr/ac_sum_monki.c @@ -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, diff --git a/src/ftr/ac_sum_monshiro.c b/src/ftr/ac_sum_monshiro.c index fde9ac9d..163b3c42 100644 --- a/src/ftr/ac_sum_monshiro.c +++ b/src/ftr/ac_sum_monshiro.c @@ -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, diff --git a/src/ftr/ac_sum_namazu.c b/src/ftr/ac_sum_namazu.c index f79c70a4..3a42d4ad 100644 --- a/src/ftr/ac_sum_namazu.c +++ b/src/ftr/ac_sum_namazu.c @@ -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, diff --git a/src/ftr/ac_sum_nanahoshi.c b/src/ftr/ac_sum_nanahoshi.c index bfa3e7c7..a2da5537 100644 --- a/src/ftr/ac_sum_nanahoshi.c +++ b/src/ftr/ac_sum_nanahoshi.c @@ -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, diff --git a/src/ftr/ac_sum_okuwa.c b/src/ftr/ac_sum_okuwa.c index 513cee66..0d008d16 100644 --- a/src/ftr/ac_sum_okuwa.c +++ b/src/ftr/ac_sum_okuwa.c @@ -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, diff --git a/src/ftr/ac_sum_oniyanma.c b/src/ftr/ac_sum_oniyanma.c index 77f30d0f..3d2a2db5 100644 --- a/src/ftr/ac_sum_oniyanma.c +++ b/src/ftr/ac_sum_oniyanma.c @@ -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, diff --git a/src/ftr/ac_sum_oonamazu.c b/src/ftr/ac_sum_oonamazu.c index c7da8934..6110e1aa 100644 --- a/src/ftr/ac_sum_oonamazu.c +++ b/src/ftr/ac_sum_oonamazu.c @@ -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, diff --git a/src/ftr/ac_sum_pirania.c b/src/ftr/ac_sum_pirania.c index 035dfe87..a4e2f4b9 100644 --- a/src/ftr/ac_sum_pirania.c +++ b/src/ftr/ac_sum_pirania.c @@ -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, diff --git a/src/ftr/ac_sum_raigyo.c b/src/ftr/ac_sum_raigyo.c index aa635baf..c4fbef73 100644 --- a/src/ftr/ac_sum_raigyo.c +++ b/src/ftr/ac_sum_raigyo.c @@ -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, diff --git a/src/ftr/ac_sum_sake.c b/src/ftr/ac_sum_sake.c index f6808a8e..78e84203 100644 --- a/src/ftr/ac_sum_sake.c +++ b/src/ftr/ac_sum_sake.c @@ -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, diff --git a/src/ftr/ac_sum_shiokara.c b/src/ftr/ac_sum_shiokara.c index bc3444ac..c1091550 100644 --- a/src/ftr/ac_sum_shiokara.c +++ b/src/ftr/ac_sum_shiokara.c @@ -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, diff --git a/src/ftr/ac_sum_tamamushi.c b/src/ftr/ac_sum_tamamushi.c index 89a8a58e..c50b24fa 100644 --- a/src/ftr/ac_sum_tamamushi.c +++ b/src/ftr/ac_sum_tamamushi.c @@ -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, diff --git a/src/ftr/ac_sum_tanago.c b/src/ftr/ac_sum_tanago.c index db30be19..963b14cc 100644 --- a/src/ftr/ac_sum_tanago.c +++ b/src/ftr/ac_sum_tanago.c @@ -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, diff --git a/src/ftr/ac_sum_tentou.c b/src/ftr/ac_sum_tentou.c index 718c460e..ec749eec 100644 --- a/src/ftr/ac_sum_tentou.c +++ b/src/ftr/ac_sum_tentou.c @@ -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, diff --git a/src/ftr/ac_sum_ugui.c b/src/ftr/ac_sum_ugui.c index cf50087b..0238109b 100644 --- a/src/ftr/ac_sum_ugui.c +++ b/src/ftr/ac_sum_ugui.c @@ -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, diff --git a/src/ftr/ac_sum_unagi.c b/src/ftr/ac_sum_unagi.c index ac7d5e52..71a1f24a 100644 --- a/src/ftr/ac_sum_unagi.c +++ b/src/ftr/ac_sum_unagi.c @@ -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, diff --git a/src/ftr/ac_sum_wakasagi.c b/src/ftr/ac_sum_wakasagi.c index 3da654bc..0c54268d 100644 --- a/src/ftr/ac_sum_wakasagi.c +++ b/src/ftr/ac_sum_wakasagi.c @@ -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, diff --git a/src/ftr/ac_sum_yamame.c b/src/ftr/ac_sum_yamame.c index a2ef622f..1138de77 100644 --- a/src/ftr/ac_sum_yamame.c +++ b/src/ftr/ac_sum_yamame.c @@ -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, diff --git a/src/ftr/ac_tak_asteroid1.c b/src/ftr/ac_tak_asteroid1.c index 23963a11..f028346d 100644 --- a/src/ftr/ac_tak_asteroid1.c +++ b/src/ftr/ac_tak_asteroid1.c @@ -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, diff --git a/src/ftr/ac_tak_barber.c b/src/ftr/ac_tak_barber.c index f73020f1..d4a32ebd 100644 --- a/src/ftr/ac_tak_barber.c +++ b/src/ftr/ac_tak_barber.c @@ -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, diff --git a/src/ftr/ac_tak_eisei.c b/src/ftr/ac_tak_eisei.c index 512e9d5a..f1504ba1 100644 --- a/src/ftr/ac_tak_eisei.c +++ b/src/ftr/ac_tak_eisei.c @@ -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, diff --git a/src/ftr/ac_tak_lion.c b/src/ftr/ac_tak_lion.c index 41cb6e73..4596e0b7 100644 --- a/src/ftr/ac_tak_lion.c +++ b/src/ftr/ac_tak_lion.c @@ -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; diff --git a/src/ftr/ac_tak_station.c b/src/ftr/ac_tak_station.c index 6d4dd9e8..c6633481 100644 --- a/src/ftr/ac_tak_station.c +++ b/src/ftr/ac_tak_station.c @@ -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, diff --git a/src/ftr/ac_tak_ufo.c b/src/ftr/ac_tak_ufo.c index 23d9d86f..9d9472dc 100644 --- a/src/ftr/ac_tak_ufo.c +++ b/src/ftr/ac_tak_ufo.c @@ -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,