diff --git a/src/math_util_2.c b/src/math_util_2.c index f2b85daeb..33565e412 100644 --- a/src/math_util_2.c +++ b/src/math_util_2.c @@ -718,6 +718,19 @@ 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) { + Mat4 matrix; + //printf("panel %d %d %d\n", x, (s32)OTRGetDimensionFromLeftEdge(x), (s32)OTRGetDimensionFromLeftEdge(0)); + + printf("X %d Y %d\n", x, y); + mtxf_translation_x_y_rotate_z_scale_x_y(matrix, x, y, angle, scale); + // convert_to_fixed_point_matrix(&gGfxPool->mtxHud[gMatrixHudCount], matrix); + // gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxHud[gMatrixHudCount++]), + // G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + AddHudMatrix(matrix, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); +} + 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 2944fddc1..842e417bd 100644 --- a/src/math_util_2.h +++ b/src/math_util_2.h @@ -70,6 +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_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 188a44e3f..a97bef7fb 100644 --- a/src/render_objects.c +++ b/src/render_objects.c @@ -3224,9 +3224,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_portrait(spD0 + 0x26, (spC4 + spCC) + 4, 0U, 1.0f, lapCount); + func_80042330_default(spD0 + 0x26, (spC4 + spCC) + 4, 0U, 1.0f, lapCount); } else { - func_80042330_portrait(spD0 + 0x1B, (spC4 + spCC) + 4, 0U, 1.0f, lapCount); + func_80042330_default(spD0 + 0x1B, (spC4 + spCC) + 4, 0U, 1.0f, lapCount); } gSPDisplayList(gDisplayListHead++, D_0D006950); if ((player == gPlayerOne) && (gScreenModeSelection == SCREEN_MODE_1P)) {