diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2019-04-07 14:19:02 -0700 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-04-07 16:36:15 -0500 |
| commit | 0a16dd0df08213b58a804b0711a7fdeb79377ce6 (patch) | |
| tree | e55162aca184cb88ed0e47e95a35a4b343e2c4ea /include/constants/battle_constants.h | |
| parent | 963d165e06f4428605fca5c1369c9f417e8e7156 (diff) | |
Decompile/port rest of battle_anim plus fix 1 NONMATCHING.
Diffstat (limited to 'include/constants/battle_constants.h')
| -rw-r--r-- | include/constants/battle_constants.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/constants/battle_constants.h b/include/constants/battle_constants.h index 65f44d8aa..3d55bde0b 100644 --- a/include/constants/battle_constants.h +++ b/include/constants/battle_constants.h @@ -241,17 +241,20 @@ #define MAX_TRAINER_ITEMS 4 #define MAX_MON_MOVES 4 +// Battle Weather flags #define WEATHER_RAIN_TEMPORARY (1 << 0) -#define WEATHER_RAIN_DOWNPOUR (1 << 1) +#define WEATHER_RAIN_DOWNPOUR (1 << 1) // unused #define WEATHER_RAIN_PERMANENT (1 << 2) -#define WEATHER_RAIN_ANY ((WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_DOWNPOUR | WEATHER_RAIN_PERMANENT)) +#define WEATHER_RAIN_ANY (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_DOWNPOUR | WEATHER_RAIN_PERMANENT) #define WEATHER_SANDSTORM_TEMPORARY (1 << 3) #define WEATHER_SANDSTORM_PERMANENT (1 << 4) -#define WEATHER_SANDSTORM_ANY ((WEATHER_SANDSTORM_TEMPORARY | WEATHER_SANDSTORM_PERMANENT)) +#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_SUN_ANY (WEATHER_SUN_TEMPORARY | WEATHER_SUN_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 MOVE_TARGET_SELECTED 0x0 #define MOVE_TARGET_DEPENDS 0x1 |