1 files changed, 13 insertions, 18 deletions
diff --git a/include/field_weather.h b/include/field_weather.h
index 3dc17b072..432c8c100 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -31,11 +31,11 @@ struct Weather
     u8 gammaStepDelay;
     u8 gammaStepFrameCounter;
     u16 fadeDestColor;
-    /*0x6C6*/ u8 palProcessingState;
-    /*0x6C7*/ u8 fadeScreenCounter;
-    /*0x6C8*/ bool8 readyForInit;
-    /*0x6C9*/ u8 taskId;
-    /*0x6CA*/ u8 unknown_6CA;
+    u8 palProcessingState;
+    u8 fadeScreenCounter;
+    bool8 readyForInit;
+    u8 taskId;
+    u8 unknown_6CA;
     u8 unknown_6CB;
     u16 initStep;
     u16 finishStep;
@@ -52,8 +52,7 @@ struct Weather
     u8 rainSpriteVisibleDelay;
     u8 isDownpour;
     u8 rainStrength;
-    /*0x6DE*/ u8 cloudSpritesCreated;
-    u8 filler_6DF[1];
+    bool8 cloudSpritesCreated;
     u16 snowflakeVisibleCounter;
     u16 unknown_6E2;
     u8 snowflakeSpriteCount;
@@ -63,17 +62,16 @@ struct Weather
     u8 unknown_6EA;
     u8 unknown_6EB;
     u8 unknown_6EC;
-    u8 thunderTriggered;
+    bool8 thunderTriggered;
     u16 fogHScrollPosX;
     u16 fogHScrollCounter;
     u16 fogHScrollOffset;
     u8 lightenedFogSpritePals[6];
     u8 lightenedFogSpritePalsCount;
-    u8 fogHSpritesCreated;
+    bool8 fogHSpritesCreated;
     u16 ashBaseSpritesX;
     u16 unknown_6FE;
-    u8 ashSpritesCreated;
-    u8 filler_701[3];
+    bool8 ashSpritesCreated;
     u32 sandstormXOffset;
     u32 sandstormYOffset;
     u8 filler_70C[2];
@@ -81,22 +79,20 @@ struct Weather
     u16 sandstormPosY;
     u16 sandstormWaveIndex;
     u16 sandstormWaveCounter;
-    u8 sandstormSpritesCreated;
-    u8 sandstormSwirlSpritesCreated;
+    bool8 sandstormSpritesCreated;
+    bool8 sandstormSwirlSpritesCreated;
     u16 fogDBaseSpritesX;
     u16 fogDPosY;
     u16 fogDScrollXCounter;
     u16 fogDScrollYCounter;
     u16 fogDXOffset;
     u16 fogDYOffset;
-    u8 fogDSpritesCreated;
-    u8 filler_725[1];
+    bool8 fogDSpritesCreated;
     u16 bubblesDelayCounter;
     u16 bubblesDelayIndex;
     u16 bubblesCoordsIndex;
     u16 bubblesSpriteCount;
-    u8 bubblesSpritesCreated;
-    u8 filler_72F;
+    bool8 bubblesSpritesCreated;
     u16 currBlendEVA;
     u16 currBlendEVB;
     u16 targetBlendEVA;
@@ -104,7 +100,6 @@ struct Weather
     u8 blendUpdateCounter;
     u8 blendFrameCounter;
     u8 blendDelay;
-    u8 filler_73B[0x3C-0x3B];
     s16 unknown_73C;
     s16 unknown_73E;
     s16 unknown_740;