more cleanup [skip-ci]

Fixes issue #872

Closes #872

See merge request cable-mc/cobblemon!1072

CHANGELOG.md

@@ -11,6 +11,7 @@
 - Fixed Pokémon losing their Hidden Ability through evolution if the middle stage did not have a Hidden Ability.
 - Fixed Crumbling Arch not blending in with the world.
 - Fixed Energy Root applying being usable on a fainted Pokemon.
+- Fixed Pokémon entity not spawning when starting a battle while recalling said Pokémon
 
 ### Additions
 - Added extra visuals to early berry growth stages

common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/SwitchInstruction.kt

@@ -47,7 +47,16 @@ class SwitchInstruction(val instructionSet: InstructionSet, val battleActor: Bat
         if (!battle.started) {
             activePokemon.battlePokemon = pokemon
             activePokemon.illusion = illusion
-            val pokemonEntity = pokemon.entity
+            val pokemonEntity = pokemon.entity?.let {
+                // If a Pokémon entity is being recalled with an animation,
+                // wrap up the animation and recall the Pokémon immediately.
+                if (it.beamMode == 3) {
+                    pokemon.effectedPokemon.recall()
+                    return@let null
+                }
+                pokemon.entity
+            }
+
             if (pokemonEntity == null && entity != null) {
                 val targetPos = battleActor.getSide().getOppositeSide().actors.filterIsInstance<EntityBackedBattleActor<*>>().firstOrNull()?.entity?.pos?.let { pos ->
                     val offset = pos.subtract(entity.pos)

utilityscripts/cobblemon_cry_checker.py

@@ -9,8 +9,6 @@ from scriptutils import printCobblemonHeader, print_list_filtered, print_cobblem
     print_cobblemon_script_footer, print_problems_and_paths, print_warning, sanitize_pokemon, print_separator
 
 DEFAULT_POKEMON_MODELS_PATH = "../common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/"
-
-# Download the CSV file
 ASSETS_CSV_URL = "https://docs.google.com/spreadsheets/d/e/2PACX-1vSTisDTkJvV0GzKV1zKjAPdMAQAO7znWxjEWXrM1gZPUVmsTU91oy54aJGMpbbvOqAOg03ER1wl7eeA/pub?gid=0&single=true&output=csv"
 
 
@@ -63,6 +61,7 @@ def main(print_missing_models=True, print_missing_animations=True):
                                                                                                          cries_in_game,
                                                                                                          pokemon_in_game,
                                                                                                          cries_on_repo):
+        # Skip pokemon that are not in the game yet
         if this_pokemon_in_game == "❌":
             continue
         cry_in_game = str(cry_in_game).strip()  # remove whitespace
@@ -88,9 +87,6 @@ def main(print_missing_models=True, print_missing_animations=True):
             'sound_effects_and_keyframes': False,
         }
         # Construct the path to the model file
-        if pokemon_name == "Rattata [Alolan]":
-            print(pokemon_name)
-        # Try to convert gen_number to an integer and handle ValueError
         try:
             if pokemon_form:
                 # Check if the form is a regional form or F or M, if not, use the default model file