Add Let's Go moves to Pikachu and Eevee's learnsets

Also removed the duplicate Teeter Dance from Spinda's learnset and gave it back Dizzy Punch.
pull/351/head
Madmadness65 2024-04-29 21:51:08 -05:00
parent bd30dca47d
commit 224fac574a
2 changed files with 105 additions and 91 deletions

View File

@ -396,9 +396,10 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 36, Moves.THUNDERBOLT ],
[ 40, Moves.LIGHT_SCREEN ],
[ 44, Moves.THUNDER ],
[ 48, Moves.PIKA_PAPOW ],
],
[Species.RAICHU]: [
[ 0, Moves.THUNDER_PUNCH ],
[ 0, Moves.ZIPPY_ZAP ],
[ 1, Moves.TAIL_WHIP ],
[ 1, Moves.GROWL ],
[ 1, Moves.THUNDER_SHOCK ],
@ -418,7 +419,9 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.ELECTRO_BALL ],
[ 1, Moves.PLAY_NICE ],
[ 1, Moves.NUZZLE ],
[ 1, Moves.THUNDER_PUNCH ],
[ 5, Moves.THUNDERBOLT ],
[ 50, Moves.PIKA_PAPOW ],
],
[Species.SANDSHREW]: [
[ 1, Moves.SCRATCH ],
@ -2231,9 +2234,10 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 45, Moves.CHARM ],
[ 50, Moves.DOUBLE_EDGE ],
[ 55, Moves.LAST_RESORT ],
[ 60, Moves.VEEVEE_VOLLEY ],
],
[Species.VAPOREON]: [
[ 0, Moves.WATER_GUN ],
[ 0, Moves.BOUNCY_BUBBLE ],
[ 1, Moves.TACKLE ],
[ 1, Moves.TAKE_DOWN ],
[ 1, Moves.DOUBLE_EDGE ],
@ -2247,19 +2251,20 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.COVET ],
[ 1, Moves.COPYCAT ],
[ 5, Moves.SAND_ATTACK ],
[ 10, Moves.QUICK_ATTACK ],
[ 15, Moves.BABY_DOLL_EYES ],
[ 20, Moves.HAZE ],
[ 25, Moves.WATER_PULSE ],
[ 30, Moves.AURORA_BEAM ],
[ 35, Moves.AQUA_RING ],
[ 40, Moves.MUDDY_WATER ],
[ 45, Moves.ACID_ARMOR ],
[ 50, Moves.HYDRO_PUMP ],
[ 55, Moves.LAST_RESORT ],
[ 10, Moves.WATER_GUN ],
[ 15, Moves.QUICK_ATTACK ],
[ 20, Moves.BABY_DOLL_EYES ],
[ 25, Moves.HAZE ],
[ 30, Moves.WATER_PULSE ],
[ 35, Moves.AURORA_BEAM ],
[ 40, Moves.AQUA_RING ],
[ 45, Moves.MUDDY_WATER ],
[ 50, Moves.ACID_ARMOR ],
[ 55, Moves.HYDRO_PUMP ],
[ 60, Moves.LAST_RESORT ],
],
[Species.JOLTEON]: [
[ 0, Moves.THUNDER_SHOCK ],
[ 0, Moves.BUZZY_BUZZ ],
[ 1, Moves.TACKLE ],
[ 1, Moves.TAKE_DOWN ],
[ 1, Moves.DOUBLE_EDGE ],
@ -2273,19 +2278,20 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.COVET ],
[ 1, Moves.COPYCAT ],
[ 5, Moves.SAND_ATTACK ],
[ 10, Moves.QUICK_ATTACK ],
[ 15, Moves.BABY_DOLL_EYES ],
[ 20, Moves.THUNDER_WAVE ],
[ 25, Moves.DOUBLE_KICK ],
[ 30, Moves.THUNDER_FANG ],
[ 35, Moves.PIN_MISSILE ],
[ 40, Moves.DISCHARGE ],
[ 45, Moves.AGILITY ],
[ 50, Moves.THUNDER ],
[ 55, Moves.LAST_RESORT ],
[ 10, Moves.THUNDER_SHOCK ],
[ 15, Moves.QUICK_ATTACK ],
[ 20, Moves.BABY_DOLL_EYES ],
[ 25, Moves.THUNDER_WAVE ],
[ 30, Moves.DOUBLE_KICK ],
[ 35, Moves.THUNDER_FANG ],
[ 40, Moves.PIN_MISSILE ],
[ 45, Moves.DISCHARGE ],
[ 50, Moves.AGILITY ],
[ 55, Moves.THUNDER ],
[ 60, Moves.LAST_RESORT ],
],
[Species.FLAREON]: [
[ 0, Moves.EMBER ],
[ 0, Moves.SIZZLY_SLIDE ],
[ 1, Moves.TACKLE ],
[ 1, Moves.TAKE_DOWN ],
[ 1, Moves.DOUBLE_EDGE ],
@ -2298,16 +2304,17 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.COVET ],
[ 1, Moves.COPYCAT ],
[ 5, Moves.SAND_ATTACK ],
[ 10, Moves.QUICK_ATTACK ],
[ 15, Moves.BABY_DOLL_EYES ],
[ 20, Moves.SMOG ],
[ 25, Moves.BITE ],
[ 30, Moves.FIRE_FANG ],
[ 35, Moves.FIRE_SPIN ],
[ 40, Moves.LAVA_PLUME ],
[ 45, Moves.SCARY_FACE ],
[ 50, Moves.FLARE_BLITZ ],
[ 55, Moves.LAST_RESORT ],
[ 10, Moves.EMBER ],
[ 15, Moves.QUICK_ATTACK ],
[ 20, Moves.BABY_DOLL_EYES ],
[ 25, Moves.SMOG ],
[ 30, Moves.BITE ],
[ 35, Moves.FIRE_FANG ],
[ 40, Moves.FIRE_SPIN ],
[ 45, Moves.LAVA_PLUME ],
[ 50, Moves.SCARY_FACE ],
[ 55, Moves.FLARE_BLITZ ],
[ 60, Moves.LAST_RESORT ],
],
[Species.PORYGON]: [
[ 1, Moves.TACKLE ],
@ -3325,7 +3332,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 52, Moves.EARTHQUAKE ],
],
[Species.ESPEON]: [
[ 0, Moves.CONFUSION ],
[ 0, Moves.GLITZY_GLOW ],
[ 1, Moves.TACKLE ],
[ 1, Moves.TAKE_DOWN ],
[ 1, Moves.DOUBLE_EDGE ],
@ -3338,19 +3345,20 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.COVET ],
[ 1, Moves.COPYCAT ],
[ 5, Moves.SAND_ATTACK ],
[ 10, Moves.QUICK_ATTACK ],
[ 15, Moves.BABY_DOLL_EYES ],
[ 20, Moves.SWIFT ],
[ 25, Moves.PSYBEAM ],
[ 30, Moves.MORNING_SUN ],
[ 35, Moves.POWER_SWAP ],
[ 40, Moves.PSYCHIC ],
[ 45, Moves.PSYCH_UP ],
[ 50, Moves.FUTURE_SIGHT ],
[ 55, Moves.LAST_RESORT ],
[ 10, Moves.CONFUSION ],
[ 15, Moves.QUICK_ATTACK ],
[ 20, Moves.BABY_DOLL_EYES ],
[ 25, Moves.SWIFT ],
[ 30, Moves.PSYBEAM ],
[ 35, Moves.MORNING_SUN ],
[ 40, Moves.POWER_SWAP ],
[ 45, Moves.PSYCHIC ],
[ 50, Moves.PSYCH_UP ],
[ 55, Moves.FUTURE_SIGHT ],
[ 60, Moves.LAST_RESORT ],
],
[Species.UMBREON]: [
[ 0, Moves.SNARL ],
[ 0, Moves.BADDY_BAD ],
[ 1, Moves.TACKLE ],
[ 1, Moves.TAKE_DOWN ],
[ 1, Moves.DOUBLE_EDGE ],
@ -3364,16 +3372,17 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.COVET ],
[ 1, Moves.COPYCAT ],
[ 5, Moves.SAND_ATTACK ],
[ 10, Moves.QUICK_ATTACK ],
[ 15, Moves.BABY_DOLL_EYES ],
[ 20, Moves.CONFUSE_RAY ],
[ 25, Moves.ASSURANCE ],
[ 30, Moves.MOONLIGHT ],
[ 35, Moves.GUARD_SWAP ],
[ 40, Moves.DARK_PULSE ],
[ 45, Moves.SCREECH ],
[ 50, Moves.MEAN_LOOK ],
[ 55, Moves.LAST_RESORT ],
[ 10, Moves.SNARL ],
[ 15, Moves.QUICK_ATTACK ],
[ 20, Moves.BABY_DOLL_EYES ],
[ 25, Moves.CONFUSE_RAY ],
[ 30, Moves.ASSURANCE ],
[ 35, Moves.MOONLIGHT ],
[ 40, Moves.GUARD_SWAP ],
[ 45, Moves.DARK_PULSE ],
[ 50, Moves.SCREECH ],
[ 55, Moves.MEAN_LOOK ],
[ 60, Moves.LAST_RESORT ],
],
[Species.MURKROW]: [
[ 1, Moves.PECK ],
@ -5586,7 +5595,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[Species.SPINDA]: [
[ 1, Moves.TACKLE ],
[ 5, Moves.COPYCAT ],
[ 10, Moves.TEETER_DANCE ],
[ 10, Moves.DIZZY_PUNCH ],
[ 14, Moves.PSYBEAM ],
[ 19, Moves.HYPNOSIS ],
[ 23, Moves.BODY_SLAM ],
@ -7932,7 +7941,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 49, Moves.U_TURN ],
],
[Species.LEAFEON]: [
[ 0, Moves.RAZOR_LEAF ],
[ 0, Moves.SAPPY_SEED ],
[ 1, Moves.TACKLE ],
[ 1, Moves.TAKE_DOWN ],
[ 1, Moves.DOUBLE_EDGE ],
@ -7946,19 +7955,20 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.COVET ],
[ 1, Moves.COPYCAT ],
[ 5, Moves.SAND_ATTACK ],
[ 10, Moves.QUICK_ATTACK ],
[ 15, Moves.BABY_DOLL_EYES ],
[ 20, Moves.LEECH_SEED ],
[ 25, Moves.MAGICAL_LEAF ],
[ 30, Moves.SYNTHESIS ],
[ 35, Moves.SUNNY_DAY ],
[ 40, Moves.GIGA_DRAIN ],
[ 45, Moves.SWORDS_DANCE ],
[ 50, Moves.LEAF_BLADE ],
[ 55, Moves.LAST_RESORT ],
[ 10, Moves.RAZOR_LEAF ],
[ 15, Moves.QUICK_ATTACK ],
[ 20, Moves.BABY_DOLL_EYES ],
[ 25, Moves.LEECH_SEED ],
[ 30, Moves.MAGICAL_LEAF ],
[ 35, Moves.SYNTHESIS ],
[ 40, Moves.SUNNY_DAY ],
[ 45, Moves.GIGA_DRAIN ],
[ 50, Moves.SWORDS_DANCE ],
[ 55, Moves.LEAF_BLADE ],
[ 60, Moves.LAST_RESORT ],
],
[Species.GLACEON]: [
[ 0, Moves.ICY_WIND ],
[ 0, Moves.FREEZY_FROST ],
[ 1, Moves.TACKLE ],
[ 1, Moves.TAKE_DOWN ],
[ 1, Moves.DOUBLE_EDGE ],
@ -7971,16 +7981,17 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.COVET ],
[ 1, Moves.COPYCAT ],
[ 5, Moves.SAND_ATTACK ],
[ 10, Moves.QUICK_ATTACK ],
[ 15, Moves.BABY_DOLL_EYES ],
[ 20, Moves.ICE_SHARD ],
[ 25, Moves.BITE ],
[ 30, Moves.ICE_FANG ],
[ 35, Moves.SNOWSCAPE ],
[ 40, Moves.FREEZE_DRY ],
[ 45, Moves.MIRROR_COAT ],
[ 50, Moves.BLIZZARD ],
[ 55, Moves.LAST_RESORT ],
[ 10, Moves.ICY_WIND ],
[ 15, Moves.QUICK_ATTACK ],
[ 20, Moves.BABY_DOLL_EYES ],
[ 25, Moves.ICE_SHARD ],
[ 30, Moves.BITE ],
[ 35, Moves.ICE_FANG ],
[ 40, Moves.SNOWSCAPE ],
[ 45, Moves.FREEZE_DRY ],
[ 50, Moves.MIRROR_COAT ],
[ 55, Moves.BLIZZARD ],
[ 60, Moves.LAST_RESORT ],
],
[Species.GLISCOR]: [
[ 1, Moves.SAND_ATTACK ],
@ -11822,7 +11833,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 66, Moves.HYPER_BEAM ],
],
[Species.SYLVEON]: [
[ 0, Moves.DISARMING_VOICE ],
[ 0, Moves.SPARKLY_SWIRL ],
[ 1, Moves.TACKLE ],
[ 1, Moves.TAKE_DOWN ],
[ 1, Moves.DOUBLE_EDGE ],
@ -11835,16 +11846,17 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.COVET ],
[ 1, Moves.COPYCAT ],
[ 5, Moves.SAND_ATTACK ],
[ 10, Moves.QUICK_ATTACK ],
[ 15, Moves.BABY_DOLL_EYES ],
[ 20, Moves.SWIFT ],
[ 25, Moves.LIGHT_SCREEN ],
[ 30, Moves.DRAINING_KISS ],
[ 35, Moves.MISTY_TERRAIN ],
[ 40, Moves.SKILL_SWAP ],
[ 45, Moves.PSYCH_UP ],
[ 50, Moves.MOONBLAST ],
[ 55, Moves.LAST_RESORT ],
[ 10, Moves.DISARMING_VOICE ],
[ 15, Moves.QUICK_ATTACK ],
[ 20, Moves.BABY_DOLL_EYES ],
[ 25, Moves.SWIFT ],
[ 30, Moves.LIGHT_SCREEN ],
[ 35, Moves.DRAINING_KISS ],
[ 40, Moves.MISTY_TERRAIN ],
[ 45, Moves.SKILL_SWAP ],
[ 50, Moves.PSYCH_UP ],
[ 55, Moves.MOONBLAST ],
[ 60, Moves.LAST_RESORT ],
],
[Species.HAWLUCHA]: [
[ 1, Moves.TACKLE ],
@ -17237,6 +17249,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
],
[Species.ALOLA_RAICHU]: [
[ 0, Moves.PSYCHIC ],
[ 0, Moves.ZIPPY_ZAP ],
[ 1, Moves.TAIL_WHIP ],
[ 1, Moves.GROWL ],
[ 1, Moves.THUNDER_SHOCK ],
@ -17257,6 +17270,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.PLAY_NICE ],
[ 1, Moves.NUZZLE ],
[ 5, Moves.THUNDERBOLT ],
[ 50, Moves.PIKA_PAPOW ],
],
[Species.ALOLA_SANDSHREW]: [
[ 1, Moves.SCRATCH ],

View File

@ -97,7 +97,7 @@ export const trainerNamePools = {
[TrainerType.MAID]: ["Belinda","Sophie","Emily","Elena","Clare","Alica","Tanya","Tammy"],
[TrainerType.MUSICIAN]: ["Boris","Preston","Charles","Clyde","Vincent","Dalton","Kirk","Shawn","Fabian","Fernando","Joseph","Marcos","Arturo","Jerry","Lonnie","Tony"],
[TrainerType.NURSERY_AIDE]: ["Autumn","Briana","Leah","Miho","Ethel","Hollie","Ilse","June","Kimya","Rosalyn"],
[TrainerType.OFFICER]: ["Dirk","Keith","Alex","Bobby","Caleb","Danny","Dylan","Thomas","Daniel","Jeff","Braven","Dell","Neagle","Haruki","Mitchell","Sheriff","Raymond"],
[TrainerType.OFFICER]: ["Dirk","Keith","Alex","Bobby","Caleb","Danny","Dylan","Thomas","Daniel","Jeff","Braven","Dell","Neagle","Haruki","Mitchell","Raymond"],
[TrainerType.PARASOL_LADY]: ["Angelica","Clarissa","Madeline","Akari","Annabell","Kayley","Rachel","Alexa","Sabrina","April","Gwyneth","Laura","Lumi","Mariah","Melita","Nicole","Tihana","Ingrid","Tyra"],
[TrainerType.PILOT]: ["Chase","Leonard","Ted","Elron","Ewing","Flynn","Winslow"],
[TrainerType.POKEFAN]: [["Alex","Allan","Brandon","Carter","Colin","Derek","Jeremy","Joshua","Rex","Robert","Trevor","William","Colton","Miguel","Francisco","Kaleb","Leonard","Boone","Elliot","Jude","Norbert","Corey","Gabe","Baxter"],["Beverly","Georgia","Jaime","Ruth","Isabel","Marissa","Vanessa","Annika","Bethany","Kimberly","Meredith","Rebekah","Eleanor","Darcy","Lydia","Sachiko","Abigail","Agnes","Lydie","Roisin","Tara","Carmen","Janet"]],