summaryrefslogtreecommitdiff
path: root/include/field_weather.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/field_weather.h')
-rw-r--r--include/field_weather.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/include/field_weather.h b/include/field_weather.h
index 195b35318..334bc0863 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -35,8 +35,8 @@ struct Weather
u8 fadeScreenCounter;
bool8 readyForInit;
u8 taskId;
- u8 unknown_6CA;
- u8 unknown_6CB;
+ u8 fadeInActive;
+ u8 fadeInCounter;
u16 initStep;
u16 finishStep;
u8 currWeather;
@@ -100,10 +100,10 @@ struct Weather
u8 blendUpdateCounter;
u8 blendFrameCounter;
u8 blendDelay;
- s16 unknown_73C;
- s16 unknown_73E;
- s16 unknown_740;
- s16 unknown_742;
+ s16 droughtBrightnessStage;
+ s16 droughtLastBrightnessStage;
+ s16 droughtTimer;
+ s16 droughtState;
u8 filler_744[0xD-4];
s8 loadDroughtPalsIndex;
u8 loadDroughtPalsOffset;
@@ -119,11 +119,11 @@ void sub_80AEDBC(void);
void DoCurrentWeather(void);
void SetSav1WeatherFromCurrMapHeader(void);
-void sub_807B0C4(u16 *, u16 *, u32);
+void SlightlyDarkenPalsInWeather(u16 *, u16 *, u32);
void PlayRainStoppingSoundEffect(void);
bool8 IsWeatherNotFadingIn(void);
void SetWeatherScreenFadeOut(void);
-void sub_807B070(void);
+void WeatherProcessingIdle(void);
u8 GetCurrentWeather(void);
void delay(u8, u8, u32);
void UpdateSpritePaletteWithWeather(u8 palIdx);
@@ -138,11 +138,11 @@ bool8 Weather_UpdateBlend(void);
void LoadCustomWeatherSpritePalette(const u16 *palette);
void ResetDroughtWeatherPaletteLoading(void);
bool8 LoadDroughtWeatherPalettes(void);
-void sub_807AC60(void);
-void sub_807AC98(void);
+void DroughtStateInit(void);
+void DroughtStateRun(void);
void SetRainStrengthFromSoundEffect(u16 soundEffect);
-void sub_807A790(s8 gammaIndex);
-void sub_807A7C4(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay);
+void WeatherShiftGammaIfPalStateIdle(s8 gammaIndex);
+void WeatherBeginGammaFade(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay);
void ApplyWeatherGammaShiftToPal(u8 paletteIndex);
void StartWeather(void);
void ResumePausedWeather(void);