From ad3a226feb7c9e1adfcf14277171d76e8fe3e5f0 Mon Sep 17 00:00:00 2001 From: Akuma-Reiki Date: Sat, 4 May 2024 17:27:29 -0500 Subject: [PATCH] GetRootSpecies rather than colors of current Species --- src/ui/summary-ui-handler.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts index 98a4351bd..ee514665d 100644 --- a/src/ui/summary-ui-handler.ts +++ b/src/ui/summary-ui-handler.ts @@ -241,7 +241,7 @@ export default class SummaryUiHandler extends UiHandler { this.shinyOverlay.setVisible(this.pokemon.isShiny()); - const colorScheme = starterColors[this.pokemon.species.speciesId]; + const colorScheme = starterColors[this.pokemon.species.getRootSpeciesId()]; this.candyIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[0]))); this.candyOverlay.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[1]))); @@ -278,7 +278,7 @@ export default class SummaryUiHandler extends UiHandler { if (!currentFriendship || currentFriendship === undefined) currentFriendship = 0; - const friendshipCap = getStarterValueFriendshipCap(speciesStarters[this.pokemon.species.speciesId]); + const friendshipCap = getStarterValueFriendshipCap(speciesStarters[this.pokemon.species.getRootSpeciesId()]); const candyCropY = 16 - (16 * (currentFriendship / friendshipCap)); if (this.candyShadow.visible) {