diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-06-19 22:27:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-19 22:27:30 +0300 |
| commit | 53ac396de4098e38a6916e0cc86cbd278a960c4c (patch) | |
| tree | dd12868357a74ca72794fc23a1dc90beaba4cf5e /include/constants | |
| parent | 41317a2b7625919ebba39c06b5aaf9e3b0800b1d (diff) | |
| parent | 12c17948602bf14535c91c530f214b99863e038e (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/items.h | 2 | ||||
| -rw-r--r-- | include/constants/pokemon.h | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/include/constants/items.h b/include/constants/items.h index 433532a4..a7fcc32f 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -128,7 +128,9 @@ #define ITEM_AIR_MAIL 146 #define ITEM_MOSAIC_MAIL 147 #define ITEM_BRICK_MAIL 148 + #define ITEM_CHERI_BERRY 149 +#define FIRST_BERRY_IDX ITEM_CHERI_BERRY #define ITEM_CHESTO_BERRY 150 #define ITEM_PECHA_BERRY 151 #define ITEM_RAWST_BERRY 152 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 5c8c32d4..1af59830 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -269,9 +269,15 @@ #define MON_DATA_SPECIES_NAME 178 #define MON_RATIO_MALE 0 +#define MON_RATIO_EIGHTH 31 +#define MON_RATIO_QUARTER 63 +#define MON_RATIO_HALF 127 +#define MON_RATIO_THREEQUARTER 191 #define MON_RATIO_FEMALE 254 #define MON_RATIO_UNKNOWN 255 +#define GENDER_RATIO(frac) ( (frac) <= 1 ? (u8)((frac) * 254.75) : 255 ) + enum MonGender { MON_MALE = 0, @@ -435,4 +441,14 @@ typedef enum EvoMethod EVO_ROUTE217, } EvoMethod; +enum GrowthRate +{ + GROWTH_MEDIUM_FAST = 0, + GROWTH_ERRATIC, + GROWTH_FLUCTUATING, + GROWTH_MEDIUM_SLOW, + GROWTH_FAST, + GROWTH_SLOW, +}; + #endif //POKEDIAMOND_CONSTANTS_POKEMON_H |