From 2b45bf167b2fa793845f2a0d659d55f3a347fdeb Mon Sep 17 00:00:00 2001
From: ry <100055739+ry4242@users.noreply.github.com>
Date: Fri, 3 Jul 2026 08:57:40 -0500
Subject: [PATCH] Fix weather ball display (#2709)

---
 .../src/battle-tooltips.ts                    | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/play.pokemonshowdown.com/src/battle-tooltips.ts b/play.pokemonshowdown.com/src/battle-tooltips.ts
index 3435cb2a6..3216980e6 100644
--- a/play.pokemonshowdown.com/src/battle-tooltips.ts
+++ b/play.pokemonshowdown.com/src/battle-tooltips.ts
@@ -1665,12 +1665,12 @@ export class BattleTooltips {
 				switch (this.battle.weather) {
 				case 'sunnyday':
 				case 'desolateland':
-					if (item.id === 'utilityumbrella') break;
+					if (value.tryItem('Utility Umbrella')) break;
 					moveType = 'Fire';
 					break;
 				case 'raindance':
 				case 'primordialsea':
-					if (item.id === 'utilityumbrella') break;
+					if (value.tryItem('Utility Umbrella')) break;
 					moveType = 'Water';
 					break;
 				case 'sandstorm':
@@ -1792,7 +1792,7 @@ export class BattleTooltips {
 				moveType = 'Stellar';
 			}
 			if (move.id === 'weatherball' && value.weatherModify(0)) {
-				if (this.battle.weather === 'stormsurge' && item.id !== 'utilityumbrella') moveType = 'Water';
+				if (this.battle.weather === 'stormsurge' && !value.tryItem('Utility Umbrella')) moveType = 'Water';
 				if (this.battle.weather === 'deserteddunes') moveType = 'Rock';
 			}
 			if (move.id === 'o' || move.id === 'worriednoises') {
@@ -2317,7 +2317,19 @@ export class BattleTooltips {
 		}
 		if (move.id === 'weatherball') {
 			if (!value.abilityModify(2, "Mega Sol") && this.battle.weather !== 'deltastream') {
-				value.weatherModify(2);
+				switch (this.battle.weather) {
+				case 'sunnyday':
+				case 'desolateland':
+				case 'raindance':
+				case 'primordialsea':
+				case 'stormsurge':
+					if (value.tryItem('Utility Umbrella')) break;
+					value.weatherModify(2);
+					break;
+				default:
+					value.weatherModify(2);
+					break;
+				}
 			}
 		}
 		if (move.id === 'hydrosteam') {