Merge remote-tracking branch 'upstream/beta' into instruct

2024-12-20 23:13:41 -05:00 · 2024-12-20 23:13:41 -05:00 · f9af6871ff
parent ba2a292410 10e0f9f0de
commit f9af6871ff
50 changed files with 4226 additions and 541 deletions
--- a/CREDITS.md
+++ b/CREDITS.md
@ -0,0 +1,624 @@
+# 🎵 Music
+
+## BGM
+- Pokémon Mystery Dungeon: Explorers of Sky
+  - Arata Iiyoshi
+  - Hideki Sakamoto
+  - Keisuke Ito
+  - Ken-ichi Saito
+  - Yoshihiro Maeda
+- Pokémon Black/White
+  - Go Ichinose
+  - Hitomi Sato
+  - Shota Kageyama
+- Pokémon Mystery Dungeon: Rescue Team DX
+  - Keisuke Ito
+  - Arata Iiyoshi
+  - Atsuhiro Ishizuna
+- Pokémon HeartGold/SoulSilver
+- Pokémon Black/White 2
+- Pokémon X/Y
+- Pokémon Omega Ruby/Alpha Sapphire
+- Pokémon Sun/Moon
+- Pokémon Ultra Sun/Ultra Moon
+- Pokémon Sword/Shield
+- Pokémon Legends: Arceus
+- Pokémon Scarlet/Violet
+- Firel (Custom Graveyard, Ice Cave, Laboratory, Metropolis, Plains, Power Plant, Seabed, Space, and Volcano biome music)
+- Lmz (Custom Ancient Ruins, Jungle, and Lake biome music)
+- Andr06 (Custom Forest, Slum and Sea biome music)
+- _tresnoir
+- unveiler
+
+## Sound Effects
+- Pokémon Emerald
+- Pokémon Black/White
+
+
+# 🎨 Art
+
+## Backgrounds
+- Squip (Paid Commissions)
+- Contributions by Someonealive-QN
+
+## UI
+- GAMEFREAK
+- LJ Birdman
+
+## Pagefault Games Intro
+- Spectremint
+
+## Game Logo
+- Gonstar (Paid Commission)
+
+## Trainer Sprites
+- GAMEFREAK (Pokémon Black/White 2, Pokémon Diamond/Pearl)
+- kyledove
+- Brumirage
+- pkmn_realidea (Paid Commissions)
+- IceJkai
+- Leparagon
+- wormhood
+
+## Mystery Event Sprites
+- chrysomelinae
+- koda_want_to_sleep
+- “🐺Kieran/YJ 🐍” rival_kieran aka thedreadedden
+- ImperialSympathizer
+- wormhood
+- gerolau
+- otterwatch
+
+## Trainer Portraits
+- pkmn_realidea (Paid Commissions)
+
+## Pokémon Sprites and Animation
+In addition to the lists below, please check [the PokéRogue wiki](https://wiki.pokerogue.net/credits:credits) for a more detailed list of Pokémon Sprite credits.
+
+- GAMEFREAK (Pokémon Black/White 2)
+- Smogon Sprite Project (Various Artists)
+- Skyflyer
+- Nolo33
+- Ebaru
+- EricLostie
+- kiriaura
+- Caruban
+- Sopita_Yorita
+- Azrita
+- AshnixsLaw
+- Hellfire0raptor
+- RetroNC
+- Franark122k
+- OldSoulja
+- PKMarioG
+- ItsYugen
+- lucasomi
+- Pkm Sinfonia
+- Poki Papillon
+- Fleimer_
+- bizcoeindoloro
+- mangalos810
+- selstar
+
+### Static Sprites and Base Shiny Replacements Credits
+- AMVictory
+- Antiant
+- Arhops
+- arinoelle
+- Arkeis
+- aXl
+- BananaToast
+- Basic Vanillite
+- BlackWhiteRobin
+- Blaquaza
+- Branflakes325
+- Brylark
+- Buna
+- Bynine
+- Corson
+- Cynda
+- “Diashi” diazhi
+- Dleep
+- doomchaos
+- Espeon Scientist
+- Farriella
+- fishbowlsoul90
+- “Follower” rulerofthesea11
+- Galifia
+- GeoisEvil
+- G.E.Z.
+- Glustora
+- Harrie
+- HealnDeal
+- Hematite
+- HM100
+- Ice-cold Claws
+- Involuntary Twitch
+- “Jay” itsamejay
+- KattenK
+- KingOfThe-X-Roads
+- KyleDove
+- Kyleo
+- Kyuzeth
+- Larryturbo
+- Layell
+- Legitimate Username
+- leParagon
+- “LJ” lj_birdman
+- Luigi Player
+- Madmadness65
+- Mega-Pokebattlerz
+- Mintly
+- mjco
+- “Momo” sphinx_sage
+- MrDollSteak
+- MyMarshlands
+- N-Kin
+- Noscium
+- “Nova” fabunova
+- “Omniv” omniv
+- paintseagull
+- princessofmusic
+- PumpkinPastel
+- Quanyails
+- RadicalCharizard
+- RedRooster
+- “♂ROMEO⚧” gerolau
+- ruleroftheseas11
+- SelenaArmorclaw
+- “serif” serifaizawa
+- Siiilver
+- Sleet
+- Snivy101
+- Speed-X
+- Sphex
+- Spook
+- Squip
+- TeraVolt
+- TheAetherPlayer
+- TheCynicalPoet
+- Tooni
+- TrainerSplash
+- Travis
+- Turtleye
+- Tyrell D. Barnes
+- “Vari” \_vari\_
+- Wobblebuns
+- WolfPP
+- WPS
+- Wyverii
+- “zan” smtif
+- Zerudez
+- Z-nogyroP
+
+### Animated Sprites Credits
+- Antiant
+- arinoelle
+- Blaquaza
+- Claire Starsword
+- Coyotango
+- DanEx
+- “Diashi” diazhi
+- GalacticArtistMuffin
+- G.E.Z.
+- hexagonereal
+- HM100
+- Katten
+- LeParagon
+- localghost
+- MallowOut
+- mattiwarden
+- “Momo” sphinx_sage
+- N-Kin
+- NoelleMBrooks
+- Nyx
+- “Omniv” omniv
+- princessofmusic
+- PumpkinPastel
+- RadicalCharizard
+- seleccion
+- SelenaArmorclaw
+- TheAetherPlayer
+- Tinkatooni
+- Typhlito
+- uppa
+- “Vari” \_vari\_
+
+### Rare/Epic Shiny Variants Credits
+- “Andr06” andr06
+- “Appo” appo
+- “Ashhawk” k_redacted
+- “Auralite” _auralite
+- “Awesome_Soul” awesome_soul
+- “Bagon” bagonganda
+- “Bibble” nuts_.
+- “BloomOfWoods” bloomofwoods
+- “Buge” buge
+- “bun” bunove
+- “bukie” bukie
+- cameranian
+- “Caramel” saltedcarriemel
+- “Chocolate Niblets” choconibs
+- “CKC” ckc_
+- “ClawsHDi” clawshdi
+- “Clown Princess” clown_princess
+- “Cmac2173” cmac2173
+- “Corsola” corsola_bandit
+- “Criminon” criminon
+- “Cryptican Gogoat Enthusiast” crypticanexe
+- “Diashi” diazhi
+- “deviant.daffodil, bug enthusiast” deviant.daffodil
+- “DigitalVaporeon” digitalvaporeon
+- dingosig
+- “Eku” ekusas00
+- “Elefante”
+- “Esca” colossalsquid
+- “Folf” folf.
+- “Follower” ruleroftheseas11
+- “Fontbane” fontbane
+- “Gallow” gallowhound
+- “Giojoe” giojoe10
+- “Gonfold” gonfold
+- greenninja757
+- “Grassy_Storm” grassy_storm
+- “GreenMegaMan” greenmegaman
+- “GROWL” myflixer.to
+- “guy claiming to work on a guide” 7thatlas
+- “h. 🍄” letterh.
+- “hamez” .hamez
+- “Hanniel” hanniel.15
+- “ImaginaryNeon” imaginaryneon
+- “Jay” itsamejay
+- “Jelke” jelke
+- kalikimothy
+- “🐺Kieran/YJ 🐍” rival_kieran aka thedreadedden
+- “Koda” Koda_want_to_sleep
+- “Lana” smogonian
+- “LJ” lj_birdman
+- “Long Girl” docamakesart
+- “Lucky” luckyluckylucky
+- “MissingNo.” clickonflareblitz
+- “Momo” sphinx_sage
+- monkehestman
+- “Nexxus” nexxus_
+- “Nik :3” realniktrustme
+- “Nikolatsu”
+- “nora” ora.n
+- “NOVA” fabunova
+- officerporkchops
+- “Omniv” omniv
+- “Otterwatch” otterwatch_
+- “Pandoraz” pandoraz
+- “Papa Pepsm An” papapepsman
+- “Penguin” peng06
+- “Prodigy” lorekeeperprodigy
+- “Purpenigma” purpenigma
+- “Rage” ragerevival
+- “♂ROMEO⚧” gerolau
+- “Sagrell D'Arcadia” coffeerequired
+- “serif” serifaizawa
+- “SillyTopplingGoose” sillytopplinggoose
+- “Splash Damage” splashceles
+- “Sweg1b01” sweg1b01
+- “SyntheGrim” synthegrim
+- “TaMenace” tamariontherestless
+- “TheTRUEgge” thetruegge
+- “Thorn” crownofthorns
+- “Togepi” togepimax
+- “Toopy” .toopy
+- “Tristan” tristan.w
+- “Umbreon” umbreon\_.\_
+- “Vari” \_vari\_
+- “Waasephi”
+- wormhood
+- “Yep, it's Caio” yepitscaio
+- “Ymri” ymri
+- “zaccie” zaccie
+- “zan” smtif
+
+## Move Animations
+- Pokémon Reborn
+
+
+# ⚖️ Balance
+
+## Balance Team
+- damocleas
+- Blitzy aka Kazapple
+- Cynthia_calliope
+- Esca
+- Fontbane
+- Plasto
+- Sethcurry
+- Starkrieg
+
+## Past Members
+- Swizzo
+- Zaccie
+
+## Past Contributors
+- chrysomelinae (Mystery Events)
+- AsdarDevelops (Mystery Events)
+
+
+# 💻 Development
+
+## Server Owner/Administrator
+- pancakes aka patapancakes
+
+## Senior Developers
+- Walker
+- NightKev
+- Moka
+- Temp aka Tempo-anon
+- Madmadness65
+
+## Developers
+- CodeTappert
+- flx-sta
+- innerthunder
+- frutescens
+- Opaquer
+- SN34KZ
+- Swain aka torranx
+
+## Junior Developers
+- KimJeongSun
+- ImperialSympathizer
+
+## Bug/Issue Managers
+- Snailman
+- Daleks
+- Lily
+- PigeonBar
+
+## Other Code Contributors
+- Admiral-Billy
+- allen925
+- arColm
+- Arxalc
+- AsdarDevelops
+- bennybroseph
+- Brain Frog
+- Corrade
+- Dakurei
+- DustinLin
+- ElizaAlex
+- EmberCM
+- EmoUsedHM01
+- EvasiveAce
+- Fontbane
+- francktrouillez
+- FredeX
+- geeilhan
+- Greenlamp
+- happinyz
+- hayuna
+- InfernoVulpix
+- j-diefenbach
+- jaimefd
+- JakubHanko
+- JonStudders
+- karl-police
+- lucfd
+- Lugiadrien
+- madibye
+- mattrossdev
+- mcmontag
+- meepen
+- Mewtwo2387
+- muscode
+- Neverblade
+- NxKarim
+- okimin
+- OrangeRed
+- PigeonBar
+- PrabbyDD
+- prateau
+- prime-dialga
+- PyGaVS
+- rationality6
+- RedstonewolfX
+- ReneGV
+- rnicar245
+- Sam aka Flashfyre (initial developer, started PokéRogue)
+- schmidtc1
+- shayebeadling
+- sirzento
+- snoozbuster
+- sodaMelon
+- td76099
+- Vassiat
+- Xiaphear
+- zaccie
+- zacharied
+- Zé Ricardo
+
+
+# 🌎 Translation
+
+## In-Game Translators
+
+### 🇩🇪 German (de)
+- CodeTappert
+
+### 🇪🇸 Spanish (es-ES)
+- Dan Stevenson
+- Javi
+- Lily Alterni
+- Qyxgames
+
+### 🇫🇷 French (fr)
+- Lugiadrien
+
+### 🇮🇹 Italian (it)
+- Nicus
+
+### 🇯🇵 Japanese (ja)
+- 6mozuke9
+- Chapybara
+- PeachFresca
+
+### 🇰🇷 Korean (ko)
+- Enoch
+- KimJeongSun
+- Returntoice
+- sodamelon
+
+### 🇧🇷 Portuguese (pt-BR)
+- Zé Ricardo
+
+### 🇨🇳 Chinese (zh-CN)
+- dddsenic
+- mercurius
+- VittorioVeneto
+- Yonmaru
+
+### 🇹🇼 Chinese (zh-TW)
+- mercurius
+- Seagull
+
+### Past contributors
+- Asdar (es-ES)
+- Rafa (es-ES)
+- GINK-SS (ko)
+- prostagma (pt-BR)
+- Ei (zh-TW)
+
+## Wiki Translators
+
+### 🇪🇸 Spanish (es-ES)
+- victorcooler
+
+### 🇫🇷 French (fr)
+- Evan
+- Mitsue
+- Papier
+- Sangara
+- Voltarix
+
+### 🇮🇹 Italian (it)
+- Purce
+- T-reds
+
+### 🇰🇷 Korean (ko)
+- LeKaaN
+- Returntoice
+- sodamelon
+
+### 🇵🇱 Polish (pl)
+- Talo
+
+### 🇧🇷 Portuguese (pt-BR)
+- Beast
+- Sushi
+- Zé Ricardo
+
+### 🇨🇳 Chinese (zh-CN)
+- jw-0-
+
+### Past contributors
+- Dietaube (de)
+- Gnorpelltroll (de)
+- xRegix (de)
+- Broly Ikari (fr)
+- Leo Edgar_Zimmer (fr)
+- Telor (fr)
+- dorri (ko)
+- Little Moder_eldenring (ko)
+- Andy (zh-CN)
+- Black Feather (zh-CN)
+- itschili (zh-CN)
+- RimKnight (zh-CN)
+- Yubari (zh-CN)
+
+## 🇺🇸 English Proofreaders
+- Cheyu
+- Faust
+- HaywiredUp
+- Irridescence
+- Ke'ahi
+- Louie
+- Nully
+- PeD
+- The Programmer
+
+### Past contributors
+- I...
+
+
+# 📰 Wiki
+
+## Wiki Head
+- H.A.R.V.
+
+## Wiki Lead
+- Sangara
+- Zac
+- Smew
+- Brain Frog
+- Hannah
+
+## Editor
+- Prodigy
+- Akuma
+- Dan Gioia
+- Shimizoki
+- Stave
+- NalysArbur
+- Ceimir
+- Solanum Tuberosum
+- Pom
+
+## Artist
+- dub
+- SmashMania
+- Wren
+- Lugiadrien
+
+## Contributor
+- Daleks <3
+- Inferno Vulpix
+- Embri
+- Nekod
+- P0kemonY
+- Scoom
+- BlueVaron
+
+
+# ☎️ Discord
+
+## Head Moderator
+- leah
+
+## Senior Moderators
+- Solanum Tuberosum
+- Madmadness65
+- Necrowmancer
+- lana
+
+## Moderators
+- Sethcurry
+
+## Junior Moderators
+- chacolah
+- ChaosGrimmon
+- Cynthia
+- Kat
+- lyn
+- Pom
+
+
+# ✨ Special Thanks
+
+## Reddit Moderators
+- TheZigglez
+- Vicksin
+- Sapphire
+- Javi
+- roi
+
+## External Tools
+- Ydarissep (creator of the now defunct "Yda's Dex")
+- Admiral-Billy (Offline App - Desktop)
+- Red aka StonedModder (iOS App)
--- a/README.md
+++ b/README.md
@ -37,93 +37,6 @@ For detailed guidelines on documenting your code, refer to the [comments.md](./d
 Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to see how can you help us!

 # 📝 Credits
-> If this project contains assets you have produced and you do not see your name here, **please** reach out.
+> If this project contains assets you have produced and you do not see your name, **please** reach out, either [here on GitHub](https://github.com/pagefaultgames/pokerogue/issues/new) or via [Discord](https://discord.gg/pokerogue).

-### 🎵 BGM
-  - Pokémon Mystery Dungeon: Explorers of Sky
-    - Arata Iiyoshi
-    - Hideki Sakamoto
-    - Keisuke Ito
-    - Ken-ichi Saito
-    - Yoshihiro Maeda
-  - Pokémon Black/White
-    - Go Ichinose
-    - Hitomi Sato
-    - Shota Kageyama
-  - Pokémon Mystery Dungeon: Rescue Team DX
-    - Keisuke Ito
-    - Arata Iiyoshi
-    - Atsuhiro Ishizuna
-  - Pokémon HeartGold/SoulSilver
-  - Pokémon Black/White 2
-  - Pokémon X/Y
-  - Pokémon Omega Ruby/Alpha Sapphire
-  - Pokémon Sun/Moon
-  - Pokémon Ultra Sun/Ultra Moon
-  - Pokémon Sword/Shield
-  - Pokémon Legends: Arceus
-  - Pokémon Scarlet/Violet
-  - Firel (Custom Ice Cave, Laboratory, Metropolis, Plains, Power Plant, Seabed, Space, and Volcano biome music)
-  - Lmz (Custom Ancient Ruins, Jungle, and Lake biome music)
-  - Andr06 (Custom Slum and Sea biome music)
-
-### 🎵 Sound Effects
-  - Pokémon Emerald
-  - Pokémon Black/White
-
-### 🎨 Backgrounds
-  - Squip (Paid Commissions)
-  - Contributions by Someonealive-QN
-
-### 🎨 UI
-  - GAMEFREAK
-  - LJ Birdman
-
-### 🎨 Pagefault Games Intro
-  - Spectremint
-
-### 🎨 Game Logo
-  - Gonstar (Paid Commission)
-
-### 🎨 Trainer Sprites
-  - GAMEFREAK (Pokémon Black/White 2, Pokémon Diamond/Pearl)
-  - kyledove
-  - Brumirage
-  - pkmn_realidea (Paid Commissions)
-  - IceJkai 
-
-### 🎨 Trainer Portraits
-  - pkmn_realidea (Paid Commissions)
-
-### 🎨 Pokemon Sprites and Animation
-  - GAMEFREAK (Pokémon Black/White 2)
-  - Smogon Sprite Project (Various Artists)
-  - Skyflyer
-  - Nolo33
-  - Ebaru
-  - EricLostie
-  - KingOfThe-X-Roads
-  - kiriaura
-  - Caruban
-  - Sopita_Yorita
-  - Azrita
-  - AshnixsLaw
-  - Hellfire0raptor
-  - RetroNC
-  - Franark122k
-  - OldSoulja
-  - PKMarioG
-  - ItsYugen
-  - lucasomi
-  - Pkm Sinfonia
-  - Poki Papillon
-  - Fleimer_
-  - bizcoeindoloro
-  - mangalos810
-  - Involuntary-Twitch
-  - selstar
-  - koda_want_to_sleep
-  - thedreadedden
-
-### 🎨 Move Animations
-  - Pokémon Reborn
+Thank you to all the wonderful people that have contributed to the PokéRogue project! You can find the credits [here](./CREDITS.md).
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
 	"name": "pokemon-rogue-battle",
-	"version": "1.2.2",
+	"version": "1.4.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "pokemon-rogue-battle",
-			"version": "1.2.2",
+			"version": "1.4.1",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@material/material-color-utilities": "^0.2.7",
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
 	"name": "pokemon-rogue-battle",
 	"private": true,
-	"version": "1.2.2",
+	"version": "1.4.1",
 	"type": "module",
 	"scripts": {
 		"start": "vite",
--- a/public/battle-anims/common-powder.json
+++ b/public/battle-anims/common-powder.json
--- a/public/images/battle_anims/PRAS-
+++ b/public/images/battle_anims/PRAS-
--- a/public/images/events/winter_holidays2024-event-de.png
+++ b/public/images/events/winter_holidays2024-event-de.png
--- a/public/images/events/winter_holidays2024-event-en.png
+++ b/public/images/events/winter_holidays2024-event-en.png
--- a/public/images/events/winter_holidays2024-event-es-ES.png
+++ b/public/images/events/winter_holidays2024-event-es-ES.png
--- a/public/images/events/winter_holidays2024-event-fr.png
+++ b/public/images/events/winter_holidays2024-event-fr.png
--- a/public/images/events/winter_holidays2024-event-it.png
+++ b/public/images/events/winter_holidays2024-event-it.png
--- a/public/images/events/winter_holidays2024-event-ja.png
+++ b/public/images/events/winter_holidays2024-event-ja.png
--- a/public/images/events/winter_holidays2024-event-ko.png
+++ b/public/images/events/winter_holidays2024-event-ko.png
--- a/public/images/events/winter_holidays2024-event-pt-BR.png
+++ b/public/images/events/winter_holidays2024-event-pt-BR.png
--- a/public/images/events/winter_holidays2024-event-zh-CN.png
+++ b/public/images/events/winter_holidays2024-event-zh-CN.png
--- a/public/locales
+++ b/public/locales
@ -1 +1 @@
-Subproject commit ed1b1df4776ccd4330e8ac1d2f44de611d04c2bc
+Subproject commit 6c6f0af398ae11f8d96c6ac064f171d927812c85
--- a/src/data/balance/egg-moves.ts
+++ b/src/data/balance/egg-moves.ts
@ -7,16 +7,16 @@ import { Species } from "#enums/species";
 export const speciesEggMoves = {
  [Species.BULBASAUR]: [ Moves.SAPPY_SEED, Moves.MALIGNANT_CHAIN, Moves.EARTH_POWER, Moves.MATCHA_GOTCHA ],
  [Species.CHARMANDER]: [ Moves.DRAGON_DANCE, Moves.BITTER_BLADE, Moves.EARTH_POWER, Moves.OBLIVION_WING ],
-  [Species.SQUIRTLE]: [ Moves.FREEZE_DRY, Moves.SHORE_UP, Moves.BOUNCY_BUBBLE, Moves.ORIGIN_PULSE ],
+  [Species.SQUIRTLE]: [ Moves.FREEZE_DRY, Moves.ARMOR_CANNON, Moves.BOUNCY_BUBBLE, Moves.ORIGIN_PULSE ],
  [Species.CATERPIE]: [ Moves.SANDSEAR_STORM, Moves.SILK_TRAP, Moves.TWIN_BEAM, Moves.BLEAKWIND_STORM ],
  [Species.WEEDLE]: [ Moves.THOUSAND_ARROWS, Moves.NOXIOUS_TORQUE, Moves.ATTACK_ORDER, Moves.VICTORY_DANCE ],
  [Species.PIDGEY]: [ Moves.WILDBOLT_STORM, Moves.SANDSEAR_STORM, Moves.NASTY_PLOT, Moves.BOOMBURST ],
  [Species.RATTATA]: [ Moves.HYPER_FANG, Moves.PSYCHIC_FANGS, Moves.FIRE_FANG, Moves.EXTREME_SPEED ],
-  [Species.SPEAROW]: [ Moves.FLOATY_FALL, Moves.EXTREME_SPEED, Moves.TIDY_UP, Moves.TRIPLE_ARROWS ],
+  [Species.SPEAROW]: [ Moves.FLOATY_FALL, Moves.HYPER_DRILL, Moves.TIDY_UP, Moves.TRIPLE_ARROWS ],
  [Species.EKANS]: [ Moves.NOXIOUS_TORQUE, Moves.DRAGON_DANCE, Moves.SLACK_OFF, Moves.SHED_TAIL ],
  [Species.SANDSHREW]: [ Moves.HIGH_HORSEPOWER, Moves.DIRE_CLAW, Moves.SHORE_UP, Moves.MIGHTY_CLEAVE ],
-  [Species.NIDORAN_F]: [ Moves.NO_RETREAT, Moves.BANEFUL_BUNKER, Moves.SANDSEAR_STORM, Moves.MALIGNANT_CHAIN ],
-  [Species.NIDORAN_M]: [ Moves.NOXIOUS_TORQUE, Moves.KINGS_SHIELD, Moves.NO_RETREAT, Moves.PRECIPICE_BLADES ],
+  [Species.NIDORAN_F]: [ Moves.CALM_MIND, Moves.MOONLIGHT, Moves.MALIGNANT_CHAIN, Moves.SANDSEAR_STORM ],
+  [Species.NIDORAN_M]: [ Moves.DRAGON_DANCE, Moves.MOUNTAIN_GALE, Moves.NOXIOUS_TORQUE, Moves.PRECIPICE_BLADES ],
  [Species.VULPIX]: [ Moves.MOONBLAST, Moves.INFERNAL_PARADE, Moves.MORNING_SUN, Moves.TAIL_GLOW ],
  [Species.ZUBAT]: [ Moves.FLOATY_FALL, Moves.DIRE_CLAW, Moves.SWORDS_DANCE, Moves.COLLISION_COURSE ],
  [Species.ODDISH]: [ Moves.SLUDGE_BOMB, Moves.FIERY_DANCE, Moves.STRENGTH_SAP, Moves.SPORE ],
@ -31,105 +31,107 @@ export const speciesEggMoves = {
  [Species.ABRA]: [ Moves.AURA_SPHERE, Moves.BADDY_BAD, Moves.ICE_BEAM, Moves.PSYSTRIKE ],
  [Species.MACHOP]: [ Moves.COMBAT_TORQUE, Moves.METEOR_MASH, Moves.MOUNTAIN_GALE, Moves.FISSURE ],
  [Species.BELLSPROUT]: [ Moves.SOLAR_BLADE, Moves.STRENGTH_SAP, Moves.FIRE_LASH, Moves.VICTORY_DANCE ],
-  [Species.TENTACOOL]: [ Moves.BANEFUL_BUNKER, Moves.STRENGTH_SAP, Moves.BOUNCY_BUBBLE, Moves.MALIGNANT_CHAIN ],
+  [Species.TENTACOOL]: [ Moves.BANEFUL_BUNKER, Moves.MALIGNANT_CHAIN, Moves.BOUNCY_BUBBLE, Moves.STRENGTH_SAP ],
  [Species.GEODUDE]: [ Moves.FLARE_BLITZ, Moves.HEAD_SMASH, Moves.SHORE_UP, Moves.SHELL_SMASH ],
-  [Species.PONYTA]: [ Moves.HIGH_HORSEPOWER, Moves.FIRE_LASH, Moves.SWORDS_DANCE, Moves.VOLT_TACKLE ],
-  [Species.SLOWPOKE]: [ Moves.BOUNCY_BUBBLE, Moves.FLAMETHROWER, Moves.MYSTICAL_POWER, Moves.SHED_TAIL ],
+  [Species.PONYTA]: [ Moves.HEADLONG_RUSH, Moves.FIRE_LASH, Moves.SWORDS_DANCE, Moves.VOLT_TACKLE ],
+  [Species.SLOWPOKE]: [ Moves.BOUNCY_BUBBLE, Moves.FROST_BREATH, Moves.SHED_TAIL, Moves.MYSTICAL_POWER ],
  [Species.MAGNEMITE]: [ Moves.PARABOLIC_CHARGE, Moves.FLAMETHROWER, Moves.ICE_BEAM, Moves.THUNDERCLAP ],
  [Species.FARFETCHD]: [ Moves.IVY_CUDGEL, Moves.TRIPLE_ARROWS, Moves.DRILL_RUN, Moves.VICTORY_DANCE ],
-  [Species.DODUO]: [ Moves.TRIPLE_AXEL, Moves.MULTI_ATTACK, Moves.FLOATY_FALL, Moves.TRIPLE_ARROWS ],
+  [Species.DODUO]: [ Moves.TRIPLE_AXEL, Moves.HYPER_DRILL, Moves.FLOATY_FALL, Moves.TRIPLE_ARROWS ],
  [Species.SEEL]: [ Moves.FREEZE_DRY, Moves.BOUNCY_BUBBLE, Moves.SLACK_OFF, Moves.STEAM_ERUPTION ],
-  [Species.GRIMER]: [ Moves.SUCKER_PUNCH, Moves.CURSE, Moves.STRENGTH_SAP, Moves.NOXIOUS_TORQUE ],
+  [Species.GRIMER]: [ Moves.SUCKER_PUNCH, Moves.CURSE, Moves.NOXIOUS_TORQUE, Moves.STRENGTH_SAP ],
  [Species.SHELLDER]: [ Moves.ROCK_BLAST, Moves.WATER_SHURIKEN, Moves.BANEFUL_BUNKER, Moves.BONE_RUSH ],
-  [Species.GASTLY]: [ Moves.SLUDGE_BOMB, Moves.AURA_SPHERE, Moves.NASTY_PLOT, Moves.ASTRAL_BARRAGE ],
+  [Species.GASTLY]: [ Moves.MALIGNANT_CHAIN, Moves.AURA_SPHERE, Moves.PARTING_SHOT, Moves.DARK_VOID ],
  [Species.ONIX]: [ Moves.SHORE_UP, Moves.THOUSAND_WAVES, Moves.COIL, Moves.DIAMOND_STORM ],
  [Species.DROWZEE]: [ Moves.BADDY_BAD, Moves.STRENGTH_SAP, Moves.LUMINA_CRASH, Moves.DARK_VOID ],
-  [Species.KRABBY]: [ Moves.DIRE_CLAW, Moves.JET_PUNCH, Moves.IVY_CUDGEL, Moves.SHELL_SMASH ],
+  [Species.KRABBY]: [ Moves.DIRE_CLAW, Moves.DRAGON_HAMMER, Moves.IVY_CUDGEL, Moves.JET_PUNCH ],
  [Species.VOLTORB]: [ Moves.NASTY_PLOT, Moves.FUSION_FLARE, Moves.FROST_BREATH, Moves.ELECTRO_DRIFT ],
  [Species.EXEGGCUTE]: [ Moves.FICKLE_BEAM, Moves.APPLE_ACID, Moves.TRICK_ROOM, Moves.LUMINA_CRASH ],
  [Species.CUBONE]: [ Moves.HEAD_SMASH, Moves.WOOD_HAMMER, Moves.SHADOW_SNEAK, Moves.BITTER_BLADE ],
  [Species.LICKITUNG]: [ Moves.CRUSH_GRIP, Moves.FIRE_LASH, Moves.SLACK_OFF, Moves.MAGICAL_TORQUE ],
  [Species.KOFFING]: [ Moves.SCALD, Moves.RECOVER, Moves.BODY_PRESS, Moves.MALIGNANT_CHAIN ],
  [Species.RHYHORN]: [ Moves.SHORE_UP, Moves.ICE_HAMMER, Moves.ACCELEROCK, Moves.HEAD_SMASH ],
-  [Species.TANGELA]: [ Moves.STRENGTH_SAP, Moves.SNAP_TRAP, Moves.PARTING_SHOT, Moves.SAPPY_SEED ],
+  [Species.TANGELA]: [ Moves.NATURES_MADNESS, Moves.SNAP_TRAP, Moves.PARTING_SHOT, Moves.SAPPY_SEED ],
  [Species.KANGASKHAN]: [ Moves.POWER_UP_PUNCH, Moves.TRAILBLAZE, Moves.FACADE, Moves.SEISMIC_TOSS ],
-  [Species.HORSEA]: [ Moves.SNIPE_SHOT, Moves.FROST_BREATH, Moves.HURRICANE, Moves.SPACIAL_REND ],
+  [Species.HORSEA]: [ Moves.SNIPE_SHOT, Moves.FROST_BREATH, Moves.SLUDGE_BOMB, Moves.CLANGING_SCALES ],
  [Species.GOLDEEN]: [ Moves.GLACIAL_LANCE, Moves.SUPERCELL_SLAM, Moves.DRAGON_DANCE, Moves.FISHIOUS_REND ],
  [Species.STARYU]: [ Moves.CALM_MIND, Moves.BOUNCY_BUBBLE, Moves.MOONBLAST, Moves.MYSTICAL_POWER ],
-  [Species.SCYTHER]: [ Moves.MIGHTY_CLEAVE, Moves.BUG_BITE, Moves.STORM_THROW, Moves.DOUBLE_IRON_BASH ],
+  [Species.SCYTHER]: [ Moves.MIGHTY_CLEAVE, Moves.GEAR_GRIND, Moves.STORM_THROW, Moves.BITTER_BLADE ],
  [Species.PINSIR]: [ Moves.HEADLONG_RUSH, Moves.LEECH_LIFE, Moves.CRUSH_GRIP, Moves.EXTREME_SPEED ],
-  [Species.TAUROS]: [ Moves.HIGH_HORSEPOWER, Moves.FIRE_LASH, Moves.LIQUIDATION, Moves.COMBAT_TORQUE ],
+  [Species.TAUROS]: [ Moves.SWORDS_DANCE, Moves.FIRE_LASH, Moves.WICKED_TORQUE, Moves.COLLISION_COURSE ],
  [Species.MAGIKARP]: [ Moves.FLIP_TURN, Moves.ICE_SPINNER, Moves.DRAGON_ASCENT, Moves.SURGING_STRIKES ],
  [Species.LAPRAS]: [ Moves.RECOVER, Moves.FREEZE_DRY, Moves.SCALD, Moves.SHELL_SMASH ],
  [Species.DITTO]: [ Moves.MIMIC, Moves.SKETCH, Moves.METRONOME, Moves.IMPRISON ],
  [Species.EEVEE]: [ Moves.WISH, Moves.NO_RETREAT, Moves.ZIPPY_ZAP, Moves.BOOMBURST ],
  [Species.PORYGON]: [ Moves.THUNDERCLAP, Moves.AURA_SPHERE, Moves.FLAMETHROWER, Moves.TECHNO_BLAST ],
-  [Species.OMANYTE]: [ Moves.FREEZE_DRY, Moves.EARTH_POWER, Moves.POWER_GEM, Moves.STEAM_ERUPTION ],
-  [Species.KABUTO]: [ Moves.CEASELESS_EDGE, Moves.HIGH_HORSEPOWER, Moves.TRIPLE_DIVE, Moves.MIGHTY_CLEAVE ],
+  [Species.OMANYTE]: [ Moves.FREEZE_DRY, Moves.GIGA_DRAIN, Moves.POWER_GEM, Moves.STEAM_ERUPTION ],
+  [Species.KABUTO]: [ Moves.CEASELESS_EDGE, Moves.HIGH_HORSEPOWER, Moves.CRABHAMMER, Moves.MIGHTY_CLEAVE ],
  [Species.AERODACTYL]: [ Moves.FLOATY_FALL, Moves.FLARE_BLITZ, Moves.SWORDS_DANCE, Moves.MIGHTY_CLEAVE ],
  [Species.ARTICUNO]: [ Moves.EARTH_POWER, Moves.CALM_MIND, Moves.AURORA_VEIL, Moves.AEROBLAST ],
  [Species.ZAPDOS]: [ Moves.BLEAKWIND_STORM, Moves.CALM_MIND, Moves.SANDSEAR_STORM, Moves.ELECTRO_SHOT ],
-  [Species.MOLTRES]: [ Moves.SCORCHING_SANDS, Moves.CALM_MIND, Moves.AEROBLAST, Moves.TORCH_SONG ],
+  [Species.MOLTRES]: [ Moves.EARTH_POWER, Moves.CALM_MIND, Moves.AEROBLAST, Moves.TORCH_SONG ],
  [Species.DRATINI]: [ Moves.DRAGON_HAMMER, Moves.CRUSH_GRIP, Moves.FIRE_LASH, Moves.GIGATON_HAMMER ],
  [Species.MEWTWO]: [ Moves.METEOR_MASH, Moves.MOONBLAST, Moves.THUNDEROUS_KICK, Moves.PHOTON_GEYSER ],
  [Species.MEW]: [ Moves.PHOTON_GEYSER, Moves.MOONBLAST, Moves.ASTRAL_BARRAGE, Moves.SHELL_SMASH ],
+
  [Species.CHIKORITA]: [ Moves.SAPPY_SEED, Moves.STONE_AXE, Moves.DRAGON_DANCE, Moves.SPORE ],
  [Species.CYNDAQUIL]: [ Moves.NASTY_PLOT, Moves.EARTH_POWER, Moves.FIERY_DANCE, Moves.ELECTRO_DRIFT ],
-  [Species.TOTODILE]: [ Moves.THUNDER_PUNCH, Moves.DRAGON_DANCE, Moves.TRIPLE_AXEL, Moves.FISHIOUS_REND ],
+  [Species.TOTODILE]: [ Moves.THUNDER_PUNCH, Moves.DRAGON_DANCE, Moves.TRIPLE_AXEL, Moves.SURGING_STRIKES ],
  [Species.SENTRET]: [ Moves.TIDY_UP, Moves.FAKE_OUT, Moves.NUZZLE, Moves.EXTREME_SPEED ],
  [Species.HOOTHOOT]: [ Moves.CALM_MIND, Moves.ESPER_WING, Moves.AEROBLAST, Moves.BOOMBURST ],
-  [Species.LEDYBA]: [ Moves.POLLEN_PUFF, Moves.THIEF, Moves.PARTING_SHOT, Moves.SPORE ],
+  [Species.LEDYBA]: [ Moves.POLLEN_PUFF, Moves.MAT_BLOCK, Moves.PARTING_SHOT, Moves.SPORE ],
  [Species.SPINARAK]: [ Moves.PARTING_SHOT, Moves.ATTACK_ORDER, Moves.GASTRO_ACID, Moves.STRENGTH_SAP ],
  [Species.CHINCHOU]: [ Moves.THUNDERCLAP, Moves.BOUNCY_BUBBLE, Moves.THUNDER_CAGE, Moves.TAIL_GLOW ],
  [Species.PICHU]: [ Moves.MOONBLAST, Moves.TRIPLE_AXEL, Moves.FIERY_DANCE, Moves.AURA_WHEEL ],
  [Species.CLEFFA]: [ Moves.CALM_MIND, Moves.EARTH_POWER, Moves.WISH, Moves.LIGHT_OF_RUIN ],
  [Species.IGGLYBUFF]: [ Moves.DRAIN_PUNCH, Moves.GRAV_APPLE, Moves.SOFT_BOILED, Moves.EXTREME_SPEED ],
-  [Species.TOGEPI]: [ Moves.SCORCHING_SANDS, Moves.ROOST, Moves.RELIC_SONG, Moves.FIERY_DANCE ],
-  [Species.NATU]: [ Moves.AEROBLAST, Moves.ROOST, Moves.MOONBLAST, Moves.LUMINA_CRASH ],
+  [Species.TOGEPI]: [ Moves.SCORCHING_SANDS, Moves.SPLISHY_SPLASH, Moves.RELIC_SONG, Moves.FIERY_DANCE ],
+  [Species.NATU]: [ Moves.REVIVAL_BLESSING, Moves.NASTY_PLOT, Moves.MOONBLAST, Moves.OBLIVION_WING ],
  [Species.MAREEP]: [ Moves.ICE_BEAM, Moves.PARABOLIC_CHARGE, Moves.CORE_ENFORCER, Moves.TAIL_GLOW ],
  [Species.HOPPIP]: [ Moves.FLOATY_FALL, Moves.STRENGTH_SAP, Moves.SAPPY_SEED, Moves.SPORE ],
-  [Species.AIPOM]: [ Moves.TIDY_UP, Moves.STORM_THROW, Moves.FAKE_OUT, Moves.POPULATION_BOMB ],
+  [Species.AIPOM]: [ Moves.ROCK_BLAST, Moves.STORM_THROW, Moves.FAKE_OUT, Moves.SWORDS_DANCE ],
  [Species.SUNKERN]: [ Moves.SPORE, Moves.QUIVER_DANCE, Moves.FIERY_DANCE, Moves.HYDRO_STEAM ],
  [Species.YANMA]: [ Moves.NASTY_PLOT, Moves.EARTH_POWER, Moves.HEAT_WAVE, Moves.BLEAKWIND_STORM ],
-  [Species.WOOPER]: [ Moves.SIZZLY_SLIDE, Moves.RECOVER, Moves.CURSE, Moves.SURGING_STRIKES ],
+  [Species.WOOPER]: [ Moves.SIZZLY_SLIDE, Moves.RECOVER, Moves.SHED_TAIL, Moves.SURGING_STRIKES ],
  [Species.MURKROW]: [ Moves.TRIPLE_ARROWS, Moves.FLOATY_FALL, Moves.TIDY_UP, Moves.WICKED_BLOW ],
-  [Species.MISDREAVUS]: [ Moves.TAKE_HEART, Moves.MOONBLAST, Moves.AURA_SPHERE, Moves.ASTRAL_BARRAGE ],
+  [Species.MISDREAVUS]: [ Moves.TAKE_HEART, Moves.MOONBLAST, Moves.AURA_SPHERE, Moves.MOONGEIST_BEAM ],
  [Species.UNOWN]: [ Moves.NATURE_POWER, Moves.COSMIC_POWER, Moves.ANCIENT_POWER, Moves.MYSTICAL_POWER ],
  [Species.GIRAFARIG]: [ Moves.MYSTICAL_POWER, Moves.NIGHT_DAZE, Moves.RECOVER, Moves.BOOMBURST ],
  [Species.PINECO]: [ Moves.METAL_BURST, Moves.SHORE_UP, Moves.BODY_PRESS, Moves.DIAMOND_STORM ],
  [Species.DUNSPARCE]: [ Moves.WICKED_TORQUE, Moves.MAGICAL_TORQUE, Moves.BLAZING_TORQUE, Moves.EXTREME_SPEED ],
-  [Species.GLIGAR]: [ Moves.FLOATY_FALL, Moves.THOUSAND_WAVES, Moves.ROOST, Moves.MIGHTY_CLEAVE ],
-  [Species.SNUBBULL]: [ Moves.FACADE, Moves.EARTHQUAKE, Moves.SWORDS_DANCE, Moves.EXTREME_SPEED ],
-  [Species.QWILFISH]: [ Moves.BARB_BARRAGE, Moves.BANEFUL_BUNKER, Moves.KNOCK_OFF, Moves.FISHIOUS_REND ],
+  [Species.GLIGAR]: [ Moves.FLOATY_FALL, Moves.THOUSAND_WAVES, Moves.SPIKY_SHIELD, Moves.MIGHTY_CLEAVE ],
+  [Species.SNUBBULL]: [ Moves.FACADE, Moves.HIGH_HORSEPOWER, Moves.SWORDS_DANCE, Moves.EXTREME_SPEED ],
+  [Species.QWILFISH]: [ Moves.BARB_BARRAGE, Moves.BANEFUL_BUNKER, Moves.RECOVER, Moves.FISHIOUS_REND ],
  [Species.SHUCKLE]: [ Moves.STUFF_CHEEKS, Moves.HEAL_ORDER, Moves.BODY_PRESS, Moves.SALT_CURE ],
-  [Species.HERACROSS]: [ Moves.ROCK_BLAST, Moves.FIRST_IMPRESSION, Moves.ICICLE_SPEAR, Moves.DRAGON_DANCE ],
-  [Species.SNEASEL]: [ Moves.DIRE_CLAW, Moves.STORM_THROW, Moves.TRIPLE_AXEL, Moves.WICKED_BLOW ],
+  [Species.HERACROSS]: [ Moves.ROCK_BLAST, Moves.FIRST_IMPRESSION, Moves.ICICLE_SPEAR, Moves.TIDY_UP ],
+  [Species.SNEASEL]: [ Moves.DIRE_CLAW, Moves.DARKEST_LARIAT, Moves.TRIPLE_AXEL, Moves.CLOSE_COMBAT ],
  [Species.TEDDIURSA]: [ Moves.MOUNTAIN_GALE, Moves.FAKE_OUT, Moves.SLACK_OFF, Moves.PRECIPICE_BLADES ],
  [Species.SLUGMA]: [ Moves.BURNING_BULWARK, Moves.POWER_GEM, Moves.SOLAR_BEAM, Moves.MAGMA_STORM ],
-  [Species.SWINUB]: [ Moves.SLACK_OFF, Moves.LANDS_WRATH, Moves.MIGHTY_CLEAVE, Moves.GLACIAL_LANCE ],
+  [Species.SWINUB]: [ Moves.SLACK_OFF, Moves.MOUNTAIN_GALE, Moves.STONE_AXE, Moves.PRECIPICE_BLADES ],
  [Species.CORSOLA]: [ Moves.SCALD, Moves.FREEZE_DRY, Moves.STRENGTH_SAP, Moves.SALT_CURE ],
  [Species.REMORAID]: [ Moves.WATER_SHURIKEN, Moves.TAKE_HEART, Moves.SHELL_SIDE_ARM, Moves.BOUNCY_BUBBLE ],
  [Species.DELIBIRD]: [ Moves.BONEMERANG, Moves.FLOATY_FALL, Moves.VICTORY_DANCE, Moves.GLACIAL_LANCE ],
  [Species.SKARMORY]: [ Moves.ROOST, Moves.BODY_PRESS, Moves.SPIKY_SHIELD, Moves.BEAK_BLAST ],
-  [Species.HOUNDOUR]: [ Moves.MOONLIGHT, Moves.FIERY_WRATH, Moves.SECRET_SWORD, Moves.HYDRO_STEAM ],
-  [Species.PHANPY]: [ Moves.SHORE_UP, Moves.SWORDS_DANCE, Moves.ICICLE_CRASH, Moves.COLLISION_COURSE ],
+  [Species.HOUNDOUR]: [ Moves.EARTH_POWER, Moves.THUNDERBOLT, Moves.MOONBLAST, Moves.FIERY_WRATH ],
+  [Species.PHANPY]: [ Moves.SHORE_UP, Moves.SWORDS_DANCE, Moves.MOUNTAIN_GALE, Moves.COLLISION_COURSE ],
  [Species.STANTLER]: [ Moves.THUNDEROUS_KICK, Moves.PHOTON_GEYSER, Moves.SWORDS_DANCE, Moves.BOOMBURST ],
  [Species.SMEARGLE]: [ Moves.CONVERSION, Moves.BURNING_BULWARK, Moves.SALT_CURE, Moves.DARK_VOID ],
  [Species.TYROGUE]: [ Moves.VICTORY_DANCE, Moves.THUNDEROUS_KICK, Moves.METEOR_MASH, Moves.WICKED_BLOW ],
-  [Species.SMOOCHUM]: [ Moves.EXPANDING_FORCE, Moves.AURA_SPHERE, Moves.FREEZE_DRY, Moves.QUIVER_DANCE ],
+  [Species.SMOOCHUM]: [ Moves.LUSTER_PURGE, Moves.AURA_SPHERE, Moves.FREEZE_DRY, Moves.QUIVER_DANCE ],
  [Species.ELEKID]: [ Moves.FIRE_LASH, Moves.ZING_ZAP, Moves.MOUNTAIN_GALE, Moves.SHIFT_GEAR ],
-  [Species.MAGBY]: [ Moves.THUNDERCLAP, Moves.EARTH_POWER, Moves.ARMOR_CANNON, Moves.FLEUR_CANNON ],
-  [Species.MILTANK]: [ Moves.BODY_PRESS, Moves.BULK_UP, Moves.YAWN, Moves.SIZZLY_SLIDE ],
+  [Species.MAGBY]: [ Moves.THUNDERCLAP, Moves.EARTH_POWER, Moves.ENERGY_BALL, Moves.BLUE_FLARE ],
+  [Species.MILTANK]: [ Moves.BODY_PRESS, Moves.BULK_UP, Moves.KNOCK_OFF, Moves.SIZZLY_SLIDE ],
  [Species.RAIKOU]: [ Moves.PARABOLIC_CHARGE, Moves.NASTY_PLOT, Moves.FROST_BREATH, Moves.ELECTRO_DRIFT ],
-  [Species.ENTEI]: [ Moves.BURNING_BULWARK, Moves.DRAGON_DANCE, Moves.EARTHQUAKE, Moves.MIGHTY_CLEAVE ],
+  [Species.ENTEI]: [ Moves.BURNING_BULWARK, Moves.DRAGON_DANCE, Moves.EARTHQUAKE, Moves.PYRO_BALL ],
  [Species.SUICUNE]: [ Moves.RECOVER, Moves.NASTY_PLOT, Moves.FREEZE_DRY, Moves.STEAM_ERUPTION ],
  [Species.LARVITAR]: [ Moves.DRAGON_DANCE, Moves.MOUNTAIN_GALE, Moves.SHORE_UP, Moves.DIAMOND_STORM ],
  [Species.LUGIA]: [ Moves.NASTY_PLOT, Moves.LUMINA_CRASH, Moves.AURA_SPHERE, Moves.OBLIVION_WING ],
  [Species.HO_OH]: [ Moves.BRAVE_BIRD, Moves.DRAGON_DANCE, Moves.REVIVAL_BLESSING, Moves.BOLT_BEAK ],
  [Species.CELEBI]: [ Moves.PHOTON_GEYSER, Moves.MATCHA_GOTCHA, Moves.REVIVAL_BLESSING, Moves.QUIVER_DANCE ],
-  [Species.TREECKO]: [ Moves.NASTY_PLOT, Moves.APPLE_ACID, Moves.SECRET_SWORD, Moves.DRAGON_ENERGY ],
-  [Species.TORCHIC]: [ Moves.HIGH_JUMP_KICK, Moves.SUPERCELL_SLAM, Moves.BURNING_BULWARK, Moves.V_CREATE ],
-  [Species.MUDKIP]: [ Moves.SHORE_UP, Moves.MOUNTAIN_GALE, Moves.BULK_UP, Moves.SURGING_STRIKES ],
+
+  [Species.TREECKO]: [ Moves.NASTY_PLOT, Moves.CORE_ENFORCER, Moves.FLAMETHROWER, Moves.SEED_FLARE ],
+  [Species.TORCHIC]: [ Moves.THUNDEROUS_KICK, Moves.ZING_ZAP, Moves.BURNING_BULWARK, Moves.PYRO_BALL ],
+  [Species.MUDKIP]: [ Moves.SHORE_UP, Moves.MOUNTAIN_GALE, Moves.AQUA_STEP, Moves.PRECIPICE_BLADES ],
  [Species.POOCHYENA]: [ Moves.JAW_LOCK, Moves.CLOSE_COMBAT, Moves.DIRE_CLAW, Moves.NO_RETREAT ],
  [Species.ZIGZAGOON]: [ Moves.EXTREME_SPEED, Moves.NUZZLE, Moves.HIGH_HORSEPOWER, Moves.TIDY_UP ],
  [Species.WURMPLE]: [ Moves.BATON_PASS, Moves.BLEAKWIND_STORM, Moves.STORED_POWER, Moves.MALIGNANT_CHAIN ],
@ -151,35 +153,35 @@ export const speciesEggMoves = {
  [Species.MAWILE]: [ Moves.BULLET_PUNCH, Moves.MAGICAL_TORQUE, Moves.EARTHQUAKE, Moves.SHIFT_GEAR ],
  [Species.ARON]: [ Moves.HEAD_SMASH, Moves.BODY_PRESS, Moves.SHORE_UP, Moves.SALT_CURE ],
  [Species.MEDITITE]: [ Moves.THUNDEROUS_KICK, Moves.SUCKER_PUNCH, Moves.BULLET_PUNCH, Moves.PHOTON_GEYSER ],
-  [Species.ELECTRIKE]: [ Moves.RISING_VOLTAGE, Moves.FLAMETHROWER, Moves.NASTY_PLOT, Moves.ICE_BEAM ],
+  [Species.ELECTRIKE]: [ Moves.FROST_BREATH, Moves.HEAT_WAVE, Moves.NASTY_PLOT, Moves.ELECTRO_DRIFT ],
  [Species.PLUSLE]: [ Moves.FLAMETHROWER, Moves.GLITZY_GLOW, Moves.SPLISHY_SPLASH, Moves.TAIL_GLOW ],
  [Species.MINUN]: [ Moves.ICE_BEAM, Moves.BADDY_BAD, Moves.SPARKLY_SWIRL, Moves.TAIL_GLOW ],
  [Species.VOLBEAT]: [ Moves.BATON_PASS, Moves.STICKY_WEB, Moves.DECORATE, Moves.VICTORY_DANCE ],
  [Species.ILLUMISE]: [ Moves.PARTING_SHOT, Moves.GLITZY_GLOW, Moves.POWDER, Moves.QUIVER_DANCE ],
-  [Species.GULPIN]: [ Moves.STRENGTH_SAP, Moves.EARTH_POWER, Moves.CALM_MIND, Moves.MALIGNANT_CHAIN ],
+  [Species.GULPIN]: [ Moves.MALIGNANT_CHAIN, Moves.EARTH_POWER, Moves.CALM_MIND, Moves.STRENGTH_SAP ],
  [Species.CARVANHA]: [ Moves.THUNDER_FANG, Moves.SWORDS_DANCE, Moves.OBSTRUCT, Moves.SURGING_STRIKES ],
-  [Species.WAILMER]: [ Moves.TAKE_HEART, Moves.BOUNCY_BUBBLE, Moves.SLACK_OFF, Moves.COMEUPPANCE ],
-  [Species.NUMEL]: [ Moves.TRICK_ROOM, Moves.ENERGY_BALL, Moves.MORNING_SUN, Moves.BLUE_FLARE ],
+  [Species.WAILMER]: [ Moves.TAKE_HEART, Moves.COMEUPPANCE, Moves.SLACK_OFF, Moves.STEAM_ERUPTION ],
+  [Species.NUMEL]: [ Moves.TRICK_ROOM, Moves.ENERGY_BALL, Moves.SLACK_OFF, Moves.BLUE_FLARE ],
  [Species.TORKOAL]: [ Moves.MORNING_SUN, Moves.BURNING_BULWARK, Moves.BODY_PRESS, Moves.HYDRO_STEAM ],
  [Species.SPOINK]: [ Moves.AURA_SPHERE, Moves.MILK_DRINK, Moves.EXPANDING_FORCE, Moves.TAIL_GLOW ],
  [Species.SPINDA]: [ Moves.SUPERPOWER, Moves.SLACK_OFF, Moves.FLEUR_CANNON, Moves.V_CREATE ],
  [Species.TRAPINCH]: [ Moves.FIRE_LASH, Moves.DRAGON_DARTS, Moves.THOUSAND_ARROWS, Moves.DRAGON_ENERGY ],
-  [Species.CACNEA]: [ Moves.EARTH_POWER, Moves.CEASELESS_EDGE, Moves.NIGHT_DAZE, Moves.IVY_CUDGEL ],
+  [Species.CACNEA]: [ Moves.EARTH_POWER, Moves.CEASELESS_EDGE, Moves.NIGHT_DAZE, Moves.SAPPY_SEED ],
  [Species.SWABLU]: [ Moves.ROOST, Moves.NASTY_PLOT, Moves.FLOATY_FALL, Moves.BOOMBURST ],
  [Species.ZANGOOSE]: [ Moves.FACADE, Moves.HIGH_HORSEPOWER, Moves.EXTREME_SPEED, Moves.TIDY_UP ],
  [Species.SEVIPER]: [ Moves.ICE_BEAM, Moves.BITTER_BLADE, Moves.SUCKER_PUNCH, Moves.NO_RETREAT ],
-  [Species.LUNATONE]: [ Moves.POWER_GEM, Moves.MOONGEIST_BEAM, Moves.SHELL_SMASH, Moves.LUMINA_CRASH ],
-  [Species.SOLROCK]: [ Moves.PSYSHIELD_BASH, Moves.MIGHTY_CLEAVE, Moves.SHELL_SMASH, Moves.SACRED_FIRE ],
+  [Species.LUNATONE]: [ Moves.REVELATION_DANCE, Moves.MOONGEIST_BEAM, Moves.SHELL_SMASH, Moves.LUMINA_CRASH ],
+  [Species.SOLROCK]: [ Moves.MIGHTY_CLEAVE, Moves.PHOTON_GEYSER, Moves.SHELL_SMASH, Moves.SACRED_FIRE ],
  [Species.BARBOACH]: [ Moves.DRAGON_DANCE, Moves.ZING_ZAP, Moves.ICE_SPINNER, Moves.SURGING_STRIKES ],
-  [Species.CORPHISH]: [ Moves.CEASELESS_EDGE, Moves.JET_PUNCH, Moves.SUCKER_PUNCH, Moves.SHELL_SMASH ],
-  [Species.BALTOY]: [ Moves.RECOVER, Moves.STORED_POWER, Moves.BODY_PRESS, Moves.MYSTICAL_POWER ],
+  [Species.CORPHISH]: [ Moves.CEASELESS_EDGE, Moves.SHELL_SIDE_ARM, Moves.SUCKER_PUNCH, Moves.JET_PUNCH ],
+  [Species.BALTOY]: [ Moves.RECOVER, Moves.GLARE, Moves.RUINATION, Moves.MYSTICAL_POWER ],
  [Species.LILEEP]: [ Moves.POWER_GEM, Moves.SCALD, Moves.STRENGTH_SAP, Moves.SAPPY_SEED ],
  [Species.ANORITH]: [ Moves.FIRST_IMPRESSION, Moves.LEECH_LIFE, Moves.DRAGON_DANCE, Moves.MIGHTY_CLEAVE ],
  [Species.FEEBAS]: [ Moves.CALM_MIND, Moves.FREEZE_DRY, Moves.MOONBLAST, Moves.STEAM_ERUPTION ],
  [Species.CASTFORM]: [ Moves.BOOMBURST, Moves.HYDRO_STEAM, Moves.ERUPTION, Moves.QUIVER_DANCE ],
  [Species.KECLEON]: [ Moves.ZIPPY_ZAP, Moves.COIL, Moves.EXTREME_SPEED, Moves.MULTI_ATTACK ],
  [Species.SHUPPET]: [ Moves.STORM_THROW, Moves.TIDY_UP, Moves.PARTING_SHOT, Moves.SPECTRAL_THIEF ],
-  [Species.DUSKULL]: [ Moves.BULK_UP, Moves.DRAIN_PUNCH, Moves.STRENGTH_SAP, Moves.RAGE_FIST ],
+  [Species.DUSKULL]: [ Moves.BULK_UP, Moves.DRAIN_PUNCH, Moves.RECOVER, Moves.RAGE_FIST ],
  [Species.TROPIUS]: [ Moves.STUFF_CHEEKS, Moves.EARTH_POWER, Moves.APPLE_ACID, Moves.SAPPY_SEED ],
  [Species.ABSOL]: [ Moves.KOWTOW_CLEAVE, Moves.SACRED_SWORD, Moves.PSYBLADE, Moves.BITTER_BLADE ],
  [Species.WYNAUT]: [ Moves.RECOVER, Moves.SHED_TAIL, Moves.TAUNT, Moves.COMEUPPANCE ],
@ -188,21 +190,22 @@ export const speciesEggMoves = {
  [Species.CLAMPERL]: [ Moves.SHELL_SIDE_ARM, Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.STEAM_ERUPTION ],
  [Species.RELICANTH]: [ Moves.DRAGON_DANCE, Moves.SHORE_UP, Moves.WAVE_CRASH, Moves.DIAMOND_STORM ],
  [Species.LUVDISC]: [ Moves.BATON_PASS, Moves.HEART_SWAP, Moves.GLITZY_GLOW, Moves.REVIVAL_BLESSING ],
-  [Species.BAGON]: [ Moves.FLOATY_FALL, Moves.FIRE_LASH, Moves.DRAGON_DANCE, Moves.GLAIVE_RUSH ],
+  [Species.BAGON]: [ Moves.FLOATY_FALL, Moves.FIRE_LASH, Moves.DRAGON_DANCE, Moves.DRAGON_DARTS ],
  [Species.BELDUM]: [ Moves.HEADLONG_RUSH, Moves.DRAIN_PUNCH, Moves.TRIPLE_AXEL, Moves.SHIFT_GEAR ],
  [Species.REGIROCK]: [ Moves.STONE_AXE, Moves.BODY_PRESS, Moves.SHORE_UP, Moves.SALT_CURE ],
  [Species.REGICE]: [ Moves.EARTH_POWER, Moves.TAKE_HEART, Moves.RECOVER, Moves.FREEZE_DRY ],
  [Species.REGISTEEL]: [ Moves.BODY_PRESS, Moves.SIZZLY_SLIDE, Moves.RECOVER, Moves.GIGATON_HAMMER ],
  [Species.LATIAS]: [ Moves.CORE_ENFORCER, Moves.FUSION_FLARE, Moves.SPARKLY_SWIRL, Moves.MYSTICAL_POWER ],
  [Species.LATIOS]: [ Moves.CORE_ENFORCER, Moves.BLUE_FLARE, Moves.NASTY_PLOT, Moves.TACHYON_CUTTER ],
-  [Species.KYOGRE]: [ Moves.RECOVER, Moves.HURRICANE, Moves.FREEZY_FROST, Moves.WILDBOLT_STORM ],
+  [Species.KYOGRE]: [ Moves.WILDBOLT_STORM, Moves.HURRICANE, Moves.FREEZY_FROST, Moves.BOUNCY_BUBBLE ],
  [Species.GROUDON]: [ Moves.STONE_AXE, Moves.SOLAR_BLADE, Moves.MORNING_SUN, Moves.SACRED_FIRE ],
  [Species.RAYQUAZA]: [ Moves.V_CREATE, Moves.DRAGON_DARTS, Moves.CORE_ENFORCER, Moves.OBLIVION_WING ],
  [Species.JIRACHI]: [ Moves.TACHYON_CUTTER, Moves.TRIPLE_ARROWS, Moves.ROCK_SLIDE, Moves.SHELL_SMASH ],
-  [Species.DEOXYS]: [ Moves.COLLISION_COURSE, Moves.EARTH_POWER, Moves.PARTING_SHOT, Moves.LUMINA_CRASH ],
+  [Species.DEOXYS]: [ Moves.COLLISION_COURSE, Moves.FUSION_FLARE, Moves.PARTING_SHOT, Moves.LUMINA_CRASH ],
+
  [Species.TURTWIG]: [ Moves.SHELL_SMASH, Moves.MIGHTY_CLEAVE, Moves.ICE_SPINNER, Moves.SAPPY_SEED ],
  [Species.CHIMCHAR]: [ Moves.FIERY_DANCE, Moves.SECRET_SWORD, Moves.TRIPLE_AXEL, Moves.SACRED_FIRE ],
-  [Species.PIPLUP]: [ Moves.KINGS_SHIELD, Moves.TACHYON_CUTTER, Moves.ROOST, Moves.STEAM_ERUPTION ],
+  [Species.PIPLUP]: [ Moves.KINGS_SHIELD, Moves.TACHYON_CUTTER, Moves.FREEZE_DRY, Moves.STEAM_ERUPTION ],
  [Species.STARLY]: [ Moves.SWORDS_DANCE, Moves.HEAD_CHARGE, Moves.FLARE_BLITZ, Moves.EXTREME_SPEED ],
  [Species.BIDOOF]: [ Moves.EXTREME_SPEED, Moves.COSMIC_POWER, Moves.POWER_TRIP, Moves.AQUA_STEP ],
  [Species.KRICKETOT]: [ Moves.BONEMERANG, Moves.VICTORY_DANCE, Moves.STONE_AXE, Moves.POPULATION_BOMB ],
@ -214,7 +217,7 @@ export const speciesEggMoves = {
  [Species.COMBEE]: [ Moves.SPORE, Moves.FLOATY_FALL, Moves.KINGS_SHIELD, Moves.VICTORY_DANCE ],
  [Species.PACHIRISU]: [ Moves.FREEZY_FROST, Moves.SIZZLY_SLIDE, Moves.SLACK_OFF, Moves.ZIPPY_ZAP ],
  [Species.BUIZEL]: [ Moves.JET_PUNCH, Moves.TRIPLE_AXEL, Moves.SUPERCELL_SLAM, Moves.SURGING_STRIKES ],
-  [Species.CHERUBI]: [ Moves.SPORE, Moves.STRENGTH_SAP, Moves.FIRE_LASH, Moves.FLOWER_TRICK ],
+  [Species.CHERUBI]: [ Moves.SLEEP_POWDER, Moves.STRENGTH_SAP, Moves.FIRE_LASH, Moves.FLOWER_TRICK ],
  [Species.SHELLOS]: [ Moves.BOUNCY_BUBBLE, Moves.SCORCHING_SANDS, Moves.FREEZE_DRY, Moves.STEAM_ERUPTION ],
  [Species.DRIFLOON]: [ Moves.WILL_O_WISP, Moves.MIND_BLOWN, Moves.CALM_MIND, Moves.OBLIVION_WING ],
  [Species.BUNEARY]: [ Moves.TRIPLE_AXEL, Moves.SWORDS_DANCE, Moves.THUNDEROUS_KICK, Moves.MULTI_ATTACK ],
@ -225,36 +228,37 @@ export const speciesEggMoves = {
  [Species.BONSLY]: [ Moves.ACCELEROCK, Moves.SWORDS_DANCE, Moves.STRENGTH_SAP, Moves.SAPPY_SEED ],
  [Species.MIME_JR]: [ Moves.CHILLY_RECEPTION, Moves.MOONBLAST, Moves.FROST_BREATH, Moves.LUMINA_CRASH ],
  [Species.HAPPINY]: [ Moves.COTTON_GUARD, Moves.SEISMIC_TOSS, Moves.SIZZLY_SLIDE, Moves.REVIVAL_BLESSING ],
-  [Species.CHATOT]: [ Moves.SPARKLING_ARIA, Moves.TORCH_SONG, Moves.BATON_PASS, Moves.BOOMBURST ],
+  [Species.CHATOT]: [ Moves.SPARKLING_ARIA, Moves.BOOMBURST, Moves.BATON_PASS, Moves.TORCH_SONG ],
  [Species.SPIRITOMB]: [ Moves.PARTING_SHOT, Moves.BADDY_BAD, Moves.STRENGTH_SAP, Moves.SPECTRAL_THIEF ],
-  [Species.GIBLE]: [ Moves.DRAGON_DANCE, Moves.BITTER_BLADE, Moves.SHORE_UP, Moves.THOUSAND_ARROWS ],
+  [Species.GIBLE]: [ Moves.DRAGON_DANCE, Moves.BITTER_BLADE, Moves.DRAGON_HAMMER, Moves.PRECIPICE_BLADES ],
  [Species.MUNCHLAX]: [ Moves.STUFF_CHEEKS, Moves.GRAV_APPLE, Moves.SLACK_OFF, Moves.EXTREME_SPEED ],
-  [Species.RIOLU]: [ Moves.THUNDEROUS_KICK, Moves.TACHYON_CUTTER, Moves.TRIPLE_AXEL, Moves.DOUBLE_IRON_BASH ],
+  [Species.RIOLU]: [ Moves.THUNDEROUS_KICK, Moves.TACHYON_CUTTER, Moves.TRIPLE_AXEL, Moves.SUNSTEEL_STRIKE ],
  [Species.HIPPOPOTAS]: [ Moves.SHORE_UP, Moves.STONE_AXE, Moves.BULK_UP, Moves.SALT_CURE ],
  [Species.SKORUPI]: [ Moves.COIL, Moves.DIRE_CLAW, Moves.CRABHAMMER, Moves.WICKED_BLOW ],
  [Species.CROAGUNK]: [ Moves.DIRE_CLAW, Moves.ICE_SPINNER, Moves.THUNDEROUS_KICK, Moves.VICTORY_DANCE ],
  [Species.CARNIVINE]: [ Moves.STRENGTH_SAP, Moves.FIRE_LASH, Moves.COIL, Moves.SAPPY_SEED ],
  [Species.FINNEON]: [ Moves.QUIVER_DANCE, Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.ORIGIN_PULSE ],
  [Species.MANTYKE]: [ Moves.SPLISHY_SPLASH, Moves.FREEZY_FROST, Moves.NASTY_PLOT, Moves.OBLIVION_WING ],
-  [Species.SNOVER]: [ Moves.HIGH_HORSEPOWER, Moves.STRENGTH_SAP, Moves.MATCHA_GOTCHA, Moves.SAPPY_SEED ],
+  [Species.SNOVER]: [ Moves.LANDS_WRATH, Moves.POWDER, Moves.CALM_MIND, Moves.MATCHA_GOTCHA ],
  [Species.ROTOM]: [ Moves.STRENGTH_SAP, Moves.FIERY_DANCE, Moves.SPLISHY_SPLASH, Moves.ELECTRO_DRIFT ],
-  [Species.UXIE]: [ Moves.COSMIC_POWER, Moves.BODY_PRESS, Moves.RECOVER, Moves.SPARKLY_SWIRL ],
+  [Species.UXIE]: [ Moves.COSMIC_POWER, Moves.SECRET_SWORD, Moves.RECOVER, Moves.SPARKLY_SWIRL ],
  [Species.MESPRIT]: [ Moves.TAIL_GLOW, Moves.AURA_SPHERE, Moves.RECOVER, Moves.LUMINA_CRASH ],
  [Species.AZELF]: [ Moves.PSYSTRIKE, Moves.ICE_BEAM, Moves.MOONBLAST, Moves.TAIL_GLOW ],
  [Species.DIALGA]: [ Moves.CORE_ENFORCER, Moves.TAKE_HEART, Moves.RECOVER, Moves.MAKE_IT_RAIN ],
-  [Species.PALKIA]: [ Moves.RECOVER, Moves.TAKE_HEART, Moves.FREEZE_DRY, Moves.ORIGIN_PULSE ],
-  [Species.HEATRAN]: [ Moves.MATCHA_GOTCHA, Moves.RECOVER, Moves.TACHYON_CUTTER, Moves.TORCH_SONG ],
+  [Species.PALKIA]: [ Moves.MALIGNANT_CHAIN, Moves.TAKE_HEART, Moves.RECOVER, Moves.ORIGIN_PULSE ],
+  [Species.HEATRAN]: [ Moves.MATCHA_GOTCHA, Moves.RECOVER, Moves.ERUPTION, Moves.TACHYON_CUTTER ],
  [Species.REGIGIGAS]: [ Moves.SKILL_SWAP, Moves.RECOVER, Moves.EXTREME_SPEED, Moves.GIGATON_HAMMER ],
  [Species.GIRATINA]: [ Moves.DRAGON_DANCE, Moves.GLAIVE_RUSH, Moves.RECOVER, Moves.SPECTRAL_THIEF ],
-  [Species.CRESSELIA]: [ Moves.COSMIC_POWER, Moves.SECRET_SWORD, Moves.SIZZLY_SLIDE, Moves.LUMINA_CRASH ],
-  [Species.PHIONE]: [ Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.SPLISHY_SPLASH, Moves.QUIVER_DANCE ],
-  [Species.MANAPHY]: [ Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.SPLISHY_SPLASH, Moves.QUIVER_DANCE ],
+  [Species.CRESSELIA]: [ Moves.COSMIC_POWER, Moves.BODY_PRESS, Moves.SIZZLY_SLIDE, Moves.LUMINA_CRASH ],
+  [Species.PHIONE]: [ Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.STORED_POWER, Moves.ORIGIN_PULSE ],
+  [Species.MANAPHY]: [ Moves.BOUNCY_BUBBLE, Moves.FROST_BREATH, Moves.WILDBOLT_STORM, Moves.ORIGIN_PULSE ],
  [Species.DARKRAI]: [ Moves.FIERY_WRATH, Moves.MOONBLAST, Moves.FIERY_DANCE, Moves.MAKE_IT_RAIN ],
  [Species.SHAYMIN]: [ Moves.MATCHA_GOTCHA, Moves.FIERY_DANCE, Moves.AEROBLAST, Moves.QUIVER_DANCE ],
  [Species.ARCEUS]: [ Moves.NO_RETREAT, Moves.COLLISION_COURSE, Moves.ASTRAL_BARRAGE, Moves.MULTI_ATTACK ],
+
  [Species.VICTINI]: [ Moves.BLUE_FLARE, Moves.BOLT_STRIKE, Moves.LUSTER_PURGE, Moves.VICTORY_DANCE ],
  [Species.SNIVY]: [ Moves.FLAMETHROWER, Moves.CLANGING_SCALES, Moves.MAKE_IT_RAIN, Moves.FLEUR_CANNON ],
-  [Species.TEPIG]: [ Moves.WAVE_CRASH, Moves.VOLT_TACKLE, Moves.DRAIN_PUNCH, Moves.VICTORY_DANCE ],
+  [Species.TEPIG]: [ Moves.WAVE_CRASH, Moves.VOLT_TACKLE, Moves.AXE_KICK, Moves.VICTORY_DANCE ],
  [Species.OSHAWOTT]: [ Moves.TRIPLE_AXEL, Moves.SHELL_SIDE_ARM, Moves.SACRED_SWORD, Moves.SHELL_SMASH ],
  [Species.PATRAT]: [ Moves.FAKE_OUT, Moves.SWORDS_DANCE, Moves.DYNAMIC_PUNCH, Moves.EXTREME_SPEED ],
  [Species.LILLIPUP]: [ Moves.CLOSE_COMBAT, Moves.BODY_SLAM, Moves.HIGH_HORSEPOWER, Moves.LAST_RESPECTS ],
@ -262,13 +266,13 @@ export const speciesEggMoves = {
  [Species.PANSAGE]: [ Moves.SWORDS_DANCE, Moves.FIRE_LASH, Moves.EARTHQUAKE, Moves.IVY_CUDGEL ],
  [Species.PANSEAR]: [ Moves.NASTY_PLOT, Moves.HYDRO_STEAM, Moves.SCORCHING_SANDS, Moves.TORCH_SONG ],
  [Species.PANPOUR]: [ Moves.NASTY_PLOT, Moves.ENERGY_BALL, Moves.EARTH_POWER, Moves.STEAM_ERUPTION ],
-  [Species.MUNNA]: [ Moves.COSMIC_POWER, Moves.AURA_SPHERE, Moves.EARTH_POWER, Moves.MYSTICAL_POWER ],
+  [Species.MUNNA]: [ Moves.COSMIC_POWER, Moves.AURA_SPHERE, Moves.LUNAR_BLESSING, Moves.MYSTICAL_POWER ],
  [Species.PIDOVE]: [ Moves.GUNK_SHOT, Moves.TIDY_UP, Moves.FLOATY_FALL, Moves.TRIPLE_ARROWS ],
  [Species.BLITZLE]: [ Moves.HORN_LEECH, Moves.SWORDS_DANCE, Moves.FLARE_BLITZ, Moves.BOLT_STRIKE ],
  [Species.ROGGENROLA]: [ Moves.BODY_PRESS, Moves.CURSE, Moves.SHORE_UP, Moves.DIAMOND_STORM ],
  [Species.WOOBAT]: [ Moves.ESPER_WING, Moves.STORED_POWER, Moves.MYSTICAL_FIRE, Moves.OBLIVION_WING ],
-  [Species.DRILBUR]: [ Moves.IRON_HEAD, Moves.MOUNTAIN_GALE, Moves.SHIFT_GEAR, Moves.THOUSAND_ARROWS ],
-  [Species.AUDINO]: [ Moves.FOLLOW_ME, Moves.MOONBLAST, Moves.WISH, Moves.LUNAR_BLESSING ],
+  [Species.DRILBUR]: [ Moves.METEOR_MASH, Moves.MOUNTAIN_GALE, Moves.SHIFT_GEAR, Moves.PRECIPICE_BLADES ],
+  [Species.AUDINO]: [ Moves.TAKE_HEART, Moves.MOONBLAST, Moves.WISH, Moves.MATCHA_GOTCHA ],
  [Species.TIMBURR]: [ Moves.MACH_PUNCH, Moves.DRAIN_PUNCH, Moves.ICE_HAMMER, Moves.DOUBLE_IRON_BASH ],
  [Species.TYMPOLE]: [ Moves.JET_PUNCH, Moves.HIGH_HORSEPOWER, Moves.BULK_UP, Moves.SURGING_STRIKES ],
  [Species.THROH]: [ Moves.MACH_PUNCH, Moves.SLACK_OFF, Moves.METEOR_MASH, Moves.RAGE_FIST ],
@ -278,41 +282,41 @@ export const speciesEggMoves = {
  [Species.COTTONEE]: [ Moves.POLLEN_PUFF, Moves.PARTING_SHOT, Moves.SLEEP_POWDER, Moves.SEED_FLARE ],
  [Species.PETILIL]: [ Moves.THUNDEROUS_KICK, Moves.SPARKLING_ARIA, Moves.FIERY_DANCE, Moves.FLOWER_TRICK ],
  [Species.BASCULIN]: [ Moves.LAST_RESPECTS, Moves.CLOSE_COMBAT, Moves.SPLISHY_SPLASH, Moves.NO_RETREAT ],
-  [Species.SANDILE]: [ Moves.DIRE_CLAW, Moves.HIGH_HORSEPOWER, Moves.FIRE_LASH, Moves.WICKED_BLOW ],
-  [Species.DARUMAKA]: [ Moves.DRAIN_PUNCH, Moves.ZIPPY_ZAP, Moves.EARTHQUAKE, Moves.PYRO_BALL ],
+  [Species.SANDILE]: [ Moves.DIRE_CLAW, Moves.HEADLONG_RUSH, Moves.FIRE_LASH, Moves.WICKED_BLOW ],
+  [Species.DARUMAKA]: [ Moves.DRAIN_PUNCH, Moves.ZIPPY_ZAP, Moves.HEADLONG_RUSH, Moves.PYRO_BALL ],
  [Species.MARACTUS]: [ Moves.EARTH_POWER, Moves.QUIVER_DANCE, Moves.FIERY_DANCE, Moves.SEED_FLARE ],
  [Species.DWEBBLE]: [ Moves.CRABHAMMER, Moves.STONE_AXE, Moves.LEECH_LIFE, Moves.MIGHTY_CLEAVE ],
  [Species.SCRAGGY]: [ Moves.SUCKER_PUNCH, Moves.BULLET_PUNCH, Moves.NOXIOUS_TORQUE, Moves.VICTORY_DANCE ],
-  [Species.SIGILYPH]: [ Moves.MOONBLAST, Moves.CALM_MIND, Moves.FREEZING_GLARE, Moves.OBLIVION_WING ],
+  [Species.SIGILYPH]: [ Moves.MOONBLAST, Moves.CALM_MIND, Moves.ESPER_WING, Moves.OBLIVION_WING ],
  [Species.YAMASK]: [ Moves.STRENGTH_SAP, Moves.GLARE, Moves.AURA_SPHERE, Moves.ASTRAL_BARRAGE ],
  [Species.TIRTOUGA]: [ Moves.ICE_SPINNER, Moves.AQUA_STEP, Moves.SHORE_UP, Moves.MIGHTY_CLEAVE ],
  [Species.ARCHEN]: [ Moves.ROOST, Moves.EARTHQUAKE, Moves.FLOATY_FALL, Moves.MIGHTY_CLEAVE ],
  [Species.TRUBBISH]: [ Moves.COIL, Moves.RECOVER, Moves.DIRE_CLAW, Moves.GIGATON_HAMMER ],
-  [Species.ZORUA]: [ Moves.FLAMETHROWER, Moves.MOONBLAST, Moves.AURA_SPHERE, Moves.FIERY_WRATH ],
+  [Species.ZORUA]: [ Moves.MALIGNANT_CHAIN, Moves.MOONBLAST, Moves.SECRET_SWORD, Moves.FIERY_WRATH ],
  [Species.MINCCINO]: [ Moves.ICICLE_SPEAR, Moves.TIDY_UP, Moves.KNOCK_OFF, Moves.POPULATION_BOMB ],
  [Species.GOTHITA]: [ Moves.RECOVER, Moves.MOONBLAST, Moves.AURA_SPHERE, Moves.LUMINA_CRASH ],
-  [Species.SOLOSIS]: [ Moves.EXPANDING_FORCE, Moves.TRICK_ROOM, Moves.AURA_SPHERE, Moves.LIGHT_OF_RUIN ],
-  [Species.DUCKLETT]: [ Moves.SPLISHY_SPLASH, Moves.EARTH_POWER, Moves.WILDBOLT_STORM, Moves.QUIVER_DANCE ],
+  [Species.SOLOSIS]: [ Moves.MIST_BALL, Moves.SPEED_SWAP, Moves.FLAMETHROWER, Moves.LIGHT_OF_RUIN ],
+  [Species.DUCKLETT]: [ Moves.SPLISHY_SPLASH, Moves.SANDSEAR_STORM, Moves.WILDBOLT_STORM, Moves.QUIVER_DANCE ],
  [Species.VANILLITE]: [ Moves.EARTH_POWER, Moves.AURORA_VEIL, Moves.CALM_MIND, Moves.SPARKLY_SWIRL ],
  [Species.DEERLING]: [ Moves.TIDY_UP, Moves.FLOWER_TRICK, Moves.BODY_SLAM, Moves.COMBAT_TORQUE ],
-  [Species.EMOLGA]: [ Moves.TRIPLE_AXEL, Moves.SPLISHY_SPLASH, Moves.FLOATY_FALL, Moves.AURA_WHEEL ],
-  [Species.KARRABLAST]: [ Moves.LEECH_LIFE, Moves.BITTER_BLADE, Moves.HIGH_HORSEPOWER, Moves.DOUBLE_IRON_BASH ],
+  [Species.EMOLGA]: [ Moves.ICICLE_CRASH, Moves.ZING_ZAP, Moves.FLOATY_FALL, Moves.ELECTRIFY ],
+  [Species.KARRABLAST]: [ Moves.LEECH_LIFE, Moves.BITTER_BLADE, Moves.OBSTRUCT, Moves.DOUBLE_IRON_BASH ],
  [Species.FOONGUS]: [ Moves.POLLEN_PUFF, Moves.PARTING_SHOT, Moves.FOUL_PLAY, Moves.SAPPY_SEED ],
-  [Species.FRILLISH]: [ Moves.STRENGTH_SAP, Moves.BUZZY_BUZZ, Moves.FREEZE_DRY, Moves.STEAM_ERUPTION ],
+  [Species.FRILLISH]: [ Moves.CALM_MIND, Moves.BUZZY_BUZZ, Moves.FREEZE_DRY, Moves.STEAM_ERUPTION ],
  [Species.ALOMOMOLA]: [ Moves.FLIP_TURN, Moves.HEART_SWAP, Moves.GLITZY_GLOW, Moves.REVIVAL_BLESSING ],
  [Species.JOLTIK]: [ Moves.WILDBOLT_STORM, Moves.PARABOLIC_CHARGE, Moves.EARTH_POWER, Moves.QUIVER_DANCE ],
-  [Species.FERROSEED]: [ Moves.STRENGTH_SAP, Moves.BODY_PRESS, Moves.SPIKY_SHIELD, Moves.SAPPY_SEED ],
-  [Species.KLINK]: [ Moves.TRIPLE_AXEL, Moves.HIGH_HORSEPOWER, Moves.FUSION_BOLT, Moves.DOUBLE_IRON_BASH ],
+  [Species.FERROSEED]: [ Moves.SYNTHESIS, Moves.COMBAT_TORQUE, Moves.SPIKY_SHIELD, Moves.SAPPY_SEED ],
+  [Species.KLINK]: [ Moves.TRIPLE_AXEL, Moves.HIGH_HORSEPOWER, Moves.RECOVER, Moves.AURA_WHEEL ],
  [Species.TYNAMO]: [ Moves.SCALD, Moves.STRENGTH_SAP, Moves.FIRE_LASH, Moves.AURA_WHEEL ],
-  [Species.ELGYEM]: [ Moves.LUSTER_PURGE, Moves.BADDY_BAD, Moves.AURA_SPHERE, Moves.TAIL_GLOW ],
-  [Species.LITWICK]: [ Moves.FIERY_DANCE, Moves.EARTH_POWER, Moves.MOONBLAST, Moves.ASTRAL_BARRAGE ],
+  [Species.ELGYEM]: [ Moves.THUNDERCLAP, Moves.BADDY_BAD, Moves.AURA_SPHERE, Moves.PHOTON_GEYSER ],
+  [Species.LITWICK]: [ Moves.PARTING_SHOT, Moves.EARTH_POWER, Moves.MOONBLAST, Moves.TORCH_SONG ],
  [Species.AXEW]: [ Moves.STONE_AXE, Moves.DIRE_CLAW, Moves.BITTER_BLADE, Moves.GLAIVE_RUSH ],
  [Species.CUBCHOO]: [ Moves.MOUNTAIN_GALE, Moves.AQUA_STEP, Moves.ICE_SHARD, Moves.COLLISION_COURSE ],
  [Species.CRYOGONAL]: [ Moves.FREEZING_GLARE, Moves.AURORA_VEIL, Moves.NASTY_PLOT, Moves.ORIGIN_PULSE ],
  [Species.SHELMET]: [ Moves.POWER_GEM, Moves.NASTY_PLOT, Moves.EARTH_POWER, Moves.STEAM_ERUPTION ],
-  [Species.STUNFISK]: [ Moves.BANEFUL_BUNKER, Moves.SANDSEAR_STORM, Moves.STRENGTH_SAP, Moves.THUNDERCLAP ],
-  [Species.MIENFOO]: [ Moves.GUNK_SHOT, Moves.SUPERCELL_SLAM, Moves.KNOCK_OFF, Moves.MOUNTAIN_GALE ],
-  [Species.DRUDDIGON]: [ Moves.FIRE_LASH, Moves.ROOST, Moves.DRAGON_DARTS, Moves.CLANGOROUS_SOUL ],
+  [Species.STUNFISK]: [ Moves.THUNDERCLAP, Moves.SANDSEAR_STORM, Moves.STRENGTH_SAP, Moves.THUNDER_CAGE ],
+  [Species.MIENFOO]: [ Moves.GUNK_SHOT, Moves.SUPERCELL_SLAM, Moves.MOUNTAIN_GALE, Moves.WICKED_BLOW ],
+  [Species.DRUDDIGON]: [ Moves.FIRE_LASH, Moves.MORNING_SUN, Moves.DRAGON_DARTS, Moves.CLANGOROUS_SOUL ],
  [Species.GOLETT]: [ Moves.SHIFT_GEAR, Moves.DRAIN_PUNCH, Moves.HEADLONG_RUSH, Moves.RAGE_FIST ],
  [Species.PAWNIARD]: [ Moves.SUCKER_PUNCH, Moves.CEASELESS_EDGE, Moves.BITTER_BLADE, Moves.LAST_RESPECTS ],
  [Species.BOUFFALANT]: [ Moves.SLACK_OFF, Moves.HIGH_JUMP_KICK, Moves.HEAD_SMASH, Moves.FLARE_BLITZ ],
@ -321,59 +325,62 @@ export const speciesEggMoves = {
  [Species.HEATMOR]: [ Moves.EARTH_POWER, Moves.OVERHEAT, Moves.THUNDERBOLT, Moves.V_CREATE ],
  [Species.DURANT]: [ Moves.HIGH_HORSEPOWER, Moves.FIRST_IMPRESSION, Moves.SWORDS_DANCE, Moves.BEHEMOTH_BASH ],
  [Species.DEINO]: [ Moves.FIERY_WRATH, Moves.ESPER_WING, Moves.SLUDGE_BOMB, Moves.FICKLE_BEAM ],
-  [Species.LARVESTA]: [ Moves.THUNDERBOLT, Moves.MATCHA_GOTCHA, Moves.EARTH_POWER, Moves.TORCH_SONG ],
+  [Species.LARVESTA]: [ Moves.THUNDERBOLT, Moves.MAGMA_STORM, Moves.EARTH_POWER, Moves.MATCHA_GOTCHA ],
  [Species.COBALION]: [ Moves.BEHEMOTH_BLADE, Moves.MIGHTY_CLEAVE, Moves.CEASELESS_EDGE, Moves.VICTORY_DANCE ],
  [Species.TERRAKION]: [ Moves.MIGHTY_CLEAVE, Moves.HEADLONG_RUSH, Moves.CEASELESS_EDGE, Moves.VICTORY_DANCE ],
  [Species.VIRIZION]: [ Moves.PSYBLADE, Moves.SAPPY_SEED, Moves.CEASELESS_EDGE, Moves.VICTORY_DANCE ],
-  [Species.TORNADUS]: [ Moves.EARTH_POWER, Moves.PARTING_SHOT, Moves.ICE_BEAM, Moves.OBLIVION_WING ],
-  [Species.THUNDURUS]: [ Moves.EARTH_POWER, Moves.HURRICANE, Moves.FROST_BREATH, Moves.ELECTRO_SHOT ],
+  [Species.TORNADUS]: [ Moves.SANDSEAR_STORM, Moves.PARTING_SHOT, Moves.SPLISHY_SPLASH, Moves.OBLIVION_WING ],
+  [Species.THUNDURUS]: [ Moves.SANDSEAR_STORM, Moves.HURRICANE, Moves.FROST_BREATH, Moves.ELECTRO_SHOT ],
  [Species.RESHIRAM]: [ Moves.ENERGY_BALL, Moves.TAKE_HEART, Moves.FICKLE_BEAM, Moves.ERUPTION ],
  [Species.ZEKROM]: [ Moves.TRIPLE_AXEL, Moves.THUNDEROUS_KICK, Moves.DRAGON_HAMMER, Moves.BOLT_BEAK ],
  [Species.LANDORUS]: [ Moves.STONE_AXE, Moves.FLOATY_FALL, Moves.ROOST, Moves.BLEAKWIND_STORM ],
  [Species.KYUREM]: [ Moves.DRAGON_DARTS, Moves.GLACIAL_LANCE, Moves.NO_RETREAT, Moves.DRAGON_ENERGY ],
-  [Species.KELDEO]: [ Moves.BOUNCY_BUBBLE, Moves.THUNDERBOLT, Moves.FREEZE_DRY, Moves.STEAM_ERUPTION ],
+  [Species.KELDEO]: [ Moves.BOUNCY_BUBBLE, Moves.THUNDERBOLT, Moves.ICE_BEAM, Moves.STEAM_ERUPTION ],
  [Species.MELOETTA]: [ Moves.BODY_SLAM, Moves.TORCH_SONG, Moves.TRIPLE_ARROWS, Moves.BOOMBURST ],
-  [Species.GENESECT]: [ Moves.EXTREME_SPEED, Moves.U_TURN, Moves.TACHYON_CUTTER, Moves.TAIL_GLOW ],
-  [Species.CHESPIN]: [ Moves.BODY_PRESS, Moves.SYNTHESIS, Moves.CEASELESS_EDGE, Moves.SAPPY_SEED ],
-  [Species.FENNEKIN]: [ Moves.EXPANDING_FORCE, Moves.MOONBLAST, Moves.THUNDERBOLT, Moves.TORCH_SONG ],
+  [Species.GENESECT]: [ Moves.EXTREME_SPEED, Moves.SHIFT_GEAR, Moves.BEHEMOTH_BASH, Moves.TACHYON_CUTTER ],
+
+  [Species.CHESPIN]: [ Moves.COMBAT_TORQUE, Moves.SYNTHESIS, Moves.CEASELESS_EDGE, Moves.SAPPY_SEED ],
+  [Species.FENNEKIN]: [ Moves.TWIN_BEAM, Moves.FIERY_DANCE, Moves.THUNDERBOLT, Moves.SPARKLY_SWIRL ],
  [Species.FROAKIE]: [ Moves.MOONBLAST, Moves.SHELL_SIDE_ARM, Moves.FIERY_WRATH, Moves.STEAM_ERUPTION ],
  [Species.BUNNELBY]: [ Moves.DRAIN_PUNCH, Moves.TIDY_UP, Moves.FACADE, Moves.EXTREME_SPEED ],
  [Species.FLETCHLING]: [ Moves.DRILL_RUN, Moves.BURNING_BULWARK, Moves.HEAD_SMASH, Moves.VOLT_TACKLE ],
  [Species.SCATTERBUG]: [ Moves.FOCUS_BLAST, Moves.AFTER_YOU, Moves.DECORATE, Moves.BLIZZARD ],
-  [Species.LITLEO]: [ Moves.EARTH_POWER, Moves.NASTY_PLOT, Moves.YAWN, Moves.TORCH_SONG ],
+  [Species.LITLEO]: [ Moves.EARTH_POWER, Moves.NASTY_PLOT, Moves.BURNING_BULWARK, Moves.BLUE_FLARE ],
  [Species.FLABEBE]: [ Moves.GLITZY_GLOW, Moves.MYSTICAL_FIRE, Moves.TAKE_HEART, Moves.SEED_FLARE ],
  [Species.SKIDDO]: [ Moves.HIGH_HORSEPOWER, Moves.GRASSY_GLIDE, Moves.STONE_AXE, Moves.SAPPY_SEED ],
  [Species.PANCHAM]: [ Moves.DRAIN_PUNCH, Moves.SUCKER_PUNCH, Moves.METEOR_MASH, Moves.WICKED_BLOW ],
  [Species.FURFROU]: [ Moves.TIDY_UP, Moves.SLACK_OFF, Moves.COMBAT_TORQUE, Moves.MULTI_ATTACK ],
  [Species.ESPURR]: [ Moves.LUSTER_PURGE, Moves.MOONBLAST, Moves.AURA_SPHERE, Moves.DARK_VOID ],
  [Species.HONEDGE]: [ Moves.TACHYON_CUTTER, Moves.SHADOW_BONE, Moves.BITTER_BLADE, Moves.BEHEMOTH_BLADE ],
-  [Species.SPRITZEE]: [ Moves.SPEED_SWAP, Moves.TORCH_SONG, Moves.ROOST, Moves.REVIVAL_BLESSING ],
+  [Species.SPRITZEE]: [ Moves.SPEED_SWAP, Moves.REVIVAL_BLESSING, Moves.ROOST, Moves.TORCH_SONG ],
  [Species.SWIRLIX]: [ Moves.BELLY_DRUM, Moves.HEADLONG_RUSH, Moves.MAGICAL_TORQUE, Moves.REVIVAL_BLESSING ],
  [Species.INKAY]: [ Moves.POWER_TRIP, Moves.SPIN_OUT, Moves.RECOVER, Moves.PSYCHO_BOOST ],
  [Species.BINACLE]: [ Moves.TRIPLE_AXEL, Moves.CRABHAMMER, Moves.DIRE_CLAW, Moves.MIGHTY_CLEAVE ],
  [Species.SKRELP]: [ Moves.STRENGTH_SAP, Moves.TRICK_ROOM, Moves.CALM_MIND, Moves.CORE_ENFORCER ],
-  [Species.CLAUNCHER]: [ Moves.SHELL_SMASH, Moves.ARMOR_CANNON, Moves.WATER_SHURIKEN, Moves.ORIGIN_PULSE ],
+  [Species.CLAUNCHER]: [ Moves.SHELL_SMASH, Moves.ARMOR_CANNON, Moves.ENERGY_BALL, Moves.ORIGIN_PULSE ],
  [Species.HELIOPTILE]: [ Moves.WEATHER_BALL, Moves.HYDRO_STEAM, Moves.EARTH_POWER, Moves.BOOMBURST ],
  [Species.TYRUNT]: [ Moves.DRAGON_HAMMER, Moves.FLARE_BLITZ, Moves.VOLT_TACKLE, Moves.SHIFT_GEAR ],
-  [Species.AMAURA]: [ Moves.RECOVER, Moves.AURORA_VEIL, Moves.POWER_GEM, Moves.GEOMANCY ],
+  [Species.AMAURA]: [ Moves.RECOVER, Moves.WRING_OUT, Moves.POWER_GEM, Moves.GEOMANCY ],
  [Species.HAWLUCHA]: [ Moves.TRIPLE_AXEL, Moves.HIGH_HORSEPOWER, Moves.FLOATY_FALL, Moves.WICKED_BLOW ],
  [Species.DEDENNE]: [ Moves.BOOMBURST, Moves.FAKE_OUT, Moves.NASTY_PLOT, Moves.REVIVAL_BLESSING ],
  [Species.CARBINK]: [ Moves.BODY_PRESS, Moves.SHORE_UP, Moves.SPARKLY_SWIRL, Moves.DIAMOND_STORM ],
-  [Species.GOOMY]: [ Moves.SCALD, Moves.RECOVER, Moves.CALM_MIND, Moves.MAKE_IT_RAIN ],
+  [Species.GOOMY]: [ Moves.DRAGON_HAMMER, Moves.RECOVER, Moves.CALM_MIND, Moves.MAKE_IT_RAIN ],
  [Species.KLEFKI]: [ Moves.HEAL_BELL, Moves.ENCORE, Moves.INSTRUCT, Moves.TOPSY_TURVY ],
-  [Species.PHANTUMP]: [ Moves.RAGE_FIST, Moves.TRICK_ROOM, Moves.SYNTHESIS, Moves.SAPPY_SEED ],
+  [Species.PHANTUMP]: [ Moves.RAGE_FIST, Moves.SLEEP_POWDER, Moves.SYNTHESIS, Moves.SAPPY_SEED ],
  [Species.PUMPKABOO]: [ Moves.SPIRIT_SHACKLE, Moves.FIRE_LASH, Moves.DIRE_CLAW, Moves.SAPPY_SEED ],
  [Species.BERGMITE]: [ Moves.STONE_AXE, Moves.METAL_BURST, Moves.BODY_PRESS, Moves.GLACIAL_LANCE ],
  [Species.NOIBAT]: [ Moves.AEROBLAST, Moves.OVERDRIVE, Moves.NASTY_PLOT, Moves.CLANGING_SCALES ],
  [Species.XERNEAS]: [ Moves.EARTH_POWER, Moves.SPRINGTIDE_STORM, Moves.STRENGTH_SAP, Moves.TAIL_GLOW ],
  [Species.YVELTAL]: [ Moves.SHELL_SIDE_ARM, Moves.POWER_TRIP, Moves.FIERY_WRATH, Moves.CLANGOROUS_SOUL ],
  [Species.ZYGARDE]: [ Moves.DRAGON_DARTS, Moves.HEAL_ORDER, Moves.CLANGOROUS_SOUL, Moves.DOUBLE_IRON_BASH ],
-  [Species.DIANCIE]: [ Moves.MAGICAL_TORQUE, Moves.AURA_SPHERE, Moves.SHORE_UP, Moves.GEOMANCY ],
+  [Species.DIANCIE]: [ Moves.MAGICAL_TORQUE, Moves.FIERY_DANCE, Moves.SHORE_UP, Moves.GEOMANCY ],
  [Species.HOOPA]: [ Moves.PHOTON_GEYSER, Moves.SECRET_SWORD, Moves.FIERY_WRATH, Moves.SHELL_SMASH ],
  [Species.VOLCANION]: [ Moves.HYDRO_STEAM, Moves.CALM_MIND, Moves.ENERGY_BALL, Moves.MAGMA_STORM ],
+  [Species.ETERNAL_FLOETTE]: [ Moves.MIND_BLOWN, Moves.CHLOROBLAST, Moves.LUSTER_PURGE, Moves.QUIVER_DANCE ],
+
  [Species.ROWLET]: [ Moves.THOUSAND_ARROWS, Moves.SHADOW_BONE, Moves.FIRST_IMPRESSION, Moves.VICTORY_DANCE ],
-  [Species.LITTEN]: [ Moves.FAKE_OUT, Moves.PARTING_SHOT, Moves.MORNING_SUN, Moves.SACRED_FIRE ],
-  [Species.POPPLIO]: [ Moves.PSYCHIC_NOISE, Moves.BOUNCY_BUBBLE, Moves.ALLURING_VOICE, Moves.TORCH_SONG ],
+  [Species.LITTEN]: [ Moves.SUCKER_PUNCH, Moves.PARTING_SHOT, Moves.SLACK_OFF, Moves.SACRED_FIRE ],
+  [Species.POPPLIO]: [ Moves.PSYCHIC_NOISE, Moves.BOUNCY_BUBBLE, Moves.OVERDRIVE, Moves.TORCH_SONG ],
  [Species.PIKIPEK]: [ Moves.DUAL_WINGBEAT, Moves.BONE_RUSH, Moves.BURNING_BULWARK, Moves.POPULATION_BOMB ],
  [Species.YUNGOOS]: [ Moves.EXTREME_SPEED, Moves.KNOCK_OFF, Moves.TIDY_UP, Moves.MULTI_ATTACK ],
  [Species.GRUBBIN]: [ Moves.ICE_BEAM, Moves.EARTH_POWER, Moves.THUNDERCLAP, Moves.QUIVER_DANCE ],
@ -381,7 +388,7 @@ export const speciesEggMoves = {
  [Species.ORICORIO]: [ Moves.QUIVER_DANCE, Moves.FIERY_DANCE, Moves.THUNDERCLAP, Moves.OBLIVION_WING ],
  [Species.CUTIEFLY]: [ Moves.STICKY_WEB, Moves.SLEEP_POWDER, Moves.HEAT_WAVE, Moves.SPARKLY_SWIRL ],
  [Species.ROCKRUFF]: [ Moves.HIGH_HORSEPOWER, Moves.TIDY_UP, Moves.ICE_SPINNER, Moves.MIGHTY_CLEAVE ],
-  [Species.WISHIWASHI]: [ Moves.HEAL_ORDER, Moves.ICE_SPINNER, Moves.DRAGON_DANCE, Moves.JET_PUNCH ],
+  [Species.WISHIWASHI]: [ Moves.HEAL_ORDER, Moves.FREEZE_DRY, Moves.WATER_SHURIKEN, Moves.TAIL_GLOW ],
  [Species.MAREANIE]: [ Moves.CEASELESS_EDGE, Moves.SIZZLY_SLIDE, Moves.BODY_PRESS, Moves.LEECH_SEED ],
  [Species.MUDBRAY]: [ Moves.BODY_PRESS, Moves.YAWN, Moves.SHORE_UP, Moves.THOUSAND_WAVES ],
  [Species.DEWPIDER]: [ Moves.JET_PUNCH, Moves.SILK_TRAP, Moves.SWORDS_DANCE, Moves.AQUA_STEP ],
@ -392,27 +399,27 @@ export const speciesEggMoves = {
  [Species.BOUNSWEET]: [ Moves.TRIPLE_AXEL, Moves.AQUA_STEP, Moves.THUNDEROUS_KICK, Moves.SAPPY_SEED ],
  [Species.COMFEY]: [ Moves.REVIVAL_BLESSING, Moves.TAKE_HEART, Moves.STRENGTH_SAP, Moves.MATCHA_GOTCHA ],
  [Species.ORANGURU]: [ Moves.JUNGLE_HEALING, Moves.YAWN, Moves.FOLLOW_ME, Moves.LUMINA_CRASH ],
-  [Species.PASSIMIAN]: [ Moves.FAKE_OUT, Moves.SUCKER_PUNCH, Moves.ZING_ZAP, Moves.PYRO_BALL ],
+  [Species.PASSIMIAN]: [ Moves.PYRO_BALL, Moves.SUCKER_PUNCH, Moves.ZING_ZAP, Moves.VICTORY_DANCE ],
  [Species.WIMPOD]: [ Moves.TRIPLE_AXEL, Moves.OBSTRUCT, Moves.JET_PUNCH, Moves.SURGING_STRIKES ],
-  [Species.SANDYGAST]: [ Moves.SANDSEAR_STORM, Moves.SPLISHY_SPLASH, Moves.TAKE_HEART, Moves.SALT_CURE ],
+  [Species.SANDYGAST]: [ Moves.BITTER_MALICE, Moves.SPLISHY_SPLASH, Moves.TAKE_HEART, Moves.SALT_CURE ],
  [Species.PYUKUMUKU]: [ Moves.COMEUPPANCE, Moves.BANEFUL_BUNKER, Moves.TOXIC_SPIKES, Moves.SALT_CURE ],
-  [Species.TYPE_NULL]: [ Moves.DIRE_CLAW, Moves.RECOVER, Moves.EXTREME_SPEED, Moves.SHELL_SMASH ],
+  [Species.TYPE_NULL]: [ Moves.DIRE_CLAW, Moves.RECOVER, Moves.COMBAT_TORQUE, Moves.NO_RETREAT ],
  [Species.MINIOR]: [ Moves.EARTH_POWER, Moves.FLOATY_FALL, Moves.ZING_ZAP, Moves.DIAMOND_STORM ],
  [Species.KOMALA]: [ Moves.SLACK_OFF, Moves.EXTREME_SPEED, Moves.KNOCK_OFF, Moves.COLLISION_COURSE ],
  [Species.TURTONATOR]: [ Moves.BURNING_BULWARK, Moves.MORNING_SUN, Moves.BODY_PRESS, Moves.CORE_ENFORCER ],
  [Species.TOGEDEMARU]: [ Moves.FAKE_OUT, Moves.METAL_BURST, Moves.METEOR_MASH, Moves.AURA_WHEEL ],
-  [Species.MIMIKYU]: [ Moves.SPIRIT_BREAK, Moves.TIDY_UP, Moves.BITTER_BLADE, Moves.SPECTRAL_THIEF ],
+  [Species.MIMIKYU]: [ Moves.SPIRIT_BREAK, Moves.TIDY_UP, Moves.FIRE_LASH, Moves.SPECTRAL_THIEF ],
  [Species.BRUXISH]: [ Moves.PLAY_ROUGH, Moves.FIRE_FANG, Moves.DRAGON_DANCE, Moves.SURGING_STRIKES ],
  [Species.DRAMPA]: [ Moves.SLACK_OFF, Moves.TRICK_ROOM, Moves.CORE_ENFORCER, Moves.BOOMBURST ],
-  [Species.DHELMISE]: [ Moves.SHADOW_BONE, Moves.STRENGTH_SAP, Moves.LIQUIDATION, Moves.SAPPY_SEED ],
+  [Species.DHELMISE]: [ Moves.SHADOW_BONE, Moves.IVY_CUDGEL, Moves.TRIPLE_DIVE, Moves.STRENGTH_SAP ],
  [Species.JANGMO_O]: [ Moves.BODY_PRESS, Moves.SHELL_SIDE_ARM, Moves.SECRET_SWORD, Moves.GLAIVE_RUSH ],
-  [Species.TAPU_KOKO]: [ Moves.MAGICAL_TORQUE, Moves.TRIPLE_AXEL, Moves.RISING_VOLTAGE, Moves.BOLT_STRIKE ],
+  [Species.TAPU_KOKO]: [ Moves.MAGICAL_TORQUE, Moves.TRIPLE_AXEL, Moves.SWORDS_DANCE, Moves.BOLT_STRIKE ],
  [Species.TAPU_LELE]: [ Moves.MOONLIGHT, Moves.NASTY_PLOT, Moves.HEAT_WAVE, Moves.EXPANDING_FORCE ],
  [Species.TAPU_BULU]: [ Moves.SAPPY_SEED, Moves.DRAIN_PUNCH, Moves.MAGICAL_TORQUE, Moves.VICTORY_DANCE ],
  [Species.TAPU_FINI]: [ Moves.AURA_SPHERE, Moves.EARTH_POWER, Moves.RECOVER, Moves.QUIVER_DANCE ],
  [Species.COSMOG]: [ Moves.PHOTON_GEYSER, Moves.PRECIPICE_BLADES, Moves.SACRED_FIRE, Moves.ASTRAL_BARRAGE ],
  [Species.NIHILEGO]: [ Moves.STRENGTH_SAP, Moves.MALIGNANT_CHAIN, Moves.EARTH_POWER, Moves.QUIVER_DANCE ],
-  [Species.BUZZWOLE]: [ Moves.FIRST_IMPRESSION, Moves.COMBAT_TORQUE, Moves.ROCK_WRECKER, Moves.DOUBLE_IRON_BASH ],
+  [Species.BUZZWOLE]: [ Moves.FIRST_IMPRESSION, Moves.COMBAT_TORQUE, Moves.ROCK_BLAST, Moves.DOUBLE_IRON_BASH ],
  [Species.PHEROMOSA]: [ Moves.SECRET_SWORD, Moves.MAKE_IT_RAIN, Moves.ATTACK_ORDER, Moves.DIAMOND_STORM ],
  [Species.XURKITREE]: [ Moves.FLAMETHROWER, Moves.GIGA_DRAIN, Moves.TAIL_GLOW, Moves.THUNDERCLAP ],
  [Species.CELESTEELA]: [ Moves.RECOVER, Moves.BUZZY_BUZZ, Moves.SANDSEAR_STORM, Moves.OBLIVION_WING ],
@ -421,11 +428,19 @@ export const speciesEggMoves = {
  [Species.NECROZMA]: [ Moves.DYNAMAX_CANNON, Moves.SACRED_FIRE, Moves.ASTRAL_BARRAGE, Moves.CLANGOROUS_SOUL ],
  [Species.MAGEARNA]: [ Moves.STRENGTH_SAP, Moves.EARTH_POWER, Moves.MOONBLAST, Moves.MAKE_IT_RAIN ],
  [Species.MARSHADOW]: [ Moves.POWER_UP_PUNCH, Moves.TRIPLE_AXEL, Moves.METEOR_MASH, Moves.STORM_THROW ],
-  [Species.POIPOLE]: [ Moves.CORE_ENFORCER, Moves.ICE_BEAM, Moves.SEARING_SHOT, Moves.MALIGNANT_CHAIN ],
+  [Species.POIPOLE]: [ Moves.MALIGNANT_CHAIN, Moves.ICE_BEAM, Moves.ARMOR_CANNON, Moves.CLANGING_SCALES ],
  [Species.STAKATAKA]: [ Moves.HEAVY_SLAM, Moves.SHORE_UP, Moves.CURSE, Moves.SALT_CURE ],
-  [Species.BLACEPHALON]: [ Moves.NASTY_PLOT, Moves.AURA_SPHERE, Moves.CHLOROBLAST, Moves.ASTRAL_BARRAGE ],
+  [Species.BLACEPHALON]: [ Moves.STEEL_BEAM, Moves.MOONBLAST, Moves.CHLOROBLAST, Moves.MOONGEIST_BEAM ],
  [Species.ZERAORA]: [ Moves.SWORDS_DANCE, Moves.TRIPLE_AXEL, Moves.BOLT_STRIKE, Moves.PYRO_BALL ],
  [Species.MELTAN]: [ Moves.BULLET_PUNCH, Moves.DRAIN_PUNCH, Moves.BULK_UP, Moves.PLASMA_FISTS ],
+  [Species.ALOLA_RATTATA]: [ Moves.FALSE_SURRENDER, Moves.PSYCHIC_FANGS, Moves.COIL, Moves.EXTREME_SPEED ],
+  [Species.ALOLA_SANDSHREW]: [ Moves.SPIKY_SHIELD, Moves.AQUA_CUTTER, Moves.SHIFT_GEAR, Moves.GLACIAL_LANCE ],
+  [Species.ALOLA_VULPIX]: [ Moves.MOONBLAST, Moves.PARTING_SHOT, Moves.EARTH_POWER, Moves.REVIVAL_BLESSING ],
+  [Species.ALOLA_DIGLETT]: [ Moves.THOUSAND_WAVES, Moves.SWORDS_DANCE, Moves.TRIPLE_DIVE, Moves.MOUNTAIN_GALE ],
+  [Species.ALOLA_MEOWTH]: [ Moves.BADDY_BAD, Moves.BUZZY_BUZZ, Moves.PARTING_SHOT, Moves.MAKE_IT_RAIN ],
+  [Species.ALOLA_GEODUDE]: [ Moves.THOUSAND_WAVES, Moves.BULK_UP, Moves.STONE_AXE, Moves.EXTREME_SPEED ],
+  [Species.ALOLA_GRIMER]: [ Moves.SUCKER_PUNCH, Moves.BARB_BARRAGE, Moves.RECOVER, Moves.SURGING_STRIKES ],
+
  [Species.GROOKEY]: [ Moves.HIGH_HORSEPOWER, Moves.CLANGOROUS_SOUL, Moves.GRASSY_GLIDE, Moves.SAPPY_SEED ],
  [Species.SCORBUNNY]: [ Moves.EXTREME_SPEED, Moves.HIGH_JUMP_KICK, Moves.TRIPLE_AXEL, Moves.BOLT_STRIKE ],
  [Species.SOBBLE]: [ Moves.AEROBLAST, Moves.FROST_BREATH, Moves.ENERGY_BALL, Moves.NASTY_PLOT ],
@ -433,15 +448,15 @@ export const speciesEggMoves = {
  [Species.ROOKIDEE]: [ Moves.ROOST, Moves.BODY_PRESS, Moves.KINGS_SHIELD, Moves.BEHEMOTH_BASH ],
  [Species.BLIPBUG]: [ Moves.HEAL_ORDER, Moves.LUSTER_PURGE, Moves.SLEEP_POWDER, Moves.TAIL_GLOW ],
  [Species.NICKIT]: [ Moves.BADDY_BAD, Moves.FLAMETHROWER, Moves.SPARKLY_SWIRL, Moves.MAKE_IT_RAIN ],
-  [Species.GOSSIFLEUR]: [ Moves.TAILWIND, Moves.STRENGTH_SAP, Moves.SAPPY_SEED, Moves.SEED_FLARE ],
+  [Species.GOSSIFLEUR]: [ Moves.PARTING_SHOT, Moves.STRENGTH_SAP, Moves.SAPPY_SEED, Moves.SEED_FLARE ],
  [Species.WOOLOO]: [ Moves.PSYSHIELD_BASH, Moves.MILK_DRINK, Moves.BODY_PRESS, Moves.MULTI_ATTACK ],
-  [Species.CHEWTLE]: [ Moves.ICE_FANG, Moves.ACCELEROCK, Moves.SHELL_SMASH, Moves.FISHIOUS_REND ],
+  [Species.CHEWTLE]: [ Moves.ICE_FANG, Moves.PSYCHIC_FANGS, Moves.SHELL_SMASH, Moves.MIGHTY_CLEAVE ],
  [Species.YAMPER]: [ Moves.ICE_FANG, Moves.SWORDS_DANCE, Moves.THUNDER_FANG, Moves.BOLT_STRIKE ],
  [Species.ROLYCOLY]: [ Moves.BITTER_BLADE, Moves.BODY_PRESS, Moves.BULK_UP, Moves.DIAMOND_STORM ],
-  [Species.APPLIN]: [ Moves.MATCHA_GOTCHA, Moves.DRAGON_HAMMER, Moves.FLOWER_TRICK, Moves.STRENGTH_SAP ],
+  [Species.APPLIN]: [ Moves.CORE_ENFORCER, Moves.DRAGON_HAMMER, Moves.FLOWER_TRICK, Moves.MATCHA_GOTCHA ],
  [Species.SILICOBRA]: [ Moves.SHORE_UP, Moves.SHED_TAIL, Moves.MOUNTAIN_GALE, Moves.THOUSAND_ARROWS ],
  [Species.CRAMORANT]: [ Moves.APPLE_ACID, Moves.SURF, Moves.SCORCHING_SANDS, Moves.OBLIVION_WING ],
-  [Species.ARROKUDA]: [ Moves.SUPERCELL_SLAM, Moves.KNOCK_OFF, Moves.ICE_SPINNER, Moves.FILLET_AWAY ],
+  [Species.ARROKUDA]: [ Moves.SUPERCELL_SLAM, Moves.TRIPLE_DIVE, Moves.ICE_SPINNER, Moves.SWORDS_DANCE ],
  [Species.TOXEL]: [ Moves.NASTY_PLOT, Moves.BUG_BUZZ, Moves.SPARKLING_ARIA, Moves.TORCH_SONG ],
  [Species.SIZZLIPEDE]: [ Moves.BURNING_BULWARK, Moves.ZING_ZAP, Moves.FIRST_IMPRESSION, Moves.BITTER_BLADE ],
  [Species.CLOBBOPUS]: [ Moves.STORM_THROW, Moves.JET_PUNCH, Moves.MACH_PUNCH, Moves.SURGING_STRIKES ],
@ -450,19 +465,19 @@ export const speciesEggMoves = {
  [Species.IMPIDIMP]: [ Moves.ENCORE, Moves.PARTING_SHOT, Moves.TOPSY_TURVY, Moves.WICKED_BLOW ],
  [Species.MILCERY]: [ Moves.MOONBLAST, Moves.CHILLY_RECEPTION, Moves.EARTH_POWER, Moves.GEOMANCY ],
  [Species.FALINKS]: [ Moves.COMBAT_TORQUE, Moves.PSYSHIELD_BASH, Moves.HEAL_ORDER, Moves.POPULATION_BOMB ],
-  [Species.PINCURCHIN]: [ Moves.TRICK_ROOM, Moves.RISING_VOLTAGE, Moves.STRENGTH_SAP, Moves.THUNDERCLAP ],
+  [Species.PINCURCHIN]: [ Moves.TRICK_ROOM, Moves.VOLT_SWITCH, Moves.STRENGTH_SAP, Moves.THUNDERCLAP ],
  [Species.SNOM]: [ Moves.FROST_BREATH, Moves.HEAL_ORDER, Moves.EARTH_POWER, Moves.SPORE ],
  [Species.STONJOURNER]: [ Moves.BODY_PRESS, Moves.HELPING_HAND, Moves.ACCELEROCK, Moves.DIAMOND_STORM ],
-  [Species.EISCUE]: [ Moves.TRIPLE_AXEL, Moves.AQUA_STEP, Moves.SHELL_SMASH, Moves.GLACIAL_LANCE ],
+  [Species.EISCUE]: [ Moves.TRIPLE_AXEL, Moves.AQUA_STEP, Moves.AXE_KICK, Moves.SHELL_SMASH ],
  [Species.INDEEDEE]: [ Moves.MATCHA_GOTCHA, Moves.EXPANDING_FORCE, Moves.MOONBLAST, Moves.REVIVAL_BLESSING ],
  [Species.MORPEKO]: [ Moves.TRIPLE_AXEL, Moves.OBSTRUCT, Moves.SWORDS_DANCE, Moves.COLLISION_COURSE ],
  [Species.CUFANT]: [ Moves.LIQUIDATION, Moves.CURSE, Moves.COMBAT_TORQUE, Moves.GIGATON_HAMMER ],
-  [Species.DRACOZOLT]: [ Moves.TRIPLE_AXEL, Moves.SCALE_SHOT, Moves.FIRE_LASH, Moves.DRAGON_DANCE ],
+  [Species.DRACOZOLT]: [ Moves.TRIPLE_AXEL, Moves.GUNK_SHOT, Moves.FIRE_LASH, Moves.DRAGON_DANCE ],
  [Species.ARCTOZOLT]: [ Moves.MOUNTAIN_GALE, Moves.AQUA_STEP, Moves.HIGH_HORSEPOWER, Moves.SHIFT_GEAR ],
  [Species.DRACOVISH]: [ Moves.TRIPLE_AXEL, Moves.DRAGON_HAMMER, Moves.THUNDER_FANG, Moves.DRAGON_DANCE ],
  [Species.ARCTOVISH]: [ Moves.ICE_FANG, Moves.THUNDER_FANG, Moves.HIGH_HORSEPOWER, Moves.SHIFT_GEAR ],
  [Species.DURALUDON]: [ Moves.CORE_ENFORCER, Moves.BODY_PRESS, Moves.RECOVER, Moves.TACHYON_CUTTER ],
-  [Species.DREEPY]: [ Moves.SHADOW_BONE, Moves.NASTY_PLOT, Moves.FIRE_LASH, Moves.COLLISION_COURSE ],
+  [Species.DREEPY]: [ Moves.SHADOW_BONE, Moves.POWER_UP_PUNCH, Moves.FIRE_LASH, Moves.DIRE_CLAW ],
  [Species.ZACIAN]: [ Moves.MAGICAL_TORQUE, Moves.MIGHTY_CLEAVE, Moves.BITTER_BLADE, Moves.PRECIPICE_BLADES ],
  [Species.ZAMAZENTA]: [ Moves.BULK_UP, Moves.BODY_PRESS, Moves.SLACK_OFF, Moves.DIAMOND_STORM ],
  [Species.ETERNATUS]: [ Moves.BODY_PRESS, Moves.NASTY_PLOT, Moves.MALIGNANT_CHAIN, Moves.DRAGON_ENERGY ],
@ -470,18 +485,36 @@ export const speciesEggMoves = {
  [Species.ZARUDE]: [ Moves.SAPPY_SEED, Moves.MIGHTY_CLEAVE, Moves.WICKED_BLOW, Moves.VICTORY_DANCE ],
  [Species.REGIELEKI]: [ Moves.NASTY_PLOT, Moves.ICE_BEAM, Moves.EARTH_POWER, Moves.ELECTRO_DRIFT ],
  [Species.REGIDRAGO]: [ Moves.METEOR_MASH, Moves.FLAMETHROWER, Moves.TAKE_HEART, Moves.DRAGON_DARTS ],
-  [Species.GLASTRIER]: [ Moves.TRICK_ROOM, Moves.SLACK_OFF, Moves.HIGH_HORSEPOWER, Moves.GLACIAL_LANCE ],
+  [Species.GLASTRIER]: [ Moves.SPEED_SWAP, Moves.SLACK_OFF, Moves.HIGH_HORSEPOWER, Moves.GLACIAL_LANCE ],
  [Species.SPECTRIER]: [ Moves.EARTH_POWER, Moves.PARTING_SHOT, Moves.AURA_SPHERE, Moves.ASTRAL_BARRAGE ],
  [Species.CALYREX]: [ Moves.SAPPY_SEED, Moves.RECOVER, Moves.SECRET_SWORD, Moves.PHOTON_GEYSER ],
-  [Species.ENAMORUS]: [ Moves.FLEUR_CANNON, Moves.TAKE_HEART, Moves.STORED_POWER, Moves.OBLIVION_WING ],
+  [Species.ENAMORUS]: [ Moves.AEROBLAST, Moves.THOUSAND_ARROWS, Moves.STORED_POWER, Moves.FLEUR_CANNON ],
+  [Species.GALAR_MEOWTH]: [ Moves.LIQUIDATION, Moves.HORN_LEECH, Moves.BULLET_PUNCH, Moves.BEHEMOTH_BASH ],
+  [Species.GALAR_PONYTA]: [ Moves.MAGICAL_TORQUE, Moves.EXTREME_SPEED, Moves.FLARE_BLITZ, Moves.PHOTON_GEYSER ],
+  [Species.GALAR_SLOWPOKE]: [ Moves.SHED_TAIL, Moves.BADDY_BAD, Moves.MOONBLAST, Moves.PHOTON_GEYSER ],
+  [Species.GALAR_FARFETCHD]: [ Moves.ROOST, Moves.SACRED_SWORD, Moves.KINGS_SHIELD, Moves.BEHEMOTH_BLADE ],
+  [Species.GALAR_ARTICUNO]: [ Moves.SECRET_SWORD, Moves.NIGHT_DAZE, Moves.ICE_BEAM, Moves.OBLIVION_WING ],
+  [Species.GALAR_ZAPDOS]: [ Moves.TIDY_UP, Moves.FLOATY_FALL, Moves.ROOST, Moves.BOLT_BEAK ],
+  [Species.GALAR_MOLTRES]: [ Moves.ROOST, Moves.SLUDGE_BOMB, Moves.FLAMETHROWER, Moves.OBLIVION_WING ],
+  [Species.GALAR_CORSOLA]: [ Moves.SHELL_SMASH, Moves.AURA_SPHERE, Moves.INFERNAL_PARADE, Moves.ASTRAL_BARRAGE ],
+  [Species.GALAR_ZIGZAGOON]: [ Moves.CEASELESS_EDGE, Moves.FACADE, Moves.PARTING_SHOT, Moves.EXTREME_SPEED ],
+  [Species.GALAR_DARUMAKA]: [ Moves.ICE_SPINNER, Moves.ZING_ZAP, Moves.DRAIN_PUNCH, Moves.PYRO_BALL ],
+  [Species.GALAR_YAMASK]: [ Moves.STRENGTH_SAP, Moves.DIRE_CLAW, Moves.THOUSAND_WAVES, Moves.SPECTRAL_THIEF ],
+  [Species.GALAR_STUNFISK]: [ Moves.SPIKY_SHIELD, Moves.THOUSAND_ARROWS, Moves.STRENGTH_SAP, Moves.DOUBLE_IRON_BASH ],
+  [Species.HISUI_GROWLITHE]: [ Moves.WAVE_CRASH, Moves.HEAD_SMASH, Moves.VOLT_TACKLE, Moves.DRAGON_DANCE ],
+  [Species.HISUI_VOLTORB]: [ Moves.FROST_BREATH, Moves.NASTY_PLOT, Moves.APPLE_ACID, Moves.ELECTRO_DRIFT ],
+  [Species.HISUI_QWILFISH]: [ Moves.CEASELESS_EDGE, Moves.KNOCK_OFF, Moves.RECOVER, Moves.FISHIOUS_REND ],
+  [Species.HISUI_SNEASEL]: [ Moves.DRAIN_PUNCH, Moves.KNOCK_OFF, Moves.PSYCHIC_FANGS, Moves.TRIPLE_AXEL ],
+  [Species.HISUI_ZORUA]: [ Moves.MOONBLAST, Moves.HYPER_VOICE, Moves.PARTING_SHOT, Moves.BLOOD_MOON ],
+
  [Species.SPRIGATITO]: [ Moves.FIRE_LASH, Moves.TRIPLE_AXEL, Moves.SUCKER_PUNCH, Moves.WICKED_BLOW ],
  [Species.FUECOCO]: [ Moves.ALLURING_VOICE, Moves.SLACK_OFF, Moves.OVERDRIVE, Moves.MOONGEIST_BEAM ],
  [Species.QUAXLY]: [ Moves.DRAGON_DANCE, Moves.TRIPLE_AXEL, Moves.POWER_TRIP, Moves.THUNDEROUS_KICK ],
  [Species.LECHONK]: [ Moves.MILK_DRINK, Moves.PSYSHIELD_BASH, Moves.FILLET_AWAY, Moves.MULTI_ATTACK ],
  [Species.TAROUNTULA]: [ Moves.STONE_AXE, Moves.LEECH_LIFE, Moves.THIEF, Moves.SPORE ],
  [Species.NYMBLE]: [ Moves.KNOCK_OFF, Moves.FELL_STINGER, Moves.ATTACK_ORDER, Moves.WICKED_BLOW ],
-  [Species.PAWMI]: [ Moves.DRAIN_PUNCH, Moves.ICE_PUNCH, Moves.MACH_PUNCH, Moves.PLASMA_FISTS ],
-  [Species.TANDEMAUS]: [ Moves.BATON_PASS, Moves.THIEF, Moves.SIZZLY_SLIDE, Moves.REVIVAL_BLESSING ],
+  [Species.PAWMI]: [ Moves.DRAIN_PUNCH, Moves.METEOR_MASH, Moves.JET_PUNCH, Moves.PLASMA_FISTS ],
+  [Species.TANDEMAUS]: [ Moves.BATON_PASS, Moves.COVET, Moves.SIZZLY_SLIDE, Moves.REVIVAL_BLESSING ],
  [Species.FIDOUGH]: [ Moves.SOFT_BOILED, Moves.HIGH_HORSEPOWER, Moves.SIZZLY_SLIDE, Moves.TIDY_UP ],
  [Species.SMOLIV]: [ Moves.STRENGTH_SAP, Moves.EARTH_POWER, Moves.CALM_MIND, Moves.BOOMBURST ],
  [Species.SQUAWKABILLY]: [ Moves.PARTING_SHOT, Moves.EARTHQUAKE, Moves.FLARE_BLITZ, Moves.EXTREME_SPEED ],
@ -497,24 +530,24 @@ export const speciesEggMoves = {
  [Species.CAPSAKID]: [ Moves.STRENGTH_SAP, Moves.APPLE_ACID, Moves.FROST_BREATH, Moves.TORCH_SONG ],
  [Species.RELLOR]: [ Moves.HEAL_BLOCK, Moves.RECOVER, Moves.HEAT_WAVE, Moves.LUMINA_CRASH ],
  [Species.FLITTLE]: [ Moves.COSMIC_POWER, Moves.AURA_SPHERE, Moves.ROOST, Moves.FIERY_DANCE ],
-  [Species.TINKATINK]: [ Moves.MAGICAL_TORQUE, Moves.PYRO_BALL, Moves.ICE_HAMMER, Moves.SHIFT_GEAR ],
+  [Species.TINKATINK]: [ Moves.MAGICAL_TORQUE, Moves.PYRO_BALL, Moves.IVY_CUDGEL, Moves.SHIFT_GEAR ],
  [Species.WIGLETT]: [ Moves.SHELL_SMASH, Moves.ICICLE_CRASH, Moves.SEED_BOMB, Moves.SURGING_STRIKES ],
  [Species.BOMBIRDIER]: [ Moves.FLOATY_FALL, Moves.SWORDS_DANCE, Moves.SUCKER_PUNCH, Moves.MIGHTY_CLEAVE ],
  [Species.FINIZEN]: [ Moves.TRIPLE_AXEL, Moves.DRAIN_PUNCH, Moves.HEADLONG_RUSH, Moves.SURGING_STRIKES ],
  [Species.VAROOM]: [ Moves.COMBAT_TORQUE, Moves.U_TURN, Moves.BLAZING_TORQUE, Moves.NOXIOUS_TORQUE ],
-  [Species.CYCLIZAR]: [ Moves.BATON_PASS, Moves.BLAZING_TORQUE, Moves.KNOCK_OFF, Moves.CLANGOROUS_SOUL ],
+  [Species.CYCLIZAR]: [ Moves.PARTING_SHOT, Moves.FIRE_LASH, Moves.MAGICAL_TORQUE, Moves.GLAIVE_RUSH ],
  [Species.ORTHWORM]: [ Moves.SIZZLY_SLIDE, Moves.COIL, Moves.BODY_PRESS, Moves.SHORE_UP ],
  [Species.GLIMMET]: [ Moves.CALM_MIND, Moves.EARTH_POWER, Moves.FIERY_DANCE, Moves.MALIGNANT_CHAIN ],
  [Species.GREAVARD]: [ Moves.SHADOW_BONE, Moves.YAWN, Moves.SHORE_UP, Moves.COLLISION_COURSE ],
  [Species.FLAMIGO]: [ Moves.THUNDEROUS_KICK, Moves.TRIPLE_AXEL, Moves.FLOATY_FALL, Moves.VICTORY_DANCE ],
-  [Species.CETODDLE]: [ Moves.MOUNTAIN_GALE, Moves.HIGH_HORSEPOWER, Moves.RECOVER, Moves.DRAGON_DANCE ],
+  [Species.CETODDLE]: [ Moves.MOUNTAIN_GALE, Moves.HIGH_HORSEPOWER, Moves.SLACK_OFF, Moves.DRAGON_DANCE ],
  [Species.VELUZA]: [ Moves.PSYBLADE, Moves.FLIP_TURN, Moves.ICE_SPINNER, Moves.BITTER_BLADE ],
-  [Species.DONDOZO]: [ Moves.SOFT_BOILED, Moves.SIZZLY_SLIDE, Moves.TOXIC, Moves.SALT_CURE ],
-  [Species.TATSUGIRI]: [ Moves.ICE_BEAM, Moves.FILLET_AWAY, Moves.CORE_ENFORCER, Moves.STEAM_ERUPTION ],
+  [Species.DONDOZO]: [ Moves.SOFT_BOILED, Moves.SIZZLY_SLIDE, Moves.BREAKING_SWIPE, Moves.SALT_CURE ],
+  [Species.TATSUGIRI]: [ Moves.SLUDGE_BOMB, Moves.FILLET_AWAY, Moves.CORE_ENFORCER, Moves.STEAM_ERUPTION ],
  [Species.GREAT_TUSK]: [ Moves.STONE_AXE, Moves.MORNING_SUN, Moves.COLLISION_COURSE, Moves.SHIFT_GEAR ],
  [Species.SCREAM_TAIL]: [ Moves.TORCH_SONG, Moves.GLITZY_GLOW, Moves.MOONLIGHT, Moves.SPARKLY_SWIRL ],
  [Species.BRUTE_BONNET]: [ Moves.SAPPY_SEED, Moves.STRENGTH_SAP, Moves.EARTHQUAKE, Moves.WICKED_BLOW ],
-  [Species.FLUTTER_MANE]: [ Moves.MOONLIGHT, Moves.FLAMETHROWER, Moves.EARTH_POWER, Moves.ASTRAL_BARRAGE ],
+  [Species.FLUTTER_MANE]: [ Moves.MOONLIGHT, Moves.NASTY_PLOT, Moves.EARTH_POWER, Moves.MOONGEIST_BEAM ],
  [Species.SLITHER_WING]: [ Moves.MIGHTY_CLEAVE, Moves.THUNDEROUS_KICK, Moves.FIRE_LASH, Moves.VICTORY_DANCE ],
  [Species.SANDY_SHOCKS]: [ Moves.MORNING_SUN, Moves.ICE_BEAM, Moves.NASTY_PLOT, Moves.THUNDERCLAP ],
  [Species.IRON_TREADS]: [ Moves.FUSION_BOLT, Moves.BULK_UP, Moves.SHORE_UP, Moves.SUNSTEEL_STRIKE ],
@ -523,57 +556,32 @@ export const speciesEggMoves = {
  [Species.IRON_JUGULIS]: [ Moves.FIERY_WRATH, Moves.ROOST, Moves.NASTY_PLOT, Moves.OBLIVION_WING ],
  [Species.IRON_MOTH]: [ Moves.EARTH_POWER, Moves.SEARING_SHOT, Moves.MALIGNANT_CHAIN, Moves.QUIVER_DANCE ],
  [Species.IRON_THORNS]: [ Moves.DIAMOND_STORM, Moves.SHORE_UP, Moves.SHIFT_GEAR, Moves.PLASMA_FISTS ],
-  [Species.FRIGIBAX]: [ Moves.DRAGON_DARTS, Moves.DRAGON_DANCE, Moves.EARTHQUAKE, Moves.GLACIAL_LANCE ],
+  [Species.FRIGIBAX]: [ Moves.BEHEMOTH_BLADE, Moves.DRAGON_DANCE, Moves.MOUNTAIN_GALE, Moves.PRECIPICE_BLADES ],
  [Species.GIMMIGHOUL]: [ Moves.HAPPY_HOUR, Moves.AURA_SPHERE, Moves.SURF, Moves.ASTRAL_BARRAGE ],
  [Species.WO_CHIEN]: [ Moves.SPORE, Moves.FIERY_WRATH, Moves.SAPPY_SEED, Moves.STRENGTH_SAP ],
-  [Species.CHIEN_PAO]: [ Moves.KNOCK_OFF, Moves.PARTING_SHOT, Moves.BITTER_BLADE, Moves.GLACIAL_LANCE ],
-  [Species.TING_LU]: [ Moves.SHORE_UP, Moves.WICKED_BLOW, Moves.SAPPY_SEED, Moves.THOUSAND_ARROWS ],
+  [Species.CHIEN_PAO]: [ Moves.KNOCK_OFF, Moves.PARTING_SHOT, Moves.TRIPLE_AXEL, Moves.BITTER_BLADE ],
+  [Species.TING_LU]: [ Moves.SHORE_UP, Moves.CEASELESS_EDGE, Moves.SAPPY_SEED, Moves.PRECIPICE_BLADES ],
  [Species.CHI_YU]: [ Moves.FIERY_WRATH, Moves.HYDRO_STEAM, Moves.MORNING_SUN, Moves.BLUE_FLARE ],
  [Species.ROARING_MOON]: [ Moves.FIRE_LASH, Moves.DRAGON_HAMMER, Moves.SUCKER_PUNCH, Moves.WICKED_BLOW ],
  [Species.IRON_VALIANT]: [ Moves.PLASMA_FISTS, Moves.NO_RETREAT, Moves.SECRET_SWORD, Moves.MAGICAL_TORQUE ],
-  [Species.KORAIDON]: [ Moves.SUNSTEEL_STRIKE, Moves.MORNING_SUN, Moves.DRAGON_DARTS, Moves.BITTER_BLADE ],
+  [Species.KORAIDON]: [ Moves.SUNSTEEL_STRIKE, Moves.SOLAR_BLADE, Moves.DRAGON_DARTS, Moves.BITTER_BLADE ],
  [Species.MIRAIDON]: [ Moves.ICE_BEAM, Moves.CLANGOROUS_SOUL, Moves.CORE_ENFORCER, Moves.RISING_VOLTAGE ],
-  [Species.WALKING_WAKE]: [ Moves.CORE_ENFORCER, Moves.NASTY_PLOT, Moves.EARTH_POWER, Moves.BOUNCY_BUBBLE ],
+  [Species.WALKING_WAKE]: [ Moves.BOUNCY_BUBBLE, Moves.NASTY_PLOT, Moves.SLUDGE_WAVE, Moves.CORE_ENFORCER ],
  [Species.IRON_LEAVES]: [ Moves.BITTER_BLADE, Moves.U_TURN, Moves.MIGHTY_CLEAVE, Moves.VICTORY_DANCE ],
-  [Species.POLTCHAGEIST]: [ Moves.SHELL_SMASH, Moves.BOUNCY_BUBBLE, Moves.LEECH_SEED, Moves.SPARKLY_SWIRL ],
-  [Species.OKIDOGI]: [ Moves.DRAIN_PUNCH, Moves.KNOCK_OFF, Moves.DIRE_CLAW, Moves.VICTORY_DANCE ],
+  [Species.POLTCHAGEIST]: [ Moves.PARABOLIC_CHARGE, Moves.BOUNCY_BUBBLE, Moves.LEECH_SEED, Moves.SPARKLY_SWIRL ],
+  [Species.OKIDOGI]: [ Moves.COMBAT_TORQUE, Moves.TIDY_UP, Moves.DIRE_CLAW, Moves.WICKED_BLOW ],
  [Species.MUNKIDORI]: [ Moves.PSYSTRIKE, Moves.HEAT_WAVE, Moves.EARTH_POWER, Moves.MALIGNANT_CHAIN ],
-  [Species.FEZANDIPITI]: [ Moves.BARB_BARRAGE, Moves.VICTORY_DANCE, Moves.TRIPLE_AXEL, Moves.MAGICAL_TORQUE ],
-  [Species.OGERPON]: [ Moves.FLOWER_TRICK, Moves.BONEMERANG, Moves.TRIPLE_AXEL, Moves.GIGATON_HAMMER ],
+  [Species.FEZANDIPITI]: [ Moves.BARB_BARRAGE, Moves.BONEMERANG, Moves.TRIPLE_AXEL, Moves.VICTORY_DANCE ],
+  [Species.OGERPON]: [ Moves.SLEEP_POWDER, Moves.BONEMERANG, Moves.TRIPLE_AXEL, Moves.FLOWER_TRICK ],
  [Species.GOUGING_FIRE]: [ Moves.EXTREME_SPEED, Moves.BULK_UP, Moves.SACRED_FIRE, Moves.GLAIVE_RUSH ],
  [Species.RAGING_BOLT]: [ Moves.NASTY_PLOT, Moves.FLAMETHROWER, Moves.MORNING_SUN, Moves.ELECTRO_DRIFT ],
  [Species.IRON_BOULDER]: [ Moves.PSYBLADE, Moves.KOWTOW_CLEAVE, Moves.STONE_AXE, Moves.BITTER_BLADE ],
  [Species.IRON_CROWN]: [ Moves.NASTY_PLOT, Moves.SECRET_SWORD, Moves.PSYSTRIKE, Moves.ELECTRO_DRIFT ],
  [Species.TERAPAGOS]: [ Moves.MOONBLAST, Moves.RECOVER, Moves.ICE_BEAM, Moves.SHELL_SMASH ],
  [Species.PECHARUNT]: [ Moves.TAKE_HEART, Moves.BODY_PRESS, Moves.SAPPY_SEED, Moves.KINGS_SHIELD ],
-  [Species.ALOLA_RATTATA]: [ Moves.FALSE_SURRENDER, Moves.PSYCHIC_FANGS, Moves.COIL, Moves.EXTREME_SPEED ],
-  [Species.ALOLA_SANDSHREW]: [ Moves.SPIKY_SHIELD, Moves.AQUA_CUTTER, Moves.SHIFT_GEAR, Moves.GLACIAL_LANCE ],
-  [Species.ALOLA_VULPIX]: [ Moves.MOONBLAST, Moves.PARTING_SHOT, Moves.FLAMETHROWER, Moves.REVIVAL_BLESSING ],
-  [Species.ALOLA_DIGLETT]: [ Moves.THOUSAND_WAVES, Moves.SWORDS_DANCE, Moves.TRIPLE_DIVE, Moves.MOUNTAIN_GALE ],
-  [Species.ALOLA_MEOWTH]: [ Moves.BADDY_BAD, Moves.BUZZY_BUZZ, Moves.PARTING_SHOT, Moves.MAKE_IT_RAIN ],
-  [Species.ALOLA_GEODUDE]: [ Moves.THOUSAND_WAVES, Moves.BULK_UP, Moves.STONE_AXE, Moves.EXTREME_SPEED ],
-  [Species.ALOLA_GRIMER]: [ Moves.SUCKER_PUNCH, Moves.BARB_BARRAGE, Moves.STRENGTH_SAP, Moves.SURGING_STRIKES ],
-  [Species.ETERNAL_FLOETTE]: [ Moves.MIND_BLOWN, Moves.CHLOROBLAST, Moves.PHOTON_GEYSER, Moves.QUIVER_DANCE ],
-  [Species.GALAR_MEOWTH]: [ Moves.AQUA_CUTTER, Moves.KNOCK_OFF, Moves.BULLET_PUNCH, Moves.BEHEMOTH_BASH ],
-  [Species.GALAR_PONYTA]: [ Moves.MAGICAL_TORQUE, Moves.EXTREME_SPEED, Moves.FLARE_BLITZ, Moves.PHOTON_GEYSER ],
-  [Species.GALAR_SLOWPOKE]: [ Moves.TRICK_ROOM, Moves.BADDY_BAD, Moves.MOONBLAST, Moves.TORCH_SONG ],
-  [Species.GALAR_FARFETCHD]: [ Moves.ROOST, Moves.SACRED_SWORD, Moves.KINGS_SHIELD, Moves.BEHEMOTH_BLADE ],
-  [Species.GALAR_ARTICUNO]: [ Moves.SECRET_SWORD, Moves.NIGHT_DAZE, Moves.ICE_BEAM, Moves.OBLIVION_WING ],
-  [Species.GALAR_ZAPDOS]: [ Moves.TIDY_UP, Moves.FLOATY_FALL, Moves.ROOST, Moves.BOLT_BEAK ],
-  [Species.GALAR_MOLTRES]: [ Moves.ROOST, Moves.SLUDGE_BOMB, Moves.FLAMETHROWER, Moves.OBLIVION_WING ],
-  [Species.GALAR_CORSOLA]: [ Moves.SHELL_SMASH, Moves.AURA_SPHERE, Moves.INFERNAL_PARADE, Moves.ASTRAL_BARRAGE ],
-  [Species.GALAR_ZIGZAGOON]: [ Moves.CEASELESS_EDGE, Moves.FACADE, Moves.PARTING_SHOT, Moves.EXTREME_SPEED ],
-  [Species.GALAR_DARUMAKA]: [ Moves.ICE_SPINNER, Moves.ENDURE, Moves.DRAIN_PUNCH, Moves.V_CREATE ],
-  [Species.GALAR_YAMASK]: [ Moves.STRENGTH_SAP, Moves.DIRE_CLAW, Moves.THOUSAND_WAVES, Moves.SPECTRAL_THIEF ],
-  [Species.GALAR_STUNFISK]: [ Moves.SPIKY_SHIELD, Moves.THOUSAND_ARROWS, Moves.STRENGTH_SAP, Moves.DOUBLE_IRON_BASH ],
-  [Species.HISUI_GROWLITHE]: [ Moves.WAVE_CRASH, Moves.HEAD_SMASH, Moves.VOLT_TACKLE, Moves.DRAGON_DANCE ],
-  [Species.HISUI_VOLTORB]: [ Moves.FROST_BREATH, Moves.NASTY_PLOT, Moves.APPLE_ACID, Moves.ELECTRO_DRIFT ],
-  [Species.HISUI_QWILFISH]: [ Moves.CEASELESS_EDGE, Moves.KNOCK_OFF, Moves.STRENGTH_SAP, Moves.FISHIOUS_REND ],
-  [Species.HISUI_SNEASEL]: [ Moves.THUNDEROUS_KICK, Moves.KNOCK_OFF, Moves.TRIPLE_AXEL, Moves.VICTORY_DANCE ],
-  [Species.HISUI_ZORUA]: [ Moves.MOONBLAST, Moves.HYPER_VOICE, Moves.PARTING_SHOT, Moves.BLOOD_MOON ],
  [Species.PALDEA_TAUROS]: [ Moves.NO_RETREAT, Moves.BLAZING_TORQUE, Moves.AQUA_STEP, Moves.THUNDEROUS_KICK ],
-  [Species.PALDEA_WOOPER]: [ Moves.RECOVER, Moves.STONE_AXE, Moves.BANEFUL_BUNKER, Moves.SAPPY_SEED ],
-  [Species.BLOODMOON_URSALUNA]: [ Moves.NASTY_PLOT, Moves.TRICK_ROOM, Moves.THUNDERBOLT, Moves.BOOMBURST ]
+  [Species.PALDEA_WOOPER]: [ Moves.STONE_AXE, Moves.RECOVER, Moves.BANEFUL_BUNKER, Moves.BARB_BARRAGE ],
+  [Species.BLOODMOON_URSALUNA]: [ Moves.NASTY_PLOT, Moves.ROCK_POLISH, Moves.SANDSEAR_STORM, Moves.BOOMBURST ]
 };

 function parseEggMoves(content: string): void {
--- a/src/data/balance/passives.ts
+++ b/src/data/balance/passives.ts
@ -23,9 +23,9 @@ export const starterPassiveAbilities = {
  [Species.MEOWTH]: Abilities.TOUGH_CLAWS,
  [Species.PSYDUCK]: Abilities.SIMPLE,
  [Species.MANKEY]: Abilities.IRON_FIST,
-  [Species.GROWLITHE]: Abilities.SPEED_BOOST,
+  [Species.GROWLITHE]: Abilities.FLUFFY,
  [Species.POLIWAG]: Abilities.NO_GUARD,
-  [Species.ABRA]: Abilities.PSYCHIC_SURGE,
+  [Species.ABRA]: Abilities.MAGICIAN,
  [Species.MACHOP]: Abilities.QUICK_FEET,
  [Species.BELLSPROUT]: Abilities.FLOWER_GIFT,
  [Species.TENTACOOL]: Abilities.TOXIC_CHAIN,
@ -41,7 +41,7 @@ export const starterPassiveAbilities = {
  [Species.GASTLY]: Abilities.SHADOW_SHIELD,
  [Species.ONIX]: Abilities.ROCKY_PAYLOAD,
  [Species.DROWZEE]: Abilities.MAGICIAN,
-  [Species.KRABBY]: Abilities.THERMAL_EXCHANGE,
+  [Species.KRABBY]: Abilities.UNBURDEN,
  [Species.VOLTORB]: Abilities.TRANSISTOR,
  [Species.EXEGGCUTE]: Abilities.RIPEN,
  [Species.CUBONE]: Abilities.PARENTAL_BOND,
@ -70,6 +70,7 @@ export const starterPassiveAbilities = {
  [Species.DRATINI]: Abilities.AERILATE,
  [Species.MEWTWO]: Abilities.NEUROFORCE,
  [Species.MEW]: Abilities.PROTEAN,
+
  [Species.CHIKORITA]: Abilities.THICK_FAT,
  [Species.CYNDAQUIL]: Abilities.DROUGHT,
  [Species.TOTODILE]: Abilities.TOUGH_CLAWS,
@ -77,12 +78,12 @@ export const starterPassiveAbilities = {
  [Species.HOOTHOOT]: Abilities.AERILATE,
  [Species.LEDYBA]: Abilities.PRANKSTER,
  [Species.SPINARAK]: Abilities.PRANKSTER,
-  [Species.CHINCHOU]: Abilities.WATER_BUBBLE,
+  [Species.CHINCHOU]: Abilities.REGENERATOR,
  [Species.PICHU]: Abilities.ELECTRIC_SURGE,
  [Species.CLEFFA]: Abilities.ANALYTIC,
  [Species.IGGLYBUFF]: Abilities.HUGE_POWER,
  [Species.TOGEPI]: Abilities.PIXILATE,
-  [Species.NATU]: Abilities.TINTED_LENS,
+  [Species.NATU]: Abilities.SHEER_FORCE,
  [Species.MAREEP]: Abilities.ELECTROMORPHOSIS,
  [Species.HOPPIP]: Abilities.FLUFFY,
  [Species.AIPOM]: Abilities.SCRAPPY,
@ -108,24 +109,25 @@ export const starterPassiveAbilities = {
  [Species.REMORAID]: Abilities.SIMPLE,
  [Species.DELIBIRD]: Abilities.HUGE_POWER,
  [Species.SKARMORY]: Abilities.LIGHTNING_ROD,
-  [Species.HOUNDOUR]: Abilities.DROUGHT,
+  [Species.HOUNDOUR]: Abilities.LIGHTNING_ROD,
  [Species.PHANPY]: Abilities.SPEED_BOOST,
  [Species.STANTLER]: Abilities.SPEED_BOOST,
  [Species.SMEARGLE]: Abilities.PRANKSTER,
  [Species.TYROGUE]: Abilities.MOXIE,
  [Species.SMOOCHUM]: Abilities.PSYCHIC_SURGE,
  [Species.ELEKID]: Abilities.SHEER_FORCE,
-  [Species.MAGBY]: Abilities.CONTRARY,
+  [Species.MAGBY]: Abilities.SHEER_FORCE,
  [Species.MILTANK]: Abilities.STAMINA,
-  [Species.RAIKOU]: Abilities.TRANSISTOR,
-  [Species.ENTEI]: Abilities.MOXIE,
-  [Species.SUICUNE]: Abilities.UNAWARE,
+  [Species.RAIKOU]: Abilities.BEAST_BOOST,
+  [Species.ENTEI]: Abilities.BEAST_BOOST,
+  [Species.SUICUNE]: Abilities.BEAST_BOOST,
  [Species.LARVITAR]: Abilities.SAND_RUSH,
  [Species.LUGIA]: Abilities.DELTA_STREAM,
  [Species.HO_OH]: Abilities.MAGIC_GUARD,
  [Species.CELEBI]: Abilities.PSYCHIC_SURGE,
+
  [Species.TREECKO]: Abilities.TINTED_LENS,
-  [Species.TORCHIC]: Abilities.RECKLESS,
+  [Species.TORCHIC]: Abilities.DEFIANT,
  [Species.MUDKIP]: Abilities.DRIZZLE,
  [Species.POOCHYENA]: Abilities.TOUGH_CLAWS,
  [Species.ZIGZAGOON]: Abilities.RUN_AWAY,
@ -148,7 +150,7 @@ export const starterPassiveAbilities = {
  [Species.MAWILE]: Abilities.UNNERVE,
  [Species.ARON]: Abilities.EARTH_EATER,
  [Species.MEDITITE]: Abilities.MINDS_EYE,
-  [Species.ELECTRIKE]: Abilities.ELECTRIC_SURGE,
+  [Species.ELECTRIKE]: Abilities.FLASH_FIRE,
  [Species.PLUSLE]: Abilities.POWER_SPOT,
  [Species.MINUN]: Abilities.POWER_SPOT,
  [Species.VOLBEAT]: Abilities.HONEY_GATHER,
@ -162,7 +164,7 @@ export const starterPassiveAbilities = {
  [Species.SPINDA]: Abilities.SIMPLE,
  [Species.TRAPINCH]: Abilities.ADAPTABILITY,
  [Species.CACNEA]: Abilities.SAND_RUSH,
-  [Species.SWABLU]: Abilities.ADAPTABILITY,
+  [Species.SWABLU]: Abilities.FLUFFY,
  [Species.ZANGOOSE]: Abilities.POISON_HEAL,
  [Species.SEVIPER]: Abilities.MULTISCALE,
  [Species.LUNATONE]: Abilities.SHADOW_SHIELD,
@ -182,14 +184,14 @@ export const starterPassiveAbilities = {
  [Species.WYNAUT]: Abilities.STURDY,
  [Species.SNORUNT]: Abilities.SNOW_WARNING,
  [Species.SPHEAL]: Abilities.UNAWARE,
-  [Species.CLAMPERL]: Abilities.DRIZZLE,
+  [Species.CLAMPERL]: Abilities.ARENA_TRAP,
  [Species.RELICANTH]: Abilities.PRIMORDIAL_SEA,
  [Species.LUVDISC]: Abilities.MULTISCALE,
-  [Species.BAGON]: Abilities.DRAGONS_MAW,
+  [Species.BAGON]: Abilities.MOLD_BREAKER,
  [Species.BELDUM]: Abilities.LEVITATE,
  [Species.REGIROCK]: Abilities.SAND_STREAM,
  [Species.REGICE]: Abilities.SNOW_WARNING,
-  [Species.REGISTEEL]: Abilities.FILTER,
+  [Species.REGISTEEL]: Abilities.STEELY_SPIRIT,
  [Species.LATIAS]: Abilities.PRISM_ARMOR,
  [Species.LATIOS]: Abilities.TINTED_LENS,
  [Species.KYOGRE]: Abilities.MOLD_BREAKER,
@ -197,6 +199,7 @@ export const starterPassiveAbilities = {
  [Species.RAYQUAZA]: Abilities.UNNERVE,
  [Species.JIRACHI]: Abilities.COMATOSE,
  [Species.DEOXYS]: Abilities.PROTEAN,
+
  [Species.TURTWIG]: Abilities.THICK_FAT,
  [Species.CHIMCHAR]: Abilities.BEAST_BOOST,
  [Species.PIPLUP]: Abilities.DRIZZLE,
@ -218,9 +221,9 @@ export const starterPassiveAbilities = {
  [Species.GLAMEOW]: Abilities.INTIMIDATE,
  [Species.CHINGLING]: Abilities.PUNK_ROCK,
  [Species.STUNKY]: Abilities.NEUTRALIZING_GAS,
-  [Species.BRONZOR]: Abilities.BULLETPROOF,
+  [Species.BRONZOR]: Abilities.MIRROR_ARMOR,
  [Species.BONSLY]: Abilities.SAP_SIPPER,
-  [Species.MIME_JR]: Abilities.OPPORTUNIST,
+  [Species.MIME_JR]: Abilities.PRANKSTER,
  [Species.HAPPINY]: Abilities.FUR_COAT,
  [Species.CHATOT]: Abilities.PUNK_ROCK,
  [Species.SPIRITOMB]: Abilities.VESSEL_OF_RUIN,
@ -233,7 +236,7 @@ export const starterPassiveAbilities = {
  [Species.CARNIVINE]: Abilities.ARENA_TRAP,
  [Species.FINNEON]: Abilities.WATER_BUBBLE,
  [Species.MANTYKE]: Abilities.UNAWARE,
-  [Species.SNOVER]: Abilities.THICK_FAT,
+  [Species.SNOVER]: Abilities.GRASSY_SURGE,
  [Species.ROTOM]: Abilities.HADRON_ENGINE,
  [Species.UXIE]: Abilities.UNAWARE,
  [Species.MESPRIT]: Abilities.MOODY,
@ -249,6 +252,7 @@ export const starterPassiveAbilities = {
  [Species.DARKRAI]: Abilities.UNNERVE,
  [Species.SHAYMIN]: Abilities.WIND_RIDER,
  [Species.ARCEUS]: Abilities.ADAPTABILITY,
+
  [Species.VICTINI]: Abilities.SHEER_FORCE,
  [Species.SNIVY]: Abilities.MULTISCALE,
  [Species.TEPIG]: Abilities.ROCK_HEAD,
@ -264,7 +268,7 @@ export const starterPassiveAbilities = {
  [Species.BLITZLE]: Abilities.ELECTRIC_SURGE,
  [Species.ROGGENROLA]: Abilities.SOLID_ROCK,
  [Species.WOOBAT]: Abilities.OPPORTUNIST,
-  [Species.DRILBUR]: Abilities.SAND_STREAM,
+  [Species.DRILBUR]: Abilities.STURDY,
  [Species.AUDINO]: Abilities.FRIEND_GUARD,
  [Species.TIMBURR]: Abilities.ROCKY_PAYLOAD,
  [Species.TYMPOLE]: Abilities.POISON_HEAL,
@ -292,7 +296,7 @@ export const starterPassiveAbilities = {
  [Species.DUCKLETT]: Abilities.DRIZZLE,
  [Species.VANILLITE]: Abilities.SLUSH_RUSH,
  [Species.DEERLING]: Abilities.FUR_COAT,
-  [Species.EMOLGA]: Abilities.TRANSISTOR,
+  [Species.EMOLGA]: Abilities.SERENE_GRACE,
  [Species.KARRABLAST]: Abilities.QUICK_DRAW,
  [Species.FOONGUS]: Abilities.THICK_FAT,
  [Species.FRILLISH]: Abilities.POISON_HEAL,
@ -301,10 +305,10 @@ export const starterPassiveAbilities = {
  [Species.FERROSEED]: Abilities.ROUGH_SKIN,
  [Species.KLINK]: Abilities.STEELY_SPIRIT,
  [Species.TYNAMO]: Abilities.POISON_HEAL,
-  [Species.ELGYEM]: Abilities.PRISM_ARMOR,
-  [Species.LITWICK]: Abilities.SOUL_HEART,
+  [Species.ELGYEM]: Abilities.BEADS_OF_RUIN,
+  [Species.LITWICK]: Abilities.SHADOW_TAG,
  [Species.AXEW]: Abilities.DRAGONS_MAW,
-  [Species.CUBCHOO]: Abilities.TOUGH_CLAWS,
+  [Species.CUBCHOO]: Abilities.FUR_COAT,
  [Species.CRYOGONAL]: Abilities.SNOW_WARNING,
  [Species.SHELMET]: Abilities.PROTEAN,
  [Species.STUNFISK]: Abilities.STORM_DRAIN,
@ -331,6 +335,7 @@ export const starterPassiveAbilities = {
  [Species.KELDEO]: Abilities.GRIM_NEIGH,
  [Species.MELOETTA]: Abilities.MINDS_EYE,
  [Species.GENESECT]: Abilities.PROTEAN,
+
  [Species.CHESPIN]: Abilities.DAUNTLESS_SHIELD,
  [Species.FENNEKIN]: Abilities.PSYCHIC_SURGE,
  [Species.FROAKIE]: Abilities.STAKEOUT,
@ -345,11 +350,11 @@ export const starterPassiveAbilities = {
  [Species.ESPURR]: Abilities.FUR_COAT,
  [Species.HONEDGE]: Abilities.SHARPNESS,
  [Species.SPRITZEE]: Abilities.FUR_COAT,
-  [Species.SWIRLIX]: Abilities.WELL_BAKED_BODY,
+  [Species.SWIRLIX]: Abilities.RIPEN,
  [Species.INKAY]: Abilities.UNNERVE,
  [Species.BINACLE]: Abilities.SAP_SIPPER,
  [Species.SKRELP]: Abilities.DRAGONS_MAW,
-  [Species.CLAUNCHER]: Abilities.SWIFT_SWIM,
+  [Species.CLAUNCHER]: Abilities.PROTEAN,
  [Species.HELIOPTILE]: Abilities.PROTEAN,
  [Species.TYRUNT]: Abilities.RECKLESS,
  [Species.AMAURA]: Abilities.ICE_SCALES,
@ -364,10 +369,12 @@ export const starterPassiveAbilities = {
  [Species.NOIBAT]: Abilities.PUNK_ROCK,
  [Species.XERNEAS]: Abilities.HARVEST,
  [Species.YVELTAL]: Abilities.SOUL_HEART,
-  [Species.ZYGARDE]: Abilities.HUGE_POWER,
-  [Species.DIANCIE]: Abilities.LEVITATE,
+  [Species.ZYGARDE]: Abilities.ADAPTABILITY,
+  [Species.DIANCIE]: Abilities.PRISM_ARMOR,
  [Species.HOOPA]: Abilities.OPPORTUNIST,
  [Species.VOLCANION]: Abilities.FILTER,
+  [Species.ETERNAL_FLOETTE]: Abilities.MAGIC_GUARD,
+
  [Species.ROWLET]: Abilities.SNIPER,
  [Species.LITTEN]: Abilities.OPPORTUNIST,
  [Species.POPPLIO]: Abilities.PUNK_ROCK,
@ -403,7 +410,7 @@ export const starterPassiveAbilities = {
  [Species.DRAMPA]: Abilities.THICK_FAT,
  [Species.DHELMISE]: Abilities.WATER_BUBBLE,
  [Species.JANGMO_O]: Abilities.DAUNTLESS_SHIELD,
-  [Species.TAPU_KOKO]: Abilities.TRANSISTOR,
+  [Species.TAPU_KOKO]: Abilities.DAUNTLESS_SHIELD,
  [Species.TAPU_LELE]: Abilities.SHEER_FORCE,
  [Species.TAPU_BULU]: Abilities.TRIAGE,
  [Species.TAPU_FINI]: Abilities.FAIRY_AURA,
@ -413,16 +420,24 @@ export const starterPassiveAbilities = {
  [Species.PHEROMOSA]: Abilities.TINTED_LENS,
  [Species.XURKITREE]: Abilities.TRANSISTOR,
  [Species.CELESTEELA]: Abilities.HEATPROOF,
-  [Species.KARTANA]: Abilities.SHARPNESS,
+  [Species.KARTANA]: Abilities.LONG_REACH,
  [Species.GUZZLORD]: Abilities.POISON_HEAL,
  [Species.NECROZMA]: Abilities.BEAST_BOOST,
  [Species.MAGEARNA]: Abilities.STEELY_SPIRIT,
  [Species.MARSHADOW]: Abilities.IRON_FIST,
-  [Species.POIPOLE]: Abilities.SHEER_FORCE,
+  [Species.POIPOLE]: Abilities.LEVITATE,
  [Species.STAKATAKA]: Abilities.SOLID_ROCK,
  [Species.BLACEPHALON]: Abilities.MAGIC_GUARD,
  [Species.ZERAORA]: Abilities.TOUGH_CLAWS,
-  [Species.MELTAN]: Abilities.STEELY_SPIRIT,
+  [Species.MELTAN]: Abilities.HEATPROOF,
+  [Species.ALOLA_RATTATA]: Abilities.ADAPTABILITY,
+  [Species.ALOLA_SANDSHREW]: Abilities.ICE_SCALES,
+  [Species.ALOLA_VULPIX]: Abilities.SHEER_FORCE,
+  [Species.ALOLA_DIGLETT]: Abilities.STURDY,
+  [Species.ALOLA_MEOWTH]: Abilities.DARK_AURA,
+  [Species.ALOLA_GEODUDE]: Abilities.DRY_SKIN,
+  [Species.ALOLA_GRIMER]: Abilities.TOXIC_DEBRIS,
+
  [Species.GROOKEY]: Abilities.GRASS_PELT,
  [Species.SCORBUNNY]: Abilities.NO_GUARD,
  [Species.SOBBLE]: Abilities.SUPER_LUCK,
@ -431,7 +446,7 @@ export const starterPassiveAbilities = {
  [Species.BLIPBUG]: Abilities.PSYCHIC_SURGE,
  [Species.NICKIT]: Abilities.MAGICIAN,
  [Species.GOSSIFLEUR]: Abilities.GRASSY_SURGE,
-  [Species.WOOLOO]: Abilities.SIMPLE,
+  [Species.WOOLOO]: Abilities.SCRAPPY,
  [Species.CHEWTLE]: Abilities.ROCKY_PAYLOAD,
  [Species.YAMPER]: Abilities.SHEER_FORCE,
  [Species.ROLYCOLY]: Abilities.SOLID_ROCK,
@ -444,7 +459,7 @@ export const starterPassiveAbilities = {
  [Species.CLOBBOPUS]: Abilities.WATER_BUBBLE,
  [Species.SINISTEA]: Abilities.SHADOW_SHIELD,
  [Species.HATENNA]: Abilities.FAIRY_AURA,
-  [Species.IMPIDIMP]: Abilities.FUR_COAT,
+  [Species.IMPIDIMP]: Abilities.INTIMIDATE,
  [Species.MILCERY]: Abilities.REGENERATOR,
  [Species.FALINKS]: Abilities.PARENTAL_BOND,
  [Species.PINCURCHIN]: Abilities.ELECTROMORPHOSIS,
@ -455,7 +470,7 @@ export const starterPassiveAbilities = {
  [Species.MORPEKO]: Abilities.MOODY,
  [Species.CUFANT]: Abilities.EARTH_EATER,
  [Species.DRACOZOLT]: Abilities.NO_GUARD,
-  [Species.ARCTOZOLT]: Abilities.TRANSISTOR,
+  [Species.ARCTOZOLT]: Abilities.WATER_ABSORB,
  [Species.DRACOVISH]: Abilities.SWIFT_SWIM,
  [Species.ARCTOVISH]: Abilities.STRONG_JAW,
  [Species.DURALUDON]: Abilities.STEELWORKER,
@ -471,6 +486,24 @@ export const starterPassiveAbilities = {
  [Species.SPECTRIER]: Abilities.SHADOW_SHIELD,
  [Species.CALYREX]: Abilities.HARVEST,
  [Species.ENAMORUS]: Abilities.FAIRY_AURA,
+  [Species.GALAR_MEOWTH]: Abilities.UNBURDEN,
+  [Species.GALAR_PONYTA]: Abilities.CHILLING_NEIGH,
+  [Species.GALAR_SLOWPOKE]: Abilities.UNAWARE,
+  [Species.GALAR_FARFETCHD]: Abilities.INTREPID_SWORD,
+  [Species.GALAR_ARTICUNO]: Abilities.SERENE_GRACE,
+  [Species.GALAR_ZAPDOS]: Abilities.TOUGH_CLAWS,
+  [Species.GALAR_MOLTRES]: Abilities.DARK_AURA,
+  [Species.GALAR_CORSOLA]: Abilities.SHADOW_SHIELD,
+  [Species.GALAR_ZIGZAGOON]: Abilities.POISON_HEAL,
+  [Species.GALAR_DARUMAKA]: Abilities.FLASH_FIRE,
+  [Species.GALAR_YAMASK]: Abilities.TABLETS_OF_RUIN,
+  [Species.GALAR_STUNFISK]: Abilities.ARENA_TRAP,
+  [Species.HISUI_GROWLITHE]: Abilities.RECKLESS,
+  [Species.HISUI_VOLTORB]: Abilities.TRANSISTOR,
+  [Species.HISUI_QWILFISH]: Abilities.MERCILESS,
+  [Species.HISUI_SNEASEL]: Abilities.SCRAPPY,
+  [Species.HISUI_ZORUA]: Abilities.ADAPTABILITY,
+
  [Species.SPRIGATITO]: Abilities.MAGICIAN,
  [Species.FUECOCO]: Abilities.PUNK_ROCK,
  [Species.QUAXLY]: Abilities.OPPORTUNIST,
@ -502,40 +535,40 @@ export const starterPassiveAbilities = {
  [Species.CYCLIZAR]: Abilities.PROTEAN,
  [Species.ORTHWORM]: Abilities.REGENERATOR,
  [Species.GLIMMET]: Abilities.LEVITATE,
-  [Species.GREAVARD]: Abilities.FUR_COAT,
+  [Species.GREAVARD]: Abilities.UNAWARE,
  [Species.FLAMIGO]: Abilities.MOXIE,
-  [Species.CETODDLE]: Abilities.ICE_SCALES,
+  [Species.CETODDLE]: Abilities.REFRIGERATE,
  [Species.VELUZA]: Abilities.SUPER_LUCK,
-  [Species.DONDOZO]: Abilities.PARENTAL_BOND,
-  [Species.TATSUGIRI]: Abilities.ADAPTABILITY,
+  [Species.DONDOZO]: Abilities.DRAGONS_MAW,
+  [Species.TATSUGIRI]: Abilities.FLUFFY,
  [Species.GREAT_TUSK]: Abilities.INTIMIDATE,
  [Species.SCREAM_TAIL]: Abilities.UNAWARE,
  [Species.BRUTE_BONNET]: Abilities.CHLOROPHYLL,
  [Species.FLUTTER_MANE]: Abilities.DAZZLING,
  [Species.SLITHER_WING]: Abilities.SCRAPPY,
-  [Species.SANDY_SHOCKS]: Abilities.EARTH_EATER,
+  [Species.SANDY_SHOCKS]: Abilities.ELECTRIC_SURGE,
  [Species.IRON_TREADS]: Abilities.STEELY_SPIRIT,
  [Species.IRON_BUNDLE]: Abilities.SNOW_WARNING,
  [Species.IRON_HANDS]: Abilities.IRON_FIST,
  [Species.IRON_JUGULIS]: Abilities.LIGHTNING_ROD,
  [Species.IRON_MOTH]: Abilities.LEVITATE,
  [Species.IRON_THORNS]: Abilities.SAND_STREAM,
-  [Species.FRIGIBAX]: Abilities.SNOW_WARNING,
+  [Species.FRIGIBAX]: Abilities.INTIMIDATE,
  [Species.GIMMIGHOUL]: Abilities.HONEY_GATHER,
  [Species.WO_CHIEN]: Abilities.VESSEL_OF_RUIN,
  [Species.CHIEN_PAO]: Abilities.INTIMIDATE,
  [Species.TING_LU]: Abilities.STAMINA,
  [Species.CHI_YU]: Abilities.BERSERK,
  [Species.ROARING_MOON]: Abilities.TOUGH_CLAWS,
-  [Species.IRON_VALIANT]: Abilities.ADAPTABILITY,
+  [Species.IRON_VALIANT]: Abilities.NEUROFORCE,
  [Species.KORAIDON]: Abilities.OPPORTUNIST,
  [Species.MIRAIDON]: Abilities.OPPORTUNIST,
  [Species.WALKING_WAKE]: Abilities.BEAST_BOOST,
  [Species.IRON_LEAVES]: Abilities.SHARPNESS,
  [Species.POLTCHAGEIST]: Abilities.TRIAGE,
-  [Species.OKIDOGI]: Abilities.FUR_COAT,
-  [Species.MUNKIDORI]: Abilities.NEUROFORCE,
-  [Species.FEZANDIPITI]: Abilities.LEVITATE,
+  [Species.OKIDOGI]: Abilities.DARK_AURA,
+  [Species.MUNKIDORI]: Abilities.MAGICIAN,
+  [Species.FEZANDIPITI]: Abilities.PIXILATE,
  [Species.OGERPON]: Abilities.OPPORTUNIST,
  [Species.GOUGING_FIRE]: Abilities.BEAST_BOOST,
  [Species.RAGING_BOLT]: Abilities.BEAST_BOOST,
@ -543,31 +576,6 @@ export const starterPassiveAbilities = {
  [Species.IRON_CROWN]: Abilities.SHARPNESS,
  [Species.TERAPAGOS]: Abilities.SOUL_HEART,
  [Species.PECHARUNT]: Abilities.TOXIC_CHAIN,
-  [Species.ALOLA_RATTATA]: Abilities.ADAPTABILITY,
-  [Species.ALOLA_SANDSHREW]: Abilities.ICE_SCALES,
-  [Species.ALOLA_VULPIX]: Abilities.SHEER_FORCE,
-  [Species.ALOLA_DIGLETT]: Abilities.STURDY,
-  [Species.ALOLA_MEOWTH]: Abilities.DARK_AURA,
-  [Species.ALOLA_GEODUDE]: Abilities.DRY_SKIN,
-  [Species.ALOLA_GRIMER]: Abilities.TOXIC_DEBRIS,
-  [Species.ETERNAL_FLOETTE]: Abilities.MAGIC_GUARD,
-  [Species.GALAR_MEOWTH]: Abilities.STEELWORKER,
-  [Species.GALAR_PONYTA]: Abilities.MOXIE,
-  [Species.GALAR_SLOWPOKE]: Abilities.UNAWARE,
-  [Species.GALAR_FARFETCHD]: Abilities.INTREPID_SWORD,
-  [Species.GALAR_ARTICUNO]: Abilities.SERENE_GRACE,
-  [Species.GALAR_ZAPDOS]: Abilities.TOUGH_CLAWS,
-  [Species.GALAR_MOLTRES]: Abilities.DARK_AURA,
-  [Species.GALAR_CORSOLA]: Abilities.SHADOW_SHIELD,
-  [Species.GALAR_ZIGZAGOON]: Abilities.POISON_HEAL,
-  [Species.GALAR_DARUMAKA]: Abilities.FLASH_FIRE,
-  [Species.GALAR_YAMASK]: Abilities.TABLETS_OF_RUIN,
-  [Species.GALAR_STUNFISK]: Abilities.ARENA_TRAP,
-  [Species.HISUI_GROWLITHE]: Abilities.RECKLESS,
-  [Species.HISUI_VOLTORB]: Abilities.TRANSISTOR,
-  [Species.HISUI_QWILFISH]: Abilities.MERCILESS,
-  [Species.HISUI_SNEASEL]: Abilities.SCRAPPY,
-  [Species.HISUI_ZORUA]: Abilities.ADAPTABILITY,
  [Species.PALDEA_TAUROS]: Abilities.ADAPTABILITY,
  [Species.PALDEA_WOOPER]: Abilities.THICK_FAT,
  [Species.BLOODMOON_URSALUNA]: Abilities.BERSERK
--- a/src/data/balance/pokemon-level-moves.ts
+++ b/src/data/balance/pokemon-level-moves.ts
@ -19464,7 +19464,6 @@ export const pokemonFormLevelMoves: PokemonSpeciesFormLevelMoves = {
  },
  [Species.GRENINJA]: {
    1: [
-      [ EVOLVE_MOVE, Moves.WATER_SHURIKEN ],
      [ EVOLVE_MOVE, Moves.WATER_SHURIKEN ],
      [ 1, Moves.POUND ],
      [ 1, Moves.GROWL ],
@ -19475,6 +19474,7 @@ export const pokemonFormLevelMoves: PokemonSpeciesFormLevelMoves = {
      [ 1, Moves.SMACK_DOWN ], // Previous Stage Move
      [ 1, Moves.BOUNCE ], // Previous Stage Move
      [ 1, Moves.HAZE ],
+      [ 1, Moves.MAT_BLOCK ],
      [ 1, Moves.ROLE_PLAY ],
      [ 1, Moves.NIGHT_SLASH ],
      [ 10, Moves.LICK ],
--- a/src/data/balance/species-egg-tiers.ts
+++ b/src/data/balance/species-egg-tiers.ts
@ -14,13 +14,10 @@ export const speciesEggTiers = {
  [Species.RATTATA]: EggTier.COMMON,
  [Species.SPEAROW]: EggTier.COMMON,
  [Species.EKANS]: EggTier.COMMON,
-  [Species.PIKACHU]: EggTier.COMMON,
  [Species.SANDSHREW]: EggTier.COMMON,
  [Species.NIDORAN_F]: EggTier.COMMON,
  [Species.NIDORAN_M]: EggTier.COMMON,
-  [Species.CLEFAIRY]: EggTier.COMMON,
  [Species.VULPIX]: EggTier.COMMON,
-  [Species.JIGGLYPUFF]: EggTier.COMMON,
  [Species.ZUBAT]: EggTier.COMMON,
  [Species.ODDISH]: EggTier.COMMON,
  [Species.PARAS]: EggTier.COMMON,
@ -39,7 +36,7 @@ export const speciesEggTiers = {
  [Species.PONYTA]: EggTier.COMMON,
  [Species.SLOWPOKE]: EggTier.COMMON,
  [Species.MAGNEMITE]: EggTier.RARE,
-  [Species.FARFETCHD]: EggTier.COMMON,
+  [Species.FARFETCHD]: EggTier.RARE,
  [Species.DODUO]: EggTier.COMMON,
  [Species.SEEL]: EggTier.COMMON,
  [Species.GRIMER]: EggTier.COMMON,
@ -51,33 +48,25 @@ export const speciesEggTiers = {
  [Species.VOLTORB]: EggTier.COMMON,
  [Species.EXEGGCUTE]: EggTier.COMMON,
  [Species.CUBONE]: EggTier.COMMON,
-  [Species.HITMONLEE]: EggTier.RARE,
-  [Species.HITMONCHAN]: EggTier.RARE,
-  [Species.LICKITUNG]: EggTier.COMMON,
+  [Species.LICKITUNG]: EggTier.RARE,
  [Species.KOFFING]: EggTier.COMMON,
-  [Species.RHYHORN]: EggTier.COMMON,
-  [Species.CHANSEY]: EggTier.COMMON,
+  [Species.RHYHORN]: EggTier.RARE,
  [Species.TANGELA]: EggTier.COMMON,
  [Species.KANGASKHAN]: EggTier.RARE,
  [Species.HORSEA]: EggTier.COMMON,
  [Species.GOLDEEN]: EggTier.COMMON,
  [Species.STARYU]: EggTier.COMMON,
-  [Species.MR_MIME]: EggTier.COMMON,
  [Species.SCYTHER]: EggTier.RARE,
-  [Species.JYNX]: EggTier.RARE,
-  [Species.ELECTABUZZ]: EggTier.RARE,
-  [Species.MAGMAR]: EggTier.RARE,
  [Species.PINSIR]: EggTier.RARE,
  [Species.TAUROS]: EggTier.RARE,
-  [Species.MAGIKARP]: EggTier.RARE,
+  [Species.MAGIKARP]: EggTier.COMMON,
  [Species.LAPRAS]: EggTier.RARE,
  [Species.DITTO]: EggTier.COMMON,
  [Species.EEVEE]: EggTier.COMMON,
  [Species.PORYGON]: EggTier.RARE,
-  [Species.OMANYTE]: EggTier.COMMON,
-  [Species.KABUTO]: EggTier.COMMON,
+  [Species.OMANYTE]: EggTier.RARE,
+  [Species.KABUTO]: EggTier.RARE,
  [Species.AERODACTYL]: EggTier.RARE,
-  [Species.SNORLAX]: EggTier.RARE,
  [Species.ARTICUNO]: EggTier.EPIC,
  [Species.ZAPDOS]: EggTier.EPIC,
  [Species.MOLTRES]: EggTier.EPIC,
@ -93,14 +82,12 @@ export const speciesEggTiers = {
  [Species.LEDYBA]: EggTier.COMMON,
  [Species.SPINARAK]: EggTier.COMMON,
  [Species.CHINCHOU]: EggTier.COMMON,
-  [Species.PICHU]: EggTier.COMMON,
+  [Species.PICHU]: EggTier.RARE,
  [Species.CLEFFA]: EggTier.COMMON,
  [Species.IGGLYBUFF]: EggTier.COMMON,
  [Species.TOGEPI]: EggTier.COMMON,
  [Species.NATU]: EggTier.COMMON,
  [Species.MAREEP]: EggTier.COMMON,
-  [Species.MARILL]: EggTier.RARE,
-  [Species.SUDOWOODO]: EggTier.COMMON,
  [Species.HOPPIP]: EggTier.COMMON,
  [Species.AIPOM]: EggTier.COMMON,
  [Species.SUNKERN]: EggTier.COMMON,
@ -109,7 +96,6 @@ export const speciesEggTiers = {
  [Species.MURKROW]: EggTier.COMMON,
  [Species.MISDREAVUS]: EggTier.COMMON,
  [Species.UNOWN]: EggTier.COMMON,
-  [Species.WOBBUFFET]: EggTier.COMMON,
  [Species.GIRAFARIG]: EggTier.COMMON,
  [Species.PINECO]: EggTier.COMMON,
  [Species.DUNSPARCE]: EggTier.COMMON,
@ -125,7 +111,6 @@ export const speciesEggTiers = {
  [Species.CORSOLA]: EggTier.COMMON,
  [Species.REMORAID]: EggTier.COMMON,
  [Species.DELIBIRD]: EggTier.COMMON,
-  [Species.MANTINE]: EggTier.COMMON,
  [Species.SKARMORY]: EggTier.RARE,
  [Species.HOUNDOUR]: EggTier.COMMON,
  [Species.PHANPY]: EggTier.COMMON,
@ -145,7 +130,7 @@ export const speciesEggTiers = {
  [Species.CELEBI]: EggTier.EPIC,

  [Species.TREECKO]: EggTier.COMMON,
-  [Species.TORCHIC]: EggTier.RARE,
+  [Species.TORCHIC]: EggTier.COMMON,
  [Species.MUDKIP]: EggTier.COMMON,
  [Species.POOCHYENA]: EggTier.COMMON,
  [Species.ZIGZAGOON]: EggTier.COMMON,
@ -154,14 +139,14 @@ export const speciesEggTiers = {
  [Species.SEEDOT]: EggTier.COMMON,
  [Species.TAILLOW]: EggTier.COMMON,
  [Species.WINGULL]: EggTier.COMMON,
-  [Species.RALTS]: EggTier.COMMON,
+  [Species.RALTS]: EggTier.RARE,
  [Species.SURSKIT]: EggTier.COMMON,
  [Species.SHROOMISH]: EggTier.COMMON,
  [Species.SLAKOTH]: EggTier.RARE,
  [Species.NINCADA]: EggTier.RARE,
  [Species.WHISMUR]: EggTier.COMMON,
  [Species.MAKUHITA]: EggTier.COMMON,
-  [Species.AZURILL]: EggTier.RARE,
+  [Species.AZURILL]: EggTier.COMMON,
  [Species.NOSEPASS]: EggTier.COMMON,
  [Species.SKITTY]: EggTier.COMMON,
  [Species.SABLEYE]: EggTier.COMMON,
@ -173,7 +158,6 @@ export const speciesEggTiers = {
  [Species.MINUN]: EggTier.COMMON,
  [Species.VOLBEAT]: EggTier.COMMON,
  [Species.ILLUMISE]: EggTier.COMMON,
-  [Species.ROSELIA]: EggTier.COMMON,
  [Species.GULPIN]: EggTier.COMMON,
  [Species.CARVANHA]: EggTier.COMMON,
  [Species.WAILMER]: EggTier.COMMON,
@ -191,21 +175,20 @@ export const speciesEggTiers = {
  [Species.BARBOACH]: EggTier.COMMON,
  [Species.CORPHISH]: EggTier.COMMON,
  [Species.BALTOY]: EggTier.COMMON,
-  [Species.LILEEP]: EggTier.COMMON,
-  [Species.ANORITH]: EggTier.COMMON,
+  [Species.LILEEP]: EggTier.RARE,
+  [Species.ANORITH]: EggTier.RARE,
  [Species.FEEBAS]: EggTier.RARE,
  [Species.CASTFORM]: EggTier.COMMON,
  [Species.KECLEON]: EggTier.COMMON,
  [Species.SHUPPET]: EggTier.COMMON,
  [Species.DUSKULL]: EggTier.COMMON,
  [Species.TROPIUS]: EggTier.COMMON,
-  [Species.CHIMECHO]: EggTier.COMMON,
  [Species.ABSOL]: EggTier.RARE,
  [Species.WYNAUT]: EggTier.COMMON,
  [Species.SNORUNT]: EggTier.COMMON,
  [Species.SPHEAL]: EggTier.COMMON,
  [Species.CLAMPERL]: EggTier.COMMON,
-  [Species.RELICANTH]: EggTier.COMMON,
+  [Species.RELICANTH]: EggTier.RARE,
  [Species.LUVDISC]: EggTier.COMMON,
  [Species.BAGON]: EggTier.RARE,
  [Species.BELDUM]: EggTier.RARE,
@ -228,8 +211,8 @@ export const speciesEggTiers = {
  [Species.KRICKETOT]: EggTier.COMMON,
  [Species.SHINX]: EggTier.COMMON,
  [Species.BUDEW]: EggTier.COMMON,
-  [Species.CRANIDOS]: EggTier.COMMON,
-  [Species.SHIELDON]: EggTier.COMMON,
+  [Species.CRANIDOS]: EggTier.RARE,
+  [Species.SHIELDON]: EggTier.RARE,
  [Species.BURMY]: EggTier.COMMON,
  [Species.COMBEE]: EggTier.COMMON,
  [Species.PACHIRISU]: EggTier.COMMON,
@ -244,12 +227,12 @@ export const speciesEggTiers = {
  [Species.BRONZOR]: EggTier.COMMON,
  [Species.BONSLY]: EggTier.COMMON,
  [Species.MIME_JR]: EggTier.COMMON,
-  [Species.HAPPINY]: EggTier.COMMON,
+  [Species.HAPPINY]: EggTier.RARE,
  [Species.CHATOT]: EggTier.COMMON,
  [Species.SPIRITOMB]: EggTier.RARE,
  [Species.GIBLE]: EggTier.RARE,
  [Species.MUNCHLAX]: EggTier.RARE,
-  [Species.RIOLU]: EggTier.COMMON,
+  [Species.RIOLU]: EggTier.RARE,
  [Species.HIPPOPOTAS]: EggTier.COMMON,
  [Species.SKORUPI]: EggTier.COMMON,
  [Species.CROAGUNK]: EggTier.COMMON,
@ -264,10 +247,10 @@ export const speciesEggTiers = {
  [Species.DIALGA]: EggTier.LEGENDARY,
  [Species.PALKIA]: EggTier.LEGENDARY,
  [Species.HEATRAN]: EggTier.EPIC,
-  [Species.REGIGIGAS]: EggTier.EPIC,
+  [Species.REGIGIGAS]: EggTier.LEGENDARY,
  [Species.GIRATINA]: EggTier.LEGENDARY,
  [Species.CRESSELIA]: EggTier.EPIC,
-  [Species.PHIONE]: EggTier.RARE,
+  [Species.PHIONE]: EggTier.EPIC,
  [Species.MANAPHY]: EggTier.EPIC,
  [Species.DARKRAI]: EggTier.EPIC,
  [Species.SHAYMIN]: EggTier.EPIC,
@ -289,7 +272,7 @@ export const speciesEggTiers = {
  [Species.ROGGENROLA]: EggTier.COMMON,
  [Species.WOOBAT]: EggTier.COMMON,
  [Species.DRILBUR]: EggTier.RARE,
-  [Species.AUDINO]: EggTier.COMMON,
+  [Species.AUDINO]: EggTier.RARE,
  [Species.TIMBURR]: EggTier.RARE,
  [Species.TYMPOLE]: EggTier.COMMON,
  [Species.THROH]: EggTier.RARE,
@ -306,8 +289,8 @@ export const speciesEggTiers = {
  [Species.SCRAGGY]: EggTier.COMMON,
  [Species.SIGILYPH]: EggTier.RARE,
  [Species.YAMASK]: EggTier.COMMON,
-  [Species.TIRTOUGA]: EggTier.COMMON,
-  [Species.ARCHEN]: EggTier.COMMON,
+  [Species.TIRTOUGA]: EggTier.RARE,
+  [Species.ARCHEN]: EggTier.RARE,
  [Species.TRUBBISH]: EggTier.COMMON,
  [Species.ZORUA]: EggTier.COMMON,
  [Species.MINCCINO]: EggTier.COMMON,
@ -339,7 +322,7 @@ export const speciesEggTiers = {
  [Species.BOUFFALANT]: EggTier.RARE,
  [Species.RUFFLET]: EggTier.COMMON,
  [Species.VULLABY]: EggTier.COMMON,
-  [Species.HEATMOR]: EggTier.COMMON,
+  [Species.HEATMOR]: EggTier.RARE,
  [Species.DURANT]: EggTier.RARE,
  [Species.DEINO]: EggTier.RARE,
  [Species.LARVESTA]: EggTier.RARE,
@ -358,7 +341,7 @@ export const speciesEggTiers = {

  [Species.CHESPIN]: EggTier.COMMON,
  [Species.FENNEKIN]: EggTier.COMMON,
-  [Species.FROAKIE]: EggTier.RARE,
+  [Species.FROAKIE]: EggTier.COMMON,
  [Species.BUNNELBY]: EggTier.COMMON,
  [Species.FLETCHLING]: EggTier.COMMON,
  [Species.SCATTERBUG]: EggTier.COMMON,
@ -376,8 +359,8 @@ export const speciesEggTiers = {
  [Species.SKRELP]: EggTier.COMMON,
  [Species.CLAUNCHER]: EggTier.COMMON,
  [Species.HELIOPTILE]: EggTier.COMMON,
-  [Species.TYRUNT]: EggTier.COMMON,
-  [Species.AMAURA]: EggTier.COMMON,
+  [Species.TYRUNT]: EggTier.RARE,
+  [Species.AMAURA]: EggTier.RARE,
  [Species.HAWLUCHA]: EggTier.RARE,
  [Species.DEDENNE]: EggTier.COMMON,
  [Species.CARBINK]: EggTier.COMMON,
@ -386,18 +369,18 @@ export const speciesEggTiers = {
  [Species.PHANTUMP]: EggTier.COMMON,
  [Species.PUMPKABOO]: EggTier.COMMON,
  [Species.BERGMITE]: EggTier.COMMON,
-  [Species.NOIBAT]: EggTier.COMMON,
+  [Species.NOIBAT]: EggTier.RARE,
  [Species.XERNEAS]: EggTier.LEGENDARY,
  [Species.YVELTAL]: EggTier.LEGENDARY,
  [Species.ZYGARDE]: EggTier.LEGENDARY,
  [Species.DIANCIE]: EggTier.EPIC,
  [Species.HOOPA]: EggTier.EPIC,
  [Species.VOLCANION]: EggTier.EPIC,
-  [Species.ETERNAL_FLOETTE]: EggTier.RARE,
+  [Species.ETERNAL_FLOETTE]: EggTier.EPIC,

  [Species.ROWLET]: EggTier.COMMON,
  [Species.LITTEN]: EggTier.COMMON,
-  [Species.POPPLIO]: EggTier.RARE,
+  [Species.POPPLIO]: EggTier.COMMON,
  [Species.PIKIPEK]: EggTier.COMMON,
  [Species.YUNGOOS]: EggTier.COMMON,
  [Species.GRUBBIN]: EggTier.COMMON,
@ -420,7 +403,7 @@ export const speciesEggTiers = {
  [Species.WIMPOD]: EggTier.COMMON,
  [Species.SANDYGAST]: EggTier.COMMON,
  [Species.PYUKUMUKU]: EggTier.COMMON,
-  [Species.TYPE_NULL]: EggTier.RARE,
+  [Species.TYPE_NULL]: EggTier.EPIC,
  [Species.MINIOR]: EggTier.RARE,
  [Species.KOMALA]: EggTier.COMMON,
  [Species.TURTONATOR]: EggTier.RARE,
@ -434,7 +417,7 @@ export const speciesEggTiers = {
  [Species.TAPU_LELE]: EggTier.EPIC,
  [Species.TAPU_BULU]: EggTier.EPIC,
  [Species.TAPU_FINI]: EggTier.EPIC,
-  [Species.COSMOG]: EggTier.EPIC,
+  [Species.COSMOG]: EggTier.LEGENDARY,
  [Species.NIHILEGO]: EggTier.EPIC,
  [Species.BUZZWOLE]: EggTier.EPIC,
  [Species.PHEROMOSA]: EggTier.EPIC,
@ -451,15 +434,15 @@ export const speciesEggTiers = {
  [Species.ZERAORA]: EggTier.EPIC,
  [Species.MELTAN]: EggTier.EPIC,
  [Species.ALOLA_RATTATA]: EggTier.COMMON,
-  [Species.ALOLA_SANDSHREW]: EggTier.COMMON,
-  [Species.ALOLA_VULPIX]: EggTier.COMMON,
-  [Species.ALOLA_DIGLETT]: EggTier.COMMON,
-  [Species.ALOLA_MEOWTH]: EggTier.COMMON,
-  [Species.ALOLA_GEODUDE]: EggTier.COMMON,
-  [Species.ALOLA_GRIMER]: EggTier.COMMON,
+  [Species.ALOLA_SANDSHREW]: EggTier.RARE,
+  [Species.ALOLA_VULPIX]: EggTier.RARE,
+  [Species.ALOLA_DIGLETT]: EggTier.RARE,
+  [Species.ALOLA_MEOWTH]: EggTier.RARE,
+  [Species.ALOLA_GEODUDE]: EggTier.RARE,
+  [Species.ALOLA_GRIMER]: EggTier.RARE,

  [Species.GROOKEY]: EggTier.COMMON,
-  [Species.SCORBUNNY]: EggTier.RARE,
+  [Species.SCORBUNNY]: EggTier.COMMON,
  [Species.SOBBLE]: EggTier.COMMON,
  [Species.SKWOVET]: EggTier.COMMON,
  [Species.ROOKIDEE]: EggTier.COMMON,
@ -505,29 +488,28 @@ export const speciesEggTiers = {
  [Species.GLASTRIER]: EggTier.EPIC,
  [Species.SPECTRIER]: EggTier.EPIC,
  [Species.CALYREX]: EggTier.LEGENDARY,
-  [Species.GALAR_MEOWTH]: EggTier.COMMON,
-  [Species.GALAR_PONYTA]: EggTier.COMMON,
-  [Species.GALAR_SLOWPOKE]: EggTier.COMMON,
-  [Species.GALAR_FARFETCHD]: EggTier.COMMON,
-  [Species.GALAR_CORSOLA]: EggTier.COMMON,
-  [Species.GALAR_ZIGZAGOON]: EggTier.COMMON,
-  [Species.GALAR_DARUMAKA]: EggTier.RARE,
-  [Species.GALAR_YAMASK]: EggTier.COMMON,
-  [Species.GALAR_STUNFISK]: EggTier.COMMON,
-  [Species.GALAR_MR_MIME]: EggTier.COMMON,
+  [Species.ENAMORUS]: EggTier.EPIC,
+  [Species.GALAR_MEOWTH]: EggTier.RARE,
+  [Species.GALAR_PONYTA]: EggTier.RARE,
+  [Species.GALAR_SLOWPOKE]: EggTier.RARE,
+  [Species.GALAR_FARFETCHD]: EggTier.RARE,
  [Species.GALAR_ARTICUNO]: EggTier.EPIC,
  [Species.GALAR_ZAPDOS]: EggTier.EPIC,
  [Species.GALAR_MOLTRES]: EggTier.EPIC,
+  [Species.GALAR_CORSOLA]: EggTier.RARE,
+  [Species.GALAR_ZIGZAGOON]: EggTier.RARE,
+  [Species.GALAR_DARUMAKA]: EggTier.RARE,
+  [Species.GALAR_YAMASK]: EggTier.RARE,
+  [Species.GALAR_STUNFISK]: EggTier.RARE,
  [Species.HISUI_GROWLITHE]: EggTier.RARE,
-  [Species.HISUI_VOLTORB]: EggTier.COMMON,
+  [Species.HISUI_VOLTORB]: EggTier.RARE,
  [Species.HISUI_QWILFISH]: EggTier.RARE,
  [Species.HISUI_SNEASEL]: EggTier.RARE,
-  [Species.HISUI_ZORUA]: EggTier.COMMON,
-  [Species.ENAMORUS]: EggTier.EPIC,
+  [Species.HISUI_ZORUA]: EggTier.RARE,

-  [Species.SPRIGATITO]: EggTier.RARE,
-  [Species.FUECOCO]: EggTier.RARE,
-  [Species.QUAXLY]: EggTier.RARE,
+  [Species.SPRIGATITO]: EggTier.COMMON,
+  [Species.FUECOCO]: EggTier.COMMON,
+  [Species.QUAXLY]: EggTier.COMMON,
  [Species.LECHONK]: EggTier.COMMON,
  [Species.TAROUNTULA]: EggTier.COMMON,
  [Species.NYMBLE]: EggTier.COMMON,
@ -551,7 +533,7 @@ export const speciesEggTiers = {
  [Species.TINKATINK]: EggTier.RARE,
  [Species.WIGLETT]: EggTier.COMMON,
  [Species.BOMBIRDIER]: EggTier.COMMON,
-  [Species.FINIZEN]: EggTier.COMMON,
+  [Species.FINIZEN]: EggTier.RARE,
  [Species.VAROOM]: EggTier.RARE,
  [Species.CYCLIZAR]: EggTier.RARE,
  [Species.ORTHWORM]: EggTier.RARE,
@ -598,6 +580,6 @@ export const speciesEggTiers = {
  [Species.TERAPAGOS]: EggTier.LEGENDARY,
  [Species.PECHARUNT]: EggTier.EPIC,
  [Species.PALDEA_TAUROS]: EggTier.RARE,
-  [Species.PALDEA_WOOPER]: EggTier.COMMON,
-  [Species.BLOODMOON_URSALUNA]: EggTier.EPIC,
+  [Species.PALDEA_WOOPER]: EggTier.RARE,
+  [Species.BLOODMOON_URSALUNA]: EggTier.EPIC
 };
--- a/src/data/balance/starters.ts
+++ b/src/data/balance/starters.ts
@ -4,7 +4,7 @@ export const POKERUS_STARTER_COUNT = 5;

 // #region Friendship constants
 export const CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER = 3;
-export const FRIENDSHIP_GAIN_FROM_BATTLE = 3;
+export const FRIENDSHIP_GAIN_FROM_BATTLE = 4;
 export const FRIENDSHIP_GAIN_FROM_RARE_CANDY = 6;
 export const FRIENDSHIP_LOSS_FROM_FAINT = 5;

@ -47,7 +47,7 @@ export const speciesStarterCosts = {
  [Species.RATTATA]: 1,
  [Species.SPEAROW]: 1,
  [Species.EKANS]: 2,
-  [Species.PIKACHU]: 3,
+  [Species.PIKACHU]: 4,
  [Species.SANDSHREW]: 2,
  [Species.NIDORAN_F]: 3,
  [Species.NIDORAN_M]: 3,
@ -88,7 +88,7 @@ export const speciesStarterCosts = {
  [Species.HITMONCHAN]: 4,
  [Species.LICKITUNG]: 3,
  [Species.KOFFING]: 2,
-  [Species.RHYHORN]: 3,
+  [Species.RHYHORN]: 4,
  [Species.CHANSEY]: 3,
  [Species.TANGELA]: 3,
  [Species.KANGASKHAN]: 4,
@ -111,12 +111,12 @@ export const speciesStarterCosts = {
  [Species.KABUTO]: 3,
  [Species.AERODACTYL]: 5,
  [Species.SNORLAX]: 5,
-  [Species.ARTICUNO]: 6,
+  [Species.ARTICUNO]: 5,
  [Species.ZAPDOS]: 6,
  [Species.MOLTRES]: 6,
  [Species.DRATINI]: 4,
  [Species.MEWTWO]: 8,
-  [Species.MEW]: 6,
+  [Species.MEW]: 5,

  [Species.CHIKORITA]: 2,
  [Species.CYNDAQUIL]: 3,
@ -126,7 +126,7 @@ export const speciesStarterCosts = {
  [Species.LEDYBA]: 1,
  [Species.SPINARAK]: 1,
  [Species.CHINCHOU]: 2,
-  [Species.PICHU]: 2,
+  [Species.PICHU]: 4,
  [Species.CLEFFA]: 2,
  [Species.IGGLYBUFF]: 1,
  [Species.TOGEPI]: 3,
@ -175,7 +175,7 @@ export const speciesStarterCosts = {
  [Species.LARVITAR]: 4,
  [Species.LUGIA]: 8,
  [Species.HO_OH]: 8,
-  [Species.CELEBI]: 6,
+  [Species.CELEBI]: 5,

  [Species.TREECKO]: 3,
  [Species.TORCHIC]: 4,
@ -187,7 +187,7 @@ export const speciesStarterCosts = {
  [Species.SEEDOT]: 2,
  [Species.TAILLOW]: 3,
  [Species.WINGULL]: 2,
-  [Species.RALTS]: 3,
+  [Species.RALTS]: 4,
  [Species.SURSKIT]: 2,
  [Species.SHROOMISH]: 3,
  [Species.SLAKOTH]: 4,
@ -198,7 +198,7 @@ export const speciesStarterCosts = {
  [Species.NOSEPASS]: 2,
  [Species.SKITTY]: 1,
  [Species.SABLEYE]: 2,
-  [Species.MAWILE]: 3,
+  [Species.MAWILE]: 2,
  [Species.ARON]: 3,
  [Species.MEDITITE]: 3,
  [Species.ELECTRIKE]: 2,
@ -243,7 +243,7 @@ export const speciesStarterCosts = {
  [Species.BAGON]: 4,
  [Species.BELDUM]: 4,
  [Species.REGIROCK]: 6,
-  [Species.REGICE]: 6,
+  [Species.REGICE]: 5,
  [Species.REGISTEEL]: 6,
  [Species.LATIAS]: 7,
  [Species.LATIOS]: 7,
@ -291,19 +291,19 @@ export const speciesStarterCosts = {
  [Species.MANTYKE]: 2,
  [Species.SNOVER]: 2,
  [Species.ROTOM]: 5,
-  [Species.UXIE]: 6,
-  [Species.MESPRIT]: 6,
+  [Species.UXIE]: 5,
+  [Species.MESPRIT]: 5,
  [Species.AZELF]: 6,
  [Species.DIALGA]: 8,
  [Species.PALKIA]: 8,
-  [Species.HEATRAN]: 6,
+  [Species.HEATRAN]: 7,
  [Species.REGIGIGAS]: 7,
  [Species.GIRATINA]: 8,
  [Species.CRESSELIA]: 6,
  [Species.PHIONE]: 4,
  [Species.MANAPHY]: 7,
  [Species.DARKRAI]: 7,
-  [Species.SHAYMIN]: 6,
+  [Species.SHAYMIN]: 5,
  [Species.ARCEUS]: 9,

  [Species.VICTINI]: 7,
@ -351,7 +351,7 @@ export const speciesStarterCosts = {
  [Species.DEERLING]: 2,
  [Species.EMOLGA]: 2,
  [Species.KARRABLAST]: 3,
-  [Species.FOONGUS]: 2,
+  [Species.FOONGUS]: 3,
  [Species.FRILLISH]: 3,
  [Species.ALOMOMOLA]: 4,
  [Species.JOLTIK]: 3,
@ -410,7 +410,7 @@ export const speciesStarterCosts = {
  [Species.CLAUNCHER]: 3,
  [Species.HELIOPTILE]: 3,
  [Species.TYRUNT]: 3,
-  [Species.AMAURA]: 3,
+  [Species.AMAURA]: 2,
  [Species.HAWLUCHA]: 4,
  [Species.DEDENNE]: 2,
  [Species.CARBINK]: 2,
@ -425,7 +425,7 @@ export const speciesStarterCosts = {
  [Species.ZYGARDE]: 8,
  [Species.DIANCIE]: 7,
  [Species.HOOPA]: 7,
-  [Species.VOLCANION]: 6,
+  [Species.VOLCANION]: 7,
  [Species.ETERNAL_FLOETTE]: 4,

  [Species.ROWLET]: 3,
@ -464,21 +464,21 @@ export const speciesStarterCosts = {
  [Species.DHELMISE]: 4,
  [Species.JANGMO_O]: 4,
  [Species.TAPU_KOKO]: 6,
-  [Species.TAPU_LELE]: 6,
+  [Species.TAPU_LELE]: 7,
  [Species.TAPU_BULU]: 6,
-  [Species.TAPU_FINI]: 6,
+  [Species.TAPU_FINI]: 5,
  [Species.COSMOG]: 7,
  [Species.NIHILEGO]: 6,
  [Species.BUZZWOLE]: 6,
  [Species.PHEROMOSA]: 7,
  [Species.XURKITREE]: 6,
  [Species.CELESTEELA]: 6,
-  [Species.KARTANA]: 7,
+  [Species.KARTANA]: 8,
  [Species.GUZZLORD]: 6,
  [Species.NECROZMA]: 8,
  [Species.MAGEARNA]: 7,
  [Species.MARSHADOW]: 7,
-  [Species.POIPOLE]: 7,
+  [Species.POIPOLE]: 8,
  [Species.STAKATAKA]: 6,
  [Species.BLACEPHALON]: 7,
  [Species.ZERAORA]: 6,
@ -532,31 +532,31 @@ export const speciesStarterCosts = {
  [Species.ZAMAZENTA]: 8,
  [Species.ETERNATUS]: 10,
  [Species.KUBFU]: 6,
-  [Species.ZARUDE]: 6,
+  [Species.ZARUDE]: 5,
  [Species.REGIELEKI]: 6,
  [Species.REGIDRAGO]: 6,
  [Species.GLASTRIER]: 6,
-  [Species.SPECTRIER]: 7,
+  [Species.SPECTRIER]: 8,
  [Species.CALYREX]: 8,
+  [Species.ENAMORUS]: 7,
  [Species.GALAR_MEOWTH]: 3,
  [Species.GALAR_PONYTA]: 2,
  [Species.GALAR_SLOWPOKE]: 3,
  [Species.GALAR_FARFETCHD]: 3,
+  [Species.GALAR_MR_MIME]: 3,
+  [Species.GALAR_ARTICUNO]: 6,
+  [Species.GALAR_ZAPDOS]: 6,
+  [Species.GALAR_MOLTRES]: 6,
  [Species.GALAR_CORSOLA]: 3,
  [Species.GALAR_ZIGZAGOON]: 3,
  [Species.GALAR_DARUMAKA]: 4,
  [Species.GALAR_YAMASK]: 3,
  [Species.GALAR_STUNFISK]: 2,
-  [Species.GALAR_MR_MIME]: 3,
-  [Species.GALAR_ARTICUNO]: 6,
-  [Species.GALAR_ZAPDOS]: 6,
-  [Species.GALAR_MOLTRES]: 6,
  [Species.HISUI_GROWLITHE]: 4,
  [Species.HISUI_VOLTORB]: 3,
  [Species.HISUI_QWILFISH]: 4,
  [Species.HISUI_SNEASEL]: 5,
  [Species.HISUI_ZORUA]: 3,
-  [Species.ENAMORUS]: 7,

  [Species.SPRIGATITO]: 4,
  [Species.FUECOCO]: 4,
@ -595,9 +595,9 @@ export const speciesStarterCosts = {
  [Species.VELUZA]: 4,
  [Species.DONDOZO]: 4,
  [Species.TATSUGIRI]: 4,
-  [Species.GREAT_TUSK]: 6,
-  [Species.SCREAM_TAIL]: 6,
-  [Species.BRUTE_BONNET]: 6,
+  [Species.GREAT_TUSK]: 7,
+  [Species.SCREAM_TAIL]: 5,
+  [Species.BRUTE_BONNET]: 5,
  [Species.FLUTTER_MANE]: 7,
  [Species.SLITHER_WING]: 6,
  [Species.SANDY_SHOCKS]: 6,
@ -606,33 +606,33 @@ export const speciesStarterCosts = {
  [Species.IRON_HANDS]: 6,
  [Species.IRON_JUGULIS]: 6,
  [Species.IRON_MOTH]: 6,
-  [Species.IRON_THORNS]: 6,
+  [Species.IRON_THORNS]: 5,
  [Species.FRIGIBAX]: 4,
  [Species.GIMMIGHOUL]: 4,
-  [Species.WO_CHIEN]: 6,
+  [Species.WO_CHIEN]: 5,
  [Species.CHIEN_PAO]: 7,
  [Species.TING_LU]: 6,
  [Species.CHI_YU]: 7,
-  [Species.ROARING_MOON]: 6,
+  [Species.ROARING_MOON]: 7,
  [Species.IRON_VALIANT]: 6,
  [Species.KORAIDON]: 9,
  [Species.MIRAIDON]: 9,
-  [Species.WALKING_WAKE]: 6,
+  [Species.WALKING_WAKE]: 7,
  [Species.IRON_LEAVES]: 6,
  [Species.POLTCHAGEIST]: 4,
  [Species.OKIDOGI]: 6,
  [Species.MUNKIDORI]: 6,
-  [Species.FEZANDIPITI]: 6,
+  [Species.FEZANDIPITI]: 5,
  [Species.OGERPON]: 7,
  [Species.GOUGING_FIRE]: 7,
-  [Species.RAGING_BOLT]: 6,
+  [Species.RAGING_BOLT]: 7,
  [Species.IRON_BOULDER]: 7,
-  [Species.IRON_CROWN]: 6,
+  [Species.IRON_CROWN]: 7,
  [Species.TERAPAGOS]: 8,
  [Species.PECHARUNT]: 6,
  [Species.PALDEA_TAUROS]: 5,
  [Species.PALDEA_WOOPER]: 3,
-  [Species.BLOODMOON_URSALUNA]: 6,
+  [Species.BLOODMOON_URSALUNA]: 5,
 };

 const starterCandyCosts: { passive: number; costReduction: [number, number]; egg: number; }[] = [
--- a/src/data/balance/tms.ts
+++ b/src/data/balance/tms.ts
@ -67148,6 +67148,7 @@ export const tmSpecies: TmSpecies = {
    Species.VELUZA,
    Species.DONDOZO,
    Species.TATSUGIRI,
+    Species.ANNIHILAPE,
    Species.CLODSIRE,
    Species.FARIGIRAF,
    Species.DUDUNSPARCE,
--- a/src/data/battle-anims.ts
+++ b/src/data/battle-anims.ts
@ -90,6 +90,7 @@ export enum CommonAnim {
    RAGING_BULL_FIRE,
    RAGING_BULL_WATER,
    SALT_CURE,
+    POWDER,
    SUNNY = 2100,
    RAIN,
    SANDSTORM,
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@ -856,6 +856,59 @@ export class SeedTag extends BattlerTag {
  }
 }

+/**
+ * BattlerTag representing the effects of {@link https://bulbapedia.bulbagarden.net/wiki/Powder_(move) | Powder}.
+ * When the afflicted Pokemon uses a Fire-type move, the move is cancelled, and the
+ * Pokemon takes damage equal to 1/4 of it's maximum HP (rounded down).
+ */
+export class PowderTag extends BattlerTag {
+  constructor() {
+    super(BattlerTagType.POWDER, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], 1);
+  }
+
+  onAdd(pokemon: Pokemon): void {
+    super.onAdd(pokemon);
+
+    // "{Pokemon} is covered in powder!"
+    pokemon.scene.queueMessage(i18next.t("battlerTags:powderOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+  }
+
+  /**
+   * Applies Powder's effects before the tag owner uses a Fire-type move.
+   * Also causes the tag to expire at the end of turn.
+   * @param pokemon {@linkcode Pokemon} the owner of this tag
+   * @param lapseType {@linkcode BattlerTagLapseType} the type of lapse functionality to carry out
+   * @returns `true` if the tag should not expire after this lapse; `false` otherwise.
+   */
+  lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
+    if (lapseType === BattlerTagLapseType.PRE_MOVE) {
+      const movePhase = pokemon.scene.getCurrentPhase();
+      if (movePhase instanceof MovePhase) {
+        const move = movePhase.move.getMove();
+        const weather = pokemon.scene.arena.weather;
+        if (pokemon.getMoveType(move) === Type.FIRE && !(weather && weather.weatherType === WeatherType.HEAVY_RAIN && !weather.isEffectSuppressed(pokemon.scene))) {
+          movePhase.fail();
+          movePhase.showMoveText();
+
+          pokemon.scene.unshiftPhase(new CommonAnimPhase(pokemon.scene, pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.POWDER));
+
+          const cancelDamage = new BooleanHolder(false);
+          applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelDamage);
+          if (!cancelDamage.value) {
+            pokemon.damageAndUpdate(Math.floor(pokemon.getMaxHp() / 4), HitResult.OTHER);
+          }
+
+          // "When the flame touched the powder\non the Pokémon, it exploded!"
+          pokemon.scene.queueMessage(i18next.t("battlerTags:powderLapse", { moveName: move.name }));
+        }
+      }
+      return true;
+    } else {
+      return super.lapse(pokemon, lapseType);
+    }
+  }
+}
+
 export class NightmareTag extends BattlerTag {
  constructor() {
    super(BattlerTagType.NIGHTMARE, BattlerTagLapseType.TURN_END, 1, Moves.NIGHTMARE);
@ -2955,6 +3008,8 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source
      return new InfatuatedTag(sourceMove, sourceId);
    case BattlerTagType.SEEDED:
      return new SeedTag(sourceId);
+    case BattlerTagType.POWDER:
+      return new PowderTag();
    case BattlerTagType.NIGHTMARE:
      return new NightmareTag();
    case BattlerTagType.FRENZY:
--- a/src/data/move.ts
+++ b/src/data/move.ts
@ -1881,8 +1881,14 @@ export class FlameBurstAttr extends MoveEffectAttr {
 }

 export class SacrificialFullRestoreAttr extends SacrificialAttr {
-  constructor() {
+  protected restorePP: boolean;
+  protected moveMessage: string;
+
+  constructor(restorePP: boolean, moveMessage: string) {
    super();
+
+    this.restorePP = restorePP;
+    this.moveMessage = moveMessage;
  }

  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
@ -1893,8 +1899,19 @@ export class SacrificialFullRestoreAttr extends SacrificialAttr {
    // We don't know which party member will be chosen, so pick the highest max HP in the party
    const maxPartyMemberHp = user.scene.getPlayerParty().map(p => p.getMaxHp()).reduce((maxHp: integer, hp: integer) => Math.max(hp, maxHp), 0);

-    user.scene.pushPhase(new PokemonHealPhase(user.scene, user.getBattlerIndex(),
-      maxPartyMemberHp, i18next.t("moveTriggers:sacrificialFullRestore", { pokemonName: getPokemonNameWithAffix(user) }), true, false, false, true), true);
+    user.scene.pushPhase(
+      new PokemonHealPhase(
+        user.scene,
+        user.getBattlerIndex(),
+        maxPartyMemberHp,
+        i18next.t(this.moveMessage, { pokemonName: getPokemonNameWithAffix(user) }),
+        true,
+        false,
+        false,
+        true,
+        false,
+        this.restorePP),
+      true);

    return true;
  }
@ -8666,7 +8683,7 @@ export function initMoves() {
      .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1)
      .ballBombMove(),
    new AttackMove(Moves.FUTURE_SIGHT, Type.PSYCHIC, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 2)
-      .partial() // cannot be used on multiple Pokemon on the same side in a double battle, hits immediately when called by Metronome/etc
+      .partial() // cannot be used on multiple Pokemon on the same side in a double battle, hits immediately when called by Metronome/etc, should not apply abilities or held items if user is off the field
      .ignoresProtect()
      .attr(DelayedAttackAttr, ArenaTagType.FUTURE_SIGHT, ChargeAnim.FUTURE_SIGHT_CHARGING, i18next.t("moveTriggers:foresawAnAttack", { pokemonName: "{USER}" })),
    new AttackMove(Moves.ROCK_SMASH, Type.FIGHTING, MoveCategory.PHYSICAL, 40, 100, 15, 50, 0, 2)
@ -8976,7 +8993,7 @@ export function initMoves() {
      .attr(ConfuseAttr)
      .pulseMove(),
    new AttackMove(Moves.DOOM_DESIRE, Type.STEEL, MoveCategory.SPECIAL, 140, 100, 5, -1, 0, 3)
-      .partial() // cannot be used on multiple Pokemon on the same side in a double battle, hits immediately when called by Metronome/etc
+      .partial() // cannot be used on multiple Pokemon on the same side in a double battle, hits immediately when called by Metronome/etc, should not apply abilities or held items if user is off the field
      .ignoresProtect()
      .attr(DelayedAttackAttr, ArenaTagType.DOOM_DESIRE, ChargeAnim.DOOM_DESIRE_CHARGING, i18next.t("moveTriggers:choseDoomDesireAsDestiny", { pokemonName: "{USER}" })),
    new AttackMove(Moves.PSYCHO_BOOST, Type.PSYCHIC, MoveCategory.SPECIAL, 140, 90, 5, -1, 0, 3)
@ -9002,7 +9019,7 @@ export function initMoves() {
      .attr(GyroBallPowerAttr)
      .ballBombMove(),
    new SelfStatusMove(Moves.HEALING_WISH, Type.PSYCHIC, -1, 10, -1, 0, 4)
-      .attr(SacrificialFullRestoreAttr)
+      .attr(SacrificialFullRestoreAttr, false, "moveTriggers:sacrificialFullRestore")
      .triageMove(),
    new AttackMove(Moves.BRINE, Type.WATER, MoveCategory.SPECIAL, 65, 100, 10, -1, 0, 4)
      .attr(MovePowerMultiplierAttr, (user, target, move) => target.getHpRatio() < 0.5 ? 2 : 1),
@ -9279,10 +9296,9 @@ export function initMoves() {
    new AttackMove(Moves.SPACIAL_REND, Type.DRAGON, MoveCategory.SPECIAL, 100, 95, 5, -1, 0, 4)
      .attr(HighCritAttr),
    new SelfStatusMove(Moves.LUNAR_DANCE, Type.PSYCHIC, -1, 10, -1, 0, 4)
-      .attr(SacrificialAttrOnHit)
+      .attr(SacrificialFullRestoreAttr, true, "moveTriggers:lunarDanceRestore")
      .danceMove()
-      .triageMove()
-      .unimplemented(),
+      .triageMove(),
    new AttackMove(Moves.CRUSH_GRIP, Type.NORMAL, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 4)
      .attr(OpponentHighHpPowerAttr, 120),
    new AttackMove(Moves.MAGMA_STORM, Type.FIRE, MoveCategory.SPECIAL, 100, 75, 5, -1, 0, 4)
@ -9732,9 +9748,9 @@ export function initMoves() {
      .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK, Stat.SPD ], -1, false, { condition: (user, target, move) => target.status?.effect === StatusEffect.POISON || target.status?.effect === StatusEffect.TOXIC })
      .target(MoveTarget.ALL_NEAR_ENEMIES),
    new StatusMove(Moves.POWDER, Type.BUG, 100, 20, -1, 1, 6)
+      .attr(AddBattlerTagAttr, BattlerTagType.POWDER, false, true)
      .ignoresSubstitute()
-      .powderMove()
-      .unimplemented(),
+      .powderMove(),
    new ChargingSelfStatusMove(Moves.GEOMANCY, Type.FAIRY, -1, 10, -1, 0, 6)
      .chargeText(i18next.t("moveTriggers:isChargingPower", { pokemonName: "{USER}" }))
      .attr(StatStageChangeAttr, [ Stat.SPATK, Stat.SPDEF, Stat.SPD ], 2, true)
--- a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts
+++ b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts
@ -13,7 +13,7 @@ import {
  ModifierTypeOption, modifierTypes,
  regenerateModifierPoolThresholds,
 } from "#app/modifier/modifier-type";
-import { randSeedInt } from "#app/utils";
+import { randSeedInt, randSeedItem } from "#app/utils";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import BattleScene from "#app/battle-scene";
@ -31,6 +31,7 @@ import { BerryType } from "#enums/berry-type";
 import { PERMANENT_STATS, Stat } from "#enums/stat";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import PokemonSpecies, { getPokemonSpecies } from "#app/data/pokemon-species";

 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/berriesAbound";
@ -58,7 +59,14 @@ export const BerriesAboundEncounter: MysteryEncounter =

      // Calculate boss mon
      const level = getEncounterPokemonLevelForWave(scene, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER);
-      const bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true);
+      let bossSpecies: PokemonSpecies;
+      if (scene.eventManager.isEventActive() && scene.eventManager.activeEvent()?.uncommonBreedEncounters && randSeedInt(2) === 1) {
+        const eventEncounter = randSeedItem(scene.eventManager.activeEvent()!.uncommonBreedEncounters!);
+        const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(level, eventEncounter.allowEvolution ?? false, true, scene.gameMode);
+        bossSpecies = getPokemonSpecies( levelSpecies );
+      } else {
+        bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true);
+      }
      const bossPokemon = new EnemyPokemon(scene, bossSpecies, level, TrainerSlot.NONE, true);
      encounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(bossPokemon));
      const config: EnemyPartyConfig = {
--- a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
+++ b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
@ -13,6 +13,7 @@ import { modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifi
 import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase";
 import i18next from "#app/plugins/i18n";
 import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
+import { randSeedItem } from "#app/utils";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
@ -33,7 +34,24 @@ const OPTION_3_DISALLOWED_MODIFIERS = [
  "PokemonBaseStatTotalModifier"
 ];

-const DELIBIRDY_MONEY_PRICE_MULTIPLIER = 2;
+const DELIBIRDY_MONEY_PRICE_MULTIPLIER = 1.5;
+
+const doEventReward = (scene: BattleScene) => {
+  const event_buff = scene.eventManager.activeEvent()?.delibirdyBuff ?? [];
+  if (event_buff.length > 0) {
+    const candidates = event_buff.filter((c => {
+      const mtype = generateModifierType(scene, modifierTypes[c]);
+      const existingCharm = scene.findModifier(m => m.type.id === mtype?.id);
+      return !(existingCharm && existingCharm.getStackCount() >= existingCharm.getMaxStackCount(scene));
+    }));
+    if (candidates.length > 0) {
+      scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes[randSeedItem(candidates)]));
+    } else {
+      // At max stacks, give a Voucher instead
+      scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.VOUCHER));
+    }
+  }
+};

 /**
 * Delibird-y encounter.
@ -42,7 +60,8 @@ const DELIBIRDY_MONEY_PRICE_MULTIPLIER = 2;
 */
 export const DelibirdyEncounter: MysteryEncounter =
  MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.DELIBIRDY)
-    .withEncounterTier(MysteryEncounterTier.GREAT)
+    .withMaxAllowedEncounters(4)
+    .withEncounterTier(MysteryEncounterTier.COMMON) //Change back after event!
    .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
    .withSceneRequirement(new MoneyRequirement(0, DELIBIRDY_MONEY_PRICE_MULTIPLIER)) // Must have enough money for it to spawn at the very least
    .withPrimaryPokemonRequirement(
@ -136,8 +155,10 @@ export const DelibirdyEncounter: MysteryEncounter =
            await applyModifierTypeToPlayerPokemon(scene, scene.getPlayerPokemon()!, shellBell);
            scene.playSound("item_fanfare");
            await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true);
+            doEventReward(scene);
          } else {
            scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.AMULET_COIN));
+            doEventReward(scene);
          }

          leaveEncounterWithoutBattle(scene, true);
@ -211,8 +232,10 @@ export const DelibirdyEncounter: MysteryEncounter =
              await applyModifierTypeToPlayerPokemon(scene, scene.getPlayerPokemon()!, shellBell);
              scene.playSound("item_fanfare");
              await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true);
+              doEventReward(scene);
            } else {
              scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.CANDY_JAR));
+              doEventReward(scene);
            }
          } else {
            // Check if the player has max stacks of that Berry Pouch already
@ -224,8 +247,10 @@ export const DelibirdyEncounter: MysteryEncounter =
              await applyModifierTypeToPlayerPokemon(scene, scene.getPlayerPokemon()!, shellBell);
              scene.playSound("item_fanfare");
              await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true);
+              doEventReward(scene);
            } else {
              scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.BERRY_POUCH));
+              doEventReward(scene);
            }
          }

@ -300,8 +325,10 @@ export const DelibirdyEncounter: MysteryEncounter =
            await applyModifierTypeToPlayerPokemon(scene, scene.getPlayerParty()[0], shellBell);
            scene.playSound("item_fanfare");
            await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true);
+            doEventReward(scene);
          } else {
            scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.HEALING_CHARM));
+            doEventReward(scene);
          }

          chosenPokemon.loseHeldItem(modifier, false);
--- a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts
+++ b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts
@ -26,9 +26,10 @@ import { getEncounterPokemonLevelForWave, getSpriteKeysFromPokemon, STANDARD_ENC
 import PokemonData from "#app/system/pokemon-data";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { randSeedInt } from "#app/utils";
+import { randSeedInt, randSeedItem } from "#app/utils";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import PokemonSpecies, { getPokemonSpecies } from "#app/data/pokemon-species";

 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/fightOrFlight";
@ -56,7 +57,14 @@ export const FightOrFlightEncounter: MysteryEncounter =

      // Calculate boss mon
      const level = getEncounterPokemonLevelForWave(scene, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER);
-      const bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true);
+      let bossSpecies: PokemonSpecies;
+      if (scene.eventManager.isEventActive() && scene.eventManager.activeEvent()?.uncommonBreedEncounters && randSeedInt(2) === 1) {
+        const eventEncounter = randSeedItem(scene.eventManager.activeEvent()!.uncommonBreedEncounters!);
+        const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(level, eventEncounter.allowEvolution ?? false, true, scene.gameMode);
+        bossSpecies = getPokemonSpecies( levelSpecies );
+      } else {
+        bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true);
+      }
      const bossPokemon = new EnemyPokemon(scene, bossSpecies, level, TrainerSlot.NONE, true);
      encounter.setDialogueToken("enemyPokemon", bossPokemon.getNameToRender());
      const config: EnemyPartyConfig = {
--- a/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts
+++ b/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts
@ -12,7 +12,7 @@ import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode
 import { TrainerSlot } from "#app/data/trainer-config";
 import { catchPokemon, getHighestLevelPlayerPokemon, getSpriteKeysFromPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import PokemonData from "#app/system/pokemon-data";
-import { isNullOrUndefined, randSeedInt } from "#app/utils";
+import { isNullOrUndefined, randSeedInt, randSeedItem } from "#app/utils";
 import { Moves } from "#enums/moves";
 import { BattlerIndex } from "#app/battle";
 import { SelfStatusMove } from "#app/data/move";
@ -23,6 +23,7 @@ import { BerryModifier } from "#app/modifier/modifier";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { Stat } from "#enums/stat";
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
+import PokemonSpecies, { getPokemonSpecies } from "#app/data/pokemon-species";

 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/uncommonBreed";
@ -51,7 +52,14 @@ export const UncommonBreedEncounter: MysteryEncounter =
      // Calculate boss mon
      // Level equal to 2 below highest party member
      const level = getHighestLevelPlayerPokemon(scene, false, true).level - 2;
-      const species = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true);
+      let species: PokemonSpecies;
+      if (scene.eventManager.isEventActive() && scene.eventManager.activeEvent()?.uncommonBreedEncounters && randSeedInt(2) === 1) {
+        const eventEncounter = randSeedItem(scene.eventManager.activeEvent()!.uncommonBreedEncounters!);
+        const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(level, eventEncounter.allowEvolution ?? false, true, scene.gameMode);
+        species = getPokemonSpecies( levelSpecies );
+      } else {
+        species = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true);
+      }
      const pokemon = new EnemyPokemon(scene, species, level, TrainerSlot.NONE, true);

      // Pokemon will always have one of its egg moves in its moveset
--- a/src/data/mystery-encounters/mystery-encounters.ts
+++ b/src/data/mystery-encounters/mystery-encounters.ts
@ -177,7 +177,7 @@ export const allMysteryEncounters: { [encounterType: number]: MysteryEncounter }
 const extremeBiomeEncounters: MysteryEncounterType[] = [];

 const nonExtremeBiomeEncounters: MysteryEncounterType[] = [
-  MysteryEncounterType.FIELD_TRIP,
+  // MysteryEncounterType.FIELD_TRIP, Disabled for holiday event
  MysteryEncounterType.DANCING_LESSONS, // Is also in BADLANDS, DESERT, VOLCANO, WASTELAND, ABYSS
 ];

@ -185,14 +185,14 @@ const humanTransitableBiomeEncounters: MysteryEncounterType[] = [
  MysteryEncounterType.MYSTERIOUS_CHALLENGERS,
  MysteryEncounterType.SHADY_VITAMIN_DEALER,
  MysteryEncounterType.THE_POKEMON_SALESMAN,
-  MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE,
+  // MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, Disabled for holiday event
  MysteryEncounterType.THE_WINSTRATE_CHALLENGE,
  MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER
 ];

 const civilizationBiomeEncounters: MysteryEncounterType[] = [
-  MysteryEncounterType.DEPARTMENT_STORE_SALE,
-  MysteryEncounterType.PART_TIMER,
+  // MysteryEncounterType.DEPARTMENT_STORE_SALE, Disabled for holiday event
+  // MysteryEncounterType.PART_TIMER, Disabled for holiday event
  MysteryEncounterType.FUN_AND_GAMES,
  MysteryEncounterType.GLOBAL_TRADE_SYSTEM
 ];
--- a/src/data/trainer-config.ts
+++ b/src/data/trainer-config.ts
@ -1170,6 +1170,9 @@ function getGymLeaderPartyTemplate(scene: BattleScene) {
 export function getRandomPartyMemberFunc(speciesPool: Species[], trainerSlot: TrainerSlot = TrainerSlot.TRAINER, ignoreEvolution: boolean = false, postProcess?: (enemyPokemon: EnemyPokemon) => void) {
  return (scene: BattleScene, level: number, strength: PartyMemberStrength) => {
    let species = Utils.randSeedItem(speciesPool);
+    if (scene.gameMode.isClassic && scene.currentBattle.waveIndex === 20) {
+      ignoreEvolution = true;
+    }
    if (!ignoreEvolution) {
      species = getPokemonSpecies(species).getTrainerSpeciesForLevel(level, true, strength, scene.currentBattle.waveIndex);
    }
@ -1229,7 +1232,7 @@ export const signatureSpecies: SignatureSpecies = {
  GIOVANNI: [ Species.SANDILE, Species.MURKROW, Species.NIDORAN_M, Species.NIDORAN_F ],
  FALKNER: [ Species.PIDGEY, Species.HOOTHOOT, Species.DODUO ],
  BUGSY: [ Species.SCYTHER, Species.HERACROSS, Species.SHUCKLE, Species.PINSIR ],
-  WHITNEY: [ Species.GIRAFARIG, Species.MILTANK ],
+  WHITNEY: [ Species.JIGGLYPUFF, Species.MILTANK, Species.AIPOM, Species.GIRAFARIG ],
  MORTY: [ Species.GASTLY, Species.MISDREAVUS, Species.SABLEYE ],
  CHUCK: [ Species.POLIWRATH, Species.MANKEY ],
  JASMINE: [ Species.MAGNEMITE, Species.STEELIX ],
@ -1239,7 +1242,7 @@ export const signatureSpecies: SignatureSpecies = {
  BRAWLY: [ Species.MACHOP, Species.MAKUHITA ],
  WATTSON: [ Species.MAGNEMITE, Species.VOLTORB, Species.ELECTRIKE ],
  FLANNERY: [ Species.SLUGMA, Species.TORKOAL, Species.NUMEL ],
-  NORMAN: [ Species.SLAKOTH, Species.SPINDA, Species.CHANSEY, Species.KANGASKHAN ],
+  NORMAN: [ Species.SLAKOTH, Species.SPINDA, Species.ZIGZAGOON, Species.KECLEON ],
  WINONA: [ Species.SWABLU, Species.WINGULL, Species.TROPIUS, Species.SKARMORY ],
  TATE: [ Species.SOLROCK, Species.NATU, Species.CHIMECHO, Species.GALLADE ],
  LIZA: [ Species.LUNATONE, Species.SPOINK, Species.BALTOY, Species.GARDEVOIR ],
@ -1247,16 +1250,16 @@ export const signatureSpecies: SignatureSpecies = {
  ROARK: [ Species.CRANIDOS, Species.LARVITAR, Species.GEODUDE ],
  GARDENIA: [ Species.ROSELIA, Species.TANGELA, Species.TURTWIG ],
  MAYLENE: [ Species.LUCARIO, Species.MEDITITE, Species.CHIMCHAR ],
-  CRASHER_WAKE: [ Species.BUIZEL, Species.MAGIKARP, Species.PIPLUP ],
+  CRASHER_WAKE: [ Species.BUIZEL, Species.WOOPER, Species.PIPLUP, Species.MAGIKARP ],
  FANTINA: [ Species.MISDREAVUS, Species.DRIFLOON, Species.SPIRITOMB ],
  BYRON: [ Species.SHIELDON, Species.BRONZOR, Species.AGGRON ],
  CANDICE: [ Species.SNEASEL, Species.SNOVER, Species.SNORUNT ],
  VOLKNER: [ Species.SHINX, Species.CHINCHOU, Species.ROTOM ],
-  CILAN: [ Species.PANSAGE, Species.COTTONEE, Species.PETILIL ],
-  CHILI: [ Species.PANSEAR, Species.DARUMAKA, Species.HEATMOR ],
-  CRESS: [ Species.PANPOUR, Species.BASCULIN, Species.TYMPOLE ],
-  CHEREN: [ Species.LILLIPUP, Species.MINCCINO, Species.PATRAT ],
-  LENORA: [ Species.KANGASKHAN, Species.DEERLING, Species.AUDINO ],
+  CILAN: [ Species.PANSAGE, Species.FOONGUS, Species.PETILIL ],
+  CHILI: [ Species.PANSEAR, Species.DARUMAKA, Species.NUMEL ],
+  CRESS: [ Species.PANPOUR, Species.TYMPOLE, Species.SLOWPOKE ],
+  CHEREN: [ Species.LILLIPUP, Species.MINCCINO, Species.PIDOVE ],
+  LENORA: [ Species.PATRAT, Species.DEERLING, Species.AUDINO ],
  ROXIE: [ Species.VENIPEDE, Species.TRUBBISH, Species.SKORUPI ],
  BURGH: [ Species.SEWADDLE, Species.SHELMET, Species.KARRABLAST ],
  ELESA: [ Species.EMOLGA, Species.BLITZLE, Species.JOLTIK ],
@ -1289,7 +1292,7 @@ export const signatureSpecies: SignatureSpecies = {
  BRASSIUS: [ Species.SMOLIV, Species.SHROOMISH, Species.ODDISH ],
  IONO: [ Species.TADBULB, Species.WATTREL, Species.VOLTORB ],
  KOFU: [ Species.VELUZA, Species.WIGLETT, Species.WINGULL ],
-  LARRY: [ Species.STARLY, Species.DUNSPARCE, Species.KOMALA ],
+  LARRY: [ Species.STARLY, Species.DUNSPARCE, Species.LECHONK, Species.KOMALA ],
  RYME: [ Species.GREAVARD, Species.SHUPPET, Species.MIMIKYU ],
  TULIP: [ Species.GIRAFARIG, Species.FLITTLE, Species.RALTS ],
  GRUSHA: [ Species.CETODDLE, Species.ALOLA_VULPIX, Species.CUBCHOO ],
@ -1852,7 +1855,7 @@ export const trainerConfigs: TrainerConfigs = {

  [TrainerType.RIVAL]: new TrainerConfig((t = TrainerType.RIVAL)).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setStaticParty().setEncounterBgm(TrainerType.RIVAL).setBattleBgm("battle_rival").setMixedBattleBgm("battle_rival").setPartyTemplates(trainerPartyTemplates.RIVAL)
    .setModifierRewardFuncs(() => modifierTypes.SUPER_EXP_CHARM, () => modifierTypes.EXP_SHARE)
-    .setEventModifierRewardFuncs(() => modifierTypes.SHINY_CHARM, () => modifierTypes.ABILITY_CHARM)
+    .setEventModifierRewardFuncs(() => modifierTypes.SHINY_CHARM, () => modifierTypes.ABILITY_CHARM, () => modifierTypes.CATCHING_CHARM)
    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, Species.CHIKORITA, Species.CYNDAQUIL, Species.TOTODILE, Species.TREECKO, Species.TORCHIC, Species.MUDKIP, Species.TURTWIG, Species.CHIMCHAR, Species.PIPLUP, Species.SNIVY, Species.TEPIG, Species.OSHAWOTT, Species.CHESPIN, Species.FENNEKIN, Species.FROAKIE, Species.ROWLET, Species.LITTEN, Species.POPPLIO, Species.GROOKEY, Species.SCORBUNNY, Species.SOBBLE, Species.SPRIGATITO, Species.FUECOCO, Species.QUAXLY ], TrainerSlot.TRAINER, true,
      (p => p.abilityIndex = 0)))
    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEY, Species.HOOTHOOT, Species.TAILLOW, Species.STARLY, Species.PIDOVE, Species.FLETCHLING, Species.PIKIPEK, Species.ROOKIDEE, Species.WATTREL ], TrainerSlot.TRAINER, true)),
--- a/src/data/weather.ts
+++ b/src/data/weather.ts
@ -242,7 +242,7 @@ export function getTerrainBlockMessage(pokemon: Pokemon, terrainType: TerrainTyp
  return i18next.t("terrain:defaultBlockMessage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), terrainName: getTerrainName(terrainType) });
 }

-interface WeatherPoolEntry {
+export interface WeatherPoolEntry {
  weatherType: WeatherType;
  weight: integer;
 }
@ -373,6 +373,10 @@ export function getRandomWeatherType(arena: any /* Importing from arena causes a
      break;
  }

+  if (arena.biomeType === Biome.TOWN && arena.scene.eventManager.isEventActive() && arena.scene.eventManager.activeEvent()?.weather?.length > 0) {
+    arena.scene.eventManager.activeEvent().weather.map(w => weatherPool.push(w));
+  }
+
  if (weatherPool.length > 1) {
    let totalWeight = 0;
    weatherPool.forEach(w => totalWeight += w.weight);
--- a/src/enums/battler-tag-type.ts
+++ b/src/enums/battler-tag-type.ts
@ -93,4 +93,5 @@ export enum BattlerTagType {
  GRUDGE = "GRUDGE",
  PSYCHO_SHIFT = "PSYCHO_SHIFT",
  ENDURE_TOKEN = "ENDURE_TOKEN",
+  POWDER = "POWDER",
 }
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@ -3501,12 +3501,21 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    return this.gender !== Gender.GENDERLESS && pokemon.gender === (this.gender === Gender.MALE ? Gender.FEMALE : Gender.MALE);
  }

-  canSetStatus(effect: StatusEffect | undefined, quiet: boolean = false, overrideStatus: boolean = false, sourcePokemon: Pokemon | null = null): boolean {
+  /**
+   * Checks if a status effect can be applied to the Pokemon.
+   *
+   * @param effect The {@linkcode StatusEffect} whose applicability is being checked
+   * @param quiet Whether in-battle messages should trigger or not
+   * @param overrideStatus Whether the Pokemon's current status can be overriden
+   * @param sourcePokemon The Pokemon that is setting the status effect
+   * @param ignoreField Whether any field effects (weather, terrain, etc.) should be considered
+   */
+  canSetStatus(effect: StatusEffect | undefined, quiet: boolean = false, overrideStatus: boolean = false, sourcePokemon: Pokemon | null = null, ignoreField: boolean = false): boolean {
    if (effect !== StatusEffect.FAINT) {
      if (overrideStatus ? this.status?.effect === effect : this.status) {
        return false;
      }
-      if (this.isGrounded() && this.scene.arena.terrain?.terrainType === TerrainType.MISTY) {
+      if (this.isGrounded() && (!ignoreField && this.scene.arena.terrain?.terrainType === TerrainType.MISTY)) {
        return false;
      }
    }
@ -3556,7 +3565,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
        }
        break;
      case StatusEffect.FREEZE:
-        if (this.isOfType(Type.ICE) || (this.scene?.arena?.weather?.weatherType && [ WeatherType.SUNNY, WeatherType.HARSH_SUN ].includes(this.scene.arena.weather.weatherType))) {
+        if (this.isOfType(Type.ICE) || (!ignoreField && (this.scene?.arena?.weather?.weatherType && [ WeatherType.SUNNY, WeatherType.HARSH_SUN ].includes(this.scene.arena.weather.weatherType)))) {
          return false;
        }
        break;
--- a/src/loading-scene.ts
+++ b/src/loading-scene.ts
@ -246,9 +246,9 @@ export class LoadingScene extends SceneBase {
    }
    const availableLangs = [ "en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN" ];
    if (lang && availableLangs.includes(lang)) {
-      this.loadImage("halloween2024-event-" + lang, "events");
+      this.loadImage("winter_holidays2024-event-" + lang, "events");
    } else {
-      this.loadImage("halloween2024-event-en", "events");
+      this.loadImage("winter_holidays2024-event-en", "events");
    }

    this.loadAtlas("statuses", "");
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@ -1093,7 +1093,10 @@ class TmModifierTypeGenerator extends ModifierTypeGenerator {
      if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in Moves)) {
        return new TmModifierType(pregenArgs[0] as Moves);
      }
-      const partyMemberCompatibleTms = party.map(p => (p as PlayerPokemon).compatibleTms.filter(tm => !p.moveset.find(m => m?.moveId === tm)));
+      const partyMemberCompatibleTms = party.map(p => {
+        const previousLevelMoves = p.getLearnableLevelMoves();
+        return (p as PlayerPokemon).compatibleTms.filter(tm => !p.moveset.find(m => m?.moveId === tm) && !previousLevelMoves.find(lm=>lm === tm));
+      });
      const tierUniqueCompatibleTms = partyMemberCompatibleTms.flat().filter(tm => tmPoolTiers[tm] === tier).filter(tm => !allMoves[tm].name.endsWith(" (N)")).filter((tm, i, array) => array.indexOf(tm) === i);
      if (!tierUniqueCompatibleTms.length) {
        return null;
@ -1751,19 +1754,59 @@ const modifierPool: ModifierPool = {
        || (p.isFusion() && checkedSpecies.includes(p.getFusionSpeciesForm(true).speciesId)))) ? 12 : 0;
    }, 12),
    new WeightedModifierType(modifierTypes.TOXIC_ORB, (party: Pokemon[]) => {
-      const checkedAbilities = [ Abilities.QUICK_FEET, Abilities.GUTS, Abilities.MARVEL_SCALE, Abilities.TOXIC_BOOST, Abilities.POISON_HEAL, Abilities.MAGIC_GUARD ];
-      const checkedMoves = [ Moves.FACADE, Moves.TRICK, Moves.FLING, Moves.SWITCHEROO, Moves.PSYCHO_SHIFT ];
-      // If a party member doesn't already have one of these two orbs and has one of the above moves or abilities, the orb can appear
-      return party.some(p => !p.getHeldItems().some(i => i instanceof TurnStatusEffectModifier)
-        && (checkedAbilities.some(a => p.hasAbility(a, false, true))
-        || p.getMoveset(true).some(m => m && checkedMoves.includes(m.moveId)))) ? 10 : 0;
+      return party.some(p => {
+        const moveset = p.getMoveset(true).filter(m => !isNullOrUndefined(m)).map(m => m.moveId);
+
+        const canSetStatus = p.canSetStatus(StatusEffect.TOXIC, true, true, null, true);
+        const isHoldingOrb = p.getHeldItems().some(i => i.type.id === "FLAME_ORB" || i.type.id === "TOXIC_ORB");
+
+        // Moves that take advantage of obtaining the actual status effect
+        const hasStatusMoves = [ Moves.FACADE, Moves.PSYCHO_SHIFT ]
+          .some(m => moveset.includes(m));
+        // Moves that take advantage of being able to give the target a status orb
+        // TODO: Take moves from comment they are implemented
+        const hasItemMoves = [ /* Moves.TRICK, Moves.FLING, Moves.SWITCHEROO */ ]
+          .some(m => moveset.includes(m));
+        // Abilities that take advantage of obtaining the actual status effect
+        const hasRelevantAbilities = [ Abilities.QUICK_FEET, Abilities.GUTS, Abilities.MARVEL_SCALE, Abilities.TOXIC_BOOST, Abilities.POISON_HEAL, Abilities.MAGIC_GUARD ]
+          .some(a => p.hasAbility(a, false, true));
+
+        if (!isHoldingOrb) {
+          if (canSetStatus) {
+            return hasRelevantAbilities || hasStatusMoves;
+          } else {
+            return hasItemMoves;
+          }
+        }
+        return false;
+      }) ? 10 : 0;
    }, 10),
    new WeightedModifierType(modifierTypes.FLAME_ORB, (party: Pokemon[]) => {
-      const checkedAbilities = [ Abilities.QUICK_FEET, Abilities.GUTS, Abilities.MARVEL_SCALE, Abilities.FLARE_BOOST, Abilities.MAGIC_GUARD ];
-      const checkedMoves = [ Moves.FACADE, Moves.TRICK, Moves.FLING, Moves.SWITCHEROO, Moves.PSYCHO_SHIFT ];
-      // If a party member doesn't already have one of these two orbs and has one of the above moves or abilities, the orb can appear
-      return party.some(p => !p.getHeldItems().some(i => i instanceof TurnStatusEffectModifier)
-        && (checkedAbilities.some(a => p.hasAbility(a, false, true)) || p.getMoveset(true).some(m => m && checkedMoves.includes(m.moveId)))) ? 10 : 0;
+      return party.some(p => {
+        const moveset = p.getMoveset(true).filter(m => !isNullOrUndefined(m)).map(m => m.moveId);
+        const canSetStatus = p.canSetStatus(StatusEffect.BURN, true, true, null, true);
+        const isHoldingOrb = p.getHeldItems().some(i => i.type.id === "FLAME_ORB" || i.type.id === "TOXIC_ORB");
+
+        // Moves that take advantage of obtaining the actual status effect
+        const hasStatusMoves = [ Moves.FACADE, Moves.PSYCHO_SHIFT ]
+          .some(m => moveset.includes(m));
+        // Moves that take advantage of being able to give the target a status orb
+        // TODO: Take moves from comment they are implemented
+        const hasItemMoves = [ /* Moves.TRICK, Moves.FLING, Moves.SWITCHEROO */ ]
+          .some(m => moveset.includes(m));
+        // Abilities that take advantage of obtaining the actual status effect
+        const hasRelevantAbilities = [ Abilities.QUICK_FEET, Abilities.GUTS, Abilities.MARVEL_SCALE, Abilities.FLARE_BOOST, Abilities.MAGIC_GUARD ]
+          .some(a => p.hasAbility(a, false, true));
+
+        if (!isHoldingOrb) {
+          if (canSetStatus) {
+            return hasRelevantAbilities || hasStatusMoves;
+          } else {
+            return hasItemMoves;
+          }
+        }
+        return false;
+      }) ? 10 : 0;
    }, 10),
    new WeightedModifierType(modifierTypes.WHITE_HERB, (party: Pokemon[]) => {
      const checkedAbilities = [ Abilities.WEAK_ARMOR, Abilities.CONTRARY, Abilities.MOODY, Abilities.ANGER_SHELL, Abilities.COMPETITIVE, Abilities.DEFIANT ];
--- a/src/phases/move-effect-phase.ts
+++ b/src/phases/move-effect-phase.ts
@ -56,7 +56,7 @@ import {
  PokemonMultiHitModifier,
 } from "#app/modifier/modifier";
 import { PokemonPhase } from "#app/phases/pokemon-phase";
-import { BooleanHolder, executeIf, NumberHolder } from "#app/utils";
+import { BooleanHolder, executeIf, isNullOrUndefined, NumberHolder } from "#app/utils";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
 import i18next from "i18next";
@ -106,9 +106,11 @@ export class MoveEffectPhase extends PokemonPhase {
           */
          return super.end();
        }
+        if (isNullOrUndefined(user.turnData)) {
          user.resetTurnData();
        }
      }
+    }

    /**
     * Does an effect from this move override other effects on this turn?
--- a/src/phases/move-phase.ts
+++ b/src/phases/move-phase.ts
@ -529,7 +529,7 @@ export class MovePhase extends BattlePhase {
   * Displays the move's usage text to the player, unless it's a charge turn (ie: {@link Moves.SOLAR_BEAM Solar Beam}),
   * the pokemon is on a recharge turn (ie: {@link Moves.HYPER_BEAM Hyper Beam}), or a 2-turn move was interrupted (ie: {@link Moves.FLY Fly}).
   */
-  protected showMoveText(): void {
+  public showMoveText(): void {
    if (this.move.moveId === Moves.NONE) {
      return;
    }
@ -545,7 +545,7 @@ export class MovePhase extends BattlePhase {
    applyMoveAttrs(PreMoveMessageAttr, this.pokemon, this.pokemon.getOpponents()[0], this.move.getMove());
  }

-  protected showFailedText(failedText?: string): void {
+  public showFailedText(failedText?: string): void {
    this.scene.queueMessage(failedText ?? i18next.t("battle:attackFailed"));
  }
 }
--- a/src/phases/pokemon-heal-phase.ts
+++ b/src/phases/pokemon-heal-phase.ts
@ -21,8 +21,9 @@ export class PokemonHealPhase extends CommonAnimPhase {
  private revive: boolean;
  private healStatus: boolean;
  private preventFullHeal: boolean;
+  private fullRestorePP: boolean;

-  constructor(scene: BattleScene, battlerIndex: BattlerIndex, hpHealed: integer, message: string | null, showFullHpMessage: boolean, skipAnim: boolean = false, revive: boolean = false, healStatus: boolean = false, preventFullHeal: boolean = false) {
+  constructor(scene: BattleScene, battlerIndex: BattlerIndex, hpHealed: integer, message: string | null, showFullHpMessage: boolean, skipAnim: boolean = false, revive: boolean = false, healStatus: boolean = false, preventFullHeal: boolean = false, fullRestorePP: boolean = false) {
    super(scene, battlerIndex, undefined, CommonAnim.HEALTH_UP);

    this.hpHealed = hpHealed;
@ -32,6 +33,7 @@ export class PokemonHealPhase extends CommonAnimPhase {
    this.revive = revive;
    this.healStatus = healStatus;
    this.preventFullHeal = preventFullHeal;
+    this.fullRestorePP = fullRestorePP;
  }

  start() {
@ -86,6 +88,13 @@ export class PokemonHealPhase extends CommonAnimPhase {
        lastStatusEffect = pokemon.status.effect;
        pokemon.resetStatus();
      }
+      if (this.fullRestorePP) {
+        for (const move of this.getPokemon().getMoveset()) {
+          if (move) {
+            move.ppUsed = 0;
+          }
+        }
+      }
      pokemon.updateInfo().then(() => super.end());
    } else if (this.healStatus && !this.revive && pokemon.status) {
      lastStatusEffect = pokemon.status.effect;
--- a/src/phases/trainer-victory-phase.ts
+++ b/src/phases/trainer-victory-phase.ts
@ -39,7 +39,7 @@ export class TrainerVictoryPhase extends BattlePhase {
    // Validate Voucher for boss trainers
    if (vouchers.hasOwnProperty(TrainerType[trainerType])) {
      if (!this.scene.validateVoucher(vouchers[TrainerType[trainerType]]) && this.scene.currentBattle.trainer?.config.isBoss) {
-        this.scene.unshiftPhase(new ModifierRewardPhase(this.scene, [ modifierTypes.VOUCHER, modifierTypes.VOUCHER, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM ][vouchers[TrainerType[trainerType]].voucherType]));
+        this.scene.unshiftPhase(new ModifierRewardPhase(this.scene, [ modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM ][vouchers[TrainerType[trainerType]].voucherType]));
      }
    }
    // Breeders in Space achievement
--- a/src/test/abilities/parental_bond.test.ts
+++ b/src/test/abilities/parental_bond.test.ts
@ -1,5 +1,5 @@
 import { Type } from "#enums/type";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { BattlerTagType } from "#enums/battler-tag-type";
 import { toDmgValue } from "#app/utils";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
@ -8,7 +8,7 @@ import { Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
 import GameManager from "#test/utils/gameManager";
 import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";


 describe("Abilities - Parental Bond", () => {
@ -470,4 +470,25 @@ describe("Abilities - Parental Bond", () => {
      expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(1);
    }
  );
+
+  it("should not allow Future Sight to hit infinitely many times if the user switches out", async () => {
+    game.override.enemyLevel(1000)
+      .moveset(Moves.FUTURE_SIGHT);
+    await game.classicMode.startBattle([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE ]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    vi.spyOn(enemyPokemon, "damageAndUpdate");
+
+    game.move.select(Moves.FUTURE_SIGHT);
+    await game.toNextTurn();
+
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    game.doSwitchPokemon(2);
+    await game.toNextTurn();
+
+    // TODO: Update hit count to 1 once Future Sight is fixed to not activate abilities if user is off the field
+    expect(enemyPokemon.damageAndUpdate).toHaveBeenCalledTimes(2);
+  });
 });
--- a/src/test/abilities/serene_grace.test.ts
+++ b/src/test/abilities/serene_grace.test.ts
@ -25,10 +25,13 @@ describe("Abilities - Serene Grace", () => {
  beforeEach(() => {
    game = new GameManager(phaserGame);
    game.override
+      .disableCrits()
      .battleType("single")
      .ability(Abilities.SERENE_GRACE)
-      .moveset([ Moves.AIR_SLASH, Moves.TACKLE ])
+      .moveset([ Moves.AIR_SLASH ])
+      .enemySpecies(Species.ALOLA_GEODUDE)
      .enemyLevel(10)
+      .enemyAbility(Abilities.BALL_FETCH)
      .enemyMoveset([ Moves.SPLASH ]);
  });

--- a/src/test/eggs/egg.test.ts
+++ b/src/test/eggs/egg.test.ts
@ -1,5 +1,4 @@
 import { speciesEggTiers } from "#app/data/balance/species-egg-tiers";
-import { speciesStarterCosts } from "#app/data/balance/starters";
 import { Egg, getLegendaryGachaSpeciesForTimestamp, getValidLegendaryGachaSpecies } from "#app/data/egg";
 import { allSpecies } from "#app/data/pokemon-species";
 import { EggSourceType } from "#app/enums/egg-source-types";
@ -33,28 +32,28 @@ describe("Egg Generation Tests", () => {
    await game.importData("src/test/utils/saves/everything.prsv");
  });

-  it("should return Arceus for the 10th of June", () => {
+  it("should return Kyogre for the 10th of June", () => {
    const scene = game.scene;
    const timestamp = new Date(2024, 5, 10, 15, 0, 0, 0).getTime();
-    const expectedSpecies = Species.ARCEUS;
+    const expectedSpecies = Species.KYOGRE;

    const result = getLegendaryGachaSpeciesForTimestamp(scene, timestamp);

    expect(result).toBe(expectedSpecies);
  });
-  it("should return Arceus for the 10th of July", () => {
+  it("should return Kyogre for the 10th of July", () => {
    const scene = game.scene;
    const timestamp = new Date(2024, 6, 10, 15, 0, 0, 0).getTime();
-    const expectedSpecies = Species.ARCEUS;
+    const expectedSpecies = Species.KYOGRE;

    const result = getLegendaryGachaSpeciesForTimestamp(scene, timestamp);

    expect(result).toBe(expectedSpecies);
  });
-  it("should hatch an Arceus around half the time. Set from legendary gacha", async () => {
+  it("should hatch a Kyogre around half the time. Set from legendary gacha", async () => {
    const scene = game.scene;
    const timestamp = new Date(2024, 6, 10, 15, 0, 0, 0).getTime();
-    const expectedSpecies = Species.ARCEUS;
+    const expectedSpecies = Species.KYOGRE;
    let gachaSpeciesCount = 0;

    for (let i = 0; i < EGG_HATCH_COUNT; i++) {
@ -385,23 +384,4 @@ describe("Egg Generation Tests", () => {
    expect(diffShiny).toBe(true);
    expect(diffAbility).toBe(true);
  });
-
-  // For now, we are using this test to detect oversights in egg tiers.
-  // Delete this test if the balance team rebalances species costs independently of egg tiers.
-  it("should have correct egg tiers based on species costs", () => {
-    const getExpectedEggTier = (starterCost) =>
-      starterCost <= 3 ? EggTier.COMMON
-        : starterCost <= 5 ? EggTier.RARE
-          : starterCost <= 7 ? EggTier.EPIC
-            : EggTier.LEGENDARY;
-
-    allSpecies.forEach(pokemonSpecies => {
-      const rootSpecies = pokemonSpecies.getRootSpeciesId();
-      const speciesCost = speciesStarterCosts[rootSpecies];
-      const expectedEggTier = getExpectedEggTier(speciesCost);
-      const actualEggTier = speciesEggTiers[rootSpecies];
-
-      expect(actualEggTier).toBe(expectedEggTier);
-    });
-  });
 });
--- a/src/test/items/multi_lens.test.ts
+++ b/src/test/items/multi_lens.test.ts
@ -24,7 +24,7 @@ describe("Items - Multi Lens", () => {
  beforeEach(() => {
    game = new GameManager(phaserGame);
    game.override
-      .moveset([ Moves.TACKLE, Moves.TRAILBLAZE, Moves.TACHYON_CUTTER ])
+      .moveset([ Moves.TACKLE, Moves.TRAILBLAZE, Moves.TACHYON_CUTTER, Moves.FUTURE_SIGHT ])
      .ability(Abilities.BALL_FETCH)
      .startingHeldItems([{ name: "MULTI_LENS" }])
      .battleType("single")
@ -170,6 +170,7 @@ describe("Items - Multi Lens", () => {
    await game.phaseInterceptor.to("MoveEndPhase");
    expect(enemyPokemon.getHpRatio()).toBeCloseTo(0.5, 5);
  });
+
  it("should result in correct damage for hp% attacks with 2 lenses + Parental Bond", async () => {
    game.override.startingHeldItems([{ name: "MULTI_LENS", count: 2 }])
      .moveset(Moves.SUPER_FANG)
@ -188,4 +189,24 @@ describe("Items - Multi Lens", () => {
    await game.phaseInterceptor.to("MoveEndPhase");
    expect(enemyPokemon.getHpRatio()).toBeCloseTo(0.25, 5);
  });
+
+  it("should not allow Future Sight to hit infinitely many times if the user switches out", async () => {
+    game.override.enemyLevel(1000);
+    await game.classicMode.startBattle([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE ]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    vi.spyOn(enemyPokemon, "damageAndUpdate");
+
+    game.move.select(Moves.FUTURE_SIGHT);
+    await game.toNextTurn();
+
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    game.doSwitchPokemon(2);
+    await game.toNextTurn();
+
+    // TODO: Update hit count to 1 once Future Sight is fixed to not activate held items if user is off the field
+    expect(enemyPokemon.damageAndUpdate).toHaveBeenCalledTimes(2);
+  });
 });
--- a/src/test/moves/lunar_dance.test.ts
+++ b/src/test/moves/lunar_dance.test.ts
@ -0,0 +1,77 @@
+import { StatusEffect } from "#app/enums/status-effect";
+import { CommandPhase } from "#app/phases/command-phase";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/utils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
+
+describe("Moves - Lunar Dance", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .statusEffect(StatusEffect.BURN)
+      .battleType("double")
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("should full restore HP, PP and status of switched in pokemon, then fail second use because no remaining backup pokemon in party", async () => {
+    await game.classicMode.startBattle([ Species.BULBASAUR, Species.ODDISH, Species.RATTATA ]);
+
+    const [ bulbasaur, oddish, rattata ] = game.scene.getPlayerParty();
+    game.move.changeMoveset(bulbasaur, [ Moves.LUNAR_DANCE, Moves.SPLASH ]);
+    game.move.changeMoveset(oddish, [ Moves.LUNAR_DANCE, Moves.SPLASH ]);
+    game.move.changeMoveset(rattata, [ Moves.LUNAR_DANCE, Moves.SPLASH ]);
+
+    game.move.select(Moves.SPLASH, 0);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to(CommandPhase);
+    await game.toNextTurn();
+
+    // Bulbasaur should still be burned and have used a PP for splash and not at max hp
+    expect(bulbasaur.status?.effect).toBe(StatusEffect.BURN);
+    expect(bulbasaur.moveset[1]?.ppUsed).toBe(1);
+    expect(bulbasaur.hp).toBeLessThan(bulbasaur.getMaxHp());
+
+    // Switch out Bulbasaur for Rattata so we can swtich bulbasaur back in with lunar dance
+    game.doSwitchPokemon(2);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to(CommandPhase);
+    await game.toNextTurn();
+
+    game.move.select(Moves.SPLASH, 0);
+    game.move.select(Moves.LUNAR_DANCE);
+    game.doSelectPartyPokemon(2);
+    await game.phaseInterceptor.to("SwitchPhase", false);
+    await game.toNextTurn();
+
+    // Bulbasaur should NOT have any status and have full PP for splash and be at max hp
+    expect(bulbasaur.status?.effect).toBeUndefined();
+    expect(bulbasaur.moveset[1]?.ppUsed).toBe(0);
+    expect(bulbasaur.isFullHp()).toBe(true);
+
+    game.move.select(Moves.SPLASH, 0);
+    game.move.select(Moves.LUNAR_DANCE);
+    await game.phaseInterceptor.to(CommandPhase);
+    await game.toNextTurn();
+
+    // Using Lunar dance again should fail because nothing in party and rattata should be alive
+    expect(rattata.status?.effect).toBe(StatusEffect.BURN);
+    expect(rattata.hp).toBeLessThan(rattata.getMaxHp());
+  });
+});
--- a/src/test/moves/powder.test.ts
+++ b/src/test/moves/powder.test.ts
@ -0,0 +1,318 @@
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import Phaser from "phaser";
+import GameManager from "#test/utils/gameManager";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { BerryPhase } from "#app/phases/berry-phase";
+import { MoveResult, PokemonMove } from "#app/field/pokemon";
+import { Type } from "#enums/type";
+import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { StatusEffect } from "#enums/status-effect";
+import { BattlerIndex } from "#app/battle";
+
+describe("Moves - Powder", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleType("single");
+
+    game.override
+      .enemySpecies(Species.SNORLAX)
+      .enemyLevel(100)
+      .enemyMoveset(Moves.EMBER)
+      .enemyAbility(Abilities.INSOMNIA)
+      .startingLevel(100)
+      .moveset([ Moves.POWDER, Moves.SPLASH, Moves.FIERY_DANCE, Moves.ROAR ]);
+  });
+
+  it(
+    "should cancel the target's Fire-type move, damage the target, and still consume the target's PP",
+    async () => {
+      // Cannot use enemy moveset override for this test, since it interferes with checking PP
+      game.override.enemyMoveset([]);
+      await game.classicMode.startBattle([ Species.CHARIZARD ]);
+
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+      enemyPokemon.moveset = [ new PokemonMove(Moves.EMBER) ];
+
+      game.move.select(Moves.POWDER);
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+      expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4));
+      expect(enemyPokemon.moveset[0]!.ppUsed).toBe(1);
+
+      await game.toNextTurn();
+
+      game.move.select(Moves.SPLASH);
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+      expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4));
+      expect(enemyPokemon.moveset[0]!.ppUsed).toBe(2);
+    });
+
+  it(
+    "should have no effect against Grass-type Pokemon",
+    async () => {
+      game.override.enemySpecies(Species.AMOONGUSS);
+
+      await game.classicMode.startBattle([ Species.CHARIZARD ]);
+
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.move.select(Moves.POWDER);
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+    });
+
+  it(
+    "should have no effect against Pokemon with Overcoat",
+    async () => {
+      game.override.enemyAbility(Abilities.OVERCOAT);
+
+      await game.classicMode.startBattle([ Species.CHARIZARD ]);
+
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.move.select(Moves.POWDER);
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+    });
+
+  it(
+    "should not damage the target if the target has Magic Guard",
+    async () => {
+      game.override.enemyAbility(Abilities.MAGIC_GUARD);
+
+      await game.classicMode.startBattle([ Species.CHARIZARD ]);
+
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.move.select(Moves.POWDER);
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+    });
+
+  it(
+    "should not damage the target if Primordial Sea is active",
+    async () => {
+      game.override.enemyAbility(Abilities.PRIMORDIAL_SEA);
+
+      await game.classicMode.startBattle([ Species.CHARIZARD ]);
+
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.move.select(Moves.POWDER);
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+    });
+
+  it(
+    "should not prevent the target from thawing out with Flame Wheel",
+    async () => {
+      game.override
+        .enemyMoveset(Array(4).fill(Moves.FLAME_WHEEL))
+        .enemyStatusEffect(StatusEffect.FREEZE);
+
+      await game.classicMode.startBattle([ Species.CHARIZARD ]);
+
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.move.select(Moves.POWDER);
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      expect(enemyPokemon.status?.effect).not.toBe(StatusEffect.FREEZE);
+      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+      expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4));
+    }
+  );
+
+  it(
+    "should not allow a target with Protean to change to Fire type",
+    async () => {
+      game.override.enemyAbility(Abilities.PROTEAN);
+
+      await game.classicMode.startBattle([ Species.CHARIZARD ]);
+
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.move.select(Moves.POWDER);
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+      expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+      expect(enemyPokemon.summonData?.types).not.toBe(Type.FIRE);
+    });
+
+  it(
+    "should cancel Fire-type moves generated by the target's Dancer ability",
+    async () => {
+      game.override
+        .battleType("double")
+        .enemySpecies(Species.BLASTOISE)
+        .enemyAbility(Abilities.DANCER);
+
+      await game.classicMode.startBattle([ Species.CHARIZARD, Species.CHARIZARD ]);
+
+      const playerPokemon = game.scene.getPlayerPokemon()!;
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      // Turn 1: Roar away 1 opponent
+      game.move.select(Moves.ROAR, 0, BattlerIndex.ENEMY_2);
+      game.move.select(Moves.SPLASH, 1);
+      await game.toNextTurn();
+      await game.toNextTurn(); // Requires game.toNextTurn() twice due to double battle
+
+      // Turn 2: Enemy should activate Powder twice: From using Ember, and from copying Fiery Dance via Dancer
+      playerPokemon.hp = playerPokemon.getMaxHp();
+      game.move.select(Moves.FIERY_DANCE, 0, BattlerIndex.ENEMY);
+      game.move.select(Moves.POWDER, 1, BattlerIndex.ENEMY);
+
+      await game.phaseInterceptor.to(MoveEffectPhase);
+      const enemyStartingHp = enemyPokemon.hp;
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+
+
+      // player should not take damage
+      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+      expect(playerPokemon.hp).toBe(playerPokemon.getMaxHp());
+      // enemy should have taken damage from player's Fiery Dance + 2 Powder procs
+      expect(enemyPokemon.hp).toBe(enemyStartingHp - playerPokemon.turnData.totalDamageDealt - 2 * Math.floor(enemyPokemon.getMaxHp() / 4));
+    });
+
+  it(
+    "should cancel Fiery Dance, then prevent it from triggering Dancer",
+    async () => {
+      game.override.ability(Abilities.DANCER)
+        .enemyMoveset(Moves.FIERY_DANCE);
+
+      await game.classicMode.startBattle([ Species.CHARIZARD ]);
+
+      const playerPokemon = game.scene.getPlayerPokemon()!;
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.move.select(Moves.POWDER);
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+      expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4));
+      expect(playerPokemon.getLastXMoves()[0].move).toBe(Moves.POWDER);
+    });
+
+  it(
+    "should cancel Revelation Dance if it becomes a Fire-type move",
+    async () => {
+      game.override
+        .enemySpecies(Species.CHARIZARD)
+        .enemyMoveset(Array(4).fill(Moves.REVELATION_DANCE));
+
+      await game.classicMode.startBattle([ Species.CHARIZARD ]);
+
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.move.select(Moves.POWDER);
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+      expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4));
+    });
+
+  it(
+    "should cancel Shell Trap and damage the target, even if the move would fail",
+    async () => {
+      game.override.enemyMoveset(Array(4).fill(Moves.SHELL_TRAP));
+
+      await game.classicMode.startBattle([ Species.CHARIZARD ]);
+
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.move.select(Moves.POWDER);
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+      expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4));
+    });
+
+  it(
+    "should cancel Grass Pledge if used after ally's Fire Pledge",
+    async () => {
+      game.override.enemyMoveset([ Moves.FIRE_PLEDGE, Moves.GRASS_PLEDGE ])
+        .battleType("double");
+
+      await game.classicMode.startBattle([ Species.CHARIZARD, Species.CHARIZARD ]);
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY);
+      game.move.select(Moves.SPLASH, 1);
+      await game.forceEnemyMove(Moves.GRASS_PLEDGE, BattlerIndex.PLAYER);
+      await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER);
+      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.ENEMY ]);
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+      expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4));
+    });
+
+  it(
+    "should cancel Fire Pledge if used before ally's Water Pledge",
+    async () => {
+      game.override.enemyMoveset([ Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE ])
+        .battleType("double");
+
+      await game.classicMode.startBattle([ Species.CHARIZARD, Species.CHARIZARD ]);
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY);
+      game.move.select(Moves.SPLASH, 1);
+      await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER);
+      await game.forceEnemyMove(Moves.WATER_PLEDGE, BattlerIndex.PLAYER);
+      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]);
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+      expect(enemyPokemon.hp).toBe(Math.ceil(3 * enemyPokemon.getMaxHp() / 4));
+    });
+
+  it(
+    "should NOT cancel Fire Pledge if used after ally's Water Pledge",
+    async () => {
+      game.override.enemyMoveset([ Moves.FIRE_PLEDGE, Moves.WATER_PLEDGE ])
+        .battleType("double");
+
+      await game.classicMode.startBattle([ Species.CHARIZARD, Species.CHARIZARD ]);
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY);
+      game.move.select(Moves.SPLASH, 1);
+      await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER);
+      await game.forceEnemyMove(Moves.WATER_PLEDGE, BattlerIndex.PLAYER);
+      await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.ENEMY ]);
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+      expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+    });
+});
--- a/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
@ -56,7 +56,7 @@ describe("Delibird-y - Mystery Encounter", () => {
    await game.runToMysteryEncounter(MysteryEncounterType.DELIBIRDY, defaultParty);

    expect(DelibirdyEncounter.encounterType).toBe(MysteryEncounterType.DELIBIRDY);
-    expect(DelibirdyEncounter.encounterTier).toBe(MysteryEncounterTier.GREAT);
+    expect(DelibirdyEncounter.encounterTier).toBe(MysteryEncounterTier.COMMON);
    expect(DelibirdyEncounter.dialogue).toBeDefined();
    expect(DelibirdyEncounter.dialogue.intro).toStrictEqual([{ text: `${namespace}:intro` }]);
    expect(DelibirdyEncounter.dialogue.outro).toStrictEqual([{ text: `${namespace}:outro` }]);
--- a/src/timed-event-manager.ts
+++ b/src/timed-event-manager.ts
@ -2,6 +2,9 @@ import BattleScene from "#app/battle-scene";
 import { TextStyle, addTextObject } from "#app/ui/text";
 import { nil } from "#app/utils";
 import i18next from "i18next";
+import { Species } from "#enums/species";
+import { WeatherPoolEntry } from "#app/data/weather";
+import { WeatherType } from "#enums/weather-type";

 export enum EventType {
  SHINY,
@ -16,6 +19,11 @@ interface EventBanner {
  availableLangs?: string[];
 }

+interface EventEncounter {
+  species: Species;
+  allowEvolution?: boolean;
+}
+
 interface TimedEvent extends EventBanner {
  name: string;
  eventType: EventType;
@ -23,19 +31,46 @@ interface TimedEvent extends EventBanner {
  friendshipMultiplier?: number;
  startDate: Date;
  endDate: Date;
+  uncommonBreedEncounters?: EventEncounter[];
+  delibirdyBuff?: string[];
+  weather?: WeatherPoolEntry[];
 }

 const timedEvents: TimedEvent[] = [
  {
-    name: "Halloween Update",
+    name: "Winter Holiday Update",
    eventType: EventType.SHINY,
    shinyMultiplier: 2,
-    friendshipMultiplier: 2,
-    startDate: new Date(Date.UTC(2024, 9, 27, 0)),
-    endDate: new Date(Date.UTC(2024, 10, 4, 0)),
-    bannerKey: "halloween2024-event-",
+    friendshipMultiplier: 1,
+    startDate: new Date(Date.UTC(2024, 11, 21, 0)),
+    endDate: new Date(Date.UTC(2025, 0, 4, 0)),
+    bannerKey: "winter_holidays2024-event-",
    scale: 0.21,
-    availableLangs: [ "en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN" ]
+    availableLangs: [ "en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN" ],
+    uncommonBreedEncounters: [
+      { species: Species.GIMMIGHOUL },
+      { species: Species.DELIBIRD },
+      { species: Species.STANTLER, allowEvolution: true },
+      { species: Species.CYNDAQUIL, allowEvolution: true },
+      { species: Species.PIPLUP, allowEvolution: true },
+      { species: Species.CHESPIN, allowEvolution: true },
+      { species: Species.BALTOY, allowEvolution: true },
+      { species: Species.SNOVER, allowEvolution: true },
+      { species: Species.CHINGLING, allowEvolution: true },
+      { species: Species.LITWICK, allowEvolution: true },
+      { species: Species.CUBCHOO, allowEvolution: true },
+      { species: Species.SWIRLIX, allowEvolution: true },
+      { species: Species.AMAURA, allowEvolution: true },
+      { species: Species.MUDBRAY, allowEvolution: true },
+      { species: Species.ROLYCOLY, allowEvolution: true },
+      { species: Species.MILCERY, allowEvolution: true },
+      { species: Species.SMOLIV, allowEvolution: true },
+      { species: Species.ALOLA_VULPIX, allowEvolution: true },
+      { species: Species.GALAR_DARUMAKA, allowEvolution: true },
+      { species: Species.IRON_BUNDLE }
+    ],
+    delibirdyBuff: [ "CATCHING_CHARM", "SHINY_CHARM", "ABILITY_CHARM", "EXP_CHARM", "SUPER_EXP_CHARM", "HEALING_CHARM" ],
+    weather: [{ weatherType: WeatherType.SNOW, weight: 1 }]
  }
 ];

@ -189,7 +224,7 @@ export class TimedEventDisplay extends Phaser.GameObjects.Container {
    const secs  = Math.round(diff % 6e4 / 1e3);

    // Return formatted string
-    return "Event Ends in : " + z(days) + "d " + z(hours) + "h " + z(mins) + "m " + z(secs) + "s";
+    return i18next.t("menu:eventTimer", { days: z(days), hours: z(hours), mins: z(mins), secs: z(secs) });
  }

  updateCountdown() {
--- a/src/ui/login-form-ui-handler.ts
+++ b/src/ui/login-form-ui-handler.ts
@ -81,7 +81,11 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
  }

  override getModalTitle(_config?: ModalConfig): string {
-    return i18next.t("menu:login");
+    let key = "menu:login";
+    if (import.meta.env.VITE_SERVER_URL === "https://apibeta.pokerogue.net") {
+      key = "menu:loginBeta";
+    }
+    return i18next.t(key);
  }

  override getWidth(_config?: ModalConfig): number {
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@ -362,12 +362,12 @@ export default class PartyUiHandler extends MessageUiHandler {
            if (p !== this.transferCursor) { // this skips adding the able/not able labels on the pokemon doing the transfer
              if (matchingModifier) { // if matchingModifier exists then the item exists on the new pokemon
                if (matchingModifier.getMaxStackCount(this.scene) === matchingModifier.stackCount) { // checks to see if the stack of items is at max stack; if so, set the description label to "Not able"
-                  ableToTransfer = "Not able";
+                  ableToTransfer = i18next.t("partyUiHandler:notAble");
                } else { // if the pokemon isn't at max stack, make the label "Able"
-                  ableToTransfer = "Able";
+                  ableToTransfer = i18next.t("partyUiHandler:able");
                }
              } else { // if matchingModifier doesn't exist, that means the pokemon doesn't have any of the item, and we need to show "Able"
-                ableToTransfer = "Able";
+                ableToTransfer = i18next.t("partyUiHandler:able");
              }
            } else { // this else relates to the transfer pokemon. We set the text to be blank so there's no "Able"/"Not able" text
              ableToTransfer = "";