From 56f6b80fdbf3cffd8daa99d41884ed14fa0bdf09 Mon Sep 17 00:00:00 2001 From: Gudf <28691694+Gudf@users.noreply.github.com> Date: Thu, 30 Jan 2025 17:36:00 +0100 Subject: [PATCH] Fixed-point min and max function Rename `sub_0201E190` to `FX_Min` Rename `sub_0201E198` to `FX_Max` --- include/unk_0201E190.h | 4 ++-- src/overlay005/ov5_021EEC68.c | 4 ++-- src/unk_0201E190.c | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/unk_0201E190.h b/include/unk_0201E190.h index 79500fa77a..ae6e6a1505 100644 --- a/include/unk_0201E190.h +++ b/include/unk_0201E190.h @@ -3,8 +3,8 @@ #include -fx32 sub_0201E190(fx32 param0, fx32 param1); -fx32 sub_0201E198(fx32 param0, fx32 param1); +fx32 FX_Min(fx32 a, fx32 b); +fx32 FX_Max(fx32 a, fx32 b); fx32 VEC_AngleBetween(const VecFx32 *param0, const VecFx32 *param1); void sub_0201E268(MtxFx33 *param0, VecFx32 *param1); void sub_0201E2E0(MtxFx33 *param0, u16 param1, u16 param2, u16 param3); diff --git a/src/overlay005/ov5_021EEC68.c b/src/overlay005/ov5_021EEC68.c index fff4c38489..f5ad5d948f 100644 --- a/src/overlay005/ov5_021EEC68.c +++ b/src/overlay005/ov5_021EEC68.c @@ -170,10 +170,10 @@ BOOL ov5_021EED9C(const fx32 param0, const fx32 param1, const fx32 param2, const if (v10 > 1) { v7 = 0; - v3 = sub_0201E198(param0, v15[0].unk_00) - sub_0201E190(param0, v15[0].unk_00); + v3 = FX_Max(param0, v15[0].unk_00) - FX_Min(param0, v15[0].unk_00); for (v6 = 1; v6 < v10; v6++) { - v4 = sub_0201E198(param0, v15[v6].unk_00) - sub_0201E190(param0, v15[v6].unk_00); + v4 = FX_Max(param0, v15[v6].unk_00) - FX_Min(param0, v15[v6].unk_00); if (v3 > v4) { v3 = v4; diff --git a/src/unk_0201E190.c b/src/unk_0201E190.c index c7d6a80fe6..49ce0ed2cc 100644 --- a/src/unk_0201E190.c +++ b/src/unk_0201E190.c @@ -10,21 +10,21 @@ #define F32_PI ((f32)3.14159265358979323846) #define FX_F32_RAD_TO_IDX(f) ((u16)(FX_RAD_TO_IDX(FX32_CONST(f)))) -fx32 sub_0201E190(fx32 param0, fx32 param1) +fx32 FX_Min(fx32 a, fx32 b) { - if (param0 < param1) { - return param0; + if (a < b) { + return a; } else { - return param1; + return b; } } -fx32 sub_0201E198(fx32 param0, fx32 param1) +fx32 FX_Max(fx32 a, fx32 b) { - if (param0 > param1) { - return param0; + if (a > b) { + return a; } else { - return param1; + return b; } }