From 6ab19954af194ae7284a01ca91399d993bd02897 Mon Sep 17 00:00:00 2001 From: roeming Date: Thu, 16 Jan 2025 15:28:16 -0500 Subject: [PATCH] link ac_museum_fish.c --- configure.py | 2 +- src/actor/ac_museum_fish.c | 4 ++-- src/actor/ac_museum_fish_base.c_inc | 2 +- src/actor/ac_museum_fish_subfish.c_inc | 3 --- 4 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 src/actor/ac_museum_fish_subfish.c_inc diff --git a/configure.py b/configure.py index 741f77eb..7650fa0a 100644 --- a/configure.py +++ b/configure.py @@ -1013,7 +1013,7 @@ config.libs = [ Object(Matching, "actor/ac_mscore_control.c"), Object(Matching, "actor/ac_mural.c"), Object(Matching, "actor/ac_museum.c"), - Object(NonMatching, "actor/ac_museum_fish.c"), + Object(Matching, "actor/ac_museum_fish.c"), Object(Matching, "actor/ac_museum_fossil.c"), Object(NonMatching, "actor/ac_museum_indoor.c"), Object(NonMatching, "actor/ac_museum_insect.c"), diff --git a/src/actor/ac_museum_fish.c b/src/actor/ac_museum_fish.c index cba224b9..291b99b3 100644 --- a/src/actor/ac_museum_fish.c +++ b/src/actor/ac_museum_fish.c @@ -488,7 +488,7 @@ PRIV_FISH_DRAW mfish_dw[40] = { /* FROG */ mfish_kaeru_dw, /* KILLIFISH */ mfish_medaka_dw, /* JELLYFISH */ mfish_kurage_dw, -/* SEA_BASS */ mfish_seafish_dw, +/* SEA_BASS */ mfish_ani_base_dw, /* RED_SNAPPER */ mfish_tai_dw, /* BARRED_KNIFEJAW */ mfish_tai_dw, /* ARAPAIMA */ mfish_big_fish_dw @@ -622,7 +622,7 @@ int unagi_rail_num_tbl[3] = { ARRAY_LEN(unagi_rail_pos3), }; -#include "../src/actor/ac_museum_fish_subfish.c_inc" +#include "../src/actor/ac_museum_fish_base.c_inc" // clang-format on diff --git a/src/actor/ac_museum_fish_base.c_inc b/src/actor/ac_museum_fish_base.c_inc index f0bcb72e..b94e2791 100644 --- a/src/actor/ac_museum_fish_base.c_inc +++ b/src/actor/ac_museum_fish_base.c_inc @@ -445,7 +445,7 @@ void mfish_base_ct(MUSEUM_FISH_PRIVATE_DATA* actor, GAME* gamex) { } else if (actor->fishIDEnum == aGYO_TYPE_FRESHWATER_GOBY) { actor->_5F4 = RANDOM_F(5.0f); } else { - actor->_5F4 = RANDOM_F(10.0f); + actor->_5F4 = RANDOM2_F(10.0f); } actor->_5D0.y = 0.0; actor->_5AC = ZeroVec; diff --git a/src/actor/ac_museum_fish_subfish.c_inc b/src/actor/ac_museum_fish_subfish.c_inc deleted file mode 100644 index cf727934..00000000 --- a/src/actor/ac_museum_fish_subfish.c_inc +++ /dev/null @@ -1,3 +0,0 @@ - -#include "../src/actor/ac_museum_fish_base.c_inc" -