diff options
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/move.h | 18 | ||||
| -rw-r--r-- | include/constants/weather.h | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/include/constants/move.h b/include/constants/move.h index 15ae1b9..0601969 100644 --- a/include/constants/move.h +++ b/include/constants/move.h @@ -11,6 +11,18 @@ enum MoveFlags MOVE_FLAG_DISABLED = 1 << 5 // Disabled by an effect like Taunt. }; +enum AccuracyType +{ + // Accuracy used for all moves. + ACCURACY_TYPE_GLOBAL, + // Multiplied with the global accuracy for offensive moves (i.e., not status moves). + ACCURACY_TYPE_OFFENSIVE, + // Used by the AI to determine how often to use Spikes. + // Values exist for all other moves, though they seem to be unused. + ACCURACY_TYPE_USE_CHANCE, + NUM_ACCURACY_TYPES +}; + struct MoveData { u8 *namePointer; @@ -22,10 +34,8 @@ struct MoveData // The AI consider certain moves to have different range than they actually do. /* 0xC */ u8 maxPP; /* 0xD */ u8 weight; - /* 0xE */ u8 accuracy[2]; - // Used by the AI to determine how often to use Spikes. - // Values exist for all other moves, though they seem to be unused. - /* 0x10 */ u8 useChance; + // There are multiple accuracy values. These are define with the AccuracyType enum. + /* 0xE */ u8 accuracy[NUM_ACCURACY_TYPES]; /* 0x11 */ u8 hitCount; // Maximum number of times the move will hit. Used for multi-hit moves like Fury Attack. u8 unk12; /* 0x13 */ u8 criticalHitChance; diff --git a/include/constants/weather.h b/include/constants/weather.h index e7225b9..2a8cf42 100644 --- a/include/constants/weather.h +++ b/include/constants/weather.h @@ -4,7 +4,7 @@ #define WEATHER_CLEAR 0 #define WEATHER_SUNNY 1 #define WEATHER_SANDSTORM 2 -#define WEATHER_CLOUDY` 3 +#define WEATHER_CLOUDY 3 #define WEATHER_RAIN 4 #define WEATHER_HAIL 5 #define WEATHER_FOG 6 |