Regular-Pokemon-Trainers-League
diff --git a/‎LICENSE
+1-1 b/‎LICENSE
+1-1
diff --git a/‎config/formats.ts
+755-541 b/‎config/formats.ts
+755-541
diff --git a/‎data/abilities.ts
+8-3 b/‎data/abilities.ts
+8-3
diff --git a/‎data/aliases.ts
+6-2 b/‎data/aliases.ts
+6-2
diff --git a/‎data/conditions.ts
+1 b/‎data/conditions.ts
+1
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2011-2022 Guangcong Luo and other contributors http://pokemonshowdown.com/
+Copyright (c) 2011-2024 Guangcong Luo and other contributors http://pokemonshowdown.com/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
 
@@ -93,13 +93,15 @@ export const Abilities: {[abilityid: string]: AbilityData} = {
 		},
 		onStart(pokemon) {
 			// Air Lock does not activate when Skill Swapped or when Neutralizing Gas leaves the field
+			pokemon.abilityState.ending = false; // Clear the ending flag
 			if (this.effectState.switchingIn) {
 				this.add('-ability', pokemon, 'Air Lock');
 				this.effectState.switchingIn = false;
 			}
 			this.eachEvent('WeatherChange', this.effect);
 		},
 		onEnd(pokemon) {
+			pokemon.abilityState.ending = true;
 			this.eachEvent('WeatherChange', this.effect);
 		},
 		suppressWeather: true,
@@ -537,13 +539,15 @@ export const Abilities: {[abilityid: string]: AbilityData} = {
 		},
 		onStart(pokemon) {
 			// Cloud Nine does not activate when Skill Swapped or when Neutralizing Gas leaves the field
+			pokemon.abilityState.ending = false; // Clear the ending flag
 			if (this.effectState.switchingIn) {
 				this.add('-ability', pokemon, 'Cloud Nine');
 				this.effectState.switchingIn = false;
 			}
 			this.eachEvent('WeatherChange', this.effect);
 		},
 		onEnd(pokemon) {
+			pokemon.abilityState.ending = true;
 			this.eachEvent('WeatherChange', this.effect);
 		},
 		suppressWeather: true,
@@ -3423,7 +3427,8 @@ export const Abilities: {[abilityid: string]: AbilityData} = {
 			// Protosynthesis is not affected by Utility Umbrella
 			if (this.field.isWeather('sunnyday')) {
 				pokemon.addVolatile('protosynthesis');
-			} else if (!pokemon.volatiles['protosynthesis']?.fromBooster) {
+			} else if (!pokemon.volatiles['protosynthesis']?.fromBooster && this.field.weather !== 'sunnyday') {
+				// Protosynthesis will not deactivite if Sun is suppressed, hence the direct ID check (isWeather respects supression)
 				pokemon.removeVolatile('protosynthesis');
 			}
 		},
@@ -3678,7 +3683,7 @@ export const Abilities: {[abilityid: string]: AbilityData} = {
 			}
 		},
 		onAfterBoost(boost, target, source, effect) {
-			if (effect?.name === 'Intimidate') {
+			if (effect?.name === 'Intimidate' && boost.atk) {
 				this.boost({spe: 1});
 			}
 		},
@@ -4849,7 +4854,7 @@ export const Abilities: {[abilityid: string]: AbilityData} = {
 	},
 	terashell: {
 		onEffectiveness(typeMod, target, type, move) {
-			if (!target || target.baseSpecies.name !== 'Terapagos-Terastal') return;
+			if (!target || target.species.name !== 'Terapagos-Terastal') return;
 			if (this.effectState.resisted) return -1; // all hits of multi-hit move should be not very effective
 			if (move.category === 'Status') return;
 			if (!target.runImmunity(move.type)) return; // immunity has priority
 
@@ -85,8 +85,12 @@ 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] Tier Shift",
-	lcotm: "[Gen 9] Sketchmons",
+	omotm: "[Gen 9] Pokebilities",
+	lcotm: "[Gen 9] The Loser's Game",
+	rmotd: "[Gen 9] Meow Cup 2: Electric Doggaroo",
+	rmotdffa: "[Gen 9] Meow Cup 2 FFA",
+	meowcup: "[Gen 9] Meow Cup 2: Electric Doggaroo",
+	meowcupffa: "[Gen 9] Meow Cup 2 FFA",
 
 	// mega evos
 	fabio: "Ampharos-Mega",
 
@@ -27,6 +27,7 @@ export const Conditions: {[k: string]: ConditionData} = {
 				this.add('-status', target, 'par');
 			}
 		},
+		onModifySpePriority: -101,
 		onModifySpe(spe, pokemon) {
 			// Paralysis occurs after all other Speed modifiers, so evaluate all modifiers up to this point first
 			spe = this.finalModify(spe);
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ export const Conditions: {[k: string]: ConditionData} = {`
`27`	`27`	`this.add('-status', target, 'par');`
`28`	`28`	`}`
`29`	`29`	`},`
	`30`	`+ onModifySpePriority: -101,`
`30`	`31`	`onModifySpe(spe, pokemon) {`
`31`	`32`	`// Paralysis occurs after all other Speed modifiers, so evaluate all modifiers up to this point first`
`32`	`33`	`spe = this.finalModify(spe);`