diff --git a/src/actor/ac_museum_insect.c b/src/actor/ac_museum_insect.c index 3c0c4597..c8652ab6 100644 --- a/src/actor/ac_museum_insect.c +++ b/src/actor/ac_museum_insect.c @@ -686,42 +686,6 @@ const f32 base_high_tbl[4] = { 85.f, 95.f, 90.f, 90.f }; -const xyz_t mino_base_pos = { - 135.f, 64.f, 474.f -}; - -const xyz_t mino_top_pos = { - 135.f, 90.f, 474.f -}; - -const xyz_t mino_bottom_pos = { - 135.f, 54.f, 474.f -}; - -const xyz_t kumo_base_pos = { - 330.f, 64.5f, 229.f -}; - -const xyz_t kumo_top_pos = { - 330.f, 90.f, 229.f -}; - -const xyz_t kumo_bottom_pos = { - 330.f, 54.f, 229.f -}; - -const xyz_t base_genji_pos = { - 258.f, 62.f, 258.5f -}; - -const xyz_t genji_mizu_pos = { - 289.f, 25.f, 218.f -}; - -const xyz_t okera_base_pos = { - 235.f, 45.f, 445.f -}; - // clang-format on int Museum_Insect_GetMsgNo(ACTOR* actorx) { diff --git a/src/actor/ac_museum_insect_genji.c_inc b/src/actor/ac_museum_insect_genji.c_inc index 569d8e0d..e9c1e50b 100644 --- a/src/actor/ac_museum_insect_genji.c_inc +++ b/src/actor/ac_museum_insect_genji.c_inc @@ -1,5 +1,9 @@ #include "ac_museum_insect_priv.h" +const xyz_t base_genji_pos = { 258.f, 62.f, 258.5f }; + +const xyz_t genji_mizu_pos = { 289.f, 25.f, 218.f }; + void mi_genji_check_player(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { PLAYER_ACTOR* player = get_player_actor_withoutCheck((GAME_PLAY*)game); f32 dist = search_position_distance(&actor->_1C, &player->actor_class.world.position); diff --git a/src/actor/ac_museum_insect_kumo.c_inc b/src/actor/ac_museum_insect_kumo.c_inc index b49af660..319c7ad1 100644 --- a/src/actor/ac_museum_insect_kumo.c_inc +++ b/src/actor/ac_museum_insect_kumo.c_inc @@ -1,5 +1,11 @@ #include "ac_museum_insect_priv.h" +const xyz_t kumo_base_pos = { 330.f, 64.5f, 229.f }; + +const xyz_t kumo_top_pos = { 330.f, 90.f, 229.f }; + +const xyz_t kumo_bottom_pos = { 330.f, 54.f, 229.f }; + void minsect_kumo_hide_init(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { actor->_40 = 0.165f; } diff --git a/src/actor/ac_museum_insect_mino.c_inc b/src/actor/ac_museum_insect_mino.c_inc index b41b0d4c..d5466ecd 100644 --- a/src/actor/ac_museum_insect_mino.c_inc +++ b/src/actor/ac_museum_insect_mino.c_inc @@ -1,6 +1,12 @@ #include "ac_museum_insect_priv.h" xyz_t amenbo_center_pos = { 289.f, 25.f, 218.f }; +const xyz_t mino_base_pos = { 135.f, 64.f, 474.f }; + +const xyz_t mino_top_pos = { 135.f, 90.f, 474.f }; + +const xyz_t mino_bottom_pos = { 135.f, 54.f, 474.f }; + void minsect_mino_up_init(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { actor->_40 = 0.165f; actor->_6E = (s16)RANDOM_F(20.f) + 50; diff --git a/src/actor/ac_museum_insect_okera.c_inc b/src/actor/ac_museum_insect_okera.c_inc index 8b8c3eee..48fe06f2 100644 --- a/src/actor/ac_museum_insect_okera.c_inc +++ b/src/actor/ac_museum_insect_okera.c_inc @@ -1,5 +1,7 @@ #include "ac_museum_insect_priv.h" +const xyz_t okera_base_pos = { 235.f, 45.f, 445.f }; + void mi_okera_check_player(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) { PLAYER_ACTOR* player = get_player_actor_withoutCheck((GAME_PLAY*)game); f32 dist = search_position_distance(&actor->_1C, &player->actor_class.world.position);