Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 94.9% (8993 of 9467 strings)

Translation: Cobblemon/Mod
Translate-URL: https://lang.cobblemon.com/projects/cobblemon/mod/zh_Hans/

CHANGELOG.md

@@ -59,13 +59,13 @@
 - Ice type Pokémon are now immune to Packed Snow
 
 ### New rideable Pokémon
-- Crobat
-- Skarmory
-- Milotic
-- Archeops
-- Goodra 
-- Goodra (Hisuian Form)
 - Drampa
+- Archeops
+- Skarmory
+- Crobat
+- Goodra
+- Hisuian Goodra
+- Milotic
 
 ### Pokémon Added
 #### Generation 3
@@ -171,14 +171,6 @@
 - Changed models for every existing regional bias
 
 ### Animation updates for the following Pokémon
-
-- Happiny
-- Poliwrath
-- Zubat
-- Vulpix
-- Drowzee
-- Hypno
-- Noctowl
 - Skarmory
 - Skitty
 - Flygon
@@ -210,16 +202,8 @@
 - Yamask
 - Cofagrigus
 - Luvdisc
-- Staryu
-- Starmie
-- Togetic
-- Rellor
-- Rabsca
-- Yungoos
-- Gumshoos
 
 #### Added sounds to the following moves
-
 - Absorb
 - Aurora Beam
 - Double Team
@@ -248,12 +232,10 @@
 
 ### Fixes
 - Adjusted Croagunk's walkspeed
-- Adjusted Aerodactyl's walkspeed
 - Fixed Blitzle's base scale being `1` rather than the intended `0.8`
 - Fixed Magnezone's emissive layer for the shiny having the wrong name, thus displaying wrongly
 - Fixed Litleo not blinking
 - Fixed Garchomp T-posing when sleeping while out of battle.
-- Fixed Omanyte and Omastar incorrectly using water animations on land.
 - Sharp Beak can now be crafted
 - Metal Alloy can now be crafted
 - Ability Capsules can now be brewed
@@ -318,6 +300,8 @@
 - Regional Foods will now prioritize being eaten instead of used for healing Pokémon, shift clicking will use it as healing
 - Resolved Z-Fighting on Pokédex Models
 - Restored Ninjask's ability to do barrel rolls
+- Fixed a crash caused by adding enchanted items to the Resurrection Machine
+- Fixed a crash that could occur when starting a PvN battle with only fainted Pokémon.
 
 ### Fixes
 - Fixed Croagunk's walkspeed
@@ -378,6 +362,7 @@
 - Separated all the functions of MoLangFunctions.kt into their own files.
 - Spawn buckets and their base weights are now provided by the spawner, with different base weights for world, fishing, snack, and habitat spawn buckets.
 - Removed "SpawnBucket" class in favour of just storing maps of bucket names to weights.
+- Fixed nicknames not being applied to Pokémon spawned from `spawn_pool_world` files
 
 ### Molang & Datapacks
 - Added `moveset_builders` datapack folder for different styles of movesets.

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

@@ -10,16 +10,14 @@ package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.mixin.accessor.SinglePoolElementAccessor;
 import com.cobblemon.mod.common.world.structureprocessors.HeightRangeStructureProcessor;
-import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
-import net.minecraft.util.RandomSource;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.levelgen.structure.Structure;
-import net.minecraft.world.level.levelgen.structure.pools.JigsawPlacement;
-import net.minecraft.world.level.levelgen.structure.pools.LegacySinglePoolElement;
-import net.minecraft.world.level.levelgen.structure.pools.SinglePoolElement;
-import net.minecraft.world.level.levelgen.structure.pools.StructurePoolElement;
-import net.minecraft.world.level.levelgen.structure.pools.StructureTemplatePool;
+import net.minecraft.world.level.levelgen.structure.pools.*;
+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.spongepowered.asm.mixin.Mixin;
@@ -28,24 +26,38 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.List;
 import java.util.Optional;
 
 @Mixin(JigsawPlacement.class)
 public class JigsawPlacementMixin {
 
 	@Inject(
-			method = "addPieces*",
-			at = @At("HEAD"),
+			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"),
 			cancellable = true
 	)
-	private static void cobblemon$cancelInvalidHeightRangeStart(
-			CallbackInfoReturnable<Optional<Structure.GenerationStub>> cir,
-			@Local(argsOnly = true, ordinal = 0) Structure.GenerationContext generationContext,
-			@Local(argsOnly = true, ordinal = 0) Holder<StructureTemplatePool> startPool,
-			@Local(argsOnly = true, ordinal = 0) BlockPos startPos
+	private static void onAddPieces(
+			Structure.GenerationContext context,
+			Holder<StructureTemplatePool> startPool,
+			Optional<ResourceLocation> startJigsawName,
+			int maxDepth,
+			BlockPos pos,
+			boolean useExpansionHack,
+			Optional<Heightmap.Types> projectStartToHeightmap,
+			int maxDistanceFromCenter,
+			PoolAliasLookup aliasLookup,
+			DimensionPadding dimensionPadding,
+			LiquidSettings liquidSettings,
+			CallbackInfoReturnable<Optional<Structure.GenerationStub>> cir
 	) {
-		if (cobblemon$canAnyStartElementPlace(generationContext, startPool, startPos)) {
+		Optional<Structure.GenerationStub> result = cir.getReturnValue();
+		if (result.isEmpty()) {
+			return;
+		}
+		BlockPos spawnPos = result.get().position();
+		boolean canPlace = cobblemon$canAnyStartElementPlace(context, startPool, spawnPos);
+
+		if (canPlace) {
 			return;
 		}
 
@@ -58,19 +70,22 @@ public class JigsawPlacementMixin {
 			Holder<StructureTemplatePool> startPool,
 			BlockPos startPos
 	) {
-		List<StructurePoolElement> elements = startPool.value().getShuffledTemplates(RandomSource.create(0L));
-		for (StructurePoolElement element : elements) {
+		for (StructurePoolElement element : startPool.value().templates) {
 			Optional<HeightRangeStructureProcessor> heightRangeProcessor = cobblemon$getHeightRangeProcessor(element);
+
 			if (heightRangeProcessor.isEmpty()) {
 				return true;
 			}
 
-			if (heightRangeProcessor.get().isValidPlacement(
+			HeightRangeStructureProcessor processor = heightRangeProcessor.get();
+			boolean valid = processor.isValidPlacement(
 					generationContext.chunkGenerator(),
 					generationContext.heightAccessor(),
 					generationContext.randomState(),
 					startPos
-			)) {
+			);
+
+			if (valid) {
 				return true;
 			}
 		}
@@ -93,5 +108,4 @@ public class JigsawPlacementMixin {
 
 		return Optional.empty();
 	}
-}
-
+}

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

@@ -308,7 +308,9 @@ object Cobblemon {
             this.config.maxPokemonLevel,
             this.config.maxPokemonFriendship,
             this.config.maxDynamaxLevel,
-            this.config.unlockAllMoveDexMovesByDefault
+            this.config.unlockAllMoveDexMovesByDefault,
+            this.config.pokemonIntrinsicSizeMin,
+            this.config.pokemonIntrinsicSizeMax
         ).sendToPlayer(player)
     }
 

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

@@ -131,6 +131,7 @@ import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.ChangeP
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.RequestPCBoxWallpapersPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.SetPCBoxWallpapersPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.UnlockPCBoxWallpaperPacket
+import com.cobblemon.mod.common.net.messages.client.tms.TechnicalMachineRegistrySyncPacket
 import com.cobblemon.mod.common.net.messages.client.toast.ToastPacket
 import com.cobblemon.mod.common.net.messages.client.trade.TradeAcceptanceChangedPacket
 import com.cobblemon.mod.common.net.messages.client.trade.TradeCancelledPacket
@@ -439,6 +440,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(BehaviourSyncPacket.ID, BehaviourSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(MarkRegistrySyncPacket.ID, MarkRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(RideSettingsSyncPacket.ID, RideSettingsSyncPacket::decode, RideSettingsSyncHandler))
+        list.add(PacketRegisterInfo(TechnicalMachineRegistrySyncPacket.ID, TechnicalMachineRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
 
         // Effects
         list.add(PacketRegisterInfo(SpawnSnowstormParticlePacket.ID, SpawnSnowstormParticlePacket::decode, SpawnSnowstormParticleHandler))

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/HabitatPool.kt

@@ -69,7 +69,7 @@ class HabitatPool {
                 pool.spawns = spawns
                 return pool
             } else {
-                return HabitatPools.habitatPoolsById[poolId] ?: HabitatPool.default()
+                return HabitatPools.habitatPoolsById[poolId] ?: default()
             }
         }
     }
@@ -94,6 +94,14 @@ class HabitatPool {
         return spawns.mapNotNull { it.createSpawnDetail(habitatBlockEntity) }
     }
 
+    fun getPhaseCount(): Int {
+        return spawns
+            .flatMap { it.phases?.ranges?.flatten() ?: emptySet() }
+            .toSet()
+            .count()
+            .coerceAtLeast(1)
+    }
+
     fun encode(buffer: RegistryFriendlyByteBuf) {
         buffer.writeResourceLocation(id)
         buffer.writeUtf(name)

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/dto/HabitatSettingsDTO.kt

@@ -17,7 +17,6 @@ import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
 
 class HabitatSettingsDTO() {
-    var numberOfPhases = 1
     var phaseOrder = HabitatPhaseOrder.SIMPLE
     lateinit var levelRange: IntRange
     var modifiers: String = ""
@@ -28,7 +27,6 @@ class HabitatSettingsDTO() {
     var naturalSettings: NaturalHabitatSettingsDTO? = null
 
     constructor(habitatBlockEntity: HabitatBlockEntity) : this() {
-        this.numberOfPhases = habitatBlockEntity.numberOfPhases
         this.phaseOrder = habitatBlockEntity.phaseOrder
         this.levelRange = habitatBlockEntity.levelRange
         this.modifiers = habitatBlockEntity.modifiers.asString()
@@ -44,7 +42,6 @@ class HabitatSettingsDTO() {
     }
 
     fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeInt(numberOfPhases)
         buffer.writeEnum(phaseOrder)
         buffer.writeInt(levelRange.first)
         buffer.writeInt(levelRange.last)
@@ -60,7 +57,6 @@ class HabitatSettingsDTO() {
     }
 
     fun decode(buffer: RegistryFriendlyByteBuf) {
-        this.numberOfPhases = buffer.readInt()
         this.phaseOrder = buffer.readEnum(HabitatPhaseOrder::class.java)
         val levelRangeStart = buffer.readInt()
         val levelRangeEnd = buffer.readInt()

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

@@ -759,6 +759,7 @@ open class PokemonProperties {
         shiny?.let { json.addProperty(DataKeys.POKEMON_SHINY, it) }
         gender?.let { json.addProperty(DataKeys.POKEMON_GENDER, it.name) }
         species?.let { json.addProperty(DataKeys.POKEMON_SPECIES_TEXT, it) }
+        nickname?.let { json.addProperty(DataKeys.POKEMON_NICKNAME, it.string) }
         form?.let { json.addProperty(DataKeys.POKEMON_FORM_ID, it) }
         friendship?.let { json.addProperty(DataKeys.POKEMON_FRIENDSHIP, it) }
         fullness?.let { json.addProperty(DataKeys.POKEMON_FULLNESS, it) }
@@ -795,6 +796,7 @@ open class PokemonProperties {
         shiny = json.get(DataKeys.POKEMON_SHINY)?.asBoolean
         gender = json.get(DataKeys.POKEMON_GENDER)?.asString?.let { Gender.valueOf(it) }
         species = json.get(DataKeys.POKEMON_SPECIES_TEXT)?.asString
+        nickname = json.get(DataKeys.POKEMON_NICKNAME)?.asString?.let(Component::literal)
         form = json.get(DataKeys.POKEMON_FORM_ID)?.asString
         friendship = json.get(DataKeys.POKEMON_FRIENDSHIP)?.asInt
         fullness = json.get(DataKeys.POKEMON_FULLNESS)?.asInt

common/src/main/kotlin/com/cobblemon/mod/common/api/tms/TechnicalMachines.kt

@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.moves.MoveTemplate
 import com.cobblemon.mod.common.api.moves.adapters.MoveTemplateAdapter
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import com.cobblemon.mod.common.net.messages.client.tms.TechnicalMachineRegistrySyncPacket
 import com.cobblemon.mod.common.util.adapters.TMObtainMethodAdapter
 import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.cobblemon.mod.common.util.cobblemonResource
@@ -70,5 +71,7 @@ object TechnicalMachines : JsonDataRegistry<TechnicalMachine> {
 
     fun getByResourceLocation(resourceLocation: ResourceLocation) = tmMap[resourceLocation]
     fun getAllResourceLocations() = tmMap.keys.toSet()
-    override fun sync(player: ServerPlayer) {}
+    override fun sync(player: ServerPlayer) {
+        TechnicalMachineRegistrySyncPacket(tmMap.values.toList()).sendToPlayer(player)
+    }
 }

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

@@ -349,11 +349,12 @@ object BattleBuilder {
             npcPartyStores.add(npcParty)
         }
 
-        if (playerActor.pokemonList.size < battleFormat.battleType.slotsPerActor) {
+        val playerAvailablePokemon = playerActor.pokemonList.count { it.health > 0 }
+        if (playerAvailablePokemon < battleFormat.battleType.slotsPerActor) {
             errors.participantErrors[playerActor] += BattleStartError.insufficientPokemon(
                 actorEntity = player,
                 requiredCount = battleFormat.battleType.slotsPerActor,
-                hadCount = playerActor.pokemonList.size
+                hadCount = playerAvailablePokemon
             )
         }
 

common/src/main/kotlin/com/cobblemon/mod/common/battles/ai/strongBattleAI/ActiveTracker.kt

@@ -163,7 +163,8 @@ class TrackerActor(val uuid: UUID) {
             //we assume that AI knows it all about our allies
             trackerActor.party.addAll(actor.pokemonList.map { createAllied(it) })
             actor.activePokemon.forEach {
-                val active = trackerActor.party.first { trackMon -> trackMon.id == it.battlePokemon!!.uuid }
+                val battlePokemon = it.battlePokemon ?: return@forEach
+                val active = trackerActor.party.first { trackMon -> trackMon.id == battlePokemon.uuid }
                 trackerActor.party.remove(active)
                 trackerActor.activePokemon.add(active)
             }
@@ -176,7 +177,8 @@ class TrackerActor(val uuid: UUID) {
             //only know basics of what we see right now
             trackerActor.party.addAll(actor.pokemonList.map { createOpposing(it) })
             actor.activePokemon.forEach {
-                val active = trackerActor.party.first { trackMon -> trackMon.id == it.battlePokemon!!.uuid }
+                val battlePokemon = it.battlePokemon ?: return@forEach
+                val active = trackerActor.party.first { trackMon -> trackMon.id == battlePokemon.uuid }
                 trackerActor.party.remove(active)
                 trackerActor.activePokemon.add(active)
             }

common/src/main/kotlin/com/cobblemon/mod/common/block/entity/DiscShelfBlockEntity.kt

@@ -16,24 +16,20 @@ import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.core.HolderLookup
 import net.minecraft.core.NonNullList
+import net.minecraft.core.component.DataComponents
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket
 import net.minecraft.sounds.SoundEvent
 import net.minecraft.sounds.SoundSource
-import net.minecraft.world.ContainerHelper
-import net.minecraft.world.Containers
-import net.minecraft.world.InteractionResult
-import net.minecraft.world.ItemInteractionResult
-import net.minecraft.world.WorldlyContainer
+import net.minecraft.world.*
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
-import net.minecraft.world.item.Items
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.phys.BlockHitResult
 import net.minecraft.world.level.gameevent.GameEvent
-import java.util.OptionalInt
+import net.minecraft.world.phys.BlockHitResult
+import java.util.*
 import kotlin.math.pow
 
 class DiscShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(CobblemonBlockEntities.DISC_SHELF, pos, state), WorldlyContainer {
@@ -134,25 +130,7 @@ class DiscShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobbl
         return stack.item is TechnicalMachineItem
                 || stack.item == CobblemonItems.UPGRADE
                 || stack.item == CobblemonItems.DUBIOUS_DISC
-                || stack.item == Items.MUSIC_DISC_13
-                || stack.item == Items.MUSIC_DISC_CAT
-                || stack.item == Items.MUSIC_DISC_BLOCKS
-                || stack.item == Items.MUSIC_DISC_CHIRP
-                || stack.item == Items.MUSIC_DISC_FAR
-                || stack.item == Items.MUSIC_DISC_MALL
-                || stack.item == Items.MUSIC_DISC_MELLOHI
-                || stack.item == Items.MUSIC_DISC_STAL
-                || stack.item == Items.MUSIC_DISC_STRAD
-                || stack.item == Items.MUSIC_DISC_WARD
-                || stack.item == Items.MUSIC_DISC_11
-                || stack.item == Items.MUSIC_DISC_WAIT
-                || stack.item == Items.MUSIC_DISC_OTHERSIDE
-                || stack.item == Items.MUSIC_DISC_5
-                || stack.item == Items.MUSIC_DISC_RELIC
-                || stack.item == Items.MUSIC_DISC_PRECIPICE
-                || stack.item == Items.MUSIC_DISC_CREATOR
-                || stack.item == Items.MUSIC_DISC_CREATOR_MUSIC_BOX
-                || stack.item == Items.MUSIC_DISC_PIGSTEP
+                || stack.has(DataComponents.JUKEBOX_PLAYABLE)
     }
 
     fun onNoteBlockPulse(level: Level, noteBlockPos: BlockPos, soundEvent: SoundEvent) {

common/src/main/kotlin/com/cobblemon/mod/common/block/habitat/HabitatBlockEntity.kt

@@ -60,10 +60,12 @@ class HabitatBlockEntity(pos: BlockPos, state: BlockState) :
 
     var spawningStyle: HabitatSpawningStyle = ActivatedHabitatSpawning(this)
 
-    var numberOfPhases: Int = 1
     var phaseOrder = HabitatPhaseOrder.SIMPLE
     var currentPhase = 1
 
+    val numberOfPhases: Int
+        get() = pool.getPhaseCount()
+
     var levelRange: IntRange = 1..Cobblemon.config.maxPokemonLevel
     var modifiers: PokemonProperties = PokemonProperties()
     var pool: HabitatPool = HabitatPool.default()
@@ -139,7 +141,6 @@ class HabitatBlockEntity(pos: BlockPos, state: BlockState) :
         val activatedSettings = habitatSettingsDTO.activatedSettings
         val naturalSettings = habitatSettingsDTO.naturalSettings
         val isActivated = habitatSettingsDTO.isActivatedSpawning
-        this.numberOfPhases = habitatSettingsDTO.numberOfPhases
         this.phaseOrder = habitatSettingsDTO.phaseOrder
         this.levelRange = habitatSettingsDTO.levelRange
         this.modifiers = PokemonProperties.parse(habitatSettingsDTO.modifiers)
@@ -169,7 +170,6 @@ class HabitatBlockEntity(pos: BlockPos, state: BlockState) :
     override fun saveAdditional(tag: CompoundTag, registryLookup: HolderLookup.Provider) {
         super.saveAdditional(tag, registryLookup)
         tag.putString(DataKeys.HABITAT_MIMIC, mimicId.toString())
-        tag.putInt(DataKeys.HABITAT_PHASE_COUNT, numberOfPhases)
         tag.putString(DataKeys.HABITAT_PHASE_ORDER, phaseOrder.toString())
         // Only save the level range when it's a non-trivial one
         if (levelRange.first != 1 || levelRange.last != Cobblemon.config.maxPokemonLevel) {
@@ -201,7 +201,6 @@ class HabitatBlockEntity(pos: BlockPos, state: BlockState) :
             return // Client doesn't need to try loading the rest
         }
 
-        numberOfPhases = tag.getInt(DataKeys.HABITAT_PHASE_COUNT)
         phaseOrder = HabitatPhaseOrder.valueOf(tag.getString(DataKeys.HABITAT_PHASE_ORDER))
         levelRange = tag.getString(DataKeys.HABITAT_LEVEL_RANGE).takeIf { it.isNotBlank() }?.let(IntRangeAdapter::deserialize) ?: 1..Cobblemon.config.maxPokemonLevel
         modifiers = tag.getString(DataKeys.HABITAT_MODIFIERS).takeIf { it.isNotBlank() }?.let(PokemonProperties::parse) ?: PokemonProperties()

common/src/main/kotlin/com/cobblemon/mod/common/block/multiblock/FossilMultiblockStructure.kt

@@ -630,7 +630,8 @@ class FossilMultiblockStructure (
         result.putInt(DataKeys.ORGANIC_MATERIAL, organicMaterialInside)
         val fossilInv = ListTag()
 
-        fossilInventory.forEach { fossilInv.add(ItemStack.CODEC.encodeStart(NbtOps.INSTANCE, it).orThrow) }
+        val ops = registryLookup.createSerializationContext(NbtOps.INSTANCE)
+        fossilInventory.forEach { fossilInv.add(ItemStack.CODEC.encodeStart(ops, it).getOrThrow()) }
         result.put(DataKeys.FOSSIL_INVENTORY, fossilInv)
         result.putString(DataKeys.CONNECTOR_DIRECTION, tankConnectorDirection?.toString())
 
@@ -669,7 +670,10 @@ class FossilMultiblockStructure (
 
             val fossilInv = if (nbt.contains(DataKeys.FOSSIL_INVENTORY)) { (nbt.get(DataKeys.FOSSIL_INVENTORY) as ListTag) } else ListTag()
             val actualFossilList = mutableListOf<ItemStack>()
-            fossilInv.forEach { ItemStack.parse(registryLookup, it).ifPresent(actualFossilList::add) }
+
+            val ops = registryLookup.createSerializationContext(NbtOps.INSTANCE)
+            fossilInv.forEach { ItemStack.CODEC.parse(ops, it).result().ifPresent(actualFossilList::add) }
+
             result.fossilInventory = actualFossilList
             result.tankConnectorDirection = Direction.byName(nbt.getString(DataKeys.CONNECTOR_DIRECTION))
 

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/habitat/HabitatEditGUI.kt

@@ -115,35 +115,19 @@ class HabitatEditGUI(
         addOptionWidget(mimicInput)
         y += spacing
 
-        labels.add(lang("ui.edit.habitat.phase_number") to (10 to y))
-        y += 12
-        val phasesInput = EditBox(font, 10, y, buttonWidth, 20, "Phases".text())
-        phasesInput.value = habitatSettingsDTO.numberOfPhases.toString()
-        phasesInput.setResponder { value ->
-            val phases = value.toIntOrNull()
-            val valid = phases != null && phases > 0
-            if (valid) {
-                habitatSettingsDTO.numberOfPhases = phases
-            }
-            phasesInput.setTextColor(if (valid) validTextColor else invalidTextColor)
-            setFieldValidity("phases", valid, "ui.edit.habitat.validation.phases")
+        // Phase setting only visible if there's more than one phase
+        val phaseCount = habitatSettingsDTO.pool.toHabitatPool()?.getPhaseCount() ?: 1
+        if (phaseCount > 1) {
+            phaseOrderButton = addOptionWidget(
+                Button.builder(getPhaseOrderText()) {
+                    val orders = HabitatPhaseOrder.entries
+                    val currentIndex = orders.indexOf(habitatSettingsDTO.phaseOrder)
+                    habitatSettingsDTO.phaseOrder = orders[(currentIndex + 1) % orders.size]
+                    refresh()
+                }.bounds(10, y, buttonWidth, 20).build()
+            )
+            y += spacing
         }
-        val initialPhases = phasesInput.value.toIntOrNull()
-        val initialPhasesValid = initialPhases != null && initialPhases > 0
-        phasesInput.setTextColor(if (initialPhasesValid) validTextColor else invalidTextColor)
-        setFieldValidity("phases", initialPhasesValid, "ui.edit.habitat.validation.phases")
-        addOptionWidget(phasesInput)
-        y += spacing
-
-        phaseOrderButton = addOptionWidget(
-            Button.builder(getPhaseOrderText()) {
-                val orders = HabitatPhaseOrder.entries
-                val currentIndex = orders.indexOf(habitatSettingsDTO.phaseOrder)
-                habitatSettingsDTO.phaseOrder = orders[(currentIndex + 1) % orders.size]
-                refresh()
-            }.bounds(10, y, buttonWidth, 20).build()
-        )
-        y += spacing
 
         labels.add(lang("ui.edit.habitat.level_range") to (10 to y))
         y += 12
@@ -390,7 +374,10 @@ class HabitatEditGUI(
     }
 
     fun refresh() {
-        phaseOrderButton.message = getPhaseOrderText()
+        val phaseCount = habitatSettingsDTO.pool.toHabitatPool()?.getPhaseCount() ?: 1
+        if (phaseCount > 1 && ::phaseOrderButton.isInitialized) {
+            phaseOrderButton.message = getPhaseOrderText()
+        }
         spawnModeButton.message = getSpawnModeText()
         poolSelectorButton.message = getPoolText()
         viewPoolButton.message = getViewPoolText()
@@ -439,6 +426,7 @@ class HabitatEditGUI(
                 }
                 habitatSettingsDTO.pool = newCustomPool
             }
+            rebuildWidgets()
             return
         }
 
@@ -451,6 +439,7 @@ class HabitatEditGUI(
         }
 
         habitatSettingsDTO.pool = selectedPool
+        rebuildWidgets()
     }
 
     private fun validateLevelRangeInputs() {

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/habitat/HabitatSpawnEditorGUI.kt

@@ -45,7 +45,6 @@ class HabitatSpawnEditorGUI(
     private val actionButtonBottomMargin = 10
     private val validTextColor = 0xFFFFFF
     private val invalidTextColor = 0xFF5555
-    private val moonPhaseRange = 0..7
     private lateinit var positionTypeButton: Button
     private lateinit var bucketButton: Button
     private lateinit var timeOfDayButton: Button
@@ -185,7 +184,7 @@ class HabitatSpawnEditorGUI(
                 phasesInput.setTextColor(validTextColor)
                 setFieldValidity("phases_list", true, "ui.edit.habitat.validation.phases_list")
             } else {
-                val parsed = parseMoonPhases(value)
+                val parsed = parsePhases(value)
                 val valid = parsed != null
                 if (valid) {
                     spawn.phases = parsed
@@ -194,7 +193,7 @@ class HabitatSpawnEditorGUI(
                 setFieldValidity("phases_list", valid, "ui.edit.habitat.validation.phases_list")
             }
         }
-        val initialPhasesValid = phasesInput.value.isBlank() || parseMoonPhases(phasesInput.value) != null
+        val initialPhasesValid = phasesInput.value.isBlank() || parsePhases(phasesInput.value) != null
         phasesInput.setTextColor(if (initialPhasesValid) validTextColor else invalidTextColor)
         setFieldValidity("phases_list", initialPhasesValid, "ui.edit.habitat.validation.phases_list")
         addOptionWidget(phasesInput)
@@ -332,7 +331,7 @@ class HabitatSpawnEditorGUI(
         return runCatching { PokemonSpecies.getByName(lowered) }.getOrNull()
     }
 
-    private fun parseMoonPhases(raw: String): IntRanges? {
+    private fun parsePhases(raw: String): IntRanges? {
         val ranges = mutableListOf<IntRange>()
         val tokens = raw.split(",").map(String::trim)
         if (tokens.isEmpty() || tokens.any { it.isEmpty() }) {
@@ -344,13 +343,12 @@ class HabitatSpawnEditorGUI(
             val range = when (parts.size) {
                 1 -> {
                     val value = parts[0].toIntOrNull() ?: return null
-                    if (value !in moonPhaseRange) return null
                     value..value
                 }
                 2 -> {
                     val start = parts[0].toIntOrNull() ?: return null
                     val end = parts[1].toIntOrNull() ?: return null
-                    if (start !in moonPhaseRange || end !in moonPhaseRange || start > end) {
+                    if (start > end) {
                         return null
                     }
                     start..end

common/src/main/kotlin/com/cobblemon/mod/common/client/net/settings/ServerSettingsPacketHandler.kt

@@ -22,6 +22,8 @@ object ServerSettingsPacketHandler : ClientNetworkPacketHandler<ServerSettingsPa
         ServerSettings.maxPokemonFriendship = packet.maxPokemonFriendship
         ServerSettings.maxDynamaxLevel = packet.maxDynamaxLevel
         ServerSettings.unlockAllMoveDexMovesByDefault = packet.unlockAllMoveDexMovesByDefault
+        ServerSettings.pokemonIntrinsicSizeMin = packet.pokemonIntrinsicSizeMin
+        ServerSettings.pokemonIntrinsicSizeMax = packet.pokemonIntrinsicSizeMax
     }
 
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/DiscShelfBlockEntityRenderer.kt

@@ -15,6 +15,7 @@ import com.cobblemon.mod.common.util.cobblemonResource
 import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.blaze3d.vertex.VertexConsumer
 import com.mojang.math.Axis
+import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.LevelRenderer
 import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.RenderType
@@ -39,13 +40,13 @@ class DiscShelfBlockEntityRenderer(ctx: BlockEntityRendererProvider.Context) :
     private val leftMargin = 1f
     private val rightMargin = 1f
     private val topMargin = 1f
-    private val bottomMargin = 1f
     private val interRowSpacing = 0f
     private val tmOverlayDepthOffset = -0.0002f
     private val slotBrightnessMultiplier = 0.65f
 
     private val tmBaseTexture = cobblemonResource("textures/block/disc_shelf/technical_machine_base.png")
     private val tmOverlayTexture = cobblemonResource("textures/block/disc_shelf/technical_machine_overlay.png")
+    private val musicDiscUnknownTexture = cobblemonResource("textures/block/disc_shelf/music_disc_unknown.png")
 
     override fun render(
         entity: DiscShelfBlockEntity,
@@ -77,7 +78,6 @@ class DiscShelfBlockEntityRenderer(ctx: BlockEntityRendererProvider.Context) :
         val slotWidth = slotWidthPixels / textureSize
         val slotHeight = slotHeightPixels / textureSize
         val verticalSpacing = (slotHeightPixels + interRowSpacing) / textureSize
-        val totalHeight = slotHeight * 7 + interRowSpacing * 6 / textureSize
         val startY = topMargin / textureSize
 
         for ((index, item) in entity.items.withIndex()) {
@@ -188,6 +188,13 @@ class DiscShelfBlockEntityRenderer(ctx: BlockEntityRendererProvider.Context) :
 
     private fun getItemTexture(itemStack: ItemStack): ResourceLocation {
         val id = BuiltInRegistries.ITEM.getKey(itemStack.item)
-        return cobblemonResource("textures/block/disc_shelf/${id.path}.png")
+        val resource = cobblemonResource("textures/block/disc_shelf/${id.path}.png")
+
+        val resourceManager = Minecraft.getInstance().resourceManager
+        if (resourceManager.getResource(resource).isEmpty) {
+            return musicDiscUnknownTexture
+        }
+
+        return resource
     }
 }

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

@@ -0,0 +1,93 @@
+/*
+ * 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.gen1
+
+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.entity.PoseType.Companion.UI_POSES
+import com.cobblemon.mod.common.util.isInWater
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class TentacoolModel(root: ModelPart) : PokemonPosableModel(root) {
+    override val rootPart = root.registerChildWithAllChildren("tentacool")
+
+    override var portraitScale = 1.2F
+    override var portraitTranslation = Vec3(0.1, 1.1, 0.0)
+
+    override var profileScale = 0.6F
+    override var profileTranslation = Vec3(0.0, 0.8, 0.0)
+
+    lateinit var standing: CobblemonPose
+    lateinit var walk: CobblemonPose
+    lateinit var swim: CobblemonPose
+    lateinit var float: CobblemonPose
+    lateinit var sleep: CobblemonPose
+    lateinit var watersleep: CobblemonPose
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("tentacool", "blink")}
+        standing = registerPose(
+            poseName = "standing",
+            poseType = PoseType.STAND,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("tentacool", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseType = PoseType.WALK,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("tentacool", "ground_idle")
+                //bedrock("tentacool", "ground_walk")
+            )
+        )
+
+        float = registerPose(
+            poseName = "float",
+            poseTypes = UI_POSES + PoseType.FLOAT,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("tentacool", "water_idle")
+            )
+        )
+
+        swim = registerPose(
+            poseName = "swim",
+            poseType = PoseType.SWIM,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("tentacool", "water_swim")
+            )
+        )
+
+        sleep = registerPose(
+                poseName = "sleep",
+                poseType = PoseType.SLEEP,
+                condition = { !it.isInWater },
+                animations = arrayOf(bedrock("tentacool", "sleep"))
+        )
+
+        watersleep = registerPose(
+                poseName = "watersleep",
+                poseType = PoseType.SLEEP,
+                condition = { it.isInWater },
+                animations = arrayOf(bedrock("tentacool", "water_sleep"))
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("tentacool", "faint") else null
+}

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

@@ -285,6 +285,7 @@ object VaryingModelRepository {
         inbuilt("rapidash", ::RapidashModel)
         inbuilt("sandslash", ::SandslashModel)
         inbuilt("tangela", ::TangelaModel)
+        inbuilt("tentacool", ::TentacoolModel)
         inbuilt("venomoth", ::VenomothModel)
         inbuilt("venonat", ::VenonatModel)
         inbuilt("elekid", ::ElekidModel)

common/src/main/kotlin/com/cobblemon/mod/common/client/settings/ServerSettings.kt

@@ -28,5 +28,7 @@ object ServerSettings {
     var maxPokemonFriendship = Cobblemon.config.maxPokemonFriendship
     var maxDynamaxLevel = Cobblemon.config.maxDynamaxLevel
     var unlockAllMoveDexMovesByDefault = Cobblemon.config.unlockAllMoveDexMovesByDefault
+    var pokemonIntrinsicSizeMin = Cobblemon.config.pokemonIntrinsicSizeMin
+    var pokemonIntrinsicSizeMax = Cobblemon.config.pokemonIntrinsicSizeMax
 
 }

common/src/main/kotlin/com/cobblemon/mod/common/config/CobblemonConfig.kt

@@ -243,18 +243,6 @@ class CobblemonConfig {
     @CobblemonConfigField(Category.Pokemon, lang = "pokemon_intrinsic_size_max", SERVER)
     var pokemonIntrinsicSizeMax = 1.05F
 
-    @CobblemonConfigField(Category.Pokemon, lang = "alpha_pokemon_size_small_multiplier", SERVER)
-    var alphaPokemonSizeSmallMultiplier = 1.70F
-
-    @CobblemonConfigField(Category.Pokemon, lang = "alpha_pokemon_size_medium_multiplier", SERVER)
-    var alphaPokemonSizeMediumMultiplier = 1.55F
-
-    @CobblemonConfigField(Category.Pokemon, lang = "alpha_pokemon_size_large_multiplier", SERVER)
-    var alphaPokemonSizeLargeMultiplier = 1.40F
-
-    @CobblemonConfigField(Category.Pokemon, lang = "alpha_pokemon_size_extra_large_multiplier", SERVER)
-    var alphaPokemonSizeExtraLargeMultiplier = 1.25F
-
     @CobblemonConfigField(Category.Pokemon, lang = "baby_pokemon_level_duration", SERVER)
     var babyPokemonLevelDuration = 9
 
@@ -347,9 +335,6 @@ class CobblemonConfig {
     // @CobblemonConfigField(Category.Riding, lang = "third_person_view_bobbing", CLIENT)
     var thirdPersonViewBobbing = true
 
-    @CobblemonConfigField(Category.Riding, lang = "invert_roll", CLIENT)
-    var invertRoll = false
-
     @CobblemonConfigField(Category.Riding, lang = "invert_pitch", CLIENT)
     var invertPitch = false
 
@@ -365,9 +350,6 @@ class CobblemonConfig {
     @CobblemonConfigField(Category.Riding, lang = "swap_x_and_y_axes", CLIENT)
     var swapXAndYAxes = false
 
-    @CobblemonConfigField(Category.Riding, lang = "automatic_righting_delay", CLIENT)
-    var rightingDelay = -1.0
-
     @CobblemonConfigField(Category.Riding, lang = "disable_roll", CLIENT)
     var disableRoll = false
 

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/settings/ServerSettingsPacket.kt

@@ -26,7 +26,9 @@ class ServerSettingsPacket internal constructor(
     val maxPokemonLevel: Int,
     val maxPokemonFriendship: Int,
     val maxDynamaxLevel: Int,
-    val unlockAllMoveDexMovesByDefault: Boolean
+    val unlockAllMoveDexMovesByDefault: Boolean,
+    val pokemonIntrinsicSizeMin: Float,
+    val pokemonIntrinsicSizeMax: Float
 ) : NetworkPacket<ServerSettingsPacket> {
     override val id = ID
     override fun encode(buffer: RegistryFriendlyByteBuf) {
@@ -37,9 +39,14 @@ class ServerSettingsPacket internal constructor(
         buffer.writeInt(Cobblemon.config.maxPokemonFriendship)
         buffer.writeInt(Cobblemon.config.maxDynamaxLevel)
         buffer.writeBoolean(Cobblemon.config.unlockAllMoveDexMovesByDefault)
+        buffer.writeFloat(Cobblemon.config.pokemonIntrinsicSizeMin)
+        buffer.writeFloat(Cobblemon.config.pokemonIntrinsicSizeMax)
     }
     companion object {
         val ID = cobblemonResource("server_settings")
-        fun decode(buffer: RegistryFriendlyByteBuf) = ServerSettingsPacket(buffer.readBoolean(), buffer.readBoolean(), buffer.readBoolean(), buffer.readInt(), buffer.readInt(), buffer.readInt(), buffer.readBoolean())
+        fun decode(buffer: RegistryFriendlyByteBuf) = ServerSettingsPacket(buffer.readBoolean(),
+            buffer.readBoolean(), buffer.readBoolean(),
+            buffer.readInt(), buffer.readInt(), buffer.readInt(),
+            buffer.readBoolean(), buffer.readFloat(), buffer.readFloat())
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/PokemonSizeCategory.kt

@@ -8,7 +8,7 @@
 
 package com.cobblemon.mod.common.pokemon
 
-import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.client.settings.ServerSettings
 
 enum class PokemonSizeCategory {
     XS,
@@ -21,7 +21,7 @@ enum class PokemonSizeCategory {
         // Find which size category corresponds to the given scale modifier.
         // The scale modifier should be between the intrinsic min and max size.
         fun fromScale(scaleModifier: Float): PokemonSizeCategory {
-            val config = Cobblemon.config
+            val config = ServerSettings //Don't use cobblemon config here as it will be used by server AND client
             val minScale = config.pokemonIntrinsicSizeMin
             val maxScale = config.pokemonIntrinsicSizeMax
             val range = (maxScale - minScale).coerceAtLeast(0.0001F)

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/OmniPathNodeMaker.kt

@@ -318,7 +318,7 @@ class OmniPathNodeMaker : NodeEvaluator() {
 
         // Hitbox thing looks confusing but if the hitbox volume is more than like, 5, it starts getting pretty
         // fucking slow to use the findAcceptedNodeWalk function
-        val strictlyWalkPathing = !canFly() && !mob.isInWater && mob.boundingBox.size < MAX_HITBOX_SIZE_FOR_WALKING
+        val strictlyWalkPathing = !canFly() && !mob.isInWater
         val doVerticalNeighbourChecks = (canFly() || mob.isInWater) && mob.boundingBox.size < MAX_HITBOX_FOR_VERTICAL_NEIGHBOURS
 
         // Non-diagonal surroundings in 3d space
@@ -623,9 +623,11 @@ class OmniPathNodeMaker : NodeEvaluator() {
 
     override fun getPathTypeOfMob(pfContext: PathfindingContext, x: Int, y: Int, z: Int, mob: Mob): PathType {
         val set = EnumSet.noneOf(PathType::class.java)
-        val sizeX = (mob.boundingBox.maxX - mob.boundingBox.minX).toInt() + 1
-        val sizeY = (mob.boundingBox.maxY - mob.boundingBox.minY).toInt() + 1
-        val sizeZ = (mob.boundingBox.maxZ - mob.boundingBox.minZ).toInt() + 1
+        // Capping the observed size of hitboxes here to put an upper limit on the cost of larger hitbox mobs
+        // Mobs larger than these caps will inevitably become stuck on obstacles as their pathing will be flawed
+        val sizeX = ((mob.boundingBox.maxX - mob.boundingBox.minX).toInt() + 1).coerceAtMost(2)
+        val sizeY = ((mob.boundingBox.maxY - mob.boundingBox.minY).toInt() + 1).coerceAtMost(3)
+        val sizeZ = ((mob.boundingBox.maxZ - mob.boundingBox.minZ).toInt() + 1).coerceAtMost(2)
 
         // TODO -- This is experimental code to see if this is meaningful. We should clean this up later when time permits.
         val returnedEarlyPathType = mutableListOf<PathType>()

common/src/main/kotlin/com/cobblemon/mod/common/util/DataKeys.kt

@@ -274,11 +274,9 @@ object DataKeys {
     // Habitat Blocks
     const val HABITAT_SPAWNING_STYLE = "SpawningStyle"
     const val HABITAT_MIMIC = "MimicId"
-    const val HABITAT_PHASE_COUNT = "PhaseCount"
     const val HABITAT_PHASE_ORDER = "PhaseOrder"
     const val HABITAT_LEVEL_RANGE = "LevelRange"
     const val HABITAT_MODIFIERS = "Modifiers"
-    const val HABITAT_POOL = "Pool"
 
     // --- Pools
     const val HABITAT_POOL_ID = "PoolId"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0062_poliwrath/poliwrath.animation.json

@@ -96,458 +96,6 @@
 				}
 			}
 		},
-		"animation.poliwrath.ground_walk": {
-			"loop": true,
-			"animation_length": 1.3333,
-			"bones": {
-				"waist": {
-					"rotation": ["9 - math.sin( q.anim_time * 90 * 6 - 45)*-4", "-math.sin( q.anim_time * 90 * 3)*8", "math.sin( q.anim_time * 90 * 3)*4"],
-					"position": [0, "-0.3+math.sin( q.anim_time * 90 * 6)*1.5", 0]
-				},
-				"torso": {
-					"rotation": ["8 - math.sin( q.anim_time * 90 * 6 - 45)*8", "-math.sin( q.anim_time * 90 * 3 - 25)*-8", "math.sin( q.anim_time * 90 * 3 - 25)*-8"],
-					"position": [0, "math.sin( q.anim_time * 90 * 6 + 45)*0.3", 0]
-				},
-				"head": {
-					"rotation": ["-math.sin( q.anim_time * 90 * 6 - 45)*-4", "-math.sin( q.anim_time * 90 * 3 - 25)*-1", 0]
-				},
-				"arm_left1": {
-					"rotation": {
-						"0.0": {
-							"post": [-13.63, -16.48493, 36.18],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [-41, 8.77773, 38.5],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [-8.15, -36.46773, 42.45],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0833": {
-							"post": [24.5, -46.5535, 23.9],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [-13.63, -16.48493, 36.18],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"arm_left2": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 61.31326, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2917": {
-							"post": [0, 70.51, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5833": {
-							"post": [0, 45.6917, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.875": {
-							"post": [0, 32.9252, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.125": {
-							"post": [0, 33.79, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [0, 61.31326, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"hand_left": {
-					"rotation": {
-						"0.0": {
-							"post": [-6.39933, 10.3524, 6.73624],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": {
-							"post": [-6.4, 10.35, 6.74],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [-6.39933, 10.3524, 6.73624],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"finger_front_left1": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 67.5],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"finger_front_left2": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 67.5],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"finger_back_left1": {
-					"rotation": [0, 0, 70]
-				},
-				"finger_back_left2": {
-					"rotation": [0, 0, 72.5]
-				},
-				"thumb_left1": {
-					"rotation": [35.65498, -41.23664, 27.4926]
-				},
-				"arm_right1": {
-					"rotation": {
-						"0.0": {
-							"post": [-8.15, 36.46773, -42.45],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4167": {
-							"post": [24.5, 46.5535, -23.9],
-							"lerp_mode": "catmullrom"
-						},
-						"0.6667": {
-							"post": [-13.63, 16.48493, -36.18],
-							"lerp_mode": "catmullrom"
-						},
-						"0.9167": {
-							"post": [-41, -8.77773, -38.5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [-8.15, 36.46773, -42.45],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"arm_right2": {
-					"rotation": {
-						"0.0": {
-							"post": [0, -45.6917, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2083": {
-							"post": [0, -32.9252, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4583": {
-							"post": [0, -33.79, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.6667": {
-							"post": [0, -61.31326, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.9583": {
-							"post": [0, -70.51, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [0, -45.6917, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"hand_right": {
-					"rotation": {
-						"0.0": {
-							"post": [-6.4, -10.35, -6.74],
-							"lerp_mode": "catmullrom"
-						},
-						"0.6667": {
-							"post": [-6.39933, -10.3524, -6.73624],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0417": {
-							"post": [-6.4, -10.35, -6.74],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [-6.4, -10.35, -6.74],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"finger_front_right1": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, -67.5],
-							"lerp_mode": "catmullrom"
-						},
-						"0.6667": {
-							"post": [0, 0, -67.5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [0, 0, -67.5],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"finger_front_right2": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, -67.5],
-							"lerp_mode": "catmullrom"
-						},
-						"0.6667": {
-							"post": [0, 0, -67.5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [0, 0, -67.5],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"finger_back_right1": {
-					"rotation": {
-						"0.0": [0, 0, -70],
-						"0.6667": [0, 0, -70],
-						"1.3333": [0, 0, -70]
-					}
-				},
-				"finger_back_right2": {
-					"rotation": {
-						"0.0": [0, 0, -72.5],
-						"0.6667": [0, 0, -72.5],
-						"1.3333": [0, 0, -72.5]
-					}
-				},
-				"leg_left": {
-					"rotation": {
-						"0.0": [-3.5, 0, 0],
-						"0.25": [28, 0, 0],
-						"0.3333": [27, 0, 0],
-						"0.4583": [36, 0, 0],
-						"0.6667": {
-							"pre": [-1, 0, 0],
-							"post": [-1, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.8333": {
-							"post": [-57.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0833": [-35, 0, 0],
-						"1.3333": [-3.5, 0, 0]
-					},
-					"position": {
-						"0.0": [0, -0.3, 0],
-						"0.25": [0, -1.1, 2.3],
-						"0.3333": [0, 0.25, 2.3],
-						"0.4583": [0, 0.2, 1.8],
-						"0.6667": {
-							"pre": [0, 0.9, -0.4],
-							"post": [0, 0.9, -0.4],
-							"lerp_mode": "catmullrom"
-						},
-						"0.8333": {
-							"post": [0, 0.8, -2.3],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0": [0, -0.7, -2.3],
-						"1.0833": [0, -1.3, -2.3],
-						"1.3333": [0, -0.3, 0]
-					}
-				},
-				"leg_left2": {
-					"rotation": {
-						"0.0": [9, 0, 0],
-						"0.25": [5, 0, 0],
-						"0.3333": [14, 0, 0],
-						"0.4583": [33, 0, 0],
-						"0.5417": {
-							"pre": [57.7, 0, 0],
-							"post": [57.7, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.6667": {
-							"post": [53, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.8333": {
-							"post": [34.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0": [17, 0, 0],
-						"1.0833": [13, 0, 0],
-						"1.3333": [9, 0, 0]
-					}
-				},
-				"foot_left": {
-					"rotation": {
-						"0.0": [-5, 0, 0],
-						"0.25": [-32, 0, 0],
-						"0.3333": [1.5, 0, 0],
-						"0.5": {
-							"pre": [29, 0, 0],
-							"post": [29, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.6667": {
-							"post": [-1, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0": [-13, 0, 0],
-						"1.0833": [22, 0, 0],
-						"1.3333": [-5, 0, 0]
-					}
-				},
-				"toes_left": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, 0, 0],
-						"0.3333": [-41, 0, 0],
-						"0.5": {
-							"pre": [-19, 0, 0],
-							"post": [-19, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.6667": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.875": {
-							"post": [-23.89, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0417": {
-							"post": [-20.18, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0833": [0, 0, 0],
-						"1.3333": [0, 0, 0]
-					}
-				},
-				"leg_right": {
-					"rotation": {
-						"0.0": {
-							"post": [-1, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.1667": {
-							"post": [-57.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4167": [-35, 0, 0],
-						"0.6667": [-3.5, 0, 0],
-						"0.9167": [28, 0, 0],
-						"1.0": [27, 0, 0],
-						"1.125": [36, 0, 0],
-						"1.3333": {
-							"pre": [-1, 0, 0],
-							"post": [-1, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					},
-					"position": {
-						"0.0": {
-							"post": [0, 0.9, -0.4],
-							"lerp_mode": "catmullrom"
-						},
-						"0.1667": {
-							"post": [0, 0.8, -2.3],
-							"lerp_mode": "catmullrom"
-						},
-						"0.3333": [0, -0.7, -2.3],
-						"0.4167": [0, -1.3, -2.3],
-						"0.6667": [0, -0.3, 0],
-						"0.9167": [0, -1.1, 2.3],
-						"1.0": [0, 0.25, 2.3],
-						"1.125": [0, 0.2, 1.8],
-						"1.3333": {
-							"pre": [0, 0.9, -0.4],
-							"post": [0, 0.9, -0.4],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"leg_right2": {
-					"rotation": {
-						"0.0": {
-							"post": [53, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.1667": {
-							"post": [34.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.3333": [17, 0, 0],
-						"0.4167": [13, 0, 0],
-						"0.9167": [5, 0, 0],
-						"1.0": [-1, 0, 0],
-						"1.125": [33, 0, 0],
-						"1.2083": {
-							"pre": [57.7, 0, 0],
-							"post": [57.7, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [53, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"foot_right": {
-					"rotation": {
-						"0.0": {
-							"post": [-1, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.3333": [-13, 0, 0],
-						"0.4167": [22, 0, 0],
-						"0.9167": [-32, 0, 0],
-						"1.0": [-6, 0, 0],
-						"1.1667": {
-							"pre": [29, 0, 0],
-							"post": [29, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [-1, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"toes_right": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2083": {
-							"post": [-23.89, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": {
-							"post": [-20.18, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4167": [0, 0, 0],
-						"0.9167": [0, 0, 0],
-						"1.0": [-41, 0, 0],
-						"1.1667": {
-							"pre": [-19, 0, 0],
-							"post": [-19, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				}
-			}
-		},
 		"animation.poliwrath.battle_idle": {
 			"loop": true,
 			"bones": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0120_staryu/staryu.animation.json

@@ -38,496 +38,6 @@
 				}
 			}
 		},
-		"animation.staryu.physical": {
-			"loop": true,
-			"animation_length": 3,
-			"bones": {
-				"body": {
-					"rotation": {
-						"0.0": {
-							"post": [0.2, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [12.8384, 24.0851, -4.3796],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4167": {
-							"post": [17.8384, 24.0851, -4.3796],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5417": [-90, 0, 0],
-						"0.7917": [-90, 0, 0],
-						"0.8333": [-90, 0, 0],
-						"0.875": {"pre": [-90, 0, 0], "post": [-90, 360, 0]},
-						"1.1667": [-90, 360, 0],
-						"1.25": {
-							"pre": [0, 277.5, 0],
-							"post": [0, 277.5, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.4167": {
-							"post": [6.39, 117.88, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [5.48, -33.58, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.2083": {
-							"post": [21.1183, -47.3658, -26.7217],
-							"lerp_mode": "catmullrom"
-						},
-						"2.5417": {
-							"post": [0, 15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"3.0": {
-							"post": [0.2, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					},
-					"position": {
-						"0.0": {
-							"post": [0, 0.18, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2083": {
-							"post": [0, -0.82, -1],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4167": {
-							"post": [0, -0.82, -1.4],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [6.02, 0.94, 0.77],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5833": {
-							"post": [13.15, -0.88, 3.58],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [15, -3, 5.6],
-							"lerp_mode": "catmullrom"
-						},
-						"0.6667": {
-							"post": [14.57, -5.35, 6.54],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": {
-							"post": [13.35, -3.68, 8.94],
-							"lerp_mode": "catmullrom"
-						},
-						"0.8333": {
-							"post": [11.93, -5.63, 11.86],
-							"lerp_mode": "catmullrom"
-						},
-						"0.875": {
-							"post": [11.18, -5.08, 13.37],
-							"lerp_mode": "catmullrom"
-						},
-						"0.9583": {
-							"post": [7, -6, 14.6],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0417": {
-							"post": [-6.26, -6.52, 13.55],
-							"lerp_mode": "catmullrom"
-						},
-						"1.125": {
-							"post": [-15, -6, 1.6],
-							"lerp_mode": "catmullrom"
-						},
-						"1.25": [1, 1.4, -20.4],
-						"1.2917": [0.43, 1.45, -20.36],
-						"1.3333": [-1.24, 1.49, -21.13],
-						"1.375": [-1.88, 1.68, -22.94],
-						"1.4167": [-1.54, 1.81, -24.12],
-						"1.5417": [-0.88, 1.67, -23.04],
-						"1.625": [-1.19, 1.92, -22.77],
-						"1.75": [-2.72, 1.42, -23.27],
-						"1.9167": [-3.9, 0.72, -26.2],
-						"2.0": [-3.13, -0.04, -27.22],
-						"2.125": {
-							"pre": [-2.63, -1.14, -29.12],
-							"post": [-2.63, -1.14, -29.12],
-							"lerp_mode": "catmullrom"
-						},
-						"2.2083": {
-							"post": [-2.2, 5.12, -21.92],
-							"lerp_mode": "catmullrom"
-						},
-						"2.3333": {
-							"post": [-1.31, 8.05, -13.11],
-							"lerp_mode": "catmullrom"
-						},
-						"2.4583": {
-							"post": [-0.45, 6.18, -4.51],
-							"lerp_mode": "catmullrom"
-						},
-						"2.5417": {
-							"post": [0, 0.18, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.7083": {
-							"post": [0.03, -1.22, 0.37],
-							"lerp_mode": "catmullrom"
-						},
-						"3.0": {
-							"post": [0, 0.18, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"body_limb_left3": {
-					"rotation": {
-						"0.0": [0, 2.5, 0],
-						"3.0": [0, 2.5, 0]
-					}
-				},
-				"body_limb_bottom_left3": {
-					"rotation": {
-						"0.0": [-5, 0, 0],
-						"3.0": [-5, 0, 0]
-					}
-				},
-				"body_limb_top3": {
-					"rotation": {
-						"0.0": [2.5, 0, 0],
-						"3.0": [2.5, 0, 0]
-					}
-				},
-				"body_limb_left": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 7.5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.2083": {
-							"post": [0, 0, 7.5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.375": {
-							"post": [-10, -20, 20],
-							"lerp_mode": "catmullrom"
-						},
-						"1.875": {
-							"post": [0, 0, 7.5],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [5.1686, 19.3385, 5.9149],
-							"lerp_mode": "catmullrom"
-						},
-						"2.125": {
-							"post": [4.7679, 3.7657, 12.0388],
-							"lerp_mode": "catmullrom"
-						},
-						"2.1667": {
-							"post": [0, 5, 15],
-							"lerp_mode": "catmullrom"
-						},
-						"3.0": {
-							"post": [0, 0, 7.5],
-							"lerp_mode": "catmullrom"
-						}
-					},
-					"scale": {
-						"2.125": [1, 1, 1],
-						"2.1667": [1.2, 0.9, 1],
-						"2.2083": [1, 1, 1]
-					}
-				},
-				"body_limb_bottom_left": {
-					"rotation": {
-						"0.0": [0.3, 0, 2.15],
-						"2.5833": [8.66217, -7.5105, 6.41838],
-						"2.7083": [-2.3895, -8.7088, 4.394],
-						"3.0": [0.3, 0, 2.15]
-					}
-				},
-				"body_limb_right": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, -7.5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.2083": {
-							"post": [0, 0, -7.5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [0, -15, -7.5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.8333": {
-							"post": [0, 0, -7.5],
-							"lerp_mode": "catmullrom"
-						},
-						"3.0": {
-							"post": [0, 0, -7.5],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"body_limb_bottom_right": {
-					"rotation": {
-						"0.0": {
-							"post": [0.3, 0, -2.15],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [-12.5699, -2.2333, 16.2155],
-							"lerp_mode": "catmullrom"
-						},
-						"0.3333": {
-							"post": [-17.0419, 2.0337, 17.6707],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4167": {
-							"post": [-11.9836, 2.1592, 17.6561],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4583": {
-							"post": [0.2897, -0.0776, 12.85],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5833": {
-							"post": [0.3, 0, -2.15],
-							"lerp_mode": "catmullrom"
-						},
-						"2.5833": [-9.7324, -5.0125, 8.4786],
-						"2.7083": [-21.5994, 2.9166, 17.3467],
-						"3.0": {
-							"pre": [0.3, 0, -2.15],
-							"post": [0.3, 0, -2.15],
-							"lerp_mode": "catmullrom"
-						}
-					},
-					"scale": {
-						"0.4167": [1, 1, 1],
-						"0.4583": [1, 1.1, 1],
-						"0.5": [1, 1, 1]
-					}
-				},
-				"body_limb_bottom_right3": {
-					"rotation": {
-						"0.0": [-5, 0, 0],
-						"3.0": [-5, 0, 0]
-					}
-				},
-				"body_limb_top": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"3.0": [0, 0, 0]
-					}
-				},
-				"face": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"2.5833": [0, 0, 0],
-						"2.7083": [0, -7.5, 0],
-						"2.875": [0, 0, 0]
-					}
-				},
-				"body_limb_top2": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2083": {
-							"post": [-7.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4167": {
-							"post": [12.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5417": {
-							"post": [-12.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.6667": {
-							"post": [0, 0, 5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.1667": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"body_limb_left2": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.1667": {
-							"post": [0, -12.5, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2917": {
-							"post": [-0.0298, 17.7172, 0.0411],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [-0.1175, -19.5709, 0.2845],
-							"lerp_mode": "catmullrom"
-						},
-						"0.7083": {
-							"post": [0, 0, 12.5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0833": {
-							"post": [0, 0, 12.5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.2083": {
-							"post": [-0.0112, -22.4314, 11.7901],
-							"lerp_mode": "catmullrom"
-						},
-						"1.375": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": [0, 0, 0],
-						"2.0833": [13.4251, -35.9563, -26.0018],
-						"2.125": [17.7735, -35.6335, -34.2819],
-						"2.1667": [0, 0, 0]
-					}
-				},
-				"body_limb_right2": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.1667": {
-							"post": [0, 12.5, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2917": {
-							"post": [-0.0298, -17.7172, -0.0411],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [-0.1175, 19.5709, -0.2845],
-							"lerp_mode": "catmullrom"
-						},
-						"0.7083": {
-							"post": [0, 0, 12.5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0833": {
-							"post": [0, 0, 12.5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.2083": {
-							"post": [-0.0112, 22.4314, 11.7901],
-							"lerp_mode": "catmullrom"
-						},
-						"1.375": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"body_limb_bottom_left2": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"2.5833": [0, 0, 0],
-						"2.7083": [42.9952, 6.5597, 2.4923],
-						"3.0": [0, 0, 0]
-					}
-				},
-				"body_limb_bottom_right2": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [-18.586, -7.5206, -21.2677],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4167": {
-							"post": [-22.8925, -9.0864, -26.0667],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4583": {
-							"post": [20.9813, -9.8466, 17.4953],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5833": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": {
-							"post": [0, 0, -10],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0833": {
-							"post": [0, 0, -10],
-							"lerp_mode": "catmullrom"
-						},
-						"1.2083": {
-							"post": [29.7624, 0.4222, -0.417],
-							"lerp_mode": "catmullrom"
-						},
-						"1.8333": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.25": {
-							"post": [-13.6038, -3.6461, -10.334],
-							"lerp_mode": "catmullrom"
-						},
-						"2.4583": [-8.1623, 0.0203, 12.7371],
-						"2.5833": [0, 0, 0],
-						"2.7083": [35.3924, 9.0867, -26.0666],
-						"3.0": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"torso": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, 0, 0],
-						"0.2917": [0, 0, 0],
-						"0.3333": {"pre": [0, 0, 0], "post": [0, 0, 1080]},
-						"0.4167": [0, 0, 1080],
-						"0.875": {
-							"pre": [0, 0, 780],
-							"post": [0, 0, 780],
-							"lerp_mode": "catmullrom"
-						},
-						"1.25": [0, 0, 201],
-						"1.8333": [0, 0, 153.14],
-						"2.0833": {
-							"pre": [0, 0, 148.3],
-							"post": [0, 0, 148.3],
-							"lerp_mode": "catmullrom"
-						},
-						"2.2917": {
-							"post": [0, 0, 153.14],
-							"lerp_mode": "catmullrom"
-						},
-						"2.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"3.0": [0, 0, 0]
-					}
-				}
-			}
-		},
 		"animation.staryu.ground_walk": {
 			"loop": true,
 			"animation_length": 1.6,

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0096_drowzee/drowzee.geo.json

@@ -55,7 +55,7 @@
 				{
 					"name": "torso",
 					"parent": "body",
-					"pivot": [0, 8, -0.25],
+					"pivot": [0, 8, 0.75],
 					"cubes": [
 						{"origin": [-5.5, 4.5, -6.5], "size": [11, 9, 12], "uv": [1, 1]}
 					]
@@ -63,7 +63,7 @@
 				{
 					"name": "upper_torso",
 					"parent": "torso",
-					"pivot": [0, 12.5, 0.75],
+					"pivot": [0, 12.5, 1.75],
 					"cubes": [
 						{"origin": [-4.5, 12, -5.25], "size": [9, 5, 10], "uv": [2, 24]}
 					]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0097_hypno/hypno_female.geo.json

@@ -134,12 +134,12 @@
 				{
 					"name": "nose",
 					"parent": "head_angle",
-					"pivot": [0, 27.25, -4.75],
+					"pivot": [0.5, 24.55, -4.75],
 					"rotation": [17.5, 0, 0],
 					"cubes": [
-						{"origin": [-1.5, 23.88496, -8.81691], "size": [3, 1, 4], "inflate": 0.01, "uv": [65, 28]},
-						{"origin": [-1.5, 24.90496, -6.81691], "size": [3, 1, 3], "inflate": 0.01, "uv": [60, 52]},
-						{"origin": [-1.5, 24.8963, -9.08986], "size": [3, 1, 5], "pivot": [0.03, 25.8863, -7.08986], "rotation": [30, 0, 0], "uv": [46, 26]}
+						{"origin": [-1.5, 23.76, -8.005], "size": [3, 1, 4], "inflate": 0.01, "uv": [65, 28]},
+						{"origin": [-1.5, 24.78, -6.005], "size": [3, 1, 3], "inflate": 0.01, "uv": [60, 52]},
+						{"origin": [-1.5, 24.77134, -8.27795], "size": [3, 1, 5], "pivot": [0.03, 25.76134, -6.27795], "rotation": [30, 0, 0], "uv": [46, 26]}
 					]
 				},
 				{
@@ -334,14 +334,6 @@
 						{"origin": [-2, 23.5, -4.65], "size": [4, 2, 0], "inflate": 0.01, "uv": [67, 61]}
 					]
 				},
-				{
-					"name": "mouth_o",
-					"parent": "head_angle",
-					"pivot": [0, 24, 1.35],
-					"cubes": [
-						{"origin": [-0.5, 23.5, -4.65], "size": [1, 2, 0], "inflate": 0.01, "uv": [76, 53]}
-					]
-				},
 				{
 					"name": "neck_fluff",
 					"parent": "upper_torso",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0097_hypno/hypno_male.geo.json

@@ -334,14 +334,6 @@
 						{"origin": [-2, 23.5, -4.65], "size": [4, 2, 0], "inflate": 0.01, "uv": [67, 61]}
 					]
 				},
-				{
-					"name": "mouth_o",
-					"parent": "head_angle",
-					"pivot": [0, 24, 1.35],
-					"cubes": [
-						{"origin": [-0.5, 23.5, -4.65], "size": [1, 2, 0], "inflate": 0.01, "uv": [76, 53]}
-					]
-				},
 				{
 					"name": "neck_fluff",
 					"parent": "upper_torso",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0120_staryu/staryu.geo.json

@@ -18,20 +18,41 @@
 				{
 					"name": "body",
 					"parent": "staryu",
-					"pivot": [0, 8.35, -0.25]
-				},
-				{
-					"name": "torso",
-					"parent": "body",
-					"pivot": [0, 8.35, -0.25],
+					"pivot": [0, 8.75, -0.25],
 					"cubes": [
 						{"origin": [-3, 5.3, -2.1], "size": [6, 6, 5], "inflate": -0.05, "uv": [0, 0]},
 						{"origin": [-0.5, 9.27, 1.87], "size": [1, 2, 1], "inflate": -0.01, "uv": [1, 2]}
 					]
 				},
+				{
+					"name": "face",
+					"parent": "body",
+					"pivot": [0, 8.25, -0.9],
+					"cubes": [
+						{"origin": [-3.5, 4.75, -3.1], "size": [7, 7, 1], "inflate": 0.11, "uv": [0, 20]},
+						{"origin": [-4, 4.25, -3.25], "size": [8, 8, 1], "inflate": 0.25, "uv": [0, 11]},
+						{"origin": [-1.5, 6.75, -4.15], "size": [3, 3, 1], "inflate": 0.1, "uv": [17, 0]}
+					]
+				},
+				{
+					"name": "locator_eye",
+					"parent": "face",
+					"pivot": [0, 8.2, -4.25],
+					"locators": {
+						"eye1": [0, 8.2, -4.25]
+					}
+				},
+				{
+					"name": "gem_emissive",
+					"parent": "face",
+					"pivot": [0, 8.25, -3.65],
+					"cubes": [
+						{"origin": [-1.5, 6.75, -4.15], "size": [3, 3, 1], "inflate": 0.11, "uv": [36, 0]}
+					]
+				},
 				{
 					"name": "body_limbs",
-					"parent": "torso",
+					"parent": "body",
 					"pivot": [0, 8.5, -0.25]
 				},
 				{
@@ -118,32 +139,6 @@
 					"cubes": [
 						{"origin": [-1.75, -1.55, -1], "size": [3, 4, 2], "inflate": 0.15, "uv": [52, 21], "mirror": true}
 					]
-				},
-				{
-					"name": "face",
-					"parent": "torso",
-					"pivot": [0, 8.25, -0.9],
-					"cubes": [
-						{"origin": [-3.5, 4.75, -3.1], "size": [7, 7, 1], "inflate": 0.11, "uv": [0, 20]},
-						{"origin": [-4, 4.25, -3.25], "size": [8, 8, 1], "inflate": 0.25, "uv": [0, 11]},
-						{"origin": [-1.5, 6.75, -4.15], "size": [3, 3, 1], "inflate": 0.1, "uv": [17, 0]}
-					]
-				},
-				{
-					"name": "locator_eye",
-					"parent": "face",
-					"pivot": [0, 8.2, -4.25],
-					"locators": {
-						"eye1": [0, 8.2, -4.25]
-					}
-				},
-				{
-					"name": "gem_emissive",
-					"parent": "face",
-					"pivot": [0, 8.25, -3.65],
-					"cubes": [
-						{"origin": [-1.5, 6.75, -4.15], "size": [3, 3, 1], "inflate": 0.11, "uv": [36, 0]}
-					]
 				}
 			]
 		}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0121_starmie/starmie.geo.json

@@ -42,8 +42,7 @@
 					"parent": "face",
 					"pivot": [0, 12.5, -8.4],
 					"locators": {
-						"eye1": [0, 12.5, -8.4],
-						"special": [0, 12.5, -8.4]
+						"eye1": [0, 12.5, -8.4]
 					}
 				},
 				{

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0164_noctowl/noctowl.geo.json

@@ -6,7 +6,7 @@
 				"identifier": "geometry.noctowl",
 				"texture_width": 128,
 				"texture_height": 128,
-				"visible_bounds_width": 7,
+				"visible_bounds_width": 6,
 				"visible_bounds_height": 3.5,
 				"visible_bounds_offset": [0, 1.25, 0]
 			},
@@ -361,21 +361,13 @@
 					"parent": "wing_open_left2",
 					"pivot": [19, 23.5, 0],
 					"cubes": [
-						{"origin": [19, 11.5, 0], "size": [7, 13, 0], "inflate": 0.02, "uv": [16, 101]},
+						{"origin": [19, 10.5, 0], "size": [14, 14, 0], "inflate": 0.02, "uv": [0, 63]},
 						{"origin": [17, 10.5, 0], "size": [2, 14, 0], "inflate": 0.02, "uv": [56, 92]},
 						{"origin": [19, 17.5, -0.5], "size": [6, 7, 1], "inflate": 0.02, "uv": [84, 25]},
 						{"origin": [19, 17.5, -0.5], "size": [6, 0, 1], "inflate": 0.02, "pivot": [22, 17.5, 0], "rotation": [0.5, 0, 0], "uv": [60, 23]},
 						{"origin": [25, 17.5, -0.5], "size": [0, 7, 1], "inflate": 0.02, "pivot": [25, 21, 0], "rotation": [0, -0.5, 0], "uv": [54, 79]}
 					]
 				},
-				{
-					"name": "wing_open_left4",
-					"parent": "wing_open_left3",
-					"pivot": [25, 23.5, 0],
-					"cubes": [
-						{"origin": [25, 14.5, 0], "size": [8, 9, 0], "inflate": 0.02, "uv": [18, 115]}
-					]
-				},
 				{
 					"name": "wing_open_right1",
 					"parent": "wings_open",
@@ -410,21 +402,13 @@
 					"parent": "wing_open_right2",
 					"pivot": [-19, 23.5, 0],
 					"cubes": [
-						{"origin": [-26, 11.5, 0], "size": [7, 13, 0], "inflate": 0.02, "uv": [1, 101]},
+						{"origin": [-33, 10.5, 0], "size": [14, 14, 0], "inflate": 0.02, "uv": [28, 65]},
 						{"origin": [-19, 10.5, 0], "size": [2, 14, 0], "inflate": 0.02, "uv": [68, 92]},
 						{"origin": [-25, 17.5, -0.5], "size": [6, 7, 1], "inflate": 0.02, "uv": [88, 73]},
 						{"origin": [-25, 17.5, -0.5], "size": [6, 0, 1], "inflate": 0.02, "pivot": [-22, 17.5, 0], "rotation": [0.5, 0, 0], "uv": [60, 24]},
 						{"origin": [-25, 17.5, -0.5], "size": [0, 7, 1], "inflate": 0.02, "pivot": [-25, 21, 0], "rotation": [0, 0.5, 0], "uv": [96, 3]}
 					]
 				},
-				{
-					"name": "wing_open_right4",
-					"parent": "wing_open_right3",
-					"pivot": [-25, 23.5, 0],
-					"cubes": [
-						{"origin": [-33, 14.5, 0], "size": [8, 9, 0], "inflate": 0.02, "uv": [1, 115]}
-					]
-				},
 				{
 					"name": "wings_closed",
 					"parent": "torso",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0884_duraludon/duraludon.geo.json

@@ -494,14 +494,6 @@
 						"tail_tip": [0, 12.25, 19.25]
 					}
 				},
-				{
-					"name": "locator_seat_1",
-					"parent": "tail",
-					"pivot": [0, 16, 12],
-					"locators": {
-						"seat_1": [0, 16, 12]
-					}
-				},
 				{
 					"name": "legs",
 					"parent": "body",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0954_rabsca/rabsca.geo.json

@@ -1,439 +1,450 @@
 {
-  "format_version": "1.12.0",
-  "minecraft:geometry": [
-    {
-      "description": {
-        "identifier": "geometry.rabsca",
-        "texture_width": 256,
-        "texture_height": 128,
-        "visible_bounds_width": 4,
-        "visible_bounds_height": 5.5,
-        "visible_bounds_offset": [0, 2.25, 0]
-      },
-      "bones": [
-        {
-          "name": "rabsca",
-          "pivot": [0, 0, 0]
-        },
-        {
-          "name": "body2",
-          "parent": "rabsca",
-          "pivot": [0, 26, 0]
-        },
-        {
-          "name": "body",
-          "parent": "body2",
-          "pivot": [0, 10, 0]
-        },
-        {
-          "name": "torso",
-          "parent": "body",
-          "pivot": [0, 8, 0],
-          "cubes": [
-            {"origin": [-4, 10, -2.5], "size": [8, 8, 5], "uv": [0, 9]},
-            {"origin": [-3.5, 10.52, 2.52], "size": [7, 7, 0], "uv": [52, 28]}
-          ]
-        },
-        {
-          "name": "legs",
-          "parent": "torso",
-          "pivot": [0, 14, -2.5]
-        },
-        {
-          "name": "leg_left",
-          "parent": "legs",
-          "pivot": [3.5, 14, -2.5],
-          "rotation": [0, 5, 0],
-          "cubes": [
-            {"origin": [2, 13.5, -2.5], "size": [6, 2, 0], "uv": [23, 0]}
-          ]
-        },
-        {
-          "name": "leg_left2",
-          "parent": "leg_left",
-          "pivot": [8, 15.5, -2.5],
-          "cubes": [
-            {"origin": [5, 15.5, -2.5], "size": [4, 5, 0], "inflate": 0.01, "uv": [35, 0]}
-          ]
-        },
-        {
-          "name": "leg_left3",
-          "parent": "leg_left2",
-          "pivot": [9, 20.5, -2.5],
-          "cubes": [
-            {"origin": [4, 20.5, -2.5], "size": [5, 5, 0], "inflate": 0.02, "uv": [26, 10]}
-          ]
-        },
-        {
-          "name": "leg_right",
-          "parent": "legs",
-          "pivot": [-3.5, 14, -2.5],
-          "rotation": [0, -5, 0],
-          "cubes": [
-            {"origin": [-8, 13.5, -2.5], "size": [6, 2, 0], "uv": [23, 2], "mirror": true}
-          ]
-        },
-        {
-          "name": "leg_right2",
-          "parent": "leg_right",
-          "pivot": [-8, 15.5, -2.5],
-          "cubes": [
-            {"origin": [-9, 15.5, -2.5], "size": [4, 5, 0], "inflate": 0.01, "uv": [28, 5], "mirror": true}
-          ]
-        },
-        {
-          "name": "leg_right3",
-          "parent": "leg_right2",
-          "pivot": [-9, 20.5, -2.5],
-          "cubes": [
-            {"origin": [-9, 20.5, -2.5], "size": [5, 5, 0], "inflate": 0.02, "uv": [36, 5], "mirror": true}
-          ]
-        },
-        {
-          "name": "head",
-          "parent": "torso",
-          "pivot": [0, 10.5, 0],
-          "cubes": [
-            {"origin": [-4.5, 6.5, -2.5], "size": [9, 4, 5], "inflate": 0.01, "uv": [0, 0]},
-            {"origin": [1.25, 4.75, -0.25], "size": [0, 4, 3], "pivot": [1.25, 8.25, 2.6], "rotation": [15, 0, -5], "uv": [0, 19]},
-            {"origin": [2.5, 5, -0.25], "size": [0, 4, 3], "pivot": [2.5, 8.25, 2.6], "rotation": [15, 0, -20], "uv": [0, 23]},
-            {"origin": [-1.25, 4.75, -0.25], "size": [0, 4, 3], "pivot": [-1.25, 8.25, 2.6], "rotation": [15, 0, 5], "uv": [6, 19], "mirror": true},
-            {"origin": [-2.5, 5, -0.25], "size": [0, 4, 3], "pivot": [-2.5, 8.25, 2.6], "rotation": [15, 0, 20], "uv": [6, 23], "mirror": true},
-            {"origin": [-0.5, 6.71716, -2.67], "size": [1, 1, 1], "inflate": -0.15, "pivot": [0, 7.21716, -2.17], "rotation": [0, 0, 45], "uv": [21, 9]}
-          ]
-        },
-        {
-          "name": "nose",
-          "parent": "head",
-          "pivot": [0, 10.5, -2.5],
-          "rotation": [12.5, 0, 0],
-          "cubes": [
-            {"origin": [-1, 9.5, -2.51], "size": [2, 2, 1], "pivot": [0, 10.5, -2], "rotation": [0, 0, -45], "uv": [57, 0]}
-          ]
-        },
-        {
-          "name": "beard",
-          "parent": "head",
-          "pivot": [0, 10.5, -2.5],
-          "rotation": [5, 0, 0]
-        },
-        {
-          "name": "beard_middle",
-          "parent": "beard",
-          "pivot": [0, 10.5, -2.5],
-          "rotation": [2.5, 0, 0],
-          "cubes": [
-            {"origin": [-3, 10.25, -2.5], "size": [6, 2, 0], "uv": [26, 15]}
-          ]
-        },
-        {
-          "name": "beard_left",
-          "parent": "beard",
-          "pivot": [2.5, 10.5, -2.5],
-          "rotation": [0, 0, 42.5]
-        },
-        {
-          "name": "beard_left_rotation",
-          "parent": "beard_left",
-          "pivot": [2.5, 10.5, -2.5],
-          "rotation": [5, 0, 0],
-          "cubes": [
-            {"origin": [2.5, 10, -2.5], "size": [2, 4, 0], "uv": [26, 17]}
-          ]
-        },
-        {
-          "name": "beard_left2",
-          "parent": "beard_left_rotation",
-          "pivot": [2.5, 14, -2.5],
-          "cubes": [
-            {"origin": [2.5, 14, -2.5], "size": [4, 3, 0], "inflate": 0.01, "uv": [38, 15]}
-          ]
-        },
-        {
-          "name": "beard_left3",
-          "parent": "beard_left2",
-          "pivot": [6.5, 16, -2.5],
-          "rotation": [0, 0, 5],
-          "cubes": [
-            {"origin": [6.5, 14, -2.5], "size": [6, 4, 0], "inflate": 0.02, "uv": [46, 17]}
-          ]
-        },
-        {
-          "name": "beard_left4",
-          "parent": "beard_left3",
-          "pivot": [12.5, 18, -2.5],
-          "rotation": [0, 0, 5],
-          "cubes": [
-            {"origin": [12.5, 13, -2.5], "size": [8, 5, 0], "inflate": 0.01, "uv": [36, 21]}
-          ]
-        },
-        {
-          "name": "beard_right",
-          "parent": "beard",
-          "pivot": [-2.5, 10.5, -2.5],
-          "rotation": [0, 0, -42.5]
-        },
-        {
-          "name": "beard_right_rotation",
-          "parent": "beard_right",
-          "pivot": [-2.5, 10.5, -2.5],
-          "rotation": [5, 0, 0],
-          "cubes": [
-            {"origin": [-4.5, 10, -2.5], "size": [2, 4, 0], "uv": [30, 17], "mirror": true}
-          ]
-        },
-        {
-          "name": "beard_right2",
-          "parent": "beard_right_rotation",
-          "pivot": [-2.5, 14, -2.5],
-          "cubes": [
-            {"origin": [-6.5, 14, -2.5], "size": [4, 3, 0], "inflate": 0.01, "uv": [34, 18], "mirror": true}
-          ]
-        },
-        {
-          "name": "beard_right3",
-          "parent": "beard_right2",
-          "pivot": [-6.5, 16, -2.5],
-          "rotation": [0, 0, -5],
-          "cubes": [
-            {"origin": [-12.5, 14, -2.5], "size": [6, 4, 0], "inflate": 0.02, "uv": [52, 21], "mirror": true}
-          ]
-        },
-        {
-          "name": "beard_right4",
-          "parent": "beard_right3",
-          "pivot": [-12.5, 18, -2.5],
-          "rotation": [0, 0, -5],
-          "cubes": [
-            {"origin": [-20.5, 13, -2.5], "size": [8, 5, 0], "inflate": 0.01, "uv": [36, 26], "mirror": true}
-          ]
-        },
-        {
-          "name": "eyebrow_left",
-          "parent": "head",
-          "pivot": [1.5, 6.5, -2.52],
-          "rotation": [-2.5, 0, -15],
-          "cubes": [
-            {"origin": [1.5, 1, -2.52], "size": [3, 7, 0], "uv": [57, 3]}
-          ]
-        },
-        {
-          "name": "eyebrow_right",
-          "parent": "head",
-          "pivot": [-1.5, 6.5, -2.52],
-          "rotation": [-2.5, 0, 15],
-          "cubes": [
-            {"origin": [-4.5, 1, -2.52], "size": [3, 7, 0], "uv": [56, 10], "mirror": true}
-          ]
-        },
-        {
-          "name": "eyes",
-          "parent": "head",
-          "pivot": [0, 9, -2.52]
-        },
-        {
-          "name": "eye_left",
-          "parent": "eyes",
-          "pivot": [2, 9.5, -2.52],
-          "rotation": [0, 0, 10]
-        },
-        {
-          "name": "eye_open_left",
-          "parent": "eye_left",
-          "pivot": [2, 9.5, -2.42],
-          "cubes": [
-            {"origin": [1, 8.8, -2.41], "size": [2, 1.4, 0], "inflate": 0.01, "uv": [0, 9]}
-          ]
-        },
-        {
-          "name": "pupil_left",
-          "parent": "eye_open_left",
-          "pivot": [2, 9.5, -2.43],
-          "cubes": [
-            {"origin": [1.5, 9, -2.43], "size": [1, 1, 0], "pivot": [2, 9.5, -2.43], "rotation": [0, 0, 45], "uv": [0, 11]}
-          ]
-        },
-        {
-          "name": "eye_closed_left",
-          "parent": "eye_left",
-          "pivot": [2, 9.5, -2.52],
-          "cubes": [
-            {"origin": [1, 9, -2.52], "size": [2, 1, 0], "uv": [0, 0]}
-          ]
-        },
-        {
-          "name": "eye_right",
-          "parent": "eyes",
-          "pivot": [-2, 9.5, -2.52],
-          "rotation": [0, 0, -10]
-        },
-        {
-          "name": "eye_open_right",
-          "parent": "eye_right",
-          "pivot": [-2, 9.5, -2.42],
-          "cubes": [
-            {"origin": [-3, 8.8, -2.41], "size": [2, 1.4, 0], "inflate": 0.01, "uv": [0, 10], "mirror": true}
-          ]
-        },
-        {
-          "name": "pupil_right",
-          "parent": "eye_open_right",
-          "pivot": [-2, 9.5, -2.43],
-          "cubes": [
-            {"origin": [-2.5, 9, -2.43], "size": [1, 1, 0], "pivot": [-2, 9.5, -2.43], "rotation": [0, 0, -45], "uv": [0, 12], "mirror": true}
-          ]
-        },
-        {
-          "name": "eye_closed_right",
-          "parent": "eye_right",
-          "pivot": [-2, 9.5, -2.52],
-          "cubes": [
-            {"origin": [-3, 9, -2.52], "size": [2, 1, 0], "uv": [0, 1], "mirror": true}
-          ]
-        },
-        {
-          "name": "arms",
-          "parent": "body",
-          "pivot": [0, 9.75, -2.5]
-        },
-        {
-          "name": "arm_left",
-          "parent": "arms",
-          "pivot": [4, 9.75, -2.5],
-          "rotation": [0, 5, 0],
-          "cubes": [
-            {"origin": [2.5, 8.25, -2.5], "size": [7, 2, 0], "uv": [43, 0]}
-          ]
-        },
-        {
-          "name": "arm_left2",
-          "parent": "arm_left",
-          "pivot": [9.5, 8.25, -2.5],
-          "cubes": [
-            {"origin": [6.5, 3.25, -2.5], "size": [5, 5, 0], "inflate": 0.01, "uv": [46, 4]}
-          ]
-        },
-        {
-          "name": "arm_left3",
-          "parent": "arm_left2",
-          "pivot": [8.5, 3.25, -2.5],
-          "cubes": [
-            {"origin": [6.5, 0.25, -2.5], "size": [5, 3, 0], "inflate": 0.02, "uv": [46, 9]}
-          ]
-        },
-        {
-          "name": "arm_right",
-          "parent": "arms",
-          "pivot": [-4, 9.75, -2.5],
-          "rotation": [0, -5, 0],
-          "cubes": [
-            {"origin": [-9.5, 8.25, -2.5], "size": [7, 2, 0], "uv": [43, 2], "mirror": true}
-          ]
-        },
-        {
-          "name": "arm_right2",
-          "parent": "arm_right",
-          "pivot": [-9.5, 8.25, -2.5],
-          "cubes": [
-            {"origin": [-11.5, 3.25, -2.5], "size": [5, 5, 0], "inflate": 0.01, "uv": [36, 10], "mirror": true}
-          ]
-        },
-        {
-          "name": "arm_right3",
-          "parent": "arm_right2",
-          "pivot": [-8.5, 3.25, -2.5],
-          "cubes": [
-            {"origin": [-11.5, 0.25, -2.5], "size": [5, 3, 0], "inflate": 0.02, "uv": [46, 12], "mirror": true}
-          ]
-        },
-        {
-          "name": "ball",
-          "parent": "body2",
-          "pivot": [0, 39, 0]
-        },
-        {
-          "name": "ball_rotation",
-          "parent": "ball",
-          "pivot": [0, 39, 0]
-        },
-        {
-          "name": "ball_inactive",
-          "parent": "ball_rotation",
-          "pivot": [0, 39, 0],
-          "cubes": [
-            {"origin": [-10, 29, -10], "size": [20, 20, 0], "inflate": 0.01, "uv": [0, 88]},
-            {"origin": [-10, 29, 10], "size": [20, 20, 0], "inflate": 0.01, "uv": [0, 108]},
-            {"origin": [-10, 49, -10], "size": [20, 0, 20], "inflate": 0.01, "uv": [-20, 48]},
-            {"origin": [-10, 29, -10], "size": [20, 0, 20], "inflate": 0.01, "uv": [-20, 68]},
-            {"origin": [10, 29, -10], "size": [0, 20, 20], "inflate": 0.01, "uv": [40, 29]},
-            {"origin": [-10, 29, -10], "size": [0, 20, 20], "inflate": 0.01, "uv": [40, 49], "mirror": true}
-          ]
-        },
-        {
-          "name": "ball_active",
-          "parent": "ball_rotation",
-          "pivot": [0, 39, 0],
-          "cubes": [
-            {"origin": [-10, 29, -10], "size": [20, 20, 0], "inflate": 0.01, "uv": [108, 40]},
-            {"origin": [-10, 29, 10], "size": [20, 20, 0], "inflate": 0.01, "uv": [108, 60]},
-            {"origin": [-10, 49, -10], "size": [20, 0, 20], "inflate": 0.01, "uv": [96, 0]},
-            {"origin": [-10, 29, -10], "size": [20, 0, 20], "inflate": 0.01, "uv": [96, 20]},
-            {"origin": [10, 29, -10], "size": [0, 20, 20], "inflate": 0.01, "uv": [108, 60]},
-            {"origin": [-10, 29, -10], "size": [0, 20, 20], "inflate": 0.01, "uv": [118, 80], "mirror": true}
-          ]
-        },
-        {
-          "name": "inner_ball_rotation",
-          "parent": "ball_rotation",
-          "pivot": [0, 39, 0]
-        },
-        {
-          "name": "inner_ball",
-          "parent": "inner_ball_rotation",
-          "pivot": [0, 39, 0],
-          "cubes": [
-            {"origin": [-6, 33, -6], "size": [12, 12, 12], "uv": [0, 24]}
-          ]
-        },
-        {
-          "name": "inner_ball_active",
-          "parent": "inner_ball_rotation",
-          "pivot": [0, 39, 0],
-          "cubes": [
-            {"origin": [-6, 33, -6], "size": [12, 12, 12], "uv": [156, 0]}
-          ]
-        },
-        {
-          "name": "grub",
-          "parent": "inner_ball_rotation",
-          "pivot": [0, 39, 0],
-          "cubes": [
-            {"origin": [-3.5, 38, -3.5], "size": [7, 3, 7], "uv": [48, 35]},
-            {"origin": [-2.5, 36, -2.5], "size": [5, 2, 5], "uv": [66, 28]},
-            {"origin": [-1.5, 34, -1.5], "size": [3, 2, 3], "uv": [40, 31]},
-            {"origin": [-2.5, 40.75, -2.5], "size": [5, 2, 5], "inflate": 0.1, "uv": [81, 30]},
-            {"origin": [-0.5, 42.25, -0.5], "size": [1, 2, 1], "uv": [82, 30]},
-            {"origin": [0.4, 41.2, -2.61], "size": [2, 1, 0], "pivot": [1.5, 41.75, -2.61], "rotation": [0, 0, 30], "uv": [81, 28]},
-            {"origin": [-2.4, 41.2, -2.61], "size": [2, 1, 0], "pivot": [-1.5, 41.75, -2.61], "rotation": [0, 0, -30], "uv": [81, 29], "mirror": true}
-          ]
-        },
-        {
-          "name": "ball_cloud",
-          "parent": "ball_rotation",
-          "pivot": [0, 39, 0],
-          "cubes": [
-            {"origin": [-13, 26, -6.5], "size": [26, 26, 13], "uv": [40, 89]},
-            {"origin": [-13, 52, -7], "size": [26, 0, 7], "pivot": [0, 52, 0], "rotation": [-12.5, 0, 0], "uv": [57, 0]},
-            {"origin": [-13, 52, 0], "size": [26, 0, 7], "pivot": [0, 52, 0], "rotation": [12.5, 0, 0], "uv": [57, 7]},
-            {"origin": [-13, 26, -7], "size": [26, 0, 7], "pivot": [0, 26, 0], "rotation": [12.5, 0, 0], "uv": [57, 14]},
-            {"origin": [-13, 26, 0], "size": [26, 0, 7], "pivot": [0, 26, 0], "rotation": [-12.5, 0, 0], "uv": [57, 21]},
-            {"origin": [13, 26, -7], "size": [0, 26, 7], "pivot": [13, 39, 0], "rotation": [0, -12.5, 0], "uv": [80, 30]},
-            {"origin": [13, 26, 0], "size": [0, 26, 7], "pivot": [13, 39, 0], "rotation": [0, 12.5, 0], "uv": [94, 30]},
-            {"origin": [-13, 26, -7], "size": [0, 26, 7], "pivot": [-13, 39, 0], "rotation": [0, 12.5, 0], "uv": [80, 56], "mirror": true},
-            {"origin": [-13, 26, 0], "size": [0, 26, 7], "pivot": [-13, 39, 0], "rotation": [0, -12.5, 0], "uv": [94, 56], "mirror": true}
-          ]
-        }
-      ]
-    }
-  ]
+	"format_version": "1.12.0",
+	"minecraft:geometry": [
+		{
+			"description": {
+				"identifier": "geometry.rabsca",
+				"texture_width": 256,
+				"texture_height": 128,
+				"visible_bounds_width": 4,
+				"visible_bounds_height": 4.5,
+				"visible_bounds_offset": [0, 1.75, 0]
+			},
+			"bones": [
+				{
+					"name": "rabsca",
+					"pivot": [0, 0, 0]
+				},
+				{
+					"name": "body",
+					"parent": "rabsca",
+					"pivot": [0, 10, 0]
+				},
+				{
+					"name": "torso",
+					"parent": "body",
+					"pivot": [0, 8, 0],
+					"cubes": [
+						{"origin": [-4, 10, -2.5], "size": [8, 8, 5], "uv": [0, 9]},
+						{"origin": [-3.5, 10.52, 2.52], "size": [7, 7, 0], "uv": [52, 28]}
+					]
+				},
+				{
+					"name": "legs",
+					"parent": "torso",
+					"pivot": [0, 14, -2.5]
+				},
+				{
+					"name": "leg_left",
+					"parent": "legs",
+					"pivot": [3.5, 14, -2.5],
+					"rotation": [0, 5, 0],
+					"cubes": [
+						{"origin": [2, 13.5, -2.5], "size": [6, 2, 0], "uv": [23, 0]}
+					]
+				},
+				{
+					"name": "leg_left2",
+					"parent": "leg_left",
+					"pivot": [8, 15.5, -2.5],
+					"cubes": [
+						{"origin": [5, 15.5, -2.5], "size": [4, 5, 0], "inflate": 0.01, "uv": [35, 0]}
+					]
+				},
+				{
+					"name": "leg_left3",
+					"parent": "leg_left2",
+					"pivot": [9, 20.5, -2.5],
+					"cubes": [
+						{"origin": [4, 20.5, -2.5], "size": [5, 5, 0], "inflate": 0.02, "uv": [26, 10]}
+					]
+				},
+				{
+					"name": "leg_right",
+					"parent": "legs",
+					"pivot": [-3.5, 14, -2.5],
+					"rotation": [0, -5, 0],
+					"cubes": [
+						{"origin": [-8, 13.5, -2.5], "size": [6, 2, 0], "uv": [23, 2], "mirror": true}
+					]
+				},
+				{
+					"name": "leg_right2",
+					"parent": "leg_right",
+					"pivot": [-8, 15.5, -2.5],
+					"cubes": [
+						{"origin": [-9, 15.5, -2.5], "size": [4, 5, 0], "inflate": 0.01, "uv": [28, 5], "mirror": true}
+					]
+				},
+				{
+					"name": "leg_right3",
+					"parent": "leg_right2",
+					"pivot": [-9, 20.5, -2.5],
+					"cubes": [
+						{"origin": [-9, 20.5, -2.5], "size": [5, 5, 0], "inflate": 0.02, "uv": [36, 5], "mirror": true}
+					]
+				},
+				{
+					"name": "head",
+					"parent": "torso",
+					"pivot": [0, 10.5, 0],
+					"cubes": [
+						{"origin": [-4.5, 6.5, -2.5], "size": [9, 4, 5], "inflate": 0.01, "uv": [0, 0]},
+						{"origin": [1.25, 4.75, -0.25], "size": [0, 4, 3], "pivot": [1.25, 8.25, 2.6], "rotation": [15, 0, -5], "uv": [0, 19]},
+						{"origin": [2.5, 5, -0.25], "size": [0, 4, 3], "pivot": [2.5, 8.25, 2.6], "rotation": [15, 0, -20], "uv": [0, 23]},
+						{"origin": [-1.25, 4.75, -0.25], "size": [0, 4, 3], "pivot": [-1.25, 8.25, 2.6], "rotation": [15, 0, 5], "uv": [6, 19], "mirror": true},
+						{"origin": [-2.5, 5, -0.25], "size": [0, 4, 3], "pivot": [-2.5, 8.25, 2.6], "rotation": [15, 0, 20], "uv": [6, 23], "mirror": true},
+						{"origin": [-0.5, 6.71716, -2.67], "size": [1, 1, 1], "inflate": -0.15, "pivot": [0, 7.21716, -2.17], "rotation": [0, 0, 45], "uv": [21, 9]}
+					]
+				},
+				{
+					"name": "nose",
+					"parent": "head",
+					"pivot": [0, 10.5, -2.5],
+					"rotation": [12.5, 0, 0],
+					"cubes": [
+						{"origin": [-1, 9.5, -2.51], "size": [2, 2, 1], "pivot": [0, 10.5, -2], "rotation": [0, 0, -45], "uv": [57, 0]}
+					]
+				},
+				{
+					"name": "beard",
+					"parent": "head",
+					"pivot": [0, 10.5, -2.5],
+					"rotation": [5, 0, 0]
+				},
+				{
+					"name": "beard_middle",
+					"parent": "beard",
+					"pivot": [0, 10.5, -2.5],
+					"rotation": [2.5, 0, 0],
+					"cubes": [
+						{"origin": [-3, 10.25, -2.5], "size": [6, 2, 0], "uv": [26, 15]}
+					]
+				},
+				{
+					"name": "beard_left",
+					"parent": "beard",
+					"pivot": [2.5, 10.5, -2.5],
+					"rotation": [0, 0, 42.5]
+				},
+				{
+					"name": "beard_left_rotation",
+					"parent": "beard_left",
+					"pivot": [2.5, 10.5, -2.5],
+					"rotation": [5, 0, 0],
+					"cubes": [
+						{"origin": [2.5, 10, -2.5], "size": [2, 4, 0], "uv": [26, 17]}
+					]
+				},
+				{
+					"name": "beard_left2",
+					"parent": "beard_left_rotation",
+					"pivot": [2.5, 14, -2.5],
+					"cubes": [
+						{"origin": [2.5, 14, -2.5], "size": [4, 3, 0], "inflate": 0.01, "uv": [38, 15]}
+					]
+				},
+				{
+					"name": "beard_left3",
+					"parent": "beard_left2",
+					"pivot": [6.5, 16, -2.5],
+					"rotation": [0, 0, 5],
+					"cubes": [
+						{"origin": [6.5, 14, -2.5], "size": [6, 4, 0], "inflate": 0.02, "uv": [46, 17]}
+					]
+				},
+				{
+					"name": "beard_left4",
+					"parent": "beard_left3",
+					"pivot": [12.5, 18, -2.5],
+					"rotation": [0, 0, 5],
+					"cubes": [
+						{"origin": [12.5, 13, -2.5], "size": [8, 5, 0], "inflate": 0.01, "uv": [36, 21]}
+					]
+				},
+				{
+					"name": "beard_right",
+					"parent": "beard",
+					"pivot": [-2.5, 10.5, -2.5],
+					"rotation": [0, 0, -42.5]
+				},
+				{
+					"name": "beard_right_rotation",
+					"parent": "beard_right",
+					"pivot": [-2.5, 10.5, -2.5],
+					"rotation": [5, 0, 0],
+					"cubes": [
+						{"origin": [-4.5, 10, -2.5], "size": [2, 4, 0], "uv": [30, 17], "mirror": true}
+					]
+				},
+				{
+					"name": "beard_right2",
+					"parent": "beard_right_rotation",
+					"pivot": [-2.5, 14, -2.5],
+					"cubes": [
+						{"origin": [-6.5, 14, -2.5], "size": [4, 3, 0], "inflate": 0.01, "uv": [34, 18], "mirror": true}
+					]
+				},
+				{
+					"name": "beard_right3",
+					"parent": "beard_right2",
+					"pivot": [-6.5, 16, -2.5],
+					"rotation": [0, 0, -5],
+					"cubes": [
+						{"origin": [-12.5, 14, -2.5], "size": [6, 4, 0], "inflate": 0.02, "uv": [52, 21], "mirror": true}
+					]
+				},
+				{
+					"name": "beard_right4",
+					"parent": "beard_right3",
+					"pivot": [-12.5, 18, -2.5],
+					"rotation": [0, 0, -5],
+					"cubes": [
+						{"origin": [-20.5, 13, -2.5], "size": [8, 5, 0], "inflate": 0.01, "uv": [36, 26], "mirror": true}
+					]
+				},
+				{
+					"name": "eyebrow_left",
+					"parent": "head",
+					"pivot": [1.5, 6.5, -2.52],
+					"rotation": [-2.5, 0, -15],
+					"cubes": [
+						{"origin": [1.5, 1, -2.52], "size": [3, 7, 0], "uv": [57, 3]}
+					]
+				},
+				{
+					"name": "eyebrow_right",
+					"parent": "head",
+					"pivot": [-1.5, 6.5, -2.52],
+					"rotation": [-2.5, 0, 15],
+					"cubes": [
+						{"origin": [-4.5, 1, -2.52], "size": [3, 7, 0], "uv": [56, 10], "mirror": true}
+					]
+				},
+				{
+					"name": "eyes",
+					"parent": "head",
+					"pivot": [0, 9, -2.52]
+				},
+				{
+					"name": "eye_left",
+					"parent": "eyes",
+					"pivot": [2, 9.5, -2.52],
+					"rotation": [0, 0, 10]
+				},
+				{
+					"name": "eye_open_left",
+					"parent": "eye_left",
+					"pivot": [-2, 9.5, -2.42],
+					"cubes": [
+						{"origin": [1, 8.8, -2.41], "size": [2, 1.4, 0], "inflate": 0.01, "uv": [0, 9]}
+					]
+				},
+				{
+					"name": "pupil_left",
+					"parent": "eye_open_left",
+					"pivot": [-2, 9.5, -2.43],
+					"cubes": [
+						{"origin": [1.5, 9, -2.43], "size": [1, 1, 0], "pivot": [2, 9.5, -2.43], "rotation": [0, 0, 45], "uv": [0, 11]}
+					]
+				},
+				{
+					"name": "eye_closed_left",
+					"parent": "eye_left",
+					"pivot": [-2, 9.5, -2.52],
+					"cubes": [
+						{"origin": [1, 9, -2.52], "size": [2, 1, 0], "uv": [0, 0]}
+					]
+				},
+				{
+					"name": "locator_eye_left",
+					"parent": "eye_left",
+					"pivot": [2, 9.5, -2.5],
+					"locators": {
+						"eye2": [2, 9.5, -2.5]
+					}
+				},
+				{
+					"name": "eye_right",
+					"parent": "eyes",
+					"pivot": [-2, 9.5, -2.52],
+					"rotation": [0, 0, -10]
+				},
+				{
+					"name": "eye_open_right",
+					"parent": "eye_right",
+					"pivot": [-2, 9.5, -2.42],
+					"cubes": [
+						{"origin": [-3, 8.8, -2.41], "size": [2, 1.4, 0], "inflate": 0.01, "uv": [0, 10], "mirror": true}
+					]
+				},
+				{
+					"name": "pupil_right",
+					"parent": "eye_open_right",
+					"pivot": [-2, 9.5, -2.43],
+					"cubes": [
+						{"origin": [-2.5, 9, -2.43], "size": [1, 1, 0], "pivot": [-2, 9.5, -2.43], "rotation": [0, 0, -45], "uv": [0, 12], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_closed_right",
+					"parent": "eye_right",
+					"pivot": [-2, 9.5, -2.52],
+					"cubes": [
+						{"origin": [-3, 9, -2.52], "size": [2, 1, 0], "uv": [0, 1], "mirror": true}
+					]
+				},
+				{
+					"name": "locator_eye_right",
+					"parent": "eye_right",
+					"pivot": [-2, 9.5, -2.5],
+					"locators": {
+						"eye1": [-2, 9.5, -2.5]
+					}
+				},
+				{
+					"name": "arms",
+					"parent": "body",
+					"pivot": [0, 9.75, -2.5]
+				},
+				{
+					"name": "arm_left",
+					"parent": "arms",
+					"pivot": [4, 9.75, -2.5],
+					"rotation": [0, 5, 0],
+					"cubes": [
+						{"origin": [2.5, 8.25, -2.5], "size": [7, 2, 0], "uv": [43, 0]}
+					]
+				},
+				{
+					"name": "arm_left2",
+					"parent": "arm_left",
+					"pivot": [9.5, 8.25, -2.5],
+					"cubes": [
+						{"origin": [6.5, 3.25, -2.5], "size": [5, 5, 0], "inflate": 0.01, "uv": [46, 4]}
+					]
+				},
+				{
+					"name": "arm_left3",
+					"parent": "arm_left2",
+					"pivot": [8.5, 3.25, -2.5],
+					"cubes": [
+						{"origin": [6.5, 0.25, -2.5], "size": [5, 3, 0], "inflate": 0.02, "uv": [46, 9]}
+					]
+				},
+				{
+					"name": "arm_right",
+					"parent": "arms",
+					"pivot": [-4, 9.75, -2.5],
+					"rotation": [0, -5, 0],
+					"cubes": [
+						{"origin": [-9.5, 8.25, -2.5], "size": [7, 2, 0], "uv": [43, 2], "mirror": true}
+					]
+				},
+				{
+					"name": "arm_right2",
+					"parent": "arm_right",
+					"pivot": [-9.5, 8.25, -2.5],
+					"cubes": [
+						{"origin": [-11.5, 3.25, -2.5], "size": [5, 5, 0], "inflate": 0.01, "uv": [36, 10], "mirror": true}
+					]
+				},
+				{
+					"name": "arm_right3",
+					"parent": "arm_right2",
+					"pivot": [-8.5, 3.25, -2.5],
+					"cubes": [
+						{"origin": [-11.5, 0.25, -2.5], "size": [5, 3, 0], "inflate": 0.02, "uv": [46, 12], "mirror": true}
+					]
+				},
+				{
+					"name": "ball",
+					"parent": "rabsca",
+					"pivot": [0, 39, 0]
+				},
+				{
+					"name": "ball_rotation",
+					"parent": "ball",
+					"pivot": [0, 39, 0]
+				},
+				{
+					"name": "ball_inactive",
+					"parent": "ball_rotation",
+					"pivot": [0, 39, 0],
+					"cubes": [
+						{"origin": [-10, 29, -10], "size": [20, 20, 0], "inflate": 0.01, "uv": [0, 88]},
+						{"origin": [-10, 29, 10], "size": [20, 20, 0], "inflate": 0.01, "uv": [0, 108]},
+						{"origin": [-10, 49, -10], "size": [20, 0, 20], "inflate": 0.01, "uv": [-20, 48]},
+						{"origin": [-10, 29, -10], "size": [20, 0, 20], "inflate": 0.01, "uv": [-20, 68]},
+						{"origin": [10, 29, -10], "size": [0, 20, 20], "inflate": 0.01, "uv": [40, 29]},
+						{"origin": [-10, 29, -10], "size": [0, 20, 20], "inflate": 0.01, "uv": [40, 49], "mirror": true}
+					]
+				},
+				{
+					"name": "ball_active",
+					"parent": "ball_rotation",
+					"pivot": [0, 39, 0],
+					"cubes": [
+						{"origin": [-10, 29, -10], "size": [20, 20, 0], "inflate": 0.01, "uv": [108, 40]},
+						{"origin": [-10, 29, 10], "size": [20, 20, 0], "inflate": 0.01, "uv": [108, 60]},
+						{"origin": [-10, 49, -10], "size": [20, 0, 20], "inflate": 0.01, "uv": [96, 0]},
+						{"origin": [-10, 29, -10], "size": [20, 0, 20], "inflate": 0.01, "uv": [96, 20]},
+						{"origin": [10, 29, -10], "size": [0, 20, 20], "inflate": 0.01, "uv": [108, 60]},
+						{"origin": [-10, 29, -10], "size": [0, 20, 20], "inflate": 0.01, "uv": [118, 80], "mirror": true}
+					]
+				},
+				{
+					"name": "inner_ball_rotation",
+					"parent": "ball_rotation",
+					"pivot": [0, 39, 0]
+				},
+				{
+					"name": "inner_ball",
+					"parent": "inner_ball_rotation",
+					"pivot": [0, 39, 0],
+					"cubes": [
+						{"origin": [-6, 33, -6], "size": [12, 12, 12], "uv": [0, 24]}
+					]
+				},
+				{
+					"name": "inner_ball_active",
+					"parent": "inner_ball_rotation",
+					"pivot": [0, 39, 0],
+					"cubes": [
+						{"origin": [-6, 33, -6], "size": [12, 12, 12], "uv": [156, 0]}
+					]
+				},
+				{
+					"name": "grub",
+					"parent": "inner_ball_rotation",
+					"pivot": [0, 39, 0],
+					"cubes": [
+						{"origin": [-3.5, 38, -3.5], "size": [7, 3, 7], "uv": [48, 35]},
+						{"origin": [-2.5, 36, -2.5], "size": [5, 2, 5], "uv": [66, 28]},
+						{"origin": [-1.5, 34, -1.5], "size": [3, 2, 3], "uv": [40, 31]},
+						{"origin": [-2.5, 40.75, -2.5], "size": [5, 2, 5], "inflate": 0.1, "uv": [81, 30]},
+						{"origin": [-0.5, 42.25, -0.5], "size": [1, 2, 1], "uv": [82, 30]},
+						{"origin": [0.4, 41.2, -2.61], "size": [2, 1, 0], "pivot": [1.5, 41.75, -2.61], "rotation": [0, 0, 30], "uv": [81, 28]},
+						{"origin": [-2.4, 41.2, -2.61], "size": [2, 1, 0], "pivot": [-1.5, 41.75, -2.61], "rotation": [0, 0, -30], "uv": [81, 29], "mirror": true}
+					]
+				},
+				{
+					"name": "ball_cloud",
+					"parent": "ball_rotation",
+					"pivot": [0, 39, 0],
+					"cubes": [
+						{"origin": [-13, 26, -6.5], "size": [26, 26, 13], "uv": [40, 89]},
+						{"origin": [-13, 52, -7], "size": [26, 0, 7], "pivot": [0, 52, 0], "rotation": [-12.5, 0, 0], "uv": [57, 0]},
+						{"origin": [-13, 52, 0], "size": [26, 0, 7], "pivot": [0, 52, 0], "rotation": [12.5, 0, 0], "uv": [57, 7]},
+						{"origin": [-13, 26, -7], "size": [26, 0, 7], "pivot": [0, 26, 0], "rotation": [12.5, 0, 0], "uv": [57, 14]},
+						{"origin": [-13, 26, 0], "size": [26, 0, 7], "pivot": [0, 26, 0], "rotation": [-12.5, 0, 0], "uv": [57, 21]},
+						{"origin": [13, 26, -7], "size": [0, 26, 7], "pivot": [13, 39, 0], "rotation": [0, -12.5, 0], "uv": [80, 30]},
+						{"origin": [13, 26, 0], "size": [0, 26, 7], "pivot": [13, 39, 0], "rotation": [0, 12.5, 0], "uv": [94, 30]},
+						{"origin": [-13, 26, -7], "size": [0, 26, 7], "pivot": [-13, 39, 0], "rotation": [0, 12.5, 0], "uv": [80, 56], "mirror": true},
+						{"origin": [-13, 26, 0], "size": [0, 26, 7], "pivot": [-13, 39, 0], "rotation": [0, -12.5, 0], "uv": [94, 56], "mirror": true}
+					]
+				}
+			]
+		}
+	]
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/1018_archaludon/archaludon.geo.json

@@ -620,14 +620,6 @@
 						{"origin": [-4.98, 15.25, 20.99], "size": [0, 2, 2], "inflate": 0.01, "uv": [93, 70], "mirror": true}
 					]
 				},
-				{
-					"name": "locator_seat_1",
-					"parent": "torso_back",
-					"pivot": [0, 11, 14],
-					"locators": {
-						"seat_1": [0, 11, 14]
-					}
-				},
 				{
 					"name": "legs",
 					"parent": "body",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0003_venusaur/venusaur.json

@@ -2,8 +2,7 @@
   "portraitScale": 1.03,
   "portraitTranslation": [-0.31, 0.12, 0],
   "profileScale": 0.47,
-  "profileTranslation": [0.07, 0.98, 0.0],
-  "profilePokedexTranslation": [0, 0.98, 0],
+  "profileTranslation": [0, 0.98, 0.0],
   "rootBone": "venusaur",
   "firstPersonCameraOffset": {
     "seat_1": [0, 0.25, 0]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0005_charmeleon/charmeleon.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 1.89,
   "portraitTranslation": [-0.13, 0.91, 0],
-  "profileScale": 0.77,
-  "profileTranslation": [0, 0.65, 0],
+  "profileScale": 0.63,
+  "profileTranslation": [0, 0.81, 0],
   "rootBone": "charmeleon",
   "animations": {
     "cry": "q.bedrock_stateful('charmeleon', 'cry')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0006_charizard/charizard.json

@@ -2,7 +2,7 @@
   "portraitScale": 2.1,
   "portraitTranslation": [-1.11, 2.43, 0],
   "profileScale": 0.54,
-  "profileTranslation": [0, 0.92, -10],
+  "profileTranslation": [0, 0.96, -10],
   "rootBone": "charizard",
   "firstPersonCameraOffset": {
     "seat_1": [0, 0.45, 0]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0034_nidoking/nidoking.json

@@ -1,8 +1,8 @@
 {
   "portraitScale": 1.89,
   "portraitTranslation": [-0.8, 1.36, 0.0],
-  "profileScale": 0.57,
-  "profileTranslation": [0, 0.81, 0.0],
+  "profileScale": 0.59,
+  "profileTranslation": [0, 0.84, 0.0],
   "rootBone": "nidoking",
   "animations": {
     "cry": "q.bedrock_stateful('nidoking', 'cry')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0037_vulpix/vulpix.json

@@ -4,10 +4,7 @@
   "profileScale": 0.71,
   "profileTranslation": [0, 0.65, 0],
   "rootBone": "vulpix",
-  "animations": {
-    "cry": "q.bedrock_stateful('vulpix', 'cry')",
-    "recoil": "q.bedrock_stateful('vulpix', 'recoil')"
-  },
+  "animations": {"cry": "q.bedrock_stateful('vulpix', 'cry')"},
   "poses": {
     "standing": {
       "poseTypes": [
@@ -19,63 +16,26 @@
       ],
       "isBattle": false,
       "animations": [
-        "q.look('head')",
+        "q.look('head', 1, 1, 70, -45, 45, -45)",
         "q.bedrock('vulpix', 'ground_idle')"
       ],
       "quirks": [
         "q.bedrock_quirk('vulpix', 'blink')"
       ]
     },
-    "battle-standing": {
-      "poseTypes": [
-        "STAND",
-        "FLOAT"
-      ],
-      "isBattle": true,
-      "animations": [
-        "q.look('head')",
-        "q.bedrock('vulpix', 'battle_idle')"
-      ],
-      "quirks": [
-        "q.bedrock_quirk('vulpix', 'blink')"
-      ]
-    },
     "walking": {
       "poseTypes": [
         "WALK",
         "SWIM"
       ],
       "animations": [
-        "q.look('head')",
-        "q.bedrock('vulpix', 'ground_walk')"
+        "q.look('head', 1, 1, 70, -45, 45, -45)",
+        "q.bedrock('vulpix', 'ground_idle')",
+        "q.quadruped_walk(0.66, 1.4, 'leg_front_left', 'leg_front_right', 'leg_back_left', 'leg_back_right')"
       ],
       "quirks": [
         "q.bedrock_quirk('vulpix', 'blink')"
       ]
-    },
-    "run": {
-      "poseName": "run",
-      "poseTypes": [
-        "WALK",
-        "SWIM"
-      ],
-      "condition": "q.is_sprinting",
-      "animations": [
-        "q.look('head')",
-        "q.bedrock('vulpix', 'ground_run')"
-      ],
-      "quirks": [
-        "q.bedrock_quirk('vulpix', 'blink')"
-      ]
-    },
-    "sleep": {
-      "poseTypes": ["SLEEP"],
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('dummy', 'cry')"
-      },
-      "animations": [
-        "q.bedrock('vulpix', 'sleep')"
-      ]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0037_vulpix/vulpix_alolan.json

@@ -1,13 +1,10 @@
 {
-  "portraitScale": 2.08,
-  "portraitTranslation": [-0.47, -0.49, 0],
+  "portraitScale": 2.19,
+  "portraitTranslation": [-0.42, -0.55, 0],
   "profileScale": 0.71,
   "profileTranslation": [0, 0.65, 0],
   "rootBone": "vulpix_alolan",
-  "animations": {
-    "cry": "q.bedrock_stateful('vulpix_alolan', 'cry')",
-    "recoil": "q.bedrock_stateful('vulpix_alolan', 'recoil')"
-  },
+  "animations": {"cry": "q.bedrock_stateful('vulpix_alolan', 'cry')"},
   "poses": {
     "standing": {
       "poseTypes": [
@@ -19,65 +16,29 @@
       ],
       "isBattle": false,
       "animations": [
-        "q.look('head')",
+        "q.look('head', 1, 1, 70, -45, 45, -45)",
         "q.bedrock('vulpix_alolan', 'ground_idle')"
       ],
       "quirks": [
         "q.bedrock_quirk('vulpix_alolan', 'blink')"
       ]
     },
-    "battle-standing": {
-      "poseTypes": [
-        "STAND",
-        "FLOAT"
-      ],
-      "isBattle": true,
-      "animations": [
-        "q.look('head')",
-        "q.bedrock('vulpix_alolan', 'battle_idle')"
-      ],
-      "quirks": [
-        "q.bedrock_quirk('vulpix_alolan', 'blink')"
-      ]
-    },
     "walking": {
       "poseTypes": [
         "WALK",
         "SWIM"
       ],
       "animations": [
-        "q.look('head')",
-        "q.bedrock('vulpix_alolan', 'ground_walk')"
+        "q.look('head', 1, 1, 70, -45, 45, -45)",
+        "q.bedrock('vulpix_alolan', 'ground_idle')",
+        "q.quadruped_walk(0.66, 1.4, 'leg_front_left', 'leg_front_right', 'leg_back_left', 'leg_back_right')"
       ],
       "quirks": [
         "q.bedrock_quirk('vulpix_alolan', 'blink')"
       ]
-    },
-    "run": {
-      "poseName": "run",
-      "poseTypes": [
-        "WALK",
-        "SWIM"
-      ],
-      "condition": "q.is_sprinting",
-      "animations": [
-        "q.look('head')",
-        "q.bedrock('vulpix_alolan', 'ground_run')"
-      ],
-      "quirks": [
-        "q.bedrock_quirk('vulpix_alolan', 'blink')"
-      ]
-    },
-    "sleep": {
-      "poseTypes": ["SLEEP"],
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('dummy', 'cry')"
-      },
-      "animations": [
-        "q.bedrock('vulpix_alolan', 'sleep')"
-      ]
     }
   }
 }
    
+   
    

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0041_zubat/zubat.json

@@ -5,8 +5,7 @@
   "profileTranslation": [0,0.7,0],
   "rootBone": "zubat",
   "animations": {
-    "cry": "q.bedrock_stateful('zubat', 'cry')",
-    "physical": "q.bedrock_primary('zubat', 'physical', q.curve('symmetrical'))"
+    "cry": "q.bedrock_stateful('zubat', 'cry')"
   },
   "poses": {
     "standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0047_parasect/parasect.json

@@ -2,7 +2,7 @@
   "portraitScale": 1.8,
   "portraitTranslation": [-0.35, -0.8, 0],
   "profileScale": 0.8,
-  "profileTranslation": [0, 0.52, 0.0],
+  "profileTranslation": [0, 0.45, 0.0],
   "rootBone": "parasect",
   "firstPersonCameraOffset": {
     "seat_1": [0, 0.45, 0]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0062_poliwrath/poliwrath.json

@@ -24,8 +24,11 @@
     },
     "walking": {
       "poseTypes": ["WALK"],
+      "isBattle": false,
       "animations": [
-        "q.bedrock('poliwrath', 'ground_walk')"
+        "q.biped_walk(0.66, 0.6, 'leg_left', 'leg_right')",
+        "q.bimanual_swing(0.66, 0.6, 'arm_left1', 'arm_right1')",
+        "q.bedrock('poliwrath', 'ground_idle')"
       ],
       "quirks": ["q.bedrock_quirk('poliwrath', 'blink')"]
     },

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0072_tentacool/tentacool.json

@@ -1,87 +0,0 @@
-{
-  "portraitScale": 1.2,
-  "portraitTranslation": [0.1, 1.1, 0.0],
-  "profileScale": 0.6,
-  "profileTranslation": [0.0, 0.8, 0.0],
-  "rootBone": "tentacool",
-  "animations": {},
-  "poses": {
-    "standing": {
-      "poseTypes": ["STAND", "WALK", "NONE"],
-      "isBattle": false,
-      "isTouchingWater": false,
-      "animations": [
-        "q.bedrock('tentacool', 'ground_idle')"
-      ],
-      "quirks": [
-        "q.bedrock_quirk('tentacool', 'blink')"
-      ]
-    },
-    "float": {
-      "poseTypes": ["FLOAT", "PORTRAIT", "PROFILE"],
-      "isTouchingWater": true,
-      "animations": [
-        "q.bedrock('tentacool', 'water_idle')"
-      ],
-      "quirks": [
-        "q.bedrock_quirk('tentacool', 'blink')"
-      ]
-    },
-    "swim": {
-      "poseTypes": ["SWIM"],
-      "isTouchingWater": true,
-      "animations": [
-        "q.bedrock('tentacool', 'water_swim')"
-      ],
-      "quirks": ["q.bedrock_quirk('tentacool', 'blink')"]
-    },
-    "surface-float": {
-      "poseTypes": ["STAND"],
-      "isTouchingWater": true,
-      "isUnderWater": false,
-      "animations": [
-        "q.bedrock('tentacool', 'water_idle')"
-      ],
-      "quirks": [
-        "q.bedrock_quirk('tentacool', 'blink')"
-      ],
-      "transformedParts": [
-        {
-          "part": "body",
-          "position": [0, 18, 0]
-        }
-      ]
-    },
-    "surface-swim": {
-      "poseTypes": ["WALK"],
-      "isTouchingWater": true,
-      "isUnderWater": false,
-      "animations": [
-        "q.bedrock('tentacool', 'water_swim')"
-      ],
-      "quirks": ["q.bedrock_quirk('tentacool', 'blink')"],
-      "transformedParts": [
-        {
-          "part": "body",
-          "position": [0, 18, 0]
-        }
-      ]
-    },
-    "water-sleep": {
-      "poseTypes": ["SLEEP"],
-      "isTouchingWater": true,
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('dummy', 'cry')"
-      },
-      "animations": ["q.bedrock('tentacool', 'water_sleep')"]
-    },
-    "ground-sleep": {
-      "poseTypes": ["SLEEP"],
-      "isTouchingWater": false,
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('dummy', 'cry')"
-      },
-      "animations": ["q.bedrock('tentacool', 'ground_sleep')"]
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0096_drowzee/drowzee.json

@@ -4,10 +4,7 @@
   "profileScale": 0.8,
   "profileTranslation": [0, 0.5, 0],
   "rootBone": "drowzee",
-  "animations": {
-    "cry": "q.bedrock_stateful('drowzee', 'cry')",
-    "recoil": "q.bedrock_stateful('drowzee', 'recoil')"
-  },
+  "animations": {},
   "poses": {
     "battle-standing": {
       "poseTypes": ["STAND"],
@@ -16,13 +13,10 @@
         "q.look('head')",
         "q.bedrock('drowzee', 'battle_idle')"
       ],
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('drowzee', 'battle_cry')"
-      },
       "quirks": ["q.bedrock_quirk('drowzee', 'blink')"]
     },
     "standing": {
-      "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE", "FLOAT"],
+      "poseTypes": ["STAND", "FLOAT", "NONE"],
       "isBattle": false,
       "animations": [
         "q.look('head')",
@@ -34,27 +28,11 @@
       "poseTypes": ["WALK", "SWIM"],
       "animations": [
         "q.look('head')",
-        "q.bedrock('drowzee', 'ground_walk')"
+        "q.biped_walk(2 , 2, 'leg_left', 'leg_right')",
+        "q.bimanual_swing(2, 2, 'arm_left', 'arm_right')",
+        "q.bedrock('drowzee', 'ground_idle')"
       ],
       "quirks": ["q.bedrock_quirk('drowzee', 'blink')"]
-    },
-    "run": {
-      "poseTypes": ["WALK", "SWIM"],
-      "condition": "q.is_sprinting",
-      "animations": [
-        "q.look('head')",
-        "q.bedrock('drowzee', 'ground_run')"
-      ],
-      "quirks": ["q.bedrock_quirk('drowzee', 'blink')"]
-    },
-    "sleep": {
-      "poseTypes": ["SLEEP"],
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('dummy', 'cry')"
-      },
-      "animations": [
-        "q.bedrock('drowzee', 'sleep')"
-      ]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0097_hypno/hypno.json

@@ -1,13 +1,10 @@
 {
   "portraitScale": 2.1,
-  "portraitTranslation": [-0.3, 0.85, 0],
+  "portraitTranslation": [-0.3, 0.69, 0],
   "profileScale": 0.7,
   "profileTranslation": [0, 0.67, 0],
   "rootBone": "hypno",
-  "animations": {
-    "cry": "q.bedrock_stateful('hypno', 'cry')",
-    "recoil": "q.bedrock_stateful('hypno', 'recoil')"
-  },
+  "animations": {},
   "poses": {
     "battle-standing": {
       "poseTypes": ["STAND"],
@@ -16,13 +13,10 @@
         "q.look('head')",
         "q.bedrock('hypno', 'battle_idle')"
       ],
-      "namedAnimations": {
-        "recoil": "q.bedrock_stateful('hypno', 'battle_recoil')"
-      },
       "quirks": ["q.bedrock_quirk('hypno', 'blink')"]
     },
     "standing": {
-      "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE", "FLOAT"],
+      "poseTypes": ["STAND", "FLOAT", "NONE"],
       "isBattle": false,
       "animations": [
         "q.look('head')",
@@ -34,38 +28,11 @@
       "poseTypes": ["WALK", "SWIM"],
       "animations": [
         "q.look('head')",
-        "q.bedrock('hypno', 'ground_walk')"
+        "q.biped_walk(0.66, 0.6, 'left_upper_leg', 'right_upper_leg')",
+        "q.bimanual_swing(0.66, 0.6, 'left_upper_arm', 'right_upper_arm')",
+        "q.bedrock('hypno', 'ground_idle')"
       ],
       "quirks": ["q.bedrock_quirk('hypno', 'blink')"]
-    },
-    "run": {
-      "poseTypes": ["WALK", "SWIM"],
-      "condition": "q.is_sprinting",
-      "animations": [
-        "q.look('head')",
-        "q.bedrock('hypno', 'ground_run')"
-      ],
-      "quirks": ["q.bedrock_quirk('hypno', 'blink')"]
-    },
-    "sleep": {
-      "poseTypes": ["SLEEP"],
-      "isBattle": false,
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('dummy', 'cry')"
-      },
-      "animations": [
-        "q.bedrock('hypno', 'sleep')"
-      ]
-    },
-    "battle-sleep": {
-      "poseTypes": ["SLEEP"],
-      "isBattle": true,
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('dummy', 'cry')"
-      },
-      "animations": [
-        "q.bedrock('hypno', 'battle_sleep')"
-      ]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0120_staryu/staryu.json

@@ -5,8 +5,7 @@
   "profileTranslation": [0.0, 0.39, 0.0],
   "rootBone": "staryu",
   "animations": {
-    "cry": "q.bedrock_stateful('staryu', 'cry')",
-    "physical": "q.bedrock_primary('staryu', 'physical', q.curve('symmetrical'))"
+    "cry": "q.bedrock_stateful('staryu', 'cry')"
   },
   "poses": {
     "standing": {
@@ -40,9 +39,26 @@
         "q.bedrock('staryu', 'sleep')"
       ]
     },
-    "float": {
+    "surface_idle": {
       "poseTypes": ["STAND", "FLOAT"],
       "isTouchingWater": true,
+      "isUnderWater": false,
+      "animations": [
+        "q.look('body')",
+        "q.bedrock('staryu', 'surfacewater_idle')"
+      ]
+    },
+    "surface_swim": {
+      "poseTypes": ["WALK", "SWIM"],
+      "isTouchingWater": true,
+      "isUnderWater": false,
+      "animations": [
+        "q.bedrock('staryu', 'surfacewater_swim')"
+      ]
+    },
+    "float": {
+      "poseTypes": ["FLOAT"],
+      "isUnderWater": true,
       "animations": [
         "q.pitch_tilt('body', 1)",
         "q.look('body')",
@@ -50,8 +66,8 @@
       ]
     },
     "swim": {
-      "poseTypes": ["WALK", "SWIM"],
-      "isTouchingWater": true,
+      "poseTypes": ["SWIM"],
+      "isUnderWater": true,
       "animations": [
         "q.pitch_tilt('body', 1)",
         "q.bedrock('staryu', 'water_swim')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0121_starmie/starmie.json

@@ -5,10 +5,7 @@
   "profileTranslation": [0, 0.72, 0],
   "rootBone": "starmie",
   "animations": {
-    "cry": "q.bedrock_stateful('starmie', 'cry')",
-    "faint": "q.bedrock_primary('starmie', 'faint', q.curve('one'))",
-    "special": "q.bedrock_primary('starmie', 'special', q.curve('symmetrical'))",
-    "recoil": "q.bedrock_stateful('starmie', 'recoil')"
+    "cry": "q.bedrock_stateful('starmie', 'cry')"
   },
   "poses": {
     "battle_standing": {
@@ -67,6 +64,18 @@
         "q.bedrock('starmie', 'sleep')"
       ]
     },
+    "surface_idle": {
+      "poseTypes": [
+        "STAND",
+        "FLOAT"
+      ],
+      "isTouchingWater": true,
+      "isUnderWater": false,
+      "animations": [
+        "q.look('body')",
+        "q.bedrock('starmie', 'surfacewater_idle')"
+      ]
+    },
     "surface_swim": {
       "poseTypes": [
         "WALK",
@@ -80,13 +89,9 @@
     },
     "float": {
       "poseTypes": [
-        "STAND",
         "FLOAT"
       ],
-      "isTouchingWater": true,
-      "namedAnimations": {
-        "special": "q.bedrock_primary('starmie', 'water_special', q.curve('symmetrical_wide'))"
-      },
+      "isUnderWater": true,
       "animations": [
         "q.pitch_tilt('body', 1)",
         "q.look('body')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0122_mrmime/mrmime_galarian.json

@@ -1,6 +1,6 @@
 {
   "portraitScale": 1.96,
-  "portraitTranslation": [ -0.3, 1.86, 0],
+  "portraitTranslation": [ -0.48, 1.61, 0],
   "profileScale": 0.53,
   "profileTranslation": [0, 0.92, 0],
   "rootBone": "mr_rime",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0164_noctowl/noctowl.json

@@ -2,222 +2,54 @@
   "portraitScale": 1.83,
   "portraitTranslation": [ -0.35, 1.05, 0],
   "profileScale": 0.62,
-  "profileTranslation": [ 0, 0.81, 0],
+  "profileTranslation": [ 0, 0.87, 0],
   "rootBone": "noctowl",
   "animations": {
-    "cry": "q.bedrock_stateful('noctowl', 'cry')",
-    "recoil": "q.bedrock_stateful('noctowl', 'recoil')"
+    "cry": "q.bedrock_stateful('noctowl', 'cry')"
   },
   "poses": {
-    "standing": {
-      "poseTypes": [
-        "STAND",
-        "PORTRAIT",
-        "PROFILE",
-        "NONE"
-      ],
-      "isBattle": false,
-      "animations": [
-        "q.look('head')",
-        "q.bedrock('noctowl', 'ground_idle')"
-      ],
-      "transformedParts": [
-        {
-          "part": "wings_open",
-          "isVisible": false
-        },
-        {
-          "part": "wings_closed",
-          "isVisible": true
-        }
-      ],
-      "quirks": [
-        "q.bedrock_quirk('noctowl', 'blink')",
-        "q.bedrock_quirk('noctowl', 'idle_quirk')"
-      ]
-    },
-    "battle-standing": {
+    "stand": {
+      "poseName": "stand",
       "poseTypes": [
         "STAND",
         "PORTRAIT",
         "PROFILE"
       ],
-      "isBattle": true,
       "animations": [
-        "q.look('head')",
-        "q.bedrock('noctowl', 'battle_idle')"
-      ],
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('noctowl', 'battle_cry')"
-      },
-      "transformedParts": [
-        {
-          "part": "wings_open",
-          "isVisible": true
-        },
-        {
-          "part": "wings_closed",
-          "isVisible": false
-        }
+        "q.bedrock('noctowl', 'ground_idle')"
       ],
+      "transformTicks": 10,
       "quirks": [
         "q.bedrock_quirk('noctowl', 'blink')"
       ]
     },
-    "walking": {
+    "walk": {
+      "poseName": "walk",
       "poseTypes": [
         "WALK"
       ],
       "animations": [
-        "q.look('head')",
         "q.bedrock('noctowl', 'ground_walk')"
       ],
-      "transformedParts": [
-        {
-          "part": "wings_open",
-          "isVisible": false
-        },
-        {
-          "part": "wings_closed",
-          "isVisible": true
-        }
-      ],
-      "quirks": [
-        "q.bedrock_quirk('noctowl', 'blink')"
-      ]
-    },
-    "run": {
-      "poseTypes": ["WALK"],
-      "condition": "q.is_sprinting",
-      "animations": [
-        "q.look('head')",
-        "q.bedrock('noctowl', 'ground_run')"
-      ],
-      "transformedParts": [
-        {
-          "part": "wings_open",
-          "isVisible": true
-        },
-        {
-          "part": "wings_closed",
-          "isVisible": false
-        }
-      ],
+      "transformTicks": 5,
       "quirks": [
         "q.bedrock_quirk('noctowl', 'blink')"
       ]
     },
     "hover": {
+      "poseName": "hover",
       "poseTypes": [
         "HOVER",
-        "FLOAT"
-      ],
-      "isBattle": false,
-      "animations": [
-        "q.look('head')",
-        "q.bedrock('noctowl', 'air_idle')"
-      ],
-      "transformedParts": [
-        {
-          "part": "wings_open",
-          "isVisible": true
-        },
-        {
-          "part": "wings_closed",
-          "isVisible": false
-        }
-      ],
-      "quirks": [
-        "q.bedrock_quirk('noctowl', 'blink')"
-      ]
-    },
-    "battle-hover": {
-      "poseTypes": [
-        "HOVER",
-        "FLOAT"
-      ],
-      "isBattle": true,
-      "animations": [
-        "q.look('head')",
-        "q.bedrock('noctowl', 'air_battle_idle')"
-      ],
-      "transformedParts": [
-        {
-          "part": "wings_open",
-          "isVisible": true
-        },
-        {
-          "part": "wings_closed",
-          "isVisible": false
-        }
-      ],
-      "quirks": [
-        "q.bedrock_quirk('noctowl', 'blink')"
-      ]
-    },
-    "flying": {
-      "poseTypes": [
         "FLY",
+        "FLOAT",
         "SWIM"
       ],
       "animations": [
-        "q.pitch_tilt('body')",
-        "q.look('head')",
-        "q.bedrock('noctowl', 'air_fly')"
-      ],
-      "transformedParts": [
-        {
-          "part": "wings_open",
-          "isVisible": true
-        },
-        {
-          "part": "wings_closed",
-          "isVisible": false
-        }
+        "q.bedrock('noctowl', 'air_idle_placeholder')"
       ],
       "quirks": [
         "q.bedrock_quirk('noctowl', 'blink')"
       ]
-    },
-    "sleep": {
-      "poseTypes": ["SLEEP"],
-      "condition": "!q.is_flying",
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('dummy', 'cry')"
-      },
-      "animations": [
-        "q.bedrock('noctowl', 'sleep')"
-      ],
-      "transformedParts": [
-        {
-          "part": "wings_open",
-          "isVisible": false
-        },
-        {
-          "part": "wings_closed",
-          "isVisible": true
-        }
-      ]
-    },
-    "air-sleep": {
-      "poseTypes": ["SLEEP"],
-      "condition": "q.is_flying",
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('dummy', 'cry')"
-      },
-      "animations": [
-        "q.bedrock('noctowl', 'air_sleep')"
-      ],
-      "transformedParts": [
-        {
-          "part": "wings_open",
-          "isVisible": true
-        },
-        {
-          "part": "wings_closed",
-          "isVisible": false
-        }
-      ]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0176_togetic/togetic.json

@@ -1,24 +1,18 @@
 {
  "portraitScale": 2.16,
- "portraitTranslation": [-0.24, 0.27, 0],
+ "portraitTranslation": [-0.13, 0.39, 0],
  "profileScale": 0.75,
  "profileTranslation": [0, 0.62, 0],
  "rootBone": "togetic",
  "animations": {
    "faint": "q.bedrock_primary('togetic', 'faint', q.curve('one'))",
    "cry": "q.bedrock_stateful('togetic', 'cry_placeholder')",
-   "recoil": "q.bedrock_stateful('togetic', 'recoil')",
-   "physical": "q.bedrock_primary('togetic', 'physical', q.curve('symmetrical'))",
-   "special": "q.bedrock_primary('togetic', 'special', q.curve('symmetrical'))",
-   "status": "q.bedrock_primary('togetic', 'status', q.curve('symmetrical'))"
+   "recoil": "q.bedrock_stateful('togetic', 'recoil')"
  },
  "poses": {
    "battle-standing": {
      "poseTypes": ["STAND"],
      "isBattle": true,
-     "namedAnimations": {
-       "cry": "q.bedrock_primary('togetic', 'battle_cry', q.curve('symmetrical_wide'))"
-     },
      "animations": [
        "q.look('head')",
        "q.bedrock('togetic', 'battle_idle')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0206_dunsparce/dunsparce.json

@@ -2,7 +2,7 @@
   "portraitScale": 1.73,
   "portraitTranslation": [-0.45, -1.17, 0],
   "profileScale": 0.7,
-  "profileTranslation": [0, 0.59, 0],
+  "profileTranslation": [-0.06, 0.59, 0],
   "rootBone": "dunsparce",
   "animations": {
       "cry": "q.bedrock_stateful('dunsparce', 'cry')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0267_beautifly/beautifly.json

@@ -2,7 +2,7 @@
   "portraitScale": 1.73,
   "portraitTranslation": [-0.09, 0.26, 0],
   "profileScale": 0.60,
-  "profileTranslation": [0, 0.90, 0],
+  "profileTranslation": [0.16, 0.90, 0],
   "rootBone": "beautifly",
   "poses": {
 	"battle-standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0269_dustox/dustox.json

@@ -2,7 +2,7 @@
   "portraitScale": 1.65,
   "portraitTranslation": [-0.10, 0.16, 0],
   "profileScale": 0.63,
-  "profileTranslation": [0, 0.64, 0],
+  "profileTranslation": [0.13, 0.64, 0],
   "rootBone": "dustox",
   "poses": {
 	"battle-standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0440_happiny/happiny.json

@@ -6,20 +6,13 @@
   "rootBone": "happiny",
   "animations": {
     "faint": "q.bedrock_primary('happiny', 'faint', q.curve('one'))",
-    "cry": "q.bedrock_stateful('happiny', 'cry')",
-    "recoil": "q.bedrock_stateful('happiny', 'recoil')",
-    "physical": "q.bedrock_primary('happiny', 'physical', q.curve('symmetrical'))",
-    "special": "q.bedrock_primary('happiny', 'special', q.curve('symmetrical'))",
-    "status": "q.bedrock_primary('happiny', 'status', q.curve('symmetrical'))"
+    "cry": "q.bedrock_stateful('happiny', 'cry')"
   },
   "poses": {
     "battle-standing": {
       "poseTypes": ["STAND"],
       "isBattle": true,
       "animations": ["q.bedrock('happiny', 'battle_idle')"],
-      "namedAnimations": {
-        "cry": "q.bedrock_primary('happiny', 'battle_cry', q.curve('symmetrical'))"
-      },
       "quirks": [
         "q.bedrock_quirk('happiny', 'blink')",
         "q.bedrock_quirk('happiny', 'hairshake_quirk')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0668_pyroar/pyroar_female.json

@@ -2,7 +2,7 @@
   "portraitScale": 1.98,
   "portraitTranslation": [-0.96, 1.39, 0],
   "profileScale": 0.59,
-  "profileTranslation": [0, 0.84, 0],
+  "profileTranslation": [0.13, 0.82, 0],
   "rootBone": "pyroar_female",
   "animations": {
     "cry": "q.bedrock_stateful('pyroar_female', 'cry')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0668_pyroar/pyroar_male.json

@@ -2,7 +2,7 @@
   "portraitScale": 1.89,
   "portraitTranslation": [-1.12, 1.78, 0],
   "profileScale": 0.51,
-  "profileTranslation": [0, 0.97, 0],
+  "profileTranslation": [0.12, 0.94, 0],
   "rootBone": "pyroar_male",
   "animations": {
     "cry": "q.bedrock_stateful('pyroar_male', 'cry')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0734_yungoos/yungoos.json

@@ -4,10 +4,6 @@
   "profileScale": 0.63,
   "profileTranslation": [ 0.03, 0.77, 0],
   "rootBone": "yungoos",
-  "animations": {
-    "cry": "q.bedrock_stateful('yungoos', 'cry')",
-    "recoil": "q.bedrock_stateful('yungoos', 'recoil')"
-  },
   "poses": {
     "standing": {
       "poseTypes": [
@@ -17,31 +13,10 @@
         "PORTRAIT",
         "PROFILE"
       ],
-      "isBattle": false,
-      "animations": [
-        "q.look('head_ai', 1, 1, 10, -10, 20, -20)",
-        "q.look('head_angle')",
-        "q.bedrock('yungoos', 'ground_idle')",
-        {
-          "condition": "q.is_holding_item",
-          "animation": "q.bedrock('yungoos', 'item_hold')"
-        }
-      ],
-      "quirks": [
-        "q.bedrock_quirk('yungoos', 'blink')"
-      ]
-    },
-    "battle-standing": {
-      "poseTypes": ["STAND"],
       "isBattle": true,
       "animations": [
-        "q.look('head_ai', 1, 1, 10, -10, 20, -20)",
-        "q.look('head_angle')",
-        "q.bedrock('yungoos', 'battle_idle')",
-        {
-          "condition": "q.is_holding_item",
-          "animation": "q.bedrock('yungoos', 'item_hold')"
-        }
+        "q.look('head')",
+        "q.bedrock('yungoos', 'ground_idle')"
       ],
       "quirks": [
         "q.bedrock_quirk('yungoos', 'blink')"
@@ -53,37 +28,13 @@
         "SWIM"
       ],
       "animations": [
-        "q.look('head_ai', 1, 1, 10, -10, 20, -20)",
-        "q.look('head_angle')",
-        "q.bedrock('yungoos', 'ground_walk')"
+        "q.look('head')",
+        "q.bedrock('yungoos', 'ground_idle')",
+        "q.quadruped_walk(1, 1, 'leg_front_left', 'leg_front_right', 'leg_back_left', 'leg_back_right')"
       ],
       "quirks": [
         "q.bedrock_quirk('yungoos', 'blink')"
       ]
-    },
-    "run": {
-      "poseTypes": [
-        "WALK",
-        "SWIM"
-      ],
-      "condition": "q.is_sprinting",
-      "animations": [
-        "q.look('head_ai', 1, 1, 10, -10, 20, -20)",
-        "q.look('head_angle')",
-        "q.bedrock('yungoos', 'ground_run')"
-      ],
-      "quirks": [
-        "q.bedrock_quirk('yungoos', 'blink')"
-      ]
-    },
-    "sleep": {
-      "poseTypes": ["SLEEP"],
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('dummy', 'cry')"
-      },
-      "animations": [
-        "q.bedrock('yungoos', 'sleep')"
-      ]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0735_gumshoos/gumshoos.json

@@ -4,10 +4,6 @@
   "profileScale": 0.65,
   "profileTranslation": [ 0.07, 0.79, 0],
   "rootBone": "gumshoos",
-  "animations": {
-    "cry": "q.bedrock_stateful('gumshoos', 'cry')",
-    "recoil": "q.bedrock_stateful('gumshoos', 'recoil')"
-  },
   "poses": {
     "standing": {
       "poseTypes": [
@@ -17,32 +13,9 @@
         "PORTRAIT",
         "PROFILE"
       ],
-      "isBattle": false,
-      "animations": [
-        "q.look('head_ai', 1, 1, 0, -45, 5, -5)",
-        "q.bedrock('gumshoos', 'ground_idle')",
-        {
-          "condition": "q.is_holding_item",
-          "animation": "q.bedrock('gumshoos', 'hold_item')"
-        }
-      ],
-      "quirks": [
-        "q.bedrock_quirk('gumshoos', 'blink')"
-      ]
-    },
-    "battle-standing": {
-      "poseTypes": ["STAND"],
       "isBattle": true,
       "animations": [
-        "q.look('head_ai', 1, 1, 0, -45, 5, -5)",
-        "q.bedrock('gumshoos', 'battle_idle')",
-        {
-          "condition": "q.is_holding_item",
-          "animation": "q.bedrock('gumshoos', 'hold_item')"
-        }
-      ],
-      "quirks": [
-        "q.bedrock_quirk('gumshoos', 'blink')"
+        "q.bedrock('gumshoos', 'ground_idle')"
       ]
     },
     "walking": {
@@ -51,15 +24,8 @@
         "SWIM"
       ],
       "animations": [
-        "q.look('head_ai', 1, 1, 0, -45, 5, -5)",
-        "q.bedrock('gumshoos', 'ground_walk')",
-        {
-          "condition": "q.is_holding_item",
-          "animation": "q.bedrock('gumshoos', 'hold_item')"
-        }
-      ],
-      "quirks": [
-        "q.bedrock_quirk('gumshoos', 'blink')"
+        "q.bedrock('gumshoos', 'ground_idle')",
+        "q.biped_walk(1, 1, 'leg_left', 'leg_right')"
       ]
     }
   }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0884_duraludon/duraludon.json

@@ -4,14 +4,6 @@
   "profileScale": 0.58,
   "profileTranslation": [ 0, 0.83, 0],
   "rootBone": "duraludon",
-  "animations": {
-    "faint": "q.bedrock_primary('duraludon', 'faint', q.curve('one'))",
-    "cry": "q.bedrock_stateful('duraludon', 'cry')",
-    "recoil": "q.bedrock_stateful('duraludon', 'recoil')",
-    "physical": "q.bedrock_primary('duraludon', 'physical', q.curve('symmetrical'))",
-    "special": "q.bedrock_primary('duraludon', 'special', q.curve('symmetrical'))",
-    "status": "q.bedrock_primary('duraludon', 'status', q.curve('symmetrical'))"
-  },
   "poses": {
     "standing": {
       "poseTypes": [
@@ -21,7 +13,7 @@
         "PORTRAIT",
         "PROFILE"
       ],
-      "isBattle": false,
+      "isBattle": true,
       "animations": [
         "q.bedrock('duraludon', 'ground_idle')"
       ],
@@ -29,29 +21,14 @@
         "q.bedrock_quirk('duraludon', 'blink')"
       ]
     },
-    "battle-standing": {
-      "poseTypes": [
-        "STAND",
-        "FLOAT"
-      ],
-      "isBattle": true,
-      "animations": [
-        "q.bedrock('duraludon', 'battle_idle')"
-      ],
-      "namedAnimations": {
-        "cry": "q.bedrock_primary('duraludon', 'battle_cry', q.curve('symmetrical'))"
-      },
-      "quirks": [
-        "q.bedrock_quirk('duraludon', 'blink')"
-      ]
-    },
     "walking": {
       "poseTypes": [
         "WALK",
         "SWIM"
       ],
       "animations": [
-        "q.bedrock('duraludon', 'ground_walk')"
+        "q.bedrock('duraludon', 'ground_idle')",
+        "q.biped_walk(1, 1, 'leg_left', 'leg_right')"
       ],
       "quirks": [
         "q.bedrock_quirk('duraludon', 'blink')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0953_rellor/rellor.json

@@ -1,41 +1,20 @@
 {
   "portraitScale": 1.51,
-  "portraitTranslation": [ -0.16, 0.61, 0 ],
+  "portraitTranslation": [ -0.16, 0.61, 0],
   "profileScale": 0.58,
-  "profileTranslation": [ -0.09, 0.8, 0 ],
+  "profileTranslation": [ -0.09, 0.8, 0],
   "rootBone": "rellor",
   "animations": {
-    "cry": "q.bedrock_stateful('rellor', 'cry')",
-    "recoil": "q.bedrock_stateful('rellor', 'recoil')",
-    "physical": "q.bedrock_primary('rellor', 'physical', q.curve('symmetrical'))",
-    "special": "q.bedrock_primary('rellor', 'special', q.curve('symmetrical_wide'))",
-    "status": "q.bedrock_primary('rellor', 'status', q.curve('symmetrical_wide'))"
+    "cry": "q.bedrock_stateful('rellor', 'cry')"
   },
   "poses": {
-    "battle-standing": {
-      "poseTypes": [
-        "STAND",
-        "FLOAT"
-      ],
-      "isBattle": true,
-      "animations": [
-        "q.bedrock('rellor', 'battle_idle')"
-      ],
-      "quirks": [
-        "q.bedrock_quirk('rellor', 'blink')"
-      ],
-      "namedAnimations": {
-        "cry": "q.bedrock_primary('rellor', 'battle_cry', q.curve('symmetrical_wide'))"
-      }
-    },
     "standing": {
       "poseTypes": [
         "STAND",
         "NONE",
-        "FLOAT",
-        "PROFILE"
+        "FLOAT"
       ],
-      "isBattle": false,
+      "isBattle": true,
       "animations": [
         "q.bedrock('rellor', 'ground_idle')"
       ],
@@ -49,30 +28,18 @@
         "SWIM"
       ],
       "animations": [
-        "q.bedrock('rellor', 'ground_walk')"
+        "q.bedrock('rellor', 'ground_idle')"
       ],
       "quirks": [
         "q.bedrock_quirk('rellor', 'blink')"
       ]
     },
-    "sleep": {
-      "poseTypes": [
-        "SLEEP"
-      ],
-      "animations": [
-        "q.bedrock('rellor', 'sleep')"
-      ],
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('dummy', 'cry')"
-      }
-    },
     "portrait": {
       "poseTypes": [
-        "PORTRAIT"
+        "PORTRAIT",
+        "PROFILE"
       ],
-      "animations": [
-        "q.bedrock('rellor', 'portrait')"
-      ]
+      "animations": ["q.bedrock('rellor', 'portrait')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0954_rabsca/rabsca.json

@@ -5,51 +5,29 @@
   "profileTranslation": [ 0, 1.07, 0],
   "rootBone": "rabsca",
   "animations": {
-    "cry": "q.bedrock_stateful('rabsca', 'cry')",
-    "physical": "q.bedrock_stateful('rabsca', 'physical')",
-    "special": "q.bedrock_stateful('rabsca', 'special')",
-    "status": "q.bedrock_stateful('rabsca', 'status')"
+    "cry": "q.bedrock_stateful('rabsca', 'cry')"
   },
   "poses": {
-    "battle-standing": {
-      "poseTypes": [
-        "STAND",
-        "FLOAT",
-        "HOVER"
-      ],
-      "isBattle": true,
-      "animations": [
-        "q.bedrock('rabsca', 'battle_idle')",
-        "q.bedrock('rabsca', 'ball_overlay')"
-      ],
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('rabsca', 'battle_cry')"
-      }
-    },
     "standing": {
       "poseTypes": [
         "STAND",
         "NONE",
         "FLOAT",
-        "HOVER",
         "PORTRAIT",
         "PROFILE"
       ],
-      "isBattle": false,
+      "isBattle": true,
       "animations": [
-        "q.bedrock('rabsca', 'ground_idle')",
-        "q.bedrock('rabsca', 'ball_overlay')"
+        "q.bedrock('rabsca', 'ground_idle')"
       ]
     },
     "walking": {
       "poseTypes": [
         "WALK",
-        "SWIM",
-        "FLY"
+        "SWIM"
       ],
       "animations": [
-        "q.bedrock('rabsca', 'ground_walk')",
-        "q.bedrock('rabsca', 'ball_overlay')"
+        "q.bedrock('rabsca', 'ground_idle')"
       ]
     }
   }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0982_dudunsparce/dudunsparce_three_segment.json

@@ -2,8 +2,7 @@
   "portraitScale": 1.1,
   "portraitTranslation": [-1.2, -0.009, 0],
   "profileScale": 0.5,
-  "profileTranslation": [0, 0.96, 0],
-  "profileSummaryTranslation": [-0.20, 0.87, 0],
+  "profileTranslation": [-0.18, 0.96, 0],
   "rootBone": "dudunsparce",
   "firstPersonCameraOffset": {
     "seat_1": [0, 0.45, 0],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0982_dudunsparce/dudunsparce_two_segment.json

@@ -2,7 +2,7 @@
   "portraitScale": 1.1,
   "portraitTranslation": [-0.8, -0.009, 0],
   "profileScale": 0.5,
-  "profileTranslation": [0, 0.96, 0],
+  "profileTranslation": [-0.18, 0.96, 0],
   "rootBone": "dudunsparce",
   "firstPersonCameraOffset": {
     "seat_1": [0, 0.45, 0],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/1018_archaludon/archaludon.json

@@ -4,14 +4,6 @@
   "profileScale": 0.53,
   "profileTranslation": [ 0, 0.96, 0],
   "rootBone": "archaludon",
-  "animations": {
-    "faint": "q.bedrock_primary('archaludon', 'faint', q.curve('one'))",
-    "cry": "q.bedrock_stateful('archaludon', 'cry')",
-    "recoil": "q.bedrock_stateful('archaludon', 'recoil')",
-    "physical": "q.bedrock_primary('archaludon', 'physical', q.curve('symmetrical'))",
-    "special": "q.bedrock_primary('archaludon', 'special', q.curve('symmetrical'))",
-    "status": "q.bedrock_primary('archaludon', 'status', q.curve('symmetrical'))"
-  },
   "poses": {
     "standing": {
       "poseTypes": [
@@ -21,7 +13,7 @@
         "PORTRAIT",
         "PROFILE"
       ],
-      "isBattle": false,
+      "isBattle": true,
       "animations": [
         "q.bedrock('archaludon', 'ground_idle')"
       ],
@@ -29,29 +21,14 @@
         "q.bedrock_quirk('archaludon', 'blink')"
       ]
     },
-    "battle-standing": {
-      "poseTypes": [
-        "STAND",
-        "FLOAT"
-      ],
-      "isBattle": true,
-      "animations": [
-        "q.bedrock('archaludon', 'battle_idle')"
-      ],
-      "namedAnimations": {
-        "cry": "q.bedrock_primary('archaludon', 'battle_cry', q.curve('symmetrical'))"
-      },
-      "quirks": [
-        "q.bedrock_quirk('archaludon', 'blink')"
-      ]
-    },
     "walking": {
       "poseTypes": [
         "WALK",
         "SWIM"
       ],
       "animations": [
-        "q.bedrock('archaludon', 'ground_walk')"
+        "q.bedrock('archaludon', 'ground_idle')",
+        "q.biped_walk(1, 1, 'leg_left', 'leg_right')"
       ],
       "quirks": [
         "q.bedrock_quirk('archaludon', 'blink')"

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

@@ -1137,7 +1137,6 @@
   "cobblemon.container.tm_machine": "TM Machine",
   "cobblemon.ui.edit.habitat": "Habitat Editor",
   "cobblemon.ui.edit.habitat.mimic_id": "Mimic Block ID",
-  "cobblemon.ui.edit.habitat.phase_number": "Number of Phases",
   "cobblemon.ui.edit.habitat.phase_order": "Phase Order: %s",
   "cobblemon.ui.edit.habitat.level_range": "Level Range (Min - Max)",
   "cobblemon.ui.edit.habitat.mode": "Mode: %s",
@@ -1187,7 +1186,7 @@
   "cobblemon.ui.edit.habitat.validation.species": "Species must be a valid Pokemon name.",
   "cobblemon.ui.edit.habitat.validation.weight": "Weight must be greater than 0.",
   "cobblemon.ui.edit.habitat.validation.modifiers": "Modifiers format is invalid.",
-  "cobblemon.ui.edit.habitat.validation.phases_list": "Phases must use valid moon phases (0-7), e.g. 1-3 or 1, 3-5, 6.",
+  "cobblemon.ui.edit.habitat.validation.phases_list": "Phases must use a valid format for integer ranges, e.g. 1-3 or 1, 3-5, 6.",
   "cobblemon.ui.edit.habitat.validation.min_light": "Min Light must be between 0 and 15.",
   "cobblemon.ui.edit.habitat.validation.max_light": "Max Light must be between 0 and 15.",
 
@@ -1352,13 +1351,13 @@
   "cobblemon.ui.pokedex.info.variation": "Variation",
   "cobblemon.ui.pokedex.info.form": "Form",
   "cobblemon.ui.pokedex.info.form.normal": "Standard",
-  "cobblemon.ui.pokedex.info.form.alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.alola": "Alolan",
   "cobblemon.ui.pokedex.info.form.region-bias-alola": "Alola Bias",
-  "cobblemon.ui.pokedex.info.form.galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.galar": "Galarian",
   "cobblemon.ui.pokedex.info.form.region-bias-galar": "Galar Bias",
-  "cobblemon.ui.pokedex.info.form.hisui": "Hisuian Form",
+  "cobblemon.ui.pokedex.info.form.hisui": "Hisuian",
   "cobblemon.ui.pokedex.info.form.region-bias-hisui": "Hisui Bias",
-  "cobblemon.ui.pokedex.info.form.paldea": "Paldean Form",
+  "cobblemon.ui.pokedex.info.form.paldea": "Paldean",
   "cobblemon.ui.pokedex.info.form.region-bias-paldea": "Paldea Bias",
   "cobblemon.ui.pokedex.info.form.netherite-coating-stage1": "Netherite Coating 1/8",
   "cobblemon.ui.pokedex.info.form.netherite-coating-stage2": "Netherite Coating 2/8",
@@ -1813,7 +1812,7 @@
   "cobblemon.mark.mark_personality_absent-minded": "Absent-Minded Mark",
   "cobblemon.mark.mark_personality_absent-minded.title": "%1$s the Spacey",
   "cobblemon.mark.mark_personality_absent-minded.desc": "A mark for a spacey Pokémon.",
-  "cobblemon.mark.mark_personality_angry": "Angry Mark",
+  "cobblemon.mark.mark_personality_angry": "Angery Mark",
   "cobblemon.mark.mark_personality_angry.title": "%1$s the Furious",
   "cobblemon.mark.mark_personality_angry.desc": "A mark for a furious Pokémon.",
   "cobblemon.mark.mark_personality_calmness": "Calmness Mark",
@@ -2872,7 +2871,7 @@
   "cobblemon.battle.activate.craftyshield": "Crafty Shield protected %1$s!",
   "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.disguise": "It's disguise served it as a decoy!",
   "cobblemon.battle.activate.electricterrain": "%1$s surrounds itself with electrified terrain!",
   "cobblemon.battle.activate.endure": "%1$s endured the hit!",
   "cobblemon.battle.activate.firespin": "%1$s became trapped in the fiery vortex!",
@@ -5706,12 +5705,12 @@
   "cobblemon.species.rattata.name": "Rattata",
   "cobblemon.ui.pokedex.info.form.rattata": "",
   "cobblemon.species.rattata.desc": "Rattata is cautious in the extreme. Even while it is asleep, it constantly listens by moving its ears around. It is not picky about where it lives—it will make its nest anywhere.",
-  "cobblemon.ui.pokedex.info.form.rattata-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.rattata-alola": "Alolan",
   "cobblemon.species.rattata-alola.desc": "Night after night, they sneak into people's homes seeking food. A massive outbreak of them has become an issue of public concern.",
   "cobblemon.species.raticate.name": "Raticate",
   "cobblemon.ui.pokedex.info.form.raticate": "",
   "cobblemon.species.raticate.desc": "Raticate's sturdy fangs grow steadily. To keep them ground down, it gnaws on rocks and logs. It may even chew on the walls of houses.",
-  "cobblemon.ui.pokedex.info.form.raticate-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.raticate-alola": "Alolan",
   "cobblemon.species.raticate-alola.desc": "It commands a nest of Rattata. Different nests don't get along, whipping up severe fights over feeding grounds.",
   "cobblemon.species.spearow.name": "Spearow",
   "cobblemon.species.spearow.desc": "Spearow has a very loud cry that can be heard over half a mile away. If its high, keening cry is heard echoing all around, it is a sign that they are warning each other of danger.",
@@ -5745,7 +5744,7 @@
   "cobblemon.species.raichu.name": "Raichu",
   "cobblemon.ui.pokedex.info.form.raichu": "",
   "cobblemon.species.raichu.desc": "This Pokémon exudes a weak electrical charge from all over its body that makes it take on a slight glow in darkness. Raichu plants its tail in the ground to discharge electricity.",
-  "cobblemon.ui.pokedex.info.form.raichu-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.raichu-alola": "Alolan",
   "cobblemon.species.raichu-alola.desc": "When you rub its cheeks, a sweet fragrance comes wafting out. However, you'll also get a light shock!",
   "cobblemon.ui.pokedex.info.form.raichu-megax": "Mega Raichu X",
   "cobblemon.species.raichu-megax.desc": "It resembles an X as it flies through the air with 50 million volts of electricity sparking from its ears and forked tail.",
@@ -5754,12 +5753,12 @@
   "cobblemon.species.sandshrew.name": "Sandshrew",
   "cobblemon.ui.pokedex.info.form.sandshrew": "",
   "cobblemon.species.sandshrew.desc": "Sandshrew has a very dry hide that is extremely tough. The Pokémon can roll into a ball that repels any attack. At night, it burrows into the desert sand to sleep.",
-  "cobblemon.ui.pokedex.info.form.sandshrew-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.sandshrew-alola": "Alolan",
   "cobblemon.species.sandshrew-alola.desc": "The skin on its back is as hard as steel. Predators go after its soft belly, so it clings to the ground desperately.",
   "cobblemon.species.sandslash.name": "Sandslash",
   "cobblemon.ui.pokedex.info.form.sandslash": "",
   "cobblemon.species.sandslash.desc": "Sandslash can roll up its body as if it were a ball covered with large spikes. In battle, this Pokémon will try to make the foe flinch by jabbing it with its spines. It then leaps at the stunned foe to tear wildly with its sharp claws.",
-  "cobblemon.ui.pokedex.info.form.sandslash-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.sandslash-alola": "Alolan",
   "cobblemon.species.sandslash-alola.desc": "A long, long time ago, it lived in the desert. With its sharp claws fully extended, it can climb right up an iceberg without slipping.",
   "cobblemon.species.nidoranf.name": "Nidoran♀",
   "cobblemon.species.nidoranf.desc": "Nidoran♀ has barbs that secrete a powerful poison. They are thought to have developed as protection for this small-bodied Pokémon. When enraged, it releases a horrible toxin from its horn.",
@@ -5783,12 +5782,12 @@
   "cobblemon.species.vulpix.name": "Vulpix",
   "cobblemon.ui.pokedex.info.form.vulpix": "",
   "cobblemon.species.vulpix.desc": "Inside Vulpix's body burns a flame that never goes out. During the daytime, when the temperatures rise, this Pokémon releases flames from its mouth to prevent its body from growing too hot.",
-  "cobblemon.ui.pokedex.info.form.vulpix-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.vulpix-alola": "Alolan",
   "cobblemon.species.vulpix-alola.desc": "They live together in a skulk, helping one another. Before eating their prey, they freeze it solid with their –58 degree Fahrenheit breath.",
   "cobblemon.species.ninetales.name": "Ninetales",
   "cobblemon.ui.pokedex.info.form.ninetales": "",
   "cobblemon.species.ninetales.desc": "Legend has it that Ninetales came into being when nine wizards possessing sacred powers merged into one. This Pokémon is highly intelligent—it can understand human speech.",
-  "cobblemon.ui.pokedex.info.form.ninetales-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.ninetales-alola": "Alolan",
   "cobblemon.species.ninetales-alola.desc": "Some said that deities visited mountains where Ninetales live, so in times long past, no one was allowed to go into those mountains.",
   "cobblemon.species.jigglypuff.name": "Jigglypuff",
   "cobblemon.species.jigglypuff.desc": "When this Pokémon sings, it never pauses to breathe. If it is in a battle against an opponent that does not easily fall asleep, Jigglypuff cannot breathe, endangering its life.",
@@ -5815,26 +5814,26 @@
   "cobblemon.species.diglett.name": "Diglett",
   "cobblemon.ui.pokedex.info.form.diglett": "",
   "cobblemon.species.diglett.desc": "Diglett are raised in most farms. The reason is simple— wherever this Pokémon burrows, the soil is left perfectly tilled for planting crops. This soil is made ideal for growing delicious vegetables.",
-  "cobblemon.ui.pokedex.info.form.diglett-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.diglett-alola": "Alolan",
   "cobblemon.species.diglett-alola.desc": "The need to dig through volcanic rock in the ground has made them more powerful than the Diglett of other regions.",
   "cobblemon.species.dugtrio.name": "Dugtrio",
   "cobblemon.ui.pokedex.info.form.dugtrio": "",
   "cobblemon.species.dugtrio.desc": "Dugtrio are actually triplets that emerged from one body. As a result, each triplet thinks exactly like the other two triplets. They work cooperatively to burrow endlessly.",
-  "cobblemon.ui.pokedex.info.form.dugtrio-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.dugtrio-alola": "Alolan",
   "cobblemon.species.dugtrio-alola.desc": "Its shining gold whiskers are advanced sensors that can detect vibrations from sounds several miles away.",
   "cobblemon.species.meowth.name": "Meowth",
   "cobblemon.ui.pokedex.info.form.meowth": "",
   "cobblemon.species.meowth.desc": "Meowth withdraws its sharp claws into its paws to slinkily sneak about without making any incriminating footsteps. For some reason, this Pokémon loves shiny coins that glitter with light.",
-  "cobblemon.ui.pokedex.info.form.meowth-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.meowth-alola": "Alolan",
   "cobblemon.species.meowth-alola.desc": "A royal house that flourished in the distant past brought it here from another region. Meowth is both selfish and prideful.",
-  "cobblemon.ui.pokedex.info.form.meowth-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.meowth-galar": "Galarian",
   "cobblemon.species.meowth-galar.desc": "Living with a savage, seafaring people has toughened this Pokémon's body so much that parts of it have turned to iron.",
   "cobblemon.ui.pokedex.info.form.meowth-gmax": "Gigantamax",
   "cobblemon.species.meowth-gmax.desc": "The pattern that has appeared on its giant coin is thought to be the key to unlocking the secrets of the Dynamax phenomenon.",
   "cobblemon.species.persian.name": "Persian",
   "cobblemon.ui.pokedex.info.form.persian": "",
   "cobblemon.species.persian.desc": "Persian has six bold whiskers that give it a look of toughness. The whiskers sense air movements to determine what is in the Pokémon's surrounding vicinity. It becomes docile if grabbed by the whiskers.",
-  "cobblemon.ui.pokedex.info.form.persian-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.persian-alola": "Alolan",
   "cobblemon.species.persian-alola.desc": "Its round face is a symbol of wealth. Persian that have bigger, plumper faces are considered more beautiful.",
   "cobblemon.species.psyduck.name": "Psyduck",
   "cobblemon.species.psyduck.desc": "If it uses its mysterious power, Psyduck can't remember having done so. It apparently can't form a memory of such an event because it goes into an altered state that is much like deep sleep.",
@@ -5847,12 +5846,12 @@
   "cobblemon.species.growlithe.name": "Growlithe",
   "cobblemon.ui.pokedex.info.form.growlithe": "",
   "cobblemon.species.growlithe.desc": "Growlithe has a superb sense of smell. Once it smells anything, this Pokémon won't forget the scent, no matter what. It uses its advanced olfactory sense to determine the emotions of other living things.",
-  "cobblemon.ui.pokedex.info.form.growlithe-hisui": "Hisuian Form",
+  "cobblemon.ui.pokedex.info.form.growlithe-hisui": "Hisuian",
   "cobblemon.species.growlithe-hisui.desc": "They patrol their territory in pairs. I believe the igneous rock components in the fur of this species are the result of volcanic activity in its habitat.",
   "cobblemon.species.arcanine.name": "Arcanine",
   "cobblemon.ui.pokedex.info.form.arcanine": "",
   "cobblemon.species.arcanine.desc": "Arcanine is known for its high speed. It is said to be capable of running over 6,200 miles in a single day and night. The fire that blazes wildly within this Pokémon's body is its source of power.",
-  "cobblemon.ui.pokedex.info.form.arcanine-hisui": "Hisuian Form",
+  "cobblemon.ui.pokedex.info.form.arcanine-hisui": "Hisuian",
   "cobblemon.species.arcanine-hisui.desc": "Snaps at its foes with fangs cloaked in blazing flame. Despite its bulk, it deftly feints every which way, leading opponents on a deceptively merry chase as it all but dances around them.",
   "cobblemon.species.poliwag.name": "Poliwag",
   "cobblemon.species.poliwag.desc": "Poliwag has a very thin skin. It is possible to see the Pokémon's spiral innards right through the skin. Despite its thinness, however, the skin is also very flexible. Even sharp fangs bounce right off it.",
@@ -5894,39 +5893,39 @@
   "cobblemon.species.geodude.name": "Geodude",
   "cobblemon.ui.pokedex.info.form.geodude": "",
   "cobblemon.species.geodude.desc": "When Geodude sleeps deeply, it buries itself halfway into the ground. It will not awaken even if hikers step on it unwittingly. In the morning, this Pokémon rolls downhill in search of food.",
-  "cobblemon.ui.pokedex.info.form.geodude-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.geodude-alola": "Alolan",
   "cobblemon.species.geodude-alola.desc": "Geodude compete against each other with headbutts. The iron sand on their heads will stick to whichever one has stronger magnetism.",
   "cobblemon.species.graveler.name": "Graveler",
   "cobblemon.ui.pokedex.info.form.graveler": "",
   "cobblemon.species.graveler.desc": "Rocks are Graveler's favorite food. This Pokémon will climb a mountain from the base to the summit, crunchingly feasting on rocks all the while. Upon reaching the peak, it rolls back down to the bottom.",
-  "cobblemon.ui.pokedex.info.form.graveler-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.graveler-alola": "Alolan",
   "cobblemon.species.graveler-alola.desc": "Graveler's entire body is tinged with electricity due to the stones it likes to eat. It's very quick-tempered.",
   "cobblemon.species.golem.name": "Golem",
   "cobblemon.ui.pokedex.info.form.golem": "",
   "cobblemon.species.golem.desc": "Golem is known for rolling down from mountains. To prevent them from rolling into the homes of people downhill, grooves have been dug into the sides of mountains to serve as guideways for diverting this Pokémon's course.",
-  "cobblemon.ui.pokedex.info.form.golem-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.golem-alola": "Alolan",
   "cobblemon.species.golem-alola.desc": "It shoots large rocks that are charged with electricity. Tremendous electric shocks are flung out across the whole area of impact.",
   "cobblemon.species.ponyta.name": "Ponyta",
   "cobblemon.ui.pokedex.info.form.ponyta": "",
   "cobblemon.species.ponyta.desc": "Ponyta is very weak at birth. It can barely stand up. This Pokémon becomes stronger by stumbling and falling to keep up with its parent.",
-  "cobblemon.ui.pokedex.info.form.ponyta-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.ponyta-galar": "Galarian",
   "cobblemon.species.ponyta-galar.desc": "Its small horn hides a healing power. With a few rubs from this Pokémon's horn, any slight wound you have will be healed.",
   "cobblemon.species.rapidash.name": "Rapidash",
   "cobblemon.ui.pokedex.info.form.rapidash": "",
   "cobblemon.species.rapidash.desc": "Rapidash usually can be seen casually cantering in the fields and plains. However, when this Pokémon turns serious, its fiery manes flare and blaze as it gallops its way up to 150 mph.",
-  "cobblemon.ui.pokedex.info.form.rapidash-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.rapidash-galar": "Galarian",
   "cobblemon.species.rapidash-galar.desc": "Little can stand up to its psycho cut. Unleashed from this Pokémon's horn, the move will punch a hole right through a thick metal sheet.",
   "cobblemon.species.slowpoke.name": "Slowpoke",
   "cobblemon.ui.pokedex.info.form.slowpoke": "",
   "cobblemon.species.slowpoke.desc": "Slowpoke uses its tail to catch prey by dipping it in water at the side of a river. However, this Pokémon often forgets what it's doing and often spends entire days just loafing at water's edge.",
-  "cobblemon.ui.pokedex.info.form.slowpoke-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.slowpoke-galar": "Galarian",
   "cobblemon.species.slowpoke-galar.desc": "Although this Pokémon is normally zoned out, its expression abruptly sharpens on occasion. The cause for this seems to lie in Slowpoke's diet.",
   "cobblemon.species.slowbro.name": "Slowbro",
   "cobblemon.ui.pokedex.info.form.slowbro": "",
   "cobblemon.species.slowbro.desc": "Slowbro's tail has a Shellder firmly attached with a bite. As a result, the tail can't be used for fishing anymore. This causes Slowbro to grudgingly swim and catch prey instead.",
   "cobblemon.ui.pokedex.info.form.slowbro-mega": "Mega Slowbro",
   "cobblemon.species.slowbro-mega.desc": "Having been swallowed whole by Shellder, Slowbro now has an iron defense. It's pretty comfortable in there, too.",
-  "cobblemon.ui.pokedex.info.form.slowbro-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.slowbro-galar": "Galarian",
   "cobblemon.species.slowbro-galar.desc": "A Shellder bite set off a chemical reaction with the spices inside Slowbro's body, causing Slowbro to become a Poison-type Pokémon.",
   "cobblemon.species.magnemite.name": "Magnemite",
   "cobblemon.species.magnemite.desc": "Magnemite floats in the air by emitting electromagnetic waves from the units at its sides. These waves block gravity. This Pokémon becomes incapable of flight if its internal electrical supply is depleted.",
@@ -5935,7 +5934,7 @@
   "cobblemon.species.farfetchd.name": "Farfetch'd",
   "cobblemon.ui.pokedex.info.form.farfetchd": "",
   "cobblemon.species.farfetchd.desc": "Farfetch'd is always seen with a stalk from a plant of some sort. Apparently, there are good stalks and bad stalks. This Pokémon has been known to fight with others over stalks.",
-  "cobblemon.ui.pokedex.info.form.farfetchd-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.farfetchd-galar": "Galarian",
   "cobblemon.species.farfetchd-galar.desc": "Wielding a thick, heavy leek has strengthened its body. In battle, it bets everything on a single destructive blow.",
   "cobblemon.species.doduo.name": "Doduo",
   "cobblemon.species.doduo.desc": "Doduo's two heads contain completely identical brains. A scientific study reported that on rare occasions, there will be examples of this Pokémon possessing different sets of brains.",
@@ -5948,12 +5947,12 @@
   "cobblemon.species.grimer.name": "Grimer",
   "cobblemon.ui.pokedex.info.form.grimer": "",
   "cobblemon.species.grimer.desc": "Grimer emerged from the sludge that settled on a polluted seabed. This Pokémon loves anything filthy. It constantly leaks a horribly germ-infested fluid from all over its body.",
-  "cobblemon.ui.pokedex.info.form.grimer-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.grimer-alola": "Alolan",
   "cobblemon.species.grimer-alola.desc": "The crystals on Grimer's body are lumps of toxins. If one falls off, lethal poisons leak out.",
   "cobblemon.species.muk.name": "Muk",
   "cobblemon.ui.pokedex.info.form.muk": "",
   "cobblemon.species.muk.desc": "This Pokémon's favorite food is anything that is repugnantly filthy. In dirty towns where people think nothing of throwing away litter on the streets, Muk are certain to gather.",
-  "cobblemon.ui.pokedex.info.form.muk-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.muk-alola": "Alolan",
   "cobblemon.species.muk-alola.desc": "What look like fangs and claws are actually crystallized poison that will afflict you at a mere touch, so don't get too close.",
   "cobblemon.species.shellder.name": "Shellder",
   "cobblemon.species.shellder.desc": "At night, this Pokémon uses its broad tongue to burrow a hole in the seafloor sand and then sleep in it. While it is sleeping, Shellder closes its shell, but leaves its tongue hanging out.",
@@ -5986,12 +5985,12 @@
   "cobblemon.species.voltorb.name": "Voltorb",
   "cobblemon.ui.pokedex.info.form.voltorb": "",
   "cobblemon.species.voltorb.desc": "Voltorb is extremely sensitive—it explodes at the slightest of shocks. It is rumored that it was first created when a Poké Ball was exposed to a powerful pulse of energy.",
-  "cobblemon.ui.pokedex.info.form.voltorb-hisui": "Hisuian Form",
+  "cobblemon.ui.pokedex.info.form.voltorb-hisui": "Hisuian",
   "cobblemon.species.voltorb-hisui.desc": "An enigmatic Pokémon that happens to bear a resemblance to a Poké Ball. When excited, it discharges the electric current it has stored in its belly, then lets out a great, uproarious laugh.",
   "cobblemon.species.electrode.name": "Electrode",
   "cobblemon.ui.pokedex.info.form.electrode": "",
   "cobblemon.species.electrode.desc": "One of Electrode's characteristics is its attraction to electricity. It is a problematical Pokémon that congregates mostly at electrical power plants to feed on electricity that has just been generated.",
-  "cobblemon.ui.pokedex.info.form.electrode-hisui": "Hisuian Form",
+  "cobblemon.ui.pokedex.info.form.electrode-hisui": "Hisuian",
   "cobblemon.species.electrode-hisui.desc": "The tissue on the surface of its body is curiously similar in composition to an Apricorn. When irritated, this Pokémon lets loose an electric current equal to 20 lightning bolts.",
   "cobblemon.species.exeggcute.name": "Exeggcute",
   "cobblemon.ui.pokedex.info.form.exeggcute": "",
@@ -5999,7 +5998,7 @@
   "cobblemon.species.exeggutor.name": "Exeggutor",
   "cobblemon.ui.pokedex.info.form.exeggutor": "",
   "cobblemon.species.exeggutor.desc": "Exeggutor originally came from the tropics. Its heads steadily grow larger from exposure to strong sunlight. It is said that when the heads fall off, they group together to form Exeggcute.",
-  "cobblemon.ui.pokedex.info.form.exeggutor-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.exeggutor-alola": "Alolan",
   "cobblemon.species.exeggutor-alola.desc": "This Pokémon's psychic powers aren't as strong as they once were. The head on this Exeggutor's tail scans surrounding areas with weak telepathy.",
   "cobblemon.species.cubone.name": "Cubone",
   "cobblemon.ui.pokedex.info.form.cubone": "",
@@ -6007,7 +6006,7 @@
   "cobblemon.species.marowak.name": "Marowak",
   "cobblemon.ui.pokedex.info.form.marowak": "",
   "cobblemon.species.marowak.desc": "Marowak is the evolved form of a Cubone that has overcome its sadness at the loss of its mother and grown tough. This Pokémon's tempered and hardened spirit is not easily broken.",
-  "cobblemon.ui.pokedex.info.form.marowak-alola": "Alolan Form",
+  "cobblemon.ui.pokedex.info.form.marowak-alola": "Alolan",
   "cobblemon.species.marowak-alola.desc": "When it beats opponents with its bone, the cursed flames spread to them. No amount of water will stop those flames from burning.",
   "cobblemon.species.hitmonlee.name": "Hitmonlee",
   "cobblemon.species.hitmonlee.desc": "Hitmonlee's legs freely contract and stretch. Using these springlike legs, it bowls over foes with devastating kicks. After battle, it rubs down its legs and loosens the muscles to overcome fatigue.",
@@ -6021,7 +6020,7 @@
   "cobblemon.species.weezing.name": "Weezing",
   "cobblemon.ui.pokedex.info.form.weezing": "",
   "cobblemon.species.weezing.desc": "Weezing alternately shrinks and inflates its twin bodies to mix together toxic gases inside. The more the gases are mixed, the more powerful the toxins become. The Pokémon also becomes more putrid.",
-  "cobblemon.ui.pokedex.info.form.weezing-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.weezing-galar": "Galarian",
   "cobblemon.species.weezing-galar.desc": "This Pokémon consumes particles that contaminate the air. Instead of leaving droppings, it expels clean air.",
   "cobblemon.species.rhyhorn.name": "Rhyhorn",
   "cobblemon.species.rhyhorn.desc": "Rhyhorn's brain is very small. It is so dense, while on a run it forgets why it started running in the first place. It apparently remembers sometimes if it demolishes something.",
@@ -6054,7 +6053,7 @@
   "cobblemon.species.mrmime.name": "Mr. Mime",
   "cobblemon.ui.pokedex.info.form.mrmime": "",
   "cobblemon.species.mrmime.desc": "Mr. Mime is a master of pantomime. Its gestures and motions convince watchers that something unseeable actually exists. Once the watchers are convinced, the unseeable thing exists as if it were real.",
-  "cobblemon.ui.pokedex.info.form.mrmime-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.mrmime-galar": "Galarian",
   "cobblemon.species.mrmime-galar.desc": "Its talent is tap-dancing. It can also manipulate temperatures to create a floor of ice, which this Pokémon can kick up to use as a barrier.",
   "cobblemon.species.scyther.name": "Scyther",
   "cobblemon.species.scyther.desc": "Scyther is blindingly fast. Its blazing speed enhances the effectiveness of the twin scythes on its forearms. This Pokémon's scythes are so effective, they can slice through thick logs in one wicked stroke.",
@@ -6072,11 +6071,11 @@
   "cobblemon.species.tauros.name": "Tauros",
   "cobblemon.ui.pokedex.info.form.tauros": "",
   "cobblemon.species.tauros.desc": "This Pokémon is not satisfied unless it is rampaging at all times. If there is no opponent for Tauros to battle, it will charge at thick trees and knock them down to calm itself.",
-  "cobblemon.ui.pokedex.info.form.tauros-paldeacombat": "Paldean Form (Combat Breed)",
+  "cobblemon.ui.pokedex.info.form.tauros-paldeacombat": "Paldean (Combat Breed)",
   "cobblemon.species.tauros-paldeacombat.desc": "This Pokémon has a muscular body and excels at close-quarters combat. It uses its short horns to strike the opponent's weak spots.",
-  "cobblemon.ui.pokedex.info.form.tauros-paldeablaze": "Paldean Form (Blaze Breed)",
+  "cobblemon.ui.pokedex.info.form.tauros-paldeablaze": "Paldean (Blaze Breed)",
   "cobblemon.species.tauros-paldeablaze.desc": "When heated by fire energy, its horns can get hotter than 1,800 degrees Fahrenheit. Those gored by them will suffer both wounds and burns.",
-  "cobblemon.ui.pokedex.info.form.tauros-paldeaaqua": "Paldean Form (Aqua Breed)",
+  "cobblemon.ui.pokedex.info.form.tauros-paldeaaqua": "Paldean (Aqua Breed)",
   "cobblemon.species.tauros-paldeaaqua.desc": "This Pokémon blasts water from holes on the tips of its horns—the high-pressure jets pierce right through Tauros's enemies.",
   "cobblemon.species.magikarp.name": "Magikarp",
   "cobblemon.species.magikarp.desc": "Magikarp is virtually useless in battle as it can only splash around. As a result, it is considered to be weak. However, it is actually a very hardy Pokémon that can survive in any body of water no matter how polluted it is.",
@@ -6126,17 +6125,17 @@
   "cobblemon.species.articuno.name": "Articuno",
   "cobblemon.ui.pokedex.info.form.articuno": "",
   "cobblemon.species.articuno.desc": "Articuno is a legendary bird Pokémon that can control ice. The flapping of its wings chills the air. As a result, it is said that when this Pokémon flies, snow will fall.",
-  "cobblemon.ui.pokedex.info.form.articuno-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.articuno-galar": "Galarian",
   "cobblemon.species.articuno-galar.desc": "Its feather-like blades are composed of psychic energy and can shear through thick iron sheets as if they were paper.",
   "cobblemon.species.zapdos.name": "Zapdos",
   "cobblemon.ui.pokedex.info.form.zapdos": "",
   "cobblemon.species.zapdos.desc": "Zapdos is a legendary bird Pokémon that has the ability to control electricity. It usually lives in thunderclouds. The Pokémon gains power if it is stricken by lightning bolts.",
-  "cobblemon.ui.pokedex.info.form.zapdos-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.zapdos-galar": "Galarian",
   "cobblemon.species.zapdos-galar.desc": "When its feathers rub together, they produce a crackling sound like the zapping of electricity. That's why this Pokémon is called Zapdos.",
   "cobblemon.species.moltres.name": "Moltres",
   "cobblemon.ui.pokedex.info.form.moltres": "",
   "cobblemon.species.moltres.desc": "Moltres is a legendary bird Pokémon that has the ability to control fire. If this Pokémon is injured, it is said to dip its body in the molten magma of a volcano to burn and heal itself.",
-  "cobblemon.ui.pokedex.info.form.moltres-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.moltres-galar": "Galarian",
   "cobblemon.species.moltres-galar.desc": "This Pokémon's sinister, flame-like aura will consume the spirit of any creature it hits. Victims become burned-out shadows of themselves.",
   "cobblemon.species.dratini.name": "Dratini",
   "cobblemon.species.dratini.desc": "Dratini continually molts and sloughs off its old skin. It does so because the life energy within its body steadily builds to reach uncontrollable levels.",
@@ -6174,7 +6173,7 @@
   "cobblemon.species.typhlosion.name": "Typhlosion",
   "cobblemon.ui.pokedex.info.form.typhlosion": "",
   "cobblemon.species.typhlosion.desc": "Typhlosion obscures itself behind a shimmering heat haze that it creates using its intensely hot flames. This Pokémon creates blazing explosive blasts that burn everything to cinders.",
-  "cobblemon.ui.pokedex.info.form.typhlosion-hisui": "Hisuian Form",
+  "cobblemon.ui.pokedex.info.form.typhlosion-hisui": "Hisuian",
   "cobblemon.species.typhlosion-hisui.desc": "Said to purify lost, forsaken souls with its flames and guide them to the afterlife. I believe its form has been influenced by the energy of the sacred mountain towering at Hisui's center.",
   "cobblemon.species.totodile.name": "Totodile",
   "cobblemon.species.totodile.desc": "Despite the smallness of its body, Totodile's jaws are very powerful. While the Pokémon may think it is just playfully nipping, its bite has enough power to cause serious injury.",
@@ -6258,7 +6257,7 @@
   "cobblemon.species.wooper.name": "Wooper",
   "cobblemon.ui.pokedex.info.form.wooper": "",
   "cobblemon.species.wooper.desc": "Wooper usually lives in water. However, it occasionally comes out onto land in search of food. On land, it coats its body with a gooey, toxic film.",
-  "cobblemon.ui.pokedex.info.form.wooper-paldea": "Paldean Form",
+  "cobblemon.ui.pokedex.info.form.wooper-paldea": "Paldean",
   "cobblemon.species.wooper-paldea.desc": "After losing a territorial struggle, Wooper began living on land. The Pokémon changed over time, developing a poisonous film to protect its body.",
   "cobblemon.species.quagsire.name": "Quagsire",
   "cobblemon.species.quagsire.desc": "Quagsire hunts for food by leaving its mouth wide open in water and waiting for its prey to blunder in unaware. Because the Pokémon does not move, it does not get very hungry.",
@@ -6271,7 +6270,7 @@
   "cobblemon.species.slowking.name": "Slowking",
   "cobblemon.ui.pokedex.info.form.slowking": "",
   "cobblemon.species.slowking.desc": "Slowking undertakes research every day in an effort to solve the mysteries of the world. However, this Pokémon apparently forgets everything it has learned if the Shellder on its head comes off.",
-  "cobblemon.ui.pokedex.info.form.slowking-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.slowking-galar": "Galarian",
   "cobblemon.species.slowking-galar.desc": "A combination of toxins and the shock of evolving has increased Shellder's intelligence to the point that Shellder now controls Slowking.",
   "cobblemon.species.misdreavus.name": "Misdreavus",
   "cobblemon.species.misdreavus.desc": "Misdreavus frightens people with a creepy, sobbing cry. The Pokémon apparently uses its red spheres to absorb the fearful feelings of foes and turn them into nutrition.",
@@ -6356,7 +6355,7 @@
   "cobblemon.species.qwilfish.name": "Qwilfish",
   "cobblemon.ui.pokedex.info.form.qwilfish": "",
   "cobblemon.species.qwilfish.desc": "Qwilfish sucks in water, inflating itself. This Pokémon uses the pressure of the water it swallowed to shoot toxic quills all at once from all over its body. It finds swimming somewhat challenging.",
-  "cobblemon.ui.pokedex.info.form.qwilfish-hisui": "Hisuian Form",
+  "cobblemon.ui.pokedex.info.form.qwilfish-hisui": "Hisuian",
   "cobblemon.species.qwilfish-hisui.desc": "It lives just offshore in cold parts of the world. Its poisonous spikes are thicker and shorter than those of other regions' Qwilfish.",
   "cobblemon.species.scizor.name": "Scizor",
   "cobblemon.ui.pokedex.info.form.scizor": "",
@@ -6373,7 +6372,7 @@
   "cobblemon.species.sneasel.name": "Sneasel",
   "cobblemon.ui.pokedex.info.form.sneasel": "",
   "cobblemon.species.sneasel.desc": "Sneasel scales trees by punching its hooked claws into the bark. This Pokémon seeks out unguarded nests and steals eggs for food while the parents are away.",
-  "cobblemon.ui.pokedex.info.form.sneasel-hisui": "Hisuian Form",
+  "cobblemon.ui.pokedex.info.form.sneasel-hisui": "Hisuian",
   "cobblemon.species.sneasel-hisui.desc": "Its sturdy, curved claws are ideal for traversing precipitous cliffs. From the tips of these claws drips a venom that infiltrates the nerves of any prey caught in Sneasel's grasp.",
   "cobblemon.species.teddiursa.name": "Teddiursa",
   "cobblemon.species.teddiursa.desc": "This Pokémon likes to lick its palms that are sweetened by being soaked in honey. Teddiursa concocts its own honey by blending fruits and pollen collected by Beedrill.",
@@ -6390,7 +6389,7 @@
   "cobblemon.species.corsola.name": "Corsola",
   "cobblemon.ui.pokedex.info.form.corsola": "",
   "cobblemon.species.corsola.desc": "Clusters of Corsola congregate in warm seas where they serve as ideal hiding places for smaller Pokémon. When the water temperature falls, this Pokémon migrates to the southern seas.",
-  "cobblemon.ui.pokedex.info.form.corsola-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.corsola-galar": "Galarian",
   "cobblemon.species.corsola-galar.desc": "Watch your step when wandering areas oceans once covered. What looks like a stone could be this Pokémon, and it will curse you if you kick it.",
   "cobblemon.species.remoraid.name": "Remoraid",
   "cobblemon.species.remoraid.desc": "Remoraid sucks in water, then expels it at high velocity using its abdominal muscles to shoot down flying prey. When evolution draws near, this Pokémon travels downstream from rivers.",
@@ -6493,12 +6492,12 @@
   "cobblemon.species.zigzagoon.name": "Zigzagoon",
   "cobblemon.ui.pokedex.info.form.zigzagoon": "",
   "cobblemon.species.zigzagoon.desc": "The hair on Zigzagoon's back is bristly. It rubs the hard back hair against trees to leave its territorial markings. This Pokémon may play dead to fool foes in battle.",
-  "cobblemon.ui.pokedex.info.form.zigzagoon-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.zigzagoon-galar": "Galarian",
   "cobblemon.species.zigzagoon-galar.desc": "Its restlessness has it constantly running around. If it sees another Pokémon, it will purposely run into them in order to start a fight.",
   "cobblemon.species.linoone.name": "Linoone",
   "cobblemon.ui.pokedex.info.form.linoone": "",
   "cobblemon.species.linoone.desc": "When hunting, Linoone will make a beeline straight for the prey at a full run. While this Pokémon is capable of topping 60 mph, it has to come to a screeching halt before it can turn.",
-  "cobblemon.ui.pokedex.info.form.linoone-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.linoone-galar": "Galarian",
   "cobblemon.species.linoone-galar.desc": "It uses its long tongue to taunt opponents. Once the opposition is enraged, this Pokémon hurls itself at the opponent, tackling them forcefully.",
   "cobblemon.species.wurmple.name": "Wurmple",
   "cobblemon.species.wurmple.desc": "Wurmple is targeted by Swellow as prey. This Pokémon will try to resist by pointing the spikes on its rear at the attacking predator. It will weaken the foe by leaking poison from the spikes.",
@@ -7167,7 +7166,7 @@
   "cobblemon.species.samurott.name": "Samurott",
   "cobblemon.ui.pokedex.info.form.samurott": "",
   "cobblemon.species.samurott.desc": "One swing of the sword incorporated in its armor can fell an opponent. A simple glare from one of them quiets everybody.",
-  "cobblemon.ui.pokedex.info.form.samurott-hisui": "Hisuian Form",
+  "cobblemon.ui.pokedex.info.form.samurott-hisui": "Hisuian",
   "cobblemon.species.samurott-hisui.desc": "Hard of heart and deft of blade, this rare form of Samurott is a product of the Pokémon's evolution in the region of Hisui. Its turbulent blows crash into foes like ceaseless pounding waves.",
   "cobblemon.species.patrat.name": "Patrat",
   "cobblemon.species.patrat.desc": "Extremely cautious, one of them will always be on the lookout, but it won't notice a foe coming from behind.",
@@ -7272,7 +7271,7 @@
   "cobblemon.species.lilligant.name": "Lilligant",
   "cobblemon.ui.pokedex.info.form.lilligant": "",
   "cobblemon.species.lilligant.desc": "Even veteran Trainers face a challenge in getting its beautiful flower to bloom. This Pokémon is popular with celebrities.",
-  "cobblemon.ui.pokedex.info.form.lilligant-hisui": "Hisuian Form",
+  "cobblemon.ui.pokedex.info.form.lilligant-hisui": "Hisuian",
   "cobblemon.species.lilligant-hisui.desc": "I suspect that its well-developed legs are the result of a life spent on mountains covered in deep snow. The scent it exudes from its flower crown heartens those in proximity.",
   "cobblemon.species.basculin.name": "Basculin",
   "cobblemon.ui.pokedex.info.form.basculin": "Red-Striped Form",
@@ -7290,16 +7289,16 @@
   "cobblemon.species.darumaka.name": "Darumaka",
   "cobblemon.ui.pokedex.info.form.darumaka": "",
   "cobblemon.species.darumaka.desc": "When it sleeps, it pulls its limbs into its body and its internal fire goes down to 1,100 degrees Fahrenheit.",
-  "cobblemon.ui.pokedex.info.form.darumaka-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.darumaka-galar": "Galarian",
   "cobblemon.species.darumaka-galar.desc": "It lived in snowy areas for so long that its fire sac cooled off and atrophied. It now has an organ that generates cold instead.",
   "cobblemon.species.darmanitan.name": "Darmanitan",
   "cobblemon.ui.pokedex.info.form.darmanitan": "Standard Mode",
   "cobblemon.species.darmanitan.desc": "Its internal fire burns at 2,500 degrees Fahrenheit, making enough power that it can destroy a dump truck with one punch.",
   "cobblemon.ui.pokedex.info.form.darmanitan-zen": "Zen Mode",
   "cobblemon.species.darmanitan-zen.desc": "Through meditation, it calms its raging spirit and hones its psychic powers.",
-  "cobblemon.ui.pokedex.info.form.darmanitan-galar": "Galarian Form Standard Mode",
+  "cobblemon.ui.pokedex.info.form.darmanitan-galar": "Standard Mode (Galarian)",
   "cobblemon.species.darmanitan-galar.desc": "On days when blizzards blow through, it comes down to where people live. It stashes food in the snowball on its head, taking it home for later.",
-  "cobblemon.ui.pokedex.info.form.darmanitan-galarzen": "Galarian Form Zen Mode",
+  "cobblemon.ui.pokedex.info.form.darmanitan-galarzen": "Zen Mode (Galarian)",
   "cobblemon.species.darmanitan-galarzen.desc": "Anger has reignited its atrophied flame sac. This Pokémon spews fire everywhere as it rampages indiscriminately.",
   "cobblemon.species.maractus.name": "Maractus",
   "cobblemon.species.maractus.desc": "Arid regions are their habitat. They move rhythmically, making a sound similar to maracas.",
@@ -7319,7 +7318,7 @@
   "cobblemon.species.yamask.name": "Yamask",
   "cobblemon.ui.pokedex.info.form.yamask": "",
   "cobblemon.species.yamask.desc": "Each of them carries a mask that used to be its face when it was human. Sometimes they look at it and cry.",
-  "cobblemon.ui.pokedex.info.form.yamask-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.yamask-galar": "Galarian",
   "cobblemon.species.yamask-galar.desc": "A clay slab with cursed engravings took possession of a Yamask. The slab is said to be absorbing the Yamask's dark power.",
   "cobblemon.species.cofagrigus.name": "Cofagrigus",
   "cobblemon.species.cofagrigus.desc": "Grave robbers who mistake them for real coffins and get too close end up trapped inside their bodies.",
@@ -7341,12 +7340,12 @@
   "cobblemon.species.zorua.name": "Zorua",
   "cobblemon.ui.pokedex.info.form.zorua": "",
   "cobblemon.species.zorua.desc": "To protect themselves from danger, they hide their true identities by transforming into people and Pokémon.",
-  "cobblemon.ui.pokedex.info.form.zorua-hisui": "Hisuian Form",
+  "cobblemon.ui.pokedex.info.form.zorua-hisui": "Hisuian",
   "cobblemon.species.zorua-hisui.desc": "A once-departed soul, returned to life in Hisui. Derives power from resentment, which rises as energy atop its head and takes on the forms of foes. In this way, Zorua vents lingering malice.",
   "cobblemon.species.zoroark.name": "Zoroark",
   "cobblemon.ui.pokedex.info.form.zoroark": "",
   "cobblemon.species.zoroark.desc": "Bonds between these Pokémon are very strong. It protects the safety of its pack by tricking its opponents.",
-  "cobblemon.ui.pokedex.info.form.zoroark-hisui": "Hisuian Form",
+  "cobblemon.ui.pokedex.info.form.zoroark-hisui": "Hisuian",
   "cobblemon.species.zoroark-hisui.desc": "With its disheveled white fur, it looks like an embodiment of death. Heedless of its own safety, Zoroark attacks its nemeses with a bitter energy so intense, it lacerates Zoroark's own body.",
   "cobblemon.species.minccino.name": "Minccino",
   "cobblemon.species.minccino.desc": "These Pokémon prefer a tidy habitat. They are always sweeping and dusting, using their tails as brooms.",
@@ -7463,7 +7462,7 @@
   "cobblemon.species.stunfisk.name": "Stunfisk",
   "cobblemon.ui.pokedex.info.form.stunfisk": "",
   "cobblemon.species.stunfisk.desc": "It conceals itself in the mud of the seashore. Then it waits. When prey touch it, it delivers a jolt of electricity.",
-  "cobblemon.ui.pokedex.info.form.stunfisk-galar": "Galarian Form",
+  "cobblemon.ui.pokedex.info.form.stunfisk-galar": "Galarian",
   "cobblemon.species.stunfisk-galar.desc": "Living in mud with a high iron content has given it a strong steel body.",
   "cobblemon.species.mienfoo.name": "Mienfoo",
   "cobblemon.species.mienfoo.desc": "In fights, they dominate with onslaughts of flowing, continuous attacks. With their sharp claws, they cut enemies.",
@@ -7490,7 +7489,7 @@
   "cobblemon.species.braviary.name": "Braviary",
   "cobblemon.ui.pokedex.info.form.braviary": "",
   "cobblemon.species.braviary.desc": "They fight for their friends without any thought about danger to themselves. One can carry a car while flying.",
-  "cobblemon.ui.pokedex.info.form.braviary-hisui": "Hisuian Form",
+  "cobblemon.ui.pokedex.info.form.braviary-hisui": "Hisuian",
   "cobblemon.species.braviary-hisui.desc": "Screaming a bloodcurdling battle cry, this huge and ferocious bird Pokémon goes out on the hunt. It blasts lakes with shock waves, then scoops up any prey that float to the water's surface.",
   "cobblemon.species.vullaby.name": "Vullaby",
   "cobblemon.species.vullaby.desc": "Their wings are too tiny to allow them to fly. They guard their posteriors with bones that were gathered by Mandibuzz.",
@@ -7536,7 +7535,6 @@
   "cobblemon.ui.pokedex.info.form.landorus-therian": "Therian Forme",
   "cobblemon.species.landorus-therian.desc": "Landorus soars through the sky in this form, bestowing plentiful harvests upon the land and earning the people's reverence. It can traverse the whole of Hisui in a mere couple of hours.",
   "cobblemon.species.kyurem.name": "Kyurem",
-  "cobblemon.ui.pokedex.info.form.kyurem": "",
   "cobblemon.species.kyurem.desc": "It generates a powerful, freezing energy inside itself, but its body became frozen when the energy leaked out.",
   "cobblemon.ui.pokedex.info.form.kyurem-white": "White Kyurem",
   "cobblemon.species.kyurem-white.desc": "It has foreseen that a world of truth will arrive for people and Pokémon. It strives to protect that future.",
@@ -7815,12 +7813,12 @@
   "cobblemon.species.sliggoo.name": "Sliggoo",
   "cobblemon.ui.pokedex.info.form.sliggoo": "",
   "cobblemon.species.sliggoo.desc": "Its four horns are a high-performance radar system. It uses them to sense sounds and smells, rather than using ears or a nose.",
-  "cobblemon.ui.pokedex.info.form.sliggoo-hisui": "Hisuian Form",
+  "cobblemon.ui.pokedex.info.form.sliggoo-hisui": "Hisuian",
   "cobblemon.species.sliggoo-hisui.desc": "The iron in Sliggoo's drinking water turned its shell metallic. The Pokémon doesn't come out of its shell on sunny days.",
   "cobblemon.species.goodra.name": "Goodra",
   "cobblemon.ui.pokedex.info.form.goodra": "",
   "cobblemon.species.goodra.desc": "It attacks with retractable horns. It throws a punch that's the equivalent of the force of a hundred pro boxers.",
-  "cobblemon.ui.pokedex.info.form.goodra-hisui": "Hisuian Form",
+  "cobblemon.ui.pokedex.info.form.goodra-hisui": "Hisuian",
   "cobblemon.species.goodra-hisui.desc": "Able to freely control the hardness of its metallic shell. It loathes solitude and is extremely clingy—it will fume and run riot if those dearest to it ever leave its side.",
   "cobblemon.species.klefki.name": "Klefki",
   "cobblemon.species.klefki.desc": "It never lets go of a key that it likes, so people give it the keys to vaults and safes as a way to prevent crime.",
@@ -7852,7 +7850,7 @@
   "cobblemon.species.avalugg.name": "Avalugg",
   "cobblemon.ui.pokedex.info.form.avalugg": "",
   "cobblemon.species.avalugg.desc": "The way several Bergmite huddle on its back makes it look like an aircraft carrier made of ice.",
-  "cobblemon.ui.pokedex.info.form.avalugg-hisui": "Hisuian Form",
+  "cobblemon.ui.pokedex.info.form.avalugg-hisui": "Hisuian",
   "cobblemon.species.avalugg-hisui.desc": "The armor of ice covering its lower jaw puts steel to shame and can shatter rocks with ease. This Pokémon barrels along steep mountain paths, cleaving through the deep snow.",
   "cobblemon.species.noibat.name": "Noibat",
   "cobblemon.species.noibat.desc": "Even a robust wrestler will become dizzy and unable to stand when exposed to its 200,000-hertz ultrasonic waves.",
@@ -7899,7 +7897,7 @@
   "cobblemon.species.decidueye.name": "Decidueye",
   "cobblemon.ui.pokedex.info.form.decidueye": "",
   "cobblemon.species.decidueye.desc": "Decidueye can nock and fire an arrow at an enemy in a tenth of a second, so its battles are decided in the blink of an eye.",
-  "cobblemon.ui.pokedex.info.form.decidueye-hisui": "Hisuian Form",
+  "cobblemon.ui.pokedex.info.form.decidueye-hisui": "Hisuian",
   "cobblemon.species.decidueye-hisui.desc": "The air stored inside the rachises of Decidueye's feathers insulates the Pokémon against Hisui's extreme cold. This is firm proof that evolution can be influenced by environment.",
   "cobblemon.species.litten.name": "Litten",
   "cobblemon.species.litten.desc": "Its coat regrows twice a year. When the time comes, Litten sets its own body on fire and burns away the old fur.",

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

@@ -9351,11 +9351,11 @@
     "cobblemon.habitat.natural_lightning_rod.name": "Pararrayos natural",
     "cobblemon.habitat.quartz_spikes.name": "Picos de Cuarzo",
     "cobblemon.subtitle.tm.use": "Máquina Técnica usada",
-    "cobblemon.subtitle.block.tm_machine.craft": "Máquina MT imprime MT",
+    "cobblemon.subtitle.block.tm_machine.craft": "Máquina MT termina de imprimir la MT",
     "cobblemon.subtitle.block.tm_machine.off": "Máquina MT desactivada",
     "cobblemon.subtitle.block.tm_machine.on": "Máquina MT activada",
     "cobblemon.subtitle.block.tm_machine.open": "La tapa de la Máquina MT se abre",
-    "cobblemon.subtitle.block.tm_machine.close": "Ma tapa de la Máquina MT se cierra",
+    "cobblemon.subtitle.block.tm_machine.close": "La tapa de la Máquina MT se cierra",
     "cobblemon.subtitle.block.tm_machine.place_disc": "MT en blanco insertada en la Máquina MT",
     "cobblemon.ui.exp.number": "+%1$s §oEXP",
     "cobblemon.config.ui.award_experience_to_fainted_pokemon": "Da Exp. a Pokémon derrotados",
@@ -9511,5 +9511,9 @@
     "advancements.cobblemon.cook_poke_snack": "Un aroma tentador",
     "advancements.cobblemon.cook_poke_snack.description": "Hornea un Poké Señuelo, un delicioso pastel que atrae a ciertos Pokémon según las bayas que uses",
     "advancements.cobblemon.register_all_tms": "Discografía completa",
-    "advancements.cobblemon.plant_tumblestone.description": "Coloca un guijarro cerca de lava o de magma para que crezca a lo largo del tiempo"
+    "advancements.cobblemon.plant_tumblestone.description": "Coloca un guijarro cerca de lava o de magma para que crezca a lo largo del tiempo",
+    "cobblemon.subtitle.block.tm_machine.burn_loop": "Máquina MT imprime MT",
+    "cobblemon.subtitle.block.tm_machine.start": "Maquina MT empieza a imprimir MT",
+    "cobblemon.subtitle.block.tm_machine.tm_insert": "MT en blanco colocada en la Máquina MT",
+    "cobblemon.subtitle.block.tm_machine.tm_retrieve": "MT retirada de la Máquina MT"
 }

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

@@ -819,7 +819,7 @@
     "advancements.cobblemon.first_catch.description": "モンスターボールを投げて、ポケモンを捕まえる",
     "advancements.cobblemon.full_party": "フルハウス",
     "advancements.cobblemon.full_party.description": "ポケモンをもっとゲットし、手持ちを6匹にする",
-    "advancements.cobblemon.first_evolution": "てれ てれん",
+    "advancements.cobblemon.first_evolution": "新たなる姿",
     "advancements.cobblemon.first_evolution.description": "進化条件を満たし、ポケモンを進化させる",
     "advancements.cobblemon.first_battle_victory": "勝利は目の前？",
     "advancements.cobblemon.first_battle_victory.description": "他のトレーナーに勝利する",
@@ -831,7 +831,7 @@
     "advancements.cobblemon.obtain_leek.description": "淡水で育つ野草、クスリソウを手に入れる",
     "advancements.cobblemon.medicinal_brew": "町のジョーイさん",
     "advancements.cobblemon.medicinal_brew.description": "クスリソウを醸造して溶媒のクスリチャを作る",
-    "advancements.cobblemon.brew_potion": "そんな装備で大丈夫か?",
+    "advancements.cobblemon.brew_potion": "お砂糖ひとさじ",
     "advancements.cobblemon.brew_potion.description": "クスリチャを溶媒にオレンのみを醸造してキズぐすりを作る",
     "advancements.cobblemon.brew_full_restore": "チャンピオン御用達",
     "advancements.cobblemon.brew_full_restore.description": "まんたんのくすりを溶媒にラムのみを醸造してかいふくのくすりを作る",
@@ -1235,10 +1235,10 @@
     "cobblemon.battle.fail.healblock": "%1$sは かいふくふうじで 回復できない!",
     "cobblemon.battle.fail.darkvoid": "しかし %1$sは 使うことが できなかった!",
     "cobblemon.battle.fail.teatime": "しかし 何も 起こらなかった!",
-    "cobblemon.battle.fail.slp": "%1$sは すでに 眠っている",
-    "cobblemon.battle.fail.par": "%1$sは すでに まひしている",
+    "cobblemon.battle.fail.slp": "しかし %1$sは 眠らない！",
+    "cobblemon.battle.fail.par": "しかし %1$sは まひにならない！",
     "cobblemon.battle.fail.tox": "%1$sは すでに 毒を あびている",
-    "cobblemon.battle.fail.psn": "%1$sは すでに 毒を あびている",
+    "cobblemon.battle.fail.psn": "しかし %1$sは 毒にならない！",
     "cobblemon.battle.fail.brn": "%1$sは すでに やけどを 負っている",
     "cobblemon.battle.fail.frz": "%1$sは すでに 凍っている",
     "cobblemon.battle.fail.uproar": "%1$sは 騒いでいて 眠れない!",
@@ -9237,7 +9237,7 @@
     "cobblemon.ui.edit.habitat.validation.species": "種族名は有効なポケモン名でなければなりません。",
     "cobblemon.ui.edit.habitat.validation.weight": "重量は0より大きくなければなりません。",
     "cobblemon.ui.edit.habitat.validation.modifiers": "修飾子の形式が無効です。",
-    "cobblemon.ui.edit.habitat.validation.phases_list": "フェーズには有効な月の満ち欠け（0-7）を指定する必要があります。例：1-3、または1、3-5、6。",
+    "cobblemon.ui.edit.habitat.validation.phases_list": "フェーズでは、整数の範囲を表す際に有効な形式を使用する必要があります。例：1-3、または1、3-5、6。",
     "cobblemon.ui.edit.habitat.validation.min_light": "最小明るさ度の値は0から15の間でなければなりません。",
     "cobblemon.ui.edit.habitat.validation.max_light": "最大明るさ度の値は0から15の間でなければなりません。",
     "cobblemon.ui.moves.learnset.tm.discovered": "発見済み",
@@ -9302,5 +9302,81 @@
     "cobblemon.habitat.pinkflowerbed_clearing.name": "ピンクフラワーベッドの開拓地",
     "cobblemon.habitat.sandpit_clearing.name": "砂場の開拓地",
     "cobblemon.habitat.sunflowerbed_clearing.name": "ヒマワリベッドの開拓地",
-    "cobblemon.habitat.sunscorched_clearing.name": "日差しに焼かれた開拓地"
+    "cobblemon.habitat.sunscorched_clearing.name": "日差しに焼かれた開拓地",
+    "cobblemon.habitat.quartz_spikes.name": "クォーツスパイク",
+    "cobblemon.habitat.reclaimed_desert_monument.name": "再生された砂漠の記念碑",
+    "cobblemon.habitat.reclaimed_lush_monument.name": "再生された繁茂した記念碑",
+    "cobblemon.habitat.rocky_outcrop.name": "岩の露頭",
+    "cobblemon.habitat.rocky_tide_pool.name": "岩場の潮だまり",
+    "cobblemon.habitat.root_nursery.name": "根苗圃",
+    "cobblemon.habitat.sandy_tide_pool.name": "砂地の潮だまり",
+    "cobblemon.habitat.skeletal_fall.name": "骸骨の墓場",
+    "cobblemon.habitat.snowy_burrow.name": "雪に覆われた巣穴",
+    "cobblemon.habitat.snowy_grotto.name": "雪に覆われた洞窟",
+    "cobblemon.habitat.snowy_thermal_vents.name": "雪に覆われた熱水噴出孔",
+    "cobblemon.habitat.thermal_crevices.name": "熱の裂け目",
+    "cobblemon.habitat.treasure_hoard.name": "秘宝の宝庫",
+    "cobblemon.habitat.volcanic_plume.name": "火山噴出柱",
+    "cobblemon.habitat.zen_garden.name": "思念の庭園",
+    "cobblemon.subtitle.tm.use": "わざマシン使用済み",
+    "cobblemon.subtitle.block.tm_machine.burn_loop": "わざマシンマシンでわざマシンをプリントする",
+    "cobblemon.subtitle.block.tm_machine.start": "わざマシンマシンがわざマシンのプリントを開始しました",
+    "cobblemon.subtitle.block.tm_machine.craft": "わざマシンマシンがわざマシンのプリントを完了しました",
+    "cobblemon.subtitle.block.tm_machine.open": "わざマシンマシンの蓋が開きます",
+    "cobblemon.subtitle.block.tm_machine.close": "わざマシンマシンの蓋が閉じます",
+    "cobblemon.subtitle.block.tm_machine.tm_insert": "わざマシンマシンに空のわざマシンをセットする",
+    "cobblemon.subtitle.block.tm_machine.tm_retrieve": "わざマシンをわざマシンマシンから入手",
+    "cobblemon.subtitle.block.tm_machine.item_insert": "アイテムをわざマシンマシンに配置しました",
+    "cobblemon.subtitle.block.tm_machine.item_retrieve": "わざマシンマシンからアイテムを取り出した",
+    "cobblemon.ui.exp.number": "+%1$s §o経験値",
+    "cobblemon.config.ui.award_experience_to_fainted_pokemon": "倒れたポケモンにも経験値を与える",
+    "cobblemon.config.ui.award_experience_to_fainted_pokemon.tooltip": "バトル中ひんしになったポケモンは、ひんしになる前に倒すのに貢献した相手から経験値を獲得できるか。",
+    "cobblemon.config.ui.award_experience_on_battle_loss": "戦闘敗北時の経験値",
+    "cobblemon.config.ui.award_experience_on_battle_loss.tooltip": "バトルに負けた場合でも、倒した相手からポケモンは経験値を獲得できるか。ひんしになったポケモンが経験値を獲得するには、「倒れたポケモンにも経験値を与える」が有効になっている必要がある。",
+    "cobblemon.config.ui.fossil_machine_alpha_chance": "化石マシンのオヤブン出現確率",
+    "cobblemon.config.ui.fossil_machine_alpha_chance.tooltip": "化石マシンから入手できるポケモンがオヤブンになる確率。\"[入力した数値]分の1\"として計算される。",
+    "cobblemon.config.ui.fossil_machine_shiny_chance.tooltip": "ふくげんマシンから入手できるポケモンが色違いになる確率。\"[入力した数値]分の1\"として計算される。",
+    "cobblemon.config.ui.honey_slather_alpha_chance.tooltip": "ミツ塗りの木から入手できるポケモンがオヤブンになる確率。\"[入力した数値]分の1\"として計算される。",
+    "cobblemon.config.ui.honey_slather_shiny_chance.tooltip": "ミツ塗りの木から入手できるポケモンが色違いになる確率。\"[入力した数値]分の1\"として計算される。",
+    "cobblemon.config.ui.fossil_machine_shiny_chance": "化石マシンの色違い出現確率",
+    "cobblemon.config.ui.honey_slather_alpha_chance": "ミツ塗りの木のオヤブン出現確率",
+    "cobblemon.config.ui.honey_slather_shiny_chance": "ミツ塗りの木の色違い出現確率",
+    "cobblemon.config.ui.data_monitor_alpha_rate": "データモニターのオヤブン出現確率",
+    "cobblemon.config.ui.data_monitor_alpha_rate.tooltip": "データモニターから入手できるポケモンがオヤブンになる確率。\"[入力した数値]分の1\"として計算される。",
+    "cobblemon.config.ui.data_monitor_shiny_rate": "データモニターの色違い出現確率",
+    "cobblemon.config.ui.data_monitor_shiny_rate.tooltip": "データモニターから入手できるポケモンが色違いになる確率。\"[入力した数値]分の1\"として計算される。",
+    "cobblemon.config.ui.pokemon_intrinsic_size_min.tooltip": "出現するポケモンの最小固有サイズ倍率。",
+    "cobblemon.config.ui.pokemon_intrinsic_size_min": "ポケモンの最小固有サイズ",
+    "cobblemon.config.ui.pokemon_intrinsic_size_max": "ポケモンの最大固有サイズ",
+    "cobblemon.config.ui.pokemon_intrinsic_size_max.tooltip": "出現するポケモンの最大固有サイズ倍率。",
+    "cobblemon.config.ui.alpha_pokemon_size_small_multiplier.tooltip": "当たり判定が0.5ブロック未満のポケモンに対するオヤブンサイズ倍率。",
+    "cobblemon.config.ui.alpha_pokemon_size_small_multiplier": "小さいオヤブンサイズ倍率",
+    "cobblemon.config.ui.alpha_pokemon_size_medium_multiplier": "中くらいのオヤブンサイズ倍率",
+    "cobblemon.config.ui.alpha_pokemon_size_medium_multiplier.tooltip": "当たり判定が0.5ブロックから1.5ブロックの間のポケモンに対するオヤブンサイズ倍率。",
+    "cobblemon.config.ui.alpha_pokemon_size_large_multiplier": "大きいオヤブンサイズ倍率",
+    "cobblemon.config.ui.alpha_pokemon_size_large_multiplier.tooltip": "当たり判定が1.5ブロックから10ブロックの間のポケモンに対するオヤブンサイズ倍率。",
+    "cobblemon.config.ui.alpha_pokemon_size_extra_large_multiplier.tooltip": "当たり判定が10ブロック以上のポケモンに対するオヤブンサイズ倍率。",
+    "cobblemon.config.ui.alpha_pokemon_size_extra_large_multiplier": "とても大きいオヤブンサイズ倍率",
+    "cobblemon.config.ui.baby_pokemon_level_duration": "ベイビィポケモン期間レベル",
+    "cobblemon.config.ui.baby_pokemon_level_duration.tooltip": "ポケモンが通常よりも小さく見える「ベイビィポケモン」とみなされるレベル数。",
+    "cobblemon.config.ui.baby_pokemon_size_multiplier": "ベイビィポケモンの最小サイズ",
+    "cobblemon.config.ui.baby_pokemon_size_multiplier.tooltip": "レベル1のポケモンに適用されるサイズ倍率。",
+    "cobblemon.config.ui.minimum_riding_scale": "ライドするための最低限のポケモンスケール値",
+    "cobblemon.config.ui.minimum_riding_scale.tooltip": "ポケモンに乗れなくなる限界のスケール。",
+    "cobblemon.config.ui.unlock_all_move_dex_moves_by_default.tooltip": "この機能を有効にすると、わざマシンやレベルアップで覚える技が解放され、わざマシンマシンやポケモン図鑑の技一覧で確認できるようになります。",
+    "cobblemon.config.ui.unlock_all_move_dex_moves_by_default": "全ての技をアンロック",
+    "cobblemon.config.ui.infinite_tm_uses": "わざマシン無限化",
+    "cobblemon.config.ui.infinite_tm_uses.tooltip": "わざマシンで技を教える際、わざマシンが消費されなくなります。",
+    "advancements.cobblemon.use_healing_machine.description": "かいふく装置のチャージを待ち、使用して手持ちのポケモンを回復させる",
+    "advancements.cobblemon.use_healing_machine": "てん てん てれれん",
+    "advancements.cobblemon.plant_all_apricorn_sprouts.description": "あらゆる色のぼんぐりの新芽を植える",
+    "advancements.cobblemon.plant_all_apricorn_sprouts": "ぼんぐりころころぼんぐりこ",
+    "advancements.cobblemon.use_mint.description": "ミントを使ってポケモンのステータスの得意不得意を変える",
+    "advancements.cobblemon.use_mint": "結果にコミント！",
+    "advancements.cobblemon.brew_medicinal_brew.description": "クスリソウを煎じて、薬の基礎となるものを作る",
+    "advancements.cobblemon.brew_medicinal_brew": "ネギらうおくすり",
+    "advancements.cobblemon.brew_all_potions.description": "クスリソウを使って、ありとあらゆるアイテムを作成する",
+    "advancements.cobblemon.brew_all_potions": "一番良いのを頼む",
+    "advancements.cobblemon.use_exp_candy.description": "ポケモンにけいけんアメを使う",
+    "advancements.cobblemon.use_exp_candy": "甘美な経験"
 }

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

@@ -5936,14 +5936,14 @@
     "block.cobblemon.red_apricorn": "红球果",
     "block.cobblemon.yellow_apricorn": "黄球果",
     "block.cobblemon.lectern": "讲台",
-    "cobblemon.fishing_bait_effects.nature.tooltip": "%1$s%%-%2$s↑性格出现率",
-    "cobblemon.fishing_bait_effects.iv.tooltip": "%1$s%%-%2$s个体值+%3$s",
-    "cobblemon.fishing_bait_effects.ev.tooltip": "%1$s%%-%2$s基础点数出现率",
-    "cobblemon.fishing_bait_effects.bite_time.tooltip": "%1$s%% - 上钩时间缩短 %3$s%%",
-    "cobblemon.fishing_bait_effects.gender_chance.tooltip": "%1$s%%-%2$s性别出现率",
-    "cobblemon.fishing_bait_effects.level_raise.tooltip": "%1$s%% - 等级 +%3$s",
+    "cobblemon.fishing_bait_effects.nature.tooltip": "%1$s%% - %2$s↑性格出现率",
+    "cobblemon.fishing_bait_effects.iv.tooltip": "%1$s%% - %2$s个体值+%3$s",
+    "cobblemon.fishing_bait_effects.ev.tooltip": "%1$s%% - %2$s基础点数出现率",
+    "cobblemon.fishing_bait_effects.bite_time.tooltip": "%1$s%% - 上钩时间缩短%3$s%%",
+    "cobblemon.fishing_bait_effects.gender_chance.tooltip": "%1$s%% - %2$s性别出现率",
+    "cobblemon.fishing_bait_effects.level_raise.tooltip": "%1$s%% - 等级+%3$s",
     "cobblemon.fishing_bait_effects.tera.tooltip": "%1$s%% - 吸引 %2$s 太晶属性",
-    "cobblemon.fishing_bait_effects.shiny_reroll.tooltip": "%1$s%% - 异色概率 ×%3$s",
+    "cobblemon.fishing_bait_effects.shiny_reroll.tooltip": "%1$s%% - 发光概率×%3$s",
     "cobblemon.fishing_bait_effects.ha_chance.tooltip": "%1$s%% - 隐藏特性出现率",
     "cobblemon.fishing_bait_effects.pokemon_chance.tooltip": "%1$s%% - 上钩一只宝可梦",
     "cobblemon.fishing_bait_effects.friendship.tooltip": "%1$s%% - 亲密度 +%3$s",
@@ -6179,7 +6179,7 @@
     "cobblemon.species.ironjugulis.desc": "它与超自然杂志曾报道过的宝可梦很相似。报道中的宝可梦是爱上机器人的三首恶龙所生的孩子。",
     "cobblemon.species.pecharunt.desc": "会让对手吃下能提升欲望和能力的毒粘糕，然后通过锁链控制对手。",
     "cobblemon.ability.teraformzero.desc": "太乐巴戈斯变为星晶形态时，蕴藏在它身上的力量会将天气和场地的影响全部归零。",
-    "cobblemon.subtitle.pokemon.shiny_shine": "被捕获的异色宝可梦闪闪发光",
+    "cobblemon.subtitle.pokemon.shiny_shine": "被捕获的发光宝可梦闪闪发光",
     "cobblemon.battle.heal.bagitemrevive": "%1$s 恢复了活力！",
     "cobblemon.battle.detailschange.noice": "%1$s的样子发生了变化！",
     "cobblemon.battle.detailschange.eiscue": "%1$s的样子发生了变化！",
@@ -6206,9 +6206,9 @@
     "cobblemon.ability.hospitality": "款待",
     "cobblemon.ability.poisonpuppeteer": "毒傀儡",
     "cobblemon.ability.supersweetsyrup": "甘露之蜜",
-    "cobblemon.subtitle.pokemon.wild_shiny_shine": "野生的异色宝可梦！",
-    "cobblemon.subtitle.pokemon.owned_shiny_ambient": "周围的异色宝可梦闪闪发光",
-    "cobblemon.subtitle.pokemon.shiny_ambient": "野生的异色宝可梦闪闪发光！",
+    "cobblemon.subtitle.pokemon.wild_shiny_shine": "野生的发光宝可梦！",
+    "cobblemon.subtitle.pokemon.owned_shiny_ambient": "周围的发光宝可梦闪闪发光",
+    "cobblemon.subtitle.pokemon.shiny_ambient": "野生的发光宝可梦闪闪发光！",
     "cobblemon.battle.withdraw.self": "%1$s ，回来！",
     "cobblemon.battle.withdraw.other": "%1$s换下了%2$s！",
     "cobblemon.type.suffix": "%1$s 属性",
@@ -6399,34 +6399,34 @@
     "cobblemon.pokerod.remove": "右键移除饵料",
     "item.cobblemon.galarica_nuts": "伽勒豆蔻枝",
     "item.cobblemon.npc_editor": "NPC的训练家证",
-    "item.cobblemon.dragon_scale.tooltip": "在连接交换时携带，可使海刺龙进化为刺龙王",
-    "item.cobblemon.link_cable.tooltip": "使需要通过交换进化的宝可梦进化",
+    "item.cobblemon.dragon_scale.tooltip": "当海刺龙携带进行连接交换时，可使其进化为刺龙王",
+    "item.cobblemon.link_cable.tooltip": "可使需要连接交换的宝可梦进化",
     "item.cobblemon.kings_rock.tooltip_2": "在交换时携带，可使蚊香君进化为蚊香蛙皇，呆呆兽进化为呆呆王",
     "item.cobblemon.metal_coat.tooltip_1": "携带后，钢属性的招式威力就会增强",
     "item.cobblemon.kings_rock.tooltip_1": "携带该道具的宝可梦造成伤害时，有概率使目标陷入畏缩状态",
-    "item.cobblemon.metal_coat.tooltip_2": "在连接交换时携带，可使大岩蛇进化为大钢蛇，使飞天螳螂进化为巨钳螳螂",
-    "item.cobblemon.upgrade.tooltip": "在连接交换时携带，可使多边兽进化为多边兽2型",
-    "item.cobblemon.dubious_disc.tooltip": "在连接交换时携带，可使多边兽2型进化为多边兽乙型",
+    "item.cobblemon.metal_coat.tooltip_2": "在连接交换时携带，可使大岩蛇进化为大钢蛇，飞天螳螂进化为巨钳螳螂",
+    "item.cobblemon.upgrade.tooltip": "当多边兽携带进行连接交换时，可使其进化为多边兽2型",
+    "item.cobblemon.dubious_disc.tooltip": "当多边兽2型携带进行连接交换时，可使其进化为多边兽乙型",
     "item.cobblemon.deep_sea_scale.tooltip_1": "大幅提升珍珠贝的特防",
-    "item.cobblemon.deep_sea_scale.tooltip_2": "在连接交换时携带，可使珍珠贝进化为樱花鱼",
-    "item.cobblemon.deep_sea_tooth.tooltip_2": "在连接交换时携带，可使珍珠贝进化为猎斑鱼",
-    "item.cobblemon.electirizer.tooltip": "在连接交换时携带，可使电击兽进化为电击魔兽",
-    "item.cobblemon.magmarizer.tooltip": "当鸭嘴火兽携带进行连接进化时，会使其进化为鸭嘴炎兽",
-    "item.cobblemon.oval_stone.tooltip": "当小福蛋携带进行连接交换时，会使其进化为吉利蛋",
-    "item.cobblemon.protector.tooltip": "当钻角犀兽携带进行连接交换时，会使其进化为超甲狂犀",
-    "item.cobblemon.prism_scale.tooltip": "当丑丑鱼携带进行连接交换时，会使其进化为美纳斯",
-    "item.cobblemon.sachet.tooltip": "当粉香香携带进行连接交换时，会使其进化为芳香精",
-    "item.cobblemon.whipped_dream.tooltip": "当绵绵泡芙携带进行连接交换时，会使其进化为胖甜妮",
-    "item.cobblemon.love_sweet.tooltip": "当小仙奶携带时，会使其进化为霜奶仙的爱心形态",
-    "item.cobblemon.berry_sweet.tooltip": "当小仙奶携带时，会使其进化为霜奶仙的野莓形态",
-    "item.cobblemon.flower_sweet.tooltip": "当小仙奶携带时，会使其进化为霜奶仙的花朵形态",
-    "item.cobblemon.ribbon_sweet.tooltip": "当小仙奶携带时，会使其进化为霜奶仙的蝴蝶结形态",
-    "item.cobblemon.cracked_pot.tooltip": "当对赝品来悲茶使用时，会使其进化为怖思壶",
-    "item.cobblemon.unremarkable_teacup.tooltip": "当对斯魔茶（冒牌货的样子）使用时，会使其进化为来悲粗茶（凡作的样子）",
-    "item.cobblemon.sweet_apple.tooltip": "当对啃果虫使用时，会使其进化为丰蜜龙",
-    "item.cobblemon.tart_apple.tooltip": "当对啃果虫使用时，会使其进化为苹裹龙",
-    "item.cobblemon.galarica_wreath.tooltip": "当对呆呆兽（伽勒尔的样子）使用时，会使其进化为呆呆王（伽勒尔的样子）",
-    "item.cobblemon.black_augurite.tooltip": "当对飞天螳螂使用，会使其进化为劈斧螳螂",
+    "item.cobblemon.deep_sea_scale.tooltip_2": "当珍珠贝携带进行连接交换时，可使其进化为樱花鱼",
+    "item.cobblemon.deep_sea_tooth.tooltip_2": "当珍珠贝携带进行连接交换时，可使其进化为猎斑鱼",
+    "item.cobblemon.electirizer.tooltip": "当电击兽携带进行连接交换时，可使其进化为电击魔兽",
+    "item.cobblemon.magmarizer.tooltip": "当鸭嘴火兽携带进行连接交换时，可使其进化为鸭嘴炎兽",
+    "item.cobblemon.oval_stone.tooltip": "当小福蛋携带并处于白天时，可使其进化为吉利蛋",
+    "item.cobblemon.protector.tooltip": "当钻角犀兽携带进行连接交换时，可使其进化为超甲狂犀",
+    "item.cobblemon.prism_scale.tooltip": "当丑丑鱼携带进行连接交换时，可使其进化为美纳斯",
+    "item.cobblemon.sachet.tooltip": "当粉香香携带进行连接交换时，可使其进化为芳香精",
+    "item.cobblemon.whipped_dream.tooltip": "当绵绵泡芙携带进行连接交换时，可使其进化为胖甜妮",
+    "item.cobblemon.love_sweet.tooltip": "当小仙奶携带时，可使其进化为霜奶仙的爱心形态",
+    "item.cobblemon.berry_sweet.tooltip": "当小仙奶携带时，可使其进化为霜奶仙的野莓形态",
+    "item.cobblemon.flower_sweet.tooltip": "当小仙奶携带时，可使其进化为霜奶仙的花朵形态",
+    "item.cobblemon.ribbon_sweet.tooltip": "当小仙奶携带时，可使其进化为霜奶仙的蝴蝶结形态",
+    "item.cobblemon.cracked_pot.tooltip": "当对赝品来悲茶使用时，可使其进化为怖思壶",
+    "item.cobblemon.unremarkable_teacup.tooltip": "当对斯魔茶（冒牌货的样子）使用时，可使其进化为来悲粗茶（凡作的样子）",
+    "item.cobblemon.sweet_apple.tooltip": "当对啃果虫使用时，可使其进化为丰蜜龙",
+    "item.cobblemon.tart_apple.tooltip": "当对啃果虫使用时，可使其进化为苹裹龙",
+    "item.cobblemon.galarica_wreath.tooltip": "当对呆呆兽（伽勒尔的样子）使用时，可使其进化为呆呆王（伽勒尔的样子）",
+    "item.cobblemon.black_augurite.tooltip": "当对飞天螳螂使用，可使其进化为劈斧螳螂",
     "item.cobblemon.moon_stone.tooltip": "进化特定宝可梦",
     "item.cobblemon.dawn_stone.tooltip": "进化特定宝可梦",
     "item.cobblemon.fire_stone.tooltip": "进化特定宝可梦",
@@ -6480,8 +6480,8 @@
     "item.cobblemon.absorb_bulb.tooltip_2": "使用后消耗",
     "item.cobblemon.air_balloon.tooltip_1": "携带后，会浮在空中",
     "item.cobblemon.assault_vest.tooltip": "虽然携带后特防会提高，但会无法使出变化招式",
-    "item.cobblemon.auspicious_armor.tooltip": "当对炭小侍使用时，会使其进化为红莲铠骑",
-    "item.cobblemon.malicious_armor.tooltip": "当对炭小侍使用时，会使其进化为苍炎刃鬼",
+    "item.cobblemon.auspicious_armor.tooltip": "当对炭小侍使用时，可使其进化为红莲铠骑",
+    "item.cobblemon.malicious_armor.tooltip": "当对炭小侍使用时，可使其进化为苍炎刃鬼",
     "item.cobblemon.binding_band.tooltip": "携带后，绑紧招式的威力会变强",
     "item.cobblemon.black_belt.tooltip": "携带后，格斗属性的招式威力就会提高",
     "item.cobblemon.black_sludge.tooltip": "携带后，毒属性的宝可梦会缓缓回复HP。其他属性的话，HP则会减少",
@@ -6532,7 +6532,7 @@
     "item.cobblemon.shed_shell.tooltip": "携带后，必定可以和后备的宝可梦进行替换",
     "item.cobblemon.shell_bell.tooltip": "携带后，攻击对手并造成伤害时，能回复少量HP",
     "item.cobblemon.shell_helmet": "硬壳头盔",
-    "item.cobblemon.shell_helmet.tooltip": "当对盖盖虫使用时，会使其进化为骑士蜗牛",
+    "item.cobblemon.shell_helmet.tooltip": "当对盖盖虫使用时，可使其进化为骑士蜗牛",
     "item.cobblemon.silver_powder.tooltip": "携带后，虫属性的招式威力就会提高",
     "item.cobblemon.soft_sand.tooltip": "携带后，地面属性的招式威力就会提高",
     "item.cobblemon.soothe_bell.tooltip": "携带后，会变得容易和训练家亲密",
@@ -6604,13 +6604,13 @@
     "item.cobblemon.flying_gem.tooltip_1": "携带后，飞行属性的招式威力会增强一次",
     "item.cobblemon.flying_gem.tooltip_2": "使用后消耗",
     "block.cobblemon.big_root.tooltip": "携带后，吸取HP的招式可以比平时更多地回复自己的HP",
-    "item.cobblemon.clover_sweet.tooltip": "当小仙奶携带时，会使其进化为霜奶仙的幸运草形态",
+    "item.cobblemon.clover_sweet.tooltip": "当小仙奶携带时，可使其进化为霜奶仙的幸运草形态",
     "item.cobblemon.water_stone.tooltip": "进化特定宝可梦",
     "item.cobblemon.jolly_mint.tooltip": "当对宝可梦使用后，会使其性格影响改变为爽朗性格",
     "item.cobblemon.cell_battery.tooltip_1": "携带它的宝可梦如果受到电属性招式的伤害，攻击就会提高",
     "item.cobblemon.dragon_fang.tooltip": "携带后，龙属性的招式威力就会提高",
     "item.cobblemon.eject_button.tooltip_1": "携带它的宝可梦如果受到招式的伤害，就能逃脱战斗",
-    "item.cobblemon.razor_fang.tooltip_2": "当天蝎携带在夜晚进行等级升级时，会使其进化为天蝎王",
+    "item.cobblemon.razor_fang.tooltip_2": "当天蝎携带在夜晚进行等级升级时，可使其进化为天蝎王",
     "item.cobblemon.ring_target.tooltip": "携带后，原本因属性相克关系而无效的招式现在会变得能够击中自己",
     "item.cobblemon.wise_glasses.tooltip": "携带后，特殊招式的威力就会少量提高",
     "item.cobblemon.power_bracer.tooltip": "携带后，在战斗中获得经验值时，会获得8点攻击基础点数",
@@ -6618,9 +6618,9 @@
     "item.cobblemon.x_special_defence.tooltip": "在战斗中使用时，会使目标的特防提升一级",
     "item.cobblemon.full_heal.tooltip": "治愈一只宝可梦的所有异常状态",
     "item.cobblemon.paralyze_heal.tooltip": "治愈一只宝可梦的麻痹状态",
-    "item.cobblemon.reaper_cloth.tooltip": "当彷徨夜灵携带进行连接交换时，会使其进化为黑夜魔灵",
-    "item.cobblemon.masterpiece_teacup.tooltip": "当对斯魔茶（高档货的样子）使用时，会使其进化为来悲粗茶（杰作的样子）",
-    "item.cobblemon.galarica_cuff.tooltip": "当对呆呆兽（伽勒尔的样子）使用时，会使其进化为呆壳兽（伽勒尔的样子）",
+    "item.cobblemon.reaper_cloth.tooltip": "当彷徨夜灵携带进行连接交换时，可使其进化为黑夜魔灵",
+    "item.cobblemon.masterpiece_teacup.tooltip": "当对斯魔茶（高档货的样子）使用时，可使其进化为来悲粗茶（杰作的样子）",
+    "item.cobblemon.galarica_cuff.tooltip": "当对呆呆兽（伽勒尔的样子）使用时，可使其进化为呆壳兽（伽勒尔的样子）",
     "item.cobblemon.ability_capsule.tooltip": "当对宝可梦使用后，会使其特性改变为另一种常见特性",
     "item.cobblemon.lonely_mint.tooltip": "当对宝可梦使用后，会使其性格影响改变为怕寂寞性格",
     "item.cobblemon.brave_mint.tooltip": "当对宝可梦使用后，会使其性格影响改变为勇敢性格",
@@ -6636,13 +6636,13 @@
     "item.cobblemon.burn_heal.tooltip": "治愈一只宝可梦的灼伤状态",
     "item.cobblemon.dragon_gem.tooltip_2": "使用后消耗",
     "item.cobblemon.ground_gem.tooltip_1": "携带后，地面属性的招式威力会增强一次",
-    "item.cobblemon.peat_block.tooltip": "当在满月对圈圈熊使用时，会使其进化为月月熊",
-    "item.cobblemon.strawberry_sweet.tooltip": "当小仙奶携带时，会使其进化为霜奶仙的草莓形态",
-    "item.cobblemon.chipped_pot.tooltip": "当对真品来悲茶使用时，会使其进化为怖思壶",
+    "item.cobblemon.peat_block.tooltip": "当在满月对圈圈熊使用时，可使其进化为月月熊",
+    "item.cobblemon.strawberry_sweet.tooltip": "当小仙奶携带时，可使其进化为霜奶仙的草莓形态",
+    "item.cobblemon.chipped_pot.tooltip": "当对真品来悲茶使用时，可使其进化为怖思壶",
     "item.cobblemon.focus_band.tooltip": "携带后，即便受到可能会导致昏厥的招式，有时也能仅以1HP撑过去",
     "item.cobblemon.light_clay.tooltip": "携带后，使出像光墙和反射壁一样的保护招式时，效果会比平时持续得更长",
     "item.cobblemon.red_card.tooltip_1": "携带后，能让对自己造成伤害的对手退场",
-    "item.cobblemon.medicinal_leek.tooltip_1": "能用来调制成药品",
+    "item.cobblemon.medicinal_leek.tooltip_1": "可调制成药品",
     "item.cobblemon.remedy.tooltip": "使一只宝可梦回复20HP，同时小幅降低它的亲密度",
     "item.cobblemon.fine_remedy.tooltip": "使一只宝可梦回复60HP，同时小幅降低它的亲密度",
     "item.cobblemon.superb_remedy.tooltip": "使一只宝可梦回复120HP，同时小幅降低它的亲密度",
@@ -6653,7 +6653,7 @@
     "item.cobblemon.ghost_gem.tooltip_1": "携带后，幽灵属性的招式威力会增强一次",
     "item.cobblemon.rock_gem.tooltip_1": "携带后，岩石属性的招式威力会增强一次",
     "item.cobblemon.psychic_gem.tooltip_2": "使用后消耗",
-    "item.cobblemon.star_sweet.tooltip": "当小仙奶携带时，会使其进化为霜奶仙的星星形态",
+    "item.cobblemon.star_sweet.tooltip": "当小仙奶携带时，可使其进化为霜奶仙的星星形态",
     "item.cobblemon.relaxed_mint.tooltip": "当对宝可梦使用后，会使其性格影响改变为悠闲性格",
     "item.cobblemon.quiet_mint.tooltip": "当对宝可梦使用后，会使其性格影响改变为冷静性格",
     "item.cobblemon.careful_mint.tooltip": "当对宝可梦使用后，会使其性格影响改变为慎重性格",
@@ -6678,8 +6678,8 @@
     "item.cobblemon.bug_gem.tooltip_1": "携带后，虫属性的招式威力会增强一次",
     "item.cobblemon.deep_sea_tooth.tooltip_1": "大幅提升珍珠贝的特攻",
     "cobblemon.fishing.no_bite": "甚至连一口都没有。",
-    "cobblemon.fishing_bait_effects.typing.tooltip": "%1$s%%-%2$s属性出现率×%3$s",
-    "cobblemon.fishing_bait_effects.egg_group.tooltip": "%1$s%%-%2$s蛋群出现率×%3$s",
+    "cobblemon.fishing_bait_effects.typing.tooltip": "%1$s%% - %2$s属性出现率×%3$s",
+    "cobblemon.fishing_bait_effects.egg_group.tooltip": "%1$s%% - %2$s蛋群出现率×%3$s",
     "cobblemon.egg_group.monster": "怪兽",
     "cobblemon.egg_group.water_1": "水中1",
     "cobblemon.egg_group.bug": "虫",
@@ -6712,7 +6712,7 @@
     "cobblemon.ui.interact.ride": "骑乘",
     "cobblemon.ui.interact.request_already_expired": "该请求已过期！",
     "cobblemon.ui.pokedex.search.search_by": "搜索 %1$s 中",
-    "cobblemon.ui.pokedex.search.type.species": "物种名称",
+    "cobblemon.ui.pokedex.search.type.species": "宝可梦名称",
     "cobblemon.ui.pokedex.search.type.abilities": "特性",
     "cobblemon.ui.pokedex.search.type.drops": "掉落物",
     "cobblemon.cosmetic.held_logs.crimson": "绯红菌柄",
@@ -6911,10 +6911,10 @@
     "cobblemon.config.ui.display_entity_name_label": "显示宝可梦的名字",
     "cobblemon.config.ui.display_entity_level_label": "显示宝可梦的等级",
     "cobblemon.config.ui.display_entity_labels_when_crouching_only.tooltip": "控制是否只在蹲下时显示宝可梦的标签。",
-    "cobblemon.config.ui.shiny_rate": "异色概率",
-    "cobblemon.config.ui.shiny_rate.tooltip": "生成的宝可梦为异色的概率。若设为0，则生成的宝可梦不会出现异色。该概率以1/x的形式计算。",
-    "cobblemon.config.ui.shiny_notice_particles_distance": "异色粒子的显示距离",
-    "cobblemon.config.ui.shiny_notice_particles_distance.tooltip": "宝可梦异色粒子效果开始显示的距离。",
+    "cobblemon.config.ui.shiny_rate": "发光概率",
+    "cobblemon.config.ui.shiny_rate.tooltip": "生成发光宝可梦的概率。若设为0，则发光宝可梦不会生成。该概率以1/x的形式计算。",
+    "cobblemon.config.ui.shiny_notice_particles_distance": "发光粒子的显示距离",
+    "cobblemon.config.ui.shiny_notice_particles_distance.tooltip": "宝可梦发光粒子效果开始显示的距离。",
     "cobblemon.config.ui.capture_calculator": "捕获计算器",
     "cobblemon.config.ui.player_damage_pokemon": "玩家攻击宝可梦",
     "cobblemon.config.ui.player_damage_pokemon.tooltip": "控制玩家是否可以攻击一般实体一样攻击宝可梦。",
@@ -7073,7 +7073,7 @@
     "cobblemon.battle.block.aromaveil": "%1$s 正受到芳香幕的保护！",
     "cobblemon.species.mimikyu-busted.desc": "因正身就要暴露而很悲痛。绝不原谅折断了它脖子的对手，会向对方报仇。",
     "item.cobblemon.syrupy_apple": "蜜汁苹果",
-    "item.cobblemon.syrupy_apple.tooltip": "当啃果虫使用时，会使其进化为裹蜜虫",
+    "item.cobblemon.syrupy_apple.tooltip": "当啃果虫使用时，可使其进化为裹蜜虫",
     "cobblemon.command.unlockablepcboxwallpaper.invalid-wallpaper": "无效的壁纸标识",
     "cobblemon.ui.pc.wallpaper": "壁纸",
     "cobblemon.ui.pc.filter": "筛选",
@@ -8577,9 +8577,9 @@
     "cobblemon.ui.pokedex.info.form.dartrix-hisuibias": "洗翠趋异的样子",
     "block.cobblemon.potted_saccharine_sapling": "蜜露树苗盆栽",
     "item.cobblemon.saccharine_sapling": "蜜露树苗",
-    "item.cobblemon.metal_alloy.tooltip": "当对铝钢龙使用时，会使其进化为铝钢桥龙",
+    "item.cobblemon.metal_alloy.tooltip": "当对铝钢龙使用时，可使其进化为铝钢桥龙",
     "item.cobblemon.health_mochi": "体力粘糕",
-    "item.cobblemon.scroll_of_waters.tooltip": "当对熊徒弟使用时，会使其进化为武道熊师（连击流）",
+    "item.cobblemon.scroll_of_waters.tooltip": "当对熊徒弟使用时，可使其进化为武道熊师（连击流）",
     "item.cobblemon.potato_mochi": "马铃薯粘糕",
     "item.cobblemon.aprijuice_black": "黑球果汁",
     "item.cobblemon.health_mochi.tooltip": "提升宝可梦的HP基础点数4点",
@@ -8592,7 +8592,7 @@
     "item.cobblemon.metal_alloy": "复合金属",
     "item.cobblemon.scroll_of_darkness": "恶之挂轴",
     "item.cobblemon.scroll_of_waters": "水之挂轴",
-    "item.cobblemon.scroll_of_darkness.tooltip": "当对熊徒弟使用时，会使其进化为武道熊师（一击流）",
+    "item.cobblemon.scroll_of_darkness.tooltip": "当对熊徒弟使用时，可使其进化为武道熊师（一击流）",
     "item.cobblemon.fried_rice": "炒饭",
     "item.cobblemon.candied_apple": "蜜饯苹果",
     "item.cobblemon.moomoo_milk": "哞哞鲜奶",
@@ -8673,13 +8673,13 @@
     "item.cobblemon.ponigiri": "宝可饭团",
     "item.cobblemon.poke_puff.frosted": "珍奇 %s 宝芙蕾",
     "tooltip.cobblemon.poke_puff.nature.neutral": "中性",
-    "item.cobblemon.health_candy.tooltip_1": "提升宝可梦HP的有效个体值1点",
-    "item.cobblemon.brittle_candy.tooltip_1": "降低宝可梦防御的有效个体值1点",
-    "item.cobblemon.numb_candy.tooltip_1": "降低宝可梦特攻的有效个体值1点",
+    "item.cobblemon.health_candy.tooltip_1": "提升宝可梦的HP有效个体值1点",
+    "item.cobblemon.brittle_candy.tooltip_1": "降低宝可梦的防御有效个体值1点",
+    "item.cobblemon.numb_candy.tooltip_1": "降低宝可梦的特攻有效个体值1点",
     "cobblemon.ui.info.gender": "性别",
-    "item.cobblemon.courage_candy.tooltip_1": "提升宝可梦特防的有效个体值1点",
+    "item.cobblemon.courage_candy.tooltip_1": "提升宝可梦的特防有效个体值1点",
     "cobblemon.command.behaviouredit.non_scriptable": "您并没有看着一个可执行MoLang脚本的实体。",
-    "cobblemon.command.pcsearch.tooltip.shiny": "这只宝可梦已经是异色了！",
+    "cobblemon.command.pcsearch.tooltip.shiny": "这只是发光宝可梦！",
     "cobblemon.command.pcsearch.entry": "- %1$s %2$s",
     "block.cobblemon.campfire": "营火",
     "block.cobblemon.campfire_pot_black": "黑色营火锅",
@@ -8711,20 +8711,20 @@
     "cobblemon.tooltip.poke_puff.friendship_effects": "亲密度影响",
     "item.cobblemon.health_candy": "元气糖果",
     "item.cobblemon.mighty_candy": "力量糖果",
-    "item.cobblemon.mighty_candy.tooltip_1": "提升宝可梦攻击的有效个体值1点",
+    "item.cobblemon.mighty_candy.tooltip_1": "提升宝可梦的攻击有效个体值1点",
     "item.cobblemon.tough_candy": "守护糖果",
-    "item.cobblemon.tough_candy.tooltip_1": "提升宝可梦防御的有效个体值1点",
+    "item.cobblemon.tough_candy.tooltip_1": "提升宝可梦的防御有效个体值1点",
     "item.cobblemon.smart_candy": "知识糖果",
-    "item.cobblemon.smart_candy.tooltip_1": "提升宝可梦特攻的有效个体值1点",
+    "item.cobblemon.smart_candy.tooltip_1": "提升宝可梦的特攻有效个体值1点",
     "item.cobblemon.courage_candy": "心灵糖果",
     "item.cobblemon.quick_candy": "敏捷糖果",
-    "item.cobblemon.quick_candy.tooltip_1": "提升宝可梦速度的有效个体值1点",
+    "item.cobblemon.quick_candy.tooltip_1": "提升宝可梦的速度有效个体值1点",
     "item.cobblemon.sickly_candy": "虚弱糖果",
-    "item.cobblemon.sickly_candy.tooltip_1": "降低宝可梦HP的有效个体值1点",
-    "item.cobblemon.weak_candy.tooltip_1": "降低宝可梦攻击的有效个体值1点",
+    "item.cobblemon.sickly_candy.tooltip_1": "降低宝可梦的HP有效个体值1点",
+    "item.cobblemon.weak_candy.tooltip_1": "降低宝可梦的攻击有效个体值1点",
     "item.cobblemon.weak_candy": "软弱糖果",
-    "item.cobblemon.coward_candy.tooltip_1": "降低宝可梦特防的有效个体值1点",
-    "item.cobblemon.slow_candy.tooltip_1": "降低宝可梦速度的有效个体值1点",
+    "item.cobblemon.coward_candy.tooltip_1": "降低宝可梦的特防有效个体值1点",
+    "item.cobblemon.slow_candy.tooltip_1": "降低宝可梦的速度有效个体值1点",
     "item.cobblemon.brittle_candy": "脆弱糖果",
     "item.cobblemon.numb_candy": "迟钝糖果",
     "item.cobblemon.coward_candy": "胆怯糖果",
@@ -9106,7 +9106,7 @@
     "item.cobblemon.eggant_berry": "子茄果",
     "cobblemon.entity.variable.look_at_entity_types.desc": "该实体将看向的实体类型。",
     "cobblemon.entity.variable.look_at_entity_types.name": "看向实体类型",
-    "cobblemon.fishing_bait_effects.drops_reroll.tooltip": "%1$s%% - %3$s× 额外掉落",
+    "cobblemon.fishing_bait_effects.drops_reroll.tooltip": "%1$s%% - %3$s×额外掉落",
     "cobblemon.requires_debug_keys": "必须在服务器上启用调试键才能使用此功能。",
     "cobblemon.ui.stats.blocks_traveled": "步数",
     "cobblemon.requires_permission": "你没有执行此操作的权限。",
@@ -9213,5 +9213,131 @@
     "cobblemon.behaviour.defend_owner.desc": "在主人受到攻击时保护他们。",
     "stat.cobblemon.riding_land": "骑着宝可梦在陆地移动距离",
     "stat.cobblemon.riding_air": "骑着宝可梦在空中移动距离",
-    "stat.cobblemon.riding_liquid": "骑着宝可梦在水域移动距离"
+    "stat.cobblemon.riding_liquid": "骑着宝可梦在水域移动距离",
+    "item.cobblemon.sweet_heart.tooltip": "非常甜腻的巧克力",
+    "item.cobblemon.sweet_heart": "心形甜点",
+    "item.cobblemon.technical_machine": "招式学习器",
+    "item.cobblemon.blank_tm": "空白招式学习器",
+    "block.cobblemon.deepslate_crystal_core": "深层水晶母岩",
+    "block.cobblemon.normal_gem_block": "一般宝石块",
+    "block.cobblemon.fire_gem_block": "火之宝石块",
+    "block.cobblemon.water_gem_block": "水之宝石块",
+    "block.cobblemon.electric_gem_block": "草之宝石块",
+    "block.cobblemon.grass_gem_block": "电之宝石块",
+    "block.cobblemon.ice_gem_block": "冰之宝石块",
+    "block.cobblemon.fighting_gem_block": "格斗宝石块",
+    "block.cobblemon.poison_gem_block": "毒之宝石块",
+    "block.cobblemon.ground_gem_block": "地面宝石块",
+    "block.cobblemon.flying_gem_block": "飞行宝石块",
+    "block.cobblemon.psychic_gem_block": "超能力宝石块",
+    "block.cobblemon.bug_gem_block": "虫之宝石块",
+    "block.cobblemon.rock_gem_block": "岩石宝石块",
+    "block.cobblemon.ghost_gem_block": "幽灵宝石块",
+    "block.cobblemon.dragon_gem_block": "龙之宝石块",
+    "block.cobblemon.dark_gem_block": "恶之宝石块",
+    "block.cobblemon.steel_gem_block": "钢之宝石块",
+    "block.cobblemon.fairy_gem_block": "妖精宝石块",
+    "block.cobblemon.normal_gem_cluster": "一般宝石簇",
+    "block.cobblemon.fire_gem_cluster": "火之宝石簇",
+    "block.cobblemon.water_gem_cluster": "水之宝石簇",
+    "block.cobblemon.electric_gem_cluster": "电之宝石簇",
+    "block.cobblemon.grass_gem_cluster": "草之宝石簇",
+    "block.cobblemon.ice_gem_cluster": "冰之宝石簇",
+    "block.cobblemon.fighting_gem_cluster": "格斗宝石簇",
+    "block.cobblemon.poison_gem_cluster": "毒之宝石簇",
+    "block.cobblemon.ground_gem_cluster": "地面宝石簇",
+    "block.cobblemon.flying_gem_cluster": "飞行宝石簇",
+    "block.cobblemon.psychic_gem_cluster": "超能力宝石簇",
+    "block.cobblemon.bug_gem_cluster": "虫之宝石簇",
+    "block.cobblemon.rock_gem_cluster": "岩石宝石簇",
+    "block.cobblemon.ghost_gem_cluster": "幽灵宝石簇",
+    "block.cobblemon.dragon_gem_cluster": "龙之宝石簇",
+    "block.cobblemon.dark_gem_cluster": "恶之宝石簇",
+    "block.cobblemon.steel_gem_cluster": "钢之宝石簇",
+    "block.cobblemon.fairy_gem_cluster": "妖精宝石簇",
+    "cobblemon.item_class.technical_machine": "招式学习器",
+    "block.cobblemon.damaged_monitor": "损坏的数据显示器",
+    "block.cobblemon.tm_machine": "招式学习器机",
+    "block.cobblemon.disc_shelf": "光盘架",
+    "cobblemon.fishing_bait_effects.mark_chance.tooltip": "%1$s%% - 证章出现率+%3$s%%",
+    "cobblemon.fishing_bait_effects.alpha_chance.tooltip": "%1$s%% - 头目宝可梦出现率",
+    "cobblemon.fishing_bait_effects.size.tooltip": "%1$s%% - 体型%3$s%%",
+    "cobblemon.technical_machine_effect_header": "招式学习器机信息：",
+    "cobblemon.command.technicalmachine.invalid-tm": "无效招式学习器",
+    "cobblemon.ui.generic.question_marks": "？？？",
+    "cobblemon.container.tm_machine": "招式学习器机",
+    "cobblemon.ui.edit.habitat": "栖息地编辑器",
+    "cobblemon.ui.edit.habitat.mimic_id": "模仿方块ID",
+    "cobblemon.ui.edit.habitat.level_range": "等级范围（最小—最大）",
+    "cobblemon.ui.edit.habitat.mode": "模式：%s",
+    "cobblemon.ui.edit.habitat.mode.activated": "已激活",
+    "cobblemon.ui.edit.habitat.mode.natural": "自然",
+    "cobblemon.ui.edit.habitat.trigger": "触发器：%s",
+    "cobblemon.ui.edit.habitat.phase_number": "阶段数",
+    "cobblemon.ui.edit.habitat.phase_order": "阶段顺序：%s",
+    "cobblemon.ui.edit.habitat.spawn_range": "生成范围（方块数）",
+    "cobblemon.ui.edit.habitat.cancelled_range": "取消自然生成的范围（方块数）",
+    "cobblemon.ui.edit.habitat.max_spawns": "最大生成数量（-1为无限）",
+    "cobblemon.ui.edit.habitat.replace_spawns": "替换正常生成：%s",
+    "cobblemon.ui.edit.habitat.influence_range": "影响范围（方块数）",
+    "cobblemon.ui.edit.habitat.pool": "生成池：%s",
+    "cobblemon.ui.edit.habitat.pool.custom": "自定义",
+    "cobblemon.ui.edit.habitat.view_pool": "查看生成池",
+    "cobblemon.ui.edit.habitat.edit_pool": "编辑生成池",
+    "cobblemon.ui.edit.habitat.pool.title": "生成池编辑器",
+    "cobblemon.ui.edit.habitat.pool.species": "宝可梦",
+    "cobblemon.ui.edit.habitat.spawn.species_name": "宝可梦名称",
+    "cobblemon.ui.edit.habitat.pool.levels": "等级",
+    "cobblemon.ui.edit.habitat.pool.phases": "阶段",
+    "cobblemon.ui.edit.habitat.pool.position": "位置",
+    "cobblemon.ui.edit.habitat.pool.weight": "权重",
+    "cobblemon.ui.edit.habitat.pool.bucket": "稀有度档位",
+    "cobblemon.ui.edit.habitat.pool.add_spawn": "增加生成",
+    "cobblemon.ui.edit.habitat.pool.back": "返回",
+    "cobblemon.ui.edit.habitat.pool.select": "选择生成池",
+    "cobblemon.ui.edit.habitat.spawn": "生成编辑器",
+    "cobblemon.ui.edit.habitat.spawn.position_type": "位置类型：%s",
+    "cobblemon.ui.edit.habitat.spawn.bucket": "稀有度档位：%s",
+    "cobblemon.ui.edit.habitat.spawn.weight": "权重",
+    "cobblemon.ui.edit.habitat.spawn.level_range": "等级范围（最小—最大）",
+    "cobblemon.ui.edit.habitat.spawn.modifiers": "修饰词（例如：shiny gender=male）",
+    "cobblemon.ui.edit.habitat.spawn.phases": "阶段（例如：1-3, 5）",
+    "cobblemon.ui.edit.habitat.spawn.time_of_day": "时段",
+    "cobblemon.ui.edit.habitat.spawn.time_of_day.value": "时段：%s",
+    "cobblemon.ui.edit.habitat.spawn.time_of_day.any": "所有",
+    "cobblemon.ui.edit.habitat.spawn.min_light": "最低光照度（0-15，可选）",
+    "cobblemon.ui.edit.habitat.spawn.max_light": "最高光照度（0-15, 可选）",
+    "cobblemon.ui.edit.habitat.spawn.back": "返回",
+    "cobblemon.ui.edit.habitat.validation.mimic": "模仿方块必须是被允许且有效的方块ID（查看 habitat_mimics.json）。",
+    "cobblemon.ui.edit.habitat.validation.phases": "阶段数必须大于0。",
+    "cobblemon.ui.edit.habitat.validation.level_range": "等级范围必须处于1到100之间，且最小值不能大于最大值。",
+    "cobblemon.ui.edit.habitat.validation.spawn_range": "生成范围必须为0或更高。",
+    "cobblemon.ui.edit.habitat.validation.cancelled_range": "被取消的自然生成范围必须为 -1（不取消）或在 0 到 64 之间。",
+    "cobblemon.ui.edit.habitat.validation.max_spawns": "最大生成数必须是-1或更高。",
+    "cobblemon.ui.edit.habitat.validation.influence_range": "影响范围必须为0或更高。",
+    "cobblemon.ui.edit.habitat.validation.species": "必须为一个有效的宝可梦。",
+    "cobblemon.ui.edit.habitat.validation.weight": "权重必须大于0。",
+    "cobblemon.ui.edit.habitat.validation.modifiers": "修饰词的格式无效。",
+    "cobblemon.ui.edit.habitat.validation.min_light": "最低光照度必须处于0到15之间。",
+    "cobblemon.ui.edit.habitat.validation.max_light": "最高光照度必须处于0到15之间。",
+    "cobblemon.ui.moves.learnset.tm.discovered": "发现了",
+    "cobblemon.ui.moves.level": "等级提升",
+    "cobblemon.ui.moves.egg": "蛋",
+    "cobblemon.ui.moves.tm": "招式学习器",
+    "cobblemon.ui.tm_machine.can_learn": "能学习",
+    "cobblemon.ui.tm_machine.cannot_learn": "不能学",
+    "cobblemon.ui.tm_machine.learned": "已学会",
+    "cobblemon.tms.unknown_move": "未知招式",
+    "cobblemon.tms.already_known": "%1$s 已经学会了 %2$s！",
+    "cobblemon.tms.teach_move": "%1$s 学会了 %2$s！",
+    "cobblemon.tms.cannot_learn": "%1$s 不能学习 %2$s！",
+    "cobblemon.tms.unlock_tm": "你解锁了 %1$s 招式学习器！",
+    "cobblemon.tms.new_tms_learned": "学会了新的招式学习器！",
+    "cobblemon.tms.check_tmm": "查看招式学习器机",
+    "cobblemon.ui.party.party_select_title": "更改同行队伍选中",
+    "cobblemon.ui.party.party_select_description": "按下 %1$s/%2$s 或长按 %3$s 滑动鼠标滚轮。",
+    "cobblemon.ui.category": "分类",
+    "cobblemon.ui.pp": "PP",
+    "cobblemon.ui.pokemon.alpha": "头目",
+    "cobblemon.ui.edit.habitat.validation.phases_list": "阶段的格式必须使用有效的整数范围，例如：1-3或者1，3-5，6。"
 }