From e19b3b702e3982c2a28fbd3699999db7848be706 Mon Sep 17 00:00:00 2001 From: coco875 <59367621+coco875@users.noreply.github.com> Date: Wed, 9 Jul 2025 03:00:20 +0000 Subject: [PATCH 1/3] Update torch (#736) * Update torch * Update torch * Update torch * Update torch --- tools/torch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/torch b/tools/torch index 5773373b3..c9c21627b 160000 --- a/tools/torch +++ b/tools/torch @@ -1 +1 @@ -Subproject commit 5773373b3620e4a6bc6c92fdc4690d66741c086d +Subproject commit c9c21627b3a43969e4ecac2bbbe0dbc05a9f75d7 From b8823f12a1c9330e5d4e478c35ebe87ac6c24d58 Mon Sep 17 00:00:00 2001 From: MegaMech Date: Sat, 12 Jul 2025 20:16:14 -0600 Subject: [PATCH 2/3] Update cpu_vehicles_camera_path.c (#738) --- src/cpu_vehicles_camera_path.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cpu_vehicles_camera_path.c b/src/cpu_vehicles_camera_path.c index 952247f26..ec7aaa743 100644 --- a/src/cpu_vehicles_camera_path.c +++ b/src/cpu_vehicles_camera_path.c @@ -1495,7 +1495,6 @@ void update_player(s32 playerId) { gPlayerTrackPositionFactorInstruction[playerId].target = 0.0f; gPlayerTrackPositionFactorInstruction[playerId].unkC = 0.0f; } - // gNearestPathPointByPlayerId[playerId] might need to be saved to a temp gPlayerPathY[playerId] = gTrackPaths[gPlayerPathIndex][gNearestPathPointByPlayerId[playerId]].posY + 4.3f; if ((D_801631F8[playerId] == 1) && (D_801631E0[playerId] == false)) { From 6c60f5d785ff2c686e9da6338134a9a85ed8cda8 Mon Sep 17 00:00:00 2001 From: MegaMech Date: Thu, 17 Jul 2025 13:04:29 -0600 Subject: [PATCH 3/3] Fix alfa for `find_vtx_and_set_colours()` (#739) * Update render_courses.c * More fixes --- src/code_800029B0.c | 12 ++++++------ src/racing/render_courses.c | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/code_800029B0.c b/src/code_800029B0.c index e1c62d768..16a69bedc 100644 --- a/src/code_800029B0.c +++ b/src/code_800029B0.c @@ -327,7 +327,7 @@ void func_80003040(void) { break; case COURSE_BANSHEE_BOARDWALK: // d_course_banshee_boardwalk_packed_dl_878 - find_vtx_and_set_colours(0x07000878, -0x80, 0, 0, 0); + find_vtx_and_set_colours(0x07000878, 128, 0, 0, 0); break; case COURSE_YOSHI_VALLEY: vec3f_set(position, -2300.0f, 0.0f, 634.0f); @@ -351,17 +351,17 @@ void func_80003040(void) { break; case COURSE_SHERBET_LAND: // d_course_sherbet_land_packed_dl_1EB8 - find_vtx_and_set_colours(0x07001EB8, -0x4C, 0xFF, 0xFF, 0xFF); + find_vtx_and_set_colours(0x07001EB8, 76, 0xFF, 0xFF, 0xFF); // d_course_sherbet_land_packed_dl_2308 - find_vtx_and_set_colours(0x07002308, -0x6A, 0xFF, 0xFF, 0xFF); + find_vtx_and_set_colours(0x07002308, 106, 0xFF, 0xFF, 0xFF); break; case COURSE_RAINBOW_ROAD: // d_course_rainbow_road_packed_dl_2068 - find_vtx_and_set_colours(0x07002068, -0x6A, 0xFF, 0xFF, 0xFF); + find_vtx_and_set_colours(0x07002068, 106, 0xFF, 0xFF, 0xFF); // d_course_rainbow_road_packed_dl_1E18 - find_vtx_and_set_colours(0x07001E18, -0x6A, 0xFF, 0xFF, 0xFF); + find_vtx_and_set_colours(0x07001E18, 106, 0xFF, 0xFF, 0xFF); // d_course_rainbow_road_packed_dl_1318 - find_vtx_and_set_colours(0x07001318, -1, 0xFF, 0xFF, 0); + find_vtx_and_set_colours(0x07001318, 255, 0xFF, 0xFF, 0); break; case COURSE_WARIO_STADIUM: vec3f_set(position, -131.0f, 83.0f, 286.0f); diff --git a/src/racing/render_courses.c b/src/racing/render_courses.c index e1556abea..851d80409 100644 --- a/src/racing/render_courses.c +++ b/src/racing/render_courses.c @@ -1547,13 +1547,13 @@ void course_generate_collision_mesh(void) { parse_course_displaylists((uintptr_t) d_course_koopa_troopa_beach_addr); func_80295C6C(); // d_course_koopa_troopa_beach_packed_dl_ADE0 - find_vtx_and_set_colours((uintptr_t) 0x0700ADE0, -0x6A, 255, 255, 255); + find_vtx_and_set_colours((uintptr_t) 0x0700ADE0, 106, 255, 255, 255); // d_course_koopa_troopa_beach_packed_dl_A540 - find_vtx_and_set_colours((uintptr_t) 0x0700A540, -0x6A, 255, 255, 255); + find_vtx_and_set_colours((uintptr_t) 0x0700A540, 106, 255, 255, 255); // d_course_koopa_troopa_beach_packed_dl_9E70 - find_vtx_and_set_colours((uintptr_t) 0x07009E70, -0x6A, 255, 255, 255); + find_vtx_and_set_colours((uintptr_t) 0x07009E70, 106, 255, 255, 255); // d_course_koopa_troopa_beach_packed_dl_358 - find_vtx_and_set_colours((uintptr_t) 0x07000358, -0x6A, 255, 255, 255); + find_vtx_and_set_colours((uintptr_t) 0x07000358, 106, 255, 255, 255); break; case COURSE_ROYAL_RACEWAY: parse_course_displaylists((uintptr_t) d_course_royal_raceway_addr); @@ -1590,9 +1590,9 @@ void course_generate_collision_mesh(void) { func_80295C6C(); D_8015F8E4 = -18.0f; // d_course_sherbet_land_packed_dl_1EB8 - find_vtx_and_set_colours((uintptr_t) 0x07001EB8, -0x4C, 255, 255, 255); + find_vtx_and_set_colours((uintptr_t) 0x07001EB8, 76, 255, 255, 255); // d_course_sherbet_land_packed_dl_2308 - find_vtx_and_set_colours((uintptr_t) 0x07002308, -0x6A, 255, 255, 255); + find_vtx_and_set_colours((uintptr_t) 0x07002308, 106, 255, 255, 255); break; case COURSE_RAINBOW_ROAD: D_800DC5C8 = 1; @@ -1600,14 +1600,14 @@ void course_generate_collision_mesh(void) { func_80295C6C(); D_8015F8E4 = 0.0f; // d_course_rainbow_road_packed_dl_2068 - find_vtx_and_set_colours((uintptr_t) 0x07002068, -0x6A, 255, 255, 255); + find_vtx_and_set_colours((uintptr_t) 0x07002068, 106, 255, 255, 255); // d_course_rainbow_road_packed_dl_1E18 - find_vtx_and_set_colours((uintptr_t) 0x07001E18, -0x6A, 255, 255, 255); + find_vtx_and_set_colours((uintptr_t) 0x07001E18, 106, 255, 255, 255); // d_course_rainbow_road_packed_dl_1318 find_vtx_and_set_colours((uintptr_t) 0x07001318, 255, 255, 255, 0); if (gGamestate != CREDITS_SEQUENCE) { // d_course_rainbow_road_packed_dl_1FB8 - find_vtx_and_set_colours((uintptr_t) 0x07001FB8, -0x6A, 255, 255, 255); + find_vtx_and_set_colours((uintptr_t) 0x07001FB8, 106, 255, 255, 255); } break; case COURSE_WARIO_STADIUM: