scraper updates

This reverts commit 6a7d5d2133.

CHANGELOG.md

@@ -3,6 +3,10 @@
 
 ### Additions
 
+### Particles
+## New Move Animations
+- Water Shuriken
+
 ### Cries added/updated for the following Pokémon
 - Hoppip
 - Skiploom
@@ -38,6 +42,8 @@
 
 ### Animation updates for the following Pokémon
 - Vikavolt
+- Magby
+- Magmar
 
 ### Changes
 - Changed the Misc icon in the Campfire Pot Recipe Book to Health Candy
@@ -59,6 +65,7 @@
 - Fixed MoLang that's targeting players intermittedly failing when they have died, needing them to relog
 - Prehistoric Frozen Pond, Prehistoric Frozen Spike, and Prehistoric Lush Den now generate
 - Fixed Frogadier floating in its battle_idle animation
+- 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

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

@@ -16,6 +16,7 @@ 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
@@ -90,6 +91,7 @@ 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
@@ -225,10 +227,12 @@ 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/api/drop/DropTable.kt

@@ -10,9 +10,14 @@ 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
@@ -105,7 +110,11 @@ class DropTable {
     ) {
         LOOT_DROPPED.postThen(
             event = LootDroppedEvent(this, player, entity, drops),
-            ifSucceeded = { it.drops.forEach { it.drop(entity, world, pos, player) } }
+            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}"))
+            }
         )
     }
 

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

@@ -0,0 +1,64 @@
+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 val percentage: Float,
+    override val quantity: Int,
+    override val 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/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 = 1.1F
-    override var profileTranslation = Vec3(-0.1, 0.1, 0.0)
+    override var profileScale = 0.93F
+    override var profileTranslation = Vec3(-0.1, 0.36, 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 = 1.1F
-    override var profileTranslation = Vec3(-0.1, 0.1, 0.0)
+    override var profileScale = 0.93F
+    override var profileTranslation = Vec3(-0.1, 0.36, 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.6F
-    override var profileTranslation = Vec3(0.0, -0.6, 0.0)
+    override var profileScale = 1.25F
+    override var profileTranslation = Vec3(0.0, -0.17, 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 = 1.0F
-    override var profileTranslation = Vec3(0.0, 0.3, 0.0)
+    override var profileScale = 0.82F
+    override var profileTranslation = Vec3(0.0, 0.53, 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.9F
-    override var profileTranslation = Vec3(0.0, 0.4, 0.0)
+    override var profileScale = 0.75F
+    override var profileTranslation = Vec3(0.0, 0.6, 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.9F
-    override var profileTranslation = Vec3(0.0, 0.4, 0.0)
+    override var profileScale = 0.75F
+    override var profileTranslation = Vec3(0.0, 0.6, 0.0)
 
     lateinit var shoulderLeft: Pose
     lateinit var shoulderRight: Pose

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.85F
+    override var profileScale = 0.68F
     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 = 1.2F
-    override var profileTranslation = Vec3(0.0, 0.05, 0.0)
+    override var profileScale = 0.98F
+    override var profileTranslation = Vec3(0.0, 0.28, 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.8F
-    override var profileTranslation = Vec3(0.0, 0.6, 0.0)
+    override var profileScale = 0.58F
+    override var profileTranslation = Vec3(0.0, 0.91, 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.32F
-    override var profileTranslation = Vec3(0.0, 1.24, 0.0)
+    override var profileScale = 0.36F
+    override var profileTranslation = Vec3(0.0, 1.19, 0.0)
 
     lateinit var standing: CobblemonPose
     lateinit var standing2: CobblemonPose

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

@@ -117,6 +117,7 @@ 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
@@ -132,6 +133,7 @@ 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
@@ -173,6 +175,7 @@ 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.*
@@ -242,6 +245,12 @@ 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

@@ -0,0 +1,28 @@
+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.util.cobblemonResource
+import net.minecraft.core.Registry
+import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType
+
+object CobblemonLootItemConditions {
+
+    @JvmField
+    val POKEMON_PROPERTIES_CONDITION = Registry.register(
+        BuiltInRegistries.LOOT_CONDITION_TYPE,
+        cobblemonResource("pokemon_properties"),
+        LootItemConditionType(PokemonPropertiesLootItemCondition.CODEC)
+    )
+
+    @JvmField
+    val BIOME_CONDITION = Registry.register(
+        BuiltInRegistries.LOOT_CONDITION_TYPE,
+        cobblemonResource("biome"),
+        LootItemConditionType(BiomeLootItemCondition.CODEC)
+    )
+
+    fun touch() = Unit
+
+}

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

@@ -0,0 +1,38 @@
+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

@@ -0,0 +1,33 @@
+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/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_actor.particle.json

@@ -0,0 +1,90 @@
+{
+	"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

@@ -0,0 +1,91 @@
+{
+	"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)*2))*(v.particle_age / v.particle_lifetime)", "(v.target_deltay+((v.particle_random_2-0.5)*2))*(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

@@ -0,0 +1,86 @@
+{
+	"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

@@ -0,0 +1,63 @@
+{
+	"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

@@ -0,0 +1,86 @@
+{
+	"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

@@ -0,0 +1,69 @@
+{
+	"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

@@ -0,0 +1,62 @@
+{
+	"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, 0, 0]
+					"rotation": ["30-math.sin(q.anim_time*90*2-60)*-3", 0, 0]
 				},
 				"tail3": {
-					"rotation": [12.5, 0, 0]
+					"rotation": ["12.5-math.sin(q.anim_time*90*2-120)*-3", 0, 0]
 				},
 				"leg_right": {
 					"rotation": [0, 5, 0]
@@ -53,6 +53,22 @@
 				},
 				"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"]
 				}
 			}
 		},
@@ -111,6 +127,30 @@
 						}
 					}
 				},
+				"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": {
@@ -118,19 +158,15 @@
 							"lerp_mode": "catmullrom"
 						},
 						"0.1667": {
-							"post": [85, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4167": {
-							"post": [85, 0, 0],
+							"post": [72.5, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
 						"0.5833": {
 							"post": [0, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"0.75": {
-							"post": [85, 0, 0],
+						"0.8333": {
+							"post": [52.5, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
 						"1.1667": {
@@ -138,6 +174,32 @@
 							"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": {
@@ -203,6 +265,546 @@
 					"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/0258_mudkip/mudkip.animation.json

@@ -3,58 +3,274 @@
 	"animations": {
 		"animation.mudkip.ground_idle": {
 			"loop": true,
+			"animation_length": 2,
 			"bones": {
 				"head": {
-					"rotation": [2.5, 0, 0]
+					"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"]
 				},
 				"fin2": {
-					"rotation": [2.5, 0, 0]
+					"rotation": [2.5, 0, "0+math.sin(q.anim_time*90*2-150)*-3"]
 				},
 				"cheek_left2": {
-					"rotation": [0, -7.5, 0]
+					"rotation": [0, -7.5, "0+math.sin(q.anim_time*90*4-90)*1.5"]
 				},
 				"leg_front_left": {
-					"rotation": [7.5, 5, 0]
+					"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"]
 				},
 				"leg_front_left2": {
-					"rotation": [-7.5, 0, 0]
+					"rotation": ["-5+math.sin(q.anim_time*90*4)*-2", 0, 0]
 				},
 				"leg_front_right": {
-					"rotation": [7.5, -5, 0]
+					"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"]
 				},
 				"leg_front_right2": {
-					"rotation": [-7.5, 0, 0]
+					"rotation": ["-5+math.sin(q.anim_time*90*4)*-2", 0, 0]
 				},
 				"leg_back_left": {
-					"rotation": [5, -5, 0]
+					"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, 0, 0]
+					"rotation": ["5+math.sin(q.anim_time*90*4)*1", 0, 0]
 				},
 				"leg_back_right": {
-					"rotation": [5, 5, 0]
+					"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, 0, 0]
+					"rotation": ["5+math.sin(q.anim_time*90*4)*1", 0, 0]
 				},
 				"body": {
 					"position": [0, -0.1, 0]
 				},
 				"tail": {
-					"rotation": [5, 0, 0]
+					"rotation": ["6+math.sin(q.anim_time*90*4)*1", "0+math.sin(q.anim_time*90*2-90)*-10", 0]
 				},
 				"fin": {
-					"rotation": [2.5, 0, 0]
+					"rotation": [2.5, 0, "0+math.sin(q.anim_time*90*2-90)*-4"]
 				},
 				"cheek_right2": {
-					"rotation": [0, -7.5, 0]
+					"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]
 				}
 			}
 		},
 		"animation.mudkip.cry": {
-			"animation_length": 1.2,
+			"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]
+					}
+				}
+			},
 			"sound_effects": {
-				"0.04": {
+				"0.5417": {
 					"effect": "pokemon.mudkip.cry"
 				}
 			}
@@ -207,6 +423,14 @@
 					"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,83 +3,173 @@
 	"animations": {
 		"animation.marshtomp.ground_idle": {
 			"loop": true,
+			"animation_length": 4,
 			"bones": {
 				"torso": {
-					"rotation": [0, 0, 0]
+					"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]
 				},
 				"chest": {
-					"rotation": [-2.5, 0, 0]
+					"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]
 				},
 				"head": {
-					"rotation": [5, 0, 0]
+					"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]
 				},
 				"arm_left": {
-					"rotation": [7.5, 0, 27.5]
+					"rotation": [7.5, 0, "37.5+math.sin(q.anim_time*90*2)*-5"]
 				},
 				"arm_left2": {
-					"rotation": [0, 15, 2.5]
+					"rotation": [0, "15+math.sin(q.anim_time*90*2-30)*5", "2.5+math.sin(q.anim_time*90*2-60)*-5"]
 				},
 				"hand_left": {
-					"rotation": [0, 0, 5]
+					"rotation": [0, "0+math.sin(q.anim_time*90*2-120)*3", "10+math.sin(q.anim_time*90*2-150)*-2.5"]
 				},
 				"finger_front_left": {
-					"rotation": [0, 2.5, 15]
+					"rotation": [0, 0, "10+math.sin(q.anim_time*90*2-60)*-5"]
 				},
 				"finger_middle_left": {
-					"rotation": [0, 0, 10]
+					"rotation": [0, 0, "10+math.sin(q.anim_time*90*2-120)*-5"]
 				},
 				"finger_back_left": {
-					"rotation": [0, -5, 20]
+					"rotation": [0, 0, "10+math.sin(q.anim_time*90*2-180)*-5"]
 				},
 				"arm_right": {
-					"rotation": [7.5, 0, -27.5]
+					"rotation": [7.5, 0, "-37.5+math.sin(q.anim_time*90*2)*-5"]
 				},
 				"arm_right2": {
-					"rotation": [0, -15, -2.5]
+					"rotation": [0, "-15+math.sin(q.anim_time*90*2-30)*5", "-2.5+math.sin(q.anim_time*90*2-60)*-5"]
 				},
 				"hand_right": {
-					"rotation": [0, 0, -5]
+					"rotation": [0, "0+math.sin(q.anim_time*90*2-120)*3", "-10+math.sin(q.anim_time*90*2-150)*-2.5"]
 				},
 				"finger_front_right": {
-					"rotation": [0, -2.5, -15]
+					"rotation": [0, 0, "-10+math.sin(q.anim_time*90*2-60)*-5"]
 				},
 				"finger_middle_right": {
-					"rotation": [0, 0, -10]
+					"rotation": [0, 0, "-10+math.sin(q.anim_time*90*2-120)*-5"]
 				},
 				"finger_back_right": {
-					"rotation": [0, 5, -20]
+					"rotation": [0, 0, "-10+math.sin(q.anim_time*90*2-180)*-5"]
 				},
 				"tail_fin_left": {
-					"rotation": [-5, 45, 0]
+					"rotation": [-5, "45+math.sin(q.anim_time*90*2)*-12", 0]
 				},
 				"tail_fin_right": {
-					"rotation": [-5, -45, 0]
+					"rotation": [-5, "-45+math.sin(q.anim_time*90*2)*12", 0]
 				},
 				"leg_left": {
-					"rotation": [2.5, 0, -2.5]
+					"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]
 				},
 				"leg_left2": {
 					"rotation": [5, 0, 0]
 				},
 				"foot_left": {
-					"rotation": [-7.5, 0, 2.5]
+					"rotation": [-7.47178, "0.6518+math.sin(q.anim_time*90*2)*-1.5", 2.45744]
 				},
 				"leg_right": {
-					"rotation": [2.5, 0, 2.5]
+					"rotation": [2.4905, "-0.2178+math.sin(q.anim_time*90*2)*1.5", 2.49527]
 				},
 				"leg_right2": {
 					"rotation": [5, 0, 0]
 				},
 				"foot_right": {
-					"rotation": [-7.5, 0, -2.5]
-				}
-			}
-		},
-		"animation.marshtomp.cry": {
-			"animation_length": 1.2,
-			"sound_effects": {
-				"0.04": {
-					"effect": "pokemon.marshtomp.cry"
+					"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]
 				}
 			}
 		},
@@ -162,6 +252,108 @@
 					"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,30 +3,33 @@
 	"animations": {
 		"animation.swampert.ground_idle": {
 			"loop": true,
+			"animation_length": 4,
 			"bones": {
 				"body": {
 					"position": [0, 1.75, 0]
 				},
 				"chest2": {
-					"rotation": [-12.5, 0, 0]
+					"rotation": ["-12.5+math.sin(q.anim_time*90*2-60)*0.75", 0, 0]
 				},
 				"neck": {
-					"rotation": [-5, 0, 0]
+					"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.77647, -12.0131, -53.28718]
+					"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.54163, -0.2127, 45.09046]
+					"rotation": [4.5416, -0.2127, 45.09046]
 				},
 				"leg_left3": {
 					"rotation": [9.83802, -2.51058, 9.95791]
 				},
 				"foot_left": {
-					"rotation": [-27.58324, -3.55523, 20.16242]
+					"rotation": [-27.58324, "-3.5552+math.sin(q.anim_time*90*2)*-1.5", 20.16242]
 				},
 				"leg_right": {
-					"rotation": [8.77647, 12.0131, 53.2872]
+					"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]
@@ -35,16 +38,155 @@
 					"rotation": [9.83802, 2.5106, -9.9579]
 				},
 				"foot_right": {
-					"rotation": [-27.58324, 3.5552, -20.1624]
+					"rotation": [-27.58324, "3.5552+math.sin(q.anim_time*90*2)*1.5", -20.1624]
 				},
 				"arm_left2": {
-					"rotation": [-4.36302, -31.26463, 17.62528]
+					"rotation": [-4.36302, -31.26463, "17.6253+math.sin(q.anim_time*90*2-90)*2"]
 				},
 				"arm_left3": {
-					"rotation": [1.80384, 2.38704, 35.42915]
+					"rotation": [1.80384, 2.38704, "35.4291+math.sin(q.anim_time*90*2-120)*2.5"]
 				},
 				"arm_left": {
-					"rotation": [-13.31914, -14.63639, 12.92638]
+					"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]
 				},
 				"finger_front_left": {
 					"rotation": [0, -37.5, 20]
@@ -59,13 +201,14 @@
 					"rotation": [0, 37.5, 0]
 				},
 				"arm_right": {
-					"rotation": [-13.31914, 14.6364, -12.9264]
+					"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]
 				},
 				"arm_right2": {
-					"rotation": [-4.36302, 31.2646, -17.6253]
+					"rotation": [-4.71002, "12.8789+math.sin(q.anim_time*90*2-90)*2", -28.88472]
 				},
 				"arm_right3": {
-					"rotation": [1.80384, -2.387, -35.4292]
+					"rotation": [1.81234, "-10.1983+math.sin(q.anim_time*90*2-30)*-5", -25.6704]
 				},
 				"fingers_right": {
 					"rotation": [0, -37.5, 0]
@@ -80,37 +223,65 @@
 					"rotation": [0, 30, 27.5]
 				},
 				"torso": {
-					"rotation": [-2.5, 0, 0]
+					"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]
 				},
 				"chest": {
-					"rotation": [-7.5, 0, 0]
+					"rotation": ["-0+math.sin(q.anim_time*90*2-30)*1.5", 0, 0]
 				},
 				"hand_left": {
-					"rotation": [0, -17.5, 0]
+					"rotation": [0, "-17.5-math.sin(q.anim_time*90*2-60)*-2", 0]
 				},
 				"finger_front_left2": {
-					"rotation": [0, -12.5, 0]
+					"rotation": [0, "-12.5+math.sin(q.anim_time*90*2-150)*-5", 0]
 				},
 				"finger_middle_left2": {
-					"rotation": [0, -10, 0]
+					"rotation": [0, "-10+math.sin(q.anim_time*90*2-150)*-5", 0]
 				},
 				"finger_back_left2": {
-					"rotation": [0, -15, 0]
-				},
-				"head_angle": {
-					"rotation": [12.5, 0, 0]
+					"rotation": [0, "-15+math.sin(q.anim_time*90*2-150)*-5", 0]
 				},
 				"hand_right": {
-					"rotation": [0, 17.5, 0]
+					"rotation": [0, "17.5+math.sin(q.anim_time*90*2-60)*-2", 0]
 				},
 				"finger_front_right2": {
-					"rotation": [0, 12.5, 0]
+					"rotation": [0, "12.5+math.sin(q.anim_time*90*2-150)*5", 0]
 				},
 				"finger_middle_right2": {
-					"rotation": [0, 10, 0]
+					"rotation": [0, "10+math.sin(q.anim_time*90*2-150)*5", 0]
 				},
 				"finger_back_right2": {
-					"rotation": [0, 15, 0]
+					"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]
 				}
 			}
 		},
@@ -233,14 +404,6 @@
 				}
 			}
 		},
-		"animation.swampert.cry": {
-			"animation_length": 1.2,
-			"sound_effects": {
-				"0.04": {
-					"effect": "pokemon.swampert.cry"
-				}
-			}
-		},
 		"animation.swampert.blink": {
 			"animation_length": 0.1667,
 			"bones": {
@@ -322,6 +485,158 @@
 					"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/posers/0010_caterpie/caterpie.json

@@ -1,8 +1,8 @@
 {
    "portraitScale": 2.1,
    "portraitTranslation": [ -0.55, -1.55, 0 ],
-   "profileScale": 0.80,
-   "profileTranslation": [ 0, 0.55, 0 ],
+   "profileScale": 0.72,
+   "profileTranslation": [ 0, 0.63, 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.80,
-   "profileTranslation": [0, 0.51, 0],
+   "profileScale": 0.72,
+   "profileTranslation": [ 0, 0.63, 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.76,
-  "profileTranslation": [0, 0.62, 0.0],
+  "profileScale": 0.83,
+  "profileTranslation": [0, 0.53, 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": 1.1,
-   "profileTranslation": [ 0.0, 0.1, 0 ],
+   "profileScale": 0.85,
+   "profileTranslation": [ 0.0, 0.45, 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": 1.1,
-   "profileTranslation": [ 0.0, 0.1, 0 ],
+   "profileScale": 0.85,
+   "profileTranslation": [ 0.0, 0.45, 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,12 +4,14 @@
   "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')", "q.bedrock('spearow', 'ground_idle')"],
+      "animations": ["q.look('head_ai')", "q.bedrock('spearow', 'ground_idle')"],
       "quirks": ["q.bedrock_quirk('spearow', 'blink')"],
       "transformedParts": [
         {
@@ -33,9 +35,8 @@
     "walking": {
       "poseTypes": ["WALK", "SWIM"],
       "animations": [
-        "q.look('head')",
-        "q.bedrock('spearow', 'ground_idle')",
-        "q.biped_walk(1, 1, 'leg_left', 'leg_right')"
+        "q.look('head_ai')",
+        "q.bedrock('spearow', 'ground_walk')"
       ],
       "quirks": ["q.bedrock_quirk('spearow', 'blink')"],
       "transformedParts": [
@@ -61,10 +62,9 @@
       "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')",
-        "q.bedrock('spearow', 'ground_idle')"
+        "q.look('head_ai')",
+        "q.bedrock('spearow', 'air_idle')"
       ],
       "quirks": ["q.bedrock_quirk('spearow', 'blink')"],
       "transformedParts": [
@@ -90,10 +90,9 @@
       "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')",
-        "q.bedrock('spearow', 'ground_idle')"
+        "q.look('head_ai')",
+        "q.bedrock('spearow', 'air_fly')"
       ],
       "quirks": ["q.bedrock_quirk('spearow', 'blink')"],
       "transformedParts": [

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

@@ -11,7 +11,7 @@
       "isBattle": false,
       "animations": [
         "q.look('neck', 1, 1, 70, -10, 20, -20)",
-        "q.look('head')",
+        "q.look('head_ai')",
         "q.bedrock('fearow', 'ground_idle')"
       ],
       "transformedParts": [
@@ -37,9 +37,8 @@
       "poseTypes": ["WALK", "SWIM"],
       "animations": [
         "q.look('neck', 1, 1, 70, -10, 20, -20)",
-        "q.look('head')",
-        "q.bedrock('fearow', 'ground_idle')",
-        "q.biped_walk(1, 1, 'leg_left', 'leg_right')"
+        "q.look('head_ai')",
+        "q.bedrock('fearow', 'ground_walk')"
       ],
       "transformedParts": [
         {
@@ -64,9 +63,8 @@
       "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')",
+        "q.look('head_ai')",
         "q.bedrock('fearow', 'air_idle')"
       ],
       "transformedParts": [
@@ -92,10 +90,9 @@
       "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')",
-        "q.bedrock('fearow', 'air_idle')"
+        "q.look('head_ai')",
+        "q.bedrock('fearow', 'air_fly')"
       ],
       "transformedParts": [
         {
@@ -115,6 +112,11 @@
           "isVisible": false
         }
       ]
+    },
+    "sleep": {
+      "poseTypes": ["SLEEP"],
+      "animations": ["q.bedrock('fearow', 'sleep')"],
+      "namedAnimations": {"cry": "q.bedrock_stateful('dummy', 'cry')"}
     }
   }
 }

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": 1.03,
-  "profileTranslation": [0, 0.21, 0],
+  "profileScale": 0.79,
+  "profileTranslation": [0, 0.54, 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": 1.05,
-  "profileTranslation": [0, 0.11, 0],
+  "profileScale": 0.79,
+  "profileTranslation": [0, 0.54, 0],
   "rootBone": "nidoranm",
   "animations": {
     "cry": "q.bedrock_stateful('nidoranm', 'cry')",

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.85,
-  "profileTranslation": [0, 0.5, 0],
+  "profileScale": 0.75,
+  "profileTranslation": [0, 0.6, 0],
   "rootBone": "oddish",
   "animations": {
     "cry": "q.bedrock_stateful('oddish', 'cry')",

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

@@ -17,9 +17,7 @@
       "poseTypes": ["WALK", "SWIM"],
       "animations": [
         "q.look('head')",
-        "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')"
+        "q.bedrock('magmar', 'ground_walk')"
       ],
       "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": 1.1,
-  "profileTranslation": [-0.1, 0, 0],
+  "profileScale": 0.76,
+  "profileTranslation": [0, 0.48, 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,7 +32,8 @@
     },
     "sleep": {
       "poseTypes": ["SLEEP"],
-      "animations": ["q.bedrock('pichu', 'sleep')"]
+      "animations": ["q.bedrock('pichu', 'sleep')"],
+      "namedAnimations": {"cry": "q.bedrock_stateful('dummy', 'cry')"}
     },    
       "shoulder_left": {
       "poseTypes": ["SHOULDER_LEFT"],

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

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

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

@@ -32,7 +32,8 @@
     },
     "sleep": {
       "poseTypes": ["SLEEP"],
-      "animations": ["q.bedrock('pichu_ukulele', 'sleep')"]
+      "animations": ["q.bedrock('pichu_ukulele', 'sleep')"],
+      "namedAnimations": {"cry": "q.bedrock_stateful('dummy', 'cry')"}
     },    
       "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.95,
-  "profileTranslation": [0, 0.35, 0],
+  "profileScale": 0.85,
+  "profileTranslation": [0, 0.45, 0],
   "animations": {
     "cry": "q.bedrock_stateful('murkrow', 'cry')"
   },

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

@@ -5,21 +5,41 @@
   "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')"]
+      "quirks": ["q.bedrock_quirk('magby', 'blink')",
+      "q.bedrock_quirk('magby', 'quirk_noot', 30, 60, 1, q.curve('symmetrical_wide'))"
+    ]
     },
     "walking": {
       "poseTypes": ["WALK", "SWIM"],
       "animations": [
         "q.look('head')",
-        "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')"
+        "q.bedrock('magby', 'ground_walk')"
       ],
       "quirks": ["q.bedrock_quirk('magby', 'blink')"]
     }

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

@@ -8,6 +8,15 @@
     "cry": "q.bedrock_stateful('mudkip', 'cry')"
   },
   "poses": {
+    "battle-standing": {
+      "isBattle": true,
+      "poseTypes": ["STAND"],
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('mdukip', '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,6 +8,15 @@
     "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,7 +8,17 @@
     "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.8,
-  "profileTranslation": [0.0, 0.56, 0.0],
+  "profileScale": 0.65,
+  "profileTranslation": [0.0, 0.75, 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.8,
-  "profileTranslation": [0.0, 0.56, 0.0],
+  "profileScale": 0.65,
+  "profileTranslation": [0.0, 0.75, 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_primary('archeops', 'air_cry', q.curve('symmetrical_wide'))"
+        "cry": "q.bedrock_stateful('archeops', 'air_cry')"
       }
     },
     "jump": {
@@ -127,7 +127,7 @@
         "q.bedrock_quirk('archeops', 'blink')"
       ],
       "namedAnimations": {
-        "cry": "q.bedrock_primary('archeops', 'air_cry', q.curve('symmetrical_wide'))"
+        "cry": "q.bedrock_stateful('archeops', 'air_cry')"
       }
     },
     "fly": {
@@ -146,7 +146,7 @@
         "q.bedrock_quirk('archeops', 'blink')"
       ],
       "namedAnimations": {
-        "cry": "q.bedrock_primary('archeops', 'air_cry', q.curve('symmetrical_wide'))"
+        "cry": "q.bedrock_stateful('archeops', 'air_cry')"
       }
     },
     "glide": {

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

@@ -1,8 +1,8 @@
 {
    "portraitScale": 1.9,
-   "portraitTranslation": [ -0.1, 1.4, 0 ],
-   "profileScale": 0.7,
-   "profileTranslation": [ 0, 0.7, 0 ],
+   "portraitTranslation": [ -0.2, 1.4, 0 ],
+   "profileScale": 0.57,
+   "profileTranslation": [ 0, 0.88, 0 ],
    "rootBone": "frogadier",
    "animations": {
       "cry": "q.bedrock_stateful('frogadier', 'cry')",

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.5,
-  "profileTranslation": [-0.05,1,0],
+  "profileScale": 0.57,
+  "profileTranslation": [-0.05,0.93,0],
   "rootBone": "helioptile",
   "animations": {
     "cry": "q.bedrock_stateful('helioptile', 'cry')"

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.39,
-  "profileTranslation": [-0.02, -0.35, 0],
+  "profileScale": 1.0,
+  "profileTranslation": [-0.02, 0.22, 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.47,
-  "profileTranslation": [ 0, 1.04, 0],
+  "profileScale": 0.54,
+  "profileTranslation": [ 0, 0.97, 0],
   "rootBone": "morpeko",
   "poses": {
     "standing": {

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.25,
-  "profileTranslation": [0.0,-0.15,0],
+  "profileScale": 1.2,
+  "profileTranslation": [0.0,-0.09,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": 4.0,
-  "portraitTranslation": [-0.61,-3.0,0],
-  "profileScale": 1.05,
-  "profileTranslation": [0.1,0.1,0],
+  "portraitScale": 3.46,
+  "portraitTranslation": [-0.94,-2.28,0],
+  "profileScale": 0.9,
+  "profileTranslation": [0,0.3,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": 1,
-  "profileTranslation": [0.0, 0.25, 0.0],
+  "profileScale": 0.9,
+  "profileTranslation": [0.0, 0.40, 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.9,
-  "profileTranslation": [-0.02, 0.46, 0.0],
+  "profileScale": 0.78,
+  "profileTranslation": [-0.02, 0.58, 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": 1,
-  "profileTranslation": [0, 0.1, 0],
+  "profileScale": 0.85,
+  "profileTranslation": [0, 0.4, 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.7,
-  "profileTranslation": [0,0.8,0],
+  "profileScale": 0.55,
+  "profileTranslation": [0,1.0,0],
   "rootBone": "glimmet",
   "animations": {
     "faint": "q.bedrock_primary('glimmet', 'faint', q.curve('one'))",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0738_vikavolt/0_vikavolt_base.json

@@ -7,7 +7,15 @@
       "poser": "cobblemon:vikavolt",
       "model": "cobblemon:vikavolt.geo",
       "texture": "cobblemon:textures/pokemon/0738_vikavolt/vikavolt.png",
-      "layers": []
+      "layers": [
+        {
+          "name": "transparency",
+          "emissive": false,
+          "texture": "cobblemon:textures/pokemon/0738_vikavolt/vikavolt_transparency.png",
+          "translucent": true,
+          "translucent_cull": true
+        }
+      ]
     },
     {
       "aspects": [

common/src/main/resources/assets/cobblemon/lang/en_us.json

@@ -2964,6 +2964,7 @@
   "cobblemon.battle.activate.custapberry": "%1$s can act faster than normal, thanks to its Custap Berry!",
   "cobblemon.battle.activate.destinybond": "%1$s took its attacker down with it!",
   "cobblemon.battle.activate.disguise": "Its disguise served it as a decoy!",
+  "cobblemon.battle.activate.eeriespell": "It reduced the PP of %1$s's %3$s by 3!",
   "cobblemon.battle.activate.electricterrain": "%1$s surrounds itself with electrified terrain!",
   "cobblemon.battle.activate.endure": "%1$s endured the hit!",
   "cobblemon.battle.activate.ficklebeam": "%1$s is going all out for this attack!",
@@ -3325,6 +3326,7 @@
   "cobblemon.battle.heal.drain": "%1$s had its HP drained!",
   "cobblemon.battle.heal.healingwish": "The healing wish came true for %1$s!",
   "cobblemon.battle.heal.revivalblessing": "%1$s was revived and is ready to fight again!",
+  "cobblemon.battle.heal.hospitality": "%2$s drank down all the matcha that %1$s made!",
   "cobblemon.battle.heal.aquaring": "A veil of water restored %1$s's HP!",
   "cobblemon.battle.heal.ingrain": "%1$s absorbed nutrients with its roots!",
   "cobblemon.battle.heal.lunardance": "%1$s became cloaked in mystical moonlight!",

common/src/main/resources/data/cobblemon/action_effects/moves/watershuriken.json

@@ -0,0 +1,48 @@
+{
+  "timeline": [
+    {
+      "type": "add_holds",
+      "holds": ["effects"]
+    },
+    {
+      "type": "animation",
+      "animation": ["throw", "punch", "special"]
+    },
+    {
+      "type": "pause",
+      "pause": 1.25
+    },
+    {
+      "type": "entity_particles",
+      "effect": "cobblemon:watershuriken_actoralt",
+      "locators": ["hand_primary", "special", "target"],
+      "targetLocators": ["target"]
+    },
+    {
+      "type": "pause",
+      "pause": 0.5
+    },
+    {
+      "type": "animation",
+      "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
+      "animation": ["recoil"]
+    },
+    {
+      "type": "pause",
+      "pause": 0.25
+    },
+    {
+      "type": "remove_holds",
+      "holds": ["effects"]
+    },
+    {
+      "type": "animation",
+      "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
+      "animation": ["recoil"]
+    },
+    {
+      "type": "pause",
+      "pause": 0.5
+    }
+  ]
+}

common/src/main/resources/data/cobblemon/action_effects/moves/watershuriken_greninja.json

@@ -0,0 +1,147 @@
+{
+  "timeline": [
+    {
+      "type": "add_holds",
+      "holds": ["effects"]
+    },
+    {
+      "type": "animation",
+      "entityCondition": "q.entity.is_user == true && q.hit_count <= 2",
+      "animation": ["watershuriken_2hit", "special"]
+    },
+    {
+      "type": "animation",
+      "entityCondition": "q.entity.is_user == true && q.hit_count == 3",
+      "animation": ["watershuriken_3hit", "special"]
+    },
+    {
+      "type": "animation",
+      "entityCondition": "q.entity.is_user == true && q.hit_count == 4",
+      "animation": ["watershuriken_4hit", "special"]
+    },
+    {
+      "type": "animation",
+      "entityCondition": "q.entity.is_user == true && q.hit_count == 5",
+      "animation": ["watershuriken_5hit", "special"]
+    },
+    {
+      "type": "pause",
+      "pause": 0.17
+    },
+    {
+      "type": "entity_particles",
+      "entityCondition": "q.entity.is_user == true",
+      "effect": "cobblemon:watershuriken_actorhor",
+      "locators": ["hand_primary", "target"],
+      "targetLocators": ["target"]
+    },
+    {
+      "type": "pause",
+      "pause": 0.14
+    },
+    {
+      "type": "entity_particles",
+      "entityCondition": "q.entity.is_user == true",
+      "effect": "cobblemon:watershuriken_actorhor",
+      "locators": ["hand_secondary", "target"],
+      "targetLocators": ["target"]
+    },
+    {
+      "type": "pause",
+      "pause": 0.16
+    },
+    {
+      "type": "animation",
+      "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false && q.hit_count >= 1",
+      "animation": ["recoil"]
+    },
+    {
+      "type": "pause",
+      "pause": 0.1
+    },
+    {
+      "type": "pause",
+      "condition": "q.hit_count >= 2",
+      "pause": 0.14
+    },
+    {
+      "type": "pause",
+      "condition": "q.hit_count >= 4",
+      "pause": 0.05
+    },
+    {
+      "type": "entity_particles",
+      "entityCondition": "q.entity.is_user == true && q.hit_count >= 3",
+      "effect": "cobblemon:watershuriken_actor",
+      "locators": ["hand_primary", "target"],
+      "targetLocators": ["target"]
+    },
+    {
+      "type": "pause",
+      "condition": "q.hit_count >= 3",
+      "pause": 0.25
+    },
+    {
+      "type": "animation",
+      "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false && q.hit_count >= 4",
+      "animation": ["recoil"]
+    },
+    {
+      "type": "pause",
+      "condition": "q.hit_count >= 4",
+      "pause": 0.41
+    },
+    {
+      "type": "pause",
+      "condition": "q.hit_count == 5",
+      "pause": 0.03
+    },
+    {
+      "type": "entity_particles",
+      "entityCondition": "q.entity.is_user == true && q.hit_count >= 4",
+      "effect": "cobblemon:watershuriken_actorvert",
+      "locators": ["hand_primary", "target"],
+      "targetLocators": ["target"]
+    },
+    {
+      "type": "pause",
+      "condition": "q.hit_count >= 4",
+      "pause": 0.28
+    },
+    {
+      "type": "animation",
+      "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false && q.hit_count == 5",
+      "animation": ["recoil"]
+    },
+    {
+      "type": "pause",
+      "condition": "q.hit_count == 5",
+      "pause": 0.76
+    },
+    {
+      "type": "entity_particles",
+      "entityCondition": "q.entity.is_user == true && q.hit_count == 5",
+      "effect": "cobblemon:watershuriken_actorhor",
+      "locators": ["hand_primary", "target"],
+      "targetLocators": ["target"]
+    },
+    {
+      "type": "pause",
+      "condition": "q.hit_count == 5",
+      "pause": 0.3
+    },
+    {
+      "type": "remove_holds",
+      "holds": ["effects"]
+    },
+    {
+      "type": "animation",
+      "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
+      "animation": ["recoil"]
+    },
+    {
+      "type": "pause",
+      "pause": 0.5
+    }
+  ]
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/abomasnow.json

@@ -0,0 +1,112 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:snowball",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 0,
+                "max": 2
+              }
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:sweet_berries",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 2,
+                "max": 4
+              }
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:never_melt_ice",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:occa_berry",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/abomasnow"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/abra.json

@@ -0,0 +1,85 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:ender_pearl",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 0,
+                "max": 1
+              }
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:twisted_spoon",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.025
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:kasib_berry",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.025
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/abra"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/absol.json

@@ -0,0 +1,84 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:razor_claw",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:life_orb",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:roseli_berry",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/absol"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/accelgor.json

@@ -0,0 +1,32 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:shed_shell",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/accelgor"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/aegislash.json

@@ -0,0 +1,111 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:iron_nugget",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 0,
+                "max": 3
+              }
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:iron_sword",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.1
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:dusk_stone",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.1
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:ability_shield",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.1
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/aegislash"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/aerodactyl.json

@@ -0,0 +1,59 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:bone",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 0,
+                "max": 3
+              }
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:rocky_helmet",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.1
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/aerodactyl"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/aggron.json

@@ -0,0 +1,85 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:raw_iron",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 0,
+                "max": 3
+              }
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:hard_stone",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.1
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:chople_berry",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.1
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/aggron"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/aipom.json

@@ -0,0 +1,59 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:nanab_berry",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.025
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:tag",
+          "name": "cobblemon:apricorn_sprouts",
+          "expand": true,
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.025
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/aipom"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/alakazam.json

@@ -0,0 +1,85 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:ender_pearl",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 0,
+                "max": 3
+              }
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:twisted_spoon",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.1
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:kasib_berry",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.1
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/alakazam"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/alcremie.json

@@ -0,0 +1,59 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:sugar",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 0,
+                "max": 2
+              }
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:cake",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/alcremie"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/alomomola.json

@@ -0,0 +1,85 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:cod",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 1,
+                "max": 1
+              }
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:bone_meal",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:deep_sea_scale",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/alomomola"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/altaria.json

@@ -0,0 +1,86 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:white_wool",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 0,
+                "max": 2
+              }
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:chicken",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 1,
+                "max": 1
+              }
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:yache_berry",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/altaria"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/amaura.json

@@ -0,0 +1,32 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:never_melt_ice",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/amaura"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/ambipom.json

@@ -0,0 +1,59 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:nanab_berry",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:tag",
+          "name": "cobblemon:apricorn_sprouts",
+          "expand": true,
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/ambipom"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/amoonguss.json

@@ -0,0 +1,59 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:red_mushroom",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 0,
+                "max": 2
+              }
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:cheri_berry",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/amoonguss"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/ampharos.json

@@ -0,0 +1,59 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:mutton",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 2,
+                "max": 4
+              }
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:cheri_berry",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.1
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/ampharos"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/annihilape.json

@@ -0,0 +1,58 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:muscle_band",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.1
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:payapa_berry",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.1
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/annihilape"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/anorith.json

@@ -0,0 +1,32 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:quick_claw",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/anorith"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/appletun.json

@@ -0,0 +1,59 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:sweet_apple",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 1,
+                "max": 1
+              }
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:yache_berry",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/appletun"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/applin.json

@@ -0,0 +1,59 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:apple",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 1,
+                "max": 1
+              }
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:yache_berry",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.025
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/applin"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/araquanid.json

@@ -0,0 +1,84 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:mystic_water",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:shed_shell",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:wepear_berry",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/araquanid"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/arbok.json

@@ -0,0 +1,58 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:razor_fang",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:shed_shell",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/arbok"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/arboliva.json

@@ -0,0 +1,84 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:big_root",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.1
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:grassy_seed",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.1
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:kebia_berry",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.1
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/arboliva"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/arcanine.json

@@ -0,0 +1,59 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:bone",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 0,
+                "max": 2
+              }
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:rawst_berry",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/arcanine"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/arcanine_hisui.json

@@ -0,0 +1,59 @@
+{
+  "type": "minecraft:generic",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:bone",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 0,
+                "max": 2
+              }
+            },
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:rawst_berry",
+          "functions": [
+            {
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 1,
+                "min": 0
+              },
+              "enchantment": "minecraft:looting",
+              "function": "minecraft:enchanted_count_increase"
+            }
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.05
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "random_sequence": "cobblemon:pokemon/arcanine_hisui"
+}

common/src/main/resources/data/cobblemon/loot_table/pokemon/arceus.json

@@ -0,0 +1,5 @@
+{
+  "type": "minecraft:generic",
+  "pools": [],
+  "random_sequence": "cobblemon:pokemon/arceus"
+}