diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h index 576e2cdf9b..7028330eab 100644 --- a/src/data/pokemon/egg_moves.h +++ b/src/data/pokemon/egg_moves.h @@ -4425,6 +4425,8 @@ const u16 gEggMoves[] = { MOVE_COUNTER, MOVE_CURSE, MOVE_DOUBLE_KICK, + MOVE_HAZE, + MOVE_MIST, MOVE_RECOVER, MOVE_SPIT_UP, MOVE_STOCKPILE, @@ -4449,269 +4451,241 @@ const u16 gEggMoves[] = { MOVE_HEAL_PULSE), #if P_GEN_9_POKEMON == TRUE - egg_moves(SPRIGATITO, - MOVE_ALLY_SWITCH, - MOVE_COPYCAT, - MOVE_LEECH_SEED, - MOVE_PETAL_BLIZZARD, - MOVE_SUCKER_PUNCH), + egg_moves(SPRIGATITO, + MOVE_ALLY_SWITCH, + MOVE_COPYCAT, + MOVE_LEECH_SEED, + MOVE_PETAL_BLIZZARD, + MOVE_SUCKER_PUNCH), - egg_moves(FUECOCO, - MOVE_BELCH, - MOVE_CURSE, - MOVE_ENCORE, - MOVE_SLACK_OFF), + egg_moves(FUECOCO, + MOVE_BELCH, + MOVE_CURSE, + MOVE_ENCORE, + MOVE_SLACK_OFF), - egg_moves(QUAXLY, - MOVE_DETECT, - MOVE_LAST_RESORT, - MOVE_RAPID_SPIN, - MOVE_ROOST), + egg_moves(QUAXLY, + MOVE_DETECT, + MOVE_LAST_RESORT, + MOVE_RAPID_SPIN, + MOVE_ROOST), - egg_moves(LECHONK, - MOVE_ENDEAVOR, - MOVE_SPIT_UP, - MOVE_STOCKPILE, - MOVE_STUFF_CHEEKS, - MOVE_SWALLOW), + egg_moves(LECHONK, + MOVE_ENDEAVOR, + MOVE_SPIT_UP, + MOVE_STOCKPILE, + MOVE_STUFF_CHEEKS, + MOVE_SWALLOW), - egg_moves(TAROUNTULA, - MOVE_FIRST_IMPRESSION, - MOVE_LUNGE, - MOVE_MEMENTO, - MOVE_SUCKER_PUNCH), + egg_moves(TAROUNTULA, + MOVE_FIRST_IMPRESSION, + MOVE_LUNGE, + MOVE_MEMENTO, + MOVE_SUCKER_PUNCH), - egg_moves(NYMBLE, - MOVE_COUNTER, - MOVE_SKITTER_SMACK), + egg_moves(NYMBLE, + MOVE_COUNTER, + MOVE_SKITTER_SMACK), - egg_moves(PAWMI, - MOVE_FAKE_OUT, - MOVE_MACH_PUNCH, - MOVE_SWEET_KISS, - MOVE_WISH), + egg_moves(PAWMI, + MOVE_FAKE_OUT, + MOVE_MACH_PUNCH, + MOVE_SWEET_KISS, + MOVE_WISH), - egg_moves(TANDEMAUS, - MOVE_AFTER_YOU, - MOVE_BATON_PASS, - MOVE_BITE, - MOVE_FEINT, - MOVE_SWITCHEROO, - MOVE_TICKLE), + egg_moves(TANDEMAUS, + MOVE_AFTER_YOU, + MOVE_BATON_PASS, + MOVE_BITE, + MOVE_FEINT, + MOVE_SWITCHEROO, + MOVE_TICKLE), - egg_moves(FIDOUGH, - MOVE_COPYCAT, - MOVE_HOWL, - MOVE_SWEET_SCENT, - MOVE_WISH, - MOVE_YAWN), + egg_moves(FIDOUGH, + MOVE_COPYCAT, + MOVE_HOWL, + MOVE_SWEET_SCENT, + MOVE_WISH, + MOVE_YAWN), - egg_moves(SMOLIV, - MOVE_MEMENTO, - MOVE_STRENGTH_SAP, - MOVE_SYNTHESIS, - MOVE_WEATHER_BALL), + egg_moves(SMOLIV, + MOVE_MEMENTO, + MOVE_STRENGTH_SAP, + MOVE_SYNTHESIS, + MOVE_WEATHER_BALL), - egg_moves(SQUAWKABILLY_GREEN_PLUMAGE, - MOVE_DOUBLE_EDGE, - MOVE_FINAL_GAMBIT, - MOVE_FLATTER, - MOVE_PARTING_SHOT), + egg_moves(SQUAWKABILLY, + MOVE_DOUBLE_EDGE, + MOVE_FINAL_GAMBIT, + MOVE_FLATTER, + MOVE_PARTING_SHOT), - egg_moves(SQUAWKABILLY_BLUE_PLUMAGE, - MOVE_DOUBLE_EDGE, - MOVE_FINAL_GAMBIT, - MOVE_FLATTER, - MOVE_PARTING_SHOT), + egg_moves(NACLI, + MOVE_ANCIENT_POWER, + MOVE_CURSE, + MOVE_FISSURE, + MOVE_POWER_GEM), - egg_moves(SQUAWKABILLY_YELLOW_PLUMAGE, - MOVE_DOUBLE_EDGE, - MOVE_FINAL_GAMBIT, - MOVE_FLATTER, - MOVE_PARTING_SHOT), + egg_moves(CHARCADET, + MOVE_DESTINY_BOND, + MOVE_DISABLE, + MOVE_SPITE), - egg_moves(SQUAWKABILLY_WHITE_PLUMAGE, - MOVE_DOUBLE_EDGE, - MOVE_FINAL_GAMBIT, - MOVE_FLATTER, - MOVE_PARTING_SHOT), + egg_moves(TADBULB, + MOVE_MUDDY_WATER, + MOVE_PARABOLIC_CHARGE, + MOVE_SOAK), - egg_moves(NACLI, - MOVE_ANCIENT_POWER, - MOVE_CURSE, - MOVE_FISSURE, - MOVE_POWER_GEM), + egg_moves(WATTREL, + MOVE_ENDEAVOR, + MOVE_FEATHER_DANCE, + MOVE_SPIT_UP, + MOVE_STOCKPILE, + MOVE_SWALLOW, + MOVE_WEATHER_BALL), - egg_moves(CHARCADET, - MOVE_DESTINY_BOND, - MOVE_DISABLE, - MOVE_SPITE), + egg_moves(MASCHIFF, + MOVE_DESTINY_BOND, + MOVE_ENDEAVOR, + MOVE_PLAY_ROUGH, + MOVE_RETALIATE), - egg_moves(TADBULB, - MOVE_MUDDY_WATER, - MOVE_PARABOLIC_CHARGE, - MOVE_SOAK), + egg_moves(SHROODLE, + MOVE_COPYCAT, + MOVE_CROSS_POISON, + MOVE_PARTING_SHOT, + MOVE_SUPER_FANG, + MOVE_SWAGGER, + MOVE_TOXIC), - egg_moves(WATTREL, - MOVE_ENDEAVOR, - MOVE_FEATHER_DANCE, - MOVE_SPIT_UP, - MOVE_STOCKPILE, - MOVE_SWALLOW, - MOVE_WEATHER_BALL), + egg_moves(BRAMBLIN, + MOVE_BEAT_UP, + MOVE_BLOCK, + MOVE_LEECH_SEED, + MOVE_SHADOW_SNEAK, + MOVE_STRENGTH_SAP), - egg_moves(MASCHIFF, - MOVE_DESTINY_BOND, - MOVE_ENDEAVOR, - MOVE_PLAY_ROUGH, - MOVE_RETALIATE), + egg_moves(TOEDSCOOL, + MOVE_ACUPRESSURE, + MOVE_KNOCK_OFF, + MOVE_LEECH_SEED, + MOVE_MIRROR_COAT, + MOVE_RAGE_POWDER, + MOVE_RAPID_SPIN, + MOVE_TICKLE, + MOVE_TOXIC), - egg_moves(SHROODLE, - MOVE_COPYCAT, - MOVE_CROSS_POISON, - MOVE_PARTING_SHOT, - MOVE_SUPER_FANG, - MOVE_SWAGGER, - MOVE_TOXIC), + egg_moves(KLAWF, + MOVE_ANCIENT_POWER, + MOVE_CRABHAMMER, + MOVE_ENDEAVOR, + MOVE_KNOCK_OFF), - egg_moves(BRAMBLIN, - MOVE_BEAT_UP, - MOVE_BLOCK, - MOVE_LEECH_SEED, - MOVE_SHADOW_SNEAK, - MOVE_STRENGTH_SAP), + egg_moves(CAPSAKID, + MOVE_INGRAIN, + MOVE_LEECH_SEED, + MOVE_RAGE_POWDER, + MOVE_ROLLOUT, + MOVE_WORRY_SEED), - egg_moves(TOEDSCOOL, - MOVE_ACUPRESSURE, - MOVE_KNOCK_OFF, - MOVE_LEECH_SEED, - MOVE_MIRROR_COAT, - MOVE_RAGE_POWDER, - MOVE_RAPID_SPIN, - MOVE_TICKLE, - MOVE_TOXIC), + egg_moves(RELLOR, + MOVE_COSMIC_POWER, + MOVE_MEMENTO, + MOVE_RECOVER, + MOVE_WEATHER_BALL), - egg_moves(KLAWF, - MOVE_ANCIENT_POWER, - MOVE_CRABHAMMER, - MOVE_ENDEAVOR, - MOVE_KNOCK_OFF), + egg_moves(FLITTLE, + MOVE_ALLY_SWITCH, + MOVE_HYPNOSIS, + MOVE_ROOST), - egg_moves(CAPSAKID, - MOVE_INGRAIN, - MOVE_LEECH_SEED, - MOVE_RAGE_POWDER, - MOVE_ROLLOUT, - MOVE_WORRY_SEED), + egg_moves(TINKATINK, + MOVE_FEINT, + MOVE_ICE_HAMMER, + MOVE_QUASH), - egg_moves(RELLOR, - MOVE_COSMIC_POWER, - MOVE_MEMENTO, - MOVE_RECOVER, - MOVE_WEATHER_BALL), + egg_moves(WIGLETT, + MOVE_FINAL_GAMBIT, + MOVE_MEMENTO), - egg_moves(FLITTLE, - MOVE_ALLY_SWITCH, - MOVE_HYPNOSIS, - MOVE_ROOST), + egg_moves(BOMBIRDIER, + MOVE_FEATHER_DANCE, + MOVE_POWER_TRIP, + MOVE_ROOST, + MOVE_SKY_ATTACK, + MOVE_SUCKER_PUNCH), - egg_moves(TINKATINK, - MOVE_FEINT, - MOVE_ICE_HAMMER, - MOVE_QUASH), + egg_moves(FINIZEN, + MOVE_BOOMBURST, + MOVE_BOUNCE, + MOVE_COUNTER, + MOVE_HAZE, + MOVE_TICKLE), - egg_moves(WIGLETT, - MOVE_FINAL_GAMBIT, - MOVE_MEMENTO), + egg_moves(VAROOM, + MOVE_HAZE, + MOVE_PARTING_SHOT, + MOVE_SELF_DESTRUCT, + MOVE_TORMENT, + MOVE_TOXIC), - egg_moves(BOMBIRDIER, - MOVE_FEATHER_DANCE, - MOVE_POWER_TRIP, - MOVE_ROOST, - MOVE_SKY_ATTACK, - MOVE_SUCKER_PUNCH), + egg_moves(CYCLIZAR, + MOVE_AQUA_TAIL, + MOVE_IRON_TAIL, + MOVE_KNOCK_OFF, + MOVE_POWER_WHIP), - egg_moves(FINIZEN, - MOVE_BOOMBURST, - MOVE_BOUNCE, - MOVE_COUNTER, - MOVE_HAZE, - MOVE_TICKLE), + egg_moves(ORTHWORM, + MOVE_COIL, + MOVE_CURSE, + MOVE_METAL_BURST), - egg_moves(VAROOM, - MOVE_HAZE, - MOVE_PARTING_SHOT, - MOVE_SELF_DESTRUCT, - MOVE_TORMENT, - MOVE_TOXIC), + egg_moves(GLIMMET, + MOVE_EXPLOSION, + MOVE_MEMENTO, + MOVE_TOXIC), - egg_moves(CYCLIZAR, - MOVE_AQUA_TAIL, - MOVE_IRON_TAIL, - MOVE_KNOCK_OFF, - MOVE_POWER_WHIP), + egg_moves(GREAVARD, + MOVE_ALLY_SWITCH, + MOVE_DESTINY_BOND, + MOVE_DISABLE, + MOVE_HOWL, + MOVE_MEMENTO, + MOVE_SHADOW_SNEAK, + MOVE_YAWN), - egg_moves(ORTHWORM, - MOVE_COIL, - MOVE_CURSE, - MOVE_METAL_BURST), + egg_moves(FLAMIGO, + MOVE_DOUBLE_TEAM, + MOVE_QUICK_GUARD, + MOVE_SKY_ATTACK), - egg_moves(GLIMMET, - MOVE_EXPLOSION, - MOVE_MEMENTO, - MOVE_TOXIC), + egg_moves(CETODDLE, + MOVE_BELLY_DRUM, + MOVE_ENTRAINMENT, + MOVE_ICICLE_CRASH, + MOVE_SUPERPOWER, + MOVE_YAWN), - egg_moves(GREAVARD, - MOVE_ALLY_SWITCH, - MOVE_DESTINY_BOND, - MOVE_DISABLE, - MOVE_HOWL, - MOVE_MEMENTO, - MOVE_SHADOW_SNEAK, - MOVE_YAWN), + egg_moves(VELUZA, + MOVE_RECOVER, + MOVE_THRASH), - egg_moves(FLAMIGO, - MOVE_DOUBLE_TEAM, - MOVE_QUICK_GUARD, - MOVE_SKY_ATTACK), + egg_moves(DONDOZO, + MOVE_CURSE, + MOVE_FISSURE, + MOVE_THRASH, + MOVE_YAWN), - egg_moves(CETODDLE, - MOVE_BELLY_DRUM, - MOVE_ENTRAINMENT, - MOVE_ICICLE_CRASH, - MOVE_SUPERPOWER, - MOVE_YAWN), + egg_moves(TATSUGIRI, + MOVE_BATON_PASS, + MOVE_COUNTER, + MOVE_RAPID_SPIN), - egg_moves(VELUZA, - MOVE_RECOVER, - MOVE_THRASH), - - egg_moves(DONDOZO, - MOVE_CURSE, - MOVE_FISSURE, - MOVE_THRASH, - MOVE_YAWN), - - egg_moves(TATSUGIRI_CURLY, - MOVE_BATON_PASS, - MOVE_COUNTER, - MOVE_RAPID_SPIN), - - egg_moves(TATSUGIRI_DROOPY, - MOVE_BATON_PASS, - MOVE_COUNTER, - MOVE_RAPID_SPIN), - - egg_moves(TATSUGIRI_STRETCHY, - MOVE_BATON_PASS, - MOVE_COUNTER, - MOVE_RAPID_SPIN), - - egg_moves(FRIGIBAX, - MOVE_AQUA_TAIL, - MOVE_DRAGON_RUSH, - MOVE_FREEZE_DRY, - MOVE_ICICLE_SPEAR), + egg_moves(FRIGIBAX, + MOVE_AQUA_TAIL, + MOVE_DRAGON_RUSH, + MOVE_FREEZE_DRY, + MOVE_ICICLE_SPEAR), #endif diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index e317e9723d..a0aeb60d92 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -6050,4 +6050,25 @@ const u8 gWalkingWakePokedexText[] = _( const u8 gIronLeavesPokedexText[] = _( "Ecology under research."); +const u8 gDipplinPokedexText[] = _( + "Ecology under research."); + +const u8 gPoltchageistPokedexText[] = _( + "Ecology under research."); + +const u8 gSinistchaPokedexText[] = _( + "Ecology under research."); + +const u8 gOkidogiPokedexText[] = _( + "Ecology under research."); + +const u8 gMunkidoriPokedexText[] = _( + "Ecology under research."); + +const u8 gFezandipitiPokedexText[] = _( + "Ecology under research."); + +const u8 gOgerponPokedexText[] = _( + "Ecology under research."); + #endif diff --git a/src/data/pokemon/teachable_learnsets.h b/src/data/pokemon/teachable_learnsets.h index a71107e502..5c4de9c7d3 100644 --- a/src/data/pokemon/teachable_learnsets.h +++ b/src/data/pokemon/teachable_learnsets.h @@ -32081,6 +32081,10 @@ static const u16 sUrsalunaTeachableLearnset[] = { MOVE_UNAVAILABLE, }; +static const u16 sUrsalunaBloodmoonTeachableLearnset[] = { + MOVE_UNAVAILABLE, +}; + static const u16 sBasculegionTeachableLearnset[] = { MOVE_UNAVAILABLE, }; @@ -37889,4 +37893,32 @@ static const u16 sIronLeavesTeachableLearnset[] = { MOVE_X_SCISSOR, MOVE_UNAVAILABLE, }; + +static const u16 sDipplinTeachableLearnset[] = { + MOVE_UNAVAILABLE, +}; + +static const u16 sPoltchageistTeachableLearnset[] = { + MOVE_UNAVAILABLE, +}; + +static const u16 sSinistchaTeachableLearnset[] = { + MOVE_UNAVAILABLE, +}; + +static const u16 sOkidogiTeachableLearnset[] = { + MOVE_UNAVAILABLE, +}; + +static const u16 sMunkidoriTeachableLearnset[] = { + MOVE_UNAVAILABLE, +}; + +static const u16 sFezandipitiTeachableLearnset[] = { + MOVE_UNAVAILABLE, +}; + +static const u16 sOgerponTeachableLearnset[] = { + MOVE_UNAVAILABLE, +}; #endif diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index dedfcd758a..d0b321cf0f 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -1036,19 +1036,21 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_WALKING_WAKE] = _("Walking Wa"), [SPECIES_IRON_LEAVES] = _("Iron Leave"), [SPECIES_DIPPLIN] = _("Dipplin"), - [SPECIES_POLTCHAGEIST_COUNTERFEIT] = _("Poltchgeis"), - [SPECIES_POLTCHAGEIST_ARTISAN] = _("Poltchgeis"), + [SPECIES_POLTCHAGEIST_COUNTERFEIT] = _("Poltchagei"), + [SPECIES_POLTCHAGEIST_ARTISAN] = _("Poltchagei"), [SPECIES_SINISTCHA_UNREMARKABLE] = _("Sinistcha"), [SPECIES_SINISTCHA_MASTERPIECE] = _("Sinistcha"), [SPECIES_OKIDOGI] = _("Okidogi"), [SPECIES_MUNKIDORI] = _("Munkidori"), - [SPECIES_FEZANDIPITI] = _("Fezandpiti"), - [SPECIES_ROARING_MOON] = _("Roaring Mo"), - [SPECIES_IRON_VALIANT] = _("Iron Valia"), - [SPECIES_KORAIDON] = _("Koraidon"), - [SPECIES_MIRAIDON] = _("Miraidon"), - [SPECIES_WALKING_WAKE] = _("Walking Wa"), - [SPECIES_IRON_LEAVES] = _("Iron Leave"), + [SPECIES_FEZANDIPITI] = _("Fezandipit"), + [SPECIES_OGERPON_TEAL] = _("Ogerpon"), + [SPECIES_OGERPON_WELLSPRING] = _("Ogerpon"), + [SPECIES_OGERPON_HEARTHFLAME] = _("Ogerpon"), + [SPECIES_OGERPON_CORNERSTONE] = _("Ogerpon"), + [SPECIES_OGERPON_TEAL_TERA] = _("Ogerpon"), + [SPECIES_OGERPON_WELLSPRING_TERA] = _("Ogerpon"), + [SPECIES_OGERPON_HEARTHFLAME_TERA] = _("Ogerpon"), + [SPECIES_OGERPON_CORNERSTONE_TERA] = _("Ogerpon"), #endif // Megas