From a24ae0e548b57ef6edbab2985095921138cb8a07 Mon Sep 17 00:00:00 2001 From: MegaMech <7255464+MegaMech@users.noreply.github.com> Date: Sun, 5 Jan 2025 12:37:56 -0700 Subject: [PATCH] rename as per review --- src/math_util_2.c | 3 ++- src/math_util_2.h | 2 +- src/render_objects.c | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/math_util_2.c b/src/math_util_2.c index 59f3a1170..7cb396242 100644 --- a/src/math_util_2.c +++ b/src/math_util_2.c @@ -718,7 +718,7 @@ void func_80042330(s32 x, s32 y, u16 angle, f32 scale) { AddHudMatrix(matrix, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } -void func_80042330_default(s32 x, s32 y, u16 angle, f32 scale) { +void func_80042330_unchanged(s32 x, s32 y, u16 angle, f32 scale) { Mat4 matrix; //printf("panel %d %d %d\n", x, (s32)OTRGetDimensionFromLeftEdge(x), (s32)OTRGetDimensionFromLeftEdge(0)); @@ -730,6 +730,7 @@ void func_80042330_default(s32 x, s32 y, u16 angle, f32 scale) { AddHudMatrix(matrix, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } +// Allows a different way of lining up the portraits at the end of race sequence void func_80042330_portrait(s32 x, s32 y, u16 angle, f32 scale, s16 lapCount) { Mat4 matrix; //printf("panel %d %d %d\n", x, (s32)OTRGetDimensionFromLeftEdge(x), (s32)OTRGetDimensionFromLeftEdge(0)); diff --git a/src/math_util_2.h b/src/math_util_2.h index 842e417bd..a62c9697b 100644 --- a/src/math_util_2.h +++ b/src/math_util_2.h @@ -70,7 +70,7 @@ void func_80041D24(void); void func_80041D34(void); void set_matrix_hud_screen(void); void func_80042330(s32, s32, u16, f32); -void func_80042330_default(s32 x, s32 y, u16 angle, f32 scale); +void func_80042330_unchanged(s32 x, s32 y, u16 angle, f32 scale); void func_80042330_portrait(s32, s32, u16, f32, s16); void func_80042330_wide(s32, s32, u16, f32); void mtxf_set_matrix_transformation(Mat4, Vec3f, Vec3su, f32); diff --git a/src/render_objects.c b/src/render_objects.c index a44aeb9ec..d6d6b6a27 100644 --- a/src/render_objects.c +++ b/src/render_objects.c @@ -518,7 +518,7 @@ void func_800463B0(s32 arg0, s32 arg1, u16 arg2, f32 arg3, u8* texture, Vtx* arg func_80042330(arg0, arg1, arg2, arg3); break; case SCREEN_MODE_3P_4P_SPLITSCREEN: - func_80042330_default(arg0, arg1, arg2, arg3); + func_80042330_unchanged(arg0, arg1, arg2, arg3); break; } @@ -535,7 +535,7 @@ void func_80046424(s32 arg0, s32 arg1, u16 arg2, f32 arg3, u8* texture, Vtx* arg func_80042330(arg0, arg1, arg2, arg3); break; case SCREEN_MODE_3P_4P_SPLITSCREEN: - func_80042330_default(arg0, arg1, arg2, arg3); + func_80042330_unchanged(arg0, arg1, arg2, arg3); break; } @@ -3265,9 +3265,9 @@ void func_80050E34(s32 playerId, s32 arg1) { gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_hud_type_C_rank_tiny_font); rsp_load_texture(common_texture_hud_type_C_rank_tiny_font[arg1 + 1], 8, 8); if (spB8 != 0) { - func_80042330_default(spD0 + 0x26, (spC4 + spCC) + 4, 0U, 1.0f, lapCount); + func_80042330_unchanged(spD0 + 0x26, (spC4 + spCC) + 4, 0U, 1.0f, lapCount); } else { - func_80042330_default(spD0 + 0x1B, (spC4 + spCC) + 4, 0U, 1.0f, lapCount); + func_80042330_unchanged(spD0 + 0x1B, (spC4 + spCC) + 4, 0U, 1.0f, lapCount); } gSPDisplayList(gDisplayListHead++, D_0D006950); if ((player == gPlayerOne) && (gScreenModeSelection == SCREEN_MODE_1P)) {