1 files changed, 31 insertions, 28 deletions

diff --git a/include/field_weather.h b/include/field_weather.h
index 7a4864075..3a84a8a73 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -3,10 +3,13 @@
 
 #include "sprite.h"
 
-#define MAX_RAIN_SPRITES  24
-#define NUM_CLOUD_SPRITES  3
-#define NUM_FOG_SPRITES   20
-#define NUM_ASH_SPRITES   20
+#define MAX_RAIN_SPRITES      24
+#define NUM_CLOUD_SPRITES      3
+#define NUM_FOG1_SPRITES      20
+#define NUM_ASH_SPRITES       20
+#define NUM_FOG2_SPRITES      20
+#define NUM_SANDSTORM_SPRITES 20
+#define NUM_SWIRL_SANDSTORM_SPRITES 5
 
 // Controls how the weather should be changing the screen palettes.
 enum
@@ -39,11 +42,11 @@ struct Weather
         struct
         {
             u8 filler0[0xA0];
-            struct Sprite *fog1Sprites[NUM_FOG_SPRITES];
+            struct Sprite *fog1Sprites[NUM_FOG1_SPRITES];
             struct Sprite *ashSprites[NUM_ASH_SPRITES];
-            struct Sprite *fog2Sprites[20];
-            struct Sprite *sandstormSprites1[20];
-            struct Sprite *sandstormSprites2[5];
+            struct Sprite *fog2Sprites[NUM_FOG2_SPRITES];
+            struct Sprite *sandstormSprites1[NUM_SANDSTORM_SPRITES];
+            struct Sprite *sandstormSprites2[NUM_SWIRL_SANDSTORM_SPRITES];
         } s2;
     } sprites;
     u8 gammaShifts[19][32];
@@ -92,32 +95,32 @@ struct Weather
     u8 lightenedFogSpritePals[6];
     u8 lightenedFogSpritePalsCount;
     u8 fog1SpritesCreated;
-    u16 baseAshSpritesX;
+    u16 ashBaseSpritesX;
     u16 unknown_6FE;
     u8 ashSpritesCreated;
     u8 filler_701[3];
-    u32 unknown_704;
-    u32 unknown_708;
+    u32 sandstormXOffset;
+    u32 sandstormYOffset;
     u8 filler_70C[2];
-    u16 unknown_70E;
-    u16 unknown_710;
-    u16 unknown_712;
-    u16 unknown_714;
-    u8 sandstormSprites1Created;
-    u8 sandstormSprites2Created;
-    u16 unknown_718;
-    u16 unknown_71A;
-    u16 unknown_71C;
-    u16 unknown_71E;
-    u16 unknown_720;
-    u16 unknown_722;
+    u16 sandstormBaseSpritesX;
+    u16 sandstormPosY;
+    u16 sandstormWaveIndex;
+    u16 sandstormWaveCounter;
+    u8 sandstormSpritesCreated;
+    u8 sandstormSwirlSpritesCreated;
+    u16 fog2BaseSpritesX;
+    u16 fog2PosY;
+    u16 fog2ScrollXCounter;
+    u16 fog2ScrollYCounter;
+    u16 fog2XOffset;
+    u16 fog2YOffset;
     u8 fog2SpritesCreated;
     u8 filler_725[1];
-    u16 unknown_726;
-    u16 unknown_728;
-    u16 unknown_72A;
-    u16 unknown_72C;
-    u8 unknown_72E;
+    u16 bubblesDelayCounter;
+    u16 bubblesDelayIndex;
+    u16 bubblesCoordsIndex;
+    u16 bubblesSpriteCount;
+    u8 bubblesSpritesCreated;
     u8 filler_72F;
     u16 currBlendEVA;
     u16 currBlendEVB;