Merged from official repos

MikeyTheA · Jul 6, 2024 · ea8a7dc · ea8a7dc
2 parents a45f5fe + 9e1980b
commit ea8a7dc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/src/battle-scene.ts b/src/battle-scene.ts
@@ -1227,6 +1227,7 @@ export default class BattleScene extends SceneBase {
     case Species.ZARUDE:
     case Species.SQUAWKABILLY:
     case Species.TATSUGIRI:
+    case Species.GIMMIGHOUL:
     case Species.PALDEA_TAUROS:
       return Utils.randSeedInt(species.forms.length);
     case Species.PIKACHU:

diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts
@@ -1618,7 +1618,8 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.FROSMOTH, 1, null, new SpeciesFriendshipEvolutionCondition(90, p => p.scene.arena.getTimeOfDay() === TimeOfDay.DUSK || p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT), SpeciesWildEvolutionDelay.MEDIUM)
   ],
   [Species.GIMMIGHOUL]: [
-    new SpeciesEvolution(Species.GHOLDENGO, 1, null, new SpeciesFriendshipEvolutionCondition(70), SpeciesWildEvolutionDelay.VERY_LONG)
+    new SpeciesFormEvolution(Species.GHOLDENGO, "chest", "", 1, null, new SpeciesFriendshipEvolutionCondition(70), SpeciesWildEvolutionDelay.VERY_LONG),
+    new SpeciesFormEvolution(Species.GHOLDENGO, "roaming", "", 1, null, new SpeciesFriendshipEvolutionCondition(70), SpeciesWildEvolutionDelay.VERY_LONG)
   ]
 };
 

diff --git a/src/data/tms.ts b/src/data/tms.ts
@@ -38685,13 +38685,17 @@ export const tmSpecies: TmSpecies = {
     Species.GOLDEEN,
     Species.SEAKING,
     Species.SCYTHER,
+    Species.ELECTABUZZ,
+    Species.MAGMAR,
     Species.PINSIR,
     Species.OMANYTE,
     Species.OMASTAR,
     Species.KABUTO,
     Species.KABUTOPS,
     Species.MEWTWO,
     Species.MEW,
+    Species.BAYLEEF,
+    Species.MEGANIUM,
     Species.SENTRET,
     Species.FURRET,
     Species.LEDYBA,
@@ -38708,8 +38712,10 @@ export const tmSpecies: TmSpecies = {
     Species.SNEASEL,
     Species.PHANPY,
     Species.DONPHAN,
+    Species.ELEKID,
     Species.TYRANITAR,
     Species.BLAZIKEN,
+    Species.SWAMPERT,
     Species.LOMBRE,
     Species.LUDICOLO,
     Species.NUZLEAF,
@@ -38740,12 +38746,7 @@ export const tmSpecies: TmSpecies = {
     Species.CHIMECHO,
     Species.ABSOL,
     Species.METAGROSS,
-    [
-      Species.DEOXYS,
-      "",
-      "defense",
-      "speed",
-    ],
+    Species.DEOXYS,
     Species.CHIMCHAR,
     Species.MONFERNO,
     Species.INFERNAPE,
@@ -38767,6 +38768,8 @@ export const tmSpecies: TmSpecies = {
     Species.WEAVILE,
     Species.LICKILICKY,
     Species.TANGROWTH,
+    Species.ELECTIVIRE,
+    Species.MAGMORTAR,
     Species.LEAFEON,
     Species.GLISCOR,
     Species.MAMOSWINE,
@@ -38781,6 +38784,8 @@ export const tmSpecies: TmSpecies = {
     Species.SNIVY,
     Species.SERVINE,
     Species.SERPERIOR,
+    Species.PIGNITE,
+    Species.EMBOAR,
     Species.OSHAWOTT,
     Species.DEWOTT,
     Species.SAMUROTT,
@@ -38837,6 +38842,8 @@ export const tmSpecies: TmSpecies = {
     Species.ACCELGOR,
     Species.MIENFOO,
     Species.MIENSHAO,
+    Species.GOLETT,
+    Species.GOLURK,
     Species.PAWNIARD,
     Species.BISHARP,
     Species.VULLABY,
@@ -38873,6 +38880,7 @@ export const tmSpecies: TmSpecies = {
     Species.SALAZZLE,
     Species.STEENEE,
     Species.TSAREENA,
+    Species.COMFEY,
     Species.ORANGURU,
     Species.PASSIMIAN,
     Species.GOLISOPOD,
@@ -38945,6 +38953,7 @@ export const tmSpecies: TmSpecies = {
     Species.GALAR_FARFETCHD,
     Species.GALAR_ZAPDOS,
     Species.GALAR_ZIGZAGOON,
+    Species.GALAR_LINOONE,
     Species.HISUI_SAMUROTT,
     Species.HISUI_ZORUA,
     Species.HISUI_ZOROARK,
@@ -61853,6 +61862,7 @@ export const tmSpecies: TmSpecies = {
     Species.METANG,
     Species.METAGROSS,
     Species.JIRACHI,
+    Species.DEOXYS,
     Species.BRONZOR,
     Species.BRONZONG,
     Species.GALLADE,