diff options
| author | Cameron Hall <cameronghall@cox.net> | 2018-01-21 13:53:32 -0600 |
|---|---|---|
| committer | Cameron Hall <cameronghall@cox.net> | 2018-01-21 13:53:32 -0600 |
| commit | 11a9371349e1743a18dce28cc60b69dd6a29b665 (patch) | |
| tree | e696d1fda7556af8b5234eae833ea2fd146fc75d /include/constants/weather.h | |
| parent | 7383117626ebb2b3d993e5ad8855da5752c9cce8 (diff) | |
| parent | 68a402883f780a61f54c2f0c8740429d0b2b3a81 (diff) | |
resolve merge conflicts and make it compile
Diffstat (limited to 'include/constants/weather.h')
| -rw-r--r-- | include/constants/weather.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/constants/weather.h b/include/constants/weather.h index 946316984..1110be7a2 100644 --- a/include/constants/weather.h +++ b/include/constants/weather.h @@ -12,7 +12,7 @@ #define WEATHER_SANDSTORM 8 #define WEATHER_FOG_2 9 #define WEATHER_FOG_3 10 -#define WEATHER_DARK 11 +#define WEATHER_SHADE 11 #define WEATHER_DROUGHT 12 #define WEATHER_RAIN_HEAVY 13 #define WEATHER_BUBBLES 14 @@ -31,7 +31,7 @@ #define COORD_EVENT_WEATHER_FOG_2 7 #define COORD_EVENT_WEATHER_ASH 8 #define COORD_EVENT_WEATHER_SANDSTORM 9 -#define COORD_EVENT_WEATHER_DARK 10 +#define COORD_EVENT_WEATHER_SHADE 10 #define COORD_EVENT_WEATHER_DROUGHT 11 #define COORD_EVENT_WEATHER_ROUTE119_CYCLE 20 #define COORD_EVENT_WEATHER_ROUTE123_CYCLE 21 |