From 20a9362a1b0e4614f0704c1e711dfc4ca2f1c14e Mon Sep 17 00:00:00 2001
From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com>
Date: Thu, 1 Aug 2024 22:36:58 -0400
Subject: [PATCH] Wording changes

Changed text to better clarify when you can/can't catch anything

Removed unnecessary rolls I left in for debugging
---
 src/phases.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/phases.ts b/src/phases.ts
index 5b00b077fd8..5a4bec5bfed 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -140,9 +140,9 @@ function findBest(scene: BattleScene, pokemon: EnemyPokemon, override?: boolean)
       offset++
     }
   })
-  scene.currentBattle.multiInt(scene, rolls, 12, 65536)
-  console.log(rolls)
-  console.log(rolls.slice(offset, offset + 3))
+  scene.currentBattle.multiInt(scene, rolls, offset + 3, 65536)
+  //console.log(rolls)
+  //console.log(rolls.slice(offset, offset + 3))
   if (scene.pokeballCounts[0] == 0 && !override) rates[0] = 0
   if (scene.pokeballCounts[1] == 0 && !override) rates[1] = 0
   if (scene.pokeballCounts[2] == 0 && !override) rates[2] = 0
@@ -171,20 +171,21 @@ function findBest(scene: BattleScene, pokemon: EnemyPokemon, override?: boolean)
         if (v > rolls[offset + 2]) {
           //console.log("Caught!")
           if (func_output == "") {
-            func_output = ballNames[i] + " (CATCH)"
+            func_output = ballNames[i] + " catches"
           }
         }
       }
     }
     if (v > rolls[offset] && v > rolls[1 + offset] && v > rolls[2 + offset]) {
       if (func_output == "") {
-        func_output = ballNames[i] + " (CATCH)"
+        func_output = ballNames[i] + " catches"
       }
     }
   })
   if (func_output != "") {
     return func_output
   }
+  return "Can't catch"
   var n = ""
   switch (rates2[0]) {
     case rates[0]: