From 86ec057ed166e985e05ea0581a91811d4b7bda34 Mon Sep 17 00:00:00 2001 From: roeming Date: Sat, 14 Dec 2024 18:26:16 -0500 Subject: [PATCH] cleaning up types --- include/ac_museum_fish.h | 61 +++++++++++++++-------------- src/actor/ac_museum_fish.c | 2 +- src/actor/ac_museum_fish_bass.c_inc | 6 +-- src/actor/ac_museum_fish_koi.c_inc | 2 +- 4 files changed, 37 insertions(+), 34 deletions(-) diff --git a/include/ac_museum_fish.h b/include/ac_museum_fish.h index 944ebd63..01332a70 100644 --- a/include/ac_museum_fish.h +++ b/include/ac_museum_fish.h @@ -234,34 +234,35 @@ void mfish_afish_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); void mfish_afish_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); void mfish_aroana_ct(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); -void mfish_aroana_dummy_process_init(); -void mfish_aroana_dummy_process(); -void mfish_aroana_normal_process_init(); -void mfish_aroana_normal_process(); -void mfish_aroana_turn_process_init(); -void mfish_aroana_turn_process(); -void mfish_aroana_long_move_process_init(); -void mfish_aroana_long_move_process(); -void mfish_aroana_base_FishMove(); +void mfish_aroana_dummy_process_init(MUSEUM_FISH_PRIVATE_DATA* actor); +void mfish_aroana_dummy_process(MUSEUM_FISH_PRIVATE_DATA* actor); +void mfish_aroana_normal_process_init(MUSEUM_FISH_PRIVATE_DATA* actor); +void mfish_aroana_normal_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); +void mfish_aroana_turn_process_init(MUSEUM_FISH_PRIVATE_DATA* actor); +void mfish_aroana_turn_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); +void mfish_aroana_long_move_process_init(MUSEUM_FISH_PRIVATE_DATA* actor); +void mfish_aroana_long_move_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); +void mfish_aroana_base_FishMove(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); void mfish_aroana_base_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); void mfish_aroana_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); BOOL mfish_aroana_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int joint_num, Gfx** joint_m, u8* joint_f, void* arg, s_xyz* joint1, xyz_t* trans); void mfish_aroana_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); -void mfish_koi_tail_anim_set(); -void mfish_koi_move_smooth(); + +void mfish_koi_tail_anim_set(MUSEUM_FISH_PRIVATE_DATA* actor, s32 r4); +void mfish_koi_move_smooth(MUSEUM_FISH_PRIVATE_DATA* actor); void mfish_koi_ct(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); -void mfish_koi_dummy_process_init(); +void mfish_koi_dummy_process_init(MUSEUM_FISH_PRIVATE_DATA* actor); void mfish_koi_dummy_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); -void mfish_koi_normal_process_init(); -void mfish_koi_normal_process(); -void mfish_koi_turn_process_init(); -void mfish_koi_turn_process(); -void mfish_koi_peck_process_init(); -void mfish_koi_peck_process(); -void mfish_koi_long_move_process_init(); -void mfish_koi_long_move_process(); -void mfish_koi_base_FishMove(); +void mfish_koi_normal_process_init(MUSEUM_FISH_PRIVATE_DATA* actor); +void mfish_koi_normal_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); +void mfish_koi_turn_process_init(MUSEUM_FISH_PRIVATE_DATA* actor); +void mfish_koi_turn_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); +void mfish_koi_peck_process_init(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); +void mfish_koi_peck_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); +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); +void mfish_koi_base_FishMove(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); void mfish_koi_base_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); void mfish_koi_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); BOOL mfish_koi_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int joint_num, Gfx** joint_m, u8* joint_f, @@ -276,17 +277,19 @@ void mfish_kaseki_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); BOOL mfish_kaseki_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int joint_num, Gfx** joint_m, u8* joint_f, void* arg, s_xyz* joint1, xyz_t* trans); void mfish_kaseki_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); -void mfish_bass_tail_anim_set(); -void mfish_bass_base_FishMove(); -void mfish_bass_dummy_process_init(); -void mfish_bass_dummy_process(); -void mfish_bass_normal_process_init(); -void mfish_bass_normal_process(); -void mfish_bass_turn_process_init(); -void mfish_bass_turn_process(); + +void mfish_bass_tail_anim_set(MUSEUM_FISH_PRIVATE_DATA* actor, s32 r4); +void mfish_bass_base_FishMove(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); +void mfish_bass_dummy_process_init(MUSEUM_FISH_PRIVATE_DATA* actor); +void mfish_bass_dummy_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); +void mfish_bass_normal_process_init(MUSEUM_FISH_PRIVATE_DATA* actor); +void mfish_bass_normal_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); +void mfish_bass_turn_process_init(MUSEUM_FISH_PRIVATE_DATA* actor); +void mfish_bass_turn_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); void mfish_bass_ct(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); void mfish_bass_mv(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); void mfish_bass_dw(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); + void mfish_seafish_ct(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game); void mfish_seafish_normal_init(); void mfish_seafish_normal(); diff --git a/src/actor/ac_museum_fish.c b/src/actor/ac_museum_fish.c index 5ab288b7..b669eb4b 100644 --- a/src/actor/ac_museum_fish.c +++ b/src/actor/ac_museum_fish.c @@ -1052,7 +1052,7 @@ BOOL kusa_before_disp(GAME* game, cKF_SkeletonInfo_R_c* keyframe, int joint_num, trans->y -= actor->_540.x * (v * joint_num); trans->z += actor->_540.z * (v * joint_num); } - return 1; + return TRUE; } void Museum_Fish_Kusa_Draw(ACTOR* actorx, GAME* game, int r5) { diff --git a/src/actor/ac_museum_fish_bass.c_inc b/src/actor/ac_museum_fish_bass.c_inc index 62585e40..582b8a6b 100644 --- a/src/actor/ac_museum_fish_bass.c_inc +++ b/src/actor/ac_museum_fish_bass.c_inc @@ -51,7 +51,7 @@ void mfish_bass_dummy_process_init(MUSEUM_FISH_PRIVATE_DATA* actor) { return; } -void mfish_bass_dummy_process(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), 0x1c7, 0x2d); actor->_622 = add_calc_short_angle2(&actor->_60C.y, actor->_612.y, CALC_EASE2(0.25f), 0xe3, 0x2d); @@ -66,7 +66,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)) { + if (RANDOM_F(1) > 0.25f && (fishActor->_62E & 0x200) == 0) { fishActor->_62E |= 0x200; } else { fishActor->_62E &= ~0x200; @@ -218,7 +218,7 @@ void mfish_bass_turn_process_init(MUSEUM_FISH_PRIVATE_DATA* actor) { actor->_34 = mfish_bass_turn_process; } -void mfish_bass_turn_process(MUSEUM_FISH_PRIVATE_DATA* actor) { +void mfish_bass_turn_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game) { int a; f32 v0, v1, v2, v3, v4; v0 = actor->_5AC.y * 0.2f + 0.05f; diff --git a/src/actor/ac_museum_fish_koi.c_inc b/src/actor/ac_museum_fish_koi.c_inc index a3454b43..2dff7fe7 100644 --- a/src/actor/ac_museum_fish_koi.c_inc +++ b/src/actor/ac_museum_fish_koi.c_inc @@ -159,7 +159,7 @@ void mfish_koi_normal_process_init(MUSEUM_FISH_PRIVATE_DATA* actor) { actor->_34 = mfish_aroana_normal_process; } -void mfish_koi_normal_process(MUSEUM_FISH_PRIVATE_DATA* actor) { +void mfish_koi_normal_process(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* game) { s16 temp; 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,