diff --git a/src/code_800029B0.c b/src/code_800029B0.c index a351de8ec..1ab0983d9 100644 --- a/src/code_800029B0.c +++ b/src/code_800029B0.c @@ -35,7 +35,7 @@ s32 D_800DC5AC = 0; u16 D_800DC5B0 = 1; u16 D_800DC5B4 = 0; u16 D_800DC5B8 = 0; -u16 D_800DC5BC = 0; +u16 bFog = 0; u16 gIsInQuitToMenuTransition = 0; u16 gQuitToMenuTransitionCounter = 0; u16 D_800DC5C8 = 0; @@ -153,9 +153,9 @@ UNUSED u8 D_80162578[sizeof(struct Actor)]; s16 gDebugPathCount; s16 sIsController1Unplugged; -s32 D_801625EC; -s32 D_801625F0; -s32 D_801625F4; +s32 gFogRed; +s32 gFogBlue; +s32 gFogGreen; s32 D_801625F8; f32 D_801625FC; @@ -299,7 +299,7 @@ void func_80003040(void) { Vec3f velocity = { 0, 0, 0 }; Vec3s rotation = { 0, 0, 0 }; - D_800DC5BC = 0; + bFog = 0; D_800DC5C8 = 0; gNumActors = 0; gIsMirrorMode = 0; diff --git a/src/code_800029B0.h b/src/code_800029B0.h index 0b7335383..39cc16f89 100644 --- a/src/code_800029B0.h +++ b/src/code_800029B0.h @@ -40,7 +40,7 @@ extern s32 D_800DC5AC; extern u16 D_800DC5B0; extern u16 D_800DC5B4; extern u16 D_800DC5B8; -extern u16 D_800DC5BC; +extern u16 bFog; extern u16 gIsInQuitToMenuTransition; extern u16 gQuitToMenuTransitionCounter; extern u16 D_800DC5C8; @@ -137,9 +137,9 @@ extern u16 gNumPermanentActors; extern UNUSED u8 D_80162578[]; extern s16 gDebugPathCount; extern s16 sIsController1Unplugged; -extern s32 D_801625EC; -extern s32 D_801625F0; -extern s32 D_801625F4; +extern s32 gFogRed; +extern s32 gFogBlue; +extern s32 gFogGreen; extern s32 D_801625F8; extern f32 D_801625FC; diff --git a/src/ending/code_80280000.c b/src/ending/code_80280000.c index 4460aa2e2..c974686aa 100644 --- a/src/ending/code_80280000.c +++ b/src/ending/code_80280000.c @@ -156,7 +156,7 @@ void load_credits(void) { D_8015F5A0 = 0; D_8015F58C = 0; gCollisionMeshCount = 0; - D_800DC5BC = 0; + bFog = 0; D_800DC5C8 = 0; gCollisionMesh = (CollisionTriangle*) gNextFreeMemoryAddress; camera->pos[0] = 1400.0f; diff --git a/src/ending/code_80281780.c b/src/ending/code_80281780.c index 0f303fa47..669f54ce4 100644 --- a/src/ending/code_80281780.c +++ b/src/ending/code_80281780.c @@ -124,7 +124,7 @@ void load_ceremony_cutscene(void) { D_8015F5A0 = 0; D_8015F58C = 0; gCollisionMeshCount = (u16) 0; - D_800DC5BC = (u16) 0; + bFog = (u16) 0; D_800DC5C8 = (u16) 0; gCollisionMesh = (CollisionTriangle*) gNextFreeMemoryAddress; //! @bug these segmented addresses need to be symbols for mobility diff --git a/src/racing/actors.c b/src/racing/actors.c index 92b13e784..a08f6c746 100644 --- a/src/racing/actors.c +++ b/src/racing/actors.c @@ -331,16 +331,16 @@ void func_80297340(Camera* arg0) { } if (temp < arg0->pos[2]) { - if (D_800DC5BC != 0) { + if (bFog != 0) { - gDPSetFogColor(gDisplayListHead++, D_801625EC, D_801625F4, D_801625F0, 0xFF); + gDPSetFogColor(gDisplayListHead++, gFogRed, gFogGreen, gFogBlue, 0xFF); gSPDisplayList(gDisplayListHead++, &D_0D001C20); } else { gSPDisplayList(gDisplayListHead++, &D_0D001B90); } - } else if (D_800DC5BC != 0) { + } else if (bFog != 0) { - gDPSetFogColor(gDisplayListHead++, D_801625EC, D_801625F4, D_801625F0, 0xFF); + gDPSetFogColor(gDisplayListHead++, gFogRed, gFogGreen, gFogBlue, 0xFF); gSPDisplayList(gDisplayListHead++, &D_0D001C88); } else { gSPDisplayList(gDisplayListHead++, &D_0D001BD8); diff --git a/src/racing/render_courses.c b/src/racing/render_courses.c index c9f171699..291e45d90 100644 --- a/src/racing/render_courses.c +++ b/src/racing/render_courses.c @@ -18,8 +18,8 @@ #include "courses/all_course_packed.h" #include "courses/all_course_offsets.h" -s16 D_802B87B0 = 995; -s16 D_802B87B4 = 1000; +s16 gFogMin = 995; +s16 gFogMax = 1000; UNUSED s32 D_802B87B8 = 0; s32 D_802B87BC = 0; UNUSED s32 D_802B87C0 = 0; @@ -648,8 +648,8 @@ void render_choco_mountain(struct UnkStruct_800DC5EC* arg0) { gSPDisplayList(gDisplayListHead++, ((uintptr_t) 0x07004608)); } gDPSetCycleType(gDisplayListHead++, G_CYC_2CYCLE); - gDPSetFogColor(gDisplayListHead++, D_801625EC, D_801625F4, D_801625F0, 0xFF); - gSPFogPosition(gDisplayListHead++, D_802B87B0, D_802B87B4); + gDPSetFogColor(gDisplayListHead++, gFogRed, gFogGreen, gFogBlue, 0xFF); + gSPFogPosition(gDisplayListHead++, gFogMin, gFogMax); gDPPipeSync(gDisplayListHead++); gSPSetGeometryMode(gDisplayListHead++, G_FOG); @@ -724,7 +724,7 @@ void render_banshee_boardwalk(struct UnkStruct_800DC5EC* arg0) { // d_course_banshee_boardwalk_packed_dl_7228 gSPDisplayList(gDisplayListHead++, ((uintptr_t) 0x07007228)); - gSPFogPosition(gDisplayListHead++, D_802B87B0, D_802B87B4); + gSPFogPosition(gDisplayListHead++, gFogMin, gFogMax); gDPPipeSync(gDisplayListHead++); @@ -957,7 +957,7 @@ void render_moo_moo_farm(struct UnkStruct_800DC5EC* arg0) { gSPDisplayList(gDisplayListHead++, ((uintptr_t) 0x07004DF8)); // d_course_moo_moo_farm_packed_dl_5640 gSPDisplayList(gDisplayListHead++, ((uintptr_t) 0x07005640)); - gSPFogPosition(gDisplayListHead++, D_802B87B0, D_802B87B4); + gSPFogPosition(gDisplayListHead++, gFogMin, gFogMax); render_course_segments((uintptr_t) moo_moo_farm_dls, arg0); @@ -1016,9 +1016,9 @@ void render_toads_turnpike(struct UnkStruct_800DC5EC* arg0) { gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH); gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); - gDPSetFogColor(gDisplayListHead++, D_801625EC, D_801625F4, D_801625F0, 0xFF); + gDPSetFogColor(gDisplayListHead++, gFogRed, gFogGreen, gFogBlue, 0xFF); gDPSetCycleType(gDisplayListHead++, G_CYC_2CYCLE); - gSPFogPosition(gDisplayListHead++, D_802B87B0, D_802B87B4); + gSPFogPosition(gDisplayListHead++, gFogMin, gFogMax); gSPSetGeometryMode(gDisplayListHead++, G_FOG); gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEI, G_CC_PASS2); gDPSetRenderMode(gDisplayListHead++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2); @@ -1465,7 +1465,7 @@ void course_generate_collision_mesh(void) { D_8015F58C = 0; gCollisionMeshCount = 0; gCollisionMesh = (CollisionTriangle*) gNextFreeMemoryAddress; - D_800DC5BC = 0; + bFog = 0; D_800DC5C8 = 0; #if !ENABLE_CUSTOM_COURSE_ENGINE switch (gCurrentCourseId) { @@ -1484,12 +1484,12 @@ void course_generate_collision_mesh(void) { D_8015F8E4 = gCourseMinY - 10.0f; break; case COURSE_CHOCO_MOUNTAIN: - D_800DC5BC = 1; - D_801625EC = 255; - D_801625F4 = 255; - D_801625F0 = 255; - D_802B87B0 = 0x3E3; - D_802B87B4 = 0x3E8; + bFog = 1; + gFogRed = 255; + gFogGreen = 255; + gFogBlue = 255; + gFogMin = 0x3E3; + gFogMax = 0x3E8; D_802B87D4 = 0x71C; D_802B87D0 = 0xE38; @@ -1522,10 +1522,10 @@ void course_generate_collision_mesh(void) { D_8015F8E4 = -50.0f; break; case COURSE_BANSHEE_BOARDWALK: - D_800DC5BC = 1; - D_801625EC = 0; - D_801625F4 = 0; - D_801625F0 = 0; + bFog = 1; + gFogRed = 0; + gFogGreen = 0; + gFogBlue = 0; parse_course_displaylists((uintptr_t) d_course_banshee_boardwalk_track_sections); func_80295C6C(); // d_course_banshee_boardwalk_packed_dl_878 @@ -1571,11 +1571,11 @@ void course_generate_collision_mesh(void) { D_8015F8E4 = gCourseMinY - 10.0f; break; case COURSE_TOADS_TURNPIKE: - D_801625EC = 43; - D_801625F4 = 13; - D_801625F0 = 4; - D_802B87B0 = 993; - D_802B87B4 = 1000; + gFogRed = 43; + gFogGreen = 13; + gFogBlue = 4; + gFogMin = 993; + gFogMax = 1000; parse_course_displaylists((uintptr_t) d_course_toads_turnpike_addr); func_80295C6C(); D_8015F8E4 = gCourseMinY - 10.0f; diff --git a/src/racing/skybox_and_splitscreen.c b/src/racing/skybox_and_splitscreen.c index 78f95fe7c..577c6afb5 100644 --- a/src/racing/skybox_and_splitscreen.c +++ b/src/racing/skybox_and_splitscreen.c @@ -371,37 +371,37 @@ struct Skybox sBottomSkyBoxColors[] = { void course_set_skybox_colours(Vtx* skybox) { s32 i; - if (D_800DC5BC != 0) { + if (bFog != 0) { - if (D_801625EC < 0) { - D_801625EC = 0; + if (gFogRed < 0) { + gFogRed = 0; } - if (D_801625F4 < 0) { - D_801625F4 = 0; + if (gFogGreen < 0) { + gFogGreen = 0; } - if (D_801625F0 < 0) { - D_801625F0 = 0; + if (gFogBlue < 0) { + gFogBlue = 0; } - if (D_801625EC > 255) { - D_801625EC = 255; + if (gFogRed > 255) { + gFogRed = 255; } - if (D_801625F4 > 255) { - D_801625F4 = 255; + if (gFogGreen > 255) { + gFogGreen = 255; } - if (D_801625F0 > 255) { - D_801625F0 = 255; + if (gFogBlue > 255) { + gFogBlue = 255; } for (i = 0; i < 8; i++) { - skybox[i].v.cn[0] = (s16) D_801625EC; - skybox[i].v.cn[1] = (s16) D_801625F4; - skybox[i].v.cn[2] = (s16) D_801625F0; + skybox[i].v.cn[0] = (s16) gFogRed; + skybox[i].v.cn[1] = (s16) gFogGreen; + skybox[i].v.cn[2] = (s16) gFogBlue; } return; }