Egg Move Refactor (#4534)

* Egg Move Refactor

* Update python file and fix formatting
This commit is contained in:
Bassoonian 2024-05-19 13:47:15 +02:00 committed by GitHub
parent 334668be26
commit bc9f09744d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 5617 additions and 4318 deletions

View File

@ -444,6 +444,7 @@ struct SpeciesInfo /*0x8C*/
// Move Data // Move Data
/* 0x80 */ const struct LevelUpMove *levelUpLearnset; /* 0x80 */ const struct LevelUpMove *levelUpLearnset;
/* 0x84 */ const u16 *teachableLearnset; /* 0x84 */ const u16 *teachableLearnset;
const u16 *eggMoveLearnset;
/* 0x88 */ const struct Evolution *evolutions; /* 0x88 */ const struct Evolution *evolutions;
/* 0x84 */ const u16 *formSpeciesIdTable; /* 0x84 */ const u16 *formSpeciesIdTable;
/* 0x84 */ const struct FormChange *formChangeTable; /* 0x84 */ const struct FormChange *formChangeTable;
@ -768,6 +769,7 @@ u16 GetSpeciesHeight(u16 species);
u16 GetSpeciesWeight(u16 species); u16 GetSpeciesWeight(u16 species);
const struct LevelUpMove *GetSpeciesLevelUpLearnset(u16 species); const struct LevelUpMove *GetSpeciesLevelUpLearnset(u16 species);
const u16 *GetSpeciesTeachableLearnset(u16 species); const u16 *GetSpeciesTeachableLearnset(u16 species);
const u16 *GetSpeciesEggMoves(u16 species);
const struct Evolution *GetSpeciesEvolutions(u16 species); const struct Evolution *GetSpeciesEvolutions(u16 species);
const u16 *GetSpeciesFormTable(u16 species); const u16 *GetSpeciesFormTable(u16 species);
const struct FormChange *GetSpeciesFormChanges(u16 species); const struct FormChange *GetSpeciesFormChanges(u16 species);

View File

@ -0,0 +1,51 @@
import re
import glob
eggMoveSpecies = []
exceptions = [ # the following exceptions are hardcoded to streamline the process. you may need to manually check what happens in case you have added forms that work similar to these below
["ShellosWestSea", "Shellos"],
["OricorioBaile", "Oricorio"]
]
# convert egg_moves.h to the new format
with open("src/data/pokemon/egg_moves.h", "r") as f:
data = f.read()
data = re.sub(r"#define(.|\n)*const u16 gEggMoves\[\] = {", "static const u16 sNoneEggMoveLearnset[] = {\n MOVE_UNAVAILABLE,\n};\n", data) # remove and replace header
data = re.sub(r"\n EGG_MOVES_TERMINATOR\n};\n\n", "", data) # remove footer
for mon in re.findall(r"egg_moves\((.*),", data):
monname = re.sub(r"_", " ", mon).title().replace(" ", "")
for x in exceptions:
if monname == x[0]:
monname = x[1]
# add it to the list for later
eggMoveSpecies.append(monname)
# regex the egg_moves.h file
data = re.sub(r" egg_moves\(" + mon + r",", "static const u16 s%sEggMoveLearnset[] = {" % monname, data)
data = re.sub(r"\),\n", ",\n MOVE_UNAVAILABLE,\n};\n", data) # add terminator to each old macro
data = re.sub(r" MOVE_", " MOVE_", data) # fix indentation
with open("src/data/pokemon/egg_moves.h", "w") as f:
f.write(data)
# update gBaseStats
for file in glob.glob('./src/data/pokemon/species_info/gen_*_families.h'):
with open(file, "r") as f:
data = f.read()
# go through all Pokemon with teachable learnsets that are also in the list, then assign egg moves to them
for mon in eggMoveSpecies:
# first do the plain replacements outside of macros
data = re.sub(r"\.teachableLearnset = s" + mon + r"sTeachableLearnset,\n", ".teachableLearnset = s%sTeachableLearnset,\n .eggMoveLearnset = s%sEggMoveLearnset,\n" % (mon, mon), data)
# check for macros (since they require \ at the end of the line and do those manually)
macrocheck = re.findall(r"\.teachableLearnset = s" + mon + r"TeachableLearnset,( *)\\\\", data)
if len(macrocheck) > 0:
data = re.sub(r"\.teachableLearnset = s" + mon + r"TeachableLearnset," + macrocheck[0] + r"\\\\", ".teachableLearnset = s%sTeachableLearnset,%s\\\\\n .eggMoveLearnset = s%sEggMoveLearnset,%s\\\\" % (mon, macrocheck[0], mon, " " * (len(macrocheck[0]) + 4)), data)
with open(file, "w") as f:
f.write(data)

File diff suppressed because it is too large Load Diff

View File

@ -61,6 +61,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.iconPalIndex = 0, .iconPalIndex = 0,
.levelUpLearnset = sNoneLevelUpLearnset, .levelUpLearnset = sNoneLevelUpLearnset,
.teachableLearnset = sNoneTeachableLearnset, .teachableLearnset = sNoneTeachableLearnset,
.eggMoveLearnset = sNoneEggMoveLearnset,
}, },
#include "species_info/gen_1_families.h" #include "species_info/gen_1_families.h"

View File

@ -54,6 +54,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Bulbasaur) FOOTPRINT(Bulbasaur)
.levelUpLearnset = sBulbasaurLevelUpLearnset, .levelUpLearnset = sBulbasaurLevelUpLearnset,
.teachableLearnset = sBulbasaurTeachableLearnset, .teachableLearnset = sBulbasaurTeachableLearnset,
.eggMoveLearnset = sBulbasaurEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_IVYSAUR}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_IVYSAUR}),
}, },
@ -343,6 +344,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Charmander) FOOTPRINT(Charmander)
.levelUpLearnset = sCharmanderLevelUpLearnset, .levelUpLearnset = sCharmanderLevelUpLearnset,
.teachableLearnset = sCharmanderTeachableLearnset, .teachableLearnset = sCharmanderTeachableLearnset,
.eggMoveLearnset = sCharmanderEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_CHARMELEON}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_CHARMELEON}),
}, },
@ -680,6 +682,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Squirtle) FOOTPRINT(Squirtle)
.levelUpLearnset = sSquirtleLevelUpLearnset, .levelUpLearnset = sSquirtleLevelUpLearnset,
.teachableLearnset = sSquirtleTeachableLearnset, .teachableLearnset = sSquirtleTeachableLearnset,
.eggMoveLearnset = sSquirtleEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_WARTORTLE}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_WARTORTLE}),
}, },
@ -1444,6 +1447,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Pidgey) FOOTPRINT(Pidgey)
.levelUpLearnset = sPidgeyLevelUpLearnset, .levelUpLearnset = sPidgeyLevelUpLearnset,
.teachableLearnset = sPidgeyTeachableLearnset, .teachableLearnset = sPidgeyTeachableLearnset,
.eggMoveLearnset = sPidgeyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_PIDGEOTTO}), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_PIDGEOTTO}),
}, },
@ -1679,6 +1683,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Rattata) FOOTPRINT(Rattata)
.levelUpLearnset = sRattataLevelUpLearnset, .levelUpLearnset = sRattataLevelUpLearnset,
.teachableLearnset = sRattataTeachableLearnset, .teachableLearnset = sRattataTeachableLearnset,
.eggMoveLearnset = sRattataEggMoveLearnset,
.formSpeciesIdTable = sRattataFormSpeciesIdTable, .formSpeciesIdTable = sRattataFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_RATICATE}), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_RATICATE}),
}, },
@ -1793,6 +1798,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isAlolanForm = TRUE, .isAlolanForm = TRUE,
.levelUpLearnset = sRattataAlolanLevelUpLearnset, .levelUpLearnset = sRattataAlolanLevelUpLearnset,
.teachableLearnset = sRattataAlolanTeachableLearnset, .teachableLearnset = sRattataAlolanTeachableLearnset,
.eggMoveLearnset = sRattataAlolanEggMoveLearnset,
.formSpeciesIdTable = sRattataFormSpeciesIdTable, .formSpeciesIdTable = sRattataFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLAN}, .evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLAN},
{EVO_NONE, 0, SPECIES_RATICATE_ALOLAN_TOTEM}), {EVO_NONE, 0, SPECIES_RATICATE_ALOLAN_TOTEM}),
@ -1955,6 +1961,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Spearow) FOOTPRINT(Spearow)
.levelUpLearnset = sSpearowLevelUpLearnset, .levelUpLearnset = sSpearowLevelUpLearnset,
.teachableLearnset = sSpearowTeachableLearnset, .teachableLearnset = sSpearowTeachableLearnset,
.eggMoveLearnset = sSpearowEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_FEAROW}), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_FEAROW}),
}, },
@ -2066,6 +2073,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Ekans) FOOTPRINT(Ekans)
.levelUpLearnset = sEkansLevelUpLearnset, .levelUpLearnset = sEkansLevelUpLearnset,
.teachableLearnset = sEkansTeachableLearnset, .teachableLearnset = sEkansTeachableLearnset,
.eggMoveLearnset = sEkansEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_ARBOK}), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_ARBOK}),
}, },
@ -2177,6 +2185,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Pichu) FOOTPRINT(Pichu)
.levelUpLearnset = sPichuLevelUpLearnset, .levelUpLearnset = sPichuLevelUpLearnset,
.teachableLearnset = sPichuTeachableLearnset, .teachableLearnset = sPichuTeachableLearnset,
.eggMoveLearnset = sPichuEggMoveLearnset,
.formSpeciesIdTable = sPichuFormSpeciesIdTable, .formSpeciesIdTable = sPichuFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_PIKACHU}), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_PIKACHU}),
}, },
@ -2228,6 +2237,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Pichu) FOOTPRINT(Pichu)
.levelUpLearnset = sPichuLevelUpLearnset, .levelUpLearnset = sPichuLevelUpLearnset,
.teachableLearnset = sPichuTeachableLearnset, .teachableLearnset = sPichuTeachableLearnset,
.eggMoveLearnset = sPichuEggMoveLearnset,
.formSpeciesIdTable = sPichuFormSpeciesIdTable, .formSpeciesIdTable = sPichuFormSpeciesIdTable,
}, },
#endif //P_GEN_2_CROSS_EVOS #endif //P_GEN_2_CROSS_EVOS
@ -3340,6 +3350,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Sandshrew) FOOTPRINT(Sandshrew)
.levelUpLearnset = sSandshrewLevelUpLearnset, .levelUpLearnset = sSandshrewLevelUpLearnset,
.teachableLearnset = sSandshrewTeachableLearnset, .teachableLearnset = sSandshrewTeachableLearnset,
.eggMoveLearnset = sSandshrewEggMoveLearnset,
.formSpeciesIdTable = sSandshrewFormSpeciesIdTable, .formSpeciesIdTable = sSandshrewFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_SANDSLASH}), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_SANDSLASH}),
}, },
@ -3451,6 +3462,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isAlolanForm = TRUE, .isAlolanForm = TRUE,
.levelUpLearnset = sSandshrewAlolanLevelUpLearnset, .levelUpLearnset = sSandshrewAlolanLevelUpLearnset,
.teachableLearnset = sSandshrewAlolanTeachableLearnset, .teachableLearnset = sSandshrewAlolanTeachableLearnset,
.eggMoveLearnset = sSandshrewAlolanEggMoveLearnset,
.formSpeciesIdTable = sSandshrewFormSpeciesIdTable, .formSpeciesIdTable = sSandshrewFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLAN}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLAN}),
}, },
@ -3564,6 +3576,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(NidoranF) FOOTPRINT(NidoranF)
.levelUpLearnset = sNidoranFLevelUpLearnset, .levelUpLearnset = sNidoranFLevelUpLearnset,
.teachableLearnset = sNidoranFTeachableLearnset, .teachableLearnset = sNidoranFTeachableLearnset,
.eggMoveLearnset = sNidoranFEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_NIDORINA}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_NIDORINA}),
}, },
@ -3730,6 +3743,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(NidoranM) FOOTPRINT(NidoranM)
.levelUpLearnset = sNidoranMLevelUpLearnset, .levelUpLearnset = sNidoranMLevelUpLearnset,
.teachableLearnset = sNidoranMTeachableLearnset, .teachableLearnset = sNidoranMTeachableLearnset,
.eggMoveLearnset = sNidoranMEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_NIDORINO}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_NIDORINO}),
}, },
@ -3908,6 +3922,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Cleffa) FOOTPRINT(Cleffa)
.levelUpLearnset = sCleffaLevelUpLearnset, .levelUpLearnset = sCleffaLevelUpLearnset,
.teachableLearnset = sCleffaTeachableLearnset, .teachableLearnset = sCleffaTeachableLearnset,
.eggMoveLearnset = sCleffaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_CLEFAIRY}), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_CLEFAIRY}),
}, },
#endif //P_GEN_2_CROSS_EVOS #endif //P_GEN_2_CROSS_EVOS
@ -4082,6 +4097,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Vulpix) FOOTPRINT(Vulpix)
.levelUpLearnset = sVulpixLevelUpLearnset, .levelUpLearnset = sVulpixLevelUpLearnset,
.teachableLearnset = sVulpixTeachableLearnset, .teachableLearnset = sVulpixTeachableLearnset,
.eggMoveLearnset = sVulpixEggMoveLearnset,
.formSpeciesIdTable = sVulpixFormSpeciesIdTable, .formSpeciesIdTable = sVulpixFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_NINETALES}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_NINETALES}),
}, },
@ -4194,6 +4210,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isAlolanForm = TRUE, .isAlolanForm = TRUE,
.levelUpLearnset = sVulpixAlolanLevelUpLearnset, .levelUpLearnset = sVulpixAlolanLevelUpLearnset,
.teachableLearnset = sVulpixAlolanTeachableLearnset, .teachableLearnset = sVulpixAlolanTeachableLearnset,
.eggMoveLearnset = sVulpixAlolanEggMoveLearnset,
.formSpeciesIdTable = sVulpixFormSpeciesIdTable, .formSpeciesIdTable = sVulpixFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_NINETALES_ALOLAN}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_NINETALES_ALOLAN}),
}, },
@ -4315,6 +4332,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Igglybuff) FOOTPRINT(Igglybuff)
.levelUpLearnset = sIgglybuffLevelUpLearnset, .levelUpLearnset = sIgglybuffLevelUpLearnset,
.teachableLearnset = sIgglybuffTeachableLearnset, .teachableLearnset = sIgglybuffTeachableLearnset,
.eggMoveLearnset = sIgglybuffEggMoveLearnset,
.evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_JIGGLYPUFF}), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_JIGGLYPUFF}),
}, },
#endif //P_GEN_2_CROSS_EVOS #endif //P_GEN_2_CROSS_EVOS
@ -4493,6 +4511,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Zubat) FOOTPRINT(Zubat)
.levelUpLearnset = sZubatLevelUpLearnset, .levelUpLearnset = sZubatLevelUpLearnset,
.teachableLearnset = sZubatTeachableLearnset, .teachableLearnset = sZubatTeachableLearnset,
.eggMoveLearnset = sZubatEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_GOLBAT}), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_GOLBAT}),
}, },
@ -4668,6 +4687,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Oddish) FOOTPRINT(Oddish)
.levelUpLearnset = sOddishLevelUpLearnset, .levelUpLearnset = sOddishLevelUpLearnset,
.teachableLearnset = sOddishTeachableLearnset, .teachableLearnset = sOddishTeachableLearnset,
.eggMoveLearnset = sOddishEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 21, SPECIES_GLOOM}), .evolutions = EVOLUTION({EVO_LEVEL, 21, SPECIES_GLOOM}),
}, },
@ -4913,6 +4933,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Paras) FOOTPRINT(Paras)
.levelUpLearnset = sParasLevelUpLearnset, .levelUpLearnset = sParasLevelUpLearnset,
.teachableLearnset = sParasTeachableLearnset, .teachableLearnset = sParasTeachableLearnset,
.eggMoveLearnset = sParasEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_PARASECT}), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_PARASECT}),
}, },
@ -5025,6 +5046,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Venonat) FOOTPRINT(Venonat)
.levelUpLearnset = sVenonatLevelUpLearnset, .levelUpLearnset = sVenonatLevelUpLearnset,
.teachableLearnset = sVenonatTeachableLearnset, .teachableLearnset = sVenonatTeachableLearnset,
.eggMoveLearnset = sVenonatEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_VENOMOTH}), .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_VENOMOTH}),
}, },
@ -5148,6 +5170,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Diglett) FOOTPRINT(Diglett)
.levelUpLearnset = sDiglettLevelUpLearnset, .levelUpLearnset = sDiglettLevelUpLearnset,
.teachableLearnset = sDiglettTeachableLearnset, .teachableLearnset = sDiglettTeachableLearnset,
.eggMoveLearnset = sDiglettEggMoveLearnset,
.formSpeciesIdTable = sDiglettFormSpeciesIdTable, .formSpeciesIdTable = sDiglettFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_DUGTRIO}), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_DUGTRIO}),
}, },
@ -5260,6 +5283,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isAlolanForm = TRUE, .isAlolanForm = TRUE,
.levelUpLearnset = sDiglettAlolanLevelUpLearnset, .levelUpLearnset = sDiglettAlolanLevelUpLearnset,
.teachableLearnset = sDiglettAlolanTeachableLearnset, .teachableLearnset = sDiglettAlolanTeachableLearnset,
.eggMoveLearnset = sDiglettAlolanEggMoveLearnset,
.formSpeciesIdTable = sDiglettFormSpeciesIdTable, .formSpeciesIdTable = sDiglettFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_DUGTRIO_ALOLAN}), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_DUGTRIO_ALOLAN}),
}, },
@ -5375,6 +5399,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Meowth) FOOTPRINT(Meowth)
.levelUpLearnset = sMeowthLevelUpLearnset, .levelUpLearnset = sMeowthLevelUpLearnset,
.teachableLearnset = sMeowthTeachableLearnset, .teachableLearnset = sMeowthTeachableLearnset,
.eggMoveLearnset = sMeowthEggMoveLearnset,
.formSpeciesIdTable = sMeowthFormSpeciesIdTable, .formSpeciesIdTable = sMeowthFormSpeciesIdTable,
.formChangeTable = sMeowthFormChangeTable, .formChangeTable = sMeowthFormChangeTable,
.evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_PERSIAN}), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_PERSIAN}),
@ -5488,6 +5513,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isAlolanForm = TRUE, .isAlolanForm = TRUE,
.levelUpLearnset = sMeowthAlolanLevelUpLearnset, .levelUpLearnset = sMeowthAlolanLevelUpLearnset,
.teachableLearnset = sMeowthAlolanTeachableLearnset, .teachableLearnset = sMeowthAlolanTeachableLearnset,
.eggMoveLearnset = sMeowthAlolanEggMoveLearnset,
.formSpeciesIdTable = sMeowthFormSpeciesIdTable, .formSpeciesIdTable = sMeowthFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_PERSIAN_ALOLAN}), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_PERSIAN_ALOLAN}),
}, },
@ -5600,6 +5626,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isGalarianForm = TRUE, .isGalarianForm = TRUE,
.levelUpLearnset = sMeowthGalarianLevelUpLearnset, .levelUpLearnset = sMeowthGalarianLevelUpLearnset,
.teachableLearnset = sMeowthGalarianTeachableLearnset, .teachableLearnset = sMeowthGalarianTeachableLearnset,
.eggMoveLearnset = sMeowthGalarianEggMoveLearnset,
.formSpeciesIdTable = sMeowthFormSpeciesIdTable, .formSpeciesIdTable = sMeowthFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_PERRSERKER}), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_PERRSERKER}),
}, },
@ -5709,6 +5736,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isGigantamax = TRUE, .isGigantamax = TRUE,
.levelUpLearnset = sMeowthLevelUpLearnset, .levelUpLearnset = sMeowthLevelUpLearnset,
.teachableLearnset = sMeowthTeachableLearnset, .teachableLearnset = sMeowthTeachableLearnset,
.eggMoveLearnset = sMeowthEggMoveLearnset,
.formSpeciesIdTable = sMeowthFormSpeciesIdTable, .formSpeciesIdTable = sMeowthFormSpeciesIdTable,
.formChangeTable = sMeowthFormChangeTable, .formChangeTable = sMeowthFormChangeTable,
}, },
@ -5766,6 +5794,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Psyduck) FOOTPRINT(Psyduck)
.levelUpLearnset = sPsyduckLevelUpLearnset, .levelUpLearnset = sPsyduckLevelUpLearnset,
.teachableLearnset = sPsyduckTeachableLearnset, .teachableLearnset = sPsyduckTeachableLearnset,
.eggMoveLearnset = sPsyduckEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_GOLDUCK}), .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_GOLDUCK}),
}, },
@ -5874,6 +5903,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Mankey) FOOTPRINT(Mankey)
.levelUpLearnset = sMankeyLevelUpLearnset, .levelUpLearnset = sMankeyLevelUpLearnset,
.teachableLearnset = sMankeyTeachableLearnset, .teachableLearnset = sMankeyTeachableLearnset,
.eggMoveLearnset = sMankeyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_PRIMEAPE}), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_PRIMEAPE}),
}, },
@ -6037,6 +6067,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Growlithe) FOOTPRINT(Growlithe)
.levelUpLearnset = sGrowlitheLevelUpLearnset, .levelUpLearnset = sGrowlitheLevelUpLearnset,
.teachableLearnset = sGrowlitheTeachableLearnset, .teachableLearnset = sGrowlitheTeachableLearnset,
.eggMoveLearnset = sGrowlitheEggMoveLearnset,
.formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE}),
}, },
@ -6259,6 +6290,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Poliwag) FOOTPRINT(Poliwag)
.levelUpLearnset = sPoliwagLevelUpLearnset, .levelUpLearnset = sPoliwagLevelUpLearnset,
.teachableLearnset = sPoliwagTeachableLearnset, .teachableLearnset = sPoliwagTeachableLearnset,
.eggMoveLearnset = sPoliwagEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_POLIWHIRL}), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_POLIWHIRL}),
}, },
@ -6508,6 +6540,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Abra) FOOTPRINT(Abra)
.levelUpLearnset = sAbraLevelUpLearnset, .levelUpLearnset = sAbraLevelUpLearnset,
.teachableLearnset = sAbraTeachableLearnset, .teachableLearnset = sAbraTeachableLearnset,
.eggMoveLearnset = sAbraEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_KADABRA}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_KADABRA}),
}, },
@ -6757,6 +6790,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Machop) FOOTPRINT(Machop)
.levelUpLearnset = sMachopLevelUpLearnset, .levelUpLearnset = sMachopLevelUpLearnset,
.teachableLearnset = sMachopTeachableLearnset, .teachableLearnset = sMachopTeachableLearnset,
.eggMoveLearnset = sMachopEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_MACHOKE}), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_MACHOKE}),
}, },
@ -6989,6 +7023,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Bellsprout) FOOTPRINT(Bellsprout)
.levelUpLearnset = sBellsproutLevelUpLearnset, .levelUpLearnset = sBellsproutLevelUpLearnset,
.teachableLearnset = sBellsproutTeachableLearnset, .teachableLearnset = sBellsproutTeachableLearnset,
.eggMoveLearnset = sBellsproutEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 21, SPECIES_WEEPINBELL}), .evolutions = EVOLUTION({EVO_LEVEL, 21, SPECIES_WEEPINBELL}),
}, },
@ -7159,6 +7194,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Tentacool) FOOTPRINT(Tentacool)
.levelUpLearnset = sTentacoolLevelUpLearnset, .levelUpLearnset = sTentacoolLevelUpLearnset,
.teachableLearnset = sTentacoolTeachableLearnset, .teachableLearnset = sTentacoolTeachableLearnset,
.eggMoveLearnset = sTentacoolEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_TENTACRUEL}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_TENTACRUEL}),
}, },
@ -7290,6 +7326,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Geodude) FOOTPRINT(Geodude)
.levelUpLearnset = sGeodudeLevelUpLearnset, .levelUpLearnset = sGeodudeLevelUpLearnset,
.teachableLearnset = sGeodudeTeachableLearnset, .teachableLearnset = sGeodudeTeachableLearnset,
.eggMoveLearnset = sGeodudeEggMoveLearnset,
.formSpeciesIdTable = sGeodudeFormSpeciesIdTable, .formSpeciesIdTable = sGeodudeFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_GRAVELER}), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_GRAVELER}),
}, },
@ -7458,6 +7495,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isAlolanForm = TRUE, .isAlolanForm = TRUE,
.levelUpLearnset = sGeodudeAlolanLevelUpLearnset, .levelUpLearnset = sGeodudeAlolanLevelUpLearnset,
.teachableLearnset = sGeodudeAlolanTeachableLearnset, .teachableLearnset = sGeodudeAlolanTeachableLearnset,
.eggMoveLearnset = sGeodudeAlolanEggMoveLearnset,
.formSpeciesIdTable = sGeodudeFormSpeciesIdTable, .formSpeciesIdTable = sGeodudeFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_GRAVELER_ALOLAN}), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_GRAVELER_ALOLAN}),
}, },
@ -7628,6 +7666,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Ponyta) FOOTPRINT(Ponyta)
.levelUpLearnset = sPonytaLevelUpLearnset, .levelUpLearnset = sPonytaLevelUpLearnset,
.teachableLearnset = sPonytaTeachableLearnset, .teachableLearnset = sPonytaTeachableLearnset,
.eggMoveLearnset = sPonytaEggMoveLearnset,
.formSpeciesIdTable = sPonytaFormSpeciesIdTable, .formSpeciesIdTable = sPonytaFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_RAPIDASH}), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_RAPIDASH}),
}, },
@ -7737,6 +7776,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isGalarianForm = TRUE, .isGalarianForm = TRUE,
.levelUpLearnset = sPonytaGalarianLevelUpLearnset, .levelUpLearnset = sPonytaGalarianLevelUpLearnset,
.teachableLearnset = sPonytaGalarianTeachableLearnset, .teachableLearnset = sPonytaGalarianTeachableLearnset,
.eggMoveLearnset = sPonytaGalarianEggMoveLearnset,
.formSpeciesIdTable = sPonytaFormSpeciesIdTable, .formSpeciesIdTable = sPonytaFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_RAPIDASH_GALARIAN}), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_RAPIDASH_GALARIAN}),
}, },
@ -7849,6 +7889,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Slowpoke) FOOTPRINT(Slowpoke)
.levelUpLearnset = sSlowpokeLevelUpLearnset, .levelUpLearnset = sSlowpokeLevelUpLearnset,
.teachableLearnset = sSlowpokeTeachableLearnset, .teachableLearnset = sSlowpokeTeachableLearnset,
.eggMoveLearnset = sSlowpokeEggMoveLearnset,
.formSpeciesIdTable = sSlowpokeFormSpeciesIdTable, .formSpeciesIdTable = sSlowpokeFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_SLOWBRO}, .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_SLOWBRO},
{EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING}, {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING},
@ -8076,6 +8117,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isGalarianForm = TRUE, .isGalarianForm = TRUE,
.levelUpLearnset = sSlowpokeGalarianLevelUpLearnset, .levelUpLearnset = sSlowpokeGalarianLevelUpLearnset,
.teachableLearnset = sSlowpokeGalarianTeachableLearnset, .teachableLearnset = sSlowpokeGalarianTeachableLearnset,
.eggMoveLearnset = sSlowpokeGalarianEggMoveLearnset,
.formSpeciesIdTable = sSlowpokeFormSpeciesIdTable, .formSpeciesIdTable = sSlowpokeFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_GALARICA_CUFF, SPECIES_SLOWBRO_GALARIAN}, .evolutions = EVOLUTION({EVO_ITEM, ITEM_GALARICA_CUFF, SPECIES_SLOWBRO_GALARIAN},
{EVO_ITEM, ITEM_GALARICA_WREATH, SPECIES_SLOWKING_GALARIAN}), {EVO_ITEM, ITEM_GALARICA_WREATH, SPECIES_SLOWKING_GALARIAN}),
@ -8431,6 +8473,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Farfetchd) FOOTPRINT(Farfetchd)
.levelUpLearnset = sFarfetchdLevelUpLearnset, .levelUpLearnset = sFarfetchdLevelUpLearnset,
.teachableLearnset = sFarfetchdTeachableLearnset, .teachableLearnset = sFarfetchdTeachableLearnset,
.eggMoveLearnset = sFarfetchdEggMoveLearnset,
.formSpeciesIdTable = sFarfetchdFormSpeciesIdTable, .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable,
}, },
@ -8487,6 +8530,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isGalarianForm = TRUE, .isGalarianForm = TRUE,
.levelUpLearnset = sFarfetchdGalarianLevelUpLearnset, .levelUpLearnset = sFarfetchdGalarianLevelUpLearnset,
.teachableLearnset = sFarfetchdGalarianTeachableLearnset, .teachableLearnset = sFarfetchdGalarianTeachableLearnset,
.eggMoveLearnset = sFarfetchdGalarianEggMoveLearnset,
.formSpeciesIdTable = sFarfetchdFormSpeciesIdTable, .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_CRITICAL_HITS, 3, SPECIES_SIRFETCHD}), .evolutions = EVOLUTION({EVO_CRITICAL_HITS, 3, SPECIES_SIRFETCHD}),
}, },
@ -8602,6 +8646,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Doduo) FOOTPRINT(Doduo)
.levelUpLearnset = sDoduoLevelUpLearnset, .levelUpLearnset = sDoduoLevelUpLearnset,
.teachableLearnset = sDoduoTeachableLearnset, .teachableLearnset = sDoduoTeachableLearnset,
.eggMoveLearnset = sDoduoEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_DODRIO}), .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_DODRIO}),
}, },
@ -8720,6 +8765,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Seel) FOOTPRINT(Seel)
.levelUpLearnset = sSeelLevelUpLearnset, .levelUpLearnset = sSeelLevelUpLearnset,
.teachableLearnset = sSeelTeachableLearnset, .teachableLearnset = sSeelTeachableLearnset,
.eggMoveLearnset = sSeelEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_DEWGONG}), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_DEWGONG}),
}, },
@ -8828,6 +8874,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Grimer) FOOTPRINT(Grimer)
.levelUpLearnset = sGrimerLevelUpLearnset, .levelUpLearnset = sGrimerLevelUpLearnset,
.teachableLearnset = sGrimerTeachableLearnset, .teachableLearnset = sGrimerTeachableLearnset,
.eggMoveLearnset = sGrimerEggMoveLearnset,
.formSpeciesIdTable = sGrimerFormSpeciesIdTable, .formSpeciesIdTable = sGrimerFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_MUK}), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_MUK}),
}, },
@ -8941,6 +8988,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isAlolanForm = TRUE, .isAlolanForm = TRUE,
.levelUpLearnset = sGrimerAlolanLevelUpLearnset, .levelUpLearnset = sGrimerAlolanLevelUpLearnset,
.teachableLearnset = sGrimerAlolanTeachableLearnset, .teachableLearnset = sGrimerAlolanTeachableLearnset,
.eggMoveLearnset = sGrimerAlolanEggMoveLearnset,
.formSpeciesIdTable = sGrimerFormSpeciesIdTable, .formSpeciesIdTable = sGrimerFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_MUK_ALOLAN}), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_MUK_ALOLAN}),
}, },
@ -9058,6 +9106,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Shellder) FOOTPRINT(Shellder)
.levelUpLearnset = sShellderLevelUpLearnset, .levelUpLearnset = sShellderLevelUpLearnset,
.teachableLearnset = sShellderTeachableLearnset, .teachableLearnset = sShellderTeachableLearnset,
.eggMoveLearnset = sShellderEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_CLOYSTER}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_CLOYSTER}),
}, },
@ -9168,6 +9217,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Gastly) FOOTPRINT(Gastly)
.levelUpLearnset = sGastlyLevelUpLearnset, .levelUpLearnset = sGastlyLevelUpLearnset,
.teachableLearnset = sGastlyTeachableLearnset, .teachableLearnset = sGastlyTeachableLearnset,
.eggMoveLearnset = sGastlyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_HAUNTER}), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_HAUNTER}),
}, },
@ -9459,6 +9509,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Onix) FOOTPRINT(Onix)
.levelUpLearnset = sOnixLevelUpLearnset, .levelUpLearnset = sOnixLevelUpLearnset,
.teachableLearnset = sOnixTeachableLearnset, .teachableLearnset = sOnixTeachableLearnset,
.eggMoveLearnset = sOnixEggMoveLearnset,
.evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX}, .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX},
{EVO_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX}), {EVO_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX}),
}, },
@ -9636,6 +9687,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Drowzee) FOOTPRINT(Drowzee)
.levelUpLearnset = sDrowzeeLevelUpLearnset, .levelUpLearnset = sDrowzeeLevelUpLearnset,
.teachableLearnset = sDrowzeeTeachableLearnset, .teachableLearnset = sDrowzeeTeachableLearnset,
.eggMoveLearnset = sDrowzeeEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_HYPNO}), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_HYPNO}),
}, },
@ -9748,6 +9800,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Krabby) FOOTPRINT(Krabby)
.levelUpLearnset = sKrabbyLevelUpLearnset, .levelUpLearnset = sKrabbyLevelUpLearnset,
.teachableLearnset = sKrabbyTeachableLearnset, .teachableLearnset = sKrabbyTeachableLearnset,
.eggMoveLearnset = sKrabbyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_KINGLER}), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_KINGLER}),
}, },
@ -10146,6 +10199,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Exeggcute) FOOTPRINT(Exeggcute)
.levelUpLearnset = sExeggcuteLevelUpLearnset, .levelUpLearnset = sExeggcuteLevelUpLearnset,
.teachableLearnset = sExeggcuteTeachableLearnset, .teachableLearnset = sExeggcuteTeachableLearnset,
.eggMoveLearnset = sExeggcuteEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR}, .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR},
{EVO_NONE, 0, SPECIES_EXEGGUTOR_ALOLAN}), {EVO_NONE, 0, SPECIES_EXEGGUTOR_ALOLAN}),
}, },
@ -10323,6 +10377,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Cubone) FOOTPRINT(Cubone)
.levelUpLearnset = sCuboneLevelUpLearnset, .levelUpLearnset = sCuboneLevelUpLearnset,
.teachableLearnset = sCuboneTeachableLearnset, .teachableLearnset = sCuboneTeachableLearnset,
.eggMoveLearnset = sCuboneEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_MAROWAK}, .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_MAROWAK},
{EVO_NONE, 0, SPECIES_MAROWAK_ALOLAN}, {EVO_NONE, 0, SPECIES_MAROWAK_ALOLAN},
{EVO_NONE, 0, SPECIES_MAROWAK_ALOLAN_TOTEM}), {EVO_NONE, 0, SPECIES_MAROWAK_ALOLAN_TOTEM}),
@ -10540,6 +10595,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Tyrogue) FOOTPRINT(Tyrogue)
.levelUpLearnset = sTyrogueLevelUpLearnset, .levelUpLearnset = sTyrogueLevelUpLearnset,
.teachableLearnset = sTyrogueTeachableLearnset, .teachableLearnset = sTyrogueTeachableLearnset,
.eggMoveLearnset = sTyrogueEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN}, .evolutions = EVOLUTION({EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN},
{EVO_LEVEL_ATK_GT_DEF, 20, SPECIES_HITMONLEE}, {EVO_LEVEL_ATK_GT_DEF, 20, SPECIES_HITMONLEE},
{EVO_LEVEL_ATK_EQ_DEF, 20, SPECIES_HITMONTOP}), {EVO_LEVEL_ATK_EQ_DEF, 20, SPECIES_HITMONTOP}),
@ -10757,6 +10813,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Lickitung) FOOTPRINT(Lickitung)
.levelUpLearnset = sLickitungLevelUpLearnset, .levelUpLearnset = sLickitungLevelUpLearnset,
.teachableLearnset = sLickitungTeachableLearnset, .teachableLearnset = sLickitungTeachableLearnset,
.eggMoveLearnset = sLickitungEggMoveLearnset,
.evolutions = EVOLUTION({EVO_MOVE, MOVE_ROLLOUT, SPECIES_LICKILICKY}), .evolutions = EVOLUTION({EVO_MOVE, MOVE_ROLLOUT, SPECIES_LICKILICKY}),
}, },
@ -10873,6 +10930,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Koffing) FOOTPRINT(Koffing)
.levelUpLearnset = sKoffingLevelUpLearnset, .levelUpLearnset = sKoffingLevelUpLearnset,
.teachableLearnset = sKoffingTeachableLearnset, .teachableLearnset = sKoffingTeachableLearnset,
.eggMoveLearnset = sKoffingEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_WEEZING}, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_WEEZING},
{EVO_NONE, 0, SPECIES_WEEZING_GALARIAN}), {EVO_NONE, 0, SPECIES_WEEZING_GALARIAN}),
}, },
@ -11052,6 +11110,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Rhyhorn) FOOTPRINT(Rhyhorn)
.levelUpLearnset = sRhyhornLevelUpLearnset, .levelUpLearnset = sRhyhornLevelUpLearnset,
.teachableLearnset = sRhyhornTeachableLearnset, .teachableLearnset = sRhyhornTeachableLearnset,
.eggMoveLearnset = sRhyhornEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_RHYDON}), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_RHYDON}),
}, },
@ -11231,6 +11290,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Happiny) FOOTPRINT(Happiny)
.levelUpLearnset = sHappinyLevelUpLearnset, .levelUpLearnset = sHappinyLevelUpLearnset,
.teachableLearnset = sHappinyTeachableLearnset, .teachableLearnset = sHappinyTeachableLearnset,
.eggMoveLearnset = sHappinyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM_HOLD_DAY, ITEM_OVAL_STONE, SPECIES_CHANSEY}, .evolutions = EVOLUTION({EVO_ITEM_HOLD_DAY, ITEM_OVAL_STONE, SPECIES_CHANSEY},
{EVO_ITEM_DAY, ITEM_OVAL_STONE, SPECIES_CHANSEY}), {EVO_ITEM_DAY, ITEM_OVAL_STONE, SPECIES_CHANSEY}),
}, },
@ -11287,6 +11347,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Chansey) FOOTPRINT(Chansey)
.levelUpLearnset = sChanseyLevelUpLearnset, .levelUpLearnset = sChanseyLevelUpLearnset,
.teachableLearnset = sChanseyTeachableLearnset, .teachableLearnset = sChanseyTeachableLearnset,
.eggMoveLearnset = sChanseyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_BLISSEY}), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_BLISSEY}),
}, },
@ -11397,6 +11458,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Tangela) FOOTPRINT(Tangela)
.levelUpLearnset = sTangelaLevelUpLearnset, .levelUpLearnset = sTangelaLevelUpLearnset,
.teachableLearnset = sTangelaTeachableLearnset, .teachableLearnset = sTangelaTeachableLearnset,
.eggMoveLearnset = sTangelaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_TANGROWTH}), .evolutions = EVOLUTION({EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_TANGROWTH}),
}, },
@ -11508,6 +11570,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Kangaskhan) FOOTPRINT(Kangaskhan)
.levelUpLearnset = sKangaskhanLevelUpLearnset, .levelUpLearnset = sKangaskhanLevelUpLearnset,
.teachableLearnset = sKangaskhanTeachableLearnset, .teachableLearnset = sKangaskhanTeachableLearnset,
.eggMoveLearnset = sKangaskhanEggMoveLearnset,
.formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable,
.formChangeTable = sKangaskhanFormChangeTable, .formChangeTable = sKangaskhanFormChangeTable,
}, },
@ -11564,6 +11627,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isMegaEvolution = TRUE, .isMegaEvolution = TRUE,
.levelUpLearnset = sKangaskhanLevelUpLearnset, .levelUpLearnset = sKangaskhanLevelUpLearnset,
.teachableLearnset = sKangaskhanTeachableLearnset, .teachableLearnset = sKangaskhanTeachableLearnset,
.eggMoveLearnset = sKangaskhanEggMoveLearnset,
.formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable,
.formChangeTable = sKangaskhanFormChangeTable, .formChangeTable = sKangaskhanFormChangeTable,
}, },
@ -11622,6 +11686,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Horsea) FOOTPRINT(Horsea)
.levelUpLearnset = sHorseaLevelUpLearnset, .levelUpLearnset = sHorseaLevelUpLearnset,
.teachableLearnset = sHorseaTeachableLearnset, .teachableLearnset = sHorseaTeachableLearnset,
.eggMoveLearnset = sHorseaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_SEADRA}), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_SEADRA}),
}, },
@ -11801,6 +11866,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Goldeen) FOOTPRINT(Goldeen)
.levelUpLearnset = sGoldeenLevelUpLearnset, .levelUpLearnset = sGoldeenLevelUpLearnset,
.teachableLearnset = sGoldeenTeachableLearnset, .teachableLearnset = sGoldeenTeachableLearnset,
.eggMoveLearnset = sGoldeenEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_SEAKING}), .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_SEAKING}),
}, },
@ -12030,6 +12096,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(MimeJr) FOOTPRINT(MimeJr)
.levelUpLearnset = sMimeJrLevelUpLearnset, .levelUpLearnset = sMimeJrLevelUpLearnset,
.teachableLearnset = sMimeJrTeachableLearnset, .teachableLearnset = sMimeJrTeachableLearnset,
.eggMoveLearnset = sMimeJrEggMoveLearnset,
.evolutions = EVOLUTION({EVO_MOVE, MOVE_MIMIC, SPECIES_MR_MIME}, .evolutions = EVOLUTION({EVO_MOVE, MOVE_MIMIC, SPECIES_MR_MIME},
{EVO_NONE, 0, SPECIES_MR_MIME_GALARIAN}), {EVO_NONE, 0, SPECIES_MR_MIME_GALARIAN}),
}, },
@ -12089,6 +12156,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(MrMime) FOOTPRINT(MrMime)
.levelUpLearnset = sMrMimeLevelUpLearnset, .levelUpLearnset = sMrMimeLevelUpLearnset,
.teachableLearnset = sMrMimeTeachableLearnset, .teachableLearnset = sMrMimeTeachableLearnset,
.eggMoveLearnset = sMrMimeEggMoveLearnset,
.formSpeciesIdTable = sMrMimeFormSpeciesIdTable, .formSpeciesIdTable = sMrMimeFormSpeciesIdTable,
}, },
@ -12144,6 +12212,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isGalarianForm = TRUE, .isGalarianForm = TRUE,
.levelUpLearnset = sMrMimeGalarianLevelUpLearnset, .levelUpLearnset = sMrMimeGalarianLevelUpLearnset,
.teachableLearnset = sMrMimeGalarianTeachableLearnset, .teachableLearnset = sMrMimeGalarianTeachableLearnset,
.eggMoveLearnset = sMrMimeGalarianEggMoveLearnset,
.formSpeciesIdTable = sMrMimeFormSpeciesIdTable, .formSpeciesIdTable = sMrMimeFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_MR_RIME}), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_MR_RIME}),
}, },
@ -12255,6 +12324,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Scyther) FOOTPRINT(Scyther)
.levelUpLearnset = sScytherLevelUpLearnset, .levelUpLearnset = sScytherLevelUpLearnset,
.teachableLearnset = sScytherTeachableLearnset, .teachableLearnset = sScytherTeachableLearnset,
.eggMoveLearnset = sScytherEggMoveLearnset,
.evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR}, .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR},
{EVO_ITEM, ITEM_BLACK_AUGURITE, SPECIES_KLEAVOR}, {EVO_ITEM, ITEM_BLACK_AUGURITE, SPECIES_KLEAVOR},
{EVO_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR}), {EVO_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR}),
@ -12484,6 +12554,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Smoochum) FOOTPRINT(Smoochum)
.levelUpLearnset = sSmoochumLevelUpLearnset, .levelUpLearnset = sSmoochumLevelUpLearnset,
.teachableLearnset = sSmoochumTeachableLearnset, .teachableLearnset = sSmoochumTeachableLearnset,
.eggMoveLearnset = sSmoochumEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_JYNX}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_JYNX}),
}, },
#endif //P_GEN_2_CROSS_EVOS #endif //P_GEN_2_CROSS_EVOS
@ -12595,6 +12666,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Elekid) FOOTPRINT(Elekid)
.levelUpLearnset = sElekidLevelUpLearnset, .levelUpLearnset = sElekidLevelUpLearnset,
.teachableLearnset = sElekidTeachableLearnset, .teachableLearnset = sElekidTeachableLearnset,
.eggMoveLearnset = sElekidEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ELECTABUZZ}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ELECTABUZZ}),
}, },
#endif //P_GEN_2_CROSS_EVOS #endif //P_GEN_2_CROSS_EVOS
@ -12771,6 +12843,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Magby) FOOTPRINT(Magby)
.levelUpLearnset = sMagbyLevelUpLearnset, .levelUpLearnset = sMagbyLevelUpLearnset,
.teachableLearnset = sMagbyTeachableLearnset, .teachableLearnset = sMagbyTeachableLearnset,
.eggMoveLearnset = sMagbyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MAGMAR}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MAGMAR}),
}, },
#endif //P_GEN_2_CROSS_EVOS #endif //P_GEN_2_CROSS_EVOS
@ -12944,6 +13017,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Pinsir) FOOTPRINT(Pinsir)
.levelUpLearnset = sPinsirLevelUpLearnset, .levelUpLearnset = sPinsirLevelUpLearnset,
.teachableLearnset = sPinsirTeachableLearnset, .teachableLearnset = sPinsirTeachableLearnset,
.eggMoveLearnset = sPinsirEggMoveLearnset,
.formSpeciesIdTable = sPinsirFormSpeciesIdTable, .formSpeciesIdTable = sPinsirFormSpeciesIdTable,
.formChangeTable = sPinsirFormChangeTable, .formChangeTable = sPinsirFormChangeTable,
}, },
@ -13001,6 +13075,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isMegaEvolution = TRUE, .isMegaEvolution = TRUE,
.levelUpLearnset = sPinsirLevelUpLearnset, .levelUpLearnset = sPinsirLevelUpLearnset,
.teachableLearnset = sPinsirTeachableLearnset, .teachableLearnset = sPinsirTeachableLearnset,
.eggMoveLearnset = sPinsirEggMoveLearnset,
.formSpeciesIdTable = sPinsirFormSpeciesIdTable, .formSpeciesIdTable = sPinsirFormSpeciesIdTable,
.formChangeTable = sPinsirFormChangeTable, .formChangeTable = sPinsirFormChangeTable,
}, },
@ -13115,6 +13190,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isPaldeanForm = TRUE, .isPaldeanForm = TRUE,
.levelUpLearnset = sTaurosPaldeanCombatBreedLevelUpLearnset, .levelUpLearnset = sTaurosPaldeanCombatBreedLevelUpLearnset,
.teachableLearnset = sTaurosPaldeanCombatBreedTeachableLearnset, .teachableLearnset = sTaurosPaldeanCombatBreedTeachableLearnset,
.eggMoveLearnset = sTaurosPaldeanCombatBreedEggMoveLearnset,
.formSpeciesIdTable = sTaurosFormSpeciesIdTable, .formSpeciesIdTable = sTaurosFormSpeciesIdTable,
}, },
@ -13169,6 +13245,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isPaldeanForm = TRUE, .isPaldeanForm = TRUE,
.levelUpLearnset = sTaurosPaldeanBlazeBreedLevelUpLearnset, .levelUpLearnset = sTaurosPaldeanBlazeBreedLevelUpLearnset,
.teachableLearnset = sTaurosPaldeanBlazeBreedTeachableLearnset, .teachableLearnset = sTaurosPaldeanBlazeBreedTeachableLearnset,
.eggMoveLearnset = sTaurosPaldeanBlazeBreedEggMoveLearnset,
.formSpeciesIdTable = sTaurosFormSpeciesIdTable, .formSpeciesIdTable = sTaurosFormSpeciesIdTable,
}, },
@ -13223,6 +13300,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isPaldeanForm = TRUE, .isPaldeanForm = TRUE,
.levelUpLearnset = sTaurosPaldeanAquaBreedLevelUpLearnset, .levelUpLearnset = sTaurosPaldeanAquaBreedLevelUpLearnset,
.teachableLearnset = sTaurosPaldeanAquaBreedTeachableLearnset, .teachableLearnset = sTaurosPaldeanAquaBreedTeachableLearnset,
.eggMoveLearnset = sTaurosPaldeanAquaBreedEggMoveLearnset,
.formSpeciesIdTable = sTaurosFormSpeciesIdTable, .formSpeciesIdTable = sTaurosFormSpeciesIdTable,
}, },
#endif //P_PALDEAN_FORMS #endif //P_PALDEAN_FORMS
@ -13457,6 +13535,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Lapras) FOOTPRINT(Lapras)
.levelUpLearnset = sLaprasLevelUpLearnset, .levelUpLearnset = sLaprasLevelUpLearnset,
.teachableLearnset = sLaprasTeachableLearnset, .teachableLearnset = sLaprasTeachableLearnset,
.eggMoveLearnset = sLaprasEggMoveLearnset,
.formSpeciesIdTable = sLaprasFormSpeciesIdTable, .formSpeciesIdTable = sLaprasFormSpeciesIdTable,
.formChangeTable = sLaprasFormChangeTable, .formChangeTable = sLaprasFormChangeTable,
}, },
@ -13515,6 +13594,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isGigantamax = TRUE, .isGigantamax = TRUE,
.levelUpLearnset = sLaprasLevelUpLearnset, .levelUpLearnset = sLaprasLevelUpLearnset,
.teachableLearnset = sLaprasTeachableLearnset, .teachableLearnset = sLaprasTeachableLearnset,
.eggMoveLearnset = sLaprasEggMoveLearnset,
.formSpeciesIdTable = sLaprasFormSpeciesIdTable, .formSpeciesIdTable = sLaprasFormSpeciesIdTable,
.formChangeTable = sLaprasFormChangeTable, .formChangeTable = sLaprasFormChangeTable,
}, },
@ -13629,6 +13709,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Eevee) FOOTPRINT(Eevee)
.levelUpLearnset = sEeveeLevelUpLearnset, .levelUpLearnset = sEeveeLevelUpLearnset,
.teachableLearnset = sEeveeTeachableLearnset, .teachableLearnset = sEeveeTeachableLearnset,
.eggMoveLearnset = sEeveeEggMoveLearnset,
.formSpeciesIdTable = sEeveeFormSpeciesIdTable, .formSpeciesIdTable = sEeveeFormSpeciesIdTable,
.formChangeTable = sEeveeFormChangeTable, .formChangeTable = sEeveeFormChangeTable,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_JOLTEON}, .evolutions = EVOLUTION({EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_JOLTEON},
@ -13695,6 +13776,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isGigantamax = TRUE, .isGigantamax = TRUE,
.levelUpLearnset = sEeveeLevelUpLearnset, .levelUpLearnset = sEeveeLevelUpLearnset,
.teachableLearnset = sEeveeTeachableLearnset, .teachableLearnset = sEeveeTeachableLearnset,
.eggMoveLearnset = sEeveeEggMoveLearnset,
.formSpeciesIdTable = sEeveeFormSpeciesIdTable, .formSpeciesIdTable = sEeveeFormSpeciesIdTable,
.formChangeTable = sEeveeFormChangeTable, .formChangeTable = sEeveeFormChangeTable,
}, },
@ -13756,6 +13838,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.allPerfectIVs = TRUE, .allPerfectIVs = TRUE,
.levelUpLearnset = sEeveeLevelUpLearnset, .levelUpLearnset = sEeveeLevelUpLearnset,
.teachableLearnset = sEeveeTeachableLearnset, .teachableLearnset = sEeveeTeachableLearnset,
.eggMoveLearnset = sEeveeEggMoveLearnset,
.formSpeciesIdTable = sEeveeFormSpeciesIdTable, .formSpeciesIdTable = sEeveeFormSpeciesIdTable,
}, },
@ -14414,6 +14497,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Omanyte) FOOTPRINT(Omanyte)
.levelUpLearnset = sOmanyteLevelUpLearnset, .levelUpLearnset = sOmanyteLevelUpLearnset,
.teachableLearnset = sOmanyteTeachableLearnset, .teachableLearnset = sOmanyteTeachableLearnset,
.eggMoveLearnset = sOmanyteEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_OMASTAR}), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_OMASTAR}),
}, },
@ -14527,6 +14611,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Kabuto) FOOTPRINT(Kabuto)
.levelUpLearnset = sKabutoLevelUpLearnset, .levelUpLearnset = sKabutoLevelUpLearnset,
.teachableLearnset = sKabutoTeachableLearnset, .teachableLearnset = sKabutoTeachableLearnset,
.eggMoveLearnset = sKabutoEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_KABUTOPS}), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_KABUTOPS}),
}, },
@ -14641,6 +14726,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Aerodactyl) FOOTPRINT(Aerodactyl)
.levelUpLearnset = sAerodactylLevelUpLearnset, .levelUpLearnset = sAerodactylLevelUpLearnset,
.teachableLearnset = sAerodactylTeachableLearnset, .teachableLearnset = sAerodactylTeachableLearnset,
.eggMoveLearnset = sAerodactylEggMoveLearnset,
.formSpeciesIdTable = sAerodactylFormSpeciesIdTable, .formSpeciesIdTable = sAerodactylFormSpeciesIdTable,
.formChangeTable = sAerodactylFormChangeTable, .formChangeTable = sAerodactylFormChangeTable,
}, },
@ -14697,6 +14783,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isMegaEvolution = TRUE, .isMegaEvolution = TRUE,
.levelUpLearnset = sAerodactylLevelUpLearnset, .levelUpLearnset = sAerodactylLevelUpLearnset,
.teachableLearnset = sAerodactylTeachableLearnset, .teachableLearnset = sAerodactylTeachableLearnset,
.eggMoveLearnset = sAerodactylEggMoveLearnset,
.formSpeciesIdTable = sAerodactylFormSpeciesIdTable, .formSpeciesIdTable = sAerodactylFormSpeciesIdTable,
.formChangeTable = sAerodactylFormChangeTable, .formChangeTable = sAerodactylFormChangeTable,
}, },
@ -14757,6 +14844,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Munchlax) FOOTPRINT(Munchlax)
.levelUpLearnset = sMunchlaxLevelUpLearnset, .levelUpLearnset = sMunchlaxLevelUpLearnset,
.teachableLearnset = sMunchlaxTeachableLearnset, .teachableLearnset = sMunchlaxTeachableLearnset,
.eggMoveLearnset = sMunchlaxEggMoveLearnset,
.evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_SNORLAX}), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_SNORLAX}),
}, },
#endif //P_GEN_4_CROSS_EVOS #endif //P_GEN_4_CROSS_EVOS
@ -14813,6 +14901,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Snorlax) FOOTPRINT(Snorlax)
.levelUpLearnset = sSnorlaxLevelUpLearnset, .levelUpLearnset = sSnorlaxLevelUpLearnset,
.teachableLearnset = sSnorlaxTeachableLearnset, .teachableLearnset = sSnorlaxTeachableLearnset,
.eggMoveLearnset = sSnorlaxEggMoveLearnset,
.formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable,
.formChangeTable = sSnorlaxFormChangeTable, .formChangeTable = sSnorlaxFormChangeTable,
}, },
@ -14871,6 +14960,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.isGigantamax = TRUE, .isGigantamax = TRUE,
.levelUpLearnset = sSnorlaxLevelUpLearnset, .levelUpLearnset = sSnorlaxLevelUpLearnset,
.teachableLearnset = sSnorlaxTeachableLearnset, .teachableLearnset = sSnorlaxTeachableLearnset,
.eggMoveLearnset = sSnorlaxEggMoveLearnset,
.formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable,
.formChangeTable = sSnorlaxFormChangeTable, .formChangeTable = sSnorlaxFormChangeTable,
}, },
@ -15292,6 +15382,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
FOOTPRINT(Dratini) FOOTPRINT(Dratini)
.levelUpLearnset = sDratiniLevelUpLearnset, .levelUpLearnset = sDratiniLevelUpLearnset,
.teachableLearnset = sDratiniTeachableLearnset, .teachableLearnset = sDratiniTeachableLearnset,
.eggMoveLearnset = sDratiniEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_DRAGONAIR}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_DRAGONAIR}),
}, },

View File

@ -54,6 +54,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Chikorita) FOOTPRINT(Chikorita)
.levelUpLearnset = sChikoritaLevelUpLearnset, .levelUpLearnset = sChikoritaLevelUpLearnset,
.teachableLearnset = sChikoritaTeachableLearnset, .teachableLearnset = sChikoritaTeachableLearnset,
.eggMoveLearnset = sChikoritaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_BAYLEEF}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_BAYLEEF}),
}, },
@ -226,6 +227,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Cyndaquil) FOOTPRINT(Cyndaquil)
.levelUpLearnset = sCyndaquilLevelUpLearnset, .levelUpLearnset = sCyndaquilLevelUpLearnset,
.teachableLearnset = sCyndaquilTeachableLearnset, .teachableLearnset = sCyndaquilTeachableLearnset,
.eggMoveLearnset = sCyndaquilEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_QUILAVA}), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_QUILAVA}),
}, },
@ -454,6 +456,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Totodile) FOOTPRINT(Totodile)
.levelUpLearnset = sTotodileLevelUpLearnset, .levelUpLearnset = sTotodileLevelUpLearnset,
.teachableLearnset = sTotodileTeachableLearnset, .teachableLearnset = sTotodileTeachableLearnset,
.eggMoveLearnset = sTotodileEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_CROCONAW}), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_CROCONAW}),
}, },
@ -624,6 +627,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Sentret) FOOTPRINT(Sentret)
.levelUpLearnset = sSentretLevelUpLearnset, .levelUpLearnset = sSentretLevelUpLearnset,
.teachableLearnset = sSentretTeachableLearnset, .teachableLearnset = sSentretTeachableLearnset,
.eggMoveLearnset = sSentretEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_FURRET}), .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_FURRET}),
}, },
@ -731,6 +735,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Hoothoot) FOOTPRINT(Hoothoot)
.levelUpLearnset = sHoothootLevelUpLearnset, .levelUpLearnset = sHoothootLevelUpLearnset,
.teachableLearnset = sHoothootTeachableLearnset, .teachableLearnset = sHoothootTeachableLearnset,
.eggMoveLearnset = sHoothootEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_NOCTOWL}), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_NOCTOWL}),
}, },
@ -848,6 +853,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Ledyba) FOOTPRINT(Ledyba)
.levelUpLearnset = sLedybaLevelUpLearnset, .levelUpLearnset = sLedybaLevelUpLearnset,
.teachableLearnset = sLedybaTeachableLearnset, .teachableLearnset = sLedybaTeachableLearnset,
.eggMoveLearnset = sLedybaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_LEDIAN}), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_LEDIAN}),
}, },
@ -960,6 +966,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Spinarak) FOOTPRINT(Spinarak)
.levelUpLearnset = sSpinarakLevelUpLearnset, .levelUpLearnset = sSpinarakLevelUpLearnset,
.teachableLearnset = sSpinarakTeachableLearnset, .teachableLearnset = sSpinarakTeachableLearnset,
.eggMoveLearnset = sSpinarakEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_ARIADOS}), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_ARIADOS}),
}, },
@ -1074,6 +1081,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Chinchou) FOOTPRINT(Chinchou)
.levelUpLearnset = sChinchouLevelUpLearnset, .levelUpLearnset = sChinchouLevelUpLearnset,
.teachableLearnset = sChinchouTeachableLearnset, .teachableLearnset = sChinchouTeachableLearnset,
.eggMoveLearnset = sChinchouEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_LANTURN}), .evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_LANTURN}),
}, },
@ -1184,6 +1192,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Togepi) FOOTPRINT(Togepi)
.levelUpLearnset = sTogepiLevelUpLearnset, .levelUpLearnset = sTogepiLevelUpLearnset,
.teachableLearnset = sTogepiTeachableLearnset, .teachableLearnset = sTogepiTeachableLearnset,
.eggMoveLearnset = sTogepiEggMoveLearnset,
.evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_TOGETIC}), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_TOGETIC}),
}, },
@ -1356,6 +1365,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Natu) FOOTPRINT(Natu)
.levelUpLearnset = sNatuLevelUpLearnset, .levelUpLearnset = sNatuLevelUpLearnset,
.teachableLearnset = sNatuTeachableLearnset, .teachableLearnset = sNatuTeachableLearnset,
.eggMoveLearnset = sNatuEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_XATU}), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_XATU}),
}, },
@ -1467,6 +1477,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Mareep) FOOTPRINT(Mareep)
.levelUpLearnset = sMareepLevelUpLearnset, .levelUpLearnset = sMareepLevelUpLearnset,
.teachableLearnset = sMareepTeachableLearnset, .teachableLearnset = sMareepTeachableLearnset,
.eggMoveLearnset = sMareepEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_FLAAFFY}), .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_FLAAFFY}),
}, },
@ -1702,6 +1713,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Azurill) FOOTPRINT(Azurill)
.levelUpLearnset = sAzurillLevelUpLearnset, .levelUpLearnset = sAzurillLevelUpLearnset,
.teachableLearnset = sAzurillTeachableLearnset, .teachableLearnset = sAzurillTeachableLearnset,
.eggMoveLearnset = sAzurillEggMoveLearnset,
.evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_MARILL}), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_MARILL}),
}, },
#endif //P_GEN_3_CROSS_EVOS #endif //P_GEN_3_CROSS_EVOS
@ -1760,6 +1772,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Marill) FOOTPRINT(Marill)
.levelUpLearnset = sMarillLevelUpLearnset, .levelUpLearnset = sMarillLevelUpLearnset,
.teachableLearnset = sMarillTeachableLearnset, .teachableLearnset = sMarillTeachableLearnset,
.eggMoveLearnset = sMarillEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_AZUMARILL}), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_AZUMARILL}),
}, },
@ -1880,6 +1893,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Bonsly) FOOTPRINT(Bonsly)
.levelUpLearnset = sBonslyLevelUpLearnset, .levelUpLearnset = sBonslyLevelUpLearnset,
.teachableLearnset = sBonslyTeachableLearnset, .teachableLearnset = sBonslyTeachableLearnset,
.eggMoveLearnset = sBonslyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_MOVE, MOVE_MIMIC, SPECIES_SUDOWOODO}), .evolutions = EVOLUTION({EVO_MOVE, MOVE_MIMIC, SPECIES_SUDOWOODO}),
}, },
#endif //P_GEN_4_CROSS_EVOS #endif //P_GEN_4_CROSS_EVOS
@ -1938,6 +1952,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Sudowoodo) FOOTPRINT(Sudowoodo)
.levelUpLearnset = sSudowoodoLevelUpLearnset, .levelUpLearnset = sSudowoodoLevelUpLearnset,
.teachableLearnset = sSudowoodoTeachableLearnset, .teachableLearnset = sSudowoodoTeachableLearnset,
.eggMoveLearnset = sSudowoodoEggMoveLearnset,
}, },
#endif //P_FAMILY_SUDOWOODO #endif //P_FAMILY_SUDOWOODO
@ -1993,6 +2008,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Hoppip) FOOTPRINT(Hoppip)
.levelUpLearnset = sHoppipLevelUpLearnset, .levelUpLearnset = sHoppipLevelUpLearnset,
.teachableLearnset = sHoppipTeachableLearnset, .teachableLearnset = sHoppipTeachableLearnset,
.eggMoveLearnset = sHoppipEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_SKIPLOOM}), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_SKIPLOOM}),
}, },
@ -2167,6 +2183,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Aipom) FOOTPRINT(Aipom)
.levelUpLearnset = sAipomLevelUpLearnset, .levelUpLearnset = sAipomLevelUpLearnset,
.teachableLearnset = sAipomTeachableLearnset, .teachableLearnset = sAipomTeachableLearnset,
.eggMoveLearnset = sAipomEggMoveLearnset,
.evolutions = EVOLUTION({EVO_MOVE, MOVE_DOUBLE_HIT, SPECIES_AMBIPOM}), .evolutions = EVOLUTION({EVO_MOVE, MOVE_DOUBLE_HIT, SPECIES_AMBIPOM}),
}, },
@ -2280,6 +2297,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Sunkern) FOOTPRINT(Sunkern)
.levelUpLearnset = sSunkernLevelUpLearnset, .levelUpLearnset = sSunkernLevelUpLearnset,
.teachableLearnset = sSunkernTeachableLearnset, .teachableLearnset = sSunkernTeachableLearnset,
.eggMoveLearnset = sSunkernEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_SUNFLORA}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_SUNFLORA}),
}, },
@ -2389,6 +2407,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Yanma) FOOTPRINT(Yanma)
.levelUpLearnset = sYanmaLevelUpLearnset, .levelUpLearnset = sYanmaLevelUpLearnset,
.teachableLearnset = sYanmaTeachableLearnset, .teachableLearnset = sYanmaTeachableLearnset,
.eggMoveLearnset = sYanmaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_YANMEGA}), .evolutions = EVOLUTION({EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_YANMEGA}),
}, },
@ -2504,6 +2523,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Wooper) FOOTPRINT(Wooper)
.levelUpLearnset = sWooperLevelUpLearnset, .levelUpLearnset = sWooperLevelUpLearnset,
.teachableLearnset = sWooperTeachableLearnset, .teachableLearnset = sWooperTeachableLearnset,
.eggMoveLearnset = sWooperEggMoveLearnset,
.formSpeciesIdTable = sWooperFormSpeciesIdTable, .formSpeciesIdTable = sWooperFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_QUAGSIRE}), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_QUAGSIRE}),
}, },
@ -2616,6 +2636,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.isPaldeanForm = TRUE, .isPaldeanForm = TRUE,
.levelUpLearnset = sWooperPaldeanLevelUpLearnset, .levelUpLearnset = sWooperPaldeanLevelUpLearnset,
.teachableLearnset = sWooperPaldeanTeachableLearnset, .teachableLearnset = sWooperPaldeanTeachableLearnset,
.eggMoveLearnset = sWooperPaldeanEggMoveLearnset,
.formSpeciesIdTable = sWooperFormSpeciesIdTable, .formSpeciesIdTable = sWooperFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_CLODSIRE}), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_CLODSIRE}),
}, },
@ -2730,6 +2751,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Murkrow) FOOTPRINT(Murkrow)
.levelUpLearnset = sMurkrowLevelUpLearnset, .levelUpLearnset = sMurkrowLevelUpLearnset,
.teachableLearnset = sMurkrowTeachableLearnset, .teachableLearnset = sMurkrowTeachableLearnset,
.eggMoveLearnset = sMurkrowEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_HONCHKROW}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_HONCHKROW}),
}, },
@ -2841,6 +2863,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Misdreavus) FOOTPRINT(Misdreavus)
.levelUpLearnset = sMisdreavusLevelUpLearnset, .levelUpLearnset = sMisdreavusLevelUpLearnset,
.teachableLearnset = sMisdreavusTeachableLearnset, .teachableLearnset = sMisdreavusTeachableLearnset,
.eggMoveLearnset = sMisdreavusEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_MISMAGIUS}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_MISMAGIUS}),
}, },
@ -3160,6 +3183,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Girafarig) FOOTPRINT(Girafarig)
.levelUpLearnset = sGirafarigLevelUpLearnset, .levelUpLearnset = sGirafarigLevelUpLearnset,
.teachableLearnset = sGirafarigTeachableLearnset, .teachableLearnset = sGirafarigTeachableLearnset,
.eggMoveLearnset = sGirafarigEggMoveLearnset,
.evolutions = EVOLUTION({EVO_MOVE, MOVE_TWIN_BEAM, SPECIES_FARIGIRAF}), .evolutions = EVOLUTION({EVO_MOVE, MOVE_TWIN_BEAM, SPECIES_FARIGIRAF}),
}, },
@ -3269,6 +3293,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Pineco) FOOTPRINT(Pineco)
.levelUpLearnset = sPinecoLevelUpLearnset, .levelUpLearnset = sPinecoLevelUpLearnset,
.teachableLearnset = sPinecoTeachableLearnset, .teachableLearnset = sPinecoTeachableLearnset,
.eggMoveLearnset = sPinecoEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_FORRETRESS}), .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_FORRETRESS}),
}, },
@ -3383,6 +3408,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Dunsparce) FOOTPRINT(Dunsparce)
.levelUpLearnset = sDunsparceLevelUpLearnset, .levelUpLearnset = sDunsparceLevelUpLearnset,
.teachableLearnset = sDunsparceTeachableLearnset, .teachableLearnset = sDunsparceTeachableLearnset,
.eggMoveLearnset = sDunsparceEggMoveLearnset,
.evolutions = EVOLUTION({EVO_MOVE_TWO_SEGMENT, MOVE_HYPER_DRILL, SPECIES_DUDUNSPARCE_TWO_SEGMENT}, .evolutions = EVOLUTION({EVO_MOVE_TWO_SEGMENT, MOVE_HYPER_DRILL, SPECIES_DUDUNSPARCE_TWO_SEGMENT},
{EVO_MOVE_THREE_SEGMENT, MOVE_HYPER_DRILL, SPECIES_DUDUNSPARCE_THREE_SEGMENT}), {EVO_MOVE_THREE_SEGMENT, MOVE_HYPER_DRILL, SPECIES_DUDUNSPARCE_THREE_SEGMENT}),
}, },
@ -3552,6 +3578,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Gligar) FOOTPRINT(Gligar)
.levelUpLearnset = sGligarLevelUpLearnset, .levelUpLearnset = sGligarLevelUpLearnset,
.teachableLearnset = sGligarTeachableLearnset, .teachableLearnset = sGligarTeachableLearnset,
.eggMoveLearnset = sGligarEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM_HOLD_NIGHT, ITEM_RAZOR_FANG, SPECIES_GLISCOR}, .evolutions = EVOLUTION({EVO_ITEM_HOLD_NIGHT, ITEM_RAZOR_FANG, SPECIES_GLISCOR},
{EVO_ITEM_NIGHT, ITEM_RAZOR_FANG, SPECIES_GLISCOR}), {EVO_ITEM_NIGHT, ITEM_RAZOR_FANG, SPECIES_GLISCOR}),
}, },
@ -3667,6 +3694,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Snubbull) FOOTPRINT(Snubbull)
.levelUpLearnset = sSnubbullLevelUpLearnset, .levelUpLearnset = sSnubbullLevelUpLearnset,
.teachableLearnset = sSnubbullTeachableLearnset, .teachableLearnset = sSnubbullTeachableLearnset,
.eggMoveLearnset = sSnubbullEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 23, SPECIES_GRANBULL}), .evolutions = EVOLUTION({EVO_LEVEL, 23, SPECIES_GRANBULL}),
}, },
@ -3789,6 +3817,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Qwilfish) FOOTPRINT(Qwilfish)
.levelUpLearnset = sQwilfishLevelUpLearnset, .levelUpLearnset = sQwilfishLevelUpLearnset,
.teachableLearnset = sQwilfishTeachableLearnset, .teachableLearnset = sQwilfishTeachableLearnset,
.eggMoveLearnset = sQwilfishEggMoveLearnset,
.formSpeciesIdTable = sQwilfishFormSpeciesIdTable, .formSpeciesIdTable = sQwilfishFormSpeciesIdTable,
}, },
@ -3958,6 +3987,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Shuckle) FOOTPRINT(Shuckle)
.levelUpLearnset = sShuckleLevelUpLearnset, .levelUpLearnset = sShuckleLevelUpLearnset,
.teachableLearnset = sShuckleTeachableLearnset, .teachableLearnset = sShuckleTeachableLearnset,
.eggMoveLearnset = sShuckleEggMoveLearnset,
}, },
#endif //P_FAMILY_SHUCKLE #endif //P_FAMILY_SHUCKLE
@ -4016,6 +4046,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Heracross) FOOTPRINT(Heracross)
.levelUpLearnset = sHeracrossLevelUpLearnset, .levelUpLearnset = sHeracrossLevelUpLearnset,
.teachableLearnset = sHeracrossTeachableLearnset, .teachableLearnset = sHeracrossTeachableLearnset,
.eggMoveLearnset = sHeracrossEggMoveLearnset,
.formSpeciesIdTable = sHeracrossFormSpeciesIdTable, .formSpeciesIdTable = sHeracrossFormSpeciesIdTable,
.formChangeTable = sHeracrossFormChangeTable, .formChangeTable = sHeracrossFormChangeTable,
}, },
@ -4072,6 +4103,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.isMegaEvolution = TRUE, .isMegaEvolution = TRUE,
.levelUpLearnset = sHeracrossLevelUpLearnset, .levelUpLearnset = sHeracrossLevelUpLearnset,
.teachableLearnset = sHeracrossTeachableLearnset, .teachableLearnset = sHeracrossTeachableLearnset,
.eggMoveLearnset = sHeracrossEggMoveLearnset,
.formSpeciesIdTable = sHeracrossFormSpeciesIdTable, .formSpeciesIdTable = sHeracrossFormSpeciesIdTable,
.formChangeTable = sHeracrossFormChangeTable, .formChangeTable = sHeracrossFormChangeTable,
}, },
@ -4135,6 +4167,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Sneasel) FOOTPRINT(Sneasel)
.levelUpLearnset = sSneaselLevelUpLearnset, .levelUpLearnset = sSneaselLevelUpLearnset,
.teachableLearnset = sSneaselTeachableLearnset, .teachableLearnset = sSneaselTeachableLearnset,
.eggMoveLearnset = sSneaselEggMoveLearnset,
.formSpeciesIdTable = sSneaselFormSpeciesIdTable, .formSpeciesIdTable = sSneaselFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_ITEM_HOLD_NIGHT, ITEM_RAZOR_CLAW, SPECIES_WEAVILE}, .evolutions = EVOLUTION({EVO_ITEM_HOLD_NIGHT, ITEM_RAZOR_CLAW, SPECIES_WEAVILE},
{EVO_ITEM_NIGHT, ITEM_RAZOR_CLAW, SPECIES_WEAVILE}), {EVO_ITEM_NIGHT, ITEM_RAZOR_CLAW, SPECIES_WEAVILE}),
@ -4369,6 +4402,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Teddiursa) FOOTPRINT(Teddiursa)
.levelUpLearnset = sTeddiursaLevelUpLearnset, .levelUpLearnset = sTeddiursaLevelUpLearnset,
.teachableLearnset = sTeddiursaTeachableLearnset, .teachableLearnset = sTeddiursaTeachableLearnset,
.eggMoveLearnset = sTeddiursaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_URSARING}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_URSARING}),
}, },
@ -4589,6 +4623,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Slugma) FOOTPRINT(Slugma)
.levelUpLearnset = sSlugmaLevelUpLearnset, .levelUpLearnset = sSlugmaLevelUpLearnset,
.teachableLearnset = sSlugmaTeachableLearnset, .teachableLearnset = sSlugmaTeachableLearnset,
.eggMoveLearnset = sSlugmaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_MAGCARGO}), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_MAGCARGO}),
}, },
@ -4703,6 +4738,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Swinub) FOOTPRINT(Swinub)
.levelUpLearnset = sSwinubLevelUpLearnset, .levelUpLearnset = sSwinubLevelUpLearnset,
.teachableLearnset = sSwinubTeachableLearnset, .teachableLearnset = sSwinubTeachableLearnset,
.eggMoveLearnset = sSwinubEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_PILOSWINE}), .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_PILOSWINE}),
}, },
@ -4890,6 +4926,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Corsola) FOOTPRINT(Corsola)
.levelUpLearnset = sCorsolaLevelUpLearnset, .levelUpLearnset = sCorsolaLevelUpLearnset,
.teachableLearnset = sCorsolaTeachableLearnset, .teachableLearnset = sCorsolaTeachableLearnset,
.eggMoveLearnset = sCorsolaEggMoveLearnset,
.formSpeciesIdTable = sCorsolaFormSpeciesIdTable, .formSpeciesIdTable = sCorsolaFormSpeciesIdTable,
}, },
@ -4945,6 +4982,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.isGalarianForm = TRUE, .isGalarianForm = TRUE,
.levelUpLearnset = sCorsolaGalarianLevelUpLearnset, .levelUpLearnset = sCorsolaGalarianLevelUpLearnset,
.teachableLearnset = sCorsolaGalarianTeachableLearnset, .teachableLearnset = sCorsolaGalarianTeachableLearnset,
.eggMoveLearnset = sCorsolaGalarianEggMoveLearnset,
.formSpeciesIdTable = sCorsolaFormSpeciesIdTable, .formSpeciesIdTable = sCorsolaFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_CURSOLA}), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_CURSOLA}),
}, },
@ -5054,6 +5092,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Remoraid) FOOTPRINT(Remoraid)
.levelUpLearnset = sRemoraidLevelUpLearnset, .levelUpLearnset = sRemoraidLevelUpLearnset,
.teachableLearnset = sRemoraidTeachableLearnset, .teachableLearnset = sRemoraidTeachableLearnset,
.eggMoveLearnset = sRemoraidEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_OCTILLERY}), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_OCTILLERY}),
}, },
@ -5167,6 +5206,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Delibird) FOOTPRINT(Delibird)
.levelUpLearnset = sDelibirdLevelUpLearnset, .levelUpLearnset = sDelibirdLevelUpLearnset,
.teachableLearnset = sDelibirdTeachableLearnset, .teachableLearnset = sDelibirdTeachableLearnset,
.eggMoveLearnset = sDelibirdEggMoveLearnset,
}, },
#endif //P_FAMILY_DELIBIRD #endif //P_FAMILY_DELIBIRD
@ -5222,6 +5262,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Mantyke) FOOTPRINT(Mantyke)
.levelUpLearnset = sMantykeLevelUpLearnset, .levelUpLearnset = sMantykeLevelUpLearnset,
.teachableLearnset = sMantykeTeachableLearnset, .teachableLearnset = sMantykeTeachableLearnset,
.eggMoveLearnset = sMantykeEggMoveLearnset,
.evolutions = EVOLUTION({EVO_SPECIFIC_MON_IN_PARTY, SPECIES_REMORAID, SPECIES_MANTINE}), .evolutions = EVOLUTION({EVO_SPECIFIC_MON_IN_PARTY, SPECIES_REMORAID, SPECIES_MANTINE}),
}, },
#endif //P_GEN_4_CROSS_EVOS #endif //P_GEN_4_CROSS_EVOS
@ -5283,6 +5324,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Mantine) FOOTPRINT(Mantine)
.levelUpLearnset = sMantineLevelUpLearnset, .levelUpLearnset = sMantineLevelUpLearnset,
.teachableLearnset = sMantineTeachableLearnset, .teachableLearnset = sMantineTeachableLearnset,
.eggMoveLearnset = sMantineEggMoveLearnset,
}, },
#endif //P_FAMILY_MANTINE #endif //P_FAMILY_MANTINE
@ -5338,6 +5380,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Skarmory) FOOTPRINT(Skarmory)
.levelUpLearnset = sSkarmoryLevelUpLearnset, .levelUpLearnset = sSkarmoryLevelUpLearnset,
.teachableLearnset = sSkarmoryTeachableLearnset, .teachableLearnset = sSkarmoryTeachableLearnset,
.eggMoveLearnset = sSkarmoryEggMoveLearnset,
}, },
#endif //P_FAMILY_SKARMORY #endif //P_FAMILY_SKARMORY
@ -5392,6 +5435,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Houndour) FOOTPRINT(Houndour)
.levelUpLearnset = sHoundourLevelUpLearnset, .levelUpLearnset = sHoundourLevelUpLearnset,
.teachableLearnset = sHoundourTeachableLearnset, .teachableLearnset = sHoundourTeachableLearnset,
.eggMoveLearnset = sHoundourEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_HOUNDOOM}), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_HOUNDOOM}),
}, },
@ -5561,6 +5605,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Phanpy) FOOTPRINT(Phanpy)
.levelUpLearnset = sPhanpyLevelUpLearnset, .levelUpLearnset = sPhanpyLevelUpLearnset,
.teachableLearnset = sPhanpyTeachableLearnset, .teachableLearnset = sPhanpyTeachableLearnset,
.eggMoveLearnset = sPhanpyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_DONPHAN}), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_DONPHAN}),
}, },
@ -5673,6 +5718,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Stantler) FOOTPRINT(Stantler)
.levelUpLearnset = sStantlerLevelUpLearnset, .levelUpLearnset = sStantlerLevelUpLearnset,
.teachableLearnset = sStantlerTeachableLearnset, .teachableLearnset = sStantlerTeachableLearnset,
.eggMoveLearnset = sStantlerEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL_MOVE_TWENTY_TIMES, MOVE_PSYSHIELD_BASH, SPECIES_WYRDEER}), .evolutions = EVOLUTION({EVO_LEVEL_MOVE_TWENTY_TIMES, MOVE_PSYSHIELD_BASH, SPECIES_WYRDEER}),
}, },
@ -5840,6 +5886,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Miltank) FOOTPRINT(Miltank)
.levelUpLearnset = sMiltankLevelUpLearnset, .levelUpLearnset = sMiltankLevelUpLearnset,
.teachableLearnset = sMiltankTeachableLearnset, .teachableLearnset = sMiltankTeachableLearnset,
.eggMoveLearnset = sMiltankEggMoveLearnset,
}, },
#endif //P_FAMILY_MILTANK #endif //P_FAMILY_MILTANK
@ -6092,6 +6139,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
FOOTPRINT(Larvitar) FOOTPRINT(Larvitar)
.levelUpLearnset = sLarvitarLevelUpLearnset, .levelUpLearnset = sLarvitarLevelUpLearnset,
.teachableLearnset = sLarvitarTeachableLearnset, .teachableLearnset = sLarvitarTeachableLearnset,
.eggMoveLearnset = sLarvitarEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_PUPITAR}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_PUPITAR}),
}, },

View File

@ -54,6 +54,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Treecko) FOOTPRINT(Treecko)
.levelUpLearnset = sTreeckoLevelUpLearnset, .levelUpLearnset = sTreeckoLevelUpLearnset,
.teachableLearnset = sTreeckoTeachableLearnset, .teachableLearnset = sTreeckoTeachableLearnset,
.eggMoveLearnset = sTreeckoEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_GROVYLE}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_GROVYLE}),
}, },
@ -281,6 +282,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Torchic) FOOTPRINT(Torchic)
.levelUpLearnset = sTorchicLevelUpLearnset, .levelUpLearnset = sTorchicLevelUpLearnset,
.teachableLearnset = sTorchicTeachableLearnset, .teachableLearnset = sTorchicTeachableLearnset,
.eggMoveLearnset = sTorchicEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_COMBUSKEN}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_COMBUSKEN}),
}, },
@ -515,6 +517,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Mudkip) FOOTPRINT(Mudkip)
.levelUpLearnset = sMudkipLevelUpLearnset, .levelUpLearnset = sMudkipLevelUpLearnset,
.teachableLearnset = sMudkipTeachableLearnset, .teachableLearnset = sMudkipTeachableLearnset,
.eggMoveLearnset = sMudkipEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_MARSHTOMP}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_MARSHTOMP}),
}, },
@ -746,6 +749,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Poochyena) FOOTPRINT(Poochyena)
.levelUpLearnset = sPoochyenaLevelUpLearnset, .levelUpLearnset = sPoochyenaLevelUpLearnset,
.teachableLearnset = sPoochyenaTeachableLearnset, .teachableLearnset = sPoochyenaTeachableLearnset,
.eggMoveLearnset = sPoochyenaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_MIGHTYENA}), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_MIGHTYENA}),
}, },
@ -863,6 +867,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Zigzagoon) FOOTPRINT(Zigzagoon)
.levelUpLearnset = sZigzagoonLevelUpLearnset, .levelUpLearnset = sZigzagoonLevelUpLearnset,
.teachableLearnset = sZigzagoonTeachableLearnset, .teachableLearnset = sZigzagoonTeachableLearnset,
.eggMoveLearnset = sZigzagoonEggMoveLearnset,
.formSpeciesIdTable = sZigzagoonFormSpeciesIdTable, .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LINOONE}), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LINOONE}),
}, },
@ -974,6 +979,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.isGalarianForm = TRUE, .isGalarianForm = TRUE,
.levelUpLearnset = sZigzagoonGalarianLevelUpLearnset, .levelUpLearnset = sZigzagoonGalarianLevelUpLearnset,
.teachableLearnset = sZigzagoonGalarianTeachableLearnset, .teachableLearnset = sZigzagoonGalarianTeachableLearnset,
.eggMoveLearnset = sZigzagoonGalarianEggMoveLearnset,
.formSpeciesIdTable = sZigzagoonFormSpeciesIdTable, .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LINOONE_GALARIAN}), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LINOONE_GALARIAN}),
}, },
@ -1452,6 +1458,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Lotad) FOOTPRINT(Lotad)
.levelUpLearnset = sLotadLevelUpLearnset, .levelUpLearnset = sLotadLevelUpLearnset,
.teachableLearnset = sLotadTeachableLearnset, .teachableLearnset = sLotadTeachableLearnset,
.eggMoveLearnset = sLotadEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_LOMBRE}), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_LOMBRE}),
}, },
@ -1625,6 +1632,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Seedot) FOOTPRINT(Seedot)
.levelUpLearnset = sSeedotLevelUpLearnset, .levelUpLearnset = sSeedotLevelUpLearnset,
.teachableLearnset = sSeedotTeachableLearnset, .teachableLearnset = sSeedotTeachableLearnset,
.eggMoveLearnset = sSeedotEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_NUZLEAF}), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_NUZLEAF}),
}, },
@ -1805,6 +1813,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Taillow) FOOTPRINT(Taillow)
.levelUpLearnset = sTaillowLevelUpLearnset, .levelUpLearnset = sTaillowLevelUpLearnset,
.teachableLearnset = sTaillowTeachableLearnset, .teachableLearnset = sTaillowTeachableLearnset,
.eggMoveLearnset = sTaillowEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_SWELLOW}), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_SWELLOW}),
}, },
@ -1920,6 +1929,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Wingull) FOOTPRINT(Wingull)
.levelUpLearnset = sWingullLevelUpLearnset, .levelUpLearnset = sWingullLevelUpLearnset,
.teachableLearnset = sWingullTeachableLearnset, .teachableLearnset = sWingullTeachableLearnset,
.eggMoveLearnset = sWingullEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_PELIPPER}), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_PELIPPER}),
}, },
@ -2043,6 +2053,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Ralts) FOOTPRINT(Ralts)
.levelUpLearnset = sRaltsLevelUpLearnset, .levelUpLearnset = sRaltsLevelUpLearnset,
.teachableLearnset = sRaltsTeachableLearnset, .teachableLearnset = sRaltsTeachableLearnset,
.eggMoveLearnset = sRaltsEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_KIRLIA}), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_KIRLIA}),
}, },
@ -2393,6 +2404,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Surskit) FOOTPRINT(Surskit)
.levelUpLearnset = sSurskitLevelUpLearnset, .levelUpLearnset = sSurskitLevelUpLearnset,
.teachableLearnset = sSurskitTeachableLearnset, .teachableLearnset = sSurskitTeachableLearnset,
.eggMoveLearnset = sSurskitEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_MASQUERAIN}), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_MASQUERAIN}),
}, },
@ -2511,6 +2523,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Shroomish) FOOTPRINT(Shroomish)
.levelUpLearnset = sShroomishLevelUpLearnset, .levelUpLearnset = sShroomishLevelUpLearnset,
.teachableLearnset = sShroomishTeachableLearnset, .teachableLearnset = sShroomishTeachableLearnset,
.eggMoveLearnset = sShroomishEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 23, SPECIES_BRELOOM}), .evolutions = EVOLUTION({EVO_LEVEL, 23, SPECIES_BRELOOM}),
}, },
@ -2620,6 +2633,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Slakoth) FOOTPRINT(Slakoth)
.levelUpLearnset = sSlakothLevelUpLearnset, .levelUpLearnset = sSlakothLevelUpLearnset,
.teachableLearnset = sSlakothTeachableLearnset, .teachableLearnset = sSlakothTeachableLearnset,
.eggMoveLearnset = sSlakothEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_VIGOROTH}), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_VIGOROTH}),
}, },
@ -2787,6 +2801,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Nincada) FOOTPRINT(Nincada)
.levelUpLearnset = sNincadaLevelUpLearnset, .levelUpLearnset = sNincadaLevelUpLearnset,
.teachableLearnset = sNincadaTeachableLearnset, .teachableLearnset = sNincadaTeachableLearnset,
.eggMoveLearnset = sNincadaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL_NINJASK, 20, SPECIES_NINJASK}, .evolutions = EVOLUTION({EVO_LEVEL_NINJASK, 20, SPECIES_NINJASK},
{EVO_LEVEL_SHEDINJA, 20, SPECIES_SHEDINJA}), {EVO_LEVEL_SHEDINJA, 20, SPECIES_SHEDINJA}),
}, },
@ -2949,6 +2964,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Whismur) FOOTPRINT(Whismur)
.levelUpLearnset = sWhismurLevelUpLearnset, .levelUpLearnset = sWhismurLevelUpLearnset,
.teachableLearnset = sWhismurTeachableLearnset, .teachableLearnset = sWhismurTeachableLearnset,
.eggMoveLearnset = sWhismurEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LOUDRED}), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LOUDRED}),
}, },
@ -3118,6 +3134,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Makuhita) FOOTPRINT(Makuhita)
.levelUpLearnset = sMakuhitaLevelUpLearnset, .levelUpLearnset = sMakuhitaLevelUpLearnset,
.teachableLearnset = sMakuhitaTeachableLearnset, .teachableLearnset = sMakuhitaTeachableLearnset,
.eggMoveLearnset = sMakuhitaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_HARIYAMA}), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_HARIYAMA}),
}, },
@ -3227,6 +3244,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Nosepass) FOOTPRINT(Nosepass)
.levelUpLearnset = sNosepassLevelUpLearnset, .levelUpLearnset = sNosepassLevelUpLearnset,
.teachableLearnset = sNosepassTeachableLearnset, .teachableLearnset = sNosepassTeachableLearnset,
.eggMoveLearnset = sNosepassEggMoveLearnset,
.evolutions = EVOLUTION({EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_PROBOPASS}, .evolutions = EVOLUTION({EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_PROBOPASS},
{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_PROBOPASS}), {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_PROBOPASS}),
}, },
@ -3340,6 +3358,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Skitty) FOOTPRINT(Skitty)
.levelUpLearnset = sSkittyLevelUpLearnset, .levelUpLearnset = sSkittyLevelUpLearnset,
.teachableLearnset = sSkittyTeachableLearnset, .teachableLearnset = sSkittyTeachableLearnset,
.eggMoveLearnset = sSkittyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_DELCATTY}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_DELCATTY}),
}, },
@ -3456,6 +3475,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Sableye) FOOTPRINT(Sableye)
.levelUpLearnset = sSableyeLevelUpLearnset, .levelUpLearnset = sSableyeLevelUpLearnset,
.teachableLearnset = sSableyeTeachableLearnset, .teachableLearnset = sSableyeTeachableLearnset,
.eggMoveLearnset = sSableyeEggMoveLearnset,
.formSpeciesIdTable = sSableyeFormSpeciesIdTable, .formSpeciesIdTable = sSableyeFormSpeciesIdTable,
.formChangeTable = sSableyeFormChangeTable, .formChangeTable = sSableyeFormChangeTable,
}, },
@ -3512,6 +3532,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.isMegaEvolution = TRUE, .isMegaEvolution = TRUE,
.levelUpLearnset = sSableyeLevelUpLearnset, .levelUpLearnset = sSableyeLevelUpLearnset,
.teachableLearnset = sSableyeTeachableLearnset, .teachableLearnset = sSableyeTeachableLearnset,
.eggMoveLearnset = sSableyeEggMoveLearnset,
.formSpeciesIdTable = sSableyeFormSpeciesIdTable, .formSpeciesIdTable = sSableyeFormSpeciesIdTable,
.formChangeTable = sSableyeFormChangeTable, .formChangeTable = sSableyeFormChangeTable,
}, },
@ -3577,6 +3598,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Mawile) FOOTPRINT(Mawile)
.levelUpLearnset = sMawileLevelUpLearnset, .levelUpLearnset = sMawileLevelUpLearnset,
.teachableLearnset = sMawileTeachableLearnset, .teachableLearnset = sMawileTeachableLearnset,
.eggMoveLearnset = sMawileEggMoveLearnset,
.formSpeciesIdTable = sMawileFormSpeciesIdTable, .formSpeciesIdTable = sMawileFormSpeciesIdTable,
.formChangeTable = sMawileFormChangeTable, .formChangeTable = sMawileFormChangeTable,
}, },
@ -3634,6 +3656,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.isMegaEvolution = TRUE, .isMegaEvolution = TRUE,
.levelUpLearnset = sMawileLevelUpLearnset, .levelUpLearnset = sMawileLevelUpLearnset,
.teachableLearnset = sMawileTeachableLearnset, .teachableLearnset = sMawileTeachableLearnset,
.eggMoveLearnset = sMawileEggMoveLearnset,
.formSpeciesIdTable = sMawileFormSpeciesIdTable, .formSpeciesIdTable = sMawileFormSpeciesIdTable,
.formChangeTable = sMawileFormChangeTable, .formChangeTable = sMawileFormChangeTable,
}, },
@ -3692,6 +3715,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Aron) FOOTPRINT(Aron)
.levelUpLearnset = sAronLevelUpLearnset, .levelUpLearnset = sAronLevelUpLearnset,
.teachableLearnset = sAronTeachableLearnset, .teachableLearnset = sAronTeachableLearnset,
.eggMoveLearnset = sAronEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_LAIRON}), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_LAIRON}),
}, },
@ -3924,6 +3948,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Meditite) FOOTPRINT(Meditite)
.levelUpLearnset = sMedititeLevelUpLearnset, .levelUpLearnset = sMedititeLevelUpLearnset,
.teachableLearnset = sMedititeTeachableLearnset, .teachableLearnset = sMedititeTeachableLearnset,
.eggMoveLearnset = sMedititeEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_MEDICHAM}), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_MEDICHAM}),
}, },
@ -4094,6 +4119,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Electrike) FOOTPRINT(Electrike)
.levelUpLearnset = sElectrikeLevelUpLearnset, .levelUpLearnset = sElectrikeLevelUpLearnset,
.teachableLearnset = sElectrikeTeachableLearnset, .teachableLearnset = sElectrikeTeachableLearnset,
.eggMoveLearnset = sElectrikeEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_MANECTRIC}), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_MANECTRIC}),
}, },
@ -4260,6 +4286,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Plusle) FOOTPRINT(Plusle)
.levelUpLearnset = sPlusleLevelUpLearnset, .levelUpLearnset = sPlusleLevelUpLearnset,
.teachableLearnset = sPlusleTeachableLearnset, .teachableLearnset = sPlusleTeachableLearnset,
.eggMoveLearnset = sPlusleEggMoveLearnset,
}, },
#endif //P_FAMILY_PLUSLE #endif //P_FAMILY_PLUSLE
@ -4315,6 +4342,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Minun) FOOTPRINT(Minun)
.levelUpLearnset = sMinunLevelUpLearnset, .levelUpLearnset = sMinunLevelUpLearnset,
.teachableLearnset = sMinunTeachableLearnset, .teachableLearnset = sMinunTeachableLearnset,
.eggMoveLearnset = sMinunEggMoveLearnset,
}, },
#endif //P_FAMILY_MINUN #endif //P_FAMILY_MINUN
@ -4376,6 +4404,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Volbeat) FOOTPRINT(Volbeat)
.levelUpLearnset = sVolbeatLevelUpLearnset, .levelUpLearnset = sVolbeatLevelUpLearnset,
.teachableLearnset = sVolbeatTeachableLearnset, .teachableLearnset = sVolbeatTeachableLearnset,
.eggMoveLearnset = sVolbeatEggMoveLearnset,
}, },
[SPECIES_ILLUMISE] = [SPECIES_ILLUMISE] =
@ -4435,6 +4464,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Illumise) FOOTPRINT(Illumise)
.levelUpLearnset = sIllumiseLevelUpLearnset, .levelUpLearnset = sIllumiseLevelUpLearnset,
.teachableLearnset = sIllumiseTeachableLearnset, .teachableLearnset = sIllumiseTeachableLearnset,
.eggMoveLearnset = sIllumiseEggMoveLearnset,
}, },
#endif //P_FAMILY_VOLBEAT_ILLUMISE #endif //P_FAMILY_VOLBEAT_ILLUMISE
@ -4492,6 +4522,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Budew) FOOTPRINT(Budew)
.levelUpLearnset = sBudewLevelUpLearnset, .levelUpLearnset = sBudewLevelUpLearnset,
.teachableLearnset = sBudewTeachableLearnset, .teachableLearnset = sBudewTeachableLearnset,
.eggMoveLearnset = sBudewEggMoveLearnset,
.evolutions = EVOLUTION({EVO_FRIENDSHIP_DAY, 0, SPECIES_ROSELIA}), .evolutions = EVOLUTION({EVO_FRIENDSHIP_DAY, 0, SPECIES_ROSELIA}),
}, },
#endif //P_GEN_4_CROSS_EVOS #endif //P_GEN_4_CROSS_EVOS
@ -4552,6 +4583,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Roselia) FOOTPRINT(Roselia)
.levelUpLearnset = sRoseliaLevelUpLearnset, .levelUpLearnset = sRoseliaLevelUpLearnset,
.teachableLearnset = sRoseliaTeachableLearnset, .teachableLearnset = sRoseliaTeachableLearnset,
.eggMoveLearnset = sRoseliaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_ROSERADE}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_ROSERADE}),
}, },
@ -4681,6 +4713,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Gulpin) FOOTPRINT(Gulpin)
.levelUpLearnset = sGulpinLevelUpLearnset, .levelUpLearnset = sGulpinLevelUpLearnset,
.teachableLearnset = sGulpinTeachableLearnset, .teachableLearnset = sGulpinTeachableLearnset,
.eggMoveLearnset = sGulpinEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_SWALOT}), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_SWALOT}),
}, },
@ -4795,6 +4828,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Carvanha) FOOTPRINT(Carvanha)
.levelUpLearnset = sCarvanhaLevelUpLearnset, .levelUpLearnset = sCarvanhaLevelUpLearnset,
.teachableLearnset = sCarvanhaTeachableLearnset, .teachableLearnset = sCarvanhaTeachableLearnset,
.eggMoveLearnset = sCarvanhaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_SHARPEDO}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_SHARPEDO}),
}, },
@ -4964,6 +4998,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Wailmer) FOOTPRINT(Wailmer)
.levelUpLearnset = sWailmerLevelUpLearnset, .levelUpLearnset = sWailmerLevelUpLearnset,
.teachableLearnset = sWailmerTeachableLearnset, .teachableLearnset = sWailmerTeachableLearnset,
.eggMoveLearnset = sWailmerEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_WAILORD}), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_WAILORD}),
}, },
@ -5076,6 +5111,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Numel) FOOTPRINT(Numel)
.levelUpLearnset = sNumelLevelUpLearnset, .levelUpLearnset = sNumelLevelUpLearnset,
.teachableLearnset = sNumelTeachableLearnset, .teachableLearnset = sNumelTeachableLearnset,
.eggMoveLearnset = sNumelEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_CAMERUPT}), .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_CAMERUPT}),
}, },
@ -5249,6 +5285,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Torkoal) FOOTPRINT(Torkoal)
.levelUpLearnset = sTorkoalLevelUpLearnset, .levelUpLearnset = sTorkoalLevelUpLearnset,
.teachableLearnset = sTorkoalTeachableLearnset, .teachableLearnset = sTorkoalTeachableLearnset,
.eggMoveLearnset = sTorkoalEggMoveLearnset,
}, },
#endif //P_FAMILY_TORKOAL #endif //P_FAMILY_TORKOAL
@ -5303,6 +5340,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Spoink) FOOTPRINT(Spoink)
.levelUpLearnset = sSpoinkLevelUpLearnset, .levelUpLearnset = sSpoinkLevelUpLearnset,
.teachableLearnset = sSpoinkTeachableLearnset, .teachableLearnset = sSpoinkTeachableLearnset,
.eggMoveLearnset = sSpoinkEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_GRUMPIG}), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_GRUMPIG}),
}, },
@ -5412,6 +5450,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Spinda) FOOTPRINT(Spinda)
.levelUpLearnset = sSpindaLevelUpLearnset, .levelUpLearnset = sSpindaLevelUpLearnset,
.teachableLearnset = sSpindaTeachableLearnset, .teachableLearnset = sSpindaTeachableLearnset,
.eggMoveLearnset = sSpindaEggMoveLearnset,
}, },
#endif //P_FAMILY_SPINDA #endif //P_FAMILY_SPINDA
@ -5471,6 +5510,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Trapinch) FOOTPRINT(Trapinch)
.levelUpLearnset = sTrapinchLevelUpLearnset, .levelUpLearnset = sTrapinchLevelUpLearnset,
.teachableLearnset = sTrapinchTeachableLearnset, .teachableLearnset = sTrapinchTeachableLearnset,
.eggMoveLearnset = sTrapinchEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_VIBRAVA}), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_VIBRAVA}),
}, },
@ -5649,6 +5689,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Cacnea) FOOTPRINT(Cacnea)
.levelUpLearnset = sCacneaLevelUpLearnset, .levelUpLearnset = sCacneaLevelUpLearnset,
.teachableLearnset = sCacneaTeachableLearnset, .teachableLearnset = sCacneaTeachableLearnset,
.eggMoveLearnset = sCacneaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_CACTURNE}), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_CACTURNE}),
}, },
@ -5760,6 +5801,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Swablu) FOOTPRINT(Swablu)
.levelUpLearnset = sSwabluLevelUpLearnset, .levelUpLearnset = sSwabluLevelUpLearnset,
.teachableLearnset = sSwabluTeachableLearnset, .teachableLearnset = sSwabluTeachableLearnset,
.eggMoveLearnset = sSwabluEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ALTARIA}), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ALTARIA}),
}, },
@ -5929,6 +5971,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Zangoose) FOOTPRINT(Zangoose)
.levelUpLearnset = sZangooseLevelUpLearnset, .levelUpLearnset = sZangooseLevelUpLearnset,
.teachableLearnset = sZangooseTeachableLearnset, .teachableLearnset = sZangooseTeachableLearnset,
.eggMoveLearnset = sZangooseEggMoveLearnset,
}, },
#endif //P_FAMILY_ZANGOOSE #endif //P_FAMILY_ZANGOOSE
@ -5986,6 +6029,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Seviper) FOOTPRINT(Seviper)
.levelUpLearnset = sSeviperLevelUpLearnset, .levelUpLearnset = sSeviperLevelUpLearnset,
.teachableLearnset = sSeviperTeachableLearnset, .teachableLearnset = sSeviperTeachableLearnset,
.eggMoveLearnset = sSeviperEggMoveLearnset,
}, },
#endif //P_FAMILY_SEVIPER #endif //P_FAMILY_SEVIPER
@ -6167,6 +6211,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Barboach) FOOTPRINT(Barboach)
.levelUpLearnset = sBarboachLevelUpLearnset, .levelUpLearnset = sBarboachLevelUpLearnset,
.teachableLearnset = sBarboachTeachableLearnset, .teachableLearnset = sBarboachTeachableLearnset,
.eggMoveLearnset = sBarboachEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_WHISCASH}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_WHISCASH}),
}, },
@ -6274,6 +6319,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Corphish) FOOTPRINT(Corphish)
.levelUpLearnset = sCorphishLevelUpLearnset, .levelUpLearnset = sCorphishLevelUpLearnset,
.teachableLearnset = sCorphishTeachableLearnset, .teachableLearnset = sCorphishTeachableLearnset,
.eggMoveLearnset = sCorphishEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_CRAWDAUNT}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_CRAWDAUNT}),
}, },
@ -6499,6 +6545,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Lileep) FOOTPRINT(Lileep)
.levelUpLearnset = sLileepLevelUpLearnset, .levelUpLearnset = sLileepLevelUpLearnset,
.teachableLearnset = sLileepTeachableLearnset, .teachableLearnset = sLileepTeachableLearnset,
.eggMoveLearnset = sLileepEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_CRADILY}), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_CRADILY}),
}, },
@ -6619,6 +6666,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Anorith) FOOTPRINT(Anorith)
.levelUpLearnset = sAnorithLevelUpLearnset, .levelUpLearnset = sAnorithLevelUpLearnset,
.teachableLearnset = sAnorithTeachableLearnset, .teachableLearnset = sAnorithTeachableLearnset,
.eggMoveLearnset = sAnorithEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_ARMALDO}), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_ARMALDO}),
}, },
@ -6732,6 +6780,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Feebas) FOOTPRINT(Feebas)
.levelUpLearnset = sFeebasLevelUpLearnset, .levelUpLearnset = sFeebasLevelUpLearnset,
.teachableLearnset = sFeebasTeachableLearnset, .teachableLearnset = sFeebasTeachableLearnset,
.eggMoveLearnset = sFeebasEggMoveLearnset,
.evolutions = EVOLUTION({EVO_BEAUTY, 170, SPECIES_MILOTIC}, .evolutions = EVOLUTION({EVO_BEAUTY, 170, SPECIES_MILOTIC},
{EVO_TRADE_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC}, {EVO_TRADE_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC},
{EVO_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC}), {EVO_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC}),
@ -6849,6 +6898,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Castform) FOOTPRINT(Castform)
.levelUpLearnset = sCastformLevelUpLearnset, .levelUpLearnset = sCastformLevelUpLearnset,
.teachableLearnset = sCastformTeachableLearnset, .teachableLearnset = sCastformTeachableLearnset,
.eggMoveLearnset = sCastformEggMoveLearnset,
.formSpeciesIdTable = sCastformFormSpeciesIdTable, .formSpeciesIdTable = sCastformFormSpeciesIdTable,
.formChangeTable = sCastformFormChangeTable, .formChangeTable = sCastformFormChangeTable,
}, },
@ -6906,6 +6956,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Castform) FOOTPRINT(Castform)
.levelUpLearnset = sCastformLevelUpLearnset, .levelUpLearnset = sCastformLevelUpLearnset,
.teachableLearnset = sCastformTeachableLearnset, .teachableLearnset = sCastformTeachableLearnset,
.eggMoveLearnset = sCastformEggMoveLearnset,
.formSpeciesIdTable = sCastformFormSpeciesIdTable, .formSpeciesIdTable = sCastformFormSpeciesIdTable,
.formChangeTable = sCastformFormChangeTable, .formChangeTable = sCastformFormChangeTable,
}, },
@ -6963,6 +7014,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Castform) FOOTPRINT(Castform)
.levelUpLearnset = sCastformLevelUpLearnset, .levelUpLearnset = sCastformLevelUpLearnset,
.teachableLearnset = sCastformTeachableLearnset, .teachableLearnset = sCastformTeachableLearnset,
.eggMoveLearnset = sCastformEggMoveLearnset,
.formSpeciesIdTable = sCastformFormSpeciesIdTable, .formSpeciesIdTable = sCastformFormSpeciesIdTable,
.formChangeTable = sCastformFormChangeTable, .formChangeTable = sCastformFormChangeTable,
}, },
@ -7020,6 +7072,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Castform) FOOTPRINT(Castform)
.levelUpLearnset = sCastformLevelUpLearnset, .levelUpLearnset = sCastformLevelUpLearnset,
.teachableLearnset = sCastformTeachableLearnset, .teachableLearnset = sCastformTeachableLearnset,
.eggMoveLearnset = sCastformEggMoveLearnset,
.formSpeciesIdTable = sCastformFormSpeciesIdTable, .formSpeciesIdTable = sCastformFormSpeciesIdTable,
.formChangeTable = sCastformFormChangeTable, .formChangeTable = sCastformFormChangeTable,
}, },
@ -7077,6 +7130,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Kecleon) FOOTPRINT(Kecleon)
.levelUpLearnset = sKecleonLevelUpLearnset, .levelUpLearnset = sKecleonLevelUpLearnset,
.teachableLearnset = sKecleonTeachableLearnset, .teachableLearnset = sKecleonTeachableLearnset,
.eggMoveLearnset = sKecleonEggMoveLearnset,
}, },
#endif //P_FAMILY_KECLEON #endif //P_FAMILY_KECLEON
@ -7133,6 +7187,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Shuppet) FOOTPRINT(Shuppet)
.levelUpLearnset = sShuppetLevelUpLearnset, .levelUpLearnset = sShuppetLevelUpLearnset,
.teachableLearnset = sShuppetTeachableLearnset, .teachableLearnset = sShuppetTeachableLearnset,
.eggMoveLearnset = sShuppetEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_BANETTE}), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_BANETTE}),
}, },
@ -7304,6 +7359,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Duskull) FOOTPRINT(Duskull)
.levelUpLearnset = sDuskullLevelUpLearnset, .levelUpLearnset = sDuskullLevelUpLearnset,
.teachableLearnset = sDuskullTeachableLearnset, .teachableLearnset = sDuskullTeachableLearnset,
.eggMoveLearnset = sDuskullEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_DUSCLOPS}), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_DUSCLOPS}),
}, },
@ -7479,6 +7535,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Tropius) FOOTPRINT(Tropius)
.levelUpLearnset = sTropiusLevelUpLearnset, .levelUpLearnset = sTropiusLevelUpLearnset,
.teachableLearnset = sTropiusTeachableLearnset, .teachableLearnset = sTropiusTeachableLearnset,
.eggMoveLearnset = sTropiusEggMoveLearnset,
}, },
#endif //P_FAMILY_TROPIUS #endif //P_FAMILY_TROPIUS
@ -7535,6 +7592,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Chingling) FOOTPRINT(Chingling)
.levelUpLearnset = sChinglingLevelUpLearnset, .levelUpLearnset = sChinglingLevelUpLearnset,
.teachableLearnset = sChinglingTeachableLearnset, .teachableLearnset = sChinglingTeachableLearnset,
.eggMoveLearnset = sChinglingEggMoveLearnset,
.evolutions = EVOLUTION({EVO_FRIENDSHIP_NIGHT, 0, SPECIES_CHIMECHO}), .evolutions = EVOLUTION({EVO_FRIENDSHIP_NIGHT, 0, SPECIES_CHIMECHO}),
}, },
#endif //P_GEN_4_CROSS_EVOS #endif //P_GEN_4_CROSS_EVOS
@ -7598,6 +7656,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Chimecho) FOOTPRINT(Chimecho)
.levelUpLearnset = sChimechoLevelUpLearnset, .levelUpLearnset = sChimechoLevelUpLearnset,
.teachableLearnset = sChimechoTeachableLearnset, .teachableLearnset = sChimechoTeachableLearnset,
.eggMoveLearnset = sChimechoEggMoveLearnset,
}, },
#endif //P_FAMILY_CHIMECHO #endif //P_FAMILY_CHIMECHO
@ -7654,6 +7713,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Absol) FOOTPRINT(Absol)
.levelUpLearnset = sAbsolLevelUpLearnset, .levelUpLearnset = sAbsolLevelUpLearnset,
.teachableLearnset = sAbsolTeachableLearnset, .teachableLearnset = sAbsolTeachableLearnset,
.eggMoveLearnset = sAbsolEggMoveLearnset,
.formSpeciesIdTable = sAbsolFormSpeciesIdTable, .formSpeciesIdTable = sAbsolFormSpeciesIdTable,
.formChangeTable = sAbsolFormChangeTable, .formChangeTable = sAbsolFormChangeTable,
}, },
@ -7711,6 +7771,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.isMegaEvolution = TRUE, .isMegaEvolution = TRUE,
.levelUpLearnset = sAbsolLevelUpLearnset, .levelUpLearnset = sAbsolLevelUpLearnset,
.teachableLearnset = sAbsolTeachableLearnset, .teachableLearnset = sAbsolTeachableLearnset,
.eggMoveLearnset = sAbsolEggMoveLearnset,
.formSpeciesIdTable = sAbsolFormSpeciesIdTable, .formSpeciesIdTable = sAbsolFormSpeciesIdTable,
.formChangeTable = sAbsolFormChangeTable, .formChangeTable = sAbsolFormChangeTable,
}, },
@ -7770,6 +7831,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Snorunt) FOOTPRINT(Snorunt)
.levelUpLearnset = sSnoruntLevelUpLearnset, .levelUpLearnset = sSnoruntLevelUpLearnset,
.teachableLearnset = sSnoruntTeachableLearnset, .teachableLearnset = sSnoruntTeachableLearnset,
.eggMoveLearnset = sSnoruntEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_GLALIE}, .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_GLALIE},
{EVO_ITEM_FEMALE, ITEM_DAWN_STONE, SPECIES_FROSLASS}), {EVO_ITEM_FEMALE, ITEM_DAWN_STONE, SPECIES_FROSLASS}),
}, },
@ -7994,6 +8056,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Spheal) FOOTPRINT(Spheal)
.levelUpLearnset = sSphealLevelUpLearnset, .levelUpLearnset = sSphealLevelUpLearnset,
.teachableLearnset = sSphealTeachableLearnset, .teachableLearnset = sSphealTeachableLearnset,
.eggMoveLearnset = sSphealEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_SEALEO}), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_SEALEO}),
}, },
@ -8162,6 +8225,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Clamperl) FOOTPRINT(Clamperl)
.levelUpLearnset = sClamperlLevelUpLearnset, .levelUpLearnset = sClamperlLevelUpLearnset,
.teachableLearnset = sClamperlTeachableLearnset, .teachableLearnset = sClamperlTeachableLearnset,
.eggMoveLearnset = sClamperlEggMoveLearnset,
.evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_DEEP_SEA_TOOTH, SPECIES_HUNTAIL}, .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_DEEP_SEA_TOOTH, SPECIES_HUNTAIL},
{EVO_TRADE_ITEM, ITEM_DEEP_SEA_SCALE, SPECIES_GOREBYSS}, {EVO_TRADE_ITEM, ITEM_DEEP_SEA_SCALE, SPECIES_GOREBYSS},
{EVO_ITEM, ITEM_DEEP_SEA_TOOTH, SPECIES_HUNTAIL}, {EVO_ITEM, ITEM_DEEP_SEA_TOOTH, SPECIES_HUNTAIL},
@ -8333,6 +8397,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Relicanth) FOOTPRINT(Relicanth)
.levelUpLearnset = sRelicanthLevelUpLearnset, .levelUpLearnset = sRelicanthLevelUpLearnset,
.teachableLearnset = sRelicanthTeachableLearnset, .teachableLearnset = sRelicanthTeachableLearnset,
.eggMoveLearnset = sRelicanthEggMoveLearnset,
}, },
#endif //P_FAMILY_RELICANTH #endif //P_FAMILY_RELICANTH
@ -8388,6 +8453,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Luvdisc) FOOTPRINT(Luvdisc)
.levelUpLearnset = sLuvdiscLevelUpLearnset, .levelUpLearnset = sLuvdiscLevelUpLearnset,
.teachableLearnset = sLuvdiscTeachableLearnset, .teachableLearnset = sLuvdiscTeachableLearnset,
.eggMoveLearnset = sLuvdiscEggMoveLearnset,
}, },
#endif //P_FAMILY_LUVDISC #endif //P_FAMILY_LUVDISC
@ -8443,6 +8509,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
FOOTPRINT(Bagon) FOOTPRINT(Bagon)
.levelUpLearnset = sBagonLevelUpLearnset, .levelUpLearnset = sBagonLevelUpLearnset,
.teachableLearnset = sBagonTeachableLearnset, .teachableLearnset = sBagonTeachableLearnset,
.eggMoveLearnset = sBagonEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_SHELGON}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_SHELGON}),
}, },

View File

@ -54,6 +54,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Turtwig) FOOTPRINT(Turtwig)
.levelUpLearnset = sTurtwigLevelUpLearnset, .levelUpLearnset = sTurtwigLevelUpLearnset,
.teachableLearnset = sTurtwigTeachableLearnset, .teachableLearnset = sTurtwigTeachableLearnset,
.eggMoveLearnset = sTurtwigEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_GROTLE}), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_GROTLE}),
}, },
@ -224,6 +225,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Chimchar) FOOTPRINT(Chimchar)
.levelUpLearnset = sChimcharLevelUpLearnset, .levelUpLearnset = sChimcharLevelUpLearnset,
.teachableLearnset = sChimcharTeachableLearnset, .teachableLearnset = sChimcharTeachableLearnset,
.eggMoveLearnset = sChimcharEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_MONFERNO}), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_MONFERNO}),
}, },
@ -398,6 +400,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Piplup) FOOTPRINT(Piplup)
.levelUpLearnset = sPiplupLevelUpLearnset, .levelUpLearnset = sPiplupLevelUpLearnset,
.teachableLearnset = sPiplupTeachableLearnset, .teachableLearnset = sPiplupTeachableLearnset,
.eggMoveLearnset = sPiplupEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_PRINPLUP}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_PRINPLUP}),
}, },
@ -576,6 +579,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Starly) FOOTPRINT(Starly)
.levelUpLearnset = sStarlyLevelUpLearnset, .levelUpLearnset = sStarlyLevelUpLearnset,
.teachableLearnset = sStarlyTeachableLearnset, .teachableLearnset = sStarlyTeachableLearnset,
.eggMoveLearnset = sStarlyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_STARAVIA}), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_STARAVIA}),
}, },
@ -754,6 +758,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Bidoof) FOOTPRINT(Bidoof)
.levelUpLearnset = sBidoofLevelUpLearnset, .levelUpLearnset = sBidoofLevelUpLearnset,
.teachableLearnset = sBidoofTeachableLearnset, .teachableLearnset = sBidoofTeachableLearnset,
.eggMoveLearnset = sBidoofEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_BIBAREL}), .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_BIBAREL}),
}, },
@ -985,6 +990,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Shinx) FOOTPRINT(Shinx)
.levelUpLearnset = sShinxLevelUpLearnset, .levelUpLearnset = sShinxLevelUpLearnset,
.teachableLearnset = sShinxTeachableLearnset, .teachableLearnset = sShinxTeachableLearnset,
.eggMoveLearnset = sShinxEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_LUXIO}), .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_LUXIO}),
}, },
@ -1159,6 +1165,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Cranidos) FOOTPRINT(Cranidos)
.levelUpLearnset = sCranidosLevelUpLearnset, .levelUpLearnset = sCranidosLevelUpLearnset,
.teachableLearnset = sCranidosTeachableLearnset, .teachableLearnset = sCranidosTeachableLearnset,
.eggMoveLearnset = sCranidosEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_RAMPARDOS}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_RAMPARDOS}),
}, },
@ -1266,6 +1273,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Shieldon) FOOTPRINT(Shieldon)
.levelUpLearnset = sShieldonLevelUpLearnset, .levelUpLearnset = sShieldonLevelUpLearnset,
.teachableLearnset = sShieldonTeachableLearnset, .teachableLearnset = sShieldonTeachableLearnset,
.eggMoveLearnset = sShieldonEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_BASTIODON}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_BASTIODON}),
}, },
@ -1888,6 +1896,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Pachirisu) FOOTPRINT(Pachirisu)
.levelUpLearnset = sPachirisuLevelUpLearnset, .levelUpLearnset = sPachirisuLevelUpLearnset,
.teachableLearnset = sPachirisuTeachableLearnset, .teachableLearnset = sPachirisuTeachableLearnset,
.eggMoveLearnset = sPachirisuEggMoveLearnset,
}, },
#endif //P_FAMILY_PACHIRISU #endif //P_FAMILY_PACHIRISU
@ -1944,6 +1953,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Buizel) FOOTPRINT(Buizel)
.levelUpLearnset = sBuizelLevelUpLearnset, .levelUpLearnset = sBuizelLevelUpLearnset,
.teachableLearnset = sBuizelTeachableLearnset, .teachableLearnset = sBuizelTeachableLearnset,
.eggMoveLearnset = sBuizelEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_FLOATZEL}), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_FLOATZEL}),
}, },
@ -2054,6 +2064,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Cherubi) FOOTPRINT(Cherubi)
.levelUpLearnset = sCherubiLevelUpLearnset, .levelUpLearnset = sCherubiLevelUpLearnset,
.teachableLearnset = sCherubiTeachableLearnset, .teachableLearnset = sCherubiTeachableLearnset,
.eggMoveLearnset = sCherubiEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_CHERRIM_OVERCAST}), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_CHERRIM_OVERCAST}),
}, },
@ -2219,6 +2230,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Shellos) FOOTPRINT(Shellos)
.levelUpLearnset = sShellosLevelUpLearnset, .levelUpLearnset = sShellosLevelUpLearnset,
.teachableLearnset = sShellosTeachableLearnset, .teachableLearnset = sShellosTeachableLearnset,
.eggMoveLearnset = sShellosEggMoveLearnset,
.formSpeciesIdTable = sShellosFormSpeciesIdTable, .formSpeciesIdTable = sShellosFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GASTRODON_WEST_SEA}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GASTRODON_WEST_SEA}),
}, },
@ -2273,6 +2285,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Shellos) FOOTPRINT(Shellos)
.levelUpLearnset = sShellosLevelUpLearnset, .levelUpLearnset = sShellosLevelUpLearnset,
.teachableLearnset = sShellosTeachableLearnset, .teachableLearnset = sShellosTeachableLearnset,
.eggMoveLearnset = sShellosEggMoveLearnset,
.formSpeciesIdTable = sShellosFormSpeciesIdTable, .formSpeciesIdTable = sShellosFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GASTRODON_EAST_SEA}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GASTRODON_EAST_SEA}),
}, },
@ -2436,6 +2449,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Drifloon) FOOTPRINT(Drifloon)
.levelUpLearnset = sDrifloonLevelUpLearnset, .levelUpLearnset = sDrifloonLevelUpLearnset,
.teachableLearnset = sDrifloonTeachableLearnset, .teachableLearnset = sDrifloonTeachableLearnset,
.eggMoveLearnset = sDrifloonEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_DRIFBLIM}), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_DRIFBLIM}),
}, },
@ -2544,6 +2558,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Buneary) FOOTPRINT(Buneary)
.levelUpLearnset = sBunearyLevelUpLearnset, .levelUpLearnset = sBunearyLevelUpLearnset,
.teachableLearnset = sBunearyTeachableLearnset, .teachableLearnset = sBunearyTeachableLearnset,
.eggMoveLearnset = sBunearyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_LOPUNNY}), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_LOPUNNY}),
}, },
@ -2710,6 +2725,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Glameow) FOOTPRINT(Glameow)
.levelUpLearnset = sGlameowLevelUpLearnset, .levelUpLearnset = sGlameowLevelUpLearnset,
.teachableLearnset = sGlameowTeachableLearnset, .teachableLearnset = sGlameowTeachableLearnset,
.eggMoveLearnset = sGlameowEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_PURUGLY}), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_PURUGLY}),
}, },
@ -2817,6 +2833,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Stunky) FOOTPRINT(Stunky)
.levelUpLearnset = sStunkyLevelUpLearnset, .levelUpLearnset = sStunkyLevelUpLearnset,
.teachableLearnset = sStunkyTeachableLearnset, .teachableLearnset = sStunkyTeachableLearnset,
.eggMoveLearnset = sStunkyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SKUNTANK}), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SKUNTANK}),
}, },
@ -3037,6 +3054,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Chatot) FOOTPRINT(Chatot)
.levelUpLearnset = sChatotLevelUpLearnset, .levelUpLearnset = sChatotLevelUpLearnset,
.teachableLearnset = sChatotTeachableLearnset, .teachableLearnset = sChatotTeachableLearnset,
.eggMoveLearnset = sChatotEggMoveLearnset,
}, },
#endif //P_FAMILY_CHATOT #endif //P_FAMILY_CHATOT
@ -3092,6 +3110,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Spiritomb) FOOTPRINT(Spiritomb)
.levelUpLearnset = sSpiritombLevelUpLearnset, .levelUpLearnset = sSpiritombLevelUpLearnset,
.teachableLearnset = sSpiritombTeachableLearnset, .teachableLearnset = sSpiritombTeachableLearnset,
.eggMoveLearnset = sSpiritombEggMoveLearnset,
}, },
#endif //P_FAMILY_SPIRITOMB #endif //P_FAMILY_SPIRITOMB
@ -3150,6 +3169,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Gible) FOOTPRINT(Gible)
.levelUpLearnset = sGibleLevelUpLearnset, .levelUpLearnset = sGibleLevelUpLearnset,
.teachableLearnset = sGibleTeachableLearnset, .teachableLearnset = sGibleTeachableLearnset,
.eggMoveLearnset = sGibleEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_GABITE}), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_GABITE}),
}, },
@ -3381,6 +3401,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Riolu) FOOTPRINT(Riolu)
.levelUpLearnset = sRioluLevelUpLearnset, .levelUpLearnset = sRioluLevelUpLearnset,
.teachableLearnset = sRioluTeachableLearnset, .teachableLearnset = sRioluTeachableLearnset,
.eggMoveLearnset = sRioluEggMoveLearnset,
.evolutions = EVOLUTION({EVO_FRIENDSHIP_DAY, 0, SPECIES_LUCARIO}), .evolutions = EVOLUTION({EVO_FRIENDSHIP_DAY, 0, SPECIES_LUCARIO}),
}, },
@ -3555,6 +3576,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Hippopotas) FOOTPRINT(Hippopotas)
.levelUpLearnset = sHippopotasLevelUpLearnset, .levelUpLearnset = sHippopotasLevelUpLearnset,
.teachableLearnset = sHippopotasTeachableLearnset, .teachableLearnset = sHippopotasTeachableLearnset,
.eggMoveLearnset = sHippopotasEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_HIPPOWDON}), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_HIPPOWDON}),
}, },
@ -3669,6 +3691,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Skorupi) FOOTPRINT(Skorupi)
.levelUpLearnset = sSkorupiLevelUpLearnset, .levelUpLearnset = sSkorupiLevelUpLearnset,
.teachableLearnset = sSkorupiTeachableLearnset, .teachableLearnset = sSkorupiTeachableLearnset,
.eggMoveLearnset = sSkorupiEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_DRAPION}), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_DRAPION}),
}, },
@ -3782,6 +3805,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Croagunk) FOOTPRINT(Croagunk)
.levelUpLearnset = sCroagunkLevelUpLearnset, .levelUpLearnset = sCroagunkLevelUpLearnset,
.teachableLearnset = sCroagunkTeachableLearnset, .teachableLearnset = sCroagunkTeachableLearnset,
.eggMoveLearnset = sCroagunkEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_TOXICROAK}), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_TOXICROAK}),
}, },
@ -3895,6 +3919,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Carnivine) FOOTPRINT(Carnivine)
.levelUpLearnset = sCarnivineLevelUpLearnset, .levelUpLearnset = sCarnivineLevelUpLearnset,
.teachableLearnset = sCarnivineTeachableLearnset, .teachableLearnset = sCarnivineTeachableLearnset,
.eggMoveLearnset = sCarnivineEggMoveLearnset,
}, },
#endif //P_FAMILY_CARNIVINE #endif //P_FAMILY_CARNIVINE
@ -3953,6 +3978,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Finneon) FOOTPRINT(Finneon)
.levelUpLearnset = sFinneonLevelUpLearnset, .levelUpLearnset = sFinneonLevelUpLearnset,
.teachableLearnset = sFinneonTeachableLearnset, .teachableLearnset = sFinneonTeachableLearnset,
.eggMoveLearnset = sFinneonEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_LUMINEON}), .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_LUMINEON}),
}, },
@ -4069,6 +4095,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
FOOTPRINT(Snover) FOOTPRINT(Snover)
.levelUpLearnset = sSnoverLevelUpLearnset, .levelUpLearnset = sSnoverLevelUpLearnset,
.teachableLearnset = sSnoverTeachableLearnset, .teachableLearnset = sSnoverTeachableLearnset,
.eggMoveLearnset = sSnoverEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_ABOMASNOW}), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_ABOMASNOW}),
}, },

View File

@ -110,6 +110,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Snivy) FOOTPRINT(Snivy)
.levelUpLearnset = sSnivyLevelUpLearnset, .levelUpLearnset = sSnivyLevelUpLearnset,
.teachableLearnset = sSnivyTeachableLearnset, .teachableLearnset = sSnivyTeachableLearnset,
.eggMoveLearnset = sSnivyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_SERVINE}), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_SERVINE}),
}, },
@ -270,6 +271,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Tepig) FOOTPRINT(Tepig)
.levelUpLearnset = sTepigLevelUpLearnset, .levelUpLearnset = sTepigLevelUpLearnset,
.teachableLearnset = sTepigTeachableLearnset, .teachableLearnset = sTepigTeachableLearnset,
.eggMoveLearnset = sTepigEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_PIGNITE}), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_PIGNITE}),
}, },
@ -431,6 +433,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Oshawott) FOOTPRINT(Oshawott)
.levelUpLearnset = sOshawottLevelUpLearnset, .levelUpLearnset = sOshawottLevelUpLearnset,
.teachableLearnset = sOshawottTeachableLearnset, .teachableLearnset = sOshawottTeachableLearnset,
.eggMoveLearnset = sOshawottEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_DEWOTT}), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_DEWOTT}),
}, },
@ -649,6 +652,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Patrat) FOOTPRINT(Patrat)
.levelUpLearnset = sPatratLevelUpLearnset, .levelUpLearnset = sPatratLevelUpLearnset,
.teachableLearnset = sPatratTeachableLearnset, .teachableLearnset = sPatratTeachableLearnset,
.eggMoveLearnset = sPatratEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_WATCHOG}), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_WATCHOG}),
}, },
@ -756,6 +760,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Lillipup) FOOTPRINT(Lillipup)
.levelUpLearnset = sLillipupLevelUpLearnset, .levelUpLearnset = sLillipupLevelUpLearnset,
.teachableLearnset = sLillipupTeachableLearnset, .teachableLearnset = sLillipupTeachableLearnset,
.eggMoveLearnset = sLillipupEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_HERDIER}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_HERDIER}),
}, },
@ -922,6 +927,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Purrloin) FOOTPRINT(Purrloin)
.levelUpLearnset = sPurrloinLevelUpLearnset, .levelUpLearnset = sPurrloinLevelUpLearnset,
.teachableLearnset = sPurrloinTeachableLearnset, .teachableLearnset = sPurrloinTeachableLearnset,
.eggMoveLearnset = sPurrloinEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LIEPARD}), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LIEPARD}),
}, },
@ -1029,6 +1035,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Pansage) FOOTPRINT(Pansage)
.levelUpLearnset = sPansageLevelUpLearnset, .levelUpLearnset = sPansageLevelUpLearnset,
.teachableLearnset = sPansageTeachableLearnset, .teachableLearnset = sPansageTeachableLearnset,
.eggMoveLearnset = sPansageEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_SIMISAGE}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_SIMISAGE}),
}, },
@ -1137,6 +1144,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Pansear) FOOTPRINT(Pansear)
.levelUpLearnset = sPansearLevelUpLearnset, .levelUpLearnset = sPansearLevelUpLearnset,
.teachableLearnset = sPansearTeachableLearnset, .teachableLearnset = sPansearTeachableLearnset,
.eggMoveLearnset = sPansearEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_SIMISEAR}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_SIMISEAR}),
}, },
@ -1245,6 +1253,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Panpour) FOOTPRINT(Panpour)
.levelUpLearnset = sPanpourLevelUpLearnset, .levelUpLearnset = sPanpourLevelUpLearnset,
.teachableLearnset = sPanpourTeachableLearnset, .teachableLearnset = sPanpourTeachableLearnset,
.eggMoveLearnset = sPanpourEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_SIMIPOUR}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_SIMIPOUR}),
}, },
@ -1353,6 +1362,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Munna) FOOTPRINT(Munna)
.levelUpLearnset = sMunnaLevelUpLearnset, .levelUpLearnset = sMunnaLevelUpLearnset,
.teachableLearnset = sMunnaTeachableLearnset, .teachableLearnset = sMunnaTeachableLearnset,
.eggMoveLearnset = sMunnaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_MUSHARNA}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_MUSHARNA}),
}, },
@ -1461,6 +1471,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Pidove) FOOTPRINT(Pidove)
.levelUpLearnset = sPidoveLevelUpLearnset, .levelUpLearnset = sPidoveLevelUpLearnset,
.teachableLearnset = sPidoveTeachableLearnset, .teachableLearnset = sPidoveTeachableLearnset,
.eggMoveLearnset = sPidoveEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 21, SPECIES_TRANQUILL}), .evolutions = EVOLUTION({EVO_LEVEL, 21, SPECIES_TRANQUILL}),
}, },
@ -1635,6 +1646,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Blitzle) FOOTPRINT(Blitzle)
.levelUpLearnset = sBlitzleLevelUpLearnset, .levelUpLearnset = sBlitzleLevelUpLearnset,
.teachableLearnset = sBlitzleTeachableLearnset, .teachableLearnset = sBlitzleTeachableLearnset,
.eggMoveLearnset = sBlitzleEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_ZEBSTRIKA}), .evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_ZEBSTRIKA}),
}, },
@ -1744,6 +1756,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Roggenrola) FOOTPRINT(Roggenrola)
.levelUpLearnset = sRoggenrolaLevelUpLearnset, .levelUpLearnset = sRoggenrolaLevelUpLearnset,
.teachableLearnset = sRoggenrolaTeachableLearnset, .teachableLearnset = sRoggenrolaTeachableLearnset,
.eggMoveLearnset = sRoggenrolaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_BOLDORE}), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_BOLDORE}),
}, },
@ -1917,6 +1930,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Woobat) FOOTPRINT(Woobat)
.levelUpLearnset = sWoobatLevelUpLearnset, .levelUpLearnset = sWoobatLevelUpLearnset,
.teachableLearnset = sWoobatTeachableLearnset, .teachableLearnset = sWoobatTeachableLearnset,
.eggMoveLearnset = sWoobatEggMoveLearnset,
.evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_SWOOBAT}), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_SWOOBAT}),
}, },
@ -2026,6 +2040,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Drilbur) FOOTPRINT(Drilbur)
.levelUpLearnset = sDrilburLevelUpLearnset, .levelUpLearnset = sDrilburLevelUpLearnset,
.teachableLearnset = sDrilburTeachableLearnset, .teachableLearnset = sDrilburTeachableLearnset,
.eggMoveLearnset = sDrilburEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_EXCADRILL}), .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_EXCADRILL}),
}, },
@ -2136,6 +2151,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Audino) FOOTPRINT(Audino)
.levelUpLearnset = sAudinoLevelUpLearnset, .levelUpLearnset = sAudinoLevelUpLearnset,
.teachableLearnset = sAudinoTeachableLearnset, .teachableLearnset = sAudinoTeachableLearnset,
.eggMoveLearnset = sAudinoEggMoveLearnset,
.formSpeciesIdTable = sAudinoFormSpeciesIdTable, .formSpeciesIdTable = sAudinoFormSpeciesIdTable,
.formChangeTable = sAudinoFormChangeTable, .formChangeTable = sAudinoFormChangeTable,
}, },
@ -2194,6 +2210,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.isMegaEvolution = TRUE, .isMegaEvolution = TRUE,
.levelUpLearnset = sAudinoLevelUpLearnset, .levelUpLearnset = sAudinoLevelUpLearnset,
.teachableLearnset = sAudinoTeachableLearnset, .teachableLearnset = sAudinoTeachableLearnset,
.eggMoveLearnset = sAudinoEggMoveLearnset,
.formSpeciesIdTable = sAudinoFormSpeciesIdTable, .formSpeciesIdTable = sAudinoFormSpeciesIdTable,
.formChangeTable = sAudinoFormChangeTable, .formChangeTable = sAudinoFormChangeTable,
}, },
@ -2251,6 +2268,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Timburr) FOOTPRINT(Timburr)
.levelUpLearnset = sTimburrLevelUpLearnset, .levelUpLearnset = sTimburrLevelUpLearnset,
.teachableLearnset = sTimburrTeachableLearnset, .teachableLearnset = sTimburrTeachableLearnset,
.eggMoveLearnset = sTimburrEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_GURDURR}), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_GURDURR}),
}, },
@ -2412,6 +2430,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Tympole) FOOTPRINT(Tympole)
.levelUpLearnset = sTympoleLevelUpLearnset, .levelUpLearnset = sTympoleLevelUpLearnset,
.teachableLearnset = sTympoleTeachableLearnset, .teachableLearnset = sTympoleTeachableLearnset,
.eggMoveLearnset = sTympoleEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_PALPITOAD}), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_PALPITOAD}),
}, },
@ -2690,6 +2709,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Sewaddle) FOOTPRINT(Sewaddle)
.levelUpLearnset = sSewaddleLevelUpLearnset, .levelUpLearnset = sSewaddleLevelUpLearnset,
.teachableLearnset = sSewaddleTeachableLearnset, .teachableLearnset = sSewaddleTeachableLearnset,
.eggMoveLearnset = sSewaddleEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_SWADLOON}), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_SWADLOON}),
}, },
@ -2863,6 +2883,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Venipede) FOOTPRINT(Venipede)
.levelUpLearnset = sVenipedeLevelUpLearnset, .levelUpLearnset = sVenipedeLevelUpLearnset,
.teachableLearnset = sVenipedeTeachableLearnset, .teachableLearnset = sVenipedeTeachableLearnset,
.eggMoveLearnset = sVenipedeEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_WHIRLIPEDE}), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_WHIRLIPEDE}),
}, },
@ -3046,6 +3067,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Cottonee) FOOTPRINT(Cottonee)
.levelUpLearnset = sCottoneeLevelUpLearnset, .levelUpLearnset = sCottoneeLevelUpLearnset,
.teachableLearnset = sCottoneeTeachableLearnset, .teachableLearnset = sCottoneeTeachableLearnset,
.eggMoveLearnset = sCottoneeEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_WHIMSICOTT}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_WHIMSICOTT}),
}, },
@ -3156,6 +3178,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Petilil) FOOTPRINT(Petilil)
.levelUpLearnset = sPetililLevelUpLearnset, .levelUpLearnset = sPetililLevelUpLearnset,
.teachableLearnset = sPetililTeachableLearnset, .teachableLearnset = sPetililTeachableLearnset,
.eggMoveLearnset = sPetililEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_LILLIGANT}, .evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_LILLIGANT},
{EVO_NONE, 0, SPECIES_LILLIGANT_HISUIAN}), {EVO_NONE, 0, SPECIES_LILLIGANT_HISUIAN}),
}, },
@ -3328,6 +3351,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Basculin) FOOTPRINT(Basculin)
.levelUpLearnset = sBasculinLevelUpLearnset, .levelUpLearnset = sBasculinLevelUpLearnset,
.teachableLearnset = sBasculinTeachableLearnset, .teachableLearnset = sBasculinTeachableLearnset,
.eggMoveLearnset = sBasculinEggMoveLearnset,
.formSpeciesIdTable = sBasculinFormSpeciesIdTable, .formSpeciesIdTable = sBasculinFormSpeciesIdTable,
}, },
@ -3383,6 +3407,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Basculin) FOOTPRINT(Basculin)
.levelUpLearnset = sBasculinLevelUpLearnset, .levelUpLearnset = sBasculinLevelUpLearnset,
.teachableLearnset = sBasculinTeachableLearnset, .teachableLearnset = sBasculinTeachableLearnset,
.eggMoveLearnset = sBasculinEggMoveLearnset,
.formSpeciesIdTable = sBasculinFormSpeciesIdTable, .formSpeciesIdTable = sBasculinFormSpeciesIdTable,
}, },
@ -3605,6 +3630,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Sandile) FOOTPRINT(Sandile)
.levelUpLearnset = sSandileLevelUpLearnset, .levelUpLearnset = sSandileLevelUpLearnset,
.teachableLearnset = sSandileTeachableLearnset, .teachableLearnset = sSandileTeachableLearnset,
.eggMoveLearnset = sSandileEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 29, SPECIES_KROKOROK}), .evolutions = EVOLUTION({EVO_LEVEL, 29, SPECIES_KROKOROK}),
}, },
@ -3773,6 +3799,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Darumaka) FOOTPRINT(Darumaka)
.levelUpLearnset = sDarumakaLevelUpLearnset, .levelUpLearnset = sDarumakaLevelUpLearnset,
.teachableLearnset = sDarumakaTeachableLearnset, .teachableLearnset = sDarumakaTeachableLearnset,
.eggMoveLearnset = sDarumakaEggMoveLearnset,
.formSpeciesIdTable = sDarumakaFormSpeciesIdTable, .formSpeciesIdTable = sDarumakaFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_DARMANITAN_STANDARD_MODE}), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_DARMANITAN_STANDARD_MODE}),
}, },
@ -3936,6 +3963,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.isGalarianForm = TRUE, .isGalarianForm = TRUE,
.levelUpLearnset = sDarumakaGalarianLevelUpLearnset, .levelUpLearnset = sDarumakaGalarianLevelUpLearnset,
.teachableLearnset = sDarumakaGalarianTeachableLearnset, .teachableLearnset = sDarumakaGalarianTeachableLearnset,
.eggMoveLearnset = sDarumakaGalarianEggMoveLearnset,
.formSpeciesIdTable = sDarumakaFormSpeciesIdTable, .formSpeciesIdTable = sDarumakaFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE}),
}, },
@ -4104,6 +4132,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Maractus) FOOTPRINT(Maractus)
.levelUpLearnset = sMaractusLevelUpLearnset, .levelUpLearnset = sMaractusLevelUpLearnset,
.teachableLearnset = sMaractusTeachableLearnset, .teachableLearnset = sMaractusTeachableLearnset,
.eggMoveLearnset = sMaractusEggMoveLearnset,
}, },
#endif //P_FAMILY_MARACTUS #endif //P_FAMILY_MARACTUS
@ -4159,6 +4188,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Dwebble) FOOTPRINT(Dwebble)
.levelUpLearnset = sDwebbleLevelUpLearnset, .levelUpLearnset = sDwebbleLevelUpLearnset,
.teachableLearnset = sDwebbleTeachableLearnset, .teachableLearnset = sDwebbleTeachableLearnset,
.eggMoveLearnset = sDwebbleEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_CRUSTLE}), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_CRUSTLE}),
}, },
@ -4268,6 +4298,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Scraggy) FOOTPRINT(Scraggy)
.levelUpLearnset = sScraggyLevelUpLearnset, .levelUpLearnset = sScraggyLevelUpLearnset,
.teachableLearnset = sScraggyTeachableLearnset, .teachableLearnset = sScraggyTeachableLearnset,
.eggMoveLearnset = sScraggyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_SCRAFTY}), .evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_SCRAFTY}),
}, },
@ -4378,6 +4409,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Sigilyph) FOOTPRINT(Sigilyph)
.levelUpLearnset = sSigilyphLevelUpLearnset, .levelUpLearnset = sSigilyphLevelUpLearnset,
.teachableLearnset = sSigilyphTeachableLearnset, .teachableLearnset = sSigilyphTeachableLearnset,
.eggMoveLearnset = sSigilyphEggMoveLearnset,
}, },
#endif //P_FAMILY_SIGILYPH #endif //P_FAMILY_SIGILYPH
@ -4434,6 +4466,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Yamask) FOOTPRINT(Yamask)
.levelUpLearnset = sYamaskLevelUpLearnset, .levelUpLearnset = sYamaskLevelUpLearnset,
.teachableLearnset = sYamaskTeachableLearnset, .teachableLearnset = sYamaskTeachableLearnset,
.eggMoveLearnset = sYamaskEggMoveLearnset,
.formSpeciesIdTable = sYamaskFormSpeciesIdTable, .formSpeciesIdTable = sYamaskFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_COFAGRIGUS}), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_COFAGRIGUS}),
}, },
@ -4544,6 +4577,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.isGalarianForm = TRUE, .isGalarianForm = TRUE,
.levelUpLearnset = sYamaskGalarianLevelUpLearnset, .levelUpLearnset = sYamaskGalarianLevelUpLearnset,
.teachableLearnset = sYamaskGalarianTeachableLearnset, .teachableLearnset = sYamaskGalarianTeachableLearnset,
.eggMoveLearnset = sYamaskGalarianEggMoveLearnset,
.formSpeciesIdTable = sYamaskFormSpeciesIdTable, .formSpeciesIdTable = sYamaskFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_SCRIPT_TRIGGER_DMG, 49, SPECIES_RUNERIGUS}), .evolutions = EVOLUTION({EVO_SCRIPT_TRIGGER_DMG, 49, SPECIES_RUNERIGUS}),
}, },
@ -4653,6 +4687,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Tirtouga) FOOTPRINT(Tirtouga)
.levelUpLearnset = sTirtougaLevelUpLearnset, .levelUpLearnset = sTirtougaLevelUpLearnset,
.teachableLearnset = sTirtougaTeachableLearnset, .teachableLearnset = sTirtougaTeachableLearnset,
.eggMoveLearnset = sTirtougaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_CARRACOSTA}), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_CARRACOSTA}),
}, },
@ -4760,6 +4795,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Archen) FOOTPRINT(Archen)
.levelUpLearnset = sArchenLevelUpLearnset, .levelUpLearnset = sArchenLevelUpLearnset,
.teachableLearnset = sArchenTeachableLearnset, .teachableLearnset = sArchenTeachableLearnset,
.eggMoveLearnset = sArchenEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_ARCHEOPS}), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_ARCHEOPS}),
}, },
@ -4869,6 +4905,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Trubbish) FOOTPRINT(Trubbish)
.levelUpLearnset = sTrubbishLevelUpLearnset, .levelUpLearnset = sTrubbishLevelUpLearnset,
.teachableLearnset = sTrubbishTeachableLearnset, .teachableLearnset = sTrubbishTeachableLearnset,
.eggMoveLearnset = sTrubbishEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_GARBODOR}), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_GARBODOR}),
}, },
@ -5041,6 +5078,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Zorua) FOOTPRINT(Zorua)
.levelUpLearnset = sZoruaLevelUpLearnset, .levelUpLearnset = sZoruaLevelUpLearnset,
.teachableLearnset = sZoruaTeachableLearnset, .teachableLearnset = sZoruaTeachableLearnset,
.eggMoveLearnset = sZoruaEggMoveLearnset,
.formSpeciesIdTable = sZoruaFormSpeciesIdTable, .formSpeciesIdTable = sZoruaFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ZOROARK}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ZOROARK}),
}, },
@ -5261,6 +5299,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Minccino) FOOTPRINT(Minccino)
.levelUpLearnset = sMinccinoLevelUpLearnset, .levelUpLearnset = sMinccinoLevelUpLearnset,
.teachableLearnset = sMinccinoTeachableLearnset, .teachableLearnset = sMinccinoTeachableLearnset,
.eggMoveLearnset = sMinccinoEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_CINCCINO}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_CINCCINO}),
}, },
@ -5369,6 +5408,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Gothita) FOOTPRINT(Gothita)
.levelUpLearnset = sGothitaLevelUpLearnset, .levelUpLearnset = sGothitaLevelUpLearnset,
.teachableLearnset = sGothitaTeachableLearnset, .teachableLearnset = sGothitaTeachableLearnset,
.eggMoveLearnset = sGothitaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_GOTHORITA}), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_GOTHORITA}),
}, },
@ -5531,6 +5571,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Solosis) FOOTPRINT(Solosis)
.levelUpLearnset = sSolosisLevelUpLearnset, .levelUpLearnset = sSolosisLevelUpLearnset,
.teachableLearnset = sSolosisTeachableLearnset, .teachableLearnset = sSolosisTeachableLearnset,
.eggMoveLearnset = sSolosisEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_DUOSION}), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_DUOSION}),
}, },
@ -5693,6 +5734,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Ducklett) FOOTPRINT(Ducklett)
.levelUpLearnset = sDucklettLevelUpLearnset, .levelUpLearnset = sDucklettLevelUpLearnset,
.teachableLearnset = sDucklettTeachableLearnset, .teachableLearnset = sDucklettTeachableLearnset,
.eggMoveLearnset = sDucklettEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_SWANNA}), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_SWANNA}),
}, },
@ -5801,6 +5843,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Vanillite) FOOTPRINT(Vanillite)
.levelUpLearnset = sVanilliteLevelUpLearnset, .levelUpLearnset = sVanilliteLevelUpLearnset,
.teachableLearnset = sVanilliteTeachableLearnset, .teachableLearnset = sVanilliteTeachableLearnset,
.eggMoveLearnset = sVanilliteEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_VANILLISH}), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_VANILLISH}),
}, },
@ -5963,6 +6006,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Deerling) FOOTPRINT(Deerling)
.levelUpLearnset = sDeerlingLevelUpLearnset, .levelUpLearnset = sDeerlingLevelUpLearnset,
.teachableLearnset = sDeerlingTeachableLearnset, .teachableLearnset = sDeerlingTeachableLearnset,
.eggMoveLearnset = sDeerlingEggMoveLearnset,
.formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .formSpeciesIdTable = sDeerlingFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_SPRING}), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_SPRING}),
}, },
@ -6017,6 +6061,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Deerling) FOOTPRINT(Deerling)
.levelUpLearnset = sDeerlingLevelUpLearnset, .levelUpLearnset = sDeerlingLevelUpLearnset,
.teachableLearnset = sDeerlingTeachableLearnset, .teachableLearnset = sDeerlingTeachableLearnset,
.eggMoveLearnset = sDeerlingEggMoveLearnset,
.formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .formSpeciesIdTable = sDeerlingFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_SUMMER}), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_SUMMER}),
}, },
@ -6071,6 +6116,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Deerling) FOOTPRINT(Deerling)
.levelUpLearnset = sDeerlingLevelUpLearnset, .levelUpLearnset = sDeerlingLevelUpLearnset,
.teachableLearnset = sDeerlingTeachableLearnset, .teachableLearnset = sDeerlingTeachableLearnset,
.eggMoveLearnset = sDeerlingEggMoveLearnset,
.formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .formSpeciesIdTable = sDeerlingFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_AUTUMN}), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_AUTUMN}),
}, },
@ -6125,6 +6171,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Deerling) FOOTPRINT(Deerling)
.levelUpLearnset = sDeerlingLevelUpLearnset, .levelUpLearnset = sDeerlingLevelUpLearnset,
.teachableLearnset = sDeerlingTeachableLearnset, .teachableLearnset = sDeerlingTeachableLearnset,
.eggMoveLearnset = sDeerlingEggMoveLearnset,
.formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .formSpeciesIdTable = sDeerlingFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_WINTER}), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_WINTER}),
}, },
@ -6395,6 +6442,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Emolga) FOOTPRINT(Emolga)
.levelUpLearnset = sEmolgaLevelUpLearnset, .levelUpLearnset = sEmolgaLevelUpLearnset,
.teachableLearnset = sEmolgaTeachableLearnset, .teachableLearnset = sEmolgaTeachableLearnset,
.eggMoveLearnset = sEmolgaEggMoveLearnset,
}, },
#endif //P_FAMILY_EMOLGA #endif //P_FAMILY_EMOLGA
@ -6449,6 +6497,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Karrablast) FOOTPRINT(Karrablast)
.levelUpLearnset = sKarrablastLevelUpLearnset, .levelUpLearnset = sKarrablastLevelUpLearnset,
.teachableLearnset = sKarrablastTeachableLearnset, .teachableLearnset = sKarrablastTeachableLearnset,
.eggMoveLearnset = sKarrablastEggMoveLearnset,
.evolutions = EVOLUTION({EVO_TRADE_SPECIFIC_MON, SPECIES_SHELMET, SPECIES_ESCAVALIER}), .evolutions = EVOLUTION({EVO_TRADE_SPECIFIC_MON, SPECIES_SHELMET, SPECIES_ESCAVALIER}),
}, },
@ -6558,6 +6607,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Foongus) FOOTPRINT(Foongus)
.levelUpLearnset = sFoongusLevelUpLearnset, .levelUpLearnset = sFoongusLevelUpLearnset,
.teachableLearnset = sFoongusTeachableLearnset, .teachableLearnset = sFoongusTeachableLearnset,
.eggMoveLearnset = sFoongusEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_AMOONGUSS}), .evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_AMOONGUSS}),
}, },
@ -6676,6 +6726,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Frillish) FOOTPRINT(Frillish)
.levelUpLearnset = sFrillishLevelUpLearnset, .levelUpLearnset = sFrillishLevelUpLearnset,
.teachableLearnset = sFrillishTeachableLearnset, .teachableLearnset = sFrillishTeachableLearnset,
.eggMoveLearnset = sFrillishEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_JELLICENT}), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_JELLICENT}),
}, },
@ -6791,6 +6842,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Alomomola) FOOTPRINT(Alomomola)
.levelUpLearnset = sAlomomolaLevelUpLearnset, .levelUpLearnset = sAlomomolaLevelUpLearnset,
.teachableLearnset = sAlomomolaTeachableLearnset, .teachableLearnset = sAlomomolaTeachableLearnset,
.eggMoveLearnset = sAlomomolaEggMoveLearnset,
}, },
#endif //P_FAMILY_ALOMOMOLA #endif //P_FAMILY_ALOMOMOLA
@ -6845,6 +6897,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Joltik) FOOTPRINT(Joltik)
.levelUpLearnset = sJoltikLevelUpLearnset, .levelUpLearnset = sJoltikLevelUpLearnset,
.teachableLearnset = sJoltikTeachableLearnset, .teachableLearnset = sJoltikTeachableLearnset,
.eggMoveLearnset = sJoltikEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_GALVANTULA}), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_GALVANTULA}),
}, },
@ -6953,6 +7006,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Ferroseed) FOOTPRINT(Ferroseed)
.levelUpLearnset = sFerroseedLevelUpLearnset, .levelUpLearnset = sFerroseedLevelUpLearnset,
.teachableLearnset = sFerroseedTeachableLearnset, .teachableLearnset = sFerroseedTeachableLearnset,
.eggMoveLearnset = sFerroseedEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_FERROTHORN}), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_FERROTHORN}),
}, },
@ -7392,6 +7446,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Elgyem) FOOTPRINT(Elgyem)
.levelUpLearnset = sElgyemLevelUpLearnset, .levelUpLearnset = sElgyemLevelUpLearnset,
.teachableLearnset = sElgyemTeachableLearnset, .teachableLearnset = sElgyemTeachableLearnset,
.eggMoveLearnset = sElgyemEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_BEHEEYEM}), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_BEHEEYEM}),
}, },
@ -7504,6 +7559,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Litwick) FOOTPRINT(Litwick)
.levelUpLearnset = sLitwickLevelUpLearnset, .levelUpLearnset = sLitwickLevelUpLearnset,
.teachableLearnset = sLitwickTeachableLearnset, .teachableLearnset = sLitwickTeachableLearnset,
.eggMoveLearnset = sLitwickEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 41, SPECIES_LAMPENT}), .evolutions = EVOLUTION({EVO_LEVEL, 41, SPECIES_LAMPENT}),
}, },
@ -7674,6 +7730,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Axew) FOOTPRINT(Axew)
.levelUpLearnset = sAxewLevelUpLearnset, .levelUpLearnset = sAxewLevelUpLearnset,
.teachableLearnset = sAxewTeachableLearnset, .teachableLearnset = sAxewTeachableLearnset,
.eggMoveLearnset = sAxewEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_FRAXURE}), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_FRAXURE}),
}, },
@ -7834,6 +7891,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Cubchoo) FOOTPRINT(Cubchoo)
.levelUpLearnset = sCubchooLevelUpLearnset, .levelUpLearnset = sCubchooLevelUpLearnset,
.teachableLearnset = sCubchooTeachableLearnset, .teachableLearnset = sCubchooTeachableLearnset,
.eggMoveLearnset = sCubchooEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_BEARTIC}), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_BEARTIC}),
}, },
@ -7997,6 +8055,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Shelmet) FOOTPRINT(Shelmet)
.levelUpLearnset = sShelmetLevelUpLearnset, .levelUpLearnset = sShelmetLevelUpLearnset,
.teachableLearnset = sShelmetTeachableLearnset, .teachableLearnset = sShelmetTeachableLearnset,
.eggMoveLearnset = sShelmetEggMoveLearnset,
.evolutions = EVOLUTION({EVO_TRADE_SPECIFIC_MON, SPECIES_KARRABLAST, SPECIES_ACCELGOR}), .evolutions = EVOLUTION({EVO_TRADE_SPECIFIC_MON, SPECIES_KARRABLAST, SPECIES_ACCELGOR}),
}, },
@ -8105,6 +8164,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Stunfisk) FOOTPRINT(Stunfisk)
.levelUpLearnset = sStunfiskLevelUpLearnset, .levelUpLearnset = sStunfiskLevelUpLearnset,
.teachableLearnset = sStunfiskTeachableLearnset, .teachableLearnset = sStunfiskTeachableLearnset,
.eggMoveLearnset = sStunfiskEggMoveLearnset,
.formSpeciesIdTable = sStunfiskFormSpeciesIdTable, .formSpeciesIdTable = sStunfiskFormSpeciesIdTable,
}, },
@ -8160,6 +8220,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.isGalarianForm = TRUE, .isGalarianForm = TRUE,
.levelUpLearnset = sStunfiskGalarianLevelUpLearnset, .levelUpLearnset = sStunfiskGalarianLevelUpLearnset,
.teachableLearnset = sStunfiskGalarianTeachableLearnset, .teachableLearnset = sStunfiskGalarianTeachableLearnset,
.eggMoveLearnset = sStunfiskGalarianEggMoveLearnset,
.formSpeciesIdTable = sStunfiskFormSpeciesIdTable, .formSpeciesIdTable = sStunfiskFormSpeciesIdTable,
}, },
#endif //P_GALARIAN_FORMS #endif //P_GALARIAN_FORMS
@ -8216,6 +8277,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Mienfoo) FOOTPRINT(Mienfoo)
.levelUpLearnset = sMienfooLevelUpLearnset, .levelUpLearnset = sMienfooLevelUpLearnset,
.teachableLearnset = sMienfooTeachableLearnset, .teachableLearnset = sMienfooTeachableLearnset,
.eggMoveLearnset = sMienfooEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_MIENSHAO}), .evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_MIENSHAO}),
}, },
@ -8324,6 +8386,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Druddigon) FOOTPRINT(Druddigon)
.levelUpLearnset = sDruddigonLevelUpLearnset, .levelUpLearnset = sDruddigonLevelUpLearnset,
.teachableLearnset = sDruddigonTeachableLearnset, .teachableLearnset = sDruddigonTeachableLearnset,
.eggMoveLearnset = sDruddigonEggMoveLearnset,
}, },
#endif //P_FAMILY_DRUDDIGON #endif //P_FAMILY_DRUDDIGON
@ -8489,6 +8552,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Pawniard) FOOTPRINT(Pawniard)
.levelUpLearnset = sPawniardLevelUpLearnset, .levelUpLearnset = sPawniardLevelUpLearnset,
.teachableLearnset = sPawniardTeachableLearnset, .teachableLearnset = sPawniardTeachableLearnset,
.eggMoveLearnset = sPawniardEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 52, SPECIES_BISHARP}), .evolutions = EVOLUTION({EVO_LEVEL, 52, SPECIES_BISHARP}),
}, },
@ -8651,6 +8715,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Bouffalant) FOOTPRINT(Bouffalant)
.levelUpLearnset = sBouffalantLevelUpLearnset, .levelUpLearnset = sBouffalantLevelUpLearnset,
.teachableLearnset = sBouffalantTeachableLearnset, .teachableLearnset = sBouffalantTeachableLearnset,
.eggMoveLearnset = sBouffalantEggMoveLearnset,
}, },
#endif //P_FAMILY_BOUFFALANT #endif //P_FAMILY_BOUFFALANT
@ -8871,6 +8936,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Vullaby) FOOTPRINT(Vullaby)
.levelUpLearnset = sVullabyLevelUpLearnset, .levelUpLearnset = sVullabyLevelUpLearnset,
.teachableLearnset = sVullabyTeachableLearnset, .teachableLearnset = sVullabyTeachableLearnset,
.eggMoveLearnset = sVullabyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 54, SPECIES_MANDIBUZZ}), .evolutions = EVOLUTION({EVO_LEVEL, 54, SPECIES_MANDIBUZZ}),
}, },
@ -8978,6 +9044,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Heatmor) FOOTPRINT(Heatmor)
.levelUpLearnset = sHeatmorLevelUpLearnset, .levelUpLearnset = sHeatmorLevelUpLearnset,
.teachableLearnset = sHeatmorTeachableLearnset, .teachableLearnset = sHeatmorTeachableLearnset,
.eggMoveLearnset = sHeatmorEggMoveLearnset,
}, },
#endif //P_FAMILY_HEATMOR #endif //P_FAMILY_HEATMOR
@ -9032,6 +9099,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Durant) FOOTPRINT(Durant)
.levelUpLearnset = sDurantLevelUpLearnset, .levelUpLearnset = sDurantLevelUpLearnset,
.teachableLearnset = sDurantTeachableLearnset, .teachableLearnset = sDurantTeachableLearnset,
.eggMoveLearnset = sDurantEggMoveLearnset,
}, },
#endif //P_FAMILY_DURANT #endif //P_FAMILY_DURANT
@ -9086,6 +9154,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Deino) FOOTPRINT(Deino)
.levelUpLearnset = sDeinoLevelUpLearnset, .levelUpLearnset = sDeinoLevelUpLearnset,
.teachableLearnset = sDeinoTeachableLearnset, .teachableLearnset = sDeinoTeachableLearnset,
.eggMoveLearnset = sDeinoEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_ZWEILOUS}), .evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_ZWEILOUS}),
}, },
@ -9247,6 +9316,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
FOOTPRINT(Larvesta) FOOTPRINT(Larvesta)
.levelUpLearnset = sLarvestaLevelUpLearnset, .levelUpLearnset = sLarvestaLevelUpLearnset,
.teachableLearnset = sLarvestaTeachableLearnset, .teachableLearnset = sLarvestaTeachableLearnset,
.eggMoveLearnset = sLarvestaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 59, SPECIES_VOLCARONA}), .evolutions = EVOLUTION({EVO_LEVEL, 59, SPECIES_VOLCARONA}),
}, },

View File

@ -54,6 +54,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Chespin) FOOTPRINT(Chespin)
.levelUpLearnset = sChespinLevelUpLearnset, .levelUpLearnset = sChespinLevelUpLearnset,
.teachableLearnset = sChespinTeachableLearnset, .teachableLearnset = sChespinTeachableLearnset,
.eggMoveLearnset = sChespinEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_QUILLADIN}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_QUILLADIN}),
}, },
@ -214,6 +215,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Fennekin) FOOTPRINT(Fennekin)
.levelUpLearnset = sFennekinLevelUpLearnset, .levelUpLearnset = sFennekinLevelUpLearnset,
.teachableLearnset = sFennekinTeachableLearnset, .teachableLearnset = sFennekinTeachableLearnset,
.eggMoveLearnset = sFennekinEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_BRAIXEN}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_BRAIXEN}),
}, },
@ -374,6 +376,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Froakie) FOOTPRINT(Froakie)
.levelUpLearnset = sFroakieLevelUpLearnset, .levelUpLearnset = sFroakieLevelUpLearnset,
.teachableLearnset = sFroakieTeachableLearnset, .teachableLearnset = sFroakieTeachableLearnset,
.eggMoveLearnset = sFroakieEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_FROGADIER}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_FROGADIER}),
}, },
@ -638,6 +641,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Bunnelby) FOOTPRINT(Bunnelby)
.levelUpLearnset = sBunnelbyLevelUpLearnset, .levelUpLearnset = sBunnelbyLevelUpLearnset,
.teachableLearnset = sBunnelbyTeachableLearnset, .teachableLearnset = sBunnelbyTeachableLearnset,
.eggMoveLearnset = sBunnelbyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_DIGGERSBY}), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_DIGGERSBY}),
}, },
@ -745,6 +749,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Fletchling) FOOTPRINT(Fletchling)
.levelUpLearnset = sFletchlingLevelUpLearnset, .levelUpLearnset = sFletchlingLevelUpLearnset,
.teachableLearnset = sFletchlingTeachableLearnset, .teachableLearnset = sFletchlingTeachableLearnset,
.eggMoveLearnset = sFletchlingEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_FLETCHINDER}), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_FLETCHINDER}),
}, },
@ -904,6 +909,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.tmIlliterate = TRUE, \ .tmIlliterate = TRUE, \
.levelUpLearnset = sScatterbugLevelUpLearnset, \ .levelUpLearnset = sScatterbugLevelUpLearnset, \
.teachableLearnset = sScatterbugTeachableLearnset, \ .teachableLearnset = sScatterbugTeachableLearnset, \
.eggMoveLearnset = sScatterbugEggMoveLearnset, \
.formSpeciesIdTable = sScatterbugFormSpeciesIdTable, \ .formSpeciesIdTable = sScatterbugFormSpeciesIdTable, \
.evolutions = EVOLUTION({EVO_LEVEL, 9, SPECIES_SPEWPA_##evolution}), \ .evolutions = EVOLUTION({EVO_LEVEL, 9, SPECIES_SPEWPA_##evolution}), \
} \ } \
@ -1283,6 +1289,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Litleo) FOOTPRINT(Litleo)
.levelUpLearnset = sLitleoLevelUpLearnset, .levelUpLearnset = sLitleoLevelUpLearnset,
.teachableLearnset = sLitleoTeachableLearnset, .teachableLearnset = sLitleoTeachableLearnset,
.eggMoveLearnset = sLitleoEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_PYROAR}), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_PYROAR}),
}, },
@ -1391,6 +1398,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Flabebe) \ FOOTPRINT(Flabebe) \
.levelUpLearnset = sFlabebeLevelUpLearnset, \ .levelUpLearnset = sFlabebeLevelUpLearnset, \
.teachableLearnset = sFlabebeTeachableLearnset, \ .teachableLearnset = sFlabebeTeachableLearnset, \
.eggMoveLearnset = sFlabebeEggMoveLearnset, \
.formSpeciesIdTable = sFlabebeFormSpeciesIdTable, \ .formSpeciesIdTable = sFlabebeFormSpeciesIdTable, \
.evolutions = EVOLUTION({EVO_LEVEL, 19, SPECIES_FLOETTE_ ##FORM##_FLOWER}) .evolutions = EVOLUTION({EVO_LEVEL, 19, SPECIES_FLOETTE_ ##FORM##_FLOWER})
@ -1707,6 +1715,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Skiddo) FOOTPRINT(Skiddo)
.levelUpLearnset = sSkiddoLevelUpLearnset, .levelUpLearnset = sSkiddoLevelUpLearnset,
.teachableLearnset = sSkiddoTeachableLearnset, .teachableLearnset = sSkiddoTeachableLearnset,
.eggMoveLearnset = sSkiddoEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_GOGOAT}), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_GOGOAT}),
}, },
@ -1815,6 +1824,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Pancham) FOOTPRINT(Pancham)
.levelUpLearnset = sPanchamLevelUpLearnset, .levelUpLearnset = sPanchamLevelUpLearnset,
.teachableLearnset = sPanchamTeachableLearnset, .teachableLearnset = sPanchamTeachableLearnset,
.eggMoveLearnset = sPanchamEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL_DARK_TYPE_MON_IN_PARTY, 32, SPECIES_PANGORO}), .evolutions = EVOLUTION({EVO_LEVEL_DARK_TYPE_MON_IN_PARTY, 32, SPECIES_PANGORO}),
}, },
@ -1920,6 +1930,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Furfrou) \ FOOTPRINT(Furfrou) \
.levelUpLearnset = sFurfrouLevelUpLearnset, \ .levelUpLearnset = sFurfrouLevelUpLearnset, \
.teachableLearnset = sFurfrouTeachableLearnset, \ .teachableLearnset = sFurfrouTeachableLearnset, \
.eggMoveLearnset = sFurfrouEggMoveLearnset, \
.formSpeciesIdTable = sFurfrouFormSpeciesIdTable, \ .formSpeciesIdTable = sFurfrouFormSpeciesIdTable, \
} }
@ -1986,6 +1997,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Espurr) FOOTPRINT(Espurr)
.levelUpLearnset = sEspurrLevelUpLearnset, .levelUpLearnset = sEspurrLevelUpLearnset,
.teachableLearnset = sEspurrTeachableLearnset, .teachableLearnset = sEspurrTeachableLearnset,
.eggMoveLearnset = sEspurrEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL_MALE, 25, SPECIES_MEOWSTIC_MALE}, .evolutions = EVOLUTION({EVO_LEVEL_MALE, 25, SPECIES_MEOWSTIC_MALE},
{EVO_LEVEL_FEMALE, 25, SPECIES_MEOWSTIC_FEMALE}), {EVO_LEVEL_FEMALE, 25, SPECIES_MEOWSTIC_FEMALE}),
}, },
@ -2149,6 +2161,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Honedge) FOOTPRINT(Honedge)
.levelUpLearnset = sHonedgeLevelUpLearnset, .levelUpLearnset = sHonedgeLevelUpLearnset,
.teachableLearnset = sHonedgeTeachableLearnset, .teachableLearnset = sHonedgeTeachableLearnset,
.eggMoveLearnset = sHonedgeEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_DOUBLADE}), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_DOUBLADE}),
}, },
@ -2378,6 +2391,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Spritzee) FOOTPRINT(Spritzee)
.levelUpLearnset = sSpritzeeLevelUpLearnset, .levelUpLearnset = sSpritzeeLevelUpLearnset,
.teachableLearnset = sSpritzeeTeachableLearnset, .teachableLearnset = sSpritzeeTeachableLearnset,
.eggMoveLearnset = sSpritzeeEggMoveLearnset,
.evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_SACHET, SPECIES_AROMATISSE}, .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_SACHET, SPECIES_AROMATISSE},
{EVO_ITEM, ITEM_SACHET, SPECIES_AROMATISSE}), {EVO_ITEM, ITEM_SACHET, SPECIES_AROMATISSE}),
}, },
@ -2486,6 +2500,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Swirlix) FOOTPRINT(Swirlix)
.levelUpLearnset = sSwirlixLevelUpLearnset, .levelUpLearnset = sSwirlixLevelUpLearnset,
.teachableLearnset = sSwirlixTeachableLearnset, .teachableLearnset = sSwirlixTeachableLearnset,
.eggMoveLearnset = sSwirlixEggMoveLearnset,
.evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_WHIPPED_DREAM, SPECIES_SLURPUFF}, .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_WHIPPED_DREAM, SPECIES_SLURPUFF},
{EVO_ITEM, ITEM_WHIPPED_DREAM, SPECIES_SLURPUFF}), {EVO_ITEM, ITEM_WHIPPED_DREAM, SPECIES_SLURPUFF}),
}, },
@ -2595,6 +2610,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Inkay) FOOTPRINT(Inkay)
.levelUpLearnset = sInkayLevelUpLearnset, .levelUpLearnset = sInkayLevelUpLearnset,
.teachableLearnset = sInkayTeachableLearnset, .teachableLearnset = sInkayTeachableLearnset,
.eggMoveLearnset = sInkayEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MALAMAR}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MALAMAR}),
}, },
@ -2702,6 +2718,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Binacle) FOOTPRINT(Binacle)
.levelUpLearnset = sBinacleLevelUpLearnset, .levelUpLearnset = sBinacleLevelUpLearnset,
.teachableLearnset = sBinacleTeachableLearnset, .teachableLearnset = sBinacleTeachableLearnset,
.eggMoveLearnset = sBinacleEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_BARBARACLE}), .evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_BARBARACLE}),
}, },
@ -2810,6 +2827,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Skrelp) FOOTPRINT(Skrelp)
.levelUpLearnset = sSkrelpLevelUpLearnset, .levelUpLearnset = sSkrelpLevelUpLearnset,
.teachableLearnset = sSkrelpTeachableLearnset, .teachableLearnset = sSkrelpTeachableLearnset,
.eggMoveLearnset = sSkrelpEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 48, SPECIES_DRAGALGE}), .evolutions = EVOLUTION({EVO_LEVEL, 48, SPECIES_DRAGALGE}),
}, },
@ -2918,6 +2936,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Clauncher) FOOTPRINT(Clauncher)
.levelUpLearnset = sClauncherLevelUpLearnset, .levelUpLearnset = sClauncherLevelUpLearnset,
.teachableLearnset = sClauncherTeachableLearnset, .teachableLearnset = sClauncherTeachableLearnset,
.eggMoveLearnset = sClauncherEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_CLAWITZER}), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_CLAWITZER}),
}, },
@ -3026,6 +3045,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Helioptile) FOOTPRINT(Helioptile)
.levelUpLearnset = sHelioptileLevelUpLearnset, .levelUpLearnset = sHelioptileLevelUpLearnset,
.teachableLearnset = sHelioptileTeachableLearnset, .teachableLearnset = sHelioptileTeachableLearnset,
.eggMoveLearnset = sHelioptileEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_HELIOLISK}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_HELIOLISK}),
}, },
@ -3134,6 +3154,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Tyrunt) FOOTPRINT(Tyrunt)
.levelUpLearnset = sTyruntLevelUpLearnset, .levelUpLearnset = sTyruntLevelUpLearnset,
.teachableLearnset = sTyruntTeachableLearnset, .teachableLearnset = sTyruntTeachableLearnset,
.eggMoveLearnset = sTyruntEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL_DAY, 39, SPECIES_TYRANTRUM}), .evolutions = EVOLUTION({EVO_LEVEL_DAY, 39, SPECIES_TYRANTRUM}),
}, },
@ -3241,6 +3262,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Amaura) FOOTPRINT(Amaura)
.levelUpLearnset = sAmauraLevelUpLearnset, .levelUpLearnset = sAmauraLevelUpLearnset,
.teachableLearnset = sAmauraTeachableLearnset, .teachableLearnset = sAmauraTeachableLearnset,
.eggMoveLearnset = sAmauraEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 39, SPECIES_AURORUS}), .evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 39, SPECIES_AURORUS}),
}, },
@ -3353,6 +3375,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Hawlucha) FOOTPRINT(Hawlucha)
.levelUpLearnset = sHawluchaLevelUpLearnset, .levelUpLearnset = sHawluchaLevelUpLearnset,
.teachableLearnset = sHawluchaTeachableLearnset, .teachableLearnset = sHawluchaTeachableLearnset,
.eggMoveLearnset = sHawluchaEggMoveLearnset,
}, },
#endif //P_FAMILY_HAWLUCHA #endif //P_FAMILY_HAWLUCHA
@ -3407,6 +3430,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Dedenne) FOOTPRINT(Dedenne)
.levelUpLearnset = sDedenneLevelUpLearnset, .levelUpLearnset = sDedenneLevelUpLearnset,
.teachableLearnset = sDedenneTeachableLearnset, .teachableLearnset = sDedenneTeachableLearnset,
.eggMoveLearnset = sDedenneEggMoveLearnset,
}, },
#endif //P_FAMILY_DEDENNE #endif //P_FAMILY_DEDENNE
@ -3518,6 +3542,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Goomy) FOOTPRINT(Goomy)
.levelUpLearnset = sGoomyLevelUpLearnset, .levelUpLearnset = sGoomyLevelUpLearnset,
.teachableLearnset = sGoomyTeachableLearnset, .teachableLearnset = sGoomyTeachableLearnset,
.eggMoveLearnset = sGoomyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_SLIGGOO}, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_SLIGGOO},
{EVO_NONE, 0, SPECIES_SLIGGOO_HISUIAN}), {EVO_NONE, 0, SPECIES_SLIGGOO_HISUIAN}),
}, },
@ -3798,6 +3823,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Klefki) FOOTPRINT(Klefki)
.levelUpLearnset = sKlefkiLevelUpLearnset, .levelUpLearnset = sKlefkiLevelUpLearnset,
.teachableLearnset = sKlefkiTeachableLearnset, .teachableLearnset = sKlefkiTeachableLearnset,
.eggMoveLearnset = sKlefkiEggMoveLearnset,
}, },
#endif //P_FAMILY_KLEFKI #endif //P_FAMILY_KLEFKI
@ -3853,6 +3879,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Phantump) FOOTPRINT(Phantump)
.levelUpLearnset = sPhantumpLevelUpLearnset, .levelUpLearnset = sPhantumpLevelUpLearnset,
.teachableLearnset = sPhantumpTeachableLearnset, .teachableLearnset = sPhantumpTeachableLearnset,
.eggMoveLearnset = sPhantumpEggMoveLearnset,
.evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_TREVENANT}, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_TREVENANT},
{EVO_ITEM, ITEM_LINKING_CORD, SPECIES_TREVENANT}), {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_TREVENANT}),
}, },
@ -3961,6 +3988,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Pumpkaboo) FOOTPRINT(Pumpkaboo)
.levelUpLearnset = sPumpkabooLevelUpLearnset, .levelUpLearnset = sPumpkabooLevelUpLearnset,
.teachableLearnset = sPumpkabooTeachableLearnset, .teachableLearnset = sPumpkabooTeachableLearnset,
.eggMoveLearnset = sPumpkabooEggMoveLearnset,
.formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOURGEIST_AVERAGE}, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOURGEIST_AVERAGE},
{EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_AVERAGE}), {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_AVERAGE}),
@ -4015,6 +4043,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Pumpkaboo) FOOTPRINT(Pumpkaboo)
.levelUpLearnset = sPumpkabooLevelUpLearnset, .levelUpLearnset = sPumpkabooLevelUpLearnset,
.teachableLearnset = sPumpkabooTeachableLearnset, .teachableLearnset = sPumpkabooTeachableLearnset,
.eggMoveLearnset = sPumpkabooEggMoveLearnset,
.formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOURGEIST_SMALL}, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOURGEIST_SMALL},
{EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_SMALL}), {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_SMALL}),
@ -4069,6 +4098,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Pumpkaboo) FOOTPRINT(Pumpkaboo)
.levelUpLearnset = sPumpkabooLevelUpLearnset, .levelUpLearnset = sPumpkabooLevelUpLearnset,
.teachableLearnset = sPumpkabooTeachableLearnset, .teachableLearnset = sPumpkabooTeachableLearnset,
.eggMoveLearnset = sPumpkabooEggMoveLearnset,
.formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOURGEIST_LARGE}, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOURGEIST_LARGE},
{EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_LARGE}), {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_LARGE}),
@ -4125,6 +4155,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Pumpkaboo) FOOTPRINT(Pumpkaboo)
.levelUpLearnset = sPumpkabooLevelUpLearnset, .levelUpLearnset = sPumpkabooLevelUpLearnset,
.teachableLearnset = sPumpkabooTeachableLearnset, .teachableLearnset = sPumpkabooTeachableLearnset,
.eggMoveLearnset = sPumpkabooEggMoveLearnset,
.formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOURGEIST_SUPER}, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOURGEIST_SUPER},
{EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_SUPER}), {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_SUPER}),
@ -4402,6 +4433,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Bergmite) FOOTPRINT(Bergmite)
.levelUpLearnset = sBergmiteLevelUpLearnset, .levelUpLearnset = sBergmiteLevelUpLearnset,
.teachableLearnset = sBergmiteTeachableLearnset, .teachableLearnset = sBergmiteTeachableLearnset,
.eggMoveLearnset = sBergmiteEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_AVALUGG}, .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_AVALUGG},
{EVO_NONE, 0, SPECIES_AVALUGG_HISUIAN}), {EVO_NONE, 0, SPECIES_AVALUGG_HISUIAN}),
}, },
@ -4571,6 +4603,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
FOOTPRINT(Noibat) FOOTPRINT(Noibat)
.levelUpLearnset = sNoibatLevelUpLearnset, .levelUpLearnset = sNoibatLevelUpLearnset,
.teachableLearnset = sNoibatTeachableLearnset, .teachableLearnset = sNoibatTeachableLearnset,
.eggMoveLearnset = sNoibatEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 48, SPECIES_NOIVERN}), .evolutions = EVOLUTION({EVO_LEVEL, 48, SPECIES_NOIVERN}),
}, },

View File

@ -54,6 +54,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Rowlet) FOOTPRINT(Rowlet)
.levelUpLearnset = sRowletLevelUpLearnset, .levelUpLearnset = sRowletLevelUpLearnset,
.teachableLearnset = sRowletTeachableLearnset, .teachableLearnset = sRowletTeachableLearnset,
.eggMoveLearnset = sRowletEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_DARTRIX}), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_DARTRIX}),
}, },
@ -273,6 +274,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Litten) FOOTPRINT(Litten)
.levelUpLearnset = sLittenLevelUpLearnset, .levelUpLearnset = sLittenLevelUpLearnset,
.teachableLearnset = sLittenTeachableLearnset, .teachableLearnset = sLittenTeachableLearnset,
.eggMoveLearnset = sLittenEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_TORRACAT}), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_TORRACAT}),
}, },
@ -433,6 +435,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Popplio) FOOTPRINT(Popplio)
.levelUpLearnset = sPopplioLevelUpLearnset, .levelUpLearnset = sPopplioLevelUpLearnset,
.teachableLearnset = sPopplioTeachableLearnset, .teachableLearnset = sPopplioTeachableLearnset,
.eggMoveLearnset = sPopplioEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_BRIONNE}), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_BRIONNE}),
}, },
@ -594,6 +597,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Pikipek) FOOTPRINT(Pikipek)
.levelUpLearnset = sPikipekLevelUpLearnset, .levelUpLearnset = sPikipekLevelUpLearnset,
.teachableLearnset = sPikipekTeachableLearnset, .teachableLearnset = sPikipekTeachableLearnset,
.eggMoveLearnset = sPikipekEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_TRUMBEAK}), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_TRUMBEAK}),
}, },
@ -757,6 +761,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Yungoos) FOOTPRINT(Yungoos)
.levelUpLearnset = sYungoosLevelUpLearnset, .levelUpLearnset = sYungoosLevelUpLearnset,
.teachableLearnset = sYungoosTeachableLearnset, .teachableLearnset = sYungoosTeachableLearnset,
.eggMoveLearnset = sYungoosEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL_DAY, 20, SPECIES_GUMSHOOS}), .evolutions = EVOLUTION({EVO_LEVEL_DAY, 20, SPECIES_GUMSHOOS}),
}, },
@ -913,6 +918,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Grubbin) FOOTPRINT(Grubbin)
.levelUpLearnset = sGrubbinLevelUpLearnset, .levelUpLearnset = sGrubbinLevelUpLearnset,
.teachableLearnset = sGrubbinTeachableLearnset, .teachableLearnset = sGrubbinTeachableLearnset,
.eggMoveLearnset = sGrubbinEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_CHARJABUG}), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_CHARJABUG}),
}, },
@ -1126,6 +1132,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Crabrawler) FOOTPRINT(Crabrawler)
.levelUpLearnset = sCrabrawlerLevelUpLearnset, .levelUpLearnset = sCrabrawlerLevelUpLearnset,
.teachableLearnset = sCrabrawlerTeachableLearnset, .teachableLearnset = sCrabrawlerTeachableLearnset,
.eggMoveLearnset = sCrabrawlerEggMoveLearnset,
.evolutions = EVOLUTION({EVO_SPECIFIC_MAP, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM, SPECIES_CRABOMINABLE}, .evolutions = EVOLUTION({EVO_SPECIFIC_MAP, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM, SPECIES_CRABOMINABLE},
{EVO_ITEM, ITEM_ICE_STONE, SPECIES_CRABOMINABLE}), {EVO_ITEM, ITEM_ICE_STONE, SPECIES_CRABOMINABLE}),
}, },
@ -1236,6 +1243,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Oricorio) FOOTPRINT(Oricorio)
.levelUpLearnset = sOricorioLevelUpLearnset, .levelUpLearnset = sOricorioLevelUpLearnset,
.teachableLearnset = sOricorioTeachableLearnset, .teachableLearnset = sOricorioTeachableLearnset,
.eggMoveLearnset = sOricorioEggMoveLearnset,
.formSpeciesIdTable = sOricorioFormSpeciesIdTable, .formSpeciesIdTable = sOricorioFormSpeciesIdTable,
.formChangeTable = sOricorioFormChangeTable, .formChangeTable = sOricorioFormChangeTable,
}, },
@ -1291,6 +1299,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Oricorio) FOOTPRINT(Oricorio)
.levelUpLearnset = sOricorioLevelUpLearnset, .levelUpLearnset = sOricorioLevelUpLearnset,
.teachableLearnset = sOricorioTeachableLearnset, .teachableLearnset = sOricorioTeachableLearnset,
.eggMoveLearnset = sOricorioEggMoveLearnset,
.formSpeciesIdTable = sOricorioFormSpeciesIdTable, .formSpeciesIdTable = sOricorioFormSpeciesIdTable,
.formChangeTable = sOricorioFormChangeTable, .formChangeTable = sOricorioFormChangeTable,
}, },
@ -1346,6 +1355,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Oricorio) FOOTPRINT(Oricorio)
.levelUpLearnset = sOricorioLevelUpLearnset, .levelUpLearnset = sOricorioLevelUpLearnset,
.teachableLearnset = sOricorioTeachableLearnset, .teachableLearnset = sOricorioTeachableLearnset,
.eggMoveLearnset = sOricorioEggMoveLearnset,
.formSpeciesIdTable = sOricorioFormSpeciesIdTable, .formSpeciesIdTable = sOricorioFormSpeciesIdTable,
.formChangeTable = sOricorioFormChangeTable, .formChangeTable = sOricorioFormChangeTable,
}, },
@ -1401,6 +1411,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Oricorio) FOOTPRINT(Oricorio)
.levelUpLearnset = sOricorioLevelUpLearnset, .levelUpLearnset = sOricorioLevelUpLearnset,
.teachableLearnset = sOricorioTeachableLearnset, .teachableLearnset = sOricorioTeachableLearnset,
.eggMoveLearnset = sOricorioEggMoveLearnset,
.formSpeciesIdTable = sOricorioFormSpeciesIdTable, .formSpeciesIdTable = sOricorioFormSpeciesIdTable,
.formChangeTable = sOricorioFormChangeTable, .formChangeTable = sOricorioFormChangeTable,
}, },
@ -1459,6 +1470,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Cutiefly) FOOTPRINT(Cutiefly)
.levelUpLearnset = sCutieflyLevelUpLearnset, .levelUpLearnset = sCutieflyLevelUpLearnset,
.teachableLearnset = sCutieflyTeachableLearnset, .teachableLearnset = sCutieflyTeachableLearnset,
.eggMoveLearnset = sCutieflyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_RIBOMBEE}, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_RIBOMBEE},
{EVO_NONE, 0, SPECIES_RIBOMBEE_TOTEM}), {EVO_NONE, 0, SPECIES_RIBOMBEE_TOTEM}),
}, },
@ -1614,6 +1626,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Rockruff) FOOTPRINT(Rockruff)
.levelUpLearnset = sRockruffLevelUpLearnset, .levelUpLearnset = sRockruffLevelUpLearnset,
.teachableLearnset = sRockruffTeachableLearnset, .teachableLearnset = sRockruffTeachableLearnset,
.eggMoveLearnset = sRockruffEggMoveLearnset,
.formSpeciesIdTable = sRockruffFormSpeciesIdTable, .formSpeciesIdTable = sRockruffFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL_DAY, 25, SPECIES_LYCANROC_MIDDAY}, .evolutions = EVOLUTION({EVO_LEVEL_DAY, 25, SPECIES_LYCANROC_MIDDAY},
{EVO_LEVEL_NIGHT, 25, SPECIES_LYCANROC_MIDNIGHT}), {EVO_LEVEL_NIGHT, 25, SPECIES_LYCANROC_MIDNIGHT}),
@ -1665,6 +1678,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Rockruff) FOOTPRINT(Rockruff)
.levelUpLearnset = sRockruffLevelUpLearnset, .levelUpLearnset = sRockruffLevelUpLearnset,
.teachableLearnset = sRockruffTeachableLearnset, .teachableLearnset = sRockruffTeachableLearnset,
.eggMoveLearnset = sRockruffEggMoveLearnset,
.formSpeciesIdTable = sRockruffFormSpeciesIdTable, .formSpeciesIdTable = sRockruffFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL_DUSK, 25, SPECIES_LYCANROC_DUSK}), .evolutions = EVOLUTION({EVO_LEVEL_DUSK, 25, SPECIES_LYCANROC_DUSK}),
}, },
@ -1881,6 +1895,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Wishiwashi) FOOTPRINT(Wishiwashi)
.levelUpLearnset = sWishiwashiLevelUpLearnset, .levelUpLearnset = sWishiwashiLevelUpLearnset,
.teachableLearnset = sWishiwashiTeachableLearnset, .teachableLearnset = sWishiwashiTeachableLearnset,
.eggMoveLearnset = sWishiwashiEggMoveLearnset,
.formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable,
.formChangeTable = sWishiwashiFormChangeTable, .formChangeTable = sWishiwashiFormChangeTable,
}, },
@ -1935,6 +1950,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Wishiwashi) FOOTPRINT(Wishiwashi)
.levelUpLearnset = sWishiwashiLevelUpLearnset, .levelUpLearnset = sWishiwashiLevelUpLearnset,
.teachableLearnset = sWishiwashiTeachableLearnset, .teachableLearnset = sWishiwashiTeachableLearnset,
.eggMoveLearnset = sWishiwashiEggMoveLearnset,
.formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable,
.formChangeTable = sWishiwashiFormChangeTable, .formChangeTable = sWishiwashiFormChangeTable,
}, },
@ -1992,6 +2008,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Mareanie) FOOTPRINT(Mareanie)
.levelUpLearnset = sMareanieLevelUpLearnset, .levelUpLearnset = sMareanieLevelUpLearnset,
.teachableLearnset = sMareanieTeachableLearnset, .teachableLearnset = sMareanieTeachableLearnset,
.eggMoveLearnset = sMareanieEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_TOXAPEX}), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_TOXAPEX}),
}, },
@ -2101,6 +2118,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Mudbray) FOOTPRINT(Mudbray)
.levelUpLearnset = sMudbrayLevelUpLearnset, .levelUpLearnset = sMudbrayLevelUpLearnset,
.teachableLearnset = sMudbrayTeachableLearnset, .teachableLearnset = sMudbrayTeachableLearnset,
.eggMoveLearnset = sMudbrayEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MUDSDALE}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MUDSDALE}),
}, },
@ -2210,6 +2228,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Dewpider) FOOTPRINT(Dewpider)
.levelUpLearnset = sDewpiderLevelUpLearnset, .levelUpLearnset = sDewpiderLevelUpLearnset,
.teachableLearnset = sDewpiderTeachableLearnset, .teachableLearnset = sDewpiderTeachableLearnset,
.eggMoveLearnset = sDewpiderEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_ARAQUANID}, .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_ARAQUANID},
{EVO_NONE, 0, SPECIES_ARAQUANID_TOTEM}), {EVO_NONE, 0, SPECIES_ARAQUANID_TOTEM}),
}, },
@ -2368,6 +2387,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Fomantis) FOOTPRINT(Fomantis)
.levelUpLearnset = sFomantisLevelUpLearnset, .levelUpLearnset = sFomantisLevelUpLearnset,
.teachableLearnset = sFomantisTeachableLearnset, .teachableLearnset = sFomantisTeachableLearnset,
.eggMoveLearnset = sFomantisEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL_DAY, 34, SPECIES_LURANTIS}, .evolutions = EVOLUTION({EVO_LEVEL_DAY, 34, SPECIES_LURANTIS},
{EVO_NONE, 0, SPECIES_LURANTIS_TOTEM}), {EVO_NONE, 0, SPECIES_LURANTIS_TOTEM}),
}, },
@ -2527,6 +2547,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Morelull) FOOTPRINT(Morelull)
.levelUpLearnset = sMorelullLevelUpLearnset, .levelUpLearnset = sMorelullLevelUpLearnset,
.teachableLearnset = sMorelullTeachableLearnset, .teachableLearnset = sMorelullTeachableLearnset,
.eggMoveLearnset = sMorelullEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_SHIINOTIC}), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_SHIINOTIC}),
}, },
@ -2637,6 +2658,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Salandit) FOOTPRINT(Salandit)
.levelUpLearnset = sSalanditLevelUpLearnset, .levelUpLearnset = sSalanditLevelUpLearnset,
.teachableLearnset = sSalanditTeachableLearnset, .teachableLearnset = sSalanditTeachableLearnset,
.eggMoveLearnset = sSalanditEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 33, SPECIES_SALAZZLE}, .evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 33, SPECIES_SALAZZLE},
{EVO_NONE, 0, SPECIES_SALAZZLE_TOTEM}), {EVO_NONE, 0, SPECIES_SALAZZLE_TOTEM}),
}, },
@ -2794,6 +2816,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Stufful) FOOTPRINT(Stufful)
.levelUpLearnset = sStuffulLevelUpLearnset, .levelUpLearnset = sStuffulLevelUpLearnset,
.teachableLearnset = sStuffulTeachableLearnset, .teachableLearnset = sStuffulTeachableLearnset,
.eggMoveLearnset = sStuffulEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_BEWEAR}), .evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_BEWEAR}),
}, },
@ -2902,6 +2925,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Bounsweet) FOOTPRINT(Bounsweet)
.levelUpLearnset = sBounsweetLevelUpLearnset, .levelUpLearnset = sBounsweetLevelUpLearnset,
.teachableLearnset = sBounsweetTeachableLearnset, .teachableLearnset = sBounsweetTeachableLearnset,
.eggMoveLearnset = sBounsweetEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_STEENEE}), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_STEENEE}),
}, },
@ -3069,6 +3093,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Comfey) FOOTPRINT(Comfey)
.levelUpLearnset = sComfeyLevelUpLearnset, .levelUpLearnset = sComfeyLevelUpLearnset,
.teachableLearnset = sComfeyTeachableLearnset, .teachableLearnset = sComfeyTeachableLearnset,
.eggMoveLearnset = sComfeyEggMoveLearnset,
}, },
#endif //P_FAMILY_COMFEY #endif //P_FAMILY_COMFEY
@ -3123,6 +3148,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Oranguru) FOOTPRINT(Oranguru)
.levelUpLearnset = sOranguruLevelUpLearnset, .levelUpLearnset = sOranguruLevelUpLearnset,
.teachableLearnset = sOranguruTeachableLearnset, .teachableLearnset = sOranguruTeachableLearnset,
.eggMoveLearnset = sOranguruEggMoveLearnset,
}, },
#endif //P_FAMILY_ORANGURU #endif //P_FAMILY_ORANGURU
@ -3177,6 +3203,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Passimian) FOOTPRINT(Passimian)
.levelUpLearnset = sPassimianLevelUpLearnset, .levelUpLearnset = sPassimianLevelUpLearnset,
.teachableLearnset = sPassimianTeachableLearnset, .teachableLearnset = sPassimianTeachableLearnset,
.eggMoveLearnset = sPassimianEggMoveLearnset,
}, },
#endif //P_FAMILY_PASSIMIAN #endif //P_FAMILY_PASSIMIAN
@ -3231,6 +3258,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Wimpod) FOOTPRINT(Wimpod)
.levelUpLearnset = sWimpodLevelUpLearnset, .levelUpLearnset = sWimpodLevelUpLearnset,
.teachableLearnset = sWimpodTeachableLearnset, .teachableLearnset = sWimpodTeachableLearnset,
.eggMoveLearnset = sWimpodEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GOLISOPOD}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GOLISOPOD}),
}, },
@ -3339,6 +3367,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Sandygast) FOOTPRINT(Sandygast)
.levelUpLearnset = sSandygastLevelUpLearnset, .levelUpLearnset = sSandygastLevelUpLearnset,
.teachableLearnset = sSandygastTeachableLearnset, .teachableLearnset = sSandygastTeachableLearnset,
.eggMoveLearnset = sSandygastEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_PALOSSAND}), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_PALOSSAND}),
}, },
@ -3447,6 +3476,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Pyukumuku) FOOTPRINT(Pyukumuku)
.levelUpLearnset = sPyukumukuLevelUpLearnset, .levelUpLearnset = sPyukumukuLevelUpLearnset,
.teachableLearnset = sPyukumukuTeachableLearnset, .teachableLearnset = sPyukumukuTeachableLearnset,
.eggMoveLearnset = sPyukumukuEggMoveLearnset,
}, },
#endif //P_FAMILY_PYUKUMUKU #endif //P_FAMILY_PYUKUMUKU
@ -3730,6 +3760,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Komala) FOOTPRINT(Komala)
.levelUpLearnset = sKomalaLevelUpLearnset, .levelUpLearnset = sKomalaLevelUpLearnset,
.teachableLearnset = sKomalaTeachableLearnset, .teachableLearnset = sKomalaTeachableLearnset,
.eggMoveLearnset = sKomalaEggMoveLearnset,
}, },
#endif //P_FAMILY_KOMALA #endif //P_FAMILY_KOMALA
@ -3785,6 +3816,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Turtonator) FOOTPRINT(Turtonator)
.levelUpLearnset = sTurtonatorLevelUpLearnset, .levelUpLearnset = sTurtonatorLevelUpLearnset,
.teachableLearnset = sTurtonatorTeachableLearnset, .teachableLearnset = sTurtonatorTeachableLearnset,
.eggMoveLearnset = sTurtonatorEggMoveLearnset,
}, },
#endif //P_FAMILY_TURTONATOR #endif //P_FAMILY_TURTONATOR
@ -3836,6 +3868,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Togedemaru) FOOTPRINT(Togedemaru)
.levelUpLearnset = sTogedemaruLevelUpLearnset, .levelUpLearnset = sTogedemaruLevelUpLearnset,
.teachableLearnset = sTogedemaruTeachableLearnset, .teachableLearnset = sTogedemaruTeachableLearnset,
.eggMoveLearnset = sTogedemaruEggMoveLearnset,
.formSpeciesIdTable = sTogedemaruFormSpeciesIdTable, .formSpeciesIdTable = sTogedemaruFormSpeciesIdTable,
}, },
@ -3887,6 +3920,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.isTotem = TRUE, .isTotem = TRUE,
.levelUpLearnset = sTogedemaruLevelUpLearnset, .levelUpLearnset = sTogedemaruLevelUpLearnset,
.teachableLearnset = sTogedemaruTeachableLearnset, .teachableLearnset = sTogedemaruTeachableLearnset,
.eggMoveLearnset = sTogedemaruEggMoveLearnset,
.formSpeciesIdTable = sTogedemaruFormSpeciesIdTable, .formSpeciesIdTable = sTogedemaruFormSpeciesIdTable,
}, },
#endif //P_FAMILY_TOGEDEMARU #endif //P_FAMILY_TOGEDEMARU
@ -3939,6 +3973,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Mimikyu) FOOTPRINT(Mimikyu)
.levelUpLearnset = sMimikyuLevelUpLearnset, .levelUpLearnset = sMimikyuLevelUpLearnset,
.teachableLearnset = sMimikyuTeachableLearnset, .teachableLearnset = sMimikyuTeachableLearnset,
.eggMoveLearnset = sMimikyuEggMoveLearnset,
.formSpeciesIdTable = sMimikyuFormSpeciesIdTable, .formSpeciesIdTable = sMimikyuFormSpeciesIdTable,
.formChangeTable = sMimikyuFormChangeTable, .formChangeTable = sMimikyuFormChangeTable,
}, },
@ -3990,6 +4025,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Mimikyu) FOOTPRINT(Mimikyu)
.levelUpLearnset = sMimikyuLevelUpLearnset, .levelUpLearnset = sMimikyuLevelUpLearnset,
.teachableLearnset = sMimikyuTeachableLearnset, .teachableLearnset = sMimikyuTeachableLearnset,
.eggMoveLearnset = sMimikyuEggMoveLearnset,
.formSpeciesIdTable = sMimikyuFormSpeciesIdTable, .formSpeciesIdTable = sMimikyuFormSpeciesIdTable,
.formChangeTable = sMimikyuFormChangeTable, .formChangeTable = sMimikyuFormChangeTable,
}, },
@ -4042,6 +4078,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.isTotem = TRUE, .isTotem = TRUE,
.levelUpLearnset = sMimikyuLevelUpLearnset, .levelUpLearnset = sMimikyuLevelUpLearnset,
.teachableLearnset = sMimikyuTeachableLearnset, .teachableLearnset = sMimikyuTeachableLearnset,
.eggMoveLearnset = sMimikyuEggMoveLearnset,
.formSpeciesIdTable = sMimikyuFormSpeciesIdTable, .formSpeciesIdTable = sMimikyuFormSpeciesIdTable,
.formChangeTable = sMimikyuTotemFormChangeTable, .formChangeTable = sMimikyuTotemFormChangeTable,
}, },
@ -4094,6 +4131,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.isTotem = TRUE, .isTotem = TRUE,
.levelUpLearnset = sMimikyuLevelUpLearnset, .levelUpLearnset = sMimikyuLevelUpLearnset,
.teachableLearnset = sMimikyuTeachableLearnset, .teachableLearnset = sMimikyuTeachableLearnset,
.eggMoveLearnset = sMimikyuEggMoveLearnset,
.formSpeciesIdTable = sMimikyuFormSpeciesIdTable, .formSpeciesIdTable = sMimikyuFormSpeciesIdTable,
.formChangeTable = sMimikyuTotemFormChangeTable, .formChangeTable = sMimikyuTotemFormChangeTable,
}, },
@ -4151,6 +4189,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Bruxish) FOOTPRINT(Bruxish)
.levelUpLearnset = sBruxishLevelUpLearnset, .levelUpLearnset = sBruxishLevelUpLearnset,
.teachableLearnset = sBruxishTeachableLearnset, .teachableLearnset = sBruxishTeachableLearnset,
.eggMoveLearnset = sBruxishEggMoveLearnset,
}, },
#endif //P_FAMILY_BRUXISH #endif //P_FAMILY_BRUXISH
@ -4206,6 +4245,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(Drampa) FOOTPRINT(Drampa)
.levelUpLearnset = sDrampaLevelUpLearnset, .levelUpLearnset = sDrampaLevelUpLearnset,
.teachableLearnset = sDrampaTeachableLearnset, .teachableLearnset = sDrampaTeachableLearnset,
.eggMoveLearnset = sDrampaEggMoveLearnset,
}, },
#endif //P_FAMILY_DRAMPA #endif //P_FAMILY_DRAMPA
@ -4317,6 +4357,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
FOOTPRINT(JangmoO) FOOTPRINT(JangmoO)
.levelUpLearnset = sJangmoOLevelUpLearnset, .levelUpLearnset = sJangmoOLevelUpLearnset,
.teachableLearnset = sJangmoOTeachableLearnset, .teachableLearnset = sJangmoOTeachableLearnset,
.eggMoveLearnset = sJangmoOEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_HAKAMO_O}), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_HAKAMO_O}),
}, },

View File

@ -54,6 +54,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Grookey) FOOTPRINT(Grookey)
.levelUpLearnset = sGrookeyLevelUpLearnset, .levelUpLearnset = sGrookeyLevelUpLearnset,
.teachableLearnset = sGrookeyTeachableLearnset, .teachableLearnset = sGrookeyTeachableLearnset,
.eggMoveLearnset = sGrookeyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_THWACKEY}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_THWACKEY}),
}, },
@ -270,6 +271,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Scorbunny) FOOTPRINT(Scorbunny)
.levelUpLearnset = sScorbunnyLevelUpLearnset, .levelUpLearnset = sScorbunnyLevelUpLearnset,
.teachableLearnset = sScorbunnyTeachableLearnset, .teachableLearnset = sScorbunnyTeachableLearnset,
.eggMoveLearnset = sScorbunnyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_RABOOT}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_RABOOT}),
}, },
@ -489,6 +491,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Sobble) FOOTPRINT(Sobble)
.levelUpLearnset = sSobbleLevelUpLearnset, .levelUpLearnset = sSobbleLevelUpLearnset,
.teachableLearnset = sSobbleTeachableLearnset, .teachableLearnset = sSobbleTeachableLearnset,
.eggMoveLearnset = sSobbleEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_DRIZZILE}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_DRIZZILE}),
}, },
@ -707,6 +710,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Skwovet) FOOTPRINT(Skwovet)
.levelUpLearnset = sSkwovetLevelUpLearnset, .levelUpLearnset = sSkwovetLevelUpLearnset,
.teachableLearnset = sSkwovetTeachableLearnset, .teachableLearnset = sSkwovetTeachableLearnset,
.eggMoveLearnset = sSkwovetEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_GREEDENT}), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_GREEDENT}),
}, },
@ -815,6 +819,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Rookidee) FOOTPRINT(Rookidee)
.levelUpLearnset = sRookideeLevelUpLearnset, .levelUpLearnset = sRookideeLevelUpLearnset,
.teachableLearnset = sRookideeTeachableLearnset, .teachableLearnset = sRookideeTeachableLearnset,
.eggMoveLearnset = sRookideeEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_CORVISQUIRE}), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_CORVISQUIRE}),
}, },
@ -1035,6 +1040,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.tmIlliterate = TRUE, .tmIlliterate = TRUE,
.levelUpLearnset = sBlipbugLevelUpLearnset, .levelUpLearnset = sBlipbugLevelUpLearnset,
.teachableLearnset = sBlipbugTeachableLearnset, .teachableLearnset = sBlipbugTeachableLearnset,
.eggMoveLearnset = sBlipbugEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_DOTTLER}), .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_DOTTLER}),
}, },
@ -1258,6 +1264,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Nickit) FOOTPRINT(Nickit)
.levelUpLearnset = sNickitLevelUpLearnset, .levelUpLearnset = sNickitLevelUpLearnset,
.teachableLearnset = sNickitTeachableLearnset, .teachableLearnset = sNickitTeachableLearnset,
.eggMoveLearnset = sNickitEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_THIEVUL}), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_THIEVUL}),
}, },
@ -1365,6 +1372,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Gossifleur) FOOTPRINT(Gossifleur)
.levelUpLearnset = sGossifleurLevelUpLearnset, .levelUpLearnset = sGossifleurLevelUpLearnset,
.teachableLearnset = sGossifleurTeachableLearnset, .teachableLearnset = sGossifleurTeachableLearnset,
.eggMoveLearnset = sGossifleurEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_ELDEGOSS}), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_ELDEGOSS}),
}, },
@ -1472,6 +1480,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Wooloo) FOOTPRINT(Wooloo)
.levelUpLearnset = sWoolooLevelUpLearnset, .levelUpLearnset = sWoolooLevelUpLearnset,
.teachableLearnset = sWoolooTeachableLearnset, .teachableLearnset = sWoolooTeachableLearnset,
.eggMoveLearnset = sWoolooEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_DUBWOOL}), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_DUBWOOL}),
}, },
@ -1578,6 +1587,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Chewtle) FOOTPRINT(Chewtle)
.levelUpLearnset = sChewtleLevelUpLearnset, .levelUpLearnset = sChewtleLevelUpLearnset,
.teachableLearnset = sChewtleTeachableLearnset, .teachableLearnset = sChewtleTeachableLearnset,
.eggMoveLearnset = sChewtleEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_DREDNAW}), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_DREDNAW}),
}, },
@ -1743,6 +1753,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Yamper) FOOTPRINT(Yamper)
.levelUpLearnset = sYamperLevelUpLearnset, .levelUpLearnset = sYamperLevelUpLearnset,
.teachableLearnset = sYamperTeachableLearnset, .teachableLearnset = sYamperTeachableLearnset,
.eggMoveLearnset = sYamperEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_BOLTUND}), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_BOLTUND}),
}, },
@ -1850,6 +1861,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Rolycoly) FOOTPRINT(Rolycoly)
.levelUpLearnset = sRolycolyLevelUpLearnset, .levelUpLearnset = sRolycolyLevelUpLearnset,
.teachableLearnset = sRolycolyTeachableLearnset, .teachableLearnset = sRolycolyTeachableLearnset,
.eggMoveLearnset = sRolycolyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_CARKOL}), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_CARKOL}),
}, },
@ -2069,6 +2081,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.tmIlliterate = TRUE, .tmIlliterate = TRUE,
.levelUpLearnset = sApplinLevelUpLearnset, .levelUpLearnset = sApplinLevelUpLearnset,
.teachableLearnset = sApplinTeachableLearnset, .teachableLearnset = sApplinTeachableLearnset,
.eggMoveLearnset = sApplinEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_TART_APPLE, SPECIES_FLAPPLE}, .evolutions = EVOLUTION({EVO_ITEM, ITEM_TART_APPLE, SPECIES_FLAPPLE},
{EVO_ITEM, ITEM_SWEET_APPLE, SPECIES_APPLETUN}, {EVO_ITEM, ITEM_SWEET_APPLE, SPECIES_APPLETUN},
{EVO_ITEM, ITEM_SYRUPY_APPLE, SPECIES_DIPPLIN}), {EVO_ITEM, ITEM_SYRUPY_APPLE, SPECIES_DIPPLIN}),
@ -2452,6 +2465,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Silicobra) FOOTPRINT(Silicobra)
.levelUpLearnset = sSilicobraLevelUpLearnset, .levelUpLearnset = sSilicobraLevelUpLearnset,
.teachableLearnset = sSilicobraTeachableLearnset, .teachableLearnset = sSilicobraTeachableLearnset,
.eggMoveLearnset = sSilicobraEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SANDACONDA}), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SANDACONDA}),
}, },
@ -2617,6 +2631,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Cramorant) FOOTPRINT(Cramorant)
.levelUpLearnset = sCramorantLevelUpLearnset, .levelUpLearnset = sCramorantLevelUpLearnset,
.teachableLearnset = sCramorantTeachableLearnset, .teachableLearnset = sCramorantTeachableLearnset,
.eggMoveLearnset = sCramorantEggMoveLearnset,
.formSpeciesIdTable = sCramorantFormSpeciesIdTable, .formSpeciesIdTable = sCramorantFormSpeciesIdTable,
.formChangeTable = sCramorantFormChangeTable, .formChangeTable = sCramorantFormChangeTable,
}, },
@ -2671,6 +2686,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Cramorant) FOOTPRINT(Cramorant)
.levelUpLearnset = sCramorantLevelUpLearnset, .levelUpLearnset = sCramorantLevelUpLearnset,
.teachableLearnset = sCramorantTeachableLearnset, .teachableLearnset = sCramorantTeachableLearnset,
.eggMoveLearnset = sCramorantEggMoveLearnset,
.formSpeciesIdTable = sCramorantFormSpeciesIdTable, .formSpeciesIdTable = sCramorantFormSpeciesIdTable,
.formChangeTable = sCramorantFormChangeTable, .formChangeTable = sCramorantFormChangeTable,
}, },
@ -2725,6 +2741,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Cramorant) FOOTPRINT(Cramorant)
.levelUpLearnset = sCramorantLevelUpLearnset, .levelUpLearnset = sCramorantLevelUpLearnset,
.teachableLearnset = sCramorantTeachableLearnset, .teachableLearnset = sCramorantTeachableLearnset,
.eggMoveLearnset = sCramorantEggMoveLearnset,
.formSpeciesIdTable = sCramorantFormSpeciesIdTable, .formSpeciesIdTable = sCramorantFormSpeciesIdTable,
.formChangeTable = sCramorantFormChangeTable, .formChangeTable = sCramorantFormChangeTable,
}, },
@ -2781,6 +2798,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Arrokuda) FOOTPRINT(Arrokuda)
.levelUpLearnset = sArrokudaLevelUpLearnset, .levelUpLearnset = sArrokudaLevelUpLearnset,
.teachableLearnset = sArrokudaTeachableLearnset, .teachableLearnset = sArrokudaTeachableLearnset,
.eggMoveLearnset = sArrokudaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_BARRASKEWDA}), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_BARRASKEWDA}),
}, },
@ -2888,6 +2906,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Toxel) FOOTPRINT(Toxel)
.levelUpLearnset = sToxelLevelUpLearnset, .levelUpLearnset = sToxelLevelUpLearnset,
.teachableLearnset = sToxelTeachableLearnset, .teachableLearnset = sToxelTeachableLearnset,
.eggMoveLearnset = sToxelEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL_NATURE_AMPED, 30, SPECIES_TOXTRICITY_AMPED}, .evolutions = EVOLUTION({EVO_LEVEL_NATURE_AMPED, 30, SPECIES_TOXTRICITY_AMPED},
{EVO_LEVEL_NATURE_LOW_KEY, 30, SPECIES_TOXTRICITY_LOW_KEY}), {EVO_LEVEL_NATURE_LOW_KEY, 30, SPECIES_TOXTRICITY_LOW_KEY}),
}, },
@ -3156,6 +3175,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Sizzlipede) FOOTPRINT(Sizzlipede)
.levelUpLearnset = sSizzlipedeLevelUpLearnset, .levelUpLearnset = sSizzlipedeLevelUpLearnset,
.teachableLearnset = sSizzlipedeTeachableLearnset, .teachableLearnset = sSizzlipedeTeachableLearnset,
.eggMoveLearnset = sSizzlipedeEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_CENTISKORCH}), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_CENTISKORCH}),
}, },
@ -3322,6 +3342,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Clobbopus) FOOTPRINT(Clobbopus)
.levelUpLearnset = sClobbopusLevelUpLearnset, .levelUpLearnset = sClobbopusLevelUpLearnset,
.teachableLearnset = sClobbopusTeachableLearnset, .teachableLearnset = sClobbopusTeachableLearnset,
.eggMoveLearnset = sClobbopusEggMoveLearnset,
.evolutions = EVOLUTION({EVO_MOVE, MOVE_TAUNT, SPECIES_GRAPPLOCT}), .evolutions = EVOLUTION({EVO_MOVE, MOVE_TAUNT, SPECIES_GRAPPLOCT}),
}, },
@ -3646,6 +3667,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Hatenna) FOOTPRINT(Hatenna)
.levelUpLearnset = sHatennaLevelUpLearnset, .levelUpLearnset = sHatennaLevelUpLearnset,
.teachableLearnset = sHatennaTeachableLearnset, .teachableLearnset = sHatennaTeachableLearnset,
.eggMoveLearnset = sHatennaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_HATTREM}), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_HATTREM}),
}, },
@ -4082,6 +4104,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Milcery) FOOTPRINT(Milcery)
.levelUpLearnset = sMilceryLevelUpLearnset, .levelUpLearnset = sMilceryLevelUpLearnset,
.teachableLearnset = sMilceryTeachableLearnset, .teachableLearnset = sMilceryTeachableLearnset,
.eggMoveLearnset = sMilceryEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM}, .evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM},
{EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM}, {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM},
{EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM}, {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM},
@ -4354,6 +4377,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Pincurchin) FOOTPRINT(Pincurchin)
.levelUpLearnset = sPincurchinLevelUpLearnset, .levelUpLearnset = sPincurchinLevelUpLearnset,
.teachableLearnset = sPincurchinTeachableLearnset, .teachableLearnset = sPincurchinTeachableLearnset,
.eggMoveLearnset = sPincurchinEggMoveLearnset,
}, },
#endif //P_FAMILY_PINCURCHIN #endif //P_FAMILY_PINCURCHIN
@ -4409,6 +4433,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Snom) FOOTPRINT(Snom)
.levelUpLearnset = sSnomLevelUpLearnset, .levelUpLearnset = sSnomLevelUpLearnset,
.teachableLearnset = sSnomTeachableLearnset, .teachableLearnset = sSnomTeachableLearnset,
.eggMoveLearnset = sSnomEggMoveLearnset,
.evolutions = EVOLUTION({EVO_FRIENDSHIP_NIGHT, 0, SPECIES_FROSMOTH}), .evolutions = EVOLUTION({EVO_FRIENDSHIP_NIGHT, 0, SPECIES_FROSMOTH}),
}, },
@ -4517,6 +4542,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Stonjourner) FOOTPRINT(Stonjourner)
.levelUpLearnset = sStonjournerLevelUpLearnset, .levelUpLearnset = sStonjournerLevelUpLearnset,
.teachableLearnset = sStonjournerTeachableLearnset, .teachableLearnset = sStonjournerTeachableLearnset,
.eggMoveLearnset = sStonjournerEggMoveLearnset,
}, },
#endif //P_FAMILY_STONJOURNER #endif //P_FAMILY_STONJOURNER
@ -4571,6 +4597,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Eiscue) FOOTPRINT(Eiscue)
.levelUpLearnset = sEiscueLevelUpLearnset, .levelUpLearnset = sEiscueLevelUpLearnset,
.teachableLearnset = sEiscueTeachableLearnset, .teachableLearnset = sEiscueTeachableLearnset,
.eggMoveLearnset = sEiscueEggMoveLearnset,
.formSpeciesIdTable = sEiscueFormSpeciesIdTable, .formSpeciesIdTable = sEiscueFormSpeciesIdTable,
.formChangeTable = sEiscueFormChangeTable, .formChangeTable = sEiscueFormChangeTable,
}, },
@ -4625,6 +4652,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Eiscue) FOOTPRINT(Eiscue)
.levelUpLearnset = sEiscueLevelUpLearnset, .levelUpLearnset = sEiscueLevelUpLearnset,
.teachableLearnset = sEiscueTeachableLearnset, .teachableLearnset = sEiscueTeachableLearnset,
.eggMoveLearnset = sEiscueEggMoveLearnset,
.formSpeciesIdTable = sEiscueFormSpeciesIdTable, .formSpeciesIdTable = sEiscueFormSpeciesIdTable,
.formChangeTable = sEiscueFormChangeTable, .formChangeTable = sEiscueFormChangeTable,
}, },
@ -4734,6 +4762,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Indeedee) FOOTPRINT(Indeedee)
.levelUpLearnset = sIndeedeeFemaleLevelUpLearnset, .levelUpLearnset = sIndeedeeFemaleLevelUpLearnset,
.teachableLearnset = sIndeedeeFemaleTeachableLearnset, .teachableLearnset = sIndeedeeFemaleTeachableLearnset,
.eggMoveLearnset = sIndeedeeFemaleEggMoveLearnset,
.formSpeciesIdTable = sIndeedeeFormSpeciesIdTable, .formSpeciesIdTable = sIndeedeeFormSpeciesIdTable,
}, },
#endif //P_FAMILY_INDEEDEE #endif //P_FAMILY_INDEEDEE
@ -4789,6 +4818,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Morpeko) FOOTPRINT(Morpeko)
.levelUpLearnset = sMorpekoLevelUpLearnset, .levelUpLearnset = sMorpekoLevelUpLearnset,
.teachableLearnset = sMorpekoTeachableLearnset, .teachableLearnset = sMorpekoTeachableLearnset,
.eggMoveLearnset = sMorpekoEggMoveLearnset,
.formSpeciesIdTable = sMorpekoFormSpeciesIdTable, .formSpeciesIdTable = sMorpekoFormSpeciesIdTable,
.formChangeTable = sMorpekoFormChangeTable, .formChangeTable = sMorpekoFormChangeTable,
}, },
@ -4843,6 +4873,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Morpeko) FOOTPRINT(Morpeko)
.levelUpLearnset = sMorpekoLevelUpLearnset, .levelUpLearnset = sMorpekoLevelUpLearnset,
.teachableLearnset = sMorpekoTeachableLearnset, .teachableLearnset = sMorpekoTeachableLearnset,
.eggMoveLearnset = sMorpekoEggMoveLearnset,
.formSpeciesIdTable = sMorpekoFormSpeciesIdTable, .formSpeciesIdTable = sMorpekoFormSpeciesIdTable,
.formChangeTable = sMorpekoFormChangeTable, .formChangeTable = sMorpekoFormChangeTable,
}, },
@ -4900,6 +4931,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Cufant) FOOTPRINT(Cufant)
.levelUpLearnset = sCufantLevelUpLearnset, .levelUpLearnset = sCufantLevelUpLearnset,
.teachableLearnset = sCufantTeachableLearnset, .teachableLearnset = sCufantTeachableLearnset,
.eggMoveLearnset = sCufantEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_COPPERAJAH}), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_COPPERAJAH}),
}, },
@ -5281,6 +5313,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Duraludon) FOOTPRINT(Duraludon)
.levelUpLearnset = sDuraludonLevelUpLearnset, .levelUpLearnset = sDuraludonLevelUpLearnset,
.teachableLearnset = sDuraludonTeachableLearnset, .teachableLearnset = sDuraludonTeachableLearnset,
.eggMoveLearnset = sDuraludonEggMoveLearnset,
.formSpeciesIdTable = sDuraludonFormSpeciesIdTable, .formSpeciesIdTable = sDuraludonFormSpeciesIdTable,
.formChangeTable = sDuraludonFormChangeTable, .formChangeTable = sDuraludonFormChangeTable,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_METAL_ALLOY, SPECIES_ARCHALUDON}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_METAL_ALLOY, SPECIES_ARCHALUDON}),
@ -5338,6 +5371,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.isGigantamax = TRUE, .isGigantamax = TRUE,
.levelUpLearnset = sDuraludonLevelUpLearnset, .levelUpLearnset = sDuraludonLevelUpLearnset,
.teachableLearnset = sDuraludonTeachableLearnset, .teachableLearnset = sDuraludonTeachableLearnset,
.eggMoveLearnset = sDuraludonEggMoveLearnset,
.formSpeciesIdTable = sDuraludonFormSpeciesIdTable, .formSpeciesIdTable = sDuraludonFormSpeciesIdTable,
.formChangeTable = sDuraludonFormChangeTable, .formChangeTable = sDuraludonFormChangeTable,
}, },
@ -5450,6 +5484,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
FOOTPRINT(Dreepy) FOOTPRINT(Dreepy)
.levelUpLearnset = sDreepyLevelUpLearnset, .levelUpLearnset = sDreepyLevelUpLearnset,
.teachableLearnset = sDreepyTeachableLearnset, .teachableLearnset = sDreepyTeachableLearnset,
.eggMoveLearnset = sDreepyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_DRAKLOAK}), .evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_DRAKLOAK}),
}, },

View File

@ -54,6 +54,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Sprigatito) //FOOTPRINT(Sprigatito)
.levelUpLearnset = sSprigatitoLevelUpLearnset, .levelUpLearnset = sSprigatitoLevelUpLearnset,
.teachableLearnset = sSprigatitoTeachableLearnset, .teachableLearnset = sSprigatitoTeachableLearnset,
.eggMoveLearnset = sSprigatitoEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_FLORAGATO}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_FLORAGATO}),
}, },
@ -214,6 +215,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Fuecoco) //FOOTPRINT(Fuecoco)
.levelUpLearnset = sFuecocoLevelUpLearnset, .levelUpLearnset = sFuecocoLevelUpLearnset,
.teachableLearnset = sFuecocoTeachableLearnset, .teachableLearnset = sFuecocoTeachableLearnset,
.eggMoveLearnset = sFuecocoEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_CROCALOR}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_CROCALOR}),
}, },
@ -374,6 +376,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Quaxly) //FOOTPRINT(Quaxly)
.levelUpLearnset = sQuaxlyLevelUpLearnset, .levelUpLearnset = sQuaxlyLevelUpLearnset,
.teachableLearnset = sQuaxlyTeachableLearnset, .teachableLearnset = sQuaxlyTeachableLearnset,
.eggMoveLearnset = sQuaxlyEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_QUAXWELL}), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_QUAXWELL}),
}, },
@ -534,6 +537,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Lechonk) //FOOTPRINT(Lechonk)
.levelUpLearnset = sLechonkLevelUpLearnset, .levelUpLearnset = sLechonkLevelUpLearnset,
.teachableLearnset = sLechonkTeachableLearnset, .teachableLearnset = sLechonkTeachableLearnset,
.eggMoveLearnset = sLechonkEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL_MALE, 18, SPECIES_OINKOLOGNE_MALE}, .evolutions = EVOLUTION({EVO_LEVEL_MALE, 18, SPECIES_OINKOLOGNE_MALE},
{EVO_LEVEL_FEMALE, 18, SPECIES_OINKOLOGNE_FEMALE}), {EVO_LEVEL_FEMALE, 18, SPECIES_OINKOLOGNE_FEMALE}),
}, },
@ -695,6 +699,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Tarountula) //FOOTPRINT(Tarountula)
.levelUpLearnset = sTarountulaLevelUpLearnset, .levelUpLearnset = sTarountulaLevelUpLearnset,
.teachableLearnset = sTarountulaTeachableLearnset, .teachableLearnset = sTarountulaTeachableLearnset,
.eggMoveLearnset = sTarountulaEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_SPIDOPS}), .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_SPIDOPS}),
}, },
@ -802,6 +807,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Nymble) //FOOTPRINT(Nymble)
.levelUpLearnset = sNymbleLevelUpLearnset, .levelUpLearnset = sNymbleLevelUpLearnset,
.teachableLearnset = sNymbleTeachableLearnset, .teachableLearnset = sNymbleTeachableLearnset,
.eggMoveLearnset = sNymbleEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_LOKIX}), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_LOKIX}),
}, },
@ -909,6 +915,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Pawmi) //FOOTPRINT(Pawmi)
.levelUpLearnset = sPawmiLevelUpLearnset, .levelUpLearnset = sPawmiLevelUpLearnset,
.teachableLearnset = sPawmiTeachableLearnset, .teachableLearnset = sPawmiTeachableLearnset,
.eggMoveLearnset = sPawmiEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_PAWMO}), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_PAWMO}),
}, },
@ -1069,6 +1076,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Tandemaus) //FOOTPRINT(Tandemaus)
.levelUpLearnset = sTandemausLevelUpLearnset, .levelUpLearnset = sTandemausLevelUpLearnset,
.teachableLearnset = sTandemausTeachableLearnset, .teachableLearnset = sTandemausTeachableLearnset,
.eggMoveLearnset = sTandemausEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL_FAMILY_OF_FOUR, 25, SPECIES_MAUSHOLD_FAMILY_OF_FOUR}, .evolutions = EVOLUTION({EVO_LEVEL_FAMILY_OF_FOUR, 25, SPECIES_MAUSHOLD_FAMILY_OF_FOUR},
{EVO_LEVEL_FAMILY_OF_THREE, 25, SPECIES_MAUSHOLD_FAMILY_OF_THREE}), {EVO_LEVEL_FAMILY_OF_THREE, 25, SPECIES_MAUSHOLD_FAMILY_OF_THREE}),
}, },
@ -1230,6 +1238,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Fidough) //FOOTPRINT(Fidough)
.levelUpLearnset = sFidoughLevelUpLearnset, .levelUpLearnset = sFidoughLevelUpLearnset,
.teachableLearnset = sFidoughTeachableLearnset, .teachableLearnset = sFidoughTeachableLearnset,
.eggMoveLearnset = sFidoughEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_DACHSBUN}), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_DACHSBUN}),
}, },
@ -1337,6 +1346,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Smoliv) //FOOTPRINT(Smoliv)
.levelUpLearnset = sSmolivLevelUpLearnset, .levelUpLearnset = sSmolivLevelUpLearnset,
.teachableLearnset = sSmolivTeachableLearnset, .teachableLearnset = sSmolivTeachableLearnset,
.eggMoveLearnset = sSmolivEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_DOLLIV}), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_DOLLIV}),
}, },
@ -1497,6 +1507,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
/*FOOTPRINT(Squawkabilly)*/ /*FOOTPRINT(Squawkabilly)*/
.levelUpLearnset = sSquawkabillyLevelUpLearnset, .levelUpLearnset = sSquawkabillyLevelUpLearnset,
.teachableLearnset = sSquawkabillyTeachableLearnset, .teachableLearnset = sSquawkabillyTeachableLearnset,
.eggMoveLearnset = sSquawkabillyEggMoveLearnset,
.formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable,
}, },
@ -1550,6 +1561,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
/*FOOTPRINT(Squawkabilly)*/ /*FOOTPRINT(Squawkabilly)*/
.levelUpLearnset = sSquawkabillyLevelUpLearnset, .levelUpLearnset = sSquawkabillyLevelUpLearnset,
.teachableLearnset = sSquawkabillyTeachableLearnset, .teachableLearnset = sSquawkabillyTeachableLearnset,
.eggMoveLearnset = sSquawkabillyEggMoveLearnset,
.formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable,
}, },
@ -1603,6 +1615,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
/*FOOTPRINT(Squawkabilly)*/ /*FOOTPRINT(Squawkabilly)*/
.levelUpLearnset = sSquawkabillyLevelUpLearnset, .levelUpLearnset = sSquawkabillyLevelUpLearnset,
.teachableLearnset = sSquawkabillyTeachableLearnset, .teachableLearnset = sSquawkabillyTeachableLearnset,
.eggMoveLearnset = sSquawkabillyEggMoveLearnset,
.formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable,
}, },
@ -1656,6 +1669,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
/*FOOTPRINT(Squawkabilly)*/ /*FOOTPRINT(Squawkabilly)*/
.levelUpLearnset = sSquawkabillyLevelUpLearnset, .levelUpLearnset = sSquawkabillyLevelUpLearnset,
.teachableLearnset = sSquawkabillyTeachableLearnset, .teachableLearnset = sSquawkabillyTeachableLearnset,
.eggMoveLearnset = sSquawkabillyEggMoveLearnset,
.formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable,
}, },
#endif //P_FAMILY_SQUAWKABILLY #endif //P_FAMILY_SQUAWKABILLY
@ -1711,6 +1725,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Nacli) //FOOTPRINT(Nacli)
.levelUpLearnset = sNacliLevelUpLearnset, .levelUpLearnset = sNacliLevelUpLearnset,
.teachableLearnset = sNacliTeachableLearnset, .teachableLearnset = sNacliTeachableLearnset,
.eggMoveLearnset = sNacliEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_NACLSTACK}), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_NACLSTACK}),
}, },
@ -1871,6 +1886,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Charcadet) //FOOTPRINT(Charcadet)
.levelUpLearnset = sCharcadetLevelUpLearnset, .levelUpLearnset = sCharcadetLevelUpLearnset,
.teachableLearnset = sCharcadetTeachableLearnset, .teachableLearnset = sCharcadetTeachableLearnset,
.eggMoveLearnset = sCharcadetEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_AUSPICIOUS_ARMOR, SPECIES_ARMAROUGE}, .evolutions = EVOLUTION({EVO_ITEM, ITEM_AUSPICIOUS_ARMOR, SPECIES_ARMAROUGE},
{EVO_ITEM, ITEM_MALICIOUS_ARMOR, SPECIES_CERULEDGE}), {EVO_ITEM, ITEM_MALICIOUS_ARMOR, SPECIES_CERULEDGE}),
}, },
@ -2032,6 +2048,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Tadbulb) //FOOTPRINT(Tadbulb)
.levelUpLearnset = sTadbulbLevelUpLearnset, .levelUpLearnset = sTadbulbLevelUpLearnset,
.teachableLearnset = sTadbulbTeachableLearnset, .teachableLearnset = sTadbulbTeachableLearnset,
.eggMoveLearnset = sTadbulbEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_BELLIBOLT}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_BELLIBOLT}),
}, },
@ -2139,6 +2156,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Wattrel) //FOOTPRINT(Wattrel)
.levelUpLearnset = sWattrelLevelUpLearnset, .levelUpLearnset = sWattrelLevelUpLearnset,
.teachableLearnset = sWattrelTeachableLearnset, .teachableLearnset = sWattrelTeachableLearnset,
.eggMoveLearnset = sWattrelEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_KILOWATTREL}), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_KILOWATTREL}),
}, },
@ -2246,6 +2264,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Maschiff) //FOOTPRINT(Maschiff)
.levelUpLearnset = sMaschiffLevelUpLearnset, .levelUpLearnset = sMaschiffLevelUpLearnset,
.teachableLearnset = sMaschiffTeachableLearnset, .teachableLearnset = sMaschiffTeachableLearnset,
.eggMoveLearnset = sMaschiffEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MABOSSTIFF}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MABOSSTIFF}),
}, },
@ -2353,6 +2372,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Shroodle) //FOOTPRINT(Shroodle)
.levelUpLearnset = sShroodleLevelUpLearnset, .levelUpLearnset = sShroodleLevelUpLearnset,
.teachableLearnset = sShroodleTeachableLearnset, .teachableLearnset = sShroodleTeachableLearnset,
.eggMoveLearnset = sShroodleEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_GRAFAIAI}), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_GRAFAIAI}),
}, },
@ -2460,6 +2480,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Bramblin) //FOOTPRINT(Bramblin)
.levelUpLearnset = sBramblinLevelUpLearnset, .levelUpLearnset = sBramblinLevelUpLearnset,
.teachableLearnset = sBramblinTeachableLearnset, .teachableLearnset = sBramblinTeachableLearnset,
.eggMoveLearnset = sBramblinEggMoveLearnset,
.evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_BRAMBLEGHAST}), .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_BRAMBLEGHAST}),
}, },
@ -2567,6 +2588,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Toedscool) //FOOTPRINT(Toedscool)
.levelUpLearnset = sToedscoolLevelUpLearnset, .levelUpLearnset = sToedscoolLevelUpLearnset,
.teachableLearnset = sToedscoolTeachableLearnset, .teachableLearnset = sToedscoolTeachableLearnset,
.eggMoveLearnset = sToedscoolEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_TOEDSCRUEL}), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_TOEDSCRUEL}),
}, },
@ -2674,6 +2696,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Klawf) //FOOTPRINT(Klawf)
.levelUpLearnset = sKlawfLevelUpLearnset, .levelUpLearnset = sKlawfLevelUpLearnset,
.teachableLearnset = sKlawfTeachableLearnset, .teachableLearnset = sKlawfTeachableLearnset,
.eggMoveLearnset = sKlawfEggMoveLearnset,
}, },
#endif //P_FAMILY_KLAWF #endif //P_FAMILY_KLAWF
@ -2728,6 +2751,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Capsakid) //FOOTPRINT(Capsakid)
.levelUpLearnset = sCapsakidLevelUpLearnset, .levelUpLearnset = sCapsakidLevelUpLearnset,
.teachableLearnset = sCapsakidTeachableLearnset, .teachableLearnset = sCapsakidTeachableLearnset,
.eggMoveLearnset = sCapsakidEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_SCOVILLAIN}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_SCOVILLAIN}),
}, },
@ -2835,6 +2859,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Rellor) //FOOTPRINT(Rellor)
.levelUpLearnset = sRellorLevelUpLearnset, .levelUpLearnset = sRellorLevelUpLearnset,
.teachableLearnset = sRellorTeachableLearnset, .teachableLearnset = sRellorTeachableLearnset,
.eggMoveLearnset = sRellorEggMoveLearnset,
.evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_RABSCA}), .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_RABSCA}),
}, },
@ -2942,6 +2967,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Flittle) //FOOTPRINT(Flittle)
.levelUpLearnset = sFlittleLevelUpLearnset, .levelUpLearnset = sFlittleLevelUpLearnset,
.teachableLearnset = sFlittleTeachableLearnset, .teachableLearnset = sFlittleTeachableLearnset,
.eggMoveLearnset = sFlittleEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ESPATHRA}), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ESPATHRA}),
}, },
@ -3049,6 +3075,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Tinkatink) //FOOTPRINT(Tinkatink)
.levelUpLearnset = sTinkatinkLevelUpLearnset, .levelUpLearnset = sTinkatinkLevelUpLearnset,
.teachableLearnset = sTinkatinkTeachableLearnset, .teachableLearnset = sTinkatinkTeachableLearnset,
.eggMoveLearnset = sTinkatinkEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_TINKATUFF}), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_TINKATUFF}),
}, },
@ -3208,6 +3235,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Wiglett) //FOOTPRINT(Wiglett)
.levelUpLearnset = sWiglettLevelUpLearnset, .levelUpLearnset = sWiglettLevelUpLearnset,
.teachableLearnset = sWiglettTeachableLearnset, .teachableLearnset = sWiglettTeachableLearnset,
.eggMoveLearnset = sWiglettEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_WUGTRIO}), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_WUGTRIO}),
}, },
@ -3315,6 +3343,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Bombirdier) //FOOTPRINT(Bombirdier)
.levelUpLearnset = sBombirdierLevelUpLearnset, .levelUpLearnset = sBombirdierLevelUpLearnset,
.teachableLearnset = sBombirdierTeachableLearnset, .teachableLearnset = sBombirdierTeachableLearnset,
.eggMoveLearnset = sBombirdierEggMoveLearnset,
}, },
#endif //P_FAMILY_BOMBIRDIER #endif //P_FAMILY_BOMBIRDIER
@ -3368,6 +3397,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Finizen) //FOOTPRINT(Finizen)
.levelUpLearnset = sFinizenLevelUpLearnset, .levelUpLearnset = sFinizenLevelUpLearnset,
.teachableLearnset = sFinizenTeachableLearnset, .teachableLearnset = sFinizenTeachableLearnset,
.eggMoveLearnset = sFinizenEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_PALAFIN_ZERO}), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_PALAFIN_ZERO}),
}, },
@ -3531,6 +3561,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Varoom) //FOOTPRINT(Varoom)
.levelUpLearnset = sVaroomLevelUpLearnset, .levelUpLearnset = sVaroomLevelUpLearnset,
.teachableLearnset = sVaroomTeachableLearnset, .teachableLearnset = sVaroomTeachableLearnset,
.eggMoveLearnset = sVaroomEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_REVAVROOM}), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_REVAVROOM}),
}, },
@ -3638,6 +3669,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Cyclizar) //FOOTPRINT(Cyclizar)
.levelUpLearnset = sCyclizarLevelUpLearnset, .levelUpLearnset = sCyclizarLevelUpLearnset,
.teachableLearnset = sCyclizarTeachableLearnset, .teachableLearnset = sCyclizarTeachableLearnset,
.eggMoveLearnset = sCyclizarEggMoveLearnset,
}, },
#endif //P_FAMILY_CYCLIZAR #endif //P_FAMILY_CYCLIZAR
@ -3692,6 +3724,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Orthworm) //FOOTPRINT(Orthworm)
.levelUpLearnset = sOrthwormLevelUpLearnset, .levelUpLearnset = sOrthwormLevelUpLearnset,
.teachableLearnset = sOrthwormTeachableLearnset, .teachableLearnset = sOrthwormTeachableLearnset,
.eggMoveLearnset = sOrthwormEggMoveLearnset,
}, },
#endif //P_FAMILY_ORTHWORM #endif //P_FAMILY_ORTHWORM
@ -3747,6 +3780,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Glimmet) //FOOTPRINT(Glimmet)
.levelUpLearnset = sGlimmetLevelUpLearnset, .levelUpLearnset = sGlimmetLevelUpLearnset,
.teachableLearnset = sGlimmetTeachableLearnset, .teachableLearnset = sGlimmetTeachableLearnset,
.eggMoveLearnset = sGlimmetEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_GLIMMORA}), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_GLIMMORA}),
}, },
@ -3855,6 +3889,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Greavard) //FOOTPRINT(Greavard)
.levelUpLearnset = sGreavardLevelUpLearnset, .levelUpLearnset = sGreavardLevelUpLearnset,
.teachableLearnset = sGreavardTeachableLearnset, .teachableLearnset = sGreavardTeachableLearnset,
.eggMoveLearnset = sGreavardEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 30, SPECIES_HOUNDSTONE}), .evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 30, SPECIES_HOUNDSTONE}),
}, },
@ -3962,6 +3997,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Flamigo) //FOOTPRINT(Flamigo)
.levelUpLearnset = sFlamigoLevelUpLearnset, .levelUpLearnset = sFlamigoLevelUpLearnset,
.teachableLearnset = sFlamigoTeachableLearnset, .teachableLearnset = sFlamigoTeachableLearnset,
.eggMoveLearnset = sFlamigoEggMoveLearnset,
}, },
#endif //P_FAMILY_FLAMIGO #endif //P_FAMILY_FLAMIGO
@ -4016,6 +4052,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Cetoddle) //FOOTPRINT(Cetoddle)
.levelUpLearnset = sCetoddleLevelUpLearnset, .levelUpLearnset = sCetoddleLevelUpLearnset,
.teachableLearnset = sCetoddleTeachableLearnset, .teachableLearnset = sCetoddleTeachableLearnset,
.eggMoveLearnset = sCetoddleEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_CETITAN}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_CETITAN}),
}, },
@ -4124,6 +4161,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Veluza) //FOOTPRINT(Veluza)
.levelUpLearnset = sVeluzaLevelUpLearnset, .levelUpLearnset = sVeluzaLevelUpLearnset,
.teachableLearnset = sVeluzaTeachableLearnset, .teachableLearnset = sVeluzaTeachableLearnset,
.eggMoveLearnset = sVeluzaEggMoveLearnset,
}, },
#endif //P_FAMILY_VELUZA #endif //P_FAMILY_VELUZA
@ -4179,6 +4217,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Dondozo) //FOOTPRINT(Dondozo)
.levelUpLearnset = sDondozoLevelUpLearnset, .levelUpLearnset = sDondozoLevelUpLearnset,
.teachableLearnset = sDondozoTeachableLearnset, .teachableLearnset = sDondozoTeachableLearnset,
.eggMoveLearnset = sDondozoEggMoveLearnset,
}, },
#endif //P_FAMILY_DONDOZO #endif //P_FAMILY_DONDOZO
@ -4233,6 +4272,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
/*FOOTPRINT(Tatsugiri)*/ /*FOOTPRINT(Tatsugiri)*/
.levelUpLearnset = sTatsugiriLevelUpLearnset, .levelUpLearnset = sTatsugiriLevelUpLearnset,
.teachableLearnset = sTatsugiriTeachableLearnset, .teachableLearnset = sTatsugiriTeachableLearnset,
.eggMoveLearnset = sTatsugiriEggMoveLearnset,
.formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable,
}, },
@ -4285,6 +4325,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
/*FOOTPRINT(Tatsugiri)*/ /*FOOTPRINT(Tatsugiri)*/
.levelUpLearnset = sTatsugiriLevelUpLearnset, .levelUpLearnset = sTatsugiriLevelUpLearnset,
.teachableLearnset = sTatsugiriTeachableLearnset, .teachableLearnset = sTatsugiriTeachableLearnset,
.eggMoveLearnset = sTatsugiriEggMoveLearnset,
.formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable,
}, },
@ -4337,6 +4378,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
/*FOOTPRINT(Tatsugiri)*/ /*FOOTPRINT(Tatsugiri)*/
.levelUpLearnset = sTatsugiriLevelUpLearnset, .levelUpLearnset = sTatsugiriLevelUpLearnset,
.teachableLearnset = sTatsugiriTeachableLearnset, .teachableLearnset = sTatsugiriTeachableLearnset,
.eggMoveLearnset = sTatsugiriEggMoveLearnset,
.formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable,
}, },
#endif //P_FAMILY_TATSUGIRI #endif //P_FAMILY_TATSUGIRI
@ -5056,6 +5098,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
//FOOTPRINT(Frigibax) //FOOTPRINT(Frigibax)
.levelUpLearnset = sFrigibaxLevelUpLearnset, .levelUpLearnset = sFrigibaxLevelUpLearnset,
.teachableLearnset = sFrigibaxTeachableLearnset, .teachableLearnset = sFrigibaxTeachableLearnset,
.eggMoveLearnset = sFrigibaxEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ARCTIBAX}), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ARCTIBAX}),
}, },

View File

@ -42,8 +42,6 @@ EWRAM_DATA static u16 sHatchedEggFinalMoves[MAX_MON_MOVES] = {0};
EWRAM_DATA static u16 sHatchedEggEggMoves[EGG_MOVES_ARRAY_COUNT] = {0}; EWRAM_DATA static u16 sHatchedEggEggMoves[EGG_MOVES_ARRAY_COUNT] = {0};
EWRAM_DATA static u16 sHatchedEggMotherMoves[MAX_MON_MOVES] = {0}; EWRAM_DATA static u16 sHatchedEggMotherMoves[MAX_MON_MOVES] = {0};
#include "data/pokemon/egg_moves.h"
static const struct WindowTemplate sDaycareLevelMenuWindowTemplate = static const struct WindowTemplate sDaycareLevelMenuWindowTemplate =
{ {
.bg = 0, .bg = 0,
@ -741,29 +739,18 @@ static void InheritAbility(struct Pokemon *egg, struct BoxPokemon *father, struc
// the given array. // the given array.
static u8 GetEggMoves(struct Pokemon *pokemon, u16 *eggMoves) static u8 GetEggMoves(struct Pokemon *pokemon, u16 *eggMoves)
{ {
u16 eggMoveIdx;
u16 numEggMoves; u16 numEggMoves;
u16 species; u16 species;
u16 i; u32 i;
const u16 *eggMoveLearnset;
numEggMoves = 0; numEggMoves = 0;
eggMoveIdx = 0;
species = GetMonData(pokemon, MON_DATA_SPECIES); species = GetMonData(pokemon, MON_DATA_SPECIES);
for (i = 0; i < ARRAY_COUNT(gEggMoves) - 1; i++) eggMoveLearnset = GetSpeciesEggMoves(species);
{
if (gEggMoves[i] == species + EGG_MOVES_SPECIES_OFFSET)
{
eggMoveIdx = i + 1;
break;
}
}
for (i = 0; i < EGG_MOVES_ARRAY_COUNT; i++) for (i = 0; eggMoveLearnset[i] != MOVE_UNAVAILABLE; i++)
{ {
if (gEggMoves[eggMoveIdx + i] > EGG_MOVES_SPECIES_OFFSET) eggMoves[i] = eggMoveLearnset[i];
break;
eggMoves[i] = gEggMoves[eggMoveIdx + i];
numEggMoves++; numEggMoves++;
} }
@ -772,30 +759,16 @@ static u8 GetEggMoves(struct Pokemon *pokemon, u16 *eggMoves)
u8 GetEggMovesSpecies(u16 species, u16 *eggMoves) u8 GetEggMovesSpecies(u16 species, u16 *eggMoves)
{ {
u16 eggMoveIdx;
u16 numEggMoves; u16 numEggMoves;
u16 i; const u16 *eggMoveLearnset;
u32 i;
numEggMoves = 0; numEggMoves = 0;
eggMoveIdx = 0; eggMoveLearnset = GetSpeciesEggMoves(species);
for (i = 0; i < ARRAY_COUNT(gEggMoves) - 1; i++)
{
if (gEggMoves[i] == species + EGG_MOVES_SPECIES_OFFSET)
{
eggMoveIdx = i + 1;
break;
}
}
for (i = 0; i < EGG_MOVES_ARRAY_COUNT; i++) for (i = 0; eggMoveLearnset[i] != MOVE_UNAVAILABLE; i++)
{ {
if (gEggMoves[eggMoveIdx + i] > EGG_MOVES_SPECIES_OFFSET) eggMoves[i] = eggMoveLearnset[i];
{
// TODO: the curly braces around this if statement are required for a matching build.
break;
}
eggMoves[i] = gEggMoves[eggMoveIdx + i];
numEggMoves++; numEggMoves++;
} }
@ -804,26 +777,15 @@ u8 GetEggMovesSpecies(u16 species, u16 *eggMoves)
bool8 SpeciesCanLearnEggMove(u16 species, u16 move) //Move search PokedexPlus HGSS_Ui bool8 SpeciesCanLearnEggMove(u16 species, u16 move) //Move search PokedexPlus HGSS_Ui
{ {
u16 eggMoveIdx; u32 i;
u16 i; const u16 *eggMoveLearnset = GetSpeciesEggMoves(species);
eggMoveIdx = 0;
for (i = 0; i < ARRAY_COUNT(gEggMoves) - 1; i++)
{
if (gEggMoves[i] == species + EGG_MOVES_SPECIES_OFFSET)
{
eggMoveIdx = i + 1;
break;
}
}
for (i = 0; i < EGG_MOVES_ARRAY_COUNT; i++) for (i = 0; eggMoveLearnset[i] != MOVE_UNAVAILABLE; i++)
{ {
if (gEggMoves[eggMoveIdx + i] > EGG_MOVES_SPECIES_OFFSET) if (eggMoveLearnset[i] == move)
return FALSE;
if (move == gEggMoves[eggMoveIdx + i])
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
} }

View File

@ -697,6 +697,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] =
#endif #endif
#include "data/pokemon/teachable_learnsets.h" #include "data/pokemon/teachable_learnsets.h"
#include "data/pokemon/egg_moves.h"
#include "data/pokemon/form_species_tables.h" #include "data/pokemon/form_species_tables.h"
#include "data/pokemon/form_change_tables.h" #include "data/pokemon/form_change_tables.h"
#include "data/pokemon/form_change_table_pointers.h" #include "data/pokemon/form_change_table_pointers.h"
@ -3573,6 +3574,14 @@ const u16 *GetSpeciesTeachableLearnset(u16 species)
return learnset; return learnset;
} }
const u16 *GetSpeciesEggMoves(u16 species)
{
const u16 *learnset = gSpeciesInfo[SanitizeSpeciesId(species)].eggMoveLearnset;
if (learnset == NULL)
return gSpeciesInfo[SPECIES_NONE].eggMoveLearnset;
return learnset;
}
const struct Evolution *GetSpeciesEvolutions(u16 species) const struct Evolution *GetSpeciesEvolutions(u16 species)
{ {
const struct Evolution *evolutions = gSpeciesInfo[SanitizeSpeciesId(species)].evolutions; const struct Evolution *evolutions = gSpeciesInfo[SanitizeSpeciesId(species)].evolutions;