@pkmn/sim 0.9.28 → 0.9.30

package/build/esm/data/pokemongo.mjs

@@ -8,14 +8,14 @@
  * - egg: Hatches from 2, 5, or 10 km eggs
  * - giovanni: Shadow Pokemon rescued from Giovanni and purified
  * - 12kmegg: Hatches from a 12 km egg, which is obtained from Team GO Rocket Leaders which unlock at level 8
- * - raid: Caught from defeating a raid boss
+ * - raid: Caught from defeating a raid boss (also used for GBL encounters)
  * - research: Reward from field research, special research, or research breakthrough
  * If the Pokemon is obtainable from the wild, other sources do not need to be included due to redundancy.
  * For shinies that can't be obtained from the wild, all other sources should be included.
  *
  * - Shiny origin restrictions:
  * - noshiny: This Pokemon's shiny form is unavailable in Pokemon GO
- * - nowildshiny: This Pokemon can't be obtained as shiny from the wild
+ * - (currently unused) nowildshiny: This Pokemon can't be obtained as shiny from the wild
  *
  * - Trade restrictions:
  * - notrade: This Pokemon cannot be traded at all
@@ -97,9 +97,9 @@ export const PokemonGoData = {
     mankey: { encounters: ['wild'] },
     primeape: { encounters: ['wild'] },
     growlithe: { encounters: ['wild'] },
-    growlithehisui: { encounters: ['egg', 'raid', 'research', 'noshiny'] }, // wild encounter available on 2023-08-26
+    growlithehisui: { encounters: ['wild'] },
     arcanine: { encounters: ['wild'] },
-    arcaninehisui: { encounters: ['egg', 'raid', 'research', 'noshiny'] }, // wild encounter available on 2023-08-26
+    arcaninehisui: { encounters: ['wild'] },
     poliwag: { encounters: ['wild'] },
     poliwhirl: { encounters: ['wild'] },
     poliwrath: { encounters: ['wild'] },
@@ -151,9 +151,9 @@ export const PokemonGoData = {
     krabby: { encounters: ['wild'] },
     kingler: { encounters: ['wild'] },
     voltorb: { encounters: ['wild'] },
-    voltorbhisui: { encounters: ['wild', 'noshiny'] },
+    voltorbhisui: { encounters: ['wild'] },
     electrode: { encounters: ['wild'] },
-    electrodehisui: { encounters: ['wild', 'noshiny'] },
+    electrodehisui: { encounters: ['wild'] },
     exeggcute: { encounters: ['wild'] },
     exeggutor: { encounters: ['wild'] },
     exeggutoralola: { encounters: ['wild'] },
@@ -239,6 +239,7 @@ export const PokemonGoData = {
     cyndaquil: { encounters: ['wild'] },
     quilava: { encounters: ['wild'] },
     typhlosion: { encounters: ['wild'] },
+    typhlosionhisui: { encounters: ['raid'] },
     totodile: { encounters: ['wild'] },
     croconaw: { encounters: ['wild'] },
     feraligatr: { encounters: ['wild'] },
@@ -276,6 +277,7 @@ export const PokemonGoData = {
     sunflora: { encounters: ['wild'] },
     yanma: { encounters: ['wild'] },
     wooper: { encounters: ['wild'] },
+    wooperpaldea: { encounters: ['wild'] },
     quagsire: { encounters: ['wild'] },
     espeon: { encounters: ['wild'] },
     umbreon: { encounters: ['wild'] },
@@ -295,7 +297,7 @@ export const PokemonGoData = {
     unownj: { encounters: ['wild'] },
     unownk: { encounters: ['wild', 'noshiny'] },
     unownl: { encounters: ['wild'] },
-    unownm: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-04
+    unownm: { encounters: ['wild'] },
     unownn: { encounters: ['wild'] },
     unowno: { encounters: ['wild'] },
     unownp: { encounters: ['wild'] },
@@ -309,8 +311,8 @@ export const PokemonGoData = {
     unownx: { encounters: ['wild'] },
     unowny: { encounters: ['wild'] },
     unownz: { encounters: ['wild', 'noshiny'] },
-    unownexclamation: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-04
-    unownquestion: { encounters: ['wild', 'noshiny'] },
+    unownexclamation: { encounters: ['wild'] },
+    unownquestion: { encounters: ['wild'] },
     wobbuffet: { encounters: ['wild'] },
     girafarig: { encounters: ['wild'] },
     pineco: { encounters: ['wild'] },
@@ -321,12 +323,12 @@ export const PokemonGoData = {
     snubbull: { encounters: ['wild'] },
     granbull: { encounters: ['wild'] },
     qwilfish: { encounters: ['wild'] },
-    qwilfishhisui: { encounters: ['wild', 'noshiny'] },
+    qwilfishhisui: { encounters: ['wild'] },
     scizor: { encounters: ['wild'] },
     shuckle: { encounters: ['wild'] },
     heracross: { encounters: ['wild'] },
     sneasel: { encounters: ['wild'] },
-    sneaselhisui: { encounters: ['wild', 'noshiny'] },
+    sneaselhisui: { encounters: ['wild'] },
     teddiursa: { encounters: ['wild'] },
     ursaring: { encounters: ['wild'] },
     slugma: { encounters: ['wild'] },
@@ -334,6 +336,7 @@ export const PokemonGoData = {
     swinub: { encounters: ['wild'] },
     piloswine: { encounters: ['wild'] },
     corsola: { encounters: ['wild'] },
+    corsolagalar: { encounters: ['egg'] },
     remoraid: { encounters: ['wild'] },
     octillery: { encounters: ['wild'] },
     delibird: { encounters: ['wild'] },
@@ -494,8 +497,8 @@ export const PokemonGoData = {
     registeel: { encounters: ['giovanni', 'raid', 'research', 'specialtrade'] },
     latias: { encounters: ['wild'] },
     latios: { encounters: ['wild'] },
-    kyogre: { encounters: ['raid', 'research', 'specialtrade'] },
-    groudon: { encounters: ['raid', 'research', 'specialtrade'] },
+    kyogre: { encounters: ['giovanni', 'raid', 'research', 'specialtrade'] },
+    groudon: { encounters: ['giovanni', 'raid', 'research', 'specialtrade'] },
     rayquaza: { encounters: ['raid', 'research', 'specialtrade'] },
     jirachi: { encounters: ['research', 'notrade'] },
     deoxys: { encounters: ['raid', 'specialtrade'] },
@@ -531,14 +534,14 @@ export const PokemonGoData = {
     mothim: { encounters: ['wild'] },
     combee: { encounters: ['wild'] },
     vespiquen: { encounters: ['wild'] },
-    pachirisu: { encounters: ['wild', 'noshiny'] },
+    pachirisu: { encounters: ['wild'] },
     buizel: { encounters: ['wild'] },
     floatzel: { encounters: ['wild'] },
     cherubi: { encounters: ['wild'] },
-    shellos: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-26
-    shelloseast: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-26
-    gastrodon: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-26
-    gastrodoneast: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-26
+    shellos: { encounters: ['wild'] },
+    shelloseast: { encounters: ['wild'] },
+    gastrodon: { encounters: ['wild'] },
+    gastrodoneast: { encounters: ['wild'] },
     ambipom: { encounters: ['wild'] },
     drifloon: { encounters: ['wild'] },
     drifblim: { encounters: ['wild'] },
@@ -548,29 +551,29 @@ export const PokemonGoData = {
     honchkrow: { encounters: ['wild'] },
     glameow: { encounters: ['wild'] },
     purugly: { encounters: ['wild'] },
-    chingling: { encounters: ['egg', 'noshiny'] },
-    stunky: { encounters: ['wild', 'noshiny'] },
-    skuntank: { encounters: ['wild', 'noshiny'] },
+    chingling: { encounters: ['egg'] },
+    stunky: { encounters: ['wild'] },
+    skuntank: { encounters: ['wild'] },
     bronzor: { encounters: ['wild'] },
     bronzong: { encounters: ['wild'] },
     bonsly: { encounters: ['egg'] },
     mimejr: { encounters: ['egg'] },
     happiny: { encounters: ['egg'] },
-    chatot: { encounters: ['wild', 'noshiny'] },
+    chatot: { encounters: ['wild'] },
     spiritomb: { encounters: ['research'] },
     gible: { encounters: ['wild'] },
     gabite: { encounters: ['wild'] },
     garchomp: { encounters: ['wild'] },
     munchlax: { encounters: ['egg'] },
     riolu: { encounters: ['egg'] },
-    lucario: { encounters: ['egg', 'research'] }, // wild encounter available on 2023-08-18
+    lucario: { encounters: ['wild'] },
     hippopotas: { encounters: ['wild'] },
     hippowdon: { encounters: ['wild'] },
     skorupi: { encounters: ['wild'] },
     drapion: { encounters: ['wild'] },
     croagunk: { encounters: ['wild'] },
     toxicroak: { encounters: ['wild'] },
-    carnivine: { encounters: ['wild', 'noshiny'] },
+    carnivine: { encounters: ['wild'] },
     finneon: { encounters: ['wild'] },
     lumineon: { encounters: ['wild'] },
     mantyke: { encounters: ['egg'] },
@@ -594,18 +597,18 @@ export const PokemonGoData = {
     probopass: { encounters: ['wild'] },
     dusknoir: { encounters: ['wild'] },
     froslass: { encounters: ['wild'] },
-    rotom: { encounters: ['wild', 'noshiny'] },
+    rotom: { encounters: ['wild'] },
     uxie: { encounters: ['wild'] },
     mesprit: { encounters: ['wild'] },
     azelf: { encounters: ['wild'] },
     dialga: { encounters: ['raid', 'specialtrade'] },
-    palkia: { encounters: ['raid', 'specialtrade'] },
-    heatran: { encounters: ['raid', 'specialtrade'] },
-    regigigas: { encounters: ['raid', 'research', 'specialtrade'] },
+    palkia: { encounters: ['giovanni', 'raid', 'specialtrade'] },
+    heatran: { encounters: ['giovanni', 'raid', 'research', 'specialtrade'] },
+    regigigas: { encounters: ['giovanni', 'raid', 'research', 'specialtrade'] },
     giratina: { encounters: ['raid', 'specialtrade'] },
-    cresselia: { encounters: ['raid', 'research', 'specialtrade'] },
-    darkrai: { encounters: ['raid', 'notrade'] },
-    shaymin: { encounters: ['research', 'noshiny', 'notrade'] },
+    cresselia: { encounters: ['giovanni', 'raid', 'research', 'specialtrade'] },
+    darkrai: { encounters: ['raid', 'research', 'notrade'] },
+    shaymin: { encounters: ['research', 'notrade'] },
     victini: { encounters: ['research', 'noshiny', 'notrade'] },
     snivy: { encounters: ['wild'] },
     servine: { encounters: ['wild'] },
@@ -616,6 +619,7 @@ export const PokemonGoData = {
     oshawott: { encounters: ['wild'] },
     dewott: { encounters: ['wild'] },
     samurott: { encounters: ['wild'] },
+    samurotthisui: { encounters: ['raid'] },
     patrat: { encounters: ['wild'] },
     watchog: { encounters: ['wild'] },
     lillipup: { encounters: ['wild'] },
@@ -644,9 +648,9 @@ export const PokemonGoData = {
     drilbur: { encounters: ['wild'] },
     excadrill: { encounters: ['wild'] },
     audino: { encounters: ['wild'] },
-    timburr: { encounters: ['egg', 'raid'] }, // wild encounter available on 2023-08-26
-    gurdurr: { encounters: ['egg', 'raid'] }, // wild encounter available on 2023-08-26
-    conkeldurr: { encounters: ['egg', 'raid'] }, // wild encounter available on 2023-08-26
+    timburr: { encounters: ['wild'] },
+    gurdurr: { encounters: ['wild'] },
+    conkeldurr: { encounters: ['wild'] },
     tympole: { encounters: ['wild'] },
     palpitoad: { encounters: ['wild'] },
     seismitoad: { encounters: ['wild'] },
@@ -660,23 +664,24 @@ export const PokemonGoData = {
     scolipede: { encounters: ['wild'] },
     cottonee: { encounters: ['wild'] },
     whimsicott: { encounters: ['wild'] },
-    petilil: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-04
-    lilligant: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-04
-    basculin: { encounters: ['wild', 'noshiny'] },
-    basculinbluestriped: { encounters: ['wild', 'noshiny'] },
-    sandile: { encounters: ['12kmegg', 'research', 'noshiny'] },
-    krokorok: { encounters: ['12kmegg', 'research', 'noshiny'] },
-    krookodile: { encounters: ['12kmegg', 'research', 'noshiny'] },
+    petilil: { encounters: ['wild'] },
+    lilligant: { encounters: ['wild'] },
+    basculin: { encounters: ['wild', 'noshiny'] }, // Shiny available 2025-02-21
+    basculinbluestriped: { encounters: ['wild', 'noshiny'] }, // Shiny available 2025-02-21
+    basculinwhitestriped: { encounters: ['wild'] },
+    sandile: { encounters: ['12kmegg', 'raid', 'research'] },
+    krokorok: { encounters: ['12kmegg', 'raid', 'research'] },
+    krookodile: { encounters: ['12kmegg', 'raid', 'research'] },
     darumaka: { encounters: ['wild'] },
     darumakagalar: { encounters: ['wild'] },
     darmanitan: { encounters: ['wild'] },
     darmanitangalar: { encounters: ['wild'] },
-    maractus: { encounters: ['wild', 'noshiny'] },
+    maractus: { encounters: ['wild', 'noshiny'] }, // Shiny available 2025-02-21
     dwebble: { encounters: ['wild'] },
     crustle: { encounters: ['wild'] },
-    scraggy: { encounters: ['wild', 'noshiny'] },
-    scrafty: { encounters: ['wild', 'noshiny'] },
-    sigilyph: { encounters: ['wild', 'noshiny'] },
+    scraggy: { encounters: ['wild'] },
+    scrafty: { encounters: ['wild'] },
+    sigilyph: { encounters: ['wild'] },
     yamask: { encounters: ['wild'] },
     yamaskgalar: { encounters: ['egg', 'raid', 'research'] },
     cofagrigus: { encounters: ['wild'] },
@@ -686,22 +691,22 @@ export const PokemonGoData = {
     archeops: { encounters: ['wild'] },
     trubbish: { encounters: ['wild'] },
     garbodor: { encounters: ['wild'] },
-    zorua: { encounters: ['wild', 'noshiny'] },
-    zoroark: { encounters: ['wild', 'noshiny'] },
+    zorua: { encounters: ['wild'] },
+    zoroark: { encounters: ['wild'] },
     minccino: { encounters: ['wild'] },
     cinccino: { encounters: ['wild'] },
-    gothita: { encounters: ['wild', 'noshiny'] },
-    gothorita: { encounters: ['wild', 'noshiny'] },
-    gothitelle: { encounters: ['wild', 'noshiny'] },
-    solosis: { encounters: ['wild', 'noshiny'] },
-    duosion: { encounters: ['wild', 'noshiny'] },
-    reuniclus: { encounters: ['wild', 'noshiny'] },
-    ducklett: { encounters: ['wild', 'noshiny'] },
-    swanna: { encounters: ['wild', 'noshiny'] },
-    vanillite: { encounters: ['wild', 'noshiny'] },
-    vanillish: { encounters: ['wild', 'noshiny'] },
-    vanilluxe: { encounters: ['wild', 'noshiny'] },
-    deerling: { encounters: ['wild', 'noshiny'] },
+    gothita: { encounters: ['wild'] },
+    gothorita: { encounters: ['wild'] },
+    gothitelle: { encounters: ['wild'] },
+    solosis: { encounters: ['wild'] },
+    duosion: { encounters: ['wild'] },
+    reuniclus: { encounters: ['wild'] },
+    ducklett: { encounters: ['wild'] },
+    swanna: { encounters: ['wild'] },
+    vanillite: { encounters: ['wild'] },
+    vanillish: { encounters: ['wild'] },
+    vanilluxe: { encounters: ['wild'] },
+    deerling: { encounters: ['wild', 'noshiny'] }, // Shiny available 2025-02-21
     deerlingsummer: { encounters: ['wild', 'noshiny'] },
     deerlingautumn: { encounters: ['wild', 'noshiny'] },
     deerlingwinter: { encounters: ['wild', 'noshiny'] },
@@ -709,7 +714,7 @@ export const PokemonGoData = {
     sawsbucksummer: { encounters: ['wild', 'noshiny'] },
     sawsbuckautumn: { encounters: ['wild', 'noshiny'] },
     sawsbuckwinter: { encounters: ['wild', 'noshiny'] },
-    emolga: { encounters: ['wild', 'noshiny'] },
+    emolga: { encounters: ['wild'] },
     karrablast: { encounters: ['wild'] },
     escavalier: { encounters: ['wild'] },
     foongus: { encounters: ['wild'] },
@@ -717,16 +722,16 @@ export const PokemonGoData = {
     frillish: { encounters: ['wild'] },
     jellicent: { encounters: ['wild'] },
     alomomola: { encounters: ['wild'] },
-    joltik: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-26
-    galvantula: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-26
+    joltik: { encounters: ['wild'] },
+    galvantula: { encounters: ['wild'] },
     ferroseed: { encounters: ['wild'] },
     ferrothorn: { encounters: ['wild'] },
     klink: { encounters: ['wild'] },
     klang: { encounters: ['wild'] },
     klinklang: { encounters: ['wild'] },
-    tynamo: { encounters: ['wild', 'noshiny'] },
-    eelektrik: { encounters: ['wild', 'noshiny'] },
-    eelektross: { encounters: ['wild', 'noshiny'] },
+    tynamo: { encounters: ['wild'] },
+    eelektrik: { encounters: ['wild'] },
+    eelektross: { encounters: ['wild'] },
     elgyem: { encounters: ['wild'] },
     beheeyem: { encounters: ['wild'] },
     litwick: { encounters: ['wild'] },
@@ -737,22 +742,22 @@ export const PokemonGoData = {
     haxorus: { encounters: ['wild'] },
     cubchoo: { encounters: ['wild'] },
     beartic: { encounters: ['wild'] },
-    cryogonal: { encounters: ['wild', 'noshiny'] },
+    cryogonal: { encounters: ['wild'] },
     shelmet: { encounters: ['wild'] },
     accelgor: { encounters: ['wild'] },
     stunfisk: { encounters: ['wild'] },
     stunfiskgalar: { encounters: ['wild'] },
-    mienfoo: { encounters: ['wild', 'noshiny'] },
-    mienshao: { encounters: ['wild', 'noshiny'] },
-    druddigon: { encounters: ['raid', 'research'] },
-    golett: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-18
-    golurk: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-18
-    pawniard: { encounters: ['12kmegg', 'research'] }, // wild encounter available on 2023-08-18
-    bisharp: { encounters: ['12kmegg', 'research'] }, // wild encounter available on 2023-08-18
-    bouffalant: { encounters: ['wild', 'noshiny'] },
+    mienfoo: { encounters: ['wild'] },
+    mienshao: { encounters: ['wild'] },
+    druddigon: { encounters: ['wild'] },
+    golett: { encounters: ['wild'] },
+    golurk: { encounters: ['wild'] },
+    pawniard: { encounters: ['wild'] },
+    bisharp: { encounters: ['wild'] },
+    bouffalant: { encounters: ['wild'] },
     rufflet: { encounters: ['wild'] },
     braviary: { encounters: ['wild'] },
-    braviaryhisui: { encounters: ['raid'] },
+    braviaryhisui: { encounters: ['wild'] },
     vullaby: { encounters: ['wild'] },
     mandibuzz: { encounters: ['wild'] },
     heatmor: { encounters: ['wild'] },
@@ -760,16 +765,16 @@ export const PokemonGoData = {
     deino: { encounters: ['wild'] },
     zweilous: { encounters: ['wild'] },
     hydreigon: { encounters: ['wild'] },
-    larvesta: { encounters: ['egg', 'noshiny'] },
-    volcarona: { encounters: ['egg', 'noshiny'] },
-    cobalion: { encounters: ['raid', 'specialtrade'] },
-    terrakion: { encounters: ['raid', 'specialtrade'] },
-    virizion: { encounters: ['raid', 'specialtrade'] },
-    tornadus: { encounters: ['raid', 'specialtrade'] },
-    thundurus: { encounters: ['raid', 'specialtrade'] },
+    larvesta: { encounters: ['egg'] },
+    volcarona: { encounters: ['egg'] },
+    cobalion: { encounters: ['raid', 'specialtrade'] }, // research available 2025-02-24
+    terrakion: { encounters: ['raid', 'specialtrade'] }, // research available 2025-02-24
+    virizion: { encounters: ['raid', 'specialtrade'] }, // research available 2025-02-24
+    tornadus: { encounters: ['raid', 'research', 'specialtrade'] }, // research available 2025-02-21
+    thundurus: { encounters: ['raid', 'research', 'specialtrade'] }, // research available 2025-02-21
     reshiram: { encounters: ['raid', 'specialtrade'] },
     zekrom: { encounters: ['raid', 'specialtrade'] },
-    landorus: { encounters: ['raid', 'specialtrade'] },
+    landorus: { encounters: ['raid', 'research', 'specialtrade'] }, // research available 2025-02-21
     kyurem: { encounters: ['raid', 'specialtrade'] },
     // Kyurem-Black/White are not directly obtained from Pokemon GO but should be able to have legal Pokemon GO origin
     kyuremblack: { encounters: ['raid', 'specialtrade'] },
@@ -783,9 +788,9 @@ export const PokemonGoData = {
     fennekin: { encounters: ['wild'] },
     braixen: { encounters: ['wild'] },
     delphox: { encounters: ['wild'] },
-    froakie: { encounters: ['wild', 'noshiny'] },
-    frogadier: { encounters: ['wild', 'noshiny'] },
-    greninja: { encounters: ['wild', 'noshiny'] },
+    froakie: { encounters: ['wild'] },
+    frogadier: { encounters: ['wild'] },
+    greninja: { encounters: ['wild'] },
     bunnelby: { encounters: ['wild'] },
     diggersby: { encounters: ['wild'] },
     fletchling: { encounters: ['wild'] },
@@ -793,45 +798,45 @@ export const PokemonGoData = {
     talonflame: { encounters: ['wild'] },
     // Scatterbug is actually obtained in a special type of encounter,
     // but the level and IV floors are the same as research encounters
-    scatterbug: { encounters: ['research', 'noshiny'] },
-    spewpa: { encounters: ['research', 'noshiny'] },
-    vivillon: { encounters: ['research', 'noshiny'] },
-    vivillonarchipelago: { encounters: ['research', 'noshiny'] },
-    vivilloncontinent: { encounters: ['research', 'noshiny'] },
-    vivillonelegant: { encounters: ['research', 'noshiny'] },
-    vivillongarden: { encounters: ['research', 'noshiny'] },
-    vivillonhighplains: { encounters: ['research', 'noshiny'] },
-    vivillonicysnow: { encounters: ['research', 'noshiny'] },
-    vivillonjungle: { encounters: ['research', 'noshiny'] },
-    vivillonmarine: { encounters: ['research', 'noshiny'] },
-    vivillonmodern: { encounters: ['research', 'noshiny'] },
-    vivillonmonsoon: { encounters: ['research', 'noshiny'] },
-    vivillonocean: { encounters: ['research', 'noshiny'] },
-    vivillonpolar: { encounters: ['research', 'noshiny'] },
-    vivillonriver: { encounters: ['research', 'noshiny'] },
-    vivillonsandstorm: { encounters: ['research', 'noshiny'] },
-    vivillonsavanna: { encounters: ['research', 'noshiny'] },
-    vivillonsun: { encounters: ['research', 'noshiny'] },
-    vivillontundra: { encounters: ['research', 'noshiny'] },
+    scatterbug: { encounters: ['research'] },
+    spewpa: { encounters: ['research'] },
+    vivillon: { encounters: ['research'] },
+    vivillonarchipelago: { encounters: ['research'] },
+    vivilloncontinent: { encounters: ['research'] },
+    vivillonelegant: { encounters: ['research'] },
+    vivillongarden: { encounters: ['research'] },
+    vivillonhighplains: { encounters: ['research'] },
+    vivillonicysnow: { encounters: ['research'] },
+    vivillonjungle: { encounters: ['research'] },
+    vivillonmarine: { encounters: ['research'] },
+    vivillonmodern: { encounters: ['research'] },
+    vivillonmonsoon: { encounters: ['research'] },
+    vivillonocean: { encounters: ['research'] },
+    vivillonpolar: { encounters: ['research'] },
+    vivillonriver: { encounters: ['research'] },
+    vivillonsandstorm: { encounters: ['research'] },
+    vivillonsavanna: { encounters: ['research'] },
+    vivillonsun: { encounters: ['research'] },
+    vivillontundra: { encounters: ['research'] },
     litleo: { encounters: ['wild'] },
     pyroar: { encounters: ['wild'] },
-    flabebe: { encounters: ['wild', 'noshiny'] },
-    flabebeblue: { encounters: ['wild', 'noshiny'] },
-    flabebeorange: { encounters: ['wild', 'noshiny'] },
-    flabebewhite: { encounters: ['wild', 'noshiny'] },
-    flabebeyellow: { encounters: ['wild', 'noshiny'] },
-    floette: { encounters: ['wild', 'noshiny'] },
-    floetteblue: { encounters: ['wild', 'noshiny'] },
-    floetteorange: { encounters: ['wild', 'noshiny'] },
-    floettewhite: { encounters: ['wild', 'noshiny'] },
-    floetteyellow: { encounters: ['wild', 'noshiny'] },
-    florges: { encounters: ['wild', 'noshiny'] },
-    florgesblue: { encounters: ['wild', 'noshiny'] },
-    florgesorange: { encounters: ['wild', 'noshiny'] },
-    florgeswhite: { encounters: ['wild', 'noshiny'] },
-    florgesyellow: { encounters: ['wild', 'noshiny'] },
-    pancham: { encounters: ['wild', '12kmegg', 'raid', 'research', 'nowildshiny'] },
-    pangoro: { encounters: ['wild', '12kmegg', 'raid', 'research', 'nowildshiny'] },
+    flabebe: { encounters: ['wild'] },
+    flabebeblue: { encounters: ['wild'] },
+    flabebeorange: { encounters: ['wild'] },
+    flabebewhite: { encounters: ['wild'] },
+    flabebeyellow: { encounters: ['wild'] },
+    floette: { encounters: ['wild'] },
+    floetteblue: { encounters: ['wild'] },
+    floetteorange: { encounters: ['wild'] },
+    floettewhite: { encounters: ['wild'] },
+    floetteyellow: { encounters: ['wild'] },
+    florges: { encounters: ['wild'] },
+    florgesblue: { encounters: ['wild'] },
+    florgesorange: { encounters: ['wild'] },
+    florgeswhite: { encounters: ['wild'] },
+    florgesyellow: { encounters: ['wild'] },
+    pancham: { encounters: ['wild'] },
+    pangoro: { encounters: ['wild'] },
     furfrou: { encounters: ['wild'] },
     furfroudandy: { encounters: ['wild'] },
     furfroudebutante: { encounters: ['wild'] },
@@ -853,97 +858,105 @@ export const PokemonGoData = {
     malamar: { encounters: ['wild'] },
     binacle: { encounters: ['wild'] },
     barbaracle: { encounters: ['wild'] },
-    skrelp: { encounters: ['wild', 'noshiny'] },
-    dragalge: { encounters: ['wild', 'noshiny'] },
+    skrelp: { encounters: ['wild'] },
+    dragalge: { encounters: ['wild'] },
     clauncher: { encounters: ['wild'] },
     clawitzer: { encounters: ['wild'] },
     helioptile: { encounters: ['wild'] },
     heliolisk: { encounters: ['wild'] },
-    tyrunt: { encounters: ['wild', 'noshiny'] },
-    tyrantrum: { encounters: ['wild', 'noshiny'] },
-    amaura: { encounters: ['wild', 'noshiny'] },
-    aurorus: { encounters: ['wild', 'noshiny'] },
+    tyrunt: { encounters: ['wild'] },
+    tyrantrum: { encounters: ['wild'] },
+    amaura: { encounters: ['wild'] },
+    aurorus: { encounters: ['wild'] },
     sylveon: { encounters: ['wild'] },
     hawlucha: { encounters: ['wild', 'noshiny'] },
     dedenne: { encounters: ['wild'] },
     carbink: { encounters: ['research', 'noshiny'] },
-    goomy: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-26
-    sliggoo: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-26
-    goodra: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-26
+    goomy: { encounters: ['wild'] },
+    sliggoo: { encounters: ['wild'] },
+    goodra: { encounters: ['wild'] },
     klefki: { encounters: ['wild', 'noshiny'] },
-    phantump: { encounters: ['wild', 'noshiny'] },
-    trevenant: { encounters: ['wild', 'noshiny'] },
-    pumpkaboo: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-04
-    pumpkaboolarge: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-04
-    pumpkaboosmall: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-04
-    pumpkaboosuper: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-04
-    gourgeist: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-04
-    gourgeistlarge: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-04
-    gourgeistsmall: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-04
-    gourgeistsuper: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-04
+    phantump: { encounters: ['wild'] },
+    trevenant: { encounters: ['wild'] },
+    pumpkaboo: { encounters: ['wild'] },
+    pumpkaboolarge: { encounters: ['wild'] },
+    pumpkaboosmall: { encounters: ['wild'] },
+    pumpkaboosuper: { encounters: ['wild'] },
+    gourgeist: { encounters: ['wild'] },
+    gourgeistlarge: { encounters: ['wild'] },
+    gourgeistsmall: { encounters: ['wild'] },
+    gourgeistsuper: { encounters: ['wild'] },
     bergmite: { encounters: ['wild'] },
     avalugg: { encounters: ['wild'] },
-    avalugghisui: { encounters: ['raid'] },
+    avalugghisui: { encounters: ['wild'] },
     noibat: { encounters: ['wild'] },
     noivern: { encounters: ['wild'] },
     xerneas: { encounters: ['raid', 'specialtrade'] },
     yveltal: { encounters: ['raid', 'specialtrade'] },
-    // zygarde: {encounters: ['research', 'noshiny']}, trading/transferring may be made available in the future
-    // diancie: {encounters: ['research', 'noshiny', 'notrade']}, transferring may be made available in the future
+    // zygarde: {encounters: ['research', 'noshiny', 'notrade']},
+    diancie: { encounters: ['research', 'noshiny', 'notrade'] },
     hoopa: { encounters: ['raid', 'research', 'noshiny', 'notrade'] },
-    rowlet: { encounters: ['wild', 'noshiny'] },
-    dartrix: { encounters: ['wild', 'noshiny'] },
-    decidueye: { encounters: ['wild', 'noshiny'] },
-    litten: { encounters: ['wild', 'noshiny'] },
-    torracat: { encounters: ['wild', 'noshiny'] },
-    incineroar: { encounters: ['wild', 'noshiny'] },
-    popplio: { encounters: ['wild', 'noshiny'] },
-    brionne: { encounters: ['wild', 'noshiny'] },
-    primarina: { encounters: ['wild', 'noshiny'] },
+    rowlet: { encounters: ['wild'] },
+    dartrix: { encounters: ['wild'] },
+    decidueye: { encounters: ['wild'] },
+    decidueyehisui: { encounters: ['raid'] },
+    litten: { encounters: ['wild'] },
+    torracat: { encounters: ['wild'] },
+    incineroar: { encounters: ['wild'] },
+    popplio: { encounters: ['wild'] },
+    brionne: { encounters: ['wild'] },
+    primarina: { encounters: ['wild'] },
     pikipek: { encounters: ['wild', 'noshiny'] },
     trumbeak: { encounters: ['wild', 'noshiny'] },
     toucannon: { encounters: ['wild', 'noshiny'] },
     yungoos: { encounters: ['wild'] },
     gumshoos: { encounters: ['wild'] },
-    grubbin: { encounters: ['wild', 'noshiny'] },
-    charjabug: { encounters: ['wild', 'noshiny'] },
-    vikavolt: { encounters: ['wild', 'noshiny'] },
-    crabrawler: { encounters: ['wild', 'noshiny'] },
-    crabominable: { encounters: ['wild', 'noshiny'] },
-    oricorio: { encounters: ['wild', 'noshiny'] },
-    cutiefly: { encounters: ['wild', 'noshiny'] },
-    ribombee: { encounters: ['wild', 'noshiny'] },
+    grubbin: { encounters: ['wild'] },
+    charjabug: { encounters: ['wild'] },
+    vikavolt: { encounters: ['wild'] },
+    crabrawler: { encounters: ['wild'] },
+    crabominable: { encounters: ['wild'] },
+    oricorio: { encounters: ['wild'] },
+    cutiefly: { encounters: ['wild'] },
+    ribombee: { encounters: ['wild'] },
     rockruff: { encounters: ['wild'] },
+    rockruffdusk: { encounters: ['wild'] },
     lycanroc: { encounters: ['wild'] },
     lycanrocmidnight: { encounters: ['wild'] },
-    mareanie: { encounters: ['wild', 'noshiny'] },
-    toxapex: { encounters: ['wild', 'noshiny'] },
-    dewpider: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-04
-    araquanid: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-04
+    lycanrocdusk: { encounters: ['wild'] },
+    mareanie: { encounters: ['wild'] },
+    toxapex: { encounters: ['wild'] },
+    // mudbray: {encounters: ['wild']}, available 2025-03-29
+    // mudsdale: {encounters: ['wild']},
+    dewpider: { encounters: ['wild'] },
+    araquanid: { encounters: ['wild'] },
     fomantis: { encounters: ['wild'] },
     lurantis: { encounters: ['wild'] },
-    morelull: { encounters: ['wild', 'noshiny'] },
-    shiinotic: { encounters: ['wild', 'noshiny'] },
-    salandit: { encounters: ['12kmegg', 'noshiny'] },
-    salazzle: { encounters: ['12kmegg', 'noshiny'] },
+    morelull: { encounters: ['wild'] },
+    shiinotic: { encounters: ['wild'] },
+    salandit: { encounters: ['12kmegg', 'research', 'noshiny'] },
+    salazzle: { encounters: ['12kmegg', 'research', 'noshiny'] },
     stufful: { encounters: ['wild'] },
     bewear: { encounters: ['wild'] },
-    bounsweet: { encounters: ['wild', 'noshiny'] },
-    steenee: { encounters: ['wild', 'noshiny'] },
-    tsareena: { encounters: ['wild', 'noshiny'] },
+    bounsweet: { encounters: ['wild'] },
+    steenee: { encounters: ['wild'] },
+    tsareena: { encounters: ['wild'] },
     comfey: { encounters: ['wild', 'noshiny'] },
-    oranguru: { encounters: ['wild', 'noshiny'] }, // shiny available on 2023-08-26
-    wimpod: { encounters: ['wild', 'noshiny'] },
-    golisopod: { encounters: ['wild', 'noshiny'] },
-    sandygast: { encounters: ['raid', 'research', 'noshiny'] },
-    palossand: { encounters: ['raid', 'research', 'noshiny'] },
-    komala: { encounters: ['wild', 'noshiny'] },
-    turtonator: { encounters: ['raid', 'research'] },
-    togedemaru: { encounters: ['wild', 'noshiny'] },
+    oranguru: { encounters: ['wild'] },
+    passimian: { encounters: ['wild'] },
+    wimpod: { encounters: ['wild'] },
+    golisopod: { encounters: ['wild'] },
+    sandygast: { encounters: ['wild'] },
+    palossand: { encounters: ['wild'] },
+    komala: { encounters: ['wild'] },
+    turtonator: { encounters: ['egg', 'raid', 'research'] },
+    togedemaru: { encounters: ['wild'] },
     bruxish: { encounters: ['wild', 'noshiny'] },
-    jangmoo: { encounters: ['wild', 'noshiny'] },
-    hakamoo: { encounters: ['wild', 'noshiny'] },
-    kommoo: { encounters: ['wild', 'noshiny'] },
+    drampa: { encounters: ['egg', 'raid', 'research'] },
+    dhelmise: { encounters: ['raid', 'noshiny'] },
+    jangmoo: { encounters: ['wild'] },
+    hakamoo: { encounters: ['wild'] },
+    kommoo: { encounters: ['wild'] },
     tapukoko: { encounters: ['raid'] },
     tapulele: { encounters: ['raid'] },
     tapubulu: { encounters: ['raid'] },
@@ -953,31 +966,111 @@ export const PokemonGoData = {
     solgaleo: { encounters: ['research', 'noshiny', 'specialtrade'] },
     lunala: { encounters: ['research', 'noshiny', 'specialtrade'] },
     nihilego: { encounters: ['raid', 'research', 'specialtrade'] },
-    buzzwole: { encounters: ['raid', 'research', 'noshiny', 'specialtrade'] },
-    pheromosa: { encounters: ['raid', 'research', 'noshiny', 'specialtrade'] },
-    xurkitree: { encounters: ['raid', 'research', 'noshiny', 'specialtrade'] },
-    celesteela: { encounters: ['raid', 'research', 'noshiny', 'specialtrade'] },
-    kartana: { encounters: ['raid', 'research', 'noshiny', 'specialtrade'] },
-    guzzlord: { encounters: ['raid', 'research', 'noshiny', 'specialtrade'] },
+    buzzwole: { encounters: ['raid', 'research', 'specialtrade'] },
+    pheromosa: { encounters: ['raid', 'research', 'specialtrade'] },
+    xurkitree: { encounters: ['raid', 'research', 'specialtrade'] },
+    celesteela: { encounters: ['raid', 'research', 'specialtrade'] },
+    kartana: { encounters: ['raid', 'research', 'specialtrade'] },
+    guzzlord: { encounters: ['raid', 'research', 'specialtrade'] },
+    poipole: { encounters: ['research', 'noshiny', 'specialtrade'] },
+    naganadel: { encounters: ['research', 'noshiny', 'specialtrade'] },
+    stakataka: { encounters: ['raid', 'research', 'noshiny', 'specialtrade'] },
+    blacephalon: { encounters: ['raid', 'research', 'noshiny', 'specialtrade'] },
+    necrozma: { encounters: ['raid', 'specialtrade'] },
     meltan: { encounters: ['wild'] },
     melmetal: { encounters: ['wild'] },
-    skwovet: { encounters: ['wild', 'noshiny'] },
-    greedent: { encounters: ['wild', 'noshiny'] },
+    grookey: { encounters: ['wild', 'noshiny'] },
+    thwackey: { encounters: ['wild', 'noshiny'] },
+    rillaboom: { encounters: ['wild', 'noshiny'] },
+    scorbunny: { encounters: ['wild', 'noshiny'] },
+    raboot: { encounters: ['wild', 'noshiny'] },
+    cinderace: { encounters: ['wild', 'noshiny'] },
+    sobble: { encounters: ['wild', 'noshiny'] },
+    drizzile: { encounters: ['wild', 'noshiny'] },
+    inteleon: { encounters: ['wild', 'noshiny'] },
+    skwovet: { encounters: ['wild'] },
+    greedent: { encounters: ['wild'] },
+    rookidee: { encounters: ['wild', 'noshiny'] },
+    corvisquire: { encounters: ['wild', 'noshiny'] },
+    corviknight: { encounters: ['wild', 'noshiny'] },
+    toxel: { encounters: ['egg'] },
+    toxtricity: { encounters: ['egg', 'raid', 'research'] },
+    toxtricitylowkey: { encounters: ['egg', 'raid', 'research'] },
+    sinistea: { encounters: ['raid', 'research', 'noshiny'] },
+    sinisteaantique: { encounters: ['raid', 'research', 'noshiny'] },
+    polteageist: { encounters: ['raid', 'research', 'noshiny'] },
+    polteageistantique: { encounters: ['raid', 'research', 'noshiny'] },
+    hatenna: { encounters: ['wild', 'noshiny'] },
+    hattrem: { encounters: ['wild', 'noshiny'] },
+    hatterene: { encounters: ['wild', 'noshiny'] },
     obstagoon: { encounters: ['wild'] },
     perrserker: { encounters: ['wild'] },
+    cursola: { encounters: ['egg'] },
     sirfetchd: { encounters: ['wild'] },
     mrrime: { encounters: ['wild'] },
     runerigus: { encounters: ['egg', 'raid', 'research'] },
-    falinks: { encounters: ['wild', 'noshiny'] },
-    zacian: { encounters: ['raid', 'noshiny', 'specialtrade'] },
-    zamazenta: { encounters: ['raid', 'noshiny', 'specialtrade'] },
+    falinks: { encounters: ['wild'] },
+    stonjourner: { encounters: ['wild', 'noshiny'] },
+    morpeko: { encounters: ['wild', 'noshiny'] },
+    dreepy: { encounters: ['wild', 'noshiny'] },
+    drakloak: { encounters: ['wild', 'noshiny'] },
+    dragapult: { encounters: ['wild', 'noshiny'] },
+    zacian: { encounters: ['raid', 'specialtrade'] },
+    zamazenta: { encounters: ['raid', 'specialtrade'] },
     zarude: { encounters: ['research', 'noshiny', 'notrade'] },
-    regieleki: { encounters: ['raid', 'noshiny', 'specialtrade'] },
-    regidrago: { encounters: ['raid', 'noshiny', 'specialtrade'] },
+    regieleki: { encounters: ['raid', 'specialtrade'] },
+    regidrago: { encounters: ['raid', 'specialtrade'] },
+    wyrdeer: { encounters: ['wild'] },
     kleavor: { encounters: ['wild'] },
     ursaluna: { encounters: ['wild'] },
-    sneasler: { encounters: ['wild', 'noshiny'] },
-    overqwil: { encounters: ['wild', 'noshiny'] },
+    sneasler: { encounters: ['wild'] },
+    overqwil: { encounters: ['wild'] },
+    enamorus: { encounters: ['raid', 'noshiny', 'specialtrade'] },
+    sprigatito: { encounters: ['wild'] },
+    floragato: { encounters: ['wild'] },
+    meowscarada: { encounters: ['wild'] },
+    fuecoco: { encounters: ['wild', 'noshiny'] }, // Shiny available 2025-03-08
+    crocalor: { encounters: ['wild', 'noshiny'] },
+    skeledirge: { encounters: ['wild', 'noshiny'] },
+    quaxly: { encounters: ['wild', 'noshiny'] },
+    quaxwell: { encounters: ['wild', 'noshiny'] },
+    quaquaval: { encounters: ['wild', 'noshiny'] },
+    lechonk: { encounters: ['wild'] },
+    oinkologne: { encounters: ['wild'] },
+    oinkolognef: { encounters: ['wild'] },
+    nymble: { encounters: ['wild'] },
+    lokix: { encounters: ['wild'] },
+    tandemaus: { encounters: ['research', 'noshiny'] },
+    maushold: { encounters: ['research', 'noshiny'] },
+    mausholdfour: { encounters: ['research', 'noshiny'] },
+    fidough: { encounters: ['wild', 'noshiny'] },
+    dachsbun: { encounters: ['wild', 'noshiny'] },
+    pawmi: { encounters: ['wild', 'noshiny'] },
+    pawmo: { encounters: ['wild', 'noshiny'] },
+    pawmot: { encounters: ['wild', 'noshiny'] },
+    smoliv: { encounters: ['wild'] },
+    dolliv: { encounters: ['wild'] },
+    arboliva: { encounters: ['wild'] },
+    charcadet: { encounters: ['egg', 'research', 'noshiny'] },
+    armarouge: { encounters: ['egg', 'research', 'noshiny'] },
+    ceruledge: { encounters: ['egg', 'research', 'noshiny'] },
+    tadbulb: { encounters: ['wild', 'noshiny'] },
+    bellibolt: { encounters: ['wild', 'noshiny'] },
+    shroodle: { encounters: ['12kmegg', 'noshiny'] },
+    grafaiai: { encounters: ['12kmegg', 'noshiny'] },
+    wiglett: { encounters: ['wild', 'noshiny'] },
+    wugtrio: { encounters: ['wild', 'noshiny'] },
+    varoom: { encounters: ['12kmegg', 'noshiny'] },
+    revavroom: { encounters: ['12kmegg', 'noshiny'] },
+    greavard: { encounters: ['wild', 'noshiny'] },
+    houndstone: { encounters: ['wild', 'noshiny'] },
+    cetoddle: { encounters: ['wild'] },
+    cetitan: { encounters: ['wild'] },
+    annihilape: { encounters: ['wild'] },
+    clodsire: { encounters: ['wild', 'noshiny'] },
+    frigibax: { encounters: ['wild', 'noshiny'] },
+    arctibax: { encounters: ['wild', 'noshiny'] },
+    baxcalibur: { encounters: ['wild', 'noshiny'] },
     gimmighoulroaming: { encounters: ['wild', 'noshiny'] },
     gholdengo: { encounters: ['wild', 'noshiny'] },
 };