Merge branch 'master' into g9-bssf

smogon · May 7, 2024 · 581c5d2 · 581c5d2
2 parents 8895797 + a4b6781
commit 581c5d2
Show file tree

Hide file tree

Showing 111 changed files with 127,086 additions and 131,501 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,6 +1,6 @@
 config/formats.ts @KrisXV @Marty-D
 data/mods/*/random-teams.ts @AnnikaCodes
-data/mods/ssb/ @HoeenCoder @KrisXV
+data/mods/gen9ssb/ @HoeenCoder @HisuianZoroark @KrisXV
 data/random-sets.json @MathyFurret @ACakeWearingAHat @livid-washed @adrivrie
 data/random-teams.ts @AnnikaCodes @KrisXV @MathyFurret @ACakeWearingAHat @livid-washed @adrivrie
 data/text/ @Marty-D

diff --git a/config/formats.ts b/config/formats.ts
diff --git a/data/abilities.ts b/data/abilities.ts
@@ -4084,7 +4084,7 @@ export const Abilities: {[abilityid: string]: AbilityData} = {
 		onBasePowerPriority: 19,
 		onBasePower(basePower, attacker, defender, move) {
 			if (move.flags['slicing']) {
-				this.debug('Shapness boost');
+				this.debug('Sharpness boost');
 				return this.chainModify(1.5);
 			}
 		},

diff --git a/data/aliases.ts b/data/aliases.ts
@@ -64,8 +64,8 @@ export const Aliases: {[alias: string]: string} = {
 	monorandom: "[Gen 8] Monotype Random Battle",
 	bf: "[Gen 7] Battle Factory",
 	bssf: "[Gen 9] BSS Factory",
-	ssb: "[Gen 8] Super Staff Bros 4",
-	ssb4: "[Gen 8] Super Staff Bros 4",
+	ssb: "[Gen 9] Super Staff Bros Ultimate",
+	ssbu: "[Gen 9] Super Staff Bros Ultimate",
 	lgrandom: "[Gen 7] Let's Go Random Battle",
 	gen6bf: "[Gen 6] Battle Factory",
 	gen7mono: "[Gen 7] Monotype",
@@ -86,8 +86,8 @@ export const Aliases: {[alias: string]: string} = {
 	gen6ag: "[Gen 6] Anything Goes",
 	crossevo: "[Gen 9] Cross Evolution",
 	mayhem: "[Gen 9] Random Battle Mayhem",
-	omotm: "[Gen 9] Foresighters",
-	lcotm: "[Gen 9] Balanced Hackmons UU",
+	omotm: "[Gen 9] Pokebilities",
+	lcotm: "[Gen 9] The Loser's Game",
 
 	// mega evos
 	fabio: "Ampharos-Mega",