3 files changed, 50 insertions, 27 deletions
diff --git a/include/field_weather.h b/include/field_weather.h
index b4006b3ad..3dc17b072 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -137,5 +137,28 @@ void PreservePaletteInWeather(u8 palIdx);
 
 void SetNextWeather(u8 weather);
 void SetCurrentAndNextWeather(u8 weather);
+void Weather_SetBlendCoeffs(u8 eva, u8 evb);
+void Weather_SetTargetBlendCoeffs(u8 eva, u8 evb, int delay);
+bool8 Weather_UpdateBlend(void);
+void LoadCustomWeatherSpritePalette(const u16 *palette);
+void ResetDroughtWeatherPaletteLoading(void);
+bool8 LoadDroughtWeatherPalettes(void);
+void sub_807AC60(void);
+void sub_807AC98(void);
+void SetRainStrengthFromSoundEffect(u16 soundEffect);
+void sub_807A790(s8 gammaIndex);
+void sub_807A7C4(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay);
+
+extern const u16 gCloudsWeatherPalette[];
+extern const u16 gSandstormWeatherPalette[];
+extern const u8 gWeatherFogDiagonalTiles[];
+extern const u8 gWeatherFogHorizontalTiles[];
+extern const u8 gWeatherCloudTiles[];
+extern const u8 gWeatherSnow1Tiles[];
+extern const u8 gWeatherSnow2Tiles[];
+extern const u8 gWeatherBubbleTiles[];
+extern const u8 gWeatherAshTiles[];
+extern const u8 gWeatherRainTiles[];
+extern const u8 gWeatherSandstormTiles[];
 
 #endif // GUARD_WEATHER_H
diff --git a/include/field_weather_effects.h b/include/field_weather_effects.h
index 11d3314a2..8ff3bae9c 100644
--- a/include/field_weather_effects.h
+++ b/include/field_weather_effects.h
@@ -4,15 +4,15 @@
 bool8 Ash_Finish(void);
 bool8 Bubbles_Finish(void);
 bool8 Clouds_Finish(void);
-bool8 Fog1_Finish(void);
-bool8 Fog2_Finish(void);
-bool8 LightRain_Finish(void);
+bool8 FogHorizontal_Finish(void);
+bool8 FogDiagonal_Finish(void);
 bool8 Rain_Finish(void);
+bool8 Thunderstorm_Finish(void);
 bool8 Sandstorm_Finish(void);
 bool8 Snow_Finish(void);
-bool8 sub_807B434(void);
-bool8 sub_807B6BC(void);
-bool8 sub_807D8D0(void);
+bool8 Sunny_Finish(void);
+bool8 Drought_Finish(void);
+bool8 Shade_Finish(void);
 void Ash_InitAll(void);
 void Ash_InitVars(void);
 void Ash_Main(void);
@@ -25,31 +25,31 @@ void Clouds_Main(void);
 void Drought_InitAll(void);
 void Drought_InitVars(void);
 void Drought_Main(void);
-void Fog1_InitAll(void);
-void Fog1_InitVars(void);
-void Fog1_Main(void);
-void Fog2_InitAll(void);
-void Fog2_InitVars(void);
-void Fog2_Main(void);
-void LightRain_InitAll(void);
-void LightRain_InitVars(void);
-void LightRain_Main(void);
+void FogHorizontal_InitAll(void);
+void FogHorizontal_InitVars(void);
+void FogHorizontal_Main(void);
+void FogDiagonal_InitAll(void);
+void FogDiagonal_InitVars(void);
+void FogDiagonal_Main(void);
+void Rain_InitAll(void);
+void Rain_InitVars(void);
 void Rain_Main(void);
+void Thunderstorm_Main(void);
 void Sandstorm_InitAll(void);
 void Sandstorm_InitVars(void);
 void Sandstorm_Main(void);
 void Snow_InitAll(void);
 void Snow_InitVars(void);
-void Weather11_InitAll(void);
-void Weather11_InitVars(void);
-void Weather2_InitAll(void);
-void Weather2_InitVars(void);
-void nullsub_48(void);
-void nullsub_49(void);
-void snowflakes_progress2(void);
-void sub_807C2E4(void);
-void sub_807C358(void);
-void sub_807C388(void);
-void sub_807C3F4(void);
+void Shade_InitAll(void);
+void Shade_InitVars(void);
+void Sunny_InitAll(void);
+void Sunny_InitVars(void);
+void Sunny_Main(void);
+void Shade_Main(void);
+void Snow_Main(void);
+void Thunderstorm_InitVars(void);
+void Thunderstorm_InitAll(void);
+void Downpour_InitVars(void);
+void Downpour_InitAll(void);
 
 #endif //GUARD_FIELD_WEATHER_EFFECTS_H
diff --git a/include/graphics.h b/include/graphics.h
index 3930861f8..8978719a8 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4322,7 +4322,7 @@ extern const u32 gSubstituteDollTilemap[];
 extern const u32 gSubstituteDollPal[];
 
 // ice
-extern const u8 gWeatherFog1Tiles[];
+extern const u8 gWeatherFogHorizontalTiles[];
 extern const u32 gBattleAnimFogTilemap[];
 extern const u16 gUnknown_83C2CE0[];