diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-20 13:49:35 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-20 13:49:35 -0400 |
| commit | 64d781111c3d148505c4ee62faf31c209c9690cd (patch) | |
| tree | 32e355b57440403b198eef326e62367bbf7aac5d /include | |
| parent | cdfeb638f40ffa0e3f5d437f7b1613f8313896ab (diff) | |
Document drought weather effect
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_weather.h | 22 | ||||
| -rw-r--r-- | include/graphics.h | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/field_weather.h b/include/field_weather.h index 4b9dc7695..c8921c1fe 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 fade_in_active; + u8 fade_in_counter; 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; @@ -123,7 +123,7 @@ 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); diff --git a/include/graphics.h b/include/graphics.h index 64ae039f8..81b6b4ddf 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4330,7 +4330,7 @@ extern const u32 gSubstituteDollPal[]; // ice extern const u8 gWeatherFogHorizontalTiles[]; extern const u32 gBattleAnimFogTilemap[]; -extern const u16 gUnknown_83C2CE0[]; +extern const u16 gDefaultWeatherSpritePalette[]; // party_menu extern const u32 gPartyMenuPokeball_Gfx[]; |