diff options
author | Evan <eroelke@gmail.com> | 2019-11-21 09:31:40 -0700 |
---|---|---|
committer | Evan <eroelke@gmail.com> | 2019-11-21 09:31:40 -0700 |
commit | 407d22af8e685076bc92f837266786dfe78e7123 (patch) | |
tree | 11a039ad7737c105d4b81ae653ba899d342b6e57 /include/constants | |
parent | e6bc189a033bb2019233dc99f2c1114053c7650d (diff) | |
parent | 1234d0252cbe2b0001784b10b75f0d339824632d (diff) |
fix PR merge conflicts
Diffstat (limited to 'include/constants')
-rw-r--r-- | include/constants/pokemon.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 6942fee83..a2ad90776 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -83,4 +83,8 @@ // Shiny odds #define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536 +// Learning moves +#define MON_ALREADY_KNOWS_MOVE 0xFFFE +#define MON_HAS_MAX_MOVES 0xFFFF + #endif // GUARD_CONSTANTS_POKEMON_H |