Added Debug Logging to hopefully find the issue

common/src/main/java/com/cobblemon/mod/common/mixin/JigsawPlacementMixin.java

@@ -20,6 +20,8 @@ import net.minecraft.world.level.levelgen.structure.pools.alias.PoolAliasLookup;
 import net.minecraft.world.level.levelgen.structure.templatesystem.LiquidSettings;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -31,6 +33,9 @@ import java.util.Optional;
 @Mixin(JigsawPlacement.class)
 public class JigsawPlacementMixin {
 
+	@Unique
+	private static final Logger cobblemon$LOGGER = LoggerFactory.getLogger("Cobblemon/HeightRangeVeto");
+
 	@Inject(
 			method = "addPieces(Lnet/minecraft/world/level/levelgen/structure/Structure$GenerationContext;Lnet/minecraft/core/Holder;Ljava/util/Optional;ILnet/minecraft/core/BlockPos;ZLjava/util/Optional;ILnet/minecraft/world/level/levelgen/structure/pools/alias/PoolAliasLookup;Lnet/minecraft/world/level/levelgen/structure/pools/DimensionPadding;Lnet/minecraft/world/level/levelgen/structure/templatesystem/LiquidSettings;)Ljava/util/Optional;",
 			at = @At("RETURN"),
@@ -54,18 +59,30 @@ public class JigsawPlacementMixin {
 		if (result.isEmpty()) {
 			return;
 		}
+
 		BlockPos spawnPos = result.get().position();
-		boolean canPlace = cobblemon$canAnyStartElementPlace(context, startPool, spawnPos);
+		String poolId = startPool.unwrapKey().map(key -> key.location().toString()).orElse("unknown");
+		boolean canPlace = cobblemon$canStructurePlace(context, startPool, spawnPos);
+
+		cobblemon$LOGGER.info(
+				"[HeightRangeVeto] addPieces evaluated requestedPos={} spawnPos={} startPool={} -> canPlace={}",
+				pos, spawnPos, poolId, canPlace
+		);
 
 		if (canPlace) {
 			return;
 		}
 
+		cobblemon$LOGGER.info(
+				"[HeightRangeVeto] Vetoing structure start at {} (startPool={})",
+				spawnPos, poolId
+		);
+
 		cir.setReturnValue(Optional.empty());
 	}
 
 	@Unique
-	private static boolean cobblemon$canAnyStartElementPlace(
+	private static boolean cobblemon$canStructurePlace(
 			Structure.GenerationContext generationContext,
 			Holder<StructureTemplatePool> startPool,
 			BlockPos startPos
@@ -74,7 +91,7 @@ public class JigsawPlacementMixin {
 			Optional<HeightRangeStructureProcessor> heightRangeProcessor = cobblemon$getHeightRangeProcessor(element);
 
 			if (heightRangeProcessor.isEmpty()) {
-				return true;
+				continue;
 			}
 
 			HeightRangeStructureProcessor processor = heightRangeProcessor.get();
@@ -85,12 +102,17 @@ public class JigsawPlacementMixin {
 					startPos
 			);
 
-			if (valid) {
-				return true;
+			cobblemon$LOGGER.info(
+					"[HeightRangeVeto] template={} pos={} valid={}",
+					element, startPos, valid
+			);
+
+			if (!valid) {
+				return false;
 			}
 		}
 
-		return false;
+		return true;
 	}
 
 	@Unique

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

@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2
+
+import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.util.isBattling
+import com.cobblemon.mod.common.util.isUnderWater
+import com.cobblemon.mod.common.util.isInWater
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class ChinchouModel (root: ModelPart) : PokemonPosableModel(root) {
+    override val rootPart = root.registerChildWithAllChildren("chinchou")
+
+    override var portraitScale = 1.75F
+    override var portraitTranslation = Vec3(-0.3, -0.8, 0.0)
+
+    override var profileScale = 0.65F
+    override var profileTranslation = Vec3(-0.05, 0.45, 0.0)
+
+    lateinit var standing: CobblemonPose
+    lateinit var walk: CobblemonPose
+    lateinit var floating: CobblemonPose
+    lateinit var swimming: CobblemonPose
+    lateinit var sleep: CobblemonPose
+    lateinit var watersleep: CobblemonPose
+    lateinit var battleidle: CobblemonPose
+    lateinit var waterbattleidle: CobblemonPose
+
+//    override val cryAnimation = CryProvider { bedrockStateful("chinchou", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("chinchou", "blink")}
+        val idleQuirk = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("chinchou", "ground_quirk")}
+        val waterQuirk = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("chinchou", "water_idle_quirk")}
+
+        sleep = registerPose(
+            poseName = "sleeping",
+            poseType = PoseType.SLEEP,
+            condition = { !it.isInWater },
+            animations = arrayOf(bedrock("chinchou", "sleep"))
+        )
+
+        watersleep = registerPose(
+            poseName = "water_sleeping",
+            poseType = PoseType.SLEEP,
+            condition = { it.isInWater },
+            animations = arrayOf(bedrock("chinchou", "water_sleep"))
+        )
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.UI_POSES + PoseType.STAND,
+            transformTicks = 10,
+            condition = { !it.isBattling && !it.isInWater && !it.isUnderWater},
+            quirks = arrayOf(blink, idleQuirk),
+            animations = arrayOf(
+                bedrock("chinchou", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            transformTicks = 10,
+            poseType = PoseType.WALK,
+            condition = { !it.isInWater && !it.isUnderWater},
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("chinchou", "ground_walk")
+            )
+        )
+
+        floating = registerPose(
+            poseName = "floating",
+            transformTicks = 10,
+            poseType = PoseType.FLOAT,
+            condition = { it.isInWater },
+            quirks = arrayOf(blink, waterQuirk),
+            animations = arrayOf(
+                bedrock("chinchou", "water_idle")
+            )
+        )
+
+        swimming = registerPose(
+            poseName = "swimming",
+            transformTicks = 10,
+            condition = { it.isInWater },
+            poseTypes = PoseType.MOVING_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("chinchou", "water_swim"),
+            )
+        )
+
+        battleidle = registerPose(
+            poseName = "battle_idle",
+            poseTypes = PoseType.STATIONARY_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            condition = { it.isBattling && !it.isInWater },
+            animations = arrayOf(
+                bedrock("chinchou", "battle_idle")
+            )
+        )
+
+        waterbattleidle = registerPose(
+            poseName = "water_battle_idle",
+            poseTypes = PoseType.STATIONARY_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            condition = { it.isBattling && it.isInWater },
+            animations = arrayOf(
+                bedrock("chinchou", "water_battle_idle")
+            )
+        )
+    }
+    override fun getFaintAnimation(state: PosableState) = if (state.isPosedIn(standing, walk, battleidle, sleep)) bedrockStateful("chinchou", "faint") else if (state.isPosedIn( waterbattleidle, watersleep, floating, swimming )) bedrockStateful("chinchou", "water_faint") else null
+}

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

@@ -368,6 +368,7 @@ object VaryingModelRepository {
         inbuilt("magcargo", ::MagcargoModel)
         inbuilt("slugma_shiny", ::SlugmaShinyModel)
         inbuilt("magcargo_shiny", ::MagcargoShinyModel)
+        inbuilt("chinchou", ::ChinchouModel)
         inbuilt("clamperl", ::ClamperlModel)
         inbuilt("huntail", ::HuntailModel)
         inbuilt("gorebyss", ::GorebyssModel)

common/src/main/kotlin/com/cobblemon/mod/common/world/structureprocessors/HeightRangeStructureProcessor.kt

@@ -20,6 +20,7 @@ import net.minecraft.world.level.levelgen.RandomState
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate
+import org.slf4j.LoggerFactory
 
 class HeightRangeStructureProcessor(
 	val minOffset: Int,
@@ -43,7 +44,14 @@ class HeightRangeStructureProcessor(
 		val referenceY = reference.getY(chunkGenerator, heightAccessor, randomState, pos)
 		val minY = referenceY + minOffset
 		val maxY = referenceY + maxOffset
-		return pos.y in minY..maxY
+		val valid = pos.y in minY..maxY
+
+		LOGGER.info(
+			"[HeightRangeVeto] isValidPlacement pos={} reference={} referenceY={} minY={} maxY={} pos.y={} -> valid={}",
+			pos, reference, referenceY, minY, maxY, pos.y, valid
+		)
+
+		return valid
 	}
 
 	override fun processBlock(
@@ -105,6 +113,8 @@ class HeightRangeStructureProcessor(
 	}
 
 	companion object {
+		private val LOGGER = LoggerFactory.getLogger("Cobblemon/HeightRangeStructureProcessor")
+
 		val CODEC: MapCodec<HeightRangeStructureProcessor> = RecordCodecBuilder.mapCodec { instance ->
 			instance.group(
 				Codec.INT.fieldOf("min_offset").forGetter { it.minOffset },

common/src/main/resources/assets/cobblemon/bedrock/generic/animations/substitute.animation.json

@@ -1575,6 +1575,470 @@
 				}
 			}
 		},
+		"animation.substitute.destroy_burst": {
+			"animation_length": 3,
+			"bones": {
+				"body": {
+					"rotation": ["-0.3*Math.cos((query.anim_time-0) * 90 * 0.5+90) *0.3", 0, "0.3*Math.cos((query.anim_time-0) * 90 * 0.5) *0.3"],
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.125": [0, 0, 0],
+						"0.1667": {
+							"pre": [0, 0.25, 5],
+							"post": [0, 0.25, 5],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": [0, 0.25, 9.9],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2917": {
+							"post": [0, 0.25, 12.4],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [0, 0, 13.3],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4583": [0, 0, 13.3]
+					},
+					"scale": {
+						"0.0": {
+							"post": [1, 1, 1],
+							"lerp_mode": "catmullrom"
+						},
+						"0.0417": {
+							"post": [1, 1, 1],
+							"lerp_mode": "catmullrom"
+						},
+						"0.125": {
+							"post": [1.11, 1.05, 0.9],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [0.855, 1.025, 1.05],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [1, 1, 1],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"arm_left": {
+					"rotation": {
+						"0.0": ["-2.5-3*Math.cos((query.anim_time-0.25) * 90 * 1) *0.05", 7.5, 0],
+						"0.0833": [-2.54822, 7.5, 0],
+						"0.125": {
+							"pre": [19.95178, 10, 0],
+							"post": [19.95178, 10, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [-2.05, -90, -17],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [-21.03, -80.89, -17.09],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [32.35, -50.6, -22],
+							"lerp_mode": "catmullrom"
+						},
+						"0.625": {
+							"post": [28.45, -46.5, -26],
+							"lerp_mode": "catmullrom"
+						},
+						"0.7917": [28.45, -46.5, -26],
+						"0.9583": {
+							"pre": [32.01, -45.83, -30.71],
+							"post": [32.01, -45.83, -30.71],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [54.92, -41.5, -61],
+							"lerp_mode": "catmullrom"
+						},
+						"1.5": [54.92, -41.5, -61]
+					},
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.125": [0, 0, 0],
+						"0.1667": {
+							"pre": [0, 0.5, 0.25],
+							"post": [0, 0.5, 0.25],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": [0, 0.5, 0.25],
+						"0.3333": {
+							"pre": [0, -0.25, 0.25],
+							"post": [0, -0.25, 0.25],
+							"lerp_mode": "catmullrom"
+						},
+						"0.7917": [0, -0.25, 0.25],
+						"1.25": {
+							"pre": [0, 0, 0.25],
+							"post": [0, 0, 0.25],
+							"lerp_mode": "catmullrom"
+						},
+						"1.5": [0, 0, 0.25]
+					}
+				},
+				"tail": {
+					"rotation": {
+						"0.0": ["2.5+2*Math.cos((query.anim_time-0.5) * 90 * 1) *0.025", 0, 0],
+						"0.0833": [2.5, 0, 0],
+						"0.1667": {
+							"pre": [6, -2.5, 2.5],
+							"post": [6, -2.5, 2.5],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": [6, -2.5, 2.5],
+						"0.2917": {
+							"pre": [6.5, 0, 0],
+							"post": [6.5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [4, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [-11.8, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [-14.6, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.9583": {
+							"post": [-17.14, 0, -1.02],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": [-29.5, 0, -4.5]
+					},
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.6667": [0, 0, 0],
+						"1.25": [0, -0.3, 0]
+					}
+				},
+				"tail2": {
+					"rotation": {
+						"0.0": ["15+2*Math.cos((query.anim_time-0.75) * 90 * 1) *0.025", 0, 0],
+						"0.0417": [15.04735, 0, 0],
+						"0.125": {
+							"pre": [20, 0, 0],
+							"post": [20, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": [0, 0, 0],
+						"0.2917": {
+							"pre": [-2.95, 0, 0],
+							"post": [-2.95, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [-2.5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4583": {
+							"post": [12.5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5833": [7.5, 0, 0]
+					}
+				},
+				"leg_left": {
+					"rotation": {
+						"0.0": [5, 5, 0],
+						"0.0833": [5, 5, 0],
+						"0.125": {
+							"pre": [5, 12.5, 0],
+							"post": [5, 12.5, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2917": {
+							"post": [-7.5, -10, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4167": {
+							"post": [2.5, -7.5, -5],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": [2.5, -7.5, -5],
+						"0.6667": [2.5, -7.5, -5],
+						"1.0": {
+							"pre": [0.5, -7.5, 1.5],
+							"post": [0.5, -7.5, 1.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": [0.5, -7.5, 1.5]
+					},
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.0833": [0, 0, 0],
+						"0.4167": [0, -0.5, -0.08],
+						"1.0": [0.25, -0.75, -0.25]
+					},
+					"scale": 1
+				},
+				"leg_right": {
+					"rotation": {
+						"0.0": [5, -5, 0],
+						"0.0833": [5, -5, 0],
+						"0.125": {
+							"pre": [5, -12.5, 0],
+							"post": [5, -12.5, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2917": {
+							"post": [-7.5, 10, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4167": {
+							"post": [2.5, 7.5, 5],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": [2.5, 7.5, 5],
+						"0.6667": [2.5, 7.5, 5],
+						"1.0": {
+							"pre": [2.5, 7.5, 2.5],
+							"post": [2.5, 7.5, 2.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": [2.5, 7.5, 2.5]
+					},
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.0833": [0, 0, 0],
+						"0.4167": [0, -0.5, -0.08]
+					}
+				},
+				"arm_right": {
+					"rotation": {
+						"0.0": ["-2.5-3*Math.cos((query.anim_time-0.25) * 90 * 1) *0.05", -7.5, 0],
+						"0.0833": [-2.54822, -7.5, 0],
+						"0.125": {
+							"pre": [19.95178, -10, 0],
+							"post": [19.95178, -10, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [-2.05, 90, 17],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [-21.03, 80.89, 17.09],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [32.35, 50.6, 22],
+							"lerp_mode": "catmullrom"
+						},
+						"0.625": {
+							"post": [28.45, 46.5, 26],
+							"lerp_mode": "catmullrom"
+						},
+						"0.7917": [28.45, 46.5, 26],
+						"1.0417": {
+							"pre": [40.18, 36.5, 36.67],
+							"post": [40.18, 36.5, 36.67],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [72.42, 9, 66],
+							"lerp_mode": "catmullrom"
+						},
+						"1.5": [72.42, 9, 66]
+					},
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.125": [0, 0, 0],
+						"0.1667": {
+							"pre": [0, 0.5, 0.25],
+							"post": [0, 0.5, 0.25],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": [0, 0.5, 0.25],
+						"0.3333": {
+							"pre": [0, -0.25, 0.25],
+							"post": [0, -0.25, 0.25],
+							"lerp_mode": "catmullrom"
+						},
+						"0.7917": [0, -0.25, 0.25],
+						"1.25": {
+							"pre": [0, 0.25, 0.25],
+							"post": [0, 0.25, 0.25],
+							"lerp_mode": "catmullrom"
+						},
+						"1.5": [0, 0.25, 0.25]
+					}
+				},
+				"torso": {
+					"rotation": {
+						"0.0": {
+							"post": [3.47, 0, 1.13],
+							"lerp_mode": "catmullrom"
+						},
+						"0.0833": {
+							"post": [-7, 0.3, -2.4],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [-12, 0, -3.2],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": {
+							"post": [-2.89, 0, -1.77],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4167": {
+							"post": [3, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.7917": {
+							"post": [6.12, 0, 1.57],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [8.28, 0, 3.68],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": [15.78, 0, 4.18]
+					},
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.125": [0, 0, 0],
+						"0.25": {
+							"pre": [0, 0.25, 0.25],
+							"post": [0, 0.25, 0.25],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2917": {
+							"post": [0, 0.15, 0.15],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": [0, 0, 0],
+						"0.6667": [0, 0, 0],
+						"0.7917": [0, 0, 0],
+						"0.9167": {
+							"pre": [0.05, 0, 0],
+							"post": [0.05, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": [0.25, -0.6, 0]
+					},
+					"scale": {
+						"0.0": [1, 1, 1],
+						"0.875": [1, 1, 1],
+						"1.1667": {
+							"pre": [1, 0.92, 1],
+							"post": [1, 0.92, 1],
+							"lerp_mode": "catmullrom"
+						},
+						"1.5": {
+							"post": [1, 0.92, 1],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"head": {
+					"relative_to": {
+						"rotation": "entity"
+					},
+					"rotation": {
+						"0.0": [0, 0, 0.01],
+						"0.0833": {
+							"pre": [12.17, 0, 5.33],
+							"post": [12.17, 0, 5.33],
+							"lerp_mode": "catmullrom"
+						},
+						"0.125": {
+							"post": [-7.5, 2.5, 7.5],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [-5, "5-2*math.sin(q.anim_time*90*20+60)", "12.5+1*math.sin(q.anim_time*90*40+60)"],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.0833": {
+							"pre": [0, 0, 0.5],
+							"post": [0, 0, 0.5],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": [0, 0.5, 0.5],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": [0, 0, 0]
+					},
+					"scale": {
+						"0.0": [1, 1, 1],
+						"0.0833": {
+							"pre": [1.05, 0.9, 1.05],
+							"post": [1.05, 0.9, 1.05],
+							"lerp_mode": "catmullrom"
+						},
+						"0.125": [0.95, 1.2, 0.95],
+						"0.1667": [0, 0, 0]
+					}
+				},
+				"stuffing_neck": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.2083": {"pre": [0, 0, 0], "post": [0, 0.3, 0]}
+					}
+				},
+				"locator_neck_fluff": {
+					"rotation": [-180, 0, 0]
+				},
+				"stuffing_shoulder_left": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.2083": {"pre": [0, 0, 0], "post": [0.25, 0, 0]}
+					}
+				},
+				"stuffing_arm_left": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.2083": {"pre": [0, 0, 0], "post": [-0.25, 0, 0]}
+					}
+				},
+				"stuffing_arm_right": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.2083": {"pre": [0, 0, 0], "post": [0.25, 0, 0]}
+					}
+				},
+				"stuffing_shoulder_right": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.2083": {"pre": [0, 0, 0], "post": [-0.25, 0, 0]}
+					}
+				}
+			},
+			"particle_effects": {
+				"0.1667": {
+					"effect": "substitute_fluff",
+					"locator": "neck_fluff"
+				}
+			}
+		},
 		"animation.substitute.flop_WIP": {
 			"animation_length": 1.5,
 			"bones": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0016_pidgey/pidgey.animation.json

@@ -1222,7 +1222,7 @@
 					"position": [0, 0, "-0.2+math.cos(q.anim_time*90*16/3*2)*0.3"]
 				},
 				"hair2": {
-					"rotation": ["-1-math.cos(q.anim_time*90*16/3*2+30)*6", 0, 0]
+					"rotation": ["-2.5-math.cos(q.anim_time*90*16/3*2+30)*9", 0, 0]
 				},
 				"wings_closed": {
 					"rotation": ["-math.cos(q.anim_time*90*16/3*2-45)*2", 0, "math.sin(q.anim_time*90*16/3)*-1"]
@@ -1462,6 +1462,9 @@
 			"bones": {
 				"pidgey": {
 					"position": [0, 0, "20-q.anim_time*16*0.95"]
+				},
+				"head": {
+					"position": [0, 0, -0.1]
 				}
 			}
 		},

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

@@ -152,9 +152,6 @@
 				},
 				"claw_outer_right": {
 					"rotation": [10, 0, 0]
-				},
-				"wings_open": {
-					"scale": 0
 				}
 			}
 		},

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0018_pidgeot/pidgeot.animation.json

@@ -207,9 +207,6 @@
 				},
 				"seat_1": {
 					"rotation": [22.5, 0, 0]
-				},
-				"wings_open": {
-					"scale": 0
 				}
 			}
 		},
@@ -1811,9 +1808,6 @@
 				},
 				"seat_1": {
 					"rotation": [22.5, 0, 0]
-				},
-				"wings_open": {
-					"scale": 0
 				}
 			}
 		},
@@ -2023,9 +2017,6 @@
 				},
 				"seat_1": {
 					"rotation": [22.5, 0, 0]
-				},
-				"wings_open": {
-					"scale": 0
 				}
 			}
 		},
@@ -3627,9 +3618,6 @@
 				},
 				"seat_1": {
 					"rotation": [22.5, 0, 0]
-				},
-				"wings_open": {
-					"scale": 0
 				}
 			}
 		},
@@ -4938,14 +4926,8 @@
 					},
 					"scale": {
 						"0.0": [0, 0, 0],
-						"0.24": {
-							"pre": [0, 0, 0],
-							"post": [1, 1, 1]
-						},
-						"2.12": {
-							"pre": [1, 1, 1],
-							"post": [0, 0, 0]
-						}
+						"0.24": {"pre": [0, 0, 0], "post": [1, 1, 1]},
+						"2.12": {"pre": [1, 1, 1], "post": [0, 0, 0]}
 					}
 				},
 				"wing_open_left2": {
@@ -5637,27 +5619,15 @@
 				"pupil_left": {
 					"position": {
 						"0.0": [-0.25, 0, 0],
-						"0.4": {
-							"pre": [-0.25, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"1.4": {
-							"pre": [0, 0, 0],
-							"post": [-0.25, 0, 0]
-						}
+						"0.4": {"pre": [-0.25, 0, 0], "post": [0, 0, 0]},
+						"1.4": {"pre": [0, 0, 0], "post": [-0.25, 0, 0]}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.32": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, -0.1]
-						},
-						"1.4": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.32": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
+						"1.4": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"jaw": {
@@ -5928,14 +5898,8 @@
 					},
 					"scale": {
 						"0.0": [1, 1, 1],
-						"0.24": {
-							"pre": [1, 1, 1],
-							"post": [0, 0, 0]
-						},
-						"2.12": {
-							"pre": [0, 0, 0],
-							"post": [1, 1, 1]
-						}
+						"0.24": {"pre": [1, 1, 1], "post": [0, 0, 0]},
+						"2.12": {"pre": [0, 0, 0], "post": [1, 1, 1]}
 					}
 				},
 				"wing_closed_left1": {
@@ -6177,27 +6141,15 @@
 				"pupil_right": {
 					"position": {
 						"0.0": [-0.65, 0, 0],
-						"0.4": {
-							"pre": [-0.65, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"1.4": {
-							"pre": [0, 0, 0],
-							"post": [-0.65, 0, 0]
-						}
+						"0.4": {"pre": [-0.65, 0, 0], "post": [0, 0, 0]},
+						"1.4": {"pre": [0, 0, 0], "post": [-0.65, 0, 0]}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.32": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, -0.1]
-						},
-						"1.4": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.32": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
+						"1.4": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"head_angle": {
@@ -6209,69 +6161,33 @@
 				"eyes_ditto": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.32": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0.1]
-						},
-						"1.4": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
+						"0.32": {"pre": [0, 0, 0], "post": [0, 0, 0.1]},
+						"1.4": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
 					}
 				},
 				"eyes_blink_ditto": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.32": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.1]
-						},
-						"1.4": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.32": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.4": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"mouth_ditto": {
 					"scale": {
 						"0.92": [1, 1, 1],
-						"1.32": {
-							"pre": [1, 1, 1],
-							"post": [0, 0, 0]
-						},
-						"1.68": {
-							"pre": [0, 0, 0],
-							"post": [1, 1, 1]
-						},
-						"1.76": {
-							"pre": [1, 1, 1],
-							"post": [0, 0, 0]
-						},
-						"2.04": {
-							"pre": [0, 0, 0],
-							"post": [1, 1, 1]
-						}
+						"1.32": {"pre": [1, 1, 1], "post": [0, 0, 0]},
+						"1.68": {"pre": [0, 0, 0], "post": [1, 1, 1]},
+						"1.76": {"pre": [1, 1, 1], "post": [0, 0, 0]},
+						"2.04": {"pre": [0, 0, 0], "post": [1, 1, 1]}
 					}
 				},
 				"mouth_open_ditto": {
 					"position": {
 						"0.92": [0, 0, 0],
-						"1.32": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.1]
-						},
-						"1.68": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						},
-						"1.76": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.1]
-						},
-						"2.04": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"1.32": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.68": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.76": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.04": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"seat_1": {
@@ -6582,14 +6498,8 @@
 					},
 					"scale": {
 						"0.0": [0, 0, 0],
-						"0.24": {
-							"pre": [0, 0, 0],
-							"post": [1, 1, 1]
-						},
-						"2.12": {
-							"pre": [1, 1, 1],
-							"post": [0, 0, 0]
-						}
+						"0.24": {"pre": [0, 0, 0], "post": [1, 1, 1]},
+						"2.12": {"pre": [1, 1, 1], "post": [0, 0, 0]}
 					}
 				},
 				"wing_open_left2": {
@@ -7281,27 +7191,15 @@
 				"pupil_left": {
 					"position": {
 						"0.0": [-0.25, 0, 0],
-						"0.4": {
-							"pre": [-0.25, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"1.4": {
-							"pre": [0, 0, 0],
-							"post": [-0.25, 0, 0]
-						}
+						"0.4": {"pre": [-0.25, 0, 0], "post": [0, 0, 0]},
+						"1.4": {"pre": [0, 0, 0], "post": [-0.25, 0, 0]}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.32": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, -0.1]
-						},
-						"1.4": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.32": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
+						"1.4": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"hair2": {
@@ -7549,14 +7447,8 @@
 					},
 					"scale": {
 						"0.0": [1, 1, 1],
-						"0.24": {
-							"pre": [1, 1, 1],
-							"post": [0, 0, 0]
-						},
-						"2.12": {
-							"pre": [0, 0, 0],
-							"post": [1, 1, 1]
-						}
+						"0.24": {"pre": [1, 1, 1], "post": [0, 0, 0]},
+						"2.12": {"pre": [0, 0, 0], "post": [1, 1, 1]}
 					}
 				},
 				"wing_closed_left1": {
@@ -7798,27 +7690,15 @@
 				"pupil_right": {
 					"position": {
 						"0.0": [-0.65, 0, 0],
-						"0.4": {
-							"pre": [-0.65, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"1.4": {
-							"pre": [0, 0, 0],
-							"post": [-0.65, 0, 0]
-						}
+						"0.4": {"pre": [-0.65, 0, 0], "post": [0, 0, 0]},
+						"1.4": {"pre": [0, 0, 0], "post": [-0.65, 0, 0]}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.32": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, -0.1]
-						},
-						"1.4": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.32": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
+						"1.4": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"head_angle": {
@@ -7830,53 +7710,29 @@
 				"eyes_ditto": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.32": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0.1]
-						},
-						"1.4": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
+						"0.32": {"pre": [0, 0, 0], "post": [0, 0, 0.1]},
+						"1.4": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
 					}
 				},
 				"eyes_blink_ditto": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.32": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.1]
-						},
-						"1.4": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.32": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.4": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"mouth_ditto": {
 					"scale": {
 						"0.92": [1, 1, 1],
-						"1.32": {
-							"pre": [1, 1, 1],
-							"post": [0, 0, 0]
-						},
-						"2.04": {
-							"pre": [0, 0, 0],
-							"post": [1, 1, 1]
-						}
+						"1.32": {"pre": [1, 1, 1], "post": [0, 0, 0]},
+						"2.04": {"pre": [0, 0, 0], "post": [1, 1, 1]}
 					}
 				},
 				"mouth_open_ditto": {
 					"position": {
 						"0.92": [0, 0, 0],
-						"1.32": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.1]
-						},
-						"2.04": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"1.32": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.04": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"seat_1": {
@@ -12932,43 +12788,19 @@
 				"mouth_ditto": {
 					"scale": {
 						"0.0": [1, 1, 1],
-						"0.4167": {
-							"pre": [1, 1, 1],
-							"post": [0, 0, 0]
-						},
-						"0.75": {
-							"pre": [0, 0, 0],
-							"post": [1, 1, 1]
-						},
-						"0.8333": {
-							"pre": [1, 1, 1],
-							"post": [0, 0, 0]
-						},
-						"1.125": {
-							"pre": [0, 0, 0],
-							"post": [1, 1, 1]
-						}
+						"0.4167": {"pre": [1, 1, 1], "post": [0, 0, 0]},
+						"0.75": {"pre": [0, 0, 0], "post": [1, 1, 1]},
+						"0.8333": {"pre": [1, 1, 1], "post": [0, 0, 0]},
+						"1.125": {"pre": [0, 0, 0], "post": [1, 1, 1]}
 					}
 				},
 				"mouth_open_ditto": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.4167": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.1]
-						},
-						"0.75": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						},
-						"0.8333": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.1]
-						},
-						"1.125": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.4167": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.75": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.8333": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.125": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
 					}
 				}
 			},
@@ -13072,10 +12904,7 @@
 				"eyelid_left": {
 					"position": {
 						"0.0": [0.1, 0, -0.1],
-						"0.2083": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.2083": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"jaw": {
@@ -13356,10 +13185,7 @@
 				"eyelid_right": {
 					"position": {
 						"0.0": [-0.1, 0, -0.1],
-						"0.2083": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.2083": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"wings": {
@@ -13385,19 +13211,13 @@
 				"eyes_ditto": {
 					"position": {
 						"0.0": [0, 0, 0.1],
-						"0.2083": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
+						"0.2083": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
 					}
 				},
 				"eyes_blink_ditto": {
 					"position": {
 						"0.0": [0, 0, -0.1],
-						"0.2083": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.2083": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
 					}
 				}
 			}
@@ -13408,37 +13228,25 @@
 				"eyelid_left": {
 					"position": {
 						"0.0": [0.1, 0, -0.1],
-						"0.2083": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.2083": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [-0.1, 0, -0.1],
-						"0.2083": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.2083": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"eyes_ditto": {
 					"position": {
 						"0.0": [0, 0, 0.1],
-						"0.2083": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
+						"0.2083": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
 					}
 				},
 				"eyes_blink_ditto": {
 					"position": {
 						"0.0": [0, 0, -0.1],
-						"0.2083": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.2083": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
 					}
 				}
 			}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0170_chinchou/chinchou.animation.json

@@ -162,7 +162,7 @@
 		},
 		"animation.chinchou.ground_walk": {
 			"loop": true,
-			"animation_length": 0.7917,
+			"animation_length": 0.79167,
 			"bones": {
 				"stem_left": {
 					"rotation": ["73.8265-0.5*math.sin(q.anim_time*90*10-30)*1", "-21.6937-3*math.sin(q.anim_time*90*5-150)*1", 6.1191]
@@ -2294,7 +2294,7 @@
 			}
 		},
 		"animation.chinchou.water_idle_quirk": {
-			"animation_length": 3.7917,
+			"animation_length": 3.79167,
 			"bones": {
 				"body": {
 					"rotation": {
@@ -2754,7 +2754,7 @@
 			}
 		},
 		"animation.chinchou.blink": {
-			"animation_length": 0.1667,
+			"animation_length": 0.16667,
 			"bones": {
 				"eyelid_left": {
 					"position": {
@@ -2879,10 +2879,29 @@
 						"1.25": [0, 0, 0]
 					}
 				}
-			},
-			"sound_effects": {
-				"0.0833": {
-					"effect": "pokemon.chinchou.cry"
+			}
+		},
+		"animation.chinchou.ground_walk speed test": {
+			"loop": true,
+			"bones": {
+				"chinchou": {
+					"position": [0, 0, "-q.anim_time*90*0.12"]
+				}
+			}
+		},
+		"animation.chinchou.ground_run speed test": {
+			"loop": true,
+			"bones": {
+				"chinchou": {
+					"position": [0, 0, "-q.anim_time*90*0.2"]
+				}
+			}
+		},
+		"animation.chinchou.water_swim speed test": {
+			"loop": true,
+			"bones": {
+				"chinchou": {
+					"position": [0, 0, "-q.anim_time*90*0.2"]
 				}
 			}
 		}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0376_metagross/metagross.animation.json

@@ -3,7 +3,7 @@
 	"animations": {
 		"animation.metagross.ground_idle": {
 			"loop": true,
-			"animation_length": 8,
+			"animation_length": 0,
 			"bones": {
 				"body2": {
 					"position": [0, -11.9, 0]
@@ -54,7 +54,8 @@
 				},
 				"torso": {
 					"rotation": {
-						"0.0": ["2+1*math.sin(q.anim_time*90*0.5)", "0.1*math.sin(q.anim_time*90*1-60)", "0.1*math.sin(q.anim_time*90*2-60)"]
+						"0.0": ["2+1*math.sin(q.anim_time*90*0.5)", "0.1*math.sin(q.anim_time*90*1-60)", "0.1*math.sin(q.anim_time*90*2-60)"],
+						"11.4167": ["2.5796+1*math.sin(q.anim_time*90*0.5)", "0.3148+0.1*math.sin(q.anim_time*90*1-60)", "2.4153+0.1*math.sin(q.anim_time*90*2-60)"]
 					},
 					"position": [0, "0.2*math.sin(q.anim_time*90*0.5-60)", 0]
 				}

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

@@ -74,19 +74,14 @@
 					"name": "neck",
 					"parent": "torso2",
 					"pivot": [0, 5.25, -7.5],
-					"rotation": [52.5, 0, 0]
-				},
-				{
-					"name": "neck_ai",
-					"parent": "neck",
-					"pivot": [0, 5.25, -7.5],
+					"rotation": [52.5, 0, 0],
 					"cubes": [
 						{"origin": [-2.5, 4.75, -9], "size": [5, 5, 5], "inflate": -0.01, "uv": [22, 32]}
 					]
 				},
 				{
 					"name": "head",
-					"parent": "neck_ai",
+					"parent": "neck",
 					"pivot": [0, 10, -6.5]
 				},
 				{

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0018_pidgeot/pidgeot.geo.json

@@ -26,9 +26,9 @@
 				{
 					"name": "locator_root",
 					"parent": "pidgeot",
-					"pivot": [0, 0, 0],
+					"pivot": [0, 32, 0],
 					"locators": {
-						"root": [0, 0, 0]
+						"root": [0, 32, 0]
 					}
 				},
 				{

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0523_zebstrika/zebstrika.geo.json

@@ -69,9 +69,9 @@
 				{
 					"name": "locator_seat_1",
 					"parent": "torso",
-					"pivot": [0, 22, 2],
+					"pivot": [0, 25, 2],
 					"locators": {
-						"seat_1": [0, 22, 2]
+						"seat_1": [0, 25, 2]
 					}
 				},
 				{

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0781_dhelmise/dhelmise.geo.json

@@ -119,8 +119,8 @@
 					"cubes": [
 						{"origin": [19, 50, 0], "size": [2, 2, 2], "inflate": 0.01, "uv": [0, 45]},
 						{"origin": [21, 49.5, -0.5], "size": [8, 3, 3], "inflate": 0.01, "uv": [8, 45]},
-						{"origin": [-21, 50, 0], "size": [2, 2, 2], "inflate": 0.01, "uv": [0, 49], "mirror": true},
-						{"origin": [-29, 49.5, -0.5], "size": [8, 3, 3], "inflate": 0.01, "uv": [8, 51], "mirror": true},
+						{"origin": [-21, 50, 0], "size": [2, 2, 2], "inflate": 0.01, "pivot": [0, 51, 3.5], "rotation": [0, 0, 0], "uv": [0, 49], "mirror": true},
+						{"origin": [-29, 49.5, -0.5], "size": [8, 3, 3], "inflate": 0.01, "pivot": [0, 51, 3], "rotation": [0, 0, 0], "uv": [8, 51], "mirror": true},
 						{"origin": [18, 50, 0], "size": [2, 2, 2], "inflate": 0.01, "pivot": [0, 51, 3], "rotation": [0, 0, -55], "uv": [0, 53]},
 						{"origin": [-20, 50, 0], "size": [2, 2, 2], "inflate": 0.01, "pivot": [0, 51, 3.5], "rotation": [0, 0, 55], "uv": [30, 43], "mirror": true},
 						{"origin": [-28, 49.5, -0.5], "size": [8, 3, 3], "inflate": 0.01, "pivot": [0, 51, 3], "rotation": [0, 0, 55], "uv": [58, 46], "mirror": true},
@@ -447,6 +447,14 @@
 					"cubes": [
 						{"origin": [0, -24.5, -8], "size": [0, 12, 7], "uv": [98, 109]}
 					]
+				},
+				{
+					"name": "locator_seat_1",
+					"parent": "body",
+					"pivot": [0, 54, -10],
+					"locators": {
+						"seat_1": [0, 54, -10]
+					}
 				}
 			]
 		}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0016_pidgey/pidgey.json

@@ -12,8 +12,7 @@
     "standing": {
       "poseTypes": ["PORTRAIT", "PROFILE", "STAND", "NONE"],
       "animations": [
-        "q.look('neck', 1, 1, 35, -12.5, 7.5, -7.5)",
-        "q.look('head_ai', 1, 1, 1.5, -12.5, 2.5, -2.5)",
+        "q.look('head_ai')",
         "q.bedrock('pidgey', 'ground_idle')"
       ],
       "transformedParts": [
@@ -42,8 +41,7 @@
     "walk": {
       "poseTypes": ["WALK"],
       "animations": [
-        "q.look('neck', 1, 1, 35, -12.5, 7.5, -7.5)",
-        "q.look('head_ai', 1, 1, 1.5, -12.5, 2.5, -2.5)",
+        "q.look('head_ai')",
         "q.bedrock('pidgey', 'ground_walk')"
       ],
       "transformedParts": [
@@ -72,8 +70,7 @@
       "poseTypes": ["HOVER", "FLOAT"],
       "animations": [
         "q.pitch_tilt('body')",
-        "q.look('neck', 1, 1, 35, -12.5, 7.5, -7.5)",
-        "q.look('head_ai', 1, 1, 1.5, -12.5, 2.5, -2.5)",
+        "q.look('head_ai')",
         "q.bedrock('pidgey', 'air_idle')"
       ],
       "transformedParts": [
@@ -185,8 +182,7 @@
     "shoulder_left": {
       "poseTypes": ["SHOULDER_LEFT"],
       "animations": [
-        "q.look('neck', 1, 1, 35, -12.5, 7.5, -7.5)",
-        "q.look('head_ai', 1, 1, 1.5, -12.5, 2.5, -2.5)",
+        "q.look('head_ai')",
         "q.bedrock('pidgey', 'shoulder_left')"],
       "quirks": ["q.bedrock_quirk('pidgey', 'blink')"],
       "transformedParts": [
@@ -215,8 +211,7 @@
     "shoulder_right": {
       "poseTypes": ["SHOULDER_RIGHT"],
       "animations": [
-        "q.look('neck', 1, 1, 35, -12.5, 7.5, -7.5)",
-        "q.look('head_ai', 1, 1, 1.5, -12.5, 2.5, -2.5)",
+        "q.look('head_ai')",
         "q.bedrock('pidgey', 'shoulder_right')"],
       "quirks": ["q.bedrock_quirk('pidgey', 'blink')"],
       "transformedParts": [

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

@@ -18,10 +18,27 @@
     "standing": {
       "poseTypes": ["PORTRAIT", "PROFILE", "STAND", "NONE"],
       "animations": [
-        "q.look('neck_ai', 1, 1, 30, -20, 7.5, -7.5)",
-        "q.look('head_ai', 1, 1, 3.5, -7.5, 1.5, -1.5)",
+        "q.look('head_ai')",
         "q.bedrock('pidgeotto', 'ground_idle')"
       ],
+      "transformedParts": [
+        {
+          "part": "wing_open_left",
+          "isVisible": false
+        },
+        {
+          "part": "wing_open_right",
+          "isVisible": false
+        },
+        {
+          "part": "wing_closed_left",
+          "isVisible": true
+        },
+        {
+          "part": "wing_closed_right",
+          "isVisible": true
+        }
+      ],
       "quirks": [
         "q.bedrock_quirk('pidgeotto', 'blink')",
         "q.bedrock_primary_quirk('pidgeotto', 'ground_quirk', 10, 30, 1, q.curve('symmetrical'))"
@@ -30,8 +47,7 @@
     "walk": {
       "poseTypes": ["WALK"],
       "animations": [
-        "q.look('neck_ai', 1, 1, 30, -20, 7.5, -7.5)",
-        "q.look('head_ai', 1, 1, 3.5, -7.5, 1.5, -1.5)",
+        "q.look('head_ai')",
         "q.bedrock('pidgeotto', 'ground_walk')"
       ],
       "transformedParts": [
@@ -60,8 +76,7 @@
       "poseTypes": ["HOVER", "FLOAT"],
       "animations": [
         "q.pitch_tilt('body')",
-        "q.look('neck_ai', 1, 1, 30, -20, 7.5, -7.5)",
-        "q.look('head_ai', 1, 1, 3.5, -7.5, 1.5, -1.5)",
+        "q.look('head_ai')",
         "q.bedrock('pidgeotto', 'air_idle')"
       ],
       "transformedParts": [

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0018_pidgeot/pidgeot.json

@@ -24,9 +24,8 @@
       "isBattle": false,
       "condition": "!q.is_ridden",
       "animations": [
-        "q.look('neck2', 1, 1, 12.5, -15, 10, -10)",
-        "q.look('head_ai', 1, 1, 1, -7.5, 2.5, -2.5)",
-        "q.look('hair3', -1, 1, 10, -20, 0, 0)",
+        "q.look('head_ai')",
+        "q.look('hair3', -1, 1, 30, -60, 0, 0)",
         "q.bedrock('pidgeot', 'ground_idle')"
       ],
       "transformedParts": [
@@ -55,14 +54,31 @@
       "poseTypes": ["STAND"],
       "isBattle": true,
       "animations": [
-        "q.look('neck2', 1, 1, 12.5, -15, 10, -10)",
-        "q.look('head_ai', 1, 1, 1, -7.5, 2.5, -2.5)",
-        "q.look('hair3', -1, 1, 10, -20, 0, 0)",
+        "q.look('head_ai')",
+        "q.look('hair3', -1, 1, 30, -60, 0, 0)",
         "q.bedrock('pidgeot', 'battle_idle')"
       ],
       "namedAnimations": {
         "cry": "q.bedrock_primary('pidgeot', 'battle_cry', q.curve('symmetrical_wide'))"
       },
+      "transformedParts": [
+        {
+          "part": "wing_open_left",
+          "isVisible": false
+        },
+        {
+          "part": "wing_open_right",
+          "isVisible": false
+        },
+        {
+          "part": "wing_closed_left",
+          "isVisible": true
+        },
+        {
+          "part": "wing_closed_right",
+          "isVisible": true
+        }
+      ],
       "quirks": [
         "q.bedrock_quirk('pidgeot', 'blink')"
       ]
@@ -71,9 +87,8 @@
       "poseTypes": ["WALK"],
       "condition": "!q.is_ridden",
       "animations": [
-        "q.look('neck2', 1, 1, 12.5, -15, 10, -10)",
-        "q.look('head_ai', 1, 1, 1, -7.5, 2.5, -2.5)",
-        "q.look('hair3', -1, 1, 10, -20, 0, 0)",
+        "q.look('head_ai')",
+        "q.look('hair3', -1, 1, 30, -60, 0, 0)",
         "q.bedrock('pidgeot', 'ground_walk')"
       ],
       "transformedParts": [
@@ -103,9 +118,8 @@
       "condition": "!q.is_ridden",
       "animations": [
         "q.pitch_tilt('body')",
-        "q.look('neck2', 1, 1, 12.5, -15, 10, -10)",
-        "q.look('head_ai', 1, 1, 1, -7.5, 2.5, -2.5)",
-        "q.look('hair3', -1, 1, 10, -20, 0, 0)",
+        "q.look('head_ai')",
+        "q.look('hair3', -1, 1, 30, -60, 0, 0)",
         "q.bedrock('pidgeot', 'air_idle')"
       ],
       "transformedParts": [
@@ -249,9 +263,8 @@
       "poseTypes": ["STAND"],
       "isBattle": false,
       "animations": [
-        "q.look('neck2', 1, 1, 12.5, -15, 10, -10)",
-        "q.look('head_ai', 1, 1, 1, -7.5, 2.5, -2.5)",
-        "q.look('hair3', -1, 1, 10, -20, 0, 0)",
+        "q.look('head_ai')",
+        "q.look('hair3', -1, 1, 30, -60, 0, 0)",
         "q.bedrock('pidgeot', 'mount_ground_idle')"
       ],
       "condition": "q.has_entity && q.is_ridden && !q.in_air",
@@ -280,9 +293,8 @@
       "isBattle": false,
       "condition": "q.is_ridden && !q.is_air && q.has_entity",
       "animations": [
-        "q.look('neck2', 1, 1, 12.5, -15, 10, -10)",
-        "q.look('head_ai', 1, 1, 1, -7.5, 2.5, -2.5)",
-        "q.look('hair3', -1, 1, 10, -20, 0, 0)",
+        "q.look('head_ai')",
+        "q.look('hair3', -1, 1, 30, -60, 0, 0)",
         "q.bedrock('pidgeot', 'ride_ground_walk')",
         "q.bedrock('pidgeot', 'mount_ground_walk')"
       ],
@@ -310,9 +322,8 @@
       "poseTypes": ["HOVER"],
       "condition": "!q.is_gliding && q.is_ridden && q.has_entity",
       "animations": [
-        "q.look('neck2', 1, 1, 12.5, -15, 10, -10)",
-        "q.look('head_ai', 1, 1, 1, -7.5, 2.5, -2.5)",
-        "q.look('hair3', -1, 1, 10, -20, 0, 0)",
+        "q.look('head_ai')",
+        "q.look('hair3', -1, 1, 30, -60, 0, 0)",
         "q.bedrock('pidgeot', 'ride_air_idle')",
         "q.bedrock('pidgeot', 'mount_air_idle')"
       ],
@@ -342,9 +353,8 @@
       "poseTypes": ["FLY"],
       "condition": "!q.is_gliding && q.is_ridden && q.has_entity",
       "animations": [
-        "q.look('neck2', 1, 1, 12.5, -15, 10, -10)",
-        "q.look('head_ai', 1, 1, 1, -7.5, 2.5, -2.5)",
-        "q.look('hair3', -1, 1, 10, -20, 0, 0)",
+        "q.look('head_ai')",
+        "q.look('hair3', -1, 1, 30, -60, 0, 0)",
         "q.bedrock('pidgeot', 'ride_air_fly')",
         "q.bedrock('pidgeot', 'mount_air_fly')"
       ],
@@ -375,9 +385,8 @@
       "condition": "q.is_gliding",
       "isBattle": false,
       "animations": [
-        "q.look('neck2', 1, 1, 12.5, -15, 10, -10)",
-        "q.look('head_ai', 1, 1, 1, -7.5, 2.5, -2.5)",
-        "q.look('hair3', -1, 1, 10, -20, 0, 0)",
+        "q.look('head_ai')",
+        "q.look('hair3', -1, 1, 30, -60, 0, 0)",
         "q.bedrock('pidgeot', 'air_glide')",
         {
           "condition": "q.is_ridden",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0142_aerodactyl/aerodactyl.json

@@ -24,8 +24,7 @@
       "poseTypes": ["STAND"],
       "isBattle": true,
       "animations": [
-        "q.look('neck', 1, 1, 25, -20, 20, -20)",
-        "q.look('head', 1, 1, 22.5, -10, 15, -15)",
+        "q.look('head_ai')",
         "q.bedrock('aerodactyl', 'battle_idle')"
       ],
       "quirks": [
@@ -39,8 +38,7 @@
       "poseTypes": ["HOVER"],
       "isBattle": true,
       "animations": [
-        "q.look('neck', 1, 1, 25, -20, 20, -20)",
-        "q.look('head', 1, 1, 22.5, -10, 15, -15)",
+        "q.look('head_ai')",
         "q.bedrock('aerodactyl', 'battle_air_idle')"
       ],
       "quirks": [
@@ -55,8 +53,7 @@
       "condition": "q.has_entity ? !q.in_air : 1.0",
       "isBattle": false,
       "animations": [
-        "q.look('neck', 1, 1, 25, -20, 20, -20)",
-        "q.look('head', 1, 1, 22.5, -10, 15, -15)",
+        "q.look('head_ai')",
         "q.bedrock('aerodactyl', 'ground_idle')",
         {
           "condition": "q.is_ridden",
@@ -80,8 +77,7 @@
       "poseTypes": ["WALK", "SWIM"],
       "condition": "q.has_entity ? !q.in_air && !q.is_sprinting : 1.0",
       "animations": [
-        "q.look('neck', 1, 1, 25, -20, 20, -20)",
-        "q.look('head', 1, 1, 22.5, -10, 15, -15)",
+        "q.look('head_ai')",
         "q.bedrock('aerodactyl', 'ground_walk')",
         {
           "condition": "q.is_ridden",
@@ -94,8 +90,7 @@
       "poseTypes": ["WALK", "SWIM"],
       "condition": "q.has_entity ? !q.in_air && q.is_sprinting : 0.0",
       "animations": [
-        "q.look('neck', 1, 1, 25, -20, 20, -20)",
-        "q.look('head', 1, 1, 22.5, -10, 15, -15)",
+        "q.look('head_ai')",
         "q.bedrock('aerodactyl', 'ground_run')",
         {
           "condition": "q.is_ridden",
@@ -111,8 +106,7 @@
       "isBattle": false,
       "condition": "!q.is_ridden",
       "animations": [
-        "q.look('neck', 1, 1, 25, -20, 20, -20)",
-        "q.look('head', 1, 1, 22.5, -10, 15, -15)",
+        "q.look('head_ai')",
         "q.bedrock('aerodactyl', 'air_idle')"
       ],
       "quirks": [
@@ -124,8 +118,7 @@
       "isBattle": false,
       "condition": "q.is_ridden",
       "animations": [
-        "q.look('neck', 1, 1, 25, -20, 20, -20)",
-        "q.look('head', 1, 1, 22.5, -10, 15, -15)",
+        "q.look('head_ai')",
         "q.bedrock('aerodactyl', 'air_idle')"
       ],
       "quirks": [
@@ -138,8 +131,7 @@
       "isBattle": false,
       "condition": "!q.is_gliding && !q.is_ridden",
       "animations": [
-        "q.look('neck', 1, 1, 25, -20, 20, -20)",
-        "q.look('head', 1, 1, 22.5, -10, 15, -15)",
+        "q.look('head_ai')",
         "q.bedrock('aerodactyl', 'air_fly')"
       ],
       "quirks": [
@@ -151,8 +143,7 @@
       "isBattle": false,
       "condition": "!q.is_gliding && q.is_ridden",
       "animations": [
-        "q.look('neck', 1, 1, 25, -20, 20, -20)",
-        "q.look('head', 1, 1, 22.5, -10, 15, -15)",
+        "q.look('head_ai')",
         "q.bedrock('aerodactyl', 'air_fly')",
         "q.bedrock('aerodactyl', 'ride_air_fly')"
       ],
@@ -166,8 +157,7 @@
       "isBattle": false,
       "condition": "q.is_gliding",
       "animations": [
-        "q.look('neck', 1, 1, 25, -20, 20, -20)",
-        "q.look('head', 1, 1, 22.5, -10, 15, -15)",
+        "q.look('head_ai')",
         "q.bedrock('aerodactyl', 'air_glide')",
         "q.bedrock('aerodactyl', 'air_dive')",
         {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0170_chinchou/chinchou.json

@@ -1,88 +0,0 @@
-{
-	"portraitScale": 1.75,
-	"portraitTranslation": [-0.3, -0.8, 0],
-	"profileScale": 0.65,
-	"profileTranslation": [-0.05, 0.45, 0],
-	"rootBone": "chinchou",
-	"animations": {
-	  "cry": "q.bedrock_stateful('chinchou', 'cry')"
-	},
-	"poses": {
-	  "portrait": {
-		 "poseTypes": ["PORTRAIT", "PROFILE"],
-		 "animations": ["q.bedrock('chinchou', 'water_idle')"]
-	  },
-	  "battle-standing": {
-		 "poseTypes": ["STAND"],
-		 "isBattle": true,
-		 "animations": ["q.bedrock('chinchou', 'battle_idle')"],
-		 "quirks": [
-			"q.bedrock_quirk('chinchou', 'blink')"
-		]
-	  },
-	  "water-battle-standing": {
-		 "poseTypes": ["FLOAT"],
-		 "isBattle": true,
-		 "animations": ["q.bedrock('chinchou', 'water_battle_idle')"],
-		 "namedAnimations": {
-			"faint": "q.bedrock('chinchou', 'water_faint', q.curve('one'))"
-		 },
-		 "quirks": [
-			"q.bedrock_quirk('chinchou', 'blink')"
-		]
-	  },
-	  "standing": {
-		 "poseTypes": ["STAND", "NONE"],
-		 "isTouchingWater": false,
-		 "animations": ["q.bedrock('chinchou', 'ground_idle')"],
-		 "quirks": [
-			"q.bedrock_quirk('chinchou', 'blink')",
-			"q.bedrock_quirk('chinchou', 'ground_quirk')"
-		]
-	  },
-	  "walking": {
-		 "poseTypes": ["WALK"],
-		 "isTouchingWater": false,
-		 "animations": ["q.bedrock('chinchou', 'water_swim')"],
-		 "quirks": [
-			"q.bedrock_quirk('chinchou', 'blink')"
-		]
-	  },
-	  "floating": {
-		 "poseTypes": ["FLOAT"],
-		 "isTouchingWater": true,
-		 "isUnderWater": true,
-		 "animations": ["q.bedrock('chinchou', 'water_idle')"],
-		 "quirks": [
-			"q.bedrock_quirk('chinchou', 'blink')",
-			"q.bedrock_quirk('chinchou', 'water_idle_quirk')"
-		]
-	  },
-	  "swimming": {
-		 "poseTypes": ["SWIM"],
-		 "isTouchingWater": true,
-		 "isUnderWater": true,
-		 "animations": ["q.bedrock('chinchou', 'water_swim')"],
-		 "quirks": [
-			"q.bedrock_quirk('chinchou', 'blink')"
-		]
-	  },
-	  "water-sleeping": {
-		 "poseTypes": ["SLEEP"],
-		 "isTouchingWater": true,
-		 "namedAnimations": {
-			"cry": "q.bedrock_stateful('dummy', 'cry')"
-		 },
-		 "animations": ["q.bedrock('chinchou', 'water_sleep')"]
-	  },
-	  "sleeping": {
-		 "poseTypes": ["SLEEP"],
-		 "isTouchingWater": false,
-		 "namedAnimations": {
-			"cry": "q.bedrock_stateful('dummy', 'cry')"
-		 },
-		 "animations": ["q.bedrock('chinchou', 'sleep')"]
-	  }
-	}
- }
- 

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0171_lanturn/lanturn.json

@@ -26,17 +26,15 @@
     "battle-standing": {
       "poseTypes": ["STAND"],
       "isBattle": true,
-      "isTouchingWater": false,
-      "animations": ["q.bedrock('lanturn', 'ground_battle_idle')"],
+      "animations": ["q.bedrock('lanturn', 'battle_idle')"],
       "quirks": ["q.bedrock_quirk('lanturn', 'blink')"]
     },
     "water-battle-standing": {
       "poseTypes": ["FLOAT"],
       "isBattle": true,
-      "isTouchingWater": true,
       "animations": ["q.bedrock('lanturn', 'water_battle_idle')"],
       "namedAnimations": {
-        "faint": "q.bedrock('lanturn', 'water_faint', q.curve('one'))"
+        "sleep": "q.bedrock('lanturn', 'water_faint', q.curve('one'))"
       },
       "quirks": ["q.bedrock_quirk('lanturn', 'blink')"]
     },
@@ -44,49 +42,42 @@
       "poseTypes": ["STAND", "WALK"],
       "condition": "q.in_air",
       "animations": ["q.bedrock('lanturn', 'water_swim')"],
-      "quirks": ["q.bedrock_quirk('lanturn', 'blink')"],
       "transformTicks": 3,
       "transformToTicks": 3
     },
     "standing": {
       "poseTypes": ["STAND", "NONE"],
       "isTouchingWater": false,
-      "animations": ["q.bedrock('lanturn', 'water_idle')"],
-      "quirks": ["q.bedrock_quirk('lanturn', 'blink')"]
+      "animations": ["q.bedrock('lanturn', 'water_idle')"]
     },
     "walking": {
       "poseTypes": ["WALK"],
       "isTouchingWater": false,
-      "animations": ["q.bedrock('lanturn', 'water_swim')"],
-      "quirks": ["q.bedrock_quirk('lanturn', 'blink')"]
+      "animations": ["q.bedrock('lanturn', 'water_swim')"]
     },
     "surface-floating": {
       "poseTypes": ["STAND"],
       "isTouchingWater": true,
       "isUnderWater": false,
-      "animations": ["q.bedrock('lanturn', 'water_idle')"],
-      "quirks": ["q.bedrock_quirk('lanturn', 'blink')"]
+      "animations": ["q.bedrock('lanturn', 'water_idle')"]
     },
     "surface-swimming": {
       "poseTypes": ["WALK"],
       "isTouchingWater": true,
       "isUnderWater": false,
-      "animations": ["q.bedrock('lanturn', 'water_swim')"],
-      "quirks": ["q.bedrock_quirk('lanturn', 'blink')"]
+      "animations": ["q.bedrock('lanturn', 'water_swim')"]
     },
     "floating": {
       "poseTypes": ["FLOAT"],
       "isTouchingWater": true,
       "isUnderWater": true,
-      "animations": ["q.bedrock('lanturn', 'water_idle')"],
-      "quirks": ["q.bedrock_quirk('lanturn', 'blink')"]
+      "animations": ["q.bedrock('lanturn', 'water_idle')"]
     },
     "swimming": {
       "poseTypes": ["SWIM"],
       "isTouchingWater": true,
       "isUnderWater": true,
-      "animations": ["q.bedrock('lanturn', 'water_swim')"],
-      "quirks": ["q.bedrock_quirk('lanturn', 'blink')"]
+      "animations": ["q.bedrock('lanturn', 'water_swim')"]
     },
     "water-sleeping": {
       "poseTypes": ["SLEEP"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0235_smeargle/smeargle.json

@@ -17,7 +17,7 @@
       "poseTypes": ["STAND"],
       "isBattle": true,
       "namedAnimations": {
-        "cry": "q.bedrock_primary('smeargle', 'battle_cry', q.curve('symmetrical_wide'))"
+        "cry": "q.bedrock_primary('smeargle', 'battle_cry')"
       },
       "animations": ["q.look('head')", "q.bedrock('smeargle', 'battle_idle')"],
       "quirks": ["q.bedrock_quirk('smeargle', 'blink')"]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0495_snivy/snivy.json

@@ -10,6 +10,7 @@
   "poses": {
     "standing": {
       "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
+      "isBattle": false,
       "animations": ["q.look('head_ai')", "q.bedrock('snivy', 'ground_idle')"],
       "quirks": ["q.bedrock_quirk('snivy', 'blink')"]
     },

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0751_dewpider/dewpider.json

@@ -10,6 +10,7 @@
   "poses": {
     "standing": {
       "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
+      "isBattle": true,
       "animations": ["q.bedrock('dewpider', 'ground_idle')"]
     },
     "walking": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0752_araquanid/araquanid.json

@@ -10,6 +10,7 @@
   "poses": {
     "standing": {
       "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
+      "isBattle": true,
       "animations": ["q.bedrock('araquanid', 'ground_idle')"]
     },
     "walking": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0938_tadbulb/tadbulb.json

@@ -6,7 +6,6 @@
   "rootBone": "tadbulb",
   "animations": {
     "faint": "q.bedrock_primary('tadbulb', 'faint', q.curve('one'))",
-    "cry": "q.bedrock_stateful('tadbulb', 'cry')",
     "recoil": "q.bedrock_stateful('tadbulb', 'recoil')",
     "physical": "q.bedrock_primary('tadbulb', 'physical', q.curve('symmetrical_wide'))",
     "special": "q.bedrock_primary('tadbulb', 'special', q.curve('symmetrical'))",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0939_bellibolt/bellibolt.json

@@ -6,7 +6,6 @@
   "rootBone": "bellibolt",
   "animations": {
     "faint": "q.bedrock_primary('bellibolt', 'faint', q.curve('one'))",
-    "cry": "q.bedrock_stateful('bellibolt', 'cry')",
     "recoil": "q.bedrock_stateful('bellibolt', 'recoil')",
     "physical": "q.bedrock_primary('bellibolt', 'physical', q.curve('symmetrical_wide'))",
     "special": "q.bedrock_primary('bellibolt', 'special', q.curve('symmetrical_wide'))",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0475_gallade/0_gallade_base.json

@@ -14,18 +14,6 @@
         "shiny"
       ],
       "texture": "cobblemon:textures/pokemon/0475_gallade/gallade_shiny.png"
-    },
-    {
-      "aspects": [
-        "alpha_eyes"
-      ],
-      "layers": [
-        {
-          "name": "alpha_eyes",
-          "texture": "cobblemon:textures/pokemon/0475_gallade/gallade_alpha.png",
-          "emissive": true
-        }
-      ]
     }
   ]
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0486_regigigas/0_regigigas_base.json

@@ -27,18 +27,6 @@
           "texture": "cobblemon:textures/pokemon/0486_regigigas/regigigas_emissive.png"
         }
       ]
-    },
-    {
-      "aspects": [
-        "alpha_eyes"
-      ],
-      "layers": [
-        {
-          "name": "alpha_eyes",
-          "texture": "cobblemon:textures/pokemon/0486_regigigas/regigigas_alpha.png",
-          "emissive": true
-        }
-      ]
     }
   ]
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0751_dewpider/0_dewpider_base.json

@@ -16,8 +16,7 @@
         {
           "name": "translucent",
           "texture": "cobblemon:textures/pokemon/0751_dewpider/dewpider_translucent.png",
-          "translucent": true,
-          "translucent_cull": true
+          "translucent": true
         }
       ]
     },

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0752_araquanid/0_araquanid_base.json

@@ -16,8 +16,7 @@
         {
           "name": "translucent",
           "texture": "cobblemon:textures/pokemon/0752_araquanid/araquanid_translucent.png",
-          "translucent": true,
-          "translucent_cull": true
+          "translucent": true
         }
       ]
     },

common/src/main/resources/assets/cobblemon/sounds.json

@@ -1346,7 +1346,7 @@
     "sounds": [ { "name": "cobblemon:move/icebeam/icebeam_target_1", "volume": 0.8 } ]
   },
   "move.icebeam.target_2": {
-    "sounds": [ { "name": "cobblemon:move/icebeam/icebeam_target_2", "volume": 0.5 } ]
+    "sounds": [ { "name": "cobblemon:move/icebeam/icebeam_target_2", "volume": 0.8 } ]
   },
   "move.infestation.actor": {
     "sounds": [ { "name": "cobblemon:move/infestation/infestation_actor", "volume": 0.8 } ]
@@ -1453,51 +1453,6 @@
   "move.waterpulse.target": {
     "sounds": [ { "name": "cobblemon:move/waterpulse/waterpulse_target", "volume": 0.8 } ]
   },
-  "move.leafstorm.actor": {
-    "sounds": [ { "name": "cobblemon:move/leafstorm/leafstorm_actor", "volume": 1.0 } ]
-  },
-  "move.leafstorm.target": {
-    "sounds": [ { "name": "cobblemon:move/leafstorm/leafstorm_target", "volume": 1.0 } ]
-  },
-  "move.suckerpunch.target": {
-    "sounds": [ { "name": "cobblemon:move/suckerpunch/suckerpunch_target", "volume": 1.0 } ]
-  },
-  "move.blizzard.actor": {
-    "sounds": [ { "name": "cobblemon:move/blizzard/blizzard_actor", "volume": 1.0 } ]
-  },
-  "move.blizzard.target": {
-    "sounds": [ { "name": "cobblemon:move/blizzard/blizzard_target", "volume": 1.0 } ]
-  },
-  "move.hydropump.actor": {
-    "sounds": [ { "name": "cobblemon:move/hydropump/hydropump_actor", "volume": 1.0 } ]
-  },
-  "move.hydropump.target": {
-    "sounds": [ { "name": "cobblemon:move/hydropump/hydropump_target", "volume": 1.0 } ]
-  },
-  "move.lightscreen.actor": {
-    "sounds": [ { "name": "cobblemon:move/lightscreen/lightscreen_actor", "volume": 1.0 } ]
-  },
-  "move.playrough.actor_1": {
-    "sounds": [ { "name": "cobblemon:move/playrough/playrough_actor_1", "volume": 1.0 } ]
-  },
-  "move.playrough.actor_2": {
-    "sounds": [ { "name": "cobblemon:move/playrough/playrough_actor_2", "volume": 1.0 } ]
-  },
-  "move.playrough.actor_3": {
-    "sounds": [ { "name": "cobblemon:move/playrough/playrough_actor_3", "volume": 1.0 } ]
-  },
-  "move.playrough.target": {
-    "sounds": [ { "name": "cobblemon:move/playrough/playrough_target", "volume": 1.0 } ]
-  },
-  "move.gigatonhammer.tinkaton": {
-    "sounds": [ { "name": "cobblemon:move/gigatonhammer/gigatonhammer_actor_tinkaton", "volume": 1.0} ]
-  },
-  "move.gigatonhammer.actor": {
-    "sounds": [ { "name": "cobblemon:move/gigatonhammer/gigatonhammer_actor", "volume": 1.0 } ]
-  },
-  "move.gigatonhammer.target": {
-    "sounds": [ { "name": "cobblemon:move/gigatonhammer/gigatonhammer_target", "volume": 1.0 } ]
-  },
   "impact.normal": {
     "sounds": [
       { "name": "cobblemon:move/impact_generic/impact_generic_fighting_1", "volume": 0.8 },

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

@@ -1,44 +0,0 @@
-{
-  "timeline": [
-    {
-      "type": "add_holds",
-      "holds": ["effects"]
-    },
-    {
-      "type": "animation",
-      "animation": ["gigatonhammer"],
-      "delay": 0.3
-    },
-    {
-      "type": "entity_molang",
-      "entityCondition": "q.entity.is_user == true",
-      "expressions": ["q.sound('move.gigatonhammer.tinkaton');"]
-    },
-    {
-      "type": "pause",
-      "pause": 0.73
-    },
-    {
-      "type": "entity_molang",
-      "entityCondition": "q.entity.is_user == true",
-      "expressions": ["q.sound('move.gigatonhammer.actor');"]
-    },
-    {
-      "type": "pause",
-      "pause": 0.49
-    },
-    {
-      "type": "entity_molang",
-      "entityCondition": "q.entity.is_user == true && q.missed(q.entity.uuid) == false",
-      "expressions": ["q.sound('move.gigatonhammer.target');"]
-    },
-    {
-      "type": "remove_holds",
-      "holds": ["effects"]
-    },
-    {
-      "type": "pause",
-      "pause": 1.5
-    }
-  ]
-}

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

@@ -21,11 +21,6 @@
       "locators": ["special", "target"],
       "targetLocators": ["target"]
     },
-    {
-      "type": "entity_molang",
-      "entityCondition": "q.entity.is_user == true",
-      "expressions": ["q.sound('move.hydropump.actor');"]
-    },
     {
       "type": "pause",
       "pause": 0.03
@@ -51,11 +46,6 @@
       "animation": ["recoil"],
       "entityCondition": "q.entity.is_user == false && q.hurt(q.entity.uuid) == true && q.missed(q.entity.uuid) == false"
     },
-    {
-      "type": "entity_molang",
-      "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
-      "expressions": ["q.sound('move.hydropump.target');"]
-    },
     {
       "type": "pause",
       "pause": 0.55

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

@@ -15,11 +15,6 @@
       "locators": ["special", "target"],
       "targetLocators": ["middle"]
     },
-    {
-      "type": "entity_molang",
-      "entityCondition": "q.entity.is_user == true",
-      "expressions": ["q.sound('move.leafstorm.actor');"]
-    },
     {
       "type": "pause",
       "pause": 0.1
@@ -40,11 +35,6 @@
       "effect": "cobblemon:leafstorm_target",
       "locators": ["target"]
     },
-    {
-      "type": "entity_molang",
-      "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
-      "expressions": ["q.sound('move.leafstorm.target');"]
-    },
     {
       "type": "animation",
       "animation": ["recoil"],

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

@@ -15,11 +15,6 @@
         "effect": "cobblemon:lightscreen_actor",
         "locators": ["target"]
       },
-      {
-        "type": "entity_molang",
-        "entityCondition": "q.entity.is_user == true && q.failed == false",
-        "expressions": ["q.sound('move.lightscreen.actor');"]
-      },
       {
         "type": "pause",
         "pause": 0.07

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

@@ -14,20 +14,10 @@
     "entityCondition": "q.entity.is_user == true && q.missed(q.entity.uuid) == false",
     "expressions": ["q.play_animation(q.bedrock_stateful('playrough', 'actor'))"]
     },
-    {
-      "type": "entity_molang",
-      "entityCondition": "q.entity.is_user == true",
-      "expressions": ["q.sound('move.playrough.actor_1');"]
-    },
     {
       "type": "pause",
       "pause": 0.125
     },
-    {
-      "type": "entity_molang",
-      "entityCondition": "q.entity.is_user == false",
-      "expressions": ["q.sound('move.playrough.actor_2');"]
-    },
     {
       "type": "entity_particles",
       "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
@@ -45,21 +35,7 @@
     },
     {
       "type": "pause",
-      "pause": 0.5
-    },
-    {
-      "type": "entity_molang",
-      "entityCondition": "q.entity.is_user == true",
-      "expressions": ["q.sound('move.playrough.actor_3');"]
-    },
-    {
-      "type": "entity_molang",
-      "entityCondition": "q.entity.is_user == false  && q.missed(q.entity.uuid) == false",
-      "expressions": ["q.sound('move.playrough.target');"]
-    },
-    {
-      "type": "pause",
-      "pause": 0.225
+      "pause": 0.725
     },
     {
       "type": "remove_holds",

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

@@ -27,11 +27,6 @@
       "effect": "cobblemon:suckerpunch_target1",
       "locator": "target"
     },
-    {
-      "type": "entity_molang",
-      "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
-      "expressions": ["q.sound('move.suckerpunch.target');"]
-    },
     {
       "type": "pause",
       "pause": 0.2

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

@@ -46,11 +46,10 @@
   "baseFriendship": 50,
   "baseScale": 1.0,
   "hitbox": {
-    "height": 1.5,
+    "height": 1,
     "fixed": false,
-    "width": 1.5
+    "width": 1
   },
-  "standingEyeHeight": 0.85,
   "riding": {
     "behaviours": {
       "AIR": {

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

@@ -45,11 +45,10 @@
   "baseFriendship": 50,
   "baseScale": 1.1,
   "hitbox": {
-    "height": 1.7,
+    "height": 1.5,
     "fixed": false,
-    "width": 0.85
+    "width": 0.75
   },
-  "standingEyeHeight": 1,
   "riding": {
     "behaviours": {
       "AIR": {
@@ -147,7 +146,7 @@
         "avoidsWater": true
       },
       "walk": {
-        "walkSpeed": 0.27
+        "walkSpeed": 0.22
       }
     },
     "resting": {

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

@@ -51,9 +51,6 @@
   },
   "behaviour": {
     "moving": {
-      "walk": {
-        "walkSpeed": 0.2
-      },
       "fly": {
         "canFly": true
       },

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

@@ -52,9 +52,6 @@
   },
   "behaviour": {
     "moving": {
-      "walk": {
-        "walkSpeed": 0.17
-      },
       "fly": {
         "canFly": true
       },

common/src/main/resources/data/cobblemon/species/generation4/bidoof.json

@@ -43,7 +43,7 @@
   "catchRate": 255,
   "eggCycles": 15,
   "baseFriendship": 50,
-  "baseScale": 0.6,
+  "baseScale": 0.5,
   "hitbox": {
     "width": 1,
     "height": 0.9,

common/src/main/resources/data/cobblemon/species/generation4/staraptor.json

@@ -89,8 +89,8 @@
         "stats": {
           "ACCELERATION": "45-70",
           "JUMP": "45-65",
-          "SKILL": "25-55",
-          "SPEED": "45-70",
+          "SKILL": "25-45",
+          "SPEED": "35-55",
           "STAMINA": "45-70"
         }
       },

common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json

@@ -56,7 +56,7 @@
         "stats": {
           "ACCELERATION": "65-85",
           "JUMP": "35-45",
-          "SKILL": "50-75",
+          "SKILL": "45-65",
           "SPEED": "35-75",
           "STAMINA": "25-45"
         }

common/src/main/resources/data/cobblemon/species/generation7/komala.json

@@ -49,9 +49,6 @@
   },
   "behaviour": {
     "moving": {
-      "walk": {
-        "canWalk": false
-      },
       "swim": {
         "avoidsWater": true
       },

common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json

@@ -57,7 +57,7 @@
           "ACCELERATION": "65-85",
           "JUMP": "35-45",
           "SKILL": "35-60",
-          "SPEED": "50-80",
+          "SPEED": "50-85",
           "STAMINA": "30-60"
         }
       }