Isometric

Fix texture reference error on Heatmor shiny

CHANGELOG.md

@@ -18,6 +18,7 @@
 - Added cosmetics for Gurdurr, Conkeldurr, Squirtle Line, Sneasler, Sandle line, Treecko line, Braixen, Delphox, and Dragonite.
 - Added `/transformmodelpart (position|rotation|scale) <modelPart> <transform: x y z>` command that can add transformations to a pokemon's model part.
   - The player executing the command must be facing the target pokemon entity. Transformations are not persistent and will revert when resources are reloaded.
+- Added `legacy` and `special` sourced moves to Pokémon.
 - Added lang keys for all moves and abilities up to Generation 9.
 - Added `translucent_cull` boolean option into resolver's layer to allow for translucent textures with culling
 - Added [LambDynamicLights](https://modrinth.com/mod/lambdynamiclights) support for items held by Pokémon, evolution stone blocks, evolution stone items, Pokédex, Luminous Moss, Flame Orb, and Magmarizer.
@@ -36,9 +37,12 @@
 ### Pokémon Added
 
 #### Gen 2
+- Marill
+- Azumarill
 - Dunsparce
 
 #### Gen 3
+- Azurill
 - Spoink
 - Grumpig
 - Snorunt
@@ -254,6 +258,7 @@
 - Fixed Pokémon marked as silent still playing shiny sounds and effects.
 - Fixed an issue with newer versions of Fabric API where underground Pokémon were spawning in The End.
 - Fixed spawning not working well when you're at high points surrounded by lower altitude spawning areas, such as flying.
+- Fixed some Pokémon having erroneous tutor moves if another move included a valid tutor move as a substring.
 - Fixed certain Pokémon with forms not having appropriate stock Pokédex entries.
 - Fixed issue with Pokédex Scanner that caused the open/close overlay to have the wrong opacity values
 - Fixed dragon's breath not being usable on the restoration tank when it should be
@@ -289,6 +294,9 @@
 - Fixed Pokédex Scanner not respecting the "Invert Mouse" option.
 - Fixed a crash due to a ConcurrentModificationException that could occur during world generation.
 - Fixed Moon Ball moon phase logic to actually work correctly
+- Fixed recoil eyes on Shellder & Cloyster.
+- Fixed Shroomish spinning at lightning speed when fainting (no longer allowed to let it rip.)
+- Fixed Quaxly's animations showing hidden wing sets
 
 ### Developer
 - A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
@@ -307,6 +315,11 @@
 - Updated NPCEntity pokeball throw positioning to properly account for the baseScale property.
 - Fixed `[Pokemon].copyFrom` error causing forms, IVs, and EVs to not be applied properly when using `[Pokemon].loadFromJSON` or `[Pokemon].loadFromNBT`
 - Added new item class, `WearableItem`. Instances of this class should have a corresponding 3D model. These models render when the items display context is `HEAD`.
+- Added new LearnsetQuery types:
+  - `LEGAL` for moves that are innately compatible and learnable by the Pokémon.
+  - `LEGACY` for moves that were once officially learnable by the Pokémon but aren't due to GameFreak's re-balancing.
+  - `SPECIAL` for moves that are not learnable by the Pokémon but may have appeared in a special event or distribution.
+
 - Pokemon now have a fireImmune attribute in their behaviour that can be set to true to ignore all fire damage (lava, magma blocks, etc.)
   `JSON
   {
@@ -339,6 +352,9 @@
 - Added `pokemon` as an available Molang function for the `battleActor` functions.
 - Fixed `heldItem` property inside spawn files not working and causing crashes
 - Fixed `spawn_bedrock_particles` MoLang causing crashes when used in a server environment
+- The following move sources are now valid for the `moves` array in species data:
+  - `legacy:{move}`
+  - `special:{move}`
 - The Pokédex form lang key definition now follows `cobblemon.ui.pokedex.info.form.{species}-{formname}` instead of `cobblemon.ui.pokedex.info.form.{formname}`.
 - Added `play_sound_on_server` as an available Molang function for the `worldHolder` & `player` functions.
 - Added `run_molang_after` as an available Molang function for the `entity` functions when schedulable.

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/moves/Learnset.kt

@@ -43,6 +43,8 @@ open class Learnset : ClientDataSynchronizer<Learnset> {
         val tmInterpreter = Interpreter.parseFromPrefixIntoList("tm") { it.tmMoves }
         val eggInterpreter = Interpreter.parseFromPrefixIntoList("egg") { it.eggMoves }
         val tutorInterpreter = Interpreter.parseFromPrefixIntoList("tutor") { it.tutorMoves }
+        val legacyInterpreter = Interpreter.parseFromPrefixIntoList("legacy") { it.legacyMoves }
+        val specialInterpreter = Interpreter.parseFromPrefixIntoList("special") { it.specialMoves }
         val formChangeInterpreter = Interpreter.parseFromPrefixIntoList("form_change") { it.formChangeMoves }
         val levelUpInterpreter = Interpreter { element, learnset ->
             val str = element.takeIf { it.isJsonPrimitive }?.asString ?: return@Interpreter false
@@ -70,6 +72,8 @@ open class Learnset : ClientDataSynchronizer<Learnset> {
             tmInterpreter,
             eggInterpreter,
             tutorInterpreter,
+            legacyInterpreter,
+            specialInterpreter,
             levelUpInterpreter,
             formChangeInterpreter
         )
@@ -78,6 +82,8 @@ open class Learnset : ClientDataSynchronizer<Learnset> {
     val levelUpMoves = mutableMapOf<Int, MutableList<MoveTemplate>>()
     val eggMoves = mutableListOf<MoveTemplate>()
     val tutorMoves = mutableListOf<MoveTemplate>()
+    val legacyMoves = mutableListOf<MoveTemplate>()
+    val specialMoves = mutableListOf<MoveTemplate>()
     val tmMoves = mutableListOf<MoveTemplate>()
     /**
      * Moves the species/form will have learnt when evolving into itself.

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/moves/LearnsetQuery.kt

@@ -24,6 +24,17 @@ fun interface LearnsetQuery {
     companion object {
 
         val ANY = LearnsetQuery { move, learnset ->
+            learnset.levelUpMoves.values.any { it.contains(move) }
+                    || learnset.eggMoves.contains(move)
+                    || learnset.tutorMoves.contains(move)
+                    || learnset.tmMoves.contains(move)
+                    || learnset.formChangeMoves.contains(move)
+                    || learnset.evolutionMoves.contains(move)
+                    || learnset.legacyMoves.contains(move)
+                    || learnset.specialMoves.contains(move)
+        }
+
+        val LEGAL = LearnsetQuery { move, learnset ->
             learnset.levelUpMoves.values.any { it.contains(move) }
                     || learnset.eggMoves.contains(move)
                     || learnset.tutorMoves.contains(move)
@@ -46,6 +57,9 @@ fun interface LearnsetQuery {
 
         val EVOLUTION = LearnsetQuery { move, learnset -> learnset.evolutionMoves.contains(move) }
 
+        val LEGACY_MOVES = LearnsetQuery { move, learnset -> learnset.legacyMoves.contains(move) }
+
+        val SPECIAL_MOVES = LearnsetQuery { move, learnset -> learnset.specialMoves.contains(move) }
     }
 
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/item/PokemonItemRenderer.kt

@@ -50,10 +50,6 @@ class PokemonItemRenderer : CobblemonBuiltinItemRenderer {
 
         val transformations = positions[mode]!!
 
-        if (mode == ItemDisplayContext.GUI) {
-            Lighting.setupForFlatItems()
-        }
-
         matrices.scale(transformations.scale.x, transformations.scale.y, transformations.scale.z)
         matrices.translate(transformations.translation.x, transformations.translation.y, transformations.translation.z)
         state.setPoseToFirstSuitable(PoseType.PORTRAIT)
@@ -64,13 +60,18 @@ class PokemonItemRenderer : CobblemonBuiltinItemRenderer {
         val rotation = Quaternionf().fromEulerXYZDegrees(Vector3f(transformations.rotation.x, transformations.rotation.y, transformations.rotation.z))
         matrices.mulPose(rotation)
         rotation.conjugate()
+
+        // TO-DO: Flip the model to show the back
+        //matrices.mulPose(Quaternionf().fromAxisAngleRad(0f, 1f, 0f, Math.PI.toFloat()))
+
+        // Tilt the model to an isometric angle
+        //matrices.mulPose(Quaternionf().fromAxisAngleRad(1f, 0f, 0f, Math.toRadians(15.0).toFloat()))
+        //matrices.mulPose(Quaternionf().fromAxisAngleRad(0f, 1f, 0f, Math.toRadians(5.0).toFloat()))
+        //matrices.mulPose(Quaternionf().fromAxisAngleRad(0f, 0f, 1f, Math.toRadians(10.0).toFloat()))
+
         val vertexConsumer: VertexConsumer = vertexConsumers.getBuffer(renderLayer)
         matrices.pushPose()
-        val packedLight = if (mode == ItemDisplayContext.GUI) {
-            LightTexture.pack(13, 13)
-        } else {
-            light
-        }
+        val packedLight = LightTexture.pack(15, 15)
 
         // x = red, y = green, z = blue, w = alpha
         val tint = pokemonItem.tint(stack)
@@ -87,9 +88,7 @@ class PokemonItemRenderer : CobblemonBuiltinItemRenderer {
         matrices.popPose()
         matrices.popPose()
 
-        if (mode == ItemDisplayContext.GUI) {
-            Lighting.setupFor3DItems()
-        }
+        Lighting.setupForFlatItems()
     }
 
     companion object {

common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt

@@ -7,9 +7,11 @@
  */
 
 package com.cobblemon.mod.common.item.group
-
+import java.io.File
+import com.google.gson.JsonParser
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonItems
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.world.level.ItemLike
@@ -52,6 +54,9 @@ object CobblemonItemGroups {
     @JvmStatic val EVOLUTION_ITEMS_KEY = this.create("evolution_item", this::evolutionItemEntries) {
         ItemStack(CobblemonItems.BLACK_AUGURITE)
     }
+    @JvmStatic val POKEMON_MODEL_ITEMS_KEY = this.create("pokemon_model_items", this::pokemonModelItemsEntries) {
+        ItemStack(Items.PAPER)
+    }
 
     @JvmStatic val BLOCKS get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(BLOCKS_KEY)
     @JvmStatic val UTILITY_ITEMS get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(UTILITY_ITEMS_KEY)
@@ -60,6 +65,7 @@ object CobblemonItemGroups {
     @JvmStatic val CONSUMABLES get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(CONSUMABLES_KEY)
     @JvmStatic val HELD_ITEMS get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(HELD_ITEMS_KEY)
     @JvmStatic val EVOLUTION_ITEMS get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(EVOLUTION_ITEMS_KEY)
+    @JvmStatic val POKEMON_MODEL_ITEMS get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(POKEMON_MODEL_ITEMS_KEY)
 
     @JvmStatic val BUILDING_BLOCKS_INJECTIONS = this.inject(ResourceKey.create(BuiltInRegistries.CREATIVE_MODE_TAB.key(), ResourceLocation.parse("building_blocks")), this::blocksInjections)
     @JvmStatic val FOOD_INJECTIONS = this.inject(ResourceKey.create(BuiltInRegistries.CREATIVE_MODE_TAB.key(), ResourceLocation.parse("food_and_drinks")), this::foodInjections)
@@ -95,6 +101,536 @@ object CobblemonItemGroups {
         return consumer
     }
 
+    private fun pokemonModelItemsEntries(displayContext: ItemDisplayParameters, entries: Output) {
+        val extraAspects: Map<String, List<Set<String>>> = mapOf(
+            "Magikarp" to listOf(
+                setOf("female"),
+                setOf("magikarp-jump-apricot-stripes"),
+                setOf("magikarp-jump-apricot-tiger"),
+                setOf("magikarp-jump-apricot-zebra"),
+                setOf("magikarp-jump-black-forehead"),
+                setOf("magikarp-jump-black-mask"),
+                setOf("magikarp-jump-blue-raindrops"),
+                setOf("magikarp-jump-blue-saucy"),
+                setOf("magikarp-jump-brown-stripes"),
+                setOf("magikarp-jump-brown-tiger"),
+                setOf("magikarp-jump-brown-zebra"),
+                setOf("magikarp-jump-calico-orange-gold"),
+                setOf("magikarp-jump-calico-orange-white"),
+                setOf("magikarp-jump-calico-orange-white-black"),
+                setOf("magikarp-jump-calico-white-orange"),
+                setOf("magikarp-jump-gray-bubbles"),
+                setOf("magikarp-jump-gray-diamonds"),
+                setOf("magikarp-jump-gray-patches"),
+                setOf("magikarp-jump-orange-dapples"),
+                setOf("magikarp-jump-orange-forehead"),
+                setOf("magikarp-jump-orange-mask"),
+                setOf("magikarp-jump-orange-orca"),
+                setOf("magikarp-jump-orange-two-tone"),
+                setOf("magikarp-jump-pink-dapples"),
+                setOf("magikarp-jump-pink-orca"),
+                setOf("magikarp-jump-pink-two-tone"),
+                setOf("magikarp-jump-purple-bubbles"),
+                setOf("magikarp-jump-purple-diamonds"),
+                setOf("magikarp-jump-purple-patches"),
+                setOf("magikarp-jump-skelly"),
+                setOf("magikarp-jump-violet-raindrops"),
+                setOf("magikarp-jump-violet-saucy")
+            ),
+            "Vivillon" to listOf(
+                setOf("vivillon-wings-archipelago"),
+                setOf("vivillon-wings-continental"),
+                setOf("vivillon-wings-elegant"),
+                setOf("vivillon-wings-fancy"),
+                setOf("vivillon-wings-forsaken"),
+                setOf("vivillon-wings-garden"),
+                setOf("vivillon-wings-high-plains"),
+                setOf("vivillon-wings-icy-snow"),
+                setOf("vivillon-wings-inferno"),
+                setOf("vivillon-wings-jungle"),
+                setOf("vivillon-wings-marine"),
+                setOf("vivillon-wings-modern"),
+                setOf("vivillon-wings-monsoon"),
+                setOf("vivillon-wings-ocean"),
+                setOf("vivillon-wings-polar"),
+                setOf("vivillon-wings-river"),
+                setOf("vivillon-wings-sandstorm"),
+                setOf("vivillon-wings-savanna"),
+                setOf("vivillon-wings-sun"),
+                setOf("vivillon-wings-tundra"),
+                setOf("vivillon-wings-void")
+            ),
+            "Wooloo" to listOf(
+                setOf("color-black"),
+                setOf("color-blue"),
+                setOf("color-brown"),
+                setOf("color-cyan"),
+                setOf("color-gray"),
+                setOf("color-green"),
+                setOf("color-light_blue"),
+                setOf("color-light_gray"),
+                setOf("color-lime"),
+                setOf("color-magenta"),
+                setOf("color-orange"),
+                setOf("color-pink"),
+                setOf("color-purple"),
+                setOf("color-red"),
+                setOf("color-yellow")
+            ),
+            "Smeargle" to listOf(
+                setOf("color-black"),
+                setOf("color-blue"),
+                setOf("color-brown"),
+                setOf("color-cyan"),
+                setOf("color-gray"),
+                setOf("color-light_blue"),
+                setOf("color-light_gray"),
+                setOf("color-lime"),
+                setOf("color-magenta"),
+                setOf("color-orange"),
+                setOf("color-pink"),
+                setOf("color-purple"),
+                setOf("color-red"),
+                setOf("color-white"),
+                setOf("color-yellow")
+            ),
+            "Dubwool" to listOf(
+                setOf("color-black"),
+                setOf("color-blue"),
+                setOf("color-brown"),
+                setOf("color-cyan"),
+                setOf("color-gray"),
+                setOf("color-green"),
+                setOf("color-light_blue"),
+                setOf("color-light_gray"),
+                setOf("color-lime"),
+                setOf("color-magenta"),
+                setOf("color-orange"),
+                setOf("color-pink"),
+                setOf("color-purple"),
+                setOf("color-red"),
+                setOf("color-yellow")
+            ),
+            "Conkeldurr" to listOf(
+                setOf("color-black"),
+                setOf("color-blue"),
+                setOf("color-brown"),
+                setOf("color-cyan"),
+                setOf("color-gray"),
+                setOf("color-green"),
+                setOf("color-light_blue"),
+                setOf("color-lime"),
+                setOf("color-magenta"),
+                setOf("color-orange"),
+                setOf("color-pink"),
+                setOf("color-purple"),
+                setOf("color-red"),
+                setOf("color-white"),
+                setOf("color-yellow")
+            ),
+            "Komala" to listOf(
+                setOf("tree-acacia"),
+                setOf("tree-apricorn"),
+                setOf("tree-birch"),
+                setOf("tree-cherry"),
+                setOf("tree-crimson"),
+                setOf("tree-darkoak"),
+                setOf("tree-jungle"),
+                setOf("tree-mangrove"),
+                setOf("tree-oak"),
+                setOf("tree-saccharine"),
+                setOf("tree-spruce"),
+                setOf("tree-warped")
+            ),
+            "Timburr" to listOf(
+                setOf("tree-acacia"),
+                setOf("tree-birch"),
+                setOf("tree-cherry"),
+                setOf("tree-crimson"),
+                setOf("tree-darkoak"),
+                setOf("tree-jungle"),
+                setOf("tree-mangrove"),
+                setOf("tree-oak"),
+                setOf("tree-saccharine"),
+                setOf("tree-spruce"),
+                setOf("tree-warped")
+            ),
+            "Torterra" to listOf(
+                setOf("tree-acacia"),
+                setOf("tree-azalea"),
+                setOf("tree-birch"),
+                setOf("tree-cherry"),
+                setOf("tree-darkoak"),
+                setOf("tree-jungle"),
+                setOf("tree-mangrove"),
+                setOf("tree-oak"),
+                setOf("tree-spruce"),
+                setOf("tree-swamp")
+            ),
+            "Gholdengo" to listOf(
+                setOf("netherite-coating-full"),
+                setOf("netherite-coating-stage1"),
+                setOf("netherite-coating-stage2"),
+                setOf("netherite-coating-stage3"),
+                setOf("netherite-coating-stage4"),
+                setOf("netherite-coating-stage5"),
+                setOf("netherite-coating-stage6"),
+                setOf("netherite-coating-stage7")
+            ),
+            "Arbok" to listOf(
+                setOf("snake-pattern-attack"),
+                setOf("snake-pattern-dark"),
+                setOf("snake-pattern-elusive"),
+                setOf("snake-pattern-heart"),
+                setOf("snake-pattern-legacy"),
+                setOf("snake-pattern-sound"),
+                setOf("snake-pattern-speed")
+            ),
+            "Flabebe" to listOf(
+                setOf("flower-pink")
+            ),
+            "Floette" to listOf(
+                setOf("flower-pink")
+            ),
+            "Florges" to listOf(
+                setOf("flower-pink")
+            ),
+            "Wooper" to listOf(
+                setOf("female"),
+                setOf("female", "wooper_heart"),
+                setOf("wooper_heart")
+            ),
+            "Gurdurr" to listOf(
+                setOf("metals-copper"),
+                setOf("metals-gold"),
+                setOf("metals-iron"),
+                setOf("metals-netherite")
+            ),
+            "Sneasel" to listOf(
+                setOf("female"),
+                setOf("female", "hisuian")
+            ),
+            "Clauncher" to listOf(
+                setOf("claw-left"),
+                setOf("claw-right"),
+                setOf("right")
+            ),
+            "Clawitzer" to listOf(
+                setOf("claw-left"),
+                setOf("claw-right"),
+                setOf("right")
+            ),
+            "Squirtle" to listOf(
+                setOf("cosmetic_item-black_glasses"),
+                setOf("cosmetic_item-wise_glasses")
+            ),
+            "Wartortle" to listOf(
+                setOf("cosmetic_item-black_glasses"),
+                setOf("cosmetic_item-wise_glasses")
+            ),
+            "Blastoise" to listOf(
+                setOf("cosmetic_item-black_glasses"),
+                setOf("cosmetic_item-wise_glasses")
+            ),
+            "Butterfree" to listOf(
+                setOf("female"),
+                setOf("valencian")
+            ),
+            "Rattata" to listOf(
+                setOf("female")
+            ),
+            "Raticate" to listOf(
+                setOf("female")
+            ),
+            "Raichu" to listOf(
+                setOf("female")
+            ),
+            "Gloom" to listOf(
+                setOf("female"),
+                setOf("valencian")
+            ),
+            "Vileplume" to listOf(
+                setOf("female"),
+                setOf("valencian")
+            ),
+            "Gyarados" to listOf(
+                setOf("female"),
+                setOf("gyarados-eye-color-purple")
+            ),
+            "Miltank" to listOf(
+                setOf("mooshtank-brown"),
+                setOf("mooshtank-red")
+            ),
+            "Gimmighoul" to listOf(
+                setOf("minecraft")
+            ),
+            "Bulbasaur" to listOf(
+                setOf("female")
+            ),
+            "Ivysaur" to listOf(
+                setOf("female")
+            ),
+            "Venusaur" to listOf(
+                setOf("female")
+            ),
+            "Pikachu" to listOf(
+                setOf("female")
+            ),
+            "Zubat" to listOf(
+                setOf("female")
+            ),
+            "Golbat" to listOf(
+                setOf("female")
+            ),
+            "Kadabra" to listOf(
+                setOf("female")
+            ),
+            "Alakazam" to listOf(
+                setOf("female")
+            ),
+            "Doduo" to listOf(
+                setOf("female")
+            ),
+            "Dodrio" to listOf(
+                setOf("female")
+            ),
+            "Hypno" to listOf(
+                setOf("female")
+            ),
+            "Rhyhorn" to listOf(
+                setOf("female")
+            ),
+            "Rhydon" to listOf(
+                setOf("female")
+            ),
+            "Goldeen" to listOf(
+                setOf("female")
+            ),
+            "Seaking" to listOf(
+                setOf("female")
+            ),
+            "Scyther" to listOf(
+                setOf("female")
+            ),
+            "Eevee" to listOf(
+                setOf("female")
+            ),
+            "Dragonite" to listOf(
+                setOf("cosmetic_item-bundle")
+            ),
+            "Ledyba" to listOf(
+                setOf("female")
+            ),
+            "Ledian" to listOf(
+                setOf("female")
+            ),
+            "Xatu" to listOf(
+                setOf("female")
+            ),
+            "Bellossom" to listOf(
+                setOf("valencian")
+            ),
+            "Aipom" to listOf(
+                setOf("female")
+            ),
+            "Quagsire" to listOf(
+                setOf("female")
+            ),
+            "Murkrow" to listOf(
+                setOf("female")
+            ),
+            "Wobbuffet" to listOf(
+                setOf("female")
+            ),
+            "Girafarig" to listOf(
+                setOf("female")
+            ),
+            "Forretress" to listOf(
+                setOf("cosmetic_item-shulker_shell")
+            ),
+            "Scizor" to listOf(
+                setOf("female")
+            ),
+            "Heracross" to listOf(
+                setOf("female")
+            ),
+            "Piloswine" to listOf(
+                setOf("female")
+            ),
+            "Octillery" to listOf(
+                setOf("female")
+            ),
+            "Donphan" to listOf(
+                setOf("female")
+            ),
+            "Treecko" to listOf(
+                setOf("cosmetic_item-stick")
+            ),
+            "Grovyle" to listOf(
+                setOf("cosmetic_item-stick")
+            ),
+            "Sceptile" to listOf(
+                setOf("cosmetic_item-stick")
+            ),
+            "Torchic" to listOf(
+                setOf("female")
+            ),
+            "Combusken" to listOf(
+                setOf("female")
+            ),
+            "Blaziken" to listOf(
+                setOf("female")
+            ),
+            "Ludicolo" to listOf(
+                setOf("female")
+            ),
+            "Nuzleaf" to listOf(
+                setOf("female")
+            ),
+            "Shiftry" to listOf(
+                setOf("female")
+            ),
+            "Roselia" to listOf(
+                setOf("female")
+            ),
+            "Cacturne" to listOf(
+                setOf("female")
+            ),
+            "Whiscash" to listOf(
+                setOf("whiscash_nero")
+            ),
+            "Milotic" to listOf(
+                setOf("female")
+            ),
+            "Relicanth" to listOf(
+                setOf("female")
+            ),
+            "Bidoof" to listOf(
+                setOf("female")
+            ),
+            "Bibarel" to listOf(
+                setOf("female")
+            ),
+            "Kricketot" to listOf(
+                setOf("female")
+            ),
+            "Kricketune" to listOf(
+                setOf("female")
+            ),
+            "Shinx" to listOf(
+                setOf("female")
+            ),
+            "Luxio" to listOf(
+                setOf("female")
+            ),
+            "Luxray" to listOf(
+                setOf("female")
+            ),
+            "Roserade" to listOf(
+                setOf("female")
+            ),
+            "Combee" to listOf(
+                setOf("female")
+            ),
+            "Buizel" to listOf(
+                setOf("female")
+            ),
+            "Floatzel" to listOf(
+                setOf("female")
+            ),
+            "Ambipom" to listOf(
+                setOf("female")
+            ),
+            "Gible" to listOf(
+                setOf("female")
+            ),
+            "Gabite" to listOf(
+                setOf("female")
+            ),
+            "Garchomp" to listOf(
+                setOf("female")
+            ),
+            "Hippopotas" to listOf(
+                setOf("female")
+            ),
+            "Hippowdon" to listOf(
+                setOf("female")
+            ),
+            "Croagunk" to listOf(
+                setOf("female")
+            ),
+            "Toxicroak" to listOf(
+                setOf("female")
+            ),
+            "Weavile" to listOf(
+                setOf("female")
+            ),
+            "Rhyperior" to listOf(
+                setOf("female")
+            ),
+            "Mamoswine" to listOf(
+                setOf("female")
+            ),
+            "Unfezant" to listOf(
+                setOf("female")
+            ),
+            "Sandile" to listOf(
+                setOf("cosmetic_item-black_glasses")
+            ),
+            "Krokorok" to listOf(
+                setOf("cosmetic_item-black_glasses")
+            ),
+            "Krookodile" to listOf(
+                setOf("cosmetic_item-black_glasses")
+            ),
+            "Frillish" to listOf(
+                setOf("female")
+            ),
+            "Jellicent" to listOf(
+                setOf("female")
+            ),
+            "Braixen" to listOf(
+                setOf("cosmetic_item-silk_scarf")
+            ),
+            "Delphox" to listOf(
+                setOf("cosmetic_item-silk_scarf")
+            ),
+            "Sneasler" to listOf(
+                setOf("cosmetic_item-composter")
+            )
+        )
+
+        val orderedSpecies = PokemonSpecies.species.sortedBy { it.nationalPokedexNumber }
+        orderedSpecies.forEach { species ->
+            if (species.forms.isEmpty()) {
+                entries.accept(com.cobblemon.mod.common.item.PokemonItem.from(species, emptySet()))
+            } else {
+                species.forms.forEach { form ->
+                    val formAspects = form.aspects.toSet()
+                    entries.accept(com.cobblemon.mod.common.item.PokemonItem.from(species, formAspects))
+                }
+            }
+            // Add extra aspects if present for this species
+            extraAspects[species.name]?.forEach { aspectSet ->
+                entries.accept(com.cobblemon.mod.common.item.PokemonItem.from(species, aspectSet))
+            }
+        }
+        orderedSpecies.forEach { species ->
+            if (species.forms.isEmpty()) {
+                entries.accept(com.cobblemon.mod.common.item.PokemonItem.from(species, setOf("shiny")))
+            } else {
+                species.forms.forEach { form ->
+                    val formAspects = form.aspects.toSet()
+                    entries.accept(com.cobblemon.mod.common.item.PokemonItem.from(species, formAspects + setOf("shiny")))
+                }
+            }
+            // Add extra aspects + shiny if present for this species
+            extraAspects[species.name]?.forEach { aspectSet ->
+                entries.accept(com.cobblemon.mod.common.item.PokemonItem.from(species, aspectSet + setOf("shiny")))
+            }
+        }
+    }
+
     private fun agricultureEntries(displayContext: ItemDisplayParameters, entries: Output) {
         entries.accept(CobblemonItems.MEDICINAL_LEEK)
         entries.accept(CobblemonItems.BIG_ROOT)

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0090_shellder/shellder.animation.json

@@ -439,7 +439,7 @@
 			}
 		},
 		"animation.shellder.recoil": {
-			"loop": true,
+			"animation_length": 0.5,
 			"bones": {
 				"eyelid_recoil_left": {
 					"position": [0, 0, -0.1]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0091_cloyster/cloyster.animation.json

@@ -460,7 +460,7 @@
 			}
 		},
 		"animation.cloyster.recoil": {
-			"loop": true,
+			"animation_length": 0.5,
 			"bones": {
 				"mouth_smile": {
 					"position": [0, 0, 0.1]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0183_marill/marill.animation.json

@@ -0,0 +1,246 @@
+{
+	"format_version": "1.8.0",
+	"animations": {
+		"animation.marill.ground_idle": {
+			"loop": true,
+			"bones": {
+				"foot_right": {
+					"rotation": [0, 17.5, 0]
+				},
+				"foot_left": {
+					"rotation": [0, -17.5, 0]
+				},
+				"ear_right": {
+					"rotation": [0, 15, -20]
+				},
+				"ear_left": {
+					"rotation": [0, -15, 20]
+				},
+				"arm_left": {
+					"rotation": [20, -12.5, 0]
+				},
+				"hand_left": {
+					"rotation": [0, 27.5, 0],
+					"position": [0.1, 0, 0.45]
+				},
+				"arm_right": {
+					"rotation": [20, 12.5, 0]
+				},
+				"hand_right": {
+					"rotation": [0, -27.5, 0],
+					"position": [-0.1, 0, 0.45]
+				},
+				"tail": {
+					"rotation": [10, 0, 0]
+				},
+				"tail2": {
+					"rotation": [-57.5, 0, 0]
+				},
+				"tail3": {
+					"rotation": [100, 0, 0]
+				},
+				"tail4": {
+					"rotation": [-90, 0, 0]
+				},
+				"tail5": {
+					"rotation": [85, 0, 0]
+				},
+				"tail6": {
+					"rotation": [-85, 0, 0]
+				},
+				"tail7": {
+					"rotation": [85, 0, 0]
+				},
+				"tail_ball": {
+					"rotation": [-47.5, 0, 0]
+				}
+			}
+		},
+		"animation.marill.water_idle": {
+			"loop": true,
+			"bones": {
+				"foot_right": {
+					"rotation": [0, 17.5, 0]
+				},
+				"foot_left": {
+					"rotation": [0, -17.5, 0]
+				},
+				"ear_right": {
+					"rotation": [0, 15, -20]
+				},
+				"ear_left": {
+					"rotation": [0, -15, 20]
+				},
+				"arm_left": {
+					"rotation": [30, -60, 0]
+				},
+				"hand_left": {
+					"rotation": [-22.5, 0, 0],
+					"position": [0, -0.05, 0.375]
+				},
+				"arm_right": {
+					"rotation": [30, 60, 0]
+				},
+				"hand_right": {
+					"rotation": [-22.5, 0, 0],
+					"position": [0, -0.05, 0.375]
+				},
+				"tail": {
+					"rotation": [0, 0, 0]
+				},
+				"tail2": {
+					"rotation": [-57.5, 0, 0]
+				},
+				"tail3": {
+					"rotation": [100, 0, 0]
+				},
+				"tail4": {
+					"rotation": [-90, 0, 0]
+				},
+				"tail5": {
+					"rotation": [85, 0, 0]
+				},
+				"tail6": {
+					"rotation": [-85, 0, 0]
+				},
+				"tail7": {
+					"rotation": [85, 0, 0]
+				},
+				"tail_ball": {
+					"rotation": [-47.5, 0, 0]
+				},
+				"feet": {
+					"rotation": [35, 0, 0],
+					"position": [0, 1, 0]
+				},
+				"torso": {
+					"rotation": [5, 0, 0]
+				}
+			}
+		},
+		"animation.marill.blink": {
+			"animation_length": 0.1667,
+			"bones": {
+				"eye_left": {
+					"position": {
+						"0.0": [0, 0, 0.1],
+						"0.1667": {
+							"pre": [0, 0, 0.1],
+							"post": [0, 0, 0]
+						}
+					}
+				},
+				"eye_right": {
+					"position": {
+						"0.0": [0, 0, 0.1],
+						"0.1667": {
+							"pre": [0, 0, 0.1],
+							"post": [0, 0, 0]
+						}
+					}
+				},
+				"eyelid_right": {
+					"position": {
+						"0.0": [0, 0, -0.1],
+						"0.1667": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						}
+					}
+				},
+				"eyelid_left": {
+					"position": {
+						"0.0": [0, 0, -0.1],
+						"0.1667": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						}
+					}
+				}
+			}
+		},
+		"animation.marill.sleep": {
+			"loop": true,
+			"bones": {
+				"ear_right": {
+					"rotation": [0, 15, -20]
+				},
+				"ear_left": {
+					"rotation": [0, -15, 20]
+				},
+				"eye_left": {
+					"position": [0, 0, 0.1]
+				},
+				"eye_right": {
+					"position": [0, 0, 0.1]
+				},
+				"mouth_closed_smile": {
+					"position": [0, 0, 0.1]
+				},
+				"mouth_closed_frown_small": {
+					"position": [0, 0, -0.1]
+				},
+				"eyelid_right": {
+					"position": [0, 0, -0.1]
+				},
+				"eyelid_left": {
+					"position": [0, 0, -0.1]
+				},
+				"body": {
+					"rotation": [-12.5, 0, 0],
+					"position": [0, -1, 0]
+				},
+				"feet": {
+					"position": [0, -0.5, -8.5]
+				},
+				"foot_left": {
+					"rotation": [-52.5, -30, 25]
+				},
+				"foot_right": {
+					"rotation": [-52.5, 30, -25]
+				},
+				"torso": {
+					"position": [0, -0.5, 0]
+				},
+				"tail": {
+					"rotation": [32.5, 45, 0]
+				},
+				"tail2": {
+					"rotation": [-45, 0, 0]
+				},
+				"tail3": {
+					"rotation": [45, 67.5, 0]
+				},
+				"tail4": {
+					"rotation": [-90, 0, 0]
+				},
+				"tail5": {
+					"rotation": [67.5, 45, 0]
+				},
+				"tail6": {
+					"rotation": [-67.5, 0, 0]
+				},
+				"tail7": {
+					"rotation": [45, 0, 0]
+				},
+				"tail_ball": {
+					"rotation": [-18, 40.5, 25]
+				},
+				"arm_left": {
+					"rotation": [30, -22.5, 0]
+				},
+				"hand_left": {
+					"rotation": [0, 45, 0],
+					"position": [0.275, 0, 0.725]
+				},
+				"arm_right": {
+					"rotation": [30, 22.5, 0]
+				},
+				"hand_right": {
+					"rotation": [0, -45, 0],
+					"position": [-0.275, 0, 0.725]
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0184_azumarill/azumarill.animation.json

@@ -0,0 +1,285 @@
+{
+	"format_version": "1.8.0",
+	"animations": {
+		"animation.azumarill.ground_idle": {
+			"loop": true,
+			"bones": {
+				"foot_left": {
+					"rotation": [10, -25, 0]
+				},
+				"foot_right": {
+					"rotation": [10, 25, 0]
+				},
+				"arm_left": {
+					"rotation": [0, 15, 45]
+				},
+				"hand_left": {
+					"rotation": [0, 0, -25],
+					"position": [-0.4, -0.1, 0]
+				},
+				"arm_right": {
+					"rotation": [0, -15, -45]
+				},
+				"hand_right": {
+					"rotation": [0, 0, 25],
+					"position": [0.4, -0.1, 0]
+				},
+				"tail2": {
+					"rotation": [-67.5, 0, 0]
+				},
+				"tail3": {
+					"rotation": [115, 0, 0]
+				},
+				"tail4": {
+					"rotation": [-90, 0, 0]
+				},
+				"tail5": {
+					"rotation": [112.5, 0, 0]
+				},
+				"tail6": {
+					"rotation": [-112.5, 0, 0]
+				},
+				"tail7": {
+					"rotation": [110, 0, 0]
+				},
+				"tail_ball": {
+					"rotation": [-57.5, 0, 0]
+				},
+				"body": {
+					"position": [0, 0.5, 0]
+				},
+				"toes_left": {
+					"rotation": [-10, 0, 0],
+					"position": [0, 0, 0.25]
+				},
+				"toes_right": {
+					"rotation": [-10, 0, 0],
+					"position": [0, 0, 0.25]
+				},
+				"tail": {
+					"rotation": [-10, 0, 0]
+				},
+				"ear_left": {
+					"rotation": [0, -15, 15]
+				},
+				"ear_left2": {
+					"rotation": [45, 0, 0]
+				},
+				"ear_right": {
+					"rotation": [0, 15, -15]
+				},
+				"ear_right2": {
+					"rotation": [95, 0, 0]
+				}
+			}
+		},
+		"animation.azumarill.water_idle": {
+			"loop": true,
+			"bones": {
+				"tail_active": {
+					"position": [0, 0, 0.1],
+					"scale": 0.1
+				},
+				"feet": {
+					"rotation": [45, 0, 0],
+					"position": [0, 1, 0]
+				},
+				"foot_left": {
+					"rotation": [0, -17.5, 0]
+				},
+				"foot_right": {
+					"rotation": [0, 17.5, 0]
+				},
+				"torso": {
+					"rotation": [5, 0, 0]
+				},
+				"tail": {
+					"rotation": [-5, 0, 0]
+				},
+				"tail2": {
+					"rotation": [-57.5, 0, 0]
+				},
+				"tail3": {
+					"rotation": [100, 0, 0]
+				},
+				"tail4": {
+					"rotation": [-90, 0, 0]
+				},
+				"tail5": {
+					"rotation": [85, 0, 0]
+				},
+				"tail6": {
+					"rotation": [-85, 0, 0]
+				},
+				"tail7": {
+					"rotation": [85, 0, 0]
+				},
+				"tail_ball": {
+					"rotation": [-47.5, 0, 0]
+				},
+				"ear_left": {
+					"rotation": [0, -15, 15]
+				},
+				"ear_left2": {
+					"rotation": [45, 0, 0]
+				},
+				"ear_right": {
+					"rotation": [0, 15, -15]
+				},
+				"ear_right2": {
+					"rotation": [90, 0, 0]
+				},
+				"arm_left": {
+					"rotation": [0, 25, 35]
+				},
+				"hand_left": {
+					"rotation": [0, 0, -25],
+					"position": [-0.4, -0.1, 0]
+				},
+				"arm_right": {
+					"rotation": [0, -25, -35]
+				},
+				"hand_right": {
+					"rotation": [0, 0, 25],
+					"position": [0.4, -0.1, 0]
+				}
+			}
+		},
+		"animation.azumarill.sleep": {
+			"loop": true,
+			"bones": {
+				"feet": {
+					"rotation": [-40, 0, 0],
+					"position": [0, 0, -6]
+				},
+				"foot_left": {
+					"rotation": [-10, -25, 0]
+				},
+				"toes_left": {
+					"rotation": [17.5, 0, 0],
+					"position": [0, 0, 0.25]
+				},
+				"foot_right": {
+					"rotation": [-10, 25, 0]
+				},
+				"toes_right": {
+					"rotation": [17.5, 0, 0],
+					"position": [0, 0, 0.25]
+				},
+				"torso": {
+					"rotation": [-17.5, 0, 0],
+					"position": [0, -2, 0]
+				},
+				"tail": {
+					"rotation": [45, 0, 0]
+				},
+				"tail2": {
+					"rotation": [-45, 45, 0]
+				},
+				"tail3": {
+					"rotation": [67.5, 0, 0]
+				},
+				"tail4": {
+					"rotation": [-67.5, 37.5, 0]
+				},
+				"tail5": {
+					"rotation": [67.5, 0, 0]
+				},
+				"tail6": {
+					"rotation": [0, 45, 0]
+				},
+				"tail7": {
+					"rotation": [67.5, 0, 0]
+				},
+				"tail_ball": {
+					"rotation": [-25, 0, -55]
+				},
+				"arm_left": {
+					"rotation": [0, 27.5, 50]
+				},
+				"hand_left": {
+					"rotation": [0, 20, 0],
+					"position": [-0.5, 0, -0.05]
+				},
+				"arm_right": {
+					"rotation": [0, -27.5, -50]
+				},
+				"hand_right": {
+					"rotation": [0, -20, 0],
+					"position": [0.5, 0, -0.05]
+				},
+				"eye_left": {
+					"position": [0, 0, 0.1]
+				},
+				"eye_right": {
+					"position": [0, 0, 0.1]
+				},
+				"mouth_closed_smile": {
+					"position": [0, 0, 0.1]
+				},
+				"eyelid_left": {
+					"position": [0, 0, -0.1]
+				},
+				"eyelid_right": {
+					"position": [0, 0, -0.1]
+				},
+				"mouth_closed_frown_small": {
+					"position": [0, 0, -0.1]
+				},
+				"ear_left": {
+					"rotation": [20, -15, 25]
+				},
+				"ear_left2": {
+					"rotation": [80, 0, 0]
+				},
+				"ear_right": {
+					"rotation": [20, 15, -25]
+				},
+				"ear_right2": {
+					"rotation": [110, 0, 0]
+				}
+			}
+		},
+		"animation.azumarill.blink": {
+			"animation_length": 0.1667,
+			"bones": {
+				"eye_left": {
+					"position": {
+						"0.0": [0, 0, 0.1],
+						"0.1667": {
+							"pre": [0, 0, 0.1],
+							"post": [0, 0, 0]
+						}
+					}
+				},
+				"eye_right": {
+					"position": {
+						"0.0": [0, 0, 0.1],
+						"0.1667": {
+							"pre": [0, 0, 0.1],
+							"post": [0, 0, 0]
+						}
+					}
+				},
+				"eyelid_right": {
+					"position": {
+						"0.0": [0, 0, -0.1],
+						"0.1667": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						}
+					}
+				},
+				"eyelid_left": {
+					"position": {
+						"0.0": [0, 0, -0.1],
+						"0.1667": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						}
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0285_shroomish/shroomish.animation.json

@@ -104,73 +104,160 @@
 			}
 		},
 		"animation.shroomish.cry": {
-			"animation_length": 0.66667,
+			"animation_length": 1.5,
 			"bones": {
+				"neck": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"0.25": [10, 0, 0],
+						"1.25": [10, 0, 0],
+						"1.5": [0, 0, 0]
+					}
+				},
+				"mouth": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": [0, -2, 0],
+						"1.25": [0, -2, 0],
+						"1.5": [0, 0, 0]
+					}
+				},
+				"mouth2": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": [0, -5, 0],
+						"1.25": [0, -5, 0],
+						"1.5": [0, 0, 0]
+					}
+				},
+				"jaw": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": [0, -3, 0],
+						"1.25": [0, -3, 0],
+						"1.5": [0, 0, 0]
+					}
+				},
+				"head": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"0.25": [-15, 0, 0],
+						"1.25": [-15, 0, 0],
+						"1.5": [0, 0, 0]
+					}
+				},
+				"head2": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"0.25": [-15, 0, 0],
+						"1.25": [-15, 0, 0],
+						"1.5": [0, 0, 0]
+					}
+				},
+				"mouth_closed2": {
+					"position": {
+						"0.25": [0, 0, -0.1],
+						"0.3333": [0, 0, 0],
+						"1.1667": [0, 0, 0],
+						"1.25": [0, 0, -0.1]
+					}
+				},
+				"mouth_open2": {
+					"position": {
+						"0.0": [0, 0, 0.1],
+						"0.25": [0, 0, 0],
+						"1.25": [0, 0, 0],
+						"1.5": [0, 0, 0.1]
+					}
+				},
+				"head3": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"0.25": [-15, 0, 0],
+						"1.25": [-15, 0, 0],
+						"1.5": [0, 0, 0]
+					}
+				},
+				"mouth_closed3": {
+					"position": {
+						"0.25": [0, 0, -0.1],
+						"0.3333": [0, 0, 0],
+						"1.1667": [0, 0, 0],
+						"1.25": [0, 0, -0.1]
+					}
+				},
+				"mouth_open3": {
+					"position": {
+						"0.0": [0, 0, 0.1],
+						"0.25": [0, 0, 0],
+						"1.25": [0, 0, 0],
+						"1.5": [0, 0, 0.1]
+					}
+				},
 				"torso": {
 					"rotation": {
 						"0.0": [0, 0, 0],
-						"0.1667": {
+						"0.25": {
 							"pre": [-7.5, 0, 0],
 							"post": [-7.5, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"0.5": {
+						"1.1667": {
 							"post": [-7.5, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"0.6667": [0, 0, 0]
+						"1.5": [0, 0, 0]
 					}
 				},
 				"mouth_closed": {
 					"position": {
-						"0.0833": [0, 0, 0],
-						"0.1667": [0, 0, 0.1],
-						"0.5": [0, 0, 0.1],
-						"0.5833": [0, 0, 0]
+						"0.25": [0, 0, 0],
+						"0.3333": [0, 0, 0.1],
+						"1.1667": [0, 0, 0.1],
+						"1.25": [0, 0, 0]
 					}
 				},
 				"mouth_open": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0833": [0, 0, 0],
-						"0.1667": [0, 0, -0.1],
-						"0.5": [0, 0, -0.1],
-						"0.5833": [0, 0, 0]
+						"0.25": [0, 0, -0.1],
+						"1.25": [0, 0, -0.1],
+						"1.5": [0, 0, 0]
 					}
 				},
 				"hair": {
 					"rotation": {
 						"0.0": [0, 0, 0],
-						"0.1667": {
+						"0.25": {
 							"pre": [-12.5, 0, 0],
 							"post": [-12.5, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"0.5": {
+						"1.1667": {
 							"post": [-12.5, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"0.6667": [0, 0, 0]
+						"1.5": [0, 0, 0]
 					}
 				},
 				"Eyebrow": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {
+						"0.25": {
 							"pre": [0, 0.05, 0],
 							"post": [0, 0.05, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"0.5": {
+						"1.1667": {
 							"post": [0, 0.4, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"0.6667": [0, 0, 0]
+						"1.5": [0, 0, 0]
 					}
 				}
 			},
 			"sound_effects": {
-				"0.0833": {
+				"0.125": {
 					"effect": "pokemon.shroomish.cry"
 				}
 			}
@@ -210,7 +297,7 @@
 			}
 		},
 		"animation.shroomish.blink": {
-			"animation_length": 0.16667,
+			"animation_length": 0.1667,
 			"bones": {
 				"eyelid_left": {
 					"position": {
@@ -430,8 +517,8 @@
 					"rotation": {
 						"0.0": [0, -20, 0],
 						"0.1667": [0, -2, 0],
-						"0.2083": [0, "-74+q.anim_time*420", 0],
-						"1.6667": [-2, "300+q.anim_time*290", 0],
+						"0.2083": [0, 13.486, 0],
+						"1.6667": [-2, 783.343, 0],
 						"1.7083": [0, 804.57, 0],
 						"2.0": [49.25, 975.5, 0],
 						"2.25": {
@@ -451,14 +538,8 @@
 							"post": [172.96, 1142.75, -10.97],
 							"lerp_mode": "catmullrom"
 						},
-						"2.7917": {
-							"post": [190.47335, 1149.92345, -2.60677],
-							"lerp_mode": "catmullrom"
-						},
-						"3.0": {
-							"post": [190.47335, 1149.92345, -2.60677],
-							"lerp_mode": "catmullrom"
-						}
+						"2.7917": [190.47335, 1149.92345, -2.60677],
+						"3.0": [190.47335, 1149.92345, -2.60677]
 					},
 					"position": {
 						"0.0": [0, 0, 0],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0298_azurill/azurill.animation.json

@@ -0,0 +1,288 @@
+{
+	"format_version": "1.8.0",
+	"animations": {
+		"animation.azurill.ground_idle": {
+			"loop": true,
+			"bones": {
+				"tail2": {
+					"rotation": [-95, 0, 0]
+				},
+				"tail3": {
+					"rotation": [100, 0, 0]
+				},
+				"tail4": {
+					"rotation": [-100, 0, 0]
+				},
+				"tail5": {
+					"rotation": [115, 0, 0]
+				},
+				"tail6": {
+					"rotation": [-115, 0, 0]
+				},
+				"tail7": {
+					"rotation": [112.5, 0, 0]
+				},
+				"mouth_closed_smile": {
+					"position": [0, 0, 0]
+				},
+				"torso": {
+					"rotation": [-5, 0, 0]
+				},
+				"ear_left": {
+					"rotation": [0, -15, 45]
+				},
+				"tail8": {
+					"rotation": [-45, 0, 0]
+				},
+				"foot_left": {
+					"rotation": [0, -25, 0]
+				},
+				"foot_right": {
+					"rotation": [0, 25, 0]
+				},
+				"ear_right": {
+					"rotation": [0, 0, -45]
+				},
+				"tail_ball": {
+					"rotation": [-12.5, 0, 0]
+				}
+			}
+		},
+		"animation.azurill.water_idle": {
+			"loop": true,
+			"bones": {
+				"tail2": {
+					"rotation": [-95, 0, 0]
+				},
+				"tail3": {
+					"rotation": [100, 0, 0]
+				},
+				"tail4": {
+					"rotation": [-100, 0, 0]
+				},
+				"tail5": {
+					"rotation": [115, 0, 0]
+				},
+				"tail6": {
+					"rotation": [-115, 0, 0]
+				},
+				"tail7": {
+					"rotation": [112.5, 0, 0]
+				},
+				"mouth_closed_smile": {
+					"position": [0, 0, 0]
+				},
+				"torso": {
+					"rotation": [5, 0, 0]
+				},
+				"ear_left": {
+					"rotation": [0, -15, 45]
+				},
+				"tail8": {
+					"rotation": [-45, 0, 0]
+				},
+				"foot_left": {
+					"rotation": [0, -25, 0]
+				},
+				"foot_right": {
+					"rotation": [0, 25, 0]
+				},
+				"ear_right": {
+					"rotation": [0, 0, -45]
+				},
+				"tail_ball": {
+					"rotation": [-12.5, 0, 0]
+				},
+				"body": {
+					"position": [0, 1, 0]
+				},
+				"feet": {
+					"rotation": [35, 0, 0]
+				},
+				"tail": {
+					"rotation": [-15, 0, 0]
+				}
+			}
+		},
+		"animation.azurill.battle_idle": {
+			"loop": true,
+			"bones": {
+				"body": {
+					"position": [0, 8, 0]
+				},
+				"foot_left": {
+					"rotation": [0, -25, 0]
+				},
+				"foot_right": {
+					"rotation": [0, 25, 0]
+				},
+				"tail2": {
+					"rotation": [-125, 0, 0]
+				},
+				"tail3": {
+					"rotation": [75, 0, 0]
+				},
+				"tail4": {
+					"rotation": [-107.5, 0, 0]
+				},
+				"tail5": {
+					"rotation": [65, 0, 0]
+				},
+				"tail6": {
+					"rotation": [-137.5, 0, 0]
+				},
+				"tail7": {
+					"rotation": [75, 0, 0]
+				},
+				"mouth_closed_smile": {
+					"position": [0, 0, -0.1]
+				},
+				"feet": {
+					"rotation": [12.5, 0, 0]
+				},
+				"tail": {
+					"rotation": [-15, 0, 0]
+				},
+				"ear_left": {
+					"rotation": [0, -10, 45]
+				},
+				"tail8": {
+					"rotation": [-95, 0, 0]
+				},
+				"torso2": {
+					"rotation": [-5, 0, 0]
+				},
+				"ear_right": {
+					"rotation": [0, 10, -45]
+				},
+				"mouth_closed": {
+					"position": [0, 0, 0.1]
+				},
+				"eye_left": {
+					"rotation": [0, 0, 2.5]
+				},
+				"eye_right": {
+					"rotation": [0, 0, -2.5]
+				},
+				"tail_ball": {
+					"rotation": [40, 0, 0]
+				},
+				"locator_top": {
+					"position": [0, 7, 0]
+				},
+				"locator_middle": {
+					"position": [0, -1, 0]
+				}
+			}
+		},
+		"animation.azurill.sleep": {
+			"loop": true,
+			"bones": {
+				"tail2": {
+					"rotation": [-95, 0, -45]
+				},
+				"tail3": {
+					"rotation": [100, 0, 0]
+				},
+				"tail4": {
+					"rotation": [-100, -45, 0]
+				},
+				"tail5": {
+					"rotation": [115, 0, 0]
+				},
+				"tail6": {
+					"rotation": [-115, -45, 0]
+				},
+				"tail7": {
+					"rotation": [112.5, 0, 0]
+				},
+				"mouth_closed_smile": {
+					"position": [0, 0, 0]
+				},
+				"ear_left": {
+					"rotation": [30, -15, 45]
+				},
+				"tail8": {
+					"rotation": [-55, -45, 0]
+				},
+				"foot_left": {
+					"rotation": [0, -25, 0],
+					"position": [0.5, 0, 0]
+				},
+				"foot_right": {
+					"rotation": [0, 25, 0],
+					"position": [-0.5, 0, 0]
+				},
+				"ear_right": {
+					"rotation": [0, 0, -45]
+				},
+				"tail_ball": {
+					"rotation": [-50.5, 16.5, -40]
+				},
+				"body": {
+					"position": [0, -1, 0]
+				},
+				"feet": {
+					"rotation": [-77.5, 0, 0],
+					"position": [0, 0.5, -4.75]
+				},
+				"torso2": {
+					"rotation": [-7.5, 0, 0]
+				},
+				"eye_left": {
+					"position": [0, 0, 0.1]
+				},
+				"eyelid_left": {
+					"position": [0, 0, -0.1]
+				},
+				"eye_right": {
+					"position": [0, 0, 0.1]
+				},
+				"eyelid_right": {
+					"position": [0, 0, -0.1]
+				}
+			}
+		},
+		"animation.azurill.blink": {
+			"animation_length": 0.1667,
+			"bones": {
+				"eye_left": {
+					"position": {
+						"0.0": [0, 0, 0.1],
+						"0.1667": {
+							"pre": [0, 0, 0.1],
+							"post": [0, 0, 0]
+						}
+					}
+				},
+				"eye_right": {
+					"position": {
+						"0.0": [0, 0, 0.1],
+						"0.1667": {
+							"pre": [0, 0, 0.1],
+							"post": [0, 0, 0]
+						}
+					}
+				},
+				"eyelid_right": {
+					"position": {
+						"0.0": [0, 0, -0.1],
+						"0.1667": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						}
+					}
+				},
+				"eyelid_left": {
+					"position": {
+						"0.0": [0, 0, -0.1],
+						"0.1667": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						}
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0357_tropius/tropius.animation.json

@@ -511,13 +511,19 @@
 				"eyelid_left": {
 					"position": {
 						"0.0": [0.1, 0, 0],
-						"0.1667": {"pre": [0.1, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0.1, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [-0.1, 0, 0],
-						"0.1667": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [-0.1, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				}
 			}
@@ -712,27 +718,75 @@
 				"eyelid_left": {
 					"position": {
 						"0.5": [0, 0, 0],
-						"0.5417": {"pre": [0, 0, 0], "post": [0.1, 0, 0]},
-						"0.7083": {"pre": [0.1, 0, 0], "post": [0, 0, 0]},
-						"2.0417": {"pre": [0, 0, 0], "post": [0, 0, 0]},
-						"2.0833": {"pre": [0, 0, 0], "post": [0.1, 0, 0]},
-						"2.25": {"pre": [0.1, 0, 0], "post": [0, 0, 0]},
-						"3.75": {"pre": [0, 0, 0], "post": [0, 0, 0]},
-						"3.7917": {"pre": [0, 0, 0], "post": [0.1, 0, 0]},
-						"3.9583": {"pre": [0.1, 0, 0], "post": [0, 0, 0]}
+						"0.5417": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, 0]
+						},
+						"0.7083": {
+							"pre": [0.1, 0, 0],
+							"post": [0, 0, 0]
+						},
+						"2.0417": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						},
+						"2.0833": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, 0]
+						},
+						"2.25": {
+							"pre": [0.1, 0, 0],
+							"post": [0, 0, 0]
+						},
+						"3.75": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						},
+						"3.7917": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, 0]
+						},
+						"3.9583": {
+							"pre": [0.1, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.5": [0, 0, 0],
-						"0.5417": {"pre": [0, 0, 0], "post": [-0.1, 0, 0]},
-						"0.7083": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]},
-						"2.0417": {"pre": [0, 0, 0], "post": [0, 0, 0]},
-						"2.0833": {"pre": [0, 0, 0], "post": [-0.1, 0, 0]},
-						"2.25": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]},
-						"3.75": {"pre": [0, 0, 0], "post": [0, 0, 0]},
-						"3.7917": {"pre": [0, 0, 0], "post": [-0.1, 0, 0]},
-						"3.9583": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]}
+						"0.5417": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, 0]
+						},
+						"0.7083": {
+							"pre": [-0.1, 0, 0],
+							"post": [0, 0, 0]
+						},
+						"2.0417": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						},
+						"2.0833": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, 0]
+						},
+						"2.25": {
+							"pre": [-0.1, 0, 0],
+							"post": [0, 0, 0]
+						},
+						"3.75": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						},
+						"3.7917": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, 0]
+						},
+						"3.9583": {
+							"pre": [-0.1, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"head": {
@@ -1456,11 +1510,7 @@
 				"leg_front_left": {
 					"rotation": {
 						"0.0": [20, -1, 0],
-						"0.25": {
-							"pre": [-42.47, 0, 0],
-							"post": [-42.47, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
+						"0.25": [-42.47, 0, 0],
 						"0.3333": [-25.43708, -0.29167, 0],
 						"0.4167": [0.80407, -0.74074, 0],
 						"0.5": [20, -1, 0]
@@ -1550,11 +1600,7 @@
 					"rotation": {
 						"0.0": [3.21, 0.74, 0],
 						"0.0833": [16, 1, 0],
-						"0.3333": {
-							"pre": [-42.47, 0, 0],
-							"post": [-42.47, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
+						"0.3333": [-42.47, 0, 0],
 						"0.5": [3.21, 0.74, 0]
 					},
 					"position": {
@@ -1629,7 +1675,10 @@
 							"post": [40, -1, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"0.4167": [40.63051, -0.53537, 0],
+						"0.4167": {
+							"post": [40.63051, -0.53537, 0],
+							"lerp_mode": "catmullrom"
+						},
 						"0.5": [9.48, -0.16, 0]
 					},
 					"position": {
@@ -1883,7 +1932,7 @@
 			"loop": true,
 			"bones": {
 				"tropius": {
-					"position": [0, 0, "39-q.anim_time*8.5"]
+					"position": [0, 0, "39-q.anim_time*90*0.12"]
 				}
 			}
 		},
@@ -1891,10 +1940,7 @@
 			"loop": true,
 			"bones": {
 				"tropius": {
-					"position": [0, 0, "39-q.anim_time*80"]
-				},
-				"neck": {
-					"rotation": [2.5, 0, 0]
+					"position": [0, 0, "39-q.anim_time*90*0.88"]
 				}
 			}
 		},
@@ -2021,7 +2067,7 @@
 					"rotation": [0, 0, -20]
 				},
 				"wing_back_right3_upper": {
-					"rotation": [0, 0, 7.5]
+					"rotation": [0, 0, 20]
 				},
 				"toe_front_left": {
 					"rotation": [12.5, 0, 0]
@@ -2060,7 +2106,7 @@
 					"position": [0, 1, 0]
 				},
 				"neck": {
-					"rotation": ["29+math.sin(q.anim_time*90*2.25-30)*2", 0, 0]
+					"rotation": ["17.5+math.sin(q.anim_time*90*2.25-30)*2", 0, 0]
 				},
 				"neck2": {
 					"rotation": ["17.5+math.sin(q.anim_time*90*2.25-100)*2", 0, 0],
@@ -2097,16 +2143,16 @@
 					"rotation": [0, 0, "0+math.sin(q.anim_time*90*2.25-50)*30"]
 				},
 				"wing_back_left2": {
-					"rotation": [0, 0, "2.5+math.sin(q.anim_time*90*2.25-30)*8"]
+					"rotation": [0, 0, "2.5+math.sin(q.anim_time*90*2.25-30)*3"]
 				},
 				"wing_back_left3": {
-					"rotation": [0, 0, "32.5+math.sin(q.anim_time*90*2.25-70)*3"]
+					"rotation": [0, 0, "32.5+math.sin(q.anim_time*90*2.25-70)*5"]
 				},
 				"wing_back_left4": {
 					"rotation": [0, 0, "32.5+math.sin(q.anim_time*90*2.25-110)*4"]
 				},
 				"wing_back_left": {
-					"rotation": [26.74152, -33.01823, -15.16293]
+					"rotation": [31.64794, -31.06472, -21.18376]
 				},
 				"leg_front_right": {
 					"rotation": ["-22.5+math.sin(q.anim_time*90*2.25-260)*-5", 0, 0]
@@ -2146,26 +2192,26 @@
 					"rotation": [0, 0, -17.5]
 				},
 				"wing_back_right": {
-					"rotation": [21.21618, 38.00898, 12.8161]
+					"rotation": [31.64794, 31.06472, 21.18376]
 				},
 				"wing_back_right2": {
-					"rotation": [0, 0, "-2.5+math.sin(q.anim_time*90*2.25-30)*-8"]
+					"rotation": [0, 0, "-2.5+math.sin(q.anim_time*90*2.25-30)*-3"]
 				},
 				"wing_back_right3": {
-					"rotation": [0, 0, "-25+math.sin(q.anim_time*90*2.25-70)*-3"]
+					"rotation": [0, 0, "-32.5+math.sin(q.anim_time*90*2.25-70)*-5"]
 				},
 				"wing_back_right4_upper": {
 					"rotation": [0, 0, 17.5]
 				},
 				"body": {
-					"rotation": ["math.sin(q.anim_time*90*2.25-20)*2", 0, "math.sin(q.anim_time*90*0.666)*-1"],
-					"position": ["0+math.sin(q.anim_time*90*0.666)", "9+math.sin(q.anim_time*90*2.25-110)*4", "1+math.sin(q.anim_time*90*2.25-60)*-1"]
+					"rotation": ["14.5+math.sin(q.anim_time*90*2.25-20)*2", 0, "math.sin(q.anim_time*90*0.666)*-1"],
+					"position": ["0+math.sin(q.anim_time*90*0.666)", "9+math.sin(q.anim_time*90*2.25-110)*4", "math.sin(q.anim_time*90*2.25-60)*-1"]
 				},
 				"wing_back_left3_upper": {
 					"rotation": [0, 0, -20]
 				},
 				"wing_back_right3_upper": {
-					"rotation": [0, 0, 7.5]
+					"rotation": [0, 0, 20]
 				},
 				"toe_front_left": {
 					"rotation": [12.5, 0, 0]
@@ -2198,25 +2244,25 @@
 			"bones": {
 				"body": {
 					"rotation": ["14.5+math.sin(q.anim_time*90*0.43-90)*3", 0, "math.sin(q.anim_time*90*0.73-90)*-2"],
-					"position": ["0+math.sin(q.anim_time*90*0.73-90)*4", "7+math.sin(q.anim_time*90*1)*2", "0+math.sin(q.anim_time*90*0.43-90)*2"]
+					"position": ["0+math.sin(q.anim_time*90*0.73-90)*4", "7+math.sin(q.anim_time*90*1)*2", "0+math.sin(q.anim_time*90*0.43-90)*1"]
 				},
 				"neck": {
-					"rotation": ["17.5+math.sin(q.anim_time*90*0.43-90)*-3", 0, "math.sin(q.anim_time*90*0.73-130)*-2"]
+					"rotation": ["25+math.sin(q.anim_time*90*0.43-90)*-3", 0, "math.sin(q.anim_time*90*0.73-130)*-2"]
 				},
 				"neck2": {
-					"rotation": ["4.7151+math.sin(q.anim_time*90*0.43-130)*-3", 0.09443, "2.9287+math.sin(q.anim_time*90*0.73-170)*-2"]
+					"rotation": ["2.2151+math.sin(q.anim_time*90*0.43-130)*-3", 0.09443, "2.9287+math.sin(q.anim_time*90*0.73-170)*-2"]
 				},
 				"neck3": {
-					"rotation": ["20+math.sin(q.anim_time*90*0.43-170)*-4", 0, "math.sin(q.anim_time*90*0.73-210)*-2"]
+					"rotation": ["15+math.sin(q.anim_time*90*0.43-170)*-3", 0, "math.sin(q.anim_time*90*0.73-210)*-2"]
 				},
 				"neck4": {
-					"rotation": ["32.5+math.sin(q.anim_time*90*0.43-200)*-4", 0, "math.sin(q.anim_time*90*0.73-250)*-2"]
+					"rotation": ["27.5+math.sin(q.anim_time*90*0.43-200)*-3", 0, "math.sin(q.anim_time*90*0.73-250)*-2"]
 				},
 				"neck5": {
-					"rotation": ["17.5+math.sin(q.anim_time*90*0.43-240)*-4", 0, "math.sin(q.anim_time*90*0.73-290)*-2"]
+					"rotation": ["17.5+math.sin(q.anim_time*90*0.43-240)*-3", 0, "math.sin(q.anim_time*90*0.73-290)*-2"]
 				},
 				"head": {
-					"rotation": ["17.5+math.sin(q.anim_time*90*0.43-300)*-4", 0, "math.sin(q.anim_time*90*0.73-330)*-2"]
+					"rotation": ["17.5+math.sin(q.anim_time*90*0.43-300)*-3", 0, "math.sin(q.anim_time*90*0.73-330)*-2"]
 				},
 				"banana_middle": {
 					"rotation": ["0+math.sin(q.anim_time*90*0.43-40)*-15", 0, 0]
@@ -2246,25 +2292,25 @@
 					"rotation": [0, 0, "4.5-math.sin(q.anim_time*90*1-140)*6"]
 				},
 				"wing_back_left": {
-					"rotation": [15.77241, -22.91054, -21.63402]
+					"rotation": [19.55989, -21.69555, -27.00655]
 				},
 				"wing_back_left2": {
 					"rotation": ["0+math.sin(q.anim_time*90*16)*1", 0, "7.5+math.sin(q.anim_time*90*1)*3"]
 				},
 				"wing_back_left3": {
-					"rotation": [0, 0, "3+math.sin(q.anim_time*90*1-50)*3"]
+					"rotation": [0, 0, "7+math.sin(q.anim_time*90*1-50)*3"]
 				},
 				"wing_back_left4": {
 					"rotation": [0, 0, "15+math.sin(q.anim_time*90*1-100)*3"]
 				},
 				"wing_back_right": {
-					"rotation": [15.77241, 22.91054, 21.63402]
+					"rotation": [19.55989, 21.69555, 27.00655]
 				},
 				"wing_back_right2": {
 					"rotation": ["0+math.sin(q.anim_time*90*16)*1", 0, "-7.5+math.sin(q.anim_time*90*1)*-3"]
 				},
 				"wing_back_right3": {
-					"rotation": [0, 0, "-3+math.sin(q.anim_time*90*1-50)*-3"]
+					"rotation": [0, 0, "-7+math.sin(q.anim_time*90*1-50)*-3"]
 				},
 				"wing_back_right4": {
 					"rotation": [0, 0, "-15+math.sin(q.anim_time*90*1-100)*-3"]
@@ -2531,19 +2577,23 @@
 					"rotation": [0, 0, 27.5]
 				},
 				"leg_front_left": {
-					"rotation": [-78.8997, -13.75392, 4.78274]
+					"rotation": [-78.8997, -13.75392, 4.78274],
+					"position": [0, 2, 0]
 				},
 				"leg_front_right": {
-					"rotation": [-81.17768, 20.52872, -1.6317]
+					"rotation": [-81.17768, 20.52872, -1.6317],
+					"position": [0, 1, 0]
 				},
 				"leg_back_left": {
-					"rotation": [82.14048, 17.34551, -2.35666]
+					"rotation": [82.14048, 17.34551, -2.35666],
+					"position": [0, 2, 0]
 				},
 				"leg_back_left2": {
 					"rotation": [5, 0, 0]
 				},
 				"leg_back_right": {
-					"rotation": [84.82456, -14.94159, 1.3378]
+					"rotation": [84.82456, -14.94159, 1.3378],
+					"position": [0, 2, 0]
 				},
 				"leg_back_right2": {
 					"rotation": [5, 0, 0]
@@ -2569,7 +2619,7 @@
 				},
 				"neck": {
 					"rotation": [96.40868, 9.38063, 0.97369],
-					"position": [0, -2, 4]
+					"position": [0, -3.4, 0]
 				},
 				"neck2": {
 					"rotation": ["20.4907+math.sin(q.anim_time*90*0.5)*0.9", 0.36957, 6.39838],
@@ -2580,7 +2630,7 @@
 					"position": [0.775, -2.925, -0.7]
 				},
 				"neck4": {
-					"rotation": ["-5.757+math.sin(q.anim_time*90*0.5)*-0.9", -10.46977, -23.04476],
+					"rotation": ["-5.757+math.sin(q.anim_time*90*0.5)*-0.9", -10.46977, -27.54476],
 					"position": [-0.6, -3.775, -1]
 				},
 				"neck5": {
@@ -2617,19 +2667,16 @@
 					"rotation": [0, 0, "40+math.sin(q.anim_time*90*0.5)*0.9"]
 				},
 				"wing_front_left3": {
-					"rotation": [0, 0, "10-math.sin(q.anim_time*90*0.5)*0.9"],
-					"position": [-2, 0, 0]
+					"rotation": [0, 0, "10-math.sin(q.anim_time*90*0.5)*0.9"]
 				},
 				"wing_front_right": {
 					"rotation": [-2.83158, -35.08163, 4.61044]
 				},
 				"wing_front_right2": {
-					"rotation": [1.83368, -4.31076, -34.76983],
-					"position": [1, 0, 0]
+					"rotation": [0, 0, -24.74881]
 				},
 				"wing_front_right3": {
-					"rotation": [0, -7.13266, "8.6164248718+math.sin(q.anim_time*90*0.5)*-2.5"],
-					"position": [1, 0, 0]
+					"rotation": [0, 0, "-10-math.sin(q.anim_time*90*0.5)*0.9"]
 				},
 				"wing_back_left2": {
 					"rotation": [0, 0, 27.5]
@@ -3138,15 +3185,27 @@
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [0.1, 0, 0]},
-						"0.2083": {"pre": [0.1, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, 0]
+						},
+						"0.2083": {
+							"pre": [0.1, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [-0.1, 0, 0]},
-						"0.2083": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, 0]
+						},
+						"0.2083": {
+							"pre": [-0.1, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				}
 			}
@@ -4458,25 +4517,67 @@
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [0.1, 0, 0]},
-						"0.2083": {"pre": [0.1, 0, 0], "post": [0, 0, 0]},
-						"0.4583": {"pre": [0, 0, 0], "post": [0.1, 0, 0]},
-						"0.9583": {"pre": [0.1, 0, 0], "post": [0, 0, 0]},
-						"1.4583": {"pre": [0, 0, 0], "post": [0.1, 0, 0]},
-						"1.7917": {"pre": [0.1, 0, 0], "post": [0, 0, 0]},
-						"2.0833": {"pre": [0, 0, 0], "post": [0.1, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, 0]
+						},
+						"0.2083": {
+							"pre": [0.1, 0, 0],
+							"post": [0, 0, 0]
+						},
+						"0.4583": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, 0]
+						},
+						"0.9583": {
+							"pre": [0.1, 0, 0],
+							"post": [0, 0, 0]
+						},
+						"1.4583": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, 0]
+						},
+						"1.7917": {
+							"pre": [0.1, 0, 0],
+							"post": [0, 0, 0]
+						},
+						"2.0833": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, 0]
+						}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [-0.1, 0, 0]},
-						"0.2083": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]},
-						"0.4583": {"pre": [0, 0, 0], "post": [-0.1, 0, 0]},
-						"0.9583": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]},
-						"1.4583": {"pre": [0, 0, 0], "post": [-0.1, 0, 0]},
-						"1.7917": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]},
-						"2.0833": {"pre": [0, 0, 0], "post": [-0.1, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, 0]
+						},
+						"0.2083": {
+							"pre": [-0.1, 0, 0],
+							"post": [0, 0, 0]
+						},
+						"0.4583": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, 0]
+						},
+						"0.9583": {
+							"pre": [-0.1, 0, 0],
+							"post": [0, 0, 0]
+						},
+						"1.4583": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, 0]
+						},
+						"1.7917": {
+							"pre": [-0.1, 0, 0],
+							"post": [0, 0, 0]
+						},
+						"2.0833": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, 0]
+						}
 					}
 				},
 				"body": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0183_marill/marill.geo.json

@@ -0,0 +1,578 @@
+{
+	"format_version": "1.12.0",
+	"minecraft:geometry": [
+		{
+			"description": {
+				"identifier": "geometry.marill",
+				"texture_width": 64,
+				"texture_height": 64,
+				"visible_bounds_width": 5,
+				"visible_bounds_height": 2.5,
+				"visible_bounds_offset": [0, 0.75, 0]
+			},
+			"bones": [
+				{
+					"name": "marill",
+					"pivot": [0, 0, 0]
+				},
+				{
+					"name": "locator_root",
+					"parent": "marill",
+					"pivot": [0, 0, 0],
+					"locators": {
+						"root": [0, 0, 0]
+					}
+				},
+				{
+					"name": "locator_top",
+					"parent": "marill",
+					"pivot": [0, 17.35, 0],
+					"locators": {
+						"top": [0, 17.35, 0]
+					}
+				},
+				{
+					"name": "body",
+					"parent": "marill",
+					"pivot": [0, 8, 0]
+				},
+				{
+					"name": "locator_target",
+					"parent": "body",
+					"pivot": [0, 8, -8],
+					"locators": {
+						"target": [0, 8, -8]
+					}
+				},
+				{
+					"name": "locator_middle",
+					"parent": "body",
+					"pivot": [0, 8, 0],
+					"locators": {
+						"middle": [0, 8, 0]
+					}
+				},
+				{
+					"name": "torso",
+					"parent": "body",
+					"pivot": [0, 2, 0],
+					"cubes": [
+						{"origin": [-6.5, 1, -6.5], "size": [13, 14, 13], "uv": [0, 0]}
+					]
+				},
+				{
+					"name": "locator_mouth",
+					"parent": "torso",
+					"pivot": [0, 10.25, -6.5],
+					"locators": {
+						"mouth": [0, 10.25, -6.5],
+						"special": [0, 10.25, -6.5]
+					}
+				},
+				{
+					"name": "locator_item_face",
+					"parent": "torso",
+					"pivot": [0, 12.25, -6.5],
+					"locators": {
+						"item_face": [0, 12.25, -6.5]
+					}
+				},
+				{
+					"name": "locator_face",
+					"parent": "torso",
+					"pivot": [0, 12.25, -6.5],
+					"locators": {
+						"face": [0, 12.25, -6.5]
+					}
+				},
+				{
+					"name": "locator_item_hat",
+					"parent": "torso",
+					"pivot": [0, 15, 0],
+					"locators": {
+						"item_hat": [0, 15, 0]
+					}
+				},
+				{
+					"name": "locator_head",
+					"parent": "torso",
+					"pivot": [0, 15, -4],
+					"locators": {
+						"head": [0, 15, -4]
+					}
+				},
+				{
+					"name": "tail",
+					"parent": "torso",
+					"pivot": [0, 2.5, 6.5],
+					"cubes": [
+						{"origin": [0, 2, 4.5], "size": [0, 1, 6], "inflate": 0.01, "uv": [30, 25]}
+					]
+				},
+				{
+					"name": "tail2",
+					"parent": "tail",
+					"pivot": [0, 2.5, 10.5],
+					"cubes": [
+						{"origin": [0, 2, 10.5], "size": [0, 1, 3], "uv": [34, 29]}
+					]
+				},
+				{
+					"name": "tail3",
+					"parent": "tail2",
+					"pivot": [0, 2.5, 13.5],
+					"cubes": [
+						{"origin": [0, 2, 13.5], "size": [0, 1, 3], "inflate": 0.01, "uv": [30, 27]}
+					]
+				},
+				{
+					"name": "locator_tail",
+					"parent": "tail3",
+					"pivot": [0, 2.5, 15],
+					"rotation": [180, 0, -180],
+					"locators": {
+						"tail": [0, 2.5, 15]
+					}
+				},
+				{
+					"name": "tail4",
+					"parent": "tail3",
+					"pivot": [0, 2.5, 16.5],
+					"cubes": [
+						{"origin": [0, 2, 16.5], "size": [0, 1, 3], "uv": [36, 27]}
+					]
+				},
+				{
+					"name": "tail5",
+					"parent": "tail4",
+					"pivot": [0, 2.5, 19.5],
+					"cubes": [
+						{"origin": [0, 2, 19.5], "size": [0, 1, 2], "inflate": 0.01, "uv": [30, 27]}
+					]
+				},
+				{
+					"name": "tail6",
+					"parent": "tail5",
+					"pivot": [0, 2.5, 21.5],
+					"cubes": [
+						{"origin": [0, 2, 21.5], "size": [0, 1, 2], "uv": [30, 30]}
+					]
+				},
+				{
+					"name": "tail7",
+					"parent": "tail6",
+					"pivot": [0, 2.5, 23.5],
+					"cubes": [
+						{"origin": [0, 2, 23.5], "size": [0, 1, 4], "inflate": 0.01, "uv": [34, 25]}
+					]
+				},
+				{
+					"name": "tail_ball",
+					"parent": "tail7",
+					"pivot": [0, 2.5, 25.5],
+					"cubes": [
+						{"origin": [-3.5, -1, 25.5], "size": [7, 7, 7], "uv": [36, 27]}
+					]
+				},
+				{
+					"name": "locator_tail_tip",
+					"parent": "tail_ball",
+					"pivot": [0, 2.5, 32.5],
+					"rotation": [180, 0, -180],
+					"locators": {
+						"tail_tip": [0, 2.5, 32.5]
+					}
+				},
+				{
+					"name": "locator_physical",
+					"parent": "tail_ball",
+					"pivot": [0, 2.5, 29],
+					"locators": {
+						"physical": [0, 2.5, 29]
+					}
+				},
+				{
+					"name": "tail_ball_active",
+					"parent": "tail_ball",
+					"pivot": [0, 2.5, 29],
+					"cubes": [
+						{"origin": [-3.5, -1, 25.5], "size": [7, 7, 7], "inflate": -0.1, "uv": [36, 42]}
+					]
+				},
+				{
+					"name": "ears",
+					"parent": "torso",
+					"pivot": [0, 15, 0.01]
+				},
+				{
+					"name": "ear_left",
+					"parent": "ears",
+					"pivot": [4, 15, 0],
+					"cubes": [
+						{"origin": [2.5, 13.5, 0], "size": [7, 6, 0], "uv": [49, 58]}
+					]
+				},
+				{
+					"name": "ear_right",
+					"parent": "ears",
+					"pivot": [-4, 15, 0],
+					"cubes": [
+						{"origin": [-9.5, 13.5, 0], "size": [7, 6, 0], "uv": [33, 58]}
+					]
+				},
+				{
+					"name": "face",
+					"parent": "torso",
+					"pivot": [0, 11.75, -6.54]
+				},
+				{
+					"name": "eyes",
+					"parent": "face",
+					"pivot": [0, 11.75, -6.54]
+				},
+				{
+					"name": "eye_left",
+					"parent": "eyes",
+					"pivot": [3, 12.25, -6.52],
+					"cubes": [
+						{"origin": [2, 11.25, -6.52], "size": [2, 2, 0], "uv": [6, 29]}
+					]
+				},
+				{
+					"name": "locator_eye_left",
+					"parent": "eye_left",
+					"pivot": [3, 12.25, -6.45],
+					"locators": {
+						"eye2": [3, 12.25, -6.45]
+					}
+				},
+				{
+					"name": "eyeshine_left",
+					"parent": "eye_left",
+					"pivot": [2.75, 12.5, -6.54],
+					"cubes": [
+						{"origin": [2.25, 12, -6.54], "size": [1, 1, 0], "uv": [14, 29]}
+					]
+				},
+				{
+					"name": "eyebrow_left",
+					"parent": "eye_left",
+					"pivot": [3, 13.25, -6.46],
+					"cubes": [
+						{"origin": [1.5, 12.75, -6.46], "size": [3, 1, 0], "uv": [8, 54]}
+					]
+				},
+				{
+					"name": "eyebrow_small_left",
+					"parent": "eye_left",
+					"pivot": [2.25, 13, -6.46],
+					"cubes": [
+						{"origin": [1.75, 12.5, -6.46], "size": [1, 1, 0], "uv": [11, 51]}
+					]
+				},
+				{
+					"name": "eye_left_happy",
+					"parent": "eyes",
+					"pivot": [3, 12.25, -6.42],
+					"cubes": [
+						{"origin": [1.5, 11.25, -6.42], "size": [3, 2, 0], "uv": [8, 46]}
+					]
+				},
+				{
+					"name": "eye_left_hurt",
+					"parent": "eyes",
+					"pivot": [3, 12.25, -6.42],
+					"cubes": [
+						{"origin": [2, 11.25, -6.42], "size": [2, 2, 0], "uv": [6, 51]}
+					]
+				},
+				{
+					"name": "eyelid_left",
+					"parent": "eyes",
+					"pivot": [3, 11.75, -6.42],
+					"cubes": [
+						{"origin": [2, 11.25, -6.42], "size": [2, 1, 0], "uv": [6, 49]}
+					]
+				},
+				{
+					"name": "eye_right",
+					"parent": "eyes",
+					"pivot": [-3, 12.25, -6.52],
+					"cubes": [
+						{"origin": [-4, 11.25, -6.52], "size": [2, 2, 0], "uv": [1, 29]}
+					]
+				},
+				{
+					"name": "locator_eye_right",
+					"parent": "eye_right",
+					"pivot": [-3, 12.25, -6.45],
+					"locators": {
+						"eye1": [-3, 12.25, -6.45]
+					}
+				},
+				{
+					"name": "eyeshine_right",
+					"parent": "eye_right",
+					"pivot": [-2.75, 12.5, -6.54],
+					"cubes": [
+						{"origin": [-3.25, 12, -6.54], "size": [1, 1, 0], "uv": [11, 29]}
+					]
+				},
+				{
+					"name": "eyebrow_right",
+					"parent": "eye_right",
+					"pivot": [-3, 13.25, -6.46],
+					"cubes": [
+						{"origin": [-4.5, 12.75, -6.46], "size": [3, 1, 0], "uv": [1, 54]}
+					]
+				},
+				{
+					"name": "eyebrow_small_right",
+					"parent": "eye_right",
+					"pivot": [-2.25, 13, -6.46],
+					"cubes": [
+						{"origin": [-2.75, 12.5, -6.46], "size": [1, 1, 0], "uv": [11, 49]}
+					]
+				},
+				{
+					"name": "eye_right_happy",
+					"parent": "eyes",
+					"pivot": [-3, 12.25, -6.42],
+					"cubes": [
+						{"origin": [-4.5, 11.25, -6.42], "size": [3, 2, 0], "uv": [1, 46]}
+					]
+				},
+				{
+					"name": "eye_right_hurt",
+					"parent": "eyes",
+					"pivot": [-3, 12.25, -6.42],
+					"cubes": [
+						{"origin": [-4, 11.25, -6.42], "size": [2, 2, 0], "uv": [1, 51]}
+					]
+				},
+				{
+					"name": "eyelid_right",
+					"parent": "eyes",
+					"pivot": [-3, 11.75, -6.42],
+					"cubes": [
+						{"origin": [-4, 11.25, -6.42], "size": [2, 1, 0], "uv": [1, 49]}
+					]
+				},
+				{
+					"name": "mouth",
+					"parent": "face",
+					"pivot": [0, 10.375, -6.52]
+				},
+				{
+					"name": "mouth_closed_smile",
+					"parent": "mouth",
+					"pivot": [0, 10.375, -6.52],
+					"cubes": [
+						{"origin": [-2, 10, -6.52], "size": [4, 1, 0], "uv": [1, 38]},
+						{"origin": [-1, 9.75, -6.52], "size": [2, 1, 0], "inflate": 0.01, "uv": [10, 38]}
+					]
+				},
+				{
+					"name": "mouth_closed_frown",
+					"parent": "mouth",
+					"pivot": [0, 10.41667, -6.42],
+					"cubes": [
+						{"origin": [-2, 9.75, -6.42], "size": [4, 1, 0], "uv": [1, 40]},
+						{"origin": [-1, 10, -6.42], "size": [2, 1, 0], "uv": [10, 40]}
+					]
+				},
+				{
+					"name": "mouth_closed_frown_small",
+					"parent": "mouth",
+					"pivot": [0, 10.25, -6.42],
+					"cubes": [
+						{"origin": [-1.5, 9.5, -6.42], "size": [3, 1, 0], "uv": [1, 44]},
+						{"origin": [-0.5, 10, -6.42], "size": [1, 1, 0], "uv": [8, 44]}
+					]
+				},
+				{
+					"name": "mouth_closed_straight",
+					"parent": "mouth",
+					"pivot": [0, 10.25, -6.42],
+					"cubes": [
+						{"origin": [-2, 9.75, -6.42], "size": [4, 1, 0], "uv": [1, 42]}
+					]
+				},
+				{
+					"name": "mouth_open",
+					"parent": "mouth",
+					"pivot": [0, 10, -6.42],
+					"cubes": [
+						{"origin": [-1, 9, -6.42], "size": [2, 2, 0], "uv": [10, 32]}
+					]
+				},
+				{
+					"name": "mouth_open_big",
+					"parent": "mouth",
+					"pivot": [0, 10, -6.42],
+					"cubes": [
+						{"origin": [-2, 9, -6.42], "size": [4, 2, 0], "uv": [1, 32]}
+					]
+				},
+				{
+					"name": "mouth_open_small",
+					"parent": "mouth",
+					"pivot": [0, 10.25, -6.42],
+					"cubes": [
+						{"origin": [-1, 9.75, -6.42], "size": [2, 1, 0], "uv": [10, 35]}
+					]
+				},
+				{
+					"name": "mouth_open_smile",
+					"parent": "mouth",
+					"pivot": [0, 10, -6.44],
+					"cubes": [
+						{"origin": [-1, 9, -6.44], "size": [2, 1, 0], "uv": [2, 36]},
+						{"origin": [-1.5, 10, -6.44], "size": [3, 1, 0], "uv": [1, 35]}
+					]
+				},
+				{
+					"name": "locator_jaw_upper",
+					"parent": "mouth",
+					"pivot": [0, 11.1, -6.5],
+					"locators": {
+						"jaw1": [0, 11.1, -6.5]
+					}
+				},
+				{
+					"name": "locator_jaw_lower",
+					"parent": "mouth",
+					"pivot": [0, 9.05, -6.5],
+					"locators": {
+						"jaw2": [0, 9.05, -6.5]
+					}
+				},
+				{
+					"name": "nose",
+					"parent": "face",
+					"pivot": [0, 12, -6.53],
+					"cubes": [
+						{"origin": [-1, 11.75, -6.54], "size": [2, 1, 0], "uv": [10, 42]},
+						{"origin": [-0.5, 11.25, -6.52], "size": [1, 1, 0], "uv": [11, 44]}
+					]
+				},
+				{
+					"name": "arms",
+					"parent": "torso",
+					"pivot": [0, 8, -4]
+				},
+				{
+					"name": "arm_left",
+					"parent": "arms",
+					"pivot": [6.25, 8, -4],
+					"cubes": [
+						{"origin": [5.25, 7, -7], "size": [2, 2, 4], "uv": [0, 6]}
+					]
+				},
+				{
+					"name": "hand_left",
+					"parent": "arm_left",
+					"pivot": [6.25, 8.05, -7],
+					"cubes": [
+						{"origin": [5.25, 7, -9], "size": [2, 2, 2], "inflate": 0.02, "uv": [52, 14]}
+					]
+				},
+				{
+					"name": "locator_hand_secondary",
+					"parent": "hand_left",
+					"pivot": [6.2, 8, -8],
+					"locators": {
+						"hand_secondary": [6.2, 8, -8]
+					}
+				},
+				{
+					"name": "arm_right",
+					"parent": "arms",
+					"pivot": [-6.25, 8, -4],
+					"cubes": [
+						{"origin": [-7.25, 7, -7], "size": [2, 2, 4], "uv": [0, 0]}
+					]
+				},
+				{
+					"name": "hand_right",
+					"parent": "arm_right",
+					"pivot": [-6.25, 7.8, -7],
+					"cubes": [
+						{"origin": [-7.25, 7, -9], "size": [2, 2, 2], "inflate": 0.02, "uv": [52, 10]}
+					]
+				},
+				{
+					"name": "locator_hand_primary",
+					"parent": "hand_right",
+					"pivot": [-6.2, 8, -8],
+					"locators": {
+						"hand_primary": [-6.2, 8, -8]
+					}
+				},
+				{
+					"name": "locator_item",
+					"parent": "hand_right",
+					"pivot": [-6.2, 8, -9],
+					"locators": {
+						"item": [-6.2, 8, -9]
+					}
+				},
+				{
+					"name": "feet",
+					"parent": "body",
+					"pivot": [0, 1, 2]
+				},
+				{
+					"name": "foot_left",
+					"parent": "feet",
+					"pivot": [3, 1, 2],
+					"cubes": [
+						{"origin": [1.5, 0, -1], "size": [3, 2, 4], "uv": [39, 6]}
+					]
+				},
+				{
+					"name": "locator_foot_secondary",
+					"parent": "foot_left",
+					"pivot": [3.025, 0.5, 0],
+					"rotation": [90, 0, 0],
+					"locators": {
+						"foot_secondary": [3.025, 0.5, 0]
+					}
+				},
+				{
+					"name": "toes_left",
+					"parent": "foot_left",
+					"pivot": [3, 1, -1],
+					"cubes": [
+						{"origin": [1.5, 0, -3], "size": [3, 2, 2], "inflate": 0.02, "uv": [49, 6]}
+					]
+				},
+				{
+					"name": "foot_right",
+					"parent": "feet",
+					"pivot": [-3, 1, 2],
+					"cubes": [
+						{"origin": [-4.5, 0, -1], "size": [3, 2, 4], "uv": [39, 0]}
+					]
+				},
+				{
+					"name": "locator_foot_primary",
+					"parent": "foot_right",
+					"pivot": [-3.025, 0.5, 0],
+					"rotation": [90, 0, 0],
+					"locators": {
+						"foot_primary": [-3.025, 0.5, 0]
+					}
+				},
+				{
+					"name": "toes_right",
+					"parent": "foot_right",
+					"pivot": [-3, 1, -1],
+					"cubes": [
+						{"origin": [-4.5, 0, -3], "size": [3, 2, 2], "inflate": 0.02, "uv": [49, 0]}
+					]
+				}
+			]
+		}
+	]
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0184_azumarill/azumarill.geo.json

@@ -0,0 +1,593 @@
+{
+	"format_version": "1.12.0",
+	"minecraft:geometry": [
+		{
+			"description": {
+				"identifier": "geometry.azumarill",
+				"texture_width": 64,
+				"texture_height": 64,
+				"visible_bounds_width": 5,
+				"visible_bounds_height": 3.5,
+				"visible_bounds_offset": [0, 1.25, 0]
+			},
+			"bones": [
+				{
+					"name": "azumarill",
+					"pivot": [0, 0, 0]
+				},
+				{
+					"name": "locator_root",
+					"parent": "azumarill",
+					"pivot": [0, 0, 0],
+					"locators": {
+						"root": [0, 0, 0]
+					}
+				},
+				{
+					"name": "locator_top",
+					"parent": "azumarill",
+					"pivot": [0, 21.35, 0],
+					"locators": {
+						"top": [0, 21.35, 0]
+					}
+				},
+				{
+					"name": "body",
+					"parent": "azumarill",
+					"pivot": [0, 10, 0]
+				},
+				{
+					"name": "locator_target",
+					"parent": "body",
+					"pivot": [0, 10, -8],
+					"locators": {
+						"target": [0, 10, -8]
+					}
+				},
+				{
+					"name": "locator_middle",
+					"parent": "body",
+					"pivot": [0, 10, 0],
+					"locators": {
+						"middle": [0, 10, 0]
+					}
+				},
+				{
+					"name": "torso",
+					"parent": "body",
+					"pivot": [0, 2.5, 0],
+					"cubes": [
+						{"origin": [-6, 1.5, -6], "size": [12, 17, 12], "uv": [0, 0]}
+					]
+				},
+				{
+					"name": "locator_head",
+					"parent": "torso",
+					"pivot": [0, 18.5, -4],
+					"locators": {
+						"head": [0, 18.5, -4]
+					}
+				},
+				{
+					"name": "locator_item_hat",
+					"parent": "torso",
+					"pivot": [0, 18.5, 0],
+					"locators": {
+						"item_hat": [0, 18.5, 0]
+					}
+				},
+				{
+					"name": "locator_face",
+					"parent": "torso",
+					"pivot": [0, 15.5, -6],
+					"locators": {
+						"face": [0, 15.5, -6]
+					}
+				},
+				{
+					"name": "locator_item_face",
+					"parent": "torso",
+					"pivot": [0, 15.5, -6],
+					"locators": {
+						"item_face": [0, 15.5, -6]
+					}
+				},
+				{
+					"name": "locator_mouth",
+					"parent": "torso",
+					"pivot": [0, 13.25, -6],
+					"locators": {
+						"mouth": [0, 13.25, -6],
+						"special": [0, 13.25, -6]
+					}
+				},
+				{
+					"name": "tail",
+					"parent": "torso",
+					"pivot": [0, 4, 6],
+					"cubes": [
+						{"origin": [0, 3.5, 4], "size": [0, 1, 4], "uv": [55, 40]}
+					]
+				},
+				{
+					"name": "tail2",
+					"parent": "tail",
+					"pivot": [0, 4, 8],
+					"cubes": [
+						{"origin": [0, 3.5, 8], "size": [0, 1, 3], "inflate": 0.01, "uv": [56, 40]}
+					]
+				},
+				{
+					"name": "tail3",
+					"parent": "tail2",
+					"pivot": [0, 4, 11],
+					"cubes": [
+						{"origin": [0, 3.5, 11], "size": [0, 1, 3], "uv": [56, 39]}
+					]
+				},
+				{
+					"name": "tail4",
+					"parent": "tail3",
+					"pivot": [0, 4, 14],
+					"cubes": [
+						{"origin": [0, 3.5, 14], "size": [0, 1, 3], "inflate": 0.01, "uv": [56, 38]}
+					]
+				},
+				{
+					"name": "locator_tail",
+					"parent": "tail4",
+					"pivot": [0, 4, 15.5],
+					"rotation": [180, 0, -180],
+					"locators": {
+						"tail": [0, 4, 15.5]
+					}
+				},
+				{
+					"name": "tail5",
+					"parent": "tail4",
+					"pivot": [0, 4, 17],
+					"cubes": [
+						{"origin": [0, 3.5, 17], "size": [0, 1, 3], "uv": [56, 37]}
+					]
+				},
+				{
+					"name": "tail6",
+					"parent": "tail5",
+					"pivot": [0, 4, 20],
+					"cubes": [
+						{"origin": [0, 3.5, 20], "size": [0, 1, 3], "inflate": 0.01, "uv": [56, 36]}
+					]
+				},
+				{
+					"name": "tail7",
+					"parent": "tail6",
+					"pivot": [0, 4, 23],
+					"cubes": [
+						{"origin": [0, 3.5, 23], "size": [0, 1, 3], "uv": [56, 35]}
+					]
+				},
+				{
+					"name": "tail_ball",
+					"parent": "tail7",
+					"pivot": [0, 4, 25],
+					"cubes": [
+						{"origin": [-2.5, 1.5, 25], "size": [5, 5, 5], "uv": [44, 26]}
+					]
+				},
+				{
+					"name": "locator_tail_tip",
+					"parent": "tail_ball",
+					"pivot": [0, 4, 30],
+					"rotation": [180, 0, -180],
+					"locators": {
+						"tail_tip": [0, 4, 30]
+					}
+				},
+				{
+					"name": "locator_physical",
+					"parent": "tail_ball",
+					"pivot": [0, 4, 27.5],
+					"locators": {
+						"physical": [0, 4, 27.5]
+					}
+				},
+				{
+					"name": "tail_ball_active",
+					"parent": "tail_ball",
+					"pivot": [0, 4, 27.5],
+					"cubes": [
+						{"origin": [-2.5, 1.5, 25], "size": [5, 5, 5], "inflate": -0.1, "uv": [23, 30]}
+					]
+				},
+				{
+					"name": "ears",
+					"parent": "torso",
+					"pivot": [0, 17.5, 0]
+				},
+				{
+					"name": "ear_left",
+					"parent": "ears",
+					"pivot": [4.5, 17.5, 0],
+					"cubes": [
+						{"origin": [2.5, 16, 0], "size": [4, 8, 0], "uv": [54, 55]}
+					]
+				},
+				{
+					"name": "ear_left2",
+					"parent": "ear_left",
+					"pivot": [4.5, 24, 0],
+					"cubes": [
+						{"origin": [2, 24, 0], "size": [5, 7, 0], "uv": [53, 47]}
+					]
+				},
+				{
+					"name": "ear_right",
+					"parent": "ears",
+					"pivot": [-4.5, 17.5, 0],
+					"cubes": [
+						{"origin": [-6.5, 16, 0], "size": [4, 8, 0], "uv": [42, 55]}
+					]
+				},
+				{
+					"name": "ear_right2",
+					"parent": "ear_right",
+					"pivot": [-4.5, 24, 0],
+					"cubes": [
+						{"origin": [-7, 24, 0], "size": [5, 7, 0], "uv": [41, 47]}
+					]
+				},
+				{
+					"name": "arms",
+					"parent": "torso",
+					"pivot": [0, 9, 0]
+				},
+				{
+					"name": "arm_left",
+					"parent": "arms",
+					"pivot": [5.5, 9, 0],
+					"cubes": [
+						{"origin": [4, 8, -1.5], "size": [6, 2, 3], "uv": [45, 7]}
+					]
+				},
+				{
+					"name": "hand_left",
+					"parent": "arm_left",
+					"pivot": [10, 9, 0],
+					"cubes": [
+						{"origin": [10, 8, -1.5], "size": [3, 2, 3], "inflate": 0.02, "uv": [0, 5]}
+					]
+				},
+				{
+					"name": "locator_hand_secondary",
+					"parent": "hand_left",
+					"pivot": [12, 9, 0],
+					"locators": {
+						"hand_secondary": [12, 9, 0]
+					}
+				},
+				{
+					"name": "arm_right",
+					"parent": "arms",
+					"pivot": [-5.5, 9, 0],
+					"cubes": [
+						{"origin": [-10, 8, -1.5], "size": [6, 2, 3], "uv": [45, 2]}
+					]
+				},
+				{
+					"name": "hand_right",
+					"parent": "arm_right",
+					"pivot": [-10, 9, 0],
+					"cubes": [
+						{"origin": [-13, 8, -1.5], "size": [3, 2, 3], "inflate": 0.02, "uv": [0, 0]}
+					]
+				},
+				{
+					"name": "locator_hand_primary",
+					"parent": "hand_right",
+					"pivot": [-12, 9, 0],
+					"locators": {
+						"hand_primary": [-12, 9, 0]
+					}
+				},
+				{
+					"name": "locator_item",
+					"parent": "hand_right",
+					"pivot": [-12.5, 8, 0],
+					"locators": {
+						"item": [-12.5, 8, 0]
+					}
+				},
+				{
+					"name": "face",
+					"parent": "torso",
+					"pivot": [0, 15.5, -6.02]
+				},
+				{
+					"name": "eyes",
+					"parent": "face",
+					"pivot": [0, 15.5, -6.02]
+				},
+				{
+					"name": "eye_left",
+					"parent": "eyes",
+					"pivot": [3, 15.5, -6.02],
+					"cubes": [
+						{"origin": [2, 14.5, -6.02], "size": [2, 2, 0], "uv": [6, 30]}
+					]
+				},
+				{
+					"name": "locator_eye_left",
+					"parent": "eye_left",
+					"pivot": [3, 15.5, -5.95],
+					"locators": {
+						"eye2": [3, 15.5, -5.95]
+					}
+				},
+				{
+					"name": "eye_shine_left",
+					"parent": "eye_left",
+					"pivot": [2.75, 15.75, -6.04],
+					"cubes": [
+						{"origin": [2.25, 15.25, -6.04], "size": [1, 1, 0], "uv": [14, 30]}
+					]
+				},
+				{
+					"name": "eyebrow_left",
+					"parent": "eye_left",
+					"pivot": [3, 16.5, -5.96],
+					"cubes": [
+						{"origin": [1.5, 16, -5.96], "size": [3, 1, 0], "uv": [8, 56]}
+					]
+				},
+				{
+					"name": "eyebrow_left_small",
+					"parent": "eye_left",
+					"pivot": [2.25, 16.25, -5.96],
+					"cubes": [
+						{"origin": [1.75, 15.75, -5.96], "size": [1, 1, 0], "uv": [11, 50]}
+					]
+				},
+				{
+					"name": "eye_left_happy",
+					"parent": "eyes",
+					"pivot": [3, 15.5, -5.92],
+					"cubes": [
+						{"origin": [1.5, 14.5, -5.92], "size": [3, 2, 0], "uv": [8, 47]}
+					]
+				},
+				{
+					"name": "eye_left_hurt",
+					"parent": "eyes",
+					"pivot": [3, 15.5, -5.92],
+					"cubes": [
+						{"origin": [2, 14.5, -5.92], "size": [2, 2, 0], "uv": [6, 53]}
+					]
+				},
+				{
+					"name": "eyelid_left",
+					"parent": "eyes",
+					"pivot": [3, 15.5, -5.92],
+					"cubes": [
+						{"origin": [2, 14.5, -5.92], "size": [2, 2, 0], "uv": [6, 50]}
+					]
+				},
+				{
+					"name": "eye_right",
+					"parent": "eyes",
+					"pivot": [-3, 15.5, -6.02],
+					"cubes": [
+						{"origin": [-4, 14.5, -6.02], "size": [2, 2, 0], "uv": [1, 30]}
+					]
+				},
+				{
+					"name": "locator_eye_right",
+					"parent": "eye_right",
+					"pivot": [-3, 15.5, -5.95],
+					"locators": {
+						"eye1": [-3, 15.5, -5.95]
+					}
+				},
+				{
+					"name": "eye_shine_right",
+					"parent": "eye_right",
+					"pivot": [-2.75, 15.75, -6.04],
+					"cubes": [
+						{"origin": [-3.25, 15.25, -6.04], "size": [1, 1, 0], "uv": [11, 30]}
+					]
+				},
+				{
+					"name": "eyebrow_right",
+					"parent": "eye_right",
+					"pivot": [-3, 16.5, -5.96],
+					"cubes": [
+						{"origin": [-4.5, 16, -5.96], "size": [3, 1, 0], "uv": [1, 56]}
+					]
+				},
+				{
+					"name": "eyebrow_right_small",
+					"parent": "eye_right",
+					"pivot": [-2.25, 16.25, -5.96],
+					"cubes": [
+						{"origin": [-2.75, 15.75, -5.96], "size": [1, 1, 0], "uv": [11, 53]}
+					]
+				},
+				{
+					"name": "eye_right_happy",
+					"parent": "eyes",
+					"pivot": [-3, 15.5, -5.92],
+					"cubes": [
+						{"origin": [-4.5, 14.5, -5.92], "size": [3, 2, 0], "uv": [1, 47]}
+					]
+				},
+				{
+					"name": "eye_right_hurt",
+					"parent": "eyes",
+					"pivot": [-3, 15.5, -5.92],
+					"cubes": [
+						{"origin": [-4, 14.5, -5.92], "size": [2, 2, 0], "uv": [1, 53]}
+					]
+				},
+				{
+					"name": "eyelid_right",
+					"parent": "eyes",
+					"pivot": [-3, 15.5, -5.92],
+					"cubes": [
+						{"origin": [-4, 14.5, -5.92], "size": [2, 2, 0], "uv": [1, 50]}
+					]
+				},
+				{
+					"name": "nose",
+					"parent": "face",
+					"pivot": [0, 14.75, -6.03],
+					"cubes": [
+						{"origin": [-1, 15, -6.04], "size": [2, 1, 0], "uv": [10, 43]},
+						{"origin": [-0.5, 14.5, -6.02], "size": [1, 1, 0], "uv": [11, 45]}
+					]
+				},
+				{
+					"name": "mouth",
+					"parent": "face",
+					"pivot": [0, 13.5, -6.02]
+				},
+				{
+					"name": "mouth_closed_smile",
+					"parent": "mouth",
+					"pivot": [0, 13.5, -6.02],
+					"cubes": [
+						{"origin": [-1, 12.75, -6.02], "size": [2, 1, 0], "uv": [10, 39]},
+						{"origin": [-2, 13.25, -6.02], "size": [4, 1, 0], "uv": [1, 39]}
+					]
+				},
+				{
+					"name": "mouth_closed_frown",
+					"parent": "mouth",
+					"pivot": [0, 13.5, -5.92],
+					"cubes": [
+						{"origin": [-1, 13.25, -5.92], "size": [2, 1, 0], "uv": [10, 41]},
+						{"origin": [-2, 12.75, -5.92], "size": [4, 1, 0], "uv": [1, 41]}
+					]
+				},
+				{
+					"name": "mouth_closed_frown_small",
+					"parent": "mouth",
+					"pivot": [0, 13.5, -5.92],
+					"cubes": [
+						{"origin": [-0.5, 13.25, -5.92], "size": [1, 1, 0], "uv": [8, 45]},
+						{"origin": [-1.5, 12.75, -5.92], "size": [3, 1, 0], "uv": [1, 45]}
+					]
+				},
+				{
+					"name": "mouth_straight",
+					"parent": "mouth",
+					"pivot": [0, 13.5, -5.92],
+					"cubes": [
+						{"origin": [-2, 13, -5.92], "size": [4, 1, 0], "uv": [1, 43]}
+					]
+				},
+				{
+					"name": "mouth_open",
+					"parent": "mouth",
+					"pivot": [0, 13.25, -5.92],
+					"cubes": [
+						{"origin": [-1, 12.25, -5.92], "size": [2, 2, 0], "uv": [10, 33]}
+					]
+				},
+				{
+					"name": "mouth_open_big",
+					"parent": "mouth",
+					"pivot": [0, 13.25, -5.92],
+					"cubes": [
+						{"origin": [-2, 12.25, -5.92], "size": [4, 2, 0], "uv": [1, 33]}
+					]
+				},
+				{
+					"name": "mouth_open_small",
+					"parent": "mouth",
+					"pivot": [0, 13.5, -5.92],
+					"cubes": [
+						{"origin": [-1, 13, -5.92], "size": [2, 1, 0], "uv": [10, 36]}
+					]
+				},
+				{
+					"name": "mouth_open_smile",
+					"parent": "mouth",
+					"pivot": [0, 13.25, -5.92],
+					"cubes": [
+						{"origin": [-2, 12.25, -5.92], "size": [4, 2, 0], "uv": [1, 36]}
+					]
+				},
+				{
+					"name": "locator_jaw_upper",
+					"parent": "mouth",
+					"pivot": [0, 14.4, -6],
+					"locators": {
+						"jaw1": [0, 14.4, -6]
+					}
+				},
+				{
+					"name": "locator_jaw_lower",
+					"parent": "mouth",
+					"pivot": [0, 12.1, -6],
+					"locators": {
+						"jaw2": [0, 12.1, -6]
+					}
+				},
+				{
+					"name": "feet",
+					"parent": "body",
+					"pivot": [0, 1.5, 1.5]
+				},
+				{
+					"name": "foot_left",
+					"parent": "feet",
+					"pivot": [3, 1.5, 1.5],
+					"cubes": [
+						{"origin": [1.5, 0, -2], "size": [3, 2, 5], "uv": [48, 12], "mirror": true}
+					]
+				},
+				{
+					"name": "locator_foot_secondary",
+					"parent": "foot_left",
+					"pivot": [3.025, 0.5, -1],
+					"rotation": [90, 0, 0],
+					"locators": {
+						"foot_secondary": [3.025, 0.5, -1]
+					}
+				},
+				{
+					"name": "toes_left",
+					"parent": "foot_left",
+					"pivot": [3, 0, -2],
+					"cubes": [
+						{"origin": [1.5, 0, -5], "size": [3, 2, 3], "inflate": 0.02, "uv": [36, 0], "mirror": true}
+					]
+				},
+				{
+					"name": "foot_right",
+					"parent": "feet",
+					"pivot": [-3, 1.5, 1.5],
+					"cubes": [
+						{"origin": [-4.5, 0, -2], "size": [3, 2, 5], "uv": [48, 12]}
+					]
+				},
+				{
+					"name": "locator_foot_primary",
+					"parent": "foot_right",
+					"pivot": [-3.025, 0.5, -1],
+					"rotation": [90, 0, 0],
+					"locators": {
+						"foot_primary": [-3.025, 0.5, -1]
+					}
+				},
+				{
+					"name": "toes_right",
+					"parent": "foot_right",
+					"pivot": [-3, 0, -2],
+					"cubes": [
+						{"origin": [-4.5, 0, -5], "size": [3, 2, 3], "inflate": 0.02, "uv": [36, 0]}
+					]
+				}
+			]
+		}
+	]
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0298_azurill/azurill.geo.json

@@ -0,0 +1,483 @@
+{
+	"format_version": "1.12.0",
+	"minecraft:geometry": [
+		{
+			"description": {
+				"identifier": "geometry.azurill",
+				"texture_width": 64,
+				"texture_height": 32,
+				"visible_bounds_width": 5,
+				"visible_bounds_height": 3.5,
+				"visible_bounds_offset": [0, 1.25, 0]
+			},
+			"bones": [
+				{
+					"name": "azurill",
+					"pivot": [0, 0, 0]
+				},
+				{
+					"name": "locator_root",
+					"parent": "azurill",
+					"pivot": [0, 0, 0],
+					"locators": {
+						"root": [0, 0, 0]
+					}
+				},
+				{
+					"name": "locator_top",
+					"parent": "azurill",
+					"pivot": [0, 11.35, 0],
+					"locators": {
+						"top": [0, 11.35, 0]
+					}
+				},
+				{
+					"name": "body",
+					"parent": "azurill",
+					"pivot": [0, 4, 0]
+				},
+				{
+					"name": "locator_target",
+					"parent": "body",
+					"pivot": [0, 4.75, -6],
+					"locators": {
+						"target": [0, 4.75, -6]
+					}
+				},
+				{
+					"name": "locator_middle",
+					"parent": "body",
+					"pivot": [0, 5, 0],
+					"locators": {
+						"middle": [0, 5, 0]
+					}
+				},
+				{
+					"name": "torso",
+					"parent": "body",
+					"pivot": [0, 1.5, 0]
+				},
+				{
+					"name": "tail",
+					"parent": "torso",
+					"pivot": [0, 2.5, 4.5],
+					"rotation": [-45, 0, 0],
+					"cubes": [
+						{"origin": [0, 1, 4], "size": [0, 5, 1], "inflate": 0.01, "uv": [35, 13]}
+					]
+				},
+				{
+					"name": "tail2",
+					"parent": "tail",
+					"pivot": [0, 6, 4.5],
+					"cubes": [
+						{"origin": [0, 6, 4], "size": [0, 3, 1], "uv": [37, 15]}
+					]
+				},
+				{
+					"name": "tail3",
+					"parent": "tail2",
+					"pivot": [0, 9, 4.5],
+					"cubes": [
+						{"origin": [0, 9, 4], "size": [0, 3, 1], "inflate": 0.01, "uv": [37, 12]}
+					]
+				},
+				{
+					"name": "tail4",
+					"parent": "tail3",
+					"pivot": [0, 12, 4.5],
+					"cubes": [
+						{"origin": [0, 12, 4], "size": [0, 3, 1], "uv": [39, 15]}
+					]
+				},
+				{
+					"name": "locator_tail",
+					"parent": "tail4",
+					"pivot": [0, 13.5, 4.5],
+					"rotation": [180, 0, -180],
+					"locators": {
+						"tail": [0, 13.5, 4.5]
+					}
+				},
+				{
+					"name": "tail5",
+					"parent": "tail4",
+					"pivot": [0, 15, 4.5],
+					"cubes": [
+						{"origin": [0, 15, 4], "size": [0, 3, 1], "inflate": 0.01, "uv": [39, 12]}
+					]
+				},
+				{
+					"name": "tail6",
+					"parent": "tail5",
+					"pivot": [0, 18, 4.5],
+					"cubes": [
+						{"origin": [0, 18, 4], "size": [0, 3, 1], "uv": [41, 15]}
+					]
+				},
+				{
+					"name": "tail7",
+					"parent": "tail6",
+					"pivot": [0, 21, 4.5],
+					"cubes": [
+						{"origin": [0, 21, 4], "size": [0, 2, 1], "inflate": 0.01, "uv": [41, 13]}
+					]
+				},
+				{
+					"name": "tail8",
+					"parent": "tail7",
+					"pivot": [0, 23, 4.5],
+					"cubes": [
+						{"origin": [0, 23, 4], "size": [0, 3, 1], "uv": [43, 15]}
+					]
+				},
+				{
+					"name": "tail_ball",
+					"parent": "tail8",
+					"pivot": [0, 25, 4.5]
+				},
+				{
+					"name": "tail_ball_scale",
+					"parent": "tail_ball",
+					"pivot": [0, 29, 4.5],
+					"cubes": [
+						{"origin": [-4, 25, 0.5], "size": [8, 8, 8], "inflate": -0.02, "uv": [0, 16]}
+					]
+				},
+				{
+					"name": "locator_tail_tip",
+					"parent": "tail_ball_scale",
+					"pivot": [0, 33, 4.5],
+					"rotation": [180, 0, -180],
+					"locators": {
+						"tail_tip": [0, 33, 4.5]
+					}
+				},
+				{
+					"name": "torso2",
+					"parent": "torso",
+					"pivot": [0, 1.5, 0],
+					"cubes": [
+						{"origin": [-4, 0.5, -4], "size": [8, 8, 8], "uv": [0, 0]}
+					]
+				},
+				{
+					"name": "locator_head",
+					"parent": "torso2",
+					"pivot": [0, 8.5, -2.5],
+					"locators": {
+						"head": [0, 8.5, -2.5],
+						"physical": [0, 8.5, -2.5]
+					}
+				},
+				{
+					"name": "locator_item_hat",
+					"parent": "torso2",
+					"pivot": [0, 8.5, 0],
+					"locators": {
+						"item_hat": [0, 8.5, 0]
+					}
+				},
+				{
+					"name": "locator_face",
+					"parent": "torso2",
+					"pivot": [0, 5.5, -4],
+					"locators": {
+						"face": [0, 5.5, -4]
+					}
+				},
+				{
+					"name": "locator_item_face",
+					"parent": "torso2",
+					"pivot": [0, 5.5, -4],
+					"locators": {
+						"item_face": [0, 5.5, -4]
+					}
+				},
+				{
+					"name": "locator_mouth",
+					"parent": "torso2",
+					"pivot": [0, 3.75, -4],
+					"locators": {
+						"mouth": [0, 3.75, -4],
+						"special": [0, 3.75, -4]
+					}
+				},
+				{
+					"name": "locator_item",
+					"parent": "torso2",
+					"pivot": [0, 3.75, -4],
+					"locators": {
+						"item": [0, 3.75, -4]
+					}
+				},
+				{
+					"name": "ears",
+					"parent": "torso2",
+					"pivot": [0, 7.45642, -0.4981]
+				},
+				{
+					"name": "ear_left",
+					"parent": "ears",
+					"pivot": [3, 8.5, 0],
+					"cubes": [
+						{"origin": [1.5, 7, 0], "size": [5, 4, 0], "uv": [34, 27]}
+					]
+				},
+				{
+					"name": "ear_right",
+					"parent": "ears",
+					"pivot": [-3, 8.5, 0],
+					"cubes": [
+						{"origin": [-6.5, 7, 0], "size": [5, 4, 0], "uv": [34, 21]}
+					]
+				},
+				{
+					"name": "tail_bump",
+					"parent": "torso2",
+					"pivot": [0, 0.5, 4],
+					"rotation": [-35, 0, 0],
+					"cubes": [
+						{"origin": [-1.5, 0.5, 2], "size": [3, 2, 2], "uv": [24, 16]}
+					]
+				},
+				{
+					"name": "mouth",
+					"parent": "torso2",
+					"pivot": [0, 3.75, -4.02]
+				},
+				{
+					"name": "mouth_closed",
+					"parent": "mouth",
+					"pivot": [0, 3.75, -4.02],
+					"cubes": [
+						{"origin": [-1, 3.25, -4.02], "size": [2, 1, 0], "uv": [33, 11]}
+					]
+				},
+				{
+					"name": "mouth_closed_smile",
+					"parent": "mouth",
+					"pivot": [0, 3.75, -3.92],
+					"cubes": [
+						{"origin": [-1, 3.25, -3.92], "size": [2, 1, 0], "uv": [33, 7]},
+						{"origin": [-0.5, 3.75, -3.94], "size": [1, 1, 0], "uv": [38, 7]}
+					]
+				},
+				{
+					"name": "mouth_closed_frown",
+					"parent": "mouth",
+					"pivot": [0, 3.75, -3.92],
+					"cubes": [
+						{"origin": [-1, 3.25, -3.92], "size": [2, 1, 0], "uv": [33, 9]},
+						{"origin": [-0.5, 2.75, -3.94], "size": [1, 1, 0], "uv": [38, 9]}
+					]
+				},
+				{
+					"name": "mouth_open",
+					"parent": "mouth",
+					"pivot": [0, 3.75, -3.92],
+					"cubes": [
+						{"origin": [-1, 3.25, -3.92], "size": [2, 1, 0], "uv": [51, 1]}
+					]
+				},
+				{
+					"name": "mouth_open_tall",
+					"parent": "mouth",
+					"pivot": [0, 3.75, -3.9],
+					"cubes": [
+						{"origin": [-0.5, 2.75, -3.92], "size": [1, 2, 0], "uv": [51, 6]}
+					]
+				},
+				{
+					"name": "mouth_open_small",
+					"parent": "mouth",
+					"pivot": [0, 3.75, -3.92],
+					"cubes": [
+						{"origin": [-0.5, 3.25, -3.92], "size": [1, 1, 0], "uv": [54, 6]}
+					]
+				},
+				{
+					"name": "mouth_open_happy",
+					"parent": "mouth",
+					"pivot": [0, 3.75, -3.92],
+					"cubes": [
+						{"origin": [-1.5, 3.25, -3.92], "size": [3, 1, 0], "uv": [51, 3]},
+						{"origin": [-1, 2.25, -3.92], "size": [2, 1, 0], "uv": [51, 4]}
+					]
+				},
+				{
+					"name": "locator_jaw_upper",
+					"parent": "mouth",
+					"pivot": [0, 4.5, -4],
+					"locators": {
+						"jaw1": [0, 4.5, -4]
+					}
+				},
+				{
+					"name": "locator_jaw_lower",
+					"parent": "mouth",
+					"pivot": [0, 2.75, -4],
+					"locators": {
+						"jaw2": [0, 2.75, -4]
+					}
+				},
+				{
+					"name": "eyes",
+					"parent": "torso2",
+					"pivot": [0, 5.5, -4]
+				},
+				{
+					"name": "eye_left",
+					"parent": "eyes",
+					"pivot": [2, 5.49996, -4.02],
+					"cubes": [
+						{"origin": [1.5, 4.49996, -4.02], "size": [1, 2, 0], "uv": [36, 1]}
+					]
+				},
+				{
+					"name": "locator_eye_left",
+					"parent": "eye_left",
+					"pivot": [2, 5.5, -3.95],
+					"locators": {
+						"eye2": [2, 5.5, -3.95]
+					}
+				},
+				{
+					"name": "eyebrow_left_small",
+					"parent": "eye_left",
+					"pivot": [2.0057, 6.49988, -3.94],
+					"cubes": [
+						{"origin": [1.5, 5.99988, -3.94], "size": [1, 1, 0], "uv": [45, 1]}
+					]
+				},
+				{
+					"name": "eyebrow_left",
+					"parent": "eye_left",
+					"pivot": [2, 6.5, -3.94],
+					"cubes": [
+						{"origin": [1, 6, -3.94], "size": [2, 1, 0], "uv": [44, 4]}
+					]
+				},
+				{
+					"name": "eye_left_shocked",
+					"parent": "eyes",
+					"pivot": [2, 5.5, -3.92],
+					"cubes": [
+						{"origin": [1.5, 5, -3.92], "size": [1, 1, 0], "uv": [42, 1]}
+					]
+				},
+				{
+					"name": "eyelid_left",
+					"parent": "eyes",
+					"pivot": [2, 5.49996, -3.92],
+					"cubes": [
+						{"origin": [1.5, 4.49996, -3.92], "size": [1, 2, 0], "uv": [36, 4]}
+					]
+				},
+				{
+					"name": "eye_right",
+					"parent": "eyes",
+					"pivot": [-2, 5.49996, -4.02],
+					"cubes": [
+						{"origin": [-2.5, 4.49996, -4.02], "size": [1, 2, 0], "uv": [33, 1]}
+					]
+				},
+				{
+					"name": "locator_eye_right",
+					"parent": "eye_right",
+					"pivot": [-2, 5.5, -3.95],
+					"locators": {
+						"eye1": [-2, 5.5, -3.95]
+					}
+				},
+				{
+					"name": "eyebrow_right_small",
+					"parent": "eye_right",
+					"pivot": [-2.0057, 6.49988, -3.94],
+					"cubes": [
+						{"origin": [-2.5, 5.99988, -3.94], "size": [1, 1, 0], "uv": [48, 1]}
+					]
+				},
+				{
+					"name": "eyebrow_right",
+					"parent": "eye_right",
+					"pivot": [-2, 6.5, -3.94],
+					"cubes": [
+						{"origin": [-3, 6, -3.94], "size": [2, 1, 0], "uv": [39, 4]}
+					]
+				},
+				{
+					"name": "eye_right_shocked",
+					"parent": "eyes",
+					"pivot": [-2, 5.5, -3.92],
+					"cubes": [
+						{"origin": [-2.5, 5, -3.92], "size": [1, 1, 0], "uv": [39, 1]}
+					]
+				},
+				{
+					"name": "eyelid_right",
+					"parent": "eyes",
+					"pivot": [-2, 5.49996, -3.92],
+					"cubes": [
+						{"origin": [-2.5, 4.49996, -3.92], "size": [1, 2, 0], "uv": [33, 4]}
+					]
+				},
+				{
+					"name": "feet",
+					"parent": "body",
+					"pivot": [0, 1, 1]
+				},
+				{
+					"name": "foot_left",
+					"parent": "feet",
+					"pivot": [1.5, 1, 1],
+					"cubes": [
+						{"origin": [0.5, 0, 0], "size": [2, 1, 2], "uv": [0, 3]}
+					]
+				},
+				{
+					"name": "locator_foot_secondary",
+					"parent": "foot_left",
+					"pivot": [1.525, 0.5, 0],
+					"rotation": [90, 0, 0],
+					"locators": {
+						"foot_secondary": [1.525, 0.5, 0]
+					}
+				},
+				{
+					"name": "toes_left",
+					"parent": "foot_left",
+					"pivot": [1.5, 0, 0],
+					"cubes": [
+						{"origin": [0.5, 0, -2], "size": [2, 1, 2], "uv": [24, 3]}
+					]
+				},
+				{
+					"name": "foot_right",
+					"parent": "feet",
+					"pivot": [-1.5, 1, 1],
+					"cubes": [
+						{"origin": [-2.5, 0, 0], "size": [2, 1, 2], "uv": [0, 0]}
+					]
+				},
+				{
+					"name": "locator_foot_primary",
+					"parent": "foot_right",
+					"pivot": [-1.525, 0.5, 0],
+					"rotation": [90, 0, 0],
+					"locators": {
+						"foot_primary": [-1.525, 0.5, 0]
+					}
+				},
+				{
+					"name": "toes_right",
+					"parent": "foot_right",
+					"pivot": [-1.5, 0, 0],
+					"cubes": [
+						{"origin": [-2.5, 0, -2], "size": [2, 1, 2], "uv": [24, 0]}
+					]
+				}
+			]
+		}
+	]
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0183_marill/marill.json

@@ -0,0 +1,42 @@
+{
+  "portraitScale": 2.02,
+  "portraitTranslation": [-0.5, -0.58, 0],
+  "profileScale": 0.81,
+  "profileTranslation": [0.0, 0.5, 0.0],
+  "rootBone": "marill",
+  "animations": {},
+  "poses": {
+    "standing": {
+      "poseName": "standing",
+      "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
+      "animations": ["q.look('head_ai')", "q.bedrock('marill', 'ground_idle')"],
+      "quirks": ["q.bedrock_quirk('marill', 'blink')"]
+    },
+    "walking": {
+      "poseName": "walking",
+      "poseTypes": ["WALK"],
+      "animations": [
+        "q.look('head_ai')",
+        "q.biped_walk(0.66, 0.6, 'leg_left', 'leg_right')",
+        "q.bedrock('marill', 'ground_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('marill', 'blink')"]
+    },
+    "swimming": {
+      "poseName": "swimming",
+      "poseTypes": ["SWIM", "FLOAT"],
+      "animations": [
+        "q.look('head_ai')",
+        "q.bedrock('marill', 'water_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('marill', 'blink')"]
+    },
+    "sleep": {
+      "poseName": "sleep",
+      "poseTypes": ["SLEEP"],
+      "animations": [
+        "q.bedrock('marill', 'sleep')"
+      ]
+    }
+  }
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0184_azumarill/azumarill.json

@@ -0,0 +1,42 @@
+{
+  "portraitScale": 1.92,
+  "portraitTranslation": [-0.41, -0.11, 0],
+  "profileScale": 0.79,
+  "profileTranslation": [0.0, 0.54, 0.0],
+  "rootBone": "azumarill",
+  "animations": {},
+  "poses": {
+    "standing": {
+      "poseName": "standing",
+      "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
+      "animations": ["q.look('head_ai')", "q.bedrock('azumarill', 'ground_idle')"],
+      "quirks": ["q.bedrock_quirk('azumarill', 'blink')"]
+    },
+    "walking": {
+      "poseName": "walking",
+      "poseTypes": ["WALK"],
+      "animations": [
+        "q.look('head_ai')",
+        "q.biped_walk(0.66, 0.6, 'leg_left', 'leg_right')",
+        "q.bedrock('azumarill', 'ground_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('azumarill', 'blink')"]
+    },
+    "swimming": {
+      "poseName": "swimming",
+      "poseTypes": ["SWIM", "FLOAT"],
+      "animations": [
+        "q.look('head_ai')",
+        "q.bedrock('azumarill', 'water_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('azumarill', 'blink')"]
+    },
+    "sleep": {
+      "poseName": "sleep",
+      "poseTypes": ["SLEEP"],
+      "animations": [
+        "q.bedrock('azumarill', 'sleep')"
+      ]
+    }
+  }
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0298_azurill/azurill.json

@@ -0,0 +1,50 @@
+{
+  "portraitScale": 2.41,
+  "portraitTranslation": [-0.23, -0.63, 0],
+  "profileScale": 0.89,
+  "profileTranslation": [0.0, 0.39, 0.0],
+  "rootBone": "azurill",
+  "animations": {},
+  "poses": {
+    "battle-standing": {
+      "poseName": "standing",
+      "poseTypes": ["STAND", "PORTRAIT", "PROFILE"],
+      "isBattle": true,
+      "animations": ["q.look('head_ai')", "q.bedrock('azurill', 'battle_idle')"],
+      "quirks": ["q.bedrock_quirk('azurill', 'blink')"]
+    },
+    "standing": {
+      "poseName": "standing",
+      "poseTypes": ["STAND", "NONE"],
+      "isBattle": false,
+      "animations": ["q.look('head_ai')", "q.bedrock('azurill', 'ground_idle')"],
+      "quirks": ["q.bedrock_quirk('azurill', 'blink')"]
+    },
+    "walking": {
+      "poseName": "walking",
+      "poseTypes": ["WALK"],
+      "animations": [
+        "q.look('head_ai')",
+        "q.biped_walk(0.66, 0.6, 'leg_left', 'leg_right')",
+        "q.bedrock('azurill', 'ground_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('azurill', 'blink')"]
+    },
+    "swimming": {
+      "poseName": "swimming",
+      "poseTypes": ["SWIM", "FLOAT"],
+      "animations": [
+        "q.look('head_ai')",
+        "q.bedrock('azurill', 'water_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('azurill', 'blink')"]
+    },
+    "sleep": {
+      "poseName": "sleep",
+      "poseTypes": ["SLEEP"],
+      "animations": [
+        "q.bedrock('azurill', 'sleep')"
+      ]
+    }
+  }
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0912_quaxly/quaxly.json

@@ -18,67 +18,63 @@
     "faint": "q.bedrock_primary('quaxly', 'faint', q.curve('one'))"
   },
   "poses": {
-    "sleep": {
+    "battle_idle": {
       "isTouchingWater": "false",
       "isUnderWater": "false",
+      "isBattle": "true",
       "poseTypes": [
-        "SLEEP"
+        "STAND"
       ],
       "animations": [
-        "q.bedrock('quaxly', 'sleep')"
+        "q.look('head')",
+        "q.bedrock('quaxly', 'battle_idle')"
       ],
-      "transformedParts": [
-        {
-          "part": "wing_right_closed",
-          "isVisible": false
-        },
-                {
-          "part": "wing_left_closed",
-          "isVisible": false
-        }
+      "transformTicks": 10,
+      "quirks": [
+        "q.bedrock_quirk('quaxly', 'blink')"
       ]
     },
-    "surface_sleep": {
+    "surface_battle_idle": {
       "isTouchingWater": "true",
       "isUnderWater": "false",
+      "isBattle": "true",
       "poseTypes": [
-        "SLEEP"
+        "STAND","FLOAT"
       ],
       "animations": [
-        "q.bedrock('quaxly', 'surfacewater_sleep')"
+        "q.look('head')",
+        "q.bedrock('quaxly', 'surfacewater_battle_idle')"
       ],
-      "transformedParts": [
-        {
-          "part": "wing_right_closed",
-          "isVisible": false
-        },
-                {
-          "part": "wing_left_closed",
-          "isVisible": false
-        }
+      "transformTicks": 10,
+      "quirks": [
+        "q.bedrock_quirk('quaxly', 'blink')"
       ]
     },
-    "water_sleep": {
+    "water_battle_idle": {
       "isTouchingWater": "true",
       "isUnderWater": "true",
+      "isBattle": "true",
       "poseTypes": [
-        "SLEEP"
+        "STAND","FLOAT"
       ],
       "animations": [
-        "q.bedrock('quaxly', 'water_sleep')"
+        "q.look('head')",
+        "q.bedrock('quaxly', 'water_battle_idle')"
+      ],
+      "transformTicks": 10,
+      "quirks": [
+        "q.bedrock_quirk('quaxly', 'blink')"
       ],
       "transformedParts": [
         {
-          "part": "wing_right_closed",
-          "isVisible": false
-        },
-                {
-          "part": "wing_left_closed",
-          "isVisible": false
+          "part": "body",
+          "position": [0, -10, 0]
         }
       ]
     },
     "standing": {
+      "isTouchingWater": "false",
+      "isBattle": "false",
       "poseTypes": [
         "PROFILE",
         "PORTRAIT",
@@ -89,23 +85,13 @@
         "q.look('head')",
         "q.bedrock('quaxly', 'ground_idle')"
       ],
-      "transformedParts": [
-        {
-          "part": "wing_right_closed",
-          "isVisible": false
-        },
-                {
-          "part": "wing_left",
-          "isVisible": false
-        }
-      ],
       "transformTicks": 10,
       "quirks": [
         "q.bedrock_quirk('quaxly', 'blink')"
       ]
     },
     "walk": {
-      "poseName": "walk",
+      "isTouchingWater": "false",
       "poseTypes": [
         "WALK"
       ],
@@ -113,22 +99,56 @@
         "q.look('head')",
         "q.bedrock('quaxly', 'ground_walk')"
       ],
-      "transformedParts": [
-        {
-          "part": "wing_right",
-          "isVisible": false
-        },
-                {
-          "part": "wing_left",
-          "isVisible": false
-        }
-      ],
       "transformTicks": 10,
       "quirks": [
         "q.bedrock_quirk('quaxly', 'blink')"
       ]
     },
+    "surface_idle": {
+      "isTouchingWater": "true",
+      "isUnderWater": "false",
+      "isBattle": "false",
+      "poseTypes": [
+        "STAND","FLOAT"
+      ],
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('quaxly', 'surfacewater_idle')"
+      ],
+      "quirks": [
+        "q.bedrock_quirk('quaxly', 'blink')"
+      ],
+      "transformedParts": [
+        {
+          "part": "body",
+          "position": [0, -10, 0]
+        }
+      ]
+    },
+    "surface_swim": {
+      "isTouchingWater": "true",
+      "isUnderWater": "false",
+      "poseTypes": [
+        "WALK","SWIM"
+      ],
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('quaxly', 'surfacewater_swim')"
+      ],
+      "quirks": [
+        "q.bedrock_quirk('quaxly', 'blink')"
+      ],
+      "transformedParts": [
+        {
+          "part": "body",
+          "position": [0, -10, 0]
+        }
+      ]
+    },
     "float": {
+      "isTouchingWater": "true",
+      "isUnderWater": "true",
+      "isBattle": "false",
       "poseTypes": [
         "FLOAT"
       ],
@@ -136,16 +156,6 @@
         "q.look('head')",
         "q.bedrock('quaxly', 'water_idle')"
       ],
-      "transformedParts": [
-        {
-          "part": "wing_right_closed",
-          "isVisible": false
-        },
-                {
-          "part": "wing_left_closed",
-          "isVisible": false
-        }
-      ],
       "transformTicks": 10,
       "quirks": [
         "q.bedrock_quirk('quaxly', 'blink')"
@@ -161,145 +171,39 @@
         "q.look('head')",
         "q.bedrock('quaxly', 'water_swim')"
       ],
-      "transformedParts": [
-        {
-          "part": "wing_right_closed",
-          "isVisible": false
-        },
-                {
-          "part": "wing_left_closed",
-          "isVisible": false
-        }
-      ],
       "transformTicks": 10,
       "quirks": [
         "q.bedrock_quirk('quaxly', 'blink')"
       ]
     },
-    "battle_idle": {
+    "sleep": {
       "isTouchingWater": "false",
       "isUnderWater": "false",
-      "isBattle": "true",
       "poseTypes": [
-        "STAND"
+        "SLEEP"
       ],
       "animations": [
-        "q.look('head')",
-        "q.bedrock('quaxly', 'battle_idle')"
-      ],
-      "transformedParts": [
-        {
-          "part": "wing_right",
-          "isVisible": false
-        },
-                {
-          "part": "wing_left",
-          "isVisible": false
-        }
-      ],
-      "transformTicks": 10,
-      "quirks": [
-        "q.bedrock_quirk('quaxly', 'blink')"
+        "q.bedrock('quaxly', 'sleep')"
       ]
     },
-    "water_battle_idle": {
+    "surface_sleep": {
+      "isTouchingWater": "true",
+      "isUnderWater": "false",
+      "poseTypes": [
+        "SLEEP"
+      ],
+      "animations": [
+        "q.bedrock('quaxly', 'surfacewater_sleep')"
+      ]
+    },
+    "water_sleep": {
       "isTouchingWater": "true",
       "isUnderWater": "true",
-      "isBattle": "true",
       "poseTypes": [
-        "FLOAT"
+        "SLEEP"
       ],
       "animations": [
-        "q.look('head')",
-        "q.bedrock('quaxly', 'water_battle_idle')"
-      ],
-      "transformedParts": [
-        {
-          "part": "wing_right",
-          "isVisible": false
-        },
-                {
-          "part": "wing_left",
-          "isVisible": false
-        }
-      ],
-      "transformTicks": 10,
-      "quirks": [
-        "q.bedrock_quirk('quaxly', 'blink')"
-      ]
-    },
-    "surface_battle_idle": {
-      "isTouchingWater": "true",
-      "isUnderWater": "false",
-      "iBattle": "true",
-      "poseTypes": [
-        "FLOAT"
-      ],
-      "animations": [
-        "q.look('head')",
-        "q.bedrock('quaxly', 'surfacewater_battle_idle')"
-      ],
-      "transformedParts": [
-        {
-          "part": "wing_right_closed",
-          "isVisible": false
-        },
-                {
-          "part": "wing_left_closed",
-          "isVisible": false
-        }
-      ],
-      "transformTicks": 10,
-      "quirks": [
-        "q.bedrock_quirk('quaxly', 'blink')"
-      ]
-    },
-    "surface_idle": {
-      "isTouchingWater": "true",
-      "isUnderWater": "false",
-      "poseTypes": [
-        "FLOAT"
-      ],
-      "animations": [
-        "q.look('head')",
-        "q.bedrock('quaxly', 'surfacewater_idle')"
-      ],
-      "transformedParts": [
-        {
-          "part": "wing_right",
-          "isVisible": false
-        },
-                {
-          "part": "wing_left",
-          "isVisible": false
-        }
-      ],
-      "quirks": [
-        "q.bedrock_quirk('quaxly', 'blink')"
-      ]
-    },
-    "surface_swim": {
-      "isTouchingWater": "true",
-      "isUnderWater": "false",
-      "poseTypes": [
-        "SWIM"
-      ],
-      "animations": [
-        "q.look('head')",
-        "q.bedrock('quaxly', 'surfacewater_swim')"
-      ],
-      "transformedParts": [
-        {
-          "part": "wing_right",
-          "isVisible": false
-        },
-                {
-          "part": "wing_left",
-          "isVisible": false
-        }
-      ],
-      "quirks": [
-        "q.bedrock_quirk('quaxly', 'blink')"
+        "q.bedrock('quaxly', 'water_sleep')"
       ]
     }
   }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0183_marill/0_marill_base.json

@@ -0,0 +1,18 @@
+{
+    "species": "cobblemon:marill",
+    "order": 0,
+    "variations": [
+      {
+        "aspects": [],
+        "poser": "cobblemon:marill",
+        "model": "cobblemon:marill.geo",
+        "texture": "cobblemon:textures/pokemon/0183_marill/marill.png",
+        "layers": []
+      },
+      {
+        "aspects": ["shiny"],
+        "texture": "cobblemon:textures/pokemon/0183_marill/marill_shiny.png"
+      }
+    ]
+  }
+  

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0184_azumarill/0_azumarill_base.json

@@ -0,0 +1,18 @@
+{
+    "species": "cobblemon:azumarill",
+    "order": 0,
+    "variations": [
+      {
+        "aspects": [],
+        "poser": "cobblemon:azumarill",
+        "model": "cobblemon:azumarill.geo",
+        "texture": "cobblemon:textures/pokemon/0184_azumarill/azumarill.png",
+        "layers": []
+      },
+      {
+        "aspects": ["shiny"],
+        "texture": "cobblemon:textures/pokemon/0184_azumarill/azumarill_shiny.png"
+      }
+    ]
+  }
+  

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0298_azurill/0_azurill_base.json

@@ -0,0 +1,18 @@
+{
+    "species": "cobblemon:azurill",
+    "order": 0,
+    "variations": [
+      {
+        "aspects": [],
+        "poser": "cobblemon:azurill",
+        "model": "cobblemon:azurill.geo",
+        "texture": "cobblemon:textures/pokemon/0298_azurill/azurill.png",
+        "layers": []
+      },
+      {
+        "aspects": ["shiny"],
+        "texture": "cobblemon:textures/pokemon/0298_azurill/azurill_shiny.png"
+      }
+    ]
+  }
+  

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0631_heatmor/0_heatmor_base.json

@@ -23,7 +23,7 @@
         {
           "name": "emissive",
           "emissive": true,
-          "texture": "cobblemon:textures/pokemon/0631_heatmor/heatmor_emissive_shiny.png",
+          "texture": "cobblemon:textures/pokemon/0631_heatmor/heatmor_shiny_emissive.png",
           "translucent": true
         }
       ]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0931_squawkabilly/0_squawkabilly_base.json

@@ -55,7 +55,6 @@
     },
     {
       "aspects": [
-        "squawkabilly-color-green",
         "shiny"
       ],
       "texture": "cobblemon:textures/pokemon/0931_squawkabilly/squawkabilly_green_shiny.png",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0982_dudunsparce/0_dudunsparce_base.json

@@ -3,14 +3,14 @@
   "order": 0,
   "variations": [
     {
-      "aspects": ["two-segment-form"],
+      "aspects": [],
       "poser": "cobblemon:dudunsparce_two_segment",
       "model": "cobblemon:dudunsparce_two_segment.geo",
       "texture": "cobblemon:textures/pokemon/0982_dudunsparce/dudunsparce_two_segment.png",
       "layers": []
     },
     {
-      "aspects": ["two-segment-form","shiny"],
+      "aspects": ["shiny"],
       "texture": "cobblemon:textures/pokemon/0982_dudunsparce/dudunsparce_two_segment_shiny.png"
     },
     {

common/src/main/resources/assets/cobblemon/models/item/pokemon_model.json

@@ -1,4 +1,4 @@
 {
   "parent": "minecraft:builtin/entity",
-  "gui_light": "side"
+  "gui_light": "front"
 }

common/src/main/resources/data/cobblemon/species/generation1/abra.json

@@ -184,7 +184,34 @@
     "tutor:thunderpunch",
     "tutor:trick",
     "tutor:wonderroom",
-    "tutor:zenheadbutt"
+    "tutor:zenheadbutt",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:counter",
+    "legacy:curse",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:nightmare",
+    "legacy:psywave",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:takedown",
+    "legacy:toxic",
+    "legacy:zapcannon"
   ],
   "evolutions": [
     {

common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json

@@ -303,7 +303,6 @@
     "tutor:laserfocus",
     "tutor:meteorbeam",
     "tutor:ominouswind",
-    "tutor:psychic",
     "tutor:rest",
     "tutor:rockslide",
     "tutor:rocksmash",
@@ -315,7 +314,30 @@
     "tutor:swift",
     "tutor:tailwind",
     "tutor:thunderfang",
-    "tutor:twister"
+    "tutor:twister",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:detect",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:dragonrage",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:razorwind",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:rockthrow",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:toxic",
+    "special:celebrate"
   ],
   "evolutions": [],
   "forms": [

common/src/main/resources/data/cobblemon/species/generation1/alakazam.json

@@ -203,7 +203,36 @@
     "tutor:thunderpunch",
     "tutor:trick",
     "tutor:wonderroom",
-    "tutor:zenheadbutt"
+    "tutor:zenheadbutt",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:counter",
+    "legacy:curse",
+    "legacy:dig",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:nightmare",
+    "legacy:nightshade",
+    "legacy:psywave",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:takedown",
+    "legacy:toxic",
+    "legacy:zapcannon"
   ],
   "preEvolution": "kadabra",
   "evolutions": [],

common/src/main/resources/data/cobblemon/species/generation1/arbok.json

@@ -171,7 +171,6 @@
     "tm:venoshock",
     "tutor:aquatail",
     "tutor:bind",
-    "tutor:bulldoze",
     "tutor:darkpulse",
     "tutor:firefang",
     "tutor:gastroacid",
@@ -187,7 +186,6 @@
     "tutor:mudslap",
     "tutor:painsplit",
     "tutor:poisonjab",
-    "tutor:psychic",
     "tutor:rest",
     "tutor:rockslide",
     "tutor:scaleshot",
@@ -197,12 +195,31 @@
     "tutor:sludgebomb",
     "tutor:snarl",
     "tutor:snatch",
-    "tutor:spikes",
     "tutor:spite",
     "tutor:stompingtantrum",
     "tutor:suckerpunch",
     "tutor:throatchop",
-    "tutor:thunderfang"
+    "tutor:thunderfang",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:doubleteam",
+    "legacy:fissure",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:megadrain",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:swagger",
+    "special:refresh"
   ],
   "preEvolution": "ekans",
   "evolutions": []

common/src/main/resources/data/cobblemon/species/generation1/arcanine.json

@@ -157,7 +157,6 @@
     "tm:thunderfang",
     "tm:wildcharge",
     "tm:willowisp",
-    "tutor:aerialace",
     "tutor:bulldoze",
     "tutor:covet",
     "tutor:dragonpulse",
@@ -173,7 +172,6 @@
     "tutor:laserfocus",
     "tutor:outrage",
     "tutor:playrough",
-    "tutor:psychic",
     "tutor:rest",
     "tutor:rocksmash",
     "tutor:scorchingsands",
@@ -181,7 +179,30 @@
     "tutor:snarl",
     "tutor:swift",
     "tutor:thunderfang",
-    "tutor:wildcharge"
+    "tutor:wildcharge",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:doubleteam",
+    "legacy:dragonbreath",
+    "legacy:dragonrage",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:mudslap",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:superpower",
+    "legacy:swagger",
+    "legacy:teleport",
+    "legacy:toxic"
   ],
   "preEvolution": "growlithe",
   "evolutions": [],
@@ -314,7 +335,6 @@
         "tutor:ironhead",
         "tutor:irontail",
         "tutor:outrage",
-        "tutor:psychic",
         "tutor:rest",
         "tutor:rockslide",
         "tutor:rocksmash",

common/src/main/resources/data/cobblemon/species/generation1/articuno.json

@@ -154,6 +154,7 @@
     "tutor:defog",
     "tutor:dualwingbeat",
     "tutor:gigaimpact",
+    "tutor:healbell",
     "tutor:helpinghand",
     "tutor:hyperbeam",
     "tutor:icebeam",
@@ -170,7 +171,34 @@
     "tutor:tailwind",
     "tutor:tripleaxel",
     "tutor:twister",
-    "tutor:waterpulse"
+    "tutor:waterpulse",
+    "legacy:bide",
+    "legacy:bubblebeam",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:detect",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:headbutt",
+    "legacy:hiddenpower",
+    "legacy:leer",
+    "legacy:mimic",
+    "legacy:mirrorcoat",
+    "legacy:mudslap",
+    "legacy:naturalgift",
+    "legacy:peck",
+    "legacy:rage",
+    "legacy:razorwind",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:toxic",
+    "legacy:watergun",
+    "legacy:whirlwind",
+    "special:extrasensory",
+    "special:healbell"
   ],
   "evolutions": [],
   "forms": [
@@ -313,7 +341,9 @@
         "tutor:sleeptalk",
         "tutor:swift",
         "tutor:tailwind",
-        "tutor:trick"
+        "tutor:trick",
+        "legacy:round",
+        "legacy:snore"
       ],
       "evolutions": [],
       "battleOnly": false,

common/src/main/resources/data/cobblemon/species/generation1/beedrill.json

@@ -179,11 +179,36 @@
     "tutor:skittersmack",
     "tutor:sleeptalk",
     "tutor:sludgebomb",
-    "tutor:spikes",
     "tutor:stringshot",
     "tutor:tailwind",
     "tutor:throatchop",
-    "tutor:xscissor"
+    "tutor:xscissor",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:headbutt",
+    "legacy:hiddenpower",
+    "legacy:megadrain",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:outrage",
+    "legacy:peck",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:sweetscent",
+    "legacy:swift",
+    "legacy:takedown",
+    "legacy:toxic"
   ],
   "preEvolution": "kakuna",
   "evolutions": [],

common/src/main/resources/data/cobblemon/species/generation1/bellsprout.json

@@ -157,7 +157,27 @@
     "tutor:sludgebomb",
     "tutor:suckerpunch",
     "tutor:synthesis",
-    "tutor:worryseed"
+    "tutor:worryseed",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:headbutt",
+    "legacy:hiddenpower",
+    "legacy:megadrain",
+    "legacy:mimic",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:takedown",
+    "special:teeterdance"
   ],
   "evolutions": [
     {

common/src/main/resources/data/cobblemon/species/generation1/blastoise.json

@@ -179,9 +179,9 @@
     "tm:workup",
     "tm:zenheadbutt",
     "tutor:aquatail",
+    "tutor:block",
     "tutor:darkpulse",
     "tutor:dive",
-    "tutor:dragonpulse",
     "tutor:flashcannon",
     "tutor:flipturn",
     "tutor:focuspunch",
@@ -196,7 +196,6 @@
     "tutor:irontail",
     "tutor:liquidation",
     "tutor:rest",
-    "tutor:rockslide",
     "tutor:rocksmash",
     "tutor:rollout",
     "tutor:signalbeam",
@@ -204,7 +203,44 @@
     "tutor:terrainpulse",
     "tutor:waterpledge",
     "tutor:waterpulse",
-    "tutor:zenheadbutt"
+    "tutor:zenheadbutt",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:bubblebeam",
+    "legacy:bulldoze",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:confusion",
+    "legacy:counter",
+    "legacy:curse",
+    "legacy:defensecurl",
+    "legacy:doubleteam",
+    "legacy:dragontail",
+    "legacy:dynamicpunch",
+    "legacy:falseswipe",
+    "legacy:fissure",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:mudslap",
+    "legacy:naturalgift",
+    "legacy:outrage",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:scald",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:toxic",
+    "legacy:waterfall",
+    "special:block",
+    "special:celebrate",
+    "special:followme",
+    "special:hydrocannon"
   ],
   "preEvolution": "wartortle",
   "evolutions": [],

common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json

@@ -146,8 +146,10 @@
     "tm:workup",
     "tm:worryseed",
     "tutor:bind",
+    "tutor:block",
     "tutor:energyball",
     "tutor:falseswipe",
+    "tutor:frenzyplant",
     "tutor:furycutter",
     "tutor:gigadrain",
     "tutor:grasspledge",
@@ -162,7 +164,33 @@
     "tutor:sludgebomb",
     "tutor:stringshot",
     "tutor:synthesis",
-    "tutor:worryseed"
+    "tutor:worryseed",
+    "legacy:amnesia",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:defensecurl",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:lightscreen",
+    "legacy:megadrain",
+    "legacy:mimic",
+    "legacy:mudslap",
+    "legacy:naturalgift",
+    "legacy:outrage",
+    "legacy:rage",
+    "legacy:razorwind",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:snore",
+    "legacy:swagger",
+    "special:block",
+    "special:celebrate",
+    "special:frenzyplant"
   ],
   "evolutions": [
     {

common/src/main/resources/data/cobblemon/species/generation1/butterfree.json

@@ -174,7 +174,34 @@
     "tutor:stringshot",
     "tutor:swift",
     "tutor:tailwind",
-    "tutor:twister"
+    "tutor:twister",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:headbutt",
+    "legacy:hiddenpower",
+    "legacy:megadrain",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:nightmare",
+    "legacy:psywave",
+    "legacy:rage",
+    "legacy:razorwind",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:sweetscent",
+    "legacy:takedown",
+    "legacy:teleport",
+    "legacy:toxic",
+    "special:morningsun"
   ],
   "preEvolution": "metapod",
   "evolutions": [],

common/src/main/resources/data/cobblemon/species/generation1/caterpie.json

@@ -85,7 +85,8 @@
     "tm:terablast",
     "tutor:bugbite",
     "tutor:electroweb",
-    "tutor:stringshot"
+    "tutor:stringshot",
+    "legacy:snore"
   ],
   "evolutions": [
     {

common/src/main/resources/data/cobblemon/species/generation1/chansey.json

@@ -206,10 +206,7 @@
     "tutor:calmmind",
     "tutor:covet",
     "tutor:dazzlinggleam",
-    "tutor:drainpunch",
-    "tutor:endeavor",
     "tutor:firepunch",
-    "tutor:flamethrower",
     "tutor:gigaimpact",
     "tutor:gravity",
     "tutor:healbell",
@@ -239,9 +236,41 @@
     "tutor:telekinesis",
     "tutor:thunderbolt",
     "tutor:thunderpunch",
-    "tutor:waterpulse",
     "tutor:wildcharge",
-    "tutor:zenheadbutt"
+    "tutor:zenheadbutt",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:bubblebeam",
+    "legacy:captivate",
+    "legacy:celebrate",
+    "legacy:chargebeam",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:focuspunch",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:mudslap",
+    "legacy:psychup",
+    "legacy:psywave",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:teleport",
+    "legacy:toxic",
+    "legacy:uproar",
+    "legacy:watergun",
+    "legacy:zapcannon",
+    "special:sweetscent",
+    "special:wish"
   ],
   "preEvolution": "happiny",
   "evolutions": [

common/src/main/resources/data/cobblemon/species/generation1/charizard.json

@@ -329,10 +329,9 @@
     "tm:weatherball",
     "tm:willowisp",
     "tm:workup",
-    "tutor:aerialace",
-    "tutor:aircutter",
     "tutor:ancientpower",
     "tutor:blastburn",
+    "tutor:block",
     "tutor:bulldoze",
     "tutor:dragonpulse",
     "tutor:firefang",
@@ -358,7 +357,45 @@
     "tutor:sleeptalk",
     "tutor:swift",
     "tutor:thunderpunch",
-    "tutor:twister"
+    "tutor:twister",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:defensecurl",
+    "legacy:defog",
+    "legacy:doubleteam",
+    "legacy:dualwingbeat",
+    "legacy:dynamicpunch",
+    "legacy:falseswipe",
+    "legacy:fissure",
+    "legacy:frustration",
+    "legacy:furyswipes",
+    "legacy:hiddenpower",
+    "legacy:leer",
+    "legacy:mimic",
+    "legacy:mudslap",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:scaleshot",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:tailwind",
+    "legacy:toxic",
+    "special:blastburn",
+    "special:block",
+    "special:celebrate",
+    "special:holdhands",
+    "special:howl",
+    "special:quickattack"
   ],
   "preEvolution": "charmeleon",
   "evolutions": [],

common/src/main/resources/data/cobblemon/species/generation1/charmander.json

@@ -164,6 +164,8 @@
     "tm:willowisp",
     "tm:workup",
     "tutor:ancientpower",
+    "tutor:blastburn",
+    "tutor:block",
     "tutor:dragonpulse",
     "tutor:falseswipe",
     "tutor:firefang",
@@ -182,7 +184,42 @@
     "tutor:shadowclaw",
     "tutor:sleeptalk",
     "tutor:swift",
-    "tutor:thunderpunch"
+    "tutor:thunderpunch",
+    "legacy:acrobatics",
+    "legacy:aerialace",
+    "legacy:aircutter",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:defensecurl",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:frustration",
+    "legacy:furyswipes",
+    "legacy:hiddenpower",
+    "legacy:leer",
+    "legacy:mimic",
+    "legacy:mudslap",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:toxic",
+    "special:blastburn",
+    "special:block",
+    "special:celebrate",
+    "special:howl",
+    "special:quickattack"
   ],
   "evolutions": [
     {

common/src/main/resources/data/cobblemon/species/generation1/charmeleon.json

@@ -161,6 +161,8 @@
     "tm:willowisp",
     "tm:workup",
     "tutor:ancientpower",
+    "tutor:blastburn",
+    "tutor:block",
     "tutor:dragonpulse",
     "tutor:falseswipe",
     "tutor:firefang",
@@ -179,7 +181,42 @@
     "tutor:shadowclaw",
     "tutor:sleeptalk",
     "tutor:swift",
-    "tutor:thunderpunch"
+    "tutor:thunderpunch",
+    "legacy:acrobatics",
+    "legacy:aerialace",
+    "legacy:aircutter",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:defensecurl",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:frustration",
+    "legacy:furyswipes",
+    "legacy:hiddenpower",
+    "legacy:leer",
+    "legacy:mimic",
+    "legacy:mudslap",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:toxic",
+    "special:blastburn",
+    "special:block",
+    "special:celebrate",
+    "special:howl",
+    "special:quickattack"
   ],
   "preEvolution": "charmander",
   "evolutions": [

common/src/main/resources/data/cobblemon/species/generation1/clefable.json

@@ -270,7 +270,38 @@
     "tutor:uproar",
     "tutor:waterpulse",
     "tutor:wonderroom",
-    "tutor:zenheadbutt"
+    "tutor:zenheadbutt",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:bubblebeam",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:counter",
+    "legacy:curse",
+    "legacy:defensecurl",
+    "legacy:detect",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mudslap",
+    "legacy:naturalgift",
+    "legacy:nightmare",
+    "legacy:psywave",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:softboiled",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:teleport",
+    "legacy:toxic",
+    "legacy:watergun",
+    "legacy:zapcannon"
   ],
   "preEvolution": "clefairy",
   "evolutions": []

common/src/main/resources/data/cobblemon/species/generation1/clefairy.json

@@ -262,7 +262,38 @@
     "tutor:uproar",
     "tutor:waterpulse",
     "tutor:wonderroom",
-    "tutor:zenheadbutt"
+    "tutor:zenheadbutt",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:bubblebeam",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:counter",
+    "legacy:curse",
+    "legacy:defensecurl",
+    "legacy:detect",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mudslap",
+    "legacy:naturalgift",
+    "legacy:nightmare",
+    "legacy:psywave",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:softboiled",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:teleport",
+    "legacy:toxic",
+    "legacy:watergun",
+    "legacy:zapcannon"
   ],
   "preEvolution": "cleffa",
   "evolutions": [

common/src/main/resources/data/cobblemon/species/generation1/cloyster.json

@@ -172,7 +172,29 @@
     "tutor:spikes",
     "tutor:steelroller",
     "tutor:swift",
-    "tutor:waterpulse"
+    "tutor:waterpulse",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:headbutt",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:teleport",
+    "legacy:toxic",
+    "special:refresh"
   ],
   "preEvolution": "shellder",
   "evolutions": []

common/src/main/resources/data/cobblemon/species/generation1/cubone.json

@@ -181,7 +181,30 @@
     "tutor:stompingtantrum",
     "tutor:swift",
     "tutor:thunderpunch",
-    "tutor:uproar"
+    "tutor:uproar",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:bubblebeam",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:counter",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:fissure",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:takedown",
+    "legacy:toxic",
+    "legacy:watergun"
   ],
   "evolutions": [
     {

common/src/main/resources/data/cobblemon/species/generation1/dewgong.json

@@ -185,7 +185,27 @@
     "tutor:sleeptalk",
     "tutor:tripleaxel",
     "tutor:uproar",
-    "tutor:waterpulse"
+    "tutor:waterpulse",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:megahorn",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:peck",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:strength",
+    "legacy:swagger",
+    "legacy:toxic"
   ],
   "preEvolution": "seel",
   "evolutions": [],

common/src/main/resources/data/cobblemon/species/generation1/diglett.json

@@ -180,7 +180,25 @@
     "tutor:stoneedge",
     "tutor:suckerpunch",
     "tutor:throatchop",
-    "tutor:uproar"
+    "tutor:uproar",
+    "legacy:aerialace",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:furyswipes",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:toxic"
   ],
   "evolutions": [
     {
@@ -327,7 +345,22 @@
         "tutor:steelbeam",
         "tutor:stompingtantrum",
         "tutor:stoneedge",
-        "tutor:suckerpunch"
+        "tutor:suckerpunch",
+        "legacy:aerialace",
+        "legacy:attract",
+        "legacy:confide",
+        "legacy:doubleteam",
+        "legacy:frustration",
+        "legacy:furyswipes",
+        "legacy:hiddenpower",
+        "legacy:return",
+        "legacy:round",
+        "legacy:scratch",
+        "legacy:slash",
+        "legacy:snore",
+        "legacy:swagger",
+        "legacy:toxic",
+        "legacy:uproar"
       ],
       "evolutions": [
         {

common/src/main/resources/data/cobblemon/species/generation1/dodrio.json

@@ -178,7 +178,27 @@
     "tutor:swift",
     "tutor:tailwind",
     "tutor:throatchop",
-    "tutor:uproar"
+    "tutor:uproar",
+    "legacy:aircutter",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:haze",
+    "legacy:headbutt",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:toxic"
   ],
   "preEvolution": "doduo",
   "evolutions": [],

common/src/main/resources/data/cobblemon/species/generation1/doduo.json

@@ -160,7 +160,28 @@
     "tutor:swift",
     "tutor:tailwind",
     "tutor:throatchop",
-    "tutor:uproar"
+    "tutor:uproar",
+    "legacy:aircutter",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:doubleteam",
+    "legacy:fly",
+    "legacy:frustration",
+    "legacy:haze",
+    "legacy:headbutt",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:toxic"
   ],
   "evolutions": [
     {

common/src/main/resources/data/cobblemon/species/generation1/dragonair.json

@@ -179,7 +179,33 @@
     "tutor:swift",
     "tutor:thunderbolt",
     "tutor:twister",
-    "tutor:waterpulse"
+    "tutor:waterpulse",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:bubblebeam",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:detect",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:horndrill",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:toxic",
+    "legacy:watergun",
+    "legacy:whirlpool",
+    "legacy:zapcannon"
   ],
   "preEvolution": "dratini",
   "evolutions": [

common/src/main/resources/data/cobblemon/species/generation1/dragonite.json

@@ -354,6 +354,7 @@
     "tutor:focuspunch",
     "tutor:furycutter",
     "tutor:gigaimpact",
+    "tutor:healbell",
     "tutor:heatwave",
     "tutor:helpinghand",
     "tutor:hyperbeam",
@@ -380,7 +381,39 @@
     "tutor:thunderbolt",
     "tutor:thunderpunch",
     "tutor:twister",
-    "tutor:waterpulse"
+    "tutor:waterpulse",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:bubblebeam",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:detect",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:dualwingbeat",
+    "legacy:dynamicpunch",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:horndrill",
+    "legacy:mimic",
+    "legacy:mudslap",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:razorwind",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:toxic",
+    "legacy:watergun",
+    "legacy:whirlpool",
+    "legacy:zapcannon",
+    "special:barrier",
+    "special:healbell"
   ],
   "preEvolution": "dragonair",
   "evolutions": []

common/src/main/resources/data/cobblemon/species/generation1/dratini.json

@@ -176,7 +176,32 @@
     "tutor:swift",
     "tutor:thunderbolt",
     "tutor:twister",
-    "tutor:waterpulse"
+    "tutor:waterpulse",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:bubblebeam",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:detect",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:toxic",
+    "legacy:watergun",
+    "legacy:whirlpool",
+    "legacy:zapcannon"
   ],
   "evolutions": [
     {

common/src/main/resources/data/cobblemon/species/generation1/drowzee.json

@@ -206,7 +206,31 @@
     "tutor:telekinesis",
     "tutor:thunderpunch",
     "tutor:trick",
-    "tutor:zenheadbutt"
+    "tutor:zenheadbutt",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:counter",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:nightmare",
+    "legacy:psywave",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:teleport",
+    "legacy:zapcannon",
+    "special:bellydrum",
+    "special:wish"
   ],
   "evolutions": [
     {

common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json

@@ -191,7 +191,27 @@
     "tutor:stoneedge",
     "tutor:suckerpunch",
     "tutor:throatchop",
-    "tutor:uproar"
+    "tutor:uproar",
+    "legacy:aerialace",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:furyswipes",
+    "legacy:hiddenpower",
+    "legacy:highhorsepower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:scaryface",
+    "legacy:secretpower",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:toxic"
   ],
   "preEvolution": "diglett",
   "evolutions": [],
@@ -350,7 +370,22 @@
         "tutor:stoneedge",
         "tutor:suckerpunch",
         "tutor:throatchop",
-        "tutor:uproar"
+        "tutor:uproar",
+        "legacy:aerialace",
+        "legacy:attract",
+        "legacy:confide",
+        "legacy:doubleteam",
+        "legacy:frustration",
+        "legacy:furyswipes",
+        "legacy:hiddenpower",
+        "legacy:highhorsepower",
+        "legacy:return",
+        "legacy:round",
+        "legacy:scratch",
+        "legacy:slash",
+        "legacy:snore",
+        "legacy:swagger",
+        "legacy:toxic"
       ],
       "preEvolution": "diglett alolan",
       "evolutions": [],

common/src/main/resources/data/cobblemon/species/generation1/eevee.json

@@ -146,7 +146,25 @@
     "tutor:rest",
     "tutor:shadowball",
     "tutor:sleeptalk",
-    "tutor:swift"
+    "tutor:swift",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:confide",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:toxic",
+    "special:celebrate",
+    "special:sing"
   ],
   "evolutions": [
     {

common/src/main/resources/data/cobblemon/species/generation1/ekans.json

@@ -164,7 +164,6 @@
     "tutor:leechlife",
     "tutor:mudslap",
     "tutor:poisonjab",
-    "tutor:psychic",
     "tutor:rest",
     "tutor:rockslide",
     "tutor:scaleshot",
@@ -174,9 +173,29 @@
     "tutor:sludgebomb",
     "tutor:snarl",
     "tutor:snatch",
-    "tutor:spikes",
     "tutor:spite",
-    "tutor:suckerpunch"
+    "tutor:suckerpunch",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:bodyslam",
+    "legacy:bulldoze",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:doubleteam",
+    "legacy:fissure",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:megadrain",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:swagger"
   ],
   "evolutions": [
     {

common/src/main/resources/data/cobblemon/species/generation1/electabuzz.json

@@ -189,7 +189,34 @@
     "tutor:thunderbolt",
     "tutor:thunderpunch",
     "tutor:uproar",
-    "tutor:wildcharge"
+    "tutor:wildcharge",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:counter",
+    "legacy:curse",
+    "legacy:detect",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:mudslap",
+    "legacy:naturalgift",
+    "legacy:psywave",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:teleport",
+    "legacy:toxic",
+    "legacy:zapcannon"
   ],
   "preEvolution": "elekid",
   "evolutions": [

common/src/main/resources/data/cobblemon/species/generation1/electrode.json

@@ -163,7 +163,26 @@
     "tutor:swift",
     "tutor:telekinesis",
     "tutor:thunderbolt",
-    "tutor:wildcharge"
+    "tutor:wildcharge",
+    "legacy:bide",
+    "legacy:confide",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:teleport",
+    "legacy:toxic",
+    "legacy:zapcannon",
+    "special:refresh"
   ],
   "preEvolution": "voltorb",
   "evolutions": [],

common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json

@@ -170,7 +170,33 @@
     "tutor:trick",
     "tutor:uproar",
     "tutor:worryseed",
-    "tutor:zenheadbutt"
+    "tutor:zenheadbutt",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:eggbomb",
+    "legacy:frustration",
+    "legacy:gravity",
+    "legacy:headbutt",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:nightmare",
+    "legacy:psywave",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:takedown",
+    "legacy:teleport",
+    "legacy:toxic",
+    "legacy:trickroom",
+    "special:sweetscent",
+    "special:wish"
   ],
   "evolutions": [
     {

common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json

@@ -191,7 +191,6 @@
     "tutor:gigadrain",
     "tutor:gigaimpact",
     "tutor:grassyglide",
-    "tutor:gravity",
     "tutor:helpinghand",
     "tutor:hyperbeam",
     "tutor:lowkick",
@@ -211,7 +210,30 @@
     "tutor:trick",
     "tutor:uproar",
     "tutor:worryseed",
-    "tutor:zenheadbutt"
+    "tutor:zenheadbutt",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:doubleteam",
+    "legacy:eggbomb",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:nightmare",
+    "legacy:powerwhip",
+    "legacy:psywave",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:teleport",
+    "legacy:toxic",
+    "special:refresh",
+    "special:sweetscent",
+    "special:wish"
   ],
   "preEvolution": "exeggcute",
   "evolutions": [],
@@ -372,7 +394,6 @@
         "tutor:gigadrain",
         "tutor:gigaimpact",
         "tutor:grassyglide",
-        "tutor:gravity",
         "tutor:helpinghand",
         "tutor:hyperbeam",
         "tutor:ironhead",
@@ -395,7 +416,30 @@
         "tutor:trick",
         "tutor:uproar",
         "tutor:worryseed",
-        "tutor:zenheadbutt"
+        "tutor:zenheadbutt",
+        "legacy:attract",
+        "legacy:bide",
+        "legacy:captivate",
+        "legacy:confide",
+        "legacy:doubleteam",
+        "legacy:eggbomb",
+        "legacy:frustration",
+        "legacy:headbutt",
+        "legacy:hiddenpower",
+        "legacy:mimic",
+        "legacy:nightmare",
+        "legacy:psywave",
+        "legacy:rage",
+        "legacy:return",
+        "legacy:round",
+        "legacy:secretpower",
+        "legacy:snore",
+        "legacy:swagger",
+        "legacy:teleport",
+        "legacy:toxic",
+        "special:celebrate",
+        "special:sweetscent",
+        "special:wish"
       ],
       "preEvolution": "exeggcute",
       "evolutions": [],

common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json

@@ -1,7 +1,7 @@
 {
   "implemented": true,
   "nationalPokedexNumber": 83,
-  "name": "Farfetch'd'",
+  "name": "Farfetch’d",
   "primaryType": "normal",
   "secondaryType": "flying",
   "maleRatio": 0.5,
@@ -204,7 +204,33 @@
     "tutor:tailwind",
     "tutor:throatchop",
     "tutor:twister",
-    "tutor:uproar"
+    "tutor:uproar",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:detect",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:razorleaf",
+    "legacy:razorwind",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:takedown",
+    "legacy:toxic",
+    "legacy:whirlwind",
+    "special:wish",
+    "special:yawn"
   ],
   "evolutions": [],
   "forms": [
@@ -331,7 +357,10 @@
         "tutor:skyattack",
         "tutor:sleeptalk",
         "tutor:superpower",
-        "tutor:throatchop"
+        "tutor:throatchop",
+        "legacy:attract",
+        "legacy:round",
+        "legacy:snore"
       ],
       "evolutions": [
         {

common/src/main/resources/data/cobblemon/species/generation1/fearow.json

@@ -164,7 +164,28 @@
     "tutor:tailwind",
     "tutor:throatchop",
     "tutor:twister",
-    "tutor:uproar"
+    "tutor:uproar",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:detect",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:headbutt",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:swift",
+    "legacy:toxic"
   ],
   "preEvolution": "spearow",
   "evolutions": [],

common/src/main/resources/data/cobblemon/species/generation1/flareon.json

@@ -187,7 +187,27 @@
     "tutor:shadowball",
     "tutor:sleeptalk",
     "tutor:superpower",
-    "tutor:swift"
+    "tutor:swift",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:confide",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:leer",
+    "legacy:mimic",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:toxic",
+    "legacy:zapcannon",
+    "special:celebrate",
+    "special:sing"
   ],
   "preEvolution": "eevee",
   "evolutions": []

common/src/main/resources/data/cobblemon/species/generation1/gastly.json

@@ -192,7 +192,28 @@
     "tutor:thunderbolt",
     "tutor:thunderpunch",
     "tutor:trick",
-    "tutor:wonderroom"
+    "tutor:wonderroom",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:headbutt",
+    "legacy:hiddenpower",
+    "legacy:knockoff",
+    "legacy:megadrain",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:poisongas",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:uproar",
+    "legacy:zapcannon"
   ],
   "evolutions": [
     {

common/src/main/resources/data/cobblemon/species/generation1/gengar.json

@@ -200,7 +200,6 @@
     "tutor:hyperbeam",
     "tutor:icepunch",
     "tutor:icywind",
-    "tutor:knockoff",
     "tutor:laserfocus",
     "tutor:ominouswind",
     "tutor:painsplit",
@@ -218,14 +217,39 @@
     "tutor:sleeptalk",
     "tutor:sludgebomb",
     "tutor:snatch",
-    "tutor:spikes",
     "tutor:spite",
     "tutor:suckerpunch",
     "tutor:telekinesis",
     "tutor:thunderbolt",
     "tutor:thunderpunch",
     "tutor:trick",
-    "tutor:wonderroom"
+    "tutor:wonderroom",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:counter",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:megadrain",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:poisongas",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:takedown",
+    "legacy:uproar",
+    "legacy:zapcannon"
   ],
   "preEvolution": "haunter",
   "evolutions": [],

common/src/main/resources/data/cobblemon/species/generation1/geodude.json

@@ -189,7 +189,28 @@
     "tutor:stoneedge",
     "tutor:suckerpunch",
     "tutor:superpower",
-    "tutor:thunderpunch"
+    "tutor:thunderpunch",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:counter",
+    "legacy:doubleteam",
+    "legacy:fissure",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:sandattack",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:toxic"
   ],
   "evolutions": [
     {
@@ -357,7 +378,21 @@
         "tutor:superpower",
         "tutor:thunderbolt",
         "tutor:thunderpunch",
-        "tutor:wildcharge"
+        "tutor:wildcharge",
+        "legacy:attract",
+        "legacy:bide",
+        "legacy:confide",
+        "legacy:doubleteam",
+        "legacy:frustration",
+        "legacy:headbutt",
+        "legacy:hiddenpower",
+        "legacy:return",
+        "legacy:round",
+        "legacy:seismictoss",
+        "legacy:snore",
+        "legacy:swagger",
+        "legacy:thundershock",
+        "legacy:toxic"
       ],
       "evolutions": [
         {

common/src/main/resources/data/cobblemon/species/generation1/gloom.json

@@ -149,7 +149,28 @@
     "tutor:sleeptalk",
     "tutor:sludgebomb",
     "tutor:synthesis",
-    "tutor:worryseed"
+    "tutor:worryseed",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:dazzlinggleam",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:drainpunch",
+    "legacy:fling",
+    "legacy:frustration",
+    "legacy:headbutt",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:takedown"
   ],
   "preEvolution": "oddish",
   "evolutions": [

common/src/main/resources/data/cobblemon/species/generation1/golbat.json

@@ -175,7 +175,29 @@
     "tutor:tailwind",
     "tutor:twister",
     "tutor:uproar",
-    "tutor:zenheadbutt"
+    "tutor:zenheadbutt",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:detect",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:headbutt",
+    "legacy:hiddenpower",
+    "legacy:megadrain",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:razorwind",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:takedown",
+    "legacy:toxic"
   ],
   "preEvolution": "zubat",
   "evolutions": [

common/src/main/resources/data/cobblemon/species/generation1/goldeen.json

@@ -162,7 +162,30 @@
     "tutor:sleeptalk",
     "tutor:swift",
     "tutor:throatchop",
-    "tutor:waterpulse"
+    "tutor:waterpulse",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:bubblebeam",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:headbutt",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:quickattack",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:takedown",
+    "legacy:toxic",
+    "legacy:watergun"
   ],
   "evolutions": [
     {

common/src/main/resources/data/cobblemon/species/generation1/golduck.json

@@ -228,7 +228,34 @@
     "tutor:waterpulse",
     "tutor:wonderroom",
     "tutor:worryseed",
-    "tutor:zenheadbutt"
+    "tutor:zenheadbutt",
+    "legacy:aerialace",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:bubblebeam",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:counter",
+    "legacy:curse",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:mudslap",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:scald",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:toxic",
+    "special:charm",
+    "special:mudsport"
   ],
   "preEvolution": "psyduck",
   "evolutions": []

common/src/main/resources/data/cobblemon/species/generation1/golem.json

@@ -207,7 +207,28 @@
     "tutor:stoneedge",
     "tutor:suckerpunch",
     "tutor:superpower",
-    "tutor:thunderpunch"
+    "tutor:thunderpunch",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:counter",
+    "legacy:doubleteam",
+    "legacy:fissure",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:sandattack",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:toxic"
   ],
   "preEvolution": "graveler",
   "evolutions": [],
@@ -382,7 +403,21 @@
         "tutor:superpower",
         "tutor:thunderbolt",
         "tutor:thunderpunch",
-        "tutor:wildcharge"
+        "tutor:wildcharge",
+        "legacy:attract",
+        "legacy:bide",
+        "legacy:confide",
+        "legacy:doubleteam",
+        "legacy:frustration",
+        "legacy:headbutt",
+        "legacy:hiddenpower",
+        "legacy:return",
+        "legacy:round",
+        "legacy:seismictoss",
+        "legacy:snore",
+        "legacy:swagger",
+        "legacy:thundershock",
+        "legacy:toxic"
       ],
       "preEvolution": "graveler alolan",
       "evolutions": [],

common/src/main/resources/data/cobblemon/species/generation1/graveler.json

@@ -198,7 +198,28 @@
     "tutor:stoneedge",
     "tutor:suckerpunch",
     "tutor:superpower",
-    "tutor:thunderpunch"
+    "tutor:thunderpunch",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:counter",
+    "legacy:doubleteam",
+    "legacy:fissure",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:sandattack",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:toxic"
   ],
   "preEvolution": "geodude",
   "evolutions": [
@@ -372,7 +393,21 @@
         "tutor:superpower",
         "tutor:thunderbolt",
         "tutor:thunderpunch",
-        "tutor:wildcharge"
+        "tutor:wildcharge",
+        "legacy:attract",
+        "legacy:bide",
+        "legacy:confide",
+        "legacy:doubleteam",
+        "legacy:frustration",
+        "legacy:headbutt",
+        "legacy:hiddenpower",
+        "legacy:return",
+        "legacy:round",
+        "legacy:seismictoss",
+        "legacy:snore",
+        "legacy:swagger",
+        "legacy:thundershock",
+        "legacy:toxic"
       ],
       "preEvolution": "geodude alolan",
       "evolutions": [

common/src/main/resources/data/cobblemon/species/generation1/grimer.json

@@ -183,7 +183,26 @@
     "tutor:sludgebomb",
     "tutor:thunderbolt",
     "tutor:thunderpunch",
-    "tutor:zenheadbutt"
+    "tutor:zenheadbutt",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:frustration",
+    "legacy:headbutt",
+    "legacy:hiddenpower",
+    "legacy:megadrain",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:zapcannon"
   ],
   "evolutions": [
     {
@@ -351,7 +370,18 @@
         "tutor:swift",
         "tutor:thunderbolt",
         "tutor:thunderpunch",
-        "tutor:zenheadbutt"
+        "tutor:zenheadbutt",
+        "legacy:attract",
+        "legacy:confide",
+        "legacy:doubleteam",
+        "legacy:frustration",
+        "legacy:headbutt",
+        "legacy:hiddenpower",
+        "legacy:megadrain",
+        "legacy:return",
+        "legacy:round",
+        "legacy:snore",
+        "legacy:swagger"
       ],
       "evolutions": [
         {

common/src/main/resources/data/cobblemon/species/generation1/growlithe.json

@@ -155,14 +155,35 @@
     "tutor:irontail",
     "tutor:outrage",
     "tutor:playrough",
-    "tutor:psychic",
     "tutor:rest",
     "tutor:rocksmash",
     "tutor:sleeptalk",
     "tutor:snarl",
     "tutor:swift",
     "tutor:thunderfang",
-    "tutor:wildcharge"
+    "tutor:wildcharge",
+    "legacy:aerialace",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:doubleteam",
+    "legacy:dragonbreath",
+    "legacy:dragonrage",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:mudslap",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:toxic"
   ],
   "evolutions": [
     {
@@ -284,7 +305,6 @@
         "tutor:helpinghand",
         "tutor:irontail",
         "tutor:outrage",
-        "tutor:psychic",
         "tutor:rest",
         "tutor:rockslide",
         "tutor:rocksmash",

common/src/main/resources/data/cobblemon/species/generation1/gyarados.json

@@ -266,7 +266,34 @@
     "tutor:stoneedge",
     "tutor:thunderbolt",
     "tutor:twister",
-    "tutor:waterpulse"
+    "tutor:waterpulse",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:bind",
+    "legacy:bubblebeam",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:doubleteam",
+    "legacy:dragonbreath",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:toxic",
+    "legacy:uproar",
+    "legacy:watergun",
+    "legacy:zapcannon",
+    "special:celebrate",
+    "special:happyhour"
   ],
   "preEvolution": "magikarp",
   "evolutions": [],

common/src/main/resources/data/cobblemon/species/generation1/haunter.json

@@ -192,14 +192,34 @@
     "tutor:sleeptalk",
     "tutor:sludgebomb",
     "tutor:snatch",
-    "tutor:spikes",
     "tutor:spite",
     "tutor:suckerpunch",
     "tutor:telekinesis",
     "tutor:thunderbolt",
     "tutor:thunderpunch",
     "tutor:trick",
-    "tutor:wonderroom"
+    "tutor:wonderroom",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:headbutt",
+    "legacy:hiddenpower",
+    "legacy:knockoff",
+    "legacy:megadrain",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:poisongas",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:uproar",
+    "legacy:zapcannon"
   ],
   "preEvolution": "gastly",
   "evolutions": [

common/src/main/resources/data/cobblemon/species/generation1/hitmonchan.json

@@ -182,7 +182,6 @@
     "tutor:knockoff",
     "tutor:laserfocus",
     "tutor:lowkick",
-    "tutor:mudslap",
     "tutor:poisonjab",
     "tutor:rest",
     "tutor:rockslide",
@@ -194,7 +193,31 @@
     "tutor:throatchop",
     "tutor:thunderpunch",
     "tutor:uproar",
-    "tutor:vacuumwave"
+    "tutor:vacuumwave",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:detect",
+    "legacy:dizzypunch",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:leer",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:toxic"
   ],
   "preEvolution": "tyrogue",
   "evolutions": []

common/src/main/resources/data/cobblemon/species/generation1/hitmonlee.json

@@ -177,7 +177,6 @@
     "tutor:knockoff",
     "tutor:laserfocus",
     "tutor:lowkick",
-    "tutor:mudslap",
     "tutor:poisonjab",
     "tutor:rest",
     "tutor:rockslide",
@@ -191,7 +190,31 @@
     "tutor:swift",
     "tutor:throatchop",
     "tutor:uproar",
-    "tutor:vacuumwave"
+    "tutor:vacuumwave",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:detect",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:focuspunch",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:toxic",
+    "special:refresh"
   ],
   "preEvolution": "tyrogue",
   "evolutions": []

common/src/main/resources/data/cobblemon/species/generation1/horsea.json

@@ -156,7 +156,28 @@
     "tutor:sleeptalk",
     "tutor:swift",
     "tutor:twister",
-    "tutor:waterpulse"
+    "tutor:waterpulse",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:scald",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:takedown",
+    "legacy:toxic"
   ],
   "evolutions": [
     {

common/src/main/resources/data/cobblemon/species/generation1/hypno.json

@@ -214,7 +214,31 @@
     "tutor:telekinesis",
     "tutor:thunderpunch",
     "tutor:trick",
-    "tutor:zenheadbutt"
+    "tutor:zenheadbutt",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:counter",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:nightmare",
+    "legacy:psywave",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:teleport",
+    "legacy:zapcannon",
+    "special:bellydrum",
+    "special:wish"
   ],
   "preEvolution": "drowzee",
   "evolutions": []

common/src/main/resources/data/cobblemon/species/generation1/ivysaur.json

@@ -147,8 +147,10 @@
     "tm:workup",
     "tm:worryseed",
     "tutor:bind",
+    "tutor:block",
     "tutor:energyball",
     "tutor:falseswipe",
+    "tutor:frenzyplant",
     "tutor:furycutter",
     "tutor:gigadrain",
     "tutor:grasspledge",
@@ -163,7 +165,33 @@
     "tutor:sludgebomb",
     "tutor:stringshot",
     "tutor:synthesis",
-    "tutor:worryseed"
+    "tutor:worryseed",
+    "legacy:amnesia",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:defensecurl",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:lightscreen",
+    "legacy:megadrain",
+    "legacy:mimic",
+    "legacy:mudslap",
+    "legacy:naturalgift",
+    "legacy:outrage",
+    "legacy:rage",
+    "legacy:razorwind",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:snore",
+    "legacy:swagger",
+    "special:block",
+    "special:celebrate",
+    "special:frenzyplant"
   ],
   "preEvolution": "bulbasaur",
   "evolutions": [

common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json

@@ -257,10 +257,38 @@
     "tutor:telekinesis",
     "tutor:thunderbolt",
     "tutor:thunderpunch",
-    "tutor:uproar",
-    "tutor:waterpulse",
     "tutor:wildcharge",
-    "tutor:zenheadbutt"
+    "tutor:zenheadbutt",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:bubblebeam",
+    "legacy:chargebeam",
+    "legacy:confide",
+    "legacy:counter",
+    "legacy:curse",
+    "legacy:detect",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:mudslap",
+    "legacy:naturalgift",
+    "legacy:nightmare",
+    "legacy:psywave",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:teleport",
+    "legacy:toxic",
+    "legacy:watergun",
+    "legacy:zapcannon",
+    "special:tickle"
   ],
   "preEvolution": "igglybuff",
   "evolutions": [

common/src/main/resources/data/cobblemon/species/generation1/jolteon.json

@@ -191,7 +191,27 @@
     "tutor:swift",
     "tutor:thunderbolt",
     "tutor:thunderfang",
-    "tutor:wildcharge"
+    "tutor:wildcharge",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:chargebeam",
+    "legacy:confide",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:toxic",
+    "legacy:zapcannon",
+    "special:celebrate",
+    "special:sing"
   ],
   "preEvolution": "eevee",
   "evolutions": []

common/src/main/resources/data/cobblemon/species/generation1/jynx.json

@@ -197,7 +197,38 @@
     "tutor:uproar",
     "tutor:waterpulse",
     "tutor:wonderroom",
-    "tutor:zenheadbutt"
+    "tutor:zenheadbutt",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:bubblebeam",
+    "legacy:confide",
+    "legacy:counter",
+    "legacy:curse",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:nightmare",
+    "legacy:psywave",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:screech",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:sweetscent",
+    "legacy:takedown",
+    "legacy:teleport",
+    "legacy:thrash",
+    "legacy:toxic",
+    "legacy:watergun"
   ],
   "preEvolution": "smoochum",
   "evolutions": []

common/src/main/resources/data/cobblemon/species/generation1/kabuto.json

@@ -169,7 +169,30 @@
     "tutor:sleeptalk",
     "tutor:stealthrock",
     "tutor:stoneedge",
-    "tutor:waterpulse"
+    "tutor:waterpulse",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:headbutt",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:rockthrow",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:slash",
+    "legacy:snore",
+    "legacy:swagger",
+    "legacy:toxic",
+    "legacy:watergun"
   ],
   "evolutions": [
     {

common/src/main/resources/data/cobblemon/species/generation1/kabutops.json

@@ -206,7 +206,33 @@
     "tutor:stoneedge",
     "tutor:superpower",
     "tutor:waterpulse",
-    "tutor:xscissor"
+    "tutor:xscissor",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:rage",
+    "legacy:razorwind",
+    "legacy:reflect",
+    "legacy:return",
+    "legacy:rockthrow",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:slash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:toxic",
+    "legacy:watergun"
   ],
   "preEvolution": "kabuto",
   "evolutions": []

common/src/main/resources/data/cobblemon/species/generation1/kadabra.json

@@ -187,7 +187,36 @@
     "tutor:thunderpunch",
     "tutor:trick",
     "tutor:wonderroom",
-    "tutor:zenheadbutt"
+    "tutor:zenheadbutt",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:counter",
+    "legacy:curse",
+    "legacy:dig",
+    "legacy:doubleedge",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:nightmare",
+    "legacy:nightshade",
+    "legacy:psywave",
+    "legacy:rage",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:takedown",
+    "legacy:toxic",
+    "legacy:zapcannon"
   ],
   "preEvolution": "abra",
   "evolutions": [

common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json

@@ -213,7 +213,35 @@
     "tutor:thunderbolt",
     "tutor:thunderpunch",
     "tutor:uproar",
-    "tutor:waterpulse"
+    "tutor:waterpulse",
+    "legacy:attract",
+    "legacy:bide",
+    "legacy:bubblebeam",
+    "legacy:captivate",
+    "legacy:confide",
+    "legacy:curse",
+    "legacy:doubleteam",
+    "legacy:dynamicpunch",
+    "legacy:fissure",
+    "legacy:frustration",
+    "legacy:hiddenpower",
+    "legacy:mimic",
+    "legacy:naturalgift",
+    "legacy:return",
+    "legacy:round",
+    "legacy:secretpower",
+    "legacy:seismictoss",
+    "legacy:skullbash",
+    "legacy:snore",
+    "legacy:submission",
+    "legacy:swagger",
+    "legacy:takedown",
+    "legacy:toxic",
+    "legacy:watergun",
+    "legacy:zapcannon",
+    "special:sing",
+    "special:wish",
+    "special:yawn"
   ],
   "evolutions": [],
   "forms": [