Merge 1e644e453c into 907e3c8208

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>

src/data/trainers/trainer-config.ts

@@ -1865,27 +1865,43 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(
       0,
       getRandomPartyMemberFunc([
+        SpeciesId.METAPOD,
+        SpeciesId.LEDYBA,
+        SpeciesId.CLEFFA,
+        SpeciesId.WOOPER,
+        SpeciesId.TEDDIURSA,
+        SpeciesId.REMORAID,
+        SpeciesId.HOUNDOUR,
+        SpeciesId.SILCOON,
         SpeciesId.PLUSLE,
         SpeciesId.VOLBEAT,
-        SpeciesId.PACHIRISU,
-        SpeciesId.SILCOON,
-        SpeciesId.METAPOD,
-        SpeciesId.IGGLYBUFF,
+        SpeciesId.SPINDA,
+        SpeciesId.BONSLY,
         SpeciesId.PETILIL,
-        SpeciesId.EEVEE,
+        SpeciesId.SPRITZEE,
+        SpeciesId.MILCERY,
+        SpeciesId.PICHU,
       ]),
     )
     .setPartyMemberFunc(
       1,
       getRandomPartyMemberFunc(
         [
+          SpeciesId.KAKUNA,
+          SpeciesId.SPINARAK,
+          SpeciesId.IGGLYBUFF,
+          SpeciesId.PALDEA_WOOPER,
+          SpeciesId.PHANPY,
+          SpeciesId.MANTYKE,
+          SpeciesId.ELECTRIKE,
+          SpeciesId.CASCOON,
           SpeciesId.MINUN,
           SpeciesId.ILLUMISE,
-          SpeciesId.EMOLGA,
-          SpeciesId.CASCOON,
-          SpeciesId.KAKUNA,
-          SpeciesId.CLEFFA,
+          SpeciesId.SPINDA,
+          SpeciesId.MIME_JR,
           SpeciesId.COTTONEE,
+          SpeciesId.SWIRLIX,
+          SpeciesId.FIDOUGH,
           SpeciesId.EEVEE,
         ],
         TrainerSlot.TRAINER_PARTNER,

src/phases/turn-start-phase.ts

@@ -17,9 +17,9 @@ export class TurnStartPhase extends FieldPhase {
   public readonly phaseName = "TurnStartPhase";
 
   /**
-   * This orders the active Pokemon on the field by speed into an BattlerIndex array and returns that array.
+   * Helper method to retrieve the current speed order of the combattants.
    * It also checks for Trick Room and reverses the array if it is present.
-   * @returns An array of {@linkcode BattlerIndex}es containing all on-field Pokemon sorted in speed order.
+   * @returns The {@linkcode BattlerIndex}es of all on-field Pokemon, sorted in speed order.
    */
   getSpeedOrder(): BattlerIndex[] {
     const playerField = globalScene.getPlayerField().filter(p => p.isActive());
@@ -53,9 +53,9 @@ export class TurnStartPhase extends FieldPhase {
   }
 
   /**
-   * This takes the result of getSpeedOrder and applies priority / bypass speed attributes to it.
+   * This takes the result of {@linkcode getSpeedOrder} and applies priority / bypass speed attributes to it.
    * This also considers the priority levels of various commands and changes the result of `getSpeedOrder` based on such.
-   * @returns An array of {@linkcode BattlerIndex}es containing all on-field Pokemon sorted in action order.
+   * @returns The `BattlerIndex`es of all on-field Pokemon sorted in action order.
    */
   getCommandOrder(): BattlerIndex[] {
     let moveOrder = this.getSpeedOrder();
@@ -164,7 +164,7 @@ export class TurnStartPhase extends FieldPhase {
 
       // TODO: Remove `turnData.order` -
       // it is used exclusively for Fusion Flare/Bolt
-      // and uses a really jank implementation
+      // and uses a really jank (and incorrect) implementation
       if (turnCommand.command === Command.FIGHT) {
         pokemon.turnData.order = index;
       }