From 36de62dc8a38bdddd8c5ac014e5387bbe707f44f Mon Sep 17 00:00:00 2001
From: Dakurei <maxime.palanchini@gmail.com>
Date: Tue, 30 Apr 2024 20:48:55 +0200
Subject: [PATCH] Fix Pokerus tutorial condition

---
 src/ui/starter-select-ui-handler.ts | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index 2fd67ac0485..f1e058b12cf 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -203,7 +203,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.starterSelectContainer.add(this.shinyOverlay);
 
     const starterContainerWindow = addWindow(this.scene, 141, 1, 178, 178);
-    
+
     this.starterSelectContainer.add(addWindow(this.scene, 107, 1, 34, 58));
     this.starterSelectContainer.add(addWindow(this.scene, 107, 59, 34, 91));
     this.starterSelectContainer.add(addWindow(this.scene, 107, 145, 34, 34, true));
@@ -318,7 +318,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.genCursorObj.setVisible(false);
     this.genCursorObj.setOrigin(0, 0);
     this.starterSelectContainer.add(this.genCursorObj);
-    
+
     this.valueLimitLabel = addTextObject(this.scene, 124, 150, '0/10', TextStyle.TOOLTIP_CONTENT);
     this.valueLimitLabel.setOrigin(0.5, 0);
     this.starterSelectContainer.add(this.valueLimitLabel);
@@ -333,7 +333,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.starterSelectContainer.add(this.startCursorObj);
 
     const starterSpecies: Species[] = [];
-    
+
     for (let g = 0; g < this.starterSelectGenIconContainers.length; g++) {
       let s = 0;
       this.genSpecies.push([]);
@@ -498,7 +498,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
 
     const eggMovesLabel = addTextObject(this.scene, -46, 0, 'Egg Moves', TextStyle.WINDOW_ALT);
     eggMovesLabel.setOrigin(0.5, 0);
-    
+
     this.pokemonEggMovesContainer.add(eggMovesLabel);
 
     for (let m = 0; m < 4; m++) {
@@ -552,7 +552,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           species = getPokemonSpecies(randomSpeciesId);
           pokerusCursor = this.genSpecies[species.generation - 1].indexOf(species);
         };
-        
+
         let dupe = false;
 
         do {
@@ -1049,7 +1049,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         }
       }
     }
-  
+
     if (success)
       ui.playSelect();
     else if (error)
@@ -1086,7 +1086,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       this.scene.gameData.starterData[speciesId].moveset = this.starterMoveset.slice(0) as StarterMoveset;
     this.setSpeciesDetails(this.lastSpecies, undefined, undefined, undefined, undefined, undefined, undefined, false);
   }
-  
+
   updateInstructions(): void {
     let instructionLines = [ ];
     let cycleInstructionLines = [];
@@ -1212,7 +1212,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
   setGenMode(genMode: boolean): boolean {
     this.genCursorObj.setVisible(genMode && !this.startCursorObj.visible);
     this.cursorObj.setVisible(!genMode && !this.startCursorObj.visible);
-    
+
     if (genMode !== this.genMode) {
       this.genMode = genMode;
 
@@ -1311,7 +1311,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           const defaultAbilityIndex = this.scene.gameData.getStarterSpeciesDefaultAbilityIndex(species);
           const defaultNature = this.scene.gameData.getSpeciesDefaultNature(species);
           props = this.scene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr);
-          
+
           this.setSpeciesDetails(species, props.shiny, props.formIndex, props.female, props.variant, defaultAbilityIndex, defaultNature);
         }
 
@@ -1319,7 +1319,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         this.setTypeIcons(speciesForm.type1, speciesForm.type2);
 
         this.pokemonSprite.clearTint();
-        if (this.pokerusCursors.find((cursor: integer, i: integer) => cursor === this.cursor && this.pokerusGens[i] === this.genCursor))
+        if (this.pokerusCursors.find((cursor: integer, i: integer) => cursor === this.cursor && this.pokerusGens[i] === this.getGenCursorWithScroll()))
           handleTutorial(this.scene, Tutorial.Pokerus);
       } else {
         this.pokemonGrowthRateText.setText('');
@@ -1341,7 +1341,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         const defaultAbilityIndex = this.scene.gameData.getStarterSpeciesDefaultAbilityIndex(species);
         const defaultNature = this.scene.gameData.getSpeciesDefaultNature(species);
         const props = this.scene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr);
-        
+
         this.setSpeciesDetails(species, props.shiny, props.formIndex, props.female, props.variant, defaultAbilityIndex, defaultNature, true);
         this.pokemonSprite.setTint(0x808080);
       }
@@ -1507,7 +1507,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
               this.speciesStarterMoves.push(speciesEggMoves[species.speciesId][em]);
           }
         }
-        
+
         const speciesMoveData = this.scene.gameData.starterData[species.speciesId].moveset;
         let moveData: StarterMoveset = speciesMoveData
           ? Array.isArray(speciesMoveData)
@@ -1696,7 +1696,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       this.statsContainer.updateIvs(null);
     }
   }
-  
+
   showStats(): void {
     if (!this.speciesStarterDexEntry)
       return;