diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-05-19 12:10:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-19 12:10:26 -0400 |
| commit | 4661be783654c654ba66c5e5fafa1aa18e7b9213 (patch) | |
| tree | 414b3654d06ebe8431c1334874a336a0c1a6d354 /include/constants/battle.h | |
| parent | 6c2d5ea50d8b2505f7eccc4283bfc32961adfb92 (diff) | |
| parent | 333d2f37a811c05672f785a13af47708ccc08613 (diff) | |
Merge pull request #57 from SatoMew/master
Add weather labels and missing constants
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 |