diff options
| author | huderlem <huderlem@gmail.com> | 2019-02-25 08:03:22 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-25 08:03:22 -0600 |
| commit | b3a7a1278abea55a2b4982c0dfc42d04c7981ba9 (patch) | |
| tree | 6c0949b768afe69803f3675fe919bcce2d8e52f6 /include | |
| parent | 84573f1774a710160af23f28ca436f6166f233c2 (diff) | |
| parent | 1cd5cb09cfb434b2f688a5a6ec13e0a2d430a41a (diff) | |
Merge pull request #577 from Phlosioneer/weather-15
Document the weather state functions
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/weather.h | 2 | ||||
| -rw-r--r-- | include/field_weather.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/constants/weather.h b/include/constants/weather.h index d0a81c34c..d62e07474 100644 --- a/include/constants/weather.h +++ b/include/constants/weather.h @@ -16,7 +16,7 @@ #define WEATHER_DROUGHT 12 #define WEATHER_RAIN_HEAVY 13 #define WEATHER_BUBBLES 14 -#define WEATHER_15 15 +#define WEATHER_ALTERNATING 15 #define WEATHER_ROUTE119_CYCLE 20 #define WEATHER_ROUTE123_CYCLE 21 diff --git a/include/field_weather.h b/include/field_weather.h index 2d73f2b94..76399200d 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -140,9 +140,9 @@ extern const u16 gUnknown_083970E8[]; extern const u8 gWeatherFog1Tiles[]; void StartWeather(void); -void ChangeWeather(u8 weather); -void sub_80AB104(u8 weather); -void sub_80AB130(u8 weather); +void SetNextWeather(u8 weather); +void SetCurrentAndNextWeather(u8 weather); +void SetCurrentAndNextWeatherNoDelay(u8 weather); void sub_80ABC48(s8 gammaIndex); void sub_80ABC7C(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay); void FadeScreen(u8 mode, s8 delay); @@ -162,7 +162,7 @@ bool8 Weather_UpdateBlend(void); void sub_80AC274(u8 a); u8 GetCurrentWeather(void); void SetRainStrengthFromSoundEffect(u16 soundEffect); -void PlayRainSoundEffect(void); +void PlayRainStoppingSoundEffect(void); u8 IsWeatherChangeComplete(void); void SetWeatherScreenFadeOut(void); void sub_80AC3E4(void); @@ -233,6 +233,6 @@ void SetSav1WeatherFromCurrMapHeader(void); void SetWeather(u32 weather); void DoCurrentWeather(void); void UpdateWeatherPerDay(u16 increment); -void sub_80AEE84(void); +void ResumePausedWeather(void); #endif // GUARD_WEATHER_H |