diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_weather.h | 14 | ||||
| -rw-r--r-- | include/global.h | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/include/field_weather.h b/include/field_weather.h index a48361b8a..d4bc85afd 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -4,7 +4,8 @@ #include "sprite.h" // Controls how the weather should be changing the screen palettes. -enum { +enum +{ WEATHER_PAL_STATE_CHANGING_WEATHER, WEATHER_PAL_STATE_SCREEN_FADING_IN, WEATHER_PAL_STATE_SCREEN_FADING_OUT, @@ -38,11 +39,11 @@ struct Weather u8 gammaStepDelay; u8 gammaStepFrameCounter; u16 fadeDestColor; - u8 palProcessingState; - u8 fadeScreenCounter; - bool8 readyForInit; - u8 taskId; - u8 unknown_6CA; + /*0x6C6*/ u8 palProcessingState; + /*0x6C7*/ u8 fadeScreenCounter; + /*0x6C8*/ bool8 readyForInit; + /*0x6C9*/ u8 taskId; + /*0x6CA*/ u8 unknown_6CA; u8 unknown_6CB; u16 initStep; u16 finishStep; @@ -168,6 +169,7 @@ void ResetDroughtWeatherPaletteLoading(void); bool8 LoadDroughtWeatherPalettes(void); u8 GetCurrentWeather(void); void LoadCustomWeatherSpritePalette(const u16 *palette); +void SetWeatherScreenFadeOut(void); extern struct Weather gWeather; diff --git a/include/global.h b/include/global.h index cc8df049f..83eb93eec 100644 --- a/include/global.h +++ b/include/global.h @@ -881,7 +881,7 @@ struct SaveBlock1 /*0x24*/ struct WarpData warp4; /*0x2C*/ u16 savedMusic; /*0x2E*/ u8 weather; - /*0x2F*/ u8 filler_2F; + /*0x2F*/ u8 weatherCycleStage; /*0x30*/ u8 flashLevel; /*0x32*/ u16 mapLayoutId; /*0x34*/ u16 mapView[0x100]; |