dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1939 from Bassoonian/noeggsdiscovered

Browse Source 
Rename Undiscovered to No Eggs Discovered
This commit is contained in:
GriffinR
2023-11-07 12:20:07 -05:00
committed by GitHub
parent 973f797d95 cd9ef3a566
commit 92e7963eff
3 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/pokemon.h
+17 -17
View File
@@ -24,24 +24,24 @@
#define NUMBER_OF_MON_TYPES 18 #define NUMBER_OF_MON_TYPES 18
// Pokemon egg groups // Pokemon egg groups
#define EGG_GROUP_NONE 0 #define EGG_GROUP_NONE 0
#define EGG_GROUP_MONSTER 1 #define EGG_GROUP_MONSTER 1
#define EGG_GROUP_WATER_1 2 #define EGG_GROUP_WATER_1 2
#define EGG_GROUP_BUG 3 #define EGG_GROUP_BUG 3
#define EGG_GROUP_FLYING 4 #define EGG_GROUP_FLYING 4
#define EGG_GROUP_FIELD 5 #define EGG_GROUP_FIELD 5
#define EGG_GROUP_FAIRY 6 #define EGG_GROUP_FAIRY 6
#define EGG_GROUP_GRASS 7 #define EGG_GROUP_GRASS 7
#define EGG_GROUP_HUMAN_LIKE 8 #define EGG_GROUP_HUMAN_LIKE 8
#define EGG_GROUP_WATER_3 9 #define EGG_GROUP_WATER_3 9
#define EGG_GROUP_MINERAL 10 #define EGG_GROUP_MINERAL 10
#define EGG_GROUP_AMORPHOUS 11 #define EGG_GROUP_AMORPHOUS 11
#define EGG_GROUP_WATER_2 12 #define EGG_GROUP_WATER_2 12
#define EGG_GROUP_DITTO 13 #define EGG_GROUP_DITTO 13
#define EGG_GROUP_DRAGON 14 #define EGG_GROUP_DRAGON 14
#define EGG_GROUP_UNDISCOVERED 15 #define EGG_GROUP_NO_EGGS_DISCOVERED 15
#define EGG_GROUPS_PER_MON 2 #define EGG_GROUPS_PER_MON 2
// Pokemon natures // Pokemon natures
#define NATURE_HARDY 0 #define NATURE_HARDY 0
src/data/pokemon/species_info.h
+62 -62
View File
@@ -2,34 +2,34 @@
// 255 (MON_GENDERLESS) is reserved for genderless Pokémon. // 255 (MON_GENDERLESS) is reserved for genderless Pokémon.
#define PERCENT_FEMALE(percent) min(254, ((percent * 255) / 100)) #define PERCENT_FEMALE(percent) min(254, ((percent * 255) / 100))
#define OLD_UNOWN_SPECIES_INFO \ #define OLD_UNOWN_SPECIES_INFO \
{ \ { \
.baseHP = 50, \ .baseHP = 50, \
.baseAttack = 150, \ .baseAttack = 150, \
.baseDefense = 50, \ .baseDefense = 50, \
.baseSpeed = 150, \ .baseSpeed = 150, \
.baseSpAttack = 150, \ .baseSpAttack = 150, \
.baseSpDefense = 50, \ .baseSpDefense = 50, \
.types = { TYPE_NORMAL, TYPE_NORMAL}, \ .types = { TYPE_NORMAL, TYPE_NORMAL}, \
.catchRate = 3, \ .catchRate = 3, \
.expYield = 1, \ .expYield = 1, \
.evYield_HP = 2, \ .evYield_HP = 2, \
.evYield_Attack = 2, \ .evYield_Attack = 2, \
.evYield_Defense = 2, \ .evYield_Defense = 2, \
.evYield_Speed = 2, \ .evYield_Speed = 2, \
.evYield_SpAttack = 2, \ .evYield_SpAttack = 2, \
.evYield_SpDefense = 2, \ .evYield_SpDefense = 2, \
.itemCommon = ITEM_NONE, \ .itemCommon = ITEM_NONE, \
.itemRare = ITEM_NONE, \ .itemRare = ITEM_NONE, \
.genderRatio = MON_GENDERLESS, \ .genderRatio = MON_GENDERLESS, \
.eggCycles = 120, \ .eggCycles = 120, \
.friendship = 0, \ .friendship = 0, \
.growthRate = GROWTH_MEDIUM_FAST, \ .growthRate = GROWTH_MEDIUM_FAST, \
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED, }, \ .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED, }, \
.abilities = {ABILITY_NONE, ABILITY_NONE}, \ .abilities = {ABILITY_NONE, ABILITY_NONE}, \
.safariZoneFleeRate = 0, \ .safariZoneFleeRate = 0, \
.bodyColor = BODY_COLOR_BLACK, \ .bodyColor = BODY_COLOR_BLACK, \
.noFlip = FALSE, \ .noFlip = FALSE, \
} }
const struct SpeciesInfo gSpeciesInfo[] = const struct SpeciesInfo gSpeciesInfo[] =
@@ -929,7 +929,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 20, .eggCycles = 20,
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_SLOW, .growthRate = GROWTH_MEDIUM_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_POISON_POINT, ABILITY_NONE}, .abilities = {ABILITY_POISON_POINT, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_BLUE, .bodyColor = BODY_COLOR_BLUE,
@@ -959,7 +959,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 20, .eggCycles = 20,
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_SLOW, .growthRate = GROWTH_MEDIUM_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_POISON_POINT, ABILITY_NONE}, .abilities = {ABILITY_POISON_POINT, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_BLUE, .bodyColor = BODY_COLOR_BLUE,
@@ -4349,7 +4349,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 80, .eggCycles = 80,
.friendship = 35, .friendship = 35,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_PRESSURE, ABILITY_NONE}, .abilities = {ABILITY_PRESSURE, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_BLUE, .bodyColor = BODY_COLOR_BLUE,
@@ -4379,7 +4379,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 80, .eggCycles = 80,
.friendship = 35, .friendship = 35,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_PRESSURE, ABILITY_NONE}, .abilities = {ABILITY_PRESSURE, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_YELLOW, .bodyColor = BODY_COLOR_YELLOW,
@@ -4409,7 +4409,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 80, .eggCycles = 80,
.friendship = 35, .friendship = 35,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_PRESSURE, ABILITY_NONE}, .abilities = {ABILITY_PRESSURE, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_YELLOW, .bodyColor = BODY_COLOR_YELLOW,
@@ -4529,7 +4529,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 120, .eggCycles = 120,
.friendship = 0, .friendship = 0,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_PRESSURE, ABILITY_NONE}, .abilities = {ABILITY_PRESSURE, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_PURPLE, .bodyColor = BODY_COLOR_PURPLE,
@@ -4559,7 +4559,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 120, .eggCycles = 120,
.friendship = 100, .friendship = 100,
.growthRate = GROWTH_MEDIUM_SLOW, .growthRate = GROWTH_MEDIUM_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_SYNCHRONIZE, ABILITY_NONE}, .abilities = {ABILITY_SYNCHRONIZE, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_PINK, .bodyColor = BODY_COLOR_PINK,
@@ -5189,7 +5189,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 10, .eggCycles = 10,
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_FAST, .growthRate = GROWTH_MEDIUM_FAST,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_STATIC, ABILITY_NONE}, .abilities = {ABILITY_STATIC, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_YELLOW, .bodyColor = BODY_COLOR_YELLOW,
@@ -5219,7 +5219,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 10, .eggCycles = 10,
.friendship = 140, .friendship = 140,
.growthRate = GROWTH_FAST, .growthRate = GROWTH_FAST,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_CUTE_CHARM, ABILITY_NONE}, .abilities = {ABILITY_CUTE_CHARM, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_PINK, .bodyColor = BODY_COLOR_PINK,
@@ -5249,7 +5249,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 10, .eggCycles = 10,
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_FAST, .growthRate = GROWTH_FAST,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_CUTE_CHARM, ABILITY_NONE}, .abilities = {ABILITY_CUTE_CHARM, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_PINK, .bodyColor = BODY_COLOR_PINK,
@@ -5279,7 +5279,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 10, .eggCycles = 10,
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_FAST, .growthRate = GROWTH_FAST,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_HUSTLE, ABILITY_SERENE_GRACE}, .abilities = {ABILITY_HUSTLE, ABILITY_SERENE_GRACE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
@@ -6059,7 +6059,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 40, .eggCycles = 40,
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_FAST, .growthRate = GROWTH_MEDIUM_FAST,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .abilities = {ABILITY_LEVITATE, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_BLACK, .bodyColor = BODY_COLOR_BLACK,
@@ -7109,7 +7109,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 25, .eggCycles = 25,
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_FAST, .growthRate = GROWTH_MEDIUM_FAST,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_GUTS, ABILITY_NONE}, .abilities = {ABILITY_GUTS, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_PURPLE, .bodyColor = BODY_COLOR_PURPLE,
@@ -7169,7 +7169,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 25, .eggCycles = 25,
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_FAST, .growthRate = GROWTH_MEDIUM_FAST,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_OBLIVIOUS, ABILITY_NONE}, .abilities = {ABILITY_OBLIVIOUS, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_PINK, .bodyColor = BODY_COLOR_PINK,
@@ -7199,7 +7199,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 25, .eggCycles = 25,
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_FAST, .growthRate = GROWTH_MEDIUM_FAST,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_STATIC, ABILITY_NONE}, .abilities = {ABILITY_STATIC, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_YELLOW, .bodyColor = BODY_COLOR_YELLOW,
@@ -7229,7 +7229,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 25, .eggCycles = 25,
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_FAST, .growthRate = GROWTH_MEDIUM_FAST,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_FLAME_BODY, ABILITY_NONE}, .abilities = {ABILITY_FLAME_BODY, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_RED, .bodyColor = BODY_COLOR_RED,
@@ -7319,7 +7319,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 80, .eggCycles = 80,
.friendship = 35, .friendship = 35,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_PRESSURE, ABILITY_NONE}, .abilities = {ABILITY_PRESSURE, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_YELLOW, .bodyColor = BODY_COLOR_YELLOW,
@@ -7349,7 +7349,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 80, .eggCycles = 80,
.friendship = 35, .friendship = 35,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_PRESSURE, ABILITY_NONE}, .abilities = {ABILITY_PRESSURE, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
@@ -7379,7 +7379,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 80, .eggCycles = 80,
.friendship = 35, .friendship = 35,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_PRESSURE, ABILITY_NONE}, .abilities = {ABILITY_PRESSURE, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_BLUE, .bodyColor = BODY_COLOR_BLUE,
@@ -7499,7 +7499,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 120, .eggCycles = 120,
.friendship = 0, .friendship = 0,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_PRESSURE, ABILITY_NONE}, .abilities = {ABILITY_PRESSURE, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
@@ -7529,7 +7529,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 120, .eggCycles = 120,
.friendship = 0, .friendship = 0,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_PRESSURE, ABILITY_NONE}, .abilities = {ABILITY_PRESSURE, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_RED, .bodyColor = BODY_COLOR_RED,
@@ -7559,7 +7559,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 120, .eggCycles = 120,
.friendship = 100, .friendship = 100,
.growthRate = GROWTH_MEDIUM_SLOW, .growthRate = GROWTH_MEDIUM_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_NATURAL_CURE, ABILITY_NONE}, .abilities = {ABILITY_NATURAL_CURE, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_GREEN, .bodyColor = BODY_COLOR_GREEN,
@@ -9829,7 +9829,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 10, .eggCycles = 10,
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_FAST, .growthRate = GROWTH_FAST,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_THICK_FAT, ABILITY_HUGE_POWER}, .abilities = {ABILITY_THICK_FAT, ABILITY_HUGE_POWER},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_BLUE, .bodyColor = BODY_COLOR_BLUE,
@@ -10129,7 +10129,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 20, .eggCycles = 20,
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_FAST, .growthRate = GROWTH_MEDIUM_FAST,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_SHADOW_TAG, ABILITY_NONE}, .abilities = {ABILITY_SHADOW_TAG, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_BLUE, .bodyColor = BODY_COLOR_BLUE,
@@ -11359,7 +11359,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 80, .eggCycles = 80,
.friendship = 35, .friendship = 35,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_CLEAR_BODY, ABILITY_NONE}, .abilities = {ABILITY_CLEAR_BODY, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
@@ -11389,7 +11389,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 80, .eggCycles = 80,
.friendship = 35, .friendship = 35,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_CLEAR_BODY, ABILITY_NONE}, .abilities = {ABILITY_CLEAR_BODY, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_BLUE, .bodyColor = BODY_COLOR_BLUE,
@@ -11419,7 +11419,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 80, .eggCycles = 80,
.friendship = 35, .friendship = 35,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_CLEAR_BODY, ABILITY_NONE}, .abilities = {ABILITY_CLEAR_BODY, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_GRAY, .bodyColor = BODY_COLOR_GRAY,
@@ -11449,7 +11449,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 120, .eggCycles = 120,
.friendship = 0, .friendship = 0,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_DRIZZLE, ABILITY_NONE}, .abilities = {ABILITY_DRIZZLE, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_BLUE, .bodyColor = BODY_COLOR_BLUE,
@@ -11479,7 +11479,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 120, .eggCycles = 120,
.friendship = 0, .friendship = 0,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_DROUGHT, ABILITY_NONE}, .abilities = {ABILITY_DROUGHT, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_RED, .bodyColor = BODY_COLOR_RED,
@@ -11509,7 +11509,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 120, .eggCycles = 120,
.friendship = 0, .friendship = 0,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_AIR_LOCK, ABILITY_NONE}, .abilities = {ABILITY_AIR_LOCK, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_GREEN, .bodyColor = BODY_COLOR_GREEN,
@@ -11539,7 +11539,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 120, .eggCycles = 120,
.friendship = 90, .friendship = 90,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .abilities = {ABILITY_LEVITATE, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_RED, .bodyColor = BODY_COLOR_RED,
@@ -11569,7 +11569,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 120, .eggCycles = 120,
.friendship = 90, .friendship = 90,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_LEVITATE, ABILITY_NONE}, .abilities = {ABILITY_LEVITATE, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_BLUE, .bodyColor = BODY_COLOR_BLUE,
@@ -11599,7 +11599,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 120, .eggCycles = 120,
.friendship = 100, .friendship = 100,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_SERENE_GRACE, ABILITY_NONE}, .abilities = {ABILITY_SERENE_GRACE, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_YELLOW, .bodyColor = BODY_COLOR_YELLOW,
@@ -11629,7 +11629,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggCycles = 120, .eggCycles = 120,
.friendship = 0, .friendship = 0,
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED }, .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = {ABILITY_PRESSURE, ABILITY_NONE}, .abilities = {ABILITY_PRESSURE, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_RED, .bodyColor = BODY_COLOR_RED,
src/daycare.c
+1 -1
View File
@@ -1033,7 +1033,7 @@ static u8 GetDaycareCompatibilityScore(struct DayCare *daycare)
} }
// check unbreedable egg group // check unbreedable egg group
if (eggGroups[0][0] == EGG_GROUP_UNDISCOVERED || eggGroups[1][0] == EGG_GROUP_UNDISCOVERED) if (eggGroups[0][0] == EGG_GROUP_NO_EGGS_DISCOVERED || eggGroups[1][0] == EGG_GROUP_NO_EGGS_DISCOVERED)
return PARENTS_INCOMPATIBLE; return PARENTS_INCOMPATIBLE;
// two Ditto can't breed // two Ditto can't breed
if (eggGroups[0][0] == EGG_GROUP_DITTO && eggGroups[1][0] == EGG_GROUP_DITTO) if (eggGroups[0][0] == EGG_GROUP_DITTO && eggGroups[1][0] == EGG_GROUP_DITTO)