Decompile skyRenderSuns

src/game/bg.c

@@ -2535,7 +2535,7 @@ Gfx *bgRenderSceneInXray(Gfx *gdl)
 		}
 	}
 
-	gdl = sky0f125a6c(gdl, 1);
+	gdl = skyRenderSuns(gdl, true);
 
 	return gdl;
 }
@@ -2660,7 +2660,7 @@ Gfx *bgRenderScene(Gfx *gdl)
 		gSPPerspNormalize(gdl++, viGetPerspScale());
 	}
 
-	gdl = sky0f125a6c(gdl, 0);
+	gdl = skyRenderSuns(gdl, false);
 
 	// Build an array of room numbers per onscreen prop.
 	// For each onscreen prop there is exactly one entry in the roomnumsbyprop array.
@@ -3122,7 +3122,7 @@ glabel bgRenderScene
 .NB0f1551d4:
 /*  f1551d4:	02202025 */ 	or	$a0,$s1,$zero
 .NB0f1551d8:
-/*  f1551d8:	0fc481ab */ 	jal	sky0f125a6c
+/*  f1551d8:	0fc481ab */ 	jal	skyRenderSuns
 /*  f1551dc:	00002825 */ 	or	$a1,$zero,$zero
 /*  f1551e0:	3c05800a */ 	lui	$a1,0x800a
 /*  f1551e4:	3c0e800a */ 	lui	$t6,0x800a

src/game/game_13c510.c

@@ -59,7 +59,7 @@ void func0f13c510(void)
 	s32 i;
 
 	for (i = 0; i < 120; i++) {
-		thing->unk00[0][i].unk00 = 0;
+		thing->unk00[0].unk00[i].unk00 = 0;
 	}
 }
 

src/include/data.h

@@ -406,8 +406,8 @@ extern struct headorbody g_HeadsAndBodies[];
 extern struct hatposition var8007dae4[1][6];
 extern f32 g_SkyCloudOffset;
 extern f32 g_SkyWindSpeed;
-extern f32 var8007db88[];
-extern u32 var8007db94[];
+extern f32 g_SunAlphaFracs[];
+extern s32 g_SunFlareTimers240[];
 extern u32 var8007dba0;
 extern u32 var8007dbb8;
 extern u32 var8007dbd0;

src/include/game/sky.h

@@ -12,8 +12,8 @@ void sky0f11f000(f32 left, f32 top, struct coord *arg2);
 bool sky0f11f07c(struct coord *arg0, struct coord *arg1, f32 *arg2);
 bool sky0f11f1fc(struct coord *arg0, struct coord *arg1, f32 *arg2);
 void sky0f11f384(struct coord *arg0, struct coord *arg1, struct coord *out);
-f32 sky0f11f3d0(f32 value, f32 min, f32 max);
-f32 sky0f11f410(f32 value);
+f32 skyClamp(f32 value, f32 min, f32 max);
+f32 skyRound(f32 value);
 u32 sky0f11f438(void);
 u32 sky0f11f6ec(void);
 Gfx *skyRender(Gfx *gdl);
@@ -21,9 +21,9 @@ u32 sky0f1228d0(void);
 u32 sky0f122ce8(void);
 u32 sky0f122d4c(void);
 u32 sky0f123fd4(void);
-u32 sky0f125948(void);
+void sky0f125948(struct bootbufferthingdeep *arg0, s32 arg1, s32 arg2);
 f32 sky0f125a1c(struct bootbufferthingdeep *arg0);
-Gfx *sky0f125a6c(Gfx *gdl, s32 arg1);
+Gfx *skyRenderSuns(Gfx *gdl, bool xray);
 Gfx *sky0f126384(Gfx *gdl, f32 x, f32 y, f32 arg3, f32 orbsize, s32 arg5, f32 arg6);
 Gfx *sky0f126c3c(Gfx *gdl, f32 x, f32 y, f32 z, f32 arg4, f32 arg5);
 Gfx *sky0f126de8(Gfx *gdl);

src/include/types.h

@@ -3323,15 +3323,13 @@ struct environment {
 };
 
 struct sun {
-	u8 lens_flare;
-	u8 red;
-	u8 green;
-	u8 blue;
-	f32 x;
-	f32 y;
-	f32 z;
-	u16 texture_size;
-	s16 orb_size;
+	/*0x00*/ u8 lens_flare;
+	/*0x01*/ u8 red;
+	/*0x02*/ u8 green;
+	/*0x03*/ u8 blue;
+	/*0x04*/ f32 pos[3];
+	/*0x10*/ s16 texture_size;
+	/*0x12*/ s16 orb_size;
 };
 
 struct envtype1 {
@@ -3632,8 +3630,12 @@ struct bootbufferthingdeep {
 	u32 unk10;
 };
 
+struct bootbufferthing2 {
+	struct bootbufferthingdeep unk00[8];
+};
+
 struct bootbufferthing {
-	struct bootbufferthingdeep unk00[15][8];
+	struct bootbufferthing2 unk00[15];
 };
 
 struct credit {

src/lib/sched.c

@@ -446,7 +446,7 @@ void bbufResetBuffers(void)
 
 	for (i = 0; i < 3; i++) {
 		for (j = 0; j < 120; j++) {
-			g_BootBuffers[i].unk00[0][j].unk00 = 0;
+			g_BootBuffers[i].unk00[0].unk00[j].unk00 = 0;
 		}
 
 		g_BootBufferDirtyIndexes[i] = 0;
@@ -496,7 +496,7 @@ void bbufUpdateIndex2Buffer(void)
 	s32 i;
 
 	for (i = 0; i < 120; i++) {
-		struct bootbufferthingdeep *deep = &thing->unk00[0][i];
+		struct bootbufferthingdeep *deep = &thing->unk00[0].unk00[i];
 
 		if (deep->unk00) {
 			u16 *unk08 = deep->unk08;