Merge branch 'master' of https://github.com/smogon/pokemon-showdown

data/aliases.ts

@@ -176,6 +176,7 @@ export const Aliases: import('../sim/dex').AliasesTable = {
 	arcrock: "Arceus-Rock",
 	arcsteel: "Arceus-Steel",
 	arcwater: "Arceus-Water",
+	basculegionm: "Basculegion",
 	basculinb: "Basculin-Blue-Striped",
 	basculinblue: "Basculin-Blue-Striped",
 	basculinbluestripe: "Basculin-Blue-Striped",
@@ -309,7 +310,11 @@ export const Aliases: import('../sim/dex').AliasesTable = {
 	galardash: "Rapidash-Galar",
 	nddf: "Indeedee-F",
 	zacianc: "Zacian-Crowned",
+	zacianh: "Zacian",
+	zacianhero: "Zacian",
 	zamazentac: "Zamazenta-Crowned",
+	zamazentah: "Zamazenta",
+	zamazentahero: "Zamazenta",
 	glowbro: "Slowbro-Galar",
 	gbro: "Slowbro-Galar",
 	glowking: "Slowking-Galar",
@@ -426,9 +431,21 @@ export const Aliases: import('../sim/dex').AliasesTable = {
 	ufof: "Pokestar UFO",
 	ufoflying: "Pokestar UFO",
 	vivillonmeadow: "Vivillon",
+	xerneasactive: "Xerneas",
+	indeedeem: "Indeedee",
+	polteageistphony: "Polteageist",
+	rockruffmidday: "Rockruff",
+	sinisteaphony: "Sinistea",
+	dudunsparcetwosegment: "Dudunsparce",
 	enamorusi: "Enamorus",
 	enamorusincarnate: "Enamorus",
 	enamorusincarnation: "Enamorus",
+	gimmighoulchest: "Gimmighoul",
+	mausholdthree: "Maushold",
+	oinkolognem: "Oinkologne",
+	palafinzero: "Palafin",
+	poltchageistcounterfeit: "Poltchageist",
+	sinistchaunremarkable: "Sinistcha",
 	squawkabillygreen: "Squawkabilly",
 	squawkabillyg: "Squawkabilly",
 	tealpon: "Ogerpon",
@@ -510,6 +527,7 @@ export const Aliases: import('../sim/dex').AliasesTable = {
 	icrown: "Iron Crown",
 
 	// cosmetic formes
+	alcremievanillacream: "Alcremie",
 	alcremierubycream: "Alcremie",
 	alcremiematchacream: "Alcremie",
 	alcremiemintcream: "Alcremie",
@@ -592,6 +610,7 @@ export const Aliases: import('../sim/dex').AliasesTable = {
 	miniorblue: "Minior",
 	miniorindigo: "Minior",
 	miniorviolet: "Minior",
+	unowna: "Unown",
 	unownb: "Unown",
 	unownc: "Unown",
 	unownd: "Unown",
@@ -619,6 +638,7 @@ export const Aliases: import('../sim/dex').AliasesTable = {
 	unownz: "Unown",
 	unownexclamation: "Unown",
 	unownquestion: "Unown",
+	tatsugiricurly: "Tatsugiri",
 	tatsugiridroopy: "Tatsugiri",
 	tatsugiristretchy: "Tatsugiri",
 

data/formats-data.ts

@@ -327,7 +327,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
 		tier: "NFE",
 	},
 	ninetales: {
-		tier: "PU",
+		tier: "ZU",
 		doublesTier: "DUU",
 		natDexTier: "RU",
 	},
@@ -758,7 +758,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
 		natDexTier: "RU",
 	},
 	electrodehisui: {
-		tier: "ZU",
+		tier: "ZUBL",
 		doublesTier: "(DUU)",
 		natDexTier: "RU",
 	},
@@ -1165,7 +1165,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
 	zapdosgalar: {
 		tier: "RU",
 		doublesTier: "(DUU)",
-		natDexTier: "UU",
+		natDexTier: "UUBL",
 	},
 	moltres: {
 		tier: "OU",
@@ -5429,7 +5429,7 @@ export const FormatsData: import('../sim/dex-species').SpeciesFormatsDataTable =
 		natDexTier: "OU",
 	},
 	brutebonnet: {
-		tier: "NU",
+		tier: "PU",
 		doublesTier: "DUU",
 		natDexTier: "RU",
 	},

data/learnsets.ts

@@ -94882,6 +94882,7 @@ export const Learnsets: import('../sim/dex-species').LearnsetDataTable = {
 			dreameater: ["7M", "4M"],
 			earthquake: ["9M", "8M", "7M", "4M"],
 			embargo: ["7M", "4M"],
+			encore: ["9M"],
 			endeavor: ["9M", "7T", "4T"],
 			facade: ["9M", "8M", "7M", "4M"],
 			fakeout: ["9L1", "8L1", "7L27", "4L35"],
@@ -94960,6 +94961,7 @@ export const Learnsets: import('../sim/dex-species').LearnsetDataTable = {
 			toxic: ["7M", "4M"],
 			trick: ["9M", "9L1", "8M", "8L1", "7T", "4T"],
 			trickroom: ["9M", "8M", "7M", "4M"],
+			upperhand: ["9M"],
 			uturn: ["9M", "8M", "7M", "4M"],
 			willowisp: ["9M", "8M", "7M", "4M"],
 		},

data/mods/gen6megasrevisited/abilities.ts

@@ -260,6 +260,32 @@ export const Abilities: import('../../../sim/dex-abilities').ModdedAbilityDataTa
 		shortDesc: "On switch-in, sets Delta Stream. User takes halved damage from hazards.",
 		rating: 5,
 	},
+	parentalbond: {
+		onPrepareHit(source, target, move) {
+			if (move.category === 'Status' || move.selfdestruct || move.multihit) return;
+			if ([
+				'endeavor', 'seismictoss', 'psywave', 'nightshade', 'sonicboom', 'dragonrage',
+				'superfang', 'naturesmadness', 'bide', 'counter', 'mirrorcoat', 'metalburst',
+			].includes(move.id)) return;
+			if (!move.spreadHit && !move.isZ && !move.isMax) {
+				move.multihit = 2;
+				move.multihitType = 'parentalbond';
+			}
+		},
+		onBasePowerPriority: 7,
+		onBasePower(basePower, pokemon, target, move) {
+			if (move.multihitType === 'parentalbond' && move.hit > 1) return this.chainModify(0.5);
+		},
+		onSourceModifySecondaries(secondaries, target, source, move) {
+			if (move.multihitType === 'parentalbond' && move.id === 'secretpower' && move.hit < 2) {
+				// hack to prevent accidentally suppressing King's Rock/Razor Fang
+				return secondaries.filter(effect => effect.volatileStatus === 'flinch');
+			}
+		},
+		name: "Parental Bond",
+		rating: 4.5,
+		num: 184,
+	},
 
 	// for ngas
 	galewings: {