diff --git a/src/actor/ac_museum_insect.c b/src/actor/ac_museum_insect.c index 183f50d4..3c0c4597 100644 --- a/src/actor/ac_museum_insect.c +++ b/src/actor/ac_museum_insect.c @@ -672,91 +672,6 @@ xyz_t rock_pos[] = { { 385.f, 0.f, 485.0f } }; -xyz_t tonbo_rock_pos[6] = { - { 215.f, 68.f, 403.f }, - { 232.f, 60.f, 381.f }, - { 372.f, 65.f, 482.f }, - { 390.f, 68.f, 469.f }, - { 328.f, 72.f, 501.f }, - { 351.f, 72.f, 501.f } -}; - -xyz_t tentou_flower_pos[4] = { - { 410.0f, 65.f, 240.0f }, - { 213.5f, 65.f, 155.0f }, - { 233.0f, 65.f, 233.5f }, - { 294.0f, 65.f, 170.5f }, -}; - -xyz_t hachi_base_pos = { - 165.5f, 78.5f, 482.5f -}; - -xyz_t kabuto_base_pos[9] = { - { 165.5f, 78.5f, 482.5f }, - { 389.5f, 66.5f, -14.5f }, - { 241.5f, 67.0f, -15.5f }, - { 165.0f, 81.5f, 0.5f }, - { 89.0f, 64.0f, -15.5f }, - { 466.0f, 84.0f, 1.5f }, - { 171.0f, 64.5f, 5.5f }, - { 319.0f, 81.0f, 1.0f }, - { 313.0f, 63.0f, 5.5f } -}; - -extern cKF_Skeleton_R_c - cKF_bs_r_act_m_hirata_b, - cKF_bs_r_act_m_nokogiri_b, - cKF_bs_r_act_m_miyama_b, - cKF_bs_r_act_m_okuwa_b; - -cKF_Skeleton_R_c *kuwagata_model_tbl[] = { - &cKF_bs_r_act_m_hirata_b, - &cKF_bs_r_act_m_nokogiri_b, - &cKF_bs_r_act_m_miyama_b, - &cKF_bs_r_act_m_okuwa_b -}; - -extern cKF_Animation_R_c - cKF_ba_r_act_m_hirata_b, - cKF_ba_r_act_m_nokogiri_b, - cKF_ba_r_act_m_miyama_b, - cKF_ba_r_act_m_okuwa_b; - -cKF_Animation_R_c *kuwagata_anim_tbl[] = { - &cKF_ba_r_act_m_hirata_b, - &cKF_ba_r_act_m_nokogiri_b, - &cKF_ba_r_act_m_miyama_b, - &cKF_ba_r_act_m_okuwa_b -}; - -xyz_t kuwagata_base_pos[4] = { - { 166.f, 80.5f, 0.5f }, - { 169.f, 66.5f, 5.0f }, - { 318.f, 80.0f, 1.0f }, - { 315.f, 65.0f, 5.5f } -}; - -xyz_t amenbo_center_pos = { - 289.f, 25.f, 218.f -}; - -xyz_t rail_pos[6] = { - { 368.f, 45.f, 467.f }, - { 363.f, 45.f, 482.f }, - { 374.f, 45.f, 499.f }, - { 393.f, 45.f, 502.f }, - { 407.f, 45.f, 488.f }, - { 407.f, 45.f, 469.f } -}; - -xyz_t ari_rail_pos[3] = { - { 177.f, 45.f, -14.f }, - { 242.f, 45.f, 10.f }, - { 307.f, 45.f, -14.f } -}; - - // rodata const s16 aim_angle_tbl[6] = { DEG2SHORT_ANGLE(45 + 0), diff --git a/src/actor/ac_museum_insect_dango.c_inc b/src/actor/ac_museum_insect_dango.c_inc index e09726c6..b629bb1b 100644 --- a/src/actor/ac_museum_insect_dango.c_inc +++ b/src/actor/ac_museum_insect_dango.c_inc @@ -1,5 +1,8 @@ #include "ac_museum_insect_priv.h" +xyz_t rail_pos[6] = { { 368.f, 45.f, 467.f }, { 363.f, 45.f, 482.f }, { 374.f, 45.f, 499.f }, + { 393.f, 45.f, 502.f }, { 407.f, 45.f, 488.f }, { 407.f, 45.f, 469.f } }; + void mi_dango_defence_anime(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { static f32 scale_table[] = { 1.f, 0.85f, 1.15f, 0.75f, 1.05f, 0.65f, 0.95f }; if (actor->_7E < 7 && actor->_7E >= 0) { diff --git a/src/actor/ac_museum_insect_hachi.c_inc b/src/actor/ac_museum_insect_hachi.c_inc index 09ca5304..fcabe599 100644 --- a/src/actor/ac_museum_insect_hachi.c_inc +++ b/src/actor/ac_museum_insect_hachi.c_inc @@ -1,4 +1,5 @@ #include "ac_museum_insect_priv.h" +xyz_t hachi_base_pos = { 165.5f, 78.5f, 482.5f }; void mi_hachi_hane_anime(MUSEUM_INSECT_PRIVATE_DATA* actor) { static f32 scaleX_table[7] = { 1.f, 0.85f, 1.15f, 0.85f, 1.15f, 0.85f, 1.15f }; diff --git a/src/actor/ac_museum_insect_ka.c_inc b/src/actor/ac_museum_insect_ka.c_inc index 4eada15d..31bbcfae 100644 --- a/src/actor/ac_museum_insect_ka.c_inc +++ b/src/actor/ac_museum_insect_ka.c_inc @@ -1,5 +1,7 @@ #include "ac_museum_insect_priv.h" +xyz_t ari_rail_pos[3] = { { 177.f, 45.f, -14.f }, { 242.f, 45.f, 10.f }, { 307.f, 45.f, -14.f } }; + void minsect_ka_ct(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { static xyz_t init_pos = { 280.f, 40.f, 320.f }; actor->_72 = qrand(); diff --git a/src/actor/ac_museum_insect_kabuto.c_inc b/src/actor/ac_museum_insect_kabuto.c_inc index 64356adb..6e64205c 100644 --- a/src/actor/ac_museum_insect_kabuto.c_inc +++ b/src/actor/ac_museum_insect_kabuto.c_inc @@ -133,3 +133,7 @@ void minsect_kabuto_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { CLOSE_POLY_XLU_DISP(game->graph); } } + +xyz_t kabuto_base_pos[9] = { { 165.5f, 78.5f, 482.5f }, { 389.5f, 66.5f, -14.5f }, { 241.5f, 67.0f, -15.5f }, + { 165.0f, 81.5f, 0.5f }, { 89.0f, 64.0f, -15.5f }, { 466.0f, 84.0f, 1.5f }, + { 171.0f, 64.5f, 5.5f }, { 319.0f, 81.0f, 1.0f }, { 313.0f, 63.0f, 5.5f } }; diff --git a/src/actor/ac_museum_insect_kuwagata.c_inc b/src/actor/ac_museum_insect_kuwagata.c_inc index 15d50cd1..6bca6e47 100644 --- a/src/actor/ac_museum_insect_kuwagata.c_inc +++ b/src/actor/ac_museum_insect_kuwagata.c_inc @@ -1,5 +1,21 @@ #include "ac_museum_insect_priv.h" +extern cKF_Skeleton_R_c cKF_bs_r_act_m_hirata_b, cKF_bs_r_act_m_nokogiri_b, cKF_bs_r_act_m_miyama_b, + cKF_bs_r_act_m_okuwa_b; + +cKF_Skeleton_R_c* kuwagata_model_tbl[] = { &cKF_bs_r_act_m_hirata_b, &cKF_bs_r_act_m_nokogiri_b, + &cKF_bs_r_act_m_miyama_b, &cKF_bs_r_act_m_okuwa_b }; + +extern cKF_Animation_R_c cKF_ba_r_act_m_hirata_b, cKF_ba_r_act_m_nokogiri_b, cKF_ba_r_act_m_miyama_b, + cKF_ba_r_act_m_okuwa_b; + +cKF_Animation_R_c* kuwagata_anim_tbl[] = { &cKF_ba_r_act_m_hirata_b, &cKF_ba_r_act_m_nokogiri_b, + &cKF_ba_r_act_m_miyama_b, &cKF_ba_r_act_m_okuwa_b }; + +xyz_t kuwagata_base_pos[4] = { + { 166.f, 80.5f, 0.5f }, { 169.f, 66.5f, 5.0f }, { 318.f, 80.0f, 1.0f }, { 315.f, 65.0f, 5.5f } +}; + void mi_kuwagata_rensa_init(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { actor->_7A = 0; } diff --git a/src/actor/ac_museum_insect_mino.c_inc b/src/actor/ac_museum_insect_mino.c_inc index d5ce26cd..b41b0d4c 100644 --- a/src/actor/ac_museum_insect_mino.c_inc +++ b/src/actor/ac_museum_insect_mino.c_inc @@ -1,4 +1,5 @@ #include "ac_museum_insect_priv.h" +xyz_t amenbo_center_pos = { 289.f, 25.f, 218.f }; void minsect_mino_up_init(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { actor->_40 = 0.165f; diff --git a/src/actor/ac_museum_insect_tentou.c_inc b/src/actor/ac_museum_insect_tentou.c_inc index c80b5619..7cf999a6 100644 --- a/src/actor/ac_museum_insect_tentou.c_inc +++ b/src/actor/ac_museum_insect_tentou.c_inc @@ -12,6 +12,13 @@ void mi_tentou_check_player(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { } } +xyz_t tentou_flower_pos[4] = { + { 410.0f, 65.f, 240.0f }, + { 213.5f, 65.f, 155.0f }, + { 233.0f, 65.f, 233.5f }, + { 294.0f, 65.f, 170.5f }, +}; + void mi_tentou_kama_anime(MUSEUM_INSECT_PRIVATE_DATA* actor) { static f32 scaleX_table[7] = { 1.f, 0.95f, 1.15f, 0.95f, 1.15f, 0.95f, 1.15f }; if (actor->_7E < 7) { diff --git a/src/actor/ac_museum_insect_tonbo.c_inc b/src/actor/ac_museum_insect_tonbo.c_inc index d337ba8b..b0ab912c 100644 --- a/src/actor/ac_museum_insect_tonbo.c_inc +++ b/src/actor/ac_museum_insect_tonbo.c_inc @@ -1,5 +1,8 @@ #include "ac_museum_insect_priv.h" +xyz_t tonbo_rock_pos[6] = { { 215.f, 68.f, 403.f }, { 232.f, 60.f, 381.f }, { 372.f, 65.f, 482.f }, + { 390.f, 68.f, 469.f }, { 328.f, 72.f, 501.f }, { 351.f, 72.f, 501.f } }; + void minsect_tonbo_ct(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { actor->_34 = ZeroVec; actor->_68 = ZeroSVec;