diff options
| author | huderlem <huderlem@gmail.com> | 2019-12-17 19:26:04 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-17 19:26:04 -0600 |
| commit | 45eefac5b9d25015671341f5f8888dc602d1a293 (patch) | |
| tree | c2d5f2f056d753bb65dfd36ec3ca7d27419f2c31 /include | |
| parent | edb5df1716beb4ea81ef0493a3fac0a43cc6eae5 (diff) | |
| parent | 4879c1eab27b0a01410d6c56c0a25b8152b166b8 (diff) | |
Merge pull request #934 from GriffinRichards/constants-fade
Use fadescreen constants
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/field_weather.h | 24 | ||||
| -rw-r--r-- | include/field_weather.h | 27 |
2 files changed, 25 insertions, 26 deletions
diff --git a/include/constants/field_weather.h b/include/constants/field_weather.h new file mode 100644 index 000000000..e84dbc48c --- /dev/null +++ b/include/constants/field_weather.h @@ -0,0 +1,24 @@ +#ifndef GUARD_CONSTANTS_FIELD_WEATHER_H +#define GUARD_CONSTANTS_FIELD_WEATHER_H + +#define MAX_RAIN_SPRITES 24 +#define NUM_CLOUD_SPRITES 3 +#define NUM_FOG_HORIZONTAL_SPRITES 20 +#define NUM_ASH_SPRITES 20 +#define NUM_FOG_DIAGONAL_SPRITES 20 +#define NUM_SANDSTORM_SPRITES 20 +#define NUM_SWIRL_SANDSTORM_SPRITES 5 + +// Controls how the weather should be changing the screen palettes. +#define WEATHER_PAL_STATE_CHANGING_WEATHER 0 +#define WEATHER_PAL_STATE_SCREEN_FADING_IN 1 +#define WEATHER_PAL_STATE_SCREEN_FADING_OUT 2 +#define WEATHER_PAL_STATE_IDLE 3 + +// Modes for FadeScreen +#define FADE_FROM_BLACK 0 +#define FADE_TO_BLACK 1 +#define FADE_FROM_WHITE 2 +#define FADE_TO_WHITE 3 + +#endif // GUARD_CONSTANTS_FIELD_WEATHER_H diff --git a/include/field_weather.h b/include/field_weather.h index e587da233..1af320151 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -2,32 +2,7 @@ #define GUARD_WEATHER_H #include "sprite.h" - -#define MAX_RAIN_SPRITES 24 -#define NUM_CLOUD_SPRITES 3 -#define NUM_FOG_HORIZONTAL_SPRITES 20 -#define NUM_ASH_SPRITES 20 -#define NUM_FOG_DIAGONAL_SPRITES 20 -#define NUM_SANDSTORM_SPRITES 20 -#define NUM_SWIRL_SANDSTORM_SPRITES 5 - -// Controls how the weather should be changing the screen palettes. -enum -{ - WEATHER_PAL_STATE_CHANGING_WEATHER, - WEATHER_PAL_STATE_SCREEN_FADING_IN, - WEATHER_PAL_STATE_SCREEN_FADING_OUT, - WEATHER_PAL_STATE_IDLE, -}; - -// For the FadeScreen function. -enum -{ - FADE_FROM_BLACK, - FADE_TO_BLACK, - FADE_FROM_WHITE, - FADE_TO_WHITE, -}; +#include "constants/field_weather.h" struct Weather { |