Fix boat style mounts sprinting on their own after landing in water from jet flight

CHANGELOG.md

@@ -1,28 +1,89 @@
 # Changelog
-## [1.8.5 (MONTH xth, 2026)](#1-8-5)
+## [1.8.3 (MONTH xth, 2026)](#1-8-3)
 
 ### Additions
 
-### Particles
-
 ### Cries added/updated for the following Pokémon
+- Hoppip
+- Skiploom
+- Jumpluff
+- Houndour
+- Houndoom
+- Wurmple
+- Silcoon
+- Beautifly
+- Cascoon
+- Dustox
+- Surskit
+- Masquerain
+- Torkoal
+- Starly
+- Staravia
+- Staraptor
+- Combee
+- Vespiquen
+- Dusknoir
+- Helioptile
+- Heliolisk
+- Grubbin
+- Charjabug
+- Vikavolt
+- Applin (updated)
+- Flapple (updated)
+- Appletun
+- Runerigus
+- Dipplin
 
 ### Model updates for the following Pokémon
 
 ### Animation updates for the following Pokémon
+- Vikavolt
 
 ### Changes
+- Changed the Misc icon in the Campfire Pot Recipe Book to Health Candy
+- Moved EXP Candies from the Medicine recipe book category to the Misc category
+- Removed Dynamic Lights data from the Magmarizer item for consistency with the block
+- Added `doPokemonPredation` gamerule, which controls aggressiveness of Pokémon with `hate_entity` brain task defined
+- Added `predation_chance` server config value, which controls the possibility of attacking the hated entity found by `hate_entity` brain task 
+- Prehistoric Eroded Pillar generates slightly more frequently
 
 ### Fixes
+- Fixed datapacks with item interaction evolutions that don't specify an item crashing the world on load.
+- Fixed the Pokédex evolution tree crashing when a datapack's dex entry is missing an evolution's form.
+- Fixed the Pokédex evolution tree crashing with a stack overflow on evolutions that loop back on themselves.
+- Fixed the Pokédex evolution tree crashing when looking at a dex that is not part of the "National Dex" aggregate.
+- Fixed evolution trees not building properly when a Pokémon has several Pokédex entries for different regions.
+- Fixed form-changing evolutions sometimes resolving to the source form in the Pokédex evolution tree.
+- Broken datapack evolutions are now logged and skipped in the Pokédex evolution tree instead of crashing.
+- Fixed the `alpha` property having no tab completion in commands such as `/pokespawn`, `/pokegive` and `/pokeedit`, and added the missing `dmax_level`, `gmax_factor` and `tradable` aliases to tab completion
+- Fixed friendship booster items not being recognised as such
+- Fixed conflicts with other mods that would make use of recipe books in certain ways (Farmer's Delight Cooking Pot)
+- Fixed Pokémon battles stalling when a sidemod cancels the `THROWN_POKEBALL_HIT` hit event
+- Fixed choice feature tab completion in `spawnpokemon/pokegive/pokeedit` commands
+- Fixed MoLang that's targeting players intermittedly failing when they have died, needing them to relog
+- Fixed a NeoForge bug where none of the Cobblemon plants/berries could be placed into pots
+- Fixed party overlay not hiding when the player opens the Pokédex scanner 
+- Added compat for AppleSkin
+- Fixed some display names having unintended font colours
+- Fixed `hate_entity` task focusing on its own entity
+  - Thus enabled deadly warfare between Zangoose and Seviper
+- Prehistoric Frozen Pond, Prehistoric Frozen Spike, and Prehistoric Lush Den now generate
+- Fixed Frogadier floating in its battle_idle animation
+- Fixed absence or incorrect mergers in spawning conditions, making max height/depth of conditions to use the min value instead
+- Added stricter riding checks on server side to prevent possible packet forgery when player tries to ride pokemon
+- Fixed Pokémon cries and animation sounds played from GUIs, such as the starter selection screen and the Pokédex, being tied to the Master volume slider instead of Friendly Creatures
+- Fixed boat style mounts sprinting on their own after landing in water from jet flight
 
 ### Developer
+- Bumped NeoForge to `21.1.195` to get access to MixinExtras `0.5` and the expressions annotation
+- New Platform Event `PLAYER_RESPAWN` which is fired when a player respawns (either through death or returning from the end)
+- Platform Events `SERVER_PLAYER_TICK_PRE` and `SERVER_PLAYER_TICK_POST` no longer fire when the player is dead
+  - it is now tied much closer to the actual entity rather than the player (or their connection)
 
 ### Molang & Datapacks
-- Added a `loot_table` drop entry type. 
-  - Accepts an `id` field, pointing to a vanilla loot table.
-  - All base mod Pokémon have been moved to this new system.
-- Added the `cobblemon:biome` and `cobblemon:pokemon_properties` loot conditions.
-  - `cobblemon:biome` returns true if the biome of death matches the `biome` field.
-  - `cobblemon:pokemon_properties` returns true if the Pokémon matches the `properties` field.
+- Fixed `q.pokemon.nature` returning class instance instead of proper string value (`cobblemon:adamant`)
+- Fixed `q.entity.is_looking_at` result being always `1` for whatever entity passed as target
+- Added hate chance optional parameter to `hate_entity` task. `1.0` will make an entity always attack the target 
 
-### Localization
+### Localization
+- Updated translations for:

changelogs/CHANGELOG-1.8.3.md

@@ -1,107 +0,0 @@
-# Changelog
-## [1.8.3 (October 25th, 2026)](#1-8-3)
-
-### Additions
-- Added compatability with AppleSkin.
-
-### New Rideable Pokémon
-- Vikavolt
-- Fearow
-
-### Particles
-## New Move Animations
-- Water Shuriken
-
-### Cries added/updated for the following Pokémon
-- Hoppip
-- Skiploom
-- Jumpluff
-- Houndour
-- Houndoom
-- Wurmple
-- Silcoon
-- Beautifly
-- Cascoon
-- Dustox
-- Surskit
-- Masquerain
-- Torkoal
-- Starly
-- Staravia
-- Staraptor
-- Combee
-- Vespiquen
-- Dusknoir
-- Helioptile
-- Heliolisk
-- Grubbin
-- Charjabug
-- Vikavolt
-- Applin (updated)
-- Flapple (updated)
-- Appletun
-- Runerigus
-- Dipplin
-
-### Animation updates for the following Pokémon
-- Vikavolt
-- Magby
-- Magmar
-- Ninetales (+ Alolan)
-- Spearow
-- Fearow
-- Squawkabilly
-- Mudkip
-- Marshtomp
-- Swampert
-
-### Changes
-- Changed the Misc icon in the Campfire Pot Recipe Book to Health Candy.
-- Moved EXP Candies from the Medicine recipe book category to the Misc category.
-- Removed Dynamic Lights data from the Magmarizer item for consistency with the block.
-- Added `doPokemonPredation` game rule, which controls aggressiveness of Pokémon with the `hate_entity` brain task defined.
-- Added `predation_chance` server config value, which controls the possibility of attacking the hated entity found in `hate_entity` brain tasks.
-- Prehistoric Eroded Pillar generates slightly more frequently.
-- Togekiss was changed from a jet-style mount to bird-style.
-
-### Fixes
-- Fixed datapacks with item interaction evolutions that don't specify an item crashing the world on load.
-- Fixed the Pokédex evolution tree crashing when a datapack's dex entry is missing an evolution's form.
-- Fixed the Pokédex evolution tree crashing with a stack overflow on evolutions that loop back on themselves.
-- Fixed the Pokédex evolution tree crashing when looking at a dex that is not part of the "National Dex" aggregate.
-- Fixed some display names in the Pokédex evolution tree having unintended font colours.
-- Fixed evolution trees not building properly when a Pokémon has several Pokédex entries for different regions.
-- Fixed form-changing evolutions sometimes resolving to the source form in the Pokédex evolution tree.
-- Broken datapack evolutions are now logged and skipped in the Pokédex evolution tree instead of crashing.
-- Fixed the `alpha` property having no tab completion in commands such as `/pokespawn`, `/pokegive` and `/pokeedit`, and added the missing `dmax_level`, `gmax_factor` and `tradable` aliases to tab completion.
-- Fixed friendship booster items not being recognised as such.
-- Fixed conflicts with other mods that would make use of recipe books in certain ways (Farmer's Delight Cooking Pot).
-- Fixed Pokémon battles stalling when a sidemod cancels the `THROWN_POKEBALL_HIT` hit event.
-- Fixed choice feature tab completion in `spawnpokemon/pokegive/pokeedit` commands.
-- Fixed MoLang that's targeting players intermittedly failing when they have died, requiring them to relog.
-- Fixed a NeoForge bug where none of the Cobblemon plants/berries could be placed into pots.
-- Fixed party overlay not hiding when the player opens the Pokédex scanner.
-- Fixed `hate_entity` task focusing on its own entity, therefore enabling deadly warfare between Zangoose and Seviper.
-- Prehistoric Frozen Pond, Prehistoric Frozen Spike, and Prehistoric Lush Den now actually generate (oops).
-- Fixed Frogadier floating in its `battle_idle` animation.
-- Fixed absence or incorrect mergers in spawning conditions, causing the max height/depth of conditions to use the min value instead.
-- Added stricter riding checks on server side to prevent possible packet forgery when a player tries to ride Pokémon.
-- Fixed Pokémon cries and animation sounds played from GUIs, such as the starter selection screen and the Pokédex, being tied to the Master volume slider instead of Friendly Creatures.
-- Fixed Archeops T-posing during its `air_cry` animation.
-
-### Developer
-- Bumped NeoForge to `21.1.195` to get access to MixinExtras `0.5` and the expressions annotation.
-- New Platform Event `PLAYER_RESPAWN` which is fired when a player respawns (either through death or returning from the end).
-- Platform Events `SERVER_PLAYER_TICK_PRE` and `SERVER_PLAYER_TICK_POST` no longer fire when the player is dead.
-  - It is now tied much closer to the actual entity rather than the player or their connection.
-
-### Molang & Datapacks
-- Fixed `q.pokemon.nature` returning class instance instead of proper string value (`cobblemon:adamant`).
-- Fixed `q.entity.is_looking_at` result being always `1` for whatever entity passed as the target parameter.
-- Added hate chance optional parameter to `hate_entity` task. `1.0` will make an entity always attack the target.
-
-### Localization
-- Updated translations for:
-  - Russian
-  - Japanese
-  - Brazilian Portuguese

changelogs/CHANGELOG-1.8.4.md

@@ -1,25 +0,0 @@
-# Changelog
-## [1.8.4 (October 27th, 2026)](#1-8-4)
-
-### Changes
-- The Froakie line now blinks. The world will never be the same.
-
-### Fixes
-- Fixed heaps of spawns not working. This was caused by us missing something before release. RIP.
-- Fixed a crash caused by Fearow blinking while you're riding one. Makes sense to me.
-- Fixed Minior's "Shields Down" ability being very broken.
-- Fixed Dusclops using Squirtle's cry sound (lol).
-- Fixed blank Cooking Pot recipe book entries and missing tabs on Fabric.
-- Fixed a hitbox issue with placeable Orb held items attached to a ceiling.
-- Fixed something sneaky. I'll tell you about it later.
-
-### Molang & Datapacks
-- Added `q.target_fainted` function to move action effects that checks if any opponents fainted from the move.
-
-### Particles
-- Updated Water Shuriken effect to be timed better when the opponent faints.
-
-### Localization
-- Updated translations for:
-  - Korean
-  - Simplified Chinese

common/src/main/java/com/cobblemon/mod/common/mixin/client/ClientRecipeBookMixin.java

@@ -69,7 +69,7 @@ public abstract class ClientRecipeBookMixin {
                     value = "INVOKE",
                     target = "Lcom/google/common/collect/ImmutableMap;copyOf(Ljava/util/Map;)Lcom/google/common/collect/ImmutableMap;"
             ))
-    private void addCustomAggregateCategories(Iterable<RecipeHolder<?>> recipes, RegistryAccess registryAccess, CallbackInfo ci, @Local(ordinal = 1) Map<RecipeBookCategories, List<RecipeCollection>> map2) {
+    private void addCustomAggregateCategories(Iterable<RecipeHolder<?>> recipes, RegistryAccess registryAccess, CallbackInfo ci, @Local(name = "map2") Map<RecipeBookCategories, List<RecipeCollection>> map2) {
         CobblemonRecipeCategories.Companion.getCustomAggregateCategories().forEach((recipeBookCategories, list) -> map2.put(recipeBookCategories, (List) list.stream().flatMap((recipeBookCategoriesx) -> ((List) map2.getOrDefault(recipeBookCategoriesx, ImmutableList.of())).stream()).collect(ImmutableList.toImmutableList())));
     }
 }

common/src/main/java/com/cobblemon/mod/common/mixin/client/RecipeBookComponentMixin.java

@@ -20,14 +20,14 @@ import org.spongepowered.asm.mixin.injection.At;
 
 @Mixin(RecipeBookComponent.class)
 public class RecipeBookComponentMixin {
-    @Definition(id = "recipeBookCategories", local = @Local(type = RecipeBookCategories.class))
+    @Definition(id = "recipeBookCategories", local = @Local(name = "recipeBookCategories"))
     @Definition(id = "FURNACE_SEARCH", field = "Lnet/minecraft/client/RecipeBookCategories;FURNACE_SEARCH:Lnet/minecraft/client/RecipeBookCategories;")
     @Expression("recipeBookCategories != FURNACE_SEARCH")
     @ModifyExpressionValue(
             method = "updateTabs",
             at = @At(value = "MIXINEXTRAS:EXPRESSION")
     )
-    private boolean notCookingPotSearch(boolean original, @Local RecipeBookCategories recipeBookCategories) {
+    private boolean notCookingPotSearch(boolean original, @Local(name = "recipeBookCategories") RecipeBookCategories recipeBookCategories) {
         return original && recipeBookCategories != CobblemonRecipeCategories.COOKING_POT_SEARCH.toVanillaCategory();
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt

@@ -16,7 +16,6 @@ import com.cobblemon.mod.common.api.drop.CommandDropEntry
 import com.cobblemon.mod.common.api.drop.DropEntry
 import com.cobblemon.mod.common.api.drop.EvolutionItemDropEntry
 import com.cobblemon.mod.common.api.drop.ItemDropEntry
-import com.cobblemon.mod.common.api.drop.LootTableDropEntry
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.CobblemonEvents.DATA_SYNCHRONIZED
 import com.cobblemon.mod.common.api.habitats.HabitatPools
@@ -91,7 +90,6 @@ import com.cobblemon.mod.common.events.EntityCallbackHandler
 import com.cobblemon.mod.common.events.PokedexHandler
 import com.cobblemon.mod.common.events.ServerTickHandler
 import com.cobblemon.mod.common.events.StatHandler
-import com.cobblemon.mod.common.loot.CobblemonLootItemConditions
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
 import com.cobblemon.mod.common.permission.LaxPermissionValidator
 import com.cobblemon.mod.common.platform.events.PlatformEvents
@@ -227,12 +225,10 @@ object Cobblemon {
         implementation.registerEntitySubPredicates()
         implementation.registerMobEffects()
         DispenserBehaviorRegistry.registerDispenserBehaviors()
-        CobblemonLootItemConditions.touch()
 
         DropEntry.register("command", CommandDropEntry::class.java)
         DropEntry.register("item", ItemDropEntry::class.java, isDefault = true)
         DropEntry.register("evolution", EvolutionItemDropEntry::class.java)
-        DropEntry.register("loot_table", LootTableDropEntry::class.java)
 
         ExperienceGroups.registerDefaults()
         CaptureCalculators.registerDefaults()

common/src/main/kotlin/com/cobblemon/mod/common/CobblemonImplementation.kt

@@ -118,7 +118,6 @@ interface CobblemonImplementation {
     fun registerMenu()
 
     fun registerEntitySubPredicates()
-    fun registerLootItemConditions()
 
     /**
      * TODO

common/src/main/kotlin/com/cobblemon/mod/common/api/battles/model/PokemonBattle.kt

@@ -239,10 +239,6 @@ open class PokemonBattle(
     }
 
     fun writeShowdownAction(vararg messages: String) {
-        if (messages.any { it.contains("\n") || it.contains("\r") }) {
-            LOGGER.warn("Refusing to forward Showdown action with an embedded line break for battle {}: {}", battleId, messages.joinToString(" | "))
-            return
-        }
         log(messages.joinToString("\n"))
         ShowdownService.service.send(battleId, messages.toList().toTypedArray())
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/drop/DropTable.kt

@@ -10,14 +10,9 @@ package com.cobblemon.mod.common.api.drop
 
 import com.cobblemon.mod.common.api.events.CobblemonEvents.LOOT_DROPPED
 import com.cobblemon.mod.common.api.events.drops.LootDroppedEvent
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.core.registries.Registries
 import kotlin.random.Random
 import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.resources.ResourceKey
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.entity.LivingEntity
@@ -110,11 +105,7 @@ class DropTable {
     ) {
         LOOT_DROPPED.postThen(
             event = LootDroppedEvent(this, player, entity, drops),
-            ifSucceeded = {
-                val pokemon = (entity as? PokemonEntity)?.pokemon?.species?.resourceIdentifier ?: return@postThen
-                it.drops.forEach { it.drop(entity, world, pos, player) }
-//                val lootKey = ResourceKey.create(Registries.LOOT_TABLE, cobblemonResource("pokemon/${pokemon}"))
-            }
+            ifSucceeded = { it.drops.forEach { it.drop(entity, world, pos, player) } }
         )
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/drop/LootTableDropEntry.kt

@@ -1,64 +0,0 @@
-package com.cobblemon.mod.common.api.drop
-
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerLevel
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.item.ItemEntity
-import net.minecraft.world.level.storage.loot.LootParams
-import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets
-import net.minecraft.world.level.storage.loot.parameters.LootContextParams
-import net.minecraft.world.phys.Vec3
-
-/**
- * A drop entry that points to a vanilla loot table.
- */
-class LootTableDropEntry(
-    override var percentage: Float,
-    override var quantity: Int,
-    override var maxSelectableTimes: Int,
-    val id: ResourceLocation
-) : DropEntry {
-    override fun drop(
-        entity: LivingEntity?,
-        world: ServerLevel,
-        pos: Vec3,
-        player: ServerPlayer?
-    ) {
-        val key = ResourceKey.create(Registries.LOOT_TABLE, id)
-        val playerEntity = player as? LivingEntity
-        if (entity == null) return
-        if (playerEntity != null) {
-            val params = LootParams.Builder(world)
-                .withParameter(LootContextParams.ATTACKING_ENTITY, playerEntity)
-                .withParameter(LootContextParams.DAMAGE_SOURCE, playerEntity.damageSources().genericKill())
-                .withParameter(LootContextParams.ORIGIN, pos)
-                .withParameter(LootContextParams.THIS_ENTITY, entity)
-                .create(LootContextParamSets.ENTITY)
-            val drops = world.server.reloadableRegistries().getLootTable(key)
-                .getRandomItems(params)
-            for (stack in drops) {
-                if (stack.isEmpty) continue
-
-                val itemEntity = ItemEntity(world, pos.x, pos.y, pos.z, stack)
-                itemEntity.setDefaultPickUpDelay()
-                world.addFreshEntity(itemEntity)
-            }
-        } else {
-            val params = LootParams.Builder(world)
-                .create(LootContextParamSets.EMPTY)
-            val drops = world.server.reloadableRegistries().getLootTable(key)
-                .getRandomItems(params)
-            for (stack in drops) {
-                if (stack.isEmpty) continue
-
-                val itemEntity = ItemEntity(world, pos.x, pos.y, pos.z, stack)
-                itemEntity.setDefaultPickUpDelay()
-                world.addFreshEntity(itemEntity)
-            }
-        }
-
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/liquid/BoatBehaviour.kt

@@ -37,6 +37,7 @@ import com.cobblemon.mod.common.util.writeRidingStats
 import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
+import net.minecraft.client.Minecraft
 import net.minecraft.core.BlockPos
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.util.Mth
@@ -94,12 +95,16 @@ class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
             state.jumpBuffer.set(state.jumpBuffer.get() + 1)
         }
 
-        // Only start sprinting on vehicle if the state has changed and the pokemon has atleast 1/3 stamina
-        if (driver.isSprinting && !state.isVehicleSprinting.get()) {
-            state.isVehicleSprinting.set(state.stamina.get() > 0.33f)
-        }
-        else if (!driver.isSprinting) {
-            state.isVehicleSprinting.set(false)
+        if (vehicle.level().isClientSide) {
+            // Check the keys instead of driver.isSprinting since that can still be true from a previous ride style
+            val tryingToSprint = Minecraft.getInstance().options.keySprint.isDown() && Minecraft.getInstance().options.keyUp.isDown()
+            // Only start sprinting on vehicle if the state has changed and the pokemon has atleast 1/3 stamina
+            if (tryingToSprint && !state.isVehicleSprinting.get()) {
+                state.isVehicleSprinting.set(state.stamina.get() > 0.33f)
+            }
+            else if (!tryingToSprint) {
+                state.isVehicleSprinting.set(false)
+            }
         }
 
         if (!state.isVehicleSprinting.get()) {

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/spawner/Spawner.kt

@@ -198,17 +198,7 @@ interface Spawner {
         val mid = chunk.getBlockState(startPos)
         val above = chunk.getBlockState(abovePos)
 
-        // Above must be non-solid
-        if (!above.isPathfindable(PathComputationType.AIR)) {
-            return false
-        }
-
-        // Position must be non-air
-        if (mid.isAir) {
-            return false
-        }
-
-        return true
+        return above.isPathfindable(PathComputationType.AIR) && mid.isAir
     }
 
     fun constrainArea(area: SpawningZoneInput): SpawningZoneInput? {

common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownActionRequest.kt

@@ -117,9 +117,6 @@ abstract class ShowdownActionResponse(val type: ShowdownActionResponseType) {
 
 data class MoveActionResponse(var moveName: String, var targetPnx: String? = null, var gimmickID: String? = null): ShowdownActionResponse(ShowdownActionResponseType.MOVE) {
     override fun isValid(activeBattlePokemon: ActiveBattlePokemon, showdownMoveSet: ShowdownMoveset?, forceSwitch: Boolean): Boolean {
-        // Ensure that the gimmick ID the player is sending is valid
-        gimmickID?.let { if (it !in VALID_GIMMICK_IDS) return false }
-
         if (forceSwitch || showdownMoveSet == null) {
             return false
         }
@@ -171,10 +168,6 @@ data class MoveActionResponse(var moveName: String, var targetPnx: String? = nul
         gimmickID = buffer.readNullable { buffer.readString() }
         return this
     }
-
-    companion object {
-        private val VALID_GIMMICK_IDS = ShowdownMoveset.Gimmick.entries.map { it.id }.toSet()
-    }
 }
 
 data class HealItemActionResponse(var item: String) : ShowdownActionResponse(ShowdownActionResponseType.FORCE_PASS) {
@@ -190,8 +183,7 @@ data class HealItemActionResponse(var item: String) : ShowdownActionResponse(Sho
     }
 
     override fun isValid(activeBattlePokemon: ActiveBattlePokemon, showdownMoveSet: ShowdownMoveset?, forceSwitch: Boolean): Boolean {
-        // Previously checked for !forceSwitch, excepts in the case of a forceSwitch, this couldn't legally be sent anyway.
-        return false
+        return !forceSwitch
     }
 
     override fun toShowdownString(activeBattlePokemon: ActiveBattlePokemon, showdownMoveSet: ShowdownMoveset?): String {

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

@@ -37,6 +37,7 @@ import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.battleLang
 import com.cobblemon.mod.common.util.cobblemonResource
 import java.util.concurrent.CompletableFuture
+import net.minecraft.world.entity.LivingEntity
 
 /**
  * Format: |move|POKEMON|MOVE|TARGET
@@ -76,7 +77,7 @@ class MoveInstruction(
             val pokemonName = userPokemon.getName()
             ShowdownInterpreter.lastCauser[battle.battleId] = message
             // For Spread targets the message data only gives the pnx strings. So we can't know what pokemon are actually targeted until the previous messages have been interpreted
-            val spreadTargetPokemon = spreadTargets.map { battle.activePokemon.firstOrNull { poke -> poke.getPNX() == it }?.battlePokemon }
+            val spreadTargetPokemon = spreadTargets.map { battle.activePokemon.firstOrNull() { poke -> poke.getPNX() == it }?.battlePokemon }
 
             val targetPokemonEntity = targetPokemon?.entity
             if (targetPokemonEntity != null) {
@@ -136,20 +137,10 @@ class MoveInstruction(
 
             val subsequentInstructions = instructionSet.findInstructionsCausedBy(this)
             val missedTargets = subsequentInstructions.filterIsInstance<MissInstruction>().mapNotNull { it.target }
-            val faintedTargets = subsequentInstructions.filterIsInstance<FaintInstruction>().map { it.faintingPokemon }
             val failed = subsequentInstructions.any { it is FailInstruction }
             val failedTargets = subsequentInstructions.filterIsInstance<FailInstruction>().mapNotNull { it.target }
             val hitCountInstruction = subsequentInstructions.filterIsInstance<HitCountInstruction>().firstOrNull()
 
-            runtime.environment.query.addFunction("target_fainted") { params ->
-                if (params.params.size == 0) {
-                    return@addFunction DoubleValue(faintedTargets.isNotEmpty())
-                } else {
-                    val entityUUID = params.getString(0)
-                    return@addFunction DoubleValue(faintedTargets.any { it.entity?.stringUUID == entityUUID })
-                }
-            }
-
             runtime.environment.query.addFunction("missed") { params ->
                 if (params.params.size == 0) {
                     return@addFunction DoubleValue(missedTargets.isNotEmpty())

common/src/main/kotlin/com/cobblemon/mod/common/block/OrbBlock.kt

@@ -30,7 +30,7 @@ class OrbBlock(properties: Properties) : SixFaceRotationalBlock(properties) {
 
         val FLOOR_NORTH = Shapes.box(0.3125, 0.0, 0.3125, 0.6875, 0.375, 0.6875)
         val WALL_NORTH = Shapes.box(0.3125, 0.3125, 0.625, 0.6875, 0.6875, 1.0)
-        val CEILING_NORTH = Shapes.box(0.3125, 0.625, 0.3125, 0.6875, 1.0, 0.6875)
+        val CEILING_NORTH = Shapes.box(0.3125, 0.625, 0.375, 0.6875, 1.0, 0.6875)
     }
 
     init {

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/PokedexGUI.kt

@@ -748,7 +748,6 @@ class PokedexGUI private constructor(
                 }
                 TAB_DROPS -> {
                     (tabInfoElement as DropsScrollingWidget).dropTable = form.drops
-                    (tabInfoElement as DropsScrollingWidget).aspects = aspects.toSet()
                     (tabInfoElement as DropsScrollingWidget).setEntries()
                 }
                 TAB_MOVES -> {

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/widgets/DropsScrollingWidget.kt

@@ -10,9 +10,6 @@ package com.cobblemon.mod.common.client.gui.pokedex.widgets
 
 import com.cobblemon.mod.common.api.drop.DropTable
 import com.cobblemon.mod.common.api.drop.ItemDropEntry
-import com.cobblemon.mod.common.api.drop.LootTableDropEntry
-import com.cobblemon.mod.common.api.pokemon.feature.AbstractChoiceSpeciesFeatureProvider
-import com.cobblemon.mod.common.api.pokemon.feature.SpeciesFeatures
 import com.cobblemon.mod.common.api.text.bold
 import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.gui.ScrollingWidget
@@ -20,26 +17,17 @@ import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.client.render.drawScaledTextJustifiedRight
 import com.cobblemon.mod.common.client.render.renderScaledGuiItemIcon
-import com.cobblemon.mod.common.pokemon.FormData
 import com.cobblemon.mod.common.util.itemRegistry
 import com.cobblemon.mod.common.util.lang
-import com.cobblemon.mod.common.util.server
-import com.google.gson.JsonArray
-import com.google.gson.JsonObject
-import com.google.gson.JsonParser
+import java.text.DecimalFormat
 import net.minecraft.ChatFormatting
-import net.minecraft.Util
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
-import net.minecraft.core.registries.Registries
 import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.MutableComponent
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.tags.TagKey
 import net.minecraft.util.FastColor
 import net.minecraft.util.Mth
 import net.minecraft.world.item.ItemStack
-import java.text.DecimalFormat
 
 class DropsScrollingWidget(val pX: Int, val pY: Int): ScrollingWidget<DropsScrollingWidget.DropWidgetEntry>(
     width = PokedexGUIConstants.HALF_OVERLAY_WIDTH - 2,
@@ -50,7 +38,6 @@ class DropsScrollingWidget(val pX: Int, val pY: Int): ScrollingWidget<DropsScrol
 ) {
 
     var dropTable: DropTable = DropTable()
-    var aspects: Set<String> = emptySet()
 
     companion object {
         val df = DecimalFormat("#.##")
@@ -63,157 +50,9 @@ class DropsScrollingWidget(val pX: Int, val pY: Int): ScrollingWidget<DropsScrol
     override fun getX() = pX
     override fun getY() = pY
 
-    private fun checkPokemonProperty(propertiesString: String): Boolean {
-        println("CHECK PROPERTY CALLED: $propertiesString")
-        val split = propertiesString.split("=", limit = 2)
-        if (split.size != 2) return true
-        val key = split[0]
-        val value = split[1]
-        val provider = SpeciesFeatures.getFeatures()
-            .filterIsInstance<AbstractChoiceSpeciesFeatureProvider<*>>()
-            .firstOrNull { key in it.keys }
-            ?: return true
-
-        val feature = provider.fromString(value) ?: return false
-        if (!provider.isAspect) return true
-        val requiredAspect = provider.getAspect(feature)
-
-        return requiredAspect in aspects
-    }
-
-    private fun checkPokemonConditions(condition: JsonObject): Boolean {
-        val conditionType = condition["condition"].asString
-        if (conditionType == "cobblemon:pokemon_properties") {
-            return checkPokemonProperty(
-                condition["properties"].asString
-            )
-        }
-        if (conditionType == "minecraft:all_of") {
-            val terms = condition["terms"]?.asJsonArray ?: return true
-            return terms.all {
-                checkPokemonConditions(it.asJsonObject)
-            }
-        }
-        if (conditionType == "minecraft:any_of") {
-            val terms = condition["terms"]?.asJsonArray ?: return true
-            return terms.any {
-                checkPokemonConditions(it.asJsonObject)
-            }
-        }
-        if (conditionType == "minecraft:inverted") {
-            val term = condition["term"]?.asJsonObject ?: return true
-            return !checkPokemonConditions(term)
-        }
-
-        return true
-    }
-
     fun setEntries() {
-        clearEntries()
-        dropTable.entries.forEach { it ->
-            if (it is ItemDropEntry) {
-                addEntry(DropWidgetEntry(it, mutableSetOf(it.item)))
-            } else if (it is LootTableDropEntry) { // LootTable doesn't expose pools, so we gotta do all this bullshit
-                val server = server() ?: return
-
-                val lootTableResource = ResourceLocation.fromNamespaceAndPath(
-                    it.id.namespace,
-                    "loot_table/${it.id.path}.json"
-                )
-
-                val resource = server.resourceManager
-                    .getResource(lootTableResource)
-                    .orElse(null)
-                    ?: return@forEach
-
-                val json = resource.openAsReader().use { reader ->
-                    JsonParser.parseReader(reader).asJsonObject
-                }
-
-                json.getAsJsonArray("pools")?.forEach { poolElement ->
-                    val pool = poolElement.asJsonObject
-                    val entries = pool.getAsJsonArray("entries") ?: return@forEach
-
-                    val validEntries = entries
-                        .map { entryElement ->
-                            entryElement.asJsonObject
-                        }.filter { entry ->
-                            val conditions = entry["conditions"]?.asJsonArray ?: JsonArray()
-
-                            conditions.all { condition ->
-                                val conditionJson = condition.asJsonObject
-                                val conditionType = conditionJson["condition"].asString
-
-                                conditionType != "cobblemon:biome" && checkPokemonConditions(conditionJson)
-                            }
-                        }
-
-                    val totalWeight = validEntries.sumOf { entry ->
-                        entry["weight"]?.asInt ?: 1
-                    }
-
-                    for (entry in validEntries) {
-                        val dropEntry = ItemDropEntry()
-                        val conditions = entry["conditions"]?.asJsonArray ?: JsonArray()
-                        val functions = entry["functions"]?.asJsonArray ?: JsonArray()
-                        val items = mutableSetOf<ResourceLocation>()
-                        var tag: ResourceLocation? = null
-
-                        if (validEntries.size > 1 && totalWeight > 0) {
-                            val weight = entry["weight"]?.asInt ?: 1
-                            dropEntry.percentage = weight.toFloat() / totalWeight.toFloat() * 100F
-                        }
-
-                        conditions.forEach { condition ->
-                            val conditionJson = condition.asJsonObject
-                            val conditionType = conditionJson["condition"].asString
-
-                            if (conditionType == "minecraft:random_chance") {
-                                val chance = conditionJson["chance"].asFloat * 100F
-
-                                if (validEntries.size > 1) {
-                                    dropEntry.percentage *= chance / 100F
-                                } else {
-                                    dropEntry.percentage = chance
-                                }
-                            }
-                        }
-
-                        functions.forEach { function ->
-                            val functionObj = function.asJsonObject
-                            if (functionObj["function"].asString == "set_count") {
-                                val count = functionObj["count"].asJsonObject
-                                val min = count["min"].asInt
-                                val max = count["max"].asInt
-                                dropEntry.quantityRange = IntRange(min, max)
-                            }
-                        }
-
-                        if (entry["type"].asString == "minecraft:tag") {
-                            val itemRegistry = Minecraft.getInstance()
-                                .level!!
-                                .registryAccess()
-                                .lookupOrThrow(Registries.ITEM)
-                            val tagKey = TagKey.create(Registries.ITEM, ResourceLocation.parse(entry["name"].asString))
-                            tag = tagKey.location
-
-                            val tagItems = itemRegistry.getOrThrow(tagKey)
-                                .stream()
-                                .map { holder ->
-                                    holder.unwrapKey().map {
-                                        it.location()
-                                    }.orElse(null)
-                                }.toList().filterNotNull()
-
-                            items.addAll(tagItems)
-                        } else if (entry["type"].asString == "minecraft:item") {
-                            items.add(ResourceLocation.parse(entry["name"].asString))
-                        }
-
-                        addEntry(DropWidgetEntry(dropEntry, items, tag))
-                    }
-                }
-            }
+        dropTable.entries.forEach {
+            if (it is ItemDropEntry) addEntry(DropWidgetEntry(it))
         }
     }
 
@@ -251,7 +90,7 @@ class DropsScrollingWidget(val pX: Int, val pY: Int): ScrollingWidget<DropsScrol
             shadow = true
         )
 
-        if (dropTable.entries.isEmpty()) {
+        if (dropTable.entries.size == 0) {
             drawScaledText(
                 context = context,
                 text = lang("ui.pokedex.info.drops_empty"),
@@ -289,7 +128,7 @@ class DropsScrollingWidget(val pX: Int, val pY: Int): ScrollingWidget<DropsScrol
         return children()[index] as DropWidgetEntry
     }
 
-    class DropWidgetEntry(val entry: ItemDropEntry, val items: MutableSet<ResourceLocation>, val tag: ResourceLocation? = null): Slot<DropWidgetEntry>() {
+    class DropWidgetEntry(val entry: ItemDropEntry): Slot<DropWidgetEntry>() {
         override fun render(
             context: GuiGraphics,
             index: Int,
@@ -302,14 +141,9 @@ class DropsScrollingWidget(val pX: Int, val pY: Int): ScrollingWidget<DropsScrol
             hovered: Boolean,
             tickDelta: Float
         ) {
-            if (items.isEmpty()) return
             context.pose().pushPose()
             context.pose().translate(0f, 0f, 100f)
-
-            val index = ((Util.getMillis() / 1000L) % items.size).toInt()
-            val itemLocation = items.elementAt(index)
-            val itemStack = Minecraft.getInstance().player?.level()?.itemRegistry?.get(itemLocation)?.defaultInstance ?: ItemStack.EMPTY
-
+            val itemStack = Minecraft.getInstance().player?.level()?.itemRegistry?.get(entry.item)?.defaultInstance ?: ItemStack.EMPTY
             renderScaledGuiItemIcon(
                 itemStack = itemStack,
                 x = x.toDouble(),
@@ -317,28 +151,28 @@ class DropsScrollingWidget(val pX: Int, val pY: Int): ScrollingWidget<DropsScrol
                 matrixStack = context.pose(),
                 scale = PokedexGUIConstants.SCALE.toDouble()
             )
-
             context.pose().pushPose()
 
             val min = entry.quantityRange?.min() ?: entry.quantity
             val max = entry.quantityRange?.max() ?: entry.quantity
 
-            val displayName = if (tag == null) {
-                itemStack.hoverName.copy().withStyle(ChatFormatting.BOLD)
-            } else {
-                Component.translatable("tag.item.${tag.namespace}.${tag.path.replace('/', '.')}").withStyle(ChatFormatting.BOLD)
-            }
+//            var itemName: String = Component.translatable(itemStack.hoverName).string
+//            itemName = if (itemName.length > 24) {
+//                itemName.substring(0, 24 - 3) + "..."
+//            } else {
+//                itemName
+//            }
 
             val displayText: MutableComponent = if (entry.quantityRange != null) {
                 lang(
                     "ui.pokedex.info.drops_display",
-                    displayName,
+                    itemStack.hoverName.copy().withStyle(ChatFormatting.BOLD),
                     lang("ui.pokedex.info.drops_range", min, max)
                 )
             } else {
                 lang(
                     "ui.pokedex.info.drops_display",
-                    displayName,
+                    itemStack.hoverName.copy().withStyle(ChatFormatting.BOLD),
                     lang("ui.pokedex.info.drops_amount", entry.quantity)
                 )
             }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdGalarianModel.kt

@@ -29,8 +29,8 @@ class FarfetchdGalarianModel(root: ModelPart) : PokemonPosableModel(root), Heade
     override var portraitScale = 2.6F
     override var portraitTranslation = Vec3(-0.2, -1.0, 0.0)
 
-    override var profileScale = 0.93F
-    override var profileTranslation = Vec3(-0.1, 0.36, 0.0)
+    override var profileScale = 1.1F
+    override var profileTranslation = Vec3(-0.1, 0.1, 0.0)
 
     lateinit var standing: Pose
     lateinit var walk: Pose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdModel.kt

@@ -28,8 +28,8 @@ class FarfetchdModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame,
     override var portraitScale = 2.6F
     override var portraitTranslation = Vec3(-0.2, -1.0, 0.0)
 
-    override var profileScale = 0.93F
-    override var profileTranslation = Vec3(-0.1, 0.36, 0.0)
+    override var profileScale = 1.1F
+    override var profileTranslation = Vec3(-0.1, 0.1, 0.0)
 
     lateinit var standing: Pose
     lateinit var walk: Pose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KabutoModel.kt

@@ -23,8 +23,8 @@ class KabutoModel(root: ModelPart) : PokemonPosableModel(root) {
     override var portraitScale = 3.3F
     override var portraitTranslation = Vec3(0.0, -3.3, 0.0)
 
-    override var profileScale = 1.25F
-    override var profileTranslation = Vec3(0.0, -0.17, 0.0)
+    override var profileScale = 1.6F
+    override var profileTranslation = Vec3(0.0, -0.6, 0.0)
 
     lateinit var standing: CobblemonPose
     lateinit var walk: CobblemonPose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HoothootModel.kt

@@ -21,8 +21,8 @@ class HoothootModel (root: ModelPart) : PokemonPosableModel(root) {
 
     override var portraitScale = 2.2F
     override var portraitTranslation = Vec3(-0.25, -0.9, 0.0)
-    override var profileScale = 0.82F
-    override var profileTranslation = Vec3(0.0, 0.53, 0.0)
+    override var profileScale = 1.0F
+    override var profileTranslation = Vec3(0.0, 0.3, 0.0)
 
     lateinit var standing: Pose
     lateinit var walk: Pose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperModel.kt

@@ -29,8 +29,8 @@ class WooperModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
     override var portraitScale = 2.0F
     override var portraitTranslation = Vec3(-0.15, -0.65, 0.0)
 
-    override var profileScale = 0.75F
-    override var profileTranslation = Vec3(0.0, 0.6, 0.0)
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3(0.0, 0.4, 0.0)
 
     lateinit var shoulderLeft: Pose
     lateinit var shoulderRight: Pose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperPaldeanModel.kt

@@ -29,8 +29,8 @@ class WooperPaldeanModel(root: ModelPart) : PokemonPosableModel(root), HeadedFra
     override var portraitScale = 2.0F
     override var portraitTranslation = Vec3(-0.15, -0.65, 0.0)
 
-    override var profileScale = 0.75F
-    override var profileTranslation = Vec3(0.0, 0.6, 0.0)
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3(0.0, 0.4, 0.0)
 
     lateinit var shoulderLeft: Pose
     lateinit var shoulderRight: Pose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/DusclopsModel.kt

@@ -34,7 +34,7 @@ class DusclopsModel (root: ModelPart) : PokemonPosableModel(root) {
     lateinit var battleidle: Pose
 
     override fun registerPoses() {
-        animations["cry"] = "q.bedrock_stateful('dusclops', 'cry')".asExpressionLike()
+        animations["cry"] = "q.bedrock_stateful('squirtle', 'cry')".asExpressionLike()
 
         val blink = quirk { bedrockStateful("dusclops", "blink") }
 

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/CarbinkModel.kt

@@ -23,7 +23,7 @@ class CarbinkModel (root: ModelPart) : PokemonPosableModel(root) {
     override var portraitScale = 1.8F
     override var portraitTranslation = Vec3(0.0, 0.2, 0.0)
 
-    override var profileScale = 0.68F
+    override var profileScale = 0.85F
     override var profileTranslation = Vec3(0.0, 0.7, 0.0)
 
     lateinit var standing: CobblemonPose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ScatterbugModel.kt

@@ -26,8 +26,8 @@ class ScatterbugModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame
     override var portraitScale = 2.6F
     override var portraitTranslation = Vec3(-0.2, -1.9, 0.0)
 
-    override var profileScale = 0.98F
-    override var profileTranslation = Vec3(0.0, 0.28, 0.0)
+    override var profileScale = 1.2F
+    override var profileTranslation = Vec3(0.0, 0.05, 0.0)
 
     lateinit var standing: CobblemonPose
     lateinit var walk: CobblemonPose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CharcadetModel.kt

@@ -36,8 +36,8 @@ class CharcadetModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame,
     override var portraitScale = 1.7F
     override var portraitTranslation = Vec3(-0.15, 0.08, 0.0)
 
-    override var profileScale = 0.58F
-    override var profileTranslation = Vec3(0.0, 0.91, 0.0)
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3(0.0, 0.6, 0.0)
 
     lateinit var standing: CobblemonPose
     lateinit var walking: CobblemonPose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaquavalModel.kt

@@ -35,8 +35,8 @@ class QuaquavalModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame,
     override var portraitScale = 2.3F
     override var portraitTranslation = Vec3(-0.42, 3.7, 0.0)
 
-    override var profileScale = 0.36F
-    override var profileTranslation = Vec3(0.0, 1.19, 0.0)
+    override var profileScale = 0.32F
+    override var profileTranslation = Vec3(0.0, 1.24, 0.0)
 
     lateinit var standing: CobblemonPose
     lateinit var standing2: CobblemonPose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SquawkabillyModel.kt

@@ -0,0 +1,208 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen9
+
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.WingFlapIdleAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BiWingedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.parabolaFunction
+import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.sineFunction
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.util.math.geometry.toRadians
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class SquawkabillyModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BiWingedFrame {
+    override val rootPart = root.registerChildWithAllChildren("squawkabilly")
+    override val head = getPart("head")
+    override val leftWing = getPart("wing_left")
+    override val rightWing = getPart("wing_right")
+    override val leftLeg = getPart("leg_left")
+    override val rightLeg = getPart("leg_right")
+    private val tail = getPart("tail")
+
+    override var portraitScale = 2.0F
+    override var portraitTranslation = Vec3(-0.2, -0.2, 0.0)
+
+    override var profileScale = 0.85F
+    override var profileTranslation = Vec3(0.0, 0.51, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+    lateinit var hovering: Pose
+    lateinit var flying: Pose
+    lateinit var shoulderLeft: Pose
+    lateinit var shoulderRight: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("squawkabilly", "cry") }
+
+    val shoulderOffsetX = -1.0
+    val shoulderOffsetY = 0
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("squawkabilly", "blink") }
+
+        standing = registerPose(
+            poseName = "standing",
+            quirks = arrayOf(blink),
+            poseTypes = PoseType.UI_POSES + PoseType.STAND,
+            transformTicks = 10,
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("squawkabilly", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            quirks = arrayOf(blink),
+            poseType = PoseType.WALK,
+            transformTicks = 10,
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("squawkabilly", "ground_idle"),
+                rootPart.translation(
+                    function = parabolaFunction(
+                        peak = -4F,
+                        period = 0.4F
+                    ),
+                    timeVariable = { state, _, _ -> state.animationSeconds },
+                    axis = ModelPartTransformation.Y_AXIS
+                ),
+                head.translation(
+                    function = sineFunction(
+                        amplitude = (-20F).toRadians(),
+                        period = 1F,
+                        verticalShift = (-10F).toRadians()
+                    ),
+                    axis = ModelPartTransformation.X_AXIS,
+                    timeVariable = { state, _, _ -> state.animationSeconds }
+                ),
+                leftLeg.rotation(
+                    function = parabolaFunction(
+                        tightness = -20F,
+                        phaseShift = 0F,
+                        verticalShift = (30F).toRadians()
+                    ),
+                    axis = ModelPartTransformation.X_AXIS,
+                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
+                ),
+                rightLeg.rotation(
+                    function = parabolaFunction(
+                        tightness = -20F,
+                        phaseShift = 0F,
+                        verticalShift = (30F).toRadians()
+                    ),
+                    axis = ModelPartTransformation.X_AXIS,
+                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
+                ),
+                tail.rotation(
+                    function = sineFunction(
+                        amplitude = (-5F).toRadians(),
+                        period = 1F
+                    ),
+                    axis = ModelPartTransformation.X_AXIS,
+                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
+                ),
+                wingFlap(
+                    flapFunction = sineFunction(
+                        amplitude = (-5F).toRadians(),
+                        period = 0.4F,
+                        phaseShift = 0.00F,
+                        verticalShift = (-20F).toRadians()
+                    ),
+                    timeVariable = { state, _, _ -> state.animationSeconds },
+                    axis = ModelPartTransformation.Z_AXIS
+                ),
+                rightWing.translation(
+                    function = parabolaFunction(
+                        tightness = -10F,
+                        phaseShift = 30F,
+                        verticalShift = (25F).toRadians()
+                    ),
+                    axis = ModelPartTransformation.Y_AXIS,
+                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
+                ),
+                leftWing.translation(
+                    function = parabolaFunction(
+                        tightness = -10F,
+                        phaseShift = 30F,
+                        verticalShift = (25F).toRadians()
+                    ),
+                    axis = ModelPartTransformation.Y_AXIS,
+                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
+                ),
+            )
+        )
+
+        hovering = registerPose(
+            poseName = "hovering",
+            quirks = arrayOf(blink),
+            poseTypes = setOf(PoseType.FLOAT, PoseType.HOVER),
+            transformTicks = 10,
+            animations = arrayOf(
+                singleBoneLook(),
+                WingFlapIdleAnimation(this,
+                    flapFunction = sineFunction(verticalShift = -10F.toRadians(), period = 0.9F, amplitude = 0.9F),
+                    timeVariable = { state, _, _ -> state.animationSeconds },
+                    axis = ModelPartTransformation.Z_AXIS
+                )
+            )
+        )
+
+        flying = registerPose(
+            poseName = "flying",
+            quirks = arrayOf(blink),
+            poseTypes = setOf(PoseType.FLY, PoseType.SWIM),
+            transformTicks = 10,
+            animations = arrayOf(
+                singleBoneLook(),
+                WingFlapIdleAnimation(this,
+                    flapFunction = sineFunction(verticalShift = -14F.toRadians(), period = 0.9F, amplitude = 0.9F),
+                    timeVariable = { state, _, _ -> state.animationSeconds },
+                    axis = ModelPartTransformation.Z_AXIS
+                )
+            )
+        )
+
+        shoulderLeft = registerPose(
+            poseType = PoseType.SHOULDER_LEFT,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("squawkabilly", "ground_idle")
+            ),
+            transformedParts = arrayOf(
+                rootPart.createTransformation().addPosition(shoulderOffsetX, shoulderOffsetY, 0.0)
+            )
+        )
+
+        shoulderRight = registerPose(
+            poseType = PoseType.SHOULDER_RIGHT,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("squawkabilly", "ground_idle")
+            ),
+            transformedParts = arrayOf(
+                rootPart.createTransformation().addPosition(-shoulderOffsetX, shoulderOffsetY, 0.0)
+            )
+        )
+
+    }
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isNotPosedIn(sleep)) bedrockStateful("squawkabilly", "faint") else null
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/VaryingModelRepository.kt

@@ -397,6 +397,7 @@ object VaryingModelRepository {
         inbuilt("bunnelby", ::BunnelbyModel)
         inbuilt("arrokuda", ::ArrokudaModel)
         inbuilt("barraskewda", ::BarraskewdaModel)
+        inbuilt("squawkabilly", ::SquawkabillyModel)
         inbuilt("ponyta_galarian", ::PonytaGalarianModel)
         inbuilt("rapidash_galarian", ::RapidashGalarianModel)
         inbuilt("volbeat", ::VolbeatModel)

common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt

@@ -117,7 +117,6 @@ import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.core.component.DataComponents
 import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.core.registries.Registries
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.NbtOps
 import net.minecraft.nbt.NbtUtils
@@ -133,7 +132,6 @@ import net.minecraft.network.protocol.game.DebugPackets
 import net.minecraft.network.syncher.EntityDataAccessor
 import net.minecraft.network.syncher.EntityDataSerializers
 import net.minecraft.network.syncher.SynchedEntityData
-import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerEntity
 import net.minecraft.server.level.ServerLevel
@@ -175,7 +173,6 @@ import net.minecraft.world.level.gameevent.GameEvent
 import net.minecraft.world.level.material.EmptyFluid
 import net.minecraft.world.level.material.FluidState
 import net.minecraft.world.level.pathfinder.PathType
-import net.minecraft.world.level.storage.loot.LootTable
 import net.minecraft.world.phys.AABB
 import net.minecraft.world.phys.Vec3
 import java.util.*
@@ -245,12 +242,6 @@ open class PokemonEntity(
 
     override val schedulingTracker = SchedulingTracker()
 
-    override fun getDefaultLootTable(): ResourceKey<LootTable?>? {
-        println(cobblemonResource("pokemon/${this.pokemon.species.resourceIdentifier.path}"))
-//        return ResourceKey.create(Registries.LOOT_TABLE, )
-        return super.getDefaultLootTable()
-    }
-
     val form: FormData
         get() = pokemon.form
     val behaviour: FormPokemonBehaviour

common/src/main/kotlin/com/cobblemon/mod/common/loot/CobblemonLootItemConditions.kt

@@ -1,36 +0,0 @@
-package com.cobblemon.mod.common.loot
-
-import com.cobblemon.mod.common.loot.conditions.BiomeLootItemCondition
-import com.cobblemon.mod.common.loot.conditions.PokemonPropertiesLootItemCondition
-import com.cobblemon.mod.common.platform.PlatformRegistry
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.core.Registry
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
-import net.minecraft.world.item.crafting.RecipeType
-import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType
-
-object CobblemonLootItemConditions :
-    PlatformRegistry<Registry<LootItemConditionType>, ResourceKey<Registry<LootItemConditionType>>, LootItemConditionType>() {
-
-    @JvmField
-    val POKEMON_PROPERTIES_CONDITION = create(
-        cobblemonResource("pokemon_properties"),
-        LootItemConditionType(PokemonPropertiesLootItemCondition.CODEC)
-    )
-
-    @JvmField
-    val BIOME_CONDITION = create(
-        cobblemonResource("biome"),
-        LootItemConditionType(BiomeLootItemCondition.CODEC)
-    )
-
-    fun touch() = Unit
-
-    override val registry: Registry<LootItemConditionType>
-        get() = BuiltInRegistries.LOOT_CONDITION_TYPE
-    override val resourceKey: ResourceKey<Registry<LootItemConditionType>>
-        get() = Registries.LOOT_CONDITION_TYPE
-
-}

common/src/main/kotlin/com/cobblemon/mod/common/loot/conditions/BiomeLootItemCondition.kt

@@ -1,38 +0,0 @@
-package com.cobblemon.mod.common.loot.conditions
-
-import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
-import com.cobblemon.mod.common.api.conditional.makeCodecForRegistryLikeCondition
-import com.cobblemon.mod.common.loot.CobblemonLootItemConditions
-import com.cobblemon.mod.common.util.toBlockPos
-import com.mojang.serialization.MapCodec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.core.registries.Registries
-import net.minecraft.world.level.biome.Biome
-import net.minecraft.world.level.storage.loot.LootContext
-import net.minecraft.world.level.storage.loot.parameters.LootContextParams
-import net.minecraft.world.level.storage.loot.predicates.LootItemCondition
-import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType
-
-class BiomeLootItemCondition(
-    val biome: RegistryLikeCondition<Biome>
-) : LootItemCondition {
-    override fun getType(): LootItemConditionType {
-        return CobblemonLootItemConditions.BIOME_CONDITION
-    }
-
-    override fun test(t: LootContext): Boolean {
-        val temp = biome.fits(t.level.getBiome(t.getParam(LootContextParams.ORIGIN).toBlockPos()))
-        return temp
-    }
-
-    companion object {
-        private val BIOME_CODEC = makeCodecForRegistryLikeCondition("biome", Registries.BIOME)
-
-        val CODEC: MapCodec<BiomeLootItemCondition> = RecordCodecBuilder.mapCodec { instance ->
-            instance.group(
-                BIOME_CODEC.fieldOf("biome")
-                    .forGetter(BiomeLootItemCondition::biome)
-                ).apply(instance, ::BiomeLootItemCondition)
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/loot/conditions/PokemonPropertiesLootItemCondition.kt

@@ -1,33 +0,0 @@
-package com.cobblemon.mod.common.loot.conditions
-
-import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.loot.CobblemonLootItemConditions
-import com.mojang.serialization.MapCodec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.world.level.storage.loot.LootContext
-import net.minecraft.world.level.storage.loot.parameters.LootContextParams
-import net.minecraft.world.level.storage.loot.predicates.LootItemCondition
-import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType
-
-class PokemonPropertiesLootItemCondition(
-    val properties: PokemonProperties
-) : LootItemCondition {
-    override fun getType(): LootItemConditionType {
-        return CobblemonLootItemConditions.POKEMON_PROPERTIES_CONDITION
-    }
-
-    override fun test(t: LootContext): Boolean {
-        val pokemon = t.getParamOrNull(LootContextParams.THIS_ENTITY) as? PokemonEntity ?: return false
-        return properties.matches(pokemon)
-    }
-
-    companion object {
-        val CODEC: MapCodec<PokemonPropertiesLootItemCondition> = RecordCodecBuilder.mapCodec { instance ->
-            instance.group(
-                PokemonProperties.CODEC.fieldOf("properties")
-                    .forGetter(PokemonPropertiesLootItemCondition::properties)
-            ).apply(instance, ::PokemonPropertiesLootItemCondition)
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/battle/BattleSelectActionsHandler.kt

@@ -8,12 +8,9 @@
 
 package com.cobblemon.mod.common.net.serverhandling.battle
 
-import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
 import com.cobblemon.mod.common.api.text.red
 import com.cobblemon.mod.common.battles.BattleRegistry
-import com.cobblemon.mod.common.battles.HealItemActionResponse
-import com.cobblemon.mod.common.battles.MoveActionResponse
 import com.cobblemon.mod.common.exception.IllegalActionChoiceException
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleQueueRequestPacket
@@ -28,27 +25,6 @@ object BattleSelectActionsHandler : ServerNetworkPacketHandler<BattleSelectActio
         if (!actor.mustChoose) {
             return
         }
-
-        // Battle command injection attempt detection
-        packet.showdownActionResponses.asSequence()
-            .flatMap {
-                when (it) {
-                    is MoveActionResponse -> sequenceOf(it.moveName, it.targetPnx, it.gimmickID)
-                    is HealItemActionResponse -> sequenceOf(it.item)
-                    else -> emptySequence()
-                }
-            }
-            .filterNotNull()
-            .firstOrNull { field -> field.any(Char::isISOControl) }
-            ?.let {
-                // Escapes control chars as \uXXXX to prevent forging logs.
-                val printable = it.replace(Regex("\\p{Cc}")) { "\\u%04x".format(it.value[0].code) }
-                Cobblemon.LOGGER.warn("Blocked battle command injection from ${player.name.string}: $printable")
-                actor.sendUpdate(BattleQueueRequestPacket(actor.request!!))
-                actor.sendUpdate(BattleMakeChoicePacket())
-                return
-            }
-
         try {
             actor.setActionResponses(packet.showdownActionResponses)
         } catch (e: IllegalActionChoiceException) {

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_actor.particle.json

@@ -1,90 +0,0 @@
-{
-	"format_version": "1.10.0",
-	"particle_effect": {
-		"description": {
-			"identifier": "cobblemon:watershuriken_actor",
-			"basic_render_parameters": {
-				"material": "particles_blend",
-				"texture": "textures/particles/moves/watershuriken"
-			}
-		},
-		"curves": {
-			"variable.rsize": {
-				"type": "linear",
-				"input": "v.particle_age",
-				"horizontal_range": "v.particle_lifetime",
-				"nodes": [0, 1, 1, 1, 1, 1, 1, 1]
-			}
-		},
-		"events": {
-			"trail": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_actortrail",
-					"type": "particle"
-				}
-			},
-			"hit": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_target",
-					"type": "particle"
-				}
-			}
-		},
-		"components": {
-			"minecraft:emitter_initialization": {
-				"creation_expression": "v.target_deltaz=5;"
-			},
-			"minecraft:emitter_rate_instant": {
-				"num_particles": 1
-			},
-			"minecraft:emitter_lifetime_once": {
-				"active_time": 0.25
-			},
-			"minecraft:emitter_shape_disc": {
-				"offset": [0, 0.02, 0.1],
-				"radius": 0.5,
-				"direction": "outwards"
-			},
-			"minecraft:particle_lifetime_expression": {
-				"max_lifetime": 0.35
-			},
-			"minecraft:particle_lifetime_events": {
-				"timeline": {
-					"0.00": "trail",
-					"0.06": "trail",
-					"0.12": "trail",
-					"0.18": "trail",
-					"0.24": "trail",
-					"0.30": "trail",
-					"0.34": "hit"
-				}
-			},
-			"minecraft:particle_initial_spin": {
-				"rotation": "math.random_integer(0,3)*90"
-			},
-			"minecraft:particle_motion_parametric": {
-				"relative_position": ["-v.target_deltax*(v.particle_age / v.particle_lifetime)", "(v.target_deltay*(v.particle_age / v.particle_lifetime))", "-v.target_deltaz*(v.particle_age / v.particle_lifetime)"]
-			},
-			"minecraft:particle_appearance_billboard": {
-				"size": ["0.4*v.rsize", "0.4*v.rsize"],
-				"facing_camera_mode": "lookat_direction",
-				"direction": {
-					"mode": "custom",
-					"custom_direction": [0, 0, -1]
-				},
-				"uv": {
-					"texture_width": 60,
-					"texture_height": 15,
-					"flipbook": {
-						"base_UV": [0, 0],
-						"size_UV": [15, 15],
-						"step_UV": [15, 0],
-						"frames_per_second": 24,
-						"max_frame": 4,
-						"loop": true
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_actoralt.particle.json

@@ -1,91 +0,0 @@
-{
-	"format_version": "1.10.0",
-	"particle_effect": {
-		"description": {
-			"identifier": "cobblemon:watershuriken_actoralt",
-			"basic_render_parameters": {
-				"material": "particles_blend",
-				"texture": "textures/particles/moves/watershuriken"
-			}
-		},
-		"curves": {
-			"variable.rsize": {
-				"type": "linear",
-				"input": "v.particle_age",
-				"horizontal_range": "v.particle_lifetime",
-				"nodes": [0, 1, 1, 1, 1, 1, 1, 1]
-			}
-		},
-		"events": {
-			"trail": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_actortrail",
-					"type": "particle"
-				}
-			},
-			"hit": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_target",
-					"type": "particle"
-				}
-			}
-		},
-		"components": {
-			"minecraft:emitter_initialization": {
-				"creation_expression": "v.target_deltaz=5;"
-			},
-			"minecraft:emitter_rate_steady": {
-				"spawn_rate": 7,
-				"max_particles": 3
-			},
-			"minecraft:emitter_lifetime_once": {
-				"active_time": 0.4
-			},
-			"minecraft:emitter_shape_disc": {
-				"offset": [0, 0.02, 0.1],
-				"radius": 0.5,
-				"direction": "outwards"
-			},
-			"minecraft:particle_lifetime_expression": {
-				"max_lifetime": 0.35
-			},
-			"minecraft:particle_lifetime_events": {
-				"timeline": {
-					"0.00": "trail",
-					"0.06": "trail",
-					"0.12": "trail",
-					"0.18": "trail",
-					"0.24": "trail",
-					"0.30": "trail",
-					"0.34": "hit"
-				}
-			},
-			"minecraft:particle_initial_spin": {
-				"rotation": "math.random_integer(0,3)*90"
-			},
-			"minecraft:particle_motion_parametric": {
-				"relative_position": ["-(v.target_deltax+((v.particle_random_1-0.5)*1.33))*(v.particle_age / v.particle_lifetime)", "(v.target_deltay+((v.particle_random_2-0.5)*1.33))*(v.particle_age / v.particle_lifetime)", "-v.target_deltaz*(v.particle_age / v.particle_lifetime)"]
-			},
-			"minecraft:particle_appearance_billboard": {
-				"size": ["0.4*v.rsize", "0.4*v.rsize"],
-				"facing_camera_mode": "lookat_direction",
-				"direction": {
-					"mode": "custom",
-					"custom_direction": [0, 0, -1]
-				},
-				"uv": {
-					"texture_width": 60,
-					"texture_height": 15,
-					"flipbook": {
-						"base_UV": [0, 0],
-						"size_UV": [15, 15],
-						"step_UV": [15, 0],
-						"frames_per_second": 24,
-						"max_frame": 4,
-						"loop": true
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_actorhor.particle.json

@@ -1,86 +0,0 @@
-{
-	"format_version": "1.10.0",
-	"particle_effect": {
-		"description": {
-			"identifier": "cobblemon:watershuriken_actorhor",
-			"basic_render_parameters": {
-				"material": "particles_blend",
-				"texture": "textures/particles/moves/watershuriken"
-			}
-		},
-		"curves": {
-			"variable.rsize": {
-				"type": "linear",
-				"input": "v.particle_age",
-				"horizontal_range": "v.particle_lifetime",
-				"nodes": [0, 1, 1, 1, 1, 1, 1, 1]
-			}
-		},
-		"events": {
-			"trail": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_actortrail",
-					"type": "particle"
-				}
-			},
-			"hit": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_target",
-					"type": "particle"
-				}
-			}
-		},
-		"components": {
-			"minecraft:emitter_initialization": {
-				"creation_expression": "v.target_deltaz=5;"
-			},
-			"minecraft:emitter_rate_instant": {
-				"num_particles": 1
-			},
-			"minecraft:emitter_lifetime_once": {
-				"active_time": 0.25
-			},
-			"minecraft:emitter_shape_disc": {
-				"offset": [0, 0.02, 0.1],
-				"radius": 0.5,
-				"direction": "outwards"
-			},
-			"minecraft:particle_lifetime_expression": {
-				"max_lifetime": 0.35
-			},
-			"minecraft:particle_lifetime_events": {
-				"timeline": {
-					"0.00": "trail",
-					"0.06": "trail",
-					"0.12": "trail",
-					"0.18": "trail",
-					"0.24": "trail",
-					"0.30": "trail",
-					"0.34": "hit"
-				}
-			},
-			"minecraft:particle_initial_spin": {
-				"rotation": "math.random_integer(0,3)*90"
-			},
-			"minecraft:particle_motion_parametric": {
-				"relative_position": ["-v.target_deltax*(v.particle_age / v.particle_lifetime)", "(v.target_deltay*(v.particle_age / v.particle_lifetime))", "-v.target_deltaz*(v.particle_age / v.particle_lifetime)"]
-			},
-			"minecraft:particle_appearance_billboard": {
-				"size": ["0.4*v.rsize", "0.4*v.rsize"],
-				"facing_camera_mode": "emitter_transform_xz",
-				"uv": {
-					"texture_width": 60,
-					"texture_height": 15,
-					"flipbook": {
-						"base_UV": [0, 0],
-						"size_UV": [15, 15],
-						"step_UV": [15, 0],
-						"frames_per_second": 24,
-						"max_frame": 4,
-						"loop": true
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_actortrail.particle.json

@@ -1,63 +0,0 @@
-{
-	"format_version": "1.10.0",
-	"particle_effect": {
-		"description": {
-			"identifier": "cobblemon:watershuriken_actortrail",
-			"basic_render_parameters": {
-				"material": "particles_alpha",
-				"texture": "textures/particles/generic/impact/impact_water"
-			}
-		},
-		"curves": {
-			"variable.scale": {
-				"type": "linear",
-				"input": "v.particle_age",
-				"horizontal_range": "v.particle_lifetime",
-				"nodes": [1, 0]
-			}
-		},
-		"components": {
-			"minecraft:emitter_rate_instant": {
-				"num_particles": 1
-			},
-			"minecraft:emitter_lifetime_once": {
-				"active_time": 1
-			},
-			"minecraft:emitter_shape_point": {
-				"direction": ["v.particle_random_1-0.5", "v.particle_random_2-0.25", -3]
-			},
-			"minecraft:particle_lifetime_expression": {
-				"max_lifetime": "math.random(0.3, 0.6)"
-			},
-			"minecraft:particle_initial_spin": {
-				"rotation": "math.round(v.particle_random_4*3)*90"
-			},
-			"minecraft:particle_initial_speed": 8,
-			"minecraft:particle_motion_dynamic": {
-				"linear_acceleration": [0, -5, 0],
-				"linear_drag_coefficient": 8
-			},
-			"minecraft:particle_appearance_billboard": {
-				"size": ["0.22 * variable.scale", "0.22 * variable.scale"],
-				"facing_camera_mode": "rotate_xyz",
-				"uv": {
-					"texture_width": 8,
-					"texture_height": 56,
-					"flipbook": {
-						"base_UV": [0, 24],
-						"size_UV": [8, 8],
-						"step_UV": [0, 8],
-						"frames_per_second": 16,
-						"max_frame": 4
-					}
-				}
-			},
-			"minecraft:particle_motion_collision": {
-				"collision_radius": 0.02
-			},
-			"minecraft:particle_appearance_tinting": {
-				"color": [0.61176, 0.87451, 1, 1]
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_actorvert.particle.json

@@ -1,86 +0,0 @@
-{
-	"format_version": "1.10.0",
-	"particle_effect": {
-		"description": {
-			"identifier": "cobblemon:watershuriken_actorvert",
-			"basic_render_parameters": {
-				"material": "particles_blend",
-				"texture": "textures/particles/moves/watershuriken"
-			}
-		},
-		"curves": {
-			"variable.rsize": {
-				"type": "linear",
-				"input": "v.particle_age",
-				"horizontal_range": "v.particle_lifetime",
-				"nodes": [0, 1, 1, 1, 1, 1, 1, 1]
-			}
-		},
-		"events": {
-			"trail": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_actortrail",
-					"type": "particle"
-				}
-			},
-			"hit": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_target",
-					"type": "particle"
-				}
-			}
-		},
-		"components": {
-			"minecraft:emitter_initialization": {
-				"creation_expression": "v.target_deltaz=5;"
-			},
-			"minecraft:emitter_rate_instant": {
-				"num_particles": 1
-			},
-			"minecraft:emitter_lifetime_once": {
-				"active_time": 0.25
-			},
-			"minecraft:emitter_shape_disc": {
-				"offset": [0, 0.02, 0.1],
-				"radius": 0.5,
-				"direction": "outwards"
-			},
-			"minecraft:particle_lifetime_expression": {
-				"max_lifetime": 0.35
-			},
-			"minecraft:particle_lifetime_events": {
-				"timeline": {
-					"0.00": "trail",
-					"0.06": "trail",
-					"0.12": "trail",
-					"0.18": "trail",
-					"0.24": "trail",
-					"0.30": "trail",
-					"0.34": "hit"
-				}
-			},
-			"minecraft:particle_initial_spin": {
-				"rotation": "math.random_integer(0,3)*90"
-			},
-			"minecraft:particle_motion_parametric": {
-				"relative_position": ["-v.target_deltax*(v.particle_age / v.particle_lifetime)", "(v.target_deltay*(v.particle_age / v.particle_lifetime))", "-v.target_deltaz*(v.particle_age / v.particle_lifetime)"]
-			},
-			"minecraft:particle_appearance_billboard": {
-				"size": ["0.4*v.rsize", "0.4*v.rsize"],
-				"facing_camera_mode": "emitter_transform_yz",
-				"uv": {
-					"texture_width": 60,
-					"texture_height": 15,
-					"flipbook": {
-						"base_UV": [0, 0],
-						"size_UV": [15, 15],
-						"step_UV": [15, 0],
-						"frames_per_second": 24,
-						"max_frame": 4,
-						"loop": true
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_target.particle.json

@@ -1,69 +0,0 @@
-{
-	"format_version": "1.10.0",
-	"particle_effect": {
-		"description": {
-			"identifier": "cobblemon:watershuriken_target",
-			"basic_render_parameters": {
-				"material": "particles_alpha",
-				"texture": "textures/particles/generic/impact/impact_water"
-			}
-		},
-		"curves": {
-			"variable.scale": {
-				"type": "linear",
-				"input": "v.particle_age",
-				"horizontal_range": "v.particle_lifetime",
-				"nodes": [1, 0]
-			}
-		},
-		"events": {
-			"event": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_targetspark",
-					"type": "particle"
-				}
-			}
-		},
-		"components": {
-			"minecraft:emitter_rate_steady": {
-				"spawn_rate": 240,
-				"max_particles": 14
-			},
-			"minecraft:emitter_lifetime_once": {
-				"active_time": 0.1
-			},
-			"minecraft:emitter_lifetime_events": {
-				"creation_event": "event"
-			},
-			"minecraft:emitter_shape_point": {},
-			"minecraft:particle_lifetime_expression": {
-				"max_lifetime": "math.random(0.3, 0.6)"
-			},
-			"minecraft:particle_initial_spin": {
-				"rotation": "math.round(v.particle_random_4*3)*90"
-			},
-			"minecraft:particle_initial_speed": "math.random(9,17)",
-			"minecraft:particle_motion_dynamic": {
-				"linear_drag_coefficient": 5
-			},
-			"minecraft:particle_appearance_billboard": {
-				"size": ["0.3 * variable.scale", "0.3 * variable.scale"],
-				"facing_camera_mode": "rotate_xyz",
-				"uv": {
-					"texture_width": 8,
-					"texture_height": 56,
-					"flipbook": {
-						"base_UV": [0, 16],
-						"size_UV": [8, 8],
-						"step_UV": [0, 8],
-						"frames_per_second": 16,
-						"max_frame": 5
-					}
-				}
-			},
-			"minecraft:particle_appearance_tinting": {
-				"color": [0.61176, 0.87451, 1, 1]
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_targetspark.particle.json

@@ -1,62 +0,0 @@
-{
-	"format_version": "1.10.0",
-	"particle_effect": {
-		"description": {
-			"identifier": "cobblemon:watershuriken_targetspark",
-			"basic_render_parameters": {
-				"material": "particles_blend",
-				"texture": "textures/particles/vanilla/critical_hit"
-			}
-		},
-		"curves": {
-			"variable.bitespark": {
-				"type": "linear",
-				"input": "v.particle_age",
-				"horizontal_range": "v.particle_lifetime",
-				"nodes": [0, 1, 0.88, 0.66, 0.35, -0.05]
-			}
-		},
-		"components": {
-			"minecraft:emitter_rate_instant": {
-				"num_particles": 7
-			},
-			"minecraft:emitter_lifetime_once": {
-				"active_time": 1
-			},
-			"minecraft:emitter_shape_point": {
-				"offset": [0, 0, -0.25],
-				"direction": ["v.particle_random_1-0.5", "v.particle_random_2-0.25", "v.particle_random_3-0.5"]
-			},
-			"minecraft:particle_lifetime_expression": {
-				"max_lifetime": "0.5-(v.particle_random_4*0.1)"
-			},
-			"minecraft:particle_initial_speed": "math.random(1.75,3.55)*3",
-			"minecraft:particle_motion_dynamic": {
-				"linear_acceleration": [0, -5, 0],
-				"linear_drag_coefficient": 4
-			},
-			"minecraft:particle_appearance_billboard": {
-				"size": ["0.125*v.bitespark", "0.125*v.bitespark"],
-				"facing_camera_mode": "rotate_xyz",
-				"uv": {
-					"texture_width": 8,
-					"texture_height": 8,
-					"uv": [0, 0],
-					"uv_size": [7, 7]
-				}
-			},
-			"minecraft:particle_motion_collision": {
-				"collision_radius": 0.01
-			},
-			"minecraft:particle_appearance_tinting": {
-				"color": {
-					"interpolant": "v.particle_age / v.particle_lifetime",
-					"gradient": {
-						"0.0": "#FF51D8FF",
-						"1.0": "#FF0076FF"
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0021_spearow/spearow.animation.json

@@ -37,10 +37,10 @@
 					"rotation": [0, -7.5, 0]
 				},
 				"tail2": {
-					"rotation": ["30-math.sin(q.anim_time*90*2-60)*-3", 0, 0]
+					"rotation": [30, 0, 0]
 				},
 				"tail3": {
-					"rotation": ["12.5-math.sin(q.anim_time*90*2-120)*-3", 0, 0]
+					"rotation": [12.5, 0, 0]
 				},
 				"leg_right": {
 					"rotation": [0, 5, 0]
@@ -53,22 +53,6 @@
 				},
 				"wings_open": {
 					"scale": 0
-				},
-				"torso": {
-					"rotation": ["-math.sin(q.anim_time*90*2-90)*1", 0, "math.sin(q.anim_time*90*1-90)*1"],
-					"position": [0, "math.sin(q.anim_time*90*2)*0.1", 0]
-				},
-				"wing_closed_left": {
-					"rotation": ["-0-math.sin(q.anim_time*90*2-150)*1", 0, 0]
-				},
-				"wing_closed_right": {
-					"rotation": ["-0-math.sin(q.anim_time*90*2-150)*1", 0, 0]
-				},
-				"neck": {
-					"rotation": ["-math.sin(q.anim_time*90*2-180)*1", 0, 0]
-				},
-				"head": {
-					"rotation": ["-math.sin(q.anim_time*90*2-90)*-2", 0, "math.sin(q.anim_time*90*1-60)*-1"]
 				}
 			}
 		},
@@ -127,30 +111,6 @@
 						}
 					}
 				},
-				"torso": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.3333": {
-							"post": [5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5833": {
-							"post": [2.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.8333": {
-							"post": [-5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.1667": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
 				"jaw": {
 					"rotation": {
 						"0.0": {
@@ -158,15 +118,19 @@
 							"lerp_mode": "catmullrom"
 						},
 						"0.1667": {
-							"post": [72.5, 0, 0],
+							"post": [85, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4167": {
+							"post": [85, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
 						"0.5833": {
 							"post": [0, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"0.8333": {
-							"post": [52.5, 0, 0],
+						"0.75": {
+							"post": [85, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
 						"1.1667": {
@@ -174,32 +138,6 @@
 							"lerp_mode": "catmullrom"
 						}
 					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.5833": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, -0.1]
-						},
-						"0.75": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.5833": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, -0.1]
-						},
-						"0.75": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
 				}
 			},
 			"sound_effects": {
@@ -265,546 +203,6 @@
 					"position": [-0.1, 0, -0.1]
 				}
 			}
-		},
-		"animation.spearow.hold_item": {
-			"loop": true,
-			"bones": {
-				"jaw": {
-					"rotation": [30, 0, 0]
-				}
-			}
-		},
-		"animation.spearow.ground_walk": {
-			"loop": true,
-			"animation_length": 0.75,
-			"bones": {
-				"torso": {
-					"rotation": ["1-math.cos(q.anim_time*90*16/3*2)*-2", "-math.sin(q.anim_time*90*16/3+60)*3", "-1+math.sin(q.anim_time*90*16/3+30)*-4"],
-					"position": [0, "math.sin(q.anim_time*90*16/3*2)*0.2", 0]
-				},
-				"wings_open": {
-					"scale": 0
-				},
-				"wing_closed_left": {
-					"rotation": [3, 0, 0]
-				},
-				"wing_closed_right": {
-					"rotation": [3, 0, 0]
-				},
-				"tail2": {
-					"rotation": ["22-math.cos(q.anim_time*90*16/3*2)*5", 0, 0]
-				},
-				"tail3": {
-					"rotation": ["5-math.cos(q.anim_time*90*16/3*2)*5", 0, 0]
-				},
-				"neck": {
-					"rotation": {
-						"0.0": ["-math.cos(q.anim_time*90*16/3*2)*-12.5", "-math.sin(q.anim_time*90*16/3+60)*-3", "math.sin(q.anim_time*90*16/3+30)*3"],
-						"0.125": ["-math.cos(q.anim_time*90*16/3*2)*-9.5", "-math.sin(q.anim_time*90*16/3+60)*-3", "math.sin(q.anim_time*90*16/3+30)*3"],
-						"0.1667": ["-math.cos(q.anim_time*90*16/3*2)*-12.5", "-math.sin(q.anim_time*90*16/3+60)*-3", "math.sin(q.anim_time*90*16/3+30)*3"],
-						"0.375": ["-math.cos(q.anim_time*90*16/3*2)*-12.5", "-math.sin(q.anim_time*90*16/3+60)*-3", "math.sin(q.anim_time*90*16/3+30)*3"],
-						"0.5": ["-math.cos(q.anim_time*90*16/3*2)*-9.5", "-math.sin(q.anim_time*90*16/3+60)*-3", "math.sin(q.anim_time*90*16/3+30)*3"],
-						"0.5417": ["-math.cos(q.anim_time*90*16/3*2)*-12.5", "-math.sin(q.anim_time*90*16/3+60)*-3", "math.sin(q.anim_time*90*16/3+30)*3"]
-					},
-					"position": {
-						"0.0": [0, "math.cos(q.anim_time*90*16/3*2)*0.2", 0],
-						"0.0417": [0, -0.075, 0.025],
-						"0.0833": [0, "-0.2+math.cos(q.anim_time*90*16/3*2)*0.2", -0.2],
-						"0.125": [0, -0.22, -0.17],
-						"0.1667": [0, -0.21, -0.185],
-						"0.375": [0, "math.cos(q.anim_time*90*16/3*2)*0.2", 0],
-						"0.4167": [0, -0.075, 0.025],
-						"0.4583": [0, "-0.2+math.cos(q.anim_time*90*16/3*2)*0.2", -0.2],
-						"0.5": [0, -0.22, -0.17],
-						"0.5417": [0, -0.21, -0.185],
-						"0.75": [0, "math.cos(q.anim_time*90*16/3*2)*0.2", 0]
-					}
-				},
-				"head": {
-					"rotation": ["5-math.cos(q.anim_time*90*16/3*2)*18", 0, 0],
-					"position": [0, 0, "-0.2+math.cos(q.anim_time*90*16/3*2)*0.3"]
-				},
-				"scruff_left": {
-					"rotation": [0, "-0-math.cos(q.anim_time*90*16/3*2-30)*7", 0]
-				},
-				"scruff_right": {
-					"rotation": [0, "0+math.cos(q.anim_time*90*16/3*2-30)*7", 0]
-				},
-				"scruff_top_right": {
-					"rotation": ["-0-math.cos(q.anim_time*90*16/3*2-30)*5", 0, 0]
-				},
-				"scruff_bottom": {
-					"rotation": ["-0-math.cos(q.anim_time*90*16/3*2)*-12", 0, 0]
-				},
-				"leg_left": {
-					"rotation": {
-						"0.0": [25, -17.5, 0],
-						"0.125": {
-							"pre": [21.25, -12.5, 0],
-							"post": [21.25, -12.5, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [-40, -5, 0],
-						"0.75": [25, -17.5, 0]
-					},
-					"position": {
-						"0.0": [0.3, 0.1, 0.6],
-						"0.0417": [0.23, 0.25, 0.71],
-						"0.125": {
-							"pre": [0, 0.68, -0.08],
-							"post": [0, 0.68, -0.08],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [0, 0.97, -1.41],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [0, -0.5, -2.15],
-						"0.5": [0, -0.19, -1.02],
-						"0.5833": [0, -0.07, -0.3],
-						"0.625": [0, -0.02, 0.21],
-						"0.7083": [0.1, 0.215, 0.43],
-						"0.75": [0.3, 0.1, 0.6]
-					}
-				},
-				"leg_left2": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.125": {
-							"pre": [-30.83, 0, 0],
-							"post": [-30.83, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [-2.65, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [12.5, 0, 0],
-						"0.75": [0, 0, 0]
-					}
-				},
-				"foot_left": {
-					"rotation": {
-						"0.0": [27.5, 0, -5],
-						"0.125": {
-							"pre": [20.17, 0, 0],
-							"post": [20.17, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [12.596, 0.6637, -1.3486],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [28, 0, 0],
-						"0.625": [-7.33, 0, 0],
-						"0.75": [27.5, 0, -5]
-					},
-					"position": {
-						"0.0": [0, 0.25, 0],
-						"0.125": [0, 0, 0],
-						"0.375": [0, 0, 0],
-						"0.625": [0, 0.17, 0],
-						"0.75": [0, 0.25, 0]
-					}
-				},
-				"toe_back_left": {
-					"rotation": {
-						"0.0": [-20, 0, 0],
-						"0.2083": {
-							"pre": [-8.33, 0, 0],
-							"post": [-8.33, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [0, 0, 0],
-						"0.625": [0, 0, 0],
-						"0.75": [-20, 0, 0]
-					}
-				},
-				"toe_inner_left": {
-					"rotation": {
-						"0.0": [-55, 10, -7.5],
-						"0.125": {
-							"pre": [7.5, 15, 0],
-							"post": [7.5, 15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [5, 15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [0, 15, 0],
-						"0.625": [0, 15, 0],
-						"0.75": [-55, 10, -7.5]
-					},
-					"position": {
-						"0.0": [0, -0.75, 1.35],
-						"0.125": [0, 0, 0],
-						"0.625": [0, 0, 0],
-						"0.75": [0, -0.75, 1.35]
-					}
-				},
-				"toe_outer_left": {
-					"rotation": {
-						"0.0": [-51.5, -2.5, 10],
-						"0.125": {
-							"pre": [5, -15, 0],
-							"post": [5, -15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [5, -15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [0, -15, 0],
-						"0.625": [0, -15, 0],
-						"0.75": [-51.5, -2.5, 10]
-					},
-					"position": {
-						"0.0": [0, -0.75, 1.35],
-						"0.125": [0, 0, 0],
-						"0.625": [0, 0, 0],
-						"0.75": [0, -0.75, 1.35]
-					}
-				},
-				"leg_right": {
-					"rotation": {
-						"0.0": [-40, 5, 0],
-						"0.375": [25, 17.5, 0],
-						"0.5": {
-							"pre": [21.25, 12.5, 0],
-							"post": [21.25, 12.5, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [-40, 5, 0]
-					},
-					"position": {
-						"0.0": [0, -0.5, -2.15],
-						"0.125": [0, -0.19, -1.02],
-						"0.2083": [0, -0.07, -0.3],
-						"0.25": [0, -0.02, 0.21],
-						"0.3333": [-0.1, 0.215, 0.43],
-						"0.375": [-0.3, 0.1, 0.6],
-						"0.4167": [-0.23, 0.25, 0.71],
-						"0.5": {
-							"pre": [0, 0.68, -0.08],
-							"post": [0, 0.68, -0.08],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [0, 0.97, -1.41],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [0, -0.5, -2.15]
-					}
-				},
-				"leg_right2": {
-					"rotation": {
-						"0.0": [12.5, 0, 0],
-						"0.375": [0, 0, 0],
-						"0.5": {
-							"pre": [-30.83, 0, 0],
-							"post": [-30.83, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [-2.65, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [12.5, 0, 0]
-					}
-				},
-				"foot_right": {
-					"rotation": {
-						"0.0": [28, 0, 0],
-						"0.25": [-7.33, 0, 0],
-						"0.375": [27.5, 0, 5],
-						"0.5": {
-							"pre": [20.17, 0, 0],
-							"post": [20.17, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [12.596, -0.6637, 1.3486],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [28, 0, 0]
-					},
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, 0.17, 0],
-						"0.375": [0, 0.25, 0],
-						"0.5": [0, 0, 0],
-						"0.75": [0, 0, 0]
-					}
-				},
-				"toe_back_right": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, 0, 0],
-						"0.375": [-20, 0, 0],
-						"0.5833": {
-							"pre": [-8.33, 0, 0],
-							"post": [-8.33, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [0, 0, 0]
-					}
-				},
-				"toe_inner_right": {
-					"rotation": {
-						"0.0": [0, -15, 0],
-						"0.25": [0, -15, 0],
-						"0.375": [-55, -10, 7.5],
-						"0.5": {
-							"pre": [7.5, -15, 0],
-							"post": [7.5, -15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [5, -15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [0, -15, 0]
-					},
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, 0, 0],
-						"0.375": [0, -0.75, 1.35],
-						"0.5": [0, 0, 0],
-						"0.75": [0, 0, 0]
-					}
-				},
-				"toe_outer_right": {
-					"rotation": {
-						"0.0": [0, 15, 0],
-						"0.25": [0, 15, 0],
-						"0.375": [-51.5, 2.5, -10],
-						"0.5": {
-							"pre": [5, 15, 0],
-							"post": [5, 15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [5, 15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [0, 15, 0]
-					},
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, 0, 0],
-						"0.375": [0, -0.75, 1.35],
-						"0.5": [0, 0, 0],
-						"0.75": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.spearow.air_idle": {
-			"loop": true,
-			"animation_length": 4,
-			"bones": {
-				"body": {
-					"position": ["-math.sin(q.anim_time*90*3-45)*0.5", "math.sin(q.anim_time*90*6-45)*1.5", "math.sin(q.anim_time*90*6-45)*1/2"]
-				},
-				"torso": {
-					"rotation": ["-math.sin(q.anim_time*90*6-120)*-4", 0, "math.sin(q.anim_time*90*3-90)*4"]
-				},
-				"wing_open_left": {
-					"rotation": ["-math.sin(q.anim_time*90*6-90)*6", 0, "math.sin(q.anim_time*90*6)*65"],
-					"position": [0, "math.sin(q.anim_time*90*6)*-1", 0]
-				},
-				"wing_open_left2": {
-					"rotation": [0, 0, "20+math.sin(q.anim_time*90*6-45)*30"]
-				},
-				"wing_open_left3": {
-					"rotation": [0, 0, "0+math.sin(q.anim_time*90*6-75)*30"]
-				},
-				"wing_open_right": {
-					"rotation": ["-math.sin(q.anim_time*90*6-90)*6", 0, "-math.sin(q.anim_time*90*6)*65"],
-					"position": [0, "math.sin(q.anim_time*90*6)*-1", 0]
-				},
-				"wing_open_right2": {
-					"rotation": [0, 0, "-20-math.sin(q.anim_time*90*6-45)*30"]
-				},
-				"wing_open_right3": {
-					"rotation": [0, 0, "-0-math.sin(q.anim_time*90*6-75)*30"]
-				},
-				"tail2": {
-					"rotation": ["-math.sin(q.anim_time*90*6-30)*5", 0, 0]
-				},
-				"tail3": {
-					"rotation": ["-math.sin(q.anim_time*90*6-90)*5", 0, 0]
-				},
-				"neck": {
-					"rotation": ["5-math.sin(q.anim_time*90*6-140)*-1", 0, "math.sin(q.anim_time*90*3-00)*-1"]
-				},
-				"head": {
-					"rotation": ["-math.sin(q.anim_time*90*6-110)*3", 0, "math.sin(q.anim_time*90*3-120)*-2"]
-				},
-				"scruff_left": {
-					"rotation": [0, "-0-math.sin(q.anim_time*90*6-170)*4", 0]
-				},
-				"scruff_right": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*6-170)*4", 0]
-				},
-				"scruff_top_right": {
-					"rotation": ["-0-math.sin(q.anim_time*90*6-210)*6", 0, 0]
-				},
-				"scruff_bottom": {
-					"rotation": ["-0-math.sin(q.anim_time*90*6-170)*3", 0, 0]
-				},
-				"leg_left": {
-					"rotation": [50, 0, 0]
-				},
-				"leg_left2": {
-					"rotation": [-100, 0, 0]
-				},
-				"foot_left": {
-					"rotation": ["40-math.sin(q.anim_time*90*6-30)*-5", -10, "math.sin(q.anim_time*90*3-150)*6"]
-				},
-				"toe_back_left": {
-					"rotation": [-27.5, 0, 0]
-				},
-				"toe_inner_left": {
-					"rotation": [37.5, 0, 0]
-				},
-				"toe_outer_left": {
-					"rotation": [37.5, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [50, 0, 0]
-				},
-				"leg_right2": {
-					"rotation": [-100, 0, 0]
-				},
-				"foot_right": {
-					"rotation": ["40-math.sin(q.anim_time*90*6-30)*-5", 10, "-math.sin(q.anim_time*90*3-150)*6"]
-				},
-				"toe_back_right": {
-					"rotation": [-27.5, 0, 0]
-				},
-				"toe_inner_right": {
-					"rotation": [37.5, 0, 0]
-				},
-				"toe_outer_right": {
-					"rotation": [37.5, 0, 0]
-				}
-			},
-			"timeline": {
-				"0.6667": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"1.3333": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"2.0": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"2.6667": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"3.3333": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"4.0": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};"
-			}
-		},
-		"animation.spearow.air_fly": {
-			"loop": true,
-			"animation_length": 4,
-			"bones": {
-				"body": {
-					"position": ["-math.sin(q.anim_time*90*3-45)*0.5", "math.sin(q.anim_time*90*6-45)*1.5", "math.sin(q.anim_time*90*6-45)*1/2"]
-				},
-				"torso": {
-					"rotation": ["15-math.sin(q.anim_time*90*6-120)*-1.5", 0, "math.sin(q.anim_time*90*3-90)*4"]
-				},
-				"wing_open_left": {
-					"rotation": ["-math.sin(q.anim_time*90*6-90)*6", 0, "math.sin(q.anim_time*90*6)*65"],
-					"position": [0, "math.sin(q.anim_time*90*6)*-1", 0]
-				},
-				"wing_open_left2": {
-					"rotation": [0, 0, "20+math.sin(q.anim_time*90*6-45)*30"]
-				},
-				"wing_open_left3": {
-					"rotation": [0, 0, "0+math.sin(q.anim_time*90*6-75)*30"]
-				},
-				"wing_open_right": {
-					"rotation": ["-math.sin(q.anim_time*90*6-90)*6", 0, "-math.sin(q.anim_time*90*6)*65"],
-					"position": [0, "math.sin(q.anim_time*90*6)*-1", 0]
-				},
-				"wing_open_right2": {
-					"rotation": [0, 0, "-20-math.sin(q.anim_time*90*6-45)*30"]
-				},
-				"wing_open_right3": {
-					"rotation": [0, 0, "-0-math.sin(q.anim_time*90*6-75)*30"]
-				},
-				"tail": {
-					"rotation": [-10, 0, 0]
-				},
-				"tail2": {
-					"rotation": ["-math.sin(q.anim_time*90*6-30)*5", 0, 0]
-				},
-				"tail3": {
-					"rotation": ["-math.sin(q.anim_time*90*6-90)*5", 0, 0]
-				},
-				"neck": {
-					"rotation": ["5-math.sin(q.anim_time*90*6-140)*-1", 0, "math.sin(q.anim_time*90*3-00)*-1"]
-				},
-				"head_ai": {
-					"rotation": [5, 0, 0]
-				},
-				"head": {
-					"rotation": ["-7.5-math.sin(q.anim_time*90*6-110)*3", 0, "math.sin(q.anim_time*90*3-120)*-2"]
-				},
-				"scruff_left": {
-					"rotation": [0, "-0-math.sin(q.anim_time*90*6-170)*4", 0]
-				},
-				"scruff_right": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*6-170)*4", 0]
-				},
-				"scruff_top_right": {
-					"rotation": ["-0-math.sin(q.anim_time*90*6-210)*6", 0, 0]
-				},
-				"scruff_bottom": {
-					"rotation": ["-0-math.sin(q.anim_time*90*6-170)*3", 0, 0]
-				},
-				"leg_left": {
-					"rotation": [50, 0, 0]
-				},
-				"leg_left2": {
-					"rotation": [-100, 0, 0]
-				},
-				"foot_left": {
-					"rotation": ["40-math.sin(q.anim_time*90*6-30)*-5", -10, "math.sin(q.anim_time*90*3-150)*6"]
-				},
-				"toe_back_left": {
-					"rotation": [-27.5, 0, 0]
-				},
-				"toe_inner_left": {
-					"rotation": [37.5, 0, 0]
-				},
-				"toe_outer_left": {
-					"rotation": [37.5, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [50, 0, 0]
-				},
-				"leg_right2": {
-					"rotation": [-100, 0, 0]
-				},
-				"foot_right": {
-					"rotation": ["40-math.sin(q.anim_time*90*6-30)*-5", 10, "-math.sin(q.anim_time*90*3-150)*6"]
-				},
-				"toe_back_right": {
-					"rotation": [-27.5, 0, 0]
-				},
-				"toe_inner_right": {
-					"rotation": [37.5, 0, 0]
-				},
-				"toe_outer_right": {
-					"rotation": [37.5, 0, 0]
-				}
-			},
-			"timeline": {
-				"0.6667": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"1.3333": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"2.0": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"2.6667": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"3.3333": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"4.0": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};"
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0038_ninetales/ninetales.animation.json

@@ -2,312 +2,6 @@
 	"format_version": "1.8.0",
 	"animations": {
 		"animation.ninetales.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -0.3, 0]
-				},
-				"torso": {
-					"rotation": ["5+math.sin(q.anim_time*90*1-0)*0.5", 0, "0-math.sin(q.anim_time*90*0.5-30)*0.5"]
-				},
-				"chest": {
-					"rotation": ["-4.8+math.sin(q.anim_time*90*1-30)*0.5", 0, -1.2]
-				},
-				"neck": {
-					"rotation": ["-12.5+math.sin(q.anim_time*90*1-60)*1", 0, 0]
-				},
-				"neck_fur_left2": {
-					"rotation": [0, 0, "-7.5-math.sin(q.anim_time*90*1-90)*1"]
-				},
-				"neck_fur_right2": {
-					"rotation": [0, 0, "7.5+math.sin(q.anim_time*90*1-90)*1"]
-				},
-				"neck2": {
-					"rotation": ["-12.5+math.sin(q.anim_time*90*1-90)*0.5", 0, 0]
-				},
-				"head_rotation": {
-					"rotation": ["32.5+math.sin(q.anim_time*90*1-90)*-2", 0, "0-math.sin(q.anim_time*90*1-120)*-0.5"]
-				},
-				"hair2": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*1-210)*1", 0, 0]
-				},
-				"hair_back_top": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*1-300)*2", 0, 0]
-				},
-				"hair_back_top2": {
-					"rotation": ["-22.5+math.sin(q.anim_time*90*1-360)*4", 0, 0]
-				},
-				"hair_back_bottom2": {
-					"rotation": ["-20+math.sin(q.anim_time*90*1-380)*4", 0, 0]
-				},
-				"tail_middle": {
-					"rotation": ["42.5+math.sin(q.anim_time*90*1-60)*-0.5", 0, 0]
-				},
-				"tail_middle2": {
-					"rotation": ["7.5+math.sin(q.anim_time*90*1-120)*-1", 0, 0]
-				},
-				"tail_middle3": {
-					"rotation": ["17.5+math.sin(q.anim_time*90*1-180)*-1", 0, 0]
-				},
-				"tail_middle4": {
-					"rotation": ["-37.5+math.sin(q.anim_time*90*1-240)*-4", 0, 0]
-				},
-				"tail_middle5": {
-					"rotation": ["-35+math.sin(q.anim_time*90*1-300)*-6", 2.5, 0]
-				},
-				"tail_middle6": {
-					"rotation": ["-42.5+math.sin(q.anim_time*90*1-300)*-6", 0, 0]
-				},
-				"tail_middle7": {
-					"rotation": ["-25+math.sin(q.anim_time*90*1-400)*-6", 0, 0]
-				},
-				"tail_middle8": {
-					"rotation": ["35+math.sin(q.anim_time*90*1-460)*-12", 0, 0]
-				},
-				"tail_left1_rotation": {
-					"rotation": ["27.525638448+math.sin(q.anim_time*90*1-60)*-0.5", 2.04767, 1.43455]
-				},
-				"tail_left1_2": {
-					"rotation": ["15.013645339+math.sin(q.anim_time*90*1-120)*-1", 2.41476, 0.64743]
-				},
-				"tail_left1_3": {
-					"rotation": ["17.5+math.sin(q.anim_time*90*1-180)*-1", 0, 0]
-				},
-				"tail_left1_4": {
-					"rotation": ["-32.599068173+math.sin(q.anim_time*90*1-240)*-4", -4.21541, 2.69136]
-				},
-				"tail_left1_5": {
-					"rotation": ["-37.605552+math.sin(q.anim_time*90*1-300)*-6", -3.9649, 3.04868]
-				},
-				"tail_left1_6": {
-					"rotation": ["-40.107597848+math.sin(q.anim_time*90*1-360)*-4", 3.82821, -3.21873]
-				},
-				"tail_left1_7": {
-					"rotation": ["-27.702122918+math.sin(q.anim_time*90*1-400)*-6", 6.64851, -3.47875]
-				},
-				"tail_left1_8": {
-					"rotation": ["30.867477791+math.sin(q.anim_time*90*1-460)*-12", 12.95254, 7.63074]
-				},
-				"tail_left2_rotation": {
-					"rotation": ["22.577335588+math.sin(q.anim_time*90*1-60)*-0.5", 4.61854, 1.91757]
-				},
-				"tail_left2_2": {
-					"rotation": ["12.5+math.sin(q.anim_time*90*1-120)*-1", 0, 0]
-				},
-				"tail_left2_3": {
-					"rotation": ["15+math.sin(q.anim_time*90*1-180)*-1", 0, 0]
-				},
-				"tail_left2_4": {
-					"rotation": ["-20+math.sin(q.anim_time*90*1-240)*-4", 0, 0]
-				},
-				"tail_left2_5": {
-					"rotation": ["-56.265008831+math.sin(q.anim_time*90*1-300)*-6", -9.93191, 14.48174]
-				},
-				"tail_left2_6": {
-					"rotation": ["-37.158458405+math.sin(q.anim_time*90*1-300)*-6", 18.26883, -13.36473]
-				},
-				"tail_left2_7": {
-					"rotation": ["33.125975871+math.sin(q.anim_time*90*1-360)*-12", 10.51794, 6.79286]
-				},
-				"tail_left3_rotation": {
-					"rotation": ["10+math.sin(q.anim_time*90*1-60)*-0.5", 0, 0]
-				},
-				"tail_left3_2": {
-					"rotation": ["22.577335588+math.sin(q.anim_time*90*1-120)*-1", 4.61854, 1.91757]
-				},
-				"tail_left3_3": {
-					"rotation": ["10+math.sin(q.anim_time*90*1-180)*-1", 0, 0]
-				},
-				"tail_left3_4": {
-					"rotation": ["-30+math.sin(q.anim_time*90*1-240)*-4", 0, 0]
-				},
-				"tail_left3_5": {
-					"rotation": ["-27.860824367+math.sin(q.anim_time*90*1-300)*-6", -8.86042, 4.65468]
-				},
-				"tail_left3_6": {
-					"rotation": ["-43.1852829+math.sin(q.anim_time*90*1-300)*-6", 9.18229, -8.51814]
-				},
-				"tail_left3_7": {
-					"rotation": ["35.413183453+math.sin(q.anim_time*90*1-360)*-12", 8.17773, 5.77509]
-				},
-				"tail_right1_rotation": {
-					"rotation": ["27.525638448+math.sin(q.anim_time*90*1-60)*-0.5", -2.04767, -1.43455]
-				},
-				"tail_right1_2": {
-					"rotation": ["15.013645339+math.sin(q.anim_time*90*1-120)*-1", -2.41476, -0.64743]
-				},
-				"tail_right1_3": {
-					"rotation": ["17.5+math.sin(q.anim_time*90*1-180)*-1", 0, 0]
-				},
-				"tail_right1_4": {
-					"rotation": ["-32.599068173+math.sin(q.anim_time*90*1-240)*-4", 4.21541, -2.69136]
-				},
-				"tail_right1_5": {
-					"rotation": ["-37.605552+math.sin(q.anim_time*90*1-300)*-6", 3.9649, -3.04868]
-				},
-				"tail_right1_6": {
-					"rotation": ["-40.107597848+math.sin(q.anim_time*90*1-360)*-4", -3.82821, 3.21873]
-				},
-				"tail_right1_7": {
-					"rotation": ["-27.702122918+math.sin(q.anim_time*90*1-400)*-6", -6.64851, 3.47875]
-				},
-				"tail_right1_8": {
-					"rotation": ["30.867477791+math.sin(q.anim_time*90*1-460)*-12", -12.95254, -7.63074]
-				},
-				"tail_right2_rotation": {
-					"rotation": ["22.577335588+math.sin(q.anim_time*90*1-60)*-0.5", -4.61854, -1.91757]
-				},
-				"tail_right2_2": {
-					"rotation": ["12.5+math.sin(q.anim_time*90*1-120)*-1", 0, 0]
-				},
-				"tail_right2_3": {
-					"rotation": ["15+math.sin(q.anim_time*90*1-180)*-1", 0, 0]
-				},
-				"tail_right2_4": {
-					"rotation": ["-20+math.sin(q.anim_time*90*1-240)*-4", 0, 0]
-				},
-				"tail_right2_5": {
-					"rotation": ["-56.265008831+math.sin(q.anim_time*90*1-300)*-6", 9.93191, -14.48174]
-				},
-				"tail_right2_6": {
-					"rotation": ["-37.158458405+math.sin(q.anim_time*90*1-300)*-6", -18.26883, 13.36473]
-				},
-				"tail_right2_7": {
-					"rotation": ["33.125975871+math.sin(q.anim_time*90*1-360)*-12", -10.51794, -6.79286]
-				},
-				"leg_front_left": {
-					"rotation": ["-9.981069394+math.sin(q.anim_time*90*1-0)*-1", 0.43523, 4.98107],
-					"position": [0, "0-math.sin(q.anim_time*90*1-0)*0.025", "0-math.sin(q.anim_time*90*1-0)*-0.15"]
-				},
-				"leg_front_left2": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*1-0)*0.5", 0, 0]
-				},
-				"foot_front_left": {
-					"rotation": ["12.5+math.sin(q.anim_time*90*1-0)*0.5", 0, -5]
-				},
-				"leg_back_left": {
-					"rotation": ["10+math.sin(q.anim_time*90*1-0)*1", 0, -7.5],
-					"position": [0, "0-math.sin(q.anim_time*90*1-0)*0.2", "0-math.sin(q.anim_time*90*1-0)*0.25"]
-				},
-				"leg_back_left2": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*1-0)*1", 0, 0]
-				},
-				"leg_back_left3": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*1-0)*-1", 0, 0]
-				},
-				"foot_back_left": {
-					"rotation": ["-5+math.sin(q.anim_time*90*1-0)*-1", 0, 7.5]
-				},
-				"leg_front_right": {
-					"rotation": ["10.018930606+math.sin(q.anim_time*90*1-0)*-1", -0.43523, -4.98107],
-					"position": [0, "0-math.sin(q.anim_time*90*1-0)*0.025", "0-math.sin(q.anim_time*90*1-0)*-0.15"]
-				},
-				"leg_front_right2": {
-					"rotation": ["-10+math.sin(q.anim_time*90*1-0)*0.5", 0, 0]
-				},
-				"foot_front_right": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-0)*0.5", 0, 5]
-				},
-				"leg_back_right": {
-					"rotation": ["17.521361057+math.sin(q.anim_time*90*1-0)*1", 0.32621, 7.49294],
-					"position": [0, "0-math.sin(q.anim_time*90*1-0)*0.2", "0-math.sin(q.anim_time*90*1-0)*0.25"]
-				},
-				"leg_back_right2": {
-					"rotation": ["-5+math.sin(q.anim_time*90*1-0)*1", 0, 0]
-				},
-				"leg_back_right3": {
-					"rotation": ["2.5+math.sin(q.anim_time*90*1-0)*-1", 0, 0]
-				},
-				"foot_back_right": {
-					"rotation": ["-15+math.sin(q.anim_time*90*1-0)*-1", 0, -7.5]
-				},
-				"tail_right3_rotation": {
-					"rotation": ["10+math.sin(q.anim_time*90*1-60)*-0.5", 0, 0]
-				},
-				"tail_right3_2": {
-					"rotation": ["22.577335588+math.sin(q.anim_time*90*1-120)*-1", -4.61854, -1.91757]
-				},
-				"tail_right3_3": {
-					"rotation": ["10+math.sin(q.anim_time*90*1-180)*-1", 0, 0]
-				},
-				"tail_right3_4": {
-					"rotation": ["-30+math.sin(q.anim_time*90*1-240)*-4", 0, 0]
-				},
-				"tail_right3_5": {
-					"rotation": ["-27.860824367+math.sin(q.anim_time*90*1-300)*-6", 8.86042, -4.65468]
-				},
-				"tail_right3_6": {
-					"rotation": ["-43.1852829+math.sin(q.anim_time*90*1-300)*-6", -9.18229, 8.51814]
-				},
-				"tail_right3_7": {
-					"rotation": ["35.413183453+math.sin(q.anim_time*90*1-360)*-12", -8.17773, -5.77509]
-				},
-				"tail_left4_rotation": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-60)*-0.5", 10, 0]
-				},
-				"tail_left4_2": {
-					"rotation": ["17.5+math.sin(q.anim_time*90*1-120)*-1", 0, 0]
-				},
-				"tail_left4_3": {
-					"rotation": ["20.4458201+math.sin(q.anim_time*90*1-180)*-2", -11.73507, -4.3361]
-				},
-				"tail_left4_4": {
-					"rotation": ["-41.341977449+math.sin(q.anim_time*90*1-240)*-4", -13.31791, 11.45696]
-				},
-				"tail_left4_5": {
-					"rotation": ["-35.413183453+math.sin(q.anim_time*90*1-300)*-6", 8.17773, -5.77509]
-				},
-				"tail_left4_6": {
-					"rotation": ["39.711284319+math.sin(q.anim_time*90*1-360)*-12", 17.67415, 14.15251]
-				},
-				"tail_right4_rotation": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-60)*-0.5", -10, 0]
-				},
-				"tail_right4_2": {
-					"rotation": ["17.5+math.sin(q.anim_time*90*1-120)*-1", 0, 0]
-				},
-				"tail_right4_3": {
-					"rotation": ["20.4458201+math.sin(q.anim_time*90*1-180)*-2", 11.73507, 4.3361]
-				},
-				"tail_right4_4": {
-					"rotation": ["-41.341977449+math.sin(q.anim_time*90*1-240)*-4", 13.31791, -11.45696]
-				},
-				"tail_right4_5": {
-					"rotation": ["-35.413183453+math.sin(q.anim_time*90*1-300)*-6", -8.17773, 5.77509]
-				},
-				"tail_right4_6": {
-					"rotation": ["39.711284319+math.sin(q.anim_time*90*1-360)*-12", -17.67415, -14.15251]
-				},
-				"neck_fur_front": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-60)*-1", 0, 0]
-				},
-				"neck_fur_front2": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-90)*2", 0, 0]
-				},
-				"neck_fur_front3": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-120)*2", 0, 0]
-				},
-				"ear_left": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-120)*1", 0, "0-math.sin(q.anim_time*90*1-30)*2"]
-				},
-				"ear_right": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-120)*1", 0, "-0+math.sin(q.anim_time*90*1-30)*2"]
-				},
-				"hair": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-150)*2", 0, 0]
-				},
-				"hair_detail": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-180)*1", 0, 0]
-				},
-				"hair_detail2": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-240)*1", 0, 0]
-				},
-				"hair_back_bottom": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-320)*2", 0, 0]
-				}
-			}
-		},
-		"animation.ninetales.base": {
 			"loop": true,
 			"bones": {
 				"body": {
@@ -582,6 +276,64 @@
 				}
 			}
 		},
+		"animation.ninetales.cry": {
+			"animation_length": 1,
+			"bones": {
+				"mouth": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": [0, -0.0999, -0.00436],
+						"0.75": [0, -0.0999, -0.00436],
+						"1.0": [0, 0, 0]
+					}
+				},
+				"head": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [-15, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [-15, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.9167": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"jaw": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [65, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.75": {
+							"post": [65, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				}
+			},
+			"sound_effects": {
+				"0.0": {
+					"effect": "pokemon.ninetales.cry"
+				}
+			}
+		},
 		"animation.ninetales.blink": {
 			"animation_length": 0.1667,
 			"bones": {
@@ -661,164 +413,6 @@
 					"position": [-0.1, 0, -0.1]
 				}
 			}
-		},
-		"animation.ninetales.cry": {
-			"animation_length": 2,
-			"bones": {
-				"torso": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [1, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [-2, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [-4, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.6667": {
-							"post": [-0.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"neck2": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2083": {
-							"post": [2.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4167": {
-							"post": [-5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.25": {
-							"post": [-7.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.625": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"head_rotation": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2083": {
-							"post": [5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4583": {
-							"post": [-22.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.25": {
-							"post": [-27, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.625": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.3333": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
-						"1.5": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.3333": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
-						"1.5": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"jaw": {
-					"rotation": {
-						"0.2917": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [47.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.25": {
-							"post": [20, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5417": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					},
-					"position": [0, 0, 0]
-				},
-				"hair": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.1667": {
-							"post": [10, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.1667": {
-							"post": [-2.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.625": {
-							"post": [5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				}
-			},
-			"sound_effects": {
-				"0.3333": {
-					"effect": "pokemon.ninetales.cry"
-				}
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0038_ninetales/ninetales_alolan.animation.json

@@ -1,7 +1,7 @@
 {
 	"format_version": "1.8.0",
 	"animations": {
-		"animation.ninetales_alolan.base": {
+		"animation.ninetales_alolan.ground_idle": {
 			"loop": true,
 			"bones": {
 				"body": {
@@ -381,411 +381,61 @@
 				}
 			}
 		},
-		"animation.ninetales_alolan.ground_idle": {
-			"loop": true,
+		"animation.ninetales_alolan.cry": {
+			"animation_length": 1,
 			"bones": {
-				"body": {
-					"position": [0, -0.25, 0]
-				},
-				"torso": {
-					"rotation": ["2.5+math.sin(q.anim_time*90*1-0)*0.5", 0, "0-math.sin(q.anim_time*90*0.5-30)*0.5"]
-				},
-				"chest": {
-					"rotation": ["-5+math.sin(q.anim_time*90*1-30)*0.5", 0, 0]
-				},
-				"neck": {
-					"rotation": ["-10+math.sin(q.anim_time*90*1-60)*1", 0, 0]
-				},
-				"neck2": {
-					"rotation": ["-10+math.sin(q.anim_time*90*1-90)*0.5", 0, 0]
-				},
-				"head_rotation": {
-					"rotation": ["14.54701+math.sin(q.anim_time*90*1-90)*-2", -3.59452, "0.40543-math.sin(q.anim_time*90*1-120)*-0.5"]
-				},
-				"hair": {
-					"rotation": ["13.75153+math.sin(q.anim_time*90*1-90)*1", 7.26228, 1.47729]
-				},
-				"hair2": {
-					"rotation": ["-12.54624+math.sin(q.anim_time*90*1-120)*2", 4.88119, -1.08482]
-				},
-				"hair3": {
-					"rotation": ["-24.58726+math.sin(q.anim_time*90*1-180)*2", -15.69466, 1.78427]
-				},
-				"hair4": {
-					"rotation": ["3.48303+math.sin(q.anim_time*90*1-240)*4", -24.77164, -8.26511]
-				},
-				"hair5": {
-					"rotation": ["-7.97337+math.sin(q.anim_time*90*1-300)*8", -59.03741, 4.53051]
-				},
-				"hair_bottom": {
-					"rotation": ["7.5+math.sin(q.anim_time*90*1-360)*12", 0, 0]
-				},
-				"hair_bottom2": {
-					"rotation": ["-27.70212+math.sin(q.anim_time*90*1-420)*18", -6.64851, 3.47875]
-				},
-				"hair_bottom3": {
-					"rotation": ["25.56145+math.sin(q.anim_time*90*1-480)*24", -27.51235, -12.45891]
-				},
-				"hair6": {
-					"rotation": ["7.5+math.sin(q.anim_time*90*1-360)*12", 0, 0]
-				},
-				"hair7": {
-					"rotation": ["-40.98084+math.sin(q.anim_time*90*1-420)*18", -11.43563, 9.77243]
-				},
-				"hair8": {
-					"rotation": ["30.86748+math.sin(q.anim_time*90*1-480)*24", -12.95254, -7.63074]
-				},
-				"tail": {
-					"rotation": [0, 0, 0]
-				},
-				"tail_middle_rotation": {
-					"rotation": ["65+math.sin(q.anim_time*90*1-60)*-0.5", 0, 0]
-				},
-				"tail_middle2": {
-					"rotation": ["-7.5+math.sin(q.anim_time*90*1-120)*-1", 0, 0]
-				},
-				"tail_middle3": {
-					"rotation": ["-25+math.sin(q.anim_time*90*1-180)*-2", 0, 0]
-				},
-				"tail_middle4": {
-					"rotation": ["-30+math.sin(q.anim_time*90*1-240)*-4", 0, 0]
-				},
-				"tail_middle5": {
-					"rotation": ["-25+math.sin(q.anim_time*90*1-300)*-6", 0, 0]
-				},
-				"tail_middle6": {
-					"rotation": ["-12.62353+math.sin(q.anim_time*90*1-360)*-12", 7.24305, -1.95155]
-				},
-				"tail_middle7": {
-					"rotation": ["-31.18939+math.sin(q.anim_time*90*1-400)*-12", -15.09492, 8.95891]
-				},
-				"tail_middle8": {
-					"rotation": ["15.22074+math.sin(q.anim_time*90*1-460)*-12", 9.65594, 2.61298]
-				},
-				"tail_middle9": {
-					"rotation": ["-20+math.sin(q.anim_time*90*1-520)*-18", 0, 0]
-				},
-				"tail_left1_rotation": {
-					"rotation": ["64.2174+math.sin(q.anim_time*90*1-60)*-0.5", 8.98581, 12.04686]
-				},
-				"tail_left1_2": {
-					"rotation": ["-17.51565+math.sin(q.anim_time*90*1-120)*-1", -2.38422, 0.7522]
-				},
-				"tail_left1_3": {
-					"rotation": ["-10.03742+math.sin(q.anim_time*90*1-180)*-2", -4.92385, 0.87038]
-				},
-				"tail_left1_4": {
-					"rotation": ["-37.52635+math.sin(q.anim_time*90*1-240)*-4", -1.98315, 1.52251]
-				},
-				"tail_left1_5": {
-					"rotation": ["-17.51565+math.sin(q.anim_time*90*1-300)*-6", -2.38422, 0.7522]
-				},
-				"tail_left1_6": {
-					"rotation": ["-25.08377+math.sin(q.anim_time*90*1-360)*-12", -4.53051, 2.11751]
-				},
-				"tail_left1_7": {
-					"rotation": ["-15.22074+math.sin(q.anim_time*90*1-400)*-12", 9.65594, -2.61298]
-				},
-				"tail_left1_8": {
-					"rotation": ["30.71983+math.sin(q.anim_time*90*1-460)*-12", -13.97399, -3.85625]
-				},
-				"tail_left1_9": {
-					"rotation": ["-42.24682+math.sin(q.anim_time*90*1-520)*-18", 17.04679, -14.9092]
-				},
-				"tail_left2_rotation": {
-					"rotation": ["63.58314+math.sin(q.anim_time*90*1-60)*-0.5", 11.98346, 41.65117]
-				},
-				"tail_left2_2": {
-					"rotation": ["-15.50409+math.sin(q.anim_time*90*1-120)*-1", -14.47751, 3.96713]
-				},
-				"tail_left2_3": {
-					"rotation": ["-9.9045+math.sin(q.anim_time*90*1-180)*-2", -2.61747, -1.08202]
-				},
-				"tail_left2_4": {
-					"rotation": ["-27.5209+math.sin(q.anim_time*90*1-240)*-4", -2.26564, 1.0571]
-				},
-				"tail_left2_5": {
-					"rotation": ["-30.09468+math.sin(q.anim_time*90*1-300)*-6", -4.32875, 2.50477]
-				},
-				"tail_left2_6": {
-					"rotation": ["-13.06681+math.sin(q.anim_time*90*1-360)*-12", 11.06861, -5.84485]
-				},
-				"tail_left2_7": {
-					"rotation": ["-25.08377+math.sin(q.anim_time*90*1-400)*-12", 4.53051, -2.11751]
-				},
-				"tail_left2_8": {
-					"rotation": ["21.88023+math.sin(q.anim_time*90*1-460)*-12", -23.39896, -9.06159]
-				},
-				"tail_left2_9": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-520)*-18", 25, 0]
-				},
-				"tail_left3": {
-					"rotation": [-7.34619, 17.12827, -7.84022]
-				},
-				"tail_left3_rotation": {
-					"rotation": ["76.5201+math.sin(q.anim_time*90*1-60)*-0.5", -21.21599, 70.91151]
-				},
-				"tail_left3_2": {
-					"rotation": ["-23.00013+math.sin(q.anim_time*90*1-120)*-1", -11.40209, 5.14995]
-				},
-				"tail_left3_3": {
-					"rotation": ["-10+math.sin(q.anim_time*90*1-180)*-2", 0, 0]
-				},
-				"tail_left3_4": {
-					"rotation": ["-20+math.sin(q.anim_time*90*1-240)*-4", 0, 0]
-				},
-				"tail_left3_5": {
-					"rotation": ["-30.02363+math.sin(q.anim_time*90*1-300)*-6", 2.16489, -1.2506]
-				},
-				"tail_left3_6": {
-					"rotation": ["-12.99008+math.sin(q.anim_time*90*1-360)*-12", 11.53486, -4.8493]
-				},
-				"tail_left3_7": {
-					"rotation": ["15+math.sin(q.anim_time*90*1-400)*-12", 20, 0]
-				},
-				"tail_left3_8": {
-					"rotation": ["-22.89875+math.sin(q.anim_time*90*1-460)*-12", -8.42145, 5.41207]
-				},
-				"tail_left3_9": {
-					"rotation": ["30+math.sin(q.anim_time*90*1-520)*-18", 22.5, 0]
-				},
-				"tail_left4_rotation": {
-					"rotation": ["83.07626+math.sin(q.anim_time*90*1-60)*-0.5", 7.16729, 88.89799]
-				},
-				"tail_left4_2": {
-					"rotation": ["-28.3693+math.sin(q.anim_time*90*1-120)*-1", -12.72029, 8.00075]
-				},
-				"tail_left4_3": {
-					"rotation": ["-12.60443+math.sin(q.anim_time*90*1-180)*-2", -7.32123, 1.63219]
-				},
-				"tail_left4_4": {
-					"rotation": ["-15.04624+math.sin(q.anim_time*90*1-240)*-4", -4.88119, 1.08482]
-				},
-				"tail_left4_5": {
-					"rotation": ["-29.41237+math.sin(q.anim_time*90*1-300)*-6", -2.14804, -1.84068]
-				},
-				"tail_left4_6": {
-					"rotation": ["-9.14867+math.sin(q.anim_time*90*1-360)*-12", 20.70481, -9.00717]
-				},
-				"tail_left4_7": {
-					"rotation": ["-15+math.sin(q.anim_time*90*1-400)*-12", -2.5, 0]
-				},
-				"tail_left4_8": {
-					"rotation": ["10+math.sin(q.anim_time*90*1-460)*-12", 20, 0]
-				},
-				"tail_left4_9": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-520)*-18", -25, 0]
-				},
-				"tail_right1_rotation": {
-					"rotation": ["64.2174+math.sin(q.anim_time*90*1-60)*-0.5", -8.98581, -12.04686]
-				},
-				"tail_right1_2": {
-					"rotation": ["-17.51565+math.sin(q.anim_time*90*1-120)*-1", 2.38422, -0.7522]
-				},
-				"tail_right1_3": {
-					"rotation": ["-10.03742+math.sin(q.anim_time*90*1-180)*-2", 4.92385, -0.87038]
-				},
-				"tail_right1_4": {
-					"rotation": ["-37.52635+math.sin(q.anim_time*90*1-240)*-4", 1.98315, -1.52251]
-				},
-				"tail_right1_5": {
-					"rotation": ["-17.51565+math.sin(q.anim_time*90*1-300)*-6", 2.38422, -0.7522]
-				},
-				"tail_right1_6": {
-					"rotation": ["-25.08377+math.sin(q.anim_time*90*1-360)*-12", 4.53051, -2.11751]
-				},
-				"tail_right1_7": {
-					"rotation": ["-15.22074+math.sin(q.anim_time*90*1-400)*-12", -9.65594, 2.61298]
-				},
-				"tail_right1_8": {
-					"rotation": ["30.71983+math.sin(q.anim_time*90*1-460)*-12", 13.97399, 3.85625]
-				},
-				"tail_right1_9": {
-					"rotation": ["-42.24682+math.sin(q.anim_time*90*1-520)*-18", -17.04679, 14.9092]
-				},
-				"tail_right2_rotation": {
-					"rotation": ["63.58314+math.sin(q.anim_time*90*1-60)*-0.5", -11.98346, -41.65117]
-				},
-				"tail_right2_2": {
-					"rotation": ["-15.50409+math.sin(q.anim_time*90*1-60)*-0.5", 14.47751, -3.96713]
-				},
-				"tail_right2_3": {
-					"rotation": ["-9.9045+math.sin(q.anim_time*90*1-180)*-2", 2.61747, 1.08202]
-				},
-				"tail_right2_4": {
-					"rotation": ["-27.5209+math.sin(q.anim_time*90*1-240)*-4", 2.26564, -1.0571]
-				},
-				"tail_right2_5": {
-					"rotation": ["-30.09468+math.sin(q.anim_time*90*1-300)*-6", 4.32875, -2.50477]
-				},
-				"tail_right2_6": {
-					"rotation": ["-13.06681+math.sin(q.anim_time*90*1-360)*-12", -11.06861, 5.84485]
-				},
-				"tail_right2_7": {
-					"rotation": ["-25.08377+math.sin(q.anim_time*90*1-400)*-12", -4.53051, 2.11751]
-				},
-				"tail_right2_8": {
-					"rotation": ["21.88023+math.sin(q.anim_time*90*1-460)*-12", 23.39896, 9.06159]
-				},
-				"tail_right2_9": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-520)*-18", -25, 0]
-				},
-				"leg_front_left": {
-					"rotation": ["-4.99527+math.sin(q.anim_time*90*1-0)*-1", 0.21782, 2.4905],
-					"position": [0, "0-math.sin(q.anim_time*90*1-0)*0.025", "0-math.sin(q.anim_time*90*1-0)*-0.15"]
-				},
-				"leg_front_left2": {
-					"rotation": ["-5+math.sin(q.anim_time*90*1-0)*0.5", 0, 0]
-				},
-				"foot_front_left": {
-					"rotation": ["9.99067+math.sin(q.anim_time*90*1-0)*0.5", 0.43399, -2.46207]
-				},
-				"leg_back_left": {
-					"rotation": ["12.5048+math.sin(q.anim_time*90*1-0)*1", 1.93726, -2.22807],
-					"position": [0, "0-math.sin(q.anim_time*90*1-0)*0.2", "0-math.sin(q.anim_time*90*1-0)*0.25"]
-				},
-				"leg_back_left2": {
-					"rotation": ["-5+math.sin(q.anim_time*90*1-0)*1", 0, 0]
-				},
-				"leg_back_left3": {
-					"rotation": ["-2.49673+math.sin(q.anim_time*90*1-0)*-1", -0.12261, 0.03929]
-				},
-				"foot_back_left": {
-					"rotation": ["-5.00899+math.sin(q.anim_time*90*1-0)*-1", -0.3507, 2.5603]
-				},
-				"leg_front_right": {
-					"rotation": ["7.47178+math.sin(q.anim_time*90*1-0)*-1", 0.65182, -4.95744],
-					"position": [0, "0-math.sin(q.anim_time*90*1-0)*0.025", "0-math.sin(q.anim_time*90*1-0)*-0.15"]
-				},
-				"leg_front_right2": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*1-0)*0.5", 0, 0]
-				},
-				"foot_front_right": {
-					"rotation": ["-5+math.sin(q.anim_time*90*1-0)*0.5", 0, 5]
-				},
-				"leg_back_right": {
-					"rotation": ["-9.8369+math.sin(q.anim_time*90*1-0)*1", 5.47408, 1.12804],
-					"position": [0, "0-math.sin(q.anim_time*90*1-0)*0.2", "0-math.sin(q.anim_time*90*1-0)*0.25"]
-				},
-				"leg_back_right2": {
-					"rotation": ["5+math.sin(q.anim_time*90*1-0)*1", 0, 0]
-				},
-				"leg_back_right3": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-0)*-1", 0, 0]
-				},
-				"foot_back_right": {
-					"rotation": ["4.98247+math.sin(q.anim_time*90*1-0)*-1", 0.85481, -2.34941]
-				},
-				"tail_right3": {
-					"rotation": [-7.34619, -17.12827, 7.84022]
-				},
-				"tail_right3_rotation": {
-					"rotation": ["76.5201+math.sin(q.anim_time*90*1-60)*-0.5", 21.21599, -70.91151]
-				},
-				"tail_right3_2": {
-					"rotation": ["-23.00013+math.sin(q.anim_time*90*1-120)*-1", 11.40209, -5.14995]
-				},
-				"tail_right3_3": {
-					"rotation": ["-10+math.sin(q.anim_time*90*1-180)*-2", 0, 0]
-				},
-				"tail_right3_4": {
-					"rotation": ["-20+math.sin(q.anim_time*90*1-240)*-4", 0, 0]
-				},
-				"tail_right3_5": {
-					"rotation": ["-30.02363+math.sin(q.anim_time*90*1-300)*-6", -2.16489, 1.2506]
-				},
-				"tail_right3_6": {
-					"rotation": ["-12.99008+math.sin(q.anim_time*90*1-360)*-12", -11.53486, 4.8493]
-				},
-				"tail_right3_7": {
-					"rotation": ["15+math.sin(q.anim_time*90*1-400)*-12", -20, 0]
-				},
-				"tail_right3_8": {
-					"rotation": ["-22.89875+math.sin(q.anim_time*90*1-460)*-12", 8.42145, -5.41207]
-				},
-				"tail_right3_9": {
-					"rotation": ["30+math.sin(q.anim_time*90*1-520)*-18", -22.5, 0]
-				},
-				"tail_right4_rotation": {
-					"rotation": ["83.07626+math.sin(q.anim_time*90*1-60)*-0.5", -7.16729, -88.89799]
-				},
-				"tail_right4_2": {
-					"rotation": ["-28.3693+math.sin(q.anim_time*90*1-120)*-1", 12.72029, -8.00075]
-				},
-				"tail_right4_3": {
-					"rotation": ["-12.60443+math.sin(q.anim_time*90*1-180)*-2", 7.32123, -1.63219]
-				},
-				"tail_right4_4": {
-					"rotation": ["-15.04624+math.sin(q.anim_time*90*1-240)*-4", 4.88119, -1.08482]
-				},
-				"tail_right4_5": {
-					"rotation": ["-29.41237+math.sin(q.anim_time*90*1-300)*-6", 2.14804, 1.84068]
-				},
-				"tail_right4_6": {
-					"rotation": ["-9.14867+math.sin(q.anim_time*90*1-360)*-12", -20.70481, 9.00717]
-				},
-				"tail_right4_7": {
-					"rotation": ["-15+math.sin(q.anim_time*90*1-400)*-12", 2.5, 0]
-				},
-				"tail_right4_8": {
-					"rotation": ["10+math.sin(q.anim_time*90*1-460)*-12", -20, 0]
-				},
-				"tail_right4_9": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-520)*-18", 25, 0]
-				},
-				"hair_left": {
-					"rotation": [0, -17.5, "55+math.sin(q.anim_time*90*1-120)*2"]
-				},
-				"hair_left2": {
-					"rotation": [-1.6575, 12.39135, "9.82005+math.sin(q.anim_time*90*1-180)*4"]
-				},
-				"hair_left3": {
-					"rotation": [8.00384, 21.21629, "20.75164+math.sin(q.anim_time*90*1-240)*8"]
-				},
-				"hair_left4": {
-					"rotation": [7.90373, -21.34916, "-15.85201+math.sin(q.anim_time*90*1-300)*18"]
-				},
-				"hair_left5": {
-					"rotation": [-6.42784, -34.18333, "7.10385+math.sin(q.anim_time*90*1-360)*24"]
-				},
-				"hair_right": {
-					"rotation": [0, 17.5, "-55-math.sin(q.anim_time*90*1-120)*2"]
-				},
-				"hair_right2": {
-					"rotation": [-1.6575, -12.39135, "-9.82005-math.sin(q.anim_time*90*1-180)*4"]
-				},
-				"hair_right3": {
-					"rotation": [8.00384, -21.21629, "-20.75164-math.sin(q.anim_time*90*1-240)*8"]
-				},
-				"hair_right4": {
-					"rotation": [7.90373, 21.34916, "15.85201-math.sin(q.anim_time*90*1-300)*18"]
-				},
-				"hair_right5": {
-					"rotation": [-6.42784, 34.18333, "-7.10385-math.sin(q.anim_time*90*1-360)*24"]
-				},
-				"neck_fur_front": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-60)*-1", 0, 0]
-				},
-				"neck_fur_front2": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-90)*2", 0, 0]
-				},
-				"neck_fur_front3": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-120)*2", 0, 0]
-				},
-				"neck_fur_left": {
-					"rotation": [0, 0, "0-math.sin(q.anim_time*90*1-90)*1"]
-				},
-				"neck_fur_right": {
-					"rotation": [0, 0, "-0+math.sin(q.anim_time*90*1-90)*1"]
-				},
-				"ear_left": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-120)*1", 0, "0-math.sin(q.anim_time*90*1-30)*2"]
-				},
-				"ear_right": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-120)*1", 0, "-0+math.sin(q.anim_time*90*1-30)*2"]
-				},
-				"hair_front": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-120)*2", 0, 0]
+				"mouth": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": [0, -0.0999, -0.00436],
+						"0.75": [0, -0.0999, -0.00436],
+						"1.0": [0, 0, 0]
+					}
+				},
+				"head": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [-15, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [-15, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.9167": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"jaw": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [65, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.75": {
+							"post": [65, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				}
+			},
+			"sound_effects": {
+				"0.0": {
+					"effect": "pokemon.ninetales_alolan.cry"
 				}
 			}
 		},
@@ -868,176 +518,6 @@
 					"position": [-0.1, 0, -0.1]
 				}
 			}
-		},
-		"animation.ninetales_alolan.cry": {
-			"animation_length": 2,
-			"bones": {
-				"torso": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [1, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [-2, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [-4, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.6667": {
-							"post": [-0.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"neck2": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2083": {
-							"post": [2.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4167": {
-							"post": [-5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.25": {
-							"post": [-7.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.625": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"head_rotation": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2083": {
-							"post": [5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4583": {
-							"post": [-22.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.25": {
-							"post": [-27, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.625": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.3333": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, -0.1]
-						},
-						"1.5": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.3333": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, -0.1]
-						},
-						"1.5": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"jaw": {
-					"rotation": {
-						"0.2917": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [47.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.25": {
-							"post": [20, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5417": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					},
-					"position": [0, 0, 0]
-				},
-				"hair": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.1667": {
-							"post": [10, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.1667": {
-							"post": [-2.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.625": {
-							"post": [5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				}
-			},
-			"sound_effects": {
-				"0.3333": {
-					"effect": "pokemon.ninetales_alolan.cry"
-				}
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0258_mudkip/mudkip.animation.json

@@ -3,274 +3,58 @@
 	"animations": {
 		"animation.mudkip.ground_idle": {
 			"loop": true,
-			"animation_length": 2,
 			"bones": {
 				"head": {
-					"rotation": ["2.5+math.sin(q.anim_time*90*4-90)*1.5", "math.sin(q.anim_time*90*2-60)*1.5", "math.sin(q.anim_time*90*2-60)*1"]
+					"rotation": [2.5, 0, 0]
 				},
 				"fin2": {
-					"rotation": [2.5, 0, "0+math.sin(q.anim_time*90*2-150)*-3"]
+					"rotation": [2.5, 0, 0]
 				},
 				"cheek_left2": {
-					"rotation": [0, -7.5, "0+math.sin(q.anim_time*90*4-90)*1.5"]
+					"rotation": [0, -7.5, 0]
 				},
 				"leg_front_left": {
-					"rotation": ["5+math.sin(q.anim_time*90*4)*2", 5, 0],
-					"position": [0, "-0.125+math.sin(q.anim_time*90*4)*-0.05", "0+math.sin(q.anim_time*90*4)*-0.07"]
+					"rotation": [7.5, 5, 0]
 				},
 				"leg_front_left2": {
-					"rotation": ["-5+math.sin(q.anim_time*90*4)*-2", 0, 0]
+					"rotation": [-7.5, 0, 0]
 				},
 				"leg_front_right": {
-					"rotation": ["5+math.sin(q.anim_time*90*4)*2", -5, 0],
-					"position": [0, "-0.125+math.sin(q.anim_time*90*4)*-0.05", "0+math.sin(q.anim_time*90*4)*-0.07"]
+					"rotation": [7.5, -5, 0]
 				},
 				"leg_front_right2": {
-					"rotation": ["-5+math.sin(q.anim_time*90*4)*-2", 0, 0]
+					"rotation": [-7.5, 0, 0]
 				},
 				"leg_back_left": {
-					"rotation": ["-5+math.sin(q.anim_time*90*4)*-1", -5, 0],
-					"position": [0, "-0.125+math.sin(q.anim_time*90*4)*-0.025", "0+math.sin(q.anim_time*90*4)*0.035"]
+					"rotation": [5, -5, 0]
 				},
 				"leg_back_left2": {
-					"rotation": ["5+math.sin(q.anim_time*90*4)*1", 0, 0]
+					"rotation": [-5, 0, 0]
 				},
 				"leg_back_right": {
-					"rotation": ["-5+math.sin(q.anim_time*90*4)*-1", 5, 0],
-					"position": [0, "-0.125+math.sin(q.anim_time*90*4)*-0.025", "0+math.sin(q.anim_time*90*4)*0.035"]
+					"rotation": [5, 5, 0]
 				},
 				"leg_back_right2": {
-					"rotation": ["5+math.sin(q.anim_time*90*4)*1", 0, 0]
+					"rotation": [-5, 0, 0]
 				},
 				"body": {
 					"position": [0, -0.1, 0]
 				},
 				"tail": {
-					"rotation": ["6+math.sin(q.anim_time*90*4)*1", "0+math.sin(q.anim_time*90*2-90)*-10", 0]
+					"rotation": [5, 0, 0]
 				},
 				"fin": {
-					"rotation": [2.5, 0, "0+math.sin(q.anim_time*90*2-90)*-4"]
+					"rotation": [2.5, 0, 0]
 				},
 				"cheek_right2": {
-					"rotation": [0, 7.5, "0+math.sin(q.anim_time*90*4-90)*-1.5"]
-				},
-				"torso": {
-					"rotation": ["0+math.sin(q.anim_time*90*4)*0.75", "0+math.sin(q.anim_time*90*2-30)*0.5", 0],
-					"position": [0, "0+math.sin(q.anim_time*90*4+30)*-0.05", 0]
-				},
-				"tail2": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-150)*-12.5", 0]
-				}
-			}
-		},
-		"animation.mudkip.battle_idle": {
-			"loop": true,
-			"animation_length": 2,
-			"bones": {
-				"head": {
-					"rotation": ["-7.5+math.sin(q.anim_time*90*4-90)*3", "math.sin(q.anim_time*90*2-60)*1", "math.sin(q.anim_time*90*2-60)*1"]
-				},
-				"fin2": {
-					"rotation": [2.5, 0, "0+math.sin(q.anim_time*90*2-120)*-3"]
-				},
-				"cheek_left2": {
-					"rotation": [0, -7.5, "-5+math.sin(q.anim_time*90*4-90)*1.5"]
-				},
-				"leg_front_left": {
-					"rotation": ["4.305+math.sin(q.anim_time*90*4)*2", 5.60922, -7.50745],
-					"position": [0, "-0.275+math.sin(q.anim_time*90*4)*-0.05", "0.3+math.sin(q.anim_time*90*4)*-0.07"]
-				},
-				"leg_front_left2": {
-					"rotation": ["-4.9575+math.sin(q.anim_time*90*4)*-2", 0.65182, 7.47178]
-				},
-				"leg_front_right": {
-					"rotation": ["4.305+math.sin(q.anim_time*90*4)*2", -5.60922, 7.50745],
-					"position": [0, "-0.275+math.sin(q.anim_time*90*4)*-0.05", "0.3+math.sin(q.anim_time*90*4)*-0.07"]
-				},
-				"leg_front_right2": {
-					"rotation": ["-4.9575+math.sin(q.anim_time*90*4)*-2", -0.65182, -7.47178]
-				},
-				"leg_back_left": {
-					"rotation": ["-5+math.sin(q.anim_time*90*4)*-1", -5, 0],
-					"position": [0, "-0.125+math.sin(q.anim_time*90*4)*-0.025", "0+math.sin(q.anim_time*90*4)*0.035"]
-				},
-				"leg_back_left2": {
-					"rotation": ["5+math.sin(q.anim_time*90*4)*1", 0, 0]
-				},
-				"leg_back_right": {
-					"rotation": ["-5+math.sin(q.anim_time*90*4)*-1", 5, 0],
-					"position": [0, "-0.125+math.sin(q.anim_time*90*4)*-0.025", "0+math.sin(q.anim_time*90*4)*0.035"]
-				},
-				"leg_back_right2": {
-					"rotation": ["5+math.sin(q.anim_time*90*4)*1", 0, 0]
-				},
-				"body": {
-					"position": [0, -0.1, 0]
-				},
-				"tail": {
-					"rotation": ["6+math.sin(q.anim_time*90*4)*1", "0+math.sin(q.anim_time*90*2-90)*-17.5", 0]
-				},
-				"fin": {
-					"rotation": [2.5, 0, "0+math.sin(q.anim_time*90*2-90)*-4"]
-				},
-				"cheek_right2": {
-					"rotation": [0, 7.5, "5+math.sin(q.anim_time*90*4-90)*-1.5"]
-				},
-				"torso": {
-					"rotation": ["10+math.sin(q.anim_time*90*4)*2.5", "math.sin(q.anim_time*90*2-30)*0.5", 0],
-					"position": [0, "0+math.sin(q.anim_time*90*4+30)*-0.07", 0]
-				},
-				"tail2": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-90)*-7.5", 0]
-				},
-				"eye_angry_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_angry_right": {
-					"position": [0, 0, -0.1]
+					"rotation": [0, -7.5, 0]
 				}
 			}
 		},
 		"animation.mudkip.cry": {
-			"animation_length": 1.75,
-			"bones": {
-				"torso": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.2917": [5, 0, 0],
-						"0.5": [0, 0, 0],
-						"1.0": [-2.5, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"head": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2083": {
-							"post": [10, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": {
-							"post": [10, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5833": {
-							"post": [-10, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.7083": {
-							"post": [-10, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0833": {
-							"post": [-17.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.2917": {
-							"post": [-3, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.625": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"jaw": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.3333": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [35, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.7083": {
-							"post": [15, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0": {
-							"post": [60, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0833": {
-							"post": [60, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"fin": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [6, 0, 0],
-						"1.0": [-5, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"cheek_left2": {
-					"rotation": {
-						"0.375": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": {
-							"post": [0, 0, -12.5],
-							"lerp_mode": "catmullrom"
-						},
-						"0.8333": {
-							"post": [0, 0, -12.5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"cheek_right2": {
-					"rotation": {
-						"0.375": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": {
-							"post": [0, 0, 12.5],
-							"lerp_mode": "catmullrom"
-						},
-						"0.8333": {
-							"post": [0, 0, 12.5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"tail": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.625": [0, "0+math.sin(q.anim_time*90*12-90)*-25", 0],
-						"1.625": [0, 0, 0]
-					}
-				}
-			},
+			"animation_length": 1.2,
 			"sound_effects": {
-				"0.5417": {
+				"0.04": {
 					"effect": "pokemon.mudkip.cry"
 				}
 			}
@@ -423,14 +207,6 @@
 					"position": [-0.1, 0, -0.1]
 				}
 			}
-		},
-		"animation.mudkip.WALKSPEED_TEST": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, 0, "q.anim_time*90*-0.07"]
-				}
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0259_marshtomp/marshtomp.animation.json

@@ -3,173 +3,83 @@
 	"animations": {
 		"animation.marshtomp.ground_idle": {
 			"loop": true,
-			"animation_length": 4,
 			"bones": {
 				"torso": {
-					"rotation": ["0+math.sin(q.anim_time*90*4)*-1", "math.sin(q.anim_time*90*2)*2", "math.sin(q.anim_time*90*2)*-1"],
-					"position": [0, "math.sin(q.anim_time*90*4-30)*-0.05", 0]
+					"rotation": [0, 0, 0]
 				},
 				"chest": {
-					"rotation": ["0+math.sin(q.anim_time*90*4-30)*-1", "math.sin(q.anim_time*90*2-30)*1", "math.sin(q.anim_time*90*2-30)*-0.5"]
-				},
-				"neck": {
-					"rotation": ["0+math.sin(q.anim_time*90*4-30)*2.5", 0, 0]
+					"rotation": [-2.5, 0, 0]
 				},
 				"head": {
-					"rotation": ["5+math.sin(q.anim_time*90*4-30)*-3", "math.sin(q.anim_time*90*2-30)*1", "math.sin(q.anim_time*90*2-30)*-1.5"]
-				},
-				"head_fin": {
-					"rotation": ["0+math.sin(q.anim_time*90*4-30)*-1.5", 0, 0]
+					"rotation": [5, 0, 0]
 				},
 				"arm_left": {
-					"rotation": [7.5, 0, "37.5+math.sin(q.anim_time*90*2)*-5"]
+					"rotation": [7.5, 0, 27.5]
 				},
 				"arm_left2": {
-					"rotation": [0, "15+math.sin(q.anim_time*90*2-30)*5", "2.5+math.sin(q.anim_time*90*2-60)*-5"]
+					"rotation": [0, 15, 2.5]
 				},
 				"hand_left": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-120)*3", "10+math.sin(q.anim_time*90*2-150)*-2.5"]
+					"rotation": [0, 0, 5]
 				},
 				"finger_front_left": {
-					"rotation": [0, 0, "10+math.sin(q.anim_time*90*2-60)*-5"]
+					"rotation": [0, 2.5, 15]
 				},
 				"finger_middle_left": {
-					"rotation": [0, 0, "10+math.sin(q.anim_time*90*2-120)*-5"]
+					"rotation": [0, 0, 10]
 				},
 				"finger_back_left": {
-					"rotation": [0, 0, "10+math.sin(q.anim_time*90*2-180)*-5"]
+					"rotation": [0, -5, 20]
 				},
 				"arm_right": {
-					"rotation": [7.5, 0, "-37.5+math.sin(q.anim_time*90*2)*-5"]
+					"rotation": [7.5, 0, -27.5]
 				},
 				"arm_right2": {
-					"rotation": [0, "-15+math.sin(q.anim_time*90*2-30)*5", "-2.5+math.sin(q.anim_time*90*2-60)*-5"]
+					"rotation": [0, -15, -2.5]
 				},
 				"hand_right": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-120)*3", "-10+math.sin(q.anim_time*90*2-150)*-2.5"]
+					"rotation": [0, 0, -5]
 				},
 				"finger_front_right": {
-					"rotation": [0, 0, "-10+math.sin(q.anim_time*90*2-60)*-5"]
+					"rotation": [0, -2.5, -15]
 				},
 				"finger_middle_right": {
-					"rotation": [0, 0, "-10+math.sin(q.anim_time*90*2-120)*-5"]
+					"rotation": [0, 0, -10]
 				},
 				"finger_back_right": {
-					"rotation": [0, 0, "-10+math.sin(q.anim_time*90*2-180)*-5"]
+					"rotation": [0, 5, -20]
 				},
 				"tail_fin_left": {
-					"rotation": [-5, "45+math.sin(q.anim_time*90*2)*-12", 0]
+					"rotation": [-5, 45, 0]
 				},
 				"tail_fin_right": {
-					"rotation": [-5, "-45+math.sin(q.anim_time*90*2)*12", 0]
+					"rotation": [-5, -45, 0]
 				},
 				"leg_left": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*2)*2.5", 0, 0],
-					"position": [0, "-0.05+math.sin(q.anim_time*90*2)*0.1", "0+math.sin(q.anim_time*90*2)*-0.1"]
-				},
-				"leg_left2": {
-					"rotation": ["2.5+math.sin(q.anim_time*90*2)*-2.5", 0, 0]
-				},
-				"leg_right": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*2)*-2.5", 0, 0],
-					"position": [0, "-0.05+math.sin(q.anim_time*90*2)*-0.1", "0+math.sin(q.anim_time*90*2)*0.1"]
-				},
-				"leg_right2": {
-					"rotation": ["2.5+math.sin(q.anim_time*90*2)*2.5", 0, 0]
-				}
-			}
-		},
-		"animation.marshtomp.battle_idle": {
-			"loop": true,
-			"animation_length": 4,
-			"bones": {
-				"torso": {
-					"rotation": ["0+math.sin(q.anim_time*90*4)*-2", "math.sin(q.anim_time*90*2)*4", "math.sin(q.anim_time*90*2)*-2"],
-					"position": [0, "math.sin(q.anim_time*90*4)*0.05", 0]
-				},
-				"chest": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*4-30)*-1", "math.sin(q.anim_time*90*2-30)*4", "math.sin(q.anim_time*90*2-30)*-2.5"]
-				},
-				"head": {
-					"rotation": ["5+math.sin(q.anim_time*90*4-30)*-3", "math.sin(q.anim_time*90*2-30)*-6", "math.sin(q.anim_time*90*2-30)*5"]
-				},
-				"arm_left": {
-					"rotation": [7.5, 0, "27.5+math.sin(q.anim_time*90*2)*-7.5"]
-				},
-				"arm_left2": {
-					"rotation": [0, "15+math.sin(q.anim_time*90*2-30)*5", "2.5+math.sin(q.anim_time*90*2-30)*-5"]
-				},
-				"hand_left": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-90)*5", "5+math.sin(q.anim_time*90*2-90)*-7.5"]
-				},
-				"finger_front_left": {
-					"rotation": [0, 2.5, "15+math.sin(q.anim_time*90*2-120)*-10"]
-				},
-				"finger_middle_left": {
-					"rotation": [0, 0, "10+math.sin(q.anim_time*90*2-150)*-10"]
-				},
-				"finger_back_left": {
-					"rotation": [0, -5, "20+math.sin(q.anim_time*90*2-180)*-10"]
-				},
-				"arm_right": {
-					"rotation": [7.5, 0, "-27.5+math.sin(q.anim_time*90*2)*-7.5"]
-				},
-				"arm_right2": {
-					"rotation": [0, "-15+math.sin(q.anim_time*90*2-30)*5", "-2.5+math.sin(q.anim_time*90*2-30)*-5"]
-				},
-				"hand_right": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-90)*5", "-5+math.sin(q.anim_time*90*2-90)*-7.5"]
-				},
-				"finger_front_right": {
-					"rotation": [0, -2.5, "-15+math.sin(q.anim_time*90*2-120)*-10"]
-				},
-				"finger_middle_right": {
-					"rotation": [0, 0, "-10+math.sin(q.anim_time*90*2-150)*-10"]
-				},
-				"finger_back_right": {
-					"rotation": [0, 5, "-20+math.sin(q.anim_time*90*2-180)*-10"]
-				},
-				"tail_fin_left": {
-					"rotation": [-5, "45+math.sin(q.anim_time*90*2)*-12", 0]
-				},
-				"tail_fin_right": {
-					"rotation": [-5, "-45+math.sin(q.anim_time*90*2)*12", 0]
-				},
-				"leg_left": {
-					"rotation": [2.4905, "0.2178+math.sin(q.anim_time*90*2)*1.5", -2.49527]
+					"rotation": [2.5, 0, -2.5]
 				},
 				"leg_left2": {
 					"rotation": [5, 0, 0]
 				},
 				"foot_left": {
-					"rotation": [-7.47178, "0.6518+math.sin(q.anim_time*90*2)*-1.5", 2.45744]
+					"rotation": [-7.5, 0, 2.5]
 				},
 				"leg_right": {
-					"rotation": [2.4905, "-0.2178+math.sin(q.anim_time*90*2)*1.5", 2.49527]
+					"rotation": [2.5, 0, 2.5]
 				},
 				"leg_right2": {
 					"rotation": [5, 0, 0]
 				},
 				"foot_right": {
-					"rotation": [-7.47178, "-0.6518+math.sin(q.anim_time*90*2)*-1.5", -2.45744]
-				},
-				"body": {
-					"position": [0, -0.15, 0]
-				},
-				"neck": {
-					"rotation": ["0+math.sin(q.anim_time*90*4-30)*2.5", 0, 0]
-				},
-				"head_fin": {
-					"rotation": ["0+math.sin(q.anim_time*90*4-30)*-1.5", 0, 0]
-				},
-				"eye_angry_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_angry_right": {
-					"position": [0, 0, -0.1]
-				},
-				"jaw": {
-					"rotation": ["5+math.sin(q.anim_time*90*4-30)*-5", 0, 0]
+					"rotation": [-7.5, 0, -2.5]
+				}
+			}
+		},
+		"animation.marshtomp.cry": {
+			"animation_length": 1.2,
+			"sound_effects": {
+				"0.04": {
+					"effect": "pokemon.marshtomp.cry"
 				}
 			}
 		},
@@ -252,108 +162,6 @@
 					"position": [0, 0, -0.1]
 				}
 			}
-		},
-		"animation.marshtomp.cry": {
-			"animation_length": 2,
-			"bones": {
-				"chest": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.125": {
-							"post": [5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [-2.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.7917": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0833": {
-							"post": [-2.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5833": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"head": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.125": {
-							"post": [7.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4167": {
-							"post": [-12.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [-5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.8333": {
-							"post": [-12.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0417": {
-							"post": [-12.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.4583": {
-							"post": [-1.53, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.7083": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"jaw": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2083": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [27.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": {
-							"post": [17.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0833": {
-							"post": [40, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.4583": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				}
-			},
-			"sound_effects": {
-				"0.4167": {
-					"effect": "pokemon.marshtomp.cry"
-				}
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0260_swampert/swampert.animation.json

@@ -3,33 +3,30 @@
 	"animations": {
 		"animation.swampert.ground_idle": {
 			"loop": true,
-			"animation_length": 4,
 			"bones": {
 				"body": {
 					"position": [0, 1.75, 0]
 				},
 				"chest2": {
-					"rotation": ["-12.5+math.sin(q.anim_time*90*2-60)*0.75", 0, 0]
+					"rotation": [-12.5, 0, 0]
 				},
 				"neck": {
-					"rotation": ["-5+math.sin(q.anim_time*90*2-90)*1", "0+math.sin(q.anim_time*90*1-90)*-1", 0]
+					"rotation": [-5, 0, 0]
 				},
 				"leg_left": {
-					"rotation": ["8.7765+math.sin(q.anim_time*90*2)*-1.5", -12.0131, -53.28718],
-					"position": [0, "0+math.sin(q.anim_time*90*2)*-0.1", "0+math.sin(q.anim_time*90*2)*0.15"]
+					"rotation": [8.77647, -12.0131, -53.28718]
 				},
 				"leg_left2": {
-					"rotation": [4.5416, -0.2127, 45.09046]
+					"rotation": [4.54163, -0.2127, 45.09046]
 				},
 				"leg_left3": {
 					"rotation": [9.83802, -2.51058, 9.95791]
 				},
 				"foot_left": {
-					"rotation": [-27.58324, "-3.5552+math.sin(q.anim_time*90*2)*-1.5", 20.16242]
+					"rotation": [-27.58324, -3.55523, 20.16242]
 				},
 				"leg_right": {
-					"rotation": ["8.7765+math.sin(q.anim_time*90*2)*-1.5", 12.0131, 53.2872],
-					"position": [0, "0+math.sin(q.anim_time*90*2)*-0.1", "0+math.sin(q.anim_time*90*2)*0.15"]
+					"rotation": [8.77647, 12.0131, 53.2872]
 				},
 				"leg_right2": {
 					"rotation": [4.54163, 0.2127, -45.0905]
@@ -38,155 +35,16 @@
 					"rotation": [9.83802, 2.5106, -9.9579]
 				},
 				"foot_right": {
-					"rotation": [-27.58324, "3.5552+math.sin(q.anim_time*90*2)*1.5", -20.1624]
+					"rotation": [-27.58324, 3.5552, -20.1624]
 				},
 				"arm_left2": {
-					"rotation": [-4.36302, -31.26463, "17.6253+math.sin(q.anim_time*90*2-90)*2"]
+					"rotation": [-4.36302, -31.26463, 17.62528]
 				},
 				"arm_left3": {
-					"rotation": [1.80384, 2.38704, "35.4291+math.sin(q.anim_time*90*2-120)*2.5"]
+					"rotation": [1.80384, 2.38704, 35.42915]
 				},
 				"arm_left": {
-					"rotation": [-13.31914, "-14.6364+math.sin(q.anim_time*90*2-60)*2", 12.92638]
-				},
-				"finger_front_left": {
-					"rotation": [0, "-37.5+math.sin(q.anim_time*90*2-120)*-2.5", 20]
-				},
-				"finger_middle_left": {
-					"rotation": [0, "-32.5+math.sin(q.anim_time*90*2-120)*-2.5", 0]
-				},
-				"finger_back_left": {
-					"rotation": [0, "-30+math.sin(q.anim_time*90*2-120)*-2.5", -27.5]
-				},
-				"fingers_left": {
-					"rotation": [0, 37.5, 0]
-				},
-				"arm_right": {
-					"rotation": [-13.31914, "14.6364+math.sin(q.anim_time*90*2-60)*-2", -12.9264]
-				},
-				"arm_right2": {
-					"rotation": [-4.33052, "31.2647+math.sin(q.anim_time*90*2-90)*2", -17.60892]
-				},
-				"arm_right3": {
-					"rotation": [1.80384, -2.387, "-35.4292+math.sin(q.anim_time*90*2-120)*-2.5"]
-				},
-				"fingers_right": {
-					"rotation": [0, -37.5, 0]
-				},
-				"finger_front_right": {
-					"rotation": [0, "37.5+math.sin(q.anim_time*90*2-120)*2.5", -20]
-				},
-				"finger_middle_right": {
-					"rotation": [0, "32.5+math.sin(q.anim_time*90*2-120)*2.5", 0]
-				},
-				"finger_back_right": {
-					"rotation": [0, "30+math.sin(q.anim_time*90*2-120)*2.5", 27.5]
-				},
-				"torso": {
-					"rotation": ["-5+math.sin(q.anim_time*90*2)*0.5", 0, 0],
-					"position": [0, "0+math.sin(q.anim_time*90*2+30)*-0.4", 0]
-				},
-				"chest": {
-					"rotation": ["-7.5+math.sin(q.anim_time*90*2-30)*1.5", 0, 0]
-				},
-				"hand_left": {
-					"rotation": [0, "-17.5+math.sin(q.anim_time*90*2-90)*-5", 0]
-				},
-				"finger_front_left2": {
-					"rotation": [0, "-12.5+math.sin(q.anim_time*90*2-150)*-5", 0]
-				},
-				"finger_middle_left2": {
-					"rotation": [0, "-10+math.sin(q.anim_time*90*2-150)*-5", 0]
-				},
-				"finger_back_left2": {
-					"rotation": [0, "-15+math.sin(q.anim_time*90*2-150)*-5", 0]
-				},
-				"hand_right": {
-					"rotation": [0, "17.5+math.sin(q.anim_time*90*2-90)*5", 0]
-				},
-				"finger_front_right2": {
-					"rotation": [0, "12.5+math.sin(q.anim_time*90*2-150)*5", 0]
-				},
-				"finger_middle_right2": {
-					"rotation": [0, "10+math.sin(q.anim_time*90*2-150)*5", 0]
-				},
-				"finger_back_right2": {
-					"rotation": [0, "15+math.sin(q.anim_time*90*2-150)*5", 0]
-				},
-				"check_left_spike_front": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-30)*3", 0]
-				},
-				"check_left_spike_back": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-30)*3", 0]
-				},
-				"check_right_spike_front": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-30)*-3", 0]
-				},
-				"check_right_spike_back": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-30)*-3", 0]
-				},
-				"eyebrow_left": {
-					"rotation": [0, "-2.5+math.sin(q.anim_time*90*2-60)*-2.5", 0]
-				},
-				"eyebrow_right": {
-					"rotation": [0, "2.5-math.sin(q.anim_time*90*2-60)*-2.5", 0]
-				},
-				"tail": {
-					"rotation": ["0+math.sin(q.anim_time*90*2-30)*-2.5", 0, 0]
-				},
-				"head": {
-					"rotation": ["12.5+math.sin(q.anim_time*90*2-90)*-2.5", "-0+math.sin(q.anim_time*90*1-90)*-0.5", 0]
-				}
-			}
-		},
-		"animation.swampert.battle_idle": {
-			"loop": true,
-			"animation_length": 4,
-			"bones": {
-				"body": {
-					"position": [0, 1.75, 0]
-				},
-				"chest2": {
-					"rotation": ["-12.5+math.sin(q.anim_time*90*2-60)*0.75", 0, 0]
-				},
-				"neck": {
-					"rotation": ["-5+math.sin(q.anim_time*90*2-90)*1", "0+math.sin(q.anim_time*90*1-90)*-1", 0]
-				},
-				"leg_left": {
-					"rotation": ["8.7765+math.sin(q.anim_time*90*2)*-1.5", -12.0131, -53.28718],
-					"position": [0, "0+math.sin(q.anim_time*90*2)*-0.1", "0+math.sin(q.anim_time*90*2)*0.15"]
-				},
-				"leg_left2": {
-					"rotation": [4.5416, -0.2127, 45.09046]
-				},
-				"leg_left3": {
-					"rotation": [9.83802, -2.51058, 9.95791]
-				},
-				"foot_left": {
-					"rotation": [-27.58324, "-3.5552+math.sin(q.anim_time*90*2)*-1.5", 20.16242]
-				},
-				"leg_right": {
-					"rotation": ["8.7765+math.sin(q.anim_time*90*2)*-1.5", 12.0131, 53.2872],
-					"position": [0, "0+math.sin(q.anim_time*90*2)*-0.1", "0+math.sin(q.anim_time*90*2)*0.15"]
-				},
-				"leg_right2": {
-					"rotation": [4.54163, 0.2127, -45.0905]
-				},
-				"leg_right3": {
-					"rotation": [9.83802, 2.5106, -9.9579]
-				},
-				"foot_right": {
-					"rotation": [-27.58324, "3.5552+math.sin(q.anim_time*90*2)*1.5", -20.1624]
-				},
-				"arm_left2": {
-					"rotation": [-4.71002, "-12.8789-math.sin(q.anim_time*90*2-90)*2", 28.88472]
-				},
-				"arm_left3": {
-					"rotation": [1.81234, "10.1983-math.sin(q.anim_time*90*2-30)*-5", 25.6704]
-				},
-				"arm_left": {
-					"rotation": [-33.31914, "-14.6364-math.sin(q.anim_time*90*2-60)*-2", 12.9264],
-					"position": [0, "0-math.sin(q.anim_time*90*2-30)*-0.3", 0]
+					"rotation": [-13.31914, -14.63639, 12.92638]
 				},
 				"finger_front_left": {
 					"rotation": [0, -37.5, 20]
@@ -201,14 +59,13 @@
 					"rotation": [0, 37.5, 0]
 				},
 				"arm_right": {
-					"rotation": [-33.31914, "14.6364+math.sin(q.anim_time*90*2-60)*-2", -12.9264],
-					"position": [0, "0-math.sin(q.anim_time*90*2-30)*-0.3", 0]
+					"rotation": [-13.31914, 14.6364, -12.9264]
 				},
 				"arm_right2": {
-					"rotation": [-4.71002, "12.8789+math.sin(q.anim_time*90*2-90)*2", -28.88472]
+					"rotation": [-4.36302, 31.2646, -17.6253]
 				},
 				"arm_right3": {
-					"rotation": [1.81234, "-10.1983+math.sin(q.anim_time*90*2-30)*-5", -25.6704]
+					"rotation": [1.80384, -2.387, -35.4292]
 				},
 				"fingers_right": {
 					"rotation": [0, -37.5, 0]
@@ -223,65 +80,37 @@
 					"rotation": [0, 30, 27.5]
 				},
 				"torso": {
-					"rotation": ["12.5+math.sin(q.anim_time*90*2)*0.5", 0, 0],
-					"position": [0, "0+math.sin(q.anim_time*90*2+30)*-0.4", 0]
+					"rotation": [-2.5, 0, 0]
 				},
 				"chest": {
-					"rotation": ["-0+math.sin(q.anim_time*90*2-30)*1.5", 0, 0]
+					"rotation": [-7.5, 0, 0]
 				},
 				"hand_left": {
-					"rotation": [0, "-17.5-math.sin(q.anim_time*90*2-60)*-2", 0]
+					"rotation": [0, -17.5, 0]
 				},
 				"finger_front_left2": {
-					"rotation": [0, "-12.5+math.sin(q.anim_time*90*2-150)*-5", 0]
+					"rotation": [0, -12.5, 0]
 				},
 				"finger_middle_left2": {
-					"rotation": [0, "-10+math.sin(q.anim_time*90*2-150)*-5", 0]
+					"rotation": [0, -10, 0]
 				},
 				"finger_back_left2": {
-					"rotation": [0, "-15+math.sin(q.anim_time*90*2-150)*-5", 0]
+					"rotation": [0, -15, 0]
+				},
+				"head_angle": {
+					"rotation": [12.5, 0, 0]
 				},
 				"hand_right": {
-					"rotation": [0, "17.5+math.sin(q.anim_time*90*2-60)*-2", 0]
+					"rotation": [0, 17.5, 0]
 				},
 				"finger_front_right2": {
-					"rotation": [0, "12.5+math.sin(q.anim_time*90*2-150)*5", 0]
+					"rotation": [0, 12.5, 0]
 				},
 				"finger_middle_right2": {
-					"rotation": [0, "10+math.sin(q.anim_time*90*2-150)*5", 0]
+					"rotation": [0, 10, 0]
 				},
 				"finger_back_right2": {
-					"rotation": [0, "15+math.sin(q.anim_time*90*2-150)*5", 0]
-				},
-				"check_left_spike_front": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-30)*3", 0]
-				},
-				"check_left_spike_back": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-30)*3", 0]
-				},
-				"check_right_spike_front": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-30)*-3", 0]
-				},
-				"check_right_spike_back": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-30)*-3", 0]
-				},
-				"eyebrow_left": {
-					"rotation": [0, "-2.5+math.sin(q.anim_time*90*2-60)*-2.5", 0]
-				},
-				"eyebrow_right": {
-					"rotation": [0, "2.5-math.sin(q.anim_time*90*2-60)*-2.5", 0]
-				},
-				"tail": {
-					"rotation": ["0+math.sin(q.anim_time*90*2-30)*-2.5", 0, 0]
-				},
-				"head": {
-					"rotation": ["-5+math.sin(q.anim_time*90*2-90)*-2.5", "math.sin(q.anim_time*90*1-90)*-0.5", 0]
-				},
-				"eye_angry_left": {
-					"position": [0, -0.1, 0]
-				},
-				"eye_angry_right": {
-					"position": [0, -0.1, 0]
+					"rotation": [0, 15, 0]
 				}
 			}
 		},
@@ -404,6 +233,14 @@
 				}
 			}
 		},
+		"animation.swampert.cry": {
+			"animation_length": 1.2,
+			"sound_effects": {
+				"0.04": {
+					"effect": "pokemon.swampert.cry"
+				}
+			}
+		},
 		"animation.swampert.blink": {
 			"animation_length": 0.1667,
 			"bones": {
@@ -485,158 +322,6 @@
 					"position": [0, -0.1, 0]
 				}
 			}
-		},
-		"animation.swampert.cry": {
-			"animation_length": 2.5,
-			"bones": {
-				"chest2": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2917": {
-							"post": [7.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [-5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5417": {
-							"post": [-6, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0417": {
-							"post": [-1, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"neck": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2917": {
-							"post": [7.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [-5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5417": {
-							"post": [-6, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0417": {
-							"post": [-1, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"head": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [7.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5833": {
-							"post": [-5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5": {
-							"post": [-6, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [1, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": {
-							"pre": [0, 0, 0],
-							"post": [0, -0.1, 0]
-						},
-						"0.4167": {
-							"pre": [0, -0.1, 0],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": {
-							"pre": [0, 0, 0],
-							"post": [0, -0.1, 0]
-						},
-						"0.4167": {
-							"pre": [0, -0.1, 0],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"jaw": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.3333": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.6667": {
-							"post": [30, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.9167": {
-							"post": [15, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.4167": {
-							"post": [40, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.8333": {
-							"post": [40, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.1667": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				}
-			},
-			"sound_effects": {
-				"0.4167": {
-					"effect": "pokemon.swampert.cry"
-				}
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0931_squawkabilly/squawkabilly.animation.json

@@ -21,12 +21,12 @@
 					"rotation": [0, -45, 0]
 				},
 				"tail": {
-					"rotation": ["50-math.sin(q.anim_time*90*2-60)*-3", 0, 0]
+					"rotation": [50, 0, 0]
 				},
-				"toe_front_inner_left": {
+				"toe_inner_left": {
 					"rotation": [0, 5, 0]
 				},
-				"toe_front_outer_left": {
+				"toe_outer_left": {
 					"rotation": [0, -5, 0]
 				},
 				"neckflap_left": {
@@ -44,372 +44,11 @@
 				},
 				"wing_right3": {
 					"rotation": [0, 45, 0]
-				},
-				"torso": {
-					"rotation": ["-math.sin(q.anim_time*90*2-90)*1", 0, "math.sin(q.anim_time*90*1-90)*1"],
-					"position": [0, "math.sin(q.anim_time*90*2)*0.1", 0]
-				},
-				"neck": {
-					"rotation": ["-0-math.sin(q.anim_time*90*2-180)*1", 0, 0]
-				},
-				"head": {
-					"rotation": ["-0-math.sin(q.anim_time*90*2-90)*-2", 0, 0]
-				},
-				"hair": {
-					"rotation": ["-0-math.sin(q.anim_time*90*2-150)*-2", 0, 0]
-				}
-			}
-		},
-		"animation.squawkabilly.ground_walk": {
-			"loop": true,
-			"animation_length": 0.75,
-			"bones": {
-				"hairstrand": {
-					"rotation": [7.5, 0, 12.5]
-				},
-				"hairstrand2": {
-					"rotation": [-17.5, 0, 0]
-				},
-				"wing_left": {
-					"rotation": [155.5391, -73.26807, -64.02788],
-					"position": [0, -1.5, -2]
-				},
-				"wing_left2": {
-					"rotation": [0, 45, 0]
-				},
-				"wing_left3": {
-					"rotation": [0, -45, 0]
-				},
-				"tail": {
-					"rotation": ["50-math.cos(q.anim_time*90*16/3*2)*5", 0, 0]
-				},
-				"toe_front_inner_left": {
-					"rotation": {
-						"0.0": [-55, 10, -7.5],
-						"0.125": {
-							"pre": [7.5, 15, 0],
-							"post": [7.5, 15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [5, 15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [0, 15, 0],
-						"0.625": [0, 15, 0],
-						"0.75": [-55, 10, -7.5]
-					},
-					"position": {
-						"0.0": [0, -0.75, 0.85],
-						"0.125": [0, 0, 0],
-						"0.625": [0, 0, 0],
-						"0.75": [0, -0.75, 0.85]
-					}
-				},
-				"toe_front_outer_left": {
-					"rotation": {
-						"0.0": [-51.5, -2.5, 10],
-						"0.125": {
-							"pre": [5, -15, 0],
-							"post": [5, -15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [5, -15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [0, -15, 0],
-						"0.625": [0, -15, 0],
-						"0.75": [-51.5, -2.5, 10]
-					},
-					"position": {
-						"0.0": [0, -0.75, 0.85],
-						"0.125": [0, 0, 0],
-						"0.625": [0, 0, 0],
-						"0.75": [0, -0.75, 0.85]
-					}
-				},
-				"neckflap_left": {
-					"rotation": [0, 0, "15+math.cos(q.anim_time*90*16/3*2-60)*-2.5"]
-				},
-				"neckflap_right": {
-					"rotation": [0, 0, "-15-math.cos(q.anim_time*90*16/3*2-60)*-2.5"]
-				},
-				"wing_right": {
-					"rotation": [153.0391, 73.26807, 64.02788],
-					"position": [0, -2, -3]
-				},
-				"wing_right2": {
-					"rotation": [0, -45, 0]
-				},
-				"wing_right3": {
-					"rotation": [0, 45, 0]
-				},
-				"torso": {
-					"rotation": ["1-math.cos(q.anim_time*90*16/3*2)*-2", "-math.sin(q.anim_time*90*16/3+60)*3", "-1+math.sin(q.anim_time*90*16/3+30)*-4"],
-					"position": [0, "math.sin(q.anim_time*90*16/3*2)*0.2", 0]
-				},
-				"coat_left": {
-					"rotation": ["-0-math.cos(q.anim_time*90*16/3*2)*-2.5", 0, "0+math.cos(q.anim_time*90*8/3*2)*5"]
-				},
-				"coat_right": {
-					"rotation": ["-0-math.cos(q.anim_time*90*16/3*2)*-2.5", 0, "0-math.cos(q.anim_time*90*8/3*2)*-5"]
-				},
-				"neck": {
-					"rotation": ["-math.cos(q.anim_time*90*16/3*2)*-2.5", "-math.sin(q.anim_time*90*16/3+60)*-3", "math.sin(q.anim_time*90*16/3+30)*3"]
-				},
-				"head": {
-					"rotation": ["-0-math.cos(q.anim_time*90*16/3*2)*3", 0, 0]
-				},
-				"hair": {
-					"rotation": ["-0-math.cos(q.anim_time*90*16/3*2-60)*4", 0, 0]
-				},
-				"leg_left": {
-					"rotation": {
-						"0.0": [25, -17.5, 0],
-						"0.125": {
-							"pre": [21.25, -12.5, 0],
-							"post": [21.25, -12.5, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [-40, -5, 0],
-						"0.75": [25, -17.5, 0]
-					},
-					"position": {
-						"0.0": [0.3, 0.1, 0.6],
-						"0.0417": [0.23, 0.25, 0.71],
-						"0.125": {
-							"pre": [0, 0.68, -0.08],
-							"post": [0, 0.68, -0.08],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [0, 0.97, -1.41],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [0, -0.5, -2.15],
-						"0.5": [0, -0.19, -1.02],
-						"0.5833": [0, -0.07, -0.3],
-						"0.625": [0, -0.02, 0.21],
-						"0.7083": [0.1, 0.215, 0.43],
-						"0.75": [0.3, 0.1, 0.6]
-					}
-				},
-				"leg_left2": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.125": {
-							"pre": [-30.83, 0, 0],
-							"post": [-30.83, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [-2.65, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [12.5, 0, 0],
-						"0.75": [0, 0, 0]
-					}
-				},
-				"foot_left": {
-					"rotation": {
-						"0.0": [27.5, 0, -5],
-						"0.125": {
-							"pre": [20.17, 0, 0],
-							"post": [20.17, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [12.596, 0.6637, -1.3486],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [28, 0, 0],
-						"0.625": [-7.33, 0, 0],
-						"0.75": [27.5, 0, -5]
-					},
-					"position": {
-						"0.0": [0, 0.25, 0],
-						"0.125": [0, 0, 0],
-						"0.375": [0, 0, 0],
-						"0.625": [0, 0.17, 0],
-						"0.75": [0, 0.25, 0]
-					}
-				},
-				"toe_back_outer_left": {
-					"rotation": {
-						"0.0": [-20, 0, 0],
-						"0.2083": {
-							"pre": [-8.33, 0, 0],
-							"post": [-8.33, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [0, 0, 0],
-						"0.625": [0, 0, 0],
-						"0.75": [-20, 0, 0]
-					}
-				},
-				"leg_right": {
-					"rotation": {
-						"0.0": [-40, 5, 0],
-						"0.375": [25, 17.5, 0],
-						"0.5": {
-							"pre": [21.25, 12.5, 0],
-							"post": [21.25, 12.5, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [-40, 5, 0]
-					},
-					"position": {
-						"0.0": [0, -0.5, -2.15],
-						"0.125": [0, -0.19, -1.02],
-						"0.2083": [0, -0.07, -0.3],
-						"0.25": [0, -0.02, 0.21],
-						"0.3333": [-0.1, 0.215, 0.43],
-						"0.375": [-0.3, 0.1, 0.6],
-						"0.4167": [-0.23, 0.25, 0.71],
-						"0.5": {
-							"pre": [0, 0.68, -0.08],
-							"post": [0, 0.68, -0.08],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [0, 0.97, -1.41],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [0, -0.5, -2.15]
-					}
-				},
-				"leg_right2": {
-					"rotation": {
-						"0.0": [12.5, 0, 0],
-						"0.375": [0, 0, 0],
-						"0.5": {
-							"pre": [-30.83, 0, 0],
-							"post": [-30.83, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [-2.65, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [12.5, 0, 0]
-					}
-				},
-				"foot_right": {
-					"rotation": {
-						"0.0": [28, 0, 0],
-						"0.25": [-7.33, 0, 0],
-						"0.375": [27.5, 0, 5],
-						"0.5": {
-							"pre": [20.17, 0, 0],
-							"post": [20.17, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [12.596, -0.6637, 1.3486],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [28, 0, 0]
-					},
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, 0.17, 0],
-						"0.375": [0, 0.25, 0],
-						"0.5": [0, 0, 0],
-						"0.75": [0, 0, 0]
-					}
-				},
-				"toe_back_inner_right": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, 0, 0],
-						"0.375": [-20, 0, 0],
-						"0.5833": {
-							"pre": [-8.33, 0, 0],
-							"post": [-8.33, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [0, 0, 0]
-					}
-				},
-				"toe_front_inner_right": {
-					"rotation": {
-						"0.0": [0, -15, 0],
-						"0.25": [0, -15, 0],
-						"0.375": [-55, -10, 7.5],
-						"0.5": {
-							"pre": [7.5, -15, 0],
-							"post": [7.5, -15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [5, -15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [0, -15, 0]
-					},
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, 0, 0],
-						"0.375": [0, -0.75, 0.85],
-						"0.5": [0, 0, 0],
-						"0.75": [0, 0, 0]
-					}
-				},
-				"toe_front_outer_right": {
-					"rotation": {
-						"0.0": [0, 15, 0],
-						"0.25": [0, 15, 0],
-						"0.375": [-51.5, 2.5, -10],
-						"0.5": {
-							"pre": [5, 15, 0],
-							"post": [5, 15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [5, 15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [0, 15, 0]
-					},
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, 0, 0],
-						"0.375": [0, -0.75, 0.85],
-						"0.5": [0, 0, 0],
-						"0.75": [0, 0, 0]
-					}
-				},
-				"toe_back_inner_left": {
-					"rotation": {
-						"0.0": [-20, 0, 0],
-						"0.2083": {
-							"pre": [-8.33, 0, 0],
-							"post": [-8.33, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [0, 0, 0],
-						"0.625": [0, 0, 0],
-						"0.75": [-20, 0, 0]
-					}
-				},
-				"toe_back_inner_right3": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, 0, 0],
-						"0.375": [-20, 0, 0],
-						"0.5833": {
-							"pre": [-8.33, 0, 0],
-							"post": [-8.33, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [0, 0, 0]
-					}
 				}
 			}
 		},
 		"animation.squawkabilly.cry": {
-			"animation_length": 2,
+			"animation_length": 1.25,
 			"bones": {
 				"neck": {
 					"rotation": {
@@ -417,27 +56,15 @@
 							"post": [0, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"0.25": {
-							"post": [12.5, 0, 0],
+						"0.1667": {
+							"post": [10, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"0.5": {
-							"post": [2.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.8333": {
-							"post": [8.33, 0, 0],
+						"0.9167": {
+							"post": [10, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
 						"1.25": {
-							"post": [-2.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.9167": {
 							"post": [0, 0, 0],
 							"lerp_mode": "catmullrom"
 						}
@@ -449,27 +76,15 @@
 							"post": [0, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"0.25": {
-							"post": [7.5, 0, 0],
+						"0.1667": {
+							"post": [-15, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"0.5": {
-							"post": [-20, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.8333": {
-							"post": [-12.78, 0, 0],
+						"0.9167": {
+							"post": [-15, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
 						"1.25": {
-							"post": [-27.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.75": {
 							"post": [0, 0, 0],
 							"lerp_mode": "catmullrom"
 						}
@@ -481,116 +96,17 @@
 							"post": [0, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"0.25": {
+						"0.1667": {
 							"post": [25, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"0.5": {
-							"post": [47.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.8333": {
-							"post": [20, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.25": {
-							"post": [62.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"torso": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5833": {
-							"post": [-7.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.8333": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.25": {
-							"post": [-5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5833": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.9167": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"hair": {
-					"rotation": {
-						"0.0833": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.3333": {
-							"post": [7.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5833": {
-							"post": [-20, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
 						"0.9167": {
-							"post": [-12.78, 0, 0],
+							"post": [25, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"1.3333": {
-							"post": [-27.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5833": {
+						"1.25": {
 							"post": [0, 0, 0],
 							"lerp_mode": "catmullrom"
-						},
-						"1.8333": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.8333": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, -0.1]
-						},
-						"1.0": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.8333": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, -0.1]
-						},
-						"1.0": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
 						}
 					}
 				}
@@ -610,205 +126,18 @@
 				"eyelid_left": {
 					"position": {
 						"0.0": [0.1, 0, -0.1],
-						"0.1667": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.125": [0.1, 0, -0.1],
+						"0.1667": [0, 0, 0]
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [-0.1, 0, -0.1],
-						"0.1667": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.125": [-0.1, 0, -0.1],
+						"0.1667": [0, 0, 0]
 					}
 				}
 			}
-		},
-		"animation.squawkabilly.air_idle": {
-			"loop": true,
-			"animation_length": 4,
-			"bones": {
-				"body": {
-					"position": ["-math.sin(q.anim_time*90*3-45)*0.5", "math.sin(q.anim_time*90*6-45)*1.5", "math.sin(q.anim_time*90*6-45)*1/2"]
-				},
-				"coat_left": {
-					"rotation": ["-0-math.sin(q.anim_time*90*6-60)*3", 0, "0+math.sin(q.anim_time*90*6-90)*5"]
-				},
-				"coat_right": {
-					"rotation": ["-0-math.sin(q.anim_time*90*6-60)*3", 0, "-0-math.sin(q.anim_time*90*6-90)*5"]
-				},
-				"wing_left": {
-					"rotation": ["25-math.sin(q.anim_time*90*6-90)*6", 0, "math.sin(q.anim_time*90*6)*65"],
-					"position": [0, "math.sin(q.anim_time*90*6)*-1", 0]
-				},
-				"wing_left2": {
-					"rotation": [0, 0, "20+math.sin(q.anim_time*90*6-45)*30"]
-				},
-				"wing_left3": {
-					"rotation": [0, 0, "0+math.sin(q.anim_time*90*6-75)*30"]
-				},
-				"wing_right": {
-					"rotation": ["25-math.sin(q.anim_time*90*6-90)*6", 0, "-math.sin(q.anim_time*90*6)*65"],
-					"position": [0, "math.sin(q.anim_time*90*6)*-1", 0]
-				},
-				"wing_right2": {
-					"rotation": [0, 0, "-20-math.sin(q.anim_time*90*6-45)*30"]
-				},
-				"wing_right3": {
-					"rotation": [0, 0, "-0-math.sin(q.anim_time*90*6-75)*30"]
-				},
-				"tail": {
-					"rotation": ["15-math.sin(q.anim_time*90*6-30)*7", 0, 0]
-				},
-				"neck": {
-					"rotation": ["5-math.sin(q.anim_time*90*6-140)*-1", 0, "math.sin(q.anim_time*90*3-00)*-1"]
-				},
-				"head": {
-					"rotation": ["-math.sin(q.anim_time*90*6-110)*3", 0, "math.sin(q.anim_time*90*3-120)*-2"]
-				},
-				"hair": {
-					"rotation": ["-0-math.sin(q.anim_time*90*6-170)*5", 0, 0]
-				},
-				"leg_left": {
-					"rotation": [-67.5, 0, -2.5]
-				},
-				"foot_left": {
-					"rotation": ["40-math.sin(q.anim_time*90*6-30)*-5", -10, "math.sin(q.anim_time*90*3-150)*6"]
-				},
-				"toe_back_outer_left": {
-					"rotation": [-30, 0, 0]
-				},
-				"toe_front_inner_left": {
-					"rotation": [30, 0, 0]
-				},
-				"toe_front_outer_left": {
-					"rotation": [30, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [-67.5, 0, 2.5]
-				},
-				"foot_right": {
-					"rotation": ["40-math.sin(q.anim_time*90*6-30)*-5", 10, "-math.sin(q.anim_time*90*3-150)*6"]
-				},
-				"toe_back_inner_right": {
-					"rotation": [-30, 0, 0]
-				},
-				"toe_front_inner_right": {
-					"rotation": [30, 0, 0]
-				},
-				"toe_front_outer_right": {
-					"rotation": [30, 0, 0]
-				},
-				"toe_back_inner_left": {
-					"rotation": [-30, 0, 0]
-				},
-				"toe_back_inner_right3": {
-					"rotation": [-30, 0, 0]
-				}
-			},
-			"timeline": {
-				"0.6667": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"1.3333": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"2.0": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"2.6667": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"3.3333": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"4.0": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};"
-			}
-		},
-		"animation.squawkabilly.air_fly": {
-			"loop": true,
-			"animation_length": 4,
-			"bones": {
-				"body": {
-					"rotation": [25, 0, 0],
-					"position": ["-math.sin(q.anim_time*90*3-45)*0.5", "math.sin(q.anim_time*90*6-45)*1.5", "math.sin(q.anim_time*90*6-45)*1/2"]
-				},
-				"coat_left": {
-					"rotation": ["-0-math.sin(q.anim_time*90*6-60)*3", 0, "0+math.sin(q.anim_time*90*6-90)*5"]
-				},
-				"coat_right": {
-					"rotation": ["-0-math.sin(q.anim_time*90*6-60)*3", 0, "-0-math.sin(q.anim_time*90*6-90)*5"]
-				},
-				"wing_left": {
-					"rotation": ["-0-math.sin(q.anim_time*90*6-90)*6", -5, "math.sin(q.anim_time*90*6)*65"],
-					"position": [0, "math.sin(q.anim_time*90*6)*-1", 0]
-				},
-				"wing_left2": {
-					"rotation": [0, 0, "20+math.sin(q.anim_time*90*6-45)*30"]
-				},
-				"wing_left3": {
-					"rotation": [0, 0, "0+math.sin(q.anim_time*90*6-75)*30"]
-				},
-				"wing_right": {
-					"rotation": ["-0-math.sin(q.anim_time*90*6-90)*6", 5, "-math.sin(q.anim_time*90*6)*65"],
-					"position": [0, "math.sin(q.anim_time*90*6)*-1", 0]
-				},
-				"wing_right2": {
-					"rotation": [0, 0, "-20-math.sin(q.anim_time*90*6-45)*30"]
-				},
-				"wing_right3": {
-					"rotation": [0, 0, "-0-math.sin(q.anim_time*90*6-75)*30"]
-				},
-				"tail": {
-					"rotation": ["15-math.sin(q.anim_time*90*6-30)*7", 0, 0]
-				},
-				"neck": {
-					"rotation": ["25-math.sin(q.anim_time*90*6-140)*-1", 0, "math.sin(q.anim_time*90*3-00)*-1"]
-				},
-				"head": {
-					"rotation": ["-50-math.sin(q.anim_time*90*6-110)*3", 0, "math.sin(q.anim_time*90*3-120)*-2"]
-				},
-				"hair": {
-					"rotation": ["-0-math.sin(q.anim_time*90*6-170)*5", 0, 0]
-				},
-				"leg_left": {
-					"rotation": [-67.5, 0, -2.5]
-				},
-				"foot_left": {
-					"rotation": ["40-math.sin(q.anim_time*90*6-30)*-5", -10, "math.sin(q.anim_time*90*3-150)*6"]
-				},
-				"toe_back_outer_left": {
-					"rotation": [-30, 0, 0]
-				},
-				"toe_front_inner_left": {
-					"rotation": [30, 0, 0]
-				},
-				"toe_front_outer_left": {
-					"rotation": [30, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [-67.5, 0, 2.5]
-				},
-				"foot_right": {
-					"rotation": ["40-math.sin(q.anim_time*90*6-30)*-5", 10, "-math.sin(q.anim_time*90*3-150)*6"]
-				},
-				"toe_back_inner_right": {
-					"rotation": [-30, 0, 0]
-				},
-				"toe_front_inner_right": {
-					"rotation": [30, 0, 0]
-				},
-				"toe_front_outer_right": {
-					"rotation": [30, 0, 0]
-				},
-				"toe_back_inner_left": {
-					"rotation": [-30, 0, 0]
-				},
-				"toe_back_inner_right3": {
-					"rotation": [-30, 0, 0]
-				}
-			},
-			"timeline": {
-				"0.6667": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"1.3333": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"2.0": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"2.6667": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"3.3333": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"4.0": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};"
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0022_fearow/fearow.geo.json

@@ -68,12 +68,7 @@
 					"name": "head",
 					"parent": "neck3",
 					"pivot": [0, 32.86868, -14.9296],
-					"rotation": [-90, 0, 0]
-				},
-				{
-					"name": "head_ai",
-					"parent": "head",
-					"pivot": [0, 32.86868, -14.9296],
+					"rotation": [-90, 0, 0],
 					"cubes": [
 						{"origin": [-2.5, 29.75372, -22.00071], "size": [5, 6, 8], "uv": [174, 92]},
 						{"origin": [-2.51, 34.75372, -22.00071], "size": [1, 1, 3], "inflate": 0.03, "uv": [1, 217]},
@@ -82,7 +77,7 @@
 				},
 				{
 					"name": "eyes",
-					"parent": "head_ai",
+					"parent": "head",
 					"pivot": [0, 33.75372, -20.50071]
 				},
 				{
@@ -231,7 +226,7 @@
 				},
 				{
 					"name": "beak",
-					"parent": "head_ai",
+					"parent": "head",
 					"pivot": [0, 33.35372, -22.50071],
 					"rotation": [17.5, 0, 0],
 					"cubes": [
@@ -281,7 +276,7 @@
 				},
 				{
 					"name": "crest",
-					"parent": "head_ai",
+					"parent": "head",
 					"pivot": [0, 35.85372, -18.60071],
 					"rotation": [-5, 0, 0]
 				},
@@ -327,7 +322,7 @@
 				},
 				{
 					"name": "jaw",
-					"parent": "head_ai",
+					"parent": "head",
 					"pivot": [0, 31.85372, -22.40071],
 					"rotation": [5, 0, 0],
 					"cubes": [
@@ -345,7 +340,7 @@
 				},
 				{
 					"name": "locator_head",
-					"parent": "head_ai",
+					"parent": "head",
 					"pivot": [0, 36, -20],
 					"locators": {
 						"head": [0, 36, -20]
@@ -353,7 +348,7 @@
 				},
 				{
 					"name": "locator_item_hat",
-					"parent": "head_ai",
+					"parent": "head",
 					"pivot": [0, 39, -18],
 					"locators": {
 						"item_hat": [0, 39, -18]
@@ -361,7 +356,7 @@
 				},
 				{
 					"name": "locator_item_face",
-					"parent": "head_ai",
+					"parent": "head",
 					"pivot": [0, 34.25, -22],
 					"locators": {
 						"item_face": [0, 34.25, -22]
@@ -369,7 +364,7 @@
 				},
 				{
 					"name": "locator_face",
-					"parent": "head_ai",
+					"parent": "head",
 					"pivot": [0, 31, -34],
 					"locators": {
 						"face": [0, 31, -34]
@@ -377,7 +372,7 @@
 				},
 				{
 					"name": "locator_mouth",
-					"parent": "head_ai",
+					"parent": "head",
 					"pivot": [0, 31.75, -20],
 					"locators": {
 						"mouth": [0, 31.75, -20]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0260_swampert/swampert.geo.json

@@ -7,8 +7,8 @@
 				"texture_width": 256,
 				"texture_height": 128,
 				"visible_bounds_width": 6,
-				"visible_bounds_height": 5,
-				"visible_bounds_offset": [0, 1.5, 0]
+				"visible_bounds_height": 4,
+				"visible_bounds_offset": [0, 1, 0]
 			},
 			"bones": [
 				{
@@ -252,7 +252,7 @@
 					"name": "head_correction",
 					"parent": "head",
 					"pivot": [0, 14.25, -14],
-					"rotation": [42.5, 0, 0]
+					"rotation": [-42.5, 0, 0]
 				},
 				{
 					"name": "head_ai",
@@ -263,7 +263,6 @@
 					"name": "head_angle",
 					"parent": "head_ai",
 					"pivot": [0, 14.25, -15],
-					"rotation": [-90, 0, 0],
 					"cubes": [
 						{"origin": [-7, 3.5, -21.5], "size": [14, 15, 6], "inflate": 0.01, "uv": [0, 0]},
 						{"origin": [-7, 10.5, -15.5], "size": [14, 8, 3], "inflate": 0.01, "uv": [40, 0]},

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0656_froakie/froakie.geo.json

@@ -227,14 +227,6 @@
 						{"origin": [3.1, 20.8, -0.84], "size": [2, 1, 1], "inflate": 0.1, "uv": [60, 42]}
 					]
 				},
-				{
-					"name": "eyelid_closed_left",
-					"parent": "head_left",
-					"pivot": [3.6, 19.7, -0.91],
-					"cubes": [
-						{"origin": [2.1, 17.2, -0.66], "size": [3, 5, 1], "inflate": 0.25, "uv": [98, 2]}
-					]
-				},
 				{
 					"name": "face_ditto_left",
 					"parent": "head_left",
@@ -340,14 +332,6 @@
 						{"origin": [-5.1, 20.8, -0.84], "size": [2, 1, 1], "inflate": 0.1, "uv": [51, 42], "mirror": true}
 					]
 				},
-				{
-					"name": "eyelid_closed_right",
-					"parent": "head_right",
-					"pivot": [-3.6, 19.7, -0.91],
-					"cubes": [
-						{"origin": [-5.1, 17.2, -0.66], "size": [3, 5, 1], "inflate": 0.25, "uv": [89, 2], "mirror": true}
-					]
-				},
 				{
 					"name": "face_ditto_right",
 					"parent": "head_right",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0657_frogadier/frogadier.geo.json

@@ -134,246 +134,107 @@
 						"jaw2": [0, 27, -7.35]
 					}
 				},
-				{
-					"name": "head_left",
-					"parent": "head_angle",
-					"pivot": [3.53, 31, 0.25],
-					"rotation": [5, 0, 0],
-					"cubes": [
-						{"origin": [2.53, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 21], "mirror": true},
-						{"origin": [3.63, 31.5, 0.25], "size": [0, 3, 5], "uv": [40, 55], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_left",
-					"parent": "head_left",
-					"pivot": [4.53, 31.5, -2.25],
-					"cubes": [
-						{"origin": [3.54, 29, -4.25], "size": [1, 5, 4], "uv": [88, 2]}
-					]
-				},
-				{
-					"name": "eye_neutral_left",
-					"parent": "eye_left",
-					"pivot": [4.54, 33, -2.25],
-					"cubes": [
-						{"origin": [3.54, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [88, 12]}
-					]
-				},
-				{
-					"name": "eye_angry_left",
-					"parent": "eye_left",
-					"pivot": [4.44, 32.5, -2.25],
-					"cubes": [
-						{"origin": [3.44, 31, -4.25], "size": [1, 3, 4], "inflate": 0.021, "uv": [88, 26]},
-						{"origin": [3.44, 31.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [95, 27]}
-					]
-				},
-				{
-					"name": "eye_sad_left",
-					"parent": "eye_left",
-					"pivot": [4.43, 33, -2.25],
-					"cubes": [
-						{"origin": [3.44, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [88, 19]},
-						{"origin": [3.44, 32.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [95, 20]}
-					]
-				},
-				{
-					"name": "pupil_left",
-					"parent": "eye_left",
-					"pivot": [4.55, 31, -3.05],
-					"cubes": [
-						{"origin": [3.55, 29.5, -4.05], "size": [1, 3, 2], "uv": [95, 0]}
-					]
-				},
-				{
-					"name": "eye_shine_left",
-					"parent": "pupil_left",
-					"pivot": [4.55, 31.5, -3.05],
-					"cubes": [
-						{"origin": [3.56, 30.5, -3.55], "size": [1, 2, 1], "uv": [106, 2]}
-					]
-				},
-				{
-					"name": "open_eye_left",
-					"parent": "head_left",
-					"pivot": [4.44, 31.5, -2.25],
-					"cubes": [
-						{"origin": [3.44, 29, -4.25], "size": [1, 5, 4], "uv": [99, 2]}
-					]
-				},
-				{
-					"name": "open_pupil_left",
-					"parent": "open_eye_left",
-					"pivot": [4.45, 31.5, -2.25],
-					"cubes": [
-						{"origin": [3.45, 31, -3.75], "size": [1, 1, 3], "uv": [99, 14]}
-					]
-				},
-				{
-					"name": "open_neutral_left",
-					"parent": "open_eye_left",
-					"pivot": [4.34, 33, -2.25],
-					"cubes": [
-						{"origin": [3.34, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [88, 12]}
-					]
-				},
-				{
-					"name": "open_happy_left",
-					"parent": "open_eye_left",
-					"pivot": [4.35, 32, -2.25],
-					"cubes": [
-						{"origin": [3.35, 31, -3.75], "size": [1, 2, 3], "uv": [99, 20]}
-					]
-				},
-				{
-					"name": "eyelid_left",
-					"parent": "head_left",
-					"pivot": [4.44, 31.5, -2.25],
-					"cubes": [
-						{"origin": [3.44, 29, -4.25], "size": [1, 5, 4], "inflate": 0.022, "uv": [99, 26]}
-					]
-				},
-				{
-					"name": "locator_eye_left",
-					"parent": "head_left",
-					"pivot": [4.54, 31, -2.46],
-					"rotation": [0, -90, 0],
-					"locators": {
-						"eye2": [4.54, 31, -2.46]
-					}
-				},
-				{
-					"name": "face_ditto_left",
-					"parent": "head_left",
-					"pivot": [4.435, 32, -2.25]
-				},
-				{
-					"name": "eye_ditto_left",
-					"parent": "face_ditto_left",
-					"pivot": [4.435, 32, -2.25],
-					"cubes": [
-						{"origin": [4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [113, 1]}
-					]
-				},
-				{
-					"name": "eye_closed_ditto_left",
-					"parent": "face_ditto_left",
-					"pivot": [4.335, 32, -2.25],
-					"cubes": [
-						{"origin": [4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [112, 2]},
-						{"origin": [4.345, 32, -2.75], "size": [0, 1, 1], "uv": [113, 5]}
-					]
-				},
 				{
 					"name": "head_right",
 					"parent": "head_angle",
-					"pivot": [-3.53, 31, 0.25],
+					"pivot": [-3.525, 31, 0.25],
 					"rotation": [5, 0, 0],
 					"cubes": [
-						{"origin": [-4.53, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 11]},
-						{"origin": [-3.63, 31.5, 0.25], "size": [0, 3, 5], "uv": [40, 55]}
-					]
-				},
-				{
-					"name": "eye_right",
-					"parent": "head_right",
-					"pivot": [-4.53, 31.5, -2.25],
-					"cubes": [
-						{"origin": [-4.54, 29, -4.25], "size": [1, 5, 4], "uv": [66, 2], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_neutral_right",
-					"parent": "eye_right",
-					"pivot": [-4.54, 33, -2.25],
-					"cubes": [
-						{"origin": [-4.54, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [66, 12], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_angry_right",
-					"parent": "eye_right",
-					"pivot": [-4.44, 32.5, -2.25],
-					"cubes": [
-						{"origin": [-4.44, 31, -4.25], "size": [1, 3, 4], "inflate": 0.021, "uv": [66, 26], "mirror": true},
-						{"origin": [-4.44, 31.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [73, 27], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_sad_right",
-					"parent": "eye_right",
-					"pivot": [-4.43, 33, -2.25],
-					"cubes": [
-						{"origin": [-4.44, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [66, 19], "mirror": true},
-						{"origin": [-4.44, 32.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [73, 20], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_right",
-					"parent": "eye_right",
-					"pivot": [-4.55, 31, -3.05],
-					"cubes": [
-						{"origin": [-4.55, 29.5, -4.05], "size": [1, 3, 2], "uv": [73, 0], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_shine_right",
-					"parent": "pupil_right",
-					"pivot": [-4.55, 31.5, -3.05],
-					"cubes": [
-						{"origin": [-4.56, 30.5, -3.55], "size": [1, 2, 1], "uv": [84, 2], "mirror": true}
-					]
-				},
-				{
-					"name": "open_eye_right",
-					"parent": "head_right",
-					"pivot": [-4.44, 31.5, -2.25],
-					"cubes": [
-						{"origin": [-4.44, 29, -4.25], "size": [1, 5, 4], "uv": [77, 2], "mirror": true}
-					]
-				},
-				{
-					"name": "open_pupil_right",
-					"parent": "open_eye_right",
-					"pivot": [-4.45, 31.5, -2.25],
-					"cubes": [
-						{"origin": [-4.45, 31, -3.75], "size": [1, 1, 3], "uv": [77, 14], "mirror": true}
-					]
-				},
-				{
-					"name": "open_neutral_right",
-					"parent": "open_eye_right",
-					"pivot": [-4.34, 33, -2.25],
-					"cubes": [
-						{"origin": [-4.34, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [66, 12], "mirror": true}
-					]
-				},
-				{
-					"name": "open_happy_right",
-					"parent": "open_eye_right",
-					"pivot": [-4.35, 32, -2.25],
-					"cubes": [
-						{"origin": [-4.35, 31, -3.75], "size": [1, 2, 3], "uv": [77, 20], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_right",
-					"parent": "head_right",
-					"pivot": [-4.44, 31.5, -2.25],
-					"cubes": [
-						{"origin": [-4.44, 29, -4.25], "size": [1, 5, 4], "inflate": 0.022, "uv": [77, 26], "mirror": true}
+						{"origin": [-4.525, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 11]},
+						{"origin": [-3.625, 31.5, 0.25], "size": [0, 3, 5], "uv": [52, 55]}
 					]
 				},
 				{
 					"name": "locator_eye_right",
 					"parent": "head_right",
-					"pivot": [-4.54, 31, -2.46],
+					"pivot": [-4.5, 31, -2.5],
 					"rotation": [0, 90, 0],
 					"locators": {
-						"eye1": [-4.54, 31, -2.46]
+						"eye1": [-4.5, 31, -2.5]
 					}
 				},
+				{
+					"name": "eye_right",
+					"parent": "head_right",
+					"pivot": [-4.525, 31.35, -2.25],
+					"cubes": [
+						{"origin": [-4.525, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [66, 2], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_neutral_right",
+					"parent": "eye_right",
+					"pivot": [-4.525, 32.85095, -2.27179],
+					"cubes": [
+						{"origin": [-4.505, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [66, 12], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_angry_right",
+					"parent": "eye_right",
+					"pivot": [-4.435, 32.1, -2.5],
+					"cubes": [
+						{"origin": [-4.405, 30.85, -4.25], "size": [1, 3, 4], "inflate": 0.05, "uv": [66, 26], "mirror": true},
+						{"origin": [-4.44, 31.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [73, 27], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_sad_right",
+					"parent": "eye_right",
+					"pivot": [-4.435, 32.85, -2.5],
+					"cubes": [
+						{"origin": [-4.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [66, 19], "mirror": true},
+						{"origin": [-4.44, 32.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [73, 20], "mirror": true}
+					]
+				},
+				{
+					"name": "pupil_right",
+					"parent": "eye_right",
+					"pivot": [-4.525, 30.85095, -3.02179],
+					"cubes": [
+						{"origin": [-4.525, 29.35, -4.04], "size": [1, 3, 2], "inflate": 0.02, "uv": [73, 0], "mirror": true}
+					]
+				},
+				{
+					"name": "pupil_right2",
+					"parent": "pupil_right",
+					"pivot": [-4.55, 31.35095, -3.02179],
+					"cubes": [
+						{"origin": [-4.55, 30.35, -3.55], "size": [1, 2, 1], "uv": [84, 2], "mirror": true}
+					]
+				},
+				{
+					"name": "eyelid_right",
+					"parent": "head_right",
+					"pivot": [-3.925, 31.35095, -2.27179],
+					"cubes": [
+						{"origin": [-4.425, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [77, 2], "mirror": true}
+					]
+				},
+				{
+					"name": "pupil_eyelid_right",
+					"parent": "eyelid_right",
+					"pivot": [-4.425, 30.80095, -2.27179],
+					"cubes": [
+						{"origin": [-4.435, 30.3, -3.75], "size": [1, 1, 3], "inflate": 0.01, "uv": [77, 14], "mirror": true}
+					]
+				},
+				{
+					"name": "eyelid_right2",
+					"parent": "eyelid_right",
+					"pivot": [-3.925, 32.85095, -2.27179],
+					"cubes": [
+						{"origin": [-4.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [66, 12], "mirror": true}
+					]
+				},
+				{
+					"name": "pupil_happy_right",
+					"parent": "eyelid_right",
+					"pivot": [-4.325, 30.80095, -2.27179],
+					"cubes": [
+						{"origin": [-4.325, 30.30095, -3.77179], "size": [1, 2, 3], "inflate": 0.05, "uv": [77, 20], "mirror": true}
+					]
+				},
 				{
 					"name": "face_ditto_right",
 					"parent": "head_right",
@@ -384,7 +245,7 @@
 					"parent": "face_ditto_right",
 					"pivot": [-4.435, 32, -2.25],
 					"cubes": [
-						{"origin": [-4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [118, 1], "mirror": true}
+						{"origin": [-4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [113, 1]}
 					]
 				},
 				{
@@ -392,8 +253,131 @@
 					"parent": "face_ditto_right",
 					"pivot": [-4.335, 32, -2.25],
 					"cubes": [
-						{"origin": [-4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [117, 2], "mirror": true},
-						{"origin": [-4.345, 32, -2.75], "size": [0, 1, 1], "uv": [118, 5], "mirror": true}
+						{"origin": [-4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [112, 2]},
+						{"origin": [-4.345, 32, -2.75], "size": [0, 1, 1], "uv": [113, 5]}
+					]
+				},
+				{
+					"name": "head_left",
+					"parent": "head_angle",
+					"pivot": [3.525, 31, 0.25],
+					"rotation": [5, 0, 0],
+					"cubes": [
+						{"origin": [2.525, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 21], "mirror": true},
+						{"origin": [3.625, 31.5, 0.25], "size": [0, 3, 5], "uv": [40, 55], "mirror": true}
+					]
+				},
+				{
+					"name": "locator_eye_left",
+					"parent": "head_left",
+					"pivot": [4.5, 31, -2.5],
+					"rotation": [0, -90, 0],
+					"locators": {
+						"eye2": [4.5, 31, -2.5]
+					}
+				},
+				{
+					"name": "eye_left",
+					"parent": "head_left",
+					"pivot": [4.525, 31.35, -2.25],
+					"cubes": [
+						{"origin": [3.525, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [88, 2]}
+					]
+				},
+				{
+					"name": "eye_neutral_left",
+					"parent": "eye_left",
+					"pivot": [4.525, 32.85095, -2.27179],
+					"cubes": [
+						{"origin": [3.505, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [88, 12]}
+					]
+				},
+				{
+					"name": "eye_angry_left",
+					"parent": "eye_left",
+					"pivot": [4.435, 32.1, -2.5],
+					"cubes": [
+						{"origin": [3.405, 30.85, -4.25], "size": [1, 3, 4], "inflate": 0.05, "uv": [88, 26]},
+						{"origin": [3.44, 31.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [95, 27]}
+					]
+				},
+				{
+					"name": "eye_sad_left",
+					"parent": "eye_left",
+					"pivot": [4.435, 32.85, -2.5],
+					"cubes": [
+						{"origin": [3.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [88, 19]},
+						{"origin": [3.44, 32.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [95, 20]}
+					]
+				},
+				{
+					"name": "pupil_left",
+					"parent": "eye_left",
+					"pivot": [4.525, 30.85095, -3.02179],
+					"cubes": [
+						{"origin": [3.525, 29.35, -4.04], "size": [1, 3, 2], "inflate": 0.02, "uv": [95, 0]}
+					]
+				},
+				{
+					"name": "pupil_left2",
+					"parent": "pupil_left",
+					"pivot": [4.55, 31.35095, -3.02179],
+					"cubes": [
+						{"origin": [3.55, 30.35, -3.55], "size": [1, 2, 1], "uv": [106, 2]}
+					]
+				},
+				{
+					"name": "eyelid_left",
+					"parent": "head_left",
+					"pivot": [3.925, 31.35095, -2.27179],
+					"cubes": [
+						{"origin": [3.425, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [99, 2]}
+					]
+				},
+				{
+					"name": "pupil_eyelid_left",
+					"parent": "eyelid_left",
+					"pivot": [4.425, 30.80095, -2.27179],
+					"cubes": [
+						{"origin": [3.435, 30.3, -3.75], "size": [1, 1, 3], "inflate": 0.01, "uv": [99, 14]}
+					]
+				},
+				{
+					"name": "eyelid_left2",
+					"parent": "eyelid_left",
+					"pivot": [3.925, 32.85095, -2.27179],
+					"cubes": [
+						{"origin": [3.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [88, 12]}
+					]
+				},
+				{
+					"name": "pupil_happy_left",
+					"parent": "eyelid_left",
+					"pivot": [4.325, 30.80095, -2.27179],
+					"cubes": [
+						{"origin": [3.325, 30.30095, -3.77179], "size": [1, 2, 3], "inflate": 0.05, "uv": [99, 20]}
+					]
+				},
+				{
+					"name": "face_ditto_left",
+					"parent": "head_left",
+					"pivot": [4.435, 32, -2.25]
+				},
+				{
+					"name": "eye_ditto_left",
+					"parent": "face_ditto_left",
+					"pivot": [4.435, 32, -2.25],
+					"cubes": [
+						{"origin": [4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [118, 1], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_closed_ditto_left",
+					"parent": "face_ditto_left",
+					"pivot": [4.335, 32, -2.25],
+					"cubes": [
+						{"origin": [4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [117, 2], "mirror": true},
+						{"origin": [4.345, 32, -2.75], "size": [0, 1, 1], "uv": [118, 5], "mirror": true}
 					]
 				},
 				{

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0658_greninja/greninja.geo.json

@@ -830,6 +830,11 @@
 						{"origin": [-3.5, 38.3, 33.75], "size": [7, 5, 9], "uv": [106, 33]}
 					]
 				},
+				{
+					"name": "tongue6",
+					"parent": "tongue5",
+					"pivot": [0, 40.8, 40.5]
+				},
 				{
 					"name": "muzzle",
 					"parent": "head_angle",
@@ -908,15 +913,6 @@
 						{"origin": [-0.1, 44.3, -8.11], "size": [4, 2, 1], "uv": [87, 72]}
 					]
 				},
-				{
-					"name": "eyelid_base_left",
-					"parent": "eye_left_base",
-					"pivot": [1.9, 43.9, -8.11],
-					"cubes": [
-						{"origin": [-0.1, 45.3, -8.11], "size": [4, 1, 1], "uv": [87, 76]},
-						{"origin": [-0.1, 41.9, -8.11], "size": [4, 4, 1], "uv": [87, 79]}
-					]
-				},
 				{
 					"name": "eye_left",
 					"parent": "eye_left_base",
@@ -954,7 +950,7 @@
 					"parent": "eye_left",
 					"pivot": [1.9, 44.2, -8.07],
 					"cubes": [
-						{"origin": [0.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [87, 85]}
+						{"origin": [0.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [87, 76]}
 					]
 				},
 				{
@@ -962,7 +958,7 @@
 					"parent": "eye_left",
 					"pivot": [1.9, 44.2, -8.07],
 					"cubes": [
-						{"origin": [0.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [87, 88]}
+						{"origin": [0.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [87, 79]}
 					]
 				},
 				{
@@ -999,15 +995,6 @@
 						{"origin": [-3.9, 44.3, -8.11], "size": [4, 2, 1], "uv": [76, 72], "mirror": true}
 					]
 				},
-				{
-					"name": "eyelid_base_right",
-					"parent": "eye_right_base",
-					"pivot": [-1.9, 43.9, -8.11],
-					"cubes": [
-						{"origin": [-3.9, 45.3, -8.11], "size": [4, 1, 1], "uv": [76, 76], "mirror": true},
-						{"origin": [-3.9, 41.9, -8.11], "size": [4, 4, 1], "uv": [76, 79], "mirror": true}
-					]
-				},
 				{
 					"name": "eye_right",
 					"parent": "eye_right_base",
@@ -1045,7 +1032,7 @@
 					"parent": "eye_right",
 					"pivot": [-1.9, 44.2, -8.07],
 					"cubes": [
-						{"origin": [-3.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [76, 85], "mirror": true}
+						{"origin": [-3.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [76, 76], "mirror": true}
 					]
 				},
 				{
@@ -1053,7 +1040,7 @@
 					"parent": "eye_right",
 					"pivot": [-1.9, 44.2, -8.07],
 					"cubes": [
-						{"origin": [-3.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [76, 88], "mirror": true}
+						{"origin": [-3.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [76, 79], "mirror": true}
 					]
 				},
 				{

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0931_squawkabilly/squawkabilly.geo.json

@@ -266,41 +266,23 @@
 					]
 				},
 				{
-					"name": "toe_back_inner_left",
+					"name": "toe_back_left",
 					"parent": "foot_left",
-					"pivot": [0.75, 1.92365, 1.01519],
-					"rotation": [0, -12.5, 0],
+					"pivot": [1.25, 1.92365, 1.01519],
 					"cubes": [
-						{"origin": [0.75, -0.07635, 1.01519], "size": [0, 1, 1], "inflate": 0.01, "uv": [0, 18]}
+						{"origin": [1.25, -0.07635, 1.01519], "size": [0, 1, 1], "inflate": 0.01, "uv": [0, 18]}
 					]
 				},
 				{
-					"name": "toe_back_inner_left2",
-					"parent": "toe_back_inner_left",
-					"pivot": [0.75, 1.92365, 2.01519],
+					"name": "claw_back_left",
+					"parent": "toe_back_left",
+					"pivot": [1.25, 1.92365, 2.01519],
 					"cubes": [
-						{"origin": [0.75, -0.07635, 2.01519], "size": [0, 1, 1], "uv": [4, 14]}
+						{"origin": [1.25, -0.07635, 2.01519], "size": [0, 1, 1], "uv": [4, 14]}
 					]
 				},
 				{
-					"name": "toe_back_outer_left",
-					"parent": "foot_left",
-					"pivot": [1.75, 1.92365, 1.01519],
-					"rotation": [0, 12.5, 0],
-					"cubes": [
-						{"origin": [1.75, -0.07635, 1.01519], "size": [0, 1, 1], "inflate": 0.01, "uv": [0, 18]}
-					]
-				},
-				{
-					"name": "toe_back_outer_left2",
-					"parent": "toe_back_outer_left",
-					"pivot": [1.75, 1.92365, 2.01519],
-					"cubes": [
-						{"origin": [1.75, -0.07635, 2.01519], "size": [0, 1, 1], "uv": [4, 14]}
-					]
-				},
-				{
-					"name": "toe_front_inner_left",
+					"name": "toe_inner_left",
 					"parent": "foot_left",
 					"pivot": [1.25, 1.92365, -0.98481],
 					"rotation": [0, 12.5, 0],
@@ -309,15 +291,15 @@
 					]
 				},
 				{
-					"name": "toe_front_inner_left2",
-					"parent": "toe_front_inner_left",
+					"name": "claw_inner_left",
+					"parent": "toe_inner_left",
 					"pivot": [0.75, 1.92365, -1.98481],
 					"cubes": [
 						{"origin": [0.75, -0.07635, -2.98481], "size": [0, 1, 1], "uv": [4, 13]}
 					]
 				},
 				{
-					"name": "toe_front_outer_left",
+					"name": "toe_outer_left",
 					"parent": "foot_left",
 					"pivot": [1.25, 1.92365, -0.98481],
 					"rotation": [0, -12.5, 0],
@@ -326,8 +308,8 @@
 					]
 				},
 				{
-					"name": "toe_front_outer_left2",
-					"parent": "toe_front_outer_left",
+					"name": "claw_outer_left",
+					"parent": "toe_outer_left",
 					"pivot": [1.75, 1.92365, -1.98481],
 					"cubes": [
 						{"origin": [1.75, -0.07635, -2.98481], "size": [0, 1, 1], "uv": [4, 5]}
@@ -361,41 +343,23 @@
 					]
 				},
 				{
-					"name": "toe_back_inner_right",
+					"name": "toe_back_right",
 					"parent": "foot_right",
-					"pivot": [-0.75, 1.92365, 1.01519],
-					"rotation": [0, 12.5, 0],
+					"pivot": [-1.25, 1.92365, 1.01519],
 					"cubes": [
-						{"origin": [-0.75, -0.07635, 1.01519], "size": [0, 1, 1], "inflate": 0.01, "uv": [0, 5]}
+						{"origin": [-1.25, -0.07635, 1.01519], "size": [0, 1, 1], "inflate": 0.01, "uv": [0, 5]}
 					]
 				},
 				{
-					"name": "toe_back_inner_right2",
-					"parent": "toe_back_inner_right",
-					"pivot": [-0.75, 1.92365, 2.01519],
+					"name": "claw_back_right",
+					"parent": "toe_back_right",
+					"pivot": [-1.25, 1.92365, 2.01519],
 					"cubes": [
-						{"origin": [-0.75, -0.07635, 2.01519], "size": [0, 1, 1], "uv": [4, 4]}
+						{"origin": [-1.25, -0.07635, 2.01519], "size": [0, 1, 1], "uv": [4, 4]}
 					]
 				},
 				{
-					"name": "toe_back_inner_right3",
-					"parent": "foot_right",
-					"pivot": [-1.75, 1.92365, 1.01519],
-					"rotation": [0, -12.5, 0],
-					"cubes": [
-						{"origin": [-1.75, -0.07635, 1.01519], "size": [0, 1, 1], "inflate": 0.01, "uv": [0, 5]}
-					]
-				},
-				{
-					"name": "toe_back_inner_right4",
-					"parent": "toe_back_inner_right3",
-					"pivot": [-1.75, 1.92365, 2.01519],
-					"cubes": [
-						{"origin": [-1.75, -0.07635, 2.01519], "size": [0, 1, 1], "uv": [4, 4]}
-					]
-				},
-				{
-					"name": "toe_front_inner_right",
+					"name": "toe_inner_right",
 					"parent": "foot_right",
 					"pivot": [-1.25, 1.92365, -0.98481],
 					"rotation": [0, -12.5, 0],
@@ -404,15 +368,15 @@
 					]
 				},
 				{
-					"name": "toe_front_inner_right2",
-					"parent": "toe_front_inner_right",
+					"name": "claw_inner_right",
+					"parent": "toe_inner_right",
 					"pivot": [-0.75, 1.92365, -1.98481],
 					"cubes": [
 						{"origin": [-0.75, -0.07635, -2.98481], "size": [0, 1, 1], "uv": [4, 0]}
 					]
 				},
 				{
-					"name": "toe_front_outer_right",
+					"name": "toe_outer_right",
 					"parent": "foot_right",
 					"pivot": [-1.25, 1.92365, -0.98481],
 					"rotation": [0, 12.5, 0],
@@ -421,8 +385,8 @@
 					]
 				},
 				{
-					"name": "toe_front_outer_right2",
-					"parent": "toe_front_outer_right",
+					"name": "claw_outer_right",
+					"parent": "toe_outer_right",
 					"pivot": [-1.75, 1.92365, -1.98481],
 					"cubes": [
 						{"origin": [-1.75, -0.07635, -2.98481], "size": [0, 1, 1], "uv": [0, 0]}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0010_caterpie/caterpie.json

@@ -1,8 +1,8 @@
 {
    "portraitScale": 2.1,
    "portraitTranslation": [ -0.55, -1.55, 0 ],
-   "profileScale": 0.72,
-   "profileTranslation": [ 0, 0.63, 0 ],
+   "profileScale": 0.80,
+   "profileTranslation": [ 0, 0.55, 0 ],
    "rootBone": "caterpie",
    "animations": {
       "cry": "q.bedrock_stateful('caterpie', 'cry')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0013_weedle/weedle.json

@@ -1,8 +1,8 @@
 {
    "portraitScale": 2.3,
    "portraitTranslation": [-0.53, -1.9, 0],
-   "profileScale": 0.72,
-   "profileTranslation": [ 0, 0.63, 0 ],
+   "profileScale": 0.80,
+   "profileTranslation": [0, 0.51, 0],
    "rootBone": "weedle",
    "animations": {
       "cry": "q.bedrock_stateful('weedle', 'cry')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0017_pidgeotto/pidgeotto.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 3.09,
   "portraitTranslation": [-0.64, -1.03, 0],
-  "profileScale": 0.83,
-  "profileTranslation": [0, 0.53, 0.0],
+  "profileScale": 0.76,
+  "profileTranslation": [0, 0.62, 0.0],
   "rootBone": "pidgeotto",
   "animations": {
     "cry": "q.bedrock_stateful('pidgeotto', 'cry')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0019_rattata/rattata.json

@@ -1,8 +1,8 @@
 {
    "portraitScale": 2.2,
    "portraitTranslation": [ -0.2, -1.4, 0 ],
-   "profileScale": 0.85,
-   "profileTranslation": [ 0.0, 0.45, 0 ],
+   "profileScale": 1.1,
+   "profileTranslation": [ 0.0, 0.1, 0 ],
    "rootBone": "rattata",
    "animations": {
       "faint": "q.bedrock_primary('rattata', 'faint')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0019_rattata/rattata_alolan.json

@@ -1,8 +1,8 @@
 {
    "portraitScale": 2.2,
    "portraitTranslation": [ -0.2, -1.4, 0 ],
-   "profileScale": 0.85,
-   "profileTranslation": [ 0.0, 0.45, 0 ],
+   "profileScale": 1.1,
+   "profileTranslation": [ 0.0, 0.1, 0 ],
    "rootBone": "rattata",
    "animations": {
       "faint": "q.bedrock_primary('rattata_alolan', 'faint')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0021_spearow/spearow.json

@@ -4,14 +4,12 @@
   "profileScale": 0.93,
   "profileTranslation": [0, 0.39, 0],
   "rootBone": "spearow",
-  "animations": {
-    "cry": "q.bedrock_stateful('spearow', 'cry')"
-  },
+  "animations": {"cry": "q.bedrock_stateful('spearow', 'cry')"},
   "poses": {
     "standing": {
       "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
       "isBattle": false,
-      "animations": ["q.look('head_ai')", "q.bedrock('spearow', 'ground_idle')"],
+      "animations": ["q.look('head')", "q.bedrock('spearow', 'ground_idle')"],
       "quirks": ["q.bedrock_quirk('spearow', 'blink')"],
       "transformedParts": [
         {
@@ -35,8 +33,9 @@
     "walking": {
       "poseTypes": ["WALK", "SWIM"],
       "animations": [
-        "q.look('head_ai')",
-        "q.bedrock('spearow', 'ground_walk')"
+        "q.look('head')",
+        "q.bedrock('spearow', 'ground_idle')",
+        "q.biped_walk(1, 1, 'leg_left', 'leg_right')"
       ],
       "quirks": ["q.bedrock_quirk('spearow', 'blink')"],
       "transformedParts": [
@@ -62,9 +61,10 @@
       "poseTypes": ["HOVER"],
       "animations": [
         "q.pitch_tilt('body')",
+        "q.sine_wing_flap(0.9, 0.9, 25, 'z', 'wing_open_left', 'wing_open_right')",
         "q.look('neck', 1, 1, 70, -10, 20, -20)",
-        "q.look('head_ai')",
-        "q.bedrock('spearow', 'air_idle')"
+        "q.look('head')",
+        "q.bedrock('spearow', 'ground_idle')"
       ],
       "quirks": ["q.bedrock_quirk('spearow', 'blink')"],
       "transformedParts": [
@@ -90,9 +90,10 @@
       "poseTypes": ["FLY"],
       "animations": [
         "q.pitch_tilt('body')",
+        "q.sine_wing_flap(0.9, 0.9, 25, 'z', 'wing_open_left', 'wing_open_right')",
         "q.look('neck', 1, 1, 70, -10, 20, -20)",
-        "q.look('head_ai')",
-        "q.bedrock('spearow', 'air_fly')"
+        "q.look('head')",
+        "q.bedrock('spearow', 'ground_idle')"
       ],
       "quirks": ["q.bedrock_quirk('spearow', 'blink')"],
       "transformedParts": [

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0022_fearow/fearow.json

@@ -8,14 +8,11 @@
   "poses": {
     "standing": {
       "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
+      "isBattle": false,
       "animations": [
         "q.look('neck', 1, 1, 70, -10, 20, -20)",
-        "q.look('head_ai')",
-        "q.bedrock('fearow', 'ground_idle')",
-        {
-          "condition": "q.is_ridden",
-          "animation": "q.bedrock('fearow', 'ride_ground_walk')"
-        }
+        "q.look('head')",
+        "q.bedrock('fearow', 'ground_idle')"
       ],
       "transformedParts": [
         {
@@ -34,21 +31,15 @@
           "part": "wing_closed_left",
           "isVisible": true
         }
-      ],
-      "quirks": [
-        "q.bedrock_quirk('fearow', 'blink')"
       ]
     },
     "walking": {
       "poseTypes": ["WALK", "SWIM"],
       "animations": [
         "q.look('neck', 1, 1, 70, -10, 20, -20)",
-        "q.look('head_ai')",
-        "q.bedrock('fearow', 'ground_walk')",
-        {
-          "condition": "q.is_ridden",
-          "animation": "q.bedrock('fearow', 'ride_ground_walk')"
-        }
+        "q.look('head')",
+        "q.bedrock('fearow', 'ground_idle')",
+        "q.biped_walk(1, 1, 'leg_left', 'leg_right')"
       ],
       "transformedParts": [
         {
@@ -67,22 +58,16 @@
           "part": "wing_closed_left",
           "isVisible": true
         }
-      ],
-      "quirks": [
-        "q.bedrock_quirk('fearow', 'blink')"
       ]
     },
     "hover": {
       "poseTypes": ["HOVER"],
       "animations": [
         "q.pitch_tilt('body')",
+        "q.sine_wing_flap(0.9, 0.9, 25, 'z', 'wing_open_left', 'wing_open_right')",
         "q.look('neck', 1, 1, 70, -10, 20, -20)",
-        "q.look('head_ai')",
-        "q.bedrock('fearow', 'air_idle')",
-        {
-          "condition": "q.is_ridden",
-          "animation": "q.bedrock('fearow', 'ride_air_fly')"
-        }
+        "q.look('head')",
+        "q.bedrock('fearow', 'air_idle')"
       ],
       "transformedParts": [
         {
@@ -101,23 +86,16 @@
           "part": "wing_closed_left",
           "isVisible": false
         }
-      ],
-      "quirks": [
-        "q.bedrock_quirk('fearow', 'blink')"
       ]
     },
     "fly": {
       "poseTypes": ["FLY"],
-      "condition": "!q.is_gliding",
       "animations": [
         "q.pitch_tilt('body')",
+        "q.sine_wing_flap(0.9, 0.9, 25, 'z', 'wing_open_left', 'wing_open_right')",
         "q.look('neck', 1, 1, 70, -10, 20, -20)",
-        "q.look('head_ai')",
-        "q.bedrock('fearow', 'air_fly')",
-        {
-          "condition": "q.is_ridden",
-          "animation": "q.bedrock('fearow', 'ride_air_fly')"
-        }
+        "q.look('head')",
+        "q.bedrock('fearow', 'air_idle')"
       ],
       "transformedParts": [
         {
@@ -136,34 +114,6 @@
           "part": "wing_closed_left",
           "isVisible": false
         }
-      ],
-      "quirks": [
-        "q.bedrock_quirk('fearow', 'blink')"
-      ]
-    },
-    "sleep": {
-      "poseTypes": ["SLEEP"],
-      "animations": ["q.bedrock('fearow', 'sleep')"],
-      "namedAnimations": {"cry": "q.bedrock_stateful('dummy', 'cry')"}
-    },
-    "glide": {
-      "poseTypes": ["FLY"],
-      "condition": "q.is_gliding",
-      "animations": [
-        "q.look('neck', 1, 1, 70, -10, 20, -20)",
-        "q.look('head_ai')",
-        "q.bedrock('fearow', 'air_glide')",
-        {
-          "condition": "q.is_ridden",
-          "animation": "q.bedrock('fearow', 'ride_air_fly')"
-        },
-        {
-          "condition": "q.is_ridden",
-          "animation": "q.bedrock('fearow', 'ride_dive')"
-        }
-      ],
-      "quirks": [
-        "q.bedrock_quirk('fearow', 'blink')"
       ]
     }
   }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0029_nidoranf/nidoranf.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 2.0,
   "portraitTranslation": [-0.16, -0.85, 0],
-  "profileScale": 0.79,
-  "profileTranslation": [0, 0.54, 0],
+  "profileScale": 1.03,
+  "profileTranslation": [0, 0.21, 0],
   "rootBone": "nidoranf",
   "animations": {
     "cry": "q.bedrock_stateful('nidoranf', 'cry')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0032_nidoranm/nidoranm.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 1.97,
   "portraitTranslation": [-0.19, -1.08, 0],
-  "profileScale": 0.79,
-  "profileTranslation": [0, 0.54, 0],
+  "profileScale": 1.05,
+  "profileTranslation": [0, 0.11, 0],
   "rootBone": "nidoranm",
   "animations": {
     "cry": "q.bedrock_stateful('nidoranm', 'cry')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0038_ninetales/ninetales_alolan.json

@@ -1,6 +1,6 @@
 {
   "portraitScale": 2.27,
-  "portraitTranslation": [-0.94, 1.23, 0],
+  "portraitTranslation": [-0.76, 0.85, 0],
   "profileScale": 0.57,
   "profileTranslation": [0, 0.9, 0],
   "rootBone": "ninetales_alolan",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0043_oddish/oddish.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 2,
   "portraitTranslation": [-0.05, -1.27, 0],
-  "profileScale": 0.75,
-  "profileTranslation": [0, 0.6, 0],
+  "profileScale": 0.85,
+  "profileTranslation": [0, 0.5, 0],
   "rootBone": "oddish",
   "animations": {
     "cry": "q.bedrock_stateful('oddish', 'cry')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0126_magmar/magmar.json

@@ -17,7 +17,9 @@
       "poseTypes": ["WALK", "SWIM"],
       "animations": [
         "q.look('head')",
-        "q.bedrock('magmar', 'ground_walk')"
+        "q.biped_walk(0.66, 0.6, 'leg_left', 'leg_right')",
+        "q.bimanual_swing(0.66, 0.6, 'arm_left', 'arm_right')",
+        "q.bedrock('magmar', 'ground_idle')"
       ],
       "quirks": ["q.bedrock_quirk('magmar', 'blink')"]
     }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0167_spinarak/spinarak.json

@@ -2,8 +2,8 @@
   "rootBone": "spinarak",
   "portraitScale": 2.8,
   "portraitTranslation": [-0.35, -2.65, 0],
-  "profileScale": 0.76,
-  "profileTranslation": [0, 0.48, 0],
+  "profileScale": 1.1,
+  "profileTranslation": [-0.1, 0, 0],
     "animations": {
       "cry": "q.bedrock_stateful('spinarak', 'cry')",
       "recoil": "q.bedrock_stateful('spinarak', 'recoil')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0172_pichu/pichu.json

@@ -32,8 +32,7 @@
     },
     "sleep": {
       "poseTypes": ["SLEEP"],
-      "animations": ["q.bedrock('pichu', 'sleep')"],
-      "namedAnimations": {"cry": "q.bedrock_stateful('dummy', 'cry')"}
+      "animations": ["q.bedrock('pichu', 'sleep')"]
     },    
       "shoulder_left": {
       "poseTypes": ["SHOULDER_LEFT"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0172_pichu/pichu_cap.json

@@ -32,8 +32,7 @@
     },
     "sleep": {
       "poseTypes": ["SLEEP"],
-      "animations": ["q.bedrock('pichu_cap', 'sleep')"],
-      "namedAnimations": {"cry": "q.bedrock_stateful('dummy', 'cry')"}
+      "animations": ["q.bedrock('pichu_cap', 'sleep')"]
     },    
       "shoulder_left": {
       "poseTypes": ["SHOULDER_LEFT"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0172_pichu/pichu_ukulele.json

@@ -32,8 +32,7 @@
     },
     "sleep": {
       "poseTypes": ["SLEEP"],
-      "animations": ["q.bedrock('pichu_ukulele', 'sleep')"],
-      "namedAnimations": {"cry": "q.bedrock_stateful('dummy', 'cry')"}
+      "animations": ["q.bedrock('pichu_ukulele', 'sleep')"]
     },    
       "shoulder_left": {
       "poseTypes": ["SHOULDER_LEFT"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0198_murkrow/murkrow.json

@@ -2,8 +2,8 @@
   "rootBone": "murkrow",
   "portraitScale": 3,
   "portraitTranslation": [-0.35, -1.23, 0],
-  "profileScale": 0.85,
-  "profileTranslation": [0, 0.45, 0],
+  "profileScale": 0.95,
+  "profileTranslation": [0, 0.35, 0],
   "animations": {
     "cry": "q.bedrock_stateful('murkrow', 'cry')"
   },

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0240_magby/magby.json

@@ -5,41 +5,21 @@
   "profileTranslation": [0, 0.6, 0],
   "rootBone": "magby",
   "animations": {
-    "faint": "q.bedrock_primary('magby', 'faint', q.curve('one'))",
-    "recoil": "q.bedrock_stateful('magby', 'recoil')",
-    "physical": "q.bedrock_primary('magby', 'physical', q.curve('symmetrical_wide'))",
-    "special": "q.bedrock_primary('magby', 'special', q.curve('symmetrical_wide'))",
-    "status": "q.bedrock_primary('magby', 'status', q.curve('symmetrical_wide'))",
     "cry": "q.bedrock_stateful('magby', 'cry')"
   },
   "poses": {
-  "battle-standing": {
-     "poseTypes": ["STAND"],
-     "isBattle": true,
-     "isTouchingWater": false,
-     "animations": [
-       "q.look('head')",
-       "q.bedrock('magby', 'battle_idle')"
-     ],
-     "quirks": ["q.bedrock_quirk('magby', 'blink')"],
-        "namedAnimations": {
-            "cry": "q.bedrock_primary('magby', 'battle_cry', q.curve('symmetrical_wide'))"
-          }
-   },
     "standing": {
-      "isBattle": false,
-      "isTouchingWater": false,
       "poseTypes": ["STAND", "FLOAT", "NONE", "PORTRAIT", "PROFILE"],
       "animations": ["q.look('head')", "q.bedrock('magby', 'ground_idle')"],
-      "quirks": ["q.bedrock_quirk('magby', 'blink')",
-      "q.bedrock_quirk('magby', 'quirk_noot', 30, 60, 1, q.curve('symmetrical_wide'))"
-    ]
+      "quirks": ["q.bedrock_quirk('magby', 'blink')"]
     },
     "walking": {
       "poseTypes": ["WALK", "SWIM"],
       "animations": [
         "q.look('head')",
-        "q.bedrock('magby', 'ground_walk')"
+        "q.biped_walk(0.66, 0.6, 'leg_left', 'leg_right')",
+        "q.bimanual_swing(0.66, 0.6, 'arm_left', 'arm_right')",
+        "q.bedrock('magby', 'ground_idle')"
       ],
       "quirks": ["q.bedrock_quirk('magby', 'blink')"]
     }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0258_mudkip/mudkip.json

@@ -8,15 +8,6 @@
     "cry": "q.bedrock_stateful('mudkip', 'cry')"
   },
   "poses": {
-    "battle-standing": {
-      "isBattle": true,
-      "poseTypes": ["STAND"],
-      "animations": [
-        "q.look('head')",
-        "q.bedrock('mudkip', 'battle_idle')"
-      ],
-      "quirks": ["q.bedrock_quirk('mudkip', 'blink')"]
-    },
     "standing": {
       "poseTypes": ["STAND", "FLOAT", "PORTRAIT", "PROFILE", "NONE"],
       "animations": ["q.look('head')", "q.bedrock('mudkip', 'ground_idle')"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0259_marshtomp/marshtomp.json

@@ -8,15 +8,6 @@
     "cry": "q.bedrock_stateful('marshtomp', 'cry')"
   },
   "poses": {
-    "battle-standing": {
-      "isBattle": true,
-      "poseTypes": ["STAND"],
-      "animations": [
-        "q.look('head')",
-        "q.bedrock('marshtomp', 'battle_idle')"
-      ],
-      "quirks": ["q.bedrock_quirk('marshtomp', 'blink')"]
-    },
     "standing": {
       "poseTypes": ["STAND", "FLOAT", "PORTRAIT", "PROFILE", "NONE"],
       "animations": ["q.look('head')", "q.bedrock('marshtomp', 'ground_idle')"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0260_swampert/swampert.json

@@ -8,17 +8,7 @@
     "cry": "q.bedrock_stateful('swampert', 'cry')"
   },
   "poses": {
-    "battle-standing": {
-      "isBattle": true,
-      "poseTypes": ["STAND"],
-      "animations": [
-        "q.look('head_ai')",
-        "q.bedrock('swampert', 'battle_idle')"
-      ],
-      "quirks": ["q.bedrock_quirk('swampert', 'blink')"]
-    },
     "standing": {
-      "isBattle": false,
       "poseTypes": ["STAND", "FLOAT", "PORTRAIT", "PROFILE", "NONE"],
       "animations": [
         "q.look('head_ai')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0311_plusle/plusle.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 2.11,
   "portraitTranslation": [-0.21, -0.6, 0],
-  "profileScale": 0.65,
-  "profileTranslation": [0.0, 0.75, 0.0],
+  "profileScale": 0.8,
+  "profileTranslation": [0.0, 0.56, 0.0],
   "rootBone": "plusle",
     "animations": {
       "faint": "q.bedrock_primary('plusle', 'faint', q.curve('one'))",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0312_minun/minun.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 2.11,
   "portraitTranslation": [-0.21, -0.6, 0],
-  "profileScale": 0.65,
-  "profileTranslation": [0.0, 0.75, 0.0],
+  "profileScale": 0.8,
+  "profileTranslation": [0.0, 0.56, 0.0],
   "rootBone": "minun",
     "animations": {
       "faint": "q.bedrock_primary('minun', 'faint', q.curve('one'))",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0567_archeops/archeops.json

@@ -52,7 +52,7 @@
         "q.bedrock_quirk('archeops', 'blink')"
       ],
       "namedAnimations": {
-        "cry": "q.bedrock_stateful('archeops', 'air_cry')"
+        "cry": "q.bedrock_primary('archeops', 'air_cry', q.curve('symmetrical_wide'))"
       }
     },
     "jump": {
@@ -127,7 +127,7 @@
         "q.bedrock_quirk('archeops', 'blink')"
       ],
       "namedAnimations": {
-        "cry": "q.bedrock_stateful('archeops', 'air_cry')"
+        "cry": "q.bedrock_primary('archeops', 'air_cry', q.curve('symmetrical_wide'))"
       }
     },
     "fly": {
@@ -146,7 +146,7 @@
         "q.bedrock_quirk('archeops', 'blink')"
       ],
       "namedAnimations": {
-        "cry": "q.bedrock_stateful('archeops', 'air_cry')"
+        "cry": "q.bedrock_primary('archeops', 'air_cry', q.curve('symmetrical_wide'))"
       }
     },
     "glide": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0656_froakie/froakie.json

@@ -27,7 +27,7 @@
             "q.look('head_ai')",
             "q.bedrock('froakie', 'ground_idle')"
          ],
-         "quirks": ["q.bedrock_quirk('froakie', 'blink')"]
+         "quirks": []
       },
       "walking": {
          "poseTypes": ["WALK"],
@@ -36,7 +36,7 @@
             "q.look('head_ai')",
             "q.bedrock('froakie', 'ground_walk')"
          ],
-         "quirks": ["q.bedrock_quirk('froakie', 'blink')"]
+         "quirks": []
       },
       "swimming": {
          "poseTypes": ["WALK","SWIM"],
@@ -46,7 +46,7 @@
             "q.look('head_ai')",
             "q.bedrock('froakie', 'water_swim')"
          ],
-         "quirks": ["q.bedrock_quirk('froakie', 'blink')"]
+         "quirks": []
       },
       "float": {
          "poseTypes": ["STAND","FLOAT"],
@@ -55,7 +55,7 @@
             "q.look('head_ai')",
             "q.bedrock('froakie', 'water_idle')"
          ],
-         "quirks": ["q.bedrock_quirk('froakie', 'blink')"]
+         "quirks": []
       },
       "sleep": {
          "poseTypes": ["SLEEP"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0657_frogadier/frogadier.json

@@ -1,8 +1,8 @@
 {
    "portraitScale": 1.9,
-   "portraitTranslation": [ -0.2, 1.4, 0 ],
-   "profileScale": 0.57,
-   "profileTranslation": [ 0, 0.88, 0 ],
+   "portraitTranslation": [ -0.1, 1.4, 0 ],
+   "profileScale": 0.7,
+   "profileTranslation": [ 0, 0.7, 0 ],
    "rootBone": "frogadier",
    "animations": {
       "cry": "q.bedrock_stateful('frogadier', 'cry')",
@@ -27,7 +27,7 @@
             "q.look('head_ai', 1, 1, 5, -45, 45, -45)",
             "q.bedrock('frogadier', 'ground_idle')"
          ],
-         "quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
+         "quirks": []
       },
       "walking": {
          "poseTypes": ["WALK"],
@@ -36,7 +36,7 @@
             "q.look('head_ai', 1, 1, 0, -45, 45, -45)",
             "q.bedrock('frogadier', 'ground_walk')"
          ],
-         "quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
+         "quirks": []
       },
       "swimming": {
          "poseTypes": ["WALK","SWIM"],
@@ -46,7 +46,7 @@
             "q.look('head_ai')",
             "q.bedrock('frogadier', 'water_swim')"
          ],
-         "quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
+         "quirks": []
       },
       "float": {
          "poseTypes": ["STAND","FLOAT"],
@@ -55,7 +55,7 @@
             "q.look('head_ai')",
             "q.bedrock('frogadier', 'water_idle')"
          ],
-         "quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
+         "quirks": []
       },
       "sleep": {
          "poseTypes": ["SLEEP"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0658_greninja/greninja.json

@@ -66,7 +66,7 @@
             "q.bedrock('greninja', math.random(0, 1) < 0.4 ? 'ground_idle_alt' : 'ground_idle')"
          ],
          "quirks": [
-            "q.bedrock_quirk('greninja', 'blink')","q.bedrock_quirk('greninja', q.array('quirk_look_left', 'quirk_look_right'), 8, 30, 1)"
+            "q.bedrock_quirk('greninja', q.array('quirk_look_left', 'quirk_look_right'), 8, 30, 1)"
          ]
       },
       "walking": {
@@ -78,7 +78,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'ground_walk')"
          ],
-         "quirks": ["q.bedrock_quirk('greninja', 'blink')"]
+         "quirks": []
       },
       "running": {
          "poseTypes": ["WALK"],
@@ -89,7 +89,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'ground_run')"
          ],
-         "quirks": ["q.bedrock_quirk('greninja', 'blink')"]
+         "quirks": []
       },
       "surface-swimming": {
          "poseTypes": ["WALK","SWIM"],
@@ -101,7 +101,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'water_swim')"
          ],
-         "quirks": ["q.bedrock_quirk('greninja', 'blink')"],
+         "quirks": [],
          "transformedParts": [
             {
                "part": "body",
@@ -118,7 +118,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'water_idle')"
          ],
-         "quirks": ["q.bedrock_quirk('greninja', 'blink')"],
+         "quirks": [],
          "transformedParts": [
             {
                "part": "body",
@@ -136,7 +136,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'water_swim')"
          ],
-         "quirks": ["q.bedrock_quirk('greninja', 'blink')"],
+         "quirks": [],
          "transformedParts": [
             {
                "part": "body",
@@ -153,7 +153,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'water_idle')"
          ],
-         "quirks": ["q.bedrock_quirk('greninja', 'blink')"],
+         "quirks": [],
          "transformedParts": [
             {
                "part": "body",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0694_helioptile/helioptile.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 1.92,
   "portraitTranslation": [-0.64,-0.32,0],
-  "profileScale": 0.57,
-  "profileTranslation": [-0.05,0.93,0],
+  "profileScale": 0.5,
+  "profileTranslation": [-0.05,1,0],
   "rootBone": "helioptile",
   "animations": {
     "cry": "q.bedrock_stateful('helioptile', 'cry')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0738_vikavolt/vikavolt.json

@@ -17,15 +17,14 @@
       "animations": [
         "q.bedrock('vikavolt', 'ground_idle')"
       ],
-      "condition": "q.has_entity ? !q.in_air : 1.0",
       "isBattle": false,
       "quirks": ["q.bedrock_quirk('vikavolt', 'blink')"],
       "transitions": {
-        "hover": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('symmetrical_wide'))",
-        "fly": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('symmetrical_wide'))",
-        "battle-standing": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('symmetrical_wide'))",
-        "battle-hover": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('symmetrical_wide'))",
-        "air-sleep": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('symmetrical_wide'))"
+        "hover": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('one'))",
+        "fly": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('one'))",
+        "battle-standing": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('one'))",
+        "battle-hover": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('one'))",
+        "air-sleep": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('one'))"
       }
     },
     "battle-standing": {
@@ -38,26 +37,20 @@
       "namedAnimations": {
         "cry": "q.bedrock_primary('vikavolt', 'battle_cry', q.curve('symmetrical_wide'))",
         "recoil": "q.bedrock_stateful('vikavolt', 'air_recoil')"
-      },
-      "transitions": {
-        "standing": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))",
-        "walking": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))",
-        "sleep": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))"
       }
     },
     "walking": {
       "poseTypes": ["WALK", "SWIM"],
-      "condition": "!q.in_air && q.riding_style != 'AIR': 1.0 ? 0.0",
       "animations": [
         "q.bedrock('vikavolt', 'ground_walk')"
       ],
       "quirks": ["q.bedrock_quirk('vikavolt', 'blink')"],
       "transitions": {
-        "hover": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('symmetrical_wide'))",
-        "fly": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('symmetrical_wide'))",
-        "battle-standing": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('symmetrical_wide'))",
-        "battle-hover": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('symmetrical_wide'))",
-        "air-sleep": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('symmetrical_wide'))"
+        "hover": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('one'))",
+        "fly": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('one'))",
+        "battle-standing": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('one'))",
+        "battle-hover": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('one'))",
+        "air-sleep": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('one'))"
       }
     },
     "hover": {
@@ -71,11 +64,6 @@
       "namedAnimations": {
         "cry": "q.bedrock_stateful('vikavolt', 'air_cry')",
         "recoil": "q.bedrock_stateful('vikavolt', 'air_recoil')"
-      },
-      "transitions": {
-        "standing": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))",
-        "walking": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))",
-        "sleep": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))"
       }
     },
     "battle-hover": {
@@ -89,67 +77,22 @@
       "namedAnimations": {
         "cry": "q.bedrock_primary('vikavolt', 'battle_cry', q.curve('symmetrical_wide'))",
         "recoil": "q.bedrock_stateful('vikavolt', 'air_recoil')"
-      },
-      "transitions": {
-        "standing": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))",
-        "walking": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))",
-        "sleep": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))"
       }
     },
     "fly": {
       "poseTypes": ["FLY"],
       "animations": [
         "q.pitch_tilt('body')",
-        "q.bedrock('vikavolt', 'air_fly')"
-      ],
-      "quirks": ["q.bedrock_quirk('vikavolt', 'blink')"],
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('vikavolt', 'air_cry')",
-        "recoil": "q.bedrock_stateful('vikavolt', 'air_recoil')"
-      },
-      "transitions": {
-        "standing": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))",
-        "walking": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))",
-        "sleep": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))"
-      }
-    },
-    "mount-hover": {
-      "poseTypes": ["STAND", "HOVER"],
-      "isBattle": false,
-      "condition": "q.has_entity ? q.is_ridden && q.riding_style == 'AIR' : 0.0",
-      "isRideStyle": ["AIR"],
-      "animations": [
-        "q.bedrock('vikavolt', 'air_idle')",
-        "q.bedrock('vikavolt', 'ride_air_fly')"
-      ],
-      "quirks": ["q.bedrock_quirk('vikavolt', 'blink')"],
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('vikavolt', 'air_cry')",
-        "recoil": "q.bedrock_stateful('vikavolt', 'air_recoil')"
-      },
-      "transitions": {
-        "standing": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))",
-        "walking": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))",
-        "sleep": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))"
-      }
-    },
-    "mount-fly": {
-      "poseTypes": ["WALK", "FLY"],
-      "isBattle": false,
-      "condition": "q.has_entity ? q.is_ridden && q.riding_style == 'AIR' : 0.0",
-      "animations": [
         "q.bedrock('vikavolt', 'air_fly')",
-        "q.bedrock('vikavolt', 'ride_air_fly')"
+        {
+          "condition": "q.is_ridden",
+          "animation": "q.bedrock('vikavolt', 'ride_air_fly')"
+        }
       ],
       "quirks": ["q.bedrock_quirk('vikavolt', 'blink')"],
       "namedAnimations": {
         "cry": "q.bedrock_stateful('vikavolt', 'air_cry')",
         "recoil": "q.bedrock_stateful('vikavolt', 'air_recoil')"
-      },
-      "transitions": {
-        "standing": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))",
-        "walking": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))",
-        "sleep": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))"
       }
     },
     "air-sleep": {
@@ -161,12 +104,7 @@
       },
       "animations": [
         "q.bedrock('vikavolt', 'air_sleep')"
-      ],
-      "transitions": {
-        "standing": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))",
-        "walking": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))",
-        "sleep": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))"
-      }
+      ]
     },
     "sleep": {
       "poseTypes": ["SLEEP"],
@@ -179,11 +117,11 @@
         "q.bedrock('vikavolt', 'sleep')"
       ],
       "transitions": {
-        "hover": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('symmetrical_wide'))",
-        "fly": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('symmetrical_wide'))",
-        "battle-standing": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('symmetrical_wide'))",
-        "battle-hover": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('symmetrical_wide'))",
-        "air-sleep": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('symmetrical_wide'))"
+        "hover": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('one'))",
+        "fly": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('one'))",
+        "battle-standing": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('one'))",
+        "battle-hover": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('one'))",
+        "air-sleep": "q.bedrock_primary('vikavolt', 'air_transition',  q.curve('one'))"
       }
     },
     "battle-sleep": {
@@ -194,12 +132,7 @@
       },
       "animations": [
         "q.bedrock('vikavolt', 'battle_sleep')"
-      ],
-      "transitions": {
-        "standing": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))",
-        "walking": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))",
-        "sleep": "q.bedrock_primary('vikavolt', 'ground_transition',  q.curve('symmetrical_wide'))"
-      }
+      ]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0821_rookidee/rookidee.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 2.1,
   "portraitTranslation": [-0.11, -1.29, 0],
-  "profileScale": 1.0,
-  "profileTranslation": [-0.02, 0.22, 0],
+  "profileScale": 1.39,
+  "profileTranslation": [-0.02, -0.35, 0],
   "rootBone": "rookidee",
   "animations": {
     "cry": "q.bedrock_stateful('rookidee', 'cry')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0877_morpeko/morpeko.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 2.14,
   "portraitTranslation": [ -0.38, -0.64, 0],
-  "profileScale": 0.54,
-  "profileTranslation": [ 0, 0.97, 0],
+  "profileScale": 0.47,
+  "profileTranslation": [ 0, 1.04, 0],
   "rootBone": "morpeko",
   "poses": {
     "standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0931_squawkabilly/squawkabilly.json

@@ -1,45 +0,0 @@
-{
-  "portraitScale": 2.0,
-  "portraitTranslation": [-0.2, -0.2, 0.0],
-  "profileScale": 0.85,
-  "profileTranslation": [0.0, 0.51, 0.0],
-  "rootBone": "squawkabilly",
-  "animations": {
-    "cry": "q.bedrock_stateful('squawkabilly', 'cry')"
-  },
-  "poses": {
-    "standing": {
-      "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
-      "animations": ["q.look('head')", "q.bedrock('squawkabilly', 'ground_idle')"],
-      "quirks": ["q.bedrock_quirk('squawkabilly', 'blink')"]
-    },
-    "walking": {
-      "poseTypes": ["WALK", "SWIM"],
-      "animations": [
-        "q.look('head')",
-        "q.bedrock('squawkabilly', 'ground_walk')"
-      ],
-      "quirks": ["q.bedrock_quirk('squawkabilly', 'blink')"]
-    },
-    "hover": {
-      "poseTypes": ["HOVER"],
-      "animations": [
-        "q.pitch_tilt('body')",
-        "q.look('neck', 1, 1, 70, -10, 20, -20)",
-        "q.look('head')",
-        "q.bedrock('squawkabilly', 'air_idle')"
-      ],
-      "quirks": ["q.bedrock_quirk('squawkabilly', 'blink')"]
-    },
-    "fly": {
-      "poseTypes": ["FLY"],
-      "animations": [
-        "q.pitch_tilt('body')",
-        "q.look('neck', 1, 1, 70, -10, 20, -20)",
-        "q.look('head')",
-        "q.bedrock('squawkabilly', 'air_fly')"
-      ],
-      "quirks": ["q.bedrock_quirk('squawkabilly', 'blink')"]
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0932_nacli/nacli.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 4.2,
   "portraitTranslation": [0.0,-4.7,0],
-  "profileScale": 1.2,
-  "profileTranslation": [0.0,-0.09,0],
+  "profileScale": 1.25,
+  "profileTranslation": [0.0,-0.15,0],
   "rootBone": "nacli",
   "animations": {
     "cry": "q.bedrock_stateful('nacli', 'cry')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0933_naclstack/naclstack.json

@@ -1,8 +1,8 @@
 {
-  "portraitScale": 3.46,
-  "portraitTranslation": [-0.94,-2.28,0],
-  "profileScale": 0.9,
-  "profileTranslation": [0,0.3,0],
+  "portraitScale": 4.0,
+  "portraitTranslation": [-0.61,-3.0,0],
+  "profileScale": 1.05,
+  "profileTranslation": [0.1,0.1,0],
   "rootBone": "naclstack",
   "animations": {
     "cry": "q.bedrock_stateful('naclstack', 'cry')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0957_tinkatink/tinkatink.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 2,
   "portraitTranslation": [0, -1.01, 0.0],
-  "profileScale": 0.9,
-  "profileTranslation": [0.0, 0.40, 0.0],
+  "profileScale": 1,
+  "profileTranslation": [0.0, 0.25, 0.0],
   "rootBone": "tinkatink",
   "animations": {
     "faint": "q.bedrock_primary('tinkatink', 'faint', q.curve('one'))",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0958_tinkatuff/tinkatuff.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 1.9,
   "portraitTranslation": [0, -0.41, 0.0],
-  "profileScale": 0.78,
-  "profileTranslation": [-0.02, 0.58, 0.0],
+  "profileScale": 0.9,
+  "profileTranslation": [-0.02, 0.46, 0.0],
   "rootBone": "tinkatuff",
   "animations": {
     "faint": "q.bedrock_primary('tinkatuff', 'faint', q.curve('one'))",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0965_varoom/varoom.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 1.7,
   "portraitTranslation": [0.05, -0.71, 0],
-  "profileScale": 0.85,
-  "profileTranslation": [0, 0.4, 0],
+  "profileScale": 1,
+  "profileTranslation": [0, 0.1, 0],
   "rootBone": "varoom",
   "animations": {
     "cry": "q.bedrock_stateful('varoom', 'cry')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0969_glimmet/glimmet.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 2,
   "portraitTranslation": [-0.45,1.3,0],
-  "profileScale": 0.55,
-  "profileTranslation": [0,1.0,0],
+  "profileScale": 0.7,
+  "profileTranslation": [0,0.8,0],
   "rootBone": "glimmet",
   "animations": {
     "faint": "q.bedrock_primary('glimmet', 'faint', q.curve('one'))",