diff --git a/src/battle-text-parser.ts b/src/battle-text-parser.ts
index 8df97c2ea5..b64e399e04 100644
--- a/src/battle-text-parser.ts
+++ b/src/battle-text-parser.ts
@@ -966,7 +966,7 @@ class BattleTextParser {
 				return line1 + template.replace('[POKEMON]', this.pokemon(pokemon)).replace('[STAT]', BattleTextParser.stat(stat)).replace('[ITEM]', this.effect(kwArgs.from));
 			}
 			const template = this.template(templateId, kwArgs.from);
-			return line1 + template.replace('[POKEMON]', this.pokemon(pokemon)).replace('[STAT]', BattleTextParser.stat(stat));
+			return line1 + template.replace(/\[POKEMON\]/g, this.pokemon(pokemon)).replace('[STAT]', BattleTextParser.stat(stat));
 		}
 
 		case '-setboost': {
diff --git a/src/battle-tooltips.ts b/src/battle-tooltips.ts
index 060e38ec35..7fac90c13e 100644
--- a/src/battle-tooltips.ts
+++ b/src/battle-tooltips.ts
@@ -2100,6 +2100,12 @@ class BattleTooltips {
 			value.itemModify(1.2);
 			return value;
 		}
+		if ((speciesName.startsWith('Ogerpon-Wellspring') && itemName === 'Wellspring Mask') ||
+			(speciesName.startsWith('Ogerpon-Hearthflame') && itemName === 'Hearthflame Mask') ||
+			(speciesName.startsWith('Ogerpon-Cornerstone') && itemName === 'Cornerstone Mask')) {
+			value.itemModify(1.2);
+			return value;
+		}
 
 		// Gems
 		if (BattleTooltips.noGemMoves.includes(moveName)) return value;