diff --git a/include/constants/pokedex.h b/include/constants/pokedex.h index 062a0b7211..b637b748d9 100644 --- a/include/constants/pokedex.h +++ b/include/constants/pokedex.h @@ -1024,13 +1024,20 @@ enum { NATIONAL_DEX_MIRAIDON, NATIONAL_DEX_WALKING_WAKE, NATIONAL_DEX_IRON_LEAVES, + NATIONAL_DEX_DIPPLIN, + NATIONAL_DEX_POLTCHAGEIST, + NATIONAL_DEX_SINISTCHA, + NATIONAL_DEX_OKIDOGI, + NATIONAL_DEX_MUNKIDORI, + NATIONAL_DEX_FEZANDIPITI, + NATIONAL_DEX_OGERPON, }; #define KANTO_DEX_COUNT NATIONAL_DEX_MEW #define JOHTO_DEX_COUNT NATIONAL_DEX_CELEBI #if P_GEN_9_POKEMON == TRUE - #define NATIONAL_DEX_COUNT NATIONAL_DEX_IRON_LEAVES + #define NATIONAL_DEX_COUNT NATIONAL_DEX_OGERPON #elif P_GEN_8_POKEMON == TRUE #define NATIONAL_DEX_COUNT NATIONAL_DEX_ENAMORUS #elif P_GEN_7_POKEMON == TRUE diff --git a/include/constants/species.h b/include/constants/species.h index c1236b430b..7897c3dd72 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1575,8 +1575,21 @@ #define SPECIES_SINISTCHA SPECIES_SINISTCHA_UNREMARKABLE #define SPECIES_SINISTCHA_UNREMARKABLE GEN9_START + 123 #define SPECIES_SINISTCHA_MASTERPIECE GEN9_START + 124 +#define SPECIES_OKIDOGI GEN9_START + 125 +#define SPECIES_MUNKIDORI GEN9_START + 126 +#define SPECIES_FEZANDIPITI GEN9_START + 127 +#define SPECIES_OGERPON SPECIES_OGERPON_TEAL +#define SPECIES_OGERPON_TEAL GEN9_START + 128 +#define SPECIES_OGERPON_WELLSPRING GEN9_START + 129 +#define SPECIES_OGERPON_HEARTHFLAME GEN9_START + 130 +#define SPECIES_OGERPON_CORNERSTONE GEN9_START + 131 +#define SPECIES_OGERPON_TEAL_TERA GEN9_START + 132 +#define SPECIES_OGERPON_WELLSPRING_TERA GEN9_START + 133 +#define SPECIES_OGERPON_HEARTHFLAME_TERA GEN9_START + 134 +#define SPECIES_OGERPON_CORNERSTONE_TERA GEN9_START + 135 +#define SPECIES_URSALUNA_BLOODMOON GEN9_START + 136 -#define GIGANTAMAX_START SPECIES_IRON_LEAVES +#define GIGANTAMAX_START SPECIES_URSALUNA_BLOODMOON // Gigantamax Forms #define SPECIES_VENUSAUR_GIGANTAMAX GIGANTAMAX_START + 1 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 1857dd5442..e7e2deeafe 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -1032,6 +1032,14 @@ const u32 gMonFrontPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/front.4b const u32 gMonFrontPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/front.4bpp.lz"); const u32 gMonFrontPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/front.4bpp.lz"); const u32 gMonFrontPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/front.4bpp.lz"); + +// const u32 gMonFrontPic_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/front.4bpp.lz"); +// const u32 gMonPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/normal.gbapal.lz"); +// const u32 gMonBackPic_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/back.4bpp.lz"); +// const u32 gMonShinyPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/shiny.gbapal.lz"); +// const u8 gMonIcon_UrsalunaBloodmoon[] = INCBIN_U8("graphics/pokemon/ursaluna/bloodmoon/icon.4bpp"); +// const u8 gMonFootprint_UrsalunaBloodmoon[] = INCBIN_U8("graphics/pokemon/ursaluna/bloodmoon/footprint.1bpp"); + const u32 gMonFrontPic_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/front.4bpp.lz"); const u32 gMonFrontPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/front.4bpp.lz"); const u32 gMonFrontPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/front.4bpp.lz"); @@ -8156,4 +8164,93 @@ const u32 gMonBackPic_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/ba const u32 gMonShinyPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/shiny.gbapal.lz"); const u8 gMonIcon_IronLeaves[] = INCBIN_U8("graphics/pokemon/iron_leaves/icon.4bpp"); // const u8 gMonFootprint_IronLeaves[] = INCBIN_U8("graphics/pokemon/iron_leaves/footprint.1bpp"); + +// const u32 gMonFrontPic_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/front.4bpp.lz"); +// const u32 gMonPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/normal.gbapal.lz"); +// const u32 gMonBackPic_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/back.4bpp.lz"); +// const u32 gMonShinyPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/shiny.gbapal.lz"); +// const u8 gMonIcon_Dipplin[] = INCBIN_U8("graphics/pokemon/dipplin/icon.4bpp"); +// const u8 gMonFootprint_Dipplin[] = INCBIN_U8("graphics/pokemon/dipplin/footprint.1bpp"); + +// const u32 gMonFrontPic_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/front.4bpp.lz"); +// const u32 gMonPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/normal.gbapal.lz"); +// const u32 gMonBackPic_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/back.4bpp.lz"); +// const u32 gMonShinyPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/shiny.gbapal.lz"); +// const u8 gMonIcon_Poltchageist[] = INCBIN_U8("graphics/pokemon/poltchageist/icon.4bpp"); +// const u8 gMonFootprint_Poltchageist[] = INCBIN_U8("graphics/pokemon/poltchageist/footprint.1bpp"); + +// const u32 gMonFrontPic_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/front.4bpp.lz"); +// const u32 gMonPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/normal.gbapal.lz"); +// const u32 gMonBackPic_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/back.4bpp.lz"); +// const u32 gMonShinyPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/shiny.gbapal.lz"); +// const u8 gMonIcon_Sinistcha[] = INCBIN_U8("graphics/pokemon/sinistcha/icon.4bpp"); +// const u8 gMonFootprint_Sinistcha[] = INCBIN_U8("graphics/pokemon/sinistcha/footprint.1bpp"); + +// const u32 gMonFrontPic_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/front.4bpp.lz"); +// const u32 gMonPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/normal.gbapal.lz"); +// const u32 gMonBackPic_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/back.4bpp.lz"); +// const u32 gMonShinyPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/shiny.gbapal.lz"); +// const u8 gMonIcon_Okidogi[] = INCBIN_U8("graphics/pokemon/okidogi/icon.4bpp"); +// const u8 gMonFootprint_Okidogi[] = INCBIN_U8("graphics/pokemon/okidogi/footprint.1bpp"); + +// const u32 gMonFrontPic_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/front.4bpp.lz"); +// const u32 gMonPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/normal.gbapal.lz"); +// const u32 gMonBackPic_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/back.4bpp.lz"); +// const u32 gMonShinyPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/shiny.gbapal.lz"); +// const u8 gMonIcon_Munkidori[] = INCBIN_U8("graphics/pokemon/munkidori/icon.4bpp"); +// const u8 gMonFootprint_Munkidori[] = INCBIN_U8("graphics/pokemon/munkidori/footprint.1bpp"); + +// const u32 gMonFrontPic_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/front.4bpp.lz"); +// const u32 gMonPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/normal.gbapal.lz"); +// const u32 gMonBackPic_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/back.4bpp.lz"); +// const u32 gMonShinyPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/shiny.gbapal.lz"); +// const u8 gMonIcon_Fezandipiti[] = INCBIN_U8("graphics/pokemon/fezandipiti/icon.4bpp"); +// const u8 gMonFootprint_Fezandipiti[] = INCBIN_U8("graphics/pokemon/fezandipiti/footprint.1bpp"); + +// const u32 gMonFrontPic_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/front.4bpp.lz"); +// const u32 gMonPalette_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/normal.gbapal.lz"); +// const u32 gMonBackPic_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/back.4bpp.lz"); +// const u32 gMonShinyPalette_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/shiny.gbapal.lz"); +// const u8 gMonIcon_OgerponTeal[] = INCBIN_U8("graphics/pokemon/ogerpon/icon.4bpp"); + +// const u32 gMonFrontPic_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/front.4bpp.lz"); +// const u32 gMonPalette_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/normal.gbapal.lz"); +// const u32 gMonBackPic_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/back.4bpp.lz"); +// const u32 gMonShinyPalette_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/shiny.gbapal.lz"); +// const u8 gMonIcon_OgerponWellspring[] = INCBIN_U8("graphics/pokemon/ogerpon/wellspring/icon.4bpp"); + +// const u32 gMonFrontPic_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/front.4bpp.lz"); +// const u32 gMonPalette_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/normal.gbapal.lz"); +// const u32 gMonBackPic_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/back.4bpp.lz"); +// const u32 gMonShinyPalette_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/shiny.gbapal.lz"); +// const u8 gMonIcon_OgerponHearthflame[] = INCBIN_U8("graphics/pokemon/ogerpon/hearthflame/icon.4bpp"); + +// const u32 gMonFrontPic_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/front.4bpp.lz"); +// const u32 gMonPalette_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/normal.gbapal.lz"); +// const u32 gMonBackPic_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/back.4bpp.lz"); +// const u32 gMonShinyPalette_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/shiny.gbapal.lz"); +// const u8 gMonIcon_OgerponCornerstone[] = INCBIN_U8("graphics/pokemon/ogerpon/cornerstone/icon.4bpp"); + +// const u32 gMonFrontPic_OgerponTealTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/front.4bpp.lz"); +// const u32 gMonPalette_OgerponTealTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/normal.gbapal.lz"); +// const u32 gMonBackPic_OgerponTealTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/back.4bpp.lz"); +// const u32 gMonShinyPalette_OgerponTealTera[]] = INCBIN_U32("graphics/pokemon/ogerpon/tera/shiny.gbapal.lz"); + +// const u32 gMonFrontPic_OgerponWellspringTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/front.4bpp.lz"); +// const u32 gMonPalette_OgerponWellspringTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/normal.gbapal.lz"); +// const u32 gMonBackPic_OgerponWellspringTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/back.4bpp.lz"); +// const u32 gMonShinyPalette_OgerponWellspringTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/shiny.gbapal.lz"); + +// const u32 gMonFrontPic_OgerponHearthflameTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/front.4bpp.lz"); +// const u32 gMonPalette_OgerponHearthflameTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/normal.gbapal.lz"); +// const u32 gMonBackPic_OgerponHearthflameTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/back.4bpp.lz"); +// const u32 gMonShinyPalette_OgerponHearthflameTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/shiny.gbapal.lz"); + +// const u32 gMonFrontPic_OgerponCornerstoneTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/front.4bpp.lz"); +// const u32 gMonPalette_OgerponCornerstoneTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/normal.gbapal.lz"); +// const u32 gMonBackPic_OgerponCornerstoneTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/back.4bpp.lz"); +// const u32 gMonShinyPalette_OgerponCornerstoneTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/shiny.gbapal.lz"); + +// const u8 gMonFootprint_Ogerpon[] = INCBIN_U8("graphics/pokemon/ogerpon/footprint.1bpp"); + #endif diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index c47da2ff5f..b4036c1e1f 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -915,6 +915,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_WYRDEER] = sWyrdeerLevelUpLearnset, [SPECIES_KLEAVOR] = sKleavorLevelUpLearnset, [SPECIES_URSALUNA] = sUrsalunaLevelUpLearnset, + [SPECIES_URSALUNA_BLOODMOON] = sUrsalunaBloodmoonLevelUpLearnset, [SPECIES_BASCULEGION_MALE] = sBasculegionLevelUpLearnset, [SPECIES_SNEASLER] = sSneaslerLevelUpLearnset, [SPECIES_OVERQWIL] = sOverqwilLevelUpLearnset, @@ -1036,6 +1037,22 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_MIRAIDON] = sMiraidonLevelUpLearnset, [SPECIES_WALKING_WAKE] = sWalkingWakeLevelUpLearnset, [SPECIES_IRON_LEAVES] = sIronLeavesLevelUpLearnset, + [SPECIES_DIPPLIN] = sDipplinLevelUpLearnset, + [SPECIES_POLTCHAGEIST_COUNTERFEIT] = sPoltchageistLevelUpLearnset, + [SPECIES_POLTCHAGEIST_ARTISAN] = sPoltchageistLevelUpLearnset, + [SPECIES_SINISTCHA_UNREMARKABLE] = sSinistchaLevelUpLearnset, + [SPECIES_SINISTCHA_MASTERPIECE] = sSinistchaLevelUpLearnset, + [SPECIES_OKIDOGI] = sOkidogiLevelUpLearnset, + [SPECIES_MUNKIDORI] = sMunkidoriLevelUpLearnset, + [SPECIES_FEZANDIPITI] = sFezandipitiLevelUpLearnset, + [SPECIES_OGERPON_TEAL] = sOgerponLevelUpLearnset, + [SPECIES_OGERPON_WELLSPRING] = sOgerponLevelUpLearnset, + [SPECIES_OGERPON_HEARTHFLAME] = sOgerponLevelUpLearnset, + [SPECIES_OGERPON_CORNERSTONE] = sOgerponLevelUpLearnset, + [SPECIES_OGERPON_TEAL_TERA] = sOgerponLevelUpLearnset, + [SPECIES_OGERPON_WELLSPRING_TERA] = sOgerponLevelUpLearnset, + [SPECIES_OGERPON_HEARTHFLAME_TERA] = sOgerponLevelUpLearnset, + [SPECIES_OGERPON_CORNERSTONE_TERA] = sOgerponLevelUpLearnset, #endif // Megas [SPECIES_VENUSAUR_MEGA] = sVenusaurLevelUpLearnset, diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index 9c359e9bc4..5875e11d11 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -19867,12 +19867,9 @@ static const struct LevelUpMove sFloragatoLevelUpLearnset[] = { static const struct LevelUpMove sMeowscaradaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_FLOWER_TRICK), - LEVEL_UP_MOVE( 1, MOVE_FLOWER_TRICK), - LEVEL_UP_MOVE( 1, MOVE_DOUBLE_TEAM), - LEVEL_UP_MOVE( 1, MOVE_TRICK), + LEVEL_UP_MOVE( 1, MOVE_LEAFAGE), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), - LEVEL_UP_MOVE( 1, MOVE_LEAFAGE), LEVEL_UP_MOVE( 7, MOVE_BITE), LEVEL_UP_MOVE(10, MOVE_HONE_CLAWS), LEVEL_UP_MOVE(13, MOVE_MAGICAL_LEAF), @@ -19926,11 +19923,9 @@ static const struct LevelUpMove sCrocalorLevelUpLearnset[] = { static const struct LevelUpMove sSkeledirgeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_TORCH_SONG), - LEVEL_UP_MOVE( 1, MOVE_TORCH_SONG), - LEVEL_UP_MOVE( 1, MOVE_SING), + LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 7, MOVE_LICK), LEVEL_UP_MOVE(10, MOVE_ROUND), LEVEL_UP_MOVE(12, MOVE_SCARY_FACE), @@ -19965,10 +19960,10 @@ static const struct LevelUpMove sQuaxlyLevelUpLearnset[] = { }; static const struct LevelUpMove sQuaxwellLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), + LEVEL_UP_MOVE( 1, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 7, MOVE_WORK_UP), LEVEL_UP_MOVE(10, MOVE_WING_ATTACK), LEVEL_UP_MOVE(13, MOVE_AQUA_JET), @@ -19985,12 +19980,10 @@ static const struct LevelUpMove sQuaxwellLevelUpLearnset[] = { static const struct LevelUpMove sQuaquavalLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_AQUA_STEP), - LEVEL_UP_MOVE( 1, MOVE_AQUA_STEP), - LEVEL_UP_MOVE( 1, MOVE_COUNTER), - LEVEL_UP_MOVE( 1, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), + LEVEL_UP_MOVE( 1, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 7, MOVE_WORK_UP), LEVEL_UP_MOVE(10, MOVE_WING_ATTACK), LEVEL_UP_MOVE(13, MOVE_AQUA_JET), @@ -20083,7 +20076,6 @@ static const struct LevelUpMove sTarountulaLevelUpLearnset[] = { static const struct LevelUpMove sSpidopsLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SILK_TRAP), - LEVEL_UP_MOVE( 1, MOVE_SILK_TRAP), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_STRING_SHOT), LEVEL_UP_MOVE( 5, MOVE_STRUGGLE_BUG), @@ -20120,7 +20112,6 @@ static const struct LevelUpMove sNymbleLevelUpLearnset[] = { static const struct LevelUpMove sLokixLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_LUNGE), - LEVEL_UP_MOVE( 1, MOVE_LUNGE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_LOW_KICK), @@ -20163,7 +20154,6 @@ static const struct LevelUpMove sPawmiLevelUpLearnset[] = { static const struct LevelUpMove sPawmoLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ARM_THRUST), - LEVEL_UP_MOVE( 1, MOVE_ARM_THRUST), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 3, MOVE_THUNDER_SHOCK), @@ -20184,10 +20174,9 @@ static const struct LevelUpMove sPawmoLevelUpLearnset[] = { static const struct LevelUpMove sPawmotLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_REVIVAL_BLESSING), - LEVEL_UP_MOVE( 1, MOVE_REVIVAL_BLESSING), - LEVEL_UP_MOVE( 1, MOVE_WILD_CHARGE), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_GROWL), + LEVEL_UP_MOVE( 1, MOVE_WILD_CHARGE), LEVEL_UP_MOVE( 3, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 6, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 8, MOVE_CHARGE), @@ -20225,10 +20214,10 @@ static const struct LevelUpMove sTandemausLevelUpLearnset[] = { }; static const struct LevelUpMove sMausholdLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_FOLLOW_ME), - LEVEL_UP_MOVE( 1, MOVE_TIDY_UP), LEVEL_UP_MOVE( 1, MOVE_POUND), + LEVEL_UP_MOVE( 1, MOVE_FOLLOW_ME), LEVEL_UP_MOVE( 1, MOVE_BABY_DOLL_EYES), + LEVEL_UP_MOVE( 1, MOVE_TIDY_UP), LEVEL_UP_MOVE( 5, MOVE_ECHOED_VOICE), LEVEL_UP_MOVE( 8, MOVE_HELPING_HAND), LEVEL_UP_MOVE(11, MOVE_SUPER_FANG), @@ -20317,10 +20306,10 @@ static const struct LevelUpMove sDollivLevelUpLearnset[] = { }; static const struct LevelUpMove sArbolivaLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_SWEET_SCENT), LEVEL_UP_MOVE( 1, MOVE_MIRROR_COAT), LEVEL_UP_MOVE( 1, MOVE_SAFEGUARD), LEVEL_UP_MOVE( 1, MOVE_TACKLE), - LEVEL_UP_MOVE( 1, MOVE_SWEET_SCENT), LEVEL_UP_MOVE( 5, MOVE_ABSORB), LEVEL_UP_MOVE( 7, MOVE_GROWTH), LEVEL_UP_MOVE(10, MOVE_RAZOR_LEAF), @@ -20377,7 +20366,6 @@ static const struct LevelUpMove sNacliLevelUpLearnset[] = { static const struct LevelUpMove sNaclstackLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SALT_CURE), - LEVEL_UP_MOVE( 1, MOVE_SALT_CURE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 5, MOVE_ROCK_THROW), @@ -20397,12 +20385,11 @@ static const struct LevelUpMove sNaclstackLevelUpLearnset[] = { static const struct LevelUpMove sGarganaclLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_HAMMER_ARM), - LEVEL_UP_MOVE( 1, MOVE_HAMMER_ARM), LEVEL_UP_MOVE( 1, MOVE_BLOCK), - LEVEL_UP_MOVE( 1, MOVE_WIDE_GUARD), - LEVEL_UP_MOVE( 1, MOVE_ROCK_BLAST), LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_WIDE_GUARD), LEVEL_UP_MOVE( 1, MOVE_HARDEN), + LEVEL_UP_MOVE( 1, MOVE_ROCK_BLAST), LEVEL_UP_MOVE( 5, MOVE_ROCK_THROW), LEVEL_UP_MOVE( 7, MOVE_MUD_SHOT), LEVEL_UP_MOVE(10, MOVE_ROCK_TOMB), @@ -20420,8 +20407,8 @@ static const struct LevelUpMove sGarganaclLevelUpLearnset[] = { }; static const struct LevelUpMove sCharcadetLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 8, MOVE_CLEAR_SMOG), LEVEL_UP_MOVE(12, MOVE_FIRE_SPIN), @@ -20435,12 +20422,11 @@ static const struct LevelUpMove sCharcadetLevelUpLearnset[] = { static const struct LevelUpMove sArmarougeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYSHOCK), - LEVEL_UP_MOVE( 1, MOVE_PSYSHOCK), - LEVEL_UP_MOVE( 1, MOVE_MYSTICAL_FIRE), - LEVEL_UP_MOVE( 1, MOVE_WIDE_GUARD), - LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_EMBER), + LEVEL_UP_MOVE( 1, MOVE_MYSTICAL_FIRE), LEVEL_UP_MOVE( 1, MOVE_ASTONISH), + LEVEL_UP_MOVE( 1, MOVE_WIDE_GUARD), LEVEL_UP_MOVE( 8, MOVE_CLEAR_SMOG), LEVEL_UP_MOVE(12, MOVE_FIRE_SPIN), LEVEL_UP_MOVE(16, MOVE_WILL_O_WISP), @@ -20458,13 +20444,8 @@ static const struct LevelUpMove sArmarougeLevelUpLearnset[] = { static const struct LevelUpMove sCeruledgeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SHADOW_CLAW), - LEVEL_UP_MOVE( 1, MOVE_SHADOW_CLAW), - LEVEL_UP_MOVE( 1, MOVE_NIGHT_SLASH), - LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), - LEVEL_UP_MOVE( 1, MOVE_QUICK_GUARD), - LEVEL_UP_MOVE( 1, MOVE_SOLAR_BLADE), - LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 8, MOVE_CLEAR_SMOG), LEVEL_UP_MOVE(12, MOVE_FIRE_SPIN), @@ -20499,9 +20480,9 @@ static const struct LevelUpMove sTadbulbLevelUpLearnset[] = { }; static const struct LevelUpMove sBelliboltLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_SLACK_OFF), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_MUD_SLAP), + LEVEL_UP_MOVE( 1, MOVE_SLACK_OFF), LEVEL_UP_MOVE( 7, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE(11, MOVE_WATER_GUN), LEVEL_UP_MOVE(17, MOVE_CHARGE), @@ -20517,8 +20498,8 @@ static const struct LevelUpMove sBelliboltLevelUpLearnset[] = { }; static const struct LevelUpMove sWattrelLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_GROWL), + LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 4, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 7, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE(11, MOVE_PLUCK), @@ -20534,9 +20515,8 @@ static const struct LevelUpMove sWattrelLevelUpLearnset[] = { static const struct LevelUpMove sKilowattrelLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ELECTRO_BALL), - LEVEL_UP_MOVE( 1, MOVE_ELECTRO_BALL), - LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_GROWL), + LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 4, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 7, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE(11, MOVE_PLUCK), @@ -20572,10 +20552,9 @@ static const struct LevelUpMove sMaschiffLevelUpLearnset[] = { static const struct LevelUpMove sMabosstiffLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_COMEUPPANCE), - LEVEL_UP_MOVE( 1, MOVE_COMEUPPANCE), - LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_SCARY_FACE), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 4, MOVE_LICK), LEVEL_UP_MOVE( 7, MOVE_SNARL), LEVEL_UP_MOVE(10, MOVE_HONE_CLAWS), @@ -20613,7 +20592,6 @@ static const struct LevelUpMove sShroodleLevelUpLearnset[] = { static const struct LevelUpMove sGrafaiaiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DOODLE), - LEVEL_UP_MOVE( 1, MOVE_DOODLE), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 5, MOVE_ACID_SPRAY), @@ -20632,9 +20610,9 @@ static const struct LevelUpMove sGrafaiaiLevelUpLearnset[] = { }; static const struct LevelUpMove sBramblinLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 1, MOVE_ROLLOUT), + LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 5, MOVE_ABSORB), LEVEL_UP_MOVE( 9, MOVE_RAPID_SPIN), LEVEL_UP_MOVE(13, MOVE_BULLET_SEED), @@ -20651,9 +20629,9 @@ static const struct LevelUpMove sBramblinLevelUpLearnset[] = { }; static const struct LevelUpMove sBrambleghastLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 1, MOVE_ROLLOUT), + LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 5, MOVE_ABSORB), LEVEL_UP_MOVE( 9, MOVE_RAPID_SPIN), LEVEL_UP_MOVE(13, MOVE_BULLET_SEED), @@ -20732,8 +20710,8 @@ static const struct LevelUpMove sKlawfLevelUpLearnset[] = { }; static const struct LevelUpMove sCapsakidLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_LEAFAGE), LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_LEAFAGE), LEVEL_UP_MOVE( 4, MOVE_BITE), LEVEL_UP_MOVE(10, MOVE_GROWTH), LEVEL_UP_MOVE(13, MOVE_RAZOR_LEAF), @@ -20750,11 +20728,9 @@ static const struct LevelUpMove sCapsakidLevelUpLearnset[] = { static const struct LevelUpMove sScovillainLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SPICY_EXTRACT), LEVEL_UP_MOVE( 0, MOVE_FLAMETHROWER), - LEVEL_UP_MOVE( 1, MOVE_SPICY_EXTRACT), - LEVEL_UP_MOVE( 1, MOVE_FLAMETHROWER), + LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_FIRE_FANG), LEVEL_UP_MOVE( 1, MOVE_LEAFAGE), - LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 4, MOVE_BITE), LEVEL_UP_MOVE(10, MOVE_GROWTH), LEVEL_UP_MOVE(13, MOVE_RAZOR_LEAF), @@ -20786,9 +20762,6 @@ static const struct LevelUpMove sRellorLevelUpLearnset[] = { static const struct LevelUpMove sRabscaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_REVIVAL_BLESSING), - LEVEL_UP_MOVE( 1, MOVE_REVIVAL_BLESSING), - LEVEL_UP_MOVE( 1, MOVE_SAFEGUARD), - LEVEL_UP_MOVE( 1, MOVE_PSYCH_UP), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 1, MOVE_CONFUSION), @@ -20809,8 +20782,8 @@ static const struct LevelUpMove sRabscaLevelUpLearnset[] = { }; static const struct LevelUpMove sFlittleLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_GROWL), + LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 5, MOVE_CONFUSION), LEVEL_UP_MOVE( 8, MOVE_BABY_DOLL_EYES), LEVEL_UP_MOVE(11, MOVE_DISARMING_VOICE), @@ -20824,11 +20797,10 @@ static const struct LevelUpMove sFlittleLevelUpLearnset[] = { static const struct LevelUpMove sEspathraLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_LUMINA_CRASH), - LEVEL_UP_MOVE( 1, MOVE_LUMINA_CRASH), + LEVEL_UP_MOVE( 1, MOVE_GROWL), + LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_DRILL_PECK), LEVEL_UP_MOVE( 1, MOVE_FEATHER_DANCE), - LEVEL_UP_MOVE( 1, MOVE_PECK), - LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 5, MOVE_CONFUSION), LEVEL_UP_MOVE( 8, MOVE_BABY_DOLL_EYES), LEVEL_UP_MOVE(11, MOVE_DISARMING_VOICE), @@ -20885,9 +20857,8 @@ static const struct LevelUpMove sTinkatuffLevelUpLearnset[] = { static const struct LevelUpMove sTinkatonLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_GIGATON_HAMMER), - LEVEL_UP_MOVE( 1, MOVE_GIGATON_HAMMER), - LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_FAIRY_WIND), + LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 5, MOVE_BABY_DOLL_EYES), LEVEL_UP_MOVE( 8, MOVE_METAL_CLAW), LEVEL_UP_MOVE(11, MOVE_COVET), @@ -20906,8 +20877,8 @@ static const struct LevelUpMove sTinkatonLevelUpLearnset[] = { }; static const struct LevelUpMove sWiglettLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), + LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), LEVEL_UP_MOVE( 4, MOVE_MUD_SLAP), LEVEL_UP_MOVE( 8, MOVE_WRAP), LEVEL_UP_MOVE(12, MOVE_AQUA_JET), @@ -20922,10 +20893,10 @@ static const struct LevelUpMove sWiglettLevelUpLearnset[] = { }; static const struct LevelUpMove sWugtrioLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), - LEVEL_UP_MOVE( 1, MOVE_MUD_SLAP), LEVEL_UP_MOVE( 1, MOVE_WRAP), + LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), + LEVEL_UP_MOVE( 1, MOVE_MUD_SLAP), LEVEL_UP_MOVE(12, MOVE_AQUA_JET), LEVEL_UP_MOVE(16, MOVE_SLAM), LEVEL_UP_MOVE(20, MOVE_WATER_PULSE), @@ -20959,8 +20930,8 @@ static const struct LevelUpMove sBombirdierLevelUpLearnset[] = { }; static const struct LevelUpMove sFinizenLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), LEVEL_UP_MOVE( 1, MOVE_SUPERSONIC), + LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), LEVEL_UP_MOVE( 7, MOVE_ASTONISH), LEVEL_UP_MOVE(10, MOVE_FOCUS_ENERGY), LEVEL_UP_MOVE(13, MOVE_AQUA_JET), @@ -20977,10 +20948,9 @@ static const struct LevelUpMove sFinizenLevelUpLearnset[] = { static const struct LevelUpMove sPalafinLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_FLIP_TURN), - LEVEL_UP_MOVE( 1, MOVE_FLIP_TURN), LEVEL_UP_MOVE( 1, MOVE_JET_PUNCH), - LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), LEVEL_UP_MOVE( 1, MOVE_SUPERSONIC), + LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), LEVEL_UP_MOVE( 7, MOVE_ASTONISH), LEVEL_UP_MOVE(10, MOVE_FOCUS_ENERGY), LEVEL_UP_MOVE(13, MOVE_AQUA_JET), @@ -21018,7 +20988,6 @@ static const struct LevelUpMove sVaroomLevelUpLearnset[] = { static const struct LevelUpMove sRevavroomLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SHIFT_GEAR), - LEVEL_UP_MOVE( 1, MOVE_SHIFT_GEAR), LEVEL_UP_MOVE( 1, MOVE_MAGNET_RISE), LEVEL_UP_MOVE( 1, MOVE_LICK), LEVEL_UP_MOVE( 1, MOVE_POISON_GAS), @@ -21094,12 +21063,11 @@ static const struct LevelUpMove sGlimmetLevelUpLearnset[] = { static const struct LevelUpMove sGlimmoraLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_MORTAL_SPIN), - LEVEL_UP_MOVE( 1, MOVE_MORTAL_SPIN), + LEVEL_UP_MOVE( 1, MOVE_SMACK_DOWN), LEVEL_UP_MOVE( 1, MOVE_SPIKY_SHIELD), LEVEL_UP_MOVE( 1, MOVE_TOXIC_SPIKES), LEVEL_UP_MOVE( 1, MOVE_ROCK_THROW), LEVEL_UP_MOVE( 1, MOVE_HARDEN), - LEVEL_UP_MOVE( 1, MOVE_SMACK_DOWN), LEVEL_UP_MOVE( 7, MOVE_ACID_SPRAY), LEVEL_UP_MOVE(11, MOVE_ANCIENT_POWER), LEVEL_UP_MOVE(15, MOVE_ROCK_POLISH), @@ -21135,7 +21103,6 @@ static const struct LevelUpMove sGreavardLevelUpLearnset[] = { static const struct LevelUpMove sHoundstoneLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_LAST_RESPECTS), - LEVEL_UP_MOVE( 1, MOVE_LAST_RESPECTS), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 3, MOVE_LICK), @@ -21267,11 +21234,10 @@ static const struct LevelUpMove sTatsugiriLevelUpLearnset[] = { static const struct LevelUpMove sAnnihilapeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SHADOW_PUNCH), - LEVEL_UP_MOVE( 1, MOVE_SHADOW_PUNCH), - LEVEL_UP_MOVE( 1, MOVE_COUNTER), - LEVEL_UP_MOVE( 1, MOVE_FLING), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_COUNTER), + LEVEL_UP_MOVE( 1, MOVE_FLING), LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY), LEVEL_UP_MOVE( 5, MOVE_FURY_SWIPES), LEVEL_UP_MOVE( 8, MOVE_LOW_KICK), @@ -21291,7 +21257,6 @@ static const struct LevelUpMove sAnnihilapeLevelUpLearnset[] = { static const struct LevelUpMove sClodsireLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_AMNESIA), - LEVEL_UP_MOVE( 1, MOVE_AMNESIA), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_POISON_STING), LEVEL_UP_MOVE( 4, MOVE_TOXIC_SPIKES), @@ -21308,11 +21273,11 @@ static const struct LevelUpMove sClodsireLevelUpLearnset[] = { }; static const struct LevelUpMove sFarigirafLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_POWER_SWAP), - LEVEL_UP_MOVE( 1, MOVE_GUARD_SWAP), - LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), + LEVEL_UP_MOVE( 1, MOVE_ASTONISH), + LEVEL_UP_MOVE( 1, MOVE_POWER_SWAP), + LEVEL_UP_MOVE( 1, MOVE_GUARD_SWAP), LEVEL_UP_MOVE( 5, MOVE_CONFUSION), LEVEL_UP_MOVE(10, MOVE_ASSURANCE), LEVEL_UP_MOVE(14, MOVE_STOMP), @@ -21328,8 +21293,8 @@ static const struct LevelUpMove sFarigirafLevelUpLearnset[] = { }; static const struct LevelUpMove sDudunsparceLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_FLAIL), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), + LEVEL_UP_MOVE( 1, MOVE_FLAIL), LEVEL_UP_MOVE( 4, MOVE_MUD_SLAP), LEVEL_UP_MOVE( 8, MOVE_ROLLOUT), LEVEL_UP_MOVE(12, MOVE_GLARE), @@ -21350,12 +21315,11 @@ static const struct LevelUpMove sDudunsparceLevelUpLearnset[] = { static const struct LevelUpMove sKingambitLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_KOWTOW_CLEAVE), - LEVEL_UP_MOVE( 1, MOVE_KOWTOW_CLEAVE), LEVEL_UP_MOVE( 1, MOVE_METAL_BURST), + LEVEL_UP_MOVE( 1, MOVE_METAL_CLAW), + LEVEL_UP_MOVE( 1, MOVE_FURY_CUTTER), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 1, MOVE_FURY_CUTTER), - LEVEL_UP_MOVE( 1, MOVE_METAL_CLAW), LEVEL_UP_MOVE(15, MOVE_TORMENT), LEVEL_UP_MOVE(20, MOVE_SCARY_FACE), LEVEL_UP_MOVE(25, MOVE_ASSURANCE), @@ -21371,10 +21335,10 @@ static const struct LevelUpMove sKingambitLevelUpLearnset[] = { }; static const struct LevelUpMove sGreatTuskLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY), LEVEL_UP_MOVE( 1, MOVE_HORN_ATTACK), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 1, MOVE_ROLLOUT), + LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY), LEVEL_UP_MOVE( 7, MOVE_BULLDOZE), LEVEL_UP_MOVE(14, MOVE_TAUNT), LEVEL_UP_MOVE(21, MOVE_RAPID_SPIN), @@ -21392,7 +21356,6 @@ static const struct LevelUpMove sGreatTuskLevelUpLearnset[] = { }; static const struct LevelUpMove sScreamTailLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY), LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_SING), LEVEL_UP_MOVE( 1, MOVE_DISABLE), @@ -21413,7 +21376,6 @@ static const struct LevelUpMove sScreamTailLevelUpLearnset[] = { }; static const struct LevelUpMove sBruteBonnetLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY), LEVEL_UP_MOVE( 1, MOVE_ABSORB), LEVEL_UP_MOVE( 1, MOVE_GROWTH), LEVEL_UP_MOVE( 1, MOVE_ASTONISH), @@ -21433,7 +21395,6 @@ static const struct LevelUpMove sBruteBonnetLevelUpLearnset[] = { }; static const struct LevelUpMove sFlutterManeLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY), LEVEL_UP_MOVE( 1, MOVE_CONFUSE_RAY), LEVEL_UP_MOVE( 1, MOVE_SPITE), LEVEL_UP_MOVE( 1, MOVE_ASTONISH), @@ -21454,7 +21415,6 @@ static const struct LevelUpMove sFlutterManeLevelUpLearnset[] = { }; static const struct LevelUpMove sSlitherWingLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY), LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 1, MOVE_BUG_BITE), @@ -21476,7 +21436,6 @@ static const struct LevelUpMove sSlitherWingLevelUpLearnset[] = { }; static const struct LevelUpMove sSandyShocksLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY), LEVEL_UP_MOVE( 1, MOVE_THUNDER_WAVE), LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN), LEVEL_UP_MOVE( 1, MOVE_SUPERSONIC), @@ -21498,10 +21457,10 @@ static const struct LevelUpMove sSandyShocksLevelUpLearnset[] = { }; static const struct LevelUpMove sIronTreadsLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN), LEVEL_UP_MOVE( 1, MOVE_HORN_ATTACK), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 1, MOVE_ROLLOUT), + LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN), LEVEL_UP_MOVE( 7, MOVE_BULLDOZE), LEVEL_UP_MOVE(21, MOVE_RAPID_SPIN), LEVEL_UP_MOVE(28, MOVE_IRON_HEAD), @@ -21518,7 +21477,6 @@ static const struct LevelUpMove sIronTreadsLevelUpLearnset[] = { }; static const struct LevelUpMove sIronBundleLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN), LEVEL_UP_MOVE( 1, MOVE_PRESENT), LEVEL_UP_MOVE( 7, MOVE_POWDER_SNOW), LEVEL_UP_MOVE(14, MOVE_WHIRLPOOL), @@ -21537,7 +21495,6 @@ static const struct LevelUpMove sIronBundleLevelUpLearnset[] = { }; static const struct LevelUpMove sIronHandsLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN), LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY), @@ -21580,7 +21537,6 @@ static const struct LevelUpMove sIronJugulisLevelUpLearnset[] = { }; static const struct LevelUpMove sIronMothLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN), LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_WHIRLWIND), LEVEL_UP_MOVE( 1, MOVE_EMBER), @@ -21602,12 +21558,11 @@ static const struct LevelUpMove sIronMothLevelUpLearnset[] = { }; static const struct LevelUpMove sIronThornsLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN), LEVEL_UP_MOVE( 1, MOVE_ROCK_THROW), LEVEL_UP_MOVE( 1, MOVE_FIRE_FANG), LEVEL_UP_MOVE( 1, MOVE_ICE_FANG), - LEVEL_UP_MOVE( 1, MOVE_IRON_DEFENSE), LEVEL_UP_MOVE( 1, MOVE_THUNDER_FANG), + LEVEL_UP_MOVE( 1, MOVE_IRON_DEFENSE), LEVEL_UP_MOVE( 7, MOVE_SCREECH), LEVEL_UP_MOVE(21, MOVE_ROCK_TOMB), LEVEL_UP_MOVE(28, MOVE_BITE), @@ -21658,13 +21613,12 @@ static const struct LevelUpMove sArctibaxLevelUpLearnset[] = { static const struct LevelUpMove sBaxcaliburLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_GLAIVE_RUSH), - LEVEL_UP_MOVE( 1, MOVE_GLAIVE_RUSH), LEVEL_UP_MOVE( 1, MOVE_SNOWSCAPE), LEVEL_UP_MOVE( 1, MOVE_BREAKING_SWIPE), + LEVEL_UP_MOVE( 1, MOVE_DRAGON_TAIL), LEVEL_UP_MOVE( 1, MOVE_ICE_SHARD), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 1, MOVE_DRAGON_TAIL), LEVEL_UP_MOVE( 6, MOVE_ICY_WIND), LEVEL_UP_MOVE(12, MOVE_DRAGON_BREATH), LEVEL_UP_MOVE(18, MOVE_FOCUS_ENERGY), @@ -21685,8 +21639,8 @@ static const struct LevelUpMove sGimmighoulLevelUpLearnset[] = { }; static const struct LevelUpMove sGholdengoLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 7, MOVE_NIGHT_SHADE), LEVEL_UP_MOVE(14, MOVE_CONFUSE_RAY), LEVEL_UP_MOVE(21, MOVE_SUBSTITUTE), @@ -21724,8 +21678,8 @@ static const struct LevelUpMove sWoChienLevelUpLearnset[] = { }; static const struct LevelUpMove sChienPaoLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 1, MOVE_SPITE), + LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 1, MOVE_MEAN_LOOK), LEVEL_UP_MOVE( 5, MOVE_ICY_WIND), LEVEL_UP_MOVE(10, MOVE_PAYBACK), @@ -21747,9 +21701,9 @@ static const struct LevelUpMove sChienPaoLevelUpLearnset[] = { }; static const struct LevelUpMove sTingLuLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_MEAN_LOOK), LEVEL_UP_MOVE( 1, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_SPITE), - LEVEL_UP_MOVE( 1, MOVE_MEAN_LOOK), LEVEL_UP_MOVE( 5, MOVE_SPIKES), LEVEL_UP_MOVE(10, MOVE_PAYBACK), LEVEL_UP_MOVE(15, MOVE_STOMP), @@ -21791,10 +21745,6 @@ static const struct LevelUpMove sChiYuLevelUpLearnset[] = { }; static const struct LevelUpMove sRoaringMoonLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY), - LEVEL_UP_MOVE( 1, MOVE_JAW_LOCK), - LEVEL_UP_MOVE( 1, MOVE_BREAKING_SWIPE), - LEVEL_UP_MOVE( 1, MOVE_SCALE_SHOT), LEVEL_UP_MOVE( 1, MOVE_DRAGON_BREATH), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_BITE), @@ -21816,7 +21766,6 @@ static const struct LevelUpMove sRoaringMoonLevelUpLearnset[] = { }; static const struct LevelUpMove sIronValiantLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN), LEVEL_UP_MOVE( 1, MOVE_DISABLE), LEVEL_UP_MOVE( 1, MOVE_DOUBLE_TEAM), LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), @@ -21832,8 +21781,8 @@ static const struct LevelUpMove sIronValiantLevelUpLearnset[] = { LEVEL_UP_MOVE(63, MOVE_CLOSE_COMBAT), LEVEL_UP_MOVE(70, MOVE_KNOCK_OFF), LEVEL_UP_MOVE(77, MOVE_DESTINY_BOND), - LEVEL_UP_MOVE(84, MOVE_WIDE_GUARD), LEVEL_UP_MOVE(84, MOVE_QUICK_GUARD), + LEVEL_UP_MOVE(84, MOVE_WIDE_GUARD), LEVEL_UP_MOVE(91, MOVE_SPIRIT_BREAK), LEVEL_UP_END }; @@ -21859,16 +21808,15 @@ static const struct LevelUpMove sKoraidonLevelUpLearnset[] = { }; static const struct LevelUpMove sMiraidonLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN), LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 1, MOVE_DRAGON_BREATH), + LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN), LEVEL_UP_MOVE( 7, MOVE_SHOCK_WAVE), LEVEL_UP_MOVE(14, MOVE_CHARGE), LEVEL_UP_MOVE(21, MOVE_PARABOLIC_CHARGE), LEVEL_UP_MOVE(28, MOVE_DISCHARGE), LEVEL_UP_MOVE(35, MOVE_AGILITY), LEVEL_UP_MOVE(42, MOVE_DRAGON_PULSE), - LEVEL_UP_MOVE(49, MOVE_POWER_GEM), LEVEL_UP_MOVE(56, MOVE_ELECTRO_DRIFT), LEVEL_UP_MOVE(63, MOVE_METAL_SOUND), LEVEL_UP_MOVE(70, MOVE_MIRROR_COAT), @@ -21880,10 +21828,8 @@ static const struct LevelUpMove sMiraidonLevelUpLearnset[] = { }; static const struct LevelUpMove sWalkingWakeLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY), - LEVEL_UP_MOVE( 1, MOVE_HONE_CLAWS), - LEVEL_UP_MOVE( 1, MOVE_ROAR), LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_ROAR), LEVEL_UP_MOVE( 1, MOVE_TWISTER), LEVEL_UP_MOVE( 1, MOVE_AQUA_JET), LEVEL_UP_MOVE( 7, MOVE_BITE), @@ -21901,10 +21847,8 @@ static const struct LevelUpMove sWalkingWakeLevelUpLearnset[] = { }; static const struct LevelUpMove sIronLeavesLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN), - LEVEL_UP_MOVE( 1, MOVE_QUASH), - LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 1, MOVE_HELPING_HAND), LEVEL_UP_MOVE( 1, MOVE_WORK_UP), LEVEL_UP_MOVE( 7, MOVE_MAGICAL_LEAF), @@ -21923,4 +21867,148 @@ static const struct LevelUpMove sIronLeavesLevelUpLearnset[] = { LEVEL_UP_END }; +static const struct LevelUpMove sDipplinLevelUpLearnset[] = { + LEVEL_UP_MOVE( 0, MOVE_DOUBLE_HIT), + LEVEL_UP_MOVE( 1, MOVE_WITHDRAW), + LEVEL_UP_MOVE( 1, MOVE_SWEET_SCENT), + LEVEL_UP_MOVE( 1, MOVE_RECYCLE), + LEVEL_UP_MOVE( 1, MOVE_ASTONISH), + LEVEL_UP_MOVE( 4, MOVE_DRAGON_TAIL), + LEVEL_UP_MOVE( 8, MOVE_GROWTH), + LEVEL_UP_MOVE(12, MOVE_DRAGON_BREATH), + LEVEL_UP_MOVE(16, MOVE_PROTECT), + LEVEL_UP_MOVE(20, MOVE_BULLET_SEED), + LEVEL_UP_MOVE(28, MOVE_SYRUP_BOMB), + LEVEL_UP_MOVE(32, MOVE_DRAGON_PULSE), + LEVEL_UP_MOVE(36, MOVE_RECOVER), + LEVEL_UP_MOVE(40, MOVE_ENERGY_BALL), + LEVEL_UP_MOVE(44, MOVE_SUBSTITUTE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sPoltchageistLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_STUN_SPORE), + LEVEL_UP_MOVE( 1, MOVE_WITHDRAW), + LEVEL_UP_MOVE( 1, MOVE_ASTONISH), + LEVEL_UP_MOVE( 6, MOVE_ABSORB), + LEVEL_UP_MOVE(12, MOVE_LIFE_DEW), + LEVEL_UP_MOVE(18, MOVE_FOUL_PLAY), + LEVEL_UP_MOVE(24, MOVE_MEGA_DRAIN), + LEVEL_UP_MOVE(30, MOVE_HEX), + LEVEL_UP_MOVE(36, MOVE_RAGE_POWDER), + LEVEL_UP_MOVE(42, MOVE_GIGA_DRAIN), + LEVEL_UP_MOVE(48, MOVE_SHADOW_BALL), + LEVEL_UP_MOVE(54, MOVE_MEMENTO), + LEVEL_UP_MOVE(60, MOVE_LEAF_STORM), + LEVEL_UP_END +}; + +static const struct LevelUpMove sSinistchaLevelUpLearnset[] = { + LEVEL_UP_MOVE( 0, MOVE_MATCHA_GOTCHA), + LEVEL_UP_MOVE( 1, MOVE_STUN_SPORE), + LEVEL_UP_MOVE( 1, MOVE_WITHDRAW), + LEVEL_UP_MOVE( 1, MOVE_ASTONISH), + LEVEL_UP_MOVE( 6, MOVE_ABSORB), + LEVEL_UP_MOVE(12, MOVE_LIFE_DEW), + LEVEL_UP_MOVE(18, MOVE_FOUL_PLAY), + LEVEL_UP_MOVE(24, MOVE_MEGA_DRAIN), + LEVEL_UP_MOVE(30, MOVE_HEX), + LEVEL_UP_MOVE(36, MOVE_RAGE_POWDER), + LEVEL_UP_MOVE(42, MOVE_STRENGTH_SAP), + LEVEL_UP_MOVE(48, MOVE_SHADOW_BALL), + LEVEL_UP_MOVE(54, MOVE_MEMENTO), + LEVEL_UP_MOVE(60, MOVE_LEAF_STORM), + LEVEL_UP_END +}; + +static const struct LevelUpMove sOkidogiLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_BITE), + LEVEL_UP_MOVE( 1, MOVE_LOW_KICK), + LEVEL_UP_MOVE( 1, MOVE_BULK_UP), + LEVEL_UP_MOVE( 8, MOVE_HOWL), + LEVEL_UP_MOVE(16, MOVE_POISON_FANG), + LEVEL_UP_MOVE(24, MOVE_FORCE_PALM), + LEVEL_UP_MOVE(32, MOVE_COUNTER), + LEVEL_UP_MOVE(40, MOVE_POISON_JAB), + LEVEL_UP_MOVE(48, MOVE_BRUTAL_SWING), + LEVEL_UP_MOVE(56, MOVE_CRUNCH), + LEVEL_UP_MOVE(64, MOVE_SUPERPOWER), + LEVEL_UP_MOVE(72, MOVE_GIGA_IMPACT), + LEVEL_UP_END +}; + +static const struct LevelUpMove sMunkidoriLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_SCRATCH), + LEVEL_UP_MOVE( 1, MOVE_CONFUSION), + LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), + LEVEL_UP_MOVE( 1, MOVE_FLATTER), + LEVEL_UP_MOVE( 8, MOVE_HELPING_HAND), + LEVEL_UP_MOVE(16, MOVE_PSYBEAM), + LEVEL_UP_MOVE(24, MOVE_CLEAR_SMOG), + LEVEL_UP_MOVE(32, MOVE_POISON_JAB), + LEVEL_UP_MOVE(40, MOVE_PSYCHIC), + LEVEL_UP_MOVE(48, MOVE_SLUDGE_WAVE), + LEVEL_UP_MOVE(56, MOVE_NASTY_PLOT), + LEVEL_UP_MOVE(64, MOVE_FUTURE_SIGHT), + LEVEL_UP_MOVE(72, MOVE_PARTING_SHOT), + LEVEL_UP_END +}; + +static const struct LevelUpMove sFezandipitiLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_DOUBLE_KICK), + LEVEL_UP_MOVE( 1, MOVE_PECK), + LEVEL_UP_MOVE( 1, MOVE_POISON_GAS), + LEVEL_UP_MOVE( 1, MOVE_DISARMING_VOICE), + LEVEL_UP_MOVE( 8, MOVE_QUICK_ATTACK), + LEVEL_UP_MOVE(16, MOVE_ATTRACT), + LEVEL_UP_MOVE(24, MOVE_WING_ATTACK), + LEVEL_UP_MOVE(32, MOVE_CROSS_POISON), + LEVEL_UP_MOVE(40, MOVE_TAIL_SLAP), + LEVEL_UP_MOVE(48, MOVE_BEAT_UP), + LEVEL_UP_MOVE(56, MOVE_FLATTER), + LEVEL_UP_MOVE(56, MOVE_SWAGGER), + LEVEL_UP_MOVE(64, MOVE_ROOST), + LEVEL_UP_MOVE(72, MOVE_MOONBLAST), + LEVEL_UP_END +}; + +static const struct LevelUpMove sOgerponLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_VINE_WHIP), + LEVEL_UP_MOVE( 1, MOVE_LEECH_SEED), + LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), + LEVEL_UP_MOVE( 1, MOVE_FOLLOW_ME), + LEVEL_UP_MOVE( 6, MOVE_FOCUS_ENERGY), + LEVEL_UP_MOVE(12, MOVE_GROWTH), + LEVEL_UP_MOVE(18, MOVE_SLAM), + LEVEL_UP_MOVE(24, MOVE_LOW_SWEEP), + LEVEL_UP_MOVE(30, MOVE_IVY_CUDGEL), + LEVEL_UP_MOVE(36, MOVE_THROAT_CHOP), + LEVEL_UP_MOVE(42, MOVE_SYNTHESIS), + LEVEL_UP_MOVE(48, MOVE_SPIKY_SHIELD), + LEVEL_UP_MOVE(54, MOVE_POWER_WHIP), + LEVEL_UP_MOVE(60, MOVE_SUPERPOWER), + LEVEL_UP_MOVE(66, MOVE_WOOD_HAMMER), + LEVEL_UP_END +}; + +static const struct LevelUpMove sUrsalunaBloodmoonLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_SCRATCH), + LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_LICK), + LEVEL_UP_MOVE( 1, MOVE_HEADLONG_RUSH), + LEVEL_UP_MOVE( 8, MOVE_FURY_SWIPES), + LEVEL_UP_MOVE(13, MOVE_PAYBACK), + LEVEL_UP_MOVE(17, MOVE_HARDEN), + LEVEL_UP_MOVE(22, MOVE_SLASH), + LEVEL_UP_MOVE(25, MOVE_PLAY_NICE), + LEVEL_UP_MOVE(35, MOVE_SCARY_FACE), + LEVEL_UP_MOVE(41, MOVE_REST), + LEVEL_UP_MOVE(41, MOVE_SNORE), + LEVEL_UP_MOVE(48, MOVE_EARTH_POWER), + LEVEL_UP_MOVE(56, MOVE_MOONBLAST), + LEVEL_UP_MOVE(64, MOVE_HAMMER_ARM), + LEVEL_UP_MOVE(70, MOVE_BLOOD_MOON), + LEVEL_UP_END +}; + #endif diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index 7624cb0395..a8bca961a3 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -12141,5 +12141,89 @@ const struct PokedexEntry gPokedexEntries[] = .height = 15, .weight = 1250, }, + + [NATIONAL_DEX_DIPPLIN] = + { + .description = gDipplinPokedexText, + .categoryName = _("Candy Apple"), + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + .height = 4, + .weight = 44, + }, + + [NATIONAL_DEX_POLTCHAGEIST] = + { + .description = gPoltchageistPokedexText, + .categoryName = _("Matcha"), + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + .height = 1, + .weight = 11, + }, + + [NATIONAL_DEX_SINISTCHA] = + { + .description = gSinistchaPokedexText, + .categoryName = _("Matcha"), + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + .height = 2, + .weight = 22, + }, + + [NATIONAL_DEX_OKIDOGI] = + { + .description = gOkidogiPokedexText, + .categoryName = _("Retainer"), + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + .height = 18, + .weight = 920, + }, + + [NATIONAL_DEX_MUNKIDORI] = + { + .description = gMunkidoriPokedexText, + .categoryName = _("Retainer"), + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + .height = 10, + .weight = 122, + }, + + [NATIONAL_DEX_FEZANDIPITI] = + { + .description = gFezandipitiPokedexText, + .categoryName = _("Retainer"), + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + .height = 14, + .weight = 301, + }, + + [NATIONAL_DEX_OGERPON] = + { + .description = gOgerponPokedexText, + .categoryName = _("Mask"), + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + .height = 12, + .weight = 398, + }, #endif }; diff --git a/src/data/pokemon/pokedex_orders.h b/src/data/pokemon/pokedex_orders.h index 71dfd9ed9c..e877bbb17f 100644 --- a/src/data/pokemon/pokedex_orders.h +++ b/src/data/pokemon/pokedex_orders.h @@ -210,6 +210,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_DIANCIE, NATIONAL_DEX_DIGGERSBY, NATIONAL_DEX_DIGLETT, + NATIONAL_DEX_DIPPLIN, NATIONAL_DEX_DITTO, NATIONAL_DEX_DODRIO, NATIONAL_DEX_DODUO, @@ -286,6 +287,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_FERALIGATR, NATIONAL_DEX_FERROSEED, NATIONAL_DEX_FERROTHORN, + NATIONAL_DEX_FEZANDIPITI, NATIONAL_DEX_FIDOUGH, NATIONAL_DEX_FINIZEN, NATIONAL_DEX_FINNEON, @@ -593,6 +595,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_MUDSDALE, NATIONAL_DEX_MUK, NATIONAL_DEX_MUNCHLAX, + NATIONAL_DEX_MUNKIDORI, NATIONAL_DEX_MUNNA, NATIONAL_DEX_MURKROW, NATIONAL_DEX_MUSHARNA, @@ -624,7 +627,9 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_OBSTAGOON, NATIONAL_DEX_OCTILLERY, NATIONAL_DEX_ODDISH, + NATIONAL_DEX_OGERPON, NATIONAL_DEX_OINKOLOGNE, + NATIONAL_DEX_OKIDOGI, NATIONAL_DEX_OMANYTE, NATIONAL_DEX_OMASTAR, NATIONAL_DEX_ONIX, @@ -680,6 +685,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_POLIWAG, NATIONAL_DEX_POLIWHIRL, NATIONAL_DEX_POLIWRATH, + NATIONAL_DEX_POLTCHAGEIST, NATIONAL_DEX_POLTEAGEIST, NATIONAL_DEX_PONYTA, NATIONAL_DEX_POOCHYENA, @@ -803,6 +809,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_SIMIPOUR, NATIONAL_DEX_SIMISAGE, NATIONAL_DEX_SIMISEAR, + NATIONAL_DEX_SINISTCHA, NATIONAL_DEX_SINISTEA, NATIONAL_DEX_SIRFETCHD, NATIONAL_DEX_SIZZLIPEDE, @@ -1121,6 +1128,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_RELLOR, // 2.4 lbs / 1.1 kg NATIONAL_DEX_JIRACHI, + NATIONAL_DEX_POLTCHAGEIST, // 2.6 lbs / 1.2 kg NATIONAL_DEX_SHEDINJA, NATIONAL_DEX_SWABLU, @@ -1170,6 +1178,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_KRICKETOT, NATIONAL_DEX_DEDENNE, NATIONAL_DEX_GOSSIFLEUR, + NATIONAL_DEX_SINISTCHA, // 5.1 lbs / 2.3 kg NATIONAL_DEX_TAILLOW, NATIONAL_DEX_SHUPPET, @@ -1493,6 +1502,8 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_SHINX, NATIONAL_DEX_ARCHEN, //NATIONAL_DEX_GOURGEIST_SMALL, + // 21.6 lbs / 9.7 kg + NATIONAL_DEX_DIPPLIN, // 21.6 lbs / 9.8 kg NATIONAL_DEX_FUECOCO, // 21.8 lbs / 9.9 kg @@ -1569,6 +1580,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_KUBFU, // 26.9 lbs / 12.2 kg NATIONAL_DEX_FLORAGATO, + NATIONAL_DEX_MUNKIDORI, // 27.3 lbs / 12.4 kg NATIONAL_DEX_POLIWAG, // 27.6 lbs / 12.5 kg @@ -1922,6 +1934,8 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_BARRASKEWDA, NATIONAL_DEX_ARCTIBAX, NATIONAL_DEX_GHOLDENGO, + // 66.4 lbs / 30.1 kg + NATIONAL_DEX_FEZANDIPITI, // 67.2 lbs / 30.5 kg NATIONAL_DEX_LUXIO, NATIONAL_DEX_SIMISAGE, @@ -2048,6 +2062,8 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_PIDGEOT, NATIONAL_DEX_SPHEAL, NATIONAL_DEX_MANDIBUZZ, + // 87.7 lbs / 39.8 kg + NATIONAL_DEX_OGERPON, // 88.2 lbs / 40.0 kg //NATIONAL_DEX_SANDSHREW_ALOLAN, NATIONAL_DEX_CLEFABLE, @@ -2451,6 +2467,8 @@ const u16 gPokedexOrder_Weight[] = // 202.8 lbs / 92.0 kg NATIONAL_DEX_GOLETT, NATIONAL_DEX_SLITHER_WING, + // 203.3 lbs / 92.2 kg + NATIONAL_DEX_OKIDOGI, // 203.9 lbs / 92.5 kg NATIONAL_DEX_SAWSBUCK,//_SPRING, //NATIONAL_DEX_SAWSBUCK_SUMMER, @@ -2908,6 +2926,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_SINISTEA,//_PHONY, //NATIONAL_DEX_SINISTEA_ANTIQUE, //NATIONAL_DEX_GIMMIGHOUL_ROAMING, + NATIONAL_DEX_POLTCHAGEIST, // 0'08" / 0.2m NATIONAL_DEX_DIGLETT, //NATIONAL_DEX_DIGLETT_ALOLAN, @@ -2945,6 +2964,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_SHROODLE, NATIONAL_DEX_RELLOR, NATIONAL_DEX_FLITTLE, + NATIONAL_DEX_SINISTCHA, // 1'00" / 0.3m NATIONAL_DEX_CATERPIE, NATIONAL_DEX_WEEDLE, @@ -3117,6 +3137,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_WATTREL, NATIONAL_DEX_TINKATINK, NATIONAL_DEX_CHI_YU, + NATIONAL_DEX_DIPPLIN, // 1'08" / 0.5m NATIONAL_DEX_SQUIRTLE, NATIONAL_DEX_NIDORAN_M, @@ -3560,6 +3581,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_SPIDOPS, NATIONAL_DEX_LOKIX, NATIONAL_DEX_VAROOM, + NATIONAL_DEX_MUNKIDORI, // 3'07" / 1.1m NATIONAL_DEX_CHARMELEON, NATIONAL_DEX_BUTTERFREE, @@ -3693,6 +3715,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_BRUTE_BONNET, NATIONAL_DEX_IRON_MOTH, NATIONAL_DEX_GHOLDENGO, + NATIONAL_DEX_OGERPON, // 4'03" / 1.3m NATIONAL_DEX_NIDOQUEEN, NATIONAL_DEX_CLEFABLE, @@ -3787,6 +3810,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_KILOWATTREL, NATIONAL_DEX_FLUTTER_MANE, NATIONAL_DEX_IRON_VALIANT, + NATIONAL_DEX_FEZANDIPITI, // 4'11" / 1.5m NATIONAL_DEX_PIDGEOT, NATIONAL_DEX_VENOMOTH, @@ -3968,6 +3992,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_REVAVROOM, NATIONAL_DEX_CLODSIRE, NATIONAL_DEX_IRON_HANDS, + NATIONAL_DEX_OKIDOGI, // 6'03" / 1.9m NATIONAL_DEX_ARCANINE, NATIONAL_DEX_RHYDON, diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 92c8f544fd..2aba85a4c8 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -21094,6 +21094,28 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, + [SPECIES_URSALUNA_BLOODMOON] = + { + .baseHP = 113, + .baseAttack = 70, + .baseDefense = 120, + .baseSpeed = 52, + .baseSpAttack = 135, + .baseSpDefense = 65, + .types = { TYPE_GROUND, TYPE_NORMAL}, + .catchRate = 5, + .expYield = 275, + .evYield_SpAtk = 3, + .genderRatio = MON_MALE + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = { EGG_GROUP_FIELD, EGG_GROUP_FIELD}, + .abilities = {ABILITY_MINDS_EYE, ABILITY_MINDS_EYE, ABILITY_MINDS_EYE}, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + [SPECIES_BASCULEGION_MALE] = { .baseHP = 120, diff --git a/src/pokemon.c b/src/pokemon.c index 8c689a4161..7e202674bc 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1267,6 +1267,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(WYRDEER), SPECIES_TO_NATIONAL(KLEAVOR), SPECIES_TO_NATIONAL(URSALUNA), + [SPECIES_URSALUNA_BLOODMOON - 1] = NATIONAL_DEX_URSALUNA, SPECIES_TO_NATIONAL(BASCULEGION), SPECIES_TO_NATIONAL(SNEASLER), SPECIES_TO_NATIONAL(OVERQWIL), @@ -1388,6 +1389,22 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(MIRAIDON), SPECIES_TO_NATIONAL(WALKING_WAKE), SPECIES_TO_NATIONAL(IRON_LEAVES), + SPECIES_TO_NATIONAL(DIPPLIN), + SPECIES_TO_NATIONAL(POLTCHAGEIST), + [SPECIES_POLTCHAGEIST_ARTISAN - 1] = NATIONAL_DEX_POLTCHAGEIST, + SPECIES_TO_NATIONAL(SINISTCHA), + [SPECIES_SINISTCHA_MASTERPIECE - 1] = NATIONAL_DEX_POLTCHAGEIST, + SPECIES_TO_NATIONAL(OKIDOGI), + SPECIES_TO_NATIONAL(MUNKIDORI), + SPECIES_TO_NATIONAL(FEZANDIPITI), + SPECIES_TO_NATIONAL(OGERPON), + [SPECIES_OGERPON_WELLSPRING - 1] = NATIONAL_DEX_OGERPON, + [SPECIES_OGERPON_HEARTHFLAME - 1] = NATIONAL_DEX_OGERPON, + [SPECIES_OGERPON_CORNERSTONE - 1] = NATIONAL_DEX_OGERPON, + [SPECIES_OGERPON_TEAL_TERA - 1] = NATIONAL_DEX_OGERPON, + [SPECIES_OGERPON_WELLSPRING_TERA - 1] = NATIONAL_DEX_OGERPON, + [SPECIES_OGERPON_HEARTHFLAME_TERA - 1] = NATIONAL_DEX_OGERPON, + [SPECIES_OGERPON_CORNERSTONE_TERA - 1] = NATIONAL_DEX_OGERPON, #endif // Megas @@ -3051,6 +3068,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_WYRDEER - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_KLEAVOR - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_URSALUNA - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_URSALUNA_BLOODMOON - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_BASCULEGION_MALE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_SNEASLER - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_OVERQWIL - 1] = ANIM_V_SQUISH_AND_BOUNCE, @@ -3172,6 +3190,22 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_MIRAIDON - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_WALKING_WAKE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_IRON_LEAVES - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_DIPPLIN - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_POLTCHAGEIST_COUNTERFEIT - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_POLTCHAGEIST_ARTISAN - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_SINISTCHA_UNREMARKABLE - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_SINISTCHA_MASTERPIECE - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_OKIDOGI - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_MUNKIDORI - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_FEZANDIPITI - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_OGERPON_TEAL - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_OGERPON_WELLSPRING - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_OGERPON_HEARTHFLAME - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_OGERPON_CORNERSTONE - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_OGERPON_TEAL_TERA - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_OGERPON_WELLSPRING_TERA - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_OGERPON_HEARTHFLAME_TERA - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_OGERPON_CORNERSTONE_TERA - 1] = ANIM_V_SQUISH_AND_BOUNCE, // Gen 3 Forms [SPECIES_CASTFORM_SUNNY - 1] = ANIM_GROW_VIBRATE, diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index bf0be741be..6e47b23fef 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -941,6 +941,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_WYRDEER] = gMonIcon_Wyrdeer, [SPECIES_KLEAVOR] = gMonIcon_Kleavor, [SPECIES_URSALUNA] = gMonIcon_Ursaluna, + //[SPECIES_URSALUNA_BLOODMOON] = gMonIcon_UrsalunaBloodmoon, [SPECIES_BASCULEGION_MALE] = gMonIcon_BasculegionMale, [SPECIES_SNEASLER] = gMonIcon_Sneasler, [SPECIES_OVERQWIL] = gMonIcon_Overqwil, @@ -1450,6 +1451,22 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_MIRAIDON] = gMonIcon_Miraidon, [SPECIES_WALKING_WAKE] = gMonIcon_WalkingWake, [SPECIES_IRON_LEAVES] = gMonIcon_IronLeaves, + //[SPECIES_DIPPLIN] = gMonIcon_Dipplin, + //[SPECIES_POLTCHAGEIST_COUNTERFEIT] = gMonIcon_Poltchageist, + //[SPECIES_POLTCHAGEIST_ARTISAN] = gMonIcon_Poltchageist, + //[SPECIES_SINISTCHA_UNREMARKABLE] = gMonIcon_Sinistcha, + //[SPECIES_SINISTCHA_MASTERPIECE] = gMonIcon_Sinistcha, + //[SPECIES_OKIDOGI] = gMonIcon_Okidogi, + //[SPECIES_MUNKIDORI] = gMonIcon_Munkidori, + //[SPECIES_FEZANDIPITI] = gMonIcon_Fezandipiti, + //[SPECIES_OGERPON_TEAL] = gMonIcon_OgerponTeal, + //[SPECIES_OGERPON_WELLSPRING] = gMonIcon_OgerponWellspring, + //[SPECIES_OGERPON_HEARTHFLAME] = gMonIcon_OgerponHearthflame, + //[SPECIES_OGERPON_CORNERSTONE] = gMonIcon_OgerponCornerstone, + //[SPECIES_OGERPON_TEAL_TERA] = gMonIcon_OgerponTeal, + //[SPECIES_OGERPON_WELLSPRING_TERA] = gMonIcon_OgerponWellspring, + //[SPECIES_OGERPON_HEARTHFLAME_TERA] = gMonIcon_OgerponHearthflame, + //[SPECIES_OGERPON_CORNERSTONE_TERA] = gMonIcon_OgerponCornerstone, #endif [SPECIES_EGG] = gMonIcon_Egg, }; @@ -2375,6 +2392,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_WYRDEER] = 2, [SPECIES_KLEAVOR] = 2, [SPECIES_URSALUNA] = 2, + [SPECIES_URSALUNA_BLOODMOON] = 0, [SPECIES_BASCULEGION_MALE] = 1, [SPECIES_SNEASLER] = 2, [SPECIES_OVERQWIL] = 2, @@ -2836,6 +2854,22 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_MIRAIDON] = 2, [SPECIES_WALKING_WAKE] = 2, [SPECIES_IRON_LEAVES] = 1, + [SPECIES_DIPPLIN] = 0, + [SPECIES_POLTCHAGEIST_COUNTERFEIT] = 0, + [SPECIES_POLTCHAGEIST_ARTISAN] = 0, + [SPECIES_SINISTCHA_UNREMARKABLE] = 0, + [SPECIES_SINISTCHA_MASTERPIECE] = 0, + [SPECIES_OKIDOGI] = 0, + [SPECIES_MUNKIDORI] = 0, + [SPECIES_FEZANDIPITI] = 0, + [SPECIES_OGERPON_TEAL] = 0, + [SPECIES_OGERPON_WELLSPRING] = 0, + [SPECIES_OGERPON_HEARTHFLAME] = 0, + [SPECIES_OGERPON_CORNERSTONE] = 0, + [SPECIES_OGERPON_TEAL_TERA] = 0, + [SPECIES_OGERPON_WELLSPRING_TERA] = 0, + [SPECIES_OGERPON_HEARTHFLAME_TERA] = 0, + [SPECIES_OGERPON_CORNERSTONE_TERA] = 0, #endif [SPECIES_EGG] = 1, };