Update StarSpawn to StarCloudData (#578)

* Update StarSpawn to StarCloudData

Add and better specify the struct used to control how stars and
 clouds are handled in various courses.

2 files changed, 189 insertions, 189 deletions

diff --git a/src/data/some_data.c b/src/data/some_data.c
index cf51e665d..b267c63e7 100644
--- a/src/data/some_data.c
+++ b/src/data/some_data.c
@@ -1071,187 +1071,187 @@ SplineData8 D_800E69F4 = {
     }
 };
 
-StarSpawn D_800E6A38[] = {
-    {{ 0x04fa, 0xfff6, 0x0096 }, 0x0000 },
-    {{ 0x4718, 0x003c, 0x007d }, 0x0000 },
-    {{ 0x5550, 0x0046, 0x0096 }, 0x0000 },
-    {{ 0x954c, 0x002d, 0x004b }, 0x0000 },
-    {{ 0xae2e, 0x0028, 0x004b }, 0x0000 },
-    {{ 0x0e38, 0x001e, 0x0032 }, 0x0001 },
-    {{ 0xa384, 0x0032, 0x0064 }, 0x0001 },
-    {{ 0xd548, 0x001e, 0x0032 }, 0x0001 },
-    {{ 0x31c4, 0x0032, 0x0064 }, 0x0002 },
-    {{ 0x7ff8, 0x0037, 0x0064 }, 0x0002 },
-    {{ 0xaaa0, 0x004b, 0x0096 }, 0x0002 },
-    {{ 0xb8d8, 0xfff9, 0x0064 }, 0x0002 },
-    {{ 0xee2a, 0x003c, 0x0050 }, 0x0002 },
-    {{ 0xffff, 0x0000, 0x0000 }, 0x0000 },
-};
-
-StarSpawn D_800E6AA8[] = {
-    {{ 0x00b6, 0x0050, 0x0041 }, 0x0000 },
-    {{ 0x4718, 0x003c, 0x0064 }, 0x0000 },
-    {{ 0x18e2, 0x0032, 0x004b }, 0x0000 },
-    {{ 0x7ff8, 0x0037, 0x0064 }, 0x0000 },
-    {{ 0x9ff6, 0x002d, 0x0032 }, 0x0000 },
-    {{ 0xc710, 0x0046, 0x003c }, 0x0000 },
-    {{ 0x0aaa, 0x001e, 0x0064 }, 0x0001 },
-    {{ 0x5c6c, 0x0046, 0x0046 }, 0x0001 },
-    {{ 0x31c4, 0x0028, 0x0050 }, 0x0002 },
-    {{ 0xf1b8, 0x0028, 0x004b }, 0x0002 },
-    {{ 0xffff, 0x0000, 0x0000 }, 0x0000 },
-};
-
-StarSpawn D_800E6B00[] = {
-    {{ 0x1554, 0x001e, 0x00c8 }, 0x0000 },
-    {{ 0xce2c, 0x001e, 0x00c8 }, 0x0000 },
-    {{ 0xa384, 0x001e, 0x00c8 }, 0x0001 },
-    {{ 0x070c, 0x001e, 0x00c8 }, 0x0001 },
-    {{ 0x4718, 0x001e, 0x00c8 }, 0x0002 },
-    {{ 0x8714, 0x001e, 0x00c8 }, 0x0003 },
-    {{ 0xffff, 0x0000, 0x0000 }, 0x0000 },
-};
-
-StarSpawn D_800E6B38[] = {
-    {{ 0x60b0, 0x003c, 0x007d }, 0x0000 },
-    {{ 0xb8d8, 0x0037, 0x0064 }, 0x0000 },
-    {{ 0xd548, 0x000a, 0x0082 }, 0x0000 },
-    {{ 0xf1b8, 0x0023, 0x0064 }, 0x0000 },
-    {{ 0x04fa, 0x0046, 0x0096 }, 0x0001 },
-    {{ 0x4718, 0x003c, 0x007d }, 0x0001 },
-    {{ 0x954c, 0x002d, 0x004b }, 0x0001 },
-    {{ 0x0e38, 0x001e, 0x0032 }, 0x0002 },
-    {{ 0x8880, 0x0046, 0x0096 }, 0x0002 },
-    {{ 0x31c4, 0x0032, 0x0064 }, 0x0003 },
-    {{ 0x5056, 0x0028, 0x004b }, 0x0003 },
-    {{ 0x7ff8, 0x0037, 0x0064 }, 0x0003 },
-    {{ 0xaaa0, 0x004b, 0x0096 }, 0x0003 },
-    {{ 0xffff, 0x0000, 0x0000 }, 0x0000 },
-};
-
-StarSpawn D_800E6BA8[] = {
-    {{ 0x4718, 0x003c, 0x007d }, 0x0000 },
-    {{ 0x5550, 0x0046, 0x0096 }, 0x0000 },
-    {{ 0x954c, 0x002d, 0x004b }, 0x0000 },
-    {{ 0xf546, 0x0028, 0x004b }, 0x0000 },
-    {{ 0x0e38, 0x001e, 0x0032 }, 0x0001 },
-    {{ 0x0222, 0x0032, 0x0064 }, 0x0002 },
-    {{ 0x1ffe, 0x0028, 0x004b }, 0x0002 },
-    {{ 0x31c4, 0x0032, 0x0064 }, 0x0002 },
-    {{ 0x7ff8, 0x0037, 0x0064 }, 0x0002 },
-    {{ 0xaaa0, 0x004b, 0x0096 }, 0x0002 },
-    {{ 0xb8d8, 0x0037, 0x0064 }, 0x0002 },
-    {{ 0xdff2, 0x001e, 0x0032 }, 0x0002 },
-    {{ 0xffff, 0x0000, 0x0000 }, 0x0000 },
-};
-
-StarSpawn D_800E6C10[] = {
-    {{ 0x1ffe, 0x0028, 0x004b }, 0x0000 },
-    {{ 0x60b0, 0x003c, 0x007d }, 0x0000 },
-    {{ 0xb8d8, 0x0037, 0x0064 }, 0x0000 },
-    {{ 0x4718, 0x003c, 0x007d }, 0x0001 },
-    {{ 0x954c, 0x002d, 0x004b }, 0x0001 },
-    {{ 0xf546, 0x0028, 0x004b }, 0x0001 },
-    {{ 0x0e38, 0x001e, 0x0032 }, 0x0002 },
-    {{ 0xa384, 0x0032, 0x0064 }, 0x0002 },
-    {{ 0xddd0, 0x0046, 0x0096 }, 0x0002 },
-    {{ 0x0222, 0x0032, 0x0064 }, 0x0003 },
-    {{ 0x31c4, 0x0032, 0x0064 }, 0x0003 },
-    {{ 0x7ff8, 0x0037, 0x0064 }, 0x0003 },
-    {{ 0xaaa0, 0x004b, 0x0096 }, 0x0003 },
-    {{ 0xffff, 0x0000, 0x0000 }, 0x0000 },
-};
-
-StarSpawn D_800E6C80[] = {
-    {{ 0x0222, 0x0032, 0x000a }, 0x0000 },
-    {{ 0x04fa, 0x0046, 0x000f }, 0x0000 },
-    {{ 0x093e, 0x000a, 0x0014 }, 0x0000 },
-    {{ 0x0e38, 0x001e, 0x000f }, 0x0000 },
-    {{ 0x11c6, 0x0028, 0x0014 }, 0x0000 },
-    {{ 0x1554, 0xfff6, 0x000f }, 0x0000 },
-    {{ 0x1ddc, 0x000a, 0x0011 }, 0x0000 },
-    {{ 0x1ffe, 0x0030, 0x0019 }, 0x0000 },
-    {{ 0x271a, 0x0046, 0x0014 }, 0x0000 },
-    {{ 0x27d0, 0xfff1, 0x0016 }, 0x0000 },
-    {{ 0x2c14, 0x0014, 0x000f }, 0x0000 },
-    {{ 0x31c4, 0x0032, 0x0016 }, 0x0000 },
-    {{ 0x327a, 0x0000, 0x000a }, 0x0000 },
-    {{ 0x3a4c, 0x000f, 0x0016 }, 0x0000 },
-    {{ 0x3ffc, 0x002d, 0x0011 }, 0x0000 },
-    {{ 0x40b2, 0xffdd, 0x0016 }, 0x0000 },
-    {{ 0x4440, 0x0037, 0x0014 }, 0x0000 },
-    {{ 0x4718, 0x003c, 0x000c }, 0x0000 },
-    {{ 0x4718, 0x0050, 0x000c }, 0x0000 },
-    {{ 0x4aa6, 0xfff6, 0x000f }, 0x0000 },
-    {{ 0x5056, 0x0028, 0x000a }, 0x0000 },
-    {{ 0x5550, 0x0046, 0x000f }, 0x0000 },
-    {{ 0x60b0, 0x003c, 0x0016 }, 0x0000 },
-    {{ 0x6388, 0xffdd, 0x0019 }, 0x0000 },
-    {{ 0x64f4, 0x0023, 0x0011 }, 0x0000 },
-    {{ 0x6aa4, 0x004b, 0x0014 }, 0x0000 },
-    {{ 0x7054, 0x002d, 0x0019 }, 0x0000 },
-    {{ 0x7498, 0x0014, 0x0012 }, 0x0000 },
-    {{ 0x7bb4, 0xfff1, 0x001b }, 0x0000 },
-    {{ 0x7ff8, 0x0037, 0x000a }, 0x0000 },
-    {{ 0x8386, 0x0041, 0x0014 }, 0x0000 },
-    {{ 0x8880, 0x0046, 0x000f }, 0x0000 },
-    {{ 0x954c, 0x002d, 0x0011 }, 0x0000 },
-    {{ 0x98da, 0x003c, 0x000f }, 0x0000 },
-    {{ 0x9dd4, 0x0000, 0x000a }, 0x0000 },
-    {{ 0xa384, 0x0046, 0x000f }, 0x0000 },
-    {{ 0xa43a, 0x0032, 0x0017 }, 0x0000 },
-    {{ 0xaaa0, 0x004b, 0x000f }, 0x0000 },
-    {{ 0xae2e, 0x0028, 0x0011 }, 0x0000 },
-    {{ 0xb1bc, 0x0023, 0x0014 }, 0x0000 },
-    {{ 0xb8d8, 0xfff1, 0x000a }, 0x0000 },
-    {{ 0xbc66, 0xffe2, 0x000f }, 0x0000 },
-    {{ 0xc710, 0x001e, 0x000c }, 0x0000 },
-    {{ 0xffff, 0x0000, 0x0000 }, 0x0000 },
-};
-
-StarSpawn D_800E6DE0[] = {
-    {{ 0x0222, 0x0050, 0x000a }, 0x0000 },
-    {{ 0x04fa, 0x0064, 0x000f }, 0x0000 },
-    {{ 0x093e, 0x005a, 0x0014 }, 0x0000 },
-    {{ 0x0e38, 0x003c, 0x000f }, 0x0000 },
-    {{ 0x11c6, 0x0046, 0x0014 }, 0x0000 },
-    {{ 0x1554, 0x0078, 0x000f }, 0x0000 },
-    {{ 0x1c70, 0x001e, 0x0011 }, 0x0000 },
-    {{ 0x1ffe, 0x0046, 0x0011 }, 0x0000 },
-    {{ 0x271a, 0x0064, 0x0014 }, 0x0000 },
-    {{ 0x2c14, 0x0032, 0x000f }, 0x0000 },
-    {{ 0x31c4, 0x0050, 0x000a }, 0x0000 },
-    {{ 0x3996, 0x0019, 0x000c }, 0x0000 },
-    {{ 0x3a4c, 0x0037, 0x0016 }, 0x0000 },
-    {{ 0x3bb8, 0x0019, 0x000c }, 0x0000 },
-    {{ 0x3ffc, 0x004b, 0x0011 }, 0x0000 },
-    {{ 0x4440, 0x0055, 0x0014 }, 0x0000 },
-    {{ 0x4718, 0x005a, 0x000c }, 0x0000 },
-    {{ 0x4aa6, 0x003c, 0x000f }, 0x0000 },
-    {{ 0x5056, 0x0046, 0x000a }, 0x0000 },
-    {{ 0x5550, 0x0064, 0x000f }, 0x0000 },
-    {{ 0x60b0, 0x005a, 0x0016 }, 0x0000 },
-    {{ 0x64f4, 0x0041, 0x0014 }, 0x0000 },
-    {{ 0x6aa4, 0x0069, 0x0014 }, 0x0000 },
-    {{ 0x7054, 0x004b, 0x0014 }, 0x0000 },
-    {{ 0x71c0, 0x0078, 0x0012 }, 0x0000 },
-    {{ 0x7498, 0x003c, 0x0012 }, 0x0000 },
-    {{ 0x7ff8, 0x0055, 0x000a }, 0x0000 },
-    {{ 0x8714, 0x0073, 0x000a }, 0x0000 },
-    {{ 0x8880, 0x0064, 0x000f }, 0x0000 },
-    {{ 0x954c, 0x004b, 0x0011 }, 0x0000 },
-    {{ 0x98da, 0x003c, 0x000f }, 0x0000 },
-    {{ 0x9dd4, 0x0032, 0x000a }, 0x0000 },
-    {{ 0xa384, 0x0050, 0x000a }, 0x0000 },
-    {{ 0xa43a, 0x006e, 0x000a }, 0x0000 },
-    {{ 0xaaa0, 0x0069, 0x000f }, 0x0000 },
-    {{ 0xae2e, 0x0046, 0x0011 }, 0x0000 },
-    {{ 0xb1bc, 0x0041, 0x0014 }, 0x0000 },
-    {{ 0xb8d8, 0x0055, 0x000a }, 0x0000 },
-    {{ 0xbc66, 0x003c, 0x000f }, 0x0000 },
-    {{ 0xc710, 0x0064, 0x000a }, 0x0000 },
-    {{ 0xffff, 0x0000, 0x0000 }, 0x0000 },
-    {{ 0x0000, 0x0000, 0x0000 }, 0x0000 },
+CloudData gLuigiRacewayClouds[] = {
+    { 0x04fa, 0xfff6, 0x0096, 0x0000 },
+    { 0x4718, 0x003c, 0x007d, 0x0000 },
+    { 0x5550, 0x0046, 0x0096, 0x0000 },
+    { 0x954c, 0x002d, 0x004b, 0x0000 },
+    { 0xae2e, 0x0028, 0x004b, 0x0000 },
+    { 0x0e38, 0x001e, 0x0032, 0x0001 },
+    { 0xa384, 0x0032, 0x0064, 0x0001 },
+    { 0xd548, 0x001e, 0x0032, 0x0001 },
+    { 0x31c4, 0x0032, 0x0064, 0x0002 },
+    { 0x7ff8, 0x0037, 0x0064, 0x0002 },
+    { 0xaaa0, 0x004b, 0x0096, 0x0002 },
+    { 0xb8d8, 0xfff9, 0x0064, 0x0002 },
+    { 0xee2a, 0x003c, 0x0050, 0x0002 },
+    { 0xffff, 0x0000, 0x0000, 0x0000 },
+};
+
+CloudData gYoshiValleyMooMooFarmClouds[] = {
+    { 0x00b6, 0x0050, 0x0041, 0x0000 },
+    { 0x4718, 0x003c, 0x0064, 0x0000 },
+    { 0x18e2, 0x0032, 0x004b, 0x0000 },
+    { 0x7ff8, 0x0037, 0x0064, 0x0000 },
+    { 0x9ff6, 0x002d, 0x0032, 0x0000 },
+    { 0xc710, 0x0046, 0x003c, 0x0000 },
+    { 0x0aaa, 0x001e, 0x0064, 0x0001 },
+    { 0x5c6c, 0x0046, 0x0046, 0x0001 },
+    { 0x31c4, 0x0028, 0x0050, 0x0002 },
+    { 0xf1b8, 0x0028, 0x004b, 0x0002 },
+    { 0xffff, 0x0000, 0x0000, 0x0000 },
+};
+
+CloudData gKoopaTroopaBeachClouds[] = {
+    { 0x1554, 0x001e, 0x00c8, 0x0000 },
+    { 0xce2c, 0x001e, 0x00c8, 0x0000 },
+    { 0xa384, 0x001e, 0x00c8, 0x0001 },
+    { 0x070c, 0x001e, 0x00c8, 0x0001 },
+    { 0x4718, 0x001e, 0x00c8, 0x0002 },
+    { 0x8714, 0x001e, 0x00c8, 0x0003 },
+    { 0xffff, 0x0000, 0x0000, 0x0000 },
+};
+
+CloudData gRoyalRacewayClouds[] = {
+    { 0x60b0, 0x003c, 0x007d, 0x0000 },
+    { 0xb8d8, 0x0037, 0x0064, 0x0000 },
+    { 0xd548, 0x000a, 0x0082, 0x0000 },
+    { 0xf1b8, 0x0023, 0x0064, 0x0000 },
+    { 0x04fa, 0x0046, 0x0096, 0x0001 },
+    { 0x4718, 0x003c, 0x007d, 0x0001 },
+    { 0x954c, 0x002d, 0x004b, 0x0001 },
+    { 0x0e38, 0x001e, 0x0032, 0x0002 },
+    { 0x8880, 0x0046, 0x0096, 0x0002 },
+    { 0x31c4, 0x0032, 0x0064, 0x0003 },
+    { 0x5056, 0x0028, 0x004b, 0x0003 },
+    { 0x7ff8, 0x0037, 0x0064, 0x0003 },
+    { 0xaaa0, 0x004b, 0x0096, 0x0003 },
+    { 0xffff, 0x0000, 0x0000, 0x0000 },
+};
+
+CloudData gSherbetLandClouds[] = {
+    { 0x4718, 0x003c, 0x007d, 0x0000 },
+    { 0x5550, 0x0046, 0x0096, 0x0000 },
+    { 0x954c, 0x002d, 0x004b, 0x0000 },
+    { 0xf546, 0x0028, 0x004b, 0x0000 },
+    { 0x0e38, 0x001e, 0x0032, 0x0001 },
+    { 0x0222, 0x0032, 0x0064, 0x0002 },
+    { 0x1ffe, 0x0028, 0x004b, 0x0002 },
+    { 0x31c4, 0x0032, 0x0064, 0x0002 },
+    { 0x7ff8, 0x0037, 0x0064, 0x0002 },
+    { 0xaaa0, 0x004b, 0x0096, 0x0002 },
+    { 0xb8d8, 0x0037, 0x0064, 0x0002 },
+    { 0xdff2, 0x001e, 0x0032, 0x0002 },
+    { 0xffff, 0x0000, 0x0000, 0x0000 },
+};
+
+CloudData gKalimariDesertClouds[] = {
+    { 0x1ffe, 0x0028, 0x004b, 0x0000 },
+    { 0x60b0, 0x003c, 0x007d, 0x0000 },
+    { 0xb8d8, 0x0037, 0x0064, 0x0000 },
+    { 0x4718, 0x003c, 0x007d, 0x0001 },
+    { 0x954c, 0x002d, 0x004b, 0x0001 },
+    { 0xf546, 0x0028, 0x004b, 0x0001 },
+    { 0x0e38, 0x001e, 0x0032, 0x0002 },
+    { 0xa384, 0x0032, 0x0064, 0x0002 },
+    { 0xddd0, 0x0046, 0x0096, 0x0002 },
+    { 0x0222, 0x0032, 0x0064, 0x0003 },
+    { 0x31c4, 0x0032, 0x0064, 0x0003 },
+    { 0x7ff8, 0x0037, 0x0064, 0x0003 },
+    { 0xaaa0, 0x004b, 0x0096, 0x0003 },
+    { 0xffff, 0x0000, 0x0000, 0x0000 },
+};
+
+StarData gToadsTurnpikeRainbowRoadStars[] = {
+    { 0x0222, 0x0032, 0x000a, 0x0000 },
+    { 0x04fa, 0x0046, 0x000f, 0x0000 },
+    { 0x093e, 0x000a, 0x0014, 0x0000 },
+    { 0x0e38, 0x001e, 0x000f, 0x0000 },
+    { 0x11c6, 0x0028, 0x0014, 0x0000 },
+    { 0x1554, 0xfff6, 0x000f, 0x0000 },
+    { 0x1ddc, 0x000a, 0x0011, 0x0000 },
+    { 0x1ffe, 0x0030, 0x0019, 0x0000 },
+    { 0x271a, 0x0046, 0x0014, 0x0000 },
+    { 0x27d0, 0xfff1, 0x0016, 0x0000 },
+    { 0x2c14, 0x0014, 0x000f, 0x0000 },
+    { 0x31c4, 0x0032, 0x0016, 0x0000 },
+    { 0x327a, 0x0000, 0x000a, 0x0000 },
+    { 0x3a4c, 0x000f, 0x0016, 0x0000 },
+    { 0x3ffc, 0x002d, 0x0011, 0x0000 },
+    { 0x40b2, 0xffdd, 0x0016, 0x0000 },
+    { 0x4440, 0x0037, 0x0014, 0x0000 },
+    { 0x4718, 0x003c, 0x000c, 0x0000 },
+    { 0x4718, 0x0050, 0x000c, 0x0000 },
+    { 0x4aa6, 0xfff6, 0x000f, 0x0000 },
+    { 0x5056, 0x0028, 0x000a, 0x0000 },
+    { 0x5550, 0x0046, 0x000f, 0x0000 },
+    { 0x60b0, 0x003c, 0x0016, 0x0000 },
+    { 0x6388, 0xffdd, 0x0019, 0x0000 },
+    { 0x64f4, 0x0023, 0x0011, 0x0000 },
+    { 0x6aa4, 0x004b, 0x0014, 0x0000 },
+    { 0x7054, 0x002d, 0x0019, 0x0000 },
+    { 0x7498, 0x0014, 0x0012, 0x0000 },
+    { 0x7bb4, 0xfff1, 0x001b, 0x0000 },
+    { 0x7ff8, 0x0037, 0x000a, 0x0000 },
+    { 0x8386, 0x0041, 0x0014, 0x0000 },
+    { 0x8880, 0x0046, 0x000f, 0x0000 },
+    { 0x954c, 0x002d, 0x0011, 0x0000 },
+    { 0x98da, 0x003c, 0x000f, 0x0000 },
+    { 0x9dd4, 0x0000, 0x000a, 0x0000 },
+    { 0xa384, 0x0046, 0x000f, 0x0000 },
+    { 0xa43a, 0x0032, 0x0017, 0x0000 },
+    { 0xaaa0, 0x004b, 0x000f, 0x0000 },
+    { 0xae2e, 0x0028, 0x0011, 0x0000 },
+    { 0xb1bc, 0x0023, 0x0014, 0x0000 },
+    { 0xb8d8, 0xfff1, 0x000a, 0x0000 },
+    { 0xbc66, 0xffe2, 0x000f, 0x0000 },
+    { 0xc710, 0x001e, 0x000c, 0x0000 },
+    { 0xffff, 0x0000, 0x0000, 0x0000 },
+};
+
+StarData gWarioStadiumStars[] = {
+    { 0x0222, 0x0050, 0x000a, 0x0000 },
+    { 0x04fa, 0x0064, 0x000f, 0x0000 },
+    { 0x093e, 0x005a, 0x0014, 0x0000 },
+    { 0x0e38, 0x003c, 0x000f, 0x0000 },
+    { 0x11c6, 0x0046, 0x0014, 0x0000 },
+    { 0x1554, 0x0078, 0x000f, 0x0000 },
+    { 0x1c70, 0x001e, 0x0011, 0x0000 },
+    { 0x1ffe, 0x0046, 0x0011, 0x0000 },
+    { 0x271a, 0x0064, 0x0014, 0x0000 },
+    { 0x2c14, 0x0032, 0x000f, 0x0000 },
+    { 0x31c4, 0x0050, 0x000a, 0x0000 },
+    { 0x3996, 0x0019, 0x000c, 0x0000 },
+    { 0x3a4c, 0x0037, 0x0016, 0x0000 },
+    { 0x3bb8, 0x0019, 0x000c, 0x0000 },
+    { 0x3ffc, 0x004b, 0x0011, 0x0000 },
+    { 0x4440, 0x0055, 0x0014, 0x0000 },
+    { 0x4718, 0x005a, 0x000c, 0x0000 },
+    { 0x4aa6, 0x003c, 0x000f, 0x0000 },
+    { 0x5056, 0x0046, 0x000a, 0x0000 },
+    { 0x5550, 0x0064, 0x000f, 0x0000 },
+    { 0x60b0, 0x005a, 0x0016, 0x0000 },
+    { 0x64f4, 0x0041, 0x0014, 0x0000 },
+    { 0x6aa4, 0x0069, 0x0014, 0x0000 },
+    { 0x7054, 0x004b, 0x0014, 0x0000 },
+    { 0x71c0, 0x0078, 0x0012, 0x0000 },
+    { 0x7498, 0x003c, 0x0012, 0x0000 },
+    { 0x7ff8, 0x0055, 0x000a, 0x0000 },
+    { 0x8714, 0x0073, 0x000a, 0x0000 },
+    { 0x8880, 0x0064, 0x000f, 0x0000 },
+    { 0x954c, 0x004b, 0x0011, 0x0000 },
+    { 0x98da, 0x003c, 0x000f, 0x0000 },
+    { 0x9dd4, 0x0032, 0x000a, 0x0000 },
+    { 0xa384, 0x0050, 0x000a, 0x0000 },
+    { 0xa43a, 0x006e, 0x000a, 0x0000 },
+    { 0xaaa0, 0x0069, 0x000f, 0x0000 },
+    { 0xae2e, 0x0046, 0x0011, 0x0000 },
+    { 0xb1bc, 0x0041, 0x0014, 0x0000 },
+    { 0xb8d8, 0x0055, 0x000a, 0x0000 },
+    { 0xbc66, 0x003c, 0x000f, 0x0000 },
+    { 0xc710, 0x0064, 0x000a, 0x0000 },
+    { 0xffff, 0x0000, 0x0000, 0x0000 },
+    { 0x0000, 0x0000, 0x0000, 0x0000 },
 };
 
 u8 D_800E6F30[][3] = {
diff --git a/src/data/some_data.h b/src/data/some_data.h
index da56ef091..881393de5 100644
--- a/src/data/some_data.h
+++ b/src/data/some_data.h
@@ -76,14 +76,14 @@ extern SplineDataUnused13 D_800E68E0;
 extern SplineData12 D_800E694C;
 extern SplineData8 D_800E69B0;
 extern SplineData8 D_800E69F4;
-extern StarSpawn D_800E6A38[];
-extern StarSpawn D_800E6AA8[];
-extern StarSpawn D_800E6B00[];
-extern StarSpawn D_800E6B38[];
-extern StarSpawn D_800E6BA8[];
-extern StarSpawn D_800E6C10[];
-extern StarSpawn D_800E6C80[];
-extern StarSpawn D_800E6DE0[];
+extern CloudData gLuigiRacewayClouds[];
+extern CloudData gYoshiValleyMooMooFarmClouds[];
+extern CloudData gKoopaTroopaBeachClouds[];
+extern CloudData gRoyalRacewayClouds[];
+extern CloudData gSherbetLandClouds[];
+extern CloudData gKalimariDesertClouds[];
+extern StarData gToadsTurnpikeRainbowRoadStars[];
+extern StarData gWarioStadiumStars[];
 extern u8 D_800E6F30[][3];
 extern u8 D_800E6F48[][3];