diff options
author | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
---|---|---|
committer | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
commit | b18ec47b1393d562655e50d30acb3de191423581 (patch) | |
tree | 7959a1477120baf656599794b423aa8cc11ea0c0 /include/constants/pokemon.h | |
parent | 359d345913d7f5ed36c34ede5476fff946318ffd (diff) | |
parent | 2d284654440cb77365639bf107c31b44326362e3 (diff) |
fix conflicts
Diffstat (limited to 'include/constants/pokemon.h')
-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 |