diff options
| author | Swastik Baranwal <swstkbaranwal@gmail.com> | 2019-06-23 18:47:35 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 18:47:35 +0530 |
| commit | 99703c6ab831d34e6859d8a8f53ba8e73dc4d3d9 (patch) | |
| tree | 3a712d3039d152616af58a45a13d82c40a87e58f /include/constants/battle.h | |
| parent | 6d190f861e3559eec922cd760778c0cba6e08397 (diff) | |
| parent | 9ee0c34758a63f8c00724b6fc984b4e96be2f7af (diff) | |
Merge pull request #5 from pret/master
Take files
Diffstat (limited to 'include/constants/battle.h')
| -rw-r--r-- | include/constants/battle.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/constants/battle.h b/include/constants/battle.h index 25544ba3d..074c0d0cd 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -207,12 +207,12 @@ #define WEATHER_SANDSTORM_TEMPORARY (1 << 3) #define WEATHER_SANDSTORM_PERMANENT (1 << 4) #define WEATHER_SANDSTORM_ANY (WEATHER_SANDSTORM_TEMPORARY | WEATHER_SANDSTORM_PERMANENT) -#define WEATHER_SUN_TEMPORARY (1 << 5) -#define WEATHER_SUN_PERMANENT (1 << 6) -#define WEATHER_SUN_ANY (WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT) +#define WEATHER_SUNNY_TEMPORARY (1 << 5) +#define WEATHER_SUNNY_PERMANENT (1 << 6) +#define WEATHER_SUNNY_ANY (WEATHER_SUNNY_TEMPORARY | WEATHER_SUNNY_PERMANENT) #define WEATHER_HAIL (1 << 7) #define WEATHER_HAIL_ANY (WEATHER_HAIL) -#define WEATHER_ANY (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY) +#define WEATHER_ANY (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_SUNNY_ANY | WEATHER_HAIL_ANY) // Move Effects #define MOVE_EFFECT_SLEEP 0x1 |