diff --git a/src/actor/ac_museum_fish.c b/src/actor/ac_museum_fish.c index c6bc1c96..c0821c0b 100644 --- a/src/actor/ac_museum_fish.c +++ b/src/actor/ac_museum_fish.c @@ -918,7 +918,7 @@ void Museum_Fish_Actor_ct(ACTOR* actorx, GAME* gamex) { } for (i = 0; i < 20; i++) { - actor->_14d50[i] = RANDOMF_RANGE(80, 120); + actor->_14d50[i] = RANDOMF_RANGE(40, 120); actor->_14d78[i] = RANDOMF_RANGE(2, 5); } } @@ -1116,7 +1116,7 @@ void Museum_Fish_Actor_move(ACTOR* actorx, GAME* game) { add_calc2(&actor->prvKusa[j]._540.x, -4.0f, 0.5f, 0.5f); add_calc_short_angle2(&actor->prvKusa[j]._538.y, DEG2SHORT_ANGLE(3.5f), CALC_EASE2(0.1f), 22, 4); } else { - actor->prvKusa[j]._540.x *= 0.9f; + actor->prvKusa[j]._540.x *= 0.98f; add_calc_short_angle2(&actor->prvKusa[j]._538.y, DEG2SHORT_ANGLE(0), CALC_EASE2(0.1f), 22, 4); } actor->prvKusa[j]._540.z *= 0.98f; @@ -1139,7 +1139,7 @@ void Museum_Fish_Actor_move(ACTOR* actorx, GAME* game) { actor->_14d78[i]--; actor->_14d50[i] = RANDOMF_RANGE(2, 10); } else { - actor->_14d50[i] = RANDOMF_RANGE(160, 240); + actor->_14d50[i] = RANDOMF_RANGE(80, 240); actor->_14d78[i] = RANDOMF_RANGE(2, 5); } } @@ -1184,7 +1184,7 @@ void Museum_Fish_Suisou_draw(ACTOR* actorx, GAME* game, int r5) { xyz_t* p = &suisou_pos[r5]; if (mfish_cull_check(game, &suisou_pos[r5], 350.0f, 20.0f, 650.0f)) { Matrix_translate(suisou_pos[r5].x, 0, suisou_pos[r5].z, 0); - Matrix_scale(0.1f, 0.1f, 0.1f, 1); + Matrix_scale(0.01f, 0.01f, 0.01f, 1); OPEN_DISP(graph); gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(play->game.graph), diff --git a/src/actor/ac_museum_fish_afish.c_inc b/src/actor/ac_museum_fish_afish.c_inc index e8240b0f..cbf18515 100644 --- a/src/actor/ac_museum_fish_afish.c_inc +++ b/src/actor/ac_museum_fish_afish.c_inc @@ -185,7 +185,7 @@ void mfish_afish_base_FishMove(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { actor->_5A0.x += actor->_5D0.x + actor->_5DC.x; actor->_5A0.z += actor->_5D0.z + actor->_5DC.z; actor->_5A0.y += actor->_5DC.y; - actor->_5A0.y = MAX(110.f, MIN(60.f, actor->_5A0.y)); + actor->_5A0.y = MAX(60.f, MIN(110.f, actor->_5A0.y)); } void mfish_afish_base_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { diff --git a/src/actor/ac_museum_fish_aroana.c_inc b/src/actor/ac_museum_fish_aroana.c_inc index 3098fa90..d500a8ae 100644 --- a/src/actor/ac_museum_fish_aroana.c_inc +++ b/src/actor/ac_museum_fish_aroana.c_inc @@ -146,7 +146,7 @@ void mfish_aroana_turn_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game) { add_calc_short_angle2(&actor->_632, 0, CALC_EASE2(0.5f), DEG2SHORT_ANGLE(2.5f), DEG2SHORT_ANGLE(0.25f)); actor->_622 = add_calc_short_angle2(&actor->_60C.y, actor->_612.y + (s16)(actor->_632 * sin_s(actor->_636)), CALC_EASE(0.2f), actor->_618.y >> 1, DEG2SHORT_ANGLE(0.25f)); - add_calc_short_angle2(&actor->_618.z, actor->_622, CALC_EASE2(0.3f), DEG2SHORT_ANGLE(1.25f), + add_calc_short_angle2(&actor->_618.z, actor->_622, CALC_EASE2(0.25f), DEG2SHORT_ANGLE(1.25f), DEG2SHORT_ANGLE(0.125f)); if (ABS((s16)(actor->_60C.y - actor->_612.y)) < DEG2SHORT_ANGLE(2) && actor->_5E8 < 0.1f) { if (actor->_63E > 0) { @@ -206,7 +206,7 @@ void mfish_aroana_base_FishMove(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game) { actor->_5A0.x += actor->_5D0.x + actor->_5DC.x; actor->_5A0.z += actor->_5D0.z + actor->_5DC.z; actor->_5A0.y += actor->_5DC.y; - actor->_5A0.y = MAX(110.f, MIN(60.f, actor->_5A0.y)); + actor->_5A0.y = MAX(60.f, MIN(110.f, actor->_5A0.y)); } void mfish_aroana_base_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { diff --git a/src/actor/ac_museum_fish_base.c_inc b/src/actor/ac_museum_fish_base.c_inc index 98be75ad..18e89e1f 100644 --- a/src/actor/ac_museum_fish_base.c_inc +++ b/src/actor/ac_museum_fish_base.c_inc @@ -124,7 +124,7 @@ void mfish_dummy_process_init(MUSEUM_FISH_PRIVATE_DATA* prv) { void mfish_dummy_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game) { // no clue what's going on here - add_calc_short_angle2(&actor->_612.y, actor->_634, CALC_EASE2(0.0f), DEG2SHORT_ANGLE(3.75f), + add_calc_short_angle2(&actor->_612.y, actor->_634, CALC_EASE2(0.2f), DEG2SHORT_ANGLE(3.75f), DEG2SHORT_ANGLE(0.25f)); actor->_622 = add_calc_short_angle2(&actor->_60C.y, actor->_612.y, CALC_EASE2(0.5f), DEG2SHORT_ANGLE(5.0f), DEG2SHORT_ANGLE(0.25f)); @@ -171,7 +171,7 @@ void mfish_normal_process_init(MUSEUM_FISH_PRIVATE_DATA* fishActor) { } } - fishActor->_632 = DEG2SHORT_ANGLE(t * 15 + 20); + fishActor->_632 = DEG2SHORT_ANGLE(t * 30.f + 20.0f); } else { if ((s16)(fishActor->_612.y - fishActor->_60C.y) > 0) { fishActor->_612.y += DEG2SHORT_ANGLE(15); @@ -179,7 +179,7 @@ void mfish_normal_process_init(MUSEUM_FISH_PRIVATE_DATA* fishActor) { fishActor->_612.y += DEG2SHORT_ANGLE(-15); } - fishActor->_632 = DEG2SHORT_ANGLE((GETREG(TAKREG, 42) + 40.0f) * t + 30); + fishActor->_632 = DEG2SHORT_ANGLE((GETREG(TAKREG, 42) + 40.0f) * t + 30.0f); } if ((s16)(fishActor->_60C.y - fishActor->_612.y) > 0) { fishActor->_636 = DEG2SHORT_ANGLE(0); @@ -354,7 +354,7 @@ void mfish_peck_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { if (actor->_632 > DEG2SHORT_ANGLE(15)) { add_calc(&actor->_5E8, actor->_5F0, CALC_EASE(0.25f), - (((actor->_632 - DEG2SHORT_ANGLE(20)) / DEG2SHORT_ANGLE(2)) * 0.04f + 0.01f) * 0.5f, 0.05f); + (((actor->_632 - DEG2SHORT_ANGLE(20)) / DEG2SHORT_ANGLE(2)) * 0.04f + 0.1f) * 0.5f, 0.05f); } else if (actor->_626 > actor->_628 - 16) { add_calc(&actor->_5E8, actor->_5F0, CALC_EASE(0.1f), 0.5f, 0.05f); } else if (dist > 20) { @@ -782,9 +782,9 @@ void Museum_Fish_DonkoBGCheck(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { Museum_Fish_objchk_pos_set(actor, gamex); // asm 17C a = (+00.0f + p.x); - b = (-45.0f + p.x); + b = (+45.0f + p.x); d = (-17.5f + p.z); - c = (+45.0f + p.z); + c = (-45.0f + p.z); f27 = 76.0f - 6.0f * cos_s(DEG2SHORT_ANGLE2(180.0f * (actor->_5B8.x - p.x) / 55.0f)); f26 = 76.0f - 6.0f * cos_s(DEG2SHORT_ANGLE2((actor->_5B8.x + sin_s(actor->_60C.y) - p.x) * 180.0f / 55.0f)); @@ -1113,8 +1113,8 @@ void Museum_Fish_Object_Check(MUSEUM_FISH_ACTOR* actor, GAME* game) { test.y = -test.y - (f->init_data._04 + fj->init_data._04); } - test.y *= 0.2f + (GETREG(TAKREG, 0x11)) * 0.001f; - f22 *= 0.2f + (GETREG(TAKREG, 0x12)) * 0.001f; + test.y *= 0.2f + (GETREG(TAKREG, 0x11)) * 0.0001f; + f22 *= 0.2f + (GETREG(TAKREG, 0x12)) * 0.0001f; f->_62A = atans_table(test.z, test.x); f->_62E |= 0x20; fj->_62A = f->_62A + DEG2SHORT_ANGLE(180); diff --git a/src/actor/ac_museum_fish_bass.c_inc b/src/actor/ac_museum_fish_bass.c_inc index 407e14b4..cb1202a0 100644 --- a/src/actor/ac_museum_fish_bass.c_inc +++ b/src/actor/ac_museum_fish_bass.c_inc @@ -19,7 +19,7 @@ void mfish_bass_base_FishMove(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game) { add_calc(&actor->_5D0.y, MAX(ABS(actor->_5E8 * sin_s(actor->_60C.x)), 0.1f), 0.1f, 0.1f, 0.005f); t = add_calc(&actor->_5A0.y, actor->_5F4 + actor->init_data._0C, 0.1f, actor->_5D0.y, 0); - if (fabsf(t) < 0.08f) { + if (fabsf(t) < 0.008f) { add_calc_short_angle2(&actor->_612.x, 0, CALC_EASE(0.03f), DEG2SHORT_ANGLE(1.0f + (0.5f * actor->_5AC.y)) >> 1, 9); } @@ -54,7 +54,7 @@ void mfish_bass_dummy_process_init(MUSEUM_FISH_PRIVATE_DATA* actor) { void mfish_bass_dummy_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game) { // no clue what's going on here - add_calc_short_angle2(&actor->_612.y, actor->_634, CALC_EASE2(0.0f), DEG2SHORT_ANGLE(2.5f), DEG2SHORT_ANGLE(0.25f)); + add_calc_short_angle2(&actor->_612.y, actor->_634, CALC_EASE2(0.1f), DEG2SHORT_ANGLE(2.5f), DEG2SHORT_ANGLE(0.25f)); actor->_622 = add_calc_short_angle2(&actor->_60C.y, actor->_612.y, CALC_EASE2(0.25f), DEG2SHORT_ANGLE(1.25f), DEG2SHORT_ANGLE(0.25f)); add_calc_short_angle2(&actor->_618.z, actor->_622, CALC_EASE2(0.25f), DEG2SHORT_ANGLE(1.25f), @@ -70,7 +70,7 @@ void mfish_bass_normal_process_init(MUSEUM_FISH_PRIVATE_DATA* fishActor) { ra = RANDOM_F(fishActor->init_data._14) + fishActor->init_data._10; t = (ra) / MAX(fishActor->init_data._14 + fishActor->init_data._10, 1); - if (RANDOM_F(1) > 0.25f && (fishActor->_62E & 0x200) == 0) { + if (RANDOM_F(1.0f) > 0.25f && (fishActor->_62E & 0x200) == 0) { fishActor->_62E |= 0x200; } else { fishActor->_62E &= ~0x200; @@ -116,7 +116,7 @@ void mfish_bass_normal_process_init(MUSEUM_FISH_PRIVATE_DATA* fishActor) { } if ((fishActor->_62E & 0x200) == 0) { - fishActor->_632 = DEG2SHORT_ANGLE(t * 15 + 20); + fishActor->_632 = DEG2SHORT_ANGLE(t * 10 + 30); } else { fishActor->_632 = DEG2SHORT_ANGLE((GETREG(TAKREG, 42) + 40.0f) * t + 30); } @@ -139,10 +139,10 @@ void mfish_bass_normal_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game) { add_calc2(&actor->_5EC, v + (actor->_5AC.y * 0.02f + 0.03f) * (float)((actor->_632 - DEG2SHORT_ANGLE(20)) / 364), actor->_5AC.y * 0.04f + 0.01f, actor->_5AC.y * 0.02f + 0.01f); - add_calc(&actor->_5E8, actor->_5F0, CALC_EASE(v), actor->_5EC * 0.5f, 0.02f); + add_calc(&actor->_5E8, actor->_5F0, CALC_EASE(v), actor->_5EC * 0.5f, 0.025f); } if (actor->_62E & 0x200) { - add_calc_short_angle2(&actor->_632, 0, CALC_EASE2(GETREG(TAKREG, 73) * 0.1f + 4.0f), + add_calc_short_angle2(&actor->_632, 0, CALC_EASE2(GETREG(TAKREG, 73) * 0.01f + 0.5f), (s16)(DEG2SHORT_ANGLE(GETREG(TAKREG, 74) * 0.1f + 4.0f) >> 1) >> 1, 45); actor->_636 = actor->_636 + (s16)DEG2SHORT_ANGLE2( (3.0f * actor->_5E8) / (actor->init_data._14 + actor->init_data._10) + 9.0f); @@ -316,7 +316,7 @@ void mfish_bass_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { actor->_34(actor, gamex); if (ABS(actor->_618.z) > ABS(actor->_622)) { - add_calc2(&actor->_5E8, MIN(GETREG(TAKREG, 19) * 0.01f + 1.0f, actor->_5E8), GETREG(TAKREG, 18) * 0.01f + 0.2f, + add_calc2(&actor->_5E8, MIN(GETREG(TAKREG, 19) * 0.1f + 1.0f, actor->_5E8), GETREG(TAKREG, 18) * 0.01f + 0.2f, GETREG(TAKREG, 17) * 0.01f + 0.5f); } diff --git a/src/actor/ac_museum_fish_big_fish.c_inc b/src/actor/ac_museum_fish_big_fish.c_inc index 269d3275..09f6dfb5 100644 --- a/src/actor/ac_museum_fish_big_fish.c_inc +++ b/src/actor/ac_museum_fish_big_fish.c_inc @@ -54,7 +54,7 @@ void mfish_big_fish_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { if (actor->_632 > DEG2SHORT_ANGLE(10)) { add_calc0(&actor->_5F0, 1.0f - actor->init_data._18, 0.005f); } else { - add_calc2(&actor->_5F0, -0.25f, CALC_EASE(0.05f), 0.005f); + add_calc2(&actor->_5F0, -0.025f, CALC_EASE(0.05f), 0.005f); } } else if (actor->_600 < 5.0f) { add_calc2(&actor->_5F0, 0.025f, CALC_EASE(0.05f), 0.005f); @@ -112,13 +112,13 @@ void mfish_big_fish_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { actor->_5F0 = actor->init_data._10 + MAX(-actor->init_data._10, RANDOM_F(actor->init_data._14)); if (RANDOM_F(1.0f) < GETREG(TAKREG, 0x46) * 0.01f + 0.5f) { - actor->_642 = DEG2SHORT_ANGLE(RANDOM_F(2.0f) + 3.0f); + actor->_642 = DEG2SHORT_ANGLE(RANDOM2_F(2.0f) + 3.0f); if (actor->_59C == 0x27 || GETREG(TAKREG, 0x39) == 1) { actor->_634 = DEG2SHORT_ANGLE(RANDOM_F(10.f) + 20.f); actor->_640 = DEG2SHORT_ANGLE(RANDOM_F(10.f)); actor->_5AC.z = Rnd_EX_f(1.0f); } else { - actor->_634 = DEG2SHORT_ANGLE(RANDOM_F(2.0f) + 3.0f); + actor->_634 = DEG2SHORT_ANGLE(RANDOM_F(5.0f) + 15.0f); actor->_640 = DEG2SHORT_ANGLE(RANDOM_F(10.f)); actor->_5AC.z = Rnd_EX_f(0.5f); } @@ -133,7 +133,7 @@ void mfish_big_fish_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { } else { actor->_5F0 = -0.01f; - actor->_5F4 = RANDOM_F(5.0f); + actor->_5F4 = RANDOM2_F(5.0f); actor->_642 = 0; actor->_634 = 0; actor->_640 = 0; @@ -172,7 +172,7 @@ BOOL mfish_bfish_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int joi v = 0.035f; } i = joint1->y - (actor->_618.z * 2) + - (int)(actor->_644 * (GETREG(TAKREG, 0x15) * 0.1f + 0.75f) * + (int)(actor->_644 * (GETREG(TAKREG, 0x15) * 0.01f + 0.75f) * sin_s(actor->_646 + DEG2SHORT_ANGLE(-90.f + GETREG(TAKREG, 0x17)))); joint1->y = MY_CLAMP(i, DEG2SHORT_ANGLE(-40), DEG2SHORT_ANGLE(40)); i = joint1->x - (actor->_618.z >> 1); diff --git a/src/actor/ac_museum_fish_dojou.c_inc b/src/actor/ac_museum_fish_dojou.c_inc index 23573aef..4686979f 100644 --- a/src/actor/ac_museum_fish_dojou.c_inc +++ b/src/actor/ac_museum_fish_dojou.c_inc @@ -200,7 +200,7 @@ void mfish_dojou_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { Matrix_translate(actor->_5A0.x, actor->_5A0.y, actor->_5A0.z, 0); Matrix_RotateY(actor->_60C.y, 1); Matrix_translate(0.0f, 0.0f, actor->init_data._24 * (0.5f * cos_s(s) + ABS(cos_s(s))), 1); - Matrix_RotateY(s, 1); + Matrix_RotateX(s, 1); Matrix_translate(0.0f, 0.0f, -actor->init_data._24 * 0.5f * cos_s(s), 1); Matrix_scale(actor->init_data._00, actor->init_data._00, actor->init_data._00, 1); gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(gamex->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/actor/ac_museum_fish_gupi.c_inc b/src/actor/ac_museum_fish_gupi.c_inc index 52792e74..df14f402 100644 --- a/src/actor/ac_museum_fish_gupi.c_inc +++ b/src/actor/ac_museum_fish_gupi.c_inc @@ -88,7 +88,7 @@ void mfish_gupi_turn(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { DEG2SHORT_ANGLE(0.25f)); add_calc_short_angle2(&actor->_618.z, actor->_622, CALC_EASE2(0.3f), DEG2SHORT_ANGLE(5), DEG2SHORT_ANGLE(0.25f)); if (ABS(actor->_622) < DEG2SHORT_ANGLE(1)) { - mfish_sfish_normal_init(actor, gamex); + mfish_gupi_normal_init(actor, gamex); } } @@ -183,8 +183,8 @@ BOOL mfish_gupi_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int join s = joint1->x - (actor->_618.z >> 1); joint1->x = MY_CLAMP(s, -DEG2SHORT_ANGLE(30), DEG2SHORT_ANGLE(30)); joint1->z += (s16)(actor->_618.x * (-1.3f + GETREG(TAKREG, 0x4e) * 0.1f)); - Matrix_scale((GETREG(TAKREG, 0x4b) * 0.01f) * sin_s(actor->_63A) + 0.5f + 1.0f, - (GETREG(TAKREG, 0x4c) * 0.01f) * cos_s(actor->_63A) + 0.1f + 1.0f, 1.0f, 1); + Matrix_scale((GETREG(TAKREG, 0x4b) * 0.01f) * cos_s(actor->_63A) + 0.05f + 1.0f, + (GETREG(TAKREG, 0x4c) * 0.01f) * sin_s(actor->_63A) + 0.1f + 1.0f, 1.0f, 1); } return TRUE; } diff --git a/src/actor/ac_museum_fish_hasu.c_inc b/src/actor/ac_museum_fish_hasu.c_inc index 7b97c0ed..6e5e482d 100644 --- a/src/actor/ac_museum_fish_hasu.c_inc +++ b/src/actor/ac_museum_fish_hasu.c_inc @@ -6,8 +6,8 @@ extern cKF_Animation_R_c cKF_ba_r_obj_museum5_hasu; void mfish_hasu_ct(YET_SKELETON_2* actor, GAME* gamex) { cKF_SkeletonInfo_R_ct(&actor->_00._00, &cKF_bs_r_obj_museum5_hasu, &cKF_ba_r_obj_museum5_hasu, &actor->_00._4F0, &actor->_00._526); - cKF_SkeletonInfo_R_init_standard_repeat_speedsetandmorph(&actor->_00._00, &cKF_ba_r_obj_museum5_hasu, NULL, 1.75, - 0.0); + cKF_SkeletonInfo_R_init_standard_repeat_speedsetandmorph(&actor->_00._00, &cKF_ba_r_obj_museum5_hasu, NULL, 0.5f, + 0.0f); } void mfish_hasu_mv(YET_SKELETON_2* actor, GAME* gamex) { @@ -36,11 +36,11 @@ void mfish_kaeru_ct(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { YET_SKELETON_2* keyframe = actor->_590; skele->_550[1] = &cKF_ba_r_act_mus_kaeru_a1_big; cKF_SkeletonInfo_R_ct(&skele->_00, skele->_54C, skele->_550[0], &skele->_4F0, &skele->_514); - cKF_SkeletonInfo_R_init_standard_repeat_speedsetandmorph(&skele->_00, skele->_550[0], NULL, 1.75f, 0.0f); + cKF_SkeletonInfo_R_init_standard_repeat_speedsetandmorph(&skele->_00, skele->_550[0], NULL, 0.5f, 0.0f); cKF_SkeletonInfo_R_ct(&keyframe->_00._00, &cKF_bs_r_obj_museum5_hasu, &cKF_ba_r_obj_museum5_hasu, &keyframe->_00._4F0, &keyframe->_00._526); - cKF_SkeletonInfo_R_init_standard_repeat_speedsetandmorph(&keyframe->_00._00, &cKF_ba_r_obj_museum5_hasu, NULL, - 1.75f, 0.0f); + cKF_SkeletonInfo_R_init_standard_repeat_speedsetandmorph(&keyframe->_00._00, &cKF_ba_r_obj_museum5_hasu, NULL, 0.5f, + 0.0f); actor->_5A0.x = 453.9f; actor->_5A0.y = 116.0f; actor->_5A0.z = 250.4f; diff --git a/src/actor/ac_museum_fish_ito.c_inc b/src/actor/ac_museum_fish_ito.c_inc index 2cddea11..f7431919 100644 --- a/src/actor/ac_museum_fish_ito.c_inc +++ b/src/actor/ac_museum_fish_ito.c_inc @@ -95,7 +95,7 @@ BOOL mfish_ito_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int joint } else if (joint_num == 2) { int i; i = joint1->y - 2 * actor->_618.z + - (int)(actor->_644 * (GETREG(TAKREG, 0x15) * 0.01f + 0.7f) * + (int)(actor->_644 * (GETREG(TAKREG, 0x15) * 0.01f + 0.75f) * sin_s(actor->_646 + DEG2SHORT_ANGLE(-90.f + GETREG(TAKREG, 0x17)))); joint1->y = MY_CLAMP(i, DEG2SHORT_ANGLE(-40), DEG2SHORT_ANGLE(40)); i = joint1->x - (actor->_618.z >> 1); diff --git a/src/actor/ac_museum_fish_kingyo.c_inc b/src/actor/ac_museum_fish_kingyo.c_inc index d2633d77..fe40f357 100644 --- a/src/actor/ac_museum_fish_kingyo.c_inc +++ b/src/actor/ac_museum_fish_kingyo.c_inc @@ -129,7 +129,7 @@ void mfish_kingyo_peck(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { actor->_612.y -= DEG2SHORT_ANGLE(90); } } - actor->_612.x += (s16)DEG2SHORT_ANGLE2(RANDOM_F(20.0f)); + actor->_612.x += (s16)DEG2SHORT_ANGLE2(RANDOM2_F(20.0f)); actor->_5F0 = RANDOM_F(actor->init_data._14) + actor->init_data._10; if (actor->_5F0 < 0.1f) { actor->_5F0 = 0.1f; diff --git a/src/actor/ac_museum_fish_koi.c_inc b/src/actor/ac_museum_fish_koi.c_inc index fb19fde2..cb71b1c4 100644 --- a/src/actor/ac_museum_fish_koi.c_inc +++ b/src/actor/ac_museum_fish_koi.c_inc @@ -164,26 +164,26 @@ void mfish_koi_normal_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game) { s16 temp; //! NOTE: wrong float somewhere in this file, just based on objdiffs colors changing if (ABS(actor->_632) > DEG2SHORT_ANGLE(20) || actor->_640 > 0) { - add_calc2(&actor->_5EC, ((actor->_632 - DEG2SHORT_ANGLE(20)) / DEG2SHORT_ANGLE(2)) * 0.002f + 0.03f, 0.25f, - 0.02f); - add_calc2(&actor->_5E8, actor->_5F0, CALC_EASE(0.2f), actor->_5EC * 0.5f); + add_calc2(&actor->_5EC, ((actor->_632 - DEG2SHORT_ANGLE(20)) / DEG2SHORT_ANGLE(2)) * 0.0035f + 0.03f, 0.35f, + 0.05f); + add_calc2(&actor->_5E8, actor->_5F0, CALC_EASE(0.4f), actor->_5EC * 0.5f); } add_calc_short_angle2(&actor->_632, 0, CALC_EASE2(0.05f), DEG2SHORT_ANGLE(0.375), DEG2SHORT_ANGLE(0.125)); - temp = DEG2SHORT_ANGLE2((actor->_5E8 * 4.0f) / (actor->init_data._14 + actor->init_data._10) + 6.0f); + temp = DEG2SHORT_ANGLE2((actor->_5E8 * 2.0f) / (actor->init_data._14 + actor->init_data._10) + 3.0f); actor->_636 += temp; actor->_622 = add_calc_short_angle2(&actor->_60C.y, actor->_612.y + (s16)(actor->_632 * sin_s(actor->_636)), CALC_EASE2(0.2f), DEG2SHORT_ANGLE(2.5f), DEG2SHORT_ANGLE(0.125f)); - add_calc_short_angle2(&actor->_618.z, actor->_622, CALC_EASE2(0.1f), DEG2SHORT_ANGLE(2.0f), + add_calc_short_angle2(&actor->_618.z, actor->_622, CALC_EASE2(0.2f), DEG2SHORT_ANGLE(2.0f), DEG2SHORT_ANGLE(0.125f)); if (actor->_5E8 < 0.01f && actor->_632 < DEG2SHORT_ANGLE(1)) { - if (fqrand() < 0.01f) { + if (fqrand() < 0.8f) { mfish_koi_long_move_process_init(actor); } else { mfish_koi_dummy_process_init(actor); } - } else if (actor->_5E8 > 0.01f && actor->_62E & 0x1e) { + } else if (actor->_5E8 > 1.0f && actor->_62E & 0x1e) { if ((s16)(actor->_60C.y - actor->_62C) > 0) { actor->_612.y = actor->_62C + DEG2SHORT_ANGLE(112.5f); } else { @@ -194,8 +194,8 @@ void mfish_koi_normal_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game) { } void mfish_koi_turn_process_init(MUSEUM_FISH_PRIVATE_DATA* actor) { - s16 s3 = DEG2SHORT_ANGLE(RANDOM_F(55.0f)) + DEG2SHORT_ANGLE(60.0f); - actor->_618.y = ABS(DEG2SHORT_ANGLE2((SHORT2DEG_ANGLE2(s3) / 120.0f) * 2.5f + 2.0f)); + s16 s3 = DEG2SHORT_ANGLE(RANDOM_F(30.0f)) + DEG2SHORT_ANGLE(60.0f); + actor->_618.y = ABS(DEG2SHORT_ANGLE2((SHORT2DEG_ANGLE2(s3) / 120.0f) * 3.0f + 2.0f)); if (actor->_62E & 0x1e) { if ((s16)(actor->_60C.y - actor->_62C) < 0) { s3 = -s3; @@ -240,7 +240,7 @@ void mfish_koi_turn_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game) { add_calc_short_angle2(&actor->_632, 0, CALC_EASE2(0.5f), DEG2SHORT_ANGLE(2.5f), DEG2SHORT_ANGLE(0.25f)); actor->_622 = add_calc_short_angle2(&actor->_60C.y, actor->_612.y + (s16)(actor->_632 * sin_s(actor->_636)), CALC_EASE(0.2f), actor->_618.y >> 1, DEG2SHORT_ANGLE(0.25f)); - add_calc_short_angle2(&actor->_618.z, actor->_622, CALC_EASE2(0.3f), DEG2SHORT_ANGLE(1.25f), + add_calc_short_angle2(&actor->_618.z, actor->_622, CALC_EASE2(0.25f), DEG2SHORT_ANGLE(1.25f), DEG2SHORT_ANGLE(0.25f)); if (ABS(actor->_622) < DEG2SHORT_ANGLE(2) && actor->_5E8 < 0.1f) { if (actor->_63E > 0 && ABS(actor->_618.z) < DEG2SHORT_ANGLE(2)) { @@ -301,7 +301,7 @@ void mfish_koi_peck_process_init(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game) { actor->_5F4 = MAX(MIN(10, actor->_5F4), -10); } - actor->_632 = DEG2SHORT_ANGLE((fVar8 * 30.0f) + 20.0f); + actor->_632 = DEG2SHORT_ANGLE((fVar8 * 40.0f) + 30.0f); if (qrand() & 0x8000) { actor->_636 = DEG2SHORT_ANGLE(90); @@ -325,24 +325,21 @@ void mfish_koi_peck_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { add_calc2(&actor->_5EC, ((actor->_632 - DEG2SHORT_ANGLE(20)) / DEG2SHORT_ANGLE(2)) * 0.0035f + 0.04f, 0.4f, 0.1f); add_calc2(&actor->_5E8, actor->_5F0, CALC_EASE(0.4f), actor->_5EC * 0.5f); - // add_calc(&actor->_5E8, actor->_5F0, CALC_EASE(0.1f), 0.5f, 0.05f); - // add_calc(&actor->_5E8, actor->_5F0, CALC_EASE(0.25f), (((actor->_632 - DEG2SHORT_ANGLE(20)) / - // DEG2SHORT_ANGLE(2)) * 0.04f + 0.01f) * 0.5f, 0.05f); } else if (actor->_626 > actor->_628 - 16) { } - add_calc_short_angle2(&actor->_632, 0, CALC_EASE2(0.25f), DEG2SHORT_ANGLE(0.375f), DEG2SHORT_ANGLE(0.125f)); + add_calc_short_angle2(&actor->_632, 0, CALC_EASE2(0.05f), DEG2SHORT_ANGLE(0.375f), DEG2SHORT_ANGLE(0.125f)); actor->_636 += DEG2SHORT_ANGLE(3.f); actor->_622 = add_calc_short_angle2(&actor->_60C.y, actor->_612.y + (s16)(sin_s(actor->_636) * actor->_632), CALC_EASE2(0.2f), DEG2SHORT_ANGLE(2.5f), DEG2SHORT_ANGLE(0.125f)); add_calc_short_angle2(&actor->_618.z, actor->_622, CALC_EASE2(0.2f), DEG2SHORT_ANGLE(2.f), DEG2SHORT_ANGLE(0.125f)); if (mfish_peck_wall_check(actor, gamex)) { - if (fqrand() < 0.9f) { - actor->_5E8 = -0.3f - fqrand() * 0.3f; + if (fqrand() < 0.8f) { + actor->_5E8 = -0.05f - fqrand() * 0.1f; actor->_5F0 = 0.05f; actor->_626 = DEG2SHORT_ANGLE(0.33f); } else { - actor->_5E8 = -1.0f - RANDOM_F(0.05f); + actor->_5E8 = -0.1f - RANDOM_F(0.05f); actor->_5F0 = 0.05f; actor->_626 = actor->init_data._2C + (s16)(fqrand() * actor->init_data._2E); // actor->_626 >>= 3; @@ -360,9 +357,9 @@ void mfish_koi_long_move_process_init(MUSEUM_FISH_PRIVATE_DATA* actor) { void mfish_koi_long_move_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game) { GAME_PLAY* play = (GAME_PLAY*)game; - actor->_622 = add_calc_short_angle2(&actor->_60C.y, actor->_612.y, CALC_EASE2(0.1f), DEG2SHORT_ANGLE(2.f), + actor->_622 = add_calc_short_angle2(&actor->_60C.y, actor->_612.y, CALC_EASE2(0.2f), DEG2SHORT_ANGLE(2.f), DEG2SHORT_ANGLE(0.25f)); - add_calc_short_angle2(&actor->_618.z, actor->_622, CALC_EASE2(0.2f), DEG2SHORT_ANGLE(1.25f), + add_calc_short_angle2(&actor->_618.z, actor->_622, CALC_EASE2(0.15f), DEG2SHORT_ANGLE(1.25f), DEG2SHORT_ANGLE(0.25f)); add_calc2(&actor->_5EC, 0.05f, 0.25f, 0.025f); add_calc2(&actor->_5E8, actor->_5F0, 0.1f, actor->_5EC); @@ -387,7 +384,7 @@ void mfish_koi_base_FishMove(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game) { actor->_5A0.x += actor->_5D0.x + actor->_5DC.x; actor->_5A0.z += actor->_5D0.z + actor->_5DC.z; actor->_5A0.y += actor->_5DC.y * 0.05f; - actor->_5A0.y = MAX(110.f, MIN(60.f, actor->_5A0.y)); + actor->_5A0.y = MAX(60.f, MIN(110.f, actor->_5A0.y)); } void mfish_koi_base_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { @@ -427,11 +424,11 @@ void mfish_koi_base_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { actor->_638 += DEG2SHORT_ANGLE(10); actor->_34(actor, gamex); if (ABS(actor->_618.z) < ABS(actor->_622) && ABS(actor->_622) > DEG2SHORT_ANGLE(2)) { - add_calc2(&actor->_5E8, MAX(0.2f, actor->_5E8), 0.2f, 0.5f); + add_calc2(&actor->_5E8, MAX(0.1f, actor->_5E8), 0.2f, 0.25f); } - add_calc_short_angle2(&actor->_60C.x, actor->_612.x, CALC_EASE(0.1f), DEG2SHORT_ANGLE(1.5f), + add_calc_short_angle2(&actor->_60C.x, actor->_612.x, CALC_EASE(0.05f), DEG2SHORT_ANGLE(1.5f), DEG2SHORT_ANGLE(0.05f)); - add_calc_short_angle2(&actor->_612.x, 0, CALC_EASE(0.1f), DEG2SHORT_ANGLE(0.5f), DEG2SHORT_ANGLE(0.05f)); + add_calc_short_angle2(&actor->_612.x, 0, CALC_EASE(0.05f), DEG2SHORT_ANGLE(0.5f), DEG2SHORT_ANGLE(0.05f)); mfish_koi_base_FishMove(actor, gamex); } diff --git a/src/actor/ac_museum_fish_kurage.c_inc b/src/actor/ac_museum_fish_kurage.c_inc index 1fc0e707..bdb53505 100644 --- a/src/actor/ac_museum_fish_kurage.c_inc +++ b/src/actor/ac_museum_fish_kurage.c_inc @@ -121,7 +121,7 @@ void mfish_kurage_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { } add_calc2(&actor->_5E8, actor->_5F0, 0.1f, actor->_5EC); add_calc2(&actor->_5AC.y, actor->_5F0, 0.1f, 0.25f); - add_calc2(&actor->_5F0, 0.1f, 0.1f, 0.01f); + add_calc2(&actor->_5F0, 0.05f, 0.05f, 0.01f); add_calc_short_angle2(&actor->_63A, (s16)DEG2SHORT_ANGLE2((GETREG(TAKREG, 0x56) + 13.0f) * 0.5f), CALC_EASE2(0.1f), DEG2SHORT_ANGLE(0.25f), DEG2SHORT_ANGLE(0.25f)); add_calc_short_angle2(&actor->_60C.x, (s16)actor->_612.x, CALC_EASE2(GETREG(TAKREG, 0x18) * 0.01f + 0.1f), diff --git a/src/actor/ac_museum_fish_medaka.c_inc b/src/actor/ac_museum_fish_medaka.c_inc index 4429e578..f0889722 100644 --- a/src/actor/ac_museum_fish_medaka.c_inc +++ b/src/actor/ac_museum_fish_medaka.c_inc @@ -80,7 +80,7 @@ void mfish_medaka_turn(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { actor->_632 = DEG2SHORT_ANGLE(actor->_5E8 * 15.0f); actor->_636 += DEG2SHORT_ANGLE(7.5f); actor->_622 = add_calc_short_angle2(&actor->_60C.y, actor->_612.y + (s16)(actor->_632 * sin_s(actor->_636)), - CALC_EASE2(GETREG(TAKREG, 0x17) * 0.01f + 0.05f), DEG2SHORT_ANGLE(7.5f), + CALC_EASE2(GETREG(TAKREG, 0x17) * 0.01f + 0.5f), DEG2SHORT_ANGLE(7.5f), DEG2SHORT_ANGLE(0.25f)); add_calc_short_angle2(&actor->_618.z, actor->_622, CALC_EASE2(0.3f), DEG2SHORT_ANGLE(5), DEG2SHORT_ANGLE(0.25f)); if (ABS(actor->_622) < DEG2SHORT_ANGLE(1)) { diff --git a/src/actor/ac_museum_fish_namazu.c_inc b/src/actor/ac_museum_fish_namazu.c_inc index 75cd51d1..89911764 100644 --- a/src/actor/ac_museum_fish_namazu.c_inc +++ b/src/actor/ac_museum_fish_namazu.c_inc @@ -72,7 +72,7 @@ void mfish_namazu_normal_process_init(MUSEUM_FISH_PRIVATE_DATA* actor) { void mfish_namazu_normal_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { if (actor->_632 > DEG2SHORT_ANGLE(20)) { - add_calc2(&actor->_5E8, actor->_5F0, CALC_EASE(0.75f), + add_calc2(&actor->_5E8, actor->_5F0, CALC_EASE(0.075f), (0.4f + ((DEG2SHORT_ANGLE(-20) + actor->_632) / DEG2SHORT_ANGLE(2)) * 0.02f) * 0.5f); } add_calc_short_angle2(&actor->_632, DEG2SHORT_ANGLE(0), CALC_EASE2(0.1f), DEG2SHORT_ANGLE(0.25f), diff --git a/src/actor/ac_museum_fish_seafish.c_inc b/src/actor/ac_museum_fish_seafish.c_inc index 9252973b..2f2e4967 100644 --- a/src/actor/ac_museum_fish_seafish.c_inc +++ b/src/actor/ac_museum_fish_seafish.c_inc @@ -188,16 +188,16 @@ void mfish_seafish_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { } else { add_calc2(&actor->_5A0.y, actor->_5F4 + actor->init_data._0C, 0.1f, 0.1f); } - add_calc0(&actor->_5F8, 0.2f, 0.05f); + add_calc0(&actor->_5F8, 0.25f, 0.05f); actor->_5F8 = MIN(1.0f, actor->_5F8); if (ABS(actor->_618.z) > DEG2SHORT_ANGLE(15) && ABS(actor->_622) - ABS(actor->_618.z) < 0) { add_calc2(&actor->_5E8, MAX(actor->_5F0, 0.8f), 0.5f, 0.25f); } else if (actor->_626 < actor->_628 - 80) { add_calc2(&actor->_5E8, actor->_5EC, 1.0f - actor->init_data._18, 0.0025f); } else if (actor->_5E8 > actor->_5F0) { - add_calc2(&actor->_5E8, actor->_5F0, 0.2f, 0.02f); - } else { add_calc2(&actor->_5E8, actor->_5F0, 0.1f, 0.01f); + } else { + add_calc2(&actor->_5E8, actor->_5F0, 0.2f, 0.02f); } actor->_38._00.frame_control.speed = (GETREG(TAKREG, 0x14) * 0.01f + 0.5f) * 0.5f + (GETREG(TAKREG, 0x15) * 0.01f + 1.2f) * actor->_5E8; diff --git a/src/actor/ac_museum_fish_small_fish.c_inc b/src/actor/ac_museum_fish_small_fish.c_inc index 5552cdf8..fe1f0862 100644 --- a/src/actor/ac_museum_fish_small_fish.c_inc +++ b/src/actor/ac_museum_fish_small_fish.c_inc @@ -6,7 +6,7 @@ void mfish_small_fish_ct(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { actor->_5F0 = actor->_5E8; actor->_60C.y = s; actor->_612.y = actor->_60C.y; - actor->_60C.x = DEG2SHORT_ANGLE(RANDOM_F(actor->init_data._30 * 2.0f)); + actor->_60C.x = DEG2SHORT_ANGLE(RANDOM2_F(actor->init_data._30 * 2.0f)); actor->_612.x = actor->_60C.x; actor->_5F4 = 110.0f; actor->_5D0.y = 0.0f; diff --git a/src/actor/ac_museum_fish_tai.c_inc b/src/actor/ac_museum_fish_tai.c_inc index e5a8206d..4088c33f 100644 --- a/src/actor/ac_museum_fish_tai.c_inc +++ b/src/actor/ac_museum_fish_tai.c_inc @@ -177,7 +177,7 @@ void mfish_tai_turn(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { DEG2SHORT_ANGLE(0.125f)); add_calc_short_angle2(&actor->_618.z, actor->_622, CALC_EASE2(0.2f + GETREG(TAKREG, 0x19) * 0.01f), - (s16)(DEG2SHORT_ANGLE(15.0f + 0.1f * GETREG(TAKREG, 0x1a)) >> 1) >> 1, + (s16)(DEG2SHORT_ANGLE(5.0f + 0.1f * GETREG(TAKREG, 0x1a)) >> 1) >> 1, DEG2SHORT_ANGLE(0.125f)); if (ABS((s16)actor->_622) < DEG2SHORT_ANGLE(3)) { diff --git a/src/actor/ac_museum_fish_unagi.c_inc b/src/actor/ac_museum_fish_unagi.c_inc index 3de9b395..6d84d743 100644 --- a/src/actor/ac_museum_fish_unagi.c_inc +++ b/src/actor/ac_museum_fish_unagi.c_inc @@ -273,8 +273,8 @@ void mfish_unagi_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { } } - add_calc0(&actor->_5AC.x, 0.25f, 0.5f); - add_calc0(&actor->_5AC.z, 0.25f, 0.5f); + add_calc0(&actor->_5AC.x, 0.025f, 0.5f); + add_calc0(&actor->_5AC.z, 0.025f, 0.5f); p1.x = sin_s(actor->_612.y) * actor->_5E8; p1.z = cos_s(actor->_612.y) * actor->_5E8; p2.x = sin_s(actor->_60C.y) * actor->_5E8;