From 2db4e26e42500b898df550a5e697d6a6e2a8a3d5 Mon Sep 17 00:00:00 2001 From: Kris Johnson <11083252+KrisXV@users.noreply.github.com> Date: Mon, 13 Jul 2020 00:39:04 -0600 Subject: [PATCH] Tooltips: Fix interation with Galar starters' Gmax moves (#1550) --- src/battle-tooltips.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/battle-tooltips.ts b/src/battle-tooltips.ts index c14d68673..b71641cb3 100644 --- a/src/battle-tooltips.ts +++ b/src/battle-tooltips.ts @@ -587,10 +587,12 @@ class BattleTooltips { maxMove = this.battle.dex.getMove(BattleTooltips.maxMoveTable['Psychic']); } } + const basePower = ['gmaxdrumsolo', 'gmaxfireball', 'gmaxhydrosnipe'].includes(maxMove.id) ? + maxMove.basePower : move.maxMove.basePower; move = new Move(maxMove.id, maxMove.name, { ...maxMove, category: move.category, - basePower: move.maxMove!.basePower, + basePower, }); } }