From 07aeaaec96edf16500bc33a4fd62ea6db4cc8bb7 Mon Sep 17 00:00:00 2001 From: coco875 Date: Sat, 31 Aug 2024 16:13:17 +0200 Subject: [PATCH] fix compilation issue --- courses/koopa_troopa_beach/course_data.h | 4 ++-- courses/sherbet_land/course_offsets.c | 4 ++-- src/racing/render_courses.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/courses/koopa_troopa_beach/course_data.h b/courses/koopa_troopa_beach/course_data.h index f5ef0a88f..fa6c27bf0 100644 --- a/courses/koopa_troopa_beach/course_data.h +++ b/courses/koopa_troopa_beach/course_data.h @@ -367,7 +367,7 @@ extern Gfx d_course_koopa_troopa_beach_dl_18D68[]; extern struct ActorSpawnData d_course_koopa_troopa_beach_item_box_spawns[]; extern struct ActorSpawnData d_course_koopa_troopa_beach_tree_spawn[]; extern TrackSections d_course_koopa_troopa_beach_addr[]; -extern Gfx* d_course_koopa_troopa_beach_section_dl1[]; -extern Gfx* d_course_koopa_troopa_beach_section_dl2[]; +extern Gfx* d_course_koopa_troopa_beach_dl_list1[]; +extern Gfx* d_course_koopa_troopa_beach_dl_list2[]; #endif diff --git a/courses/sherbet_land/course_offsets.c b/courses/sherbet_land/course_offsets.c index 4dd320415..b606a47ae 100644 --- a/courses/sherbet_land/course_offsets.c +++ b/courses/sherbet_land/course_offsets.c @@ -22,7 +22,7 @@ const course_texture sherbet_land_textures[] = { { 0x00000000, 0x0000, 0x0000, 0x0 }, }; -const Gfx* d_course_sherbet_land_section_dl1[] = { +const Gfx* sherbet_land_dls[] = { d_course_sherbet_land_dl_0, d_course_sherbet_land_dl_158, d_course_sherbet_land_dl_C0, d_course_sherbet_land_dl_1A8, d_course_sherbet_land_dl_280, d_course_sherbet_land_dl_3B8, d_course_sherbet_land_dl_310, d_course_sherbet_land_dl_400, d_course_sherbet_land_dl_4E8, @@ -49,7 +49,7 @@ const Gfx* d_course_sherbet_land_section_dl1[] = { d_course_sherbet_land_dl_25A0, d_course_sherbet_land_dl_2530, d_course_sherbet_land_dl_25F8, }; -const Gfx* d_course_sherbet_land_section_dl2[] = { +const Gfx* sherbet_land_dls_2[] = { d_course_sherbet_land_dl_26D0, d_course_sherbet_land_dl_28A0, d_course_sherbet_land_dl_27F0, d_course_sherbet_land_dl_2918, d_course_sherbet_land_dl_2A38, d_course_sherbet_land_dl_2BE0, d_course_sherbet_land_dl_2B08, d_course_sherbet_land_dl_2C58, d_course_sherbet_land_dl_2D78, diff --git a/src/racing/render_courses.c b/src/racing/render_courses.c index 3e23b27bc..d2716bcc6 100644 --- a/src/racing/render_courses.c +++ b/src/racing/render_courses.c @@ -301,7 +301,7 @@ void func_8029122C(struct UnkStruct_800DC5EC* arg0, s32 playerId) { gDPSetBlendMask(gDisplayListHead++, 0xFF); gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA, G_CC_MODULATEIA); gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK); - render_course_segments((uintptr_t) d_course_koopa_troopa_beach_section_dl2, arg0); + render_course_segments((uintptr_t) d_course_koopa_troopa_beach_dl_list2, arg0); gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 1, 1, G_OFF); gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK); gDPSetAlphaCompare(gDisplayListHead++, G_AC_NONE); @@ -319,7 +319,7 @@ void func_8029122C(struct UnkStruct_800DC5EC* arg0, s32 playerId) { mtxf_identity(matrix); render_set_position(matrix, 0); - render_course_segments((uintptr_t) d_course_sherbet_land_section_dl2, arg0); + render_course_segments((uintptr_t) sherbet_land_dls_2, arg0); gDPSetAlphaCompare(gDisplayListHead++, G_AC_NONE); if ((func_80290C20(arg0->camera) == 1) && (func_802AAB4C(player) < player->pos[1])) { @@ -816,7 +816,7 @@ void render_koopa_troopa_beach(struct UnkStruct_800DC5EC* arg0) { gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); // d_course_koopa_troopa_beach_packed_dl_9688 gSPDisplayList(gDisplayListHead++, ((uintptr_t) 0x07009688)); - render_course_segments((uintptr_t) d_course_koopa_troopa_beach_section_dl1, arg0); + render_course_segments((uintptr_t) d_course_koopa_troopa_beach_dl_list1, arg0); gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK); gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2); @@ -1078,7 +1078,7 @@ void render_sherbet_land(struct UnkStruct_800DC5EC* arg0) { gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH); gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEI, G_CC_MODULATEI); gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); - render_course_segments((uintptr_t) d_course_sherbet_land_section_dl1, arg0); + render_course_segments((uintptr_t) sherbet_land_dls, arg0); } void render_rainbow_road(UNUSED struct UnkStruct_800DC5EC* arg0) {