diff --git a/src/actor/ac_museum_insect_base.c_inc b/src/actor/ac_museum_insect_base.c_inc index 7af99eb0..46726502 100644 --- a/src/actor/ac_museum_insect_base.c_inc +++ b/src/actor/ac_museum_insect_base.c_inc @@ -1,5 +1,11 @@ #include "ac_museum_insect_priv.h" +void mID_insect_moveF(MUSEUM_INSECT_PRIVATE_DATA* actor) { + actor->_34.x = actor->_40 * sin_s(actor->_68.y); + actor->_34.z = actor->_40 * cos_s(actor->_68.y); + xyz_t_add(&actor->_1C, &actor->_34, &actor->_1C); +} + #include "../src/actor/ac_museum_insect_chou.c_inc" #include "../src/actor/ac_museum_insect_semi.c_inc" #include "../src/actor/ac_museum_insect_tonbo.c_inc" @@ -8,19 +14,6 @@ #include "../src/actor/ac_museum_insect_hachi.c_inc" #include "../src/actor/ac_museum_insect_kabuto.c_inc" #include "../src/actor/ac_museum_insect_kuwagata.c_inc" -#include "../src/actor/ac_museum_insect_mino.c_inc" -#include "../src/actor/ac_museum_insect_kumo.c_inc" -#include "../src/actor/ac_museum_insect_goki.c_inc" -#include "../src/actor/ac_museum_insect_genji.c_inc" -#include "../src/actor/ac_museum_insect_dango.c_inc" -#include "../src/actor/ac_museum_insect_okera.c_inc" -#include "../src/actor/ac_museum_insect_ka.c_inc" - -void mID_insect_moveF(MUSEUM_INSECT_PRIVATE_DATA* actor) { - actor->_34.x = actor->_40 * sin_s(actor->_68.y); - actor->_34.z = actor->_40 * cos_s(actor->_68.y); - xyz_t_add(&actor->_1C, &actor->_34, &actor->_1C); -} void minsect_amenbo_ct(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { actor->_1C = amenbo_center_pos; @@ -94,6 +87,12 @@ void minsect_amenbo_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { CLOSE_DISP(game->graph); } +#include "../src/actor/ac_museum_insect_mino.c_inc" +#include "../src/actor/ac_museum_insect_kumo.c_inc" +#include "../src/actor/ac_museum_insect_goki.c_inc" +#include "../src/actor/ac_museum_insect_genji.c_inc" +#include "../src/actor/ac_museum_insect_dango.c_inc" + void ari_alone_ct(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { actor->_8C |= 1; if (RANDOM_F(1.f) < (2.f / 3.f)) { @@ -163,6 +162,9 @@ void ari_alone_move(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { } } +#include "../src/actor/ac_museum_insect_okera.c_inc" +#include "../src/actor/ac_museum_insect_ka.c_inc" + extern Gfx act_m_mu_ariT_model; void ari_alone_draw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { _texture_z_light_fog_prim_xlu(game->graph); diff --git a/src/actor/ac_museum_insect_goki.c_inc b/src/actor/ac_museum_insect_goki.c_inc index cbe3babf..94144938 100644 --- a/src/actor/ac_museum_insect_goki.c_inc +++ b/src/actor/ac_museum_insect_goki.c_inc @@ -1,5 +1,9 @@ #include "ac_museum_insect_priv.h" +// UNUSED +void mi_goki_hane_anime() { +} + void minsect_goki_ct(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { actor->_1C.x = 280.f; actor->_1C.y = 40.f; diff --git a/src/actor/ac_museum_insect_kuwagata.c_inc b/src/actor/ac_museum_insect_kuwagata.c_inc index 6bca6e47..488ab3cc 100644 --- a/src/actor/ac_museum_insect_kuwagata.c_inc +++ b/src/actor/ac_museum_insect_kuwagata.c_inc @@ -286,6 +286,14 @@ void minsect_kuwagata_ct(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { mi_kuwagata_setupAction(actor, 0, game); } +// UNUSED +void minsect_kuwagata_normal_process() { +} + +// UNUSED +void minsect_kuwagata_battle_process() { +} + void minsect_kuwagata_mv(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { actor->_04(actor, game); } diff --git a/src/actor/ac_museum_insect_tonbo.c_inc b/src/actor/ac_museum_insect_tonbo.c_inc index b0ab912c..8b4abf35 100644 --- a/src/actor/ac_museum_insect_tonbo.c_inc +++ b/src/actor/ac_museum_insect_tonbo.c_inc @@ -124,6 +124,14 @@ void minsect_tonbo_rock_target_set(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game } } +// UNUSED +void minsect_tonbo_suprised_near_player() { + extern _strip(f32); + _strip(75.f); + _strip(6.f); + _strip(55.f); +} + BOOL minsect_tonbo_suprised_rest_player(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { if (actor->_74 >= 6) { actor->_7A = 1;