From 05e97806b58d94cc7ed605798d82f6000f70f3b0 Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Thu, 16 Jan 2025 22:31:18 +0100
Subject: [PATCH] Pokerus cursor is now treated as decoration

---
 src/ui/pokedex-ui-handler.ts | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/pokedex-ui-handler.ts
index 4f3cf8afd9e..c1c1bbfd436 100644
--- a/src/ui/pokedex-ui-handler.ts
+++ b/src/ui/pokedex-ui-handler.ts
@@ -1418,29 +1418,26 @@ export default class PokedexUiHandler extends MessageUiHandler {
 
     this.starterSelectScrollBar.setScrollCursor(this.scrollCursor);
 
+    this.pokerusCursorObjs.forEach(cursorObj => cursorObj.setVisible(false));
+
     let pokerusCursorIndex = 0;
     this.filteredStarterContainers.forEach((container, i) => {
       const pos = calcStarterPosition(i, this.scrollCursor);
       container.setPosition(pos.x, pos.y);
       if (i < onScreenFirstIndex || i > onScreenLastIndex) {
         container.setVisible(false);
-
-        if (this.pokerusSpecies.includes(container.species)) {
-          this.pokerusCursorObjs[pokerusCursorIndex].setPosition(pos.x - 1, pos.y + 1);
-          this.pokerusCursorObjs[pokerusCursorIndex].setVisible(false);
-          pokerusCursorIndex++;
-        }
         return;
       } else {
         container.setVisible(true);
 
-        if (this.pokerusSpecies.includes(container.species)) {
-          this.pokerusCursorObjs[pokerusCursorIndex].setPosition(pos.x - 1, pos.y + 1);
-          this.pokerusCursorObjs[pokerusCursorIndex].setVisible(true);
-          pokerusCursorIndex++;
-        }
-
         if (this.showDecorations) {
+
+          if (this.pokerusSpecies.includes(container.species)) {
+            this.pokerusCursorObjs[pokerusCursorIndex].setPosition(pos.x - 1, pos.y + 1);
+            this.pokerusCursorObjs[pokerusCursorIndex].setVisible(true);
+            pokerusCursorIndex++;
+          }
+
           const speciesId = container.species.speciesId;
           this.updateStarterValueLabel(container);