From 118bdcc49ea317785c8e67e7e62ee94fcbf7807a Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Sat, 1 Mar 2025 01:15:11 +0100
Subject: [PATCH 1/3] =?UTF-8?q?[Bug][UI/UX]=20Never=20select=20invisible?=
 =?UTF-8?q?=20containers=20in=20Pok=C3=A9dex=20(#5449)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ui/pokedex-ui-handler.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/pokedex-ui-handler.ts
index a18f138e4f7..02c19f11813 100644
--- a/src/ui/pokedex-ui-handler.ts
+++ b/src/ui/pokedex-ui-handler.ts
@@ -986,7 +986,7 @@ export default class PokedexUiHandler extends MessageUiHandler {
             this.updateScroll();
             const proportion = this.filterBarCursor / Math.max(1, this.filterBar.numFilters - 1);
             const targetCol = Math.min(8, proportion < 0.5 ? Math.floor(proportion * 8) : Math.ceil(proportion * 8));
-            this.setCursor(Math.min(targetCol, numberOfStarters));
+            this.setCursor(Math.min(targetCol, numberOfStarters - 1));
             success = true;
           }
           break;
@@ -1108,7 +1108,7 @@ export default class PokedexUiHandler extends MessageUiHandler {
             }
             break;
           case Button.DOWN:
-            if (currentRow < numOfRows - 1) { // not last row
+            if ((currentRow < numOfRows - 1) && (this.cursor + 9 < this.filteredPokemonData.length)) { // not last row
               if (currentRow - this.scrollCursor === 8) { // last row of visible pokemon
                 this.scrollCursor++;
                 this.updateScroll();

From 7cc5f40af8f0b37fc2e790f8d23c9310b0f72907 Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Sat, 1 Mar 2025 01:55:22 +0100
Subject: [PATCH 2/3] =?UTF-8?q?[Bug][UI/UX]=20Restore=20egg/tm=20move=20an?=
 =?UTF-8?q?d=20passive=20icons=20when=20using=20filters=20in=20Pok=C3=A9de?=
 =?UTF-8?q?x=20(#5450)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ui/pokedex-ui-handler.ts | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/pokedex-ui-handler.ts
index 02c19f11813..83739ba26a8 100644
--- a/src/ui/pokedex-ui-handler.ts
+++ b/src/ui/pokedex-ui-handler.ts
@@ -1577,6 +1577,37 @@ export default class PokedexUiHandler extends MessageUiHandler {
           container.icon.setTint(0);
         }
 
+        if (data.eggMove1) {
+          container.eggMove1Icon.setVisible(true);
+        } else {
+          container.eggMove1Icon.setVisible(false);
+        }
+        if (data.eggMove2) {
+          container.eggMove2Icon.setVisible(true);
+        } else {
+          container.eggMove2Icon.setVisible(false);
+        }
+        if (data.tmMove1) {
+          container.tmMove1Icon.setVisible(true);
+        } else {
+          container.tmMove1Icon.setVisible(false);
+        }
+        if (data.tmMove2) {
+          container.tmMove2Icon.setVisible(true);
+        } else {
+          container.tmMove2Icon.setVisible(false);
+        }
+        if (data.passive1) {
+          container.passive1Icon.setVisible(true);
+        } else {
+          container.passive1Icon.setVisible(false);
+        }
+        if (data.passive2) {
+          container.passive2Icon.setVisible(true);
+        } else {
+          container.passive2Icon.setVisible(false);
+        }
+
         if (this.showDecorations) {
 
           if (this.pokerusSpecies.includes(data.species)) {

From b348626ec2257352dc758e5aecaf4dcdd153fff7 Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Sat, 1 Mar 2025 02:00:56 +0100
Subject: [PATCH 3/3] [Bug][UI/UX] Make candy icons show up again in starter
 select screen (#5451)

---
 src/ui/abstact-option-select-ui-handler.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/abstact-option-select-ui-handler.ts b/src/ui/abstact-option-select-ui-handler.ts
index 07e43a344dd..a462ed158cb 100644
--- a/src/ui/abstact-option-select-ui-handler.ts
+++ b/src/ui/abstact-option-select-ui-handler.ts
@@ -147,7 +147,7 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
         itemIcon.setScale(3 * this.scale);
         this.optionSelectIcons.push(itemIcon);
 
-        this.optionSelectContainer.add(itemIcon);
+        this.optionSelectTextContainer.add(itemIcon);
 
         itemIcon.setPositionRelative(this.optionSelectText, 36 * this.scale, 7 + i * (114 * this.scale - 3));
 
@@ -156,7 +156,7 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
           itemOverlayIcon.setScale(3 * this.scale);
           this.optionSelectIcons.push(itemOverlayIcon);
 
-          this.optionSelectContainer.add(itemOverlayIcon);
+          this.optionSelectTextContainer.add(itemOverlayIcon);
 
           itemOverlayIcon.setPositionRelative(this.optionSelectText, 36 * this.scale, 7 + i * (114 * this.scale - 3));