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

Ishaan0132 · Jan 2, 2025 · c9d576e · c9d576e
2 parents 40b618d + 7c99856
commit c9d576e
Show file tree

Hide file tree

Showing 44 changed files with 1,108 additions and 1,107 deletions.
diff --git a/config/formats.ts b/config/formats.ts
diff --git a/data/aliases.ts b/data/aliases.ts
@@ -90,8 +90,8 @@ export const Aliases: import('../sim/dex').AliasesTable = {
 	gen6ag: "[Gen 6] Anything Goes",
 	crossevo: "[Gen 9] Cross Evolution",
 	mayhem: "[Gen 9] Random Battle Mayhem",
-	omotm: "[Gen 9] Twisted Dimension",
-	lcotm: "[Gen 9] Mix and Mega Doubles",
+	omotm: "[Gen 9] Nature Swap",
+	lcotm: "[Gen 9] Camomons",
 
 	// mega evos
 	fabio: "Ampharos-Mega",

diff --git a/data/conditions.ts b/data/conditions.ts
@@ -374,7 +374,8 @@ export const Conditions: import('../sim/dex-conditions').ConditionDataTable = {
 	futuremove: {
 		// this is a slot condition
 		name: 'futuremove',
-		onStart() {
+		onStart(target) {
+			this.effectState.targetSlot = target.getSlot();
 			this.effectState.endingTurn = (this.turn - 1) + 2;
 			if (this.effectState.endingTurn >= 254) {
 				this.hint(`In Gen 8+, Future attacks will never resolve when used on the 255th turn or later.`);
@@ -383,7 +384,7 @@ export const Conditions: import('../sim/dex-conditions').ConditionDataTable = {
 		onResidualOrder: 3,
 		onResidual(side: any) {
 			if (this.getOverflowedTurnCount() < this.effectState.endingTurn) return;
-			side.removeSlotCondition(this.getAtSlot(this.effectState.sourceSlot), 'futuremove');
+			side.removeSlotCondition(this.getAtSlot(this.effectState.targetSlot), 'futuremove');
 		},
 		onEnd(target) {
 			const data = this.effectState;