mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match all but the last function in ac_museum_insect_base.c_inc

Browse Source
This commit is contained in:
roeming
2025-02-15 14:29:58 -05:00
parent 2469800e24
commit 1b3a966fea
7 changed files with 425 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/GAFE01_00/foresta/splits.txt
+1 -17
View File
@@ -854,23 +854,7 @@ actor/ac_museum_indoor.c:
.data start:0x00038F08 end:0x00038F48
actor/ac_museum_insect.c:
.text start:0x000EA278 end:0x000EAA24
.text start:0x000EAA24 end:0x000EC6CC
.text start:0x000EC6CC end:0x000EDE80
.text start:0x000EDE80 end:0x000EE5C4
.text start:0x000EE5C4 end:0x000F11E4
.text start:0x000F11E4 end:0x000F21F8
.text start:0x000F21F8 end:0x000F3E48
.text start:0x000F3E48 end:0x000F5244
.text start:0x000F5244 end:0x000F5C90
.text start:0x000F5C90 end:0x000F7220
.text start:0x000F7220 end:0x000F8CF4
.text start:0x000F8CF4 end:0x000FA5FC
.text start:0x000FA5FC end:0x000FB188
.text start:0x000FB188 end:0x000FC81C
.text start:0x000FC81C end:0x000FD418
.text start:0x000FD418 end:0x000FE3D4
.text start:0x000FE3D4 end:0x000FEB90
.text start:0x000EA278 end:0x000FEB90
.rodata start:0x00003420 end:0x00003828
.data start:0x00038F48 end:0x00039BF0
.bss start:0x000A16D8 end:0x000A16F0
include/ac_museum_insect_priv.h
+14 -14
View File
@@ -61,7 +61,7 @@ typedef struct _MUSEUM_INSECT_PRIVATE_DATA {
};
};
f32 _60;
artificial_padding(0x60, 0x68, int);
artificial_padding(0x60, 0x68, f32);
s_xyz _68;
s16 _6E;
s16 _70;
@@ -87,14 +87,14 @@ typedef struct _INSECT_DISPLAY_MSG_INFO {
typedef struct _MUSEUM_INSECT_ACTOR {
ACTOR actor; // offset: 0x0
MUSEUM_INSECT_PRIVATE_DATA privInsects[aINS_INSECT_TYPE_NUM]; // offset 0x174
MUSEUM_INSECT_PRIVATE_DATA _1894[7]; // offset 0x1894
artificial_padding(0x1894, 0x24b8, MUSEUM_INSECT_PRIVATE_DATA[7]);
MUSEUM_INSECT_SKELETON _24B8[4];
int _2F78; // offset: 0x2F78
int _2F7C; // offset: 0x2F7C
INSECT_DISPLAY_MSG_INFO _2F80[7]; // offset: 0x2F82
s16 _2F9C[5]; // offset: 0x2F9C
MUSEUM_INSECT_PRIVATE_DATA privInsects[aINS_INSECT_TYPE_NUM]; // offset: 0x174
MUSEUM_INSECT_PRIVATE_DATA _1894[6]; // offset: 0x1894
MUSEUM_INSECT_PRIVATE_DATA _1CA0[15]; // offset: 0x1CA0
MUSEUM_INSECT_SKELETON _24B8[4]; // offset: 0x24B8
int _2F78; // offset: 0x2F78
int _2F7C; // offset: 0x2F7C
INSECT_DISPLAY_MSG_INFO _2F80[7]; // offset: 0x2F82
s16 _2F9C[5]; // offset: 0x2F9C
} MUSEUM_INSECT_ACTOR;
// bss
@@ -163,17 +163,17 @@ void minsect_amenbo_ct(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game);
void minsect_amenbo_mv(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game);
void minsect_amenbo_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game);
void ari_alone_ct(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game);
void ari_alone_make(void);
void ari_alone_dt(void);
void ari_alone_move(void);
void ari_alone_draw(void);
void ari_alone_make(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game);
void ari_alone_dt(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game);
void ari_alone_move(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game);
void ari_alone_draw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game);
void minsect_ari_ct(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game);
void minsect_ari_mv(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game);
void minsect_ari_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game);
void minsect_draw_shadow(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game);
void minsect_fly_BGCheck(MUSEUM_INSECT_PRIVATE_DATA* actor, f32 f1, f32 f2);
void minsect_garden_BGCheck(MUSEUM_INSECT_PRIVATE_DATA* actor, f32 f1, f32 f2);
void minsect_flower_BGCheck(MUSEUM_INSECT_PRIVATE_DATA* actor, const xyz_t* p);
void minsect_flower_BGCheck(MUSEUM_INSECT_PRIVATE_DATA* actor, xyz_t* p);
void minsect_goki_BGCheck(MUSEUM_INSECT_PRIVATE_DATA* actor);
void minsect_kanban_BGCheck(MUSEUM_INSECT_PRIVATE_DATA* actor);
void minsect_tree_ObjCheck(MUSEUM_INSECT_PRIVATE_DATA* actor);
src/actor/ac_museum_insect.c
+6 -44
View File
@@ -756,48 +756,6 @@ xyz_t ari_rail_pos[3] = {
{ 307.f, 45.f, -14.f }
};
f32 minsect_scale_tbl[40] = {
0.01f,
0.01f,
0.01f,
0.01f,
0.008f,
0.008f,
0.008f,
0.008f,
0.01f,
0.01f,
0.01f,
0.01f,
0.01f,
0.01f,
0.01f,
0.01f,
0.01f,
0.01f,
0.01f,
0.01f,
0.01f,
0.01f,
0.009f,
0.009f,
0.009f,
0.009f,
0.01f,
0.01f,
0.01f,
0.01f,
0.01f,
0.01f,
0.01f,
0.01f,
0.007f,
0.01f,
0.01f,
0.01f,
0.01f,
0.01f
};
// rodata
const s16 aim_angle_tbl[6] = {
@@ -885,6 +843,12 @@ int Museum_Insect_GetMsgNo(ACTOR* actorx) {
MUSEUM_INSECT_ACTOR* MI_Control_Actor = NULL;
#include "../src/actor/ac_museum_insect_base.c_inc"
f32 minsect_scale_tbl[40] = { 0.01f, 0.01f, 0.01f, 0.01f, 0.008f, 0.008f, 0.008f, 0.008f, 0.01f, 0.01f,
0.01f, 0.01f, 0.01f, 0.01f, 0.01f, 0.01f, 0.01f, 0.01f, 0.01f, 0.01f,
0.01f, 0.01f, 0.009f, 0.009f, 0.009f, 0.009f, 0.01f, 0.01f, 0.01f, 0.01f,
0.01f, 0.01f, 0.01f, 0.01f, 0.007f, 0.01f, 0.01f, 0.01f, 0.01f, 0.01f };
int Museum_Insect_Check_Talk_Distance(GAME* game, int i) {
static xyz_t kanban_pos[6] = { { 140.f, 40.f, 60.f }, { 420.f, 40.f, 60.f }, { 220.f, 40.f, 300.f },
{ 380.f, 40.f, 300.f }, { 180.f, 40.f, 540.f }, { 340.f, 40.f, 540.f } };
@@ -1036,5 +1000,3 @@ void Museum_Insect_Actor_draw(ACTOR* actorx, GAME* game) {
}
}
}
#include "../src/actor/ac_museum_insect_base.c_inc"
src/actor/ac_museum_insect_base.c_inc
+397 -5
View File
@@ -17,47 +17,439 @@
#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;
actor->_34 = ZeroVec;
actor->_44 = ZeroVec;
actor->_68 = ZeroSVec;
actor->_68.y = qrand();
actor->_70 = actor->_68.y;
actor->_6E = (s16)RANDOM_F(60.f);
actor->_40 = 0.f;
}
void minsect_amenbo_mv(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
actor->_8E = get_now_mind_flag(actor, game);
actor->_6E--;
if (actor->_40 > 0.f) {
if (!add_calc(&actor->_40, 0.f, CALC_EASE(0.1), 0.05f, 0.005f)) {
actor->_70 += (s16)DEG2SHORT_ANGLE2(RANDOM2_F(120.f));
actor->_6E = RANDOM_F(60.f);
if (actor->_8E == 0) {
actor->_6E *= 10;
}
}
mID_insect_moveF(actor);
} else {
if (actor->_6E < 0) {
if (!add_calc_short_angle2(&actor->_68.y, actor->_70, CALC_EASE(0.5f), DEG2SHORT_ANGLE(5),
DEG2SHORT_ANGLE(0.5f))) {
actor->_40 = (RANDOM_F(1.19f) + 1.15f) * 0.5f;
Common_Get(clip.effect_clip)->effect_make_proc(69, actor->_1C, 1, actor->_68.y, game, 0, 1, 0);
}
}
}
if (actor->_1C.x < amenbo_center_pos.x - 25.f) {
actor->_1C.x = amenbo_center_pos.x - 25.f;
actor->_6E = 0;
actor->_40 = 0.f;
actor->_70 = -actor->_68.y;
} else if (actor->_1C.x > amenbo_center_pos.x + 25.f) {
actor->_1C.x = amenbo_center_pos.x + 25.f;
actor->_6E = 0;
actor->_40 = 0.f;
actor->_70 = -actor->_68.y;
}
if (actor->_1C.z < amenbo_center_pos.z - 18.f) {
actor->_1C.z = amenbo_center_pos.z - 18.f;
actor->_6E = 0;
actor->_40 = 0.f;
actor->_70 = (s16)DEG2SHORT_ANGLE2(180);
actor->_70 -= actor->_68.y;
} else if (actor->_1C.z > amenbo_center_pos.z + 18.f) {
actor->_1C.z = amenbo_center_pos.z + 18.f;
actor->_6E = 0;
actor->_40 = 0.f;
actor->_70 = (s16)DEG2SHORT_ANGLE2(180);
actor->_70 -= actor->_68.y;
}
}
void minsect_amenbo_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
_texture_z_light_fog_prim_xlu(game->graph);
OPEN_DISP(game->graph);
Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z, FALSE);
Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
Matrix_rotateXYZ(actor->_68.x, actor->_68.y + (s16)DEG2SHORT_ANGLE2(180), actor->_68.z, TRUE);
gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetEnvColor(NEXT_POLY_OPA_DISP, 0, 0xff, 0x9b, 0xff);
gSPDisplayList(NEXT_POLY_OPA_DISP, minsect_mdl[actor->_00][0]);
CLOSE_DISP(game->graph);
}
void ari_alone_ct(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
actor->_8C |= 1;
if (RANDOM_F(1.f) < (2.f / 3.f)) {
actor->_74 = 1;
actor->_1C = ari_rail_pos[0];
} else {
actor->_1C = ari_rail_pos[2];
actor->_74 = -1;
}
actor->_70 = 1;
actor->_40 = RANDOM_F(0.25f) + 0.05f;
actor->_6E = (s16)RANDOM_F(1160.f) + 40;
actor->_5C = RANDOM2_F(5.f);
}
void ari_alone_make(void) {
void ari_alone_make(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
int i = 0;
for (i = 0; i < 15; actor++, i++) {
if ((actor->_8C & 1) == 0) {
ari_alone_ct(actor, game);
break;
}
}
}
void ari_alone_dt(void) {
void ari_alone_dt(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
actor->_8C &= ~1;
}
void ari_alone_move(void) {
void ari_alone_move(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
xyz_t p = ari_rail_pos[actor->_70];
xyz_t p2;
actor->_6E--;
if (actor->_40 > 0.f) {
f32 v;
s16 s;
if (actor->_74 > 0) {
v = 307.f - actor->_1C.x;
} else {
v = actor->_1C.x - 177.f;
}
s = DEG2SHORT_ANGLE2((v * 360.f) / 130.f);
if (actor->_70 == 1) {
actor->_58 = (-5.f - (GETREG(TAKREG, 0x32) * 0.1f)) * sin_s(s);
} else {
actor->_58 = (5.f + (GETREG(TAKREG, 0x32) * 0.1f)) * sin_s(s);
}
p.z += actor->_5C;
if (!chase_xyz_t(&actor->_1C, &p, actor->_40)) {
if (actor->_70 == 1) {
actor->_70 += actor->_74;
} else {
ari_alone_dt(actor, game);
}
}
xyz_t_sub(&p, &actor->_1C, &p2);
actor->_72 = atans_table(p2.z, p2.x);
add_calc_short_angle2(&actor->_68.y, actor->_72, CALC_EASE2(0.3f), DEG2SHORT_ANGLE(1.25f),
DEG2SHORT_ANGLE(0.25f));
if (actor->_6E < 0) {
actor->_40 = 0.f;
actor->_6E = (s16)RANDOM_F(260.f) + 40;
}
} else if (actor->_6E < 0) {
actor->_40 = RANDOM_F(0.25f) + 0.05f;
actor->_6E = (s16)RANDOM_F(1160.f) + 40;
}
}
void ari_alone_draw(void) {
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);
OPEN_DISP(game->graph);
Matrix_translate(actor->_1C.x, actor->_1C.y, actor->_1C.z + actor->_58, FALSE);
Matrix_rotateXYZ(actor->_68.x, actor->_68.y, actor->_68.z, TRUE);
Matrix_scale(actor->_14, actor->_14, actor->_14, TRUE);
gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(NEXT_POLY_OPA_DISP, &act_m_mu_ariT_model);
CLOSE_DISP(game->graph);
}
void minsect_ari_ct(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
MUSEUM_INSECT_PRIVATE_DATA* priv = &MI_Control_Actor->_1CA0[0];
int i;
actor->_6E = (s16)RANDOM_F(100.f) + 20;
for (i = 0; i < 15; priv++, i++) {
ari_alone_dt(priv, game);
}
}
void minsect_ari_mv(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
MUSEUM_INSECT_PRIVATE_DATA* priv = MI_Control_Actor->_1CA0;
int i;
if (actor->_6E-- < 0) {
actor->_6E = (s16)RANDOM_F(100.f) + 20;
ari_alone_make(priv, game);
}
for (i = 0; i < 15; priv++, i++) {
if (priv->_8C & 1) {
ari_alone_move(priv, game);
priv->_14 = actor->_14;
}
}
}
void minsect_ari_dw(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
MUSEUM_INSECT_PRIVATE_DATA* priv = MI_Control_Actor->_1CA0;
int i;
for (i = 0; i < 15; priv++, i++) {
if (priv->_8C & 1) {
ari_alone_draw(priv, game);
}
}
}
extern Gfx ef_shadow_insect_modelT;
void minsect_draw_shadow(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
GAME_PLAY* play = (GAME_PLAY*)game;
u8 shadow = play->kankyo.shadow_alpha;
f32 v;
f32 scale;
u8 alpha;
f32 v0;
f32 v1;
if (actor->_1C.z > -40.f && actor->_1C.z < 40.f) {
v = 46.f;
} else if (actor->_1C.x > 120.f && actor->_1C.x < 440.f &&
(actor->_1C.z > 120.f && actor->_1C.z < 280.f || actor->_1C.z > 360.f && actor->_1C.z < 520.f)) {
v = 45.f;
} else {
v = 40.f;
}
v0 = 100.f - (actor->_1C.y - v);
v1 = 1.f + (GETREG(TAKREG, 0x2b) * 0.1f);
alpha = (int)(v0 * v1 + 40.0f + GETREG(TAKREG, 0x2c));
alpha = (alpha * shadow) >> 8;
scale = (GETREG(TAKREG, 0x28) * 0.001f + 0.005f);
scale *= minsect_shadow_scale_tbl[(int)actor->_00];
Matrix_translate(actor->_1C.x, v, actor->_1C.z, FALSE);
Matrix_scale(scale, scale, scale, TRUE);
_texture_z_light_fog_prim_shadow(game->graph);
OPEN_SHADOW_DISP(game->graph);
gDPSetPrimColor(SHADOW_DISP++, 0, 255, 0, 0, 0, alpha);
gSPMatrix(SHADOW_DISP++, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(SHADOW_DISP++, &ef_shadow_insect_modelT);
CLOSE_SHADOW_DISP(game->graph);
}
void minsect_fly_BGCheck(MUSEUM_INSECT_PRIVATE_DATA* actor, f32 f1, f32 f2) {
const f32 min = 50.0f;
const f32 max = 510.0f;
actor->_8C &= ~0x1e;
if (actor->_1C.x < min) {
actor->_1C.x = min;
actor->_8C |= 2;
} else if (actor->_1C.x > max) {
actor->_1C.x = max;
actor->_8C |= 4;
}
if (actor->_1C.z < f2) {
actor->_8C |= 8;
} else if (actor->_1C.z > f1) {
actor->_8C |= 0x10;
}
}
void minsect_garden_BGCheck(MUSEUM_INSECT_PRIVATE_DATA* actor, f32 f1, f32 f2) {
const f32 v1 = 130.f, v2 = 430.f;
actor->_8C &= ~0x1e;
actor->_8C &= ~0x20;
if (actor->_1C.x < v1) {
actor->_1C.x = v1;
actor->_8C |= 2;
} else if (actor->_1C.x > v2) {
actor->_1C.x = v2;
actor->_8C |= 4;
}
if (actor->_1C.z < f2) {
actor->_1C.z = f2;
actor->_8C |= 8;
} else if (actor->_1C.z > f1) {
actor->_1C.z = f1;
actor->_8C |= 0x10;
}
if (actor->_1C.y < 45.f) {
actor->_1C.y = 45.f;
actor->_8C |= 0x20;
}
}
void minsect_flower_BGCheck(MUSEUM_INSECT_PRIVATE_DATA* actor, const xyz_t* p) {
void minsect_flower_BGCheck(MUSEUM_INSECT_PRIVATE_DATA* actor, xyz_t* p) {
xyz_t p2;
f32 dsq;
xyz_t_sub(&actor->_1C, p, &p2);
dsq = SQ(p2.x) + SQ(p2.z);
actor->_8C &= ~2;
if (dsq > SQ(15)) {
f32 d = sqrtf(dsq);
p2.x *= (14.9f) / d;
p2.z *= (14.9f) / d;
actor->_1C.x = p->x + p2.x;
actor->_1C.z = p->z + p2.z;
actor->_8C |= 2;
}
actor->_1C.y = (-p2.z * 5.f) / 20.f + 65.f;
}
void minsect_goki_BGCheck(MUSEUM_INSECT_PRIVATE_DATA* actor) {
f32 v1, v2;
v1 = actor->_1C.x - 115.f;
v2 = 445.f - actor->_1C.x;
actor->_8C &= ~0x1e;
actor->_8C &= ~0x20;
if (actor->_1C.x < 45.f) {
actor->_1C.x = 45.f;
actor->_8C |= 2;
} else if (actor->_1C.x > 515.f) {
actor->_1C.x = 515.f;
actor->_8C |= 4;
}
if (actor->_1C.z < 45.f) {
actor->_1C.z = 45.f;
actor->_8C |= 8;
} else if (actor->_1C.z > 595.f) {
actor->_1C.z = 595.f;
actor->_8C |= 0x10;
}
if (actor->_1C.y < 40.f) {
actor->_1C.y = 40.f;
actor->_8C |= 0x20;
}
if (v1 > 0.f && v2 > 0.f) {
int i;
for (i = 0; i < 2; i++) {
static const float BG_ZB_tbl[2] = { 115.f, 355.f };
static const float BG_ZF_tbl[2] = { 285.f, 525.f };
f32 a1 = actor->_1C.z - BG_ZB_tbl[i];
f32 a2 = BG_ZF_tbl[i] - actor->_1C.z;
if (a1 > 0.f && a2 > 0.f) {
// f32 v3 = -v1;
f32 m1 = v1 > v2 ? v2 : -v1;
f32 m2 = a1 > a2 ? a2 : -a1;
f32 bb = ABS(m2);
f32 cc = ABS(m1);
if (cc > bb) {
actor->_1C.x += m2;
if (m2 > 0.f) {
actor->_8C |= 4;
} else {
actor->_8C |= 2;
}
} else {
actor->_1C.z += m1;
if (m1 > 0.f) {
actor->_8C |= 0x10;
} else {
actor->_8C |= 8;
}
}
}
}
}
}
void minsect_kanban_BGCheck(MUSEUM_INSECT_PRIVATE_DATA* actor) {
static float KANBAN_XL_TBL[] = { 162.f, 325.f };
static float KANBAN_XR_TBL[] = { 195.f, 358.f };
int i;
for (i = 0; i < 2; i++) {
if (actor->_1C.x > KANBAN_XL_TBL[i] && actor->_1C.x < KANBAN_XR_TBL[i]) {
f32 v = actor->_1C.z - actor->_34.z;
const f32 vv = 508.f;
const f32 tt = 500.f;
if (v - vv >= 0.f && actor->_1C.z - vv < 0.f) {
actor->_1C.z = vv;
} else if (v - tt <= 0.f && actor->_1C.z - tt > 0.f) {
actor->_1C.z = tt;
}
}
}
}
void minsect_tree_ObjCheck(MUSEUM_INSECT_PRIVATE_DATA* actor) {
int i = 0;
const f32 d = SQ(20.f);
actor->_8C &= ~0x80;
for (i = 0; i < 8; i++) {
f32 x = tree_pos[i].x - actor->_1C.x;
f32 z = tree_pos[i].z - actor->_1C.z;
f32 dsq = SQ(x) + SQ(z);
if (dsq < d) {
s16 ang = atans_table(z, x);
f32 dist = 20.1f - sqrtf(dsq);
actor->_1C.x -= dist * sin_s(ang);
actor->_1C.z -= dist * cos_s(ang);
actor->_8C |= 0x80;
}
}
}
void minsect_rock_ObjCheck(MUSEUM_INSECT_PRIVATE_DATA* actor) {
int i = 0;
const f32 d = SQ(22.f);
actor->_8C &= ~0x40;
for (i = 0; i < 2; i++) {
f32 x = rock_pos[i].x - actor->_1C.x;
f32 z = rock_pos[i].z - actor->_1C.z;
f32 dsq = SQ(x) + SQ(z);
if (dsq < d) {
s16 ang = atans_table(z, x);
f32 dist = 22.f - sqrtf(dsq);
actor->_1C.x -= dist * sin_s(ang);
actor->_1C.z -= dist * cos_s(ang);
actor->_8C |= 0x40;
}
}
}
void minsect_batta_ObjCheck(MUSEUM_INSECT_PRIVATE_DATA* actor) {
int c = 6;
int i;
if (MI_Control_Actor->privInsects[0x21]._8C & 1 &&
MI_Control_Actor->privInsects[0x21]._04 == okera_normal_process) {
c = 7;
}
for (i = 0; i < c; i++) {
static int idx_tbl[7] = { 0xd, 0xe, 0xf, 0x10, 0x11, 0x12, 0x21 };
MUSEUM_INSECT_PRIVATE_DATA* priv = &MI_Control_Actor->privInsects[idx_tbl[i]];
if (priv != actor && priv->_8C & 1) {
f32 x = priv->_1C.x - actor->_1C.x;
f32 z = priv->_1C.z - actor->_1C.z;
f32 dsq = SQ(x) + SQ(z);
const f32 d = SQ(GETREG(NMREG, 0x5a) + 10.f);
if (dsq < d) {
s16 ang = atans_table(z, x);
f32 dist = (GETREG(NMREG, 0x5a) + 10.f) - sqrtf(dsq);
actor->_1C.x -= dist * sin_s(ang);
actor->_1C.z -= dist * cos_s(ang);
}
}
}
}
BOOL get_now_mind_flag(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
src/actor/ac_museum_insect_genji.c_inc
+1 -1
View File
@@ -226,7 +226,7 @@ void minsect_genji_mv(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
add_calc_short_angle2(&actor->_68.z, actor->_5E_s16, CALC_EASE2(0.4f),
(s16)(DEG2SHORT_ANGLE(GETREG(NMREG, 3) * 0.01f + 5.f) >> 1) >> 1, DEG2SHORT_ANGLE(0.25f));
add_calc_short_angle2(&actor->_7E, actor->_80, CALC_EASE2(0.4f), DEG2SHORT_ANGLE(0.75f), DEG2SHORT_ANGLE(0.25f));
for (i = 1; i < 7; i++, priv++) {
for (i = 0 + 1; i < 6 + 1; i++, priv++) {
if (priv->_8C & 1) {
if ((GETREG(NMREG, 0xF) || (RANDOM_F(1.f) > 0.9f && actor->_6E < 0)) && (priv->_8C & 0x100) == 0) {
src/actor/ac_museum_insect_kumo.c_inc
+4 -3
View File
@@ -186,9 +186,10 @@ void minsect_kumo_hineri(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
void minsect_kumo_setupAction(MUSEUM_INSECT_PRIVATE_DATA* actor, int r4, GAME* game) {
static PRIV_INSECT_PROCESS init_proc[] = { minsect_kumo_wait_init, minsect_kumo_move_init, minsect_kumo_up_init,
minsect_kumo_down_init };
static PRIV_INSECT_PROCESS move_proc[] = { minsect_kumo_wait, minsect_kumo_move, minsect_kumo_up,
minsect_kumo_down };
minsect_kumo_down_init, minsect_kumo_hide_init };
static PRIV_INSECT_PROCESS move_proc[] = { minsect_kumo_wait, minsect_kumo_move, minsect_kumo_up, minsect_kumo_down,
minsect_kumo_hide };
static f32 scaleX_table[] = { 1.15, 0.5f, 1.15f, 0.5f, 1.15f, 0.5f, 1.15f };
actor->_04 = move_proc[r4];
init_proc[r4](actor, game);
}
src/actor/ac_museum_insect_tentou.c_inc
+2 -2
View File
@@ -171,8 +171,8 @@ void mi_tentou_menace(MUSEUM_INSECT_PRIVATE_DATA* actor, GAME* game) {
}
void mi_tentou_setupAction(MUSEUM_INSECT_PRIVATE_DATA* actor, int r4, GAME* game) {
static PRIV_INSECT_PROCESS move_proc[3] = { mi_tentou_wait_init, mi_tentou_move_init, mi_tentou_menace_init };
static PRIV_INSECT_PROCESS init_proc[3] = { mi_tentou_wait, mi_tentou_move, mi_tentou_menace };
static PRIV_INSECT_PROCESS init_proc[3] = { mi_tentou_wait_init, mi_tentou_move_init, mi_tentou_menace_init };
static PRIV_INSECT_PROCESS move_proc[3] = { mi_tentou_wait, mi_tentou_move, mi_tentou_menace };
actor->_04 = move_proc[r4];
init_proc[r4](actor, game);
}