From d57baf0c2231303622ade07a3ea1df2d795fd73c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 19 Jun 2020 10:06:32 -0400 Subject: nutdata.c --- include/constants/items.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/constants') 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 -- cgit v1.2.3 From 6f0dba80ac2ba1b5571d551ceca24c89a332fa14 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 19 Jun 2020 10:44:15 -0400 Subject: Name growth rates in personal.json --- include/constants/pokemon.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'include/constants') diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 5c8c32d4..4a2647d6 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -435,4 +435,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 -- cgit v1.2.3 From 73d7f3cc5eb19168234ef82a18dc0d235e699401 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 19 Jun 2020 10:58:09 -0400 Subject: Define gender ratio as floats in personal.json --- include/constants/pokemon.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/constants') diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 4a2647d6..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, -- cgit v1.2.3