diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-21 19:49:52 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-21 19:49:52 -0500 |
| commit | 79b322918594737d7dc8405e2ad823335693b9ae (patch) | |
| tree | 4826b774febbed88a50d22116fd896c34447997e /include/constants/weather.h | |
| parent | 5ffd006acfe8ad12e88fa53a93a55b6f59e77779 (diff) | |
| parent | 68a402883f780a61f54c2f0c8740429d0b2b3a81 (diff) | |
Merge branch 'master' into pokemon_storage_system
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 |