- Adjust for evolutions in games as well

1 year ago · 96aee7a440
2 changed files with 215 additions and 188 deletions
--- a/DBEditor/plan2.py
+++ b/DBEditor/plan2.py
@ -79,21 +79,52 @@ class EfficiencyOriginDexPlanner:

        print(f"Needed pokemon after adding new evolutions: {len(needed_pokemon)}")

-        # Create a dictionary to store the Pokémon available in each game
-        game_pokemon = {game['id']: set(encounter['pfic'] for encounter in encounter_data[game['id']]) for game in games_in_group}
+        # Create a dictionary to store the Pokémon available in each game, including evolutions
+        game_pokemon = {}
+        for game in games_in_group:
+            game_pokemon[game['id']] = set()
+            for encounter in encounter_data[game['id']]:
+                game_pokemon[game['id']].add(encounter['pfic'])
+                # Add all possible evolutions
+                current_pfic = encounter['pfic']
+                while current_pfic in evolution_map:
+                    for evolved_pfic in evolution_map[current_pfic]:
+                        if self.get_pokemon_generation(evolved_pfic) in generations:
+                            game_pokemon[game['id']].add(evolved_pfic)
+                            current_pfic = evolved_pfic
+                            break
+                    else:
+                        break

        selected_games = []
-        remaining_pokemon = needed_pokemon.copy()  # Create a copy to modify
+        remaining_pokemon = needed_pokemon.copy()
+
        while remaining_pokemon:
+            # Add debugging information
+            print("\nDebug: Game selection process")
+            for game in games_in_group:
+                pokemon_covered = remaining_pokemon & game_pokemon[game['id']]
+                print(f"  {game['name']}: {len(pokemon_covered)} Pokemon covered")
+                print(f"    First 15 Pokemon: {[self.get_pokemon_name(pfic) for pfic in list(pokemon_covered)[:15]]}")
+
            best_game = max(games_in_group, key=lambda g: len(remaining_pokemon & game_pokemon[g['id']]))
            pokemon_covered = remaining_pokemon & game_pokemon[best_game['id']]
-            print(f"Best game: {best_game['name']}, Pokemon covered: {len(pokemon_covered)}")
+            print(f"\nBest game: {best_game['name']}, Pokemon covered: {len(pokemon_covered)}")
+            print(f"First 10 Pokemon covered by {best_game['name']}: {[self.get_pokemon_name(pfic) for pfic in list(pokemon_covered)[:10]]}")
+            
            if not pokemon_covered:
                print("No more Pokémon can be covered. Breaking loop.")
                break
+            
            selected_games.append(best_game)
            remaining_pokemon -= pokemon_covered

+            # Check if we can remove any previously selected games
+            for game in selected_games[:-1]:
+                if all(pokemon in game_pokemon[best_game['id']] for pokemon in game_pokemon[game['id']] & needed_pokemon):
+                    selected_games.remove(game)
+                    print(f"Removed {game['name']} as it's covered by {best_game['name']}")
+
        print(f"Selected games: {[game['name'] for game in selected_games]}")

        for game in selected_games:
@ -250,8 +281,8 @@ class EfficiencyOriginDexPlanner:
        plan = self.generate_efficient_plan(generation_groups)
        
        # Print to console
-        for step in plan:
-            print(step)
+        #for step in plan:
+        #    print(step)
        
        # Write to file
        with open(output_file, 'w', encoding='utf-8') as f:
@ -281,4 +312,3 @@ class EfficiencyOriginDexPlanner:
 # Example usage
 planner = EfficiencyOriginDexPlanner('pokemon_forms.db')
 planner.display_plan([[1, 2], [3, 4, 5, 6], [7], [8], [9]])
-
--- a/efficiency_plan.txt
+++ b/efficiency_plan.txt
@ -166,8 +166,8 @@ Play Crystal:
    - Caterpie into Metapod
    - Caterpie into Metapod
    - Caterpie into Metapod
-    - Metapod into Butterfree (Female)
    - Metapod into Butterfree (Male)
+    - Metapod into Butterfree (Female)
    - Weedle into Kakuna
    - Weedle into Kakuna
    - Kakuna into Beedrill
@ -194,14 +194,14 @@ Play Crystal:
    - Golbat (Female) into Crobat
    - Zubat (Male) into Golbat (Male)
    - Zubat (Male) into Golbat (Male)
+    - Oddish into Gloom (Female)
    - Oddish into Gloom (Male)
    - Oddish into Gloom (Female)
    - Oddish into Gloom (Male)
    - Oddish into Gloom (Male)
-    - Oddish into Gloom (Female)
+    - Gloom (Female) into Vileplume (Female)
    - Gloom (Male) into Vileplume (Male)
    - Gloom (Male) into Bellossom
-    - Gloom (Female) into Vileplume (Female)
    - Paras into Parasect
    - Venonat into Venomoth
    - Diglett into Dugtrio
@ -212,9 +212,9 @@ Play Crystal:
    - Poliwag into Poliwhirl
    - Poliwag into Poliwhirl
    - Poliwag into Poliwhirl
+    - Poliwhirl into Poliwrath
    - Poliwhirl into Politoed (Male)
    - Poliwhirl into Politoed (Female)
-    - Poliwhirl into Poliwrath
    - Abra into Kadabra (Male)
    - Abra into Kadabra (Male)
    - Abra into Kadabra (Female)
@ -245,8 +245,8 @@ Play Crystal:
    - Haunter into Gengar
    - Onix into Steelix (Male)
    - Onix into Steelix (Female)
-    - Drowzee into Hypno (Male)
    - Drowzee into Hypno (Female)
+    - Drowzee into Hypno (Male)
    - Krabby into Kingler
    - Voltorb into Electrode
    - Exeggcute into Exeggutor
@ -265,11 +265,11 @@ Play Crystal:
    - Scyther (Male) into Scizor (Male)
    - Magikarp (Female) into Gyarados (Female)
    - Magikarp (Male) into Gyarados (Male)
-    - Eevee (Female) into Jolteon
-    - Eevee (Female) into Umbreon
-    - Eevee (Female) into Vaporeon
    - Eevee (Female) into Flareon
+    - Eevee (Female) into Vaporeon
    - Eevee (Female) into Espeon
+    - Eevee (Female) into Jolteon
+    - Eevee (Female) into Umbreon
    - Porygon into Porygon2
    - Dratini into Dragonair
    - Dratini into Dragonair
@ -277,8 +277,8 @@ Play Crystal:
    - Chikorita into Bayleef
    - Chikorita into Bayleef
    - Chikorita into Bayleef
-    - Bayleef into Meganium (Female)
    - Bayleef into Meganium (Male)
+    - Bayleef into Meganium (Female)
    - Cyndaquil into Quilava
    - Cyndaquil into Quilava
    - Quilava into Typhlosion
@ -305,8 +305,8 @@ Play Crystal:
    - Teddiursa into Ursaring (Male)
    - Teddiursa into Ursaring (Female)
    - Slugma into Magcargo
-    - Swinub into Piloswine (Male)
    - Swinub into Piloswine (Female)
+    - Swinub into Piloswine (Male)
    - Houndour into Houndoom (Male)
    - Houndour into Houndoom (Female)
    - Phanpy into Donphan (Male)
@ -315,22 +315,23 @@ Play Crystal:
    - Larvitar into Pupitar
    - Pupitar into Tyranitar
  Breed:
-    - Pikachu (Female) to get Pichu
    - Pikachu (Male) to get Pichu
+    - Pikachu (Female) to get Pichu
    - Clefairy to get Cleffa
    - Jigglypuff to get Igglybuff
    - Togetic to get Togepi
-    - Hitmonchan to get Tyrogue
    - Hitmontop to get Tyrogue
+    - Hitmonchan to get Tyrogue
    - Hitmonlee to get Tyrogue
    - Jynx to get Smoochum
    - Electabuzz to get Elekid
    - Magmar to get Magby
-Play Red:
+Play Yellow:
  Catch:
    - Bulbasaur: 4 time(s)
    - Charmander: 3 time(s)
    - Squirtle: 3 time(s)
+    - Vulpix: 2 time(s)
    - Mankey: 2 time(s)
    - Omanyte: 2 time(s)
    - Kabuto: 2 time(s)
@ -343,14 +344,15 @@ Play Red:
    - Bulbasaur into Ivysaur
    - Bulbasaur into Ivysaur
    - Bulbasaur into Ivysaur
-    - Ivysaur into Venusaur (Male)
    - Ivysaur into Venusaur (Female)
+    - Ivysaur into Venusaur (Male)
    - Charmander into Charmeleon
    - Charmander into Charmeleon
    - Charmeleon into Charizard
    - Squirtle into Wartortle
    - Squirtle into Wartortle
    - Wartortle into Blastoise
+    - Vulpix into Ninetales
    - Mankey into Primeape
    - Omanyte into Omastar
    - Kabuto into Kabutops
@ -366,26 +368,21 @@ Play Gold:
    - Flaaffy into Ampharos
    - Remoraid into Octillery (Female)
    - Remoraid into Octillery (Male)
-Play Blue:
-  Catch:
-    - Vulpix: 2 time(s)
-  Evolve:
-    - Vulpix into Ninetales
 Play Black 2:
  Catch:
-    - Sneasel (Female): 1 time(s)
-    - Sneasel (Male): 1 time(s)
-    - Murkrow (Male): 1 time(s)
-    - Eevee (Female): 3 time(s)
-    - Lickitung: 1 time(s)
    - Aipom (Female): 1 time(s)
-    - Gligar (Male): 1 time(s)
+    - Gligar (Female): 1 time(s)
+    - Murkrow (Female): 1 time(s)
    - Tangela: 2 time(s)
+    - Yanma: 1 time(s)
+    - Lickitung: 1 time(s)
+    - Magneton: 1 time(s)
    - Piloswine (Female): 1 time(s)
-    - Aipom (Male): 1 time(s)
+    - Sneasel (Female): 1 time(s)
+    - Sneasel (Male): 1 time(s)
    - Piloswine (Male): 1 time(s)
-    - Magneton: 1 time(s)
-    - Yanma: 1 time(s)
+    - Eevee (Female): 3 time(s)
+    - Aipom (Male): 1 time(s)
    - Lotad: 4 time(s)
    - Seedot: 5 time(s)
    - Taillow: 2 time(s)
@ -553,33 +550,33 @@ Play Black 2:
    - Zekrom: 1 time(s)
    - Kyurem: 1 time(s)
  Evolve:
+    - Aipom (Female) into Ambipom (Female)
+    - Gligar (Female) into Gliscor
+    - Murkrow (Female) into Honchkrow
+    - Tangela into Tangrowth (Male)
+    - Tangela into Tangrowth (Female)
+    - Yanma into Yanmega
+    - Lickitung into Lickilicky
+    - Magneton into Magnezone
+    - Piloswine (Female) into Mamoswine (Female)
    - Sneasel (Female) into Weavile (Female)
    - Sneasel (Male) into Weavile (Male)
-    - Murkrow (Male) into Honchkrow
+    - Piloswine (Male) into Mamoswine (Male)
    - Eevee (Female) into Sylveon
-    - Eevee (Female) into Leafeon
    - Eevee (Female) into Glaceon
-    - Lickitung into Lickilicky
-    - Aipom (Female) into Ambipom (Female)
-    - Gligar (Male) into Gliscor
-    - Tangela into Tangrowth (Female)
-    - Tangela into Tangrowth (Male)
-    - Piloswine (Female) into Mamoswine (Female)
+    - Eevee (Female) into Leafeon
    - Aipom (Male) into Ambipom (Male)
-    - Piloswine (Male) into Mamoswine (Male)
-    - Magneton into Magnezone
-    - Yanma into Yanmega
    - Lotad into Lombre
    - Lotad into Lombre
    - Lotad into Lombre
    - Lombre into Ludicolo (Male)
    - Lombre into Ludicolo (Female)
    - Seedot into Nuzleaf (Female)
-    - Seedot into Nuzleaf (Female)
    - Seedot into Nuzleaf (Male)
    - Seedot into Nuzleaf (Male)
-    - Nuzleaf (Female) into Shiftry (Female)
+    - Seedot into Nuzleaf (Female)
    - Nuzleaf (Male) into Shiftry (Male)
+    - Nuzleaf (Female) into Shiftry (Female)
    - Taillow into Swellow
    - Wingull into Pelipper
    - Surskit into Masquerain
@ -613,14 +610,14 @@ Play Black 2:
    - Baltoy into Claydol
    - Lileep into Cradily
    - Anorith into Armaldo
-    - Feebas into Milotic (Male)
    - Feebas into Milotic (Female)
+    - Feebas into Milotic (Male)
    - Shuppet into Banette
    - Spheal into Sealeo
    - Spheal into Sealeo
    - Sealeo into Walrein
-    - Clamperl into Huntail
    - Clamperl into Gorebyss
+    - Clamperl into Huntail
    - Bagon into Shelgon
    - Bagon into Shelgon
    - Shelgon into Salamence
@ -672,8 +669,8 @@ Play Black 2:
    - Pidove into Tranquill
    - Pidove into Tranquill
    - Pidove into Tranquill
-    - Tranquill into Unfezant (Female)
    - Tranquill into Unfezant (Male)
+    - Tranquill into Unfezant (Female)
    - Blitzle into Zebstrika
    - Roggenrola into Boldore
    - Roggenrola into Boldore
@ -746,80 +743,85 @@ Play Black 2:
    - Roselia (Female) to get Budew
    - Roselia (Male) to get Budew
    - Lucario to get Riolu
-Play Platinum:
+Play Y:
  Catch:
-    - Rhydon (Male): 1 time(s)
-    - Electabuzz: 1 time(s)
-    - Rhydon (Female): 1 time(s)
-    - Magmar: 1 time(s)
    - Poochyena: 2 time(s)
    - Zigzagoon: 2 time(s)
    - Wurmple: 7 time(s)
    - Ralts: 4 time(s)
-    - Nincada: 2 time(s)
    - Whismur: 3 time(s)
    - Skitty: 2 time(s)
-    - Sableye: 1 time(s)
-    - Mawile: 1 time(s)
    - Minun: 1 time(s)
    - Numel (Female): 2 time(s)
    - Numel (Male): 2 time(s)
    - Torkoal: 1 time(s)
    - Spinda: 1 time(s)
    - Duskull: 3 time(s)
-    - Chimecho: 1 time(s)
-    - Snorunt: 3 time(s)
-    - Turtwig: 3 time(s)
-    - Chimchar: 3 time(s)
-    - Piplup: 3 time(s)
    - Starly (Female): 3 time(s)
    - Starly (Male): 3 time(s)
-    - Kricketot (Female): 2 time(s)
-    - Kricketot (Male): 2 time(s)
    - Shinx (Female): 3 time(s)
    - Shinx (Male): 3 time(s)
    - Burmy (Plant Cloak): 3 time(s)
-    - Cherubi: 2 time(s)
    - Shellos (East Sea): 1 time(s)
    - Shellos (West Sea): 2 time(s)
-    - Gastrodon (East Sea): 1 time(s)
    - Chingling: 1 time(s)
    - Mime Jr.: 1 time(s)
-    - Spiritomb: 1 time(s)
-    - Snover (Female): 2 time(s)
-    - Snover (Male): 2 time(s)
+    - Abomasnow (Female): 1 time(s)
+    - Abomasnow (Male): 1 time(s)
    - Rotom: 1 time(s)
-    - Dialga: 1 time(s)
-    - Palkia: 1 time(s)
-    - Giratina (Altered Forme): 1 time(s)
-    - Giratina (Origin Forme): 1 time(s)
+    - Rotom (Fan Rotom): 1 time(s)
+    - Rotom (Frost Rotom): 1 time(s)
+    - Rotom (Heat Rotom): 1 time(s)
+    - Rotom (Mow Rotom): 1 time(s)
+    - Rotom (Wash Rotom): 1 time(s)
    - Phione: 1 time(s)
-    - Darkrai: 1 time(s)
-    - Shaymin (Land Forme): 1 time(s)
-    - Arceus (Normal): 1 time(s)
+    - Solosis: 3 time(s)
+    - Chespin: 3 time(s)
+    - Fennekin: 3 time(s)
+    - Froakie: 3 time(s)
+    - Bunnelby: 2 time(s)
+    - Fletchling: 3 time(s)
+    - Scatterbug: 3 time(s)
+    - Litleo: 3 time(s)
+    - Flabébé (Blue Flower): 1 time(s)
+    - Flabébé (Orange Flower): 1 time(s)
+    - Flabébé (White Flower): 1 time(s)
+    - Flabébé (Yellow Flower): 1 time(s)
+    - Skiddo: 2 time(s)
+    - Furfrou (Natural Form): 1 time(s)
+    - Honedge: 3 time(s)
+    - Binacle: 2 time(s)
+    - Skrelp: 2 time(s)
+    - Tyrunt: 2 time(s)
+    - Amaura: 2 time(s)
+    - Carbink: 1 time(s)
+    - Goomy: 3 time(s)
+    - Trevenant: 1 time(s)
+    - Pumpkaboo (Average Size): 2 time(s)
+    - Pumpkaboo (Large Size): 1 time(s)
+    - Pumpkaboo (Small Size): 2 time(s)
+    - Pumpkaboo (Super Size): 2 time(s)
+    - Yveltal: 1 time(s)
+    - Zygarde (10% Forme): 1 time(s)
+    - Zygarde (50% Forme): 1 time(s)
  Evolve:
-    - Rhydon (Male) into Rhyperior (Male)
-    - Electabuzz into Electivire
-    - Rhydon (Female) into Rhyperior (Female)
-    - Magmar into Magmortar
    - Poochyena into Mightyena
    - Zigzagoon into Linoone
    - Wurmple into Cascoon
-    - Wurmple into Cascoon
    - Wurmple into Silcoon
    - Wurmple into Silcoon
-    - Wurmple into Cascoon
    - Wurmple into Silcoon
+    - Wurmple into Cascoon
+    - Wurmple into Cascoon
    - Cascoon into Dustox (Female)
    - Cascoon into Dustox (Male)
-    - Silcoon into Beautifly (Female)
    - Silcoon into Beautifly (Male)
+    - Silcoon into Beautifly (Female)
    - Ralts into Kirlia
    - Ralts into Kirlia
    - Ralts into Kirlia
-    - Kirlia into Gallade
    - Kirlia into Gardevoir
-    - Nincada into Ninjask
+    - Kirlia into Gallade
    - Whismur into Loudred
    - Whismur into Loudred
    - Loudred into Exploud
@ -829,25 +831,12 @@ Play Platinum:
    - Duskull into Dusclops
    - Duskull into Dusclops
    - Dusclops into Dusknoir
-    - Snorunt into Froslass
-    - Snorunt into Glalie
-    - Turtwig into Grotle
-    - Turtwig into Grotle
-    - Grotle into Torterra
-    - Chimchar into Monferno
-    - Chimchar into Monferno
-    - Monferno into Infernape
-    - Piplup into Prinplup
-    - Piplup into Prinplup
-    - Prinplup into Empoleon
    - Starly (Female) into Staravia (Female)
    - Starly (Female) into Staravia (Female)
    - Staravia (Female) into Staraptor (Female)
    - Starly (Male) into Staravia (Male)
    - Starly (Male) into Staravia (Male)
    - Staravia (Male) into Staraptor (Male)
-    - Kricketot (Female) into Kricketune (Female)
-    - Kricketot (Male) into Kricketune (Male)
    - Shinx (Female) into Luxio (Female)
    - Shinx (Female) into Luxio (Female)
    - Luxio (Female) into Luxray (Female)
@ -856,50 +845,7 @@ Play Platinum:
    - Luxio (Male) into Luxray (Male)
    - Burmy (Plant Cloak) into Wormadam (Plant Cloak)
    - Burmy (Plant Cloak) into Mothim
-    - Cherubi into Cherrim (Overcast Form)
    - Shellos (West Sea) into Gastrodon (West Sea)
-    - Snover (Female) into Abomasnow (Female)
-    - Snover (Male) into Abomasnow (Male)
-  Breed:
-    - Chimecho to get Chingling
-    - Manaphy to get Phione
-Play Y:
-  Catch:
-    - Rotom (Fan Rotom): 1 time(s)
-    - Rotom (Frost Rotom): 1 time(s)
-    - Rotom (Heat Rotom): 1 time(s)
-    - Rotom (Mow Rotom): 1 time(s)
-    - Rotom (Wash Rotom): 1 time(s)
-    - Solosis: 3 time(s)
-    - Chespin: 3 time(s)
-    - Fennekin: 3 time(s)
-    - Froakie: 3 time(s)
-    - Bunnelby: 2 time(s)
-    - Fletchling: 3 time(s)
-    - Scatterbug: 3 time(s)
-    - Litleo: 3 time(s)
-    - Flabébé (Blue Flower): 1 time(s)
-    - Flabébé (Orange Flower): 1 time(s)
-    - Flabébé (White Flower): 1 time(s)
-    - Flabébé (Yellow Flower): 1 time(s)
-    - Skiddo: 2 time(s)
-    - Furfrou (Natural Form): 1 time(s)
-    - Honedge: 3 time(s)
-    - Binacle: 2 time(s)
-    - Skrelp: 2 time(s)
-    - Tyrunt: 2 time(s)
-    - Amaura: 2 time(s)
-    - Carbink: 1 time(s)
-    - Goomy: 3 time(s)
-    - Trevenant: 1 time(s)
-    - Pumpkaboo (Average Size): 2 time(s)
-    - Pumpkaboo (Large Size): 1 time(s)
-    - Pumpkaboo (Small Size): 2 time(s)
-    - Pumpkaboo (Super Size): 2 time(s)
-    - Yveltal: 1 time(s)
-    - Zygarde (10% Forme): 1 time(s)
-    - Zygarde (50% Forme): 1 time(s)
-  Evolve:
    - Solosis into Duosion
    - Solosis into Duosion
    - Duosion into Reuniclus
@ -919,8 +865,8 @@ Play Y:
    - Scatterbug into Spewpa
    - Scatterbug into Spewpa
    - Spewpa into Vivillon (Meadow Pattern)
-    - Litleo into Pyroar (Male)
    - Litleo into Pyroar (Female)
+    - Litleo into Pyroar (Male)
    - Skiddo into Gogoat
    - Honedge into Doublade
    - Honedge into Doublade
@ -935,23 +881,38 @@ Play Y:
    - Pumpkaboo (Average Size) into Gourgeist (Average Size)
    - Pumpkaboo (Small Size) into Gourgeist (Small Size)
    - Pumpkaboo (Super Size) into Gourgeist (Super Size)
-Play Omega Ruby:
+  Breed:
+    - Chimecho to get Chingling
+    - Manaphy to get Phione
+Play Alpha Sapphire:
  Catch:
    - Misdreavus: 1 time(s)
    - Treecko: 3 time(s)
    - Torchic (Female): 3 time(s)
    - Torchic (Male): 3 time(s)
    - Mudkip: 3 time(s)
+    - Nincada: 2 time(s)
+    - Sableye: 1 time(s)
+    - Snorunt: 3 time(s)
    - Latias: 1 time(s)
-    - Groudon: 1 time(s)
+    - Kyogre: 1 time(s)
    - Rayquaza: 1 time(s)
    - Deoxys (Normal Forme): 1 time(s)
+    - Turtwig: 3 time(s)
+    - Chimchar: 3 time(s)
+    - Piplup: 3 time(s)
+    - Kricketot (Female): 2 time(s)
+    - Kricketot (Male): 2 time(s)
+    - Cherubi: 2 time(s)
    - Glameow: 2 time(s)
+    - Spiritomb: 1 time(s)
+    - Dialga: 1 time(s)
+    - Giratina (Altered Forme): 1 time(s)
    - Petilil: 2 time(s)
    - Rufflet: 2 time(s)
-    - Tornadus (Incarnate Forme): 1 time(s)
-    - Reshiram: 1 time(s)
+    - Thundurus (Incarnate Forme): 1 time(s)
    - Landorus (Incarnate Forme): 1 time(s)
+    - Clauncher: 2 time(s)
    - Klefki: 1 time(s)
    - Phantump: 2 time(s)
  Evolve:
@ -968,24 +929,60 @@ Play Omega Ruby:
    - Mudkip into Marshtomp
    - Mudkip into Marshtomp
    - Marshtomp into Swampert
+    - Nincada into Ninjask
+    - Snorunt into Glalie
+    - Snorunt into Froslass
+    - Turtwig into Grotle
+    - Turtwig into Grotle
+    - Grotle into Torterra
+    - Chimchar into Monferno
+    - Chimchar into Monferno
+    - Monferno into Infernape
+    - Piplup into Prinplup
+    - Piplup into Prinplup
+    - Prinplup into Empoleon
+    - Kricketot (Female) into Kricketune (Female)
+    - Kricketot (Male) into Kricketune (Male)
+    - Cherubi into Cherrim (Overcast Form)
    - Glameow into Purugly
    - Petilil into Lilligant
    - Rufflet into Braviary
+    - Clauncher into Clawitzer
    - Phantump into Trevenant
-Play White:
+Play Platinum:
+  Catch:
+    - Rhydon (Female): 1 time(s)
+    - Magmar: 1 time(s)
+    - Electabuzz: 1 time(s)
+    - Rhydon (Male): 1 time(s)
+    - Mawile: 1 time(s)
+    - Gastrodon (East Sea): 1 time(s)
+    - Snover (Female): 2 time(s)
+    - Snover (Male): 2 time(s)
+    - Palkia: 1 time(s)
+    - Giratina (Origin Forme): 1 time(s)
+    - Darkrai: 1 time(s)
+    - Shaymin (Land Forme): 1 time(s)
+    - Arceus (Normal): 1 time(s)
+  Evolve:
+    - Rhydon (Female) into Rhyperior (Female)
+    - Magmar into Magmortar
+    - Electabuzz into Electivire
+    - Rhydon (Male) into Rhyperior (Male)
+    - Snover (Female) into Abomasnow (Female)
+    - Snover (Male) into Abomasnow (Male)
+Play Black:
  Catch:
    - Victini: 1 time(s)
-    - Thundurus (Incarnate Forme): 1 time(s)
+    - Tornadus (Incarnate Forme): 1 time(s)
+    - Reshiram: 1 time(s)
+Play Ruby:
+  Catch:
+    - Groudon: 1 time(s)
 Play X:
  Catch:
-    - Clauncher: 2 time(s)
    - Xerneas (Neutral Mode): 1 time(s)
-  Evolve:
-    - Clauncher into Clawitzer
-Play Emerald:
-  Catch:
-    - Kyogre: 1 time(s)
-Play Ultra Sun:
+Play Ultra Moon:
  Catch:
    - Rowlet: 3 time(s)
    - Litten: 3 time(s)
@ -1011,7 +1008,7 @@ Play Ultra Sun:
    - Stufful: 2 time(s)
    - Bounsweet: 3 time(s)
    - Comfey: 1 time(s)
-    - Passimian: 1 time(s)
+    - Oranguru: 1 time(s)
    - Wimpod: 2 time(s)
    - Sandygast: 2 time(s)
    - Pyukumuku: 1 time(s)
@ -1025,10 +1022,10 @@ Play Ultra Sun:
    - Minior (Violet Core): 1 time(s)
    - Minior (Yellow Core): 1 time(s)
    - Komala: 1 time(s)
-    - Turtonator: 1 time(s)
    - Togedemaru: 1 time(s)
    - Mimikyu: 1 time(s)
    - Bruxish: 1 time(s)
+    - Drampa: 1 time(s)
    - Dhelmise: 1 time(s)
    - Jangmo-o: 3 time(s)
    - Tapu Koko: 1 time(s)
@ -1037,14 +1034,14 @@ Play Ultra Sun:
    - Tapu Fini: 1 time(s)
    - Cosmog: 4 time(s)
    - Nihilego: 1 time(s)
-    - Buzzwole: 1 time(s)
+    - Pheromosa: 1 time(s)
    - Xurkitree: 1 time(s)
-    - Kartana: 1 time(s)
+    - Celesteela: 1 time(s)
    - Guzzlord: 1 time(s)
    - Necrozma: 1 time(s)
    - Magearna: 1 time(s)
    - Poipole: 2 time(s)
-    - Blacephalon: 1 time(s)
+    - Stakataka: 1 time(s)
  Evolve:
    - Rowlet into Dartrix
    - Rowlet into Dartrix
@ -1084,16 +1081,16 @@ Play Ultra Sun:
    - Cosmog into Cosmoem
    - Cosmog into Cosmoem
    - Cosmog into Cosmoem
-    - Cosmoem into Lunala
    - Cosmoem into Solgaleo
+    - Cosmoem into Lunala
    - Poipole into Naganadel
-Play Ultra Moon:
+Play Ultra Sun:
  Catch:
-    - Oranguru: 1 time(s)
-    - Drampa: 1 time(s)
-    - Pheromosa: 1 time(s)
-    - Celesteela: 1 time(s)
-    - Stakataka: 1 time(s)
+    - Passimian: 1 time(s)
+    - Turtonator: 1 time(s)
+    - Buzzwole: 1 time(s)
+    - Kartana: 1 time(s)
+    - Blacephalon: 1 time(s)
 Play Sword:
  Catch:
    - Sneasel (Female): 1 time(s)
@ -1208,8 +1205,8 @@ Play Sword:
    - Eternatus: 1 time(s)
  Evolve:
    - Sneasel (Female) into Sneasler
-    - Basculin (Red-Striped Form) into Basculegion (Female)
    - Basculin (Red-Striped Form) into Basculegion (Male)
+    - Basculin (Red-Striped Form) into Basculegion (Female)
    - Grookey into Thwackey
    - Grookey into Thwackey
    - Thwackey into Rillaboom
@ -1254,19 +1251,9 @@ Play Sword:
    - Dreepy into Drakloak
    - Dreepy into Drakloak
    - Drakloak into Dragapult
-Play Legends Arceus:
-  Catch:
-    - Stantler: 1 time(s)
-    - Ursaring (Male): 1 time(s)
-    - Scyther (Male): 1 time(s)
-    - Overqwil: 1 time(s)
-    - Enamorus (Incarnate Forme): 1 time(s)
-  Evolve:
-    - Stantler into Wyrdeer
-    - Ursaring (Male) into Ursaluna
-    - Scyther (Male) into Kleavor
 Play Expansion Pass:
  Catch:
+    - Scyther (Male): 1 time(s)
    - Kubfu: 2 time(s)
    - Regieleki: 1 time(s)
    - Regidrago: 1 time(s)
@ -1274,18 +1261,28 @@ Play Expansion Pass:
    - Spectrier: 1 time(s)
    - Calyrex: 1 time(s)
  Evolve:
+    - Scyther (Male) into Kleavor
    - Kubfu into Urshifu (Single Strike Style)
+Play Legends Arceus:
+  Catch:
+    - Ursaring (Female): 1 time(s)
+    - Stantler: 1 time(s)
+    - Overqwil: 1 time(s)
+    - Enamorus (Incarnate Forme): 1 time(s)
+  Evolve:
+    - Ursaring (Female) into Ursaluna
+    - Stantler into Wyrdeer
 Play Shield:
  Catch:
    - Cursola: 1 time(s)
    - Zamazenta (Hero of Many Battles): 1 time(s)
 Play Scarlet:
  Catch:
-    - Bisharp: 1 time(s)
    - Dunsparce: 1 time(s)
-    - Girafarig (Male): 1 time(s)
-    - Primeape: 1 time(s)
+    - Girafarig (Female): 1 time(s)
    - Applin: 3 time(s)
+    - Primeape: 1 time(s)
+    - Bisharp: 1 time(s)
    - Sprigatito: 3 time(s)
    - Fuecoco: 3 time(s)
    - Quaxly: 3 time(s)
@ -1350,12 +1347,12 @@ Play Scarlet:
    - Walking Wake: 1 time(s)
    - Iron Leaves: 1 time(s)
  Evolve:
-    - Bisharp into Kingambit
    - Dunsparce into Dudunsparce (Two-Segment Form)
-    - Girafarig (Male) into Farigiraf
-    - Primeape into Annihilape
+    - Girafarig (Female) into Farigiraf
    - Applin into Dipplin
    - Dipplin into Hydrapple
+    - Primeape into Annihilape
+    - Bisharp into Kingambit
    - Sprigatito into Floragato
    - Sprigatito into Floragato
    - Floragato into Meowscarada
@ -1380,8 +1377,8 @@ Play Scarlet:
    - Nacli into Naclstack
    - Nacli into Naclstack
    - Naclstack into Garganacl
-    - Charcadet into Ceruledge
    - Charcadet into Armarouge
+    - Charcadet into Ceruledge
    - Tadbulb into Bellibolt
    - Wattrel into Kilowattrel
    - Maschiff into Mabosstiff